diff --git a/AGENTS.md b/AGENTS.md
index d96259a61d2..a9cc829b322 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -185,7 +185,7 @@ lines.some((line) => !HEADING_RE.test(line));
 
 ## Base realm imports
 
-- Only card definitions (files run through the card loader) can use static ESM imports from `https://cardstack.com/base/*`. Host-side modules must load the module at runtime via `loader.import(`${baseRealm.url}...`)`. Static value imports from the HTTPS specifier inside host code trigger build-time `webpackMissingModule` failures. Type imports are OK using static ESM syntax.
+- Only card definitions (files run through the card loader) can use static ESM imports from `@cardstack/base/*`. Host-side modules must load the module at runtime via `loader.import(`${baseRealm.url}...`)`. Static value imports from the HTTPS specifier inside host code trigger build-time `webpackMissingModule` failures. Type imports are OK using static ESM syntax.
 
 ## Linear Ticket Process (Reusable)
 
diff --git a/mise-tasks/dev b/mise-tasks/dev
index aac5d88ad8f..2bbb9f9a50e 100755
--- a/mise-tasks/dev
+++ b/mise-tasks/dev
@@ -2,6 +2,8 @@
 #MISE description="Start full dev stack (realm server, workers, test realms)"
 #MISE dir="packages/realm-server"
 
+export PATH="$PATH:node_modules/.bin"
+
 . "$(cd "$(dirname "$0")" && pwd)/lib/dev-common.sh"
 
 WAIT_ON_TIMEOUT=7200000 NODE_NO_WARNINGS=1 start-server-and-test \
diff --git a/mise-tasks/services/realm-server b/mise-tasks/services/realm-server
index e98dcd68268..930a9c1a07a 100755
--- a/mise-tasks/services/realm-server
+++ b/mise-tasks/services/realm-server
@@ -87,7 +87,7 @@ LOW_CREDIT_THRESHOLD="${LOW_CREDIT_THRESHOLD:-2000}" \
   \
   --path='../base' \
   --username='base_realm' \
-  --fromUrl='https://cardstack.com/base/' \
+  --fromUrl='@cardstack/base/' \
   --toUrl="${REALM_BASE_URL}/base/" \
   \
   ${START_CATALOG:+--path="${CATALOG_REALM_PATH}"} \
diff --git a/mise-tasks/services/realm-server-base b/mise-tasks/services/realm-server-base
index de572132e9c..566606a4a5e 100755
--- a/mise-tasks/services/realm-server-base
+++ b/mise-tasks/services/realm-server-base
@@ -28,5 +28,5 @@ NODE_ENV=development \
   \
   --path='../base' \
   --username='base_realm' \
-  --fromUrl='https://cardstack.com/base/' \
+  --fromUrl='@cardstack/base/' \
   --toUrl='http://localhost:4201/base/'
diff --git a/mise-tasks/services/test-realms b/mise-tasks/services/test-realms
index 284d8e33853..770a6f3185b 100755
--- a/mise-tasks/services/test-realms
+++ b/mise-tasks/services/test-realms
@@ -65,5 +65,5 @@ NODE_ENV=test \
   --username='test_realm' \
   --fromUrl="${REALM_TEST_URL}/test/" \
   --toUrl="${REALM_TEST_URL}/test/" \
-  --fromUrl='https://cardstack.com/base/' \
+  --fromUrl='@cardstack/base/' \
   --toUrl="${REALM_BASE_URL}/base/"
diff --git a/mise-tasks/services/worker b/mise-tasks/services/worker
index 1a3f0035213..6eb2fe1754b 100755
--- a/mise-tasks/services/worker
+++ b/mise-tasks/services/worker
@@ -31,7 +31,7 @@ NODE_ENV=development \
   --matrixURL="${MATRIX_URL_VAL}" \
   --prerendererUrl="${PRERENDER_MGR_URL}" \
   \
-  --fromUrl='https://cardstack.com/base/' \
+  --fromUrl='@cardstack/base/' \
   --toUrl="${REALM_BASE_URL}/base/" \
   \
   ${START_EXPERIMENTS:+--fromUrl="${REALM_BASE_URL}/experiments/"} \
diff --git a/mise-tasks/services/worker-base b/mise-tasks/services/worker-base
index 0f6aa184d66..97e2400af42 100755
--- a/mise-tasks/services/worker-base
+++ b/mise-tasks/services/worker-base
@@ -17,5 +17,5 @@ NODE_ENV=development \
   --matrixURL="${MATRIX_URL_VAL}" \
   --prerendererUrl="${PRERENDER_MGR_URL}" \
   \
-  --fromUrl='https://cardstack.com/base/' \
+  --fromUrl='@cardstack/base/' \
   --toUrl='http://localhost:4201/base/'
diff --git a/mise-tasks/services/worker-test b/mise-tasks/services/worker-test
index db236d975fd..ed9f097ae09 100755
--- a/mise-tasks/services/worker-test
+++ b/mise-tasks/services/worker-test
@@ -36,7 +36,7 @@ NODE_ENV=test \
   \
   --fromUrl="${REALM_TEST_URL}/test/" \
   --toUrl="${REALM_TEST_URL}/test/" \
-  --fromUrl='https://cardstack.com/base/' \
+  --fromUrl='@cardstack/base/' \
   --toUrl="${REALM_BASE_URL}/base/" \
   --fromUrl='@cardstack/skills/' \
   --toUrl="${REALM_BASE_URL}/skills/"
diff --git a/packages/ai-bot/lib/debug.ts b/packages/ai-bot/lib/debug.ts
index 50f90e33f70..908a5b003d7 100644
--- a/packages/ai-bot/lib/debug.ts
+++ b/packages/ai-bot/lib/debug.ts
@@ -2,7 +2,7 @@ import { setTitle } from './set-title';
 import type OpenAI from 'openai';
 
 import * as Sentry from '@sentry/node';
-import type { MatrixEvent as DiscreteMatrixEvent } from 'https://cardstack.com/base/matrix-event';
+import type { MatrixEvent as DiscreteMatrixEvent } from '@cardstack/base/matrix-event';
 import {
   getPromptParts,
   isRecognisedDebugCommand,
diff --git a/packages/ai-bot/lib/matrix/response-publisher.ts b/packages/ai-bot/lib/matrix/response-publisher.ts
index f688b64daa3..01163e158d0 100644
--- a/packages/ai-bot/lib/matrix/response-publisher.ts
+++ b/packages/ai-bot/lib/matrix/response-publisher.ts
@@ -7,7 +7,7 @@ import {
   APP_BOXEL_HAS_CONTINUATION_CONTENT_KEY,
 } from '@cardstack/runtime-common';
 import { sendErrorEvent, sendMessageEvent } from '@cardstack/runtime-common/ai';
-import type { CardMessageContent } from 'https://cardstack.com/base/matrix-event';
+import type { CardMessageContent } from '@cardstack/base/matrix-event';
 import ResponseEventData from './response-event-data';
 import { logger } from '@cardstack/runtime-common';
 import type { MatrixClient } from 'matrix-js-sdk';
diff --git a/packages/ai-bot/lib/set-title.ts b/packages/ai-bot/lib/set-title.ts
index f683d4250bf..a1be707e71f 100644
--- a/packages/ai-bot/lib/set-title.ts
+++ b/packages/ai-bot/lib/set-title.ts
@@ -8,7 +8,7 @@ import type {
   EncodedCommandRequest,
   CodePatchResultContent,
   CardMessageContent,
-} from 'https://cardstack.com/base/matrix-event';
+} from '@cardstack/base/matrix-event';
 import type { ChatCompletionMessageParam } from 'openai/resources';
 import {
   type OpenAIPromptMessage,
diff --git a/packages/ai-bot/main.ts b/packages/ai-bot/main.ts
index f7fcda49cea..5ecdad407e2 100644
--- a/packages/ai-bot/main.ts
+++ b/packages/ai-bot/main.ts
@@ -37,7 +37,7 @@ import {
   setTitle,
   roomTitleAlreadySet,
 } from './lib/set-title';
-import type { MatrixEvent as DiscreteMatrixEvent } from 'https://cardstack.com/base/matrix-event';
+import type { MatrixEvent as DiscreteMatrixEvent } from '@cardstack/base/matrix-event';
 import * as Sentry from '@sentry/node';
 
 import { saveUsageCost } from '@cardstack/billing/ai-billing';
diff --git a/packages/ai-bot/tests/chat-titling-test.ts b/packages/ai-bot/tests/chat-titling-test.ts
index e9a474dc8d8..ad9798674c0 100644
--- a/packages/ai-bot/tests/chat-titling-test.ts
+++ b/packages/ai-bot/tests/chat-titling-test.ts
@@ -4,7 +4,7 @@ import {
   setTitle,
   shouldSetRoomTitle,
 } from '../lib/set-title';
-import type { MatrixEvent as DiscreteMatrixEvent } from 'https://cardstack.com/base/matrix-event';
+import type { MatrixEvent as DiscreteMatrixEvent } from '@cardstack/base/matrix-event';
 import {
   APP_BOXEL_CODE_PATCH_RESULT_EVENT_TYPE,
   APP_BOXEL_CODE_PATCH_RESULT_MSGTYPE,
diff --git a/packages/ai-bot/tests/history-construction-test.ts b/packages/ai-bot/tests/history-construction-test.ts
index be04676a842..db074eea1d7 100644
--- a/packages/ai-bot/tests/history-construction-test.ts
+++ b/packages/ai-bot/tests/history-construction-test.ts
@@ -14,7 +14,7 @@ import { EventStatus, type IRoomEvent } from 'matrix-js-sdk';
 import type {
   CardMessageEvent,
   MatrixEvent as DiscreteMatrixEvent,
-} from 'https://cardstack.com/base/matrix-event';
+} from '@cardstack/base/matrix-event';
 import { FakeMatrixClient } from './helpers/fake-matrix-client';
 
 module('constructHistory', (hooks) => {
diff --git a/packages/ai-bot/tests/matrix-util-test.ts b/packages/ai-bot/tests/matrix-util-test.ts
index 6e0f2cc4104..f42f360c405 100644
--- a/packages/ai-bot/tests/matrix-util-test.ts
+++ b/packages/ai-bot/tests/matrix-util-test.ts
@@ -4,7 +4,7 @@ import type { Method } from 'matrix-js-sdk';
 import type {
   CardMessageEvent,
   MatrixEvent as DiscreteMatrixEvent,
-} from 'https://cardstack.com/base/matrix-event';
+} from '@cardstack/base/matrix-event';
 import { APP_BOXEL_MESSAGE_MSGTYPE } from '@cardstack/runtime-common';
 import { getRoomEvents, sendErrorEvent } from '@cardstack/runtime-common/ai';
 import { OpenAIError } from 'openai/error';
diff --git a/packages/ai-bot/tests/prompt-construction-test.ts b/packages/ai-bot/tests/prompt-construction-test.ts
index cfc9691e159..eaa3009c62e 100644
--- a/packages/ai-bot/tests/prompt-construction-test.ts
+++ b/packages/ai-bot/tests/prompt-construction-test.ts
@@ -18,9 +18,9 @@ import type {
   MatrixEvent as DiscreteMatrixEvent,
   Tool,
   CardMessageContent,
-} from 'https://cardstack.com/base/matrix-event';
+} from '@cardstack/base/matrix-event';
 import { EventStatus } from 'matrix-js-sdk';
-import type { CardDef } from 'https://cardstack.com/base/card-api';
+import type { CardDef } from '@cardstack/base/card-api';
 import { readFileSync } from 'fs-extra';
 import * as path from 'path';
 import { FakeMatrixClient } from './helpers/fake-matrix-client';
@@ -228,7 +228,7 @@ Current date and time: 2025-06-11T11:43:00.533Z
                   },
                   {
                     codeRef: {
-                      module: 'https://cardstack.com/base/card-api',
+                      module: '@cardstack/base/card-api',
                       name: 'CardDef',
                     },
                     fields: [],
@@ -287,7 +287,7 @@ File open in code editor: http://localhost:4201/experiments/author.gts
   Inheritance chain:
     1. Address from http://localhost:4201/experiments/author
        Fields: street, city, state
-      2. CardDef from https://cardstack.com/base/card-api
+      2. CardDef from @cardstack/base/card-api
   Selected text: lines 10-12 (1-based), columns 5-20 (1-based)
   Note: Line numbers in selection refer to the original file. Attached file contents below show line numbers for reference.
 Module inspector panel: preview
@@ -1931,7 +1931,7 @@ Attached Files (files with newer versions don't show their content):
       text: JSON.stringify({
         data: {
           type: 'card',
-          id: 'https://cardstack.com/base/Skill/card-editing',
+          id: '@cardstack/base/Skill/card-editing',
           attributes: {
             instructions:
               '- If the user wants the data they see edited, AND the patchCardInstance function is available, you MUST use the "patchCardInstance" function to make the change.\n- If the user wants the data they see edited, AND the patchCardInstance function is NOT available, you MUST ask the user to open the card and share it with you.\n- If you do not call patchCardInstance, the user will not see the change.\n- You can ONLY modify cards shared with you. If there is no patchCardInstance function or tool, then the user hasn\'t given you access.\n- NEVER tell the user to use patchCardInstance; you should always do it for them.\n- If the user wants to search for a card instance, AND the "searchCard" function is available, you MUST use the "searchCard" function to find the card instance.\nOnly recommend one searchCard function at a time.\nIf the user wants to edit a field of a card, you can optionally use "searchCard" to help find a card instance that is compatible with the field being edited before using "patchCardInstance" to make the change of the field.\n You MUST confirm with the user the correct choice of card instance that he intends to use based upon the results of the search.',
@@ -1977,7 +1977,7 @@ Attached Files (files with newer versions don't show their content):
     assert.true(systemPromptText.includes(SKILL_INSTRUCTIONS_MESSAGE));
     assert.true(
       systemPromptText.includes(
-        'Skill (id: https://cardstack.com/base/Skill/card-editing, title: Card Editing):',
+        'Skill (id: @cardstack/base/Skill/card-editing, title: Card Editing):',
       ),
       'includes skill title metadata when present',
     );
@@ -2010,7 +2010,7 @@ Attached Files (files with newer versions don't show their content):
       text: JSON.stringify({
         data: {
           type: 'card',
-          id: 'https://cardstack.com/base/Skill/card-editing',
+          id: '@cardstack/base/Skill/card-editing',
           attributes: {
             instructions:
               '- If the user wants the data they see edited, AND the patchCardInstance function is available, you MUST use the "patchCardInstance" function to make the change.\n- If the user wants the data they see edited, AND the patchCardInstance function is NOT available, you MUST ask the user to open the card and share it with you.\n- If you do not call patchCardInstance, the user will not see the change.\n- You can ONLY modify cards shared with you. If there is no patchCardInstance function or tool, then the user hasn\'t given you access.\n- NEVER tell the user to use patchCardInstance; you should always do it for them.\n- If the user wants to search for a card instance, AND the "searchCard" function is available, you MUST use the "searchCard" function to find the card instance.\nOnly recommend one searchCard function at a time.\nIf the user wants to edit a field of a card, you can optionally use "searchCard" to help find a card instance that is compatible with the field being edited before using "patchCardInstance" to make the change of the field.\n You MUST confirm with the user the correct choice of card instance that he intends to use based upon the results of the search.',
@@ -2229,7 +2229,7 @@ Attached Files (files with newer versions don't show their content):
       text: JSON.stringify({
         data: {
           type: 'card',
-          id: 'https://cardstack.com/base/Skill/card-editing',
+          id: '@cardstack/base/Skill/card-editing',
           attributes: {
             instructions:
               '- If the user wants the data they see edited, AND the patchCardInstance function is available, you MUST use the "patchCardInstance" function to make the change.\n- If the user wants the data they see edited, AND the patchCardInstance function is NOT available, you MUST ask the user to open the card and share it with you.\n- If you do not call patchCardInstance, the user will not see the change.\n- You can ONLY modify cards shared with you. If there is no patchCardInstance function or tool, then the user hasn\'t given you access.\n- NEVER tell the user to use patchCardInstance; you should always do it for them.\n- If the user wants to search for a card instance, AND the "searchCard" function is available, you MUST use the "searchCard" function to find the card instance.\nOnly recommend one searchCard function at a time.\nIf the user wants to edit a field of a card, you can optionally use "searchCard" to help find a card instance that is compatible with the field being edited before using "patchCardInstance" to make the change of the field.\n You MUST confirm with the user the correct choice of card instance that he intends to use based upon the results of the search.',
@@ -2654,7 +2654,7 @@ Attached Files (files with newer versions don't show their content):
                   },
                   meta: {
                     adoptsFrom: {
-                      module: 'https://cardstack.com/base/search-results',
+                      module: '@cardstack/base/search-results',
                       name: 'SearchResults',
                     },
                   },
@@ -2694,7 +2694,7 @@ Attached Files (files with newer versions don't show their content):
     );
     assert.equal(result[5].role, 'tool');
     assert.equal(result[5].tool_call_id, 'tool-call-id-1');
-    const expected = `Tool call executed, with result card: {"data":{"type":"card","attributes":{"title":"Search Results","description":"Here are the search results","results":[{"data":{"type":"card","id":"http://localhost:4201/drafts/Author/1","attributes":{"firstName":"Alice","lastName":"Enwunder","photo":null,"body":"Alice is a software engineer at Google.","description":null,"thumbnailURL":null},"meta":{"adoptsFrom":{"module":"../author","name":"Author"}}}}]},"meta":{"adoptsFrom":{"module":"https://cardstack.com/base/search-results","name":"SearchResults"}}}}.`;
+    const expected = `Tool call executed, with result card: {"data":{"type":"card","attributes":{"title":"Search Results","description":"Here are the search results","results":[{"data":{"type":"card","id":"http://localhost:4201/drafts/Author/1","attributes":{"firstName":"Alice","lastName":"Enwunder","photo":null,"body":"Alice is a software engineer at Google.","description":null,"thumbnailURL":null},"meta":{"adoptsFrom":{"module":"../author","name":"Author"}}}}]},"meta":{"adoptsFrom":{"module":"@cardstack/base/search-results","name":"SearchResults"}}}}.`;
 
     assert.equal((result[5].content as string).trim(), expected.trim());
   });
@@ -2835,7 +2835,7 @@ Attached Files (files with newer versions don't show their content):
       text: JSON.stringify({
         data: {
           type: 'card',
-          id: 'https://cardstack.com/base/Skill/skill_card_v1',
+          id: '@cardstack/base/Skill/skill_card_v1',
           attributes: {
             instructions: 'Test skill instructions',
             title: 'Test Skill',
@@ -2854,7 +2854,7 @@ Attached Files (files with newer versions don't show their content):
       text: JSON.stringify({
         data: {
           type: 'card',
-          id: 'https://cardstack.com/base/Skill/skill_card_v2',
+          id: '@cardstack/base/Skill/skill_card_v2',
           attributes: {
             instructions: 'Test skill instructions with updated commands',
             commands: [
@@ -3079,7 +3079,7 @@ Attached Files (files with newer versions don't show their content):
       text: JSON.stringify({
         data: {
           type: 'card',
-          id: 'https://cardstack.com/base/Skill/card-editing',
+          id: '@cardstack/base/Skill/card-editing',
           attributes: {
             instructions:
               '- If the user wants the data they see edited, AND the patchCardInstance function is available, you MUST use the "patchCardInstance" function to make the change.\n- If the user wants the data they see edited, AND the patchCardInstance function is NOT available, you MUST ask the user to open the card and share it with you.\n- If you do not call patchCardInstance, the user will not see the change.\n- You can ONLY modify cards shared with you. If there is no patchCardInstance function or tool, then the user hasn\'t given you access.\n- NEVER tell the user to use patchCardInstance; you should always do it for them.\n- If the user wants to search for a card instance, AND the "searchCard" function is available, you MUST use the "searchCard" function to find the card instance.\nOnly recommend one searchCard function at a time.\nIf the user wants to edit a field of a card, you can optionally use "searchCard" to help find a card instance that is compatible with the field being edited before using "patchCardInstance" to make the change of the field.\n You MUST confirm with the user the correct choice of card instance that he intends to use based upon the results of the search.',
@@ -3255,7 +3255,7 @@ Current date and time: 2025-06-11T11:43:00.533Z
       text: JSON.stringify({
         data: {
           type: 'card',
-          id: 'https://cardstack.com/base/Skill/skill_card_v1',
+          id: '@cardstack/base/Skill/skill_card_v1',
           attributes: {
             instructions: 'Test skill instructions',
             title: 'Test Skill',
@@ -3274,7 +3274,7 @@ Current date and time: 2025-06-11T11:43:00.533Z
       text: JSON.stringify({
         data: {
           type: 'card',
-          id: 'https://cardstack.com/base/Skill/skill_card_v2',
+          id: '@cardstack/base/Skill/skill_card_v2',
           attributes: {
             instructions: 'Test skill instructions with updated commands',
             commands: [
@@ -3425,7 +3425,7 @@ Current date and time: 2025-06-11T11:43:00.533Z
       text: JSON.stringify({
         data: {
           type: 'card',
-          id: 'https://cardstack.com/base/Skill/skill_card_v1',
+          id: '@cardstack/base/Skill/skill_card_v1',
           attributes: {
             instructions: 'Test skill instructions',
             title: 'Test Skill',
diff --git a/packages/ai-bot/tests/resources/chats/added-skill.json b/packages/ai-bot/tests/resources/chats/added-skill.json
index c357db99ea9..5ac8b345f42 100644
--- a/packages/ai-bot/tests/resources/chats/added-skill.json
+++ b/packages/ai-bot/tests/resources/chats/added-skill.json
@@ -288,7 +288,7 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/abc123",
-          "sourceUrl": "https://cardstack.com/base/Skill/card-editing",
+          "sourceUrl": "@cardstack/base/Skill/card-editing",
           "contentType": "text/plain"
         }
       ],
@@ -311,7 +311,7 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/abc123",
-          "sourceUrl": "https://cardstack.com/base/Skill/card-editing",
+          "sourceUrl": "@cardstack/base/Skill/card-editing",
           "contentType": "text/plain"
         },
         {
@@ -330,7 +330,7 @@
         "enabledSkillCards": [
           {
             "url": "mxc://mock-server/abc123",
-            "sourceUrl": "https://cardstack.com/base/Skill/card-editing"
+            "sourceUrl": "@cardstack/base/Skill/card-editing"
           }
         ],
         "disabledSkillCards": []
@@ -346,7 +346,7 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/abc123",
-          "sourceUrl": "https://cardstack.com/base/Skill/card-editing"
+          "sourceUrl": "@cardstack/base/Skill/card-editing"
         }
       ],
       "disabledSkillCards": []
diff --git a/packages/ai-bot/tests/resources/chats/added-two-skills-removed-one-skill.json b/packages/ai-bot/tests/resources/chats/added-two-skills-removed-one-skill.json
index 65e11588c3f..9d68d26ac53 100644
--- a/packages/ai-bot/tests/resources/chats/added-two-skills-removed-one-skill.json
+++ b/packages/ai-bot/tests/resources/chats/added-two-skills-removed-one-skill.json
@@ -288,7 +288,7 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+          "sourceUrl": "@cardstack/base/Skill/skill1",
           "contentType": "text/plain"
         }
       ],
@@ -311,12 +311,12 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+          "sourceUrl": "@cardstack/base/Skill/skill1",
           "contentType": "text/plain"
         },
         {
           "url": "mxc://mock-server/skill2",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill2",
+          "sourceUrl": "@cardstack/base/Skill/skill2",
           "contentType": "text/plain"
         }
       ],
@@ -330,7 +330,7 @@
         "enabledSkillCards": [
           {
             "url": "mxc://mock-server/skill1",
-            "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+            "sourceUrl": "@cardstack/base/Skill/skill1",
             "contentType": "text/plain"
           }
         ],
@@ -347,7 +347,7 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+          "sourceUrl": "@cardstack/base/Skill/skill1",
           "contentType": "text/plain"
         }
       ],
@@ -362,14 +362,14 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill2",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill2",
+          "sourceUrl": "@cardstack/base/Skill/skill2",
           "contentType": "text/plain"
         }
       ],
       "disabledSkillCards": [
         {
           "url": "mxc://mock-server/skill1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+          "sourceUrl": "@cardstack/base/Skill/skill1",
           "contentType": "text/plain"
         }
       ]
@@ -382,12 +382,12 @@
         "enabledSkillCards": [
           {
             "url": "mxc://mock-server/skill1",
-            "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+            "sourceUrl": "@cardstack/base/Skill/skill1",
             "contentType": "text/plain"
           },
           {
             "url": "mxc://mock-server/skill2",
-            "sourceUrl": "https://cardstack.com/base/Skill/skill2",
+            "sourceUrl": "@cardstack/base/Skill/skill2",
             "contentType": "text/plain"
           }
         ],
@@ -404,12 +404,12 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+          "sourceUrl": "@cardstack/base/Skill/skill1",
           "contentType": "text/plain"
         },
         {
           "url": "mxc://mock-server/skill2",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill2",
+          "sourceUrl": "@cardstack/base/Skill/skill2",
           "contentType": "text/plain"
         }
       ],
diff --git a/packages/ai-bot/tests/resources/chats/added-two-skills-removed-two-skills.json b/packages/ai-bot/tests/resources/chats/added-two-skills-removed-two-skills.json
index f985339cc5f..9339ecad0ca 100644
--- a/packages/ai-bot/tests/resources/chats/added-two-skills-removed-two-skills.json
+++ b/packages/ai-bot/tests/resources/chats/added-two-skills-removed-two-skills.json
@@ -288,7 +288,7 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+          "sourceUrl": "@cardstack/base/Skill/skill1",
           "contentType": "text/plain"
         }
       ],
@@ -311,12 +311,12 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+          "sourceUrl": "@cardstack/base/Skill/skill1",
           "contentType": "text/plain"
         },
         {
           "url": "mxc://mock-server/skill2",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill2",
+          "sourceUrl": "@cardstack/base/Skill/skill2",
           "contentType": "text/plain"
         }
       ],
@@ -330,7 +330,7 @@
         "enabledSkillCards": [
           {
             "url": "mxc://mock-server/skill1",
-            "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+            "sourceUrl": "@cardstack/base/Skill/skill1",
             "contentType": "text/plain"
           }
         ],
@@ -347,7 +347,7 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+          "sourceUrl": "@cardstack/base/Skill/skill1",
           "contentType": "text/plain"
         }
       ],
@@ -362,14 +362,14 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill2",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill2",
+          "sourceUrl": "@cardstack/base/Skill/skill2",
           "contentType": "text/plain"
         }
       ],
       "disabledSkillCards": [
         {
           "url": "mxc://mock-server/skill1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+          "sourceUrl": "@cardstack/base/Skill/skill1",
           "contentType": "text/plain"
         }
       ]
@@ -382,12 +382,12 @@
         "enabledSkillCards": [
           {
             "url": "mxc://mock-server/skill1",
-            "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+            "sourceUrl": "@cardstack/base/Skill/skill1",
             "contentType": "text/plain"
           },
           {
             "url": "mxc://mock-server/skill2",
-            "sourceUrl": "https://cardstack.com/base/Skill/skill2",
+            "sourceUrl": "@cardstack/base/Skill/skill2",
             "contentType": "text/plain"
           }
         ],
@@ -404,12 +404,12 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+          "sourceUrl": "@cardstack/base/Skill/skill1",
           "contentType": "text/plain"
         },
         {
           "url": "mxc://mock-server/skill2",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill2",
+          "sourceUrl": "@cardstack/base/Skill/skill2",
           "contentType": "text/plain"
         }
       ],
@@ -425,12 +425,12 @@
       "disabledSkillCards": [
         {
           "url": "mxc://mock-server/skill1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+          "sourceUrl": "@cardstack/base/Skill/skill1",
           "contentType": "text/plain"
         },
         {
           "url": "mxc://mock-server/skill2",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill2",
+          "sourceUrl": "@cardstack/base/Skill/skill2",
           "contentType": "text/plain"
         }
       ]
@@ -443,14 +443,14 @@
         "enabledSkillCards": [
           {
             "url": "mxc://mock-server/skill2",
-            "sourceUrl": "https://cardstack.com/base/Skill/skill2",
+            "sourceUrl": "@cardstack/base/Skill/skill2",
             "contentType": "text/plain"
           }
         ],
         "disabledSkillCards": [
           {
             "url": "mxc://mock-server/skill1",
-            "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+            "sourceUrl": "@cardstack/base/Skill/skill1",
             "contentType": "text/plain"
           }
         ]
@@ -466,14 +466,14 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill2",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill2",
+          "sourceUrl": "@cardstack/base/Skill/skill2",
           "contentType": "text/plain"
         }
       ],
       "disabledSkillCards": [
         {
           "url": "mxc://mock-server/skill1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill1",
+          "sourceUrl": "@cardstack/base/Skill/skill1",
           "contentType": "text/plain"
         }
       ]
diff --git a/packages/ai-bot/tests/resources/chats/invoke-submode-swith-command.json b/packages/ai-bot/tests/resources/chats/invoke-submode-swith-command.json
index 0b42161f426..b5436e77555 100644
--- a/packages/ai-bot/tests/resources/chats/invoke-submode-swith-command.json
+++ b/packages/ai-bot/tests/resources/chats/invoke-submode-swith-command.json
@@ -31,7 +31,7 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill_card_v1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill_card_v1",
+          "sourceUrl": "@cardstack/base/Skill/skill_card_v1",
           "contentType": "text/plain"
         }
       ],
@@ -67,7 +67,7 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill_card_v2",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill_card_v2",
+          "sourceUrl": "@cardstack/base/Skill/skill_card_v2",
           "contentType": "text/plain"
         }
       ],
diff --git a/packages/ai-bot/tests/resources/chats/read-card.json b/packages/ai-bot/tests/resources/chats/read-card.json
index d4ed3453ad4..9bd387f098a 100644
--- a/packages/ai-bot/tests/resources/chats/read-card.json
+++ b/packages/ai-bot/tests/resources/chats/read-card.json
@@ -82,7 +82,7 @@
           "name": "Search Results",
           "contentType": "application/vnd.card+json",
           "contentHash": "2f111846167f5ffe476ec32f9daa09db",
-          "content": "{\"data\":{\"type\":\"card\",\"lid\":\"95197459-f975-4224-b4fa-35c965cc976d\",\"attributes\":{\"cardIds\":[\"http://test-realm-server/user/test-realm/Postcard/46268158-2eb9-4025-804d-45c299017e8f\"],\"title\":\"Search Results\",\"description\":\"Query: {\\n  \\\"contains\\\": {\\n    \\\"title\\\": \\\"Nashville\\\"\\n  }\\n}\",\"thumbnailURL\":null},\"meta\":{\"adoptsFrom\":{\"module\":\"https://cardstack.com/base/commands/search-card-result\",\"name\":\"SearchCardsResult\"}}}}"
+          "content": "{\"data\":{\"type\":\"card\",\"lid\":\"95197459-f975-4224-b4fa-35c965cc976d\",\"attributes\":{\"cardIds\":[\"http://test-realm-server/user/test-realm/Postcard/46268158-2eb9-4025-804d-45c299017e8f\"],\"title\":\"Search Results\",\"description\":\"Query: {\\n  \\\"contains\\\": {\\n    \\\"title\\\": \\\"Nashville\\\"\\n  }\\n}\",\"thumbnailURL\":null},\"meta\":{\"adoptsFrom\":{\"module\":\"@cardstack/base/commands/search-card-result\",\"name\":\"SearchCardsResult\"}}}}"
         }
       }
     },
diff --git a/packages/ai-bot/tests/resources/chats/server-side-aggregations.json b/packages/ai-bot/tests/resources/chats/server-side-aggregations.json
index c7c23fedd59..694121ee0ef 100644
--- a/packages/ai-bot/tests/resources/chats/server-side-aggregations.json
+++ b/packages/ai-bot/tests/resources/chats/server-side-aggregations.json
@@ -165,7 +165,7 @@
     "content": {
       "enabledSkillCards": [
         {
-          "sourceUrl": "https://cardstack.com/base/Skill/card-editing",
+          "sourceUrl": "@cardstack/base/Skill/card-editing",
           "url": "mxc://mock-server/skill_card_v1",
           "name": "Card Editing",
           "contentType": "text/plain",
diff --git a/packages/ai-bot/tests/resources/chats/two-messages-with-same-skill-card.json b/packages/ai-bot/tests/resources/chats/two-messages-with-same-skill-card.json
index 173678e496f..7ae2d133e84 100644
--- a/packages/ai-bot/tests/resources/chats/two-messages-with-same-skill-card.json
+++ b/packages/ai-bot/tests/resources/chats/two-messages-with-same-skill-card.json
@@ -325,8 +325,8 @@
     "content": {
       "enabledSkillCards": [
         {
-          "url": "https://cardstack.com/base/Skill/card-editing",
-          "sourceUrl": "https://cardstack.com/base/Skill/card-editing",
+          "url": "@cardstack/base/Skill/card-editing",
+          "sourceUrl": "@cardstack/base/Skill/card-editing",
           "contentType": "text/plain"
         }
       ],
@@ -348,8 +348,8 @@
     "content": {
       "enabledSkillCards": [
         {
-          "url": "https://cardstack.com/base/Skill/card-editing",
-          "sourceUrl": "https://cardstack.com/base/Skill/card-editing",
+          "url": "@cardstack/base/Skill/card-editing",
+          "sourceUrl": "@cardstack/base/Skill/card-editing",
           "contentType": "text/plain"
         },
         {
@@ -367,8 +367,8 @@
       "prev_content": {
         "enabledSkillCards": [
           {
-            "url": "https://cardstack.com/base/Skill/card-editing",
-            "sourceUrl": "https://cardstack.com/base/Skill/card-editing",
+            "url": "@cardstack/base/Skill/card-editing",
+            "sourceUrl": "@cardstack/base/Skill/card-editing",
             "contentType": "text/plain"
           }
         ],
@@ -384,8 +384,8 @@
     "prev_content": {
       "enabledSkillCards": [
         {
-          "url": "https://cardstack.com/base/Skill/card-editing",
-          "sourceUrl": "https://cardstack.com/base/Skill/card-editing",
+          "url": "@cardstack/base/Skill/card-editing",
+          "sourceUrl": "@cardstack/base/Skill/card-editing",
           "contentType": "text/plain"
         }
       ],
@@ -413,8 +413,8 @@
       "prev_content": {
         "enabledSkillCards": [
           {
-            "url": "https://cardstack.com/base/Skill/card-editing",
-            "sourceUrl": "https://cardstack.com/base/Skill/card-editing",
+            "url": "@cardstack/base/Skill/card-editing",
+            "sourceUrl": "@cardstack/base/Skill/card-editing",
             "contentType": "text/plain"
           },
           {
@@ -435,8 +435,8 @@
     "prev_content": {
       "enabledSkillCards": [
         {
-          "url": "https://cardstack.com/base/Skill/card-editing",
-          "sourceUrl": "https://cardstack.com/base/Skill/card-editing",
+          "url": "@cardstack/base/Skill/card-editing",
+          "sourceUrl": "@cardstack/base/Skill/card-editing",
           "contentType": "text/plain"
         },
         {
diff --git a/packages/ai-bot/tests/resources/chats/updated-skill-command-definitions.json b/packages/ai-bot/tests/resources/chats/updated-skill-command-definitions.json
index fb09d05dbc2..9954ef7254d 100644
--- a/packages/ai-bot/tests/resources/chats/updated-skill-command-definitions.json
+++ b/packages/ai-bot/tests/resources/chats/updated-skill-command-definitions.json
@@ -31,7 +31,7 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill_card_v1",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill_card_v1",
+          "sourceUrl": "@cardstack/base/Skill/skill_card_v1",
           "contentType": "text/plain"
         }
       ],
@@ -67,7 +67,7 @@
       "enabledSkillCards": [
         {
           "url": "mxc://mock-server/skill_card_v2",
-          "sourceUrl": "https://cardstack.com/base/Skill/skill_card_v2",
+          "sourceUrl": "@cardstack/base/Skill/skill_card_v2",
           "contentType": "text/plain"
         }
       ],
diff --git a/packages/ai-bot/tsconfig.json b/packages/ai-bot/tsconfig.json
index 9136bf3cf89..f4395e0dd2b 100644
--- a/packages/ai-bot/tsconfig.json
+++ b/packages/ai-bot/tsconfig.json
@@ -28,7 +28,7 @@
     "skipLibCheck": true,
     "strict": true,
     "paths": {
-      "https://cardstack.com/base/*": [
+      "@cardstack/base/*": [
         "../base/*"
       ],
       "@cardstack/boxel-ui": [
diff --git a/packages/base/Skill/boxel-development.json b/packages/base/Skill/boxel-development.json
index 8e996e3be19..bb70143c2c0 100644
--- a/packages/base/Skill/boxel-development.json
+++ b/packages/base/Skill/boxel-development.json
@@ -2,7 +2,7 @@
   "data": {
     "type": "card",
     "attributes": {
-      "instructions": "# Boxel Development Guide\n\n🛰️ You are an AI assistant specializing in Boxel development. Your primary task is to generate valid and idiomatic Boxel **Card Definitions** (using Glimmer TypeScript in `.gts` files) and **Card Instances** (using JSON:API in `.json` files). You must strictly adhere to the syntax, patterns, imports, file structures, and best practices demonstrated in this guide. Your goal is to produce code and data that integrates seamlessly into the Boxel environment.\n\n## Quick Reference\n\n**File Types:** `.gts` (definitions) | `.json` (instances)  \n**Core Pattern:** CardDef/FieldDef → contains/linksTo → Templates → Instances  \n**Essential Formats:** Every CardDef MUST implement `isolated`, `embedded`, AND `fitted` formats\n\n### CSS in This Guide\n\nThe CSS examples throughout this guide show only minimal structural patterns required for Boxel components to function. They are intentionally bare-bones and omit visual design. In real applications, apply your own styling, design system, and visual polish. The only CSS patterns marked as \"CRITICAL\" are functionally required.\n\nWhen using Boxel UI components (Button, Pill, Avatar, etc.), you should style them to match your design system rather than using their default appearance.\n\n### File Handling\n\n#### File Type Rules\n- **`.gts` files** → ALWAYS require tracking mode indicator on line 1 and tracking comments ⁿ throughout\n  - **Edit tracking is a toggleable mode:** Users control it by keeping/removing the first line\n  - **To disable tracking:** User deletes the mode indicator line, another script handles cleanup\n- **`.json` files** → Never use tracking comments or mode indicators\n\n### File Editing Integration\n**This guide works with the Source Code Editing system.** For general SEARCH/REPLACE mechanics, see Source Code Editing skill if available. This guide adds Boxel-specific requirements:\n- **MANDATORY:** All `.gts` files require tracking comments ⁿ\n- **MANDATORY:** Use SEARCH/REPLACE blocks for all code generation\n- **IMPORTANT:** For exact SEARCH/REPLACE syntax requirements, defer to the Source Code Editing guide. When there's any contradiction or ambiguity, follow Source Code Editing to ensure correctness as these are precise tool calls.\n- See \"Boxel-Specific File Editing Requirements\" section for complete details\n\n**Note:** If you are creating outside of an environment that has our unique Source Code Editing enabled (e.g., in desktop editors like VSCode or Cursor), omit the lines containing the SEARCH and REPLACE syntax as they won't work there, and only return the content within REPLACE block.\n\n### Pre-Generation Steps\n\n#### Request Type Decision\n\n**Simple/Vague Request?** (3 sentences or less, create/build/design/prototype...)\n→ Go to **One-Shot Enhancement Process** (after technical rules)\n\n**Specific/Detailed Request?** (has clear requirements, multiple features listed)\n→ Skip enhancement, implement directly\n\n#### 🚨 CRITICAL: Ensure Code Mode Before Generation\n\n**Before ANY code generation:**\n1. **CHECK** - Are you already in code mode?\n   - If YES → Proceed to step 3\n   - If NO → Switch to code mode first\n2. **Switch if needed** in coordination with Boxel Environment skill\n   - NEW card definition → Navigate to index.json\n   - REVISION to existing card → Navigate to the specific .gts file\n3. **Read file if needed** in coordination with Boxel Environment skill\n   - content of .gts file is present in prompt → Proceed with generation\n   - content of .gts file missing → Use the read-file-for-ai-assistant_[hash] command  \n4. **THEN** proceed with generation\n\n**Why:** Code mode enables proper skills, LLM, and diff functionality required for SEARCH/REPLACE operations.\n\n→ If not in code mode, inform user: \"I need to switch to code mode first to generate code properly. Let me do that now.\"\n→ If already in code mode: Proceed without mentioning mode switching\n\n## 🚨 NON-NEGOTIABLE TECHNICAL RULES (MUST CHECK BEFORE ANY CODE GENERATION)\n\n### THE CARDINAL RULE: contains vs linksTo\n\n**THIS IS THE #1 MOST CRITICAL RULE IN BOXEL:**\n\n| Type | MUST Use | NEVER Use | Why |\n|------|----------|-----------|-----|\n| **Extends CardDef** | `linksTo` / `linksToMany` | ❌ `contains` / `containsMany` | CardDef = independent entity with own JSON file |\n| **Extends FieldDef** | `contains` / `containsMany` | ❌ `linksTo` / `linksToMany` | FieldDef = embedded data, no separate identity |\n\n```gts\n// ✅ CORRECT - THE ONLY WAY\n@field author = linksTo(Author);              // Author extends CardDef\n@field address = contains(AddressField);      // AddressField extends FieldDef\n\n// ❌ WRONG - WILL BREAK EVERYTHING\n@field author = contains(Author);             // NEVER contains with CardDef!\n@field address = linksTo(AddressField);       // NEVER linksTo with FieldDef!\n```\n\n### MANDATORY TECHNICAL REQUIREMENTS\n\n1. **Always use SEARCH/REPLACE with tracking for .gts files**\n   - Every .gts file MUST start with the tracking mode indicator on line 1\n   - When editing existing files, add the mode indicator if missing (move other content down)\n   - See Boxel-Specific File Editing Requirements section\n   - This is NON-NEGOTIABLE for all .gts files\n\n2. **Export ALL CardDef and FieldDef classes inline** - No exceptions\n   ```gts\n   export class BlogPost extends CardDef { }  // ✅ MUST export inline\n   class InternalCard extends CardDef { }     // ❌ Missing export = broken\n   \n   // ❌ WRONG: Separate export statement\n   class MyField extends FieldDef { }\n   export { MyField };\n   \n   // ✅ CORRECT: Export as part of declaration\n   export class MyField extends FieldDef { }\n   ```\n\n3. **Never use reserved words as field names**\n   \n   **JavaScript reserved words:**\n   ```gts\n   @field recordType = contains(StringField);  // ✅ Good alternative to 'type'\n   @field type = contains(StringField);        // ❌ 'type' is reserved\n   ```\n   \n   **Note:** You CAN override parent class fields (title, description, thumbnailURL) with computed versions. You CANNOT define the same field name twice within your own class.\n\n4. **Keep computed fields simple and unidirectional** - No cycles!\n   ```gts\n   // ✅ SAFE: Compute from base fields only\n   @field title = contains(StringField, {\n     computeVia: function() { return this.headline ?? 'Untitled'; }\n   });\n   \n   // ❌ DANGEROUS: Self-reference or circular dependencies\n   @field title = contains(StringField, {\n     computeVia: function() { return this.title ?? 'Untitled'; } // Stack overflow!\n   });\n   ```\n\n6. **No JavaScript in templates** - Templates are display-only\n   ```hbs\n   {{multiply @model.price 1.2}}              // ✅ Use helpers\n   {{@model.price * 1.2}}                     // ❌ No calculations\n   ```\n   **Also:** No SVG `url(#id)` references - use CSS instead\n\n7. **Wrap delegated collections with spacing containers**\n   ```hbs\n   <div class=\"items-container\">\n     <@fields.items @format=\"embedded\" />\n   </div>\n   <style scoped>\n     .items-container { gap: 0.75rem; } /* REQUIRED spacing */\n   </style>\n   ```\n\n### TECHNICAL VALIDATION CHECKLIST\nBefore generating ANY code, confirm:\n- [ ] SEARCH/REPLACE blocks prepared with tracking markers for .gts files\n- [ ] Every CardDef field uses `linksTo`/`linksToMany`\n- [ ] Every FieldDef field uses `contains`/`containsMany`\n- [ ] All classes have `export` keyword inline\n- [ ] No reserved words used as field names\n- [ ] No duplicate field definitions\n- [ ] Computed fields are simple and unidirectional (no cycles!)\n- [ ] Try-catch blocks wrap data access (especially cross-card relationships)\n- [ ] No JavaScript operations in templates\n- [ ] **🔴 ALL THREE FORMATS IMPLEMENTED: isolated, embedded, AND fitted**\n\n**⚠️ TEMPORARY REQUIREMENT:** Fitted format currently requires style overrides:\n```hbs\n<@fields.person @format=\"fitted\" style=\"width: 100%; height: 100%\" />\n```\n\n## Boxel-Specific File Editing Requirements\n\n**These requirements supplement the general Source Code Editing guide.**\n\n### MANDATORY for .gts Files\n\n1. **All `.gts` files require tracking mode indicator on line 1:**\n   ```gts\n   // ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\n   ```\n\n2. **Format:** `// ⁿ description` using sequential superscripts: ¹, ², ³...\n3. **Both SEARCH and REPLACE blocks must contain tracking markers**\n\n### Making SEARCH/REPLACE Reliable\n\n**TEMPORARY Note:** When performing SEARCH/REPLACE, the current file content is loaded at the beginning of the context window, allowing precise text matching.\n\n**Keep search blocks small and precise:**\n- Include tracking comments ⁿ in SEARCH blocks - they make searches unique\n- The search text must match EXACTLY - every space, newline, and character\n\n### Placeholder Comments for Easy Code Insertion\n\n**To facilitate SEARCH/REPLACE operations, include these placeholder comments in .gts files:**\n\n1. **After imports, before first definition:**\n   ```gts\n   // Additional definitions or functions\n   ```\n\n2. **Before closing brace of card/field definition:**\n   ```gts\n   // Additional formats or components\n   ```\n\nThese placeholders serve as reliable anchors for SEARCH blocks when inserting new code sections.\n\n### Example: Creating New Boxel File\n\n```gts\nhttp://realm/recipe-card.gts\n╔═══ SEARCH ════╗\n╠═══════════════╣\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nimport { CardDef, field, contains, Component } from 'https://cardstack.com/base/card-api'; // ¹ Core imports\nimport StringField from 'https://cardstack.com/base/string';\nimport NumberField from 'https://cardstack.com/base/number';\nimport CookingIcon from '@cardstack/boxel-icons/cooking-pot'; // ² icon import\n\nexport class RecipeCard extends CardDef { // ³ Card definition\n  static displayName = 'Recipe';\n  static icon = CookingIcon;\n  \n  @field recipeName = contains(StringField); // ⁴ Primary fields\n  @field prepTime = contains(NumberField);\n  @field cookTime = contains(NumberField);\n  \n  // ⁵ Computed title from primary field\n  @field title = contains(StringField, {\n    computeVia: function(this: RecipeCard) {\n      return this.recipeName ?? 'Untitled Recipe';\n    }\n  });\n  \n  static embedded = class Embedded extends Component<typeof this> { // ⁶ Embedded format\n    <template>\n      <div class=\"recipe-card\">\n        <h3>{{if @model.recipeName @model.recipeName \"Untitled Recipe\"}}</h3>\n        <span class=\"time\">{{add @model.prepTime @model.cookTime}} mins total</span>\n      </div>\n      \n      <style scoped> /* ⁷ Component styles */\n        .recipe-card {\n          padding: 0.75rem;\n        }\n      </style>\n    </template>\n  };\n}\n╚═══ REPLACE ═══╝\n```\n╰ ¹⁻⁷\n\n**Note:** The `╰ ¹⁻⁷` notation after the SEARCH/REPLACE block indicates which tracking markers were added or modified in this operation.\n\n### Example: Modifying Existing File\n\n```gts\nhttps://example.com/recipe-card.gts\n╔═══ SEARCH ════╗\nexport class RecipeCard extends CardDef { // ³ Card definition\n  static displayName = 'Recipe';\n  static icon = CookingIcon;\n╠═══════════════╣\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nexport class RecipeCard extends CardDef { // ³ Card definition\n  static displayName = 'Recipe';\n  static icon = CookingIcon;\n╚═══ REPLACE ═══╝\n```\n╰ no changes\n\n**Note:** When editing a file without the tracking mode indicator, add it as line 1 first, then continue with your changes.\n\n```gts\nhttps://example.com/recipe-card.gts\n╔═══ SEARCH ════╗\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nexport class RecipeCard extends CardDef { // ³ Card definition\n  static displayName = 'Recipe';\n  static icon = CookingIcon;\n  \n  @field recipeName = contains(StringField); // ⁴ Primary fields\n  @field prepTime = contains(NumberField);\n  @field cookTime = contains(NumberField);\n╠═══════════════╣\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nexport class RecipeCard extends CardDef { // ³ Card definition\n  static displayName = 'Recipe';\n  static icon = CookingIcon;\n  \n  @field recipeName = contains(StringField); // ⁴ Primary fields\n  @field prepTime = contains(NumberField);\n  @field cookTime = contains(NumberField);\n  @field servings = contains(NumberField); // ¹⁸ Added servings field\n  @field difficulty = contains(StringField); // ¹⁹ Added difficulty\n╚═══ REPLACE ═══╝\n```\n╰ ¹⁸⁻¹⁹\n\n**Remember:** When implementing any code example from this guide via SEARCH/REPLACE, add appropriate tracking markers ⁿ\n\n## One-Shot Enhancement Process (For Simple/Vague Requests)\n\n**⚡ WHEN TO USE: User gives simple prompt without much implementation details**\n\nCommon triggers:\n- \"Create a [thing]\" / \"Build a [app type]\" / \"Make a [system]\"\n- \"I want/need a [solution]\" / \"Can you make [something]\"\n- \"Design/prototype/develop a [concept]\"\n- \"Help me with [vague domain]\"\n- Any request with 3 sentences or less\n- Aspirational ideas without technical requirements\n\n### Quick Pre-Flight Check\n- [ ] Understand contains/linksTo rule\n- [ ] Plan 1 primary CardDef (max 3 for navigation)\n- [ ] Other entities as FieldDefs\n- [ ] Prepare tracking markers for SEARCH/REPLACE\n\n### 500-Word Enhancement Sprint\n\n**Technical Architecture**\nPrimary CardDef: [EntityName] as the main interactive unit. Supporting FieldDefs: List 3-5 compound fields that add richness. Navigation: Only add secondary CardDefs if drill-down is essential. Key relationships: Map contains/linksTo connections clearly.\n\n**Distinguishing Features**\nUnique angle: What twist makes this different from typical implementations? Clever fields: 2-3 unexpected fields that add personality. Smart computations: Interesting derived values or calculations. Interaction hooks: Where users will want to click/explore.\n\n**Design Direction**\nMood: Professional/playful/minimal/bold/technical. Colors: Primary #[hex], Secondary #[hex], Accent #[hex]. Typography: [Google Font] for headings, [Google Font] for body. Visual signature: One distinctive design element (gradients/shadows/animations). Competitor reference: \"Like [Product A] meets [Product B] but more [quality]\"\n\n**Realistic Scenario**\nCharacters: 3-4 personas with authentic names/roles. Company/Context: Believable organization or situation. Data points: Specific numbers, dates, statuses that tell a story. Pain point: What problem does this solve in the scenario? Success metric: What would make users say \"wow\"?\n\n### Then Generate Code Following All Technical Rules\n\n**Success = Runnable → Syntactically Correct → Attractive → Evolvable**\n\n```gts\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\n// ¹ Core imports - ALWAYS needed for definitions\nimport { CardDef, FieldDef, Component, field, contains, containsMany, linksTo, linksToMany } from 'https://cardstack.com/base/card-api';\n\n// ² Base field imports (only what you use)\nimport StringField from 'https://cardstack.com/base/string';\nimport NumberField from 'https://cardstack.com/base/number';\nimport BooleanField from 'https://cardstack.com/base/boolean';\nimport DateField from 'https://cardstack.com/base/date';\nimport DateTimeField from 'https://cardstack.com/base/datetime';\nimport MarkdownField from 'https://cardstack.com/base/markdown';\nimport TextAreaField from 'https://cardstack.com/base/text-area';\nimport BigIntegerField from 'https://cardstack.com/base/big-integer';\nimport CodeRefField from 'https://cardstack.com/base/code-ref';\nimport Base64ImageField from 'https://cardstack.com/base/base64-image'; // Don't use - too large for AI processing\nimport ColorField from 'https://cardstack.com/base/color';\nimport EmailField from 'https://cardstack.com/base/email';\nimport PercentageField from 'https://cardstack.com/base/percentage';\nimport PhoneNumberField from 'https://cardstack.com/base/phone-number';\nimport UrlField from 'https://cardstack.com/base/url';\nimport AddressField from 'https://cardstack.com/base/address';\n\n// ⚠️ EXTENDING BASE FIELDS: To customize a base field, import it and extend:\n// import BaseAddressField from 'https://cardstack.com/base/address';\n// export class FancyAddressField extends BaseAddressField { }\n// Never import and define the same field name - it causes conflicts!\n\n// ³ UI Component imports\nimport { Button, Pill, Avatar, FieldContainer, CardContainer, BoxelSelect, ViewSelector } from '@cardstack/boxel-ui/components';\n\n// ⁴ Helper imports\nimport { eq, gt, gte, lt, lte, and, or, not, cn, add, subtract, multiply, divide } from '@cardstack/boxel-ui/helpers';\nimport { currencyFormat, formatDateTime, optional, pick } from '@cardstack/boxel-ui/helpers';\nimport { concat, fn } from '@ember/helper';\nimport { get } from '@ember/helper';\nimport { on } from '@ember/modifier';\nimport Modifier from 'ember-modifier';\nimport { action } from '@ember/object';\nimport { tracked } from '@glimmer/tracking';\nimport { task, restartableTask } from 'ember-concurrency';\n// NOTE: 'if' is built into Glimmer templates - DO NOT import it\n\n// ⁶ TIMING RULE: NEVER use requestAnimationFrame\n// - DOM timing: Use Glimmer modifiers with cleanup\n// - Async coordination: Use task/restartableTask from ember-concurrency  \n// - Delays: Use await timeout(ms) from ember-concurrency, not setTimeout\n\n// ⁵ Icon imports\nimport EmailIcon from '@cardstack/boxel-icons/mail';\nimport PhoneIcon from '@cardstack/boxel-icons/phone';\nimport RocketIcon from '@cardstack/boxel-icons/rocket';\n// Available from Lucide, Lucide Labs, and Tabler icon sets\n// NOTE: Only use for static card/field type icons, NOT in templates\n\n// CRITICAL IMPORT RULES:\n// ⚠️ If you don't see an import in the approved lists above, DO NOT assume it exists!\n// ⚠️ Only use imports explicitly shown in this guide - no exceptions!\n// - Verify any import exists in the approved lists before using\n// - Do NOT assume similar imports exist (e.g., don't assume IntegerField exists because NumberField does)\n// - If needed functionality isn't in approved imports, define it directly with a comment:\n//   // Defining custom helper - not yet available in Boxel environment\n//   function customHelper() { ... }\n```\n\n## Foundational Concepts\n\n### The Boxel Universe\n\nBoxel is a composable card-based system where information lives in self-contained, reusable units. Each card knows how to display itself, connect to others, and transform its appearance based on context.\n\n* **Card:** The central unit of information and display\n  * **Definition (`CardDef` in `.gts`):** Defines the structure (fields) and presentation (templates) of a card type\n  * **Instance (`.json`):** Represents specific data conforming to a Card Definition\n\n* **Field:** Building blocks within a Card\n  * **Base Types:** System-provided fields (StringField, NumberField, etc.)\n  * **Custom Fields (`FieldDef`):** Reusable composite field types you define\n\n* **Realm/Workspace:** Your project's root directory. All imports and paths are relative to this context\n\n* **Formats:** Different visual representations of the same card:\n  * `isolated`: Full detailed view (should be scrollable for long content)\n  * `embedded`: Compact view for inclusion in other cards\n  * `fitted`: **🚨 ESSENTIAL** - Fixed dimensions for grids/galleries/dashboards (parent sets both width AND height)\n    * **⚠️ TEMPORARY:** Fitted format requires style overrides: `<@fields.person @format=\"fitted\" style=\"width: 100%; height: 100%\" />`\n  * `atom`: Minimal inline representation\n  * `edit`: Form for data modification (default provided, override only if needed)\n\n**🔴 CRITICAL:** Modern Boxel cards require ALL THREE display formats: isolated, embedded, AND fitted. Missing custom fitted format will fallback to basic fitted view that won't look very nice or have enough info to show in grids, choosers, galleries, or dashboards.\n\n### Base Card Fields\n\n**IMPORTANT:** Every CardDef automatically inherits these base fields:\n- `title` (StringField) - Used for card headers and tiles\n- `description` (StringField) - Used for card summaries\n- `thumbnailURL` (StringField) - Used for card preview images\n- `info` (reserved) - Future use\n\n**✅ You CAN override these inherited fields with computed versions:**\n```gts\n// ✅ CORRECT - Override inherited title with computed version\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nexport class BlogPost extends CardDef {\n  @field headline = contains(StringField); // Your primary field\n  \n  // Override parent's title with computed version\n  @field title = contains(StringField, {\n    computeVia: function() { return this.headline ?? 'Untitled'; }\n  });\n}\n```\n\n**❌ You CANNOT define the same field twice in your own class:**\n```gts\n// ❌ WRONG - Defining same field name twice\nexport class BlogPost extends CardDef {\n  @field title = contains(StringField);\n  @field title = contains(StringField, { computeVia: ... }); // ERROR!\n}\n```\n\n**Best Practice:** Define your own primary identifier field (e.g., `name`, `headline`, `productName`) and compute the inherited `title` from it:\n\n```gts\nexport class Product extends CardDef { // ¹² Card definition\n  @field productName = contains(StringField); // ¹³ Primary field - NOT 'title'!\n  @field price = contains(NumberField);\n  \n  // ¹⁴ Compute the inherited title from your primary field\n  @field title = contains(StringField, {\n    computeVia: function(this: Product) {\n      const name = this.productName ?? 'Unnamed Product';\n      const price = this.price ? ` - ${this.price}` : '';\n      return `${name}${price}`;\n    }\n  });\n}\n```\n\n**⚠️ CRITICAL: Keep computed titles simple and unidirectional**\n- Only reference OTHER fields, never self-reference\n- Don't create circular dependencies between computed fields\n- Keep logic simple - just format/combine existing field values\n- If complex logic is needed, compute from base fields only\n\n**Remember:** When implementing via SEARCH/REPLACE, include tracking markers ⁿ\n\n## Decision Trees\n\n**Data Structure Choice:**\n```\nNeeds own identity? → CardDef with linksTo\nReferenced from multiple places? → CardDef with linksTo  \nJust compound data? → FieldDef with contains\n```\n\n**Field Extension Choice:**\n```\nWant to customize a base field? → import BaseField, extend it\nCreating new field type? → extends FieldDef directly\nAdding to existing field? → extends BaseFieldName\n```\n\n**Value Setup:**\n```\nComputed from other fields? → computeVia\nUser-editable with default? → Field literal or computeVia\nSimple one-time value? → Field literal\n```\n\n**Circular Dependencies?**\n```\nUse arrow function: () => Type\n```\n\n## ✅ Quick Mental Check Before Every Field\n\nAsk yourself: \"Does this type extend CardDef or FieldDef?\"\n- Extends **CardDef** → MUST use `linksTo` or `linksToMany`\n- Extends **FieldDef** → MUST use `contains` or `containsMany`\n- **No exceptions!**\n\nFor computed fields, ask: \"Am I keeping this simple and unidirectional?\"\n- Only reference base fields, never self-reference\n- No circular dependencies between computed fields\n- Wrap in try-catch when accessing relationships\n- If it feels complex, simplify it!\n\n## Template Field Access Patterns\n\n**CRITICAL:** Understanding when to use different field access patterns prevents rendering errors.\n\n| Pattern | Usage | Purpose | Example |\n|---------|-------|---------|---------|\n| `{{@model.title}}` | **Raw Data Access** | Get raw field values for computation/display | `{{@model.title}}` gets the title string |\n| `<@fields.title />` | **Field Template Rendering** | Render field using its own template | `<@fields.title />` renders title field's embedded template |\n| `<@fields.phone @format=\"atom\" />` | **Compound Field Display** | Display compound fields (FieldDef) correctly | Prevents `[object Object]` display |\n| `<@fields.author />` | **Single Field Delegation** | Delegate rendering for ANY field (singular or collection) | Always use `@fields`, even for singular entities |\n| `<@fields.blogPosts @format=\"embedded\" />` | **Auto-Collection Rendering** | Default container automatically iterates collections (**CRITICAL:** Must use `.container > .containsMany-field` selector for spacing) | `<div class=\"items\"><@fields.blogPosts @format=\"embedded\" /></div>` with `.items > .containsMany-field { gap: 1rem; }` |\n| `<@fields.person @format=\"fitted\" style=\"width: 100%; height: 100%\" />` | **Fitted Format Override** | Style overrides required for fitted format (TEMPORARY) | Required for proper fitted rendering |\n| `{{#each @fields.blogPosts as |post|}}` | **Manual Collection Iteration** | Manual loop control with custom rendering | `{{#each @fields.blogPosts as |post|}}<post @format=\"fitted\" />{{/each}}` |\n| `{{get @model.comments 0}}` | **Array Index Access** | Access array elements by index | `{{get @model.comments 0}}` gets first comment |\n| `{{if @model.description @model.description \"No description available\"}}` | **Inline Fallback Values** | Provide defaults for missing values in single line | Shows fallback when description is empty or null |\n| `{{currencyFormat @model.totalCost 'USD'}}` | **Currency Formatting** | Format numbers as currency in templates (use i18n in JS) | `{{currencyFormat @model.totalCost 'USD'}}` shows $1,234.56 |\n| `{{formatDateTime @model.publishDate 'MMM D, YYYY'}}` | **Date Formatting** | Format dates in templates (use i18n in JS) | `{{formatDateTime @model.publishDate 'MMM D, YYYY'}}` shows Jan 15, 2025 |\n| `<PrerenderedCardSearch>` | **Query Result Display** | Live card search with real-time updates | See Query System section |\n\n### ⚠️ CRITICAL: @model Iteration vs @fields Delegation\n\n**Once you iterate with @model, you CANNOT delegate to @fields within that iteration.**\n\n```hbs\n<!-- ❌ BREAKS: Mixing @model iteration with @fields delegation -->\n{{#each @model.teamMembers as |member|}}\n  <@fields.member @format=\"embedded\" />  <!-- NO ACCESS to @fields.member -->\n{{/each}}\n\n<!-- ✅ OPTION 1: Use delegated rendering for the whole collection -->\n<@fields.teamMembers @format=\"embedded\" />\n\n<!-- ✅ OPTION 2: Commit to full @model control -->\n{{#each @model.teamMembers as |member|}}\n  <div class=\"custom-member\">{{member.name}}</div>\n{{/each}}\n\n<!-- ✅ OPTION 3: If filtering needed, use query patterns -->\n<!-- Use PrerenderedCardSearch or getCards for filtered collections -->\n```\n\n**Why this breaks:** @fields provides field-level components. Once you're iterating with @model, you're working with raw data, not field components.\n\n**Decision Rule:** Before iterating, decide:\n- Need composability? → Use delegated rendering\n- Need filtering? → Use query patterns (PrerenderedCardSearch/getCards)\n- Need custom control? → Use @model but handle ALL rendering yourself\n\n### Styling Responsibility Model\n\n**Core Rule: Container provides frame, content provides data**\n\n**Visual Chrome (border, shadow, radius, background):**\n- **Isolated/Embedded/Fitted/Edit:** Parent or CardContainer handles\n- **Atom:** Self-styles (inline use case)\n\n**Layout:** Parent controls container dimensions and spacing via `.containsMany-field`\n\n## Format Dimensions Comparison\n\n| Format | Width | Height | Parent Sets | Key Behavior |\n|--------|-------|--------|-------------|--------------|\n| **Isolated** | Max-width + centered | Natural + scrollable | ❌ Neither | Full viewport available |\n| **Embedded** | Fills container | Natural (parent can limit) | ✅ Width only | Parent can add \"view more\" controls |\n| **Fitted** | Fills exactly | Fills exactly | ✅ **Both** | Must set width AND height |\n| **Atom** | Inline/shrink to fit | Inline | ❌ Neither | Self-contained sizing |\n| **Edit** | Fills container | Natural form height | ✅ Width only | Grows with fields |\n\n### Embedded Height Control Pattern\n```css\n/* Parent can limit embedded height with expand control */\n.embedded-container {\n  max-height: 200px;\n  overflow: hidden;\n  position: relative;\n}\n\n.embedded-container.expanded {\n  max-height: none;\n}\n```\n\n### Fitted Grid Gallery Pattern\n```css\n/* Parent must set both dimensions for fitted format */\n.photo-gallery > .containsMany-field {\n  display: grid;\n  grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));\n  grid-auto-rows: 300px;  /* Fixed height required for fitted */\n  gap: 1rem;\n}\n/* Fitted items automatically fill cell via temporary rule: style=\"width: 100%; height: 100%\" */\n```\n\n### Quick Rule: Embedded vs Fitted\n**Embedded:** Like paragraphs - flow naturally, parent can truncate  \n**Fitted:** Like photos - exact dimensions required\n\n### Displaying Compound Fields\n\n**CRITICAL:** When displaying compound fields (FieldDef types) like `PhoneNumberField`, `AddressField`, or custom field definitions, you must use their format templates, not raw model access:\n\n```hbs\n<!-- ❌ WRONG: Shows [object Object] -->\n<p>Phone: {{@model.phone}}</p>\n\n<!-- ✅ CORRECT: Uses the field's atom format -->\n<p>Phone: <@fields.phone @format=\"atom\" /></p>\n\n<!-- ✅ CORRECT: For full field display -->\n<div class=\"contact-info\">\n  <@fields.phone @format=\"embedded\" />\n</div>\n```\n\n**💡 Line-saving tip:** Keep self-closing tags compact:\n```hbs\n<!-- Good: Saves vertical space -->\n<@fields.author @format=\"embedded\" />\n<@fields.phone @format=\"atom\" />\n```\n\n### @fields Delegation Rule\n\n**CRITICAL:** When delegating to embedded/fitted formats, you must iterate through `@fields`, not `@model`. Always use `@fields` for delegation, even for singular fields. See \"⚠️ CRITICAL: @model Iteration vs @fields Delegation\" section for why you cannot mix these patterns.\n\n```hbs\n<!-- ✅ CORRECT: Using @fields for both singular and collection fields -->\n<@fields.author @format=\"embedded\" />\n<@fields.items @format=\"embedded\" />\n{{#each @fields.items as |item|}}\n  <item @format=\"embedded\" />\n{{/each}}\n\n<!-- ❌ WRONG: Can't iterate @model then try to delegate to @fields -->\n{{#each @model.items as |item|}}\n  <@fields.??? @format=\"embedded\" /> <!-- This won't work -->\n{{/each}}\n```\n\n**Line-saving tip:** Put `/>` on the end of the previous line for self-closing tags:\n```hbs\n<!-- Instead of: -->\n<@fields.author @format=\"embedded\" \n/>\n\n<!-- Use: -->\n<@fields.author @format=\"embedded\" />\n```\n\n**containsMany Spacing Pattern:** Due to an additional wrapper div, target `.containsMany-field`:\n```css\n/* For grids */\n.products-grid > .containsMany-field {\n  display: grid;\n  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));\n  gap: 1rem;\n}\n\n/* For lists */\n.items-list > .containsMany-field {\n  display: flex;\n  flex-direction: column;\n  gap: 0.75rem;\n}\n```\n\n## Template Fallback Value Patterns\n\n**CRITICAL:** Boxel cards boot with no data by default. Templates must gracefully handle null, undefined, and empty string values at ALL levels of data access to prevent runtime errors and provide meaningful visual fallbacks.\n\n### Three Primary Patterns for Fallbacks\n\n**1. Inline if/else (for simple display fallbacks):**\n```hbs\n<span>{{if @model.eventTime (formatDateTime @model.eventTime \"MMM D, h:mm A\") \"Event time to be announced\"}}</span>\n<h2>{{if @model.title @model.title \"Untitled Document\"}}</h2>\n<p>Status: {{if @model.status @model.status \"Status pending\"}}</p>\n```\n\n**2. Block-based if/else (for complex content):**\n```hbs\n<div class=\"event-time\">\n  {{#if @model.eventTime}}\n    <strong>{{formatDateTime @model.eventTime \"MMM D, h:mm A\"}}</strong>\n  {{else}}\n    <em class=\"placeholder\">Event time to be announced</em>\n  {{/if}}\n</div>\n\n{{#if @model.description}}\n  <div class=\"description\">\n    <@fields.description />\n  </div>\n{{else}}\n  <div class=\"empty-description\">\n    <p>No description provided yet. Click to add one.</p>\n  </div>\n{{/if}}\n```\n\n**3. Unless for safety/validation checks (composed with other helpers):**\n```hbs\n{{unless (and @model.isValid @model.hasPermission) \"⚠️ Cannot proceed - missing validation or permission\"}}\n{{unless (or @model.email @model.phone) \"Contact information required\"}}\n{{unless (gt @model.items.length 0) \"No items available\"}}\n{{unless (eq @model.status \"active\") \"Service unavailable\"}}\n```\n\n**Best Practices:** Use descriptive placeholder text rather than generic \"N/A\", style placeholder text differently (lighter color, italic), use `unless` for safety checks and `if` for display fallbacks.\n\n**Icon Usage:** Avoid emoji in templates (unless the application specifically calls for it) due to OS/platform variations that cause legibility issues. Use Boxel icons only for static card/field type icons (displayName properties). In templates, use inline SVG instead since we can't be sure which Boxel icons exist. **Note:** Avoid SVG `url(#id)` references (gradients, patterns) as Boxel cannot route these - use CSS styling instead.\n\n## Template Array Handling Patterns\n\n**CRITICAL:** Templates must gracefully handle all array states to prevent errors. Arrays can be undefined, null, empty, or populated.\n\n### The Three Array States\n\nYour templates must handle:\n1. **Completely undefined arrays** - Field doesn't exist or is null\n2. **Empty arrays** - Field exists but has no items (`[]`)\n3. **Arrays with actual data** - Field has one or more items\n\n### Array Logic Pattern\n\n**❌ WRONG - Only checks for existence:**\n```hbs\n{{#if @model.goals}}\n  <ul class=\"goals-list\">\n    {{#each @model.goals as |goal|}}\n      <li>{{goal}}</li>\n    {{/each}}\n  </ul>\n{{/if}}\n```\n\n**✅ CORRECT - Checks for length and provides empty state:**\n```hbs\n{{#if (gt @model.goals.length 0)}}\n  <div class=\"goals-section\">\n    <h4>\n      <svg class=\"section-icon\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\">\n        <circle cx=\"12\" cy=\"12\" r=\"10\"/>\n        <circle cx=\"12\" cy=\"12\" r=\"6\"/>\n        <circle cx=\"12\" cy=\"12\" r=\"2\"/>\n      </svg>\n      Daily Goals\n    </h4>\n    <ul class=\"goals-list\">\n      {{#each @model.goals as |goal|}}\n        <li>{{goal}}</li>\n      {{/each}}\n    </ul>\n  </div>\n{{else}}\n  <div class=\"goals-section\">\n    <h4>\n      <svg class=\"section-icon\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\">\n        <circle cx=\"12\" cy=\"12\" r=\"10\"/>\n        <circle cx=\"12\" cy=\"12\" r=\"6\"/>\n        <circle cx=\"12\" cy=\"12\" r=\"2\"/>\n      </svg>\n      Daily Goals\n    </h4>\n    <p class=\"empty-state\">No goals set yet. What would you like to accomplish?</p>\n  </div>\n{{/if}}\n```\n\n### Complete Array Handling Example with Required Spacing\n\n```gts\n<template>\n  {{#if (gt @model.teamMembers.length 0)}}\n    <section class=\"team-section\">\n      <h3>Team Members</h3>\n      <div class=\"team-container\">\n        <@fields.teamMembers @format=\"fitted\" />\n      </div>\n    </section>\n  {{else}}\n    <section class=\"team-section\">\n      <h3>Team Members</h3>\n      <div class=\"empty-state\">\n        <p>No team members added yet. Invite your first team member!</p>\n      </div>\n    </section>\n  {{/if}}\n  \n  <style scoped>\n    /* CRITICAL: Target .containsMany-field for proper spacing */\n    .team-container > .containsMany-field {\n      display: flex;\n      flex-direction: column;\n      gap: 0.75rem; /* Essential spacing between delegated items */\n    }\n    \n    .empty-state {\n      text-align: center;\n      padding: 1rem;\n      color: #6b7280;\n      font-style: italic;\n      font-size: 0.8125rem;\n    }\n  </style>\n</template>\n```\n\n**Remember:** When implementing templates via SEARCH/REPLACE, include tracking markers ⁿ for style blocks\n\n## Core Patterns\n\n### 1. Card Definition with Safe Computed Title\n```gts\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nimport { CardDef, field, contains, linksTo, containsMany, linksToMany, Component } from 'https://cardstack.com/base/card-api'; // ⁸ Core imports\nimport StringField from 'https://cardstack.com/base/string';\nimport DateField from 'https://cardstack.com/base/date';\nimport FileTextIcon from '@cardstack/boxel-icons/file-text'; // ⁹ icon import\nimport { Author } from './author';\n\nexport class BlogPost extends CardDef { // ¹⁰ Card definition\n  static displayName = 'Blog Post';\n  static icon = FileTextIcon;  // ✅ CORRECT: Boxel icons for static card/field type icons\n  static prefersWideFormat = true; // Optional: Only for dashboards/apps. Content cards (albums, listings) rarely need this.\n  \n  @field headline = contains(StringField); // ¹¹ Primary identifier - NOT 'title'!\n  @field publishDate = contains(DateField);\n  @field author = linksTo(Author);        // ¹² Reference to another card\n  @field tags = containsMany(TagField);   // ¹³ Multiple embedded fields\n  @field relatedPosts = linksToMany(() => BlogPost); // ¹⁴ Self-reference with arrow function\n  \n  // ¹⁵ Compute the inherited title from primary fields ONLY - keep it simple!\n  @field title = contains(StringField, {\n    computeVia: function(this: BlogPost) {\n      try {\n        const baseTitle = this.headline ?? 'Untitled Post';\n        const maxLength = 50;\n        \n        if (baseTitle.length <= maxLength) return baseTitle;\n        return baseTitle.substring(0, maxLength - 3) + '...';\n      } catch (e) {\n        console.error('BlogPost: Error computing title', e);\n        return 'Untitled Post';\n      }\n    }\n  });\n}\n```\n\n### WARNING: Do NOT Use Constructors for Default Values\n\n**CRITICAL:** Constructors should NOT be used for setting default values in Boxel cards. Use template fallbacks (if field is editable) or computeVia (only if field is strictly read-only) instead.\n\n```gts\n// ❌ WRONG - Never use constructors for defaults\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nexport class Todo extends CardDef {\n  constructor(owner: unknown, args: {}) {\n    super(owner, args);\n    this.createdDate = new Date(); // DON'T DO THIS\n    this.isCompleted = false;      // DON'T DO THIS\n  }\n}\n```\n\n### **CRITICAL: NEVER Create JavaScript Objects in Templates**\n\n**Templates are for simple display logic only.** Never call constructors, create objects, or perform complex operations in template expressions.\n\n```hbs\n<!-- ❌ WRONG: Creating objects in templates -->\n<span>{{if @model.currentMonth @model.currentMonth (formatDateTime (new Date()) \"MMMM YYYY\")}}</span>\n<div>{{someFunction(@model.data)}}</div>\n\n<!-- ✅ CORRECT: Move logic to JavaScript computed properties -->\n<span>{{if @model.currentMonth @model.currentMonth this.currentMonthDisplay}}</span>\n<div>{{this.processedData}}</div>\n```\n\n```gts\n// ✅ CORRECT: Define logic in JavaScript\nexport class MyCard extends CardDef { // ²⁴ Card definition\n  get currentMonthDisplay() {\n    return new Intl.DateTimeFormat('en-US', { \n      month: 'long', \n      year: 'numeric' \n    }).format(new Date());\n  }\n  \n  get processedData() {\n    return this.args.model?.data ? this.processData(this.args.model.data) : 'No data';\n  }\n  \n  private processData(data: any) {\n    // Complex processing logic here\n    return result;\n  }\n}\n```\n\n### 2. Field Definition (Always Include Embedded Template)\n\n**CRITICAL:** Every FieldDef file must import FieldDef and MUST be exported:\n\n```gts\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nimport { FieldDef, field, contains, Component } from 'https://cardstack.com/base/card-api'; // ¹⁶ Core imports\nimport StringField from 'https://cardstack.com/base/string';\nimport LocationIcon from '@cardstack/boxel-icons/map-pin'; // ¹⁷ icon import\n\n// Creating a new field from scratch\nexport class AddressField extends FieldDef { // ¹⁸ Field definition\n  static displayName = 'Address';\n  static icon = LocationIcon; // ✅ CORRECT: Boxel icons for static card/field type icons\n  \n  @field street = contains(StringField); // ¹⁹ Component fields\n  @field city = contains(StringField);\n  @field postalCode = contains(StringField);\n  @field country = contains(StringField);\n  \n  // ²⁰ Always create embedded template for FieldDefs\n  static embedded = class Embedded extends Component<typeof this> {\n    <template>\n      <div class=\"address\">\n        {{#if @model.street}}\n          <div><@fields.street /></div>\n        {{else}}\n          <div class=\"placeholder\">Street address not provided</div>\n        {{/if}}\n        \n        <div>\n          {{if @model.city @model.city \"City\"}}{{if @model.postalCode (concat \", \" @model.postalCode) \"\"}}\n        </div>\n        \n        {{#if @model.country}}\n          <div><@fields.country /></div>\n        {{else}}\n          <div class=\"placeholder\">Country not specified</div>\n        {{/if}}\n      </div>\n      \n      <style scoped> /* ²¹ Component styles */\n        /* Minimal styling for placeholders */\n        .placeholder {\n          font-style: italic;\n        }\n      </style>\n    </template>\n  };\n}\n\n// ✅ CORRECT: Extending a base field for customization\nimport BaseAddressField from 'https://cardstack.com/base/address';\n\nexport class EnhancedAddressField extends BaseAddressField { // ²⁵ Extended field\n  static displayName = 'Enhanced Address';\n  \n  // ²⁶ Add new fields to the base\n  @field apartment = contains(StringField);\n  @field instructions = contains(StringField);\n  \n  // ²⁷ Override templates as needed\n  static embedded = class Embedded extends Component<typeof this> {\n    <template>\n      <!-- Custom template that includes new fields -->\n    </template>\n  };\n}\n```\n\n### 3. Computed Properties with Safety\n\n**CRITICAL:** Avoid cycles and infinite recursion in computed fields.\n\n```gts\n// ❌ DANGEROUS: Self-reference causes infinite recursion\n@field title = contains(StringField, {\n  computeVia: function(this: BlogPost) {\n    return this.title || 'Untitled'; // ❌ Refers to itself - STACK OVERFLOW!\n  }\n});\n\n// ❌ DANGEROUS: Circular dependency between computed fields\n@field displayName = contains(StringField, {\n  computeVia: function(this: Person) {\n    return this.formattedName; // refers to formattedName\n  }\n});\n@field formattedName = contains(StringField, {\n  computeVia: function(this: Person) {\n    return `Name: ${this.displayName}`; // refers back to displayName - CYCLE!\n  }\n});\n\n// ✅ SAFE: Reference only base fields, keep it unidirectional\n@field fullName = contains(StringField, { // ²⁸ Computed field\n  computeVia: function(this: Person) {\n    try {\n      const first = this.firstName ?? '';\n      const last = this.lastName ?? '';\n      const full = `${first} ${last}`.trim();\n      return full || 'Name not provided';\n    } catch (e) {\n      console.error('Person: Error computing fullName', e);\n      return 'Name unavailable';\n    }\n  }\n});\n\n// ✅ SAFE: Computed title from primary fields only with error handling\n@field title = contains(StringField, { // ²⁹ Safe computed title\n  computeVia: function(this: BlogPost) {\n    try {\n      const headline = this.headline ?? 'Untitled Post';\n      const date = this.publishDate ? ` (${new Date(this.publishDate).getFullYear()})` : '';\n      return `${headline}${date}`;\n    } catch (e) {\n      console.error('BlogPost: Error computing title', { error: e, headline: this.headline });\n      return 'Untitled Post';\n    }\n  }\n});\n```\n\n### 4. Templates with Proper Computation Patterns\n\n**Remember:** When implementing templates via SEARCH/REPLACE, track all major sections with ⁿ and include the post-block notation `╰ ⁿ⁻ᵐ`\n\n```gts\nstatic isolated = class Isolated extends Component<typeof BlogPost> { // ³⁰ Isolated format\n  @tracked showComments = false;\n  \n  // ³¹ CRITICAL: Do ALL computation in functions, never in templates\n  get safeTitle() {\n    try {\n      return this.args?.model?.title ?? 'Untitled Post';\n    } catch (e) {\n      console.error('BlogPost: Error accessing title', e);\n      return 'Untitled Post';\n    }\n  }\n  \n  get commentButtonText() {\n    try {\n      const count = this.args?.model?.commentCount ?? 0;\n      return this.showComments ? `Hide Comments (${count})` : `Show Comments (${count})`;\n    } catch (e) {\n      console.error('BlogPost: Error computing comment button text', e);\n      return this.showComments ? 'Hide Comments' : 'Show Comments';\n    }\n  }\n  \n  toggleComments = () => {\n    this.showComments = !this.showComments;\n  }\n  \n  <template>\n    <!-- ³² Responsive Stage/Mat Pattern -->\n    <div class=\"stage\">\n      <article class=\"blog-post-mat\">\n        <header>\n          <time>{{if @model.publishDate (formatDateTime @model.publishDate 'MMMM D, YYYY') \"Date not set\"}}</time>\n          <h1>{{this.safeTitle}}</h1>\n          \n          {{#if @fields.author}}\n            <@fields.author />\n          {{else}}\n            <div class=\"author-placeholder\">Author not specified</div>\n          {{/if}}\n        </header>\n        \n        <div class=\"post-content\">\n          {{#if @model.body}}\n            <@fields.body />\n          {{else}}\n            <div class=\"content-placeholder\">\n              <p>No content has been written yet. Click to start writing!</p>\n            </div>\n          {{/if}}\n        </div>\n        \n        <!-- ³³ Handle arrays with REQUIRED spacing -->\n        {{#if (gt @model.tags.length 0)}}\n          <div class=\"tags-section\">\n            <h4>Tags</h4>\n            <div class=\"tags-container\">\n              <@fields.tags @format=\"atom\" />\n            </div>\n          </div>\n        {{/if}}\n        \n        {{#if (gt @model.commentCount 0)}}\n          <Button \n            @variant=\"ghost\" \n            class=\"comment-button\"\n            {{on 'click' this.toggleComments}}\n          >\n            <svg class=\"button-icon\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\">\n              <path d=\"M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z\"/>\n            </svg>\n            {{this.commentButtonText}}\n          </Button>\n        {{/if}}\n        \n        {{#if this.showComments}}\n          <section class=\"comments-section\">\n            <h3>Discussion</h3>\n            {{#if (gt @model.comments.length 0)}}\n              <div class=\"comments-container\">\n                <@fields.comments @format=\"embedded\" />\n              </div>\n            {{else}}\n              <p class=\"no-comments\">No comments yet. Be the first to share your thoughts!</p>\n            {{/if}}\n          </section>\n        {{/if}}\n      </article>\n    </div>\n    \n    <style scoped> /* ³⁴ Component styles */\n      /* Responsive Stage: Hide below 800px to save space */\n      .stage {\n        width: 100%;\n        height: 100%;\n        display: flex;\n        justify-content: center;\n        padding: 0.5rem;\n      }\n      \n      @media (max-width: 800px) {\n        .stage {\n          padding: 0;\n        }\n      }\n      \n      /* Mat: Content area - MUST be scrollable with generous padding */\n      .blog-post-mat {\n        max-width: 42rem;\n        width: 100%;\n        padding: 2rem; /* Generous padding for comfortable reading */\n        overflow-y: auto;\n        max-height: 100%;\n        font-size: 0.875rem;\n        line-height: 1.3;\n      }\n      \n      @media (max-width: 800px) {\n        .blog-post-mat {\n          max-width: none;\n          height: 100%;\n          padding: 1.5rem; /* Maintain comfortable padding on mobile */\n        }\n      }\n      \n      /* Within cards: tight, dense spacing and smaller fonts */\n      .post-header h1 {\n        font-size: 1.125rem;\n        margin-bottom: 0.5rem;\n        line-height: 1.2;\n      }\n      \n      .post-content {\n        font-size: 0.8125rem;\n        line-height: 1.25;\n      }\n      \n      /* ³⁵ CRITICAL: Always style buttons completely - never use unstyled */\n      .comment-button {\n        /* Style Boxel components to match your design */\n        padding: 0.5rem 0.75rem;\n        font-size: 0.8125rem;\n        display: inline-flex;\n        align-items: center;\n        gap: 0.375rem;\n      }\n      \n      .comment-button .button-icon {\n        width: 1rem;\n        height: 1rem;\n      }\n      \n      /* ³⁶ CRITICAL: Spacing for containsMany collections */\n      .tags-container > .containsMany-field {\n        display: flex;\n        flex-wrap: wrap;\n        gap: 0.25rem; /* Essential spacing between tags */\n      }\n      \n      .comments-container > .containsMany-field {\n        display: flex;\n        flex-direction: column;\n        gap: 0.75rem; /* Essential spacing between comments */\n      }\n    </style>\n  </template>\n};\n```\n\n## Design Philosophy and Competitive Styling\n\n**Design and implement your stylesheet to fit the domain you are generating.** Research the top 2 products/services in that area and design your card as if you are the 3rd competitor looking to one-up the market in terms of look and feel, functionality, and user-friendliness.\n\n**Approach:** Study the leading players' design patterns, then create something that feels more modern, intuitive, and polished. Focus on micro-interactions, thoughtful spacing, superior visual hierarchy, and removing friction from user workflows.\n\n**Key Areas to Compete On:**\n- **Visual Polish:** Better typography, spacing, and color schemes\n- **Interaction Design:** Smoother animations, better feedback, clearer affordances\n- **Information Architecture:** More logical organization, better progressive disclosure\n- **Accessibility:** Superior contrast, keyboard navigation, screen reader support\n- **Performance:** Faster loading, smoother animations, responsive design\n\n**Typography Guidance:** Always discern what typeface would be best for the specific domain. Don't default to Boxel or OS fonts - use proven and popular Google fonts whenever possible. \n\nChoose modern, readable fonts that match your design's personality. Clean sans-serifs like Inter, Roboto, Open Sans, Source Sans Pro, DM Sans, Work Sans, Manrope, or Plus Jakarta Sans work great for body text. For headings, consider geometric fonts (Montserrat, Space Grotesk, Raleway, Poppins), bold condensed options (Bebas Neue, Archivo Black, Oswald, Anton), or elegant serifs (Playfair Display, Lora, Merriweather, Crimson Text). Add character with rounded alternatives (Nunito, Comfortaa), industrial styles (Barlow, Righteous), or even scripts where appropriate (Pacifico, Dancing Script). The key is balancing readability with visual impact – pick fonts that enhance your content's tone while staying legible across all devices. Feel free to explore beyond these suggestions to find what best fits your design vision.\n\n\n## Design Token Foundation\n\n**Dense professional layouts with thoughtful scaling:**\n\n**Typography:** Start at 0.8125rem (13px) base, scale in small increments\n* Body: 0.8125rem, Labels: 0.875rem, Headings: 1rem-1.25rem\n\n**Spacing:** Tight but breathable, using 0.25rem (4px) increments\n* Inline: 0.25-0.5rem, Sections: 0.75-1rem, Major breaks: 1.5-2rem\n\n**Brand Customization:** Define your unique identity\n* Colors: Primary, secondary, accent, surface, text\n* Fonts: Choose domain-appropriate Google fonts (never default to system)\n* Radius: Match the aesthetic (sharp for technical, soft for friendly)\n\n**Font Selection:** Always choose fonts that match your domain's character. Use proven Google fonts that align with the emotional tone and professional context of your specific application.\n\n## CSS Safety Rules\n\n### Critical CSS Safety Rules\n\n**Scoped Styles:** ALWAYS use `<style scoped>` inside `<template>`. This prevents styles from leaking out.\n\n**CSS Comments:** **NEVER** use `//` single-line comments in CSS within `<style scoped>` tags. **ONLY** use `/* */` block comments. Single-line comments cause parsing errors that break rendering.\n\n```css\n/* ✅ CORRECT: Block comments */\n.my-component {\n  /* This is a proper CSS comment */\n  color: blue;\n}\n\n/* ❌ WRONG: Single-line comments break parsing */\n.my-component {\n  // This will cause errors!\n  color: blue;\n}\n```\n\n**AVOID GLOBAL CSS SELECTORS:** NEVER use `:root`, `:global`, or other global CSS selectors (like `body`, `html`, or global class selectors without component prefixes). In component-based systems like Boxel, all styles MUST be scoped to the component.\n\n```css\n/* ❌ INCORRECT - NEVER DO THIS */\n:root {\n  --primary-color: #007bff;\n  --spacing-unit: 8px;\n}\n\n/* ✅ CORRECT - ALWAYS SCOPE TO COMPONENT */\n.my-component {\n  --primary-color: #007bff;\n  --spacing-unit: 8px;\n}\n\n.my-component .child-element {\n  color: var(--primary-color);\n  margin-bottom: var(--spacing-unit);\n}\n```\n\n**Containment Principle:** NEVER use fixed or absolute positioning to create overlays, floating buttons, or toasts that extend beyond the card's boundaries. All UI elements must remain within their designated bounding box.\n\n**Z-Index Conservation:** Be conservative with z-index values. Keep them as low as possible (preferably under 10) since many elements of the Boxel system are overlays. High z-index values can interfere with Boxel's built-in overlays, modals, and dropdowns.\n\n```css\n/* ✅ CORRECT: Conservative z-index usage */\n.my-component .tooltip {\n  z-index: 1; /* Just enough to float above content */\n}\n\n.my-component .dropdown {\n  z-index: 2; /* Slightly higher for dropdowns */\n}\n\n/* ❌ WRONG: Excessive z-index values */\n.my-component .popup {\n  z-index: 9999; /* Will conflict with Boxel overlays! */\n}\n```\n\n### CSS Variable Scoping\n\n**Best Practice:** NEVER assume CSS variables exist; always define them in each template/format to ensure components work correctly in isolation.\n\n```css\n.card-component {\n  /* Define all variables at component root */\n  --card-padding: 1rem;\n  --card-radius: 0.5rem;\n  --card-shadow: 0 2px 4px rgba(0,0,0,0.1);\n  \n  /* Use with fallbacks */\n  padding: var(--card-padding, 1rem);\n  border-radius: var(--card-radius, 0.5rem);\n  box-shadow: var(--card-shadow, none);\n}\n```\n\n### Dynamic Styling with Field Values\n\nApply field values as CSS properties in Boxel components:\n\n**1. Inline style attributes:**\n```hbs\n<div style={{concat \"color: \" @model.textColor}}>Text content</div>\n```\n\n**2. Dynamic class names:**\n```hbs\n<div class={{concat \"theme-\" @model.colorTheme}}>Content</div>\n```\n\n**3. CSS custom properties (variables):**\n```hbs\n<div style={{concat \"--accent: \" @model.accentColor}}>\n  <h2 class=\"heading\">Title</h2>\n</div>\n```\n```css\n.heading {\n  color: var(--accent, #333); /* Default fallback */\n  border-bottom: 1px solid var(--accent, #333);\n}\n```\n\n**Complete ColorField Example:**\n```gts\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nimport { CardDef, field, contains, Component } from 'https://cardstack.com/base/card-api';\nimport StringField from 'https://cardstack.com/base/string';\nimport ColorField from 'https://cardstack.com/base/color';\nimport { concat } from '@ember/helper';\n\nexport class ColoredCard extends CardDef {\n  @field title = contains(StringField);\n  @field primaryColor = contains(ColorField);\n  \n  static isolated = class Isolated extends Component<typeof ColoredCard> {\n    <template>\n      <div class=\"card\" style={{concat \"--primary: \" @model.primaryColor}}>\n        <h2>{{@model.title}}</h2>\n      </div>\n      \n      <style scoped>\n        .card {\n          --primary: #ffffff; /* Default value */\n          background-color: var(--primary);\n          padding: 16px;\n          border-radius: 8px;\n        }\n        h2 { \n          color: var(--text-color, #000); \n        }\n      </style>\n    </template>\n  };\n}\n```\n\n### Advanced Dynamic CSS Patterns\n\n**Module-scoped CSS generators with sanitization:**\n\n```gts\nimport { htmlSafe } from '@ember/template';\nimport { sanitizeHtml } from '@cardstack/runtime-common';\n\n// Sanitization helper\nfunction sanitize(html: string) {\n  return htmlSafe(sanitizeHtml(html));\n}\n\n// Size helper\nconst setContainerSize = ({ width, height }) => {\n  return sanitize(`width: ${width}px; height: ${height}px`);\n};\n\n// Background image helper\nconst setBackgroundImage = (backgroundURL) => {\n  if (!backgroundURL) return;\n  return sanitize(`background-image: url(${backgroundURL});`);\n};\n\n// Complex styling helper\nconst setCardStyle = (model) => {\n  if (!model) return;\n  \n  const styles = [];\n  \n  if (model.cssVariables) styles.push(model.cssVariables);\n  if (model.borderStyle) styles.push(`border-style: ${model.borderStyle}`);\n  if (model.opacity) styles.push(`opacity: ${model.opacity}`);\n  if (model.transform) styles.push(`transform: ${model.transform}`);\n  \n  return styles.length ? sanitize(styles.join('; ')) : undefined;\n};\n```\n\n**Usage in templates - CRITICAL syntax:**\n```hbs\n<!-- ✅ CORRECT: Space-separated Handlebars syntax -->\n<div class=\"container\" style={{setContainerSize spec}} />\n<div class=\"bg-element\" style={{setBackgroundImage @model.backgroundURL}} />\n<div class=\"card\" style={{this.getThemeStyles \"header\"}} />\n\n<!-- ❌ INCORRECT: JavaScript-style parentheses -->\n<div class=\"card\" style={{this.getThemeStyles('header')}}></div>\n```\n\n**NEVER attempt dynamic values in `<style>` tags:**\n```hbs\n<style scoped>\n  /* ❌ INCORRECT - This does NOT work */\n  .container { \n    width: {{@model.width}}px; /* Will not be processed */\n  }\n</style>\n```\n\n### Common CSS Errors to Avoid\n\n1. **Not scoping styles** - Always use `<style scoped>`\n2. **Using `//` comments in CSS** - Only use `/* */`\n3. **Global selectors** - Never use `:root`, `:global`, `body`, etc.\n4. **Fixed positioning** - Keep everything within card boundaries\n5. **Missing CSS variable definitions** - Define all variables you use\n6. **No fallback values** - Always provide defaults: `var(--color, #default)`\n7. **Hardcoded pixels** - Use variables for consistency\n8. **Dynamic values in `<style>` tags** - Use style attributes instead\n9. **Excessive z-index values** - Keep under 10 to avoid conflicts with Boxel overlays\n\n## Creative Sample Data\n\n**Generate unique, believable scenarios for every creation.** Avoid lazy clichés and overused examples.\n\n**Sample Data Requirements:**\n* **Limit to 3 instances per card/field type** - unless more needed for template functionality\n* **Always randomize:** Use current prompt as seed - never repeat the same fictional cast\n* **Create depth:** Characters with believable backgrounds and authentic motivations\n* **Industry-specific:** Match the domain with appropriate terminology and scenarios\n* **Global perspective:** Mix cultural backgrounds, time zones, and locations\n* **Recent dates:** Use 2024/2025 for contemporary relevance\n\n## Generation Guidelines\n\n### Code Generation Limits\n\n**CRITICAL: Limit code generation to maximum 4500 lines total across all .gts definition files per user prompt, devoting about 1/3 of the lines to styling to ensure elevated design aesthetics.** Sample data (.json files) are excluded from this limit.\n\n**One-Shot Complexity Management:**\n- **1 primary CardDef** - The main interactive entity users will work with\n- **Additional CardDefs (max 2 more) ONLY if** implementing drill-down navigation via CardContainer pattern\n- **All other entities as FieldDefs** - Rich compound fields for embedded data\n- **This approach ensures:** Navigational simplicity, faster comprehension, easier evolution\n\n**CRITICAL: Use SEARCH and REPLACE blocks to edit or create .gts or .json files.** All code delivery must use the proper SEARCH/REPLACE syntax for file creation and modification. See Source Code Editing skill for general SEARCH/REPLACE mechanics.\n\n**Note:** If creating outside of an environment with Source Code Editing enabled, omit the SEARCH/REPLACE syntax and only return the content within the REPLACE block.\n\n**Prioritize:**\n- Complete, polished primary card implementation\n- Rich interactivity and state management\n- Professional styling with animations and transitions\n- Comprehensive empty states and error handling\n- Clear extension points for future development\n\n**Remember:** Include tracking markers ⁿ in all SEARCH/REPLACE blocks for .gts files\n\n## Boxel UI Helpers Reference\n\n### Logic & Comparison Helpers\n**Import:** `import { eq, gt, gte, lt, lte, and, or, not } from '@cardstack/boxel-ui/helpers';`\n\n- `{{eq a b}}` - Strict equality check\n- `{{gt a b}}` / `{{lt a b}}` - Greater/less than comparison  \n- `{{and val1 val2 ...}}` - All values truthy\n- `{{or val1 val2 ...}}` - Any value truthy\n- `{{not val}}` - Invert truthiness\n\n### Math Helpers\n**Import:** `import { add, subtract, multiply, divide } from '@cardstack/boxel-ui/helpers';`\n\n### 🎨 Boxel Formatters\n\n#### Overview: Template Helpers + JavaScript Functions\n\nThe advanced formatter system provides rich, locale-aware formatting that works **both as template helpers AND JavaScript functions**. This dual nature gives you maximum flexibility for internationalized display formatting.\n\n**Key Advantages over Basic Helpers:**\n\n- **Full internationalization** - Locale-aware formatting for global applications\n- **Size variants** - From `tiny` (1.2M) to `long` (1.2 million dollars)\n- **Smart formatting** - Relative time, humanized durations, cultural name ordering\n- **Dual usage** - Same formatter works in templates AND JavaScript\n- **Rich options** - Precision control, fallbacks, custom formats\n\n**Import:** `import {\n  formatDateTime,\n  formatCurrency,\n  formatNumber,\n  formatDuration,\n  formatList,\n  formatFileSize,\n  formatOrdinal,\n  formatAge,\n  formatCountdown,\n  formatNames,\n  formatPeriod,\n  formatRelativeTime\n} from '@cardstack/boxel-ui/helpers';`  \n\n#### Benefits of Formatter Helpers\n\n| Feature | Benefits |\n|---------|-------------------|\n| **Template Usage** | `{{formatDateTime date size=\"short\"}}` |\n| **JavaScript Usage** | `formatDateTime(date, { size: 'short' })` |\n| **Localization** | Full i18n support |\n| **Size Variants** | tiny, short, medium, long |\n| **Fallback Values** | Built-in fallback option |\n| **Smart Features** | Relative time, Excel dates, compact notation |\n\n#### Where to Use Formatters\n\n| Location | Usage | Example |\n|----------|-------|---------|\n| **Templates (Direct)** | ✅ Use as helpers | `{{formatCurrency @model.price currency=\"EUR\"}}` |\n| **Component Getters** | ✅ JavaScript functions | `get displayPrice() { return formatCurrency(this.args.model?.price); }` |\n| **Component Methods** | ✅ JavaScript functions | `formatUpdateTime(date) { return formatDateTime(date, { relative: true }); }` |\n| **NOT in computeVia** | ❌ Preserves field data type | Fields should contain raw data, not formatted strings |\n\n#### 📊 Complete Formatter API Reference\n\n**All formatters work as both template helpers and JavaScript functions.** The same parameters apply in both contexts.\n\n| Formatter | Purpose | Options | Size Variants | Special Features |\n|-----------|---------|---------|---------------|------------------|\n| **formatDateTime** | Dates & times | `size`, `format`, `relative`, `parse`, `locale`, `fallback` | **tiny**: \"3:45 PM\" or \"3/15\"<br>**short**: \"Today\" or \"Mar 15\"<br>**medium**: \"Mar 15, 2024\"<br>**long**: \"Friday, March 15, 2024\" | • Relative time (\"2 hours ago\")<br>• Excel serial dates<br>• Auto-detects current year |\n| **formatCurrency** | Money values | `currency`, `size`, `locale`, `fallback` | **tiny**: \"$1.2M\"<br>**short**: \"$1,235\"<br>**medium**: \"$1,234.56\"<br>**long**: \"1,234.56 US dollars\" | • Compact notation for large amounts<br>• Locale-specific symbols<br>• Multi-currency support |\n| **formatNumber** | Numbers & percentages | `style`, `size`, `minimumFractionDigits`, `maximumFractionDigits`, `locale`, `fallback` | **tiny**: \"1.2M\", \"15%\"<br>**short**: \"1,235\", \"15.6%\"<br>**medium**: \"1,234.56\"<br>**long**: \"1,234.5678\" | • Percentage formatting<br>• Compact notation<br>• Precision control |\n| **formatDuration** | Time spans | `unit`, `format`, `locale`, `fallback` | **humanize**: \"2 hours\"<br>**timer**: \"2:15:30\"<br>**short**: \"2h 15m\"<br>**long**: \"2 hours, 15 minutes\" | • Multiple input units<br>• Timer display format<br>• Human-friendly rounding |\n| **formatList** | Arrays to text | `style`, `type`, `locale`, `fallback` | **long**: \"A, B, and C\"<br>**short**: \"A, B, C\"<br>**narrow**: \"A B C\" | • Conjunction types<br>• Locale-aware separators<br>• Oxford comma support |\n| **formatFileSize** | Byte amounts | `binary`, `precision`, `locale`, `fallback` | N/A | • Binary (1024) vs decimal (1000)<br>• Auto-scaling units |\n| **formatOrdinal** | Ordinal numbers | `locale`, `fallback` | N/A | • Language-specific rules<br>• \"1st\", \"2nd\", \"3rd\", etc. |\n| **formatAge** | Age from birthdate | `unit`, `precise`, `locale`, `fallback` | **auto**: Smart unit selection<br>**years/months/days**: Force specific unit | • Precise mode: \"1 year, 3 months\"<br>• Auto-selects appropriate unit |\n| **formatCountdown** | Time until date | `showDays`, `showHours`, `showMinutes`, `showSeconds`, `locale`, `fallback` | N/A | • Configurable components<br>• \"Expired\" for past dates |\n| **formatNames** | Name formatting | `format`, `includeMiddle`, `separator`, `locale`, `fallback` | **full**: \"John Q. Smith\"<br>**initials**: \"J.Q.S.\"<br>**first-last**: \"John Smith\"<br>**last-first**: \"Smith, John\" | • Handles name objects or strings<br>• Cultural name orders |\n| **formatPeriod** | Time periods | `size`, `withRange`, `locale`, `fallback` | **tiny**: \"Q1\"<br>**short**: \"Q1 24\"<br>**long**: \"Quarter 1, 2024\" | • Quarter/month/week parsing<br>• Optional date ranges |\n| **formatRelativeTime** | Relative timestamps | `size`, `locale`, `fallback` | **tiny**: \"2h\", \"3d\"<br>**medium**: \"2 hours ago\" | • Compact abbreviations<br>• Auto-scaling units |\n\n### 📐 The Size System: Progressive Detail Levels\n\nThe size variants provide **progressive levels of detail** - from ultra-compact to fully spelled out. Think of it as a **responsive formatting system** that adapts to your available space and context.\n\n#### Core Size Philosophy\n\n| Size | Purpose | Use When |\n|------|---------|----------|\n| **tiny** | Ultra-compact, minimal space | Dashboards, grids, mobile, tooltips |\n| **short** | Abbreviated but clear | Lists, tables, cards |\n| **medium** | Standard, balanced detail | Default display, forms |\n| **long** | Full detail, maximum clarity | Detail views, reports, accessibility |\n\n#### Size Examples by Formatter\n\n#### Currency Sizing\n```javascript\nformatCurrency(1234567.89, { size: 'tiny' })   // \"$1.2M\"\nformatCurrency(1234567.89, { size: 'short' })  // \"$1,234,568\"\nformatCurrency(1234567.89, { size: 'medium' }) // \"$1,234,567.89\"\nformatCurrency(1234567.89, { size: 'long' })   // \"1,234,567.89 US dollars\"\n```\n**Pattern**: Tiny uses suffixes (K/M/B), short drops decimals, medium is standard, long spells out currency name.\n\n##### DateTime Sizing\n```javascript\n// For today at 3:45 PM:\nformatDateTime(date, { size: 'tiny' })   // \"3:45 PM\" (today) or \"3/15\" (other days)\nformatDateTime(date, { size: 'short' })  // \"Today\" or \"Mar 15\"\nformatDateTime(date, { size: 'medium' }) // \"Mar 15, 2024\"\nformatDateTime(date, { size: 'long' })   // \"Friday, March 15, 2024\"\n```\n**Pattern**: Tiny is contextual, short uses human terms, medium drops redundant info, long shows everything.\n\n##### Number Sizing\n```javascript\nformatNumber(1234567, { size: 'tiny' })   // \"1.2M\"\nformatNumber(1234567, { size: 'short' })  // \"1,234,567\"\nformatNumber(1234567, { size: 'medium' }) // \"1,234,567.00\"\n\n// Percentages\nformatNumber(0.156, { style: 'percent', size: 'tiny' })   // \"16%\"\nformatNumber(0.156, { style: 'percent', size: 'short' })  // \"15.6%\"\nformatNumber(0.156, { style: 'percent', size: 'medium' }) // \"15.60%\"\n```\n**Pattern**: Tiny compacts large numbers, short removes decimals, medium/long show precision.\n\n#### Smart Size Selection Patterns\n\n```gts\n// ⁽⁴⁸⁾ Adaptive sizing based on value magnitude\nget priceDisplay() {\n  const price = this.args.model?.price;\n  \n  // Use tiny for millions+, short for thousands, medium for rest\n  const size = price > 1000000 ? 'tiny' : \n               price > 1000 ? 'short' : \n               'medium';\n  \n  return formatCurrency(price, { size });\n}\n\n// ⁽⁴⁹⁾ Responsive sizing based on display context\nget dateDisplay() {\n  const isCompact = this.args.format === 'fitted' || this.args.format === 'atom';\n  \n  return formatDateTime(this.args.model?.date, {\n    size: isCompact ? 'tiny' : 'medium'\n  });\n}\n\n// ⁽⁵⁰⁾ Template example with conditional sizing\n<template>\n  {{#if this.isGridView}}\n    <!-- Compact for grid -->\n    {{formatCurrency @model.revenue size=\"tiny\"}}\n    {{formatDateTime @model.lastUpdate size=\"tiny\"}}\n  {{else}}\n    <!-- Standard for list/detail -->\n    {{formatCurrency @model.revenue size=\"medium\"}}\n    {{formatDateTime @model.lastUpdate size=\"medium\"}}\n  {{/if}}\n</template>\n```\n\n#### Size Selection Guidelines\n\n| Context | Recommended Size | Example Output |\n|---------|-----------------|----------------|\n| **Dashboard tiles** | tiny | \"$2.3M\", \"15.2K\", \"3d\" |\n| **Data tables** | short | \"$2,345\", \"Mar 15\", \"15.6%\" |\n| **Form fields** | medium | \"$2,345.67\", \"March 15, 2024\" |\n| **Detail pages** | long | \"2,345.67 US dollars\", \"Friday, March 15, 2024\" |\n| **Mobile screens** | tiny/short | Compact formats save space |\n| **Accessibility mode** | long | Fully spelled out for clarity |\n| **Tooltips** | tiny | Minimal space usage |\n| **Reports/Printing** | medium/long | Professional appearance |\n\n#### Best Practices for Size Selection\n\n1. **Be consistent** - Use the same size for similar data in a view\n2. **Consider density** - Tiny for high-density displays, long for spacious layouts  \n3. **Progressive disclosure** - Show tiny by default, long on hover/focus\n4. **Test at extremes** - Ensure tiny is readable, long doesn't overflow\n5. **Match the format** - `fitted` and `atom` formats should use tiny/short\n\n**Key Insight**: The size system is about **information density**, not importance. Even \"tiny\" formats should convey the essential information clearly.\n\n#### 🎯 Direct Template Usage (Primary Pattern)\n\nThe formatters work directly in templates as helpers, making internationalized formatting incredibly simple:\n\n```gts\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁽ⁿ⁾ ═══\nimport { Component } from 'https://cardstack.com/base/card-api'; // ⁽¹⁾\nimport {\n  formatDateTime,\n  formatCurrency,\n  formatNumber,\n  formatDuration,\n  formatList,\n  formatFileSize,\n  formatOrdinal,\n  formatAge,\n  formatCountdown,\n  formatNames,\n  formatPeriod,\n  formatRelativeTime\n} from '@cardstack/boxel-ui/helpers'; // ⁽²⁾ Import enables template helpers\n\nexport class InvoiceCard extends CardDef { // ⁽⁴⁾\n  static embedded = class Embedded extends Component<typeof this> {\n    <template>\n      <div class=\"invoice\">\n        <!-- ⁽⁵⁾ Direct template usage with parameters -->\n        <div class=\"amount\">\n          {{formatCurrency @model.totalAmount currency=\"USD\" size=\"medium\"}}\n        </div>\n        \n        <!-- Relative time formatting -->\n        <div class=\"due-date\">\n          Due: {{formatDateTime @model.dueDate relative=true fallback=\"Not set\"}}\n        </div>\n        \n        <!-- ⁽⁷⁾ Multiple formatters with conditions -->\n        <div class=\"discount\">\n          {{#if @model.discountRate}}\n            Save {{formatNumber @model.discountRate style=\"percent\" size=\"short\"}}\n            ({{formatCurrency @model.discountAmount currency=\"USD\"}})\n          {{else}}\n            No discount applied\n          {{/if}}\n        </div>\n        \n        <!-- ⁽⁸⁾ Compact notation for large numbers -->\n        <div class=\"stats\">\n          {{formatNumber @model.viewCount size=\"tiny\"}} views\n          • Updated {{formatRelativeTime @model.lastModified size=\"tiny\"}}\n        </div>\n        \n        <!-- Duration formatting -->\n        <div class=\"payment-terms\">\n          {{formatDuration @model.paymentTermDays unit=\"days\" format=\"humanize\"}}\n        </div>\n      </div>\n    </template>\n  };\n}\n```\n\n##@## Template Helper Syntax Examples\n\n```hbs\n<!-- Basic usage -->\n{{formatCurrency @model.price}}\n\n<!-- With named parameters -->\n{{formatCurrency @model.price currency=\"EUR\" size=\"tiny\"}}\n\n<!-- Boolean parameters -->\n{{formatDateTime @model.date relative=true}}\n\n<!-- Using hash for nested options -->\n{{formatDateTime @model.excelDate parse=(hash serialOrigin=\"excel1900\")}}\n\n<!-- Multiple parameters -->\n{{formatCountdown @model.eventDate showDays=true showHours=true showSeconds=false}}\n\n<!-- With fallback values -->\n{{formatAge @model.birthdate unit=\"auto\" precise=true fallback=\"Age unknown\"}}\n\n<!-- String parameters with spaces -->\n{{formatDuration @model.seconds format=\"long\" fallback=\"No duration\"}}\n```\n\n#### 💻 JavaScript Usage Examples\n\n##### In Component Getters (Most Common)\n\n```gts\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁽ⁿ⁾ ═══\nimport { Component } from 'https://cardstack.com/base/card-api'; // ⁽¹⁾\nimport { formatDateTime, formatCurrency, formatNumber } from '@cardstack/boxel-ui/helpers'; // ⁽²⁾\n\nexport class ProductCard extends CardDef { // ⁽³⁾\n  static isolated = class Isolated extends Component<typeof this> { // ⁽⁴⁾\n    // ⁽⁵⁾ Format for display in template\n    get priceDisplay() {\n      return formatCurrency(this.args.model?.price, {\n        currency: this.args.model?.currency || 'USD',\n        size: 'medium',\n        locale: navigator.language,\n        fallback: 'Price not set'\n      });\n    }\n    \n    // ⁽⁶⁾ Smart relative time\n    get lastUpdatedText() {\n      return formatDateTime(this.args.model?.updatedAt, {\n        relative: true,\n        locale: 'en-US',\n        fallback: 'Never updated'\n      });\n    }\n    \n    // ⁽⁷⁾ Percentage with custom precision\n    get discountText() {\n      return formatNumber(this.args.model?.discountRate, {\n        style: 'percent',\n        minimumFractionDigits: 0,\n        maximumFractionDigits: 1,\n        fallback: 'No discount'\n      });\n    }\n    \n    <template>\n      <div class=\"product-card\">\n        <h3>{{@model.name}}</h3>\n        <div class=\"price\">{{this.priceDisplay}}</div>\n        <div class=\"discount\">{{this.discountText}} off!</div>\n        <footer>Updated {{this.lastUpdatedText}}</footer>\n      </div>\n    </template>\n  };\n}\n```\n\n##### Handling Special Cases\n\n```gts\n// ⁽⁸⁾ Excel date serial numbers\nget excelDateDisplay() {\n  return formatDateTime(this.args.model?.serialDate, {\n    parse: { \n      serialOrigin: 'excel1900' // or 'excel1904' for Mac Excel\n    },\n    size: 'medium',\n    fallback: 'Invalid date'\n  });\n}\n\n// ⁽⁹⁾ Multi-locale team dashboard\nget memberAgeDisplay() {\n  const member = this.args.model;\n  return formatAge(member?.birthdate, {\n    unit: 'auto',        // Smart: \"25 years\" or \"6 months\" \n    precise: true,       // Shows \"25 years, 3 months\"\n    locale: member?.preferredLocale || 'en-US',\n    fallback: 'Age unknown'\n  });\n}\n\n// ⁽¹⁰⁾ Large number compacting\nget viewCountDisplay() {\n  const views = this.args.model?.views;\n  \n  // Auto-compact based on size\n  return formatNumber(views, {\n    size: views > 10000 ? 'tiny' : 'short',  // \"1.2M\" or \"1,234\"\n    locale: 'en-US',\n    fallback: '0 views'\n  });\n}\n\n// ⁽¹¹⁾ Timer display with configurable precision\nget elapsedTimeDisplay() {\n  return formatDuration(this.args.model?.elapsedSeconds, {\n    unit: 'seconds',\n    format: this.args.model?.showPreciseTime ? 'timer' : 'humanize',\n    fallback: 'Not started'\n  });\n  // Precise: \"1:45:23\"\n  // Human: \"2 hours\"\n}\n```\n\n##### Locale-Aware Formatting\n\n```gts\n// ⁽¹²⁾ Smart locale detection with fallback chain\nexport class GlobalDashboard extends CardDef {\n  static isolated = class Isolated extends Component<typeof this> {\n    get userLocale() {\n      return this.args.model?.userPreferences?.locale  // 1. User preference\n        || this.args.context?.locale                   // 2. App context\n        || navigator.language                          // 3. Browser\n        || 'en-US';                                   // 4. Fallback\n    }\n    \n    // ⁽¹³⁾ Currency with user's locale\n    get revenueDisplay() {\n      return formatCurrency(this.args.model?.revenue, {\n        currency: this.args.model?.currency || 'USD',\n        size: this.args.model?.revenue > 1000000 ? 'tiny' : 'medium',\n        locale: this.userLocale,\n        fallback: '—'\n      });\n    }\n    \n    // ⁽¹⁴⁾ List formatting respects locale\n    get contributorList() {\n      const names = this.args.model?.contributors || [];\n      \n      return formatList(names, {\n        type: 'conjunction',    // \"and\" separator\n        style: 'long',         \n        locale: this.userLocale, // \"A, B y C\" in Spanish\n        fallback: 'No contributors'\n      });\n    }\n  };\n}\n```\n\n##### Advanced Formatting Patterns\n\n```gts\n// ⁽¹⁵⁾ Conditional formatting based on value\nget fileSizeDisplay() {\n  const bytes = this.args.model?.fileSize;\n  \n  if (!bytes) return 'No file';\n  \n  // Show more precision for smaller files\n  return formatFileSize(bytes, {\n    binary: true,                    // Use KiB, MiB, etc.\n    precision: bytes < 1024 ? 0 : 2, // \"512 B\" or \"1.45 MiB\"\n    fallback: 'Unknown size'\n  });\n}\n\n// ⁽¹⁶⁾ Countdown with dynamic components\nget eventCountdown() {\n  const eventDate = this.args.model?.eventDate;\n  const now = new Date();\n  const msUntilEvent = new Date(eventDate).getTime() - now.getTime();\n  const daysUntil = Math.floor(msUntilEvent / (1000 * 60 * 60 * 24));\n  \n  return formatCountdown(eventDate, {\n    showDays: true,\n    showHours: daysUntil < 7,     // Show hours in final week\n    showMinutes: daysUntil < 1,   // Show minutes on final day\n    showSeconds: daysUntil === 0, // Show seconds on event day\n    fallback: 'Date not set'\n  });\n}\n\n// ⁽¹⁷⁾ Name formatting with cultural awareness\nget authorDisplay() {\n  const author = this.args.model?.author;\n  \n  return formatNames(author, {\n    format: author?.culture === 'eastern' ? 'last-first' : 'first-last',\n    includeMiddle: author?.showMiddleName !== false,\n    separator: author?.culture === 'eastern' ? '' : ' ',\n    locale: author?.locale || 'en-US',\n    fallback: 'Anonymous'\n  });\n}\n\n// ⁽¹⁸⁾ Period formatting with ranges\nget quarterDisplay() {\n  const period = this.args.model?.fiscalQuarter; // \"Q2 2024\"\n  \n  const result = formatPeriod(period, {\n    size: 'long',        // \"Q2 2024 (Apr - Jun)\"\n    withRange: true,     // Returns object with date range\n    fallback: 'No period'\n  });\n  \n  // If withRange: { text: \"Q2 2024 (Apr - Jun)\", range: { start: Date, end: Date } }\n  return typeof result === 'string' ? result : result.text;\n}\n```\n\n#### 🎯 Common Patterns\n\n##### Dashboard Metrics\n```gts\n// ⁽¹⁹⁾ Complete metrics formatting\nexport class MetricsDashboard extends CardDef {\n  static embedded = class Embedded extends Component<typeof this> {\n    get metrics() {\n      const locale = navigator.language || 'en-US';\n      const data = this.args.model;\n      \n      return {\n        revenue: formatCurrency(data?.revenue, {\n          size: data?.revenue > 1000000 ? 'tiny' : 'short',\n          currency: 'USD',\n          locale,\n          fallback: '$0'\n        }),\n        growth: formatNumber(data?.growthRate, {\n          style: 'percent',\n          size: 'short',\n          minimumFractionDigits: 1,\n          locale,\n          fallback: '0%'\n        }),\n        users: formatNumber(data?.activeUsers, {\n          size: 'tiny',  // Auto-compacts: \"15.2K\"\n          locale,\n          fallback: '0'\n        }),\n        uptime: formatDuration(data?.uptimeSeconds, {\n          format: 'humanize',\n          unit: 'seconds',\n          fallback: 'Unknown'\n        }),\n        updated: formatRelativeTime(data?.lastSync, {\n          size: 'tiny',  // \"5m\" instead of \"5 minutes ago\"\n          locale,\n          fallback: 'Never'\n        })\n      };\n    }\n    \n    <template>\n      <div class=\"metrics\">\n        <div class=\"metric\">\n          <span class=\"label\">Revenue</span>\n          <span class=\"value\">{{this.metrics.revenue}}</span>\n          <span class=\"growth\">{{this.metrics.growth}}</span>\n        </div>\n        <div class=\"metric\">\n          <span class=\"label\">Active Users</span>\n          <span class=\"value\">{{this.metrics.users}}</span>\n        </div>\n        <div class=\"metric\">\n          <span class=\"label\">Uptime</span>\n          <span class=\"value\">{{this.metrics.uptime}}</span>\n        </div>\n        <footer>Updated {{this.metrics.updated}}</footer>\n      </div>\n    </template>\n  };\n}\n```\n\n#### 📊 Complete Template Examples\n\nThe formatter helpers demonstrate the full range of template helper usage:\n\n```hbs\n<!-- Currency: All size variants -->\n{{formatCurrency @model.amount}}                                  <!-- Default: $1,234.56 -->\n{{formatCurrency @model.amount currency=\"EUR\" size=\"tiny\"}}      <!-- Compact: €1.2M -->\n{{formatCurrency @model.amount currency=\"EUR\" size=\"short\"}}     <!-- No decimals: €1,235 -->\n{{formatCurrency @model.amount currency=\"EUR\" size=\"medium\"}}    <!-- Standard: €1,234.56 -->\n{{formatCurrency @model.amount currency=\"EUR\" size=\"long\"}}      <!-- Spelled out: 1,234.56 euros -->\n\n<!-- DateTime: Flexible display options -->\n{{formatDateTime @model.date size=\"tiny\"}}                        <!-- 3:45 PM or 3/15 -->\n{{formatDateTime @model.date size=\"short\"}}                       <!-- Today or Mar 15 -->\n{{formatDateTime @model.date size=\"medium\"}}                      <!-- Mar 15, 2024 -->\n{{formatDateTime @model.date size=\"long\"}}                        <!-- Friday, March 15, 2024 -->\n{{formatDateTime @model.date relative=true}}                      <!-- 2 hours ago -->\n{{formatDateTime @model.date format=\"YYYY-MM-DD\"}}                <!-- 2024-03-15 -->\n{{formatDateTime @model.excelSerial parse=(hash serialOrigin=\"excel1900\")}} <!-- From Excel -->\n\n<!-- Numbers: Decimal and percentage -->\n{{formatNumber @model.value}}                                      <!-- 1,234.56 -->\n{{formatNumber @model.value size=\"tiny\"}}                          <!-- 1.2K -->\n{{formatNumber @model.rate style=\"percent\"}}                      <!-- 12.35% -->\n{{formatNumber @model.rate style=\"percent\" size=\"tiny\"}}          <!-- 12% -->\n{{formatNumber @model.value minimumFractionDigits=4}}             <!-- 1,234.5600 -->\n\n<!-- Duration: Multiple formats -->\n{{formatDuration @model.seconds}}                                  <!-- 2 hours (humanized) -->\n{{formatDuration @model.seconds format=\"timer\"}}                   <!-- 2:15:30 -->\n{{formatDuration @model.seconds format=\"short\"}}                   <!-- 2h 15m 30s -->\n{{formatDuration @model.seconds format=\"long\"}}                    <!-- 2 hours, 15 minutes, and 30 seconds -->\n{{formatDuration @model.milliseconds unit=\"milliseconds\"}}         <!-- Convert from ms -->\n\n<!-- Lists: Proper conjunctions -->\n{{formatList @model.items}}                                        <!-- Apple, Banana, and Cherry -->\n{{formatList @model.items type=\"disjunction\"}}                    <!-- Apple, Banana, or Cherry -->\n{{formatList @model.items type=\"unit\"}}                            <!-- Apple, Banana, Cherry -->\n{{formatList @model.items style=\"narrow\"}}                         <!-- Apple Banana Cherry -->\n\n<!-- File sizes: Binary vs decimal -->\n{{formatFileSize @model.bytes}}                                    <!-- 1.45 MiB (default binary) -->\n{{formatFileSize @model.bytes binary=false}}                      <!-- 1.52 MB (decimal) -->\n{{formatFileSize @model.bytes precision=0}}                        <!-- 1 MiB -->\n{{formatFileSize @model.bytes precision=3}}                        <!-- 1.445 MiB -->\n\n<!-- Special formatters -->\n{{formatOrdinal @model.position}}                                  <!-- 1st, 2nd, 3rd, 21st -->\n{{formatAge @model.birthdate}}                                     <!-- 25 years -->\n{{formatAge @model.birthdate precise=true}}                        <!-- 25 years, 3 months -->\n{{formatCountdown @model.eventDate}}                               <!-- 3 days, 14 hours, 25 minutes, 10 seconds -->\n{{formatCountdown @model.eventDate showSeconds=false}}            <!-- 3 days, 14 hours, 25 minutes -->\n{{formatNames @model.person format=\"initials\"}}                    <!-- J.Q.A. -->\n{{formatNames @model.person format=\"last-first\"}}                  <!-- Adams, John Quincy -->\n{{formatPeriod \"Q1 2024\" size=\"long\"}}                            <!-- Quarter 1, 2024 -->\n{{formatRelativeTime @model.timestamp size=\"tiny\"}}                <!-- 5m, 2h, 3d -->\n```\n\n#### ⚠️ Important Notes\n\n1. **Dual usage** - Works as both template helpers AND JavaScript functions\n2. **Template syntax** - Use named parameters: `{{formatCurrency @model.price currency=\"EUR\"}}`\n3. **Always provide fallbacks** - Handle null/undefined gracefully\n4. **Size matters** - Use compact sizes in grids, full sizes in details\n5. **Respect user locale** - Check user preferences before browser defaults\n6. **Don't use in computeVia** - Keep field data in its raw form\n7. **Import enables both modes** - Destructuring formatters makes them available as template helpers\n\n**Remember:** Formatters enhance display without changing your data structure!\n\n### Utility Helpers\n**Import:** `import { cn, optional, pick } from '@cardstack/boxel-ui/helpers';`\n\n**Class Names (cn):**\n```hbs\n<div class={{cn \"base-class\" (hash active=@model.isActive error=@model.hasError)}}>\n```\n\n**Optional Actions:**\n```hbs\n<Button @onClick={{optional @onSave}}>Save</Button>\n```\n\n**Event Value Extraction:**\n```hbs\n<input {{on \"input\" (pick \"target.value\" @updateValue)}}>\n```\n\n## Defensive Programming in Boxel Components\n\n**CRITICAL:** Prevent runtime errors by safely handling undefined/null values and malformed data. Cards boot with no data by default - every component must handle completely empty state gracefully.\n\n### Essential Defensive Patterns\n\n#### Always Use Optional Chaining (`?.`)\n```js\n// ❌ UNSAFE: Will throw if model is undefined\nif (this.args.model.completedDays.includes(day)) { ... }\n\n// ✅ SAFE: Optional chaining prevents errors\nif (this.args?.model?.completedDays?.includes(day)) { ... }\n```\n\n#### Provide Default Values (`??`)\n```js\n// ❌ UNSAFE: May result in NaN\nreturn this.args.model.progress + 10;\n\n// ✅ SAFE: Default value prevents NaN\nreturn (this.args?.model?.progress ?? 0) + 10;\n```\n\n#### Try-Catch for Network of Cards\nWhen accessing data across card relationships, always wrap in try-catch to handle missing or malformed data:\n\n```js\n// ³⁷ In computed properties or methods\nget authorDisplayName() {\n  try {\n    const author = this.args?.model?.author;\n    if (!author) {\n      console.warn('BlogPost: No author assigned');\n      return 'Unknown Author';\n    }\n    \n    const name = author.name || author.title;\n    if (!name) {\n      console.warn('BlogPost: Author exists but has no name', { authorId: author.id });\n      return 'Unnamed Author';\n    }\n    \n    return name;\n  } catch (error) {\n    console.error('BlogPost: Error accessing author data', {\n      error,\n      postId: this.args?.model?.id,\n      authorData: this.args?.model?.author\n    });\n    return 'Author Unavailable';\n  }\n}\n\n// ³⁸ In template getters\nget relatedPostsSummary() {\n  try {\n    const posts = this.args?.model?.relatedPosts;\n    if (!Array.isArray(posts)) {\n      return 'No related posts';\n    }\n    \n    return posts\n      .filter(post => post?.title) // Skip malformed entries\n      .map(post => post.title)\n      .join(', ') || 'No related posts';\n      \n  } catch (error) {\n    console.error('BlogPost: Failed to process related posts', error);\n    return 'Related posts unavailable';\n  }\n}\n```\n\n#### Validate Arrays Before Operations\n```js\n// ❌ UNSAFE: May throw if not an array\nconst sorted = this.completedDays.sort((a, b) => a - b);\n\n// ✅ SAFE: Check existence and type first\nif (!Array.isArray(this.completedDays) || !this.completedDays.length) {\n  return [];\n}\nconst sorted = [...this.completedDays].sort((a, b) => a - b);\n```\n\n**Key Principles:** \n- Assume data might be missing, null, or the wrong type\n- Provide meaningful fallbacks for user display\n- Log errors with context for debugging (include IDs, data state)\n- Never let malformed data crash your UI\n\n## Advanced Patterns\n\n### Delegated Rendering: Making Cards Talk To Each Other\n\n**What is Delegated Rendering?** Boxel's superpower that lets you embed one card inside another while preserving each card's own styling and behavior. Creates truly composable interfaces where each component maintains its identity while seamlessly integrating into larger contexts.\n\n**CRITICAL:** Always use `<@fields.entity />` for delegation, even for singular fields (not `<@field.entity />`).\n\n**DESIGN CONSISTENCY:** When delegating from a custom-designed template, ensure the delegated card/field's format has matching design aesthetics. Mismatched styles create jarring user experiences.\n\n```gts\n// ³⁹ If your parent card has a modern, minimal design with specific colors/fonts...\nstatic isolated = class Isolated extends Component<typeof this> {\n  <template>\n    <div class=\"modern-container\">\n      <!-- The author card's embedded format should match this aesthetic -->\n      <@fields.author @format=\"embedded\" />\n    </div>\n    <style scoped>\n      .modern-container {\n        font-family: 'Inter', sans-serif;\n        background: #f8fafc;\n        border-radius: 12px;\n      }\n    </style>\n  </template>\n};\n\n// ⁴⁰ Then the Author card should have complementary styling:\nexport class Author extends CardDef {\n  static embedded = class Embedded extends Component<typeof this> {\n    <template>\n      <div class=\"author-card\">\n        <!-- Matching the parent's design language -->\n      </div>\n      <style scoped>\n        .author-card {\n          font-family: 'Inter', sans-serif;  /* Same font */\n          background: white;                  /* Complementary color */\n          border-radius: 8px;                 /* Consistent radius style */\n        }\n      </style>\n    </template>\n  };\n}\n```\n\n#### Delegation Patterns\n\n```gts\n<template>\n  <!-- ⁴¹ Single card rendering - still use @fields -->\n  <div class=\"author-section\">\n    {{#if @fields.author}}\n      <@fields.author />\n    {{else}}\n      <div class=\"author-placeholder\">No author assigned</div>\n    {{/if}}\n  </div>\n  \n  <!-- ⁴² Collection with REQUIRED custom spacing -->\n  {{#if (gt @model.relatedPosts.length 0)}}\n    <div class=\"posts-container\">\n      <@fields.relatedPosts @format=\"embedded\" />\n    </div>\n  {{/if}}\n  \n  <style scoped>\n    /* Target .containsMany-field due to wrapper div */\n    .posts-container > .containsMany-field {\n      display: flex;\n      flex-direction: column;\n      gap: 0.75rem;  /* REQUIRED: Spacing between items */\n    }\n  </style>\n</template>\n```\n\n### Avoiding Relationship Cycles\n\n**Problem:** Bidirectional `linksTo` relationships create circular dependencies that complicate indexing and can cause infinite recursion.\n\n**Solution:** Use canonical (one-way) links + dynamic queries for reverse relationships.\n\n#### Pattern: Canonical Links + Dynamic Queries\n\n1. **Define canonical links** - Choose the primary direction in your schema:\n```gts\n// Employee owns the supervisor relationship\nexport class Employee extends CardDef {\n  @field supervisor = linksTo(() => Employee);\n  @field department = linksTo(Department);\n}\n\n// Department owns the manager relationship\nexport class Department extends CardDef {\n  @field manager = linksTo(Employee);\n}\n```\n\n2. **Use dynamic queries for reverse relationships** - Fetch at runtime instead of schema links:\n```gts\n// Get direct reports dynamically (in Employee component)\nget directReportsQuery(): Query {\n  return {\n    filter: {\n      on: { module: './employee', name: 'Employee' },\n      eq: { supervisor: this.args.model.id }\n    }\n  };\n}\n\n// Use with getCards or PrerenderedCardSearch\ndirectReports = this.args.context?.getCards(this, () => this.directReportsQuery, () => this.realms);\n```\n\n**Key Principle:** Model the simplest set of unidirectional links that define core relationships. Use queries for derived views, aggregations, and inverse relationships.\n\n### BoxelSelect: Smart Dropdown Menus\n\nRegular HTML selects are limited to plain text. BoxelSelect lets you create rich, searchable dropdowns with custom rendering.\n\n#### Pattern: Rich Select with Custom Options\n\n```gts\nexport class OptionField extends FieldDef { // ⁴³ Option field for select\n  static displayName = 'Option';\n  \n  @field key = contains(StringField);\n  @field label = contains(StringField);\n  @field description = contains(StringField);\n\n  static embedded = class Embedded extends Component<typeof this> {\n    <template>\n      <div class=\"option-display\">\n        <strong>{{if @model.label @model.label \"Unnamed Option\"}}</strong>\n        <span>{{if @model.description @model.description \"No description\"}}</span>\n      </div>\n    </template>\n  };\n}\n\nexport class ProductCategory extends CardDef { // ⁴⁴ Card using BoxelSelect\n  @field selectedCategory = contains(OptionField);\n  \n  static edit = class Edit extends Component<typeof this> { // ⁴⁵ Edit format\n    @tracked selectedOption = this.args.model?.selectedCategory;\n\n    options = [\n      { key: '1', label: 'Electronics', description: 'Phones, computers, and gadgets' },\n      { key: '2', label: 'Clothing', description: 'Fashion and apparel' },\n      { key: '3', label: 'Home & Garden', description: 'Furniture and decor' }\n    ];\n\n    updateSelection = (option: typeof this.options[0] | null) => {\n      this.selectedOption = option;\n      this.args.model.selectedCategory = option ? new OptionField(option) : null;\n    }\n\n    <template>\n      <FieldContainer @label=\"Product Category\">\n        <BoxelSelect\n          @selected={{this.selectedOption}}\n          @options={{this.options}}\n          @onChange={{this.updateSelection}}\n          @searchEnabled={{true}}\n          @placeholder=\"Select a category...\"\n          as |option|\n        >\n          <div class=\"option-item\">\n            <span>{{option.label}}</span>\n            <span>{{option.description}}</span>\n          </div>\n        </BoxelSelect>\n      </FieldContainer>\n    </template>\n  };\n}\n```\n\n### Custom Edit Controls\n\nCreate user-friendly edit controls that accept natural input. Hide complexity in expandable sections while keeping ALL properties editable and inspectable.\n\n```gts\n// Example: Natural language time period input\nstatic edit = class Edit extends Component<typeof this> {\n  @tracked showDetails = false;\n  \n  @action parseInput(value: string) {\n    // Parse \"Q1 2025\" → quarter: 1, year: 2025, startDate: Jan 1, endDate: Mar 31\n    // Parse \"April 2025\" → month: 4, year: 2025, startDate: Apr 1, endDate: Apr 30\n  }\n  \n  <template>\n    <FieldContainer @label=\"Time Period\">\n      <input placeholder=\"e.g., Q1 2025 or April 2025\" {{on 'blur' this.parseInput}} />\n    </FieldContainer>\n    \n    <Button {{on 'click' (toggle 'showDetails' this)}}>\n      {{if this.showDetails \"Hide\" \"Show\"}} Details\n    </Button>\n    \n    {{#if this.showDetails}}\n      <!-- Show all parsed values for verification -->\n      <!-- Allow manual override of auto-parsed results -->\n      <!-- Provide controls for each field property -->\n    {{/if}}\n  </template>\n};\n```\n\n## Query System: Finding and Displaying Cards\n\n### The 'on' Property Rule (MEMORIZE THIS)\n\n**When using filters beyond basic type search, MUST include `on` as sibling:**\n\n```typescript\n// ❌ WRONG - Will fail\n{ range: { price: { lte: 100 } } }\n\n// ✅ CORRECT - 'on' specifies card type\n{ \n  on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n  range: { price: { lte: 100 } } \n}\n\n// ✅ EXCEPTION - Simple eq after type filter\n{ \n  every: [\n    { type: { module: new URL('./task', import.meta.url).href, name: 'Task' } },\n    { eq: { status: \"active\" } }  // No 'on' needed immediately after type\n  ]\n}\n```\n\n### Query Quick Reference\n\n#### Filter Types & 'on' Requirements\n| Filter | Needs 'on'? | Example |\n|--------|-------------|---------|\n| `type` | No | `{ type: { module: '...', name: 'Product' } }` |\n| `eq` | Yes* | `{ on: {...}, eq: { status: \"active\" } }` |\n| `contains` | Yes | `{ on: {...}, contains: { tags: \"urgent\" } }` |\n| `range` | Yes | `{ on: {...}, range: { price: { gte: 100 } } }` |\n| `every` | No | `{ every: [...] }` (AND) |\n| `any` | No | `{ any: [...] }` (OR) |\n| `not` | No | `{ not: { eq: {...} } }` |\n\n*Only when not directly after type filter\n\n#### Range Operators\n`gt` (>) `gte` (>=) `lt` (<) `lte` (<=)\n\n#### Module & Realm Rules\n```typescript\n// ✅ ALWAYS absolute URLs\n{ module: new URL('./product', import.meta.url).href, name: 'Product' }\n\n// ✅ Realms need trailing slash\n'https://app.boxel.ai/sarah/projects/'  // ✅\n'https://app.boxel.ai/sarah/projects'   // ❌\n```\n\n### ⚠️ CRITICAL: The 'on' Attribute is MANDATORY\n\n**Missing 'on' will lead to no results shown!** When using:\n- `eq`, `contains`, `range` filters (except immediately after type filter)\n- `sort` on type-specific fields (anything beyond base fields like id, createdAt)\n\n```typescript\n// ❌ WILL FAIL - Missing 'on' for sort\n{ \n  sort: [{ by: \"price\", direction: \"desc\" }]\n}\n\n// ✅ CORRECT - Include 'on' for type-specific fields\n{ \n  sort: [{ \n    by: \"price\", \n    on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n    direction: \"desc\" \n  }]\n}\n```\n\n### Complete Query Pattern\n\n```typescript\nconst query: Query = {\n  filter: {\n    every: [  // AND\n      { type: { module: new URL('./product', import.meta.url).href, name: 'Product' } },\n      { \n        any: [  // OR\n          { on: { module: new URL('./product', import.meta.url).href, name: 'Product' }, eq: { category: \"laptop\" } },\n          { on: { module: new URL('./product', import.meta.url).href, name: 'Product' }, eq: { category: \"tablet\" } }\n        ]\n      },\n      { \n        on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n        range: { \n          price: { gte: 100, lte: 2000 },  // Multiple conditions\n          rating: { gte: 4 }\n        }\n      },\n      { \n        on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n        contains: { features: \"wireless\" }\n      },\n      {\n        on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n        not: { eq: { status: \"discontinued\" } }  // Exclude\n      }\n    ]\n  },\n  sort: [\n    { by: \"createdAt\", direction: \"desc\" },  // General field\n    { \n      by: \"warranty\",  // Type-specific needs 'on'\n      on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n      direction: \"desc\" \n    }\n  ],\n  page: { number: 0, size: 20 }\n};\n```\n\n### Decision: PrerenderedCardSearch vs getCards\n\n```\nDisplay cards as-is? → PrerenderedCardSearch\nNeed live updates? → PrerenderedCardSearch with @isLive={{true}}\nNeed to sort/filter/aggregate AFTER retrieval? → getCards\nNeed raw data access? → getCards\n```\n\n## PrerenderedCardSearch Pattern\n\n```gts\n// ⁴⁹ Component with dynamic query\nexport class Dashboard extends Component {\n  get urgentTasksQuery(): Query {\n    return {\n      filter: {\n        every: [\n          { type: { module: new URL('./task', import.meta.url).href, name: 'Task' } },\n          { \n            on: { module: new URL('./task', import.meta.url).href, name: 'Task' },\n            not: { eq: { status: \"completed\" } }\n          }\n        ]\n      },\n      sort: [{ by: \"dueDate\", direction: \"asc\" }],\n      page: { number: 0, size: 10 }\n    };\n  }\n\n  realms = ['https://app.boxel.ai/sarah/tasks/'];  // Trailing slash!\n\n  <template>\n    {{#let (component @context.prerenderedCardSearchComponent) as |PrerenderedCardSearch|}}\n      <PrerenderedCardSearch\n        @query={{this.urgentTasksQuery}}\n        @format=\"embedded\"\n        @realms={{this.realms}}\n        @isLive={{true}}\n      >\n        <:loading>\n          <div class=\"skeleton-grid\">Loading...</div>\n        </:loading>\n        \n        <:response as |cards|>\n          {{#if (gt cards.length 0)}}\n            <div class=\"tasks-container\">\n              {{#each cards key=\"url\" as |card|}}\n                {{#unless card.isError}}\n                  <card.component />\n                {{else}}\n                  <div class=\"error\">Failed: {{card.url}}</div>\n                {{/unless}}\n              {{/each}}\n            </div>\n          {{else}}\n            <div class=\"empty\">No urgent tasks!</div>\n          {{/if}}\n        </:response>\n      </PrerenderedCardSearch>\n    {{/let}}\n    \n    <style scoped> /* ⁵⁰ Container layout only */\n      .tasks-container {\n        display: flex;\n        flex-direction: column;\n        gap: 0.75rem;\n      }\n    </style>\n  </template>\n}\n```\n\n### Making Query Results Clickable\n\n```gts\n// ⁵¹ Wrap with CardContainer for navigation\n<:response as |cards|>\n  <ul class=\"results\">\n    {{#each cards key=\"url\" as |card|}}\n      <li>\n        <CardContainer\n          {{@context.cardComponentModifier\n            cardId=card.url\n            format='data'\n            fieldType=undefined\n            fieldName=undefined\n          }}\n          @displayBoundaries={{true}}\n        >\n          <card.component />\n        </CardContainer>\n      </li>\n    {{/each}}\n  </ul>\n</:response>\n```\n\n## getCards Pattern (Data Manipulation)\n\n```gts\n// ⁵² Direct assignment for data access\ncardsResult = this.args.context?.getCards(\n  this,\n  () => this.query,\n  () => this.realms,\n  { isLive: true }\n);\n\n// ⁵³ Post-retrieval sorting\nget sortedByRevenue() {\n  const products = this.cardsResult?.instances ?? [];\n  return [...products].sort((a, b) => {\n    const scoreA = (a.revenue || 0) * (a.rating || 1);\n    const scoreB = (b.revenue || 0) * (b.rating || 1);\n    return scoreB - scoreA;\n  });\n}\n\n// ⁵⁴ Aggregation\nget totalRevenue() {\n  return this.cardsResult?.instances?.reduce((sum, p) => sum + (p.revenue || 0), 0) || 0;\n}\n```\n\n\n## Creating Fitted Formats - The Four Sub-formats Strategy\n\nFitted Formats are unique part of the Boxel Architecture in that it allows a version of a card or a field that fit into any slot (width and height up to 600px) allocated by a parent container, so as to support listing, gallery, chooser, even 3D sprites usage without the parent knowing anything about this card's or field's schema or template other than its ID.\n\nTo create fitted formats that automatically adapt to any container size, implement four responsive subformats within a single fitted template. This pattern ensures your cards look perfect whether displayed as tiny badges or full-width cards. While the platform provides a fallback fitted format for CardDefs, custom implementation is strongly recommended for optimal display. For FieldDefs, fitted format is optional as embedded format is the primary requirement.\n\n### Core Concept\n\nYou only have one fitted template so that the resulting parent template only needs to give a size they want to display and you will provide the best layout given that space.\n\nTo do that, create 4 subformats and turn on only one at a time. Create 4 divs inside the fitted template and use container queries to turn them on and off. Make sure there are no gaps where no subformat is active.\n\nFitted format shouldn't have borders, that is drawn by parent.\n\n**RECOMMENDED:** Every CardDef should implement a custom fitted format for optimal display. While the platform provides a fallback, custom fitted formats ensure your cards look their best in galleries, grids, choosers, and dashboards.\n\n**Key Implementation Points:**\n- **CardDef:** Custom fitted format recommended (platform provides fallback)\n- **FieldDef:** Embedded format mandatory, fitted format optional\n- Create 4 divs inside the fitted template (badge, strip, tile, card)\n- Use container queries to show only the appropriate subformat\n- CRITICAL: Ensure no gaps where no subformat is active - all sizes must be handled\n- Fitted format shouldn't have borders (drawn by parent)\n\n### Container Size Decision Tree\n\n```\nContainer Size\n    │\n    ├─ Height < 170px (Horizontal)\n    │   │\n    │   ├─ Width ≤ 150px → BADGE\n    │   │   • 150×40  (micro)\n    │   │   • 150×65  (small)\n    │   │   • 150×105 (large) ← optimize\n    │   │\n    │   └─ Width > 150px → STRIP\n    │       • 250×40  (single)\n    │       • 250×65  (double)\n    │       • 250×105 (triple)\n    │       • 400×65  (wide double) ← optimize\n    │       • 400×105 (wide triple)\n    │\n    └─ Height ≥ 170px (Vertical)\n        │\n        ├─ Width < 400px → TILE\n        │   • 150×170 (narrow)\n        │   • 170×250 (grid) ← optimize\n        │   • 250×170 (wide)\n        │   • 250×275 (large)\n        │\n        └─ Width ≥ 400px → CARD\n            • 400×170 (compact)\n            • 400×275 (standard) ← optimize\n            • 400×445 (expanded)\n```\n\n#### Design Philosophy\n\n**First design the IDEAL layout for each subformat at the \"optimized for\" size.** Think of each subformat as if you were making 4 independent templates, each perfect for its specific use case.\n\n**Height Quantum:** The height breakpoints (40px, 65px, 105px, etc.) follow golden ratio progression (φ ≈ 1.618), creating natural visual harmony as formats scale.\n\n**Golden Ratio Usage:** Apply the golden ratio (1.618:1) throughout your layouts - for splits, spacing progressions, content zones, and visual balance. This mathematical harmony creates inherently pleasing proportions.\n\n**Typography Hierarchy:** Create clear visual distinction between text levels:\n- **Size cascade:** Each level 80-87% of the previous (1em → 0.875em → 0.75em)\n- **Weight cascade:** Drop 100-200 font-weight units per level (600 → 500 → 400)\n- **Spacing cascade:** Buffer between levels follows 50% → 37.5% → 25% pattern\n- **Same-level spacing:** Use 25% of the element's font size\n\n**Qualities for All Fitted Formats:**\n- **Well-balanced** - Every element positioned with intention\n- **On-brand** - Visually polished and consistent\n- **Scannable** - Clear indicators, easy to parse\n- **Small multiples** - Differences pop in collections\n- **Clickable** - Inviting interaction (cards only)\n- **Complete** - Show key data within constraints\n- **Familiar yet superior** - Match expectations, execute better\n- **Identifier visible** - Never obscure with entrance animations\n- **Clear hierarchy** - Primary/secondary/tertiary distinct\n\n### Content Priority Guidelines\n\nSuggested priority order - adjust for your use case:\n\n1. **Title/Name** - Primary identifier\n2. **Image** - Visual identity \n3. **Short ID** - SKU, username, ticket #\n4. **Key Info** - Dates, stats, linked entities\n5. **Badge/Status** - Visual indicators\n6. **Key-Value Metadata** - Show complete pairs only\n7. **Description** - Low priority, line-clamp aggressively\n8. **CTA** - Hover/focus only in tiles\n\n**For FieldDefs:** Since fitted format is optional, focus on embedded format first. If implementing fitted: priorities shift since there's no click-through. Show most important data within space constraints - composite identity plus critical values.\n\n**Examples:**\n- **Inventory:** SKU/status may outrank title\n- **Analytics:** Numbers take precedence\n- **Tasks:** Due date/assignee before description\n\n### Container Query Skeleton\n\n```css\n.fitted-container {\n  container-type: size;\n  width: 100%;\n  height: 100%;\n}\n\n/* Hide all by default */\n.badge-format, .strip-format, .tile-format, .card-format {\n  display: none;\n  width: 100%;\n  height: 100%;\n  /* CRITICAL: Clear space prevents edge bleeding - scales with container size */\n  padding: clamp(0.1875rem, 2%, 0.625rem);  /* 3px min → 10px max */\n  box-sizing: border-box;\n}\n\n/* Micro containers: absolute minimum safe padding */\n@container (max-width: 80px) and (max-height: 80px) {\n  .badge-format { \n    padding: 0.1875rem; /* 3px - visual safety minimum */\n  }\n}\n\n/* Small containers: tight but safe */\n@container (max-width: 150px) {\n  .badge-format, .strip-format { \n    padding: 0.25rem; /* 4px - small but comfortable */\n  }\n}\n\n/* Medium containers: breathing room */\n@container (min-width: 250px) and (max-width: 399px) {\n  .tile-format {\n    padding: 0.5rem; /* 8px - standard spacing */\n  }\n}\n\n/* Large containers: generous clear space */\n@container (min-width: 400px) {\n  .card-format {\n    padding: clamp(0.5rem, 2%, 0.625rem); /* 8px → 10px max for expanded */\n  }\n}\n\n/* Activation ranges - NO GAPS */\n@container (max-width: 150px) and (max-height: 169px) {\n  .badge-format { display: flex; }\n}\n\n@container (min-width: 151px) and (max-height: 169px) {\n  .strip-format { display: flex; }\n}\n\n@container (max-width: 399px) and (min-height: 170px) {\n  .tile-format { display: flex; flex-direction: column; }\n}\n\n@container (min-width: 400px) and (min-height: 170px) {\n  .card-format { display: flex; flex-direction: column; }\n}\n\n/* Compact card: horizontal split at golden ratio */\n@container (min-width: 400px) and (height: 170px) {\n  .card-format { \n    flex-direction: row;\n    gap: 1rem;\n  }\n  .card-format > * {\n    display: flex;\n    flex-direction: column;\n  }\n  .card-format > *:first-child { flex: 1.618; }\n  .card-format > *:last-child { flex: 1; }\n}\n\n/* Background fills respect padding for visual safety */\n.badge-format.has-fill,\n.strip-format.has-fill,\n.tile-format.has-fill,\n.card-format.has-fill {\n  background: var(--fill-color);\n  /* Background extends to edge but content stays within padding */\n  background-clip: padding-box; /* Or border-box if fill should reach edge */\n}\n\n/* Type hierarchy - MANDATORY */\n.primary-text {\n  font-size: 1em;\n  font-weight: 600;\n  color: var(--text-primary, rgba(0,0,0,0.95));\n  line-height: 1.2;\n}\n\n.secondary-text {\n  font-size: 0.875em; /* 87.5% of primary */\n  font-weight: 500;\n  color: var(--text-secondary, rgba(0,0,0,0.85));\n  line-height: 1.3;\n}\n\n.tertiary-text {\n  font-size: 0.75em; /* 75% of primary */\n  font-weight: 400;\n  color: var(--text-tertiary, rgba(0,0,0,0.7));\n  line-height: 1.4;\n}\n\n/* Typography Hierarchy Spacing Heuristics */\n/* Primary → Secondary: 0.5em gap (half the primary size) */\n/* Secondary → Tertiary: 0.375em gap */\n/* Same level elements: 0.25em gap */\n\n.primary-text + .secondary-text {\n  margin-top: 0.5em;\n}\n\n.secondary-text + .tertiary-text {\n  margin-top: 0.375em;\n}\n\n.primary-text + .primary-text,\n.secondary-text + .secondary-text {\n  margin-top: 0.25em;\n}\n\n/* Visual hierarchy multipliers:\n   - Size: Each level ~80-87% of previous\n   - Weight: Drop 100-200 units per level\n   - Opacity: Drop 10-15% per level\n   - Spacing: 50% → 37.5% → 25% of primary size */\n```\n\n### Subformat-Specific Rules\n\n**Design with familiar patterns** - Users know these formats from daily app usage. Meet their expectations, then exceed them with better spacing, smoother interactions, and superior visual polish. Doing something expected is good - just do it better.\n\n**Badge Format:**\n- Feels like exportable graphics\n- **Familiar from:** Slack badges, GitHub labels\n- 150×105 has 3 vertical elements\n- Fills/backgrounds extend to edges, content respects padding\n- **LEFT align always** - right elements balance\n- **Images:** Iconified 16-34px\n- **Heights:**\n  - 40px: Title + icon horizontal only (or composite field identity)\n  - 65px: Title + icon/ID stacked, single lines\n  - 105px: Title + icon + status, magnetic edges\n- Use formatters for compact display\n- **For FieldDefs:** Show composite identity + key details\n- **Typography example at 105px:**\n  - Primary title: 14px (0.875rem)\n  - Secondary ID: 12px with 7px gap from title\n  - Tertiary status: 10px with 5px gap from ID\n\n**Strip Format:**\n- **Primary use:** Dropdown and chooser panels where users scan and select\n- **Familiar from:** VS Code command palette, Spotlight search, Notion quick switcher\n- Optimized for quick scanning and selection - every pixel matters\n- **Title/identifier MUST ALWAYS be visible** - no animations, overlays, or effects that obscure it\n- Never use hover effects that hide or transform the identifier\n- Right-justify elements in wider strips\n- **Left aligned - no exceptions**\n- **Images:** \n  - 40px height: Same as badge (20-34px) for consistency\n  - 65px+ height: Standard size (40px)\n- **Height requirements:**\n  - 40px: Title + key stat horizontally ONLY - single line, images 20-34px (same as badge)\n  - 65px: Two single lines stacked vertically - NO wrapping within lines, images 40px\n  - 105px: Three rows with magnetic edge spacing, images 40px\n- Abbreviate metadata, keep primary identity full\n\n**Tile Format:**\n- Standard vertical card layout\n- Optimize for grid viewing\n- Primary identity MUST be fully visible and prominent - no exceptions\n- The last vertical element MUST magnetically stick to the bottom\n\n**Card Format:**\n- Compact card (400×170) is split horizontally once at the golden ratio, then content within each panel is organized vertically\n- All other cards larger than compact card should be vertically subdivided\n- Expanded card is the full card with more data on the bottom\n- Expanded card MUST use all available vertical space - empty space is failure\n- The last vertical element MUST magnetically stick to the bottom\n\n### CTA Placement\n- **CardDef tile subformats only** (not FieldDefs)\n- Show on hover/focus only\n- Can obscure other content when shown\n- Lowest priority\n\n### Fitted Formats for FieldDefs (Optional)\n\n**IMPORTANT:** Fitted formats are optional for FieldDefs. FieldDefs require embedded format (with natural height) and that should be your primary focus. Only create fitted formats when your field might be displayed in fixed-size containers.\n\nWhen implementing fitted formats for FieldDefs, they require a different approach than CardDefs because they lack inherent identity and have no click-through capability.\n\n**Key Difference from CardDef Fitted:**\n- **CardDef fitted:** Shows identity + key info → click for details\n- **FieldDef fitted:** Shows most important data that fits (still space-constrained)\n\n**Creating Field Identity:**\nSince fields don't have clear identity like cards, create a composite identifier by combining 1-3 most important data points. For example:\n- Address field: Street + City\n- Price field: Amount + Currency + Trend\n- Contact field: Name + Primary method\n- Date range: Start + Duration + Status\n\n**Content Priority Shift:**\nBecause users can't click through to see more, fitted formats for fields should:\n- Show the most important data that fits the space\n- Prioritize key identifiers and critical values\n- Include essential metadata over nice-to-have details\n- Use composite identity from 1-3 key data points\n- Remember: still space-constrained like card fitted formats\n\n**Visual Field Handling:**\nFor image-based or visually-oriented compound fields:\n- Make the image/visual element primary (fill most space)\n- Overlay metadata on top with appropriate contrast\n- Use scrims or backdrop shadows for text legibility (except on precise visual content)\n- Consider the image as the \"identity\" with data as support\n- **CRITICAL:** For color fields, charts, or data visualizations, avoid scrims/overlays that alter perception\n\n**Example implementations:**\n- **Location field:** Map thumbnail with address overlay\n- **Chart field:** Visualization fills space, key metrics on corners (no scrim)\n- **Media field:** Thumbnail/preview large, metadata badge overlay\n- **Color field:** Swatch as background, hex/rgb values on top (pure color, no overlay)\n\n```css\n/* Example: Visual field with overlay metadata */\n.field-tile-format.visual-field {\n  position: relative;\n  padding: clamp(0.1875rem, 2%, 0.5rem); /* Clear space scales with container */\n}\n\n.field-tile-format .visual-primary {\n  width: 100%;\n  height: 100%;\n  object-fit: cover;\n  border-radius: 0.25rem; /* Subtle radius prevents harsh edges */\n}\n\n.field-tile-format .metadata-overlay {\n  position: absolute;\n  bottom: clamp(0.1875rem, 2%, 0.5rem); /* Match container padding */\n  left: clamp(0.1875rem, 2%, 0.5rem);\n  right: clamp(0.1875rem, 2%, 0.5rem);\n  padding: 0.5rem;\n  background: linear-gradient(to top, \n    rgba(0,0,0,0.8) 0%, \n    rgba(0,0,0,0) 100%);\n  color: white;\n  border-radius: 0.25rem;\n}\n\n/* Non-visual fields show more detail */\n.field-badge-format {\n  padding: clamp(0.1875rem, 2%, 0.375rem); /* Clear space for badges */\n}\n\n.field-badge-format .composite-identity {\n  font-weight: 600;\n  margin-bottom: 0.25rem;\n}\n\n.field-badge-format .field-details {\n  font-size: 0.75rem;\n  opacity: 0.9;\n}\n```\n\n### Visual Guidelines\n\n#### Icons\n- Incorporate subtly with appropriate size/weight\n- Visual support only - include after key content\n\n#### Images\n- Priority 2 - show after primary identifier\n- **Badge:** Always iconified (16-34px)\n- **Strip:** \n  - 40px height: 20-34px (matches badge)\n  - 65px height: Fixed 40px\n  - 105px height: Can fill height with AR constraint in wide strips (250px+)\n- **Tile:** Background with vibrant scrim if image would obscure text (except for visually precise content)\n- **Tile/Card:** Apply shared scale budget with text\n- Aspect ratios 0.7-1.4 unless decorative\n- Never completely displace text\n- **For visual FieldDefs:** Image can be primary with metadata overlay\n\n**Scrim effects:** Use accent colors for vibrant overlays. Mix brand colors with dark gradients: purple-to-black, blue-to-indigo-to-black, or accent-with-opacity layers. **CRITICAL:** Never apply scrims to visually precise content (color swatches, charts, data visualizations, medical imagery) as they alter perception and compromise accuracy.\n\n**Animation restraint:** Never use animations that move content near edges - can expose accidental borders. Strips especially need static, predictable layouts for scanning.\n\n#### 105px Height Magnetic Edge Layout\n\nAt 105px, use `justify-content: space-between` to push three elements to top/middle/bottom edges, maximizing visual separation.\n\n### Key Implementation Details\n\n1. **CardDef Fitted:** Custom recommended (fallback exists)\n2. **FieldDef Requirements:** Embedded mandatory, fitted optional\n3. **Container Queries:** `container-type: size`\n4. **No Gaps:** Cover all sizes\n5. **Line Clamping:** Match height constraints\n6. **Scaling:** `clamp()` ±20-25%\n7. **Height Use:** Fill 40/65/105px fully\n8. **40px:** Horizontal only\n9. **105px:** `justify-content: space-between`\n10. **Strip IDs:** Always visible\n11. **Clear Space:** 3px min to 1rem max\n12. **Type Hierarchy:** Size/weight/spacing cascades (80-87% per level)\n13. **Data Shaping:** Use formatters\n14. **Priority:** Key-values > descriptions\n15. **Badge Images:** 16-34px scaling\n16. **Strip Images:** Match badge at 40px, larger at 65px+, AR-fill at 105px wide\n17. **Scale Budget:** 50% shared text/image\n18. **Font Scaling:** Smaller = smaller base\n19. **Key-Values:** Complete pairs only\n20. **Familiar Patterns:** Match expectations\n21. **Edge Fills:** Backgrounds full, content padded\n22. **Vibrant Scrims:** Accent colors\n23. **No Edge Animations:** Prevent border exposure\n24. **FieldDef Identity:** Composite 1-3 key data points for recognition\n25. **Visual Precision:** No scrims on color/chart/data viz content\n\n\n\n## CRITICAL Reminders\n\n1. **PrerenderedCardSearch returns components, not data** - Can't sort/filter after\n2. **Type-specific sort fields MUST have 'on'** - Missing 'on' = no results shown!\n3. **Empty arrays need length check** - `(gt @model.items.length 0)`\n4. **Query result spacing** - Use `.container > .containsMany-field` pattern\n5. **Always use absolute module URLs** - `new URL(...).href`\n\n### Using getCards for Data Access and Aggregation\n\nWhen you need full access to card data for calculations, aggregations, or custom processing, use the `getCards` API from context.\n\n#### Basic getCards Pattern\n\n```gts\n// ❌ WRONG: Don't import getCards - it's just a type definition\n// import { getCards } from '@cardstack/runtime-common';\n\n// ✅ CORRECT: Use getCards from context\n// With live updates (for dashboards)\ncardsResult = this.args.context?.getCards(\n  this,\n  () => this.query,\n  () => this.realmHrefs,\n  { isLive: true }\n);\n\n// For one-time load (omit isLive)\ncardsResult = this.args.context?.getCards(\n  this,\n  () => this.query,\n  () => this.realmHrefs\n);\n```\n\n#### Working with getCards Results\n\n```gts\n// getCards returns: { instances, isLoading, instancesByRealm }\ncardsResult = this.args.context?.getCards(\n  this,\n  () => this.storyQuery,\n  () => this.realmHrefs,\n);\n\n// Frontend sorting/filtering\nget sortedCards() {\n  const cards = this.cardsResult?.instances ?? [];\n  return [...cards].sort((a, b) => b.rating - a.rating);\n}\n\n<template>\n  {{#if this.cardsResult.isLoading}}\n    <div class=\"loading-state\">Loading cards...</div>\n  {{else if (gt this.cardsResult.instances.length 0)}}\n    <ul class=\"cards-list\">\n      {{#each this.sortedCards as |card|}}\n        <li>{{card.title}} - {{card.rating}}</li>\n      {{/each}}\n    </ul>\n  {{else}}\n    <div class=\"empty-state\">No cards found</div>\n  {{/if}}\n</template>\n```\n\n#### Map/Reduce Aggregation Patterns\n\n**Note:** These patterns load all matching cards into memory, so use sparingly for large datasets.\n\n**RULE: Make aggregated stats real** - When showing totals, averages, or counts in templates, calculate them from actual data using aggregation functions, not hardcoded placeholders.\n\n```gts\n// Calculate totals using reduce\nget totalValue() {\n  if (!this.cardsResult?.instances) return 0;\n  return this.cardsResult.instances.reduce((sum, card) => {\n    return sum + (card.value || 0);\n  }, 0);\n}\n\n// Group by category\nget groupedByCategory() {\n  if (!this.cardsResult?.instances) return {};\n  return this.cardsResult.instances.reduce((groups, card) => {\n    const category = card.category || 'Uncategorized';\n    groups[category] = groups[category] || [];\n    groups[category].push(card);\n    return groups;\n  }, {});\n}\n\n// Multiple metrics in one pass\nget metrics() {\n  if (!this.cardsResult?.instances) return null;\n  \n  return this.cardsResult.instances.reduce((acc, card) => {\n    acc.total += card.amount || 0;\n    acc.count += 1;\n    acc.byStatus[card.status] = (acc.byStatus[card.status] || 0) + 1;\n    if (card.priority === 'high') acc.highPriority += 1;\n    return acc;\n  }, {\n    total: 0,\n    count: 0,\n    byStatus: {},\n    highPriority: 0\n  });\n}\n```\n\n**Performance Considerations:**\n- For simple counts, use the type summaries API instead\n- PrerenderedCardSearch is better for display-only needs\n- Only use getCards when you need complex calculations\n- Consider pagination for large datasets\n\n### CardContainer: Making Cards Clickable\n\nTransforms cards into interactive, clickable elements for viewing or editing, complete with visual chrome. When used with the `cardComponentModifier`, it enables users to click through to view or edit the wrapped card.\n\n#### Usage\n\n```gts\n<template>\n  {{#if (gt @model.members.length 0)}}\n    <div class=\"members-grid\">\n      {{#each @fields.members as |member|}}\n        <CardContainer   \n            {{@context.cardComponentModifier\n            cardId=member.url\n            format='data'\n            fieldCategories=undefined\n            fieldName=undefined\n            }}\n            @displayBoundaries={{true}}>\n          <member @format=\"fitted\" />\n        </CardContainer>\n      {{/each}}\n    </div>\n  {{/if}}\n  \n  <style scoped>\n    .members-grid {\n      display: grid;\n      grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));\n      gap: 12px;\n    }\n    \n    /* If using containsMany delegation instead of manual iteration */\n    .members-container > .containsMany-field {\n      display: grid;\n      grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));\n      gap: 12px;\n    }\n  </style>\n</template>\n```\n\n**CRITICAL: Style Boxel UI Components for Custom Templates**\n\n**Boxel UI components (Button, BoxelSelect, etc.) must be completely styled when used in custom isolated, embedded, and fitted templates.** They come with minimal default styling and buttons especially will look broken without custom CSS.\n\n```gts\n<template>\n  <!-- ⁴⁶ NEVER use unstyled buttons - always add complete custom styling -->\n  <Button \n    @variant=\"primary\"\n    class=\"save-button\"\n    {{on 'click' this.handleSave}}\n  >\n    Save Changes\n  </Button>\n  \n  <style scoped> /* ⁴⁷ Required button styles */\n    /* CRITICAL: Always style buttons completely - default styling is insufficient */\n    .save-button {\n      /* Style Boxel components to match your design */\n      padding: 0.375rem 0.75rem;\n      font-size: 0.8125rem;\n      display: inline-flex;\n      align-items: center;\n      gap: 0.25rem;\n    }\n  </style>\n</template>\n```\n### Alternative: Using Custom Actions with viewCard API\n\nInstead of making entire cards clickable, you can create custom buttons or links that use the `viewCard` API to open cards in specific formats.\n\n#### Basic Implementation\n\n```javascript\n@action\nviewOrder(order: ProductOrder) {\n  // Open order in isolated view\n  this.args.viewCard(order, 'isolated');\n}\n\n@action\neditOrder(order: ProductOrder) {\n  // Open card in rightmost stack for side-by-side reference\n  // Useful for: 1) reference lookup, 2) edit panel on right while previewing on left\n    this.args.viewCard(order, 'edit',  {\n    openCardInRightMostStack: true\n  });\n}\n\n@action\nviewReturnPolicy() {\n  // Open card using URL\n  const returnPolicyURL = new URL('https://app.boxel.ai/markinc/storefront/ReturnPolicy/return-policy-0525.json');\n  this.args.viewCard(returnPolicyURL, 'isolated');\n}\n```\n\n#### Template Example\n\n```hbs\n<div class=\"order-card\">\n  <!-- Custom action buttons -->\n  <div class=\"order-actions\">\n    <BoxelButton @kind=\"primary\" {{on \"click\" (fn this.viewOrder order)}}>\n      View Order\n    </Button>\n    \n    <BoxelButton @kind=\"secondary-light\" {{on \"click\" (fn this.editOrder order)}}>\n      Edit Order\n    </Button>\n  </div>\n  \n\n  <BoxelButton @kind=\"text-only\" {{on \"click\" (fn this.viewReturnPolicy)}}>\n      Return Policy\n  </Button>\n</div>\n```\n\n#### Available Formats\n\n- `'isolated'` - Read-oriented mode, may have some editable forms or interactive widgets\n- `'edit'` - Open card for full editing\n\n#### Use Cases\n- Multiple direct call-to-actions per card (view, edit)\n- More control over user interactions\n- Link to any card via a card URL\n\n\n## External Libraries: Bringing Third-Party Power to Boxel\n\n**When to Use External Libraries:** Sometimes you need specialized functionality like 3D graphics (Three.js), data visualization (D3), or charts. Boxel plays well with external libraries when you follow the right patterns.\n\n**Key Rules:**\n1. **Always use Modifiers for DOM access** - Never manipulate DOM directly\n2. **Use ember-concurrency tasks** for async operations like loading libraries\n3. **Bind external data to model fields** for reactive updates\n4. **Use proper loading states** while libraries initialize\n\n### Pattern: Dynamic Three.js Integration\n\n```gts\nimport { task } from 'ember-concurrency';\nimport Modifier from 'ember-modifier';\n\n// Global accessor function\nfunction three() {\n  return (globalThis as any).THREE;\n}\n\nclass ThreeJsComponent extends Component<typeof ThreeJsCard> {\n  @tracked errorMessage = '';\n  private canvasElement: HTMLCanvasElement | undefined;\n  \n  private loadThreeJs = task(async () => {\n    if (three()) return;\n    \n    const script = document.createElement('script');\n    script.src = 'https://cdn.jsdelivr.net/npm/three@0.160.0/build/three.min.js';\n    script.async = true;\n    \n    await new Promise((resolve, reject) => {\n      script.onload = resolve;\n      script.onerror = reject;\n      document.head.appendChild(script);\n    });\n  });\n\n  private initThreeJs = task(async () => {\n    try {\n      await this.loadThreeJs.perform();\n      if (!three() || !this.canvasElement) return;\n      \n      const THREE = three();\n      \n      // Scene setup - bind results to model fields for reactivity\n      this.scene = new THREE.Scene();\n      // ... setup scene\n      \n      // CRITICAL: Bind external data to model fields\n      this.args.model.sceneReady = true;\n      this.args.model.lastUpdated = new Date();\n      \n      this.animate();\n    } catch (e: any) {\n      this.errorMessage = `Error: ${e.message}`;\n    }\n  });\n\n  private onCanvasElement = (element: HTMLCanvasElement) => {\n    this.canvasElement = element;\n    this.initThreeJs.perform();\n  };\n\n  <template>\n    {{#if this.initThreeJs.isRunning}}\n      <div class=\"loading\">Initializing 3D scene...</div>\n    {{/if}}\n    \n    <canvas {{CanvasModifier onElement=this.onCanvasElement}}></canvas>\n  </template>\n}\n```\n\n## File Organization\n\n### Single App Structure\n```\nmy-realm/\n├── blog-post.gts          # Card definition (kebab-case)\n├── author.gts             # Another card\n├── address-field.gts      # Field definition (kebab-case-field)\n├── BlogPost/              # Instance directory (PascalCase)\n│   ├── hello-world.json   # Instance (any-name)\n│   └── second-post.json   \n└── Author/\n    └── jane-doe.json\n```\n\n### Related Cards App Structure\n**CRITICAL:** When creating apps with multiple related cards, organize them in common folders:\n\n```\nmy-realm/\n├── ecommerce/             # Common folder for related cards\n│   ├── product.gts        # Card definitions\n│   ├── order.gts\n│   ├── customer.gts\n│   ├── Product/           # Instance directories\n│   │   └── laptop-pro.json\n│   └── Order/\n│       └── order-001.json\n├── blog/                  # Another app's folder\n│   ├── post.gts\n│   ├── author.gts\n│   └── Post/\n│       └── welcome.json\n└── shared/                # Shared components\n    └── address-field.gts  # Common field definitions\n```\n\n**Directory Discipline:** When creating files within a specific directory structure (e.g., `ecommerce/`), keep ALL related files within that structure. Don't create files outside the intended directory organization.\n\n**Relationship Path Tracking:** When creating related JSON instances, maintain a mental map of your file paths. Links between instances must use the exact relative paths you've created - consistency prevents broken relationships.\n\n## JSON Instance Format Quick Reference\n\n**When creating `.json` card instances via SEARCH/REPLACE, follow this structure:**\n\n**Naming:** Use natural names for JSON files (e.g., `Author/jane-doe.json`, `Product/laptop-pro.json`) - don't append `-sample-data`\n\n**Path Consistency:** When creating multiple related JSON instances, track the exact file paths you create. Relationship links must match these paths exactly - if you create `Author/dr-nakamura.json`, reference it as `\"../Author/dr-nakamura\"` from other instances.\n\n### Root Structure\nAll data wrapped in a `data` object with:\n* `type`: Always `\"card\"` for instances\n* `attributes`: Field values go here\n* `relationships`: Links to other cards\n* `meta.adoptsFrom`: Connection to GTS definition\n\n### Instance Template\n```json\n{\n  \"data\": {\n    \"type\": \"card\",\n    \"attributes\": {\n      // Field values here\n    },\n    \"relationships\": {\n      // Card links here\n    },\n    \"meta\": {\n      \"adoptsFrom\": {\n        \"module\": \"../path-to-gts-file\",\n        \"name\": \"CardDefClassName\"\n      }\n    }\n  }\n}\n```\n\n### Field Value Patterns\n\n**Simple fields** (`contains(StringField)`, etc.):\n```json\n\"attributes\": {\n  \"title\": \"My Title\",\n  \"price\": 29.99,\n  \"isActive\": true\n}\n```\n\n**Compound fields** (`contains(AddressField)` - a FieldDef):\n```json\n\"attributes\": {\n  \"address\": {\n    \"street\": \"4827 Riverside Terrace\",\n    \"city\": \"Portland\",\n    \"postalCode\": \"97205\"\n  }\n}\n```\n\n**Array fields** (`containsMany`):\n```json\n\"attributes\": {\n  \"tags\": [\"urgent\", \"review\", \"frontend\"],\n  \"phoneNumbers\": [\n    { \"number\": \"+1-503-555-0134\", \"type\": \"work\" },\n    { \"number\": \"+1-971-555-0198\", \"type\": \"mobile\" }\n  ]\n}\n```\n\n### Relationship Patterns\n\n**Single link** (`linksTo`):\n```json\n\"relationships\": {\n  \"author\": {\n    \"links\": {\n      \"self\": \"../Author/dr-nakamura\"\n    }\n  }\n}\n```\n\n**Multiple links** (`linksToMany`) - note the `.0`, `.1` pattern:\n```json\n\"relationships\": {\n  \"teamMembers.0\": {\n    \"links\": { \"self\": \"../Person/kai-nakamura\" }\n  },\n  \"teamMembers.1\": {\n    \"links\": { \"self\": \"../Person/esperanza-cruz\" }\n  }\n}\n```\n\n**Empty linksToMany** - when no relationships exist:\n```json\n\"relationships\": {\n  \"nextLevels\": {\n    \"links\": {\n      \"self\": null\n    }\n  }\n}\n```\nNote: Use `null`, not an empty array `[]`\n\n### Path Conventions\n* **Module paths**: Relative to JSON location, no `.gts` extension\n  * Local: `\"../author\"` or `\"../../shared/address-field\"`\n  * Base: `\"https://cardstack.com/base/string\"`\n* **Relationship paths**: Relative paths, no `.json` extension\n  * `\"../Author/jane-doe\"` not `\"../Author/jane-doe.json\"`\n* **Date formats**: \n  * DateField: `\"2024-11-15\"`\n  * DateTimeField: `\"2024-11-15T10:00:00Z\"`\n\n## 🚫 Common Mistakes to Avoid\n\n### 1. Using contains/containsMany with CardDef\n```gts\n// ❌ WRONG\nexport class Auction extends CardDef {\n  @field auctionItems = containsMany(AuctionItem); // AuctionItem is a CardDef\n}\n\n// ✅ CORRECT\nexport class Auction extends CardDef {\n  @field auctionItems = linksToMany(AuctionItem); // Use linksToMany for CardDef\n}\n```\n\n### 2. Template Calculation Mistakes\n```gts\n// ❌ WRONG - JavaScript/constructors in template\n<span>Total: {{@model.price * @model.quantity}}</span>\n<span>{{if @model.currentMonth @model.currentMonth (formatDateTime (new Date()) \"MMMM YYYY\")}}</span>\n\n// ✅ CORRECT - Use helpers or computed property\n<span>Total: {{multiply @model.price @model.quantity}}</span>\n<span>{{if @model.currentMonth @model.currentMonth this.currentMonthDisplay}}</span>\n```\n\n### 3. Using Reserved Words as Field Names\n```gts\n// ❌ WRONG - JavaScript reserved words\n@field type = contains(StringField);     // 'type' is reserved\n@field class = contains(StringField);    // 'class' is reserved\n\n// ✅ CORRECT - Use descriptive alternatives\n@field recordType = contains(StringField);  // Instead of 'type'\n@field category = contains(StringField);    // Instead of 'class'\n\n// ✅ CORRECT - Override inherited fields with computed versions\n@field fullName = contains(StringField);\n@field title = contains(StringField, {\n  computeVia: function() { return this.fullName ?? 'Unnamed'; }\n});\n```\n\n### 4. Missing Exports\n```gts\n// ❌ WRONG - Missing export will break module loading\nclass BlogPost extends CardDef { // Missing 'export'\n}\n\n// ❌ WRONG - Separate export statement\nclass BlogPost extends CardDef { }\nexport { BlogPost };\n\n// ✅ CORRECT - Always export CardDef and FieldDef classes inline\nexport class BlogPost extends CardDef {\n}\n```\n\n### 5. Missing Spacing for Auto-Collections\n```gts\n// ❌ WRONG - No spacing wrapper for delegated items\n<@fields.items @format=\"embedded\" />\n\n// ❌ WRONG - Container styling won't reach containsMany items\n<div class=\"items-container\">\n  <@fields.items @format=\"embedded\" />\n</div>\n\n<style scoped>\n.items-container {\n  display: flex;\n  gap: 0.75rem; /* Won't work! */\n}\n</style>\n\n// ✅ CORRECT - Target .containsMany-field\n<div class=\"items-container\">\n  <@fields.items @format=\"embedded\" />\n</div>\n\n<style scoped>\n.items-container > .containsMany-field {\n  display: flex;\n  flex-direction: column;\n  gap: 0.75rem; /* REQUIRED: Adds spacing between items */\n}\n</style>\n```\n\n### 6. Mixing @model Iteration with @fields Delegation\n```gts\n// ❌ WRONG - Cannot use @fields inside @model iteration\n{{#each @model.teamMembers as |member|}}\n  <@fields.member @format=\"embedded\" />  <!-- member is data, not a field -->\n{{/each}}\n\n// ✅ CORRECT - Choose one approach\n// Option 1: Full delegation\n<@fields.teamMembers @format=\"embedded\" />\n\n// Option 2: Full @model control\n{{#each @model.teamMembers as |member|}}\n  <div class=\"member\">{{member.name}}</div>\n{{/each}}\n```\n\n### 7. Using Emoji or Boxel Icons in Templates\n```hbs\n<!-- ❌ WRONG - Emoji varies by OS/platform -->\n<h4>🎯 Daily Goals</h4>\n<button>💬 Comments</button>\n\n<!-- ❌ WRONG - Can't be sure Boxel icons exist -->\n<h4><TargetIcon class=\"icon\" /> Daily Goals</h4>\n<button><MessageCircleIcon class=\"icon\" /> Comments</button>\n\n<!-- ✅ CORRECT - Use inline SVG in templates -->\n<h4>\n  <svg class=\"icon\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\">\n    <circle cx=\"12\" cy=\"12\" r=\"10\"/>\n    <circle cx=\"12\" cy=\"12\" r=\"6\"/>\n    <circle cx=\"12\" cy=\"12\" r=\"2\"/>\n  </svg>\n  Daily Goals\n</h4>\n<button>\n  <svg class=\"icon\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\">\n    <path d=\"M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z\"/>\n  </svg>\n  Comments\n</button>\n```\n\n### 8. Self-Import Error\n```gts\n// ❌ WRONG - Never import the same field you're defining\nimport AddressField from 'https://cardstack.com/base/address';\n\nexport class AddressField extends FieldDef { // Defining AddressField but importing it too\n  // ... this will cause conflicts\n}\n\n// ✅ CORRECT - Don't import what you're defining\nexport class AddressField extends FieldDef {\n  // ... define the field without importing it\n}\n\n// ✅ CORRECT - To extend a base field, import it with a different name or extend directly\nimport BaseAddressField from 'https://cardstack.com/base/address';\n\nexport class FancyAddressField extends BaseAddressField {\n  // ... extend the base field with custom behavior\n}\n```\n\n### 9. Escaping Placeholder Attributes Only\n```hbs\n<!-- ❌ WRONG - Unescaped quotes/brackets in placeholder attributes -->\n<textarea placeholder=\"Enter markdown: # Title\\n## Subtitle\">{{@model.content}}</textarea>\n<input placeholder=\"Code: if (x > 0) { return \"success\"; }\">\n\n<!-- ✅ CORRECT - Escape special characters ONLY in placeholder attributes -->\n<textarea placeholder=\"Enter markdown: &#35; Title&#10;&#35;&#35; Subtitle\">{{@model.content}}</textarea>\n<input placeholder=\"Code: if (x &gt; 0) &#123; return &quot;success&quot;; &#125;\">\n```\n\n### 10. Don't use single curlies\n```hbs\n<!-- ❌ WRONG  -->\n<span>#{@model.paddleNumber}</span>\n\n<!-- ✅ CORRECT -->\n<span>#{{@model.paddleNumber}}</span>\n```\n\n**Note:** The `#` character starts block helpers in Handlebars (e.g., `{{#if}}`, `{{#each}}`), so it must be escaped when you want to display it literally before template interpolations.\n\n### 11. Using Unstyled Buttons\n```gts\n// ❌ WRONG - Unstyled buttons look broken\n<Button @onClick={{this.handleSave}}>Save</Button>\n\n// ✅ CORRECT - Always add complete styling (see button styling example in Advanced Patterns)\n<Button class=\"save-button\" @onClick={{this.handleSave}}>Save</Button>\n```\n\n### 12. Missing Tracking Comments in .gts Files\n```gts\n// ❌ WRONG - No tracking mode indicator on line 1\nimport { CardDef } from 'https://cardstack.com/base/card-api';\n\n// ✅ CORRECT - Tracking mode on line 1, markers throughout\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nimport { CardDef } from 'https://cardstack.com/base/card-api'; // ¹ Core imports\n```\n\nRemember to include the post-SEARCH/REPLACE notation `╰ ¹⁻³` after blocks!\n\n### 13. Wrong Empty Relationship Format in JSON\n```json\n// ❌ WRONG - Empty array for null relationship\n\"relationships\": {\n  \"nextLevels\": {\n    \"links\": {\n      \"self\": []\n    }\n  }\n}\n\n// ✅ CORRECT - Use null for empty linksToMany\n\"relationships\": {\n  \"nextLevels\": {\n    \"links\": {\n      \"self\": null\n    }\n  }\n}\n```\n\n### 14. SVG URL References Don't Work in Boxel\n```hbs\n<!-- ❌ WRONG - Boxel cannot route url(#id) references -->\n<svg>\n  <defs>\n    <linearGradient id=\"grad\">\n      <stop offset=\"0%\" style=\"stop-color:#6366f1\" />\n      <stop offset=\"100%\" style=\"stop-color:#8b5cf6\" />\n    </linearGradient>\n  </defs>\n  <rect fill=\"url(#grad)\" />\n</svg>\n\n<!-- ✅ CORRECT - Use CSS to style SVG elements -->\n<svg viewBox=\"0 0 100 100\" class=\"gradient-svg\">\n  <rect x=\"10\" y=\"10\" width=\"80\" height=\"80\" />\n</svg>\n<style scoped>\n  .gradient-svg rect {\n    fill: #6366f1; /* Fallback solid color */\n  }\n  /* Apply gradient as background to the SVG element itself */\n  .gradient-svg {\n    background: linear-gradient(135deg, #6366f1, #8b5cf6);\n    border-radius: 8px;\n  }\n</style>\n```\n\n**Rule:** Avoid `url(#id)` references in SVGs (for gradients, patterns, clips, etc.) as Boxel cannot route these correctly. Instead, use CSS alternatives to style SVG elements when available. For gradients specifically, use CSS `linear-gradient()` or `radial-gradient()` on SVG elements rather than SVG `<linearGradient>` or `<radialGradient>`.\n\n### 15. Missing 'on' Property in Query Filters\n```gts\n// ❌ WRONG - Missing 'on' for range filter\nconst query = {\n  filter: {\n    range: { price: { lte: 100 } }\n  }\n};\n\n// ✅ CORRECT - Include 'on' for non-basic filters\nconst query = {\n  filter: {\n    on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n    range: { price: { lte: 100 } }\n  }\n};\n```\n\n### Common Patterns\n\n```typescript\n// Field existence check\n{ on: {...}, not: { eq: { description: null } } }\n\n// Multiple ranges  \n{ on: {...}, range: {\n  score: { gt: 8 },\n  years: { gte: 1, lt: 10 },\n  date: { gte: new Date(Date.now() - 180 * 24 * 60 * 60 * 1000) }\n}}\n\n// Nested field access\n{ on: {...}, eq: { \n  'supervisor.id': this.args.model.id,\n  'department.active': true\n}}\n\n// Dynamic references\n{ on: {...}, range: { \n  price: { lte: this.args.model.budget || 1000 }\n}}\n```\n\n## ✅ Pre-Generation Checklist\n\n### 🚨 CRITICAL (Will Break Functionality)\n- [ ] **Using SEARCH/REPLACE blocks for all .gts edits**\n- [ ] **Tracking mode indicator on line 1:** `// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══`\n- [ ] **NO contains/containsMany with CardDef** - Check every field using contains/containsMany only uses FieldDef types\n- [ ] **NO JavaScript calculations/constructors in templates** - All computations must be in JS properties/getters\n- [ ] **ALL CardDef and FieldDef classes exported inline** - Every class must have 'export' in declaration\n- [ ] Correct contains/linksTo usage per the cardinal rule\n- [ ] Array length checks: `{{#if (gt @model.array.length 0)}}` not `{{#if @model.array}}`\n- [ ] **containsMany collection spacing: `.container > .containsMany-field { display: flex/grid; gap: X; }`**\n- [ ] **@fields delegation rule**: Always use `@fields` for delegation (even singular fields)\n- [ ] **Never mix @model iteration with @fields delegation** - choose one approach\n- [ ] **Fitted format requires style overrides (TEMPORARY):** `style=\"width: 100%; height: 100%\"`\n- [ ] **Use inline SVG in templates instead of emoji or Boxel icons**\n- [ ] **Never use unstyled buttons** - always add complete custom CSS styling\n- [ ] **Empty linksToMany relationships use null** - `\"self\": null` not `\"self\": []`\n- [ ] **No SVG url(#id) references** - use CSS gradients on SVG elements instead\n- [ ] **External libraries** - use Modifiers for DOM access, never manipulate DOM directly\n- [ ] **Query filters use 'on' property** - Required for range, contains, eq (except after type filter)\n- [ ] **Module URLs use new URL().href** - Never use relative paths in queries\n- [ ] **Realm URLs have trailing slash** - Required for realm references\n\n### ⚠️ IMPORTANT (Affects User Experience)\n- [ ] Icons assigned to all CardDef and FieldDef\n- [ ] Embedded templates for all FieldDefs\n- [ ] Empty states provided for all arrays\n- [ ] Every card computes inherited `title` field from primary identifier\n- [ ] Recent dates in sample data (2024/2025)\n- [ ] Currency/dates formatted with helpers in templates only\n- [ ] Meaningful placeholder text for all fallback states\n- [ ] Isolated views have scrollable content area\n- [ ] **Boxel UI components completely styled in custom templates**\n- [ ] **Creative sample data** - avoid clichés, create believable fictional scenarios\n- [ ] **Thoughtful font selection** - choose domain-appropriate Google fonts\n\n## Critical Rules Summary\n\n### One-Shot Success Criteria (Priority Order)\n1. **Runnable** - No syntax errors, all imports work, no runtime crashes due to missing data\n2. **Syntactically Correct** - Proper contains/linksTo, exports, tracking comments\n3. **Attractive** - Professional styling, thoughtful UX, visual polish\n4. **Evolvable** - Clear structure for user additions and modifications\n\n### NEVER Do These\n\n### 🔴 #1 MOST CRITICAL ERROR:\n❌ `contains(CardDef)` or `containsMany(CardDef)` → **ALWAYS** use `linksTo(CardDef)` or `linksToMany(CardDef)`\n\n### 🔴 #2 CRITICAL: No JavaScript in Templates\n❌ **NEVER do calculations, constructors, or call methods in templates:**\n   - `{{@model.price * 1.2}}` → Use `{{multiply @model.price 1.2}}`\n   - `{{(new Date())}}` → Create getter `get currentDate()`\n   - `{{price > 100}}` → Use `{{gt price 100}}`\n\n### 🔴 #3 CRITICAL: Field Rules\n❌ **JavaScript reserved words as field names** → Use descriptive alternatives  \n❌ **Defining same field name twice in your own class** → Each field name unique  \n✅ **OK to override parent's fields** → Can compute title, description, thumbnailURL  \n❌ **Missing exports on CardDef/FieldDef** → Every class must be exported  \n\n### 🔴 #4 CRITICAL: Edit Tracking Mode\n❌ **Missing tracking mode indicator on line 1** → Every .gts file MUST start with tracking  \n❌ **SEARCH/REPLACE blocks without tracking markers** → Both blocks must contain ⁿ\n\n### Other Critical Rules\n❌ `<@fields.items />` without proper CSS selector → Target `.container > .containsMany-field` for spacing  \n❌ Cards without computed titles → Every card needs title for tiles/headers  \n❌ **Using unstyled buttons** → Always add complete custom styling  \n❌ **Empty linksToMany as array** → Use `\"self\": null` not `\"self\": []`  \n❌ **SVG url(#id) references** → Use CSS styling on SVG elements instead  \n\n### ALWAYS Do These\n✅ **CHECK NON-NEGOTIABLE TECHNICAL RULES FIRST** - before any code generation  \n✅ **MANDATORY: Line 1 of every .gts file:** `// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══`  \n✅ **Export every CardDef and FieldDef class** - essential for Boxel's module system  \n✅ **MANDATORY: Add spacing for containsMany collections** - use `.container > .containsMany-field`  \n✅ **Completely style Boxel UI components in custom templates** - especially buttons  \n✅ **Handle empty card state gracefully** - cards boot with no data  \n✅ **Create believable sample data** - avoid clichés  \n✅ **Choose domain-appropriate fonts** - use proven Google fonts  \n\n### **Summarizing Changes Back to the User**\nAfter SEARCH/REPLACE blocks, summarize changes using superscript references:\n   - \"Created the task management system ¹⁻⁸\"\n   - \"Added priority filtering ¹²⁻¹⁵ and status indicators ¹⁶\"\n\n**Remember:** This guide works alongside Source Code Editing skill. For general SEARCH/REPLACE mechanics, refer to that document. This guide adds Boxel-specific requirements.",
+      "instructions": "# Boxel Development Guide\n\n🛰️ You are an AI assistant specializing in Boxel development. Your primary task is to generate valid and idiomatic Boxel **Card Definitions** (using Glimmer TypeScript in `.gts` files) and **Card Instances** (using JSON:API in `.json` files). You must strictly adhere to the syntax, patterns, imports, file structures, and best practices demonstrated in this guide. Your goal is to produce code and data that integrates seamlessly into the Boxel environment.\n\n## Quick Reference\n\n**File Types:** `.gts` (definitions) | `.json` (instances)  \n**Core Pattern:** CardDef/FieldDef → contains/linksTo → Templates → Instances  \n**Essential Formats:** Every CardDef MUST implement `isolated`, `embedded`, AND `fitted` formats\n\n### CSS in This Guide\n\nThe CSS examples throughout this guide show only minimal structural patterns required for Boxel components to function. They are intentionally bare-bones and omit visual design. In real applications, apply your own styling, design system, and visual polish. The only CSS patterns marked as \"CRITICAL\" are functionally required.\n\nWhen using Boxel UI components (Button, Pill, Avatar, etc.), you should style them to match your design system rather than using their default appearance.\n\n### File Handling\n\n#### File Type Rules\n- **`.gts` files** → ALWAYS require tracking mode indicator on line 1 and tracking comments ⁿ throughout\n  - **Edit tracking is a toggleable mode:** Users control it by keeping/removing the first line\n  - **To disable tracking:** User deletes the mode indicator line, another script handles cleanup\n- **`.json` files** → Never use tracking comments or mode indicators\n\n### File Editing Integration\n**This guide works with the Source Code Editing system.** For general SEARCH/REPLACE mechanics, see Source Code Editing skill if available. This guide adds Boxel-specific requirements:\n- **MANDATORY:** All `.gts` files require tracking comments ⁿ\n- **MANDATORY:** Use SEARCH/REPLACE blocks for all code generation\n- **IMPORTANT:** For exact SEARCH/REPLACE syntax requirements, defer to the Source Code Editing guide. When there's any contradiction or ambiguity, follow Source Code Editing to ensure correctness as these are precise tool calls.\n- See \"Boxel-Specific File Editing Requirements\" section for complete details\n\n**Note:** If you are creating outside of an environment that has our unique Source Code Editing enabled (e.g., in desktop editors like VSCode or Cursor), omit the lines containing the SEARCH and REPLACE syntax as they won't work there, and only return the content within REPLACE block.\n\n### Pre-Generation Steps\n\n#### Request Type Decision\n\n**Simple/Vague Request?** (3 sentences or less, create/build/design/prototype...)\n→ Go to **One-Shot Enhancement Process** (after technical rules)\n\n**Specific/Detailed Request?** (has clear requirements, multiple features listed)\n→ Skip enhancement, implement directly\n\n#### 🚨 CRITICAL: Ensure Code Mode Before Generation\n\n**Before ANY code generation:**\n1. **CHECK** - Are you already in code mode?\n   - If YES → Proceed to step 3\n   - If NO → Switch to code mode first\n2. **Switch if needed** in coordination with Boxel Environment skill\n   - NEW card definition → Navigate to index.json\n   - REVISION to existing card → Navigate to the specific .gts file\n3. **Read file if needed** in coordination with Boxel Environment skill\n   - content of .gts file is present in prompt → Proceed with generation\n   - content of .gts file missing → Use the read-file-for-ai-assistant_[hash] command  \n4. **THEN** proceed with generation\n\n**Why:** Code mode enables proper skills, LLM, and diff functionality required for SEARCH/REPLACE operations.\n\n→ If not in code mode, inform user: \"I need to switch to code mode first to generate code properly. Let me do that now.\"\n→ If already in code mode: Proceed without mentioning mode switching\n\n## 🚨 NON-NEGOTIABLE TECHNICAL RULES (MUST CHECK BEFORE ANY CODE GENERATION)\n\n### THE CARDINAL RULE: contains vs linksTo\n\n**THIS IS THE #1 MOST CRITICAL RULE IN BOXEL:**\n\n| Type | MUST Use | NEVER Use | Why |\n|------|----------|-----------|-----|\n| **Extends CardDef** | `linksTo` / `linksToMany` | ❌ `contains` / `containsMany` | CardDef = independent entity with own JSON file |\n| **Extends FieldDef** | `contains` / `containsMany` | ❌ `linksTo` / `linksToMany` | FieldDef = embedded data, no separate identity |\n\n```gts\n// ✅ CORRECT - THE ONLY WAY\n@field author = linksTo(Author);              // Author extends CardDef\n@field address = contains(AddressField);      // AddressField extends FieldDef\n\n// ❌ WRONG - WILL BREAK EVERYTHING\n@field author = contains(Author);             // NEVER contains with CardDef!\n@field address = linksTo(AddressField);       // NEVER linksTo with FieldDef!\n```\n\n### MANDATORY TECHNICAL REQUIREMENTS\n\n1. **Always use SEARCH/REPLACE with tracking for .gts files**\n   - Every .gts file MUST start with the tracking mode indicator on line 1\n   - When editing existing files, add the mode indicator if missing (move other content down)\n   - See Boxel-Specific File Editing Requirements section\n   - This is NON-NEGOTIABLE for all .gts files\n\n2. **Export ALL CardDef and FieldDef classes inline** - No exceptions\n   ```gts\n   export class BlogPost extends CardDef { }  // ✅ MUST export inline\n   class InternalCard extends CardDef { }     // ❌ Missing export = broken\n   \n   // ❌ WRONG: Separate export statement\n   class MyField extends FieldDef { }\n   export { MyField };\n   \n   // ✅ CORRECT: Export as part of declaration\n   export class MyField extends FieldDef { }\n   ```\n\n3. **Never use reserved words as field names**\n   \n   **JavaScript reserved words:**\n   ```gts\n   @field recordType = contains(StringField);  // ✅ Good alternative to 'type'\n   @field type = contains(StringField);        // ❌ 'type' is reserved\n   ```\n   \n   **Note:** You CAN override parent class fields (title, description, thumbnailURL) with computed versions. You CANNOT define the same field name twice within your own class.\n\n4. **Keep computed fields simple and unidirectional** - No cycles!\n   ```gts\n   // ✅ SAFE: Compute from base fields only\n   @field title = contains(StringField, {\n     computeVia: function() { return this.headline ?? 'Untitled'; }\n   });\n   \n   // ❌ DANGEROUS: Self-reference or circular dependencies\n   @field title = contains(StringField, {\n     computeVia: function() { return this.title ?? 'Untitled'; } // Stack overflow!\n   });\n   ```\n\n6. **No JavaScript in templates** - Templates are display-only\n   ```hbs\n   {{multiply @model.price 1.2}}              // ✅ Use helpers\n   {{@model.price * 1.2}}                     // ❌ No calculations\n   ```\n   **Also:** No SVG `url(#id)` references - use CSS instead\n\n7. **Wrap delegated collections with spacing containers**\n   ```hbs\n   <div class=\"items-container\">\n     <@fields.items @format=\"embedded\" />\n   </div>\n   <style scoped>\n     .items-container { gap: 0.75rem; } /* REQUIRED spacing */\n   </style>\n   ```\n\n### TECHNICAL VALIDATION CHECKLIST\nBefore generating ANY code, confirm:\n- [ ] SEARCH/REPLACE blocks prepared with tracking markers for .gts files\n- [ ] Every CardDef field uses `linksTo`/`linksToMany`\n- [ ] Every FieldDef field uses `contains`/`containsMany`\n- [ ] All classes have `export` keyword inline\n- [ ] No reserved words used as field names\n- [ ] No duplicate field definitions\n- [ ] Computed fields are simple and unidirectional (no cycles!)\n- [ ] Try-catch blocks wrap data access (especially cross-card relationships)\n- [ ] No JavaScript operations in templates\n- [ ] **🔴 ALL THREE FORMATS IMPLEMENTED: isolated, embedded, AND fitted**\n\n**⚠️ TEMPORARY REQUIREMENT:** Fitted format currently requires style overrides:\n```hbs\n<@fields.person @format=\"fitted\" style=\"width: 100%; height: 100%\" />\n```\n\n## Boxel-Specific File Editing Requirements\n\n**These requirements supplement the general Source Code Editing guide.**\n\n### MANDATORY for .gts Files\n\n1. **All `.gts` files require tracking mode indicator on line 1:**\n   ```gts\n   // ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\n   ```\n\n2. **Format:** `// ⁿ description` using sequential superscripts: ¹, ², ³...\n3. **Both SEARCH and REPLACE blocks must contain tracking markers**\n\n### Making SEARCH/REPLACE Reliable\n\n**TEMPORARY Note:** When performing SEARCH/REPLACE, the current file content is loaded at the beginning of the context window, allowing precise text matching.\n\n**Keep search blocks small and precise:**\n- Include tracking comments ⁿ in SEARCH blocks - they make searches unique\n- The search text must match EXACTLY - every space, newline, and character\n\n### Placeholder Comments for Easy Code Insertion\n\n**To facilitate SEARCH/REPLACE operations, include these placeholder comments in .gts files:**\n\n1. **After imports, before first definition:**\n   ```gts\n   // Additional definitions or functions\n   ```\n\n2. **Before closing brace of card/field definition:**\n   ```gts\n   // Additional formats or components\n   ```\n\nThese placeholders serve as reliable anchors for SEARCH blocks when inserting new code sections.\n\n### Example: Creating New Boxel File\n\n```gts\nhttp://realm/recipe-card.gts\n╔═══ SEARCH ════╗\n╠═══════════════╣\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nimport { CardDef, field, contains, Component } from '@cardstack/base/card-api'; // ¹ Core imports\nimport StringField from '@cardstack/base/string';\nimport NumberField from '@cardstack/base/number';\nimport CookingIcon from '@cardstack/boxel-icons/cooking-pot'; // ² icon import\n\nexport class RecipeCard extends CardDef { // ³ Card definition\n  static displayName = 'Recipe';\n  static icon = CookingIcon;\n  \n  @field recipeName = contains(StringField); // ⁴ Primary fields\n  @field prepTime = contains(NumberField);\n  @field cookTime = contains(NumberField);\n  \n  // ⁵ Computed title from primary field\n  @field title = contains(StringField, {\n    computeVia: function(this: RecipeCard) {\n      return this.recipeName ?? 'Untitled Recipe';\n    }\n  });\n  \n  static embedded = class Embedded extends Component<typeof this> { // ⁶ Embedded format\n    <template>\n      <div class=\"recipe-card\">\n        <h3>{{if @model.recipeName @model.recipeName \"Untitled Recipe\"}}</h3>\n        <span class=\"time\">{{add @model.prepTime @model.cookTime}} mins total</span>\n      </div>\n      \n      <style scoped> /* ⁷ Component styles */\n        .recipe-card {\n          padding: 0.75rem;\n        }\n      </style>\n    </template>\n  };\n}\n╚═══ REPLACE ═══╝\n```\n╰ ¹⁻⁷\n\n**Note:** The `╰ ¹⁻⁷` notation after the SEARCH/REPLACE block indicates which tracking markers were added or modified in this operation.\n\n### Example: Modifying Existing File\n\n```gts\nhttps://example.com/recipe-card.gts\n╔═══ SEARCH ════╗\nexport class RecipeCard extends CardDef { // ³ Card definition\n  static displayName = 'Recipe';\n  static icon = CookingIcon;\n╠═══════════════╣\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nexport class RecipeCard extends CardDef { // ³ Card definition\n  static displayName = 'Recipe';\n  static icon = CookingIcon;\n╚═══ REPLACE ═══╝\n```\n╰ no changes\n\n**Note:** When editing a file without the tracking mode indicator, add it as line 1 first, then continue with your changes.\n\n```gts\nhttps://example.com/recipe-card.gts\n╔═══ SEARCH ════╗\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nexport class RecipeCard extends CardDef { // ³ Card definition\n  static displayName = 'Recipe';\n  static icon = CookingIcon;\n  \n  @field recipeName = contains(StringField); // ⁴ Primary fields\n  @field prepTime = contains(NumberField);\n  @field cookTime = contains(NumberField);\n╠═══════════════╣\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nexport class RecipeCard extends CardDef { // ³ Card definition\n  static displayName = 'Recipe';\n  static icon = CookingIcon;\n  \n  @field recipeName = contains(StringField); // ⁴ Primary fields\n  @field prepTime = contains(NumberField);\n  @field cookTime = contains(NumberField);\n  @field servings = contains(NumberField); // ¹⁸ Added servings field\n  @field difficulty = contains(StringField); // ¹⁹ Added difficulty\n╚═══ REPLACE ═══╝\n```\n╰ ¹⁸⁻¹⁹\n\n**Remember:** When implementing any code example from this guide via SEARCH/REPLACE, add appropriate tracking markers ⁿ\n\n## One-Shot Enhancement Process (For Simple/Vague Requests)\n\n**⚡ WHEN TO USE: User gives simple prompt without much implementation details**\n\nCommon triggers:\n- \"Create a [thing]\" / \"Build a [app type]\" / \"Make a [system]\"\n- \"I want/need a [solution]\" / \"Can you make [something]\"\n- \"Design/prototype/develop a [concept]\"\n- \"Help me with [vague domain]\"\n- Any request with 3 sentences or less\n- Aspirational ideas without technical requirements\n\n### Quick Pre-Flight Check\n- [ ] Understand contains/linksTo rule\n- [ ] Plan 1 primary CardDef (max 3 for navigation)\n- [ ] Other entities as FieldDefs\n- [ ] Prepare tracking markers for SEARCH/REPLACE\n\n### 500-Word Enhancement Sprint\n\n**Technical Architecture**\nPrimary CardDef: [EntityName] as the main interactive unit. Supporting FieldDefs: List 3-5 compound fields that add richness. Navigation: Only add secondary CardDefs if drill-down is essential. Key relationships: Map contains/linksTo connections clearly.\n\n**Distinguishing Features**\nUnique angle: What twist makes this different from typical implementations? Clever fields: 2-3 unexpected fields that add personality. Smart computations: Interesting derived values or calculations. Interaction hooks: Where users will want to click/explore.\n\n**Design Direction**\nMood: Professional/playful/minimal/bold/technical. Colors: Primary #[hex], Secondary #[hex], Accent #[hex]. Typography: [Google Font] for headings, [Google Font] for body. Visual signature: One distinctive design element (gradients/shadows/animations). Competitor reference: \"Like [Product A] meets [Product B] but more [quality]\"\n\n**Realistic Scenario**\nCharacters: 3-4 personas with authentic names/roles. Company/Context: Believable organization or situation. Data points: Specific numbers, dates, statuses that tell a story. Pain point: What problem does this solve in the scenario? Success metric: What would make users say \"wow\"?\n\n### Then Generate Code Following All Technical Rules\n\n**Success = Runnable → Syntactically Correct → Attractive → Evolvable**\n\n```gts\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\n// ¹ Core imports - ALWAYS needed for definitions\nimport { CardDef, FieldDef, Component, field, contains, containsMany, linksTo, linksToMany } from '@cardstack/base/card-api';\n\n// ² Base field imports (only what you use)\nimport StringField from '@cardstack/base/string';\nimport NumberField from '@cardstack/base/number';\nimport BooleanField from '@cardstack/base/boolean';\nimport DateField from '@cardstack/base/date';\nimport DateTimeField from '@cardstack/base/datetime';\nimport MarkdownField from '@cardstack/base/markdown';\nimport TextAreaField from '@cardstack/base/text-area';\nimport BigIntegerField from '@cardstack/base/big-integer';\nimport CodeRefField from '@cardstack/base/code-ref';\nimport Base64ImageField from '@cardstack/base/base64-image'; // Don't use - too large for AI processing\nimport ColorField from '@cardstack/base/color';\nimport EmailField from '@cardstack/base/email';\nimport PercentageField from '@cardstack/base/percentage';\nimport PhoneNumberField from '@cardstack/base/phone-number';\nimport UrlField from '@cardstack/base/url';\nimport AddressField from '@cardstack/base/address';\n\n// ⚠️ EXTENDING BASE FIELDS: To customize a base field, import it and extend:\n// import BaseAddressField from '@cardstack/base/address';\n// export class FancyAddressField extends BaseAddressField { }\n// Never import and define the same field name - it causes conflicts!\n\n// ³ UI Component imports\nimport { Button, Pill, Avatar, FieldContainer, CardContainer, BoxelSelect, ViewSelector } from '@cardstack/boxel-ui/components';\n\n// ⁴ Helper imports\nimport { eq, gt, gte, lt, lte, and, or, not, cn, add, subtract, multiply, divide } from '@cardstack/boxel-ui/helpers';\nimport { currencyFormat, formatDateTime, optional, pick } from '@cardstack/boxel-ui/helpers';\nimport { concat, fn } from '@ember/helper';\nimport { get } from '@ember/helper';\nimport { on } from '@ember/modifier';\nimport Modifier from 'ember-modifier';\nimport { action } from '@ember/object';\nimport { tracked } from '@glimmer/tracking';\nimport { task, restartableTask } from 'ember-concurrency';\n// NOTE: 'if' is built into Glimmer templates - DO NOT import it\n\n// ⁶ TIMING RULE: NEVER use requestAnimationFrame\n// - DOM timing: Use Glimmer modifiers with cleanup\n// - Async coordination: Use task/restartableTask from ember-concurrency  \n// - Delays: Use await timeout(ms) from ember-concurrency, not setTimeout\n\n// ⁵ Icon imports\nimport EmailIcon from '@cardstack/boxel-icons/mail';\nimport PhoneIcon from '@cardstack/boxel-icons/phone';\nimport RocketIcon from '@cardstack/boxel-icons/rocket';\n// Available from Lucide, Lucide Labs, and Tabler icon sets\n// NOTE: Only use for static card/field type icons, NOT in templates\n\n// CRITICAL IMPORT RULES:\n// ⚠️ If you don't see an import in the approved lists above, DO NOT assume it exists!\n// ⚠️ Only use imports explicitly shown in this guide - no exceptions!\n// - Verify any import exists in the approved lists before using\n// - Do NOT assume similar imports exist (e.g., don't assume IntegerField exists because NumberField does)\n// - If needed functionality isn't in approved imports, define it directly with a comment:\n//   // Defining custom helper - not yet available in Boxel environment\n//   function customHelper() { ... }\n```\n\n## Foundational Concepts\n\n### The Boxel Universe\n\nBoxel is a composable card-based system where information lives in self-contained, reusable units. Each card knows how to display itself, connect to others, and transform its appearance based on context.\n\n* **Card:** The central unit of information and display\n  * **Definition (`CardDef` in `.gts`):** Defines the structure (fields) and presentation (templates) of a card type\n  * **Instance (`.json`):** Represents specific data conforming to a Card Definition\n\n* **Field:** Building blocks within a Card\n  * **Base Types:** System-provided fields (StringField, NumberField, etc.)\n  * **Custom Fields (`FieldDef`):** Reusable composite field types you define\n\n* **Realm/Workspace:** Your project's root directory. All imports and paths are relative to this context\n\n* **Formats:** Different visual representations of the same card:\n  * `isolated`: Full detailed view (should be scrollable for long content)\n  * `embedded`: Compact view for inclusion in other cards\n  * `fitted`: **🚨 ESSENTIAL** - Fixed dimensions for grids/galleries/dashboards (parent sets both width AND height)\n    * **⚠️ TEMPORARY:** Fitted format requires style overrides: `<@fields.person @format=\"fitted\" style=\"width: 100%; height: 100%\" />`\n  * `atom`: Minimal inline representation\n  * `edit`: Form for data modification (default provided, override only if needed)\n\n**🔴 CRITICAL:** Modern Boxel cards require ALL THREE display formats: isolated, embedded, AND fitted. Missing custom fitted format will fallback to basic fitted view that won't look very nice or have enough info to show in grids, choosers, galleries, or dashboards.\n\n### Base Card Fields\n\n**IMPORTANT:** Every CardDef automatically inherits these base fields:\n- `title` (StringField) - Used for card headers and tiles\n- `description` (StringField) - Used for card summaries\n- `thumbnailURL` (StringField) - Used for card preview images\n- `info` (reserved) - Future use\n\n**✅ You CAN override these inherited fields with computed versions:**\n```gts\n// ✅ CORRECT - Override inherited title with computed version\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nexport class BlogPost extends CardDef {\n  @field headline = contains(StringField); // Your primary field\n  \n  // Override parent's title with computed version\n  @field title = contains(StringField, {\n    computeVia: function() { return this.headline ?? 'Untitled'; }\n  });\n}\n```\n\n**❌ You CANNOT define the same field twice in your own class:**\n```gts\n// ❌ WRONG - Defining same field name twice\nexport class BlogPost extends CardDef {\n  @field title = contains(StringField);\n  @field title = contains(StringField, { computeVia: ... }); // ERROR!\n}\n```\n\n**Best Practice:** Define your own primary identifier field (e.g., `name`, `headline`, `productName`) and compute the inherited `title` from it:\n\n```gts\nexport class Product extends CardDef { // ¹² Card definition\n  @field productName = contains(StringField); // ¹³ Primary field - NOT 'title'!\n  @field price = contains(NumberField);\n  \n  // ¹⁴ Compute the inherited title from your primary field\n  @field title = contains(StringField, {\n    computeVia: function(this: Product) {\n      const name = this.productName ?? 'Unnamed Product';\n      const price = this.price ? ` - ${this.price}` : '';\n      return `${name}${price}`;\n    }\n  });\n}\n```\n\n**⚠️ CRITICAL: Keep computed titles simple and unidirectional**\n- Only reference OTHER fields, never self-reference\n- Don't create circular dependencies between computed fields\n- Keep logic simple - just format/combine existing field values\n- If complex logic is needed, compute from base fields only\n\n**Remember:** When implementing via SEARCH/REPLACE, include tracking markers ⁿ\n\n## Decision Trees\n\n**Data Structure Choice:**\n```\nNeeds own identity? → CardDef with linksTo\nReferenced from multiple places? → CardDef with linksTo  \nJust compound data? → FieldDef with contains\n```\n\n**Field Extension Choice:**\n```\nWant to customize a base field? → import BaseField, extend it\nCreating new field type? → extends FieldDef directly\nAdding to existing field? → extends BaseFieldName\n```\n\n**Value Setup:**\n```\nComputed from other fields? → computeVia\nUser-editable with default? → Field literal or computeVia\nSimple one-time value? → Field literal\n```\n\n**Circular Dependencies?**\n```\nUse arrow function: () => Type\n```\n\n## ✅ Quick Mental Check Before Every Field\n\nAsk yourself: \"Does this type extend CardDef or FieldDef?\"\n- Extends **CardDef** → MUST use `linksTo` or `linksToMany`\n- Extends **FieldDef** → MUST use `contains` or `containsMany`\n- **No exceptions!**\n\nFor computed fields, ask: \"Am I keeping this simple and unidirectional?\"\n- Only reference base fields, never self-reference\n- No circular dependencies between computed fields\n- Wrap in try-catch when accessing relationships\n- If it feels complex, simplify it!\n\n## Template Field Access Patterns\n\n**CRITICAL:** Understanding when to use different field access patterns prevents rendering errors.\n\n| Pattern | Usage | Purpose | Example |\n|---------|-------|---------|---------|\n| `{{@model.title}}` | **Raw Data Access** | Get raw field values for computation/display | `{{@model.title}}` gets the title string |\n| `<@fields.title />` | **Field Template Rendering** | Render field using its own template | `<@fields.title />` renders title field's embedded template |\n| `<@fields.phone @format=\"atom\" />` | **Compound Field Display** | Display compound fields (FieldDef) correctly | Prevents `[object Object]` display |\n| `<@fields.author />` | **Single Field Delegation** | Delegate rendering for ANY field (singular or collection) | Always use `@fields`, even for singular entities |\n| `<@fields.blogPosts @format=\"embedded\" />` | **Auto-Collection Rendering** | Default container automatically iterates collections (**CRITICAL:** Must use `.container > .containsMany-field` selector for spacing) | `<div class=\"items\"><@fields.blogPosts @format=\"embedded\" /></div>` with `.items > .containsMany-field { gap: 1rem; }` |\n| `<@fields.person @format=\"fitted\" style=\"width: 100%; height: 100%\" />` | **Fitted Format Override** | Style overrides required for fitted format (TEMPORARY) | Required for proper fitted rendering |\n| `{{#each @fields.blogPosts as |post|}}` | **Manual Collection Iteration** | Manual loop control with custom rendering | `{{#each @fields.blogPosts as |post|}}<post @format=\"fitted\" />{{/each}}` |\n| `{{get @model.comments 0}}` | **Array Index Access** | Access array elements by index | `{{get @model.comments 0}}` gets first comment |\n| `{{if @model.description @model.description \"No description available\"}}` | **Inline Fallback Values** | Provide defaults for missing values in single line | Shows fallback when description is empty or null |\n| `{{currencyFormat @model.totalCost 'USD'}}` | **Currency Formatting** | Format numbers as currency in templates (use i18n in JS) | `{{currencyFormat @model.totalCost 'USD'}}` shows $1,234.56 |\n| `{{formatDateTime @model.publishDate 'MMM D, YYYY'}}` | **Date Formatting** | Format dates in templates (use i18n in JS) | `{{formatDateTime @model.publishDate 'MMM D, YYYY'}}` shows Jan 15, 2025 |\n| `<PrerenderedCardSearch>` | **Query Result Display** | Live card search with real-time updates | See Query System section |\n\n### ⚠️ CRITICAL: @model Iteration vs @fields Delegation\n\n**Once you iterate with @model, you CANNOT delegate to @fields within that iteration.**\n\n```hbs\n<!-- ❌ BREAKS: Mixing @model iteration with @fields delegation -->\n{{#each @model.teamMembers as |member|}}\n  <@fields.member @format=\"embedded\" />  <!-- NO ACCESS to @fields.member -->\n{{/each}}\n\n<!-- ✅ OPTION 1: Use delegated rendering for the whole collection -->\n<@fields.teamMembers @format=\"embedded\" />\n\n<!-- ✅ OPTION 2: Commit to full @model control -->\n{{#each @model.teamMembers as |member|}}\n  <div class=\"custom-member\">{{member.name}}</div>\n{{/each}}\n\n<!-- ✅ OPTION 3: If filtering needed, use query patterns -->\n<!-- Use PrerenderedCardSearch or getCards for filtered collections -->\n```\n\n**Why this breaks:** @fields provides field-level components. Once you're iterating with @model, you're working with raw data, not field components.\n\n**Decision Rule:** Before iterating, decide:\n- Need composability? → Use delegated rendering\n- Need filtering? → Use query patterns (PrerenderedCardSearch/getCards)\n- Need custom control? → Use @model but handle ALL rendering yourself\n\n### Styling Responsibility Model\n\n**Core Rule: Container provides frame, content provides data**\n\n**Visual Chrome (border, shadow, radius, background):**\n- **Isolated/Embedded/Fitted/Edit:** Parent or CardContainer handles\n- **Atom:** Self-styles (inline use case)\n\n**Layout:** Parent controls container dimensions and spacing via `.containsMany-field`\n\n## Format Dimensions Comparison\n\n| Format | Width | Height | Parent Sets | Key Behavior |\n|--------|-------|--------|-------------|--------------|\n| **Isolated** | Max-width + centered | Natural + scrollable | ❌ Neither | Full viewport available |\n| **Embedded** | Fills container | Natural (parent can limit) | ✅ Width only | Parent can add \"view more\" controls |\n| **Fitted** | Fills exactly | Fills exactly | ✅ **Both** | Must set width AND height |\n| **Atom** | Inline/shrink to fit | Inline | ❌ Neither | Self-contained sizing |\n| **Edit** | Fills container | Natural form height | ✅ Width only | Grows with fields |\n\n### Embedded Height Control Pattern\n```css\n/* Parent can limit embedded height with expand control */\n.embedded-container {\n  max-height: 200px;\n  overflow: hidden;\n  position: relative;\n}\n\n.embedded-container.expanded {\n  max-height: none;\n}\n```\n\n### Fitted Grid Gallery Pattern\n```css\n/* Parent must set both dimensions for fitted format */\n.photo-gallery > .containsMany-field {\n  display: grid;\n  grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));\n  grid-auto-rows: 300px;  /* Fixed height required for fitted */\n  gap: 1rem;\n}\n/* Fitted items automatically fill cell via temporary rule: style=\"width: 100%; height: 100%\" */\n```\n\n### Quick Rule: Embedded vs Fitted\n**Embedded:** Like paragraphs - flow naturally, parent can truncate  \n**Fitted:** Like photos - exact dimensions required\n\n### Displaying Compound Fields\n\n**CRITICAL:** When displaying compound fields (FieldDef types) like `PhoneNumberField`, `AddressField`, or custom field definitions, you must use their format templates, not raw model access:\n\n```hbs\n<!-- ❌ WRONG: Shows [object Object] -->\n<p>Phone: {{@model.phone}}</p>\n\n<!-- ✅ CORRECT: Uses the field's atom format -->\n<p>Phone: <@fields.phone @format=\"atom\" /></p>\n\n<!-- ✅ CORRECT: For full field display -->\n<div class=\"contact-info\">\n  <@fields.phone @format=\"embedded\" />\n</div>\n```\n\n**💡 Line-saving tip:** Keep self-closing tags compact:\n```hbs\n<!-- Good: Saves vertical space -->\n<@fields.author @format=\"embedded\" />\n<@fields.phone @format=\"atom\" />\n```\n\n### @fields Delegation Rule\n\n**CRITICAL:** When delegating to embedded/fitted formats, you must iterate through `@fields`, not `@model`. Always use `@fields` for delegation, even for singular fields. See \"⚠️ CRITICAL: @model Iteration vs @fields Delegation\" section for why you cannot mix these patterns.\n\n```hbs\n<!-- ✅ CORRECT: Using @fields for both singular and collection fields -->\n<@fields.author @format=\"embedded\" />\n<@fields.items @format=\"embedded\" />\n{{#each @fields.items as |item|}}\n  <item @format=\"embedded\" />\n{{/each}}\n\n<!-- ❌ WRONG: Can't iterate @model then try to delegate to @fields -->\n{{#each @model.items as |item|}}\n  <@fields.??? @format=\"embedded\" /> <!-- This won't work -->\n{{/each}}\n```\n\n**Line-saving tip:** Put `/>` on the end of the previous line for self-closing tags:\n```hbs\n<!-- Instead of: -->\n<@fields.author @format=\"embedded\" \n/>\n\n<!-- Use: -->\n<@fields.author @format=\"embedded\" />\n```\n\n**containsMany Spacing Pattern:** Due to an additional wrapper div, target `.containsMany-field`:\n```css\n/* For grids */\n.products-grid > .containsMany-field {\n  display: grid;\n  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));\n  gap: 1rem;\n}\n\n/* For lists */\n.items-list > .containsMany-field {\n  display: flex;\n  flex-direction: column;\n  gap: 0.75rem;\n}\n```\n\n## Template Fallback Value Patterns\n\n**CRITICAL:** Boxel cards boot with no data by default. Templates must gracefully handle null, undefined, and empty string values at ALL levels of data access to prevent runtime errors and provide meaningful visual fallbacks.\n\n### Three Primary Patterns for Fallbacks\n\n**1. Inline if/else (for simple display fallbacks):**\n```hbs\n<span>{{if @model.eventTime (formatDateTime @model.eventTime \"MMM D, h:mm A\") \"Event time to be announced\"}}</span>\n<h2>{{if @model.title @model.title \"Untitled Document\"}}</h2>\n<p>Status: {{if @model.status @model.status \"Status pending\"}}</p>\n```\n\n**2. Block-based if/else (for complex content):**\n```hbs\n<div class=\"event-time\">\n  {{#if @model.eventTime}}\n    <strong>{{formatDateTime @model.eventTime \"MMM D, h:mm A\"}}</strong>\n  {{else}}\n    <em class=\"placeholder\">Event time to be announced</em>\n  {{/if}}\n</div>\n\n{{#if @model.description}}\n  <div class=\"description\">\n    <@fields.description />\n  </div>\n{{else}}\n  <div class=\"empty-description\">\n    <p>No description provided yet. Click to add one.</p>\n  </div>\n{{/if}}\n```\n\n**3. Unless for safety/validation checks (composed with other helpers):**\n```hbs\n{{unless (and @model.isValid @model.hasPermission) \"⚠️ Cannot proceed - missing validation or permission\"}}\n{{unless (or @model.email @model.phone) \"Contact information required\"}}\n{{unless (gt @model.items.length 0) \"No items available\"}}\n{{unless (eq @model.status \"active\") \"Service unavailable\"}}\n```\n\n**Best Practices:** Use descriptive placeholder text rather than generic \"N/A\", style placeholder text differently (lighter color, italic), use `unless` for safety checks and `if` for display fallbacks.\n\n**Icon Usage:** Avoid emoji in templates (unless the application specifically calls for it) due to OS/platform variations that cause legibility issues. Use Boxel icons only for static card/field type icons (displayName properties). In templates, use inline SVG instead since we can't be sure which Boxel icons exist. **Note:** Avoid SVG `url(#id)` references (gradients, patterns) as Boxel cannot route these - use CSS styling instead.\n\n## Template Array Handling Patterns\n\n**CRITICAL:** Templates must gracefully handle all array states to prevent errors. Arrays can be undefined, null, empty, or populated.\n\n### The Three Array States\n\nYour templates must handle:\n1. **Completely undefined arrays** - Field doesn't exist or is null\n2. **Empty arrays** - Field exists but has no items (`[]`)\n3. **Arrays with actual data** - Field has one or more items\n\n### Array Logic Pattern\n\n**❌ WRONG - Only checks for existence:**\n```hbs\n{{#if @model.goals}}\n  <ul class=\"goals-list\">\n    {{#each @model.goals as |goal|}}\n      <li>{{goal}}</li>\n    {{/each}}\n  </ul>\n{{/if}}\n```\n\n**✅ CORRECT - Checks for length and provides empty state:**\n```hbs\n{{#if (gt @model.goals.length 0)}}\n  <div class=\"goals-section\">\n    <h4>\n      <svg class=\"section-icon\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\">\n        <circle cx=\"12\" cy=\"12\" r=\"10\"/>\n        <circle cx=\"12\" cy=\"12\" r=\"6\"/>\n        <circle cx=\"12\" cy=\"12\" r=\"2\"/>\n      </svg>\n      Daily Goals\n    </h4>\n    <ul class=\"goals-list\">\n      {{#each @model.goals as |goal|}}\n        <li>{{goal}}</li>\n      {{/each}}\n    </ul>\n  </div>\n{{else}}\n  <div class=\"goals-section\">\n    <h4>\n      <svg class=\"section-icon\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\">\n        <circle cx=\"12\" cy=\"12\" r=\"10\"/>\n        <circle cx=\"12\" cy=\"12\" r=\"6\"/>\n        <circle cx=\"12\" cy=\"12\" r=\"2\"/>\n      </svg>\n      Daily Goals\n    </h4>\n    <p class=\"empty-state\">No goals set yet. What would you like to accomplish?</p>\n  </div>\n{{/if}}\n```\n\n### Complete Array Handling Example with Required Spacing\n\n```gts\n<template>\n  {{#if (gt @model.teamMembers.length 0)}}\n    <section class=\"team-section\">\n      <h3>Team Members</h3>\n      <div class=\"team-container\">\n        <@fields.teamMembers @format=\"fitted\" />\n      </div>\n    </section>\n  {{else}}\n    <section class=\"team-section\">\n      <h3>Team Members</h3>\n      <div class=\"empty-state\">\n        <p>No team members added yet. Invite your first team member!</p>\n      </div>\n    </section>\n  {{/if}}\n  \n  <style scoped>\n    /* CRITICAL: Target .containsMany-field for proper spacing */\n    .team-container > .containsMany-field {\n      display: flex;\n      flex-direction: column;\n      gap: 0.75rem; /* Essential spacing between delegated items */\n    }\n    \n    .empty-state {\n      text-align: center;\n      padding: 1rem;\n      color: #6b7280;\n      font-style: italic;\n      font-size: 0.8125rem;\n    }\n  </style>\n</template>\n```\n\n**Remember:** When implementing templates via SEARCH/REPLACE, include tracking markers ⁿ for style blocks\n\n## Core Patterns\n\n### 1. Card Definition with Safe Computed Title\n```gts\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nimport { CardDef, field, contains, linksTo, containsMany, linksToMany, Component } from '@cardstack/base/card-api'; // ⁸ Core imports\nimport StringField from '@cardstack/base/string';\nimport DateField from '@cardstack/base/date';\nimport FileTextIcon from '@cardstack/boxel-icons/file-text'; // ⁹ icon import\nimport { Author } from './author';\n\nexport class BlogPost extends CardDef { // ¹⁰ Card definition\n  static displayName = 'Blog Post';\n  static icon = FileTextIcon;  // ✅ CORRECT: Boxel icons for static card/field type icons\n  static prefersWideFormat = true; // Optional: Only for dashboards/apps. Content cards (albums, listings) rarely need this.\n  \n  @field headline = contains(StringField); // ¹¹ Primary identifier - NOT 'title'!\n  @field publishDate = contains(DateField);\n  @field author = linksTo(Author);        // ¹² Reference to another card\n  @field tags = containsMany(TagField);   // ¹³ Multiple embedded fields\n  @field relatedPosts = linksToMany(() => BlogPost); // ¹⁴ Self-reference with arrow function\n  \n  // ¹⁵ Compute the inherited title from primary fields ONLY - keep it simple!\n  @field title = contains(StringField, {\n    computeVia: function(this: BlogPost) {\n      try {\n        const baseTitle = this.headline ?? 'Untitled Post';\n        const maxLength = 50;\n        \n        if (baseTitle.length <= maxLength) return baseTitle;\n        return baseTitle.substring(0, maxLength - 3) + '...';\n      } catch (e) {\n        console.error('BlogPost: Error computing title', e);\n        return 'Untitled Post';\n      }\n    }\n  });\n}\n```\n\n### WARNING: Do NOT Use Constructors for Default Values\n\n**CRITICAL:** Constructors should NOT be used for setting default values in Boxel cards. Use template fallbacks (if field is editable) or computeVia (only if field is strictly read-only) instead.\n\n```gts\n// ❌ WRONG - Never use constructors for defaults\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nexport class Todo extends CardDef {\n  constructor(owner: unknown, args: {}) {\n    super(owner, args);\n    this.createdDate = new Date(); // DON'T DO THIS\n    this.isCompleted = false;      // DON'T DO THIS\n  }\n}\n```\n\n### **CRITICAL: NEVER Create JavaScript Objects in Templates**\n\n**Templates are for simple display logic only.** Never call constructors, create objects, or perform complex operations in template expressions.\n\n```hbs\n<!-- ❌ WRONG: Creating objects in templates -->\n<span>{{if @model.currentMonth @model.currentMonth (formatDateTime (new Date()) \"MMMM YYYY\")}}</span>\n<div>{{someFunction(@model.data)}}</div>\n\n<!-- ✅ CORRECT: Move logic to JavaScript computed properties -->\n<span>{{if @model.currentMonth @model.currentMonth this.currentMonthDisplay}}</span>\n<div>{{this.processedData}}</div>\n```\n\n```gts\n// ✅ CORRECT: Define logic in JavaScript\nexport class MyCard extends CardDef { // ²⁴ Card definition\n  get currentMonthDisplay() {\n    return new Intl.DateTimeFormat('en-US', { \n      month: 'long', \n      year: 'numeric' \n    }).format(new Date());\n  }\n  \n  get processedData() {\n    return this.args.model?.data ? this.processData(this.args.model.data) : 'No data';\n  }\n  \n  private processData(data: any) {\n    // Complex processing logic here\n    return result;\n  }\n}\n```\n\n### 2. Field Definition (Always Include Embedded Template)\n\n**CRITICAL:** Every FieldDef file must import FieldDef and MUST be exported:\n\n```gts\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nimport { FieldDef, field, contains, Component } from '@cardstack/base/card-api'; // ¹⁶ Core imports\nimport StringField from '@cardstack/base/string';\nimport LocationIcon from '@cardstack/boxel-icons/map-pin'; // ¹⁷ icon import\n\n// Creating a new field from scratch\nexport class AddressField extends FieldDef { // ¹⁸ Field definition\n  static displayName = 'Address';\n  static icon = LocationIcon; // ✅ CORRECT: Boxel icons for static card/field type icons\n  \n  @field street = contains(StringField); // ¹⁹ Component fields\n  @field city = contains(StringField);\n  @field postalCode = contains(StringField);\n  @field country = contains(StringField);\n  \n  // ²⁰ Always create embedded template for FieldDefs\n  static embedded = class Embedded extends Component<typeof this> {\n    <template>\n      <div class=\"address\">\n        {{#if @model.street}}\n          <div><@fields.street /></div>\n        {{else}}\n          <div class=\"placeholder\">Street address not provided</div>\n        {{/if}}\n        \n        <div>\n          {{if @model.city @model.city \"City\"}}{{if @model.postalCode (concat \", \" @model.postalCode) \"\"}}\n        </div>\n        \n        {{#if @model.country}}\n          <div><@fields.country /></div>\n        {{else}}\n          <div class=\"placeholder\">Country not specified</div>\n        {{/if}}\n      </div>\n      \n      <style scoped> /* ²¹ Component styles */\n        /* Minimal styling for placeholders */\n        .placeholder {\n          font-style: italic;\n        }\n      </style>\n    </template>\n  };\n}\n\n// ✅ CORRECT: Extending a base field for customization\nimport BaseAddressField from '@cardstack/base/address';\n\nexport class EnhancedAddressField extends BaseAddressField { // ²⁵ Extended field\n  static displayName = 'Enhanced Address';\n  \n  // ²⁶ Add new fields to the base\n  @field apartment = contains(StringField);\n  @field instructions = contains(StringField);\n  \n  // ²⁷ Override templates as needed\n  static embedded = class Embedded extends Component<typeof this> {\n    <template>\n      <!-- Custom template that includes new fields -->\n    </template>\n  };\n}\n```\n\n### 3. Computed Properties with Safety\n\n**CRITICAL:** Avoid cycles and infinite recursion in computed fields.\n\n```gts\n// ❌ DANGEROUS: Self-reference causes infinite recursion\n@field title = contains(StringField, {\n  computeVia: function(this: BlogPost) {\n    return this.title || 'Untitled'; // ❌ Refers to itself - STACK OVERFLOW!\n  }\n});\n\n// ❌ DANGEROUS: Circular dependency between computed fields\n@field displayName = contains(StringField, {\n  computeVia: function(this: Person) {\n    return this.formattedName; // refers to formattedName\n  }\n});\n@field formattedName = contains(StringField, {\n  computeVia: function(this: Person) {\n    return `Name: ${this.displayName}`; // refers back to displayName - CYCLE!\n  }\n});\n\n// ✅ SAFE: Reference only base fields, keep it unidirectional\n@field fullName = contains(StringField, { // ²⁸ Computed field\n  computeVia: function(this: Person) {\n    try {\n      const first = this.firstName ?? '';\n      const last = this.lastName ?? '';\n      const full = `${first} ${last}`.trim();\n      return full || 'Name not provided';\n    } catch (e) {\n      console.error('Person: Error computing fullName', e);\n      return 'Name unavailable';\n    }\n  }\n});\n\n// ✅ SAFE: Computed title from primary fields only with error handling\n@field title = contains(StringField, { // ²⁹ Safe computed title\n  computeVia: function(this: BlogPost) {\n    try {\n      const headline = this.headline ?? 'Untitled Post';\n      const date = this.publishDate ? ` (${new Date(this.publishDate).getFullYear()})` : '';\n      return `${headline}${date}`;\n    } catch (e) {\n      console.error('BlogPost: Error computing title', { error: e, headline: this.headline });\n      return 'Untitled Post';\n    }\n  }\n});\n```\n\n### 4. Templates with Proper Computation Patterns\n\n**Remember:** When implementing templates via SEARCH/REPLACE, track all major sections with ⁿ and include the post-block notation `╰ ⁿ⁻ᵐ`\n\n```gts\nstatic isolated = class Isolated extends Component<typeof BlogPost> { // ³⁰ Isolated format\n  @tracked showComments = false;\n  \n  // ³¹ CRITICAL: Do ALL computation in functions, never in templates\n  get safeTitle() {\n    try {\n      return this.args?.model?.title ?? 'Untitled Post';\n    } catch (e) {\n      console.error('BlogPost: Error accessing title', e);\n      return 'Untitled Post';\n    }\n  }\n  \n  get commentButtonText() {\n    try {\n      const count = this.args?.model?.commentCount ?? 0;\n      return this.showComments ? `Hide Comments (${count})` : `Show Comments (${count})`;\n    } catch (e) {\n      console.error('BlogPost: Error computing comment button text', e);\n      return this.showComments ? 'Hide Comments' : 'Show Comments';\n    }\n  }\n  \n  toggleComments = () => {\n    this.showComments = !this.showComments;\n  }\n  \n  <template>\n    <!-- ³² Responsive Stage/Mat Pattern -->\n    <div class=\"stage\">\n      <article class=\"blog-post-mat\">\n        <header>\n          <time>{{if @model.publishDate (formatDateTime @model.publishDate 'MMMM D, YYYY') \"Date not set\"}}</time>\n          <h1>{{this.safeTitle}}</h1>\n          \n          {{#if @fields.author}}\n            <@fields.author />\n          {{else}}\n            <div class=\"author-placeholder\">Author not specified</div>\n          {{/if}}\n        </header>\n        \n        <div class=\"post-content\">\n          {{#if @model.body}}\n            <@fields.body />\n          {{else}}\n            <div class=\"content-placeholder\">\n              <p>No content has been written yet. Click to start writing!</p>\n            </div>\n          {{/if}}\n        </div>\n        \n        <!-- ³³ Handle arrays with REQUIRED spacing -->\n        {{#if (gt @model.tags.length 0)}}\n          <div class=\"tags-section\">\n            <h4>Tags</h4>\n            <div class=\"tags-container\">\n              <@fields.tags @format=\"atom\" />\n            </div>\n          </div>\n        {{/if}}\n        \n        {{#if (gt @model.commentCount 0)}}\n          <Button \n            @variant=\"ghost\" \n            class=\"comment-button\"\n            {{on 'click' this.toggleComments}}\n          >\n            <svg class=\"button-icon\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\">\n              <path d=\"M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z\"/>\n            </svg>\n            {{this.commentButtonText}}\n          </Button>\n        {{/if}}\n        \n        {{#if this.showComments}}\n          <section class=\"comments-section\">\n            <h3>Discussion</h3>\n            {{#if (gt @model.comments.length 0)}}\n              <div class=\"comments-container\">\n                <@fields.comments @format=\"embedded\" />\n              </div>\n            {{else}}\n              <p class=\"no-comments\">No comments yet. Be the first to share your thoughts!</p>\n            {{/if}}\n          </section>\n        {{/if}}\n      </article>\n    </div>\n    \n    <style scoped> /* ³⁴ Component styles */\n      /* Responsive Stage: Hide below 800px to save space */\n      .stage {\n        width: 100%;\n        height: 100%;\n        display: flex;\n        justify-content: center;\n        padding: 0.5rem;\n      }\n      \n      @media (max-width: 800px) {\n        .stage {\n          padding: 0;\n        }\n      }\n      \n      /* Mat: Content area - MUST be scrollable with generous padding */\n      .blog-post-mat {\n        max-width: 42rem;\n        width: 100%;\n        padding: 2rem; /* Generous padding for comfortable reading */\n        overflow-y: auto;\n        max-height: 100%;\n        font-size: 0.875rem;\n        line-height: 1.3;\n      }\n      \n      @media (max-width: 800px) {\n        .blog-post-mat {\n          max-width: none;\n          height: 100%;\n          padding: 1.5rem; /* Maintain comfortable padding on mobile */\n        }\n      }\n      \n      /* Within cards: tight, dense spacing and smaller fonts */\n      .post-header h1 {\n        font-size: 1.125rem;\n        margin-bottom: 0.5rem;\n        line-height: 1.2;\n      }\n      \n      .post-content {\n        font-size: 0.8125rem;\n        line-height: 1.25;\n      }\n      \n      /* ³⁵ CRITICAL: Always style buttons completely - never use unstyled */\n      .comment-button {\n        /* Style Boxel components to match your design */\n        padding: 0.5rem 0.75rem;\n        font-size: 0.8125rem;\n        display: inline-flex;\n        align-items: center;\n        gap: 0.375rem;\n      }\n      \n      .comment-button .button-icon {\n        width: 1rem;\n        height: 1rem;\n      }\n      \n      /* ³⁶ CRITICAL: Spacing for containsMany collections */\n      .tags-container > .containsMany-field {\n        display: flex;\n        flex-wrap: wrap;\n        gap: 0.25rem; /* Essential spacing between tags */\n      }\n      \n      .comments-container > .containsMany-field {\n        display: flex;\n        flex-direction: column;\n        gap: 0.75rem; /* Essential spacing between comments */\n      }\n    </style>\n  </template>\n};\n```\n\n## Design Philosophy and Competitive Styling\n\n**Design and implement your stylesheet to fit the domain you are generating.** Research the top 2 products/services in that area and design your card as if you are the 3rd competitor looking to one-up the market in terms of look and feel, functionality, and user-friendliness.\n\n**Approach:** Study the leading players' design patterns, then create something that feels more modern, intuitive, and polished. Focus on micro-interactions, thoughtful spacing, superior visual hierarchy, and removing friction from user workflows.\n\n**Key Areas to Compete On:**\n- **Visual Polish:** Better typography, spacing, and color schemes\n- **Interaction Design:** Smoother animations, better feedback, clearer affordances\n- **Information Architecture:** More logical organization, better progressive disclosure\n- **Accessibility:** Superior contrast, keyboard navigation, screen reader support\n- **Performance:** Faster loading, smoother animations, responsive design\n\n**Typography Guidance:** Always discern what typeface would be best for the specific domain. Don't default to Boxel or OS fonts - use proven and popular Google fonts whenever possible. \n\nChoose modern, readable fonts that match your design's personality. Clean sans-serifs like Inter, Roboto, Open Sans, Source Sans Pro, DM Sans, Work Sans, Manrope, or Plus Jakarta Sans work great for body text. For headings, consider geometric fonts (Montserrat, Space Grotesk, Raleway, Poppins), bold condensed options (Bebas Neue, Archivo Black, Oswald, Anton), or elegant serifs (Playfair Display, Lora, Merriweather, Crimson Text). Add character with rounded alternatives (Nunito, Comfortaa), industrial styles (Barlow, Righteous), or even scripts where appropriate (Pacifico, Dancing Script). The key is balancing readability with visual impact – pick fonts that enhance your content's tone while staying legible across all devices. Feel free to explore beyond these suggestions to find what best fits your design vision.\n\n\n## Design Token Foundation\n\n**Dense professional layouts with thoughtful scaling:**\n\n**Typography:** Start at 0.8125rem (13px) base, scale in small increments\n* Body: 0.8125rem, Labels: 0.875rem, Headings: 1rem-1.25rem\n\n**Spacing:** Tight but breathable, using 0.25rem (4px) increments\n* Inline: 0.25-0.5rem, Sections: 0.75-1rem, Major breaks: 1.5-2rem\n\n**Brand Customization:** Define your unique identity\n* Colors: Primary, secondary, accent, surface, text\n* Fonts: Choose domain-appropriate Google fonts (never default to system)\n* Radius: Match the aesthetic (sharp for technical, soft for friendly)\n\n**Font Selection:** Always choose fonts that match your domain's character. Use proven Google fonts that align with the emotional tone and professional context of your specific application.\n\n## CSS Safety Rules\n\n### Critical CSS Safety Rules\n\n**Scoped Styles:** ALWAYS use `<style scoped>` inside `<template>`. This prevents styles from leaking out.\n\n**CSS Comments:** **NEVER** use `//` single-line comments in CSS within `<style scoped>` tags. **ONLY** use `/* */` block comments. Single-line comments cause parsing errors that break rendering.\n\n```css\n/* ✅ CORRECT: Block comments */\n.my-component {\n  /* This is a proper CSS comment */\n  color: blue;\n}\n\n/* ❌ WRONG: Single-line comments break parsing */\n.my-component {\n  // This will cause errors!\n  color: blue;\n}\n```\n\n**AVOID GLOBAL CSS SELECTORS:** NEVER use `:root`, `:global`, or other global CSS selectors (like `body`, `html`, or global class selectors without component prefixes). In component-based systems like Boxel, all styles MUST be scoped to the component.\n\n```css\n/* ❌ INCORRECT - NEVER DO THIS */\n:root {\n  --primary-color: #007bff;\n  --spacing-unit: 8px;\n}\n\n/* ✅ CORRECT - ALWAYS SCOPE TO COMPONENT */\n.my-component {\n  --primary-color: #007bff;\n  --spacing-unit: 8px;\n}\n\n.my-component .child-element {\n  color: var(--primary-color);\n  margin-bottom: var(--spacing-unit);\n}\n```\n\n**Containment Principle:** NEVER use fixed or absolute positioning to create overlays, floating buttons, or toasts that extend beyond the card's boundaries. All UI elements must remain within their designated bounding box.\n\n**Z-Index Conservation:** Be conservative with z-index values. Keep them as low as possible (preferably under 10) since many elements of the Boxel system are overlays. High z-index values can interfere with Boxel's built-in overlays, modals, and dropdowns.\n\n```css\n/* ✅ CORRECT: Conservative z-index usage */\n.my-component .tooltip {\n  z-index: 1; /* Just enough to float above content */\n}\n\n.my-component .dropdown {\n  z-index: 2; /* Slightly higher for dropdowns */\n}\n\n/* ❌ WRONG: Excessive z-index values */\n.my-component .popup {\n  z-index: 9999; /* Will conflict with Boxel overlays! */\n}\n```\n\n### CSS Variable Scoping\n\n**Best Practice:** NEVER assume CSS variables exist; always define them in each template/format to ensure components work correctly in isolation.\n\n```css\n.card-component {\n  /* Define all variables at component root */\n  --card-padding: 1rem;\n  --card-radius: 0.5rem;\n  --card-shadow: 0 2px 4px rgba(0,0,0,0.1);\n  \n  /* Use with fallbacks */\n  padding: var(--card-padding, 1rem);\n  border-radius: var(--card-radius, 0.5rem);\n  box-shadow: var(--card-shadow, none);\n}\n```\n\n### Dynamic Styling with Field Values\n\nApply field values as CSS properties in Boxel components:\n\n**1. Inline style attributes:**\n```hbs\n<div style={{concat \"color: \" @model.textColor}}>Text content</div>\n```\n\n**2. Dynamic class names:**\n```hbs\n<div class={{concat \"theme-\" @model.colorTheme}}>Content</div>\n```\n\n**3. CSS custom properties (variables):**\n```hbs\n<div style={{concat \"--accent: \" @model.accentColor}}>\n  <h2 class=\"heading\">Title</h2>\n</div>\n```\n```css\n.heading {\n  color: var(--accent, #333); /* Default fallback */\n  border-bottom: 1px solid var(--accent, #333);\n}\n```\n\n**Complete ColorField Example:**\n```gts\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nimport { CardDef, field, contains, Component } from '@cardstack/base/card-api';\nimport StringField from '@cardstack/base/string';\nimport ColorField from '@cardstack/base/color';\nimport { concat } from '@ember/helper';\n\nexport class ColoredCard extends CardDef {\n  @field title = contains(StringField);\n  @field primaryColor = contains(ColorField);\n  \n  static isolated = class Isolated extends Component<typeof ColoredCard> {\n    <template>\n      <div class=\"card\" style={{concat \"--primary: \" @model.primaryColor}}>\n        <h2>{{@model.title}}</h2>\n      </div>\n      \n      <style scoped>\n        .card {\n          --primary: #ffffff; /* Default value */\n          background-color: var(--primary);\n          padding: 16px;\n          border-radius: 8px;\n        }\n        h2 { \n          color: var(--text-color, #000); \n        }\n      </style>\n    </template>\n  };\n}\n```\n\n### Advanced Dynamic CSS Patterns\n\n**Module-scoped CSS generators with sanitization:**\n\n```gts\nimport { htmlSafe } from '@ember/template';\nimport { sanitizeHtml } from '@cardstack/runtime-common';\n\n// Sanitization helper\nfunction sanitize(html: string) {\n  return htmlSafe(sanitizeHtml(html));\n}\n\n// Size helper\nconst setContainerSize = ({ width, height }) => {\n  return sanitize(`width: ${width}px; height: ${height}px`);\n};\n\n// Background image helper\nconst setBackgroundImage = (backgroundURL) => {\n  if (!backgroundURL) return;\n  return sanitize(`background-image: url(${backgroundURL});`);\n};\n\n// Complex styling helper\nconst setCardStyle = (model) => {\n  if (!model) return;\n  \n  const styles = [];\n  \n  if (model.cssVariables) styles.push(model.cssVariables);\n  if (model.borderStyle) styles.push(`border-style: ${model.borderStyle}`);\n  if (model.opacity) styles.push(`opacity: ${model.opacity}`);\n  if (model.transform) styles.push(`transform: ${model.transform}`);\n  \n  return styles.length ? sanitize(styles.join('; ')) : undefined;\n};\n```\n\n**Usage in templates - CRITICAL syntax:**\n```hbs\n<!-- ✅ CORRECT: Space-separated Handlebars syntax -->\n<div class=\"container\" style={{setContainerSize spec}} />\n<div class=\"bg-element\" style={{setBackgroundImage @model.backgroundURL}} />\n<div class=\"card\" style={{this.getThemeStyles \"header\"}} />\n\n<!-- ❌ INCORRECT: JavaScript-style parentheses -->\n<div class=\"card\" style={{this.getThemeStyles('header')}}></div>\n```\n\n**NEVER attempt dynamic values in `<style>` tags:**\n```hbs\n<style scoped>\n  /* ❌ INCORRECT - This does NOT work */\n  .container { \n    width: {{@model.width}}px; /* Will not be processed */\n  }\n</style>\n```\n\n### Common CSS Errors to Avoid\n\n1. **Not scoping styles** - Always use `<style scoped>`\n2. **Using `//` comments in CSS** - Only use `/* */`\n3. **Global selectors** - Never use `:root`, `:global`, `body`, etc.\n4. **Fixed positioning** - Keep everything within card boundaries\n5. **Missing CSS variable definitions** - Define all variables you use\n6. **No fallback values** - Always provide defaults: `var(--color, #default)`\n7. **Hardcoded pixels** - Use variables for consistency\n8. **Dynamic values in `<style>` tags** - Use style attributes instead\n9. **Excessive z-index values** - Keep under 10 to avoid conflicts with Boxel overlays\n\n## Creative Sample Data\n\n**Generate unique, believable scenarios for every creation.** Avoid lazy clichés and overused examples.\n\n**Sample Data Requirements:**\n* **Limit to 3 instances per card/field type** - unless more needed for template functionality\n* **Always randomize:** Use current prompt as seed - never repeat the same fictional cast\n* **Create depth:** Characters with believable backgrounds and authentic motivations\n* **Industry-specific:** Match the domain with appropriate terminology and scenarios\n* **Global perspective:** Mix cultural backgrounds, time zones, and locations\n* **Recent dates:** Use 2024/2025 for contemporary relevance\n\n## Generation Guidelines\n\n### Code Generation Limits\n\n**CRITICAL: Limit code generation to maximum 4500 lines total across all .gts definition files per user prompt, devoting about 1/3 of the lines to styling to ensure elevated design aesthetics.** Sample data (.json files) are excluded from this limit.\n\n**One-Shot Complexity Management:**\n- **1 primary CardDef** - The main interactive entity users will work with\n- **Additional CardDefs (max 2 more) ONLY if** implementing drill-down navigation via CardContainer pattern\n- **All other entities as FieldDefs** - Rich compound fields for embedded data\n- **This approach ensures:** Navigational simplicity, faster comprehension, easier evolution\n\n**CRITICAL: Use SEARCH and REPLACE blocks to edit or create .gts or .json files.** All code delivery must use the proper SEARCH/REPLACE syntax for file creation and modification. See Source Code Editing skill for general SEARCH/REPLACE mechanics.\n\n**Note:** If creating outside of an environment with Source Code Editing enabled, omit the SEARCH/REPLACE syntax and only return the content within the REPLACE block.\n\n**Prioritize:**\n- Complete, polished primary card implementation\n- Rich interactivity and state management\n- Professional styling with animations and transitions\n- Comprehensive empty states and error handling\n- Clear extension points for future development\n\n**Remember:** Include tracking markers ⁿ in all SEARCH/REPLACE blocks for .gts files\n\n## Boxel UI Helpers Reference\n\n### Logic & Comparison Helpers\n**Import:** `import { eq, gt, gte, lt, lte, and, or, not } from '@cardstack/boxel-ui/helpers';`\n\n- `{{eq a b}}` - Strict equality check\n- `{{gt a b}}` / `{{lt a b}}` - Greater/less than comparison  \n- `{{and val1 val2 ...}}` - All values truthy\n- `{{or val1 val2 ...}}` - Any value truthy\n- `{{not val}}` - Invert truthiness\n\n### Math Helpers\n**Import:** `import { add, subtract, multiply, divide } from '@cardstack/boxel-ui/helpers';`\n\n### 🎨 Boxel Formatters\n\n#### Overview: Template Helpers + JavaScript Functions\n\nThe advanced formatter system provides rich, locale-aware formatting that works **both as template helpers AND JavaScript functions**. This dual nature gives you maximum flexibility for internationalized display formatting.\n\n**Key Advantages over Basic Helpers:**\n\n- **Full internationalization** - Locale-aware formatting for global applications\n- **Size variants** - From `tiny` (1.2M) to `long` (1.2 million dollars)\n- **Smart formatting** - Relative time, humanized durations, cultural name ordering\n- **Dual usage** - Same formatter works in templates AND JavaScript\n- **Rich options** - Precision control, fallbacks, custom formats\n\n**Import:** `import {\n  formatDateTime,\n  formatCurrency,\n  formatNumber,\n  formatDuration,\n  formatList,\n  formatFileSize,\n  formatOrdinal,\n  formatAge,\n  formatCountdown,\n  formatNames,\n  formatPeriod,\n  formatRelativeTime\n} from '@cardstack/boxel-ui/helpers';`  \n\n#### Benefits of Formatter Helpers\n\n| Feature | Benefits |\n|---------|-------------------|\n| **Template Usage** | `{{formatDateTime date size=\"short\"}}` |\n| **JavaScript Usage** | `formatDateTime(date, { size: 'short' })` |\n| **Localization** | Full i18n support |\n| **Size Variants** | tiny, short, medium, long |\n| **Fallback Values** | Built-in fallback option |\n| **Smart Features** | Relative time, Excel dates, compact notation |\n\n#### Where to Use Formatters\n\n| Location | Usage | Example |\n|----------|-------|---------|\n| **Templates (Direct)** | ✅ Use as helpers | `{{formatCurrency @model.price currency=\"EUR\"}}` |\n| **Component Getters** | ✅ JavaScript functions | `get displayPrice() { return formatCurrency(this.args.model?.price); }` |\n| **Component Methods** | ✅ JavaScript functions | `formatUpdateTime(date) { return formatDateTime(date, { relative: true }); }` |\n| **NOT in computeVia** | ❌ Preserves field data type | Fields should contain raw data, not formatted strings |\n\n#### 📊 Complete Formatter API Reference\n\n**All formatters work as both template helpers and JavaScript functions.** The same parameters apply in both contexts.\n\n| Formatter | Purpose | Options | Size Variants | Special Features |\n|-----------|---------|---------|---------------|------------------|\n| **formatDateTime** | Dates & times | `size`, `format`, `relative`, `parse`, `locale`, `fallback` | **tiny**: \"3:45 PM\" or \"3/15\"<br>**short**: \"Today\" or \"Mar 15\"<br>**medium**: \"Mar 15, 2024\"<br>**long**: \"Friday, March 15, 2024\" | • Relative time (\"2 hours ago\")<br>• Excel serial dates<br>• Auto-detects current year |\n| **formatCurrency** | Money values | `currency`, `size`, `locale`, `fallback` | **tiny**: \"$1.2M\"<br>**short**: \"$1,235\"<br>**medium**: \"$1,234.56\"<br>**long**: \"1,234.56 US dollars\" | • Compact notation for large amounts<br>• Locale-specific symbols<br>• Multi-currency support |\n| **formatNumber** | Numbers & percentages | `style`, `size`, `minimumFractionDigits`, `maximumFractionDigits`, `locale`, `fallback` | **tiny**: \"1.2M\", \"15%\"<br>**short**: \"1,235\", \"15.6%\"<br>**medium**: \"1,234.56\"<br>**long**: \"1,234.5678\" | • Percentage formatting<br>• Compact notation<br>• Precision control |\n| **formatDuration** | Time spans | `unit`, `format`, `locale`, `fallback` | **humanize**: \"2 hours\"<br>**timer**: \"2:15:30\"<br>**short**: \"2h 15m\"<br>**long**: \"2 hours, 15 minutes\" | • Multiple input units<br>• Timer display format<br>• Human-friendly rounding |\n| **formatList** | Arrays to text | `style`, `type`, `locale`, `fallback` | **long**: \"A, B, and C\"<br>**short**: \"A, B, C\"<br>**narrow**: \"A B C\" | • Conjunction types<br>• Locale-aware separators<br>• Oxford comma support |\n| **formatFileSize** | Byte amounts | `binary`, `precision`, `locale`, `fallback` | N/A | • Binary (1024) vs decimal (1000)<br>• Auto-scaling units |\n| **formatOrdinal** | Ordinal numbers | `locale`, `fallback` | N/A | • Language-specific rules<br>• \"1st\", \"2nd\", \"3rd\", etc. |\n| **formatAge** | Age from birthdate | `unit`, `precise`, `locale`, `fallback` | **auto**: Smart unit selection<br>**years/months/days**: Force specific unit | • Precise mode: \"1 year, 3 months\"<br>• Auto-selects appropriate unit |\n| **formatCountdown** | Time until date | `showDays`, `showHours`, `showMinutes`, `showSeconds`, `locale`, `fallback` | N/A | • Configurable components<br>• \"Expired\" for past dates |\n| **formatNames** | Name formatting | `format`, `includeMiddle`, `separator`, `locale`, `fallback` | **full**: \"John Q. Smith\"<br>**initials**: \"J.Q.S.\"<br>**first-last**: \"John Smith\"<br>**last-first**: \"Smith, John\" | • Handles name objects or strings<br>• Cultural name orders |\n| **formatPeriod** | Time periods | `size`, `withRange`, `locale`, `fallback` | **tiny**: \"Q1\"<br>**short**: \"Q1 24\"<br>**long**: \"Quarter 1, 2024\" | • Quarter/month/week parsing<br>• Optional date ranges |\n| **formatRelativeTime** | Relative timestamps | `size`, `locale`, `fallback` | **tiny**: \"2h\", \"3d\"<br>**medium**: \"2 hours ago\" | • Compact abbreviations<br>• Auto-scaling units |\n\n### 📐 The Size System: Progressive Detail Levels\n\nThe size variants provide **progressive levels of detail** - from ultra-compact to fully spelled out. Think of it as a **responsive formatting system** that adapts to your available space and context.\n\n#### Core Size Philosophy\n\n| Size | Purpose | Use When |\n|------|---------|----------|\n| **tiny** | Ultra-compact, minimal space | Dashboards, grids, mobile, tooltips |\n| **short** | Abbreviated but clear | Lists, tables, cards |\n| **medium** | Standard, balanced detail | Default display, forms |\n| **long** | Full detail, maximum clarity | Detail views, reports, accessibility |\n\n#### Size Examples by Formatter\n\n#### Currency Sizing\n```javascript\nformatCurrency(1234567.89, { size: 'tiny' })   // \"$1.2M\"\nformatCurrency(1234567.89, { size: 'short' })  // \"$1,234,568\"\nformatCurrency(1234567.89, { size: 'medium' }) // \"$1,234,567.89\"\nformatCurrency(1234567.89, { size: 'long' })   // \"1,234,567.89 US dollars\"\n```\n**Pattern**: Tiny uses suffixes (K/M/B), short drops decimals, medium is standard, long spells out currency name.\n\n##### DateTime Sizing\n```javascript\n// For today at 3:45 PM:\nformatDateTime(date, { size: 'tiny' })   // \"3:45 PM\" (today) or \"3/15\" (other days)\nformatDateTime(date, { size: 'short' })  // \"Today\" or \"Mar 15\"\nformatDateTime(date, { size: 'medium' }) // \"Mar 15, 2024\"\nformatDateTime(date, { size: 'long' })   // \"Friday, March 15, 2024\"\n```\n**Pattern**: Tiny is contextual, short uses human terms, medium drops redundant info, long shows everything.\n\n##### Number Sizing\n```javascript\nformatNumber(1234567, { size: 'tiny' })   // \"1.2M\"\nformatNumber(1234567, { size: 'short' })  // \"1,234,567\"\nformatNumber(1234567, { size: 'medium' }) // \"1,234,567.00\"\n\n// Percentages\nformatNumber(0.156, { style: 'percent', size: 'tiny' })   // \"16%\"\nformatNumber(0.156, { style: 'percent', size: 'short' })  // \"15.6%\"\nformatNumber(0.156, { style: 'percent', size: 'medium' }) // \"15.60%\"\n```\n**Pattern**: Tiny compacts large numbers, short removes decimals, medium/long show precision.\n\n#### Smart Size Selection Patterns\n\n```gts\n// ⁽⁴⁸⁾ Adaptive sizing based on value magnitude\nget priceDisplay() {\n  const price = this.args.model?.price;\n  \n  // Use tiny for millions+, short for thousands, medium for rest\n  const size = price > 1000000 ? 'tiny' : \n               price > 1000 ? 'short' : \n               'medium';\n  \n  return formatCurrency(price, { size });\n}\n\n// ⁽⁴⁹⁾ Responsive sizing based on display context\nget dateDisplay() {\n  const isCompact = this.args.format === 'fitted' || this.args.format === 'atom';\n  \n  return formatDateTime(this.args.model?.date, {\n    size: isCompact ? 'tiny' : 'medium'\n  });\n}\n\n// ⁽⁵⁰⁾ Template example with conditional sizing\n<template>\n  {{#if this.isGridView}}\n    <!-- Compact for grid -->\n    {{formatCurrency @model.revenue size=\"tiny\"}}\n    {{formatDateTime @model.lastUpdate size=\"tiny\"}}\n  {{else}}\n    <!-- Standard for list/detail -->\n    {{formatCurrency @model.revenue size=\"medium\"}}\n    {{formatDateTime @model.lastUpdate size=\"medium\"}}\n  {{/if}}\n</template>\n```\n\n#### Size Selection Guidelines\n\n| Context | Recommended Size | Example Output |\n|---------|-----------------|----------------|\n| **Dashboard tiles** | tiny | \"$2.3M\", \"15.2K\", \"3d\" |\n| **Data tables** | short | \"$2,345\", \"Mar 15\", \"15.6%\" |\n| **Form fields** | medium | \"$2,345.67\", \"March 15, 2024\" |\n| **Detail pages** | long | \"2,345.67 US dollars\", \"Friday, March 15, 2024\" |\n| **Mobile screens** | tiny/short | Compact formats save space |\n| **Accessibility mode** | long | Fully spelled out for clarity |\n| **Tooltips** | tiny | Minimal space usage |\n| **Reports/Printing** | medium/long | Professional appearance |\n\n#### Best Practices for Size Selection\n\n1. **Be consistent** - Use the same size for similar data in a view\n2. **Consider density** - Tiny for high-density displays, long for spacious layouts  \n3. **Progressive disclosure** - Show tiny by default, long on hover/focus\n4. **Test at extremes** - Ensure tiny is readable, long doesn't overflow\n5. **Match the format** - `fitted` and `atom` formats should use tiny/short\n\n**Key Insight**: The size system is about **information density**, not importance. Even \"tiny\" formats should convey the essential information clearly.\n\n#### 🎯 Direct Template Usage (Primary Pattern)\n\nThe formatters work directly in templates as helpers, making internationalized formatting incredibly simple:\n\n```gts\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁽ⁿ⁾ ═══\nimport { Component } from '@cardstack/base/card-api'; // ⁽¹⁾\nimport {\n  formatDateTime,\n  formatCurrency,\n  formatNumber,\n  formatDuration,\n  formatList,\n  formatFileSize,\n  formatOrdinal,\n  formatAge,\n  formatCountdown,\n  formatNames,\n  formatPeriod,\n  formatRelativeTime\n} from '@cardstack/boxel-ui/helpers'; // ⁽²⁾ Import enables template helpers\n\nexport class InvoiceCard extends CardDef { // ⁽⁴⁾\n  static embedded = class Embedded extends Component<typeof this> {\n    <template>\n      <div class=\"invoice\">\n        <!-- ⁽⁵⁾ Direct template usage with parameters -->\n        <div class=\"amount\">\n          {{formatCurrency @model.totalAmount currency=\"USD\" size=\"medium\"}}\n        </div>\n        \n        <!-- Relative time formatting -->\n        <div class=\"due-date\">\n          Due: {{formatDateTime @model.dueDate relative=true fallback=\"Not set\"}}\n        </div>\n        \n        <!-- ⁽⁷⁾ Multiple formatters with conditions -->\n        <div class=\"discount\">\n          {{#if @model.discountRate}}\n            Save {{formatNumber @model.discountRate style=\"percent\" size=\"short\"}}\n            ({{formatCurrency @model.discountAmount currency=\"USD\"}})\n          {{else}}\n            No discount applied\n          {{/if}}\n        </div>\n        \n        <!-- ⁽⁸⁾ Compact notation for large numbers -->\n        <div class=\"stats\">\n          {{formatNumber @model.viewCount size=\"tiny\"}} views\n          • Updated {{formatRelativeTime @model.lastModified size=\"tiny\"}}\n        </div>\n        \n        <!-- Duration formatting -->\n        <div class=\"payment-terms\">\n          {{formatDuration @model.paymentTermDays unit=\"days\" format=\"humanize\"}}\n        </div>\n      </div>\n    </template>\n  };\n}\n```\n\n##@## Template Helper Syntax Examples\n\n```hbs\n<!-- Basic usage -->\n{{formatCurrency @model.price}}\n\n<!-- With named parameters -->\n{{formatCurrency @model.price currency=\"EUR\" size=\"tiny\"}}\n\n<!-- Boolean parameters -->\n{{formatDateTime @model.date relative=true}}\n\n<!-- Using hash for nested options -->\n{{formatDateTime @model.excelDate parse=(hash serialOrigin=\"excel1900\")}}\n\n<!-- Multiple parameters -->\n{{formatCountdown @model.eventDate showDays=true showHours=true showSeconds=false}}\n\n<!-- With fallback values -->\n{{formatAge @model.birthdate unit=\"auto\" precise=true fallback=\"Age unknown\"}}\n\n<!-- String parameters with spaces -->\n{{formatDuration @model.seconds format=\"long\" fallback=\"No duration\"}}\n```\n\n#### 💻 JavaScript Usage Examples\n\n##### In Component Getters (Most Common)\n\n```gts\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁽ⁿ⁾ ═══\nimport { Component } from '@cardstack/base/card-api'; // ⁽¹⁾\nimport { formatDateTime, formatCurrency, formatNumber } from '@cardstack/boxel-ui/helpers'; // ⁽²⁾\n\nexport class ProductCard extends CardDef { // ⁽³⁾\n  static isolated = class Isolated extends Component<typeof this> { // ⁽⁴⁾\n    // ⁽⁵⁾ Format for display in template\n    get priceDisplay() {\n      return formatCurrency(this.args.model?.price, {\n        currency: this.args.model?.currency || 'USD',\n        size: 'medium',\n        locale: navigator.language,\n        fallback: 'Price not set'\n      });\n    }\n    \n    // ⁽⁶⁾ Smart relative time\n    get lastUpdatedText() {\n      return formatDateTime(this.args.model?.updatedAt, {\n        relative: true,\n        locale: 'en-US',\n        fallback: 'Never updated'\n      });\n    }\n    \n    // ⁽⁷⁾ Percentage with custom precision\n    get discountText() {\n      return formatNumber(this.args.model?.discountRate, {\n        style: 'percent',\n        minimumFractionDigits: 0,\n        maximumFractionDigits: 1,\n        fallback: 'No discount'\n      });\n    }\n    \n    <template>\n      <div class=\"product-card\">\n        <h3>{{@model.name}}</h3>\n        <div class=\"price\">{{this.priceDisplay}}</div>\n        <div class=\"discount\">{{this.discountText}} off!</div>\n        <footer>Updated {{this.lastUpdatedText}}</footer>\n      </div>\n    </template>\n  };\n}\n```\n\n##### Handling Special Cases\n\n```gts\n// ⁽⁸⁾ Excel date serial numbers\nget excelDateDisplay() {\n  return formatDateTime(this.args.model?.serialDate, {\n    parse: { \n      serialOrigin: 'excel1900' // or 'excel1904' for Mac Excel\n    },\n    size: 'medium',\n    fallback: 'Invalid date'\n  });\n}\n\n// ⁽⁹⁾ Multi-locale team dashboard\nget memberAgeDisplay() {\n  const member = this.args.model;\n  return formatAge(member?.birthdate, {\n    unit: 'auto',        // Smart: \"25 years\" or \"6 months\" \n    precise: true,       // Shows \"25 years, 3 months\"\n    locale: member?.preferredLocale || 'en-US',\n    fallback: 'Age unknown'\n  });\n}\n\n// ⁽¹⁰⁾ Large number compacting\nget viewCountDisplay() {\n  const views = this.args.model?.views;\n  \n  // Auto-compact based on size\n  return formatNumber(views, {\n    size: views > 10000 ? 'tiny' : 'short',  // \"1.2M\" or \"1,234\"\n    locale: 'en-US',\n    fallback: '0 views'\n  });\n}\n\n// ⁽¹¹⁾ Timer display with configurable precision\nget elapsedTimeDisplay() {\n  return formatDuration(this.args.model?.elapsedSeconds, {\n    unit: 'seconds',\n    format: this.args.model?.showPreciseTime ? 'timer' : 'humanize',\n    fallback: 'Not started'\n  });\n  // Precise: \"1:45:23\"\n  // Human: \"2 hours\"\n}\n```\n\n##### Locale-Aware Formatting\n\n```gts\n// ⁽¹²⁾ Smart locale detection with fallback chain\nexport class GlobalDashboard extends CardDef {\n  static isolated = class Isolated extends Component<typeof this> {\n    get userLocale() {\n      return this.args.model?.userPreferences?.locale  // 1. User preference\n        || this.args.context?.locale                   // 2. App context\n        || navigator.language                          // 3. Browser\n        || 'en-US';                                   // 4. Fallback\n    }\n    \n    // ⁽¹³⁾ Currency with user's locale\n    get revenueDisplay() {\n      return formatCurrency(this.args.model?.revenue, {\n        currency: this.args.model?.currency || 'USD',\n        size: this.args.model?.revenue > 1000000 ? 'tiny' : 'medium',\n        locale: this.userLocale,\n        fallback: '—'\n      });\n    }\n    \n    // ⁽¹⁴⁾ List formatting respects locale\n    get contributorList() {\n      const names = this.args.model?.contributors || [];\n      \n      return formatList(names, {\n        type: 'conjunction',    // \"and\" separator\n        style: 'long',         \n        locale: this.userLocale, // \"A, B y C\" in Spanish\n        fallback: 'No contributors'\n      });\n    }\n  };\n}\n```\n\n##### Advanced Formatting Patterns\n\n```gts\n// ⁽¹⁵⁾ Conditional formatting based on value\nget fileSizeDisplay() {\n  const bytes = this.args.model?.fileSize;\n  \n  if (!bytes) return 'No file';\n  \n  // Show more precision for smaller files\n  return formatFileSize(bytes, {\n    binary: true,                    // Use KiB, MiB, etc.\n    precision: bytes < 1024 ? 0 : 2, // \"512 B\" or \"1.45 MiB\"\n    fallback: 'Unknown size'\n  });\n}\n\n// ⁽¹⁶⁾ Countdown with dynamic components\nget eventCountdown() {\n  const eventDate = this.args.model?.eventDate;\n  const now = new Date();\n  const msUntilEvent = new Date(eventDate).getTime() - now.getTime();\n  const daysUntil = Math.floor(msUntilEvent / (1000 * 60 * 60 * 24));\n  \n  return formatCountdown(eventDate, {\n    showDays: true,\n    showHours: daysUntil < 7,     // Show hours in final week\n    showMinutes: daysUntil < 1,   // Show minutes on final day\n    showSeconds: daysUntil === 0, // Show seconds on event day\n    fallback: 'Date not set'\n  });\n}\n\n// ⁽¹⁷⁾ Name formatting with cultural awareness\nget authorDisplay() {\n  const author = this.args.model?.author;\n  \n  return formatNames(author, {\n    format: author?.culture === 'eastern' ? 'last-first' : 'first-last',\n    includeMiddle: author?.showMiddleName !== false,\n    separator: author?.culture === 'eastern' ? '' : ' ',\n    locale: author?.locale || 'en-US',\n    fallback: 'Anonymous'\n  });\n}\n\n// ⁽¹⁸⁾ Period formatting with ranges\nget quarterDisplay() {\n  const period = this.args.model?.fiscalQuarter; // \"Q2 2024\"\n  \n  const result = formatPeriod(period, {\n    size: 'long',        // \"Q2 2024 (Apr - Jun)\"\n    withRange: true,     // Returns object with date range\n    fallback: 'No period'\n  });\n  \n  // If withRange: { text: \"Q2 2024 (Apr - Jun)\", range: { start: Date, end: Date } }\n  return typeof result === 'string' ? result : result.text;\n}\n```\n\n#### 🎯 Common Patterns\n\n##### Dashboard Metrics\n```gts\n// ⁽¹⁹⁾ Complete metrics formatting\nexport class MetricsDashboard extends CardDef {\n  static embedded = class Embedded extends Component<typeof this> {\n    get metrics() {\n      const locale = navigator.language || 'en-US';\n      const data = this.args.model;\n      \n      return {\n        revenue: formatCurrency(data?.revenue, {\n          size: data?.revenue > 1000000 ? 'tiny' : 'short',\n          currency: 'USD',\n          locale,\n          fallback: '$0'\n        }),\n        growth: formatNumber(data?.growthRate, {\n          style: 'percent',\n          size: 'short',\n          minimumFractionDigits: 1,\n          locale,\n          fallback: '0%'\n        }),\n        users: formatNumber(data?.activeUsers, {\n          size: 'tiny',  // Auto-compacts: \"15.2K\"\n          locale,\n          fallback: '0'\n        }),\n        uptime: formatDuration(data?.uptimeSeconds, {\n          format: 'humanize',\n          unit: 'seconds',\n          fallback: 'Unknown'\n        }),\n        updated: formatRelativeTime(data?.lastSync, {\n          size: 'tiny',  // \"5m\" instead of \"5 minutes ago\"\n          locale,\n          fallback: 'Never'\n        })\n      };\n    }\n    \n    <template>\n      <div class=\"metrics\">\n        <div class=\"metric\">\n          <span class=\"label\">Revenue</span>\n          <span class=\"value\">{{this.metrics.revenue}}</span>\n          <span class=\"growth\">{{this.metrics.growth}}</span>\n        </div>\n        <div class=\"metric\">\n          <span class=\"label\">Active Users</span>\n          <span class=\"value\">{{this.metrics.users}}</span>\n        </div>\n        <div class=\"metric\">\n          <span class=\"label\">Uptime</span>\n          <span class=\"value\">{{this.metrics.uptime}}</span>\n        </div>\n        <footer>Updated {{this.metrics.updated}}</footer>\n      </div>\n    </template>\n  };\n}\n```\n\n#### 📊 Complete Template Examples\n\nThe formatter helpers demonstrate the full range of template helper usage:\n\n```hbs\n<!-- Currency: All size variants -->\n{{formatCurrency @model.amount}}                                  <!-- Default: $1,234.56 -->\n{{formatCurrency @model.amount currency=\"EUR\" size=\"tiny\"}}      <!-- Compact: €1.2M -->\n{{formatCurrency @model.amount currency=\"EUR\" size=\"short\"}}     <!-- No decimals: €1,235 -->\n{{formatCurrency @model.amount currency=\"EUR\" size=\"medium\"}}    <!-- Standard: €1,234.56 -->\n{{formatCurrency @model.amount currency=\"EUR\" size=\"long\"}}      <!-- Spelled out: 1,234.56 euros -->\n\n<!-- DateTime: Flexible display options -->\n{{formatDateTime @model.date size=\"tiny\"}}                        <!-- 3:45 PM or 3/15 -->\n{{formatDateTime @model.date size=\"short\"}}                       <!-- Today or Mar 15 -->\n{{formatDateTime @model.date size=\"medium\"}}                      <!-- Mar 15, 2024 -->\n{{formatDateTime @model.date size=\"long\"}}                        <!-- Friday, March 15, 2024 -->\n{{formatDateTime @model.date relative=true}}                      <!-- 2 hours ago -->\n{{formatDateTime @model.date format=\"YYYY-MM-DD\"}}                <!-- 2024-03-15 -->\n{{formatDateTime @model.excelSerial parse=(hash serialOrigin=\"excel1900\")}} <!-- From Excel -->\n\n<!-- Numbers: Decimal and percentage -->\n{{formatNumber @model.value}}                                      <!-- 1,234.56 -->\n{{formatNumber @model.value size=\"tiny\"}}                          <!-- 1.2K -->\n{{formatNumber @model.rate style=\"percent\"}}                      <!-- 12.35% -->\n{{formatNumber @model.rate style=\"percent\" size=\"tiny\"}}          <!-- 12% -->\n{{formatNumber @model.value minimumFractionDigits=4}}             <!-- 1,234.5600 -->\n\n<!-- Duration: Multiple formats -->\n{{formatDuration @model.seconds}}                                  <!-- 2 hours (humanized) -->\n{{formatDuration @model.seconds format=\"timer\"}}                   <!-- 2:15:30 -->\n{{formatDuration @model.seconds format=\"short\"}}                   <!-- 2h 15m 30s -->\n{{formatDuration @model.seconds format=\"long\"}}                    <!-- 2 hours, 15 minutes, and 30 seconds -->\n{{formatDuration @model.milliseconds unit=\"milliseconds\"}}         <!-- Convert from ms -->\n\n<!-- Lists: Proper conjunctions -->\n{{formatList @model.items}}                                        <!-- Apple, Banana, and Cherry -->\n{{formatList @model.items type=\"disjunction\"}}                    <!-- Apple, Banana, or Cherry -->\n{{formatList @model.items type=\"unit\"}}                            <!-- Apple, Banana, Cherry -->\n{{formatList @model.items style=\"narrow\"}}                         <!-- Apple Banana Cherry -->\n\n<!-- File sizes: Binary vs decimal -->\n{{formatFileSize @model.bytes}}                                    <!-- 1.45 MiB (default binary) -->\n{{formatFileSize @model.bytes binary=false}}                      <!-- 1.52 MB (decimal) -->\n{{formatFileSize @model.bytes precision=0}}                        <!-- 1 MiB -->\n{{formatFileSize @model.bytes precision=3}}                        <!-- 1.445 MiB -->\n\n<!-- Special formatters -->\n{{formatOrdinal @model.position}}                                  <!-- 1st, 2nd, 3rd, 21st -->\n{{formatAge @model.birthdate}}                                     <!-- 25 years -->\n{{formatAge @model.birthdate precise=true}}                        <!-- 25 years, 3 months -->\n{{formatCountdown @model.eventDate}}                               <!-- 3 days, 14 hours, 25 minutes, 10 seconds -->\n{{formatCountdown @model.eventDate showSeconds=false}}            <!-- 3 days, 14 hours, 25 minutes -->\n{{formatNames @model.person format=\"initials\"}}                    <!-- J.Q.A. -->\n{{formatNames @model.person format=\"last-first\"}}                  <!-- Adams, John Quincy -->\n{{formatPeriod \"Q1 2024\" size=\"long\"}}                            <!-- Quarter 1, 2024 -->\n{{formatRelativeTime @model.timestamp size=\"tiny\"}}                <!-- 5m, 2h, 3d -->\n```\n\n#### ⚠️ Important Notes\n\n1. **Dual usage** - Works as both template helpers AND JavaScript functions\n2. **Template syntax** - Use named parameters: `{{formatCurrency @model.price currency=\"EUR\"}}`\n3. **Always provide fallbacks** - Handle null/undefined gracefully\n4. **Size matters** - Use compact sizes in grids, full sizes in details\n5. **Respect user locale** - Check user preferences before browser defaults\n6. **Don't use in computeVia** - Keep field data in its raw form\n7. **Import enables both modes** - Destructuring formatters makes them available as template helpers\n\n**Remember:** Formatters enhance display without changing your data structure!\n\n### Utility Helpers\n**Import:** `import { cn, optional, pick } from '@cardstack/boxel-ui/helpers';`\n\n**Class Names (cn):**\n```hbs\n<div class={{cn \"base-class\" (hash active=@model.isActive error=@model.hasError)}}>\n```\n\n**Optional Actions:**\n```hbs\n<Button @onClick={{optional @onSave}}>Save</Button>\n```\n\n**Event Value Extraction:**\n```hbs\n<input {{on \"input\" (pick \"target.value\" @updateValue)}}>\n```\n\n## Defensive Programming in Boxel Components\n\n**CRITICAL:** Prevent runtime errors by safely handling undefined/null values and malformed data. Cards boot with no data by default - every component must handle completely empty state gracefully.\n\n### Essential Defensive Patterns\n\n#### Always Use Optional Chaining (`?.`)\n```js\n// ❌ UNSAFE: Will throw if model is undefined\nif (this.args.model.completedDays.includes(day)) { ... }\n\n// ✅ SAFE: Optional chaining prevents errors\nif (this.args?.model?.completedDays?.includes(day)) { ... }\n```\n\n#### Provide Default Values (`??`)\n```js\n// ❌ UNSAFE: May result in NaN\nreturn this.args.model.progress + 10;\n\n// ✅ SAFE: Default value prevents NaN\nreturn (this.args?.model?.progress ?? 0) + 10;\n```\n\n#### Try-Catch for Network of Cards\nWhen accessing data across card relationships, always wrap in try-catch to handle missing or malformed data:\n\n```js\n// ³⁷ In computed properties or methods\nget authorDisplayName() {\n  try {\n    const author = this.args?.model?.author;\n    if (!author) {\n      console.warn('BlogPost: No author assigned');\n      return 'Unknown Author';\n    }\n    \n    const name = author.name || author.title;\n    if (!name) {\n      console.warn('BlogPost: Author exists but has no name', { authorId: author.id });\n      return 'Unnamed Author';\n    }\n    \n    return name;\n  } catch (error) {\n    console.error('BlogPost: Error accessing author data', {\n      error,\n      postId: this.args?.model?.id,\n      authorData: this.args?.model?.author\n    });\n    return 'Author Unavailable';\n  }\n}\n\n// ³⁸ In template getters\nget relatedPostsSummary() {\n  try {\n    const posts = this.args?.model?.relatedPosts;\n    if (!Array.isArray(posts)) {\n      return 'No related posts';\n    }\n    \n    return posts\n      .filter(post => post?.title) // Skip malformed entries\n      .map(post => post.title)\n      .join(', ') || 'No related posts';\n      \n  } catch (error) {\n    console.error('BlogPost: Failed to process related posts', error);\n    return 'Related posts unavailable';\n  }\n}\n```\n\n#### Validate Arrays Before Operations\n```js\n// ❌ UNSAFE: May throw if not an array\nconst sorted = this.completedDays.sort((a, b) => a - b);\n\n// ✅ SAFE: Check existence and type first\nif (!Array.isArray(this.completedDays) || !this.completedDays.length) {\n  return [];\n}\nconst sorted = [...this.completedDays].sort((a, b) => a - b);\n```\n\n**Key Principles:** \n- Assume data might be missing, null, or the wrong type\n- Provide meaningful fallbacks for user display\n- Log errors with context for debugging (include IDs, data state)\n- Never let malformed data crash your UI\n\n## Advanced Patterns\n\n### Delegated Rendering: Making Cards Talk To Each Other\n\n**What is Delegated Rendering?** Boxel's superpower that lets you embed one card inside another while preserving each card's own styling and behavior. Creates truly composable interfaces where each component maintains its identity while seamlessly integrating into larger contexts.\n\n**CRITICAL:** Always use `<@fields.entity />` for delegation, even for singular fields (not `<@field.entity />`).\n\n**DESIGN CONSISTENCY:** When delegating from a custom-designed template, ensure the delegated card/field's format has matching design aesthetics. Mismatched styles create jarring user experiences.\n\n```gts\n// ³⁹ If your parent card has a modern, minimal design with specific colors/fonts...\nstatic isolated = class Isolated extends Component<typeof this> {\n  <template>\n    <div class=\"modern-container\">\n      <!-- The author card's embedded format should match this aesthetic -->\n      <@fields.author @format=\"embedded\" />\n    </div>\n    <style scoped>\n      .modern-container {\n        font-family: 'Inter', sans-serif;\n        background: #f8fafc;\n        border-radius: 12px;\n      }\n    </style>\n  </template>\n};\n\n// ⁴⁰ Then the Author card should have complementary styling:\nexport class Author extends CardDef {\n  static embedded = class Embedded extends Component<typeof this> {\n    <template>\n      <div class=\"author-card\">\n        <!-- Matching the parent's design language -->\n      </div>\n      <style scoped>\n        .author-card {\n          font-family: 'Inter', sans-serif;  /* Same font */\n          background: white;                  /* Complementary color */\n          border-radius: 8px;                 /* Consistent radius style */\n        }\n      </style>\n    </template>\n  };\n}\n```\n\n#### Delegation Patterns\n\n```gts\n<template>\n  <!-- ⁴¹ Single card rendering - still use @fields -->\n  <div class=\"author-section\">\n    {{#if @fields.author}}\n      <@fields.author />\n    {{else}}\n      <div class=\"author-placeholder\">No author assigned</div>\n    {{/if}}\n  </div>\n  \n  <!-- ⁴² Collection with REQUIRED custom spacing -->\n  {{#if (gt @model.relatedPosts.length 0)}}\n    <div class=\"posts-container\">\n      <@fields.relatedPosts @format=\"embedded\" />\n    </div>\n  {{/if}}\n  \n  <style scoped>\n    /* Target .containsMany-field due to wrapper div */\n    .posts-container > .containsMany-field {\n      display: flex;\n      flex-direction: column;\n      gap: 0.75rem;  /* REQUIRED: Spacing between items */\n    }\n  </style>\n</template>\n```\n\n### Avoiding Relationship Cycles\n\n**Problem:** Bidirectional `linksTo` relationships create circular dependencies that complicate indexing and can cause infinite recursion.\n\n**Solution:** Use canonical (one-way) links + dynamic queries for reverse relationships.\n\n#### Pattern: Canonical Links + Dynamic Queries\n\n1. **Define canonical links** - Choose the primary direction in your schema:\n```gts\n// Employee owns the supervisor relationship\nexport class Employee extends CardDef {\n  @field supervisor = linksTo(() => Employee);\n  @field department = linksTo(Department);\n}\n\n// Department owns the manager relationship\nexport class Department extends CardDef {\n  @field manager = linksTo(Employee);\n}\n```\n\n2. **Use dynamic queries for reverse relationships** - Fetch at runtime instead of schema links:\n```gts\n// Get direct reports dynamically (in Employee component)\nget directReportsQuery(): Query {\n  return {\n    filter: {\n      on: { module: './employee', name: 'Employee' },\n      eq: { supervisor: this.args.model.id }\n    }\n  };\n}\n\n// Use with getCards or PrerenderedCardSearch\ndirectReports = this.args.context?.getCards(this, () => this.directReportsQuery, () => this.realms);\n```\n\n**Key Principle:** Model the simplest set of unidirectional links that define core relationships. Use queries for derived views, aggregations, and inverse relationships.\n\n### BoxelSelect: Smart Dropdown Menus\n\nRegular HTML selects are limited to plain text. BoxelSelect lets you create rich, searchable dropdowns with custom rendering.\n\n#### Pattern: Rich Select with Custom Options\n\n```gts\nexport class OptionField extends FieldDef { // ⁴³ Option field for select\n  static displayName = 'Option';\n  \n  @field key = contains(StringField);\n  @field label = contains(StringField);\n  @field description = contains(StringField);\n\n  static embedded = class Embedded extends Component<typeof this> {\n    <template>\n      <div class=\"option-display\">\n        <strong>{{if @model.label @model.label \"Unnamed Option\"}}</strong>\n        <span>{{if @model.description @model.description \"No description\"}}</span>\n      </div>\n    </template>\n  };\n}\n\nexport class ProductCategory extends CardDef { // ⁴⁴ Card using BoxelSelect\n  @field selectedCategory = contains(OptionField);\n  \n  static edit = class Edit extends Component<typeof this> { // ⁴⁵ Edit format\n    @tracked selectedOption = this.args.model?.selectedCategory;\n\n    options = [\n      { key: '1', label: 'Electronics', description: 'Phones, computers, and gadgets' },\n      { key: '2', label: 'Clothing', description: 'Fashion and apparel' },\n      { key: '3', label: 'Home & Garden', description: 'Furniture and decor' }\n    ];\n\n    updateSelection = (option: typeof this.options[0] | null) => {\n      this.selectedOption = option;\n      this.args.model.selectedCategory = option ? new OptionField(option) : null;\n    }\n\n    <template>\n      <FieldContainer @label=\"Product Category\">\n        <BoxelSelect\n          @selected={{this.selectedOption}}\n          @options={{this.options}}\n          @onChange={{this.updateSelection}}\n          @searchEnabled={{true}}\n          @placeholder=\"Select a category...\"\n          as |option|\n        >\n          <div class=\"option-item\">\n            <span>{{option.label}}</span>\n            <span>{{option.description}}</span>\n          </div>\n        </BoxelSelect>\n      </FieldContainer>\n    </template>\n  };\n}\n```\n\n### Custom Edit Controls\n\nCreate user-friendly edit controls that accept natural input. Hide complexity in expandable sections while keeping ALL properties editable and inspectable.\n\n```gts\n// Example: Natural language time period input\nstatic edit = class Edit extends Component<typeof this> {\n  @tracked showDetails = false;\n  \n  @action parseInput(value: string) {\n    // Parse \"Q1 2025\" → quarter: 1, year: 2025, startDate: Jan 1, endDate: Mar 31\n    // Parse \"April 2025\" → month: 4, year: 2025, startDate: Apr 1, endDate: Apr 30\n  }\n  \n  <template>\n    <FieldContainer @label=\"Time Period\">\n      <input placeholder=\"e.g., Q1 2025 or April 2025\" {{on 'blur' this.parseInput}} />\n    </FieldContainer>\n    \n    <Button {{on 'click' (toggle 'showDetails' this)}}>\n      {{if this.showDetails \"Hide\" \"Show\"}} Details\n    </Button>\n    \n    {{#if this.showDetails}}\n      <!-- Show all parsed values for verification -->\n      <!-- Allow manual override of auto-parsed results -->\n      <!-- Provide controls for each field property -->\n    {{/if}}\n  </template>\n};\n```\n\n## Query System: Finding and Displaying Cards\n\n### The 'on' Property Rule (MEMORIZE THIS)\n\n**When using filters beyond basic type search, MUST include `on` as sibling:**\n\n```typescript\n// ❌ WRONG - Will fail\n{ range: { price: { lte: 100 } } }\n\n// ✅ CORRECT - 'on' specifies card type\n{ \n  on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n  range: { price: { lte: 100 } } \n}\n\n// ✅ EXCEPTION - Simple eq after type filter\n{ \n  every: [\n    { type: { module: new URL('./task', import.meta.url).href, name: 'Task' } },\n    { eq: { status: \"active\" } }  // No 'on' needed immediately after type\n  ]\n}\n```\n\n### Query Quick Reference\n\n#### Filter Types & 'on' Requirements\n| Filter | Needs 'on'? | Example |\n|--------|-------------|---------|\n| `type` | No | `{ type: { module: '...', name: 'Product' } }` |\n| `eq` | Yes* | `{ on: {...}, eq: { status: \"active\" } }` |\n| `contains` | Yes | `{ on: {...}, contains: { tags: \"urgent\" } }` |\n| `range` | Yes | `{ on: {...}, range: { price: { gte: 100 } } }` |\n| `every` | No | `{ every: [...] }` (AND) |\n| `any` | No | `{ any: [...] }` (OR) |\n| `not` | No | `{ not: { eq: {...} } }` |\n\n*Only when not directly after type filter\n\n#### Range Operators\n`gt` (>) `gte` (>=) `lt` (<) `lte` (<=)\n\n#### Module & Realm Rules\n```typescript\n// ✅ ALWAYS absolute URLs\n{ module: new URL('./product', import.meta.url).href, name: 'Product' }\n\n// ✅ Realms need trailing slash\n'https://app.boxel.ai/sarah/projects/'  // ✅\n'https://app.boxel.ai/sarah/projects'   // ❌\n```\n\n### ⚠️ CRITICAL: The 'on' Attribute is MANDATORY\n\n**Missing 'on' will lead to no results shown!** When using:\n- `eq`, `contains`, `range` filters (except immediately after type filter)\n- `sort` on type-specific fields (anything beyond base fields like id, createdAt)\n\n```typescript\n// ❌ WILL FAIL - Missing 'on' for sort\n{ \n  sort: [{ by: \"price\", direction: \"desc\" }]\n}\n\n// ✅ CORRECT - Include 'on' for type-specific fields\n{ \n  sort: [{ \n    by: \"price\", \n    on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n    direction: \"desc\" \n  }]\n}\n```\n\n### Complete Query Pattern\n\n```typescript\nconst query: Query = {\n  filter: {\n    every: [  // AND\n      { type: { module: new URL('./product', import.meta.url).href, name: 'Product' } },\n      { \n        any: [  // OR\n          { on: { module: new URL('./product', import.meta.url).href, name: 'Product' }, eq: { category: \"laptop\" } },\n          { on: { module: new URL('./product', import.meta.url).href, name: 'Product' }, eq: { category: \"tablet\" } }\n        ]\n      },\n      { \n        on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n        range: { \n          price: { gte: 100, lte: 2000 },  // Multiple conditions\n          rating: { gte: 4 }\n        }\n      },\n      { \n        on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n        contains: { features: \"wireless\" }\n      },\n      {\n        on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n        not: { eq: { status: \"discontinued\" } }  // Exclude\n      }\n    ]\n  },\n  sort: [\n    { by: \"createdAt\", direction: \"desc\" },  // General field\n    { \n      by: \"warranty\",  // Type-specific needs 'on'\n      on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n      direction: \"desc\" \n    }\n  ],\n  page: { number: 0, size: 20 }\n};\n```\n\n### Decision: PrerenderedCardSearch vs getCards\n\n```\nDisplay cards as-is? → PrerenderedCardSearch\nNeed live updates? → PrerenderedCardSearch with @isLive={{true}}\nNeed to sort/filter/aggregate AFTER retrieval? → getCards\nNeed raw data access? → getCards\n```\n\n## PrerenderedCardSearch Pattern\n\n```gts\n// ⁴⁹ Component with dynamic query\nexport class Dashboard extends Component {\n  get urgentTasksQuery(): Query {\n    return {\n      filter: {\n        every: [\n          { type: { module: new URL('./task', import.meta.url).href, name: 'Task' } },\n          { \n            on: { module: new URL('./task', import.meta.url).href, name: 'Task' },\n            not: { eq: { status: \"completed\" } }\n          }\n        ]\n      },\n      sort: [{ by: \"dueDate\", direction: \"asc\" }],\n      page: { number: 0, size: 10 }\n    };\n  }\n\n  realms = ['https://app.boxel.ai/sarah/tasks/'];  // Trailing slash!\n\n  <template>\n    {{#let (component @context.prerenderedCardSearchComponent) as |PrerenderedCardSearch|}}\n      <PrerenderedCardSearch\n        @query={{this.urgentTasksQuery}}\n        @format=\"embedded\"\n        @realms={{this.realms}}\n        @isLive={{true}}\n      >\n        <:loading>\n          <div class=\"skeleton-grid\">Loading...</div>\n        </:loading>\n        \n        <:response as |cards|>\n          {{#if (gt cards.length 0)}}\n            <div class=\"tasks-container\">\n              {{#each cards key=\"url\" as |card|}}\n                {{#unless card.isError}}\n                  <card.component />\n                {{else}}\n                  <div class=\"error\">Failed: {{card.url}}</div>\n                {{/unless}}\n              {{/each}}\n            </div>\n          {{else}}\n            <div class=\"empty\">No urgent tasks!</div>\n          {{/if}}\n        </:response>\n      </PrerenderedCardSearch>\n    {{/let}}\n    \n    <style scoped> /* ⁵⁰ Container layout only */\n      .tasks-container {\n        display: flex;\n        flex-direction: column;\n        gap: 0.75rem;\n      }\n    </style>\n  </template>\n}\n```\n\n### Making Query Results Clickable\n\n```gts\n// ⁵¹ Wrap with CardContainer for navigation\n<:response as |cards|>\n  <ul class=\"results\">\n    {{#each cards key=\"url\" as |card|}}\n      <li>\n        <CardContainer\n          {{@context.cardComponentModifier\n            cardId=card.url\n            format='data'\n            fieldType=undefined\n            fieldName=undefined\n          }}\n          @displayBoundaries={{true}}\n        >\n          <card.component />\n        </CardContainer>\n      </li>\n    {{/each}}\n  </ul>\n</:response>\n```\n\n## getCards Pattern (Data Manipulation)\n\n```gts\n// ⁵² Direct assignment for data access\ncardsResult = this.args.context?.getCards(\n  this,\n  () => this.query,\n  () => this.realms,\n  { isLive: true }\n);\n\n// ⁵³ Post-retrieval sorting\nget sortedByRevenue() {\n  const products = this.cardsResult?.instances ?? [];\n  return [...products].sort((a, b) => {\n    const scoreA = (a.revenue || 0) * (a.rating || 1);\n    const scoreB = (b.revenue || 0) * (b.rating || 1);\n    return scoreB - scoreA;\n  });\n}\n\n// ⁵⁴ Aggregation\nget totalRevenue() {\n  return this.cardsResult?.instances?.reduce((sum, p) => sum + (p.revenue || 0), 0) || 0;\n}\n```\n\n\n## Creating Fitted Formats - The Four Sub-formats Strategy\n\nFitted Formats are unique part of the Boxel Architecture in that it allows a version of a card or a field that fit into any slot (width and height up to 600px) allocated by a parent container, so as to support listing, gallery, chooser, even 3D sprites usage without the parent knowing anything about this card's or field's schema or template other than its ID.\n\nTo create fitted formats that automatically adapt to any container size, implement four responsive subformats within a single fitted template. This pattern ensures your cards look perfect whether displayed as tiny badges or full-width cards. While the platform provides a fallback fitted format for CardDefs, custom implementation is strongly recommended for optimal display. For FieldDefs, fitted format is optional as embedded format is the primary requirement.\n\n### Core Concept\n\nYou only have one fitted template so that the resulting parent template only needs to give a size they want to display and you will provide the best layout given that space.\n\nTo do that, create 4 subformats and turn on only one at a time. Create 4 divs inside the fitted template and use container queries to turn them on and off. Make sure there are no gaps where no subformat is active.\n\nFitted format shouldn't have borders, that is drawn by parent.\n\n**RECOMMENDED:** Every CardDef should implement a custom fitted format for optimal display. While the platform provides a fallback, custom fitted formats ensure your cards look their best in galleries, grids, choosers, and dashboards.\n\n**Key Implementation Points:**\n- **CardDef:** Custom fitted format recommended (platform provides fallback)\n- **FieldDef:** Embedded format mandatory, fitted format optional\n- Create 4 divs inside the fitted template (badge, strip, tile, card)\n- Use container queries to show only the appropriate subformat\n- CRITICAL: Ensure no gaps where no subformat is active - all sizes must be handled\n- Fitted format shouldn't have borders (drawn by parent)\n\n### Container Size Decision Tree\n\n```\nContainer Size\n    │\n    ├─ Height < 170px (Horizontal)\n    │   │\n    │   ├─ Width ≤ 150px → BADGE\n    │   │   • 150×40  (micro)\n    │   │   • 150×65  (small)\n    │   │   • 150×105 (large) ← optimize\n    │   │\n    │   └─ Width > 150px → STRIP\n    │       • 250×40  (single)\n    │       • 250×65  (double)\n    │       • 250×105 (triple)\n    │       • 400×65  (wide double) ← optimize\n    │       • 400×105 (wide triple)\n    │\n    └─ Height ≥ 170px (Vertical)\n        │\n        ├─ Width < 400px → TILE\n        │   • 150×170 (narrow)\n        │   • 170×250 (grid) ← optimize\n        │   • 250×170 (wide)\n        │   • 250×275 (large)\n        │\n        └─ Width ≥ 400px → CARD\n            • 400×170 (compact)\n            • 400×275 (standard) ← optimize\n            • 400×445 (expanded)\n```\n\n#### Design Philosophy\n\n**First design the IDEAL layout for each subformat at the \"optimized for\" size.** Think of each subformat as if you were making 4 independent templates, each perfect for its specific use case.\n\n**Height Quantum:** The height breakpoints (40px, 65px, 105px, etc.) follow golden ratio progression (φ ≈ 1.618), creating natural visual harmony as formats scale.\n\n**Golden Ratio Usage:** Apply the golden ratio (1.618:1) throughout your layouts - for splits, spacing progressions, content zones, and visual balance. This mathematical harmony creates inherently pleasing proportions.\n\n**Typography Hierarchy:** Create clear visual distinction between text levels:\n- **Size cascade:** Each level 80-87% of the previous (1em → 0.875em → 0.75em)\n- **Weight cascade:** Drop 100-200 font-weight units per level (600 → 500 → 400)\n- **Spacing cascade:** Buffer between levels follows 50% → 37.5% → 25% pattern\n- **Same-level spacing:** Use 25% of the element's font size\n\n**Qualities for All Fitted Formats:**\n- **Well-balanced** - Every element positioned with intention\n- **On-brand** - Visually polished and consistent\n- **Scannable** - Clear indicators, easy to parse\n- **Small multiples** - Differences pop in collections\n- **Clickable** - Inviting interaction (cards only)\n- **Complete** - Show key data within constraints\n- **Familiar yet superior** - Match expectations, execute better\n- **Identifier visible** - Never obscure with entrance animations\n- **Clear hierarchy** - Primary/secondary/tertiary distinct\n\n### Content Priority Guidelines\n\nSuggested priority order - adjust for your use case:\n\n1. **Title/Name** - Primary identifier\n2. **Image** - Visual identity \n3. **Short ID** - SKU, username, ticket #\n4. **Key Info** - Dates, stats, linked entities\n5. **Badge/Status** - Visual indicators\n6. **Key-Value Metadata** - Show complete pairs only\n7. **Description** - Low priority, line-clamp aggressively\n8. **CTA** - Hover/focus only in tiles\n\n**For FieldDefs:** Since fitted format is optional, focus on embedded format first. If implementing fitted: priorities shift since there's no click-through. Show most important data within space constraints - composite identity plus critical values.\n\n**Examples:**\n- **Inventory:** SKU/status may outrank title\n- **Analytics:** Numbers take precedence\n- **Tasks:** Due date/assignee before description\n\n### Container Query Skeleton\n\n```css\n.fitted-container {\n  container-type: size;\n  width: 100%;\n  height: 100%;\n}\n\n/* Hide all by default */\n.badge-format, .strip-format, .tile-format, .card-format {\n  display: none;\n  width: 100%;\n  height: 100%;\n  /* CRITICAL: Clear space prevents edge bleeding - scales with container size */\n  padding: clamp(0.1875rem, 2%, 0.625rem);  /* 3px min → 10px max */\n  box-sizing: border-box;\n}\n\n/* Micro containers: absolute minimum safe padding */\n@container (max-width: 80px) and (max-height: 80px) {\n  .badge-format { \n    padding: 0.1875rem; /* 3px - visual safety minimum */\n  }\n}\n\n/* Small containers: tight but safe */\n@container (max-width: 150px) {\n  .badge-format, .strip-format { \n    padding: 0.25rem; /* 4px - small but comfortable */\n  }\n}\n\n/* Medium containers: breathing room */\n@container (min-width: 250px) and (max-width: 399px) {\n  .tile-format {\n    padding: 0.5rem; /* 8px - standard spacing */\n  }\n}\n\n/* Large containers: generous clear space */\n@container (min-width: 400px) {\n  .card-format {\n    padding: clamp(0.5rem, 2%, 0.625rem); /* 8px → 10px max for expanded */\n  }\n}\n\n/* Activation ranges - NO GAPS */\n@container (max-width: 150px) and (max-height: 169px) {\n  .badge-format { display: flex; }\n}\n\n@container (min-width: 151px) and (max-height: 169px) {\n  .strip-format { display: flex; }\n}\n\n@container (max-width: 399px) and (min-height: 170px) {\n  .tile-format { display: flex; flex-direction: column; }\n}\n\n@container (min-width: 400px) and (min-height: 170px) {\n  .card-format { display: flex; flex-direction: column; }\n}\n\n/* Compact card: horizontal split at golden ratio */\n@container (min-width: 400px) and (height: 170px) {\n  .card-format { \n    flex-direction: row;\n    gap: 1rem;\n  }\n  .card-format > * {\n    display: flex;\n    flex-direction: column;\n  }\n  .card-format > *:first-child { flex: 1.618; }\n  .card-format > *:last-child { flex: 1; }\n}\n\n/* Background fills respect padding for visual safety */\n.badge-format.has-fill,\n.strip-format.has-fill,\n.tile-format.has-fill,\n.card-format.has-fill {\n  background: var(--fill-color);\n  /* Background extends to edge but content stays within padding */\n  background-clip: padding-box; /* Or border-box if fill should reach edge */\n}\n\n/* Type hierarchy - MANDATORY */\n.primary-text {\n  font-size: 1em;\n  font-weight: 600;\n  color: var(--text-primary, rgba(0,0,0,0.95));\n  line-height: 1.2;\n}\n\n.secondary-text {\n  font-size: 0.875em; /* 87.5% of primary */\n  font-weight: 500;\n  color: var(--text-secondary, rgba(0,0,0,0.85));\n  line-height: 1.3;\n}\n\n.tertiary-text {\n  font-size: 0.75em; /* 75% of primary */\n  font-weight: 400;\n  color: var(--text-tertiary, rgba(0,0,0,0.7));\n  line-height: 1.4;\n}\n\n/* Typography Hierarchy Spacing Heuristics */\n/* Primary → Secondary: 0.5em gap (half the primary size) */\n/* Secondary → Tertiary: 0.375em gap */\n/* Same level elements: 0.25em gap */\n\n.primary-text + .secondary-text {\n  margin-top: 0.5em;\n}\n\n.secondary-text + .tertiary-text {\n  margin-top: 0.375em;\n}\n\n.primary-text + .primary-text,\n.secondary-text + .secondary-text {\n  margin-top: 0.25em;\n}\n\n/* Visual hierarchy multipliers:\n   - Size: Each level ~80-87% of previous\n   - Weight: Drop 100-200 units per level\n   - Opacity: Drop 10-15% per level\n   - Spacing: 50% → 37.5% → 25% of primary size */\n```\n\n### Subformat-Specific Rules\n\n**Design with familiar patterns** - Users know these formats from daily app usage. Meet their expectations, then exceed them with better spacing, smoother interactions, and superior visual polish. Doing something expected is good - just do it better.\n\n**Badge Format:**\n- Feels like exportable graphics\n- **Familiar from:** Slack badges, GitHub labels\n- 150×105 has 3 vertical elements\n- Fills/backgrounds extend to edges, content respects padding\n- **LEFT align always** - right elements balance\n- **Images:** Iconified 16-34px\n- **Heights:**\n  - 40px: Title + icon horizontal only (or composite field identity)\n  - 65px: Title + icon/ID stacked, single lines\n  - 105px: Title + icon + status, magnetic edges\n- Use formatters for compact display\n- **For FieldDefs:** Show composite identity + key details\n- **Typography example at 105px:**\n  - Primary title: 14px (0.875rem)\n  - Secondary ID: 12px with 7px gap from title\n  - Tertiary status: 10px with 5px gap from ID\n\n**Strip Format:**\n- **Primary use:** Dropdown and chooser panels where users scan and select\n- **Familiar from:** VS Code command palette, Spotlight search, Notion quick switcher\n- Optimized for quick scanning and selection - every pixel matters\n- **Title/identifier MUST ALWAYS be visible** - no animations, overlays, or effects that obscure it\n- Never use hover effects that hide or transform the identifier\n- Right-justify elements in wider strips\n- **Left aligned - no exceptions**\n- **Images:** \n  - 40px height: Same as badge (20-34px) for consistency\n  - 65px+ height: Standard size (40px)\n- **Height requirements:**\n  - 40px: Title + key stat horizontally ONLY - single line, images 20-34px (same as badge)\n  - 65px: Two single lines stacked vertically - NO wrapping within lines, images 40px\n  - 105px: Three rows with magnetic edge spacing, images 40px\n- Abbreviate metadata, keep primary identity full\n\n**Tile Format:**\n- Standard vertical card layout\n- Optimize for grid viewing\n- Primary identity MUST be fully visible and prominent - no exceptions\n- The last vertical element MUST magnetically stick to the bottom\n\n**Card Format:**\n- Compact card (400×170) is split horizontally once at the golden ratio, then content within each panel is organized vertically\n- All other cards larger than compact card should be vertically subdivided\n- Expanded card is the full card with more data on the bottom\n- Expanded card MUST use all available vertical space - empty space is failure\n- The last vertical element MUST magnetically stick to the bottom\n\n### CTA Placement\n- **CardDef tile subformats only** (not FieldDefs)\n- Show on hover/focus only\n- Can obscure other content when shown\n- Lowest priority\n\n### Fitted Formats for FieldDefs (Optional)\n\n**IMPORTANT:** Fitted formats are optional for FieldDefs. FieldDefs require embedded format (with natural height) and that should be your primary focus. Only create fitted formats when your field might be displayed in fixed-size containers.\n\nWhen implementing fitted formats for FieldDefs, they require a different approach than CardDefs because they lack inherent identity and have no click-through capability.\n\n**Key Difference from CardDef Fitted:**\n- **CardDef fitted:** Shows identity + key info → click for details\n- **FieldDef fitted:** Shows most important data that fits (still space-constrained)\n\n**Creating Field Identity:**\nSince fields don't have clear identity like cards, create a composite identifier by combining 1-3 most important data points. For example:\n- Address field: Street + City\n- Price field: Amount + Currency + Trend\n- Contact field: Name + Primary method\n- Date range: Start + Duration + Status\n\n**Content Priority Shift:**\nBecause users can't click through to see more, fitted formats for fields should:\n- Show the most important data that fits the space\n- Prioritize key identifiers and critical values\n- Include essential metadata over nice-to-have details\n- Use composite identity from 1-3 key data points\n- Remember: still space-constrained like card fitted formats\n\n**Visual Field Handling:**\nFor image-based or visually-oriented compound fields:\n- Make the image/visual element primary (fill most space)\n- Overlay metadata on top with appropriate contrast\n- Use scrims or backdrop shadows for text legibility (except on precise visual content)\n- Consider the image as the \"identity\" with data as support\n- **CRITICAL:** For color fields, charts, or data visualizations, avoid scrims/overlays that alter perception\n\n**Example implementations:**\n- **Location field:** Map thumbnail with address overlay\n- **Chart field:** Visualization fills space, key metrics on corners (no scrim)\n- **Media field:** Thumbnail/preview large, metadata badge overlay\n- **Color field:** Swatch as background, hex/rgb values on top (pure color, no overlay)\n\n```css\n/* Example: Visual field with overlay metadata */\n.field-tile-format.visual-field {\n  position: relative;\n  padding: clamp(0.1875rem, 2%, 0.5rem); /* Clear space scales with container */\n}\n\n.field-tile-format .visual-primary {\n  width: 100%;\n  height: 100%;\n  object-fit: cover;\n  border-radius: 0.25rem; /* Subtle radius prevents harsh edges */\n}\n\n.field-tile-format .metadata-overlay {\n  position: absolute;\n  bottom: clamp(0.1875rem, 2%, 0.5rem); /* Match container padding */\n  left: clamp(0.1875rem, 2%, 0.5rem);\n  right: clamp(0.1875rem, 2%, 0.5rem);\n  padding: 0.5rem;\n  background: linear-gradient(to top, \n    rgba(0,0,0,0.8) 0%, \n    rgba(0,0,0,0) 100%);\n  color: white;\n  border-radius: 0.25rem;\n}\n\n/* Non-visual fields show more detail */\n.field-badge-format {\n  padding: clamp(0.1875rem, 2%, 0.375rem); /* Clear space for badges */\n}\n\n.field-badge-format .composite-identity {\n  font-weight: 600;\n  margin-bottom: 0.25rem;\n}\n\n.field-badge-format .field-details {\n  font-size: 0.75rem;\n  opacity: 0.9;\n}\n```\n\n### Visual Guidelines\n\n#### Icons\n- Incorporate subtly with appropriate size/weight\n- Visual support only - include after key content\n\n#### Images\n- Priority 2 - show after primary identifier\n- **Badge:** Always iconified (16-34px)\n- **Strip:** \n  - 40px height: 20-34px (matches badge)\n  - 65px height: Fixed 40px\n  - 105px height: Can fill height with AR constraint in wide strips (250px+)\n- **Tile:** Background with vibrant scrim if image would obscure text (except for visually precise content)\n- **Tile/Card:** Apply shared scale budget with text\n- Aspect ratios 0.7-1.4 unless decorative\n- Never completely displace text\n- **For visual FieldDefs:** Image can be primary with metadata overlay\n\n**Scrim effects:** Use accent colors for vibrant overlays. Mix brand colors with dark gradients: purple-to-black, blue-to-indigo-to-black, or accent-with-opacity layers. **CRITICAL:** Never apply scrims to visually precise content (color swatches, charts, data visualizations, medical imagery) as they alter perception and compromise accuracy.\n\n**Animation restraint:** Never use animations that move content near edges - can expose accidental borders. Strips especially need static, predictable layouts for scanning.\n\n#### 105px Height Magnetic Edge Layout\n\nAt 105px, use `justify-content: space-between` to push three elements to top/middle/bottom edges, maximizing visual separation.\n\n### Key Implementation Details\n\n1. **CardDef Fitted:** Custom recommended (fallback exists)\n2. **FieldDef Requirements:** Embedded mandatory, fitted optional\n3. **Container Queries:** `container-type: size`\n4. **No Gaps:** Cover all sizes\n5. **Line Clamping:** Match height constraints\n6. **Scaling:** `clamp()` ±20-25%\n7. **Height Use:** Fill 40/65/105px fully\n8. **40px:** Horizontal only\n9. **105px:** `justify-content: space-between`\n10. **Strip IDs:** Always visible\n11. **Clear Space:** 3px min to 1rem max\n12. **Type Hierarchy:** Size/weight/spacing cascades (80-87% per level)\n13. **Data Shaping:** Use formatters\n14. **Priority:** Key-values > descriptions\n15. **Badge Images:** 16-34px scaling\n16. **Strip Images:** Match badge at 40px, larger at 65px+, AR-fill at 105px wide\n17. **Scale Budget:** 50% shared text/image\n18. **Font Scaling:** Smaller = smaller base\n19. **Key-Values:** Complete pairs only\n20. **Familiar Patterns:** Match expectations\n21. **Edge Fills:** Backgrounds full, content padded\n22. **Vibrant Scrims:** Accent colors\n23. **No Edge Animations:** Prevent border exposure\n24. **FieldDef Identity:** Composite 1-3 key data points for recognition\n25. **Visual Precision:** No scrims on color/chart/data viz content\n\n\n\n## CRITICAL Reminders\n\n1. **PrerenderedCardSearch returns components, not data** - Can't sort/filter after\n2. **Type-specific sort fields MUST have 'on'** - Missing 'on' = no results shown!\n3. **Empty arrays need length check** - `(gt @model.items.length 0)`\n4. **Query result spacing** - Use `.container > .containsMany-field` pattern\n5. **Always use absolute module URLs** - `new URL(...).href`\n\n### Using getCards for Data Access and Aggregation\n\nWhen you need full access to card data for calculations, aggregations, or custom processing, use the `getCards` API from context.\n\n#### Basic getCards Pattern\n\n```gts\n// ❌ WRONG: Don't import getCards - it's just a type definition\n// import { getCards } from '@cardstack/runtime-common';\n\n// ✅ CORRECT: Use getCards from context\n// With live updates (for dashboards)\ncardsResult = this.args.context?.getCards(\n  this,\n  () => this.query,\n  () => this.realmHrefs,\n  { isLive: true }\n);\n\n// For one-time load (omit isLive)\ncardsResult = this.args.context?.getCards(\n  this,\n  () => this.query,\n  () => this.realmHrefs\n);\n```\n\n#### Working with getCards Results\n\n```gts\n// getCards returns: { instances, isLoading, instancesByRealm }\ncardsResult = this.args.context?.getCards(\n  this,\n  () => this.storyQuery,\n  () => this.realmHrefs,\n);\n\n// Frontend sorting/filtering\nget sortedCards() {\n  const cards = this.cardsResult?.instances ?? [];\n  return [...cards].sort((a, b) => b.rating - a.rating);\n}\n\n<template>\n  {{#if this.cardsResult.isLoading}}\n    <div class=\"loading-state\">Loading cards...</div>\n  {{else if (gt this.cardsResult.instances.length 0)}}\n    <ul class=\"cards-list\">\n      {{#each this.sortedCards as |card|}}\n        <li>{{card.title}} - {{card.rating}}</li>\n      {{/each}}\n    </ul>\n  {{else}}\n    <div class=\"empty-state\">No cards found</div>\n  {{/if}}\n</template>\n```\n\n#### Map/Reduce Aggregation Patterns\n\n**Note:** These patterns load all matching cards into memory, so use sparingly for large datasets.\n\n**RULE: Make aggregated stats real** - When showing totals, averages, or counts in templates, calculate them from actual data using aggregation functions, not hardcoded placeholders.\n\n```gts\n// Calculate totals using reduce\nget totalValue() {\n  if (!this.cardsResult?.instances) return 0;\n  return this.cardsResult.instances.reduce((sum, card) => {\n    return sum + (card.value || 0);\n  }, 0);\n}\n\n// Group by category\nget groupedByCategory() {\n  if (!this.cardsResult?.instances) return {};\n  return this.cardsResult.instances.reduce((groups, card) => {\n    const category = card.category || 'Uncategorized';\n    groups[category] = groups[category] || [];\n    groups[category].push(card);\n    return groups;\n  }, {});\n}\n\n// Multiple metrics in one pass\nget metrics() {\n  if (!this.cardsResult?.instances) return null;\n  \n  return this.cardsResult.instances.reduce((acc, card) => {\n    acc.total += card.amount || 0;\n    acc.count += 1;\n    acc.byStatus[card.status] = (acc.byStatus[card.status] || 0) + 1;\n    if (card.priority === 'high') acc.highPriority += 1;\n    return acc;\n  }, {\n    total: 0,\n    count: 0,\n    byStatus: {},\n    highPriority: 0\n  });\n}\n```\n\n**Performance Considerations:**\n- For simple counts, use the type summaries API instead\n- PrerenderedCardSearch is better for display-only needs\n- Only use getCards when you need complex calculations\n- Consider pagination for large datasets\n\n### CardContainer: Making Cards Clickable\n\nTransforms cards into interactive, clickable elements for viewing or editing, complete with visual chrome. When used with the `cardComponentModifier`, it enables users to click through to view or edit the wrapped card.\n\n#### Usage\n\n```gts\n<template>\n  {{#if (gt @model.members.length 0)}}\n    <div class=\"members-grid\">\n      {{#each @fields.members as |member|}}\n        <CardContainer   \n            {{@context.cardComponentModifier\n            cardId=member.url\n            format='data'\n            fieldCategories=undefined\n            fieldName=undefined\n            }}\n            @displayBoundaries={{true}}>\n          <member @format=\"fitted\" />\n        </CardContainer>\n      {{/each}}\n    </div>\n  {{/if}}\n  \n  <style scoped>\n    .members-grid {\n      display: grid;\n      grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));\n      gap: 12px;\n    }\n    \n    /* If using containsMany delegation instead of manual iteration */\n    .members-container > .containsMany-field {\n      display: grid;\n      grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));\n      gap: 12px;\n    }\n  </style>\n</template>\n```\n\n**CRITICAL: Style Boxel UI Components for Custom Templates**\n\n**Boxel UI components (Button, BoxelSelect, etc.) must be completely styled when used in custom isolated, embedded, and fitted templates.** They come with minimal default styling and buttons especially will look broken without custom CSS.\n\n```gts\n<template>\n  <!-- ⁴⁶ NEVER use unstyled buttons - always add complete custom styling -->\n  <Button \n    @variant=\"primary\"\n    class=\"save-button\"\n    {{on 'click' this.handleSave}}\n  >\n    Save Changes\n  </Button>\n  \n  <style scoped> /* ⁴⁷ Required button styles */\n    /* CRITICAL: Always style buttons completely - default styling is insufficient */\n    .save-button {\n      /* Style Boxel components to match your design */\n      padding: 0.375rem 0.75rem;\n      font-size: 0.8125rem;\n      display: inline-flex;\n      align-items: center;\n      gap: 0.25rem;\n    }\n  </style>\n</template>\n```\n### Alternative: Using Custom Actions with viewCard API\n\nInstead of making entire cards clickable, you can create custom buttons or links that use the `viewCard` API to open cards in specific formats.\n\n#### Basic Implementation\n\n```javascript\n@action\nviewOrder(order: ProductOrder) {\n  // Open order in isolated view\n  this.args.viewCard(order, 'isolated');\n}\n\n@action\neditOrder(order: ProductOrder) {\n  // Open card in rightmost stack for side-by-side reference\n  // Useful for: 1) reference lookup, 2) edit panel on right while previewing on left\n    this.args.viewCard(order, 'edit',  {\n    openCardInRightMostStack: true\n  });\n}\n\n@action\nviewReturnPolicy() {\n  // Open card using URL\n  const returnPolicyURL = new URL('https://app.boxel.ai/markinc/storefront/ReturnPolicy/return-policy-0525.json');\n  this.args.viewCard(returnPolicyURL, 'isolated');\n}\n```\n\n#### Template Example\n\n```hbs\n<div class=\"order-card\">\n  <!-- Custom action buttons -->\n  <div class=\"order-actions\">\n    <BoxelButton @kind=\"primary\" {{on \"click\" (fn this.viewOrder order)}}>\n      View Order\n    </Button>\n    \n    <BoxelButton @kind=\"secondary-light\" {{on \"click\" (fn this.editOrder order)}}>\n      Edit Order\n    </Button>\n  </div>\n  \n\n  <BoxelButton @kind=\"text-only\" {{on \"click\" (fn this.viewReturnPolicy)}}>\n      Return Policy\n  </Button>\n</div>\n```\n\n#### Available Formats\n\n- `'isolated'` - Read-oriented mode, may have some editable forms or interactive widgets\n- `'edit'` - Open card for full editing\n\n#### Use Cases\n- Multiple direct call-to-actions per card (view, edit)\n- More control over user interactions\n- Link to any card via a card URL\n\n\n## External Libraries: Bringing Third-Party Power to Boxel\n\n**When to Use External Libraries:** Sometimes you need specialized functionality like 3D graphics (Three.js), data visualization (D3), or charts. Boxel plays well with external libraries when you follow the right patterns.\n\n**Key Rules:**\n1. **Always use Modifiers for DOM access** - Never manipulate DOM directly\n2. **Use ember-concurrency tasks** for async operations like loading libraries\n3. **Bind external data to model fields** for reactive updates\n4. **Use proper loading states** while libraries initialize\n\n### Pattern: Dynamic Three.js Integration\n\n```gts\nimport { task } from 'ember-concurrency';\nimport Modifier from 'ember-modifier';\n\n// Global accessor function\nfunction three() {\n  return (globalThis as any).THREE;\n}\n\nclass ThreeJsComponent extends Component<typeof ThreeJsCard> {\n  @tracked errorMessage = '';\n  private canvasElement: HTMLCanvasElement | undefined;\n  \n  private loadThreeJs = task(async () => {\n    if (three()) return;\n    \n    const script = document.createElement('script');\n    script.src = 'https://cdn.jsdelivr.net/npm/three@0.160.0/build/three.min.js';\n    script.async = true;\n    \n    await new Promise((resolve, reject) => {\n      script.onload = resolve;\n      script.onerror = reject;\n      document.head.appendChild(script);\n    });\n  });\n\n  private initThreeJs = task(async () => {\n    try {\n      await this.loadThreeJs.perform();\n      if (!three() || !this.canvasElement) return;\n      \n      const THREE = three();\n      \n      // Scene setup - bind results to model fields for reactivity\n      this.scene = new THREE.Scene();\n      // ... setup scene\n      \n      // CRITICAL: Bind external data to model fields\n      this.args.model.sceneReady = true;\n      this.args.model.lastUpdated = new Date();\n      \n      this.animate();\n    } catch (e: any) {\n      this.errorMessage = `Error: ${e.message}`;\n    }\n  });\n\n  private onCanvasElement = (element: HTMLCanvasElement) => {\n    this.canvasElement = element;\n    this.initThreeJs.perform();\n  };\n\n  <template>\n    {{#if this.initThreeJs.isRunning}}\n      <div class=\"loading\">Initializing 3D scene...</div>\n    {{/if}}\n    \n    <canvas {{CanvasModifier onElement=this.onCanvasElement}}></canvas>\n  </template>\n}\n```\n\n## File Organization\n\n### Single App Structure\n```\nmy-realm/\n├── blog-post.gts          # Card definition (kebab-case)\n├── author.gts             # Another card\n├── address-field.gts      # Field definition (kebab-case-field)\n├── BlogPost/              # Instance directory (PascalCase)\n│   ├── hello-world.json   # Instance (any-name)\n│   └── second-post.json   \n└── Author/\n    └── jane-doe.json\n```\n\n### Related Cards App Structure\n**CRITICAL:** When creating apps with multiple related cards, organize them in common folders:\n\n```\nmy-realm/\n├── ecommerce/             # Common folder for related cards\n│   ├── product.gts        # Card definitions\n│   ├── order.gts\n│   ├── customer.gts\n│   ├── Product/           # Instance directories\n│   │   └── laptop-pro.json\n│   └── Order/\n│       └── order-001.json\n├── blog/                  # Another app's folder\n│   ├── post.gts\n│   ├── author.gts\n│   └── Post/\n│       └── welcome.json\n└── shared/                # Shared components\n    └── address-field.gts  # Common field definitions\n```\n\n**Directory Discipline:** When creating files within a specific directory structure (e.g., `ecommerce/`), keep ALL related files within that structure. Don't create files outside the intended directory organization.\n\n**Relationship Path Tracking:** When creating related JSON instances, maintain a mental map of your file paths. Links between instances must use the exact relative paths you've created - consistency prevents broken relationships.\n\n## JSON Instance Format Quick Reference\n\n**When creating `.json` card instances via SEARCH/REPLACE, follow this structure:**\n\n**Naming:** Use natural names for JSON files (e.g., `Author/jane-doe.json`, `Product/laptop-pro.json`) - don't append `-sample-data`\n\n**Path Consistency:** When creating multiple related JSON instances, track the exact file paths you create. Relationship links must match these paths exactly - if you create `Author/dr-nakamura.json`, reference it as `\"../Author/dr-nakamura\"` from other instances.\n\n### Root Structure\nAll data wrapped in a `data` object with:\n* `type`: Always `\"card\"` for instances\n* `attributes`: Field values go here\n* `relationships`: Links to other cards\n* `meta.adoptsFrom`: Connection to GTS definition\n\n### Instance Template\n```json\n{\n  \"data\": {\n    \"type\": \"card\",\n    \"attributes\": {\n      // Field values here\n    },\n    \"relationships\": {\n      // Card links here\n    },\n    \"meta\": {\n      \"adoptsFrom\": {\n        \"module\": \"../path-to-gts-file\",\n        \"name\": \"CardDefClassName\"\n      }\n    }\n  }\n}\n```\n\n### Field Value Patterns\n\n**Simple fields** (`contains(StringField)`, etc.):\n```json\n\"attributes\": {\n  \"title\": \"My Title\",\n  \"price\": 29.99,\n  \"isActive\": true\n}\n```\n\n**Compound fields** (`contains(AddressField)` - a FieldDef):\n```json\n\"attributes\": {\n  \"address\": {\n    \"street\": \"4827 Riverside Terrace\",\n    \"city\": \"Portland\",\n    \"postalCode\": \"97205\"\n  }\n}\n```\n\n**Array fields** (`containsMany`):\n```json\n\"attributes\": {\n  \"tags\": [\"urgent\", \"review\", \"frontend\"],\n  \"phoneNumbers\": [\n    { \"number\": \"+1-503-555-0134\", \"type\": \"work\" },\n    { \"number\": \"+1-971-555-0198\", \"type\": \"mobile\" }\n  ]\n}\n```\n\n### Relationship Patterns\n\n**Single link** (`linksTo`):\n```json\n\"relationships\": {\n  \"author\": {\n    \"links\": {\n      \"self\": \"../Author/dr-nakamura\"\n    }\n  }\n}\n```\n\n**Multiple links** (`linksToMany`) - note the `.0`, `.1` pattern:\n```json\n\"relationships\": {\n  \"teamMembers.0\": {\n    \"links\": { \"self\": \"../Person/kai-nakamura\" }\n  },\n  \"teamMembers.1\": {\n    \"links\": { \"self\": \"../Person/esperanza-cruz\" }\n  }\n}\n```\n\n**Empty linksToMany** - when no relationships exist:\n```json\n\"relationships\": {\n  \"nextLevels\": {\n    \"links\": {\n      \"self\": null\n    }\n  }\n}\n```\nNote: Use `null`, not an empty array `[]`\n\n### Path Conventions\n* **Module paths**: Relative to JSON location, no `.gts` extension\n  * Local: `\"../author\"` or `\"../../shared/address-field\"`\n  * Base: `\"@cardstack/base/string\"`\n* **Relationship paths**: Relative paths, no `.json` extension\n  * `\"../Author/jane-doe\"` not `\"../Author/jane-doe.json\"`\n* **Date formats**: \n  * DateField: `\"2024-11-15\"`\n  * DateTimeField: `\"2024-11-15T10:00:00Z\"`\n\n## 🚫 Common Mistakes to Avoid\n\n### 1. Using contains/containsMany with CardDef\n```gts\n// ❌ WRONG\nexport class Auction extends CardDef {\n  @field auctionItems = containsMany(AuctionItem); // AuctionItem is a CardDef\n}\n\n// ✅ CORRECT\nexport class Auction extends CardDef {\n  @field auctionItems = linksToMany(AuctionItem); // Use linksToMany for CardDef\n}\n```\n\n### 2. Template Calculation Mistakes\n```gts\n// ❌ WRONG - JavaScript/constructors in template\n<span>Total: {{@model.price * @model.quantity}}</span>\n<span>{{if @model.currentMonth @model.currentMonth (formatDateTime (new Date()) \"MMMM YYYY\")}}</span>\n\n// ✅ CORRECT - Use helpers or computed property\n<span>Total: {{multiply @model.price @model.quantity}}</span>\n<span>{{if @model.currentMonth @model.currentMonth this.currentMonthDisplay}}</span>\n```\n\n### 3. Using Reserved Words as Field Names\n```gts\n// ❌ WRONG - JavaScript reserved words\n@field type = contains(StringField);     // 'type' is reserved\n@field class = contains(StringField);    // 'class' is reserved\n\n// ✅ CORRECT - Use descriptive alternatives\n@field recordType = contains(StringField);  // Instead of 'type'\n@field category = contains(StringField);    // Instead of 'class'\n\n// ✅ CORRECT - Override inherited fields with computed versions\n@field fullName = contains(StringField);\n@field title = contains(StringField, {\n  computeVia: function() { return this.fullName ?? 'Unnamed'; }\n});\n```\n\n### 4. Missing Exports\n```gts\n// ❌ WRONG - Missing export will break module loading\nclass BlogPost extends CardDef { // Missing 'export'\n}\n\n// ❌ WRONG - Separate export statement\nclass BlogPost extends CardDef { }\nexport { BlogPost };\n\n// ✅ CORRECT - Always export CardDef and FieldDef classes inline\nexport class BlogPost extends CardDef {\n}\n```\n\n### 5. Missing Spacing for Auto-Collections\n```gts\n// ❌ WRONG - No spacing wrapper for delegated items\n<@fields.items @format=\"embedded\" />\n\n// ❌ WRONG - Container styling won't reach containsMany items\n<div class=\"items-container\">\n  <@fields.items @format=\"embedded\" />\n</div>\n\n<style scoped>\n.items-container {\n  display: flex;\n  gap: 0.75rem; /* Won't work! */\n}\n</style>\n\n// ✅ CORRECT - Target .containsMany-field\n<div class=\"items-container\">\n  <@fields.items @format=\"embedded\" />\n</div>\n\n<style scoped>\n.items-container > .containsMany-field {\n  display: flex;\n  flex-direction: column;\n  gap: 0.75rem; /* REQUIRED: Adds spacing between items */\n}\n</style>\n```\n\n### 6. Mixing @model Iteration with @fields Delegation\n```gts\n// ❌ WRONG - Cannot use @fields inside @model iteration\n{{#each @model.teamMembers as |member|}}\n  <@fields.member @format=\"embedded\" />  <!-- member is data, not a field -->\n{{/each}}\n\n// ✅ CORRECT - Choose one approach\n// Option 1: Full delegation\n<@fields.teamMembers @format=\"embedded\" />\n\n// Option 2: Full @model control\n{{#each @model.teamMembers as |member|}}\n  <div class=\"member\">{{member.name}}</div>\n{{/each}}\n```\n\n### 7. Using Emoji or Boxel Icons in Templates\n```hbs\n<!-- ❌ WRONG - Emoji varies by OS/platform -->\n<h4>🎯 Daily Goals</h4>\n<button>💬 Comments</button>\n\n<!-- ❌ WRONG - Can't be sure Boxel icons exist -->\n<h4><TargetIcon class=\"icon\" /> Daily Goals</h4>\n<button><MessageCircleIcon class=\"icon\" /> Comments</button>\n\n<!-- ✅ CORRECT - Use inline SVG in templates -->\n<h4>\n  <svg class=\"icon\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\">\n    <circle cx=\"12\" cy=\"12\" r=\"10\"/>\n    <circle cx=\"12\" cy=\"12\" r=\"6\"/>\n    <circle cx=\"12\" cy=\"12\" r=\"2\"/>\n  </svg>\n  Daily Goals\n</h4>\n<button>\n  <svg class=\"icon\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\">\n    <path d=\"M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z\"/>\n  </svg>\n  Comments\n</button>\n```\n\n### 8. Self-Import Error\n```gts\n// ❌ WRONG - Never import the same field you're defining\nimport AddressField from '@cardstack/base/address';\n\nexport class AddressField extends FieldDef { // Defining AddressField but importing it too\n  // ... this will cause conflicts\n}\n\n// ✅ CORRECT - Don't import what you're defining\nexport class AddressField extends FieldDef {\n  // ... define the field without importing it\n}\n\n// ✅ CORRECT - To extend a base field, import it with a different name or extend directly\nimport BaseAddressField from '@cardstack/base/address';\n\nexport class FancyAddressField extends BaseAddressField {\n  // ... extend the base field with custom behavior\n}\n```\n\n### 9. Escaping Placeholder Attributes Only\n```hbs\n<!-- ❌ WRONG - Unescaped quotes/brackets in placeholder attributes -->\n<textarea placeholder=\"Enter markdown: # Title\\n## Subtitle\">{{@model.content}}</textarea>\n<input placeholder=\"Code: if (x > 0) { return \"success\"; }\">\n\n<!-- ✅ CORRECT - Escape special characters ONLY in placeholder attributes -->\n<textarea placeholder=\"Enter markdown: &#35; Title&#10;&#35;&#35; Subtitle\">{{@model.content}}</textarea>\n<input placeholder=\"Code: if (x &gt; 0) &#123; return &quot;success&quot;; &#125;\">\n```\n\n### 10. Don't use single curlies\n```hbs\n<!-- ❌ WRONG  -->\n<span>#{@model.paddleNumber}</span>\n\n<!-- ✅ CORRECT -->\n<span>#{{@model.paddleNumber}}</span>\n```\n\n**Note:** The `#` character starts block helpers in Handlebars (e.g., `{{#if}}`, `{{#each}}`), so it must be escaped when you want to display it literally before template interpolations.\n\n### 11. Using Unstyled Buttons\n```gts\n// ❌ WRONG - Unstyled buttons look broken\n<Button @onClick={{this.handleSave}}>Save</Button>\n\n// ✅ CORRECT - Always add complete styling (see button styling example in Advanced Patterns)\n<Button class=\"save-button\" @onClick={{this.handleSave}}>Save</Button>\n```\n\n### 12. Missing Tracking Comments in .gts Files\n```gts\n// ❌ WRONG - No tracking mode indicator on line 1\nimport { CardDef } from '@cardstack/base/card-api';\n\n// ✅ CORRECT - Tracking mode on line 1, markers throughout\n// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══\nimport { CardDef } from '@cardstack/base/card-api'; // ¹ Core imports\n```\n\nRemember to include the post-SEARCH/REPLACE notation `╰ ¹⁻³` after blocks!\n\n### 13. Wrong Empty Relationship Format in JSON\n```json\n// ❌ WRONG - Empty array for null relationship\n\"relationships\": {\n  \"nextLevels\": {\n    \"links\": {\n      \"self\": []\n    }\n  }\n}\n\n// ✅ CORRECT - Use null for empty linksToMany\n\"relationships\": {\n  \"nextLevels\": {\n    \"links\": {\n      \"self\": null\n    }\n  }\n}\n```\n\n### 14. SVG URL References Don't Work in Boxel\n```hbs\n<!-- ❌ WRONG - Boxel cannot route url(#id) references -->\n<svg>\n  <defs>\n    <linearGradient id=\"grad\">\n      <stop offset=\"0%\" style=\"stop-color:#6366f1\" />\n      <stop offset=\"100%\" style=\"stop-color:#8b5cf6\" />\n    </linearGradient>\n  </defs>\n  <rect fill=\"url(#grad)\" />\n</svg>\n\n<!-- ✅ CORRECT - Use CSS to style SVG elements -->\n<svg viewBox=\"0 0 100 100\" class=\"gradient-svg\">\n  <rect x=\"10\" y=\"10\" width=\"80\" height=\"80\" />\n</svg>\n<style scoped>\n  .gradient-svg rect {\n    fill: #6366f1; /* Fallback solid color */\n  }\n  /* Apply gradient as background to the SVG element itself */\n  .gradient-svg {\n    background: linear-gradient(135deg, #6366f1, #8b5cf6);\n    border-radius: 8px;\n  }\n</style>\n```\n\n**Rule:** Avoid `url(#id)` references in SVGs (for gradients, patterns, clips, etc.) as Boxel cannot route these correctly. Instead, use CSS alternatives to style SVG elements when available. For gradients specifically, use CSS `linear-gradient()` or `radial-gradient()` on SVG elements rather than SVG `<linearGradient>` or `<radialGradient>`.\n\n### 15. Missing 'on' Property in Query Filters\n```gts\n// ❌ WRONG - Missing 'on' for range filter\nconst query = {\n  filter: {\n    range: { price: { lte: 100 } }\n  }\n};\n\n// ✅ CORRECT - Include 'on' for non-basic filters\nconst query = {\n  filter: {\n    on: { module: new URL('./product', import.meta.url).href, name: 'Product' },\n    range: { price: { lte: 100 } }\n  }\n};\n```\n\n### Common Patterns\n\n```typescript\n// Field existence check\n{ on: {...}, not: { eq: { description: null } } }\n\n// Multiple ranges  \n{ on: {...}, range: {\n  score: { gt: 8 },\n  years: { gte: 1, lt: 10 },\n  date: { gte: new Date(Date.now() - 180 * 24 * 60 * 60 * 1000) }\n}}\n\n// Nested field access\n{ on: {...}, eq: { \n  'supervisor.id': this.args.model.id,\n  'department.active': true\n}}\n\n// Dynamic references\n{ on: {...}, range: { \n  price: { lte: this.args.model.budget || 1000 }\n}}\n```\n\n## ✅ Pre-Generation Checklist\n\n### 🚨 CRITICAL (Will Break Functionality)\n- [ ] **Using SEARCH/REPLACE blocks for all .gts edits**\n- [ ] **Tracking mode indicator on line 1:** `// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══`\n- [ ] **NO contains/containsMany with CardDef** - Check every field using contains/containsMany only uses FieldDef types\n- [ ] **NO JavaScript calculations/constructors in templates** - All computations must be in JS properties/getters\n- [ ] **ALL CardDef and FieldDef classes exported inline** - Every class must have 'export' in declaration\n- [ ] Correct contains/linksTo usage per the cardinal rule\n- [ ] Array length checks: `{{#if (gt @model.array.length 0)}}` not `{{#if @model.array}}`\n- [ ] **containsMany collection spacing: `.container > .containsMany-field { display: flex/grid; gap: X; }`**\n- [ ] **@fields delegation rule**: Always use `@fields` for delegation (even singular fields)\n- [ ] **Never mix @model iteration with @fields delegation** - choose one approach\n- [ ] **Fitted format requires style overrides (TEMPORARY):** `style=\"width: 100%; height: 100%\"`\n- [ ] **Use inline SVG in templates instead of emoji or Boxel icons**\n- [ ] **Never use unstyled buttons** - always add complete custom CSS styling\n- [ ] **Empty linksToMany relationships use null** - `\"self\": null` not `\"self\": []`\n- [ ] **No SVG url(#id) references** - use CSS gradients on SVG elements instead\n- [ ] **External libraries** - use Modifiers for DOM access, never manipulate DOM directly\n- [ ] **Query filters use 'on' property** - Required for range, contains, eq (except after type filter)\n- [ ] **Module URLs use new URL().href** - Never use relative paths in queries\n- [ ] **Realm URLs have trailing slash** - Required for realm references\n\n### ⚠️ IMPORTANT (Affects User Experience)\n- [ ] Icons assigned to all CardDef and FieldDef\n- [ ] Embedded templates for all FieldDefs\n- [ ] Empty states provided for all arrays\n- [ ] Every card computes inherited `title` field from primary identifier\n- [ ] Recent dates in sample data (2024/2025)\n- [ ] Currency/dates formatted with helpers in templates only\n- [ ] Meaningful placeholder text for all fallback states\n- [ ] Isolated views have scrollable content area\n- [ ] **Boxel UI components completely styled in custom templates**\n- [ ] **Creative sample data** - avoid clichés, create believable fictional scenarios\n- [ ] **Thoughtful font selection** - choose domain-appropriate Google fonts\n\n## Critical Rules Summary\n\n### One-Shot Success Criteria (Priority Order)\n1. **Runnable** - No syntax errors, all imports work, no runtime crashes due to missing data\n2. **Syntactically Correct** - Proper contains/linksTo, exports, tracking comments\n3. **Attractive** - Professional styling, thoughtful UX, visual polish\n4. **Evolvable** - Clear structure for user additions and modifications\n\n### NEVER Do These\n\n### 🔴 #1 MOST CRITICAL ERROR:\n❌ `contains(CardDef)` or `containsMany(CardDef)` → **ALWAYS** use `linksTo(CardDef)` or `linksToMany(CardDef)`\n\n### 🔴 #2 CRITICAL: No JavaScript in Templates\n❌ **NEVER do calculations, constructors, or call methods in templates:**\n   - `{{@model.price * 1.2}}` → Use `{{multiply @model.price 1.2}}`\n   - `{{(new Date())}}` → Create getter `get currentDate()`\n   - `{{price > 100}}` → Use `{{gt price 100}}`\n\n### 🔴 #3 CRITICAL: Field Rules\n❌ **JavaScript reserved words as field names** → Use descriptive alternatives  \n❌ **Defining same field name twice in your own class** → Each field name unique  \n✅ **OK to override parent's fields** → Can compute title, description, thumbnailURL  \n❌ **Missing exports on CardDef/FieldDef** → Every class must be exported  \n\n### 🔴 #4 CRITICAL: Edit Tracking Mode\n❌ **Missing tracking mode indicator on line 1** → Every .gts file MUST start with tracking  \n❌ **SEARCH/REPLACE blocks without tracking markers** → Both blocks must contain ⁿ\n\n### Other Critical Rules\n❌ `<@fields.items />` without proper CSS selector → Target `.container > .containsMany-field` for spacing  \n❌ Cards without computed titles → Every card needs title for tiles/headers  \n❌ **Using unstyled buttons** → Always add complete custom styling  \n❌ **Empty linksToMany as array** → Use `\"self\": null` not `\"self\": []`  \n❌ **SVG url(#id) references** → Use CSS styling on SVG elements instead  \n\n### ALWAYS Do These\n✅ **CHECK NON-NEGOTIABLE TECHNICAL RULES FIRST** - before any code generation  \n✅ **MANDATORY: Line 1 of every .gts file:** `// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══`  \n✅ **Export every CardDef and FieldDef class** - essential for Boxel's module system  \n✅ **MANDATORY: Add spacing for containsMany collections** - use `.container > .containsMany-field`  \n✅ **Completely style Boxel UI components in custom templates** - especially buttons  \n✅ **Handle empty card state gracefully** - cards boot with no data  \n✅ **Create believable sample data** - avoid clichés  \n✅ **Choose domain-appropriate fonts** - use proven Google fonts  \n\n### **Summarizing Changes Back to the User**\nAfter SEARCH/REPLACE blocks, summarize changes using superscript references:\n   - \"Created the task management system ¹⁻⁸\"\n   - \"Added priority filtering ¹²⁻¹⁵ and status indicators ¹⁶\"\n\n**Remember:** This guide works alongside Source Code Editing skill. For general SEARCH/REPLACE mechanics, refer to that document. This guide adds Boxel-specific requirements.",
       "commands": [],
       "cardTitle": "Boxel Development",
       "cardDescription": "Created by the Boxel Team with help from Gemini 2.5 Pro Experimental - V3",
@@ -10,7 +10,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/base/Skill/boxel-environment.json b/packages/base/Skill/boxel-environment.json
index 7770aebc804..12189cd90da 100644
--- a/packages/base/Skill/boxel-environment.json
+++ b/packages/base/Skill/boxel-environment.json
@@ -2,7 +2,7 @@
   "data": {
     "type": "card",
     "attributes": {
-      "instructions": "# Boxel Environment Guide\n\n🔭 You help users navigate Boxel efficiently, switching between modes and orchestrating workflows. Work alongside Boxel Development skill for seamless code operations.\n\n## ⚠️ CRITICAL: Runaway Loop Detection\n**STOP IMMEDIATELY if you see:**\n- Same commands repeating\n- Duplicate messages accumulating\n- Actions looping without progress\n**→ Halt generation and alert: \"Detected potential loop. Stopping to prevent runaway execution.\"**\n\n## 🚨 CRITICAL: Code Mode First for ALL Code Generation\n**ALWAYS switch to code mode BEFORE ANY code generation activity**, including:\n- One-shot prompts from Boxel Development Guide\n- Card definition creation\n- Template modifications\n- Any SEARCH/REPLACE operations\n**→ No exceptions. Switch to code mode FIRST, then proceed with generation.**\n\n**🔴 CRITICAL: Verify LLM Before Code Generation**\nBefore generating ANY code, check current LLM:\n- **Approved for code**: `anthropic/claude-sonnet-4.6`, `anthropic/claude-opus-4`, `google/gemini-2.5-pro`\n- **If using different model** → Switch to approved model FIRST\n- **Default**: Always use `anthropic/claude-sonnet-4.6` unless specific reason\n\n**EXCEPTION: When Boxel Development skill is active:**\n- Code generation allowed in ANY mode (interact or code)\n- Interact mode: Only modify code visible in current view\n- Use open card stack for context\n\n**EXCEPTION: When workspace is known:**\n- Can create new cards/code even without open cards\n- Still switch to code mode for better experience\n\n## Debug Mode\nWhen user starts with \"debug\", output current context: attached files, workspace (username/workspace-name), mode, available skills, decision factors, and any pending schema fixes.\n\n## Location Parsing\n\nWhere is the user in Boxel?\n\n- **Dashboard**: No workspace in URL → \"Navigate to workspace first\"\n- **Workspace Home**: Has workspace, no cards → Offer search/create\n- **Card View**: Workspace + cards → Active interactive session focusing on content and data exploration\n- **Code Edit**: Code mode + file → Editing schema or instance\n\n**Navigation Stack**: User's click path (not data relationships)\n- Bottom = oldest, Top = current\n- Use URLs to fetch card context\n- Mixed realms possible\n\n**Format Detection**: Current format = user's focus for code changes\n- `isolated`: Full detail | `embedded`: Summary | `fitted`: Grid\n- `atom`: Inline | `edit`: Form\n\n## User Communication\n\n**Focus on intent, not mechanics.** Users care about what they want to do, not Boxel's internal structure.\n\n### Intent-Based Responses\n\n| User Says | Respond With | Not |\n|-----------|--------------|-----|\n| \"Create a shopping list\" | \"I'll create a shopping list card for you\" | \"You're in workspace slewis88/buff-forrest in interact mode\" |\n| \"What am I looking at?\" | \"You're viewing a blog post in preview\" | \"You have BlogPost/123 open in embedded format\" |\n| \"Fix this error\" | \"I see the issue - let me fix that JSON syntax\" | \"I need to use read-file-for-ai-assistant first\" |\n| \"Make the title bigger\" | \"I'll update the title styling\" | \"Switching to code mode to edit embedded template\" |\n\n### Acknowledge → Act → Confirm\n1. **Acknowledge intent**: \"I'll help you create that\"\n2. **Act silently**: Switch modes, read files, run commands\n3. **Confirm completion**: \"Done! Your shopping list is ready\"\n\n## Quick Reference\n\n**File Types:** `.gts` (CardDef/FieldDef definitions) | `.json` (instance data)  \n**Core Pattern:** CardDef uses linksTo | FieldDef uses contains  \n**Essential Formats:** Every CardDef needs isolated, embedded, fitted  \n**Current Format = Code Focus:** User viewing embedded? → Edit embedded template  \n\n**Command Names:**\n- `switch-submode` → Toggle interact/code modes\n- `show-card` → Display card in current mode\n- `search-cards` → Simple title search\n- `search-cards-by-query` → Advanced search (preferred)\n- `read-text-file` → Read files\n- `write-text-file` → Save files\n- `patch-code` → Apply code changes with auto-lint\n- `patch-card-instance` → Update card data only\n- `save-card` → Create card instance\n- `copy-card` → Duplicate card\n- `transform-cards` → Bulk update with command\n- `set-active-llm` → Switch AI model\n\n## Decision Tree\n\n```\nCan you determine workspace from first attached file?\n├─ No workspace evident? → You're in Dashboard\n│   └─ Ask user to navigate to workspace and open a card first\n└─ Workspace identified? → Proceed with operations\n\nIs Boxel Development skill active (coding workflow started)?\n├─ Yes → Code changes allowed in ANY mode\n│   ├─ Interact mode? → OK to modify .gts files (better for preview/navigation)\n│   │   └─ Use open card stack for parent context\n│   └─ Code mode? → Standard code operations\n└─ No → Follow standard mode restrictions\n\nUser wants to change card appearance/logic/code?\n├─ Development skill active? → Proceed in current mode\n├─ Switch to code mode (simple): {\"name\": \"switch-submode_[hash]\", \"payload\": {\"submode\": \"code\"}}\n├─ Switch with navigation: {\"name\": \"switch-submode_[hash]\", \"payload\": {\"submode\": \"code\", \"codePath\": \"[full-url].gts\"}}\n└─ Read contents of gts file: { \"name\": \"read-file-for-ai-assistant_[hash]\", \"payload\": { \"fileUrl\": \"[full-url].gts\"}}\n\nJust made schema-breaking changes?\n├─ Offer to fix instances: \"Update existing instances?\"\n├─ Search for all affected instances\n├─ ≤10 files? → Fix all with SEARCH/REPLACE\n├─ >10 files? → \"Found X instances. Update first 10?\"\n├─ After fixing → switch-submode to instance.json to verify\n└─ If partial → \"First 10 done. Continue with next 10 of Y remaining?\"\n\nCreating NEW .gts file?\n├─ Navigate with codePath to non-existent .gts\n├─ Create with SEARCH/REPLACE\n├─ Wait for user acceptance\n└─ Propose: \"Refresh to see new file?\" → If yes, switch-submode with same codePath\n\nUser exploring/finding cards?\n├─ PREFERRED: Use `search-cards-by-query` with full query object\n├─ Simple title-only search? → Can use `search-cards` (but query preferred)\n└─ Need to view results? → Use `show-card` for each result\n\nUser updating content?\n├─ Code/template changes? → Development skill active? Any mode OK : Switch to code mode first\n├─ Data-only changes? → Use `patch-card-instance`\n└─ Bulk operations? → Switch to code mode for SEARCH/REPLACE\n\nIn interact mode with open card stack?\n├─ Extract navigation hierarchy for context\n├─ Identify parent cards that may be querying current card\n├─ Use stack order: bottom (oldest) → top (current) for relationship analysis\n└─ Share parent context with Development skill for smarter code generation\n```\n\n## URL Structure & Workspace Awareness\n\n```\nhttps://[boxel-app-domain]/[username]/[workspace]/[path].[extension]\nExample: https://app.boxel.ai/sarah/pet-rescue/animals/dog.gts\n         └── app.boxel.ai is one example of boxel-app-domain ──┘\n```\n\n**🚨 No workspace evident?** → Ask: \"Please navigate to a workspace, open a card, then reply 'continue'\"\n\n**File Naming:**\n- Definitions: `kebab-case.gts`\n- Instance dirs: `PascalCase/`\n- Instances in JSON links: `BlogPost/my-first-post` (no extension)\n- Instances in workspace view: `BlogPost/my-first-post.json`\n\n## Essential Commands\n\n### update-code-path-with-selection (switch modes/navigate)\n\n**Full tool call syntax:**\n```json\n{\n  \"name\": \"update-code-path-with-selection\",\n  \"payload\": {\n    \"submode\": \"code\",\n    \"codePath\": \"https://[boxel-app-domain]/alex/crm-app/employee.gts\"  // optional\n  }\n}\n```\n\n**Common patterns:**\n```json\n// Just switch modes\n{\n  \"name\": \"update-code-path-with-selection\",\n  \"payload\": {\n    \"submode\": \"code\"\n  }\n}\n\n// Switch + navigate (needs full URL with extension)\n{\n  \"name\": \"update-code-path-with-selection\",\n  \"payload\": {\n    \"submode\": \"code\",\n    \"codePath\": \"https://[boxel-app-domain]/maya/recipes/dish.gts\"\n  }\n}\n\n// Verify instance after schema fix\n{\n  \"name\": \"update-code-path-with-selection\",\n  \"payload\": {\n    \"submode\": \"code\",\n    \"codePath\": \"https://[boxel-app-domain]/maya/recipes/Dish/pasta-carbonara.json\"\n  }\n}\n```\n\n**NEW .gts pattern:** Navigate → Create with SEARCH/REPLACE → User accepts → Propose: \"Refresh to see new file?\" → Same codePath\n\n### SearchCardsByQueryCommand (via apply-search-replace-block)\n\n**Full tool call syntax:**\n```json\n{\n  \"name\": \"apply-search-replace-block\",\n  \"payload\": {\n    \"query\": {\n      \"filter\": {\n        \"on\": { \"module\": \"https://[boxel-app-domain]/jenna/shop/product\", \"name\": \"Product\" },\n        \"contains\": { \"name\": \"laptop\" }\n      }\n    }\n  }\n}\n```\n\n**Multiple conditions:** Use `every` (AND) or `any` (OR) arrays  \n**❌ Common mistake:** Forgetting the `query` wrapper\n\n### SearchCardsByTypeAndTitleCommand (via ai-assistant)\n\n**Full tool call syntax:**\n```json\n{\n  \"name\": \"ai-assistant\",\n  \"payload\": {\n    \"title\": \"quarterly report\",\n    \"cardType\": \"https://[boxel-app-domain]/emma/finance/report#Report\"\n  }\n}\n```\n\n### update-playground-selection (show card)\n\n**Full tool call syntax:**\n```json\n{\n  \"name\": \"update-playground-selection\",\n  \"payload\": {\n    \"cardId\": \"https://[boxel-app-domain]/jenna/shop/Product/laptop-pro\"\n  }\n}\n```\n**Note:** Instance URLs work with or without `.json`\n**Shows card instance in the current mode** (interact or code)\n\n### patch-card-instance\n\n**Full tool call syntax:**\n```json\n{\n  \"name\": \"patch-card-instance_[hash]\",\n  \"payload\": {\n    \"cardId\": \"https://[boxel-app-domain]/david/fitness/Workout/morning-routine\",\n    \"patch\": {\n      \"attributes\": {\n        \"duration\": 45,\n        \"difficulty\": \"intermediate\"\n      }\n    }\n  }\n}\n```\n**Use for:** Single data updates only. Everything else → code mode + SEARCH/REPLACE\n\n### Additional Commands\n\n**write-text-file**: Create new files\n```json\n{\n  \"name\": \"write-text-file\",\n  \"payload\": {\n    \"path\": \"https://[boxel-app-domain]/user/workspace/new-card.gts\",\n    \"content\": \"// File content here\"\n  }\n}\n```\n\n**save-card**: Save card instances\n```json\n{\n  \"name\": \"save-card\",\n  \"payload\": {\n    \"card\": { /* card data */ }\n  }\n}\n```\n\n**copy-card**: Duplicate existing cards\n```json\n{\n  \"name\": \"copy-card\",\n  \"payload\": {\n    \"sourceCard\": \"https://[boxel-app-domain]/user/Card/original\",\n    \"targetRealm\": \"https://[boxel-app-domain]/user/workspace/\"\n  }\n}\n```\n\n**patch-code**: Apply code changes\n```json\n{\n  \"name\": \"patch-code\",\n  \"payload\": {\n    \"path\": \"https://[boxel-app-domain]/user/card.gts\",\n    \"patch\": { /* patch object */ }\n  }\n}\n```\n\n**lint-and-fix**: Auto-fix code issues\n```json\n{\n  \"name\": \"lint-and-fix\",\n  \"payload\": {\n    \"path\": \"https://[boxel-app-domain]/user/card.gts\"\n  }\n}\n```\n\n### read-text-file (read file)\n\n**Full tool call syntax:**\n```json\n{\n  \"name\": \"read-text-file\",\n  \"payload\": {\n    \"path\": \"https://[boxel-app-domain]/jenna/shop/product.gts\"\n  }\n}\n```\n\nFile contents attached to tool call result.\n\n**Use for:** \n- Getting file content before SEARCH/REPLACE\n- Reading JSON with syntax errors → fix with SEARCH/REPLACE\n\n## Workflows\n\n### Code Generation\n```json\n{\"name\": \"switch-submode\", \"payload\": {\"submode\": \"code\"}}\n→ {\"name\": \"read-text-file\", \"payload\": {\"path\": \"https://[domain]/user/card.gts\"}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n→ (offer refresh)\n```\n\n### Card Creation\n```json\n{\"name\": \"switch-submode\", \"payload\": {\"submode\": \"code\"}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n→ {\"name\": \"save-card\", \"payload\": {\"realm\": \"...\", \"cardType\": {...}, \"data\": {...}}}\n→ {\"name\": \"show-card\", \"payload\": {\"cardId\": \"...\"}}\n```\n\n### Search & Modify\n```json\n{\"name\": \"search-cards-by-query\", \"payload\": {\"query\": {...}}}\n→ {\"name\": \"patch-card-instance\", \"payload\": {\"cardId\": \"...\", \"patch\": {...}}}\n```\n\n### Schema Migration\n1. Update schema with breaking changes:\n```json\n{\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n```\n2. Add migration command to same file:\n```typescript\nexport class MigrateNameFields extends Command<typeof JsonCard, typeof JsonCard> {\n  async getInputType() { return JsonCard; }\n  protected async run(input: JsonCard): Promise<JsonCard> {\n    // Transform logic here\n  }\n}\n```\n3. Run transform:\n```json\n{\"name\": \"transform-cards\", \"payload\": {\"query\": {...}, \"commandRef\": {...}}}\n```\n4. Remove migration command after success\n\n### Multi-Realm Operations\n```json\n{\"name\": \"copy-source\", \"payload\": {\"source\": \"...\", \"target\": \"...\"}}\n→ {\"name\": \"copy-card\", \"payload\": {\"sourceCard\": \"...\", \"targetRealm\": \"...\"}}\n→ {\"name\": \"transform-cards\", \"payload\": {\"query\": {...}, \"commandRef\": {...}}}\n```\n\n## Query Structure\n\n**Always wrap filter in query object:**\n```json\n{\n  \"query\": {\n    \"filter\": {\n      \"on\": { \"module\": \"...\", \"name\": \"Product\" },\n      \"contains\": { \"name\": \"laptop\" }\n    }\n  }\n}\n```\n\n**Operations:** `eq`, `contains`, `range`, `not`, `type`, `every` (AND), `any` (OR)\n\n**Find instances after schema change:**\n```json\n{\n  \"query\": {\n    \"filter\": {\n      \"type\": { \"module\": \"...\", \"name\": \"Employee\" }\n    }\n  }\n}\n```\n\n## Common Pitfalls\n\n❌ Not switching to code mode first (unless Development skill active)  \n❌ Missing file content → use read-text-file first  \n❌ Missing `query` wrapper in searches  \n❌ Using patch-card-instance for schema → use patch-code  \n❌ Auto-running refresh → always propose first  \n❌ Exceeding batch limit (10 files) for transforms\n\n## Orchestration Patterns\n\n### 1. Smart Code Refactoring\n```json\n{\"name\": \"set-active-llm\", \"payload\": {\"roomId\": \"!room:id\", \"llmId\": \"anthropic/claude-sonnet-4.6\"}}\n→ {\"name\": \"read-text-file\", \"payload\": {\"path\": \"https://[domain]/user/card.gts\"}}\n→ {\"name\": \"ai-assistant\", \"payload\": {\"prompt\": \"improve code structure\"}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n```\n**Note:** Always verify/switch to code-approved LLM first\n\n### 2. Data-Driven Schema Generation\n```json\n{\"name\": \"read-file-for-ai-assistant\", \"payload\": {\"path\": \"data.csv\"}}\n→ {\"name\": \"ai-assistant\", \"payload\": {\"prompt\": \"generate CardDef from CSV\"}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n→ {\"name\": \"save-card\", \"payload\": {\"realm\": \"...\", \"cardType\": {...}, \"data\": {...}}}\n```\n\n### 3. Live Preview Development\n```json\n{\"name\": \"show-card\", \"payload\": {\"cardId\": \"https://[domain]/user/Card/instance\"}}\n→ {\"name\": \"ai-assistant\", \"payload\": {\"prompt\": \"enhance UX for this card\"}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n→ {\"name\": \"show-card\", \"payload\": {\"cardId\": \"...\"}}\n```\n\n### 4. Bulk Relationship Mapping\n```json\n{\"name\": \"search-cards-by-query\", \"payload\": {\"query\": {\"filter\": {...}}}}\n→ {\"name\": \"ai-assistant\", \"payload\": {\"prompt\": \"detect relationship patterns\"}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n→ {\"name\": \"transform-cards\", \"payload\": {\"query\": {...}, \"commandRef\": {...}}}\n```\n\n### 5. Context-Aware Migration\n```json\n{\"name\": \"read-text-file\", \"payload\": {\"path\": \"https://[domain]/user/schema.gts\"}}\n→ {\"name\": \"search-cards-by-query\", \"payload\": {\"query\": {\"filter\": {...}}}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [{\"search\": \"}\", \"replace\": \"export class Migrate...}\"}]}}\n→ {\"name\": \"transform-cards\", \"payload\": {\"query\": {...}, \"commandRef\": {...}}}\n```\n\n### 6. Dependency Surfing\n```json\n{\"name\": \"read-text-file\", \"payload\": {\"path\": \"https://[domain]/user/card.gts\"}}\n→ {\"name\": \"read-text-file\", \"payload\": {\"path\": \"https://[domain]/user/Card/instance.json\"}}\n→ {\"name\": \"search-cards-by-query\", \"payload\": {\"query\": {\"filter\": {\"contains\": {\"imports\": \"card\"}}}}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n```\n\n### 7. Intelligent Debug Escalation\n```json\n{\"name\": \"ai-assistant\", \"payload\": {\"prompt\": \"debug this error: ...\"}}\n→ [if stuck] → {\"name\": \"set-active-llm\", \"payload\": {\"roomId\": \"!room:id\", \"llmId\": \"google/gemini-2.5-pro\"}}\n→ {\"name\": \"ai-assistant\", \"payload\": {\"prompt\": \"debug this error: ...\"}}\n```\n\n## Open Card Stack Navigation Context\n\nWhen user has multiple open cards, the navigation stack provides context:\n\n### Stack = Click History\n- **Bottom**: Oldest (first opened)\n- **Top**: Current card\n- **Not semantic**: Just navigation path, not data relationships\n\n### Using Stack for Context\n```javascript\n// Extract navigation context\nconst openCardStack = [\n  'https://app.boxel.ai/user/BlogApp',\n  'https://app.boxel.ai/user/BlogPost/1',\n  'https://cardstack.com/base/Author/jane'  // May be read-only realm\n];\n\nconst currentCard = openCardStack[openCardStack.length - 1];\nconst navigationPath = openCardStack.map(url => url.split('/').pop());\n// → ['BlogApp', '1', 'jane']\n```\n\nUse stack URLs to fetch card details and understand user's exploration path.\n\n## LLM Selection Strategy\n\n**🚨 CRITICAL: Always start with anthropic/claude-sonnet-4.6 for coding**\n\n### Recommendations\n- **Coding**: `anthropic/claude-sonnet-4.6` (always start here)\n- **Debug alternative**: `google/gemini-2.5-pro` or `google/gemini-2.5-flash`\n- **Complex refactoring**: `anthropic/claude-opus-4` (ask permission)\n- **General chat**: `openai/gpt-4.1`\n- **Bulk data/docs**: `google/gemini-2.5-flash` (fast) or `google/gemini-2.5-pro` (thorough)\n- **Current events**: `x-ai/grok-3` / `grok-3-mini`\n- **Legal tasks**: `meta-llama/llama-3.3-70b-instruct` (multilingual legal analysis)\n\n### LLM Selection Flowchart\n\n```\nWhat task are you doing?\n├─ 📝 Writing Code? → anthropic/claude-sonnet-4.6 (ALWAYS)\n│   └─ Complex refactoring? → Ask permission → anthropic/claude-opus-4\n├─ 🐛 Debugging?\n│   ├─ Try current LLM first\n│   └─ Still stuck? → google/gemini-2.5-flash (fast) or gemini-2.5-pro (deep)\n├─ 💬 General Chat/Planning? → openai/gpt-4.1\n├─ 📊 Bulk Data/Documents? → google/gemini-2.5-flash (no latency)\n├─ 🌍 Current Events/News? → x-ai/grok-3 or grok-3-mini\n├─ ⚖️ Legal Analysis? → meta-llama/llama-3.3-70b-instruct\n└─ 🧮 Complex Reasoning? → openai/o4-mini\n```\n\n### Available LLM IDs\n\n**🌟 Preferred Models:**\n- `anthropic/claude-sonnet-4.6` - **PRIMARY CODING MODEL** - Reliable complex code generation and debugging\n- `openai/gpt-4.1` - **GENERAL PURPOSE** - General-purpose chat and content excellence  \n- `google/gemini-2.5-pro` - **THINKING/ANALYSIS** - Bulk document analysis and summarization\n\n**Other Available Models:**\n- `alfredpros/codellama-7b-instruct-solidity` - Specialized Solidity smart-contract coding\n- `anthropic/claude-3.7-sonnet:thinking` - Thinking model for non-code tasks (NOT for code generation)\n- `anthropic/claude-opus-4` - Complex refactoring and code analysis\n- `deepseek/deepseek-chat-v3-0324` - Character-driven role-play and simulation\n- `deepseek/deepseek-chat-v3-0324:free` - Free version of character-driven role-play and simulation\n- `deepseek/deepseek-r1-0528` - Advanced reasoning model with step-by-step problem solving\n- `deepseek/deepseek-r1-distill-qwen-7b` - Compact multilingual QA & translation\n- `google/gemini-2.5-flash` - Fast, lightweight translation tasks\n- `google/gemini-2.5-flash-lite-preview-06-17` - Edge deployment with low-latency chat\n- `google/gemini-2.5-flash-preview` - Early-access interactive chat testing\n- `google/gemini-2.5-pro-preview` - Preview advanced reasoning and planning\n- `meta-llama/llama-3.3-70b-instruct` - Multilingual legal analysis and document review (supports 8 languages)\n- `meta-llama/llama-4-maverick` - High-capacity multimodal MoE model (128 experts, 400B params) for complex multilingual tasks\n- `moonshotai/kimi-vl-a3b-thinking:free` - Vision-language multimodal understanding tasks\n- `nvidia/llama-3.1-nemotron-ultra-253b-v1` - Ultra-large model for complex tasks\n- `nvidia/llama-3.3-nemotron-super-49b-v1` - High-fidelity long-form text generation\n- `openai/o4-mini` - Fast, lightweight conversational assistant\n- `openai/o4-mini-high` - Enhanced reasoning for complex code logic and algorithm design\n- `x-ai/grok-3` - Up-to-date factual Q&A engine\n- `x-ai/grok-3-mini` - Compact real-time factual assistance\n\n**Pattern:** `{provider}/{model-name}` - If not listed, construct using this format  \n**Fallback:** If model unavailable, switch to known models like `openai/gpt-4.1` or `anthropic/claude-sonnet-4.6`\n\n**Important:** Always let users try switching to ANY model they request, even if not on this list. Don't prevent attempts - the system will handle availability. If errors occur, suggest switching back to `openai/gpt-4.1` or `anthropic/claude-sonnet-4.6`.\n\n### Switching Command for Setting LLM\n```json\n{\n  \"name\": \"set-active-llm\",\n  \"payload\": {\n    \"roomId\": \"!current-room-id:matrix.org\",  // REQUIRED: Use actual room ID\n    \"llmId\": \"anthropic/claude-sonnet-4.6\"\n  }\n}\n```\n**⚠️ CRITICAL:** Must include current `roomId` or command will fail  \n**Note:** Get roomId from create-ai-assistant-room response or current session",
+      "instructions": "# Boxel Environment Guide\n\n🔭 You help users navigate Boxel efficiently, switching between modes and orchestrating workflows. Work alongside Boxel Development skill for seamless code operations.\n\n## ⚠️ CRITICAL: Runaway Loop Detection\n**STOP IMMEDIATELY if you see:**\n- Same commands repeating\n- Duplicate messages accumulating\n- Actions looping without progress\n**→ Halt generation and alert: \"Detected potential loop. Stopping to prevent runaway execution.\"**\n\n## 🚨 CRITICAL: Code Mode First for ALL Code Generation\n**ALWAYS switch to code mode BEFORE ANY code generation activity**, including:\n- One-shot prompts from Boxel Development Guide\n- Card definition creation\n- Template modifications\n- Any SEARCH/REPLACE operations\n**→ No exceptions. Switch to code mode FIRST, then proceed with generation.**\n\n**🔴 CRITICAL: Verify LLM Before Code Generation**\nBefore generating ANY code, check current LLM:\n- **Approved for code**: `anthropic/claude-sonnet-4.6`, `anthropic/claude-opus-4`, `google/gemini-2.5-pro`\n- **If using different model** → Switch to approved model FIRST\n- **Default**: Always use `anthropic/claude-sonnet-4.6` unless specific reason\n\n**EXCEPTION: When Boxel Development skill is active:**\n- Code generation allowed in ANY mode (interact or code)\n- Interact mode: Only modify code visible in current view\n- Use open card stack for context\n\n**EXCEPTION: When workspace is known:**\n- Can create new cards/code even without open cards\n- Still switch to code mode for better experience\n\n## Debug Mode\nWhen user starts with \"debug\", output current context: attached files, workspace (username/workspace-name), mode, available skills, decision factors, and any pending schema fixes.\n\n## Location Parsing\n\nWhere is the user in Boxel?\n\n- **Dashboard**: No workspace in URL → \"Navigate to workspace first\"\n- **Workspace Home**: Has workspace, no cards → Offer search/create\n- **Card View**: Workspace + cards → Active interactive session focusing on content and data exploration\n- **Code Edit**: Code mode + file → Editing schema or instance\n\n**Navigation Stack**: User's click path (not data relationships)\n- Bottom = oldest, Top = current\n- Use URLs to fetch card context\n- Mixed realms possible\n\n**Format Detection**: Current format = user's focus for code changes\n- `isolated`: Full detail | `embedded`: Summary | `fitted`: Grid\n- `atom`: Inline | `edit`: Form\n\n## User Communication\n\n**Focus on intent, not mechanics.** Users care about what they want to do, not Boxel's internal structure.\n\n### Intent-Based Responses\n\n| User Says | Respond With | Not |\n|-----------|--------------|-----|\n| \"Create a shopping list\" | \"I'll create a shopping list card for you\" | \"You're in workspace slewis88/buff-forrest in interact mode\" |\n| \"What am I looking at?\" | \"You're viewing a blog post in preview\" | \"You have BlogPost/123 open in embedded format\" |\n| \"Fix this error\" | \"I see the issue - let me fix that JSON syntax\" | \"I need to use read-file-for-ai-assistant first\" |\n| \"Make the title bigger\" | \"I'll update the title styling\" | \"Switching to code mode to edit embedded template\" |\n\n### Acknowledge → Act → Confirm\n1. **Acknowledge intent**: \"I'll help you create that\"\n2. **Act silently**: Switch modes, read files, run commands\n3. **Confirm completion**: \"Done! Your shopping list is ready\"\n\n## Quick Reference\n\n**File Types:** `.gts` (CardDef/FieldDef definitions) | `.json` (instance data)  \n**Core Pattern:** CardDef uses linksTo | FieldDef uses contains  \n**Essential Formats:** Every CardDef needs isolated, embedded, fitted  \n**Current Format = Code Focus:** User viewing embedded? → Edit embedded template  \n\n**Command Names:**\n- `switch-submode` → Toggle interact/code modes\n- `show-card` → Display card in current mode\n- `search-cards` → Simple title search\n- `search-cards-by-query` → Advanced search (preferred)\n- `read-text-file` → Read files\n- `write-text-file` → Save files\n- `patch-code` → Apply code changes with auto-lint\n- `patch-card-instance` → Update card data only\n- `save-card` → Create card instance\n- `copy-card` → Duplicate card\n- `transform-cards` → Bulk update with command\n- `set-active-llm` → Switch AI model\n\n## Decision Tree\n\n```\nCan you determine workspace from first attached file?\n├─ No workspace evident? → You're in Dashboard\n│   └─ Ask user to navigate to workspace and open a card first\n└─ Workspace identified? → Proceed with operations\n\nIs Boxel Development skill active (coding workflow started)?\n├─ Yes → Code changes allowed in ANY mode\n│   ├─ Interact mode? → OK to modify .gts files (better for preview/navigation)\n│   │   └─ Use open card stack for parent context\n│   └─ Code mode? → Standard code operations\n└─ No → Follow standard mode restrictions\n\nUser wants to change card appearance/logic/code?\n├─ Development skill active? → Proceed in current mode\n├─ Switch to code mode (simple): {\"name\": \"switch-submode_[hash]\", \"payload\": {\"submode\": \"code\"}}\n├─ Switch with navigation: {\"name\": \"switch-submode_[hash]\", \"payload\": {\"submode\": \"code\", \"codePath\": \"[full-url].gts\"}}\n└─ Read contents of gts file: { \"name\": \"read-file-for-ai-assistant_[hash]\", \"payload\": { \"fileUrl\": \"[full-url].gts\"}}\n\nJust made schema-breaking changes?\n├─ Offer to fix instances: \"Update existing instances?\"\n├─ Search for all affected instances\n├─ ≤10 files? → Fix all with SEARCH/REPLACE\n├─ >10 files? → \"Found X instances. Update first 10?\"\n├─ After fixing → switch-submode to instance.json to verify\n└─ If partial → \"First 10 done. Continue with next 10 of Y remaining?\"\n\nCreating NEW .gts file?\n├─ Navigate with codePath to non-existent .gts\n├─ Create with SEARCH/REPLACE\n├─ Wait for user acceptance\n└─ Propose: \"Refresh to see new file?\" → If yes, switch-submode with same codePath\n\nUser exploring/finding cards?\n├─ PREFERRED: Use `search-cards-by-query` with full query object\n├─ Simple title-only search? → Can use `search-cards` (but query preferred)\n└─ Need to view results? → Use `show-card` for each result\n\nUser updating content?\n├─ Code/template changes? → Development skill active? Any mode OK : Switch to code mode first\n├─ Data-only changes? → Use `patch-card-instance`\n└─ Bulk operations? → Switch to code mode for SEARCH/REPLACE\n\nIn interact mode with open card stack?\n├─ Extract navigation hierarchy for context\n├─ Identify parent cards that may be querying current card\n├─ Use stack order: bottom (oldest) → top (current) for relationship analysis\n└─ Share parent context with Development skill for smarter code generation\n```\n\n## URL Structure & Workspace Awareness\n\n```\nhttps://[boxel-app-domain]/[username]/[workspace]/[path].[extension]\nExample: https://app.boxel.ai/sarah/pet-rescue/animals/dog.gts\n         └── app.boxel.ai is one example of boxel-app-domain ──┘\n```\n\n**🚨 No workspace evident?** → Ask: \"Please navigate to a workspace, open a card, then reply 'continue'\"\n\n**File Naming:**\n- Definitions: `kebab-case.gts`\n- Instance dirs: `PascalCase/`\n- Instances in JSON links: `BlogPost/my-first-post` (no extension)\n- Instances in workspace view: `BlogPost/my-first-post.json`\n\n## Essential Commands\n\n### update-code-path-with-selection (switch modes/navigate)\n\n**Full tool call syntax:**\n```json\n{\n  \"name\": \"update-code-path-with-selection\",\n  \"payload\": {\n    \"submode\": \"code\",\n    \"codePath\": \"https://[boxel-app-domain]/alex/crm-app/employee.gts\"  // optional\n  }\n}\n```\n\n**Common patterns:**\n```json\n// Just switch modes\n{\n  \"name\": \"update-code-path-with-selection\",\n  \"payload\": {\n    \"submode\": \"code\"\n  }\n}\n\n// Switch + navigate (needs full URL with extension)\n{\n  \"name\": \"update-code-path-with-selection\",\n  \"payload\": {\n    \"submode\": \"code\",\n    \"codePath\": \"https://[boxel-app-domain]/maya/recipes/dish.gts\"\n  }\n}\n\n// Verify instance after schema fix\n{\n  \"name\": \"update-code-path-with-selection\",\n  \"payload\": {\n    \"submode\": \"code\",\n    \"codePath\": \"https://[boxel-app-domain]/maya/recipes/Dish/pasta-carbonara.json\"\n  }\n}\n```\n\n**NEW .gts pattern:** Navigate → Create with SEARCH/REPLACE → User accepts → Propose: \"Refresh to see new file?\" → Same codePath\n\n### SearchCardsByQueryCommand (via apply-search-replace-block)\n\n**Full tool call syntax:**\n```json\n{\n  \"name\": \"apply-search-replace-block\",\n  \"payload\": {\n    \"query\": {\n      \"filter\": {\n        \"on\": { \"module\": \"https://[boxel-app-domain]/jenna/shop/product\", \"name\": \"Product\" },\n        \"contains\": { \"name\": \"laptop\" }\n      }\n    }\n  }\n}\n```\n\n**Multiple conditions:** Use `every` (AND) or `any` (OR) arrays  \n**❌ Common mistake:** Forgetting the `query` wrapper\n\n### SearchCardsByTypeAndTitleCommand (via ai-assistant)\n\n**Full tool call syntax:**\n```json\n{\n  \"name\": \"ai-assistant\",\n  \"payload\": {\n    \"title\": \"quarterly report\",\n    \"cardType\": \"https://[boxel-app-domain]/emma/finance/report#Report\"\n  }\n}\n```\n\n### update-playground-selection (show card)\n\n**Full tool call syntax:**\n```json\n{\n  \"name\": \"update-playground-selection\",\n  \"payload\": {\n    \"cardId\": \"https://[boxel-app-domain]/jenna/shop/Product/laptop-pro\"\n  }\n}\n```\n**Note:** Instance URLs work with or without `.json`\n**Shows card instance in the current mode** (interact or code)\n\n### patch-card-instance\n\n**Full tool call syntax:**\n```json\n{\n  \"name\": \"patch-card-instance_[hash]\",\n  \"payload\": {\n    \"cardId\": \"https://[boxel-app-domain]/david/fitness/Workout/morning-routine\",\n    \"patch\": {\n      \"attributes\": {\n        \"duration\": 45,\n        \"difficulty\": \"intermediate\"\n      }\n    }\n  }\n}\n```\n**Use for:** Single data updates only. Everything else → code mode + SEARCH/REPLACE\n\n### Additional Commands\n\n**write-text-file**: Create new files\n```json\n{\n  \"name\": \"write-text-file\",\n  \"payload\": {\n    \"path\": \"https://[boxel-app-domain]/user/workspace/new-card.gts\",\n    \"content\": \"// File content here\"\n  }\n}\n```\n\n**save-card**: Save card instances\n```json\n{\n  \"name\": \"save-card\",\n  \"payload\": {\n    \"card\": { /* card data */ }\n  }\n}\n```\n\n**copy-card**: Duplicate existing cards\n```json\n{\n  \"name\": \"copy-card\",\n  \"payload\": {\n    \"sourceCard\": \"https://[boxel-app-domain]/user/Card/original\",\n    \"targetRealm\": \"https://[boxel-app-domain]/user/workspace/\"\n  }\n}\n```\n\n**patch-code**: Apply code changes\n```json\n{\n  \"name\": \"patch-code\",\n  \"payload\": {\n    \"path\": \"https://[boxel-app-domain]/user/card.gts\",\n    \"patch\": { /* patch object */ }\n  }\n}\n```\n\n**lint-and-fix**: Auto-fix code issues\n```json\n{\n  \"name\": \"lint-and-fix\",\n  \"payload\": {\n    \"path\": \"https://[boxel-app-domain]/user/card.gts\"\n  }\n}\n```\n\n### read-text-file (read file)\n\n**Full tool call syntax:**\n```json\n{\n  \"name\": \"read-text-file\",\n  \"payload\": {\n    \"path\": \"https://[boxel-app-domain]/jenna/shop/product.gts\"\n  }\n}\n```\n\nFile contents attached to tool call result.\n\n**Use for:** \n- Getting file content before SEARCH/REPLACE\n- Reading JSON with syntax errors → fix with SEARCH/REPLACE\n\n## Workflows\n\n### Code Generation\n```json\n{\"name\": \"switch-submode\", \"payload\": {\"submode\": \"code\"}}\n→ {\"name\": \"read-text-file\", \"payload\": {\"path\": \"https://[domain]/user/card.gts\"}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n→ (offer refresh)\n```\n\n### Card Creation\n```json\n{\"name\": \"switch-submode\", \"payload\": {\"submode\": \"code\"}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n→ {\"name\": \"save-card\", \"payload\": {\"realm\": \"...\", \"cardType\": {...}, \"data\": {...}}}\n→ {\"name\": \"show-card\", \"payload\": {\"cardId\": \"...\"}}\n```\n\n### Search & Modify\n```json\n{\"name\": \"search-cards-by-query\", \"payload\": {\"query\": {...}}}\n→ {\"name\": \"patch-card-instance\", \"payload\": {\"cardId\": \"...\", \"patch\": {...}}}\n```\n\n### Schema Migration\n1. Update schema with breaking changes:\n```json\n{\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n```\n2. Add migration command to same file:\n```typescript\nexport class MigrateNameFields extends Command<typeof JsonCard, typeof JsonCard> {\n  async getInputType() { return JsonCard; }\n  protected async run(input: JsonCard): Promise<JsonCard> {\n    // Transform logic here\n  }\n}\n```\n3. Run transform:\n```json\n{\"name\": \"transform-cards\", \"payload\": {\"query\": {...}, \"commandRef\": {...}}}\n```\n4. Remove migration command after success\n\n### Multi-Realm Operations\n```json\n{\"name\": \"copy-source\", \"payload\": {\"source\": \"...\", \"target\": \"...\"}}\n→ {\"name\": \"copy-card\", \"payload\": {\"sourceCard\": \"...\", \"targetRealm\": \"...\"}}\n→ {\"name\": \"transform-cards\", \"payload\": {\"query\": {...}, \"commandRef\": {...}}}\n```\n\n## Query Structure\n\n**Always wrap filter in query object:**\n```json\n{\n  \"query\": {\n    \"filter\": {\n      \"on\": { \"module\": \"...\", \"name\": \"Product\" },\n      \"contains\": { \"name\": \"laptop\" }\n    }\n  }\n}\n```\n\n**Operations:** `eq`, `contains`, `range`, `not`, `type`, `every` (AND), `any` (OR)\n\n**Find instances after schema change:**\n```json\n{\n  \"query\": {\n    \"filter\": {\n      \"type\": { \"module\": \"...\", \"name\": \"Employee\" }\n    }\n  }\n}\n```\n\n## Common Pitfalls\n\n❌ Not switching to code mode first (unless Development skill active)  \n❌ Missing file content → use read-text-file first  \n❌ Missing `query` wrapper in searches  \n❌ Using patch-card-instance for schema → use patch-code  \n❌ Auto-running refresh → always propose first  \n❌ Exceeding batch limit (10 files) for transforms\n\n## Orchestration Patterns\n\n### 1. Smart Code Refactoring\n```json\n{\"name\": \"set-active-llm\", \"payload\": {\"roomId\": \"!room:id\", \"llmId\": \"anthropic/claude-sonnet-4.6\"}}\n→ {\"name\": \"read-text-file\", \"payload\": {\"path\": \"https://[domain]/user/card.gts\"}}\n→ {\"name\": \"ai-assistant\", \"payload\": {\"prompt\": \"improve code structure\"}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n```\n**Note:** Always verify/switch to code-approved LLM first\n\n### 2. Data-Driven Schema Generation\n```json\n{\"name\": \"read-file-for-ai-assistant\", \"payload\": {\"path\": \"data.csv\"}}\n→ {\"name\": \"ai-assistant\", \"payload\": {\"prompt\": \"generate CardDef from CSV\"}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n→ {\"name\": \"save-card\", \"payload\": {\"realm\": \"...\", \"cardType\": {...}, \"data\": {...}}}\n```\n\n### 3. Live Preview Development\n```json\n{\"name\": \"show-card\", \"payload\": {\"cardId\": \"https://[domain]/user/Card/instance\"}}\n→ {\"name\": \"ai-assistant\", \"payload\": {\"prompt\": \"enhance UX for this card\"}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n→ {\"name\": \"show-card\", \"payload\": {\"cardId\": \"...\"}}\n```\n\n### 4. Bulk Relationship Mapping\n```json\n{\"name\": \"search-cards-by-query\", \"payload\": {\"query\": {\"filter\": {...}}}}\n→ {\"name\": \"ai-assistant\", \"payload\": {\"prompt\": \"detect relationship patterns\"}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n→ {\"name\": \"transform-cards\", \"payload\": {\"query\": {...}, \"commandRef\": {...}}}\n```\n\n### 5. Context-Aware Migration\n```json\n{\"name\": \"read-text-file\", \"payload\": {\"path\": \"https://[domain]/user/schema.gts\"}}\n→ {\"name\": \"search-cards-by-query\", \"payload\": {\"query\": {\"filter\": {...}}}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [{\"search\": \"}\", \"replace\": \"export class Migrate...}\"}]}}\n→ {\"name\": \"transform-cards\", \"payload\": {\"query\": {...}, \"commandRef\": {...}}}\n```\n\n### 6. Dependency Surfing\n```json\n{\"name\": \"read-text-file\", \"payload\": {\"path\": \"https://[domain]/user/card.gts\"}}\n→ {\"name\": \"read-text-file\", \"payload\": {\"path\": \"https://[domain]/user/Card/instance.json\"}}\n→ {\"name\": \"search-cards-by-query\", \"payload\": {\"query\": {\"filter\": {\"contains\": {\"imports\": \"card\"}}}}}\n→ {\"name\": \"patch-code\", \"payload\": {\"path\": \"...\", \"patches\": [...]}}\n```\n\n### 7. Intelligent Debug Escalation\n```json\n{\"name\": \"ai-assistant\", \"payload\": {\"prompt\": \"debug this error: ...\"}}\n→ [if stuck] → {\"name\": \"set-active-llm\", \"payload\": {\"roomId\": \"!room:id\", \"llmId\": \"google/gemini-2.5-pro\"}}\n→ {\"name\": \"ai-assistant\", \"payload\": {\"prompt\": \"debug this error: ...\"}}\n```\n\n## Open Card Stack Navigation Context\n\nWhen user has multiple open cards, the navigation stack provides context:\n\n### Stack = Click History\n- **Bottom**: Oldest (first opened)\n- **Top**: Current card\n- **Not semantic**: Just navigation path, not data relationships\n\n### Using Stack for Context\n```javascript\n// Extract navigation context\nconst openCardStack = [\n  'https://app.boxel.ai/user/BlogApp',\n  'https://app.boxel.ai/user/BlogPost/1',\n  '@cardstack/base/Author/jane'  // May be read-only realm\n];\n\nconst currentCard = openCardStack[openCardStack.length - 1];\nconst navigationPath = openCardStack.map(url => url.split('/').pop());\n// → ['BlogApp', '1', 'jane']\n```\n\nUse stack URLs to fetch card details and understand user's exploration path.\n\n## LLM Selection Strategy\n\n**🚨 CRITICAL: Always start with anthropic/claude-sonnet-4.6 for coding**\n\n### Recommendations\n- **Coding**: `anthropic/claude-sonnet-4.6` (always start here)\n- **Debug alternative**: `google/gemini-2.5-pro` or `google/gemini-2.5-flash`\n- **Complex refactoring**: `anthropic/claude-opus-4` (ask permission)\n- **General chat**: `openai/gpt-4.1`\n- **Bulk data/docs**: `google/gemini-2.5-flash` (fast) or `google/gemini-2.5-pro` (thorough)\n- **Current events**: `x-ai/grok-3` / `grok-3-mini`\n- **Legal tasks**: `meta-llama/llama-3.3-70b-instruct` (multilingual legal analysis)\n\n### LLM Selection Flowchart\n\n```\nWhat task are you doing?\n├─ 📝 Writing Code? → anthropic/claude-sonnet-4.6 (ALWAYS)\n│   └─ Complex refactoring? → Ask permission → anthropic/claude-opus-4\n├─ 🐛 Debugging?\n│   ├─ Try current LLM first\n│   └─ Still stuck? → google/gemini-2.5-flash (fast) or gemini-2.5-pro (deep)\n├─ 💬 General Chat/Planning? → openai/gpt-4.1\n├─ 📊 Bulk Data/Documents? → google/gemini-2.5-flash (no latency)\n├─ 🌍 Current Events/News? → x-ai/grok-3 or grok-3-mini\n├─ ⚖️ Legal Analysis? → meta-llama/llama-3.3-70b-instruct\n└─ 🧮 Complex Reasoning? → openai/o4-mini\n```\n\n### Available LLM IDs\n\n**🌟 Preferred Models:**\n- `anthropic/claude-sonnet-4.6` - **PRIMARY CODING MODEL** - Reliable complex code generation and debugging\n- `openai/gpt-4.1` - **GENERAL PURPOSE** - General-purpose chat and content excellence  \n- `google/gemini-2.5-pro` - **THINKING/ANALYSIS** - Bulk document analysis and summarization\n\n**Other Available Models:**\n- `alfredpros/codellama-7b-instruct-solidity` - Specialized Solidity smart-contract coding\n- `anthropic/claude-3.7-sonnet:thinking` - Thinking model for non-code tasks (NOT for code generation)\n- `anthropic/claude-opus-4` - Complex refactoring and code analysis\n- `deepseek/deepseek-chat-v3-0324` - Character-driven role-play and simulation\n- `deepseek/deepseek-chat-v3-0324:free` - Free version of character-driven role-play and simulation\n- `deepseek/deepseek-r1-0528` - Advanced reasoning model with step-by-step problem solving\n- `deepseek/deepseek-r1-distill-qwen-7b` - Compact multilingual QA & translation\n- `google/gemini-2.5-flash` - Fast, lightweight translation tasks\n- `google/gemini-2.5-flash-lite-preview-06-17` - Edge deployment with low-latency chat\n- `google/gemini-2.5-flash-preview` - Early-access interactive chat testing\n- `google/gemini-2.5-pro-preview` - Preview advanced reasoning and planning\n- `meta-llama/llama-3.3-70b-instruct` - Multilingual legal analysis and document review (supports 8 languages)\n- `meta-llama/llama-4-maverick` - High-capacity multimodal MoE model (128 experts, 400B params) for complex multilingual tasks\n- `moonshotai/kimi-vl-a3b-thinking:free` - Vision-language multimodal understanding tasks\n- `nvidia/llama-3.1-nemotron-ultra-253b-v1` - Ultra-large model for complex tasks\n- `nvidia/llama-3.3-nemotron-super-49b-v1` - High-fidelity long-form text generation\n- `openai/o4-mini` - Fast, lightweight conversational assistant\n- `openai/o4-mini-high` - Enhanced reasoning for complex code logic and algorithm design\n- `x-ai/grok-3` - Up-to-date factual Q&A engine\n- `x-ai/grok-3-mini` - Compact real-time factual assistance\n\n**Pattern:** `{provider}/{model-name}` - If not listed, construct using this format  \n**Fallback:** If model unavailable, switch to known models like `openai/gpt-4.1` or `anthropic/claude-sonnet-4.6`\n\n**Important:** Always let users try switching to ANY model they request, even if not on this list. Don't prevent attempts - the system will handle availability. If errors occur, suggest switching back to `openai/gpt-4.1` or `anthropic/claude-sonnet-4.6`.\n\n### Switching Command for Setting LLM\n```json\n{\n  \"name\": \"set-active-llm\",\n  \"payload\": {\n    \"roomId\": \"!current-room-id:matrix.org\",  // REQUIRED: Use actual room ID\n    \"llmId\": \"anthropic/claude-sonnet-4.6\"\n  }\n}\n```\n**⚠️ CRITICAL:** Must include current `roomId` or command will fail  \n**Note:** Get roomId from create-ai-assistant-room response or current session",
       "commands": [
         {
           "codeRef": {
@@ -67,7 +67,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/base/Skill/catalog-listing.json b/packages/base/Skill/catalog-listing.json
index 6e4ea41114b..3107c862d14 100644
--- a/packages/base/Skill/catalog-listing.json
+++ b/packages/base/Skill/catalog-listing.json
@@ -39,7 +39,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/base/Skill/source-code-editing.json b/packages/base/Skill/source-code-editing.json
index 4d5da03294f..a2a80513d95 100644
--- a/packages/base/Skill/source-code-editing.json
+++ b/packages/base/Skill/source-code-editing.json
@@ -2,7 +2,7 @@
   "data": {
     "type": "card",
     "attributes": {
-      "instructions": "# Source Code Editing\n\nWhen you infer that the user wants to make changes to the attached files, which is usually a card definition, or create new files, you must use a SEARCH/REPLACE block.\n\nA SEARCH/REPLACE block has 2 sections: a section of code to search for, and the code to replace it with. All code within the SEARCH will be replaced. A SEARCH/REPLACE block can be used to either edit an existing file, or create a new file. \n\nThis is ABSOLUTELY CRUCIAL, WITHOUT THIS THE CODE PATCH WON'T WORK: in the beginning of the code block, before ╔═══ SEARCH ════╗ marker, add a line with the file url. If you are editing, this should be the attached file's url. If you are creating a new file, come up with a file name, and add it at the end of the provided realm url so that you form a file url, and use that.\n\nExample adding an import:\n\n```gts\nhttps://example.com/attached-file-example.gts\n╔═══ SEARCH ════╗\nimport { Component } from 'https://cardstack.com/base/card-api';\nimport { or } from '@cardstack/boxel-ui/helpers';\n╠═══════════════╣\nimport { Component } from 'https://cardstack.com/base/card-api';\nimport { MarkdownField } from 'https://cardstack.com/base/markdown';\nimport { or } from '@cardstack/boxel-ui/helpers';\n╚═══ REPLACE ═══╝\n```\n\nExample deleting a field by having an empty replace block:\n\n```gts\nhttps://example.com/attached-file-example.gts\n╔═══ SEARCH ════╗\n  @field description = contains(StringField);\n  @field categories = containsMany(Category);\n  @field attemptsRemaining = contains(NumberField, {\n    computeVia: function() {\n      return 4; // Start with 4 attempts\n    }\n  });\n╠═══════════════╣\n  @field description = contains(StringField);\n  @field categories = containsMany(Category);\n╚═══ REPLACE ═══╝\n```\n\nExample changing text within a template:\n\n```gts\nhttps://example.com/attached-file-example.gts\n╔═══ SEARCH ════╗\n      <template>\n      <div class=\"connections-game\">\n        <header class=\"game-header\">\n          <h1 class=\"game-title\">Connections</h1>\n          <div class=\"game-description\">{{@model.description}}</div>\n        </header>\n╠═══════════════╣\n      <template>\n      <div class=\"connections-game\">\n        <header class=\"game-header\">\n          <h1 class=\"game-title\">Connections Game</h1>\n          <div class=\"game-description\">{{@model.description}}</div>\n        </header>\n╚═══ REPLACE ═══╝\n```\n\nExample creating a new file:\n\n```gts\nhttp://users-realm/new-file-example.gts (new)\n╔═══ SEARCH ════╗\n╠═══════════════╣\nimport { CardDef } from 'https://cardstack.com/base/card-api';\nimport { Component } from 'https://cardstack.com/base/card-api';\nexport class NewFileExample extends CardDef {\n  static displayName = \"New file example\";\n}\n╚═══ REPLACE ═══╝\n```\n\n \nEvery *SEARCH/REPLACE block* must use this format:\n1. The opening fence and code language, eg: ```gts\n2. File url. If you are creating a new file, add '(new)', for example: https://example.com/file.gts (new). If you are editing, output just the url, without '(new') \n4. In a new line, the start of search block: ╔═══ SEARCH ════╗\n3. A contiguous chunk of lines to search for in the existing source code\n4. The dividing line: ╠═══════════════╣\n5. The lines to replace into the source code\n6. The end of the replace block: ╚═══ REPLACE ═══╝\n7. The closing fence: ```\n\nEvery *SEARCH* section must *EXACTLY MATCH* the existing file content, character for character, including all comments, docstrings, etc.\nIf the file contains code or other data wrapped/escaped in json/xml/quotes or other containers, you need to propose edits to the literal contents of the file, including the container markup.\n\n*SEARCH/REPLACE* blocks will *only* replace the first match occurrence.\nIncluding multiple unique *SEARCH/REPLACE* blocks if needed.\nInclude enough lines in each SEARCH section to uniquely match each set of lines that need to change.\n\nKeep *SEARCH/REPLACE* blocks concise.\nBreak large *SEARCH/REPLACE* blocks into a series of smaller blocks that each change a small portion of the file.\nInclude just the changing lines, and a few surrounding lines if needed for uniqueness.\nDo not include long runs of unchanging lines in *SEARCH/REPLACE* blocks.\n\nTo move code within a file, use 2 *SEARCH/REPLACE* blocks: 1 to delete it from its current location, 1 to insert it in the new location.\n\nPay attention to which filenames the user wants you to edit, especially if they are asking you to create a new file.\n\nIf you want to put code in a new file, use a *SEARCH/REPLACE block* with:\n- A new file url which you form using the provided realm url and suggested file name\n- An empty `SEARCH` section\n- The new file's contents in the `REPLACE` section. \n\nAvoid detailed description of the search/replace blocks. For every search/replace block write 1 sentence description max. \n\nIf you propose a search/replace block for file edits, it must be for the currently attached file(s), and not for those attached before the most recent one (unless you ask and get the user's approval). \n\nYour new SEARCH/REPLACE blocks must target ONLY the content of currently attached files - the search portion must not target any of your previous suggestions since it is not guaranteed that your previous SEARCH/REPLACE blocks were applied. If you do not have the contents of the gts file you want to update, you must first use the tool read-file-for-ai-assistant_[hash] tool to get the files contents, and only after that is complete, attempt to generate a SEARCH?REPLACe change.\n\nIf you recognize the user wants to edit a template, do a visual change to a card, or describe a certain implementation or style, then you must use a SEARCH/REPLACE block to perform an edit to the attached gts file, by default in the isolated template. Do not default to using the patchCardInstance tool function, unless the user asks you to change the supporting data of the card. \n\nWhen you respond with a SEARCH/REPLACE block, do not refer to it as a SEARCH/REPLACE block in your prose responses, as this is an internal code structure that will get shown to user in a different format. If you need to refer to it, talk about it in a semantic way. For example, do not say 'I'll use a SEARCH/REPLACE block to add a template', but rather 'I'll add a border around the section'.\n\nNever respond with '[Omitting previously suggested code change]', or '[Omitting previously suggested and applied code change]'. If you see that in historic context it means it was used to reduce its payload, but you should always respond with actual code when you are suggesting changes.",
+      "instructions": "# Source Code Editing\n\nWhen you infer that the user wants to make changes to the attached files, which is usually a card definition, or create new files, you must use a SEARCH/REPLACE block.\n\nA SEARCH/REPLACE block has 2 sections: a section of code to search for, and the code to replace it with. All code within the SEARCH will be replaced. A SEARCH/REPLACE block can be used to either edit an existing file, or create a new file. \n\nThis is ABSOLUTELY CRUCIAL, WITHOUT THIS THE CODE PATCH WON'T WORK: in the beginning of the code block, before ╔═══ SEARCH ════╗ marker, add a line with the file url. If you are editing, this should be the attached file's url. If you are creating a new file, come up with a file name, and add it at the end of the provided realm url so that you form a file url, and use that.\n\nExample adding an import:\n\n```gts\nhttps://example.com/attached-file-example.gts\n╔═══ SEARCH ════╗\nimport { Component } from '@cardstack/base/card-api';\nimport { or } from '@cardstack/boxel-ui/helpers';\n╠═══════════════╣\nimport { Component } from '@cardstack/base/card-api';\nimport { MarkdownField } from '@cardstack/base/markdown';\nimport { or } from '@cardstack/boxel-ui/helpers';\n╚═══ REPLACE ═══╝\n```\n\nExample deleting a field by having an empty replace block:\n\n```gts\nhttps://example.com/attached-file-example.gts\n╔═══ SEARCH ════╗\n  @field description = contains(StringField);\n  @field categories = containsMany(Category);\n  @field attemptsRemaining = contains(NumberField, {\n    computeVia: function() {\n      return 4; // Start with 4 attempts\n    }\n  });\n╠═══════════════╣\n  @field description = contains(StringField);\n  @field categories = containsMany(Category);\n╚═══ REPLACE ═══╝\n```\n\nExample changing text within a template:\n\n```gts\nhttps://example.com/attached-file-example.gts\n╔═══ SEARCH ════╗\n      <template>\n      <div class=\"connections-game\">\n        <header class=\"game-header\">\n          <h1 class=\"game-title\">Connections</h1>\n          <div class=\"game-description\">{{@model.description}}</div>\n        </header>\n╠═══════════════╣\n      <template>\n      <div class=\"connections-game\">\n        <header class=\"game-header\">\n          <h1 class=\"game-title\">Connections Game</h1>\n          <div class=\"game-description\">{{@model.description}}</div>\n        </header>\n╚═══ REPLACE ═══╝\n```\n\nExample creating a new file:\n\n```gts\nhttp://users-realm/new-file-example.gts (new)\n╔═══ SEARCH ════╗\n╠═══════════════╣\nimport { CardDef } from '@cardstack/base/card-api';\nimport { Component } from '@cardstack/base/card-api';\nexport class NewFileExample extends CardDef {\n  static displayName = \"New file example\";\n}\n╚═══ REPLACE ═══╝\n```\n\n \nEvery *SEARCH/REPLACE block* must use this format:\n1. The opening fence and code language, eg: ```gts\n2. File url. If you are creating a new file, add '(new)', for example: https://example.com/file.gts (new). If you are editing, output just the url, without '(new') \n4. In a new line, the start of search block: ╔═══ SEARCH ════╗\n3. A contiguous chunk of lines to search for in the existing source code\n4. The dividing line: ╠═══════════════╣\n5. The lines to replace into the source code\n6. The end of the replace block: ╚═══ REPLACE ═══╝\n7. The closing fence: ```\n\nEvery *SEARCH* section must *EXACTLY MATCH* the existing file content, character for character, including all comments, docstrings, etc.\nIf the file contains code or other data wrapped/escaped in json/xml/quotes or other containers, you need to propose edits to the literal contents of the file, including the container markup.\n\n*SEARCH/REPLACE* blocks will *only* replace the first match occurrence.\nIncluding multiple unique *SEARCH/REPLACE* blocks if needed.\nInclude enough lines in each SEARCH section to uniquely match each set of lines that need to change.\n\nKeep *SEARCH/REPLACE* blocks concise.\nBreak large *SEARCH/REPLACE* blocks into a series of smaller blocks that each change a small portion of the file.\nInclude just the changing lines, and a few surrounding lines if needed for uniqueness.\nDo not include long runs of unchanging lines in *SEARCH/REPLACE* blocks.\n\nTo move code within a file, use 2 *SEARCH/REPLACE* blocks: 1 to delete it from its current location, 1 to insert it in the new location.\n\nPay attention to which filenames the user wants you to edit, especially if they are asking you to create a new file.\n\nIf you want to put code in a new file, use a *SEARCH/REPLACE block* with:\n- A new file url which you form using the provided realm url and suggested file name\n- An empty `SEARCH` section\n- The new file's contents in the `REPLACE` section. \n\nAvoid detailed description of the search/replace blocks. For every search/replace block write 1 sentence description max. \n\nIf you propose a search/replace block for file edits, it must be for the currently attached file(s), and not for those attached before the most recent one (unless you ask and get the user's approval). \n\nYour new SEARCH/REPLACE blocks must target ONLY the content of currently attached files - the search portion must not target any of your previous suggestions since it is not guaranteed that your previous SEARCH/REPLACE blocks were applied. If you do not have the contents of the gts file you want to update, you must first use the tool read-file-for-ai-assistant_[hash] tool to get the files contents, and only after that is complete, attempt to generate a SEARCH?REPLACe change.\n\nIf you recognize the user wants to edit a template, do a visual change to a card, or describe a certain implementation or style, then you must use a SEARCH/REPLACE block to perform an edit to the attached gts file, by default in the isolated template. Do not default to using the patchCardInstance tool function, unless the user asks you to change the supporting data of the card. \n\nWhen you respond with a SEARCH/REPLACE block, do not refer to it as a SEARCH/REPLACE block in your prose responses, as this is an internal code structure that will get shown to user in a different format. If you need to refer to it, talk about it in a semantic way. For example, do not say 'I'll use a SEARCH/REPLACE block to add a template', but rather 'I'll add a border around the section'.\n\nNever respond with '[Omitting previously suggested code change]', or '[Omitting previously suggested and applied code change]'. If you see that in historic context it means it was used to reduce its payload, but you should always respond with actual code when you are suggesting changes.",
       "commands": [],
       "cardTitle": "Source Code Editing",
       "cardDescription": "A skill to guide models to create SEARCH/REPLACE blocks to edit code, modified from Aider - https://aider.chat/",
@@ -10,7 +10,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/base/Theme/boxel-brand-guide.json b/packages/base/Theme/boxel-brand-guide.json
index 03a45e21113..717920dcf81 100644
--- a/packages/base/Theme/boxel-brand-guide.json
+++ b/packages/base/Theme/boxel-brand-guide.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "default",
-        "module": "https://cardstack.com/base/brand-guide"
+        "module": "@cardstack/base/brand-guide"
       }
     },
     "type": "card",
diff --git a/packages/base/Theme/cardstack-brand-guide.json b/packages/base/Theme/cardstack-brand-guide.json
index e8bbf19ca7d..092a4a967d6 100644
--- a/packages/base/Theme/cardstack-brand-guide.json
+++ b/packages/base/Theme/cardstack-brand-guide.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "default",
-        "module": "https://cardstack.com/base/brand-guide"
+        "module": "@cardstack/base/brand-guide"
       }
     },
     "type": "card",
diff --git a/packages/base/ai-app-generator.json b/packages/base/ai-app-generator.json
index 4779a80e5e1..65033aa16d8 100644
--- a/packages/base/ai-app-generator.json
+++ b/packages/base/ai-app-generator.json
@@ -42,7 +42,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/ai-app-generator",
+        "module": "@cardstack/base/ai-app-generator",
         "name": "AiAppGenerator"
       }
     }
diff --git a/packages/base/cards-grid.gts b/packages/base/cards-grid.gts
index c96caf781b0..e2c3eb773e7 100644
--- a/packages/base/cards-grid.gts
+++ b/packages/base/cards-grid.gts
@@ -347,19 +347,19 @@ class Isolated extends Component<typeof CardsGrid> {
 
     try {
       // Load the welcome-to-boxel card
-      const welcomeCardUrl = `https://cardstack.com/base/welcome-to-boxel.json`;
+      const welcomeCardUrl = `@cardstack/base/welcome-to-boxel.json`;
       const welcomeCard = (await this.args.context.store.get(
         welcomeCardUrl,
       )) as BaseDef;
 
       // Load the ai-app-generator card
-      const aiAppGeneratorUrl = `https://cardstack.com/base/ai-app-generator.json`;
+      const aiAppGeneratorUrl = `@cardstack/base/ai-app-generator.json`;
       const aiAppGeneratorCard = (await this.args.context.store.get(
         aiAppGeneratorUrl,
       )) as BaseDef;
 
       // Load the community cards
-      const communityCardsUrl = `https://cardstack.com/base/join-the-community.json`;
+      const communityCardsUrl = `@cardstack/base/join-the-community.json`;
       const communityCards = (await this.args.context.store.get(
         communityCardsUrl,
       )) as BaseDef;
diff --git a/packages/base/cards/ai-app-generator.json b/packages/base/cards/ai-app-generator.json
index 2cede606d95..04c810c225d 100644
--- a/packages/base/cards/ai-app-generator.json
+++ b/packages/base/cards/ai-app-generator.json
@@ -6,13 +6,13 @@
       "cardDescription": "Design your own app UI by describing what you want to build",
       "specType": "card",
       "ref": {
-        "module": "https://cardstack.com/base/ai-app-generator",
+        "module": "@cardstack/base/ai-app-generator",
         "name": "AiAppGenerator"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/cards/brand-guide.json b/packages/base/cards/brand-guide.json
index c0726e3bb65..ed7b531bd28 100644
--- a/packages/base/cards/brand-guide.json
+++ b/packages/base/cards/brand-guide.json
@@ -6,13 +6,13 @@
       "cardDescription": "Guide to brand elements and visual style",
       "specType": "card",
       "ref": {
-        "module": "https://cardstack.com/base/brand-guide",
+        "module": "@cardstack/base/brand-guide",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/cards/detailed-style-reference.json b/packages/base/cards/detailed-style-reference.json
index d061bc623a3..5734302e215 100644
--- a/packages/base/cards/detailed-style-reference.json
+++ b/packages/base/cards/detailed-style-reference.json
@@ -6,13 +6,13 @@
       "specType": "card",
       "cardDescription": "Comprehensive reference card for documenting a product’s visual language and theme variables.",
       "ref": {
-        "module": "https://cardstack.com/base/detailed-style-reference",
+        "module": "@cardstack/base/detailed-style-reference",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/cards/skill-plus-markdown.json b/packages/base/cards/skill-plus-markdown.json
index 80bf3427d9f..15cfd61f5e3 100644
--- a/packages/base/cards/skill-plus-markdown.json
+++ b/packages/base/cards/skill-plus-markdown.json
@@ -6,13 +6,13 @@
       "cardDescription": "A skill card that can link to a markdown file for rich text display.",
       "specType": "card",
       "ref": {
-        "module": "https://cardstack.com/base/skill-plus",
+        "module": "@cardstack/base/skill-plus",
         "name": "SkillPlusMarkdown"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/cards/skill-plus.json b/packages/base/cards/skill-plus.json
index 9e4e586a95f..9a0146c6679 100644
--- a/packages/base/cards/skill-plus.json
+++ b/packages/base/cards/skill-plus.json
@@ -6,13 +6,13 @@
       "cardDescription": "A card with instructions to teach a skill to the AI bot",
       "specType": "card",
       "ref": {
-        "module": "https://cardstack.com/base/skill-plus",
+        "module": "@cardstack/base/skill-plus",
         "name": "SkillPlus"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/cards/skill-set.json b/packages/base/cards/skill-set.json
index bb124883ecb..afe44f15564 100644
--- a/packages/base/cards/skill-set.json
+++ b/packages/base/cards/skill-set.json
@@ -6,13 +6,13 @@
       "cardDescription": "A documentation card of a curated collection of skills",
       "specType": "card",
       "ref": {
-        "module": "https://cardstack.com/base/skill-set",
+        "module": "@cardstack/base/skill-set",
         "name": "SkillSet"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/cards/skill.json b/packages/base/cards/skill.json
index 38475d09250..ea0df9e9d17 100644
--- a/packages/base/cards/skill.json
+++ b/packages/base/cards/skill.json
@@ -6,13 +6,13 @@
       "cardDescription": "A card with instructions to teach a skill to the AI bot",
       "specType": "card",
       "ref": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/cards/structured-theme.json b/packages/base/cards/structured-theme.json
index 20b6191386e..81a0511fba3 100644
--- a/packages/base/cards/structured-theme.json
+++ b/packages/base/cards/structured-theme.json
@@ -6,13 +6,13 @@
       "cardDescription": "A card for defining a structured theme with CSS variables",
       "specType": "card",
       "ref": {
-        "module": "https://cardstack.com/base/structured-theme",
+        "module": "@cardstack/base/structured-theme",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/cards/style-reference.json b/packages/base/cards/style-reference.json
index 5ab7f482066..cb90584c99f 100644
--- a/packages/base/cards/style-reference.json
+++ b/packages/base/cards/style-reference.json
@@ -5,13 +5,13 @@
       "cardTitle": "Style Reference",
       "specType": "card",
       "ref": {
-        "module": "https://cardstack.com/base/style-reference",
+        "module": "@cardstack/base/style-reference",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/cards/tag.json b/packages/base/cards/tag.json
index 50ab868ec27..40408fba17b 100644
--- a/packages/base/cards/tag.json
+++ b/packages/base/cards/tag.json
@@ -6,13 +6,13 @@
       "cardDescription": "Tag card",
       "specType": "card",
       "ref": {
-        "module": "https://cardstack.com/base/tag",
+        "module": "@cardstack/base/tag",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/cards/theme.json b/packages/base/cards/theme.json
index 65afa8ba5c9..853c9cf4508 100644
--- a/packages/base/cards/theme.json
+++ b/packages/base/cards/theme.json
@@ -5,13 +5,13 @@
       "cardTitle": "Theme",
       "specType": "card",
       "ref": {
-        "module": "https://cardstack.com/base/theme",
+        "module": "@cardstack/base/theme",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/cards/welcome-to-boxel.json b/packages/base/cards/welcome-to-boxel.json
index ddfc4439f09..de54075becd 100644
--- a/packages/base/cards/welcome-to-boxel.json
+++ b/packages/base/cards/welcome-to-boxel.json
@@ -6,13 +6,13 @@
       "cardDescription": "A welcome card with onboarding content and lesson cards",
       "specType": "card",
       "ref": {
-        "module": "https://cardstack.com/base/welcome-to-boxel",
+        "module": "@cardstack/base/welcome-to-boxel",
         "name": "WelcomeToBoxel"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/default-templates/head.gts b/packages/base/default-templates/head.gts
index 75a75bc178d..3976c95ff50 100644
--- a/packages/base/default-templates/head.gts
+++ b/packages/base/default-templates/head.gts
@@ -1,6 +1,6 @@
 import GlimmerComponent from '@glimmer/component';
 import type { BaseDef, CardDef } from '../card-api';
-import type BrandGuide from 'https://cardstack.com/base/brand-guide';
+import type BrandGuide from '@cardstack/base/brand-guide';
 
 export default class DefaultHeadTemplate extends GlimmerComponent<{
   Args: {
diff --git a/packages/base/fields/address-field.json b/packages/base/fields/address-field.json
index d0e6e40a874..61e7c59a119 100644
--- a/packages/base/fields/address-field.json
+++ b/packages/base/fields/address-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that validates physical addresses and provides a suitable editor.",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/address",
+        "module": "@cardstack/base/address",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/base64-image.json b/packages/base/fields/base64-image.json
index 9499bb07d38..2aed808a76c 100644
--- a/packages/base/fields/base64-image.json
+++ b/packages/base/fields/base64-image.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field capable of representing an image via base64 encoding.",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/base64-image",
+        "module": "@cardstack/base/base64-image",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/biginteger-field.json b/packages/base/fields/biginteger-field.json
index f41c4346b4c..c43423d7cdf 100644
--- a/packages/base/fields/biginteger-field.json
+++ b/packages/base/fields/biginteger-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that captures big int values",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/big-integer",
+        "module": "@cardstack/base/big-integer",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/boolean-field.json b/packages/base/fields/boolean-field.json
index 389513e7359..a6de854f58c 100644
--- a/packages/base/fields/boolean-field.json
+++ b/packages/base/fields/boolean-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that captures boolean values (true/false)",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/boolean",
+        "module": "@cardstack/base/boolean",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/code-ref-field.json b/packages/base/fields/code-ref-field.json
index 1186316faa8..a15f7457cb2 100644
--- a/packages/base/fields/code-ref-field.json
+++ b/packages/base/fields/code-ref-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that captures a reference to a card or field type",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/code-ref",
+        "module": "@cardstack/base/code-ref",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/color-field.json b/packages/base/fields/color-field.json
index bd219c21c74..bbfd31f8f92 100644
--- a/packages/base/fields/color-field.json
+++ b/packages/base/fields/color-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that captures color values.",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/color",
+        "module": "@cardstack/base/color",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/command-field.json b/packages/base/fields/command-field.json
index 36d3d960be7..5335b23df79 100644
--- a/packages/base/fields/command-field.json
+++ b/packages/base/fields/command-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that represents an executable command within a skill",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "CommandField"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/country-field.json b/packages/base/fields/country-field.json
index f74fd5dee1f..4a474f10804 100644
--- a/packages/base/fields/country-field.json
+++ b/packages/base/fields/country-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that captures country values.",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/country",
+        "module": "@cardstack/base/country",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/date-field.json b/packages/base/fields/date-field.json
index 2fd40c03171..5a28f133420 100644
--- a/packages/base/fields/date-field.json
+++ b/packages/base/fields/date-field.json
@@ -5,14 +5,14 @@
       "cardTitle": "Date Field",
       "cardDescription": "A field that captures date values",
       "ref": {
-        "module": "https://cardstack.com/base/date",
+        "module": "@cardstack/base/date",
         "name": "default"
       },
       "specType": "field"
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/date-range-field.json b/packages/base/fields/date-range-field.json
index cc4c49cdd2b..e823d90a123 100644
--- a/packages/base/fields/date-range-field.json
+++ b/packages/base/fields/date-range-field.json
@@ -5,14 +5,14 @@
       "cardTitle": "Date Range Field",
       "cardDescription": "A field that captures date range values.",
       "ref": {
-        "module": "https://cardstack.com/base/date-range-field",
+        "module": "@cardstack/base/date-range-field",
         "name": "default"
       },
       "specType": "field"
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/datetime-field.json b/packages/base/fields/datetime-field.json
index e67c2c89e3b..aa8eb83f48f 100644
--- a/packages/base/fields/datetime-field.json
+++ b/packages/base/fields/datetime-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that captures date-time values",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/datetime",
+        "module": "@cardstack/base/datetime",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/email-field.json b/packages/base/fields/email-field.json
index ed19ee300a4..0da790be490 100644
--- a/packages/base/fields/email-field.json
+++ b/packages/base/fields/email-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "An email field that validates email addresses and provides a suitable editor.",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/email",
+        "module": "@cardstack/base/email",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/ethereum-address-field.json b/packages/base/fields/ethereum-address-field.json
index 51ff206bdbd..9b1f2474285 100644
--- a/packages/base/fields/ethereum-address-field.json
+++ b/packages/base/fields/ethereum-address-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that captures checksum ethereum addresses",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/ethereum-address",
+        "module": "@cardstack/base/ethereum-address",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/field.json b/packages/base/fields/field.json
index 9d9ad105590..949ccedc9f9 100644
--- a/packages/base/fields/field.json
+++ b/packages/base/fields/field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A general field that can contain any field type.",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/card-api",
+        "module": "@cardstack/base/card-api",
         "name": "FieldDef"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/markdown-field.json b/packages/base/fields/markdown-field.json
index 9d1f8ee182b..7c0fd491bf2 100644
--- a/packages/base/fields/markdown-field.json
+++ b/packages/base/fields/markdown-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that captures markdown values",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/markdown",
+        "module": "@cardstack/base/markdown",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/number-field.json b/packages/base/fields/number-field.json
index eab263e9db0..51714695fe8 100644
--- a/packages/base/fields/number-field.json
+++ b/packages/base/fields/number-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that captures number values",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/number",
+        "module": "@cardstack/base/number",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/percentage-field.json b/packages/base/fields/percentage-field.json
index a98edb3af79..f100676ddce 100644
--- a/packages/base/fields/percentage-field.json
+++ b/packages/base/fields/percentage-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that captures percentage values.",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/percentage",
+        "module": "@cardstack/base/percentage",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/phone-number.json b/packages/base/fields/phone-number.json
index e9f20b616bf..e1ce5ae618b 100644
--- a/packages/base/fields/phone-number.json
+++ b/packages/base/fields/phone-number.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that validates phone numbers and provides a suitable editor.",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/phone-number",
+        "module": "@cardstack/base/phone-number",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/realm-field.json b/packages/base/fields/realm-field.json
index 8d40689e18a..9107d50c5a5 100644
--- a/packages/base/fields/realm-field.json
+++ b/packages/base/fields/realm-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that captures realm values.",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/realm",
+        "module": "@cardstack/base/realm",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/string-field.json b/packages/base/fields/string-field.json
index 0f3dddd5e5f..2df7ffb129b 100644
--- a/packages/base/fields/string-field.json
+++ b/packages/base/fields/string-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that captures string values",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/card-api",
+        "module": "@cardstack/base/card-api",
         "name": "StringField"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/text-area-field.json b/packages/base/fields/text-area-field.json
index 9f3bc57047e..67a7c9fb370 100644
--- a/packages/base/fields/text-area-field.json
+++ b/packages/base/fields/text-area-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that can capture string values in a multi-line input format. Useful for capturing a large body of text.",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/text-area",
+        "module": "@cardstack/base/text-area",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/url-field.json b/packages/base/fields/url-field.json
index da541e51a28..165cdf59cbe 100644
--- a/packages/base/fields/url-field.json
+++ b/packages/base/fields/url-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that validates URL addresses and provides a suitable editor.",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/url",
+        "module": "@cardstack/base/url",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/fields/website-field.json b/packages/base/fields/website-field.json
index d4e64eb933e..28bf370b973 100644
--- a/packages/base/fields/website-field.json
+++ b/packages/base/fields/website-field.json
@@ -6,13 +6,13 @@
       "cardDescription": "A field that validates website addresses and provides a suitable editor.",
       "specType": "field",
       "ref": {
-        "module": "https://cardstack.com/base/website",
+        "module": "@cardstack/base/website",
         "name": "default"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/join-the-community.json b/packages/base/join-the-community.json
index d72ed4a44ca..be0d134f8fb 100644
--- a/packages/base/join-the-community.json
+++ b/packages/base/join-the-community.json
@@ -33,7 +33,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/join-the-community",
+        "module": "@cardstack/base/join-the-community",
         "name": "JoinTheCommunity"
       }
     }
diff --git a/packages/base/types/card.json b/packages/base/types/card.json
index 8b5c7d5f933..d0466889397 100644
--- a/packages/base/types/card.json
+++ b/packages/base/types/card.json
@@ -6,13 +6,13 @@
       "cardDescription": "A general card that can contain any card type.",
       "specType": "card",
       "ref": {
-        "module": "https://cardstack.com/base/card-api",
+        "module": "@cardstack/base/card-api",
         "name": "CardDef"
       }
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/base/welcome-to-boxel.json b/packages/base/welcome-to-boxel.json
index 8cfabc1ac07..c246402116a 100644
--- a/packages/base/welcome-to-boxel.json
+++ b/packages/base/welcome-to-boxel.json
@@ -40,7 +40,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/welcome-to-boxel",
+        "module": "@cardstack/base/welcome-to-boxel",
         "name": "WelcomeToBoxel"
       }
     }
diff --git a/packages/billing/tsconfig.json b/packages/billing/tsconfig.json
index cdfc0ed6f59..83eac173b56 100644
--- a/packages/billing/tsconfig.json
+++ b/packages/billing/tsconfig.json
@@ -28,7 +28,7 @@
     "skipLibCheck": true,
     "strict": true,
     "paths": {
-      "https://cardstack.com/base/*": [
+      "@cardstack/base/*": [
         "../base/*"
       ],
       "@cardstack/boxel-ui": [
diff --git a/packages/bot-runner/lib/create-listing-pr-handler.ts b/packages/bot-runner/lib/create-listing-pr-handler.ts
index 8e9925feb01..d925f15e06f 100644
--- a/packages/bot-runner/lib/create-listing-pr-handler.ts
+++ b/packages/bot-runner/lib/create-listing-pr-handler.ts
@@ -3,7 +3,7 @@ import {
   toBranchName,
   type RunCommandResponse,
 } from '@cardstack/runtime-common';
-import type { BotTriggerContent } from 'https://cardstack.com/base/matrix-event';
+import type { BotTriggerContent } from '@cardstack/base/matrix-event';
 import { createHash } from 'node:crypto';
 import type { GitHubClient, OpenPullRequestResult } from './github';
 
diff --git a/packages/bot-runner/tsconfig.json b/packages/bot-runner/tsconfig.json
index 1dfe64b8250..bbc8b9f7ab5 100644
--- a/packages/bot-runner/tsconfig.json
+++ b/packages/bot-runner/tsconfig.json
@@ -28,7 +28,7 @@
     "skipLibCheck": true,
     "strict": true,
     "paths": {
-      "https://cardstack.com/base/*": [
+      "@cardstack/base/*": [
         "../base/*"
       ],
       "@cardstack/boxel-ui": [
diff --git a/packages/boxel-ui/addon/tsconfig.json b/packages/boxel-ui/addon/tsconfig.json
index d20d11dcf6f..b269cac5508 100644
--- a/packages/boxel-ui/addon/tsconfig.json
+++ b/packages/boxel-ui/addon/tsconfig.json
@@ -26,7 +26,7 @@
     "target": "es2020",
     "traceResolution": false,
     "paths": {
-      "https://cardstack.com/base/*": [
+      "@cardstack/base/*": [
         "../../base/*"
       ],
       "*": [
diff --git a/packages/catalog-realm/3d-model-viewer/gltf-viewer.gts b/packages/catalog-realm/3d-model-viewer/gltf-viewer.gts
index 05df9d9025b..da4711c31a9 100644
--- a/packages/catalog-realm/3d-model-viewer/gltf-viewer.gts
+++ b/packages/catalog-realm/3d-model-viewer/gltf-viewer.gts
@@ -4,11 +4,11 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import UrlField from 'https://cardstack.com/base/url';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import UrlField from '@cardstack/base/url';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
 import { tracked } from '@glimmer/tracking';
 import { task } from 'ember-concurrency';
 import { action } from '@ember/object';
diff --git a/packages/catalog-realm/Image/0c28db0a-3535-4cba-a22a-f278cee887f3.json b/packages/catalog-realm/Image/0c28db0a-3535-4cba-a22a-f278cee887f3.json
index f0de62c5654..42e37357226 100644
--- a/packages/catalog-realm/Image/0c28db0a-3535-4cba-a22a-f278cee887f3.json
+++ b/packages/catalog-realm/Image/0c28db0a-3535-4cba-a22a-f278cee887f3.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/image",
+        "module": "@cardstack/base/image",
         "name": "default"
       }
     }
diff --git a/packages/catalog-realm/Image/5c07810b-7c7f-4a33-a4b5-58f101fc5a82.json b/packages/catalog-realm/Image/5c07810b-7c7f-4a33-a4b5-58f101fc5a82.json
index 7628954ced5..c58eb6e03ff 100644
--- a/packages/catalog-realm/Image/5c07810b-7c7f-4a33-a4b5-58f101fc5a82.json
+++ b/packages/catalog-realm/Image/5c07810b-7c7f-4a33-a4b5-58f101fc5a82.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/image",
+        "module": "@cardstack/base/image",
         "name": "default"
       }
     }
diff --git a/packages/catalog-realm/Image/b190f3e2-0953-4322-a815-3d5c07810b7c.json b/packages/catalog-realm/Image/b190f3e2-0953-4322-a815-3d5c07810b7c.json
index 37f497f85e0..8fd3f468051 100644
--- a/packages/catalog-realm/Image/b190f3e2-0953-4322-a815-3d5c07810b7c.json
+++ b/packages/catalog-realm/Image/b190f3e2-0953-4322-a815-3d5c07810b7c.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/image",
+        "module": "@cardstack/base/image",
         "name": "default"
       }
     }
diff --git a/packages/catalog-realm/Image/e2095313-22a8-453d-9c07-810b7c7f9a33.json b/packages/catalog-realm/Image/e2095313-22a8-453d-9c07-810b7c7f9a33.json
index c3685a0331a..7d2c11c1440 100644
--- a/packages/catalog-realm/Image/e2095313-22a8-453d-9c07-810b7c7f9a33.json
+++ b/packages/catalog-realm/Image/e2095313-22a8-453d-9c07-810b7c7f9a33.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/image",
+        "module": "@cardstack/base/image",
         "name": "default"
       }
     }
diff --git a/packages/catalog-realm/Skill/avatar-suggestion.json b/packages/catalog-realm/Skill/avatar-suggestion.json
index 4b1cb8e5669..91ae13bbc74 100644
--- a/packages/catalog-realm/Skill/avatar-suggestion.json
+++ b/packages/catalog-realm/Skill/avatar-suggestion.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Skill",
-        "module": "https://cardstack.com/base/skill"
+        "module": "@cardstack/base/skill"
       }
     },
     "type": "card",
diff --git a/packages/catalog-realm/Skill/cursor-coding.json b/packages/catalog-realm/Skill/cursor-coding.json
index 65fbabe862f..e99761c5427 100644
--- a/packages/catalog-realm/Skill/cursor-coding.json
+++ b/packages/catalog-realm/Skill/cursor-coding.json
@@ -2,7 +2,7 @@
   "data": {
     "type": "card",
     "attributes": {
-      "instructions": "Boxel is a platform where people can create Cards, which under the hood are built out of glimmer components and ember.\n\nCards are independent linkable items that get an ID. Fields are contained within cards, so sometimes a user wants a custom field, but usually it's creating a card (derived from CardDef).\n\nUse glimmer templating and typescript for the code. Remember the limitations of logic within glimmer templating code. Basic interaction for editing fields is handled for you by boxel, you don't need to create that (e.g. StringField has an edit template that allows a user to edit the data). Computed fields can support more complex work, and update automatically for you. Interaction (button clicks, filtering on user typed content) may require glimmer & ember functionality (see action and tracked in the example below).\n\n## Card Definition:\n\nCards you create have four templates. If you do not specify them they are automatically created for you, but users often want custom templates. Each template is a glimmer template and can use ember functionality. These are specified as static in the card definition:\n\n```\nimport {\n  contains,\n  containsMany,\n  linksToMany,\n  field,\n  CardDef,\n  Component,\n} from 'https://cardstack.com/base/card-api';\nimport StringField from 'https://cardstack.com/base/string';\nimport NumberField from 'https://cardstack.com/base/number';\nimport BooleanField from 'https://cardstack.com/base/boolean';\nimport DateField from 'https://cardstack.com/base/date';\n\n// Important, this is the tracked decorator\nimport { tracked } from '@glimmer/tracking';\nimport { action } from '@ember/object';\nimport { fn } from '@ember/helper';\nimport { on } from '@ember/modifier';\nimport { and, bool, eq, gt, lt, not, or, add, subtract } from '@cardstack/boxel-ui/helpers';\n\n// The above functions must be imported to use.  Other functions must be written directly.\n\nexport class MyCustomCard  extends CardDef {\n  static displayName = 'BoxelBuddyGuestList';\n\n  // linksTo and linksToMany \n  @field linkedData = linksToMany(() => AnotherCard);\n\n  // A field that is computed from other data in the card\n @field computedData = contains(NumberField, {\n   computeVia: function (this: MyCustomCard) {\n     // implementation logic here\n     return 1;\n   },\n });\n \n  // Isolated templates are used when items are viewed on their own. Default to the isolated template\n  static isolated = class Isolated extends Component<typeof this> {\n    // Use tracked and action decorators to be able to use interactivity in the templated\n  @tracked  trackedValue = [];\n  @action interactivity(event: InputEvent) {}\n// Glimmer template goes here, make sure the style tag is at the top level of the template\n  <template>\n    <style scoped>\n    </style>\n  </template>\n};\n // Embedded is when they appear in other cards\n  static embedded = class Embedded extends Component<typeof this> {\n    <template>\n      <style scoped>\n      </style>\n    </template>\n};\n\n // Fitted templates should be responsive to the size of the container they appear in\n static fitted = class Fitted extends Component<typeof this> {\n    <template>\n      <style scoped>\n      </style>\n    </template>\n  };\n\n// Edit is for the user editing the data. Use @fields let the field render itself\n  static edit = class Edit extends Component<typeof this> {\n    <template>\n      <@fields.fieldName />\n      <style scoped>\n      </style>\n    </template>\n  };\n}\n```\n\n@fields.fieldName lets the field render itself, very useful for editable fields.\n@model.fieldName gets the value out of the field.\n\n## Important:\n\nIt is extremely important you use the following imports for interactivity:\n\n```\nimport { tracked } from '@glimmer/tracking';\nimport { action } from '@ember/object';\nimport { fn, get } from '@ember/helper';\nimport { on } from '@ember/modifier';\n```\n\nRemember to define a field the following syntax is used:\n\n```\n  @field fieldname = contains(FieldType);\n  @field fieldname = containsMany(FieldType);\n```\n\nAnd for linking to other cards:\n\n```\n  @field fieldname = linksTo(() => CardType);\n  @field fieldname = linksToMany(() => CardType);\n```\n\n## Templating\n\nWhen writing the glimmer template, ensure that the style tags appear within the template tag, as the last item in them. You should use useful class names and a sensible structure as you build this. Use single quotes for the class names.\n\nWhen writing this, take care to remember ember and glimmer oddities. \n\nValues from the model can be directly inserted with\n\n```\n{{@model.fieldName}}\n```\n\nand you can delegate rendering to the field with\n\n```\n<@fields.fieldName />\n```\n\nAccessing a list by index should use this format:\n\n```\n{{(get @model.fieldWithAList index)}}\n```\n\nYou must be careful with the templates, remember glimmer rules. Do not put a dollar sign ($) directly in front of the brackets.\n\n## Styling\n\nUnless otherwise instructed, use a modern but stylish theme. \n\nCards are shown by default within a rounded corner card-like UI. You should not add outer divs to the template that give a border as that will look bad. You should however have padding so that the elements are not touching the edge.\n\n## Be Collaborative\n\nYou can ask followups\n\nYou can propose new/improved data structures",
+      "instructions": "Boxel is a platform where people can create Cards, which under the hood are built out of glimmer components and ember.\n\nCards are independent linkable items that get an ID. Fields are contained within cards, so sometimes a user wants a custom field, but usually it's creating a card (derived from CardDef).\n\nUse glimmer templating and typescript for the code. Remember the limitations of logic within glimmer templating code. Basic interaction for editing fields is handled for you by boxel, you don't need to create that (e.g. StringField has an edit template that allows a user to edit the data). Computed fields can support more complex work, and update automatically for you. Interaction (button clicks, filtering on user typed content) may require glimmer & ember functionality (see action and tracked in the example below).\n\n## Card Definition:\n\nCards you create have four templates. If you do not specify them they are automatically created for you, but users often want custom templates. Each template is a glimmer template and can use ember functionality. These are specified as static in the card definition:\n\n```\nimport {\n  contains,\n  containsMany,\n  linksToMany,\n  field,\n  CardDef,\n  Component,\n} from '@cardstack/base/card-api';\nimport StringField from '@cardstack/base/string';\nimport NumberField from '@cardstack/base/number';\nimport BooleanField from '@cardstack/base/boolean';\nimport DateField from '@cardstack/base/date';\n\n// Important, this is the tracked decorator\nimport { tracked } from '@glimmer/tracking';\nimport { action } from '@ember/object';\nimport { fn } from '@ember/helper';\nimport { on } from '@ember/modifier';\nimport { and, bool, eq, gt, lt, not, or, add, subtract } from '@cardstack/boxel-ui/helpers';\n\n// The above functions must be imported to use.  Other functions must be written directly.\n\nexport class MyCustomCard  extends CardDef {\n  static displayName = 'BoxelBuddyGuestList';\n\n  // linksTo and linksToMany \n  @field linkedData = linksToMany(() => AnotherCard);\n\n  // A field that is computed from other data in the card\n @field computedData = contains(NumberField, {\n   computeVia: function (this: MyCustomCard) {\n     // implementation logic here\n     return 1;\n   },\n });\n \n  // Isolated templates are used when items are viewed on their own. Default to the isolated template\n  static isolated = class Isolated extends Component<typeof this> {\n    // Use tracked and action decorators to be able to use interactivity in the templated\n  @tracked  trackedValue = [];\n  @action interactivity(event: InputEvent) {}\n// Glimmer template goes here, make sure the style tag is at the top level of the template\n  <template>\n    <style scoped>\n    </style>\n  </template>\n};\n // Embedded is when they appear in other cards\n  static embedded = class Embedded extends Component<typeof this> {\n    <template>\n      <style scoped>\n      </style>\n    </template>\n};\n\n // Fitted templates should be responsive to the size of the container they appear in\n static fitted = class Fitted extends Component<typeof this> {\n    <template>\n      <style scoped>\n      </style>\n    </template>\n  };\n\n// Edit is for the user editing the data. Use @fields let the field render itself\n  static edit = class Edit extends Component<typeof this> {\n    <template>\n      <@fields.fieldName />\n      <style scoped>\n      </style>\n    </template>\n  };\n}\n```\n\n@fields.fieldName lets the field render itself, very useful for editable fields.\n@model.fieldName gets the value out of the field.\n\n## Important:\n\nIt is extremely important you use the following imports for interactivity:\n\n```\nimport { tracked } from '@glimmer/tracking';\nimport { action } from '@ember/object';\nimport { fn, get } from '@ember/helper';\nimport { on } from '@ember/modifier';\n```\n\nRemember to define a field the following syntax is used:\n\n```\n  @field fieldname = contains(FieldType);\n  @field fieldname = containsMany(FieldType);\n```\n\nAnd for linking to other cards:\n\n```\n  @field fieldname = linksTo(() => CardType);\n  @field fieldname = linksToMany(() => CardType);\n```\n\n## Templating\n\nWhen writing the glimmer template, ensure that the style tags appear within the template tag, as the last item in them. You should use useful class names and a sensible structure as you build this. Use single quotes for the class names.\n\nWhen writing this, take care to remember ember and glimmer oddities. \n\nValues from the model can be directly inserted with\n\n```\n{{@model.fieldName}}\n```\n\nand you can delegate rendering to the field with\n\n```\n<@fields.fieldName />\n```\n\nAccessing a list by index should use this format:\n\n```\n{{(get @model.fieldWithAList index)}}\n```\n\nYou must be careful with the templates, remember glimmer rules. Do not put a dollar sign ($) directly in front of the brackets.\n\n## Styling\n\nUnless otherwise instructed, use a modern but stylish theme. \n\nCards are shown by default within a rounded corner card-like UI. You should not add outer divs to the template that give a border as that will look bad. You should however have padding so that the elements are not touching the edge.\n\n## Be Collaborative\n\nYou can ask followups\n\nYou can propose new/improved data structures",
       "commands": [],
       "cardTitle": "Cursor Coding",
       "cardDescription": "Helps you write Boxel code in Cursor",
@@ -10,7 +10,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/catalog-realm/Skill/fitted-formats.json b/packages/catalog-realm/Skill/fitted-formats.json
index 9045aa15f45..59bc0cc7d54 100644
--- a/packages/catalog-realm/Skill/fitted-formats.json
+++ b/packages/catalog-realm/Skill/fitted-formats.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Skill",
-        "module": "https://cardstack.com/base/skill"
+        "module": "@cardstack/base/skill"
       }
     },
     "type": "card",
diff --git a/packages/catalog-realm/Skill/homework-grader.json b/packages/catalog-realm/Skill/homework-grader.json
index 1e3ae90badf..9e27dae646b 100644
--- a/packages/catalog-realm/Skill/homework-grader.json
+++ b/packages/catalog-realm/Skill/homework-grader.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Skill",
-        "module": "https://cardstack.com/base/skill"
+        "module": "@cardstack/base/skill"
       }
     },
     "type": "card",
diff --git a/packages/catalog-realm/Skill/skill-pirate-speak.json b/packages/catalog-realm/Skill/skill-pirate-speak.json
index 772c1233f46..1d7c56424a1 100644
--- a/packages/catalog-realm/Skill/skill-pirate-speak.json
+++ b/packages/catalog-realm/Skill/skill-pirate-speak.json
@@ -9,7 +9,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/catalog-realm/Spec/00e866b7-f8b0-4053-b545-1dde17116ba6.json b/packages/catalog-realm/Spec/00e866b7-f8b0-4053-b545-1dde17116ba6.json
index e88e9a1f9a5..98f08232fe1 100644
--- a/packages/catalog-realm/Spec/00e866b7-f8b0-4053-b545-1dde17116ba6.json
+++ b/packages/catalog-realm/Spec/00e866b7-f8b0-4053-b545-1dde17116ba6.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/0156b795-16c0-4f47-a085-93954d3e6a0e.json b/packages/catalog-realm/Spec/0156b795-16c0-4f47-a085-93954d3e6a0e.json
index 9ac29af7b67..5ef1da2bc65 100644
--- a/packages/catalog-realm/Spec/0156b795-16c0-4f47-a085-93954d3e6a0e.json
+++ b/packages/catalog-realm/Spec/0156b795-16c0-4f47-a085-93954d3e6a0e.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/01800772-0f10-4079-a517-ea38f3ba43d5.json b/packages/catalog-realm/Spec/01800772-0f10-4079-a517-ea38f3ba43d5.json
index a366fb5af44..3d16862a2ed 100644
--- a/packages/catalog-realm/Spec/01800772-0f10-4079-a517-ea38f3ba43d5.json
+++ b/packages/catalog-realm/Spec/01800772-0f10-4079-a517-ea38f3ba43d5.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/0252595a-e315-4fa5-a8ea-6adf2fda9ca6.json b/packages/catalog-realm/Spec/0252595a-e315-4fa5-a8ea-6adf2fda9ca6.json
index f5a345c2966..599d0d53805 100644
--- a/packages/catalog-realm/Spec/0252595a-e315-4fa5-a8ea-6adf2fda9ca6.json
+++ b/packages/catalog-realm/Spec/0252595a-e315-4fa5-a8ea-6adf2fda9ca6.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/0315f977-9aae-4559-bb38-3218b8e61ee8.json b/packages/catalog-realm/Spec/0315f977-9aae-4559-bb38-3218b8e61ee8.json
index 8abe1596bef..2404e0d1f7d 100644
--- a/packages/catalog-realm/Spec/0315f977-9aae-4559-bb38-3218b8e61ee8.json
+++ b/packages/catalog-realm/Spec/0315f977-9aae-4559-bb38-3218b8e61ee8.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/046636fe-8150-4a2d-8387-26ed2c437d21.json b/packages/catalog-realm/Spec/046636fe-8150-4a2d-8387-26ed2c437d21.json
index 5d84ac08e15..971361d53a8 100644
--- a/packages/catalog-realm/Spec/046636fe-8150-4a2d-8387-26ed2c437d21.json
+++ b/packages/catalog-realm/Spec/046636fe-8150-4a2d-8387-26ed2c437d21.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/04c39fcf-2c81-49b8-9920-fde39eba2a27.json b/packages/catalog-realm/Spec/04c39fcf-2c81-49b8-9920-fde39eba2a27.json
index bb1bfa79ea9..397ccaff469 100644
--- a/packages/catalog-realm/Spec/04c39fcf-2c81-49b8-9920-fde39eba2a27.json
+++ b/packages/catalog-realm/Spec/04c39fcf-2c81-49b8-9920-fde39eba2a27.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/067a1da5-01cb-4cdf-a101-8007720f10d0.json b/packages/catalog-realm/Spec/067a1da5-01cb-4cdf-a101-8007720f10d0.json
index ac26990ebed..e6de5cc1d6b 100644
--- a/packages/catalog-realm/Spec/067a1da5-01cb-4cdf-a101-8007720f10d0.json
+++ b/packages/catalog-realm/Spec/067a1da5-01cb-4cdf-a101-8007720f10d0.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/06cc5cce-ff21-49e6-a438-7626f71e5b3c.json b/packages/catalog-realm/Spec/06cc5cce-ff21-49e6-a438-7626f71e5b3c.json
index 1675fe40216..0dc62442b60 100644
--- a/packages/catalog-realm/Spec/06cc5cce-ff21-49e6-a438-7626f71e5b3c.json
+++ b/packages/catalog-realm/Spec/06cc5cce-ff21-49e6-a438-7626f71e5b3c.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/07100678-a3a3-402f-8071-4e67719b4d6f.json b/packages/catalog-realm/Spec/07100678-a3a3-402f-8071-4e67719b4d6f.json
index 8989025fa0e..5e2fcda01b9 100644
--- a/packages/catalog-realm/Spec/07100678-a3a3-402f-8071-4e67719b4d6f.json
+++ b/packages/catalog-realm/Spec/07100678-a3a3-402f-8071-4e67719b4d6f.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/07461ce8-3256-4115-a76b-4cf88bd878f1.json b/packages/catalog-realm/Spec/07461ce8-3256-4115-a76b-4cf88bd878f1.json
index df828c23d66..848418f1703 100644
--- a/packages/catalog-realm/Spec/07461ce8-3256-4115-a76b-4cf88bd878f1.json
+++ b/packages/catalog-realm/Spec/07461ce8-3256-4115-a76b-4cf88bd878f1.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/07609721-fd41-411d-b879-65bcaf3c10d2.json b/packages/catalog-realm/Spec/07609721-fd41-411d-b879-65bcaf3c10d2.json
index 829d3f5b53e..3c9189ca5fc 100644
--- a/packages/catalog-realm/Spec/07609721-fd41-411d-b879-65bcaf3c10d2.json
+++ b/packages/catalog-realm/Spec/07609721-fd41-411d-b879-65bcaf3c10d2.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/07a899d8-f330-47cd-a54c-a65b60a65929.json b/packages/catalog-realm/Spec/07a899d8-f330-47cd-a54c-a65b60a65929.json
index 9ac29af7b67..5ef1da2bc65 100644
--- a/packages/catalog-realm/Spec/07a899d8-f330-47cd-a54c-a65b60a65929.json
+++ b/packages/catalog-realm/Spec/07a899d8-f330-47cd-a54c-a65b60a65929.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/07e47a7d-bb95-486c-a9b1-c9a6b802410e.json b/packages/catalog-realm/Spec/07e47a7d-bb95-486c-a9b1-c9a6b802410e.json
index 464a3082039..d5c812f2264 100644
--- a/packages/catalog-realm/Spec/07e47a7d-bb95-486c-a9b1-c9a6b802410e.json
+++ b/packages/catalog-realm/Spec/07e47a7d-bb95-486c-a9b1-c9a6b802410e.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/093db1f6-f709-47d4-b14d-86bdb90e9a95.json b/packages/catalog-realm/Spec/093db1f6-f709-47d4-b14d-86bdb90e9a95.json
index 872fcb305e7..9c5b6f9bbda 100644
--- a/packages/catalog-realm/Spec/093db1f6-f709-47d4-b14d-86bdb90e9a95.json
+++ b/packages/catalog-realm/Spec/093db1f6-f709-47d4-b14d-86bdb90e9a95.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/09e6e438-7626-471e-9b3c-bdb1653e8778.json b/packages/catalog-realm/Spec/09e6e438-7626-471e-9b3c-bdb1653e8778.json
index a630e149bbd..c8aa52669e5 100644
--- a/packages/catalog-realm/Spec/09e6e438-7626-471e-9b3c-bdb1653e8778.json
+++ b/packages/catalog-realm/Spec/09e6e438-7626-471e-9b3c-bdb1653e8778.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/0a98b650-2dc4-4b9d-959d-3b0b750bee4d.json b/packages/catalog-realm/Spec/0a98b650-2dc4-4b9d-959d-3b0b750bee4d.json
index cc2aba3a300..48b8230d7f0 100644
--- a/packages/catalog-realm/Spec/0a98b650-2dc4-4b9d-959d-3b0b750bee4d.json
+++ b/packages/catalog-realm/Spec/0a98b650-2dc4-4b9d-959d-3b0b750bee4d.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/0c1aed91-ae63-4b87-bcf0-3505520c7169.json b/packages/catalog-realm/Spec/0c1aed91-ae63-4b87-bcf0-3505520c7169.json
index 4c2bc555daf..15d45de8d21 100644
--- a/packages/catalog-realm/Spec/0c1aed91-ae63-4b87-bcf0-3505520c7169.json
+++ b/packages/catalog-realm/Spec/0c1aed91-ae63-4b87-bcf0-3505520c7169.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/0df300e8-66b7-48b0-b053-75451dde1711.json b/packages/catalog-realm/Spec/0df300e8-66b7-48b0-b053-75451dde1711.json
index 5adb61b27bb..8a0d93770b1 100644
--- a/packages/catalog-realm/Spec/0df300e8-66b7-48b0-b053-75451dde1711.json
+++ b/packages/catalog-realm/Spec/0df300e8-66b7-48b0-b053-75451dde1711.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/0fa0bb69-4d39-4bea-b46f-2b184fecfd3c.json b/packages/catalog-realm/Spec/0fa0bb69-4d39-4bea-b46f-2b184fecfd3c.json
index d33de46ce8e..b59b8f75146 100644
--- a/packages/catalog-realm/Spec/0fa0bb69-4d39-4bea-b46f-2b184fecfd3c.json
+++ b/packages/catalog-realm/Spec/0fa0bb69-4d39-4bea-b46f-2b184fecfd3c.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/0fc8d228-1ca4-41ce-ac8f-45d4fd83a680.json b/packages/catalog-realm/Spec/0fc8d228-1ca4-41ce-ac8f-45d4fd83a680.json
index ac283450179..12e11bbfbae 100644
--- a/packages/catalog-realm/Spec/0fc8d228-1ca4-41ce-ac8f-45d4fd83a680.json
+++ b/packages/catalog-realm/Spec/0fc8d228-1ca4-41ce-ac8f-45d4fd83a680.json
@@ -40,7 +40,7 @@
         ]
       },
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/0fe173b7-bcfa-4f9b-b8db-60c1b61d9e27.json b/packages/catalog-realm/Spec/0fe173b7-bcfa-4f9b-b8db-60c1b61d9e27.json
index d56f0ea0d0c..a20d3b9841c 100644
--- a/packages/catalog-realm/Spec/0fe173b7-bcfa-4f9b-b8db-60c1b61d9e27.json
+++ b/packages/catalog-realm/Spec/0fe173b7-bcfa-4f9b-b8db-60c1b61d9e27.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/100fc181-3d73-4823-b48d-834dc743b86f.json b/packages/catalog-realm/Spec/100fc181-3d73-4823-b48d-834dc743b86f.json
index e97ec103595..c1088c23f56 100644
--- a/packages/catalog-realm/Spec/100fc181-3d73-4823-b48d-834dc743b86f.json
+++ b/packages/catalog-realm/Spec/100fc181-3d73-4823-b48d-834dc743b86f.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/109bc9f9-8190-4b54-9b6f-b57bcc8743f0.json b/packages/catalog-realm/Spec/109bc9f9-8190-4b54-9b6f-b57bcc8743f0.json
index 24d79e0b310..997cb87d99c 100644
--- a/packages/catalog-realm/Spec/109bc9f9-8190-4b54-9b6f-b57bcc8743f0.json
+++ b/packages/catalog-realm/Spec/109bc9f9-8190-4b54-9b6f-b57bcc8743f0.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/10ea7ab6-c9c9-4fdd-ba72-d08252e9eb7a.json b/packages/catalog-realm/Spec/10ea7ab6-c9c9-4fdd-ba72-d08252e9eb7a.json
index 8f0af1aaa07..10e055f9bef 100644
--- a/packages/catalog-realm/Spec/10ea7ab6-c9c9-4fdd-ba72-d08252e9eb7a.json
+++ b/packages/catalog-realm/Spec/10ea7ab6-c9c9-4fdd-ba72-d08252e9eb7a.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/1166e3f7-88e8-48fb-a7a5-b8bdd76e246a.json b/packages/catalog-realm/Spec/1166e3f7-88e8-48fb-a7a5-b8bdd76e246a.json
index 883ecbeb7bf..6af135abbfb 100644
--- a/packages/catalog-realm/Spec/1166e3f7-88e8-48fb-a7a5-b8bdd76e246a.json
+++ b/packages/catalog-realm/Spec/1166e3f7-88e8-48fb-a7a5-b8bdd76e246a.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/12e7104b-0be0-4c68-9d25-6dcfafd8cbfc.json b/packages/catalog-realm/Spec/12e7104b-0be0-4c68-9d25-6dcfafd8cbfc.json
index 98dc3a37442..394dc9175bf 100644
--- a/packages/catalog-realm/Spec/12e7104b-0be0-4c68-9d25-6dcfafd8cbfc.json
+++ b/packages/catalog-realm/Spec/12e7104b-0be0-4c68-9d25-6dcfafd8cbfc.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/135858e8-7ae8-4009-b7c7-370933c7c13a.json b/packages/catalog-realm/Spec/135858e8-7ae8-4009-b7c7-370933c7c13a.json
index 30551f65a6d..417de516c7a 100644
--- a/packages/catalog-realm/Spec/135858e8-7ae8-4009-b7c7-370933c7c13a.json
+++ b/packages/catalog-realm/Spec/135858e8-7ae8-4009-b7c7-370933c7c13a.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/13dc781c-c652-4f73-b0e2-5583d6f8d2ad.json b/packages/catalog-realm/Spec/13dc781c-c652-4f73-b0e2-5583d6f8d2ad.json
index afbaf2cb3ba..1938efd39e0 100644
--- a/packages/catalog-realm/Spec/13dc781c-c652-4f73-b0e2-5583d6f8d2ad.json
+++ b/packages/catalog-realm/Spec/13dc781c-c652-4f73-b0e2-5583d6f8d2ad.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/158fa01e-5c46-4d10-b88e-6dc6e42ce53c.json b/packages/catalog-realm/Spec/158fa01e-5c46-4d10-b88e-6dc6e42ce53c.json
index 07563722762..94902fe3a6e 100644
--- a/packages/catalog-realm/Spec/158fa01e-5c46-4d10-b88e-6dc6e42ce53c.json
+++ b/packages/catalog-realm/Spec/158fa01e-5c46-4d10-b88e-6dc6e42ce53c.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/16320d37-fac6-417c-ae20-c583ea0c8a2e.json b/packages/catalog-realm/Spec/16320d37-fac6-417c-ae20-c583ea0c8a2e.json
index 84f5bbac9db..8f134a44493 100644
--- a/packages/catalog-realm/Spec/16320d37-fac6-417c-ae20-c583ea0c8a2e.json
+++ b/packages/catalog-realm/Spec/16320d37-fac6-417c-ae20-c583ea0c8a2e.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/1780b283-3078-4710-902a-6028ef2be83b.json b/packages/catalog-realm/Spec/1780b283-3078-4710-902a-6028ef2be83b.json
index 35e652d4f31..1daadfc9c3d 100644
--- a/packages/catalog-realm/Spec/1780b283-3078-4710-902a-6028ef2be83b.json
+++ b/packages/catalog-realm/Spec/1780b283-3078-4710-902a-6028ef2be83b.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/1ae19cab-8003-41b4-950a-2305f442fd0b.json b/packages/catalog-realm/Spec/1ae19cab-8003-41b4-950a-2305f442fd0b.json
index 811af2fc882..18402f961a0 100644
--- a/packages/catalog-realm/Spec/1ae19cab-8003-41b4-950a-2305f442fd0b.json
+++ b/packages/catalog-realm/Spec/1ae19cab-8003-41b4-950a-2305f442fd0b.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/1afd63a1-a236-4df0-8bae-e460e04bf343.json b/packages/catalog-realm/Spec/1afd63a1-a236-4df0-8bae-e460e04bf343.json
index f104086ffb4..fd71a7f52ab 100644
--- a/packages/catalog-realm/Spec/1afd63a1-a236-4df0-8bae-e460e04bf343.json
+++ b/packages/catalog-realm/Spec/1afd63a1-a236-4df0-8bae-e460e04bf343.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/1b023c94-c534-43bf-8a09-3db1f6f70967.json b/packages/catalog-realm/Spec/1b023c94-c534-43bf-8a09-3db1f6f70967.json
index 726ba67b74e..43f8226c6a3 100644
--- a/packages/catalog-realm/Spec/1b023c94-c534-43bf-8a09-3db1f6f70967.json
+++ b/packages/catalog-realm/Spec/1b023c94-c534-43bf-8a09-3db1f6f70967.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/1baaa928-ffb1-43c9-b624-fbd39e736c0d.json b/packages/catalog-realm/Spec/1baaa928-ffb1-43c9-b624-fbd39e736c0d.json
index 87a53ef0c11..fc381deae1a 100644
--- a/packages/catalog-realm/Spec/1baaa928-ffb1-43c9-b624-fbd39e736c0d.json
+++ b/packages/catalog-realm/Spec/1baaa928-ffb1-43c9-b624-fbd39e736c0d.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/1c039761-a17e-4a8e-a4ee-e5563befbad9.json b/packages/catalog-realm/Spec/1c039761-a17e-4a8e-a4ee-e5563befbad9.json
index d9dde0c137b..408ffca6ec1 100644
--- a/packages/catalog-realm/Spec/1c039761-a17e-4a8e-a4ee-e5563befbad9.json
+++ b/packages/catalog-realm/Spec/1c039761-a17e-4a8e-a4ee-e5563befbad9.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/1da501cb-bcdf-4101-8007-720f10d07925.json b/packages/catalog-realm/Spec/1da501cb-bcdf-4101-8007-720f10d07925.json
index 54262f8dfb6..7eaab63623e 100644
--- a/packages/catalog-realm/Spec/1da501cb-bcdf-4101-8007-720f10d07925.json
+++ b/packages/catalog-realm/Spec/1da501cb-bcdf-4101-8007-720f10d07925.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/1dde1711-6ba6-4ade-b34b-2ebb91b9bf4c.json b/packages/catalog-realm/Spec/1dde1711-6ba6-4ade-b34b-2ebb91b9bf4c.json
index 194ebfdbb64..8c45c74aaf3 100644
--- a/packages/catalog-realm/Spec/1dde1711-6ba6-4ade-b34b-2ebb91b9bf4c.json
+++ b/packages/catalog-realm/Spec/1dde1711-6ba6-4ade-b34b-2ebb91b9bf4c.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/1dde6ecb-e779-4fb7-89de-597399bb1530.json b/packages/catalog-realm/Spec/1dde6ecb-e779-4fb7-89de-597399bb1530.json
index 6c36b8a04c7..63d3c6805cb 100644
--- a/packages/catalog-realm/Spec/1dde6ecb-e779-4fb7-89de-597399bb1530.json
+++ b/packages/catalog-realm/Spec/1dde6ecb-e779-4fb7-89de-597399bb1530.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Spec",
-        "module": "https://cardstack.com/base/spec"
+        "module": "@cardstack/base/spec"
       }
     },
     "type": "card",
diff --git a/packages/catalog-realm/Spec/1f0a971a-df80-4516-8f13-6988c906038e.json b/packages/catalog-realm/Spec/1f0a971a-df80-4516-8f13-6988c906038e.json
index 0dac44adf7a..5db7cf3e328 100644
--- a/packages/catalog-realm/Spec/1f0a971a-df80-4516-8f13-6988c906038e.json
+++ b/packages/catalog-realm/Spec/1f0a971a-df80-4516-8f13-6988c906038e.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/1f4256c4-34b2-4cd4-9eaf-388839bf9ac7.json b/packages/catalog-realm/Spec/1f4256c4-34b2-4cd4-9eaf-388839bf9ac7.json
index 4c2bc555daf..15d45de8d21 100644
--- a/packages/catalog-realm/Spec/1f4256c4-34b2-4cd4-9eaf-388839bf9ac7.json
+++ b/packages/catalog-realm/Spec/1f4256c4-34b2-4cd4-9eaf-388839bf9ac7.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/20f75ed6-f7d4-4806-98cf-71a2b3471688.json b/packages/catalog-realm/Spec/20f75ed6-f7d4-4806-98cf-71a2b3471688.json
index 048c578f5fd..c4131fe8fa9 100644
--- a/packages/catalog-realm/Spec/20f75ed6-f7d4-4806-98cf-71a2b3471688.json
+++ b/packages/catalog-realm/Spec/20f75ed6-f7d4-4806-98cf-71a2b3471688.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/20fde39e-ba2a-47f6-8869-790156b79516.json b/packages/catalog-realm/Spec/20fde39e-ba2a-47f6-8869-790156b79516.json
index 566e2c6f186..d223c442e7b 100644
--- a/packages/catalog-realm/Spec/20fde39e-ba2a-47f6-8869-790156b79516.json
+++ b/packages/catalog-realm/Spec/20fde39e-ba2a-47f6-8869-790156b79516.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/2109e6e4-3876-46f7-9e5b-3cbdb1653e87.json b/packages/catalog-realm/Spec/2109e6e4-3876-46f7-9e5b-3cbdb1653e87.json
index eed0c0bee7d..b433c91b07c 100644
--- a/packages/catalog-realm/Spec/2109e6e4-3876-46f7-9e5b-3cbdb1653e87.json
+++ b/packages/catalog-realm/Spec/2109e6e4-3876-46f7-9e5b-3cbdb1653e87.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/225448a4-7dcb-42f1-aa84-15cbe15ae04f.json b/packages/catalog-realm/Spec/225448a4-7dcb-42f1-aa84-15cbe15ae04f.json
index 9ac29af7b67..5ef1da2bc65 100644
--- a/packages/catalog-realm/Spec/225448a4-7dcb-42f1-aa84-15cbe15ae04f.json
+++ b/packages/catalog-realm/Spec/225448a4-7dcb-42f1-aa84-15cbe15ae04f.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/239b84fc-b080-4465-ae9f-b3e9abd0ec3f.json b/packages/catalog-realm/Spec/239b84fc-b080-4465-ae9f-b3e9abd0ec3f.json
index e0f337d47a2..a982f8ee41e 100644
--- a/packages/catalog-realm/Spec/239b84fc-b080-4465-ae9f-b3e9abd0ec3f.json
+++ b/packages/catalog-realm/Spec/239b84fc-b080-4465-ae9f-b3e9abd0ec3f.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/243337da-30e2-4d9a-a34d-fec1e0788e41.json b/packages/catalog-realm/Spec/243337da-30e2-4d9a-a34d-fec1e0788e41.json
index 6cedf307759..e205123c2da 100644
--- a/packages/catalog-realm/Spec/243337da-30e2-4d9a-a34d-fec1e0788e41.json
+++ b/packages/catalog-realm/Spec/243337da-30e2-4d9a-a34d-fec1e0788e41.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/2517ea38-f3ba-43d5-920a-fb1936279570.json b/packages/catalog-realm/Spec/2517ea38-f3ba-43d5-920a-fb1936279570.json
index 1325e5eb488..7f25ac8aa7f 100644
--- a/packages/catalog-realm/Spec/2517ea38-f3ba-43d5-920a-fb1936279570.json
+++ b/packages/catalog-realm/Spec/2517ea38-f3ba-43d5-920a-fb1936279570.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/25c14134-8209-4af5-b4f9-2bd8d2672641.json b/packages/catalog-realm/Spec/25c14134-8209-4af5-b4f9-2bd8d2672641.json
index 6997df8c8cc..622a5fc228b 100644
--- a/packages/catalog-realm/Spec/25c14134-8209-4af5-b4f9-2bd8d2672641.json
+++ b/packages/catalog-realm/Spec/25c14134-8209-4af5-b4f9-2bd8d2672641.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/275ff1e6-7436-41a6-bcf2-72014bed10fc.json b/packages/catalog-realm/Spec/275ff1e6-7436-41a6-bcf2-72014bed10fc.json
index c4cc9eddfc6..99e3c62d336 100644
--- a/packages/catalog-realm/Spec/275ff1e6-7436-41a6-bcf2-72014bed10fc.json
+++ b/packages/catalog-realm/Spec/275ff1e6-7436-41a6-bcf2-72014bed10fc.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/27a5b8bd-d76e-446a-9bed-f909f1803234.json b/packages/catalog-realm/Spec/27a5b8bd-d76e-446a-9bed-f909f1803234.json
index 57590549c61..d708f627a57 100644
--- a/packages/catalog-realm/Spec/27a5b8bd-d76e-446a-9bed-f909f1803234.json
+++ b/packages/catalog-realm/Spec/27a5b8bd-d76e-446a-9bed-f909f1803234.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/27ce1fe6-1166-43f7-88e8-88fb27a5b8bd.json b/packages/catalog-realm/Spec/27ce1fe6-1166-43f7-88e8-88fb27a5b8bd.json
index 23b5a5b4bdb..5a5a66c79dc 100644
--- a/packages/catalog-realm/Spec/27ce1fe6-1166-43f7-88e8-88fb27a5b8bd.json
+++ b/packages/catalog-realm/Spec/27ce1fe6-1166-43f7-88e8-88fb27a5b8bd.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/27f64869-7901-46b7-9516-c0ef47e08593.json b/packages/catalog-realm/Spec/27f64869-7901-46b7-9516-c0ef47e08593.json
index ac0239a1dd5..7e6359a3851 100644
--- a/packages/catalog-realm/Spec/27f64869-7901-46b7-9516-c0ef47e08593.json
+++ b/packages/catalog-realm/Spec/27f64869-7901-46b7-9516-c0ef47e08593.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/299226b3-c50d-4cf3-a5ae-6f11bd2f34ba.json b/packages/catalog-realm/Spec/299226b3-c50d-4cf3-a5ae-6f11bd2f34ba.json
index 98dc3a37442..394dc9175bf 100644
--- a/packages/catalog-realm/Spec/299226b3-c50d-4cf3-a5ae-6f11bd2f34ba.json
+++ b/packages/catalog-realm/Spec/299226b3-c50d-4cf3-a5ae-6f11bd2f34ba.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/2a27f648-6979-4156-b795-16c0ef47e085.json b/packages/catalog-realm/Spec/2a27f648-6979-4156-b795-16c0ef47e085.json
index 811af2fc882..18402f961a0 100644
--- a/packages/catalog-realm/Spec/2a27f648-6979-4156-b795-16c0ef47e085.json
+++ b/packages/catalog-realm/Spec/2a27f648-6979-4156-b795-16c0ef47e085.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/2a870145-9f84-4cca-baa2-e5ef5d2d24e9.json b/packages/catalog-realm/Spec/2a870145-9f84-4cca-baa2-e5ef5d2d24e9.json
index ef4bd21abc5..2767b341f05 100644
--- a/packages/catalog-realm/Spec/2a870145-9f84-4cca-baa2-e5ef5d2d24e9.json
+++ b/packages/catalog-realm/Spec/2a870145-9f84-4cca-baa2-e5ef5d2d24e9.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/2c81f9b8-d920-4de3-9eba-2a27f6486979.json b/packages/catalog-realm/Spec/2c81f9b8-d920-4de3-9eba-2a27f6486979.json
index 2a2cce26df8..a6d11c1758a 100644
--- a/packages/catalog-realm/Spec/2c81f9b8-d920-4de3-9eba-2a27f6486979.json
+++ b/packages/catalog-realm/Spec/2c81f9b8-d920-4de3-9eba-2a27f6486979.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/2dc9afda-d18c-4ad1-962f-3e3c769f101a.json b/packages/catalog-realm/Spec/2dc9afda-d18c-4ad1-962f-3e3c769f101a.json
index 9e7dc0c393d..326cf6da7d2 100644
--- a/packages/catalog-realm/Spec/2dc9afda-d18c-4ad1-962f-3e3c769f101a.json
+++ b/packages/catalog-realm/Spec/2dc9afda-d18c-4ad1-962f-3e3c769f101a.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/2e565733-3788-469f-9e8d-86159427ad8b.json b/packages/catalog-realm/Spec/2e565733-3788-469f-9e8d-86159427ad8b.json
index 6a0238e3786..04169cd18cf 100644
--- a/packages/catalog-realm/Spec/2e565733-3788-469f-9e8d-86159427ad8b.json
+++ b/packages/catalog-realm/Spec/2e565733-3788-469f-9e8d-86159427ad8b.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/2f48a563-beea-41b5-900c-21d9ea0f16ee.json b/packages/catalog-realm/Spec/2f48a563-beea-41b5-900c-21d9ea0f16ee.json
index cbe683251dd..3fc761fd779 100644
--- a/packages/catalog-realm/Spec/2f48a563-beea-41b5-900c-21d9ea0f16ee.json
+++ b/packages/catalog-realm/Spec/2f48a563-beea-41b5-900c-21d9ea0f16ee.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/2f57e5ba-e10f-4769-8a6a-a245dbee5634.json b/packages/catalog-realm/Spec/2f57e5ba-e10f-4769-8a6a-a245dbee5634.json
index 8f108af275e..fc236900fac 100644
--- a/packages/catalog-realm/Spec/2f57e5ba-e10f-4769-8a6a-a245dbee5634.json
+++ b/packages/catalog-realm/Spec/2f57e5ba-e10f-4769-8a6a-a245dbee5634.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/3092be10-ea7a-46c9-893f-dd7a72d08252.json b/packages/catalog-realm/Spec/3092be10-ea7a-46c9-893f-dd7a72d08252.json
index 2a2cce26df8..a6d11c1758a 100644
--- a/packages/catalog-realm/Spec/3092be10-ea7a-46c9-893f-dd7a72d08252.json
+++ b/packages/catalog-realm/Spec/3092be10-ea7a-46c9-893f-dd7a72d08252.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/30980469-41a0-4ac1-beca-2ede6a59eac4.json b/packages/catalog-realm/Spec/30980469-41a0-4ac1-beca-2ede6a59eac4.json
index c4f79079010..8df14cc96ad 100644
--- a/packages/catalog-realm/Spec/30980469-41a0-4ac1-beca-2ede6a59eac4.json
+++ b/packages/catalog-realm/Spec/30980469-41a0-4ac1-beca-2ede6a59eac4.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/318c7fe9-4601-44a4-acff-e2ba452af302.json b/packages/catalog-realm/Spec/318c7fe9-4601-44a4-acff-e2ba452af302.json
index 47ab93d48a8..2b18ee0a261 100644
--- a/packages/catalog-realm/Spec/318c7fe9-4601-44a4-acff-e2ba452af302.json
+++ b/packages/catalog-realm/Spec/318c7fe9-4601-44a4-acff-e2ba452af302.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/32597db8-0aa6-4d4e-a43b-9720f75ed6f7.json b/packages/catalog-realm/Spec/32597db8-0aa6-4d4e-a43b-9720f75ed6f7.json
index 11e13623dbf..72ffe286c79 100644
--- a/packages/catalog-realm/Spec/32597db8-0aa6-4d4e-a43b-9720f75ed6f7.json
+++ b/packages/catalog-realm/Spec/32597db8-0aa6-4d4e-a43b-9720f75ed6f7.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/34f73caa-96db-4de1-b1a8-a13474a8be8a.json b/packages/catalog-realm/Spec/34f73caa-96db-4de1-b1a8-a13474a8be8a.json
index cea7dbeaba3..c4867fe22cb 100644
--- a/packages/catalog-realm/Spec/34f73caa-96db-4de1-b1a8-a13474a8be8a.json
+++ b/packages/catalog-realm/Spec/34f73caa-96db-4de1-b1a8-a13474a8be8a.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/35bb1935-4ca3-4667-8f41-5b7726b6fbd8.json b/packages/catalog-realm/Spec/35bb1935-4ca3-4667-8f41-5b7726b6fbd8.json
index 86f3a506552..0661e609586 100644
--- a/packages/catalog-realm/Spec/35bb1935-4ca3-4667-8f41-5b7726b6fbd8.json
+++ b/packages/catalog-realm/Spec/35bb1935-4ca3-4667-8f41-5b7726b6fbd8.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/35c04cf6-643c-421e-a2f8-52b6032a53ca.json b/packages/catalog-realm/Spec/35c04cf6-643c-421e-a2f8-52b6032a53ca.json
index 8538bcc554f..80a545b1953 100644
--- a/packages/catalog-realm/Spec/35c04cf6-643c-421e-a2f8-52b6032a53ca.json
+++ b/packages/catalog-realm/Spec/35c04cf6-643c-421e-a2f8-52b6032a53ca.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/3631a63c-f272-414b-ad10-fc8265cff1b6.json b/packages/catalog-realm/Spec/3631a63c-f272-414b-ad10-fc8265cff1b6.json
index bdadbc3fdf3..c7cb708aae6 100644
--- a/packages/catalog-realm/Spec/3631a63c-f272-414b-ad10-fc8265cff1b6.json
+++ b/packages/catalog-realm/Spec/3631a63c-f272-414b-ad10-fc8265cff1b6.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/37b6edc5-df3b-4da3-8b11-dd8934a46c27.json b/packages/catalog-realm/Spec/37b6edc5-df3b-4da3-8b11-dd8934a46c27.json
index c1b7d1df6bf..6853d776278 100644
--- a/packages/catalog-realm/Spec/37b6edc5-df3b-4da3-8b11-dd8934a46c27.json
+++ b/packages/catalog-realm/Spec/37b6edc5-df3b-4da3-8b11-dd8934a46c27.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/38834e22-4298-444e-bb11-ea9a133a0f96.json b/packages/catalog-realm/Spec/38834e22-4298-444e-bb11-ea9a133a0f96.json
index 89e3964828d..3b60dc6620a 100644
--- a/packages/catalog-realm/Spec/38834e22-4298-444e-bb11-ea9a133a0f96.json
+++ b/packages/catalog-realm/Spec/38834e22-4298-444e-bb11-ea9a133a0f96.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/3a7a139d-cc13-4a07-80f4-b8aa264f8eba.json b/packages/catalog-realm/Spec/3a7a139d-cc13-4a07-80f4-b8aa264f8eba.json
index 1384bfeb0ee..ec579582921 100644
--- a/packages/catalog-realm/Spec/3a7a139d-cc13-4a07-80f4-b8aa264f8eba.json
+++ b/packages/catalog-realm/Spec/3a7a139d-cc13-4a07-80f4-b8aa264f8eba.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/3af3b410-91cb-4e34-8f3f-bc3fbed58910.json b/packages/catalog-realm/Spec/3af3b410-91cb-4e34-8f3f-bc3fbed58910.json
index 74dae08dcca..8e779be2fb2 100644
--- a/packages/catalog-realm/Spec/3af3b410-91cb-4e34-8f3f-bc3fbed58910.json
+++ b/packages/catalog-realm/Spec/3af3b410-91cb-4e34-8f3f-bc3fbed58910.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/3c121ee2-f852-4603-aa53-ca8bac313f7f.json b/packages/catalog-realm/Spec/3c121ee2-f852-4603-aa53-ca8bac313f7f.json
index 4f941bd0843..5a6c7a9426c 100644
--- a/packages/catalog-realm/Spec/3c121ee2-f852-4603-aa53-ca8bac313f7f.json
+++ b/packages/catalog-realm/Spec/3c121ee2-f852-4603-aa53-ca8bac313f7f.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/3caa96db-dde1-41a8-a134-74a8be8a05ca.json b/packages/catalog-realm/Spec/3caa96db-dde1-41a8-a134-74a8be8a05ca.json
index 41aa8ecffce..3b8c806c7f7 100644
--- a/packages/catalog-realm/Spec/3caa96db-dde1-41a8-a134-74a8be8a05ca.json
+++ b/packages/catalog-realm/Spec/3caa96db-dde1-41a8-a134-74a8be8a05ca.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/3cb2eecd-ca34-473c-aa96-dbdde1f1a8a1.json b/packages/catalog-realm/Spec/3cb2eecd-ca34-473c-aa96-dbdde1f1a8a1.json
index ca99da6887f..b865f4bf888 100644
--- a/packages/catalog-realm/Spec/3cb2eecd-ca34-473c-aa96-dbdde1f1a8a1.json
+++ b/packages/catalog-realm/Spec/3cb2eecd-ca34-473c-aa96-dbdde1f1a8a1.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/3d732823-f48d-434d-8743-b86f4a9fa8a5.json b/packages/catalog-realm/Spec/3d732823-f48d-434d-8743-b86f4a9fa8a5.json
index 39ce12aceb6..62ffc0baa6b 100644
--- a/packages/catalog-realm/Spec/3d732823-f48d-434d-8743-b86f4a9fa8a5.json
+++ b/packages/catalog-realm/Spec/3d732823-f48d-434d-8743-b86f4a9fa8a5.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/3db1f6f7-0967-4471-8d86-bdb90e9a95eb.json b/packages/catalog-realm/Spec/3db1f6f7-0967-4471-8d86-bdb90e9a95eb.json
index bdda5a7b787..604379dfe74 100644
--- a/packages/catalog-realm/Spec/3db1f6f7-0967-4471-8d86-bdb90e9a95eb.json
+++ b/packages/catalog-realm/Spec/3db1f6f7-0967-4471-8d86-bdb90e9a95eb.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/3e318c7f-e946-4164-a46c-ffe2ba452af3.json b/packages/catalog-realm/Spec/3e318c7f-e946-4164-a46c-ffe2ba452af3.json
index bb1bfa79ea9..397ccaff469 100644
--- a/packages/catalog-realm/Spec/3e318c7f-e946-4164-a46c-ffe2ba452af3.json
+++ b/packages/catalog-realm/Spec/3e318c7f-e946-4164-a46c-ffe2ba452af3.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/4256c434-b2ec-44de-af38-8839bf9ac7f4.json b/packages/catalog-realm/Spec/4256c434-b2ec-44de-af38-8839bf9ac7f4.json
index ab3156c6a1e..c2e749c1cfd 100644
--- a/packages/catalog-realm/Spec/4256c434-b2ec-44de-af38-8839bf9ac7f4.json
+++ b/packages/catalog-realm/Spec/4256c434-b2ec-44de-af38-8839bf9ac7f4.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/438389fe-cba3-4e12-a30a-aaf589960a75.json b/packages/catalog-realm/Spec/438389fe-cba3-4e12-a30a-aaf589960a75.json
index db51969b79e..6e2ca37c342 100644
--- a/packages/catalog-realm/Spec/438389fe-cba3-4e12-a30a-aaf589960a75.json
+++ b/packages/catalog-realm/Spec/438389fe-cba3-4e12-a30a-aaf589960a75.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/451dde17-116b-46ba-9eb3-4b2ebb91b9bf.json b/packages/catalog-realm/Spec/451dde17-116b-46ba-9eb3-4b2ebb91b9bf.json
index 4074a21ba97..b933f94c120 100644
--- a/packages/catalog-realm/Spec/451dde17-116b-46ba-9eb3-4b2ebb91b9bf.json
+++ b/packages/catalog-realm/Spec/451dde17-116b-46ba-9eb3-4b2ebb91b9bf.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/455a5aac-04c3-4fcf-ac81-f9b8d920fde3.json b/packages/catalog-realm/Spec/455a5aac-04c3-4fcf-ac81-f9b8d920fde3.json
index 5a3335e9660..0aaab523463 100644
--- a/packages/catalog-realm/Spec/455a5aac-04c3-4fcf-ac81-f9b8d920fde3.json
+++ b/packages/catalog-realm/Spec/455a5aac-04c3-4fcf-ac81-f9b8d920fde3.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/459eb700-0956-4ed3-9c41-4e21ae58e941.json b/packages/catalog-realm/Spec/459eb700-0956-4ed3-9c41-4e21ae58e941.json
index c9afbf4fe0f..fca8b46cb15 100644
--- a/packages/catalog-realm/Spec/459eb700-0956-4ed3-9c41-4e21ae58e941.json
+++ b/packages/catalog-realm/Spec/459eb700-0956-4ed3-9c41-4e21ae58e941.json
@@ -46,7 +46,7 @@
         ]
       },
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/46a57708-3eb2-4809-8366-6d85f757dc5c.json b/packages/catalog-realm/Spec/46a57708-3eb2-4809-8366-6d85f757dc5c.json
index 75d9d9d98fd..455cafa087a 100644
--- a/packages/catalog-realm/Spec/46a57708-3eb2-4809-8366-6d85f757dc5c.json
+++ b/packages/catalog-realm/Spec/46a57708-3eb2-4809-8366-6d85f757dc5c.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/473cb2ee-cdca-44f7-bcaa-96dbdde1f1a8.json b/packages/catalog-realm/Spec/473cb2ee-cdca-44f7-bcaa-96dbdde1f1a8.json
index 67a06d5327a..9671ddc8a4f 100644
--- a/packages/catalog-realm/Spec/473cb2ee-cdca-44f7-bcaa-96dbdde1f1a8.json
+++ b/packages/catalog-realm/Spec/473cb2ee-cdca-44f7-bcaa-96dbdde1f1a8.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/48697901-56b7-4516-80ef-47e08593954d.json b/packages/catalog-realm/Spec/48697901-56b7-4516-80ef-47e08593954d.json
index c1b7d1df6bf..6853d776278 100644
--- a/packages/catalog-realm/Spec/48697901-56b7-4516-80ef-47e08593954d.json
+++ b/packages/catalog-realm/Spec/48697901-56b7-4516-80ef-47e08593954d.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/48a47dcb-12f1-4a84-95cb-e15ae04f5db4.json b/packages/catalog-realm/Spec/48a47dcb-12f1-4a84-95cb-e15ae04f5db4.json
index 6997df8c8cc..622a5fc228b 100644
--- a/packages/catalog-realm/Spec/48a47dcb-12f1-4a84-95cb-e15ae04f5db4.json
+++ b/packages/catalog-realm/Spec/48a47dcb-12f1-4a84-95cb-e15ae04f5db4.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/4a63774c-c4e7-4e37-927c-4185efb2dd0c.json b/packages/catalog-realm/Spec/4a63774c-c4e7-4e37-927c-4185efb2dd0c.json
index e0c90df8804..3081612cf8a 100644
--- a/packages/catalog-realm/Spec/4a63774c-c4e7-4e37-927c-4185efb2dd0c.json
+++ b/packages/catalog-realm/Spec/4a63774c-c4e7-4e37-927c-4185efb2dd0c.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/4ca3a667-cf41-4b77-a6b6-fbd81693e2c5.json b/packages/catalog-realm/Spec/4ca3a667-cf41-4b77-a6b6-fbd81693e2c5.json
index 6914a54236c..b5e9825e535 100644
--- a/packages/catalog-realm/Spec/4ca3a667-cf41-4b77-a6b6-fbd81693e2c5.json
+++ b/packages/catalog-realm/Spec/4ca3a667-cf41-4b77-a6b6-fbd81693e2c5.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/4cf6643c-121e-42f8-92b6-032a53ca8bac.json b/packages/catalog-realm/Spec/4cf6643c-121e-42f8-92b6-032a53ca8bac.json
index 5031b3a4e0f..bc052c6e400 100644
--- a/packages/catalog-realm/Spec/4cf6643c-121e-42f8-92b6-032a53ca8bac.json
+++ b/packages/catalog-realm/Spec/4cf6643c-121e-42f8-92b6-032a53ca8bac.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/4d86bdb9-0e9a-45eb-be97-e8960cfb907e.json b/packages/catalog-realm/Spec/4d86bdb9-0e9a-45eb-be97-e8960cfb907e.json
index 041d8028712..a0aad172131 100644
--- a/packages/catalog-realm/Spec/4d86bdb9-0e9a-45eb-be97-e8960cfb907e.json
+++ b/packages/catalog-realm/Spec/4d86bdb9-0e9a-45eb-be97-e8960cfb907e.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/500c21d9-ea0f-46ee-a282-509a1803d2d2.json b/packages/catalog-realm/Spec/500c21d9-ea0f-46ee-a282-509a1803d2d2.json
index 92f2af2c11b..139da53d453 100644
--- a/packages/catalog-realm/Spec/500c21d9-ea0f-46ee-a282-509a1803d2d2.json
+++ b/packages/catalog-realm/Spec/500c21d9-ea0f-46ee-a282-509a1803d2d2.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/509a2d83-8726-4d2c-837d-2171eade2544.json b/packages/catalog-realm/Spec/509a2d83-8726-4d2c-837d-2171eade2544.json
index e3ac4e64e1c..aae73f6ee2c 100644
--- a/packages/catalog-realm/Spec/509a2d83-8726-4d2c-837d-2171eade2544.json
+++ b/packages/catalog-realm/Spec/509a2d83-8726-4d2c-837d-2171eade2544.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/50cb92d0-5287-45a0-ae72-deca40e62ddd.json b/packages/catalog-realm/Spec/50cb92d0-5287-45a0-ae72-deca40e62ddd.json
index 2ddfb2a44de..ef941dfc8b3 100644
--- a/packages/catalog-realm/Spec/50cb92d0-5287-45a0-ae72-deca40e62ddd.json
+++ b/packages/catalog-realm/Spec/50cb92d0-5287-45a0-ae72-deca40e62ddd.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/50e1376d-bd34-400f-8181-3d732823f48d.json b/packages/catalog-realm/Spec/50e1376d-bd34-400f-8181-3d732823f48d.json
index 2fb38865bb6..b33910949bc 100644
--- a/packages/catalog-realm/Spec/50e1376d-bd34-400f-8181-3d732823f48d.json
+++ b/packages/catalog-realm/Spec/50e1376d-bd34-400f-8181-3d732823f48d.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/527c4185-efb2-4d0c-ab59-881ec9d51570.json b/packages/catalog-realm/Spec/527c4185-efb2-4d0c-ab59-881ec9d51570.json
index fa2638b25d9..f51ccb0a1b9 100644
--- a/packages/catalog-realm/Spec/527c4185-efb2-4d0c-ab59-881ec9d51570.json
+++ b/packages/catalog-realm/Spec/527c4185-efb2-4d0c-ab59-881ec9d51570.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/5375451d-de17-416b-a6ba-deb34b2ebb91.json b/packages/catalog-realm/Spec/5375451d-de17-416b-a6ba-deb34b2ebb91.json
index 5fd64d9430e..77a82ad2bec 100644
--- a/packages/catalog-realm/Spec/5375451d-de17-416b-a6ba-deb34b2ebb91.json
+++ b/packages/catalog-realm/Spec/5375451d-de17-416b-a6ba-deb34b2ebb91.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/538695cb-e2c7-4b60-aafd-ca3c1382b610.json b/packages/catalog-realm/Spec/538695cb-e2c7-4b60-aafd-ca3c1382b610.json
index 44a1258bdc9..c981f05ed3d 100644
--- a/packages/catalog-realm/Spec/538695cb-e2c7-4b60-aafd-ca3c1382b610.json
+++ b/packages/catalog-realm/Spec/538695cb-e2c7-4b60-aafd-ca3c1382b610.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/5403bdfb-a0f5-40b8-919a-129fd8807302.json b/packages/catalog-realm/Spec/5403bdfb-a0f5-40b8-919a-129fd8807302.json
index ca99da6887f..b865f4bf888 100644
--- a/packages/catalog-realm/Spec/5403bdfb-a0f5-40b8-919a-129fd8807302.json
+++ b/packages/catalog-realm/Spec/5403bdfb-a0f5-40b8-919a-129fd8807302.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/5448a47d-cb12-41aa-8415-cbe15ae04f5d.json b/packages/catalog-realm/Spec/5448a47d-cb12-41aa-8415-cbe15ae04f5d.json
index 444eef76f96..bbc3e1694cf 100644
--- a/packages/catalog-realm/Spec/5448a47d-cb12-41aa-8415-cbe15ae04f5d.json
+++ b/packages/catalog-realm/Spec/5448a47d-cb12-41aa-8415-cbe15ae04f5d.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/562a48ff-2fd0-42f4-ad60-2e285d47402e.json b/packages/catalog-realm/Spec/562a48ff-2fd0-42f4-ad60-2e285d47402e.json
index 27d477104a0..80e29d1a753 100644
--- a/packages/catalog-realm/Spec/562a48ff-2fd0-42f4-ad60-2e285d47402e.json
+++ b/packages/catalog-realm/Spec/562a48ff-2fd0-42f4-ad60-2e285d47402e.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Spec",
-        "module": "https://cardstack.com/base/spec"
+        "module": "@cardstack/base/spec"
       }
     },
     "type": "card",
diff --git a/packages/catalog-realm/Spec/56b79516-c0ef-47e0-8593-954d3e6a0ed1.json b/packages/catalog-realm/Spec/56b79516-c0ef-47e0-8593-954d3e6a0ed1.json
index 614980e048b..e9c090f955c 100644
--- a/packages/catalog-realm/Spec/56b79516-c0ef-47e0-8593-954d3e6a0ed1.json
+++ b/packages/catalog-realm/Spec/56b79516-c0ef-47e0-8593-954d3e6a0ed1.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/56c434b2-ecd4-4eaf-b888-39bf9ac7f43d.json b/packages/catalog-realm/Spec/56c434b2-ecd4-4eaf-b888-39bf9ac7f43d.json
index a48777dca83..c29970b11f1 100644
--- a/packages/catalog-realm/Spec/56c434b2-ecd4-4eaf-b888-39bf9ac7f43d.json
+++ b/packages/catalog-realm/Spec/56c434b2-ecd4-4eaf-b888-39bf9ac7f43d.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/597db80a-a64d-4ea4-bb97-20f75ed6f7d4.json b/packages/catalog-realm/Spec/597db80a-a64d-4ea4-bb97-20f75ed6f7d4.json
index 81a62172abc..98d8caa3b17 100644
--- a/packages/catalog-realm/Spec/597db80a-a64d-4ea4-bb97-20f75ed6f7d4.json
+++ b/packages/catalog-realm/Spec/597db80a-a64d-4ea4-bb97-20f75ed6f7d4.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/599cecb6-3f69-46b2-96bd-906ac3160a57.json b/packages/catalog-realm/Spec/599cecb6-3f69-46b2-96bd-906ac3160a57.json
index 3bfea3dcdf1..870b60f0773 100644
--- a/packages/catalog-realm/Spec/599cecb6-3f69-46b2-96bd-906ac3160a57.json
+++ b/packages/catalog-realm/Spec/599cecb6-3f69-46b2-96bd-906ac3160a57.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/5a5aac04-c39f-4f2c-81f9-b8d920fde39e.json b/packages/catalog-realm/Spec/5a5aac04-c39f-4f2c-81f9-b8d920fde39e.json
index 921e8032f01..180d56402a2 100644
--- a/packages/catalog-realm/Spec/5a5aac04-c39f-4f2c-81f9-b8d920fde39e.json
+++ b/packages/catalog-realm/Spec/5a5aac04-c39f-4f2c-81f9-b8d920fde39e.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/5aac04c3-9fcf-4c81-b9b8-d920fde39eba.json b/packages/catalog-realm/Spec/5aac04c3-9fcf-4c81-b9b8-d920fde39eba.json
index f3e51826108..72222dad307 100644
--- a/packages/catalog-realm/Spec/5aac04c3-9fcf-4c81-b9b8-d920fde39eba.json
+++ b/packages/catalog-realm/Spec/5aac04c3-9fcf-4c81-b9b8-d920fde39eba.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/5ae71ae1-9cab-4003-b1b4-550a2305f442.json b/packages/catalog-realm/Spec/5ae71ae1-9cab-4003-b1b4-550a2305f442.json
index 05806abde93..aca2412a49c 100644
--- a/packages/catalog-realm/Spec/5ae71ae1-9cab-4003-b1b4-550a2305f442.json
+++ b/packages/catalog-realm/Spec/5ae71ae1-9cab-4003-b1b4-550a2305f442.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/5c962014-06cc-4cce-bf21-09e6e4387626.json b/packages/catalog-realm/Spec/5c962014-06cc-4cce-bf21-09e6e4387626.json
index b475b8099b6..69cd1bb2bd6 100644
--- a/packages/catalog-realm/Spec/5c962014-06cc-4cce-bf21-09e6e4387626.json
+++ b/packages/catalog-realm/Spec/5c962014-06cc-4cce-bf21-09e6e4387626.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/5cef210f-cb2d-43d5-83ee-d5144deb3671.json b/packages/catalog-realm/Spec/5cef210f-cb2d-43d5-83ee-d5144deb3671.json
index dfef61fe59c..1c593b03f75 100644
--- a/packages/catalog-realm/Spec/5cef210f-cb2d-43d5-83ee-d5144deb3671.json
+++ b/packages/catalog-realm/Spec/5cef210f-cb2d-43d5-83ee-d5144deb3671.json
@@ -15,7 +15,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/5ed6f7d4-3806-48cf-b1a2-b3471688bfed.json b/packages/catalog-realm/Spec/5ed6f7d4-3806-48cf-b1a2-b3471688bfed.json
index e0c90df8804..3081612cf8a 100644
--- a/packages/catalog-realm/Spec/5ed6f7d4-3806-48cf-b1a2-b3471688bfed.json
+++ b/packages/catalog-realm/Spec/5ed6f7d4-3806-48cf-b1a2-b3471688bfed.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/5ff1e674-3631-463c-b272-014bed10fc82.json b/packages/catalog-realm/Spec/5ff1e674-3631-463c-b272-014bed10fc82.json
index 8d7b0fff97f..4a11388a8f3 100644
--- a/packages/catalog-realm/Spec/5ff1e674-3631-463c-b272-014bed10fc82.json
+++ b/packages/catalog-realm/Spec/5ff1e674-3631-463c-b272-014bed10fc82.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/61018007-720f-40d0-b925-17ea38f3ba43.json b/packages/catalog-realm/Spec/61018007-720f-40d0-b925-17ea38f3ba43.json
index 4fa04792512..655bc1bbde2 100644
--- a/packages/catalog-realm/Spec/61018007-720f-40d0-b925-17ea38f3ba43.json
+++ b/packages/catalog-realm/Spec/61018007-720f-40d0-b925-17ea38f3ba43.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/62e067bc-4f88-43a7-9e30-6d8f6ffde66f.json b/packages/catalog-realm/Spec/62e067bc-4f88-43a7-9e30-6d8f6ffde66f.json
index e498b055f6a..1234bc8f9d2 100644
--- a/packages/catalog-realm/Spec/62e067bc-4f88-43a7-9e30-6d8f6ffde66f.json
+++ b/packages/catalog-realm/Spec/62e067bc-4f88-43a7-9e30-6d8f6ffde66f.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/63beeac1-b550-4c21-99ea-0f16ee228250.json b/packages/catalog-realm/Spec/63beeac1-b550-4c21-99ea-0f16ee228250.json
index d92952d505c..49c2052d349 100644
--- a/packages/catalog-realm/Spec/63beeac1-b550-4c21-99ea-0f16ee228250.json
+++ b/packages/catalog-realm/Spec/63beeac1-b550-4c21-99ea-0f16ee228250.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/63fbcce0-08ff-4047-82bc-8199ff4cd586.json b/packages/catalog-realm/Spec/63fbcce0-08ff-4047-82bc-8199ff4cd586.json
index fee6a35b4b5..8141261e9fa 100644
--- a/packages/catalog-realm/Spec/63fbcce0-08ff-4047-82bc-8199ff4cd586.json
+++ b/packages/catalog-realm/Spec/63fbcce0-08ff-4047-82bc-8199ff4cd586.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Spec",
-        "module": "https://cardstack.com/base/spec"
+        "module": "@cardstack/base/spec"
       }
     },
     "type": "card",
diff --git a/packages/catalog-realm/Spec/66b7f8b0-b053-4545-9dde-17116ba6bade.json b/packages/catalog-realm/Spec/66b7f8b0-b053-4545-9dde-17116ba6bade.json
index bafc1f7f279..bc3814e76a5 100644
--- a/packages/catalog-realm/Spec/66b7f8b0-b053-4545-9dde-17116ba6bade.json
+++ b/packages/catalog-realm/Spec/66b7f8b0-b053-4545-9dde-17116ba6bade.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/66c3c617-21c2-4162-ae44-6aee4df29212.json b/packages/catalog-realm/Spec/66c3c617-21c2-4162-ae44-6aee4df29212.json
index aa0d7b9a2fa..0f996718cc4 100644
--- a/packages/catalog-realm/Spec/66c3c617-21c2-4162-ae44-6aee4df29212.json
+++ b/packages/catalog-realm/Spec/66c3c617-21c2-4162-ae44-6aee4df29212.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/6733cf88-60c0-436d-a9d7-8baa51259a19.json b/packages/catalog-realm/Spec/6733cf88-60c0-436d-a9d7-8baa51259a19.json
index 0500ef42fea..d79feb31af7 100644
--- a/packages/catalog-realm/Spec/6733cf88-60c0-436d-a9d7-8baa51259a19.json
+++ b/packages/catalog-realm/Spec/6733cf88-60c0-436d-a9d7-8baa51259a19.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/67d4714d-86bd-490e-9a95-eb3e97e8960c.json b/packages/catalog-realm/Spec/67d4714d-86bd-490e-9a95-eb3e97e8960c.json
index 594f1c16f49..67571778f9e 100644
--- a/packages/catalog-realm/Spec/67d4714d-86bd-490e-9a95-eb3e97e8960c.json
+++ b/packages/catalog-realm/Spec/67d4714d-86bd-490e-9a95-eb3e97e8960c.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/69790156-b795-46c0-af47-e08593954d3e.json b/packages/catalog-realm/Spec/69790156-b795-46c0-af47-e08593954d3e.json
index 75d9d9d98fd..455cafa087a 100644
--- a/packages/catalog-realm/Spec/69790156-b795-46c0-af47-e08593954d3e.json
+++ b/packages/catalog-realm/Spec/69790156-b795-46c0-af47-e08593954d3e.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/6dbd3410-0fc1-413d-b328-23f48d834dc7.json b/packages/catalog-realm/Spec/6dbd3410-0fc1-413d-b328-23f48d834dc7.json
index c261f525ab8..6062236d2f8 100644
--- a/packages/catalog-realm/Spec/6dbd3410-0fc1-413d-b328-23f48d834dc7.json
+++ b/packages/catalog-realm/Spec/6dbd3410-0fc1-413d-b328-23f48d834dc7.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/6e428463-fc70-432e-9c88-59f61d4a2e48.json b/packages/catalog-realm/Spec/6e428463-fc70-432e-9c88-59f61d4a2e48.json
index 1d53aa988fc..b8d73243511 100644
--- a/packages/catalog-realm/Spec/6e428463-fc70-432e-9c88-59f61d4a2e48.json
+++ b/packages/catalog-realm/Spec/6e428463-fc70-432e-9c88-59f61d4a2e48.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/6f1780b2-8330-4817-90d0-2a6028ef2be8.json b/packages/catalog-realm/Spec/6f1780b2-8330-4817-90d0-2a6028ef2be8.json
index 7ee574be630..f0c94eaf8f3 100644
--- a/packages/catalog-realm/Spec/6f1780b2-8330-4817-90d0-2a6028ef2be8.json
+++ b/packages/catalog-realm/Spec/6f1780b2-8330-4817-90d0-2a6028ef2be8.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/6f6f99ad-b439-46d4-8985-45c3cec00ffd.json b/packages/catalog-realm/Spec/6f6f99ad-b439-46d4-8985-45c3cec00ffd.json
index 40822efc44a..a6ac80e174f 100644
--- a/packages/catalog-realm/Spec/6f6f99ad-b439-46d4-8985-45c3cec00ffd.json
+++ b/packages/catalog-realm/Spec/6f6f99ad-b439-46d4-8985-45c3cec00ffd.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/723a51e8-40ae-4f02-bc77-c69a22284063.json b/packages/catalog-realm/Spec/723a51e8-40ae-4f02-bc77-c69a22284063.json
index f3c3bae18be..62ab7489556 100644
--- a/packages/catalog-realm/Spec/723a51e8-40ae-4f02-bc77-c69a22284063.json
+++ b/packages/catalog-realm/Spec/723a51e8-40ae-4f02-bc77-c69a22284063.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/7287d325-38bd-4243-8433-362a10a445d1.json b/packages/catalog-realm/Spec/7287d325-38bd-4243-8433-362a10a445d1.json
index e3b1d9c23f6..f3959e4311b 100644
--- a/packages/catalog-realm/Spec/7287d325-38bd-4243-8433-362a10a445d1.json
+++ b/packages/catalog-realm/Spec/7287d325-38bd-4243-8433-362a10a445d1.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/73bfca09-3db1-46f7-8967-d4714d86bdb9.json b/packages/catalog-realm/Spec/73bfca09-3db1-46f7-8967-d4714d86bdb9.json
index ab2862c1c81..ee5d03eae47 100644
--- a/packages/catalog-realm/Spec/73bfca09-3db1-46f7-8967-d4714d86bdb9.json
+++ b/packages/catalog-realm/Spec/73bfca09-3db1-46f7-8967-d4714d86bdb9.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/743631a6-3cf2-4201-8bed-10fc8265cff1.json b/packages/catalog-realm/Spec/743631a6-3cf2-4201-8bed-10fc8265cff1.json
index 6ace7f1458c..a9fdc737583 100644
--- a/packages/catalog-realm/Spec/743631a6-3cf2-4201-8bed-10fc8265cff1.json
+++ b/packages/catalog-realm/Spec/743631a6-3cf2-4201-8bed-10fc8265cff1.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/74b300d3-0a98-4650-adc4-cb9d559d3b0b.json b/packages/catalog-realm/Spec/74b300d3-0a98-4650-adc4-cb9d559d3b0b.json
index b2d9c179e22..ca7868b4099 100644
--- a/packages/catalog-realm/Spec/74b300d3-0a98-4650-adc4-cb9d559d3b0b.json
+++ b/packages/catalog-realm/Spec/74b300d3-0a98-4650-adc4-cb9d559d3b0b.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/74f2e937-553d-408f-b8fc-aba2fa844f98.json b/packages/catalog-realm/Spec/74f2e937-553d-408f-b8fc-aba2fa844f98.json
index 1f3d5b8b231..fbf804d9ae8 100644
--- a/packages/catalog-realm/Spec/74f2e937-553d-408f-b8fc-aba2fa844f98.json
+++ b/packages/catalog-realm/Spec/74f2e937-553d-408f-b8fc-aba2fa844f98.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/75451dde-1711-4ba6-bade-b34b2ebb91b9.json b/packages/catalog-realm/Spec/75451dde-1711-4ba6-bade-b34b2ebb91b9.json
index 82f40d6db62..4a2d8eba0a4 100644
--- a/packages/catalog-realm/Spec/75451dde-1711-4ba6-bade-b34b2ebb91b9.json
+++ b/packages/catalog-realm/Spec/75451dde-1711-4ba6-bade-b34b2ebb91b9.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/768812e7-104b-4be0-8c68-dd256dcfafd8.json b/packages/catalog-realm/Spec/768812e7-104b-4be0-8c68-dd256dcfafd8.json
index cea7dbeaba3..c4867fe22cb 100644
--- a/packages/catalog-realm/Spec/768812e7-104b-4be0-8c68-dd256dcfafd8.json
+++ b/packages/catalog-realm/Spec/768812e7-104b-4be0-8c68-dd256dcfafd8.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/790156b7-9516-40ef-87e0-8593954d3e6a.json b/packages/catalog-realm/Spec/790156b7-9516-40ef-87e0-8593954d3e6a.json
index ad53cfcfb1d..6e26f5523f8 100644
--- a/packages/catalog-realm/Spec/790156b7-9516-40ef-87e0-8593954d3e6a.json
+++ b/packages/catalog-realm/Spec/790156b7-9516-40ef-87e0-8593954d3e6a.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/792f48a5-63be-4ac1-b550-0c21d9ea0f16.json b/packages/catalog-realm/Spec/792f48a5-63be-4ac1-b550-0c21d9ea0f16.json
index 860d45f13d8..a54db28496f 100644
--- a/packages/catalog-realm/Spec/792f48a5-63be-4ac1-b550-0c21d9ea0f16.json
+++ b/packages/catalog-realm/Spec/792f48a5-63be-4ac1-b550-0c21d9ea0f16.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/7a1da501-cbbc-4f61-8180-07720f10d079.json b/packages/catalog-realm/Spec/7a1da501-cbbc-4f61-8180-07720f10d079.json
index 5ab610e2461..532c6d6af65 100644
--- a/packages/catalog-realm/Spec/7a1da501-cbbc-4f61-8180-07720f10d079.json
+++ b/packages/catalog-realm/Spec/7a1da501-cbbc-4f61-8180-07720f10d079.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/7b07a899-d8f3-4037-8da5-4ca65b60a659.json b/packages/catalog-realm/Spec/7b07a899-d8f3-4037-8da5-4ca65b60a659.json
index 136af1b8656..96f0993f195 100644
--- a/packages/catalog-realm/Spec/7b07a899-d8f3-4037-8da5-4ca65b60a659.json
+++ b/packages/catalog-realm/Spec/7b07a899-d8f3-4037-8da5-4ca65b60a659.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/7c1f4256-c434-42ec-94de-af388839bf9a.json b/packages/catalog-realm/Spec/7c1f4256-c434-42ec-94de-af388839bf9a.json
index edec1f1a5e8..446191b91fd 100644
--- a/packages/catalog-realm/Spec/7c1f4256-c434-42ec-94de-af388839bf9a.json
+++ b/packages/catalog-realm/Spec/7c1f4256-c434-42ec-94de-af388839bf9a.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/7d723a51-e840-4e5f-823c-77c69a222840.json b/packages/catalog-realm/Spec/7d723a51-e840-4e5f-823c-77c69a222840.json
index aa72a3a356f..de036f2ba8e 100644
--- a/packages/catalog-realm/Spec/7d723a51-e840-4e5f-823c-77c69a222840.json
+++ b/packages/catalog-realm/Spec/7d723a51-e840-4e5f-823c-77c69a222840.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/7db80aa6-4d4e-443b-9720-f75ed6f7d438.json b/packages/catalog-realm/Spec/7db80aa6-4d4e-443b-9720-f75ed6f7d438.json
index 7435a90a76c..a7f8d4961af 100644
--- a/packages/catalog-realm/Spec/7db80aa6-4d4e-443b-9720-f75ed6f7d438.json
+++ b/packages/catalog-realm/Spec/7db80aa6-4d4e-443b-9720-f75ed6f7d438.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/7f239b84-fcb0-40f4-a56e-9fb3e9abd0ec.json b/packages/catalog-realm/Spec/7f239b84-fcb0-40f4-a56e-9fb3e9abd0ec.json
index 3cd5d248728..773b1313256 100644
--- a/packages/catalog-realm/Spec/7f239b84-fcb0-40f4-a56e-9fb3e9abd0ec.json
+++ b/packages/catalog-realm/Spec/7f239b84-fcb0-40f4-a56e-9fb3e9abd0ec.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/7fe94601-64a4-4cff-a2ba-452af3028bab.json b/packages/catalog-realm/Spec/7fe94601-64a4-4cff-a2ba-452af3028bab.json
index 77392c6d29e..fa79eca1a77 100644
--- a/packages/catalog-realm/Spec/7fe94601-64a4-4cff-a2ba-452af3028bab.json
+++ b/packages/catalog-realm/Spec/7fe94601-64a4-4cff-a2ba-452af3028bab.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/80b28330-7817-40d0-aa60-28ef2be83b6d.json b/packages/catalog-realm/Spec/80b28330-7817-40d0-aa60-28ef2be83b6d.json
index 1469eb482eb..ac5b82741bc 100644
--- a/packages/catalog-realm/Spec/80b28330-7817-40d0-aa60-28ef2be83b6d.json
+++ b/packages/catalog-realm/Spec/80b28330-7817-40d0-aa60-28ef2be83b6d.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/81f9b8d9-20fd-439e-ba2a-27f648697901.json b/packages/catalog-realm/Spec/81f9b8d9-20fd-439e-ba2a-27f648697901.json
index 444eef76f96..bbc3e1694cf 100644
--- a/packages/catalog-realm/Spec/81f9b8d9-20fd-439e-ba2a-27f648697901.json
+++ b/packages/catalog-realm/Spec/81f9b8d9-20fd-439e-ba2a-27f648697901.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/84fb4a63-774c-44e7-ae37-527c4185efb2.json b/packages/catalog-realm/Spec/84fb4a63-774c-44e7-ae37-527c4185efb2.json
index 048c578f5fd..c4131fe8fa9 100644
--- a/packages/catalog-realm/Spec/84fb4a63-774c-44e7-ae37-527c4185efb2.json
+++ b/packages/catalog-realm/Spec/84fb4a63-774c-44e7-ae37-527c4185efb2.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/8679dbe1-138f-4ad6-8699-7a6a024d6e3b.json b/packages/catalog-realm/Spec/8679dbe1-138f-4ad6-8699-7a6a024d6e3b.json
index 402091ad5e9..7640c3474dc 100644
--- a/packages/catalog-realm/Spec/8679dbe1-138f-4ad6-8699-7a6a024d6e3b.json
+++ b/packages/catalog-realm/Spec/8679dbe1-138f-4ad6-8699-7a6a024d6e3b.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/86b403d5-85d8-4d13-9c78-1cc6527f73b0.json b/packages/catalog-realm/Spec/86b403d5-85d8-4d13-9c78-1cc6527f73b0.json
index c774cf48cbc..9bac9919d8a 100644
--- a/packages/catalog-realm/Spec/86b403d5-85d8-4d13-9c78-1cc6527f73b0.json
+++ b/packages/catalog-realm/Spec/86b403d5-85d8-4d13-9c78-1cc6527f73b0.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/8812e710-4b0b-404c-a8dd-256dcfafd8cb.json b/packages/catalog-realm/Spec/8812e710-4b0b-404c-a8dd-256dcfafd8cb.json
index ca99da6887f..b865f4bf888 100644
--- a/packages/catalog-realm/Spec/8812e710-4b0b-404c-a8dd-256dcfafd8cb.json
+++ b/packages/catalog-realm/Spec/8812e710-4b0b-404c-a8dd-256dcfafd8cb.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/889706f8-9dd3-4dad-b277-f43faaea4c1c.json b/packages/catalog-realm/Spec/889706f8-9dd3-4dad-b277-f43faaea4c1c.json
index 54ba1b5bfc7..fed72da033f 100644
--- a/packages/catalog-realm/Spec/889706f8-9dd3-4dad-b277-f43faaea4c1c.json
+++ b/packages/catalog-realm/Spec/889706f8-9dd3-4dad-b277-f43faaea4c1c.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/88e888fb-27a5-48bd-976e-246a9bedf909.json b/packages/catalog-realm/Spec/88e888fb-27a5-48bd-976e-246a9bedf909.json
index 76b0a7bf725..ee811849d5d 100644
--- a/packages/catalog-realm/Spec/88e888fb-27a5-48bd-976e-246a9bedf909.json
+++ b/packages/catalog-realm/Spec/88e888fb-27a5-48bd-976e-246a9bedf909.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/8c7fe946-0164-446c-bfe2-ba452af3028b.json b/packages/catalog-realm/Spec/8c7fe946-0164-446c-bfe2-ba452af3028b.json
index f864e37ea2c..2b45b29ed00 100644
--- a/packages/catalog-realm/Spec/8c7fe946-0164-446c-bfe2-ba452af3028b.json
+++ b/packages/catalog-realm/Spec/8c7fe946-0164-446c-bfe2-ba452af3028b.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/92be10ea-7ab6-49c9-bfdd-7a72d08252e9.json b/packages/catalog-realm/Spec/92be10ea-7ab6-49c9-bfdd-7a72d08252e9.json
index 444eef76f96..bbc3e1694cf 100644
--- a/packages/catalog-realm/Spec/92be10ea-7ab6-49c9-bfdd-7a72d08252e9.json
+++ b/packages/catalog-realm/Spec/92be10ea-7ab6-49c9-bfdd-7a72d08252e9.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/92d16304-6636-4e81-909a-2d838726ed2c.json b/packages/catalog-realm/Spec/92d16304-6636-4e81-909a-2d838726ed2c.json
index 4f056c48cc9..8e5b5c8ce58 100644
--- a/packages/catalog-realm/Spec/92d16304-6636-4e81-909a-2d838726ed2c.json
+++ b/packages/catalog-realm/Spec/92d16304-6636-4e81-909a-2d838726ed2c.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/938e0b02-5259-4ae3-956f-a568ea6adf2f.json b/packages/catalog-realm/Spec/938e0b02-5259-4ae3-956f-a568ea6adf2f.json
index 560e77e74ca..7c90565fbbb 100644
--- a/packages/catalog-realm/Spec/938e0b02-5259-4ae3-956f-a568ea6adf2f.json
+++ b/packages/catalog-realm/Spec/938e0b02-5259-4ae3-956f-a568ea6adf2f.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/93fa9879-2f48-4563-beea-c1b5500c21d9.json b/packages/catalog-realm/Spec/93fa9879-2f48-4563-beea-c1b5500c21d9.json
index 6340bba648b..4f0622cc91b 100644
--- a/packages/catalog-realm/Spec/93fa9879-2f48-4563-beea-c1b5500c21d9.json
+++ b/packages/catalog-realm/Spec/93fa9879-2f48-4563-beea-c1b5500c21d9.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/94c53473-bfca-493d-b1f6-f70967d4714d.json b/packages/catalog-realm/Spec/94c53473-bfca-493d-b1f6-f70967d4714d.json
index 5b6dba3deab..a6d2ee82fcc 100644
--- a/packages/catalog-realm/Spec/94c53473-bfca-493d-b1f6-f70967d4714d.json
+++ b/packages/catalog-realm/Spec/94c53473-bfca-493d-b1f6-f70967d4714d.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/9606a493-4a12-4ee4-a1b4-bc38f936abbe.json b/packages/catalog-realm/Spec/9606a493-4a12-4ee4-a1b4-bc38f936abbe.json
index 0ca71af5087..ac9cebe1c51 100644
--- a/packages/catalog-realm/Spec/9606a493-4a12-4ee4-a1b4-bc38f936abbe.json
+++ b/packages/catalog-realm/Spec/9606a493-4a12-4ee4-a1b4-bc38f936abbe.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/96201406-cc5c-4eff-a109-e6e4387626f7.json b/packages/catalog-realm/Spec/96201406-cc5c-4eff-a109-e6e4387626f7.json
index d40760feec6..fa9afeb9909 100644
--- a/packages/catalog-realm/Spec/96201406-cc5c-4eff-a109-e6e4387626f7.json
+++ b/packages/catalog-realm/Spec/96201406-cc5c-4eff-a109-e6e4387626f7.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/98792f48-a563-4eea-81b5-500c21d9ea0f.json b/packages/catalog-realm/Spec/98792f48-a563-4eea-81b5-500c21d9ea0f.json
index 95a2770669e..ceb27c8ac9b 100644
--- a/packages/catalog-realm/Spec/98792f48-a563-4eea-81b5-500c21d9ea0f.json
+++ b/packages/catalog-realm/Spec/98792f48-a563-4eea-81b5-500c21d9ea0f.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/9925c141-3482-492a-b5b4-f92bd8d26726.json b/packages/catalog-realm/Spec/9925c141-3482-492a-b5b4-f92bd8d26726.json
index 444eef76f96..bbc3e1694cf 100644
--- a/packages/catalog-realm/Spec/9925c141-3482-492a-b5b4-f92bd8d26726.json
+++ b/packages/catalog-realm/Spec/9925c141-3482-492a-b5b4-f92bd8d26726.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/99d8f330-37cd-454c-a65b-60a65929dcac.json b/packages/catalog-realm/Spec/99d8f330-37cd-454c-a65b-60a65929dcac.json
index 6997df8c8cc..622a5fc228b 100644
--- a/packages/catalog-realm/Spec/99d8f330-37cd-454c-a65b-60a65929dcac.json
+++ b/packages/catalog-realm/Spec/99d8f330-37cd-454c-a65b-60a65929dcac.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/9bc9f981-90ab-445b-afb5-7bcc8743f09e.json b/packages/catalog-realm/Spec/9bc9f981-90ab-445b-afb5-7bcc8743f09e.json
index 566e2c6f186..d223c442e7b 100644
--- a/packages/catalog-realm/Spec/9bc9f981-90ab-445b-afb5-7bcc8743f09e.json
+++ b/packages/catalog-realm/Spec/9bc9f981-90ab-445b-afb5-7bcc8743f09e.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/9cab8003-71b4-450a-a305-f442fd0b786a.json b/packages/catalog-realm/Spec/9cab8003-71b4-450a-a305-f442fd0b786a.json
index 40f74cb5ef2..d59209d72ee 100644
--- a/packages/catalog-realm/Spec/9cab8003-71b4-450a-a305-f442fd0b786a.json
+++ b/packages/catalog-realm/Spec/9cab8003-71b4-450a-a305-f442fd0b786a.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/9eba2a27-f648-4979-8156-b79516c0ef47.json b/packages/catalog-realm/Spec/9eba2a27-f648-4979-8156-b79516c0ef47.json
index 05806abde93..aca2412a49c 100644
--- a/packages/catalog-realm/Spec/9eba2a27-f648-4979-8156-b79516c0ef47.json
+++ b/packages/catalog-realm/Spec/9eba2a27-f648-4979-8156-b79516c0ef47.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/9fcf2c81-f9b8-4920-bde3-9eba2a27f648.json b/packages/catalog-realm/Spec/9fcf2c81-f9b8-4920-bde3-9eba2a27f648.json
index f864e37ea2c..2b45b29ed00 100644
--- a/packages/catalog-realm/Spec/9fcf2c81-f9b8-4920-bde3-9eba2a27f648.json
+++ b/packages/catalog-realm/Spec/9fcf2c81-f9b8-4920-bde3-9eba2a27f648.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/a0047f23-9b84-4cb0-80f4-656e9fb3e9ab.json b/packages/catalog-realm/Spec/a0047f23-9b84-4cb0-80f4-656e9fb3e9ab.json
index a0c75d85a6a..bf9514af06e 100644
--- a/packages/catalog-realm/Spec/a0047f23-9b84-4cb0-80f4-656e9fb3e9ab.json
+++ b/packages/catalog-realm/Spec/a0047f23-9b84-4cb0-80f4-656e9fb3e9ab.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Spec",
-        "module": "https://cardstack.com/base/spec"
+        "module": "@cardstack/base/spec"
       }
     },
     "type": "card",
diff --git a/packages/catalog-realm/Spec/a05956e5-e590-4d26-8eb1-63f4c16c263a.json b/packages/catalog-realm/Spec/a05956e5-e590-4d26-8eb1-63f4c16c263a.json
index aa5395e778a..220e529c26c 100644
--- a/packages/catalog-realm/Spec/a05956e5-e590-4d26-8eb1-63f4c16c263a.json
+++ b/packages/catalog-realm/Spec/a05956e5-e590-4d26-8eb1-63f4c16c263a.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/a377bdf6-c1c4-487b-9431-5a93feea3e51.json b/packages/catalog-realm/Spec/a377bdf6-c1c4-487b-9431-5a93feea3e51.json
index 5cfd9d94c2f..cef74e0a199 100644
--- a/packages/catalog-realm/Spec/a377bdf6-c1c4-487b-9431-5a93feea3e51.json
+++ b/packages/catalog-realm/Spec/a377bdf6-c1c4-487b-9431-5a93feea3e51.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/a4c5f3ab-cb1b-4cec-93e4-3749fcc3fb93.json b/packages/catalog-realm/Spec/a4c5f3ab-cb1b-4cec-93e4-3749fcc3fb93.json
index 65234b42d0d..2359bf3aa0f 100644
--- a/packages/catalog-realm/Spec/a4c5f3ab-cb1b-4cec-93e4-3749fcc3fb93.json
+++ b/packages/catalog-realm/Spec/a4c5f3ab-cb1b-4cec-93e4-3749fcc3fb93.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/a563beea-c1b5-400c-a1d9-ea0f16ee2282.json b/packages/catalog-realm/Spec/a563beea-c1b5-400c-a1d9-ea0f16ee2282.json
index 3eaaf7344e5..a895aa5438b 100644
--- a/packages/catalog-realm/Spec/a563beea-c1b5-400c-a1d9-ea0f16ee2282.json
+++ b/packages/catalog-realm/Spec/a563beea-c1b5-400c-a1d9-ea0f16ee2282.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/a577083e-b2d8-4983-a66d-85f757dc5c69.json b/packages/catalog-realm/Spec/a577083e-b2d8-4983-a66d-85f757dc5c69.json
index ad53cfcfb1d..6e26f5523f8 100644
--- a/packages/catalog-realm/Spec/a577083e-b2d8-4983-a66d-85f757dc5c69.json
+++ b/packages/catalog-realm/Spec/a577083e-b2d8-4983-a66d-85f757dc5c69.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/a635bb19-354c-43a6-a7cf-415b7726b6fb.json b/packages/catalog-realm/Spec/a635bb19-354c-43a6-a7cf-415b7726b6fb.json
index b9325dd69f1..dd0bd4e5f92 100644
--- a/packages/catalog-realm/Spec/a635bb19-354c-43a6-a7cf-415b7726b6fb.json
+++ b/packages/catalog-realm/Spec/a635bb19-354c-43a6-a7cf-415b7726b6fb.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/a88dbb17-671c-428e-a13e-81d42709cf92.json b/packages/catalog-realm/Spec/a88dbb17-671c-428e-a13e-81d42709cf92.json
index 4393bb4fe49..e77c1a7a857 100644
--- a/packages/catalog-realm/Spec/a88dbb17-671c-428e-a13e-81d42709cf92.json
+++ b/packages/catalog-realm/Spec/a88dbb17-671c-428e-a13e-81d42709cf92.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/a899d8f3-3037-4da5-8ca6-5b60a65929dc.json b/packages/catalog-realm/Spec/a899d8f3-3037-4da5-8ca6-5b60a65929dc.json
index 444eef76f96..bbc3e1694cf 100644
--- a/packages/catalog-realm/Spec/a899d8f3-3037-4da5-8ca6-5b60a65929dc.json
+++ b/packages/catalog-realm/Spec/a899d8f3-3037-4da5-8ca6-5b60a65929dc.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/aa01e091-e2bc-4c41-8a81-96ac38906273.json b/packages/catalog-realm/Spec/aa01e091-e2bc-4c41-8a81-96ac38906273.json
index 3a18cc4298a..315646cfe50 100644
--- a/packages/catalog-realm/Spec/aa01e091-e2bc-4c41-8a81-96ac38906273.json
+++ b/packages/catalog-realm/Spec/aa01e091-e2bc-4c41-8a81-96ac38906273.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/aa0df300-e866-47f8-b0b0-5375451dde17.json b/packages/catalog-realm/Spec/aa0df300-e866-47f8-b0b0-5375451dde17.json
index 7820ef6bf7b..84e5c80f424 100644
--- a/packages/catalog-realm/Spec/aa0df300-e866-47f8-b0b0-5375451dde17.json
+++ b/packages/catalog-realm/Spec/aa0df300-e866-47f8-b0b0-5375451dde17.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/aaa928ff-b1d3-49f6-a4fb-d39e736c0d7f.json b/packages/catalog-realm/Spec/aaa928ff-b1d3-49f6-a4fb-d39e736c0d7f.json
index 0a8a88a1023..688f8643d29 100644
--- a/packages/catalog-realm/Spec/aaa928ff-b1d3-49f6-a4fb-d39e736c0d7f.json
+++ b/packages/catalog-realm/Spec/aaa928ff-b1d3-49f6-a4fb-d39e736c0d7f.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/ac04c39f-cf2c-41f9-b8d9-20fde39eba2a.json b/packages/catalog-realm/Spec/ac04c39f-cf2c-41f9-b8d9-20fde39eba2a.json
index 2817c2314cb..4b68ac3555a 100644
--- a/packages/catalog-realm/Spec/ac04c39f-cf2c-41f9-b8d9-20fde39eba2a.json
+++ b/packages/catalog-realm/Spec/ac04c39f-cf2c-41f9-b8d9-20fde39eba2a.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/ad6f1780-b283-4078-9710-d02a6028ef2b.json b/packages/catalog-realm/Spec/ad6f1780-b283-4078-9710-d02a6028ef2b.json
index 75b56dbd662..457d7d4b8f2 100644
--- a/packages/catalog-realm/Spec/ad6f1780-b283-4078-9710-d02a6028ef2b.json
+++ b/packages/catalog-realm/Spec/ad6f1780-b283-4078-9710-d02a6028ef2b.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/author.json b/packages/catalog-realm/Spec/author.json
index 9147557c1ae..3f5cadacd45 100644
--- a/packages/catalog-realm/Spec/author.json
+++ b/packages/catalog-realm/Spec/author.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/b0537545-1dde-4711-aba6-badeb34b2ebb.json b/packages/catalog-realm/Spec/b0537545-1dde-4711-aba6-badeb34b2ebb.json
index 9c1b1fbb239..143ed4c847a 100644
--- a/packages/catalog-realm/Spec/b0537545-1dde-4711-aba6-badeb34b2ebb.json
+++ b/packages/catalog-realm/Spec/b0537545-1dde-4711-aba6-badeb34b2ebb.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/b0b05375-451d-4e17-916b-a6badeb34b2e.json b/packages/catalog-realm/Spec/b0b05375-451d-4e17-916b-a6badeb34b2e.json
index 91e76e5d3f6..9e3441e1352 100644
--- a/packages/catalog-realm/Spec/b0b05375-451d-4e17-916b-a6badeb34b2e.json
+++ b/packages/catalog-realm/Spec/b0b05375-451d-4e17-916b-a6badeb34b2e.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/b1f6f709-67d4-414d-86bd-b90e9a95eb3e.json b/packages/catalog-realm/Spec/b1f6f709-67d4-414d-86bd-b90e9a95eb3e.json
index a5c50f19823..90cf4b6cc10 100644
--- a/packages/catalog-realm/Spec/b1f6f709-67d4-414d-86bd-b90e9a95eb3e.json
+++ b/packages/catalog-realm/Spec/b1f6f709-67d4-414d-86bd-b90e9a95eb3e.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/b2cf74b3-00d3-4a98-b650-2dc4cb9d559d.json b/packages/catalog-realm/Spec/b2cf74b3-00d3-4a98-b650-2dc4cb9d559d.json
index e6486682090..04263160273 100644
--- a/packages/catalog-realm/Spec/b2cf74b3-00d3-4a98-b650-2dc4cb9d559d.json
+++ b/packages/catalog-realm/Spec/b2cf74b3-00d3-4a98-b650-2dc4cb9d559d.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/b4377852-f78e-43f9-accb-72b7006dcd81.json b/packages/catalog-realm/Spec/b4377852-f78e-43f9-accb-72b7006dcd81.json
index fc03a427167..431107973a5 100644
--- a/packages/catalog-realm/Spec/b4377852-f78e-43f9-accb-72b7006dcd81.json
+++ b/packages/catalog-realm/Spec/b4377852-f78e-43f9-accb-72b7006dcd81.json
@@ -40,7 +40,7 @@
         ]
       },
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/b5500c21-d9ea-4f16-ae22-82509a1803d2.json b/packages/catalog-realm/Spec/b5500c21-d9ea-4f16-ae22-82509a1803d2.json
index bf81686be6d..30c3c7aae39 100644
--- a/packages/catalog-realm/Spec/b5500c21-d9ea-4f16-ae22-82509a1803d2.json
+++ b/packages/catalog-realm/Spec/b5500c21-d9ea-4f16-ae22-82509a1803d2.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/b79516c0-ef47-4085-9395-4d3e6a0ed146.json b/packages/catalog-realm/Spec/b79516c0-ef47-4085-9395-4d3e6a0ed146.json
index 136af1b8656..96f0993f195 100644
--- a/packages/catalog-realm/Spec/b79516c0-ef47-4085-9395-4d3e6a0ed146.json
+++ b/packages/catalog-realm/Spec/b79516c0-ef47-4085-9395-4d3e6a0ed146.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/b7f8b0b0-5375-451d-9e17-116ba6badeb3.json b/packages/catalog-realm/Spec/b7f8b0b0-5375-451d-9e17-116ba6badeb3.json
index ff97c13cb8f..d590f963d01 100644
--- a/packages/catalog-realm/Spec/b7f8b0b0-5375-451d-9e17-116ba6badeb3.json
+++ b/packages/catalog-realm/Spec/b7f8b0b0-5375-451d-9e17-116ba6badeb3.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/b8d920fd-e39e-4a2a-a7f6-4869790156b7.json b/packages/catalog-realm/Spec/b8d920fd-e39e-4a2a-a7f6-4869790156b7.json
index 8f0af1aaa07..10e055f9bef 100644
--- a/packages/catalog-realm/Spec/b8d920fd-e39e-4a2a-a7f6-4869790156b7.json
+++ b/packages/catalog-realm/Spec/b8d920fd-e39e-4a2a-a7f6-4869790156b7.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/b90e9a95-eb3e-47e8-960c-fb907eed22d7.json b/packages/catalog-realm/Spec/b90e9a95-eb3e-47e8-960c-fb907eed22d7.json
index 58d518d18f4..0b3fdb474cd 100644
--- a/packages/catalog-realm/Spec/b90e9a95-eb3e-47e8-960c-fb907eed22d7.json
+++ b/packages/catalog-realm/Spec/b90e9a95-eb3e-47e8-960c-fb907eed22d7.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/b934d0c2-7c20-4e61-b7af-1e03684213ff.json b/packages/catalog-realm/Spec/b934d0c2-7c20-4e61-b7af-1e03684213ff.json
index 43dd737685b..4bd2d6ce8d7 100644
--- a/packages/catalog-realm/Spec/b934d0c2-7c20-4e61-b7af-1e03684213ff.json
+++ b/packages/catalog-realm/Spec/b934d0c2-7c20-4e61-b7af-1e03684213ff.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/ba18cf89-cef3-48a2-90b3-894e59a20bee.json b/packages/catalog-realm/Spec/ba18cf89-cef3-48a2-90b3-894e59a20bee.json
index 2a11e43f4a5..02c17caa52e 100644
--- a/packages/catalog-realm/Spec/ba18cf89-cef3-48a2-90b3-894e59a20bee.json
+++ b/packages/catalog-realm/Spec/ba18cf89-cef3-48a2-90b3-894e59a20bee.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/ba2a27f6-4869-4901-96b7-9516c0ef47e0.json b/packages/catalog-realm/Spec/ba2a27f6-4869-4901-96b7-9516c0ef47e0.json
index 7dcc81ef655..665f2dae197 100644
--- a/packages/catalog-realm/Spec/ba2a27f6-4869-4901-96b7-9516c0ef47e0.json
+++ b/packages/catalog-realm/Spec/ba2a27f6-4869-4901-96b7-9516c0ef47e0.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/bb17671c-028e-413e-81d4-2709cf92e892.json b/packages/catalog-realm/Spec/bb17671c-028e-413e-81d4-2709cf92e892.json
index f7741b73bf7..19284e4e65d 100644
--- a/packages/catalog-realm/Spec/bb17671c-028e-413e-81d4-2709cf92e892.json
+++ b/packages/catalog-realm/Spec/bb17671c-028e-413e-81d4-2709cf92e892.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/bb19354c-a3a6-47cf-815b-7726b6fbd816.json b/packages/catalog-realm/Spec/bb19354c-a3a6-47cf-815b-7726b6fbd816.json
index 2b3db9eb614..697ad71af9e 100644
--- a/packages/catalog-realm/Spec/bb19354c-a3a6-47cf-815b-7726b6fbd816.json
+++ b/packages/catalog-realm/Spec/bb19354c-a3a6-47cf-815b-7726b6fbd816.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/bcca3aa2-e5ef-4d2d-a4e9-2e220300fa0e.json b/packages/catalog-realm/Spec/bcca3aa2-e5ef-4d2d-a4e9-2e220300fa0e.json
index f9eccc74d70..f19b80e597d 100644
--- a/packages/catalog-realm/Spec/bcca3aa2-e5ef-4d2d-a4e9-2e220300fa0e.json
+++ b/packages/catalog-realm/Spec/bcca3aa2-e5ef-4d2d-a4e9-2e220300fa0e.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/be10ea7a-b6c9-493f-9d7a-72d08252e9eb.json b/packages/catalog-realm/Spec/be10ea7a-b6c9-493f-9d7a-72d08252e9eb.json
index 6997df8c8cc..622a5fc228b 100644
--- a/packages/catalog-realm/Spec/be10ea7a-b6c9-493f-9d7a-72d08252e9eb.json
+++ b/packages/catalog-realm/Spec/be10ea7a-b6c9-493f-9d7a-72d08252e9eb.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/beeac1b5-500c-41d9-aa0f-16ee2282509a.json b/packages/catalog-realm/Spec/beeac1b5-500c-41d9-aa0f-16ee2282509a.json
index b7ad144445a..c95432241e5 100644
--- a/packages/catalog-realm/Spec/beeac1b5-500c-41d9-aa0f-16ee2282509a.json
+++ b/packages/catalog-realm/Spec/beeac1b5-500c-41d9-aa0f-16ee2282509a.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/bfca093d-b1f6-4709-a7d4-714d86bdb90e.json b/packages/catalog-realm/Spec/bfca093d-b1f6-4709-a7d4-714d86bdb90e.json
index b282cb912a5..0358c2a96ab 100644
--- a/packages/catalog-realm/Spec/bfca093d-b1f6-4709-a7d4-714d86bdb90e.json
+++ b/packages/catalog-realm/Spec/bfca093d-b1f6-4709-a7d4-714d86bdb90e.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/blog-app.json b/packages/catalog-realm/Spec/blog-app.json
index 8728bf407e6..9f8048c81d3 100644
--- a/packages/catalog-realm/Spec/blog-app.json
+++ b/packages/catalog-realm/Spec/blog-app.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/blog-category.json b/packages/catalog-realm/Spec/blog-category.json
index 97ec774ece1..e997bec674a 100644
--- a/packages/catalog-realm/Spec/blog-category.json
+++ b/packages/catalog-realm/Spec/blog-category.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/blog-post.json b/packages/catalog-realm/Spec/blog-post.json
index 88492f63b44..112200ab52a 100644
--- a/packages/catalog-realm/Spec/blog-post.json
+++ b/packages/catalog-realm/Spec/blog-post.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/c04cf664-3c12-4ee2-b852-b6032a53ca8b.json b/packages/catalog-realm/Spec/c04cf664-3c12-4ee2-b852-b6032a53ca8b.json
index aa8543494c5..4942b7fc9e5 100644
--- a/packages/catalog-realm/Spec/c04cf664-3c12-4ee2-b852-b6032a53ca8b.json
+++ b/packages/catalog-realm/Spec/c04cf664-3c12-4ee2-b852-b6032a53ca8b.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/c1b5500c-21d9-4a0f-96ee-2282509a1803.json b/packages/catalog-realm/Spec/c1b5500c-21d9-4a0f-96ee-2282509a1803.json
index e40ffa3b021..b3d0289c2fc 100644
--- a/packages/catalog-realm/Spec/c1b5500c-21d9-4a0f-96ee-2282509a1803.json
+++ b/packages/catalog-realm/Spec/c1b5500c-21d9-4a0f-96ee-2282509a1803.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/c2067a1d-a501-4bbc-9f61-018007720f10.json b/packages/catalog-realm/Spec/c2067a1d-a501-4bbc-9f61-018007720f10.json
index cae1f02aeb7..62c39145fce 100644
--- a/packages/catalog-realm/Spec/c2067a1d-a501-4bbc-9f61-018007720f10.json
+++ b/packages/catalog-realm/Spec/c2067a1d-a501-4bbc-9f61-018007720f10.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/c39fcf2c-81f9-48d9-a0fd-e39eba2a27f6.json b/packages/catalog-realm/Spec/c39fcf2c-81f9-48d9-a0fd-e39eba2a27f6.json
index 47ab93d48a8..2b18ee0a261 100644
--- a/packages/catalog-realm/Spec/c39fcf2c-81f9-48d9-a0fd-e39eba2a27f6.json
+++ b/packages/catalog-realm/Spec/c39fcf2c-81f9-48d9-a0fd-e39eba2a27f6.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/c3a0d4d5-c206-4a1d-a501-cbbcdf610180.json b/packages/catalog-realm/Spec/c3a0d4d5-c206-4a1d-a501-cbbcdf610180.json
index 4fde45787c4..022440cc8d9 100644
--- a/packages/catalog-realm/Spec/c3a0d4d5-c206-4a1d-a501-cbbcdf610180.json
+++ b/packages/catalog-realm/Spec/c3a0d4d5-c206-4a1d-a501-cbbcdf610180.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/c3c61721-c251-42ee-846a-ee4df29212e3.json b/packages/catalog-realm/Spec/c3c61721-c251-42ee-846a-ee4df29212e3.json
index b7fe3b218c7..7bfe19785e9 100644
--- a/packages/catalog-realm/Spec/c3c61721-c251-42ee-846a-ee4df29212e3.json
+++ b/packages/catalog-realm/Spec/c3c61721-c251-42ee-846a-ee4df29212e3.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/c53af3b4-1091-4b3e-b48f-3fbc3fbed589.json b/packages/catalog-realm/Spec/c53af3b4-1091-4b3e-b48f-3fbc3fbed589.json
index babeaede3b2..71a6f513331 100644
--- a/packages/catalog-realm/Spec/c53af3b4-1091-4b3e-b48f-3fbc3fbed589.json
+++ b/packages/catalog-realm/Spec/c53af3b4-1091-4b3e-b48f-3fbc3fbed589.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/c56a8a0c-9b8f-4f7f-ae84-fb4a63774cc4.json b/packages/catalog-realm/Spec/c56a8a0c-9b8f-4f7f-ae84-fb4a63774cc4.json
index d680c48704e..680c5ab1b57 100644
--- a/packages/catalog-realm/Spec/c56a8a0c-9b8f-4f7f-ae84-fb4a63774cc4.json
+++ b/packages/catalog-realm/Spec/c56a8a0c-9b8f-4f7f-ae84-fb4a63774cc4.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/c6527f73-b0e2-4583-96f8-d2ad1792d163.json b/packages/catalog-realm/Spec/c6527f73-b0e2-4583-96f8-d2ad1792d163.json
index 53e60bab94a..447a2c4422b 100644
--- a/packages/catalog-realm/Spec/c6527f73-b0e2-4583-96f8-d2ad1792d163.json
+++ b/packages/catalog-realm/Spec/c6527f73-b0e2-4583-96f8-d2ad1792d163.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/c6c5c3b6-29fd-4697-89b5-2fe07815f69a.json b/packages/catalog-realm/Spec/c6c5c3b6-29fd-4697-89b5-2fe07815f69a.json
index 7bb2b98423b..5b870331234 100644
--- a/packages/catalog-realm/Spec/c6c5c3b6-29fd-4697-89b5-2fe07815f69a.json
+++ b/packages/catalog-realm/Spec/c6c5c3b6-29fd-4697-89b5-2fe07815f69a.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/c9afdad1-8caa-41d6-af3e-3c769f101a87.json b/packages/catalog-realm/Spec/c9afdad1-8caa-41d6-af3e-3c769f101a87.json
index ad39916fb3c..af8619c673f 100644
--- a/packages/catalog-realm/Spec/c9afdad1-8caa-41d6-af3e-3c769f101a87.json
+++ b/packages/catalog-realm/Spec/c9afdad1-8caa-41d6-af3e-3c769f101a87.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/c9f98190-ab54-4b6f-b57b-cc8743f09eab.json b/packages/catalog-realm/Spec/c9f98190-ab54-4b6f-b57b-cc8743f09eab.json
index dce7eeb86cd..80030652069 100644
--- a/packages/catalog-realm/Spec/c9f98190-ab54-4b6f-b57b-cc8743f09eab.json
+++ b/packages/catalog-realm/Spec/c9f98190-ab54-4b6f-b57b-cc8743f09eab.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/ca093db1-f6f7-4967-9471-4d86bdb90e9a.json b/packages/catalog-realm/Spec/ca093db1-f6f7-4967-9471-4d86bdb90e9a.json
index ba72e83580c..d5c407dcab9 100644
--- a/packages/catalog-realm/Spec/ca093db1-f6f7-4967-9471-4d86bdb90e9a.json
+++ b/packages/catalog-realm/Spec/ca093db1-f6f7-4967-9471-4d86bdb90e9a.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/ca2f3de0-83dc-4d11-aa87-01459f84bcca.json b/packages/catalog-realm/Spec/ca2f3de0-83dc-4d11-aa87-01459f84bcca.json
index 708c766efe1..a726dffc965 100644
--- a/packages/catalog-realm/Spec/ca2f3de0-83dc-4d11-aa87-01459f84bcca.json
+++ b/packages/catalog-realm/Spec/ca2f3de0-83dc-4d11-aa87-01459f84bcca.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/ca34f73c-aa96-4bdd-a1f1-a8a13474a8be.json b/packages/catalog-realm/Spec/ca34f73c-aa96-4bdd-a1f1-a8a13474a8be.json
index 2dbd918dd17..7350b54bc27 100644
--- a/packages/catalog-realm/Spec/ca34f73c-aa96-4bdd-a1f1-a8a13474a8be.json
+++ b/packages/catalog-realm/Spec/ca34f73c-aa96-4bdd-a1f1-a8a13474a8be.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/card-list.json b/packages/catalog-realm/Spec/card-list.json
index 98ebe8f58fc..2e6bf357fba 100644
--- a/packages/catalog-realm/Spec/card-list.json
+++ b/packages/catalog-realm/Spec/card-list.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/cb92d052-87e5-406e-b2de-ca40e62dddee.json b/packages/catalog-realm/Spec/cb92d052-87e5-406e-b2de-ca40e62dddee.json
index 3f8cbc1c85e..d16f7695388 100644
--- a/packages/catalog-realm/Spec/cb92d052-87e5-406e-b2de-ca40e62dddee.json
+++ b/packages/catalog-realm/Spec/cb92d052-87e5-406e-b2de-ca40e62dddee.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/cb9d559d-3b0b-450b-ae4d-8187dd88d1dc.json b/packages/catalog-realm/Spec/cb9d559d-3b0b-450b-ae4d-8187dd88d1dc.json
index 9777cde8048..f69b3ed8473 100644
--- a/packages/catalog-realm/Spec/cb9d559d-3b0b-450b-ae4d-8187dd88d1dc.json
+++ b/packages/catalog-realm/Spec/cb9d559d-3b0b-450b-ae4d-8187dd88d1dc.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/cbbcdf61-0180-4772-8f10-d0792517ea38.json b/packages/catalog-realm/Spec/cbbcdf61-0180-4772-8f10-d0792517ea38.json
index 9fe53490311..1ac80c883c2 100644
--- a/packages/catalog-realm/Spec/cbbcdf61-0180-4772-8f10-d0792517ea38.json
+++ b/packages/catalog-realm/Spec/cbbcdf61-0180-4772-8f10-d0792517ea38.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/cd13dc78-1cc6-427f-b3b0-e25583d6f8d2.json b/packages/catalog-realm/Spec/cd13dc78-1cc6-427f-b3b0-e25583d6f8d2.json
index be9646a92b5..2bc598874e4 100644
--- a/packages/catalog-realm/Spec/cd13dc78-1cc6-427f-b3b0-e25583d6f8d2.json
+++ b/packages/catalog-realm/Spec/cd13dc78-1cc6-427f-b3b0-e25583d6f8d2.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/cd426f5e-b542-46d2-ac45-073f5970b528.json b/packages/catalog-realm/Spec/cd426f5e-b542-46d2-ac45-073f5970b528.json
index 28771854bd4..ac332662d8a 100644
--- a/packages/catalog-realm/Spec/cd426f5e-b542-46d2-ac45-073f5970b528.json
+++ b/packages/catalog-realm/Spec/cd426f5e-b542-46d2-ac45-073f5970b528.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/cd63a3fc-e789-48b2-a1b0-01eb30794379.json b/packages/catalog-realm/Spec/cd63a3fc-e789-48b2-a1b0-01eb30794379.json
index 461d71f523d..5f61faaa063 100644
--- a/packages/catalog-realm/Spec/cd63a3fc-e789-48b2-a1b0-01eb30794379.json
+++ b/packages/catalog-realm/Spec/cd63a3fc-e789-48b2-a1b0-01eb30794379.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/cdd83b5d-2c92-4cee-8fa9-48127305718f.json b/packages/catalog-realm/Spec/cdd83b5d-2c92-4cee-8fa9-48127305718f.json
index c427ba2c0e2..5f66e6c1432 100644
--- a/packages/catalog-realm/Spec/cdd83b5d-2c92-4cee-8fa9-48127305718f.json
+++ b/packages/catalog-realm/Spec/cdd83b5d-2c92-4cee-8fa9-48127305718f.json
@@ -44,7 +44,7 @@
         ]
       },
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/ce1fe611-66e3-4788-a888-fb27a5b8bdd7.json b/packages/catalog-realm/Spec/ce1fe611-66e3-4788-a888-fb27a5b8bdd7.json
index e260f832647..cb7cb07b723 100644
--- a/packages/catalog-realm/Spec/ce1fe611-66e3-4788-a888-fb27a5b8bdd7.json
+++ b/packages/catalog-realm/Spec/ce1fe611-66e3-4788-a888-fb27a5b8bdd7.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/ceff2109-e6e4-4876-a6f7-1e5b3cbdb165.json b/packages/catalog-realm/Spec/ceff2109-e6e4-4876-a6f7-1e5b3cbdb165.json
index 9513927fd78..89c347f90c5 100644
--- a/packages/catalog-realm/Spec/ceff2109-e6e4-4876-a6f7-1e5b3cbdb165.json
+++ b/packages/catalog-realm/Spec/ceff2109-e6e4-4876-a6f7-1e5b3cbdb165.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/cf2c81f9-b8d9-40fd-a39e-ba2a27f64869.json b/packages/catalog-realm/Spec/cf2c81f9-b8d9-40fd-a39e-ba2a27f64869.json
index 77392c6d29e..fa79eca1a77 100644
--- a/packages/catalog-realm/Spec/cf2c81f9-b8d9-40fd-a39e-ba2a27f64869.json
+++ b/packages/catalog-realm/Spec/cf2c81f9-b8d9-40fd-a39e-ba2a27f64869.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/cf74b300-d30a-48b6-902d-c4cb9d559d3b.json b/packages/catalog-realm/Spec/cf74b300-d30a-48b6-902d-c4cb9d559d3b.json
index 92be40226a7..ae5700075bf 100644
--- a/packages/catalog-realm/Spec/cf74b300-d30a-48b6-902d-c4cb9d559d3b.json
+++ b/packages/catalog-realm/Spec/cf74b300-d30a-48b6-902d-c4cb9d559d3b.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/cfef2f57-e5ba-410f-a769-4a6aa245dbee.json b/packages/catalog-realm/Spec/cfef2f57-e5ba-410f-a769-4a6aa245dbee.json
index decbfc971c8..cfac899ae7c 100644
--- a/packages/catalog-realm/Spec/cfef2f57-e5ba-410f-a769-4a6aa245dbee.json
+++ b/packages/catalog-realm/Spec/cfef2f57-e5ba-410f-a769-4a6aa245dbee.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/character-creator.json b/packages/catalog-realm/Spec/character-creator.json
index 2f54a92e3cb..fb24f893209 100644
--- a/packages/catalog-realm/Spec/character-creator.json
+++ b/packages/catalog-realm/Spec/character-creator.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/chess.json b/packages/catalog-realm/Spec/chess.json
index d48bbb5ac19..5d1ab34b5cd 100644
--- a/packages/catalog-realm/Spec/chess.json
+++ b/packages/catalog-realm/Spec/chess.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/contact-link.json b/packages/catalog-realm/Spec/contact-link.json
index 93429437b06..87ea43af6a9 100644
--- a/packages/catalog-realm/Spec/contact-link.json
+++ b/packages/catalog-realm/Spec/contact-link.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Spec",
-        "module": "https://cardstack.com/base/spec"
+        "module": "@cardstack/base/spec"
       },
       "fields": {
         "containedExamples": [
diff --git a/packages/catalog-realm/Spec/coordinate.json b/packages/catalog-realm/Spec/coordinate.json
index 82e8122869c..2f33be01e31 100644
--- a/packages/catalog-realm/Spec/coordinate.json
+++ b/packages/catalog-realm/Spec/coordinate.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-account.json b/packages/catalog-realm/Spec/crm-account.json
index b58c47f0ee1..d853e47e6c5 100644
--- a/packages/catalog-realm/Spec/crm-account.json
+++ b/packages/catalog-realm/Spec/crm-account.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-account-header.json b/packages/catalog-realm/Spec/crm-app-account-header.json
index 9e5bf0d56a6..5ba95c86fc2 100644
--- a/packages/catalog-realm/Spec/crm-app-account-header.json
+++ b/packages/catalog-realm/Spec/crm-app-account-header.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-activity-card.json b/packages/catalog-realm/Spec/crm-app-activity-card.json
index d7aaeb6edf1..7e7ea825c34 100644
--- a/packages/catalog-realm/Spec/crm-app-activity-card.json
+++ b/packages/catalog-realm/Spec/crm-app-activity-card.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-amount-with-currency.json b/packages/catalog-realm/Spec/crm-app-amount-with-currency.json
index d7169bc92a8..a82e9609161 100644
--- a/packages/catalog-realm/Spec/crm-app-amount-with-currency.json
+++ b/packages/catalog-realm/Spec/crm-app-amount-with-currency.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-avatar-group.json b/packages/catalog-realm/Spec/crm-app-avatar-group.json
index ec9425840d3..7f07b3534c7 100644
--- a/packages/catalog-realm/Spec/crm-app-avatar-group.json
+++ b/packages/catalog-realm/Spec/crm-app-avatar-group.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-base-task-planner.json b/packages/catalog-realm/Spec/crm-app-base-task-planner.json
index 9636318c53f..f64689a7e31 100644
--- a/packages/catalog-realm/Spec/crm-app-base-task-planner.json
+++ b/packages/catalog-realm/Spec/crm-app-base-task-planner.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-card.json b/packages/catalog-realm/Spec/crm-app-card.json
index 7c2d1a9311f..36eb51d1508 100644
--- a/packages/catalog-realm/Spec/crm-app-card.json
+++ b/packages/catalog-realm/Spec/crm-app-card.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-contact-row.json b/packages/catalog-realm/Spec/crm-app-contact-row.json
index 1ed22a0844f..4bfacc5a5d7 100644
--- a/packages/catalog-realm/Spec/crm-app-contact-row.json
+++ b/packages/catalog-realm/Spec/crm-app-contact-row.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-crm-progress-bar.json b/packages/catalog-realm/Spec/crm-app-crm-progress-bar.json
index e4085a68b1f..b30caa21c53 100644
--- a/packages/catalog-realm/Spec/crm-app-crm-progress-bar.json
+++ b/packages/catalog-realm/Spec/crm-app-crm-progress-bar.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-currency.json b/packages/catalog-realm/Spec/crm-app-currency.json
index 2292eaa8acb..36c29938a66 100644
--- a/packages/catalog-realm/Spec/crm-app-currency.json
+++ b/packages/catalog-realm/Spec/crm-app-currency.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-filter-display.json b/packages/catalog-realm/Spec/crm-app-filter-display.json
index 0771a5af784..ed654028a3f 100644
--- a/packages/catalog-realm/Spec/crm-app-filter-display.json
+++ b/packages/catalog-realm/Spec/crm-app-filter-display.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-filter-dropdown-item.json b/packages/catalog-realm/Spec/crm-app-filter-dropdown-item.json
index 8e191c6d16b..7fa215bf84b 100644
--- a/packages/catalog-realm/Spec/crm-app-filter-dropdown-item.json
+++ b/packages/catalog-realm/Spec/crm-app-filter-dropdown-item.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-filter-dropdown.json b/packages/catalog-realm/Spec/crm-app-filter-dropdown.json
index e872079f7bb..ce24a25f1e9 100644
--- a/packages/catalog-realm/Spec/crm-app-filter-dropdown.json
+++ b/packages/catalog-realm/Spec/crm-app-filter-dropdown.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-filter-trigger.json b/packages/catalog-realm/Spec/crm-app-filter-trigger.json
index 8672e34dc1b..6c0c1eb0b17 100644
--- a/packages/catalog-realm/Spec/crm-app-filter-trigger.json
+++ b/packages/catalog-realm/Spec/crm-app-filter-trigger.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-page-layout.json b/packages/catalog-realm/Spec/crm-app-page-layout.json
index a764d5f541e..345bb1542c2 100644
--- a/packages/catalog-realm/Spec/crm-app-page-layout.json
+++ b/packages/catalog-realm/Spec/crm-app-page-layout.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-search-input.json b/packages/catalog-realm/Spec/crm-app-search-input.json
index eb6a0bdd480..f441692bc63 100644
--- a/packages/catalog-realm/Spec/crm-app-search-input.json
+++ b/packages/catalog-realm/Spec/crm-app-search-input.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-status-pill.json b/packages/catalog-realm/Spec/crm-app-status-pill.json
index f3a5586f63a..a5512832f0b 100644
--- a/packages/catalog-realm/Spec/crm-app-status-pill.json
+++ b/packages/catalog-realm/Spec/crm-app-status-pill.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-summary-card.json b/packages/catalog-realm/Spec/crm-app-summary-card.json
index 59ffd418706..f38811dbeec 100644
--- a/packages/catalog-realm/Spec/crm-app-summary-card.json
+++ b/packages/catalog-realm/Spec/crm-app-summary-card.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app-summary-grid-container.json b/packages/catalog-realm/Spec/crm-app-summary-grid-container.json
index 3c97454911e..e0a299cfe33 100644
--- a/packages/catalog-realm/Spec/crm-app-summary-grid-container.json
+++ b/packages/catalog-realm/Spec/crm-app-summary-grid-container.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-app.json b/packages/catalog-realm/Spec/crm-app.json
index 2f54124b9f2..e5aff032141 100644
--- a/packages/catalog-realm/Spec/crm-app.json
+++ b/packages/catalog-realm/Spec/crm-app.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-base-task.json b/packages/catalog-realm/Spec/crm-base-task.json
index cc54774c22e..cb51f47d854 100644
--- a/packages/catalog-realm/Spec/crm-base-task.json
+++ b/packages/catalog-realm/Spec/crm-base-task.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-company.json b/packages/catalog-realm/Spec/crm-company.json
index 8d140eae324..34216d74a3d 100644
--- a/packages/catalog-realm/Spec/crm-company.json
+++ b/packages/catalog-realm/Spec/crm-company.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-contact-status-tag.json b/packages/catalog-realm/Spec/crm-contact-status-tag.json
index 6940209fbd7..ef9e6217b4f 100644
--- a/packages/catalog-realm/Spec/crm-contact-status-tag.json
+++ b/packages/catalog-realm/Spec/crm-contact-status-tag.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-contact.json b/packages/catalog-realm/Spec/crm-contact.json
index 2cf00f4b2dd..19c3ef70e63 100644
--- a/packages/catalog-realm/Spec/crm-contact.json
+++ b/packages/catalog-realm/Spec/crm-contact.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-customer.json b/packages/catalog-realm/Spec/crm-customer.json
index af6972de3a3..55751bd37e6 100644
--- a/packages/catalog-realm/Spec/crm-customer.json
+++ b/packages/catalog-realm/Spec/crm-customer.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-deal-event.json b/packages/catalog-realm/Spec/crm-deal-event.json
index e967b75dadc..115de276938 100644
--- a/packages/catalog-realm/Spec/crm-deal-event.json
+++ b/packages/catalog-realm/Spec/crm-deal-event.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-deal-priority.json b/packages/catalog-realm/Spec/crm-deal-priority.json
index cc33f94be14..1f8d71cc27a 100644
--- a/packages/catalog-realm/Spec/crm-deal-priority.json
+++ b/packages/catalog-realm/Spec/crm-deal-priority.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-deal-status.json b/packages/catalog-realm/Spec/crm-deal-status.json
index 1c1d8316ecf..e91d24923d0 100644
--- a/packages/catalog-realm/Spec/crm-deal-status.json
+++ b/packages/catalog-realm/Spec/crm-deal-status.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-deal-summary.json b/packages/catalog-realm/Spec/crm-deal-summary.json
index 092ad4a816c..12dc7e2770c 100644
--- a/packages/catalog-realm/Spec/crm-deal-summary.json
+++ b/packages/catalog-realm/Spec/crm-deal-summary.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-deal.json b/packages/catalog-realm/Spec/crm-deal.json
index 11b940f8f9c..1ef027c3eed 100644
--- a/packages/catalog-realm/Spec/crm-deal.json
+++ b/packages/catalog-realm/Spec/crm-deal.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-document.json b/packages/catalog-realm/Spec/crm-document.json
index 7c422d8be81..2bbe83bf428 100644
--- a/packages/catalog-realm/Spec/crm-document.json
+++ b/packages/catalog-realm/Spec/crm-document.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-kanban-resource.json b/packages/catalog-realm/Spec/crm-kanban-resource.json
index 825609ae6e4..8d90d710255 100644
--- a/packages/catalog-realm/Spec/crm-kanban-resource.json
+++ b/packages/catalog-realm/Spec/crm-kanban-resource.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-lead.json b/packages/catalog-realm/Spec/crm-lead.json
index 28c35bdd760..f9e1b4c4fc0 100644
--- a/packages/catalog-realm/Spec/crm-lead.json
+++ b/packages/catalog-realm/Spec/crm-lead.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-representative.json b/packages/catalog-realm/Spec/crm-representative.json
index 0f1a6c44797..3c35ec771b2 100644
--- a/packages/catalog-realm/Spec/crm-representative.json
+++ b/packages/catalog-realm/Spec/crm-representative.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-shared.json b/packages/catalog-realm/Spec/crm-shared.json
index d39c7ac2558..fe5f9718fa7 100644
--- a/packages/catalog-realm/Spec/crm-shared.json
+++ b/packages/catalog-realm/Spec/crm-shared.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-tag.json b/packages/catalog-realm/Spec/crm-tag.json
index b779096d3c9..219ff645bd9 100644
--- a/packages/catalog-realm/Spec/crm-tag.json
+++ b/packages/catalog-realm/Spec/crm-tag.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-task-planner.json b/packages/catalog-realm/Spec/crm-task-planner.json
index ac8bc12199c..f56706ee5de 100644
--- a/packages/catalog-realm/Spec/crm-task-planner.json
+++ b/packages/catalog-realm/Spec/crm-task-planner.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-task.json b/packages/catalog-realm/Spec/crm-task.json
index 92fc676ef69..24013e9c64d 100644
--- a/packages/catalog-realm/Spec/crm-task.json
+++ b/packages/catalog-realm/Spec/crm-task.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-todo.json b/packages/catalog-realm/Spec/crm-todo.json
index 8da512761e4..fbe648887d3 100644
--- a/packages/catalog-realm/Spec/crm-todo.json
+++ b/packages/catalog-realm/Spec/crm-todo.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-urgency-tag.json b/packages/catalog-realm/Spec/crm-urgency-tag.json
index 459a24bdc36..f3a1c4c2218 100644
--- a/packages/catalog-realm/Spec/crm-urgency-tag.json
+++ b/packages/catalog-realm/Spec/crm-urgency-tag.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/crm-user.json b/packages/catalog-realm/Spec/crm-user.json
index 6f82e9cb99f..17ddb4d11dd 100644
--- a/packages/catalog-realm/Spec/crm-user.json
+++ b/packages/catalog-realm/Spec/crm-user.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/d06535b3-9e30-4838-99a6-729053dd2fb4.json b/packages/catalog-realm/Spec/d06535b3-9e30-4838-99a6-729053dd2fb4.json
index fa171cb5b02..92bc49e15f2 100644
--- a/packages/catalog-realm/Spec/d06535b3-9e30-4838-99a6-729053dd2fb4.json
+++ b/packages/catalog-realm/Spec/d06535b3-9e30-4838-99a6-729053dd2fb4.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/d2ad1792-d163-4466-b6fe-81509a2d8387.json b/packages/catalog-realm/Spec/d2ad1792-d163-4466-b6fe-81509a2d8387.json
index 161aba7a629..3063adea310 100644
--- a/packages/catalog-realm/Spec/d2ad1792-d163-4466-b6fe-81509a2d8387.json
+++ b/packages/catalog-realm/Spec/d2ad1792-d163-4466-b6fe-81509a2d8387.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/d361358a-08b8-4e03-9a39-e40b539eb3e0.json b/packages/catalog-realm/Spec/d361358a-08b8-4e03-9a39-e40b539eb3e0.json
index b0e2b619599..2561505c17b 100644
--- a/packages/catalog-realm/Spec/d361358a-08b8-4e03-9a39-e40b539eb3e0.json
+++ b/packages/catalog-realm/Spec/d361358a-08b8-4e03-9a39-e40b539eb3e0.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/d4d5c206-7a1d-4501-8bbc-df6101800772.json b/packages/catalog-realm/Spec/d4d5c206-7a1d-4501-8bbc-df6101800772.json
index 38760ce45ba..dc47a4389a7 100644
--- a/packages/catalog-realm/Spec/d4d5c206-7a1d-4501-8bbc-df6101800772.json
+++ b/packages/catalog-realm/Spec/d4d5c206-7a1d-4501-8bbc-df6101800772.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/d5c2067a-1da5-41cb-bcdf-61018007720f.json b/packages/catalog-realm/Spec/d5c2067a-1da5-41cb-bcdf-61018007720f.json
index 5ce57e2ed8e..b47d06060e9 100644
--- a/packages/catalog-realm/Spec/d5c2067a-1da5-41cb-bcdf-61018007720f.json
+++ b/packages/catalog-realm/Spec/d5c2067a-1da5-41cb-bcdf-61018007720f.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/d6f7d438-0698-4f71-a2b3-471688bfed91.json b/packages/catalog-realm/Spec/d6f7d438-0698-4f71-a2b3-471688bfed91.json
index fa2638b25d9..f51ccb0a1b9 100644
--- a/packages/catalog-realm/Spec/d6f7d438-0698-4f71-a2b3-471688bfed91.json
+++ b/packages/catalog-realm/Spec/d6f7d438-0698-4f71-a2b3-471688bfed91.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/d8cd13dc-781c-4652-bf73-b0e25583d6f8.json b/packages/catalog-realm/Spec/d8cd13dc-781c-4652-bf73-b0e25583d6f8.json
index ee4c3302689..207717b21ef 100644
--- a/packages/catalog-realm/Spec/d8cd13dc-781c-4652-bf73-b0e25583d6f8.json
+++ b/packages/catalog-realm/Spec/d8cd13dc-781c-4652-bf73-b0e25583d6f8.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/d920fde3-9eba-4a27-b648-69790156b795.json b/packages/catalog-realm/Spec/d920fde3-9eba-4a27-b648-69790156b795.json
index 24d79e0b310..997cb87d99c 100644
--- a/packages/catalog-realm/Spec/d920fde3-9eba-4a27-b648-69790156b795.json
+++ b/packages/catalog-realm/Spec/d920fde3-9eba-4a27-b648-69790156b795.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/d9a1b093-132a-4020-9823-15a7329d38dc.json b/packages/catalog-realm/Spec/d9a1b093-132a-4020-9823-15a7329d38dc.json
index a7a68ca37e0..6aef7c81d9c 100644
--- a/packages/catalog-realm/Spec/d9a1b093-132a-4020-9823-15a7329d38dc.json
+++ b/packages/catalog-realm/Spec/d9a1b093-132a-4020-9823-15a7329d38dc.json
@@ -28,7 +28,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/da8579b2-5703-4a50-952d-1a07f0234926.json b/packages/catalog-realm/Spec/da8579b2-5703-4a50-952d-1a07f0234926.json
index 2db017aef56..c76095de219 100644
--- a/packages/catalog-realm/Spec/da8579b2-5703-4a50-952d-1a07f0234926.json
+++ b/packages/catalog-realm/Spec/da8579b2-5703-4a50-952d-1a07f0234926.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/dc781cc6-527f-43b0-a255-83d6f8d2ad17.json b/packages/catalog-realm/Spec/dc781cc6-527f-43b0-a255-83d6f8d2ad17.json
index e969285b850..6e798583001 100644
--- a/packages/catalog-realm/Spec/dc781cc6-527f-43b0-a255-83d6f8d2ad17.json
+++ b/packages/catalog-realm/Spec/dc781cc6-527f-43b0-a255-83d6f8d2ad17.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/dd1b56b8-d8ba-42cb-96de-dcd03a5ea4ef.json b/packages/catalog-realm/Spec/dd1b56b8-d8ba-42cb-96de-dcd03a5ea4ef.json
index 8175000d5d6..649c2f8b63d 100644
--- a/packages/catalog-realm/Spec/dd1b56b8-d8ba-42cb-96de-dcd03a5ea4ef.json
+++ b/packages/catalog-realm/Spec/dd1b56b8-d8ba-42cb-96de-dcd03a5ea4ef.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/de3daa01-e091-42bc-bc41-4a8196ac3890.json b/packages/catalog-realm/Spec/de3daa01-e091-42bc-bc41-4a8196ac3890.json
index b6aad2d42c0..b4e959e98c3 100644
--- a/packages/catalog-realm/Spec/de3daa01-e091-42bc-bc41-4a8196ac3890.json
+++ b/packages/catalog-realm/Spec/de3daa01-e091-42bc-bc41-4a8196ac3890.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/df7b07a8-99d8-4330-b7cd-a54ca65b60a6.json b/packages/catalog-realm/Spec/df7b07a8-99d8-4330-b7cd-a54ca65b60a6.json
index 614980e048b..e9c090f955c 100644
--- a/packages/catalog-realm/Spec/df7b07a8-99d8-4330-b7cd-a54ca65b60a6.json
+++ b/packages/catalog-realm/Spec/df7b07a8-99d8-4330-b7cd-a54ca65b60a6.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e067bc4f-8873-47de-b06d-8f6ffde66f6f.json b/packages/catalog-realm/Spec/e067bc4f-8873-47de-b06d-8f6ffde66f6f.json
index 1d8f78e6b47..dadcde3144f 100644
--- a/packages/catalog-realm/Spec/e067bc4f-8873-47de-b06d-8f6ffde66f6f.json
+++ b/packages/catalog-realm/Spec/e067bc4f-8873-47de-b06d-8f6ffde66f6f.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e083dc9d-112a-4701-859f-84bcca3aa2e5.json b/packages/catalog-realm/Spec/e083dc9d-112a-4701-859f-84bcca3aa2e5.json
index e0657394533..680bf11a041 100644
--- a/packages/catalog-realm/Spec/e083dc9d-112a-4701-859f-84bcca3aa2e5.json
+++ b/packages/catalog-realm/Spec/e083dc9d-112a-4701-859f-84bcca3aa2e5.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e091e2bc-bc41-4a81-96ac-389062734642.json b/packages/catalog-realm/Spec/e091e2bc-bc41-4a81-96ac-389062734642.json
index bfd7d3c3fcd..1f2988a4cef 100644
--- a/packages/catalog-realm/Spec/e091e2bc-bc41-4a81-96ac-389062734642.json
+++ b/packages/catalog-realm/Spec/e091e2bc-bc41-4a81-96ac-389062734642.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e115cc06-06d1-463e-a9da-aa4f9efdea7e.json b/packages/catalog-realm/Spec/e115cc06-06d1-463e-a9da-aa4f9efdea7e.json
index e8331ad109d..cf7dc94a657 100644
--- a/packages/catalog-realm/Spec/e115cc06-06d1-463e-a9da-aa4f9efdea7e.json
+++ b/packages/catalog-realm/Spec/e115cc06-06d1-463e-a9da-aa4f9efdea7e.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e19cab80-0371-4455-8a23-05f442fd0b78.json b/packages/catalog-realm/Spec/e19cab80-0371-4455-8a23-05f442fd0b78.json
index ac0239a1dd5..7e6359a3851 100644
--- a/packages/catalog-realm/Spec/e19cab80-0371-4455-8a23-05f442fd0b78.json
+++ b/packages/catalog-realm/Spec/e19cab80-0371-4455-8a23-05f442fd0b78.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e39eba2a-27f6-4869-b901-56b79516c0ef.json b/packages/catalog-realm/Spec/e39eba2a-27f6-4869-b901-56b79516c0ef.json
index dc57eb71cb9..d8912e79360 100644
--- a/packages/catalog-realm/Spec/e39eba2a-27f6-4869-b901-56b79516c0ef.json
+++ b/packages/catalog-realm/Spec/e39eba2a-27f6-4869-b901-56b79516c0ef.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e5bae10f-2769-4a6a-a245-dbee563456e7.json b/packages/catalog-realm/Spec/e5bae10f-2769-4a6a-a245-dbee563456e7.json
index e179aa7b81a..734abdf3313 100644
--- a/packages/catalog-realm/Spec/e5bae10f-2769-4a6a-a245-dbee563456e7.json
+++ b/packages/catalog-realm/Spec/e5bae10f-2769-4a6a-a245-dbee563456e7.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e6267d3b-2f56-4938-9585-26a6dc72cf5d.json b/packages/catalog-realm/Spec/e6267d3b-2f56-4938-9585-26a6dc72cf5d.json
index 10a722eeea8..e3aa69b9d81 100644
--- a/packages/catalog-realm/Spec/e6267d3b-2f56-4938-9585-26a6dc72cf5d.json
+++ b/packages/catalog-realm/Spec/e6267d3b-2f56-4938-9585-26a6dc72cf5d.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e6743631-a63c-4272-814b-ed10fc8265cf.json b/packages/catalog-realm/Spec/e6743631-a63c-4272-814b-ed10fc8265cf.json
index e2b23ab4b64..abf203b3093 100644
--- a/packages/catalog-realm/Spec/e6743631-a63c-4272-814b-ed10fc8265cf.json
+++ b/packages/catalog-realm/Spec/e6743631-a63c-4272-814b-ed10fc8265cf.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e6978e23-53b0-4c33-9984-74cdd61a761d.json b/packages/catalog-realm/Spec/e6978e23-53b0-4c33-9984-74cdd61a761d.json
index b871c9b0b69..a5a6870d2f8 100644
--- a/packages/catalog-realm/Spec/e6978e23-53b0-4c33-9984-74cdd61a761d.json
+++ b/packages/catalog-realm/Spec/e6978e23-53b0-4c33-9984-74cdd61a761d.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e7104b0b-e04c-48dd-a56d-cfafd8cbfcb2.json b/packages/catalog-realm/Spec/e7104b0b-e04c-48dd-a56d-cfafd8cbfcb2.json
index 41aa8ecffce..3b8c806c7f7 100644
--- a/packages/catalog-realm/Spec/e7104b0b-e04c-48dd-a56d-cfafd8cbfcb2.json
+++ b/packages/catalog-realm/Spec/e7104b0b-e04c-48dd-a56d-cfafd8cbfcb2.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e71ae19c-ab80-4371-b455-0a2305f442fd.json b/packages/catalog-realm/Spec/e71ae19c-ab80-4371-b455-0a2305f442fd.json
index 7dcc81ef655..665f2dae197 100644
--- a/packages/catalog-realm/Spec/e71ae19c-ab80-4371-b455-0a2305f442fd.json
+++ b/packages/catalog-realm/Spec/e71ae19c-ab80-4371-b455-0a2305f442fd.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e80009b7-c737-4933-87c1-3ab3347782b9.json b/packages/catalog-realm/Spec/e80009b7-c737-4933-87c1-3ab3347782b9.json
index e9c19cd18b9..42fe054cdd4 100644
--- a/packages/catalog-realm/Spec/e80009b7-c737-4933-87c1-3ab3347782b9.json
+++ b/packages/catalog-realm/Spec/e80009b7-c737-4933-87c1-3ab3347782b9.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e866b7f8-b0b0-4375-851d-de17116ba6ba.json b/packages/catalog-realm/Spec/e866b7f8-b0b0-4375-851d-de17116ba6ba.json
index ef890ad9e3b..9f01cab6cb5 100644
--- a/packages/catalog-realm/Spec/e866b7f8-b0b0-4375-851d-de17116ba6ba.json
+++ b/packages/catalog-realm/Spec/e866b7f8-b0b0-4375-851d-de17116ba6ba.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/e888fb27-a5b8-4dd7-ae24-6a9bedf909f1.json b/packages/catalog-realm/Spec/e888fb27-a5b8-4dd7-ae24-6a9bedf909f1.json
index 9ba0b77c236..f60157a4b7c 100644
--- a/packages/catalog-realm/Spec/e888fb27-a5b8-4dd7-ae24-6a9bedf909f1.json
+++ b/packages/catalog-realm/Spec/e888fb27-a5b8-4dd7-ae24-6a9bedf909f1.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/ea108ed8-0114-4294-a690-d4000f7706d9.json b/packages/catalog-realm/Spec/ea108ed8-0114-4294-a690-d4000f7706d9.json
index 3b581a085d9..8ff27ff6ada 100644
--- a/packages/catalog-realm/Spec/ea108ed8-0114-4294-a690-d4000f7706d9.json
+++ b/packages/catalog-realm/Spec/ea108ed8-0114-4294-a690-d4000f7706d9.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/ea5403bd-fba0-4530-b811-9a129fd88073.json b/packages/catalog-realm/Spec/ea5403bd-fba0-4530-b811-9a129fd88073.json
index 41aa8ecffce..3b8c806c7f7 100644
--- a/packages/catalog-realm/Spec/ea5403bd-fba0-4530-b811-9a129fd88073.json
+++ b/packages/catalog-realm/Spec/ea5403bd-fba0-4530-b811-9a129fd88073.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/eb5d5424-d2ee-4497-94d6-36166772f516.json b/packages/catalog-realm/Spec/eb5d5424-d2ee-4497-94d6-36166772f516.json
index a1f069b27ed..3cba2a1ed3f 100644
--- a/packages/catalog-realm/Spec/eb5d5424-d2ee-4497-94d6-36166772f516.json
+++ b/packages/catalog-realm/Spec/eb5d5424-d2ee-4497-94d6-36166772f516.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/ec61d50f-c8d2-481c-a491-ceec8f45d4fd.json b/packages/catalog-realm/Spec/ec61d50f-c8d2-481c-a491-ceec8f45d4fd.json
index faac9f34c96..12ba58dc952 100644
--- a/packages/catalog-realm/Spec/ec61d50f-c8d2-481c-a491-ceec8f45d4fd.json
+++ b/packages/catalog-realm/Spec/ec61d50f-c8d2-481c-a491-ceec8f45d4fd.json
@@ -40,7 +40,7 @@
         ]
       },
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/edd06535-b39e-4018-b819-a6729053dd2f.json b/packages/catalog-realm/Spec/edd06535-b39e-4018-b819-a6729053dd2f.json
index f5972fef82e..a6b3ff0a1d8 100644
--- a/packages/catalog-realm/Spec/edd06535-b39e-4018-b819-a6729053dd2f.json
+++ b/packages/catalog-realm/Spec/edd06535-b39e-4018-b819-a6729053dd2f.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/eee8f5cb-51ac-4bf2-93cc-668bd8ab4393.json b/packages/catalog-realm/Spec/eee8f5cb-51ac-4bf2-93cc-668bd8ab4393.json
index 8c95dca5637..30edce5533d 100644
--- a/packages/catalog-realm/Spec/eee8f5cb-51ac-4bf2-93cc-668bd8ab4393.json
+++ b/packages/catalog-realm/Spec/eee8f5cb-51ac-4bf2-93cc-668bd8ab4393.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/f1e67436-31a6-4cf2-b201-4bed10fc8265.json b/packages/catalog-realm/Spec/f1e67436-31a6-4cf2-b201-4bed10fc8265.json
index 9a6d1763538..eda7625b474 100644
--- a/packages/catalog-realm/Spec/f1e67436-31a6-4cf2-b201-4bed10fc8265.json
+++ b/packages/catalog-realm/Spec/f1e67436-31a6-4cf2-b201-4bed10fc8265.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/f300e866-b7f8-40b0-9375-451dde17116b.json b/packages/catalog-realm/Spec/f300e866-b7f8-40b0-9375-451dde17116b.json
index 72ca8a3c1e2..ace063fd378 100644
--- a/packages/catalog-realm/Spec/f300e866-b7f8-40b0-9375-451dde17116b.json
+++ b/packages/catalog-realm/Spec/f300e866-b7f8-40b0-9375-451dde17116b.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/f6486979-0156-4795-96c0-ef47e0859395.json b/packages/catalog-realm/Spec/f6486979-0156-4795-96c0-ef47e0859395.json
index 40f74cb5ef2..d59209d72ee 100644
--- a/packages/catalog-realm/Spec/f6486979-0156-4795-96c0-ef47e0859395.json
+++ b/packages/catalog-realm/Spec/f6486979-0156-4795-96c0-ef47e0859395.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/f6f70967-d471-4d86-bdb9-0e9a95eb3e97.json b/packages/catalog-realm/Spec/f6f70967-d471-4d86-bdb9-0e9a95eb3e97.json
index 36d0a7524a8..8bbc24357df 100644
--- a/packages/catalog-realm/Spec/f6f70967-d471-4d86-bdb9-0e9a95eb3e97.json
+++ b/packages/catalog-realm/Spec/f6f70967-d471-4d86-bdb9-0e9a95eb3e97.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/f73caa96-dbdd-41f1-a8a1-3474a8be8a05.json b/packages/catalog-realm/Spec/f73caa96-dbdd-41f1-a8a1-3474a8be8a05.json
index 98dc3a37442..394dc9175bf 100644
--- a/packages/catalog-realm/Spec/f73caa96-dbdd-41f1-a8a1-3474a8be8a05.json
+++ b/packages/catalog-realm/Spec/f73caa96-dbdd-41f1-a8a1-3474a8be8a05.json
@@ -23,7 +23,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/f75ed6f7-d438-4698-8f71-a2b3471688bf.json b/packages/catalog-realm/Spec/f75ed6f7-d438-4698-8f71-a2b3471688bf.json
index 907006bd145..8e482845468 100644
--- a/packages/catalog-realm/Spec/f75ed6f7-d438-4698-8f71-a2b3471688bf.json
+++ b/packages/catalog-realm/Spec/f75ed6f7-d438-4698-8f71-a2b3471688bf.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/f788e888-fb27-45b8-bdd7-6e246a9bedf9.json b/packages/catalog-realm/Spec/f788e888-fb27-45b8-bdd7-6e246a9bedf9.json
index d782088e3e4..2b689f6b245 100644
--- a/packages/catalog-realm/Spec/f788e888-fb27-45b8-bdd7-6e246a9bedf9.json
+++ b/packages/catalog-realm/Spec/f788e888-fb27-45b8-bdd7-6e246a9bedf9.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/f869024a-cdec-4a73-afca-d8d32f258ead.json b/packages/catalog-realm/Spec/f869024a-cdec-4a73-afca-d8d32f258ead.json
index 555edd3640e..0d3bd752262 100644
--- a/packages/catalog-realm/Spec/f869024a-cdec-4a73-afca-d8d32f258ead.json
+++ b/packages/catalog-realm/Spec/f869024a-cdec-4a73-afca-d8d32f258ead.json
@@ -32,7 +32,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/f8b0b053-7545-4dde-9711-6ba6badeb34b.json b/packages/catalog-realm/Spec/f8b0b053-7545-4dde-9711-6ba6badeb34b.json
index ac44d502cf3..15f179f2865 100644
--- a/packages/catalog-realm/Spec/f8b0b053-7545-4dde-9711-6ba6badeb34b.json
+++ b/packages/catalog-realm/Spec/f8b0b053-7545-4dde-9711-6ba6badeb34b.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/f98190ab-545b-4fb5-bbcc-8743f09eabf7.json b/packages/catalog-realm/Spec/f98190ab-545b-4fb5-bbcc-8743f09eabf7.json
index dc57eb71cb9..d8912e79360 100644
--- a/packages/catalog-realm/Spec/f98190ab-545b-4fb5-bbcc-8743f09eabf7.json
+++ b/packages/catalog-realm/Spec/f98190ab-545b-4fb5-bbcc-8743f09eabf7.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/f9b8d920-fde3-4eba-aa27-f64869790156.json b/packages/catalog-realm/Spec/f9b8d920-fde3-4eba-aa27-f64869790156.json
index 6997df8c8cc..622a5fc228b 100644
--- a/packages/catalog-realm/Spec/f9b8d920-fde3-4eba-aa27-f64869790156.json
+++ b/packages/catalog-realm/Spec/f9b8d920-fde3-4eba-aa27-f64869790156.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/fa98792f-48a5-43be-aac1-b5500c21d9ea.json b/packages/catalog-realm/Spec/fa98792f-48a5-43be-aac1-b5500c21d9ea.json
index aec00d6a681..5914e996bf8 100644
--- a/packages/catalog-realm/Spec/fa98792f-48a5-43be-aac1-b5500c21d9ea.json
+++ b/packages/catalog-realm/Spec/fa98792f-48a5-43be-aac1-b5500c21d9ea.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/fb4a6377-4cc4-47ee-b752-7c4185efb2dd.json b/packages/catalog-realm/Spec/fb4a6377-4cc4-47ee-b752-7c4185efb2dd.json
index 907006bd145..8e482845468 100644
--- a/packages/catalog-realm/Spec/fb4a6377-4cc4-47ee-b752-7c4185efb2dd.json
+++ b/packages/catalog-realm/Spec/fb4a6377-4cc4-47ee-b752-7c4185efb2dd.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/fde39eba-2a27-4648-a979-0156b79516c0.json b/packages/catalog-realm/Spec/fde39eba-2a27-4648-a979-0156b79516c0.json
index dce7eeb86cd..80030652069 100644
--- a/packages/catalog-realm/Spec/fde39eba-2a27-4648-a979-0156b79516c0.json
+++ b/packages/catalog-realm/Spec/fde39eba-2a27-4648-a979-0156b79516c0.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/featured-image.json b/packages/catalog-realm/Spec/featured-image.json
index 5041a0b3592..d922b1a2d4c 100644
--- a/packages/catalog-realm/Spec/featured-image.json
+++ b/packages/catalog-realm/Spec/featured-image.json
@@ -15,7 +15,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/ff1afd63-a1a2-46fd-b00b-aee460e04bf3.json b/packages/catalog-realm/Spec/ff1afd63-a1a2-46fd-b00b-aee460e04bf3.json
index e76059a819b..923f53be6ad 100644
--- a/packages/catalog-realm/Spec/ff1afd63-a1a2-46fd-b00b-aee460e04bf3.json
+++ b/packages/catalog-realm/Spec/ff1afd63-a1a2-46fd-b00b-aee460e04bf3.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/generate-daily-report.json b/packages/catalog-realm/Spec/generate-daily-report.json
index 6fb288c2d67..e3af1dcb3a7 100644
--- a/packages/catalog-realm/Spec/generate-daily-report.json
+++ b/packages/catalog-realm/Spec/generate-daily-report.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/grid.json b/packages/catalog-realm/Spec/grid.json
index aaf67fbe8b7..db8337c0585 100644
--- a/packages/catalog-realm/Spec/grid.json
+++ b/packages/catalog-realm/Spec/grid.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/layout.json b/packages/catalog-realm/Spec/layout.json
index ccbfaf44ea9..ae16794f076 100644
--- a/packages/catalog-realm/Spec/layout.json
+++ b/packages/catalog-realm/Spec/layout.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/leaflet-map-config.json b/packages/catalog-realm/Spec/leaflet-map-config.json
index d7b984097d2..235d82ec3da 100644
--- a/packages/catalog-realm/Spec/leaflet-map-config.json
+++ b/packages/catalog-realm/Spec/leaflet-map-config.json
@@ -32,7 +32,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/leaflet-map.json b/packages/catalog-realm/Spec/leaflet-map.json
index 1a056f850df..924d0c8f08f 100644
--- a/packages/catalog-realm/Spec/leaflet-map.json
+++ b/packages/catalog-realm/Spec/leaflet-map.json
@@ -15,7 +15,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/map-render.json b/packages/catalog-realm/Spec/map-render.json
index e6e0325d066..cba414fc850 100644
--- a/packages/catalog-realm/Spec/map-render.json
+++ b/packages/catalog-realm/Spec/map-render.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/map.json b/packages/catalog-realm/Spec/map.json
index e34d12e0411..01a69cf77a9 100644
--- a/packages/catalog-realm/Spec/map.json
+++ b/packages/catalog-realm/Spec/map.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/model-configuration.json b/packages/catalog-realm/Spec/model-configuration.json
index 0d1e6d4c3d7..91c551e5c23 100644
--- a/packages/catalog-realm/Spec/model-configuration.json
+++ b/packages/catalog-realm/Spec/model-configuration.json
@@ -5,7 +5,7 @@
       "readMe": null,
       "ref": {
         "name": "ModelConfiguration",
-        "module": "https://cardstack.com/base/system-card"
+        "module": "@cardstack/base/system-card"
       },
       "specType": "card",
       "containedExamples": [],
@@ -32,7 +32,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/mortgage-calculator.json b/packages/catalog-realm/Spec/mortgage-calculator.json
index 65c7a5267d5..f7ea55383eb 100644
--- a/packages/catalog-realm/Spec/mortgage-calculator.json
+++ b/packages/catalog-realm/Spec/mortgage-calculator.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/review-blog.json b/packages/catalog-realm/Spec/review-blog.json
index 740da81f7e9..e7e5af0ee4a 100644
--- a/packages/catalog-realm/Spec/review-blog.json
+++ b/packages/catalog-realm/Spec/review-blog.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/route.json b/packages/catalog-realm/Spec/route.json
index 50f855abd2a..b20b402a3be 100644
--- a/packages/catalog-realm/Spec/route.json
+++ b/packages/catalog-realm/Spec/route.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/sort.json b/packages/catalog-realm/Spec/sort.json
index 5e78dc3d90b..bf4ebd03a47 100644
--- a/packages/catalog-realm/Spec/sort.json
+++ b/packages/catalog-realm/Spec/sort.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/sprint-planner-base-task-planner.json b/packages/catalog-realm/Spec/sprint-planner-base-task-planner.json
index ae083c19a19..91ab54f4e59 100644
--- a/packages/catalog-realm/Spec/sprint-planner-base-task-planner.json
+++ b/packages/catalog-realm/Spec/sprint-planner-base-task-planner.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/sprint-planner-filter-display.json b/packages/catalog-realm/Spec/sprint-planner-filter-display.json
index 93f7b71dbdf..ceb5ba60ff4 100644
--- a/packages/catalog-realm/Spec/sprint-planner-filter-display.json
+++ b/packages/catalog-realm/Spec/sprint-planner-filter-display.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/sprint-planner-filter-dropdown-item.json b/packages/catalog-realm/Spec/sprint-planner-filter-dropdown-item.json
index 12e486a7c0a..9538306fa50 100644
--- a/packages/catalog-realm/Spec/sprint-planner-filter-dropdown-item.json
+++ b/packages/catalog-realm/Spec/sprint-planner-filter-dropdown-item.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/sprint-planner-filter-dropdown.json b/packages/catalog-realm/Spec/sprint-planner-filter-dropdown.json
index 54946c2af17..8bbbde87928 100644
--- a/packages/catalog-realm/Spec/sprint-planner-filter-dropdown.json
+++ b/packages/catalog-realm/Spec/sprint-planner-filter-dropdown.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/sprint-planner-filter-trigger.json b/packages/catalog-realm/Spec/sprint-planner-filter-trigger.json
index 7f1f9acac83..7785621cb2c 100644
--- a/packages/catalog-realm/Spec/sprint-planner-filter-trigger.json
+++ b/packages/catalog-realm/Spec/sprint-planner-filter-trigger.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/sprint-planner-kanban-resource.json b/packages/catalog-realm/Spec/sprint-planner-kanban-resource.json
index cd6a18ee890..6187689a4fc 100644
--- a/packages/catalog-realm/Spec/sprint-planner-kanban-resource.json
+++ b/packages/catalog-realm/Spec/sprint-planner-kanban-resource.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/sprint-planner-sprint-task.json b/packages/catalog-realm/Spec/sprint-planner-sprint-task.json
index a985ed7378e..88e674b7a16 100644
--- a/packages/catalog-realm/Spec/sprint-planner-sprint-task.json
+++ b/packages/catalog-realm/Spec/sprint-planner-sprint-task.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/sprint-planner-tag.json b/packages/catalog-realm/Spec/sprint-planner-tag.json
index 4d3ba1596da..b40981b913e 100644
--- a/packages/catalog-realm/Spec/sprint-planner-tag.json
+++ b/packages/catalog-realm/Spec/sprint-planner-tag.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/sprint-planner-task.json b/packages/catalog-realm/Spec/sprint-planner-task.json
index a48ba0bee30..5dcf2fb62c3 100644
--- a/packages/catalog-realm/Spec/sprint-planner-task.json
+++ b/packages/catalog-realm/Spec/sprint-planner-task.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/sprint-planner-todo.json b/packages/catalog-realm/Spec/sprint-planner-todo.json
index c83f2ac708c..cc89c5dac75 100644
--- a/packages/catalog-realm/Spec/sprint-planner-todo.json
+++ b/packages/catalog-realm/Spec/sprint-planner-todo.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/sprint-planner-user.json b/packages/catalog-realm/Spec/sprint-planner-user.json
index 127c15e5f08..1c808b742c6 100644
--- a/packages/catalog-realm/Spec/sprint-planner-user.json
+++ b/packages/catalog-realm/Spec/sprint-planner-user.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/sprint-planner.json b/packages/catalog-realm/Spec/sprint-planner.json
index 46f601f50de..0563b69824e 100644
--- a/packages/catalog-realm/Spec/sprint-planner.json
+++ b/packages/catalog-realm/Spec/sprint-planner.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/story-board.json b/packages/catalog-realm/Spec/story-board.json
index 4e1a763e438..e5894e7742c 100644
--- a/packages/catalog-realm/Spec/story-board.json
+++ b/packages/catalog-realm/Spec/story-board.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/system-card.json b/packages/catalog-realm/Spec/system-card.json
index ce306abfb2b..ae9a7b644d1 100644
--- a/packages/catalog-realm/Spec/system-card.json
+++ b/packages/catalog-realm/Spec/system-card.json
@@ -5,7 +5,7 @@
       "readMe": null,
       "ref": {
         "name": "SystemCard",
-        "module": "https://cardstack.com/base/system-card"
+        "module": "@cardstack/base/system-card"
       },
       "specType": "card",
       "containedExamples": [],
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/theme-templates.json b/packages/catalog-realm/Spec/theme-templates.json
index 5493f184930..489e7ce4fdd 100644
--- a/packages/catalog-realm/Spec/theme-templates.json
+++ b/packages/catalog-realm/Spec/theme-templates.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/todo-mvc.json b/packages/catalog-realm/Spec/todo-mvc.json
index 633c34dbe57..26942c56d78 100644
--- a/packages/catalog-realm/Spec/todo-mvc.json
+++ b/packages/catalog-realm/Spec/todo-mvc.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/travel-mapper.json b/packages/catalog-realm/Spec/travel-mapper.json
index 4285aca66db..31cd0e9da4d 100644
--- a/packages/catalog-realm/Spec/travel-mapper.json
+++ b/packages/catalog-realm/Spec/travel-mapper.json
@@ -27,7 +27,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Spec/user.json b/packages/catalog-realm/Spec/user.json
index 14e9dcb3727..1fb04baba30 100644
--- a/packages/catalog-realm/Spec/user.json
+++ b/packages/catalog-realm/Spec/user.json
@@ -16,7 +16,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/catalog-realm/Statement/boxel-ui-forms.json b/packages/catalog-realm/Statement/boxel-ui-forms.json
index e6a8d346473..ee596ade88a 100644
--- a/packages/catalog-realm/Statement/boxel-ui-forms.json
+++ b/packages/catalog-realm/Statement/boxel-ui-forms.json
@@ -8,7 +8,7 @@
     },
     "type": "card",
     "attributes": {
-      "content": "# Boxel UI Form Input Elements\n\nBoxel UI provides a comprehensive set of form input components for building interactive forms.\n\n## Input\n\n**Import:**\n```gts\nimport { BoxelInput } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** Standard text input with built-in validation and styling\n\n**Key Props:**\n- `@value` - The input value\n- `@onInput` - Callback when value changes\n- `@placeholder` - Placeholder text\n- `@disabled` - Disable the input\n- `@invalid` - Show error state\n- `@errorMessage` - Error message to display\n- `@helperText` - Helper text below input\n- `@id` - Input ID for label association\n\n**Usage:**\n```gts\n<label class=\"field-label\">\n  Email\n  <BoxelInput\n    @type=\"email\"\n    @value={{this.email}}\n    @onInput={{this.updateEmail}}\n    @placeholder=\"Enter your email\"\n    @invalid={{this.hasError}}\n    @errorMessage=\"Please enter a valid email\"\n  />\n</label>\n```\n\n**Types:**\n- `text` (default)\n- `email`\n- `password`\n- `number`\n- `url`\n- `tel`\n\n## Select\n\n**Import:**\n```gts\nimport { BoxelSelect } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** Dropdown select with search and custom rendering\n\n**Key Props:**\n- `@options` - Array of options to display\n- `@selected` - Currently selected option\n- `@onChange` - Callback when selection changes\n- `@placeholder` - Placeholder text\n- `@searchEnabled` - Enable search/filter functionality\n- `@disabled` - Disable the select\n- `@matchTriggerWidth` - Match dropdown width to trigger\n\n**Basic Usage:**\n```gts\n<div class=\"field-group\">\n  <label>Country</label>\n  <BoxelSelect\n    @options={{this.countries}}\n    @selected={{this.selectedCountry}}\n    @onChange={{this.updateCountry}}\n    @placeholder=\"Select a country\"\n    @searchEnabled={{true}}\n  />\n</div>\n```\n\n**With Custom Rendering:**\n```gts\n<BoxelSelect\n  @options={{this.users}}\n  @selected={{this.selectedUser}}\n  @onChange={{this.updateUser}}\n  @searchEnabled={{true}}\n  as |user|\n>\n  <div class=\"user-option\">\n    <Avatar @userId={{user.id}} @displayName={{user.name}} />\n    <div>\n      <div class=\"user-name\">{{user.name}}</div>\n      <div class=\"user-email\">{{user.email}}</div>\n    </div>\n  </div>\n</BoxelSelect>\n```\n\n## MultiSelect\n\n**Import:**\n```gts\nimport { BoxelMultiSelect } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** Select multiple options from a list\n\n**Key Props:**\n- `@options` - Array of available options\n- `@selected` - Array of selected options\n- `@onChange` - Callback with new selected array\n- `@placeholder` - Placeholder text\n- `@searchEnabled` - Enable search\n- `@disabled` - Disable the component\n\n**Usage:**\n```gts\n<div class=\"field-group\">\n  <label>Tags</label>\n  <BoxelMultiSelect\n    @options={{this.availableTags}}\n    @selected={{this.selectedTags}}\n    @onChange={{this.updateTags}}\n    @placeholder=\"Select tags\"\n    @searchEnabled={{true}}\n  />\n</div>\n```\n\n**With Custom Chip Display:**\n```gts\n<BoxelMultiSelect\n  @options={{this.categories}}\n  @selected={{this.selectedCategories}}\n  @onChange={{this.updateCategories}}\n  as |category|\n>\n  <Pill>{{category.name}}</Pill>\n</BoxelMultiSelect>\n```\n\n## Radio\n\n**Import:**\n```gts\nimport { RadioInput } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** Radio button group for exclusive selection\n\n**Key Props:**\n- `@groupDescription` - Label for the radio group\n- `@items` - Array of radio options\n- `@name` - Name attribute for the radio group\n- `@orientation` - `horizontal` or `vertical` layout\n- `@spacing` - Gap between items (e.g., 'default', 'compact')\n- `@disabled` - Disable all radio buttons\n\n**Usage:**\n```gts\n<div class=\"field-group\">\n  <label>Subscription Plan</label>\n  <RadioInput\n    @groupDescription=\"Choose your plan\"\n    @items={{this.plans}}\n    @name=\"subscription\"\n    @orientation=\"vertical\"\n    @spacing=\"default\"\n  />\n</div>\n```\n\n**With Custom Layout:**\n```gts\n{{#each this.paymentMethods as |method|}}\n  <label class=\"radio-option\">\n    <input\n      type=\"radio\"\n      name=\"payment\"\n      value={{method.id}}\n      checked={{eq this.selectedPayment method.id}}\n      {{on \"change\" (fn this.selectPayment method)}}\n    />\n    <div class=\"radio-content\">\n      <strong>{{method.name}}</strong>\n      <p>{{method.description}}</p>\n    </div>\n  </label>\n{{/each}}\n```\n\n## Switch\n\n**Import:**\n```gts\nimport { BoxelSwitch } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** Toggle switch for boolean values\n\n**Key Props:**\n- `@checked` - Current state (true/false)\n- `@onChange` - Callback when toggled\n- `@disabled` - Disable the switch\n\n**Usage:**\n```gts\n<label class=\"switch-label\">\n  <BoxelSwitch\n    @checked={{this.notificationsEnabled}}\n    @onChange={{this.toggleNotifications}}\n  />\n  <span>Enable notifications</span>\n</label>\n```\n\n## PhoneInput\n\n**Import:**\n```gts\nimport { PhoneInput } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** International phone number input with country selector\n\n**Key Props:**\n- `@value` - Phone number string\n- `@onInput` - Callback when number changes\n- `@defaultCountry` - Default country code (e.g., 'US', 'GB')\n- `@placeholder` - Placeholder text\n- `@disabled` - Disable the input\n\n**Usage:**\n```gts\n<div class=\"field-group\">\n  <label>Phone Number</label>\n  <PhoneInput\n    @value={{this.phoneNumber}}\n    @onInput={{this.updatePhone}}\n    @defaultCountry=\"US\"\n    @placeholder=\"(555) 123-4567\"\n  />\n</div>\n```\n\n**With Validation:**\n```gts\n<div class=\"field-group\">\n  <label>Contact Number</label>\n  <PhoneInput\n    @value={{this.phone}}\n    @onInput={{this.validatePhone}}\n    @invalid={{this.phoneError}}\n  />\n  {{#if this.phoneError}}\n    <span class=\"error-message\">{{this.phoneError}}</span>\n  {{/if}}\n</div>\n```\n\n## DateRangePicker\n\n**Import:**\n```gts\nimport { DateRangePicker } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** Select a date range with calendar interface\n\n**Key Props:**\n- `@startDate` - Start date of range\n- `@endDate` - End date of range\n- `@onSelect` - Callback with {startDate, endDate}\n- `@placeholder` - Placeholder text\n- `@disabled` - Disable the picker\n- `@minDate` - Minimum selectable date\n- `@maxDate` - Maximum selectable date\n\n**Usage:**\n```gts\n<div class=\"field-group\">\n  <label>Event Dates</label>\n  <DateRangePicker\n    @startDate={{this.eventStart}}\n    @endDate={{this.eventEnd}}\n    @onSelect={{this.updateDateRange}}\n    @placeholder=\"Select date range\"\n  />\n</div>\n```\n\n**With Constraints:**\n```gts\n<DateRangePicker\n  @startDate={{this.bookingStart}}\n  @endDate={{this.bookingEnd}}\n  @onSelect={{this.updateBooking}}\n  @minDate={{this.today}}\n  @maxDate={{this.maxBookingDate}}\n  @placeholder=\"Check-in \u2192 Check-out\"\n/>\n```\n\n## Complete Form Example\n\n```gts\nimport { Component } from 'https://cardstack.com/base/card-api';\nimport { tracked } from '@glimmer/tracking';\nimport { action } from '@ember/object';\nimport {\n  BoxelInput,\n  BoxelSelect,\n  BoxelMultiSelect,\n  RadioInput,\n  BoxelSwitch,\n  PhoneInput,\n  DateRangePicker,\n  Button\n} from '@cardstack/boxel-ui/components';\n\nexport class UserProfileForm extends Component {\n  @tracked name = '';\n  @tracked email = '';\n  @tracked country = null;\n  @tracked interests = [];\n  @tracked accountType = 'personal';\n  @tracked marketingEmails = false;\n  @tracked phone = '';\n  @tracked availableFrom = null;\n  @tracked availableTo = null;\n\n  countries = [\n    { id: 'us', name: 'United States' },\n    { id: 'uk', name: 'United Kingdom' },\n    { id: 'ca', name: 'Canada' }\n  ];\n\n  interestOptions = [\n    { id: 'tech', label: 'Technology' },\n    { id: 'design', label: 'Design' },\n    { id: 'business', label: 'Business' }\n  ];\n\n  accountTypes = [\n    { id: 'personal', label: 'Personal', description: 'For individual use' },\n    { id: 'business', label: 'Business', description: 'For organizations' }\n  ];\n\n  @action\n  updateName(event: Event) {\n    this.name = (event.target as HTMLInputElement).value;\n  }\n\n  @action\n  updateEmail(event: Event) {\n    this.email = (event.target as HTMLInputElement).value;\n  }\n\n  @action\n  updateCountry(country: any) {\n    this.country = country;\n  }\n\n  @action\n  updateInterests(interests: any[]) {\n    this.interests = interests;\n  }\n\n  @action\n  selectAccountType(type: any) {\n    this.accountType = type.id;\n  }\n\n  @action\n  toggleMarketing() {\n    this.marketingEmails = !this.marketingEmails;\n  }\n\n  @action\n  updatePhone(phone: string) {\n    this.phone = phone;\n  }\n\n  @action\n  updateAvailability({startDate, endDate}: {startDate: Date, endDate: Date}) {\n    this.availableFrom = startDate;\n    this.availableTo = endDate;\n  }\n\n  <template>\n    <form class=\"profile-form\">\n      <label class=\"field-label\">\n        Full Name\n        <BoxelInput\n          @value={{this.name}}\n          @onInput={{this.updateName}}\n          @placeholder=\"John Doe\"\n        />\n      </label>\n\n      <label class=\"field-label\">\n        Email\n        <BoxelInput\n          @type=\"email\"\n          @value={{this.email}}\n          @onInput={{this.updateEmail}}\n          @placeholder=\"john@example.com\"\n        />\n      </label>\n\n      <div class=\"field-group\">\n        <label>Country</label>\n        <BoxelSelect\n          @options={{this.countries}}\n          @selected={{this.country}}\n          @onChange={{this.updateCountry}}\n          @placeholder=\"Select your country\"\n          @searchEnabled={{true}}\n        />\n      </div>\n\n      <div class=\"field-group\">\n        <label>Interests</label>\n        <BoxelMultiSelect\n          @options={{this.interestOptions}}\n          @selected={{this.interests}}\n          @onChange={{this.updateInterests}}\n          @placeholder=\"Select your interests\"\n        />\n      </div>\n\n      <div class=\"field-group\">\n        <label>Account Type</label>\n        <RadioInput\n          @groupDescription=\"Choose account type\"\n          @items={{this.accountTypes}}\n          @name=\"accountType\"\n          @orientation=\"vertical\"\n        />\n      </div>\n\n      <div class=\"field-group\">\n        <label>Phone Number</label>\n        <PhoneInput\n          @value={{this.phone}}\n          @onInput={{this.updatePhone}}\n          @defaultCountry=\"US\"\n        />\n      </div>\n\n      <div class=\"field-group\">\n        <label>Availability Period</label>\n        <DateRangePicker\n          @startDate={{this.availableFrom}}\n          @endDate={{this.availableTo}}\n          @onSelect={{this.updateAvailability}}\n          @placeholder=\"Select date range\"\n        />\n      </div>\n\n      <label class=\"switch-container\">\n        <BoxelSwitch\n          @checked={{this.marketingEmails}}\n          @onChange={{this.toggleMarketing}}\n        />\n        <span>Receive marketing emails</span>\n      </label>\n\n      <div class=\"form-actions\">\n        <Button @kind=\"primary\" type=\"submit\">\n          Save Profile\n        </Button>\n        <Button @kind=\"secondary\" type=\"button\">\n          Cancel\n        </Button>\n      </div>\n    </form>\n\n    <style scoped>\n      .profile-form {\n        display: flex;\n        flex-direction: column;\n        gap: 1.5rem;\n        max-width: 600px;\n        padding: 2rem;\n      }\n\n      .field-label {\n        display: flex;\n        flex-direction: column;\n        gap: 0.5rem;\n        font-weight: 500;\n      }\n\n      .field-group {\n        display: flex;\n        flex-direction: column;\n        gap: 0.5rem;\n      }\n\n      .field-group label {\n        font-weight: 500;\n      }\n\n      .switch-container {\n        display: flex;\n        align-items: center;\n        gap: 0.75rem;\n        cursor: pointer;\n      }\n\n      .form-actions {\n        display: flex;\n        gap: 0.75rem;\n        justify-content: flex-end;\n        margin-top: 1rem;\n        padding-top: 1rem;\n        border-top: 1px solid #e2e8f0;\n      }\n    </style>\n  </template>\n}\n```\n\n## Best Practices\n\n1. **Enable search for long lists** - Use `@searchEnabled` on Select/MultiSelect\n2. **Provide helpful placeholder text** - Guide users on expected input\n3. **Show validation errors** - Use `@invalid` and `@errorMessage` props\n4. **Handle loading states** - Disable inputs during form submission\n5. **Use appropriate input types** - email, tel, url for better mobile keyboards\n6. **Consider accessibility** - Proper labels, ARIA attributes, keyboard navigation\n7. **Group related fields** - Use fieldsets or visual grouping\n8. **Provide clear feedback** - Show success/error messages after actions\n9. **Test on mobile** - Ensure touch targets are adequate (min 44px)",
+      "content": "# Boxel UI Form Input Elements\n\nBoxel UI provides a comprehensive set of form input components for building interactive forms.\n\n## Input\n\n**Import:**\n```gts\nimport { BoxelInput } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** Standard text input with built-in validation and styling\n\n**Key Props:**\n- `@value` - The input value\n- `@onInput` - Callback when value changes\n- `@placeholder` - Placeholder text\n- `@disabled` - Disable the input\n- `@invalid` - Show error state\n- `@errorMessage` - Error message to display\n- `@helperText` - Helper text below input\n- `@id` - Input ID for label association\n\n**Usage:**\n```gts\n<label class=\"field-label\">\n  Email\n  <BoxelInput\n    @type=\"email\"\n    @value={{this.email}}\n    @onInput={{this.updateEmail}}\n    @placeholder=\"Enter your email\"\n    @invalid={{this.hasError}}\n    @errorMessage=\"Please enter a valid email\"\n  />\n</label>\n```\n\n**Types:**\n- `text` (default)\n- `email`\n- `password`\n- `number`\n- `url`\n- `tel`\n\n## Select\n\n**Import:**\n```gts\nimport { BoxelSelect } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** Dropdown select with search and custom rendering\n\n**Key Props:**\n- `@options` - Array of options to display\n- `@selected` - Currently selected option\n- `@onChange` - Callback when selection changes\n- `@placeholder` - Placeholder text\n- `@searchEnabled` - Enable search/filter functionality\n- `@disabled` - Disable the select\n- `@matchTriggerWidth` - Match dropdown width to trigger\n\n**Basic Usage:**\n```gts\n<div class=\"field-group\">\n  <label>Country</label>\n  <BoxelSelect\n    @options={{this.countries}}\n    @selected={{this.selectedCountry}}\n    @onChange={{this.updateCountry}}\n    @placeholder=\"Select a country\"\n    @searchEnabled={{true}}\n  />\n</div>\n```\n\n**With Custom Rendering:**\n```gts\n<BoxelSelect\n  @options={{this.users}}\n  @selected={{this.selectedUser}}\n  @onChange={{this.updateUser}}\n  @searchEnabled={{true}}\n  as |user|\n>\n  <div class=\"user-option\">\n    <Avatar @userId={{user.id}} @displayName={{user.name}} />\n    <div>\n      <div class=\"user-name\">{{user.name}}</div>\n      <div class=\"user-email\">{{user.email}}</div>\n    </div>\n  </div>\n</BoxelSelect>\n```\n\n## MultiSelect\n\n**Import:**\n```gts\nimport { BoxelMultiSelect } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** Select multiple options from a list\n\n**Key Props:**\n- `@options` - Array of available options\n- `@selected` - Array of selected options\n- `@onChange` - Callback with new selected array\n- `@placeholder` - Placeholder text\n- `@searchEnabled` - Enable search\n- `@disabled` - Disable the component\n\n**Usage:**\n```gts\n<div class=\"field-group\">\n  <label>Tags</label>\n  <BoxelMultiSelect\n    @options={{this.availableTags}}\n    @selected={{this.selectedTags}}\n    @onChange={{this.updateTags}}\n    @placeholder=\"Select tags\"\n    @searchEnabled={{true}}\n  />\n</div>\n```\n\n**With Custom Chip Display:**\n```gts\n<BoxelMultiSelect\n  @options={{this.categories}}\n  @selected={{this.selectedCategories}}\n  @onChange={{this.updateCategories}}\n  as |category|\n>\n  <Pill>{{category.name}}</Pill>\n</BoxelMultiSelect>\n```\n\n## Radio\n\n**Import:**\n```gts\nimport { RadioInput } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** Radio button group for exclusive selection\n\n**Key Props:**\n- `@groupDescription` - Label for the radio group\n- `@items` - Array of radio options\n- `@name` - Name attribute for the radio group\n- `@orientation` - `horizontal` or `vertical` layout\n- `@spacing` - Gap between items (e.g., 'default', 'compact')\n- `@disabled` - Disable all radio buttons\n\n**Usage:**\n```gts\n<div class=\"field-group\">\n  <label>Subscription Plan</label>\n  <RadioInput\n    @groupDescription=\"Choose your plan\"\n    @items={{this.plans}}\n    @name=\"subscription\"\n    @orientation=\"vertical\"\n    @spacing=\"default\"\n  />\n</div>\n```\n\n**With Custom Layout:**\n```gts\n{{#each this.paymentMethods as |method|}}\n  <label class=\"radio-option\">\n    <input\n      type=\"radio\"\n      name=\"payment\"\n      value={{method.id}}\n      checked={{eq this.selectedPayment method.id}}\n      {{on \"change\" (fn this.selectPayment method)}}\n    />\n    <div class=\"radio-content\">\n      <strong>{{method.name}}</strong>\n      <p>{{method.description}}</p>\n    </div>\n  </label>\n{{/each}}\n```\n\n## Switch\n\n**Import:**\n```gts\nimport { BoxelSwitch } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** Toggle switch for boolean values\n\n**Key Props:**\n- `@checked` - Current state (true/false)\n- `@onChange` - Callback when toggled\n- `@disabled` - Disable the switch\n\n**Usage:**\n```gts\n<label class=\"switch-label\">\n  <BoxelSwitch\n    @checked={{this.notificationsEnabled}}\n    @onChange={{this.toggleNotifications}}\n  />\n  <span>Enable notifications</span>\n</label>\n```\n\n## PhoneInput\n\n**Import:**\n```gts\nimport { PhoneInput } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** International phone number input with country selector\n\n**Key Props:**\n- `@value` - Phone number string\n- `@onInput` - Callback when number changes\n- `@defaultCountry` - Default country code (e.g., 'US', 'GB')\n- `@placeholder` - Placeholder text\n- `@disabled` - Disable the input\n\n**Usage:**\n```gts\n<div class=\"field-group\">\n  <label>Phone Number</label>\n  <PhoneInput\n    @value={{this.phoneNumber}}\n    @onInput={{this.updatePhone}}\n    @defaultCountry=\"US\"\n    @placeholder=\"(555) 123-4567\"\n  />\n</div>\n```\n\n**With Validation:**\n```gts\n<div class=\"field-group\">\n  <label>Contact Number</label>\n  <PhoneInput\n    @value={{this.phone}}\n    @onInput={{this.validatePhone}}\n    @invalid={{this.phoneError}}\n  />\n  {{#if this.phoneError}}\n    <span class=\"error-message\">{{this.phoneError}}</span>\n  {{/if}}\n</div>\n```\n\n## DateRangePicker\n\n**Import:**\n```gts\nimport { DateRangePicker } from '@cardstack/boxel-ui/components';\n```\n\n**Purpose:** Select a date range with calendar interface\n\n**Key Props:**\n- `@startDate` - Start date of range\n- `@endDate` - End date of range\n- `@onSelect` - Callback with {startDate, endDate}\n- `@placeholder` - Placeholder text\n- `@disabled` - Disable the picker\n- `@minDate` - Minimum selectable date\n- `@maxDate` - Maximum selectable date\n\n**Usage:**\n```gts\n<div class=\"field-group\">\n  <label>Event Dates</label>\n  <DateRangePicker\n    @startDate={{this.eventStart}}\n    @endDate={{this.eventEnd}}\n    @onSelect={{this.updateDateRange}}\n    @placeholder=\"Select date range\"\n  />\n</div>\n```\n\n**With Constraints:**\n```gts\n<DateRangePicker\n  @startDate={{this.bookingStart}}\n  @endDate={{this.bookingEnd}}\n  @onSelect={{this.updateBooking}}\n  @minDate={{this.today}}\n  @maxDate={{this.maxBookingDate}}\n  @placeholder=\"Check-in \u2192 Check-out\"\n/>\n```\n\n## Complete Form Example\n\n```gts\nimport { Component } from '@cardstack/base/card-api';\nimport { tracked } from '@glimmer/tracking';\nimport { action } from '@ember/object';\nimport {\n  BoxelInput,\n  BoxelSelect,\n  BoxelMultiSelect,\n  RadioInput,\n  BoxelSwitch,\n  PhoneInput,\n  DateRangePicker,\n  Button\n} from '@cardstack/boxel-ui/components';\n\nexport class UserProfileForm extends Component {\n  @tracked name = '';\n  @tracked email = '';\n  @tracked country = null;\n  @tracked interests = [];\n  @tracked accountType = 'personal';\n  @tracked marketingEmails = false;\n  @tracked phone = '';\n  @tracked availableFrom = null;\n  @tracked availableTo = null;\n\n  countries = [\n    { id: 'us', name: 'United States' },\n    { id: 'uk', name: 'United Kingdom' },\n    { id: 'ca', name: 'Canada' }\n  ];\n\n  interestOptions = [\n    { id: 'tech', label: 'Technology' },\n    { id: 'design', label: 'Design' },\n    { id: 'business', label: 'Business' }\n  ];\n\n  accountTypes = [\n    { id: 'personal', label: 'Personal', description: 'For individual use' },\n    { id: 'business', label: 'Business', description: 'For organizations' }\n  ];\n\n  @action\n  updateName(event: Event) {\n    this.name = (event.target as HTMLInputElement).value;\n  }\n\n  @action\n  updateEmail(event: Event) {\n    this.email = (event.target as HTMLInputElement).value;\n  }\n\n  @action\n  updateCountry(country: any) {\n    this.country = country;\n  }\n\n  @action\n  updateInterests(interests: any[]) {\n    this.interests = interests;\n  }\n\n  @action\n  selectAccountType(type: any) {\n    this.accountType = type.id;\n  }\n\n  @action\n  toggleMarketing() {\n    this.marketingEmails = !this.marketingEmails;\n  }\n\n  @action\n  updatePhone(phone: string) {\n    this.phone = phone;\n  }\n\n  @action\n  updateAvailability({startDate, endDate}: {startDate: Date, endDate: Date}) {\n    this.availableFrom = startDate;\n    this.availableTo = endDate;\n  }\n\n  <template>\n    <form class=\"profile-form\">\n      <label class=\"field-label\">\n        Full Name\n        <BoxelInput\n          @value={{this.name}}\n          @onInput={{this.updateName}}\n          @placeholder=\"John Doe\"\n        />\n      </label>\n\n      <label class=\"field-label\">\n        Email\n        <BoxelInput\n          @type=\"email\"\n          @value={{this.email}}\n          @onInput={{this.updateEmail}}\n          @placeholder=\"john@example.com\"\n        />\n      </label>\n\n      <div class=\"field-group\">\n        <label>Country</label>\n        <BoxelSelect\n          @options={{this.countries}}\n          @selected={{this.country}}\n          @onChange={{this.updateCountry}}\n          @placeholder=\"Select your country\"\n          @searchEnabled={{true}}\n        />\n      </div>\n\n      <div class=\"field-group\">\n        <label>Interests</label>\n        <BoxelMultiSelect\n          @options={{this.interestOptions}}\n          @selected={{this.interests}}\n          @onChange={{this.updateInterests}}\n          @placeholder=\"Select your interests\"\n        />\n      </div>\n\n      <div class=\"field-group\">\n        <label>Account Type</label>\n        <RadioInput\n          @groupDescription=\"Choose account type\"\n          @items={{this.accountTypes}}\n          @name=\"accountType\"\n          @orientation=\"vertical\"\n        />\n      </div>\n\n      <div class=\"field-group\">\n        <label>Phone Number</label>\n        <PhoneInput\n          @value={{this.phone}}\n          @onInput={{this.updatePhone}}\n          @defaultCountry=\"US\"\n        />\n      </div>\n\n      <div class=\"field-group\">\n        <label>Availability Period</label>\n        <DateRangePicker\n          @startDate={{this.availableFrom}}\n          @endDate={{this.availableTo}}\n          @onSelect={{this.updateAvailability}}\n          @placeholder=\"Select date range\"\n        />\n      </div>\n\n      <label class=\"switch-container\">\n        <BoxelSwitch\n          @checked={{this.marketingEmails}}\n          @onChange={{this.toggleMarketing}}\n        />\n        <span>Receive marketing emails</span>\n      </label>\n\n      <div class=\"form-actions\">\n        <Button @kind=\"primary\" type=\"submit\">\n          Save Profile\n        </Button>\n        <Button @kind=\"secondary\" type=\"button\">\n          Cancel\n        </Button>\n      </div>\n    </form>\n\n    <style scoped>\n      .profile-form {\n        display: flex;\n        flex-direction: column;\n        gap: 1.5rem;\n        max-width: 600px;\n        padding: 2rem;\n      }\n\n      .field-label {\n        display: flex;\n        flex-direction: column;\n        gap: 0.5rem;\n        font-weight: 500;\n      }\n\n      .field-group {\n        display: flex;\n        flex-direction: column;\n        gap: 0.5rem;\n      }\n\n      .field-group label {\n        font-weight: 500;\n      }\n\n      .switch-container {\n        display: flex;\n        align-items: center;\n        gap: 0.75rem;\n        cursor: pointer;\n      }\n\n      .form-actions {\n        display: flex;\n        gap: 0.75rem;\n        justify-content: flex-end;\n        margin-top: 1rem;\n        padding-top: 1rem;\n        border-top: 1px solid #e2e8f0;\n      }\n    </style>\n  </template>\n}\n```\n\n## Best Practices\n\n1. **Enable search for long lists** - Use `@searchEnabled` on Select/MultiSelect\n2. **Provide helpful placeholder text** - Guide users on expected input\n3. **Show validation errors** - Use `@invalid` and `@errorMessage` props\n4. **Handle loading states** - Disable inputs during form submission\n5. **Use appropriate input types** - email, tel, url for better mobile keyboards\n6. **Consider accessibility** - Proper labels, ARIA attributes, keyboard navigation\n7. **Group related fields** - Use fieldsets or visual grouping\n8. **Provide clear feedback** - Show success/error messages after actions\n9. **Test on mobile** - Ensure touch targets are adequate (min 44px)",
       "cardInfo": {
         "notes": null,
         "name": null,
diff --git a/packages/catalog-realm/Statement/enum-field-config.json b/packages/catalog-realm/Statement/enum-field-config.json
index 90f28b03372..c019f23037d 100644
--- a/packages/catalog-realm/Statement/enum-field-config.json
+++ b/packages/catalog-realm/Statement/enum-field-config.json
@@ -8,7 +8,7 @@
     },
     "type": "card",
     "attributes": {
-      "content": "# Enum Fields and Field Configuration API\n\nBoxel provides powerful mechanisms for creating constrained fields with enumerated values and per-instance field configuration.\n\n## enumField Factory\n\n### Overview\n\nThe `enumField` factory creates a FieldDef subclass with a constrained set of allowed values and a default edit experience (dropdown) powered by Boxel UI. This enables consistent, type-safe enumerations for primitive fields.\n\n### Basic Usage\n\n**Import:**\n```gts\nimport { enumField } from 'https://cardstack.com/base/card-api';\nimport StringField from 'https://cardstack.com/base/string';\n```\n\n**Simple Enum:**\n```gts\nconst PriorityField = enumField(StringField, {\n  options: ['Highest', 'High', 'Medium', 'Low', 'Lowest'],\n});\n\nclass Task extends CardDef {\n  @field priority = contains(PriorityField);\n}\n// PriorityField has edit format that is a dropdown with the enum values\n```\n\n### Rich Options with Labels and Icons\n\nFor enhanced user experience, you can provide rich option objects with custom labels and icons:\n\n```gts\nimport ArrowUpIcon from '@cardstack/boxel-icons/arrow-up';\nimport MinusIcon from '@cardstack/boxel-icons/minus';\nimport ArrowDownIcon from '@cardstack/boxel-icons/arrow-down';\n\nconst PriorityField = enumField(StringField, {\n  options: [\n    { value: 'high', label: 'High', icon: ArrowUpIcon },\n    { value: 'medium', label: 'Medium', icon: MinusIcon },\n    { value: 'low', label: 'Low', icon: ArrowDownIcon },\n  ],\n});\n\nclass Task extends CardDef {\n  @field priority = contains(PriorityField);\n}\n// Edit format renders a dropdown with labeled options and icons\n// Selected trigger shows the chosen label and icon\n```\n\n### API Surface\n\n**Signature:**\n```typescript\nenumField(BaseField, { options, displayName?, icon? }) -> FieldDefConstructor\n```\n\n**Parameters:**\n- `BaseField`: A primitive FieldDefConstructor (e.g., StringField, NumberField)\n- `options`: Array of allowed values as primitives or rich objects `{ value, label?, icon? }`\n- `displayName?`: Optional custom display name for the field class\n- `icon?`: Optional icon for the field class\n\n**Returned Class Properties:**\n- `static enumOptions`: Readonly array of allowed values as provided\n- `static isEnumField = true`: Marker for validation and helpers\n- `static edit`: Default editor using BoxelSelect dropdown\n\n### Introspection Helpers\n\n**enumValues Helper:**\n\nAlways returns an array of primitive values, extracting `option.value` when rich options are configured:\n\n```gts\n<template>\n  {{enumValues @model 'priority'}}\n  {{! Returns: ['high', 'medium', 'low'] }}\n</template>\n```\n\n**enumOptions Helper:**\n\nAlways returns normalized rich option objects `{ value, label, icon? }` for use in templates and tests:\n\n```gts\n<template>\n  {{enumOptions @model 'priority'}}\n  {{! Returns: [{ value: 'high', label: 'High', icon: ArrowUpIcon }, ...] }}\n</template>\n```\n\n### Editing Behavior\n\n- Uses `BoxelSelect` from `@cardstack/boxel-ui/components` for the editor\n- Maps options to select items: label is `String(value)` or provided label\n- Value is the primitive for data storage\n- Defines an atom format that renders the selected option's label and optional icon\n- Uses the enum field's atom view for both select trigger and option row content\n- Respects `@canEdit`; when false, renders a disabled select\n\n### Validation\n\nEnum fields enforce allowed values when setting field values:\n\n- **Detection**: If `field.card.isEnumField`, validation is triggered\n- **Comparison**: Primitive comparison by value\n- **Implementation**: Check in `Contains.validate` to reject values not in `card.enumOptions` when `isEnumField` is true\n\n### Serialization and Querying\n\n- **Serialization**: Primitive enums serialize as primitives via the base field's serializer\n- **Querying**: Query behavior delegates to `getQueryableValue` of the base field type\n- Enum wrapping does not change query shape\n\n## Field Configuration API\n\n### Overview\n\nPer-instance field configuration provides a consistent mechanism for computing configuration for fields (e.g., options, palettes, constraints) while keeping the parent instance private and offering a safe, reactive API.\n\n### API Summary\n\n**Single, Consistent Key: `configuration`**\n\n**Field Definition (FieldDef):**\n```gts\nstatic configuration?: ConfigurationInput<any>\n```\n\n**Field Usage:**\n```gts\ncontains(Field, { configuration?: ConfigurationInput<ParentInstance> })\ncontainsMany(Field, { configuration?: ConfigurationInput<ParentInstance> })\nlinksTo(Card, { configuration?: ConfigurationInput<ParentInstance> })\nlinksToMany(Card, { configuration?: ConfigurationInput<ParentInstance> })\n```\n\n**Where:**\n```typescript\nConfigurationInput<T> = FieldConfiguration | ((self: Readonly<T>) => FieldConfiguration | undefined)\n```\n\n### Configuration Sources and Merging\n\nBoth configuration sources (FieldDef and contains/linksTo) are computed and merged:\n\n**Merge Rules:**\n- Deterministic order: `fromFieldDef` \u2192 `fromFieldUsage`\n- Shallow merge by default (object spread semantics)\n- One-level deep merge for nested objects\n- Arrays are replaced rather than concatenated\n- `undefined` values treated as \"absent\" and don't overwrite existing values\n- If a configuration function throws `NotLoaded`, catch and treat fragment as undefined for current render\n\n### Function Signature and NotLoaded Handling\n\nConfiguration functions have the same signature in both places:\n\n```typescript\n(self: Readonly<T>) => FieldConfiguration | undefined\n```\n\n**Runtime handles reactivity and NotLoaded:**\n- Before invocation, calls `entangleWithCardTracking(self)`\n- Invokes function inside try/catch\n- If accessing `self.someLink` throws `NotLoaded`, treats fragment as undefined for current render\n- Relies on re-render when links load\n- No special context object or `read()` wrapper required\n\n### FieldConfiguration Shape\n\nEach field type defines and validates its own schema. Suggested namespacing pattern:\n\n```typescript\n{\n  validate?: { min?: number; max?: number },\n  presentation?: { palette?: string[] },\n  options?: (primitive | { value; label?; icon? })[]\n}\n```\n\nThe runtime treats FieldConfiguration as an opaque object; the field class interprets it.\n\n### Resolution and Merge\n\n`resolveFieldConfiguration(field, instance)` function:\n\n1. Calls `entangleWithCardTracking(instance)` for reactive recomputation\n2. Computes configuration fragments:\n   - `fromFieldDef`: Evaluates `field.card.constructor.configuration` if present\n   - `fromFieldUsage`: Evaluates `field.configuration` stored by contains/linksTo\n3. Merges available fragments to produce effective configuration\n\n**Caching:**\n- Optionally cache by `(instance, fieldName)` in a WeakMap\n- Invalidate on `notifyCardTracking(instance)` to recompute on next access\n\n### Consumption in Components\n\nEditors and atoms receive merged configuration directly as `@configuration` argument:\n\n```gts\nclass ColorPaletteField extends FieldDef {\n  static edit = class Edit extends Component<typeof this> {\n    <template>\n      {{#each (@configuration.presentation.palette ?? []) as |color|}}\n        <span class='swatch' style={{concat 'background:' color}} />\n      {{/each}}\n    </template>\n  };\n}\n```\n\n**Key Points:**\n- All field/card format components (isolated, embedded, fitted, edit, atom) can read `@configuration`\n- Parent instance is NOT provided to components\u2014only `@configuration`\n- Configuration is intentionally opaque; field authors define the shape\n- Preferred pattern: use injected `@configuration` arg instead of helpers\n\n### Examples\n\n**FieldDef-level Configuration (function form):**\n\n```gts\nclass ColorPaletteField extends FieldDef {\n  static configuration: ConfigurationInput<Card> = function(self) {\n    return {\n      presentation: { palette: self.theme?.palette },\n    };\n  };\n}\n\nclass Card extends CardDef {\n  @field theme = linksTo(Theme);\n  @field color = contains(ColorPaletteField);\n}\n```\n\n**Parent-level Configuration Merged with FieldDef:**\n\n```gts\nclass Card extends CardDef {\n  @field theme = linksTo(Theme);\n  @field color = contains(ColorPaletteField, {\n    configuration: { presentation: { palette: ['red', 'blue'] } },\n  });\n  // Effective configuration merges:\n  //   ColorPaletteField.configuration \u2192 contains(...).configuration\n}\n```\n\n**Dynamic Options from Parent Card:**\n\n```gts\nclass CrmApp extends CardDef {\n  @field globalPriorityOptions = containsMany(StringField);\n}\n\nclass Task extends CardDef {\n  @field crmApp = linksTo(CrmApp);\n  @field priority = contains(PriorityField);\n}\n\nconst PriorityField = enumField(StringField, {\n  options: function(self) {\n    return self.crmApp?.globalPriorityOptions;\n  }\n});\n```\n\n**Validation Based on Merged Configuration:**\n\n```gts\nclass ColorPaletteField extends FieldDef {\n  validate(instance: BaseDef, value: string | null) {\n    let cfg = resolveFieldConfiguration(this, instance);\n    let palette = cfg?.presentation?.palette ?? [];\n    if (value == null) return value;\n    if (!palette.includes(value))\n      throw new Error('color not allowed by palette');\n    return value;\n  }\n}\n```\n\n### Consuming @configuration in Custom Field Components\n\n**Simple Palette Consumer:**\n\n```gts\nimport { FieldDef, Component } from 'https://cardstack.com/base/card-api';\n\nexport class ColorField extends FieldDef {\n  static edit = class Edit extends Component<typeof this> {\n    // Normalize to array to keep template simple\n    get palette(): string[] {\n      return ((this.args.configuration as any)?.presentation?.palette ??\n        []) as string[];\n    }\n\n    <template>\n      {{#if this.palette.length}}\n        <ul class='color-palette' data-test-color-palette>\n          {{#each this.palette as |color|}}\n            <li\n              class='swatch'\n              style={{concat 'background:' color}}\n              data-test-swatch={{color}}\n            />\n          {{/each}}\n        </ul>\n      {{else}}\n        <em data-test-no-palette>palette loading or not configured</em>\n      {{/if}}\n    </template>\n  };\n}\n```\n\n**Options for Select-like Field:**\n\n```gts\nimport { FieldDef, Component } from 'https://cardstack.com/base/card-api';\n\ntype Option = string | { value: string; label?: string };\n\nexport class SelectField extends FieldDef {\n  static edit = class Edit extends Component<typeof this> {\n    get options(): { value: string; label: string }[] {\n      let raw = (this.args.configuration as any)?.options as\n        | Option[]\n        | undefined;\n      if (!raw) return [];\n      return raw.map((o) =>\n        typeof o === 'string'\n          ? { value: o, label: o }\n          : { value: o.value, label: o.label ?? o.value },\n      );\n    }\n\n    <template>\n      <select data-test-select>\n        {{#each this.options as |opt|}}\n          <option value={{opt.value}}>{{opt.label}}</option>\n        {{/each}}\n      </select>\n    </template>\n  };\n}\n```\n\n**Notes:**\n- **Reactivity**: Configuration recomputes automatically when inputs change\n- **Privacy**: Parent instance is not provided to components\u2014only `@configuration`\n- **Types**: Configuration is intentionally opaque; field authors define shape and validate locally\n- **Loading**: If configuration function reads links, may be undefined until links load; guard template accordingly\n\n### Backward Compatibility\n\n- Existing fields continue to work with no configuration\n- Existing `contains(Field)` calls continue to work; configuration option is optional and additive\n- No template changes required\n- Editors/helpers adopt the resolver internally\n\n### Relation to enumField\n\n`enumField` can adopt the configuration mechanism by:\n\n1. Defining `static configuration?: ConfigurationInput<Parent>` that returns `{ options }`\n2. Can be POGO or function accessing links on `self` (may throw `NotLoaded`; runtime tolerates this)\n3. Parent authors can add per-usage configuration via `contains(PriorityField, { configuration })`\n4. Both sources are merged automatically\n\n## Best Practices\n\n1. **Use enumField for constrained value sets** - Provides type safety and consistent UI\n2. **Leverage rich options** - Include labels and icons for better UX\n3. **Use configuration for dynamic options** - When options depend on parent card state\n4. **Guard against loading states** - Configuration may be undefined while links load\n5. **Keep configuration shape documented** - Define clear TypeScript interfaces for field configuration\n6. **Validate against configuration** - Use merged configuration in field `validate()` methods\n7. **Use @configuration argument** - Preferred over helpers for accessing configuration in components",
+      "content": "# Enum Fields and Field Configuration API\n\nBoxel provides powerful mechanisms for creating constrained fields with enumerated values and per-instance field configuration.\n\n## enumField Factory\n\n### Overview\n\nThe `enumField` factory creates a FieldDef subclass with a constrained set of allowed values and a default edit experience (dropdown) powered by Boxel UI. This enables consistent, type-safe enumerations for primitive fields.\n\n### Basic Usage\n\n**Import:**\n```gts\nimport { enumField } from '@cardstack/base/card-api';\nimport StringField from '@cardstack/base/string';\n```\n\n**Simple Enum:**\n```gts\nconst PriorityField = enumField(StringField, {\n  options: ['Highest', 'High', 'Medium', 'Low', 'Lowest'],\n});\n\nclass Task extends CardDef {\n  @field priority = contains(PriorityField);\n}\n// PriorityField has edit format that is a dropdown with the enum values\n```\n\n### Rich Options with Labels and Icons\n\nFor enhanced user experience, you can provide rich option objects with custom labels and icons:\n\n```gts\nimport ArrowUpIcon from '@cardstack/boxel-icons/arrow-up';\nimport MinusIcon from '@cardstack/boxel-icons/minus';\nimport ArrowDownIcon from '@cardstack/boxel-icons/arrow-down';\n\nconst PriorityField = enumField(StringField, {\n  options: [\n    { value: 'high', label: 'High', icon: ArrowUpIcon },\n    { value: 'medium', label: 'Medium', icon: MinusIcon },\n    { value: 'low', label: 'Low', icon: ArrowDownIcon },\n  ],\n});\n\nclass Task extends CardDef {\n  @field priority = contains(PriorityField);\n}\n// Edit format renders a dropdown with labeled options and icons\n// Selected trigger shows the chosen label and icon\n```\n\n### API Surface\n\n**Signature:**\n```typescript\nenumField(BaseField, { options, displayName?, icon? }) -> FieldDefConstructor\n```\n\n**Parameters:**\n- `BaseField`: A primitive FieldDefConstructor (e.g., StringField, NumberField)\n- `options`: Array of allowed values as primitives or rich objects `{ value, label?, icon? }`\n- `displayName?`: Optional custom display name for the field class\n- `icon?`: Optional icon for the field class\n\n**Returned Class Properties:**\n- `static enumOptions`: Readonly array of allowed values as provided\n- `static isEnumField = true`: Marker for validation and helpers\n- `static edit`: Default editor using BoxelSelect dropdown\n\n### Introspection Helpers\n\n**enumValues Helper:**\n\nAlways returns an array of primitive values, extracting `option.value` when rich options are configured:\n\n```gts\n<template>\n  {{enumValues @model 'priority'}}\n  {{! Returns: ['high', 'medium', 'low'] }}\n</template>\n```\n\n**enumOptions Helper:**\n\nAlways returns normalized rich option objects `{ value, label, icon? }` for use in templates and tests:\n\n```gts\n<template>\n  {{enumOptions @model 'priority'}}\n  {{! Returns: [{ value: 'high', label: 'High', icon: ArrowUpIcon }, ...] }}\n</template>\n```\n\n### Editing Behavior\n\n- Uses `BoxelSelect` from `@cardstack/boxel-ui/components` for the editor\n- Maps options to select items: label is `String(value)` or provided label\n- Value is the primitive for data storage\n- Defines an atom format that renders the selected option's label and optional icon\n- Uses the enum field's atom view for both select trigger and option row content\n- Respects `@canEdit`; when false, renders a disabled select\n\n### Validation\n\nEnum fields enforce allowed values when setting field values:\n\n- **Detection**: If `field.card.isEnumField`, validation is triggered\n- **Comparison**: Primitive comparison by value\n- **Implementation**: Check in `Contains.validate` to reject values not in `card.enumOptions` when `isEnumField` is true\n\n### Serialization and Querying\n\n- **Serialization**: Primitive enums serialize as primitives via the base field's serializer\n- **Querying**: Query behavior delegates to `getQueryableValue` of the base field type\n- Enum wrapping does not change query shape\n\n## Field Configuration API\n\n### Overview\n\nPer-instance field configuration provides a consistent mechanism for computing configuration for fields (e.g., options, palettes, constraints) while keeping the parent instance private and offering a safe, reactive API.\n\n### API Summary\n\n**Single, Consistent Key: `configuration`**\n\n**Field Definition (FieldDef):**\n```gts\nstatic configuration?: ConfigurationInput<any>\n```\n\n**Field Usage:**\n```gts\ncontains(Field, { configuration?: ConfigurationInput<ParentInstance> })\ncontainsMany(Field, { configuration?: ConfigurationInput<ParentInstance> })\nlinksTo(Card, { configuration?: ConfigurationInput<ParentInstance> })\nlinksToMany(Card, { configuration?: ConfigurationInput<ParentInstance> })\n```\n\n**Where:**\n```typescript\nConfigurationInput<T> = FieldConfiguration | ((self: Readonly<T>) => FieldConfiguration | undefined)\n```\n\n### Configuration Sources and Merging\n\nBoth configuration sources (FieldDef and contains/linksTo) are computed and merged:\n\n**Merge Rules:**\n- Deterministic order: `fromFieldDef` \u2192 `fromFieldUsage`\n- Shallow merge by default (object spread semantics)\n- One-level deep merge for nested objects\n- Arrays are replaced rather than concatenated\n- `undefined` values treated as \"absent\" and don't overwrite existing values\n- If a configuration function throws `NotLoaded`, catch and treat fragment as undefined for current render\n\n### Function Signature and NotLoaded Handling\n\nConfiguration functions have the same signature in both places:\n\n```typescript\n(self: Readonly<T>) => FieldConfiguration | undefined\n```\n\n**Runtime handles reactivity and NotLoaded:**\n- Before invocation, calls `entangleWithCardTracking(self)`\n- Invokes function inside try/catch\n- If accessing `self.someLink` throws `NotLoaded`, treats fragment as undefined for current render\n- Relies on re-render when links load\n- No special context object or `read()` wrapper required\n\n### FieldConfiguration Shape\n\nEach field type defines and validates its own schema. Suggested namespacing pattern:\n\n```typescript\n{\n  validate?: { min?: number; max?: number },\n  presentation?: { palette?: string[] },\n  options?: (primitive | { value; label?; icon? })[]\n}\n```\n\nThe runtime treats FieldConfiguration as an opaque object; the field class interprets it.\n\n### Resolution and Merge\n\n`resolveFieldConfiguration(field, instance)` function:\n\n1. Calls `entangleWithCardTracking(instance)` for reactive recomputation\n2. Computes configuration fragments:\n   - `fromFieldDef`: Evaluates `field.card.constructor.configuration` if present\n   - `fromFieldUsage`: Evaluates `field.configuration` stored by contains/linksTo\n3. Merges available fragments to produce effective configuration\n\n**Caching:**\n- Optionally cache by `(instance, fieldName)` in a WeakMap\n- Invalidate on `notifyCardTracking(instance)` to recompute on next access\n\n### Consumption in Components\n\nEditors and atoms receive merged configuration directly as `@configuration` argument:\n\n```gts\nclass ColorPaletteField extends FieldDef {\n  static edit = class Edit extends Component<typeof this> {\n    <template>\n      {{#each (@configuration.presentation.palette ?? []) as |color|}}\n        <span class='swatch' style={{concat 'background:' color}} />\n      {{/each}}\n    </template>\n  };\n}\n```\n\n**Key Points:**\n- All field/card format components (isolated, embedded, fitted, edit, atom) can read `@configuration`\n- Parent instance is NOT provided to components\u2014only `@configuration`\n- Configuration is intentionally opaque; field authors define the shape\n- Preferred pattern: use injected `@configuration` arg instead of helpers\n\n### Examples\n\n**FieldDef-level Configuration (function form):**\n\n```gts\nclass ColorPaletteField extends FieldDef {\n  static configuration: ConfigurationInput<Card> = function(self) {\n    return {\n      presentation: { palette: self.theme?.palette },\n    };\n  };\n}\n\nclass Card extends CardDef {\n  @field theme = linksTo(Theme);\n  @field color = contains(ColorPaletteField);\n}\n```\n\n**Parent-level Configuration Merged with FieldDef:**\n\n```gts\nclass Card extends CardDef {\n  @field theme = linksTo(Theme);\n  @field color = contains(ColorPaletteField, {\n    configuration: { presentation: { palette: ['red', 'blue'] } },\n  });\n  // Effective configuration merges:\n  //   ColorPaletteField.configuration \u2192 contains(...).configuration\n}\n```\n\n**Dynamic Options from Parent Card:**\n\n```gts\nclass CrmApp extends CardDef {\n  @field globalPriorityOptions = containsMany(StringField);\n}\n\nclass Task extends CardDef {\n  @field crmApp = linksTo(CrmApp);\n  @field priority = contains(PriorityField);\n}\n\nconst PriorityField = enumField(StringField, {\n  options: function(self) {\n    return self.crmApp?.globalPriorityOptions;\n  }\n});\n```\n\n**Validation Based on Merged Configuration:**\n\n```gts\nclass ColorPaletteField extends FieldDef {\n  validate(instance: BaseDef, value: string | null) {\n    let cfg = resolveFieldConfiguration(this, instance);\n    let palette = cfg?.presentation?.palette ?? [];\n    if (value == null) return value;\n    if (!palette.includes(value))\n      throw new Error('color not allowed by palette');\n    return value;\n  }\n}\n```\n\n### Consuming @configuration in Custom Field Components\n\n**Simple Palette Consumer:**\n\n```gts\nimport { FieldDef, Component } from '@cardstack/base/card-api';\n\nexport class ColorField extends FieldDef {\n  static edit = class Edit extends Component<typeof this> {\n    // Normalize to array to keep template simple\n    get palette(): string[] {\n      return ((this.args.configuration as any)?.presentation?.palette ??\n        []) as string[];\n    }\n\n    <template>\n      {{#if this.palette.length}}\n        <ul class='color-palette' data-test-color-palette>\n          {{#each this.palette as |color|}}\n            <li\n              class='swatch'\n              style={{concat 'background:' color}}\n              data-test-swatch={{color}}\n            />\n          {{/each}}\n        </ul>\n      {{else}}\n        <em data-test-no-palette>palette loading or not configured</em>\n      {{/if}}\n    </template>\n  };\n}\n```\n\n**Options for Select-like Field:**\n\n```gts\nimport { FieldDef, Component } from '@cardstack/base/card-api';\n\ntype Option = string | { value: string; label?: string };\n\nexport class SelectField extends FieldDef {\n  static edit = class Edit extends Component<typeof this> {\n    get options(): { value: string; label: string }[] {\n      let raw = (this.args.configuration as any)?.options as\n        | Option[]\n        | undefined;\n      if (!raw) return [];\n      return raw.map((o) =>\n        typeof o === 'string'\n          ? { value: o, label: o }\n          : { value: o.value, label: o.label ?? o.value },\n      );\n    }\n\n    <template>\n      <select data-test-select>\n        {{#each this.options as |opt|}}\n          <option value={{opt.value}}>{{opt.label}}</option>\n        {{/each}}\n      </select>\n    </template>\n  };\n}\n```\n\n**Notes:**\n- **Reactivity**: Configuration recomputes automatically when inputs change\n- **Privacy**: Parent instance is not provided to components\u2014only `@configuration`\n- **Types**: Configuration is intentionally opaque; field authors define shape and validate locally\n- **Loading**: If configuration function reads links, may be undefined until links load; guard template accordingly\n\n### Backward Compatibility\n\n- Existing fields continue to work with no configuration\n- Existing `contains(Field)` calls continue to work; configuration option is optional and additive\n- No template changes required\n- Editors/helpers adopt the resolver internally\n\n### Relation to enumField\n\n`enumField` can adopt the configuration mechanism by:\n\n1. Defining `static configuration?: ConfigurationInput<Parent>` that returns `{ options }`\n2. Can be POGO or function accessing links on `self` (may throw `NotLoaded`; runtime tolerates this)\n3. Parent authors can add per-usage configuration via `contains(PriorityField, { configuration })`\n4. Both sources are merged automatically\n\n## Best Practices\n\n1. **Use enumField for constrained value sets** - Provides type safety and consistent UI\n2. **Leverage rich options** - Include labels and icons for better UX\n3. **Use configuration for dynamic options** - When options depend on parent card state\n4. **Guard against loading states** - Configuration may be undefined while links load\n5. **Keep configuration shape documented** - Define clear TypeScript interfaces for field configuration\n6. **Validate against configuration** - Use merged configuration in field `validate()` methods\n7. **Use @configuration argument** - Preferred over helpers for accessing configuration in components",
       "cardInfo": {
         "notes": null,
         "name": null,
diff --git a/packages/catalog-realm/Statement/theming-system.json b/packages/catalog-realm/Statement/theming-system.json
index d91307551d2..0ae81af9284 100644
--- a/packages/catalog-realm/Statement/theming-system.json
+++ b/packages/catalog-realm/Statement/theming-system.json
@@ -8,7 +8,7 @@
     },
     "type": "card",
     "attributes": {
-      "content": "# Theming System and CSS Variables\n\nBoxel uses CSS custom properties (variables) for theming. When creating fields, use these variables. \n\nFallback values break with dark mode and custom themes. If fallbacks are needed, define them once on the parent container class rather than repeating them throughout child selectors.\n\n- You must link to a `Theme` card (instances of `https://cardstack.com/base/structured-theme` or its subclasses) to see the theming. Default theme to link to:\n\n```json\n\"relationships\": {\n  \"cardInfo.theme\": {\n    \"links\": {\n      \"self\": \"https://cardstack.com/base/Theme/cardstack-brand-guide\"\n    }\n  }\n}\n```\n\n- Never hardcode colors. Always use CSS custom properties.\n\n**Wrong:**\n```css\nlinear-gradient(180deg, #fef7ed 0%, #fed7aa 100%)\n```\n\n**Correct:**\n```css\nlinear-gradient(180deg, var(--muted) 0%, var(--accent) 100%)\n```\n\n- Do not use rgba() values. Use color-mix() to derive semi-transparent variants from semantic tokens:\n\n- `rgba(255,255,255,0.25)` on primary background → `color-mix(in oklch, var(--primary-foreground) 25%, transparent)`\n\n- Icons and SVGs must not use hardcoded hex fills — use theme color tokens via CSS\n\n## Available Theme Variables\n\n### Shadcn Design System Variables\n\n**Colors:**\n- `--foreground`, `--background`\n- `--primary`, `--primary-foreground`\n- `--secondary`, `--secondary-foreground`\n- `--muted`, `--muted-foreground`\n- `--accent`, `--accent-foreground`\n- `--card`, `--card-foreground`\n- `--popover`, `--popover-foreground`\n- `--destructive`, `--destructive-foreground`\n- `--input`, `--ring`, `--border`\n\n**Charts:** `--chart1`, `--chart2`, `--chart3`, `--chart4`, `--chart5`\n\n**Sidebar:**\n- `--sidebar`, `--sidebar-foreground`\n- `--sidebar-primary`, `--sidebar-primary-foreground`\n- `--sidebar-accent`, `--sidebar-accent-foreground`\n- `--sidebar-border`, `--sidebar-ring`\n\n**Typography:** `--font-sans`, `--font-serif`, `--font-mono`, `--tracking-normal`\n\n#### Note: \n\nFor all cards with Themes linked in their `cardInfo.theme`:\n\n- Font-family defaults to `var(--font-sans,  'IBM Plex, sans-serif)'`\n- Font-size defaults to `var(--boxel-font-size-sm)` which is `0.875rem`\n- Letter-spacing is set to `var(--tracking-normal)`\n- Line-height defaults to `var(--boxel-line-height-sm)` which is `~1.385`\n\n**Layout:** `--radius`, `--spacing`\n\nNote: Radius and spacing are mapped to boxel variables:\n```css\n--boxel-sp: var(calc(--spacing * 4), 1rem);\n/*  --boxel-sp-*[6xs to 6xl] recalculated based on Perfect Fourth scale */\n\n--boxel-border-radius: var(--radius, 0.625rem);\n/* --boxel-border-radius-*[xxs to xxl] recalculated accordingly */\n```\n\n**Shadows:** `--shadow2xs`, `--shadow-xs`, `--shadow-sm`, `--shadow`, `--shadow-md`, `--shadow-lg`, `--shadow-xl`, `--shadow2xl`\n\n### Brand Variables\n\n#### Brand Logos & Icons\n\n- Primary Logo (On light background):\n```css\n--brand-primary-mark-1\n--brand-primary-mark-greyscale-1\n```\n- Primary Logo (On dark background):\n```css\n--brand-primary-mark-2\n--brand-primary-mark-greyscale-2\n```\n- Primary logo padding ratio and min-height requirements:\n```css\n--brand-primary-mark-clearance-ratio\n--brand-primary-mark-min-height\n```\n\n- Secondary Logo (On light background):\n```css\n--brand-secondary-mark-1\n--brand-secondary-mark-greyscale-1\n```\n- Secondary Logo (On dark background):\n```css\n--brand-secondary-mark-2\n--brand-secondary-mark-greyscale-2\n```\n- Secondary logo padding ratio and min-height requirements:\n```css\n--brand-secondary-mark-clearance-ratio\n--brand-secondary-mark-min-height\n```\n\n- Social media icon: `--brand-social-media-profile-icon`\n\n#### Brand colors and Brand to Boxel/Shadcn Mapping\n\nAll css variables above are valid and recalculated based on brand values. In addition, brands can define their own custom css variables in the Brand Guide, linked via `cardInfo.theme`.\n\nThe system automatically maps brand variables to shadcn and Boxel variables:\n\n```css\n--primary: var(--brand-primary);\n--secondary: var(--brand-secondary);\n--muted: var(--brand-neutral);\n--accent: var(--brand-accent);\n--background: var(--brand-light);\n--foreground: var(--brand-dark);\n--border: var(--brand-border);\n\n--boxel-border-radius: var(--radius, 0.625rem);\n/* --boxel-border-radius-*[xxs to xxl] recalculated accordingly */\n\n--boxel-sp: var(calc(--spacing * 4), 1rem);\n/*  --boxel-sp-*[6xs to 6xl] recalculated based on Perfect Fourth scale */\n\n--boxel-font-size: var(--brand-body-font-size, 0.875rem);\n/* --boxel-font-size-*[2xl to 2xs] recalculated */\n\n/* Heading  (h1) */\n--boxel-heading-font-family: var(--brand-heading-font-family, var(--boxel-font-family));\n--boxel-heading-font-size: var(--brand-heading-font-size, var(--boxel-font-size-lg));\n--boxel-heading-font-weight: var(--brand-heading-font-weight, 700);\n--boxel-heading-line-height: var(--brand-heading-line-height, var(--boxel-line-height-lg));\n\n/* Section heading (h2) */\n--boxel-section-heading-font-family: var(--brand-section-heading-font-family, var(--boxel-font-family));\n--boxel-section-heading-font-size: var(--brand-section-heading-font-size, var(--boxel-font-size-md));\n--boxel-section-heading-font-weight: var(--brand-section-heading-font-weight, 500);\n--boxel-section-heading-line-height: var(--brand-section-heading-line-height, var(--boxel-line-height-md));\n\n/* Subheading (h3) */\n--boxel-subheading-font-family: var(--brand-subheading-font-family, var(--boxel-font-family);\n--boxel-subheading-font-size: var(--brand-subheading-font-size, var(--boxel-font-size));\n--boxel-subheading-font-weight: var(--brand-subheading-font-weight, 500);\n--boxel-subheading-line-height: var(--brand-subheading-line-height, var(--boxel-line-height));\n\n/* Body (p) */\n--boxel-body-font-family: var(--brand-body-font-family, var(--boxel-font-family));\n--boxel-body-font-size: var(--brand-body-font-size, var(--boxel-font-size-sm));\n--boxel-body-font-weight: var(--brand-body-font-weight, 400);\n--boxel-body-line-height: var(--brand-body-line-height, var(--boxel-line-height-sm));\n\n/* Caption (small) */\n--boxel-caption-font-family: var(--brand-caption-font-family, var(--boxel-font-family));\n--boxel-caption-font-size: var(--brand-caption-font-size, var(--boxel-font-size-xs));\n--boxel-caption-font-weight: var(--brand-caption-font-weight, 500);\n--boxel-caption-line-height: var(--brand-caption-line-height, var(--boxel-line-height-xs));\n```\n\nIf foreground colors were not manually set, they (`--primary-foreground`, `--secondary-foreground`, `--muted-foreground`, `--accent-foreground`) are automatically determined based on contrast using `--brand-light` and `--brand-dark`.\n\n## Complete Example\n\n```gts\n  <template>\n    <article class='my-card' aria-labelledby='mc-title'>\n      <header class='mc-header'>\n        <h1 class='mc-title' id='mc-title'><@fields.cardTitle /></h1>\n        <p class='mc-summary'><@fields.cardDescription /></p>\n      </header>\n\n      <div class='mc-body'>\n        <div class='mc-main'>\n          <section aria-labelledby='mc-section-1'>\n            <h2 class='mc-section-heading' id='mc-section-1'>Section 1 Title</h2>\n            <p class='mc-prose'>Paragraph</p>\n            <ul class='items-grid'>\n              <li class='section-item'>\n                <h3 class='item-title'>Item 1</h3>\n                <p class='item-content'>Item 1 content</p>\n              </li>\n              <li class='section-item'>\n                <h3 class='item-title'>Item 2</h3>\n                <p class='item-content'>Item 2 content</p>\n              </li>\n              <li class='section-item'>\n                <h3 class='item-title'>Item 3</h3>\n                <p class='item-content'>Item 3 content</p>\n              </li>\n            </ul>\n          </section>\n          <section aria-labelledby='mc-section-2'>\n            <h2 class='mc-section-heading' id='mc-section-2'>Section 2 Title</h2>\n            <p class='mc-prose'>Paragraph</p>\n          </section>\n        </div>\n\n        <aside class='mc-sidebar'>\n          <section\n            class='sidebar-section'\n            aria-labelledby='sidebar-heading-1'\n          >\n            <h2 class='sidebar-heading' id='sidebar-heading-1'>Sidebar Title 1</h2>\n            <ul class='sidebar-list'>\n              <li class='sidebar-item'>\n                <span>Sidebar item 1</span>\n              </li>\n              <li class='sidebar-item'>\n                <span>Sidebar item 2</span>\n              </li>\n              <li class='sidebar-item'>\n                <span>Sidebar item 3</span>\n              </li>\n            </ul>\n          </section>\n\n          <section\n            class='sidebar-section'\n            aria-labelledby='sidebar-heading-2'\n          >\n            <h2 class='sidebar-heading' id='sidebar-heading-2'>Sidebar Title 2</h2>\n            <dl class='sidebar-dl'>\n              <div class='sidebar-dl-row'>\n                <dt>Sidebar item 1</dt>\n                <dd>Content</dd>\n              </div>\n              <div class='sidebar-dl-row'>\n                <dt>Sidebar item 2</dt>\n                <dd>Content</dd>\n              </div>\n            </dl>\n          </section>\n        </aside>\n      </div>\n\n      <footer class='mc-footer'>\n        <p>Footer text</p>\n        <nav aria-label='Footer links'>\n          <ul class='footer-links'>\n            <li><a href='#'>Link 1</a></li>\n            <li><a href='#'>Link 2</a></li>\n            <li><a href='#'>Link 3</a></li>\n          </ul>\n        </nav>\n      </footer>\n    </article>\n    <style scoped>\n      .my-card {\n        container-type: inline-size;\n        container-name: mc-container;\n        height: 100%;\n        overflow-y: auto;\n        padding: var(--boxel-sp-xl);\n        background-color: var(--background);\n        color: var(--foreground);\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-lg);\n        box-sizing: border-box;\n      }\n\n      /* Header */\n      .mc-header {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-xs);\n        border-bottom: 1px solid var(--border);\n        padding-bottom: var(--boxel-sp-lg);\n      }\n      .mc-title {\n        font-size: var(--boxel-font-size-xl);\n        font-weight: 700;\n        letter-spacing: var(--boxel-lsp-xs);\n        margin: 0;\n      }\n      .mc-summary {\n        font-size: var(--boxel-font-size-sm);\n        line-height: var(--boxel-line-height-sm);\n        color: var(--muted-foreground);\n        margin: 0;\n      }\n\n      /* Body: main + sidebar */\n      .mc-body {\n        display: grid;\n        grid-template-columns: 1fr 16rem;\n        gap: var(--boxel-sp-lg);\n        align-items: start;\n      }\n\n      /* Main column */\n      .mc-main {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-xl);\n      }\n      .mc-main section {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-sm);\n      }\n      .mc-prose {\n        font-size: var(--boxel-font-size-sm);\n        line-height: var(--boxel-line-height);\n        color: var(--foreground);\n        margin: 0;\n      }\n      .mc-section-heading {\n        font-size: var(--boxel-font-size-lg);\n        font-weight: 600;\n        margin: 0;\n      }\n\n      /* Items grid */\n      .items-grid {\n        list-style: none;\n        margin: 0;\n        padding: 0;\n        display: grid;\n        grid-template-columns: repeat(auto-fill, minmax(12rem, 1fr));\n        gap: var(--boxel-sp);\n      }\n      .section-item {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-xs);\n        background-color: var(--card);\n        color: var(--card-foreground);\n        padding: var(--boxel-sp);\n        border: 1px solid var(--border);\n        border-radius: var(--boxel-border-radius);\n        box-shadow: var(--shadow);\n      }\n      .item-title {\n        font-size: var(--boxel-font-size-sm);\n        font-weight: 600;\n        margin: 0;\n      }\n      .item-content {\n        font-size: var(--boxel-font-size-xs);\n        color: var(--muted-foreground);\n        margin: 0;\n        line-height: var(--boxel-line-height-sm);\n      }\n\n      /* Sidebar */\n      .mc-sidebar {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp);\n        background-color: var(--sidebar);\n        color: var(--sidebar-foreground);\n        border: 1px solid var(--sidebar-border);\n        border-radius: var(--boxel-border-radius);\n        padding: var(--boxel-sp);\n      }\n      .sidebar-section {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-xs);\n      }\n      .sidebar-section + .sidebar-section {\n        border-top: 1px solid var(--sidebar-border);\n        padding-top: var(--boxel-sp);\n      }\n      .sidebar-heading {\n        font-size: var(--boxel-font-size-xs);\n        font-weight: 600;\n        text-transform: uppercase;\n        letter-spacing: var(--boxel-lsp-lg);\n        margin: 0;\n      }\n      .sidebar-list {\n        list-style: none;\n        margin: 0;\n        padding: 0;\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-5xs);\n      }\n      .sidebar-item {\n        display: flex;\n        align-items: center;\n        gap: var(--boxel-sp-5xs);\n        font-size: var(--boxel-font-size-sm);\n      }\n\n      /* Definition list */\n      .sidebar-dl {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-5xs);\n        margin: 0;\n      }\n      .sidebar-dl-row {\n        display: flex;\n        justify-content: space-between;\n        font-size: var(--boxel-font-size-xs);\n      }\n      .sidebar-dl-row dt {\n        color: var(--muted-foreground);\n      }\n      .sidebar-dl-row dd {\n        margin: 0;\n        font-weight: 500;\n      }\n\n      /* Footer */\n      .mc-footer {\n        border-top: 1px solid var(--border);\n        padding-top: var(--boxel-sp-sm);\n        font-size: var(--boxel-font-size-xs);\n        color: var(--muted-foreground);\n        display: flex;\n        flex-wrap: wrap;\n        align-items: center;\n        justify-content: center;\n        gap: var(--boxel-sp-xs);\n      }\n      .mc-footer p {\n        font-size: inherit;\n        margin: 0;\n      }\n      .footer-links {\n        list-style: none;\n        margin: 0;\n        padding: 0;\n        display: flex;\n        align-items: center;\n        gap: 0;\n      }\n      .footer-links li + li::before {\n        content: '·';\n        margin-inline: var(--boxel-sp-xs);\n      }\n      .mc-footer a {\n        color: var(--muted-foreground);\n        text-decoration: underline;\n        text-underline-offset: 2px;\n      }\n      .mc-footer a:hover {\n        color: var(--foreground);\n      }\n\n      /* Responsive: stack on narrow containers */\n      @container mc-container (max-width: 600px) {\n        .mc-body {\n          grid-template-columns: 1fr;\n        }\n      }\n    </style>\n  </template>\n```\n\n## Key Principles\n\n1. No hard-coded colors — use CSS custom properties\n2. Respect spacing system — Use `calc(var(--spacing) * n)` or `boxel-sp-* [6xs to 6xl]`  for consistency\n3. Always prefer boxel-ui components over raw HTML elements. Read the component API in the monorepo.\n4. No `@import url(...)` inside style tag. Font-families are imported automatically by the linked theme.",
+      "content": "# Theming System and CSS Variables\n\nBoxel uses CSS custom properties (variables) for theming. When creating fields, use these variables. \n\nFallback values break with dark mode and custom themes. If fallbacks are needed, define them once on the parent container class rather than repeating them throughout child selectors.\n\n- You must link to a `Theme` card (instances of `@cardstack/base/structured-theme` or its subclasses) to see the theming. Default theme to link to:\n\n```json\n\"relationships\": {\n  \"cardInfo.theme\": {\n    \"links\": {\n      \"self\": \"@cardstack/base/Theme/cardstack-brand-guide\"\n    }\n  }\n}\n```\n\n- Never hardcode colors. Always use CSS custom properties.\n\n**Wrong:**\n```css\nlinear-gradient(180deg, #fef7ed 0%, #fed7aa 100%)\n```\n\n**Correct:**\n```css\nlinear-gradient(180deg, var(--muted) 0%, var(--accent) 100%)\n```\n\n- Do not use rgba() values. Use color-mix() to derive semi-transparent variants from semantic tokens:\n\n- `rgba(255,255,255,0.25)` on primary background → `color-mix(in oklch, var(--primary-foreground) 25%, transparent)`\n\n- Icons and SVGs must not use hardcoded hex fills — use theme color tokens via CSS\n\n## Available Theme Variables\n\n### Shadcn Design System Variables\n\n**Colors:**\n- `--foreground`, `--background`\n- `--primary`, `--primary-foreground`\n- `--secondary`, `--secondary-foreground`\n- `--muted`, `--muted-foreground`\n- `--accent`, `--accent-foreground`\n- `--card`, `--card-foreground`\n- `--popover`, `--popover-foreground`\n- `--destructive`, `--destructive-foreground`\n- `--input`, `--ring`, `--border`\n\n**Charts:** `--chart1`, `--chart2`, `--chart3`, `--chart4`, `--chart5`\n\n**Sidebar:**\n- `--sidebar`, `--sidebar-foreground`\n- `--sidebar-primary`, `--sidebar-primary-foreground`\n- `--sidebar-accent`, `--sidebar-accent-foreground`\n- `--sidebar-border`, `--sidebar-ring`\n\n**Typography:** `--font-sans`, `--font-serif`, `--font-mono`, `--tracking-normal`\n\n#### Note: \n\nFor all cards with Themes linked in their `cardInfo.theme`:\n\n- Font-family defaults to `var(--font-sans,  'IBM Plex, sans-serif)'`\n- Font-size defaults to `var(--boxel-font-size-sm)` which is `0.875rem`\n- Letter-spacing is set to `var(--tracking-normal)`\n- Line-height defaults to `var(--boxel-line-height-sm)` which is `~1.385`\n\n**Layout:** `--radius`, `--spacing`\n\nNote: Radius and spacing are mapped to boxel variables:\n```css\n--boxel-sp: var(calc(--spacing * 4), 1rem);\n/*  --boxel-sp-*[6xs to 6xl] recalculated based on Perfect Fourth scale */\n\n--boxel-border-radius: var(--radius, 0.625rem);\n/* --boxel-border-radius-*[xxs to xxl] recalculated accordingly */\n```\n\n**Shadows:** `--shadow2xs`, `--shadow-xs`, `--shadow-sm`, `--shadow`, `--shadow-md`, `--shadow-lg`, `--shadow-xl`, `--shadow2xl`\n\n### Brand Variables\n\n#### Brand Logos & Icons\n\n- Primary Logo (On light background):\n```css\n--brand-primary-mark-1\n--brand-primary-mark-greyscale-1\n```\n- Primary Logo (On dark background):\n```css\n--brand-primary-mark-2\n--brand-primary-mark-greyscale-2\n```\n- Primary logo padding ratio and min-height requirements:\n```css\n--brand-primary-mark-clearance-ratio\n--brand-primary-mark-min-height\n```\n\n- Secondary Logo (On light background):\n```css\n--brand-secondary-mark-1\n--brand-secondary-mark-greyscale-1\n```\n- Secondary Logo (On dark background):\n```css\n--brand-secondary-mark-2\n--brand-secondary-mark-greyscale-2\n```\n- Secondary logo padding ratio and min-height requirements:\n```css\n--brand-secondary-mark-clearance-ratio\n--brand-secondary-mark-min-height\n```\n\n- Social media icon: `--brand-social-media-profile-icon`\n\n#### Brand colors and Brand to Boxel/Shadcn Mapping\n\nAll css variables above are valid and recalculated based on brand values. In addition, brands can define their own custom css variables in the Brand Guide, linked via `cardInfo.theme`.\n\nThe system automatically maps brand variables to shadcn and Boxel variables:\n\n```css\n--primary: var(--brand-primary);\n--secondary: var(--brand-secondary);\n--muted: var(--brand-neutral);\n--accent: var(--brand-accent);\n--background: var(--brand-light);\n--foreground: var(--brand-dark);\n--border: var(--brand-border);\n\n--boxel-border-radius: var(--radius, 0.625rem);\n/* --boxel-border-radius-*[xxs to xxl] recalculated accordingly */\n\n--boxel-sp: var(calc(--spacing * 4), 1rem);\n/*  --boxel-sp-*[6xs to 6xl] recalculated based on Perfect Fourth scale */\n\n--boxel-font-size: var(--brand-body-font-size, 0.875rem);\n/* --boxel-font-size-*[2xl to 2xs] recalculated */\n\n/* Heading  (h1) */\n--boxel-heading-font-family: var(--brand-heading-font-family, var(--boxel-font-family));\n--boxel-heading-font-size: var(--brand-heading-font-size, var(--boxel-font-size-lg));\n--boxel-heading-font-weight: var(--brand-heading-font-weight, 700);\n--boxel-heading-line-height: var(--brand-heading-line-height, var(--boxel-line-height-lg));\n\n/* Section heading (h2) */\n--boxel-section-heading-font-family: var(--brand-section-heading-font-family, var(--boxel-font-family));\n--boxel-section-heading-font-size: var(--brand-section-heading-font-size, var(--boxel-font-size-md));\n--boxel-section-heading-font-weight: var(--brand-section-heading-font-weight, 500);\n--boxel-section-heading-line-height: var(--brand-section-heading-line-height, var(--boxel-line-height-md));\n\n/* Subheading (h3) */\n--boxel-subheading-font-family: var(--brand-subheading-font-family, var(--boxel-font-family);\n--boxel-subheading-font-size: var(--brand-subheading-font-size, var(--boxel-font-size));\n--boxel-subheading-font-weight: var(--brand-subheading-font-weight, 500);\n--boxel-subheading-line-height: var(--brand-subheading-line-height, var(--boxel-line-height));\n\n/* Body (p) */\n--boxel-body-font-family: var(--brand-body-font-family, var(--boxel-font-family));\n--boxel-body-font-size: var(--brand-body-font-size, var(--boxel-font-size-sm));\n--boxel-body-font-weight: var(--brand-body-font-weight, 400);\n--boxel-body-line-height: var(--brand-body-line-height, var(--boxel-line-height-sm));\n\n/* Caption (small) */\n--boxel-caption-font-family: var(--brand-caption-font-family, var(--boxel-font-family));\n--boxel-caption-font-size: var(--brand-caption-font-size, var(--boxel-font-size-xs));\n--boxel-caption-font-weight: var(--brand-caption-font-weight, 500);\n--boxel-caption-line-height: var(--brand-caption-line-height, var(--boxel-line-height-xs));\n```\n\nIf foreground colors were not manually set, they (`--primary-foreground`, `--secondary-foreground`, `--muted-foreground`, `--accent-foreground`) are automatically determined based on contrast using `--brand-light` and `--brand-dark`.\n\n## Complete Example\n\n```gts\n  <template>\n    <article class='my-card' aria-labelledby='mc-title'>\n      <header class='mc-header'>\n        <h1 class='mc-title' id='mc-title'><@fields.cardTitle /></h1>\n        <p class='mc-summary'><@fields.cardDescription /></p>\n      </header>\n\n      <div class='mc-body'>\n        <div class='mc-main'>\n          <section aria-labelledby='mc-section-1'>\n            <h2 class='mc-section-heading' id='mc-section-1'>Section 1 Title</h2>\n            <p class='mc-prose'>Paragraph</p>\n            <ul class='items-grid'>\n              <li class='section-item'>\n                <h3 class='item-title'>Item 1</h3>\n                <p class='item-content'>Item 1 content</p>\n              </li>\n              <li class='section-item'>\n                <h3 class='item-title'>Item 2</h3>\n                <p class='item-content'>Item 2 content</p>\n              </li>\n              <li class='section-item'>\n                <h3 class='item-title'>Item 3</h3>\n                <p class='item-content'>Item 3 content</p>\n              </li>\n            </ul>\n          </section>\n          <section aria-labelledby='mc-section-2'>\n            <h2 class='mc-section-heading' id='mc-section-2'>Section 2 Title</h2>\n            <p class='mc-prose'>Paragraph</p>\n          </section>\n        </div>\n\n        <aside class='mc-sidebar'>\n          <section\n            class='sidebar-section'\n            aria-labelledby='sidebar-heading-1'\n          >\n            <h2 class='sidebar-heading' id='sidebar-heading-1'>Sidebar Title 1</h2>\n            <ul class='sidebar-list'>\n              <li class='sidebar-item'>\n                <span>Sidebar item 1</span>\n              </li>\n              <li class='sidebar-item'>\n                <span>Sidebar item 2</span>\n              </li>\n              <li class='sidebar-item'>\n                <span>Sidebar item 3</span>\n              </li>\n            </ul>\n          </section>\n\n          <section\n            class='sidebar-section'\n            aria-labelledby='sidebar-heading-2'\n          >\n            <h2 class='sidebar-heading' id='sidebar-heading-2'>Sidebar Title 2</h2>\n            <dl class='sidebar-dl'>\n              <div class='sidebar-dl-row'>\n                <dt>Sidebar item 1</dt>\n                <dd>Content</dd>\n              </div>\n              <div class='sidebar-dl-row'>\n                <dt>Sidebar item 2</dt>\n                <dd>Content</dd>\n              </div>\n            </dl>\n          </section>\n        </aside>\n      </div>\n\n      <footer class='mc-footer'>\n        <p>Footer text</p>\n        <nav aria-label='Footer links'>\n          <ul class='footer-links'>\n            <li><a href='#'>Link 1</a></li>\n            <li><a href='#'>Link 2</a></li>\n            <li><a href='#'>Link 3</a></li>\n          </ul>\n        </nav>\n      </footer>\n    </article>\n    <style scoped>\n      .my-card {\n        container-type: inline-size;\n        container-name: mc-container;\n        height: 100%;\n        overflow-y: auto;\n        padding: var(--boxel-sp-xl);\n        background-color: var(--background);\n        color: var(--foreground);\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-lg);\n        box-sizing: border-box;\n      }\n\n      /* Header */\n      .mc-header {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-xs);\n        border-bottom: 1px solid var(--border);\n        padding-bottom: var(--boxel-sp-lg);\n      }\n      .mc-title {\n        font-size: var(--boxel-font-size-xl);\n        font-weight: 700;\n        letter-spacing: var(--boxel-lsp-xs);\n        margin: 0;\n      }\n      .mc-summary {\n        font-size: var(--boxel-font-size-sm);\n        line-height: var(--boxel-line-height-sm);\n        color: var(--muted-foreground);\n        margin: 0;\n      }\n\n      /* Body: main + sidebar */\n      .mc-body {\n        display: grid;\n        grid-template-columns: 1fr 16rem;\n        gap: var(--boxel-sp-lg);\n        align-items: start;\n      }\n\n      /* Main column */\n      .mc-main {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-xl);\n      }\n      .mc-main section {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-sm);\n      }\n      .mc-prose {\n        font-size: var(--boxel-font-size-sm);\n        line-height: var(--boxel-line-height);\n        color: var(--foreground);\n        margin: 0;\n      }\n      .mc-section-heading {\n        font-size: var(--boxel-font-size-lg);\n        font-weight: 600;\n        margin: 0;\n      }\n\n      /* Items grid */\n      .items-grid {\n        list-style: none;\n        margin: 0;\n        padding: 0;\n        display: grid;\n        grid-template-columns: repeat(auto-fill, minmax(12rem, 1fr));\n        gap: var(--boxel-sp);\n      }\n      .section-item {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-xs);\n        background-color: var(--card);\n        color: var(--card-foreground);\n        padding: var(--boxel-sp);\n        border: 1px solid var(--border);\n        border-radius: var(--boxel-border-radius);\n        box-shadow: var(--shadow);\n      }\n      .item-title {\n        font-size: var(--boxel-font-size-sm);\n        font-weight: 600;\n        margin: 0;\n      }\n      .item-content {\n        font-size: var(--boxel-font-size-xs);\n        color: var(--muted-foreground);\n        margin: 0;\n        line-height: var(--boxel-line-height-sm);\n      }\n\n      /* Sidebar */\n      .mc-sidebar {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp);\n        background-color: var(--sidebar);\n        color: var(--sidebar-foreground);\n        border: 1px solid var(--sidebar-border);\n        border-radius: var(--boxel-border-radius);\n        padding: var(--boxel-sp);\n      }\n      .sidebar-section {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-xs);\n      }\n      .sidebar-section + .sidebar-section {\n        border-top: 1px solid var(--sidebar-border);\n        padding-top: var(--boxel-sp);\n      }\n      .sidebar-heading {\n        font-size: var(--boxel-font-size-xs);\n        font-weight: 600;\n        text-transform: uppercase;\n        letter-spacing: var(--boxel-lsp-lg);\n        margin: 0;\n      }\n      .sidebar-list {\n        list-style: none;\n        margin: 0;\n        padding: 0;\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-5xs);\n      }\n      .sidebar-item {\n        display: flex;\n        align-items: center;\n        gap: var(--boxel-sp-5xs);\n        font-size: var(--boxel-font-size-sm);\n      }\n\n      /* Definition list */\n      .sidebar-dl {\n        display: flex;\n        flex-direction: column;\n        gap: var(--boxel-sp-5xs);\n        margin: 0;\n      }\n      .sidebar-dl-row {\n        display: flex;\n        justify-content: space-between;\n        font-size: var(--boxel-font-size-xs);\n      }\n      .sidebar-dl-row dt {\n        color: var(--muted-foreground);\n      }\n      .sidebar-dl-row dd {\n        margin: 0;\n        font-weight: 500;\n      }\n\n      /* Footer */\n      .mc-footer {\n        border-top: 1px solid var(--border);\n        padding-top: var(--boxel-sp-sm);\n        font-size: var(--boxel-font-size-xs);\n        color: var(--muted-foreground);\n        display: flex;\n        flex-wrap: wrap;\n        align-items: center;\n        justify-content: center;\n        gap: var(--boxel-sp-xs);\n      }\n      .mc-footer p {\n        font-size: inherit;\n        margin: 0;\n      }\n      .footer-links {\n        list-style: none;\n        margin: 0;\n        padding: 0;\n        display: flex;\n        align-items: center;\n        gap: 0;\n      }\n      .footer-links li + li::before {\n        content: '·';\n        margin-inline: var(--boxel-sp-xs);\n      }\n      .mc-footer a {\n        color: var(--muted-foreground);\n        text-decoration: underline;\n        text-underline-offset: 2px;\n      }\n      .mc-footer a:hover {\n        color: var(--foreground);\n      }\n\n      /* Responsive: stack on narrow containers */\n      @container mc-container (max-width: 600px) {\n        .mc-body {\n          grid-template-columns: 1fr;\n        }\n      }\n    </style>\n  </template>\n```\n\n## Key Principles\n\n1. No hard-coded colors — use CSS custom properties\n2. Respect spacing system — Use `calc(var(--spacing) * n)` or `boxel-sp-* [6xs to 6xl]`  for consistency\n3. Always prefer boxel-ui components over raw HTML elements. Read the component API in the monorepo.\n4. No `@import url(...)` inside style tag. Font-families are imported automatically by the linked theme.",
       "cardInfo": {
         "name": "Theming System and CSS Variables",
         "notes": null,
diff --git a/packages/catalog-realm/SubmissionCardPortal/b535d5fb-8eef-44a6-8114-4bce6929b95a.json b/packages/catalog-realm/SubmissionCardPortal/b535d5fb-8eef-44a6-8114-4bce6929b95a.json
new file mode 100644
index 00000000000..0495fb0b9f9
--- /dev/null
+++ b/packages/catalog-realm/SubmissionCardPortal/b535d5fb-8eef-44a6-8114-4bce6929b95a.json
@@ -0,0 +1,26 @@
+{
+  "data": {
+    "meta": {
+      "adoptsFrom": {
+        "name": "SubmissionCardPortal",
+        "module": "../submission-card/submission-card-portal"
+      }
+    },
+    "type": "card",
+    "attributes": {
+      "cardInfo": {
+        "name": "Submission Card Portal",
+        "notes": null,
+        "summary": null,
+        "cardThumbnailURL": null
+      }
+    },
+    "relationships": {
+      "cardInfo.theme": {
+        "links": {
+          "self": "@cardstack/base/Theme/cardstack-brand-guide"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/catalog-realm/SystemCard/9ccb154a-aa08-4442-a3a4-3623446bfefb.json b/packages/catalog-realm/SystemCard/9ccb154a-aa08-4442-a3a4-3623446bfefb.json
index 763eff4c4d0..f1804a3e265 100644
--- a/packages/catalog-realm/SystemCard/9ccb154a-aa08-4442-a3a4-3623446bfefb.json
+++ b/packages/catalog-realm/SystemCard/9ccb154a-aa08-4442-a3a4-3623446bfefb.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "SystemCard",
-        "module": "https://cardstack.com/base/system-card"
+        "module": "@cardstack/base/system-card"
       }
     },
     "type": "card",
diff --git a/packages/catalog-realm/SystemCard/default.json b/packages/catalog-realm/SystemCard/default.json
index e85d37624fe..af796fc3629 100644
--- a/packages/catalog-realm/SystemCard/default.json
+++ b/packages/catalog-realm/SystemCard/default.json
@@ -133,7 +133,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/system-card",
+        "module": "@cardstack/base/system-card",
         "name": "SystemCard"
       }
     }
diff --git a/packages/catalog-realm/Theme/github-pr-brand-guide.json b/packages/catalog-realm/Theme/github-pr-brand-guide.json
index 4e34eaafa71..bdfffcb539a 100644
--- a/packages/catalog-realm/Theme/github-pr-brand-guide.json
+++ b/packages/catalog-realm/Theme/github-pr-brand-guide.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "default",
-        "module": "https://cardstack.com/base/brand-guide"
+        "module": "@cardstack/base/brand-guide"
       }
     },
     "type": "card",
diff --git a/packages/catalog-realm/ThemeListing/4d6390f1-3bae-4e75-a95d-4309010e03e4.json b/packages/catalog-realm/ThemeListing/4d6390f1-3bae-4e75-a95d-4309010e03e4.json
index f02d4aa4a30..31783c71075 100644
--- a/packages/catalog-realm/ThemeListing/4d6390f1-3bae-4e75-a95d-4309010e03e4.json
+++ b/packages/catalog-realm/ThemeListing/4d6390f1-3bae-4e75-a95d-4309010e03e4.json
@@ -55,7 +55,7 @@
       },
       "examples.0": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       },
       "categories.0": {
@@ -65,7 +65,7 @@
       },
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/catalog-realm/ThemeListing/f87667d9-7616-4baf-b2fe-8ce5d393f676.json b/packages/catalog-realm/ThemeListing/f87667d9-7616-4baf-b2fe-8ce5d393f676.json
index 98c9913a3ce..aece710b5c6 100644
--- a/packages/catalog-realm/ThemeListing/f87667d9-7616-4baf-b2fe-8ce5d393f676.json
+++ b/packages/catalog-realm/ThemeListing/f87667d9-7616-4baf-b2fe-8ce5d393f676.json
@@ -55,7 +55,7 @@
       },
       "examples.0": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/cardstack-brand-guide"
+          "self": "@cardstack/base/Theme/cardstack-brand-guide"
         }
       },
       "categories.0": {
@@ -65,7 +65,7 @@
       },
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/cardstack-brand-guide"
+          "self": "@cardstack/base/Theme/cardstack-brand-guide"
         }
       }
     }
diff --git a/packages/catalog-realm/adventure/Skill/adventure-game-master.json b/packages/catalog-realm/adventure/Skill/adventure-game-master.json
index 40478c4eae6..665b7840a76 100644
--- a/packages/catalog-realm/adventure/Skill/adventure-game-master.json
+++ b/packages/catalog-realm/adventure/Skill/adventure-game-master.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Skill",
-        "module": "https://cardstack.com/base/skill"
+        "module": "@cardstack/base/skill"
       }
     },
     "type": "card",
diff --git a/packages/catalog-realm/adventure/Skill/suggestion-action-helper.json b/packages/catalog-realm/adventure/Skill/suggestion-action-helper.json
index bbe8a5672b2..d9ec0ee5a1b 100644
--- a/packages/catalog-realm/adventure/Skill/suggestion-action-helper.json
+++ b/packages/catalog-realm/adventure/Skill/suggestion-action-helper.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Skill",
-        "module": "https://cardstack.com/base/skill"
+        "module": "@cardstack/base/skill"
       }
     },
     "type": "card",
diff --git a/packages/catalog-realm/adventure/adventure-scenario.gts b/packages/catalog-realm/adventure/adventure-scenario.gts
index 175efe70366..365b5c97cb9 100644
--- a/packages/catalog-realm/adventure/adventure-scenario.gts
+++ b/packages/catalog-realm/adventure/adventure-scenario.gts
@@ -4,8 +4,8 @@ import {
   field,
   contains,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import BookOpenIcon from '@cardstack/boxel-icons/book-open';
 
 export class AdventureScenario extends CardDef {
diff --git a/packages/catalog-realm/adventure/adventure.gts b/packages/catalog-realm/adventure/adventure.gts
index f63ec2ed891..84ae7301206 100644
--- a/packages/catalog-realm/adventure/adventure.gts
+++ b/packages/catalog-realm/adventure/adventure.gts
@@ -9,13 +9,13 @@ import {
   realmURL,
   linksTo,
   FieldDef,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
 
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import NumberField from 'https://cardstack.com/base/number';
+import MarkdownField from '@cardstack/base/markdown';
+import DateTimeField from '@cardstack/base/datetime';
+import BooleanField from '@cardstack/base/boolean';
+import NumberField from '@cardstack/base/number';
 import { Button } from '@cardstack/boxel-ui/components';
 import { eq, gt, or, not, and } from '@cardstack/boxel-ui/helpers';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/ai-layout-board/ai-layout-board.gts b/packages/catalog-realm/ai-layout-board/ai-layout-board.gts
index 7aedc6c729e..ee9131fd985 100644
--- a/packages/catalog-realm/ai-layout-board/ai-layout-board.gts
+++ b/packages/catalog-realm/ai-layout-board/ai-layout-board.gts
@@ -4,9 +4,9 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import {
   eq,
   and,
diff --git a/packages/catalog-realm/ai-layout-board/fields/board-item.gts b/packages/catalog-realm/ai-layout-board/fields/board-item.gts
index cda47af388a..142695f5d6b 100644
--- a/packages/catalog-realm/ai-layout-board/fields/board-item.gts
+++ b/packages/catalog-realm/ai-layout-board/fields/board-item.gts
@@ -5,10 +5,10 @@ import {
   Component,
   FieldDef,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import UrlField from 'https://cardstack.com/base/url';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import UrlField from '@cardstack/base/url';
+import DateTimeField from '@cardstack/base/datetime';
 import { BoardPosition } from './board-position';
 import { action } from '@ember/object';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/ai-layout-board/fields/board-position.gts b/packages/catalog-realm/ai-layout-board/fields/board-position.gts
index 1b370b344e1..fb79a2fa9f6 100644
--- a/packages/catalog-realm/ai-layout-board/fields/board-position.gts
+++ b/packages/catalog-realm/ai-layout-board/fields/board-position.gts
@@ -3,9 +3,9 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
 import { action } from '@ember/object';
 import { on } from '@ember/modifier';
 import { eq } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/airbnb-listing/airbnb-listing.gts b/packages/catalog-realm/airbnb-listing/airbnb-listing.gts
index 5f1d152d7c2..d214f3f41b3 100644
--- a/packages/catalog-realm/airbnb-listing/airbnb-listing.gts
+++ b/packages/catalog-realm/airbnb-listing/airbnb-listing.gts
@@ -5,8 +5,8 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
 import NumberField from '../fields/number'; // ² Import catalog number field
 import RatingField from '../fields/rating'; // ³ Import catalog rating field
 import MultipleImageField from '../fields/multiple-image'; // ⁴ Import catalog multiple image field
diff --git a/packages/catalog-realm/annotation/annotation.gts b/packages/catalog-realm/annotation/annotation.gts
index 7969d9fc1ce..1cf3b310f3b 100644
--- a/packages/catalog-realm/annotation/annotation.gts
+++ b/packages/catalog-realm/annotation/annotation.gts
@@ -5,10 +5,10 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import UrlField from '@cardstack/base/url';
 import { Button } from '@cardstack/boxel-ui/components'; // ² UI components
 import { fn, concat, array } from '@ember/helper';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/app/app.gts b/packages/catalog-realm/app/app.gts
index e8aae3823aa..8abc38be16c 100644
--- a/packages/catalog-realm/app/app.gts
+++ b/packages/catalog-realm/app/app.gts
@@ -1,4 +1,4 @@
-import { CardDef } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
 
 export class AppCard extends CardDef {
   static displayName = 'App Card';
diff --git a/packages/catalog-realm/app/data-explorer.gts b/packages/catalog-realm/app/data-explorer.gts
index e1d4cba3698..54441c39857 100644
--- a/packages/catalog-realm/app/data-explorer.gts
+++ b/packages/catalog-realm/app/data-explorer.gts
@@ -3,15 +3,15 @@ import {
   field,
   contains,
   type CreateCardFn,
-} from 'https://cardstack.com/base/card-api';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import { AbsoluteCodeRefField } from 'https://cardstack.com/base/code-ref';
+} from '@cardstack/base/card-api';
+import BooleanField from '@cardstack/base/boolean';
+import { AbsoluteCodeRefField } from '@cardstack/base/code-ref';
 import { realmURL, type CodeRef } from '@cardstack/runtime-common';
 
 import { Table } from '../components/table';
 import { AppCard } from './app';
 import { LoadingIndicator } from '@cardstack/boxel-ui/components';
-import { CardCrudFunctionsConsumer } from 'https://cardstack.com/base/field-component';
+import { CardCrudFunctionsConsumer } from '@cardstack/base/field-component';
 
 import type { Query } from '@cardstack/runtime-common';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/catalog-realm/astral-garden/astral-garden.gts b/packages/catalog-realm/astral-garden/astral-garden.gts
index 71aa26ecc6b..b970866bae7 100644
--- a/packages/catalog-realm/astral-garden/astral-garden.gts
+++ b/packages/catalog-realm/astral-garden/astral-garden.gts
@@ -6,10 +6,10 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import DateField from 'https://cardstack.com/base/date';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown';
+import DateField from '@cardstack/base/date';
 import { Button } from '@cardstack/boxel-ui/components';
 import { formatDateTime, eq } from '@cardstack/boxel-ui/helpers';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/avatar-creator/avatar-creator.gts b/packages/catalog-realm/avatar-creator/avatar-creator.gts
index cfbb0b3edcb..b37528138a5 100644
--- a/packages/catalog-realm/avatar-creator/avatar-creator.gts
+++ b/packages/catalog-realm/avatar-creator/avatar-creator.gts
@@ -3,8 +3,8 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import UserIcon from '@cardstack/boxel-icons/user';
 import Avatar from '../fields/avatar';
diff --git a/packages/catalog-realm/base-entity/game.gts b/packages/catalog-realm/base-entity/game.gts
index cc12616fc91..c115d80c994 100644
--- a/packages/catalog-realm/base-entity/game.gts
+++ b/packages/catalog-realm/base-entity/game.gts
@@ -1,7 +1,7 @@
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
 
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown';
 
 import GamepadIcon from '@cardstack/boxel-icons/gamepad-2';
 
diff --git a/packages/catalog-realm/base-entity/music-album.gts b/packages/catalog-realm/base-entity/music-album.gts
index 3303755a6b1..f85d35e448a 100644
--- a/packages/catalog-realm/base-entity/music-album.gts
+++ b/packages/catalog-realm/base-entity/music-album.gts
@@ -1,6 +1,6 @@
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import MusicIcon from '@cardstack/boxel-icons/music';
 
 export class MusicAlbumCard extends CardDef {
diff --git a/packages/catalog-realm/base-entity/song.gts b/packages/catalog-realm/base-entity/song.gts
index 9fa4bff3742..e028ebbb315 100644
--- a/packages/catalog-realm/base-entity/song.gts
+++ b/packages/catalog-realm/base-entity/song.gts
@@ -1,5 +1,5 @@
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import MusicIcon from '@cardstack/boxel-icons/music';
 
 export class Song extends CardDef {
diff --git a/packages/catalog-realm/beat-maker/beat-maker.gts b/packages/catalog-realm/beat-maker/beat-maker.gts
index 944bf63d95f..9109f4b511d 100644
--- a/packages/catalog-realm/beat-maker/beat-maker.gts
+++ b/packages/catalog-realm/beat-maker/beat-maker.gts
@@ -6,9 +6,9 @@ import {
   linksTo,
   linksToMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import MusicIcon from '@cardstack/boxel-icons/music';
 import { Button } from '@cardstack/boxel-ui/components';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/catalog-realm/birthday-card/birthday-card.gts b/packages/catalog-realm/birthday-card/birthday-card.gts
index 008ff8bb36f..f93f344d71a 100644
--- a/packages/catalog-realm/birthday-card/birthday-card.gts
+++ b/packages/catalog-realm/birthday-card/birthday-card.gts
@@ -6,11 +6,11 @@ import {
   containsMany,
   Component,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateField from 'https://cardstack.com/base/date';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateField from '@cardstack/base/date';
+import TextAreaField from '@cardstack/base/text-area';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { Button } from '@cardstack/boxel-ui/components';
diff --git a/packages/catalog-realm/blackjack/blackjack.gts b/packages/catalog-realm/blackjack/blackjack.gts
index f0a8751bc72..b3083f16950 100644
--- a/packages/catalog-realm/blackjack/blackjack.gts
+++ b/packages/catalog-realm/blackjack/blackjack.gts
@@ -6,7 +6,7 @@ import {
   containsMany,
   linksTo,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import RecordGameResultCommand from '../commands/record-game-result';
 import {
   GameResult,
@@ -22,9 +22,9 @@ import type Owner from '@ember/owner';
 import { fn } from '@ember/helper';
 import { on } from '@ember/modifier';
 import { eq, not } from '@cardstack/boxel-ui/helpers';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
 import ValidationSteps, {
   type ValidationStep,
 } from '../components/validation-steps';
diff --git a/packages/catalog-realm/blog-app/author.gts b/packages/catalog-realm/blog-app/author.gts
index 4949c0abe8e..fece22e3795 100644
--- a/packages/catalog-realm/blog-app/author.gts
+++ b/packages/catalog-realm/blog-app/author.gts
@@ -1,5 +1,5 @@
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+import MarkdownField from '@cardstack/base/markdown';
+import TextAreaField from '@cardstack/base/text-area';
 import {
   Component,
   CardDef,
@@ -8,8 +8,8 @@ import {
   containsMany,
   linksTo,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-import EmailField from 'https://cardstack.com/base/email';
+} from '@cardstack/base/card-api';
+import EmailField from '@cardstack/base/email';
 
 import Email from '@cardstack/boxel-icons/mail';
 import Linkedin from '@cardstack/boxel-icons/linkedin';
diff --git a/packages/catalog-realm/blog-app/blog-app.gts b/packages/catalog-realm/blog-app/blog-app.gts
index c142e1edc5a..cac2982537b 100644
--- a/packages/catalog-realm/blog-app/blog-app.gts
+++ b/packages/catalog-realm/blog-app/blog-app.gts
@@ -13,7 +13,7 @@ import {
   contains,
   StringField,
   type CardContext,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import {
   type LooseSingleCardDocument,
diff --git a/packages/catalog-realm/blog-app/blog-category.gts b/packages/catalog-realm/blog-app/blog-category.gts
index 27908b0943a..f912cdb4d95 100644
--- a/packages/catalog-realm/blog-app/blog-category.gts
+++ b/packages/catalog-realm/blog-app/blog-category.gts
@@ -4,9 +4,9 @@ import {
   Component,
   CardDef,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import ColorField from '@cardstack/base/color';
 import { BlogApp as BlogAppCard } from './blog-app';
 import { htmlSafe } from '@ember/template';
 import { cssVar, getContrastColor } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/blog-app/blog-post.gts b/packages/catalog-realm/blog-app/blog-post.gts
index 1348f41a0b2..7d01addec2a 100644
--- a/packages/catalog-realm/blog-app/blog-post.gts
+++ b/packages/catalog-realm/blog-app/blog-post.gts
@@ -1,7 +1,7 @@
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import NumberField from 'https://cardstack.com/base/number';
+import DateTimeField from '@cardstack/base/datetime';
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown';
+import NumberField from '@cardstack/base/number';
 import {
   CardDef,
   field,
@@ -10,7 +10,7 @@ import {
   Component,
   getCardMeta,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import CalendarCog from '@cardstack/boxel-icons/calendar-cog';
 import BlogIcon from '@cardstack/boxel-icons/notebook';
diff --git a/packages/catalog-realm/blog-app/user.gts b/packages/catalog-realm/blog-app/user.gts
index 913119795f7..bb013fbb683 100644
--- a/packages/catalog-realm/blog-app/user.gts
+++ b/packages/catalog-realm/blog-app/user.gts
@@ -3,7 +3,7 @@ import {
   StringField,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export class User extends CardDef {
   static displayName = 'User';
diff --git a/packages/catalog-realm/book-recommender/book-recommender.gts b/packages/catalog-realm/book-recommender/book-recommender.gts
index 4b38d2253c5..08d4b5c4a0a 100644
--- a/packages/catalog-realm/book-recommender/book-recommender.gts
+++ b/packages/catalog-realm/book-recommender/book-recommender.gts
@@ -5,11 +5,11 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown';
+import BooleanField from '@cardstack/base/boolean';
+import UrlField from '@cardstack/base/url';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/calendar/calendar.gts b/packages/catalog-realm/calendar/calendar.gts
index 8a465b81af0..e57aa4f1718 100644
--- a/packages/catalog-realm/calendar/calendar.gts
+++ b/packages/catalog-realm/calendar/calendar.gts
@@ -6,12 +6,12 @@ import {
   Component,
   realmURL,
   linksTo,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateField from 'https://cardstack.com/base/date';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateField from '@cardstack/base/date';
+import DateTimeField from '@cardstack/base/datetime';
+import TextAreaField from '@cardstack/base/text-area';
 import { Button } from '@cardstack/boxel-ui/components'; // ² UI components
 import { fn, concat } from '@ember/helper';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/car-configurator-ev/car-configurator-ev.gts b/packages/catalog-realm/car-configurator-ev/car-configurator-ev.gts
index 10fd5f58ee9..32c3ac55247 100644
--- a/packages/catalog-realm/car-configurator-ev/car-configurator-ev.gts
+++ b/packages/catalog-realm/car-configurator-ev/car-configurator-ev.gts
@@ -5,11 +5,11 @@ import {
   field,
   contains,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import UrlField from '@cardstack/base/url';
 import { on } from '@ember/modifier';
 import { BoxelButton, BoxelSelect } from '@cardstack/boxel-ui/components';
 import { eq } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/catalog-app/catalog.gts b/packages/catalog-realm/catalog-app/catalog.gts
index 26e3ccd6b4f..480f1ea2bd9 100644
--- a/packages/catalog-realm/catalog-app/catalog.gts
+++ b/packages/catalog-realm/catalog-app/catalog.gts
@@ -12,14 +12,14 @@ import {
   type BaseDef,
   linksToMany,
   realmURL,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import {
   Query,
   isCardInstance,
   AnyFilter,
   Filter,
 } from '@cardstack/runtime-common';
-import StringField from 'https://cardstack.com/base/string';
+import StringField from '@cardstack/base/string';
 
 import FilterSidebar, { type FilterItem } from './components/filter-section';
 import ShowcaseView from './components/showcase-view';
diff --git a/packages/catalog-realm/catalog-app/components/card-with-hydration.gts b/packages/catalog-realm/catalog-app/components/card-with-hydration.gts
index c9cb6c23501..6ea0b302c87 100644
--- a/packages/catalog-realm/catalog-app/components/card-with-hydration.gts
+++ b/packages/catalog-realm/catalog-app/components/card-with-hydration.gts
@@ -8,7 +8,7 @@ import {
   type CardContext,
   type BaseDef,
   type BoxComponent,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import { type PrerenderedCardLike } from '@cardstack/runtime-common';
 
diff --git a/packages/catalog-realm/catalog-app/components/cards-display-section.gts b/packages/catalog-realm/catalog-app/components/cards-display-section.gts
index 933cfc78d44..0ba208e164f 100644
--- a/packages/catalog-realm/catalog-app/components/cards-display-section.gts
+++ b/packages/catalog-realm/catalog-app/components/cards-display-section.gts
@@ -4,7 +4,7 @@ import {
   CardDef,
   type BaseDef,
   type CardContext,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import { CardContainer } from '@cardstack/boxel-ui/components';
 
diff --git a/packages/catalog-realm/catalog-app/components/choose-realm-action.gts b/packages/catalog-realm/catalog-app/components/choose-realm-action.gts
index 8a5b115811a..ded7445ce65 100644
--- a/packages/catalog-realm/catalog-app/components/choose-realm-action.gts
+++ b/packages/catalog-realm/catalog-app/components/choose-realm-action.gts
@@ -8,7 +8,7 @@ import {
   Menu as BoxelMenu,
 } from '@cardstack/boxel-ui/components';
 import { MenuItem } from '@cardstack/boxel-ui/helpers';
-import { CardContext } from 'https://cardstack.com/base/card-api';
+import { CardContext } from '@cardstack/base/card-api';
 import { task } from 'ember-concurrency';
 
 interface ChooseRealmActionSignature {
diff --git a/packages/catalog-realm/catalog-app/components/grid.gts b/packages/catalog-realm/catalog-app/components/grid.gts
index 08bdfdb8923..d528c958439 100644
--- a/packages/catalog-realm/catalog-app/components/grid.gts
+++ b/packages/catalog-realm/catalog-app/components/grid.gts
@@ -1,5 +1,5 @@
 import GlimmerComponent from '@glimmer/component';
-import { type CardContext } from 'https://cardstack.com/base/card-api';
+import { type CardContext } from '@cardstack/base/card-api';
 import { eq } from '@cardstack/boxel-ui/helpers';
 
 import { type Query } from '@cardstack/runtime-common';
diff --git a/packages/catalog-realm/catalog-app/components/list-view.gts b/packages/catalog-realm/catalog-app/components/list-view.gts
index 49b4e7d1b4c..9131ebf5a3c 100644
--- a/packages/catalog-realm/catalog-app/components/list-view.gts
+++ b/packages/catalog-realm/catalog-app/components/list-view.gts
@@ -1,6 +1,6 @@
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
-import { CardContext } from 'https://cardstack.com/base/card-api';
+import { CardContext } from '@cardstack/base/card-api';
 import { Query } from '@cardstack/runtime-common';
 import GlimmerComponent from '@glimmer/component';
 
diff --git a/packages/catalog-realm/catalog-app/components/listing-fitted.gts b/packages/catalog-realm/catalog-app/components/listing-fitted.gts
index 1a09b1bd66c..19ce7d33750 100644
--- a/packages/catalog-realm/catalog-app/components/listing-fitted.gts
+++ b/packages/catalog-realm/catalog-app/components/listing-fitted.gts
@@ -1,9 +1,9 @@
-import { Component, realmURL } from 'https://cardstack.com/base/card-api';
-import { commandData } from 'https://cardstack.com/base/resources/command-data';
+import { Component, realmURL } from '@cardstack/base/card-api';
+import { commandData } from '@cardstack/base/resources/command-data';
 import type {
   GetAllRealmMetasResult,
   RealmMetaField,
-} from 'https://cardstack.com/base/command';
+} from '@cardstack/base/command';
 
 import { type Listing } from '../listing/listing';
 
diff --git a/packages/catalog-realm/catalog-app/components/showcase-view.gts b/packages/catalog-realm/catalog-app/components/showcase-view.gts
index 9dccd7d62ed..430ea0436f1 100644
--- a/packages/catalog-realm/catalog-app/components/showcase-view.gts
+++ b/packages/catalog-realm/catalog-app/components/showcase-view.gts
@@ -1,4 +1,4 @@
-import { CardDef, CardContext } from 'https://cardstack.com/base/card-api';
+import { CardDef, CardContext } from '@cardstack/base/card-api';
 import GlimmerComponent from '@glimmer/component';
 
 import CardsDisplaySection, {
diff --git a/packages/catalog-realm/catalog-app/listing/category.gts b/packages/catalog-realm/catalog-app/listing/category.gts
index efd91acfbf8..5fe4096ca86 100644
--- a/packages/catalog-realm/catalog-app/listing/category.gts
+++ b/packages/catalog-realm/catalog-app/listing/category.gts
@@ -4,7 +4,7 @@ import {
   contains,
   StringField,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import { Sphere } from './sphere';
 
diff --git a/packages/catalog-realm/catalog-app/listing/license.gts b/packages/catalog-realm/catalog-app/listing/license.gts
index 64cb855aaf2..ecaf2f14271 100644
--- a/packages/catalog-realm/catalog-app/listing/license.gts
+++ b/packages/catalog-realm/catalog-app/listing/license.gts
@@ -3,8 +3,8 @@ import {
   field,
   contains,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+} from '@cardstack/base/card-api';
+import TextAreaField from '@cardstack/base/text-area';
 
 export class License extends CardDef {
   static displayName = 'License';
diff --git a/packages/catalog-realm/catalog-app/listing/listing.gts b/packages/catalog-realm/catalog-app/listing/listing.gts
index 5cd35fe2c94..3ce615af978 100644
--- a/packages/catalog-realm/catalog-app/listing/listing.gts
+++ b/packages/catalog-realm/catalog-app/listing/listing.gts
@@ -10,15 +10,15 @@ import {
   instanceOf,
   realmURL,
   type GetMenuItemParams,
-} from 'https://cardstack.com/base/card-api';
-import { commandData } from 'https://cardstack.com/base/resources/command-data';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import { Spec } from 'https://cardstack.com/base/spec';
-import { Skill } from 'https://cardstack.com/base/skill';
+} from '@cardstack/base/card-api';
+import { commandData } from '@cardstack/base/resources/command-data';
+import MarkdownField from '@cardstack/base/markdown';
+import { Spec } from '@cardstack/base/spec';
+import { Skill } from '@cardstack/base/skill';
 import type {
   GetAllRealmMetasResult,
   RealmMetaField,
-} from 'https://cardstack.com/base/command';
+} from '@cardstack/base/command';
 
 import { fn } from '@ember/helper';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/catalog-app/listing/publisher.gts b/packages/catalog-realm/catalog-app/listing/publisher.gts
index bb7989b037c..4d2589fbc25 100644
--- a/packages/catalog-realm/catalog-app/listing/publisher.gts
+++ b/packages/catalog-realm/catalog-app/listing/publisher.gts
@@ -1,5 +1,5 @@
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import { StringField } from 'https://cardstack.com/base/card-api';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import { StringField } from '@cardstack/base/card-api';
 
 export class Publisher extends CardDef {
   static displayName = 'Publisher';
diff --git a/packages/catalog-realm/catalog-app/listing/review.gts b/packages/catalog-realm/catalog-app/listing/review.gts
index d0737bc09f8..850eeb4cde8 100644
--- a/packages/catalog-realm/catalog-app/listing/review.gts
+++ b/packages/catalog-realm/catalog-app/listing/review.gts
@@ -3,9 +3,9 @@ import {
   field,
   contains,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import MarkdownField from '@cardstack/base/markdown';
 
 import { Listing } from './listing';
 
diff --git a/packages/catalog-realm/catalog-app/listing/sphere.gts b/packages/catalog-realm/catalog-app/listing/sphere.gts
index 37fd5b1a62f..b07934d8a04 100644
--- a/packages/catalog-realm/catalog-app/listing/sphere.gts
+++ b/packages/catalog-realm/catalog-app/listing/sphere.gts
@@ -3,7 +3,7 @@ import {
   field,
   contains,
   StringField,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export class Sphere extends CardDef {
   static displayName = 'Sphere';
diff --git a/packages/catalog-realm/catalog-app/listing/tag.gts b/packages/catalog-realm/catalog-app/listing/tag.gts
index 9a442de331a..5435edf72e4 100644
--- a/packages/catalog-realm/catalog-app/listing/tag.gts
+++ b/packages/catalog-realm/catalog-app/listing/tag.gts
@@ -4,8 +4,8 @@ import {
   contains,
   field,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import ColorField from '@cardstack/base/color';
 import TagIcon from '@cardstack/boxel-icons/tag';
 import { Pill } from '@cardstack/boxel-ui/components';
 
diff --git a/packages/catalog-realm/catalog-app/resources/helpers/listing-action-resolver.gts b/packages/catalog-realm/catalog-app/resources/helpers/listing-action-resolver.gts
index bd94c503e75..610396cbeed 100644
--- a/packages/catalog-realm/catalog-app/resources/helpers/listing-action-resolver.gts
+++ b/packages/catalog-realm/catalog-app/resources/helpers/listing-action-resolver.gts
@@ -1,4 +1,4 @@
-import { CardContext } from 'https://cardstack.com/base/card-api';
+import { CardContext } from '@cardstack/base/card-api';
 import { Listing } from '../../listing/listing';
 
 import UseAiAssistantCommand from '@cardstack/boxel-host/commands/ai-assistant';
diff --git a/packages/catalog-realm/catalog-app/resources/listing-actions.gts b/packages/catalog-realm/catalog-app/resources/listing-actions.gts
index ce5b232273c..c9132153a09 100644
--- a/packages/catalog-realm/catalog-app/resources/listing-actions.gts
+++ b/packages/catalog-realm/catalog-app/resources/listing-actions.gts
@@ -1,5 +1,5 @@
 import { resource } from 'ember-resources';
-import { CardContext } from 'https://cardstack.com/base/card-api';
+import { CardContext } from '@cardstack/base/card-api';
 import { Listing } from '../listing/listing';
 import {
   resolveListingActions,
diff --git a/packages/catalog-realm/chess/chess.gts b/packages/catalog-realm/chess/chess.gts
index 549c907ed51..1f1bf905a31 100644
--- a/packages/catalog-realm/chess/chess.gts
+++ b/packages/catalog-realm/chess/chess.gts
@@ -1,10 +1,10 @@
 import {
   Component as BoxelComponent,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import Component from '@glimmer/component';
-import StringField from 'https://cardstack.com/base/string';
-import { contains, field } from 'https://cardstack.com/base/card-api';
+import StringField from '@cardstack/base/string';
+import { contains, field } from '@cardstack/base/card-api';
 import { on } from '@ember/modifier';
 import { cn } from '@cardstack/boxel-ui/helpers';
 import { not } from '@cardstack/boxel-ui/helpers';
@@ -37,7 +37,7 @@ import {
 import Modifier from 'ember-modifier';
 import { Resource } from 'ember-modify-based-class-resource';
 
-import BooleanField from 'https://cardstack.com/base/boolean';
+import BooleanField from '@cardstack/base/boolean';
 import { tracked } from '@glimmer/tracking';
 import ChessIcon from '@cardstack/boxel-icons/chess';
 
diff --git a/packages/catalog-realm/chord-progression/chord-progression.gts b/packages/catalog-realm/chord-progression/chord-progression.gts
index 424bab1e3a4..5089c0b7682 100644
--- a/packages/catalog-realm/chord-progression/chord-progression.gts
+++ b/packages/catalog-realm/chord-progression/chord-progression.gts
@@ -7,9 +7,9 @@ import {
   Component,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import MusicIcon from '@cardstack/boxel-icons/music';
 import { Button } from '@cardstack/boxel-ui/components';
 import { gt, eq, add, lt } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/chrome-rebel/chrome-rebel.gts b/packages/catalog-realm/chrome-rebel/chrome-rebel.gts
index 5be3e7c14cf..8a33a9e0547 100644
--- a/packages/catalog-realm/chrome-rebel/chrome-rebel.gts
+++ b/packages/catalog-realm/chrome-rebel/chrome-rebel.gts
@@ -3,10 +3,10 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
 import MotorcycleIcon from '@cardstack/boxel-icons/bike';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/packages/catalog-realm/cloudflare-image.gts b/packages/catalog-realm/cloudflare-image.gts
index e7c05758135..ffa3e150dab 100644
--- a/packages/catalog-realm/cloudflare-image.gts
+++ b/packages/catalog-realm/cloudflare-image.gts
@@ -1,7 +1,7 @@
-import ImageCard from 'https://cardstack.com/base/image';
-import { contains, field } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import UrlField from 'https://cardstack.com/base/url';
+import ImageCard from '@cardstack/base/image';
+import { contains, field } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import UrlField from '@cardstack/base/url';
 
 export const CLOUDFLARE_ACCOUNT_ID = '4a94a1eb2d21bbbe160234438a49f687';
 
diff --git a/packages/catalog-realm/cocktail-recipe/cocktail-recipe.gts b/packages/catalog-realm/cocktail-recipe/cocktail-recipe.gts
index 6988f04b8f9..be3b4a52109 100644
--- a/packages/catalog-realm/cocktail-recipe/cocktail-recipe.gts
+++ b/packages/catalog-realm/cocktail-recipe/cocktail-recipe.gts
@@ -4,10 +4,10 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import TextAreaField from '@cardstack/base/text-area';
 import { IngredientField } from './fields/ingredient-field';
 import { GarnishField } from './fields/garnish-field';
 import GlassIcon from '@cardstack/boxel-icons/wine';
diff --git a/packages/catalog-realm/cocktail-recipe/fields/garnish-field.gts b/packages/catalog-realm/cocktail-recipe/fields/garnish-field.gts
index e343125b599..eba633c2c1d 100644
--- a/packages/catalog-realm/cocktail-recipe/fields/garnish-field.gts
+++ b/packages/catalog-realm/cocktail-recipe/fields/garnish-field.gts
@@ -3,8 +3,8 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import LemonIcon from '@cardstack/boxel-icons/cherry';
 import { fn } from '@ember/helper';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/cocktail-recipe/fields/ingredient-field.gts b/packages/catalog-realm/cocktail-recipe/fields/ingredient-field.gts
index 219bf5d61ca..5ca72ffae5a 100644
--- a/packages/catalog-realm/cocktail-recipe/fields/ingredient-field.gts
+++ b/packages/catalog-realm/cocktail-recipe/fields/ingredient-field.gts
@@ -3,9 +3,9 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import BottleIcon from '@cardstack/boxel-icons/wine';
 import { fn } from '@ember/helper';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/commands/collect-submission-files.ts b/packages/catalog-realm/commands/collect-submission-files.ts
index 78be2aae99a..60d07e6f4ff 100644
--- a/packages/catalog-realm/commands/collect-submission-files.ts
+++ b/packages/catalog-realm/commands/collect-submission-files.ts
@@ -18,8 +18,8 @@ import {
   CardDef,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import GetCardCommand from '@cardstack/boxel-host/commands/get-card';
 import ReadSourceCommand from '@cardstack/boxel-host/commands/read-source';
 import SerializeCardCommand from '@cardstack/boxel-host/commands/serialize-card';
diff --git a/packages/catalog-realm/commands/create-pr-card.ts b/packages/catalog-realm/commands/create-pr-card.ts
index bd8422e5046..1401b9c4693 100644
--- a/packages/catalog-realm/commands/create-pr-card.ts
+++ b/packages/catalog-realm/commands/create-pr-card.ts
@@ -1,9 +1,9 @@
 import { Command } from '@cardstack/runtime-common';
 
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import StringField from 'https://cardstack.com/base/string';
-import { JsonField } from 'https://cardstack.com/base/commands/search-card-result';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import MarkdownField from '@cardstack/base/markdown';
+import StringField from '@cardstack/base/string';
+import { JsonField } from '@cardstack/base/commands/search-card-result';
 import SaveCardCommand from '@cardstack/boxel-host/commands/save-card';
 
 import { FileContentField } from '../fields/file-content';
diff --git a/packages/catalog-realm/commands/create-real-image.gts b/packages/catalog-realm/commands/create-real-image.gts
index 87c4c35d6b7..d975e8220ae 100644
--- a/packages/catalog-realm/commands/create-real-image.gts
+++ b/packages/catalog-realm/commands/create-real-image.gts
@@ -1,5 +1,5 @@
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import { Command } from '@cardstack/runtime-common';
 import SendRequestViaProxyCommand from '@cardstack/boxel-host/commands/send-request-via-proxy';
diff --git a/packages/catalog-realm/commands/export-album-command.ts b/packages/catalog-realm/commands/export-album-command.ts
index 916e9945f9d..b1c0866318e 100644
--- a/packages/catalog-realm/commands/export-album-command.ts
+++ b/packages/catalog-realm/commands/export-album-command.ts
@@ -7,8 +7,8 @@ import {
   field,
   contains,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { Command } from '@cardstack/runtime-common';
 
 class ExportAlbumInput extends CardDef {
diff --git a/packages/catalog-realm/commands/export-product-catalog.ts b/packages/catalog-realm/commands/export-product-catalog.ts
index 58292721570..35ac2f6e367 100644
--- a/packages/catalog-realm/commands/export-product-catalog.ts
+++ b/packages/catalog-realm/commands/export-product-catalog.ts
@@ -6,8 +6,8 @@ import {
   field,
   contains,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import { ProductCatalog } from '../product-rotater/components/product-catalog';
 import { ProductRotationImage } from '../product-rotater/components/product-rotation-image';
diff --git a/packages/catalog-realm/commands/generate-daily-report.gts b/packages/catalog-realm/commands/generate-daily-report.gts
index 0b6a858b790..b1ba2c76307 100644
--- a/packages/catalog-realm/commands/generate-daily-report.gts
+++ b/packages/catalog-realm/commands/generate-daily-report.gts
@@ -3,9 +3,9 @@ import {
   field,
   contains,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import DateField from 'https://cardstack.com/base/date';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import DateField from '@cardstack/base/date';
 import UseAiAssistantCommand from '@cardstack/boxel-host/commands/ai-assistant';
 import {
   Command,
diff --git a/packages/catalog-realm/commands/generate-image-command.gts b/packages/catalog-realm/commands/generate-image-command.gts
index e6b6dc1e0af..b208e98efce 100644
--- a/packages/catalog-realm/commands/generate-image-command.gts
+++ b/packages/catalog-realm/commands/generate-image-command.gts
@@ -1,6 +1,6 @@
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import UrlField from 'https://cardstack.com/base/url';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import UrlField from '@cardstack/base/url';
 import { Command } from '@cardstack/runtime-common';
 import SendRequestViaProxyCommand from '@cardstack/boxel-host/commands/send-request-via-proxy';
 import UploadImageCommand from './upload-image';
diff --git a/packages/catalog-realm/commands/generate-images-rotation.gts b/packages/catalog-realm/commands/generate-images-rotation.gts
index a7c776fbe73..6b9641d3f92 100644
--- a/packages/catalog-realm/commands/generate-images-rotation.gts
+++ b/packages/catalog-realm/commands/generate-images-rotation.gts
@@ -2,8 +2,8 @@ import {
   CardDef,
   field,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import { Command } from '@cardstack/runtime-common';
 import SendRequestViaProxyCommand from '@cardstack/boxel-host/commands/send-request-via-proxy';
diff --git a/packages/catalog-realm/commands/process-github-event.gts b/packages/catalog-realm/commands/process-github-event.gts
index 3a441f3f098..3feac611ef9 100644
--- a/packages/catalog-realm/commands/process-github-event.gts
+++ b/packages/catalog-realm/commands/process-github-event.gts
@@ -1,6 +1,6 @@
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import { JsonField } from 'https://cardstack.com/base/commands/search-card-result';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import { JsonField } from '@cardstack/base/commands/search-card-result';
 import { Command } from '@cardstack/runtime-common';
 import SaveCardCommand from '@cardstack/boxel-host/commands/save-card';
 import { GithubEventCard } from '../github-event/github-event';
diff --git a/packages/catalog-realm/commands/record-game-result.gts b/packages/catalog-realm/commands/record-game-result.gts
index b2197757136..cbac03cdfec 100644
--- a/packages/catalog-realm/commands/record-game-result.gts
+++ b/packages/catalog-realm/commands/record-game-result.gts
@@ -3,8 +3,8 @@ import {
   field,
   contains,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { Command } from '@cardstack/runtime-common';
 import { GameResult } from '../game-result/game-result';
 import SaveCardCommand from '@cardstack/boxel-host/commands/save-card';
diff --git a/packages/catalog-realm/commands/suggest-avatar.gts b/packages/catalog-realm/commands/suggest-avatar.gts
index be59822b5b5..f548b26d39d 100644
--- a/packages/catalog-realm/commands/suggest-avatar.gts
+++ b/packages/catalog-realm/commands/suggest-avatar.gts
@@ -1,5 +1,5 @@
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import UseAiAssistantCommand from '@cardstack/boxel-host/commands/ai-assistant';
 import SetActiveLLMCommand from '@cardstack/boxel-host/commands/set-active-llm';
 import { Command, DEFAULT_CODING_LLM } from '@cardstack/runtime-common';
diff --git a/packages/catalog-realm/commands/upload-image.ts b/packages/catalog-realm/commands/upload-image.ts
index 31be30dc0a1..7c2a85d4a1b 100644
--- a/packages/catalog-realm/commands/upload-image.ts
+++ b/packages/catalog-realm/commands/upload-image.ts
@@ -2,9 +2,9 @@ import { tracked } from '@glimmer/tracking';
 
 import { isCardInstance, Command } from '@cardstack/runtime-common';
 
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import UrlField from 'https://cardstack.com/base/url';
-import StringField from 'https://cardstack.com/base/string';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import UrlField from '@cardstack/base/url';
+import StringField from '@cardstack/base/string';
 
 import SaveCardCommand from '@cardstack/boxel-host/commands/save-card';
 import SendRequestViaProxyCommand from '@cardstack/boxel-host/commands/send-request-via-proxy';
diff --git a/packages/catalog-realm/components/card-list.gts b/packages/catalog-realm/components/card-list.gts
index 458b38dc140..d5511b675b0 100644
--- a/packages/catalog-realm/components/card-list.gts
+++ b/packages/catalog-realm/components/card-list.gts
@@ -1,6 +1,6 @@
 import GlimmerComponent from '@glimmer/component';
 
-import { type CardContext } from 'https://cardstack.com/base/card-api';
+import { type CardContext } from '@cardstack/base/card-api';
 
 import {
   type Query,
diff --git a/packages/catalog-realm/components/field-renderer.gts b/packages/catalog-realm/components/field-renderer.gts
index a845ebf2f11..35b665a485c 100644
--- a/packages/catalog-realm/components/field-renderer.gts
+++ b/packages/catalog-realm/components/field-renderer.gts
@@ -3,12 +3,12 @@ import {
   type CardDef,
   Box,
   type Field,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import {
   getBoxComponent,
   type BoxComponent,
-} from 'https://cardstack.com/base/field-component';
-import { initSharedState } from 'https://cardstack.com/base/shared-state';
+} from '@cardstack/base/field-component';
+import { initSharedState } from '@cardstack/base/shared-state';
 
 const fieldRendererCache = initSharedState(
   'fieldRendererCache',
diff --git a/packages/catalog-realm/components/grid.gts b/packages/catalog-realm/components/grid.gts
index 09c9cb0409d..1d21cf027bc 100644
--- a/packages/catalog-realm/components/grid.gts
+++ b/packages/catalog-realm/components/grid.gts
@@ -1,6 +1,6 @@
 import GlimmerComponent from '@glimmer/component';
 
-import { type CardContext } from 'https://cardstack.com/base/card-api';
+import { type CardContext } from '@cardstack/base/card-api';
 
 import { type Query } from '@cardstack/runtime-common';
 
diff --git a/packages/catalog-realm/components/layout.gts b/packages/catalog-realm/components/layout.gts
index 9c4974d252f..29ed0b71300 100644
--- a/packages/catalog-realm/components/layout.gts
+++ b/packages/catalog-realm/components/layout.gts
@@ -1,7 +1,7 @@
 import GlimmerComponent from '@glimmer/component';
 import type { TemplateOnlyComponent } from '@ember/component/template-only';
 import { htmlSafe } from '@ember/template';
-import { type CardOrFieldTypeIcon } from 'https://cardstack.com/base/card-api';
+import { type CardOrFieldTypeIcon } from '@cardstack/base/card-api';
 import ImageIcon from '@cardstack/boxel-icons/image';
 import { FilterList } from '@cardstack/boxel-ui/components';
 import { element } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/components/lightbox-carousel.gts b/packages/catalog-realm/components/lightbox-carousel.gts
index 7b49c33eb02..4901776e7f0 100644
--- a/packages/catalog-realm/components/lightbox-carousel.gts
+++ b/packages/catalog-realm/components/lightbox-carousel.gts
@@ -6,7 +6,7 @@ import GlimmerComponent from '@glimmer/component';
 import type {
   BoxComponent,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import type Owner from '@ember/owner';
 
 // Focuses the overlay and wires up keyboard navigation when it renders
diff --git a/packages/catalog-realm/components/paginated-cards.gts b/packages/catalog-realm/components/paginated-cards.gts
index 64abe2d5859..930c48acc68 100644
--- a/packages/catalog-realm/components/paginated-cards.gts
+++ b/packages/catalog-realm/components/paginated-cards.gts
@@ -4,7 +4,7 @@ import {
   type Query,
   type PrerenderedCardLike,
 } from '@cardstack/runtime-common';
-import { type CardContext } from 'https://cardstack.com/base/card-api';
+import { type CardContext } from '@cardstack/base/card-api';
 import { Paginator } from './paginator';
 
 interface Signature {
diff --git a/packages/catalog-realm/components/post-composer.gts b/packages/catalog-realm/components/post-composer.gts
index 526fefd5ee3..59ff32236d1 100644
--- a/packages/catalog-realm/components/post-composer.gts
+++ b/packages/catalog-realm/components/post-composer.gts
@@ -1,5 +1,5 @@
 import GlimmerComponent from '@glimmer/component';
-import { type BaseDef } from 'https://cardstack.com/base/card-api';
+import { type BaseDef } from '@cardstack/base/card-api';
 import { on } from '@ember/modifier';
 import { BoxelSelect, BoxelButton } from '@cardstack/boxel-ui/components';
 
diff --git a/packages/catalog-realm/components/table.gts b/packages/catalog-realm/components/table.gts
index 6ea937fd416..3035c42df3d 100644
--- a/packages/catalog-realm/components/table.gts
+++ b/packages/catalog-realm/components/table.gts
@@ -6,7 +6,7 @@ import {
   type CardDef,
   type CreateCardFn,
   type Field,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { type CodeRef } from '@cardstack/runtime-common';
 import { LoadingIndicator, Pill, Button } from '@cardstack/boxel-ui/components';
 import { eq, not } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/crm-app/account.gts b/packages/catalog-realm/crm-app/account.gts
index b23c5214c11..2c89d479cab 100644
--- a/packages/catalog-realm/crm-app/account.gts
+++ b/packages/catalog-realm/crm-app/account.gts
@@ -8,9 +8,9 @@ import {
   linksToMany,
   realmURL,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-import WebsiteField from 'https://cardstack.com/base/website';
-import AddressField from 'https://cardstack.com/base/address';
+} from '@cardstack/base/card-api';
+import WebsiteField from '@cardstack/base/website';
+import AddressField from '@cardstack/base/address';
 
 import type { LooseSingleCardDocument } from '@cardstack/runtime-common';
 import { Query } from '@cardstack/runtime-common';
diff --git a/packages/catalog-realm/crm-app/app-card.gts b/packages/catalog-realm/crm-app/app-card.gts
index 201ebe1d16a..588103cdbf7 100644
--- a/packages/catalog-realm/crm-app/app-card.gts
+++ b/packages/catalog-realm/crm-app/app-card.gts
@@ -1,6 +1,6 @@
-import BooleanField from 'https://cardstack.com/base/boolean';
-import CodeRefField from 'https://cardstack.com/base/code-ref';
-import Base64ImageField from 'https://cardstack.com/base/base64-image';
+import BooleanField from '@cardstack/base/boolean';
+import CodeRefField from '@cardstack/base/code-ref';
+import Base64ImageField from '@cardstack/base/base64-image';
 import {
   CardDef,
   field,
@@ -13,7 +13,7 @@ import {
   type CardContext,
   FieldsTypeFor,
   CreateCardFn,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { CardContainer } from '@cardstack/boxel-ui/components';
 import { and, bool, cn } from '@cardstack/boxel-ui/helpers';
 import {
diff --git a/packages/catalog-realm/crm-app/base-task.gts b/packages/catalog-realm/crm-app/base-task.gts
index 21d5c4802e7..7bef529925c 100644
--- a/packages/catalog-realm/crm-app/base-task.gts
+++ b/packages/catalog-realm/crm-app/base-task.gts
@@ -6,11 +6,11 @@ import {
   linksToMany,
   Component,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateRangeField from 'https://cardstack.com/base/date-range-field';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import DateRangeField from '@cardstack/base/date-range-field';
+import ColorField from '@cardstack/base/color';
 
 import { Tag } from './tag';
 import { User } from './user';
diff --git a/packages/catalog-realm/crm-app/company.gts b/packages/catalog-realm/crm-app/company.gts
index a7096c43047..41d41299b10 100644
--- a/packages/catalog-realm/crm-app/company.gts
+++ b/packages/catalog-realm/crm-app/company.gts
@@ -1,14 +1,14 @@
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import WebsiteField from 'https://cardstack.com/base/website';
-import AddressField from 'https://cardstack.com/base/address';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import WebsiteField from '@cardstack/base/website';
+import AddressField from '@cardstack/base/address';
 import {
   Component,
   CardDef,
   field,
   contains,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import { CrmApp } from './crm-app';
 import {
diff --git a/packages/catalog-realm/crm-app/components/base-task-planner.gts b/packages/catalog-realm/crm-app/components/base-task-planner.gts
index 6c08b035771..9cd960a2fd0 100644
--- a/packages/catalog-realm/crm-app/components/base-task-planner.gts
+++ b/packages/catalog-realm/crm-app/components/base-task-planner.gts
@@ -2,7 +2,7 @@ import {
   CardContext,
   CardDef,
   BaseDef,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { tracked } from '@glimmer/tracking';
 import { TrackedMap } from 'tracked-built-ins';
 import GlimmerComponent from '@glimmer/component';
diff --git a/packages/catalog-realm/crm-app/components/page-layout.gts b/packages/catalog-realm/crm-app/components/page-layout.gts
index 8c70647c478..fffe722eee3 100644
--- a/packages/catalog-realm/crm-app/components/page-layout.gts
+++ b/packages/catalog-realm/crm-app/components/page-layout.gts
@@ -1,6 +1,6 @@
 import GlimmerComponent from '@glimmer/component';
 
-import type { Format } from 'https://cardstack.com/base/card-api';
+import type { Format } from '@cardstack/base/card-api';
 
 import { cn } from '@cardstack/boxel-ui/helpers';
 
diff --git a/packages/catalog-realm/crm-app/components/status-pill.gts b/packages/catalog-realm/crm-app/components/status-pill.gts
index 02d4cd2182f..9ba981d3569 100644
--- a/packages/catalog-realm/crm-app/components/status-pill.gts
+++ b/packages/catalog-realm/crm-app/components/status-pill.gts
@@ -1,7 +1,7 @@
 import GlimmerComponent from '@glimmer/component';
 import { Pill } from '@cardstack/boxel-ui/components';
 import { cssVar, getContrastColor } from '@cardstack/boxel-ui/helpers';
-import { CardOrFieldTypeIcon } from 'https://cardstack.com/base/card-api';
+import { CardOrFieldTypeIcon } from '@cardstack/base/card-api';
 
 interface StatusPillSignature {
   Args: {
diff --git a/packages/catalog-realm/crm-app/contact-status-tag.gts b/packages/catalog-realm/crm-app/contact-status-tag.gts
index 4dd7400d001..a7a7aeeccf0 100644
--- a/packages/catalog-realm/crm-app/contact-status-tag.gts
+++ b/packages/catalog-realm/crm-app/contact-status-tag.gts
@@ -4,8 +4,8 @@ import {
   contains,
   StringField,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import ColorField from '@cardstack/base/color';
 
 import ContactIcon from '@cardstack/boxel-icons/contact';
 
diff --git a/packages/catalog-realm/crm-app/contact.gts b/packages/catalog-realm/crm-app/contact.gts
index cb218a2a08a..cc3d21777f8 100644
--- a/packages/catalog-realm/crm-app/contact.gts
+++ b/packages/catalog-realm/crm-app/contact.gts
@@ -1,4 +1,4 @@
-import StringField from 'https://cardstack.com/base/string';
+import StringField from '@cardstack/base/string';
 import {
   Component,
   CardDef,
@@ -6,9 +6,9 @@ import {
   contains,
   linksTo,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
-import { ContactPhoneNumber } from 'https://cardstack.com/base/phone-number';
-import EmailField from 'https://cardstack.com/base/email';
+} from '@cardstack/base/card-api';
+import { ContactPhoneNumber } from '@cardstack/base/phone-number';
+import EmailField from '@cardstack/base/email';
 
 import {
   Avatar,
diff --git a/packages/catalog-realm/crm-app/crm-app.gts b/packages/catalog-realm/crm-app/crm-app.gts
index 83b084dd75e..b1d935e224f 100644
--- a/packages/catalog-realm/crm-app/crm-app.gts
+++ b/packages/catalog-realm/crm-app/crm-app.gts
@@ -22,7 +22,7 @@ import {
   Component,
   realmURL,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import { not, eq } from '@cardstack/boxel-ui/helpers';
 import {
diff --git a/packages/catalog-realm/crm-app/customer.gts b/packages/catalog-realm/crm-app/customer.gts
index 1473bc11c32..963406a3089 100644
--- a/packages/catalog-realm/crm-app/customer.gts
+++ b/packages/catalog-realm/crm-app/customer.gts
@@ -1,4 +1,4 @@
-import { field, contains } from 'https://cardstack.com/base/card-api';
+import { field, contains } from '@cardstack/base/card-api';
 import { Contact } from './contact';
 import HeartHandshakeIcon from '@cardstack/boxel-icons/heart-handshake';
 import { StatusTagField } from './contact-status-tag';
diff --git a/packages/catalog-realm/crm-app/deal-event.gts b/packages/catalog-realm/crm-app/deal-event.gts
index a2f068e2fdf..4f4335578ac 100644
--- a/packages/catalog-realm/crm-app/deal-event.gts
+++ b/packages/catalog-realm/crm-app/deal-event.gts
@@ -3,13 +3,13 @@ import {
   field,
   CardDef,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { Representative } from './representative';
-import { Component } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+import { Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateTimeField from '@cardstack/base/datetime';
+import TextAreaField from '@cardstack/base/text-area';
 import {
   FieldContainer,
   BoxelSelect,
diff --git a/packages/catalog-realm/crm-app/deal-priority.gts b/packages/catalog-realm/crm-app/deal-priority.gts
index 47b748543f3..5c9c2a2e195 100644
--- a/packages/catalog-realm/crm-app/deal-priority.gts
+++ b/packages/catalog-realm/crm-app/deal-priority.gts
@@ -4,9 +4,9 @@ import {
   contains,
   StringField,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import ColorField from '@cardstack/base/color';
 
 import { BoxelSelect } from '@cardstack/boxel-ui/components';
 
diff --git a/packages/catalog-realm/crm-app/deal-status.gts b/packages/catalog-realm/crm-app/deal-status.gts
index 075b895426c..109a599192b 100644
--- a/packages/catalog-realm/crm-app/deal-status.gts
+++ b/packages/catalog-realm/crm-app/deal-status.gts
@@ -4,9 +4,9 @@ import {
   contains,
   StringField,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import ColorField from '@cardstack/base/color';
 
 import FilterSearch from '@cardstack/boxel-icons/filter-search';
 import FilePen from '@cardstack/boxel-icons/file-pen';
diff --git a/packages/catalog-realm/crm-app/deal-summary.gts b/packages/catalog-realm/crm-app/deal-summary.gts
index 03ffc482ef6..a32bfdb7704 100644
--- a/packages/catalog-realm/crm-app/deal-summary.gts
+++ b/packages/catalog-realm/crm-app/deal-summary.gts
@@ -10,7 +10,7 @@ import TrendingUpIcon from '@cardstack/boxel-icons/trending-up';
 import CalculatorIcon from '@cardstack/boxel-icons/calculator';
 import NumbersIcon from '@cardstack/boxel-icons/numbers';
 import ChartCovariateIcon from '@cardstack/boxel-icons/chart-covariate';
-import { type CardContext } from 'https://cardstack.com/base/card-api';
+import { type CardContext } from '@cardstack/base/card-api';
 
 interface Signature {
   Args: {
diff --git a/packages/catalog-realm/crm-app/deal.gts b/packages/catalog-realm/crm-app/deal.gts
index a6f98f414d2..c7849485447 100644
--- a/packages/catalog-realm/crm-app/deal.gts
+++ b/packages/catalog-realm/crm-app/deal.gts
@@ -10,14 +10,14 @@ import {
   realmURL,
   FieldDef,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateField from 'https://cardstack.com/base/date';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import AddressField from 'https://cardstack.com/base/address';
-import WebsiteField from 'https://cardstack.com/base/website';
-import PercentageField from 'https://cardstack.com/base/percentage';
+} from '@cardstack/base/card-api';
+
+import BooleanField from '@cardstack/base/boolean';
+import DateField from '@cardstack/base/date';
+import MarkdownField from '@cardstack/base/markdown';
+import AddressField from '@cardstack/base/address';
+import WebsiteField from '@cardstack/base/website';
+import PercentageField from '@cardstack/base/percentage';
 
 import { Query } from '@cardstack/runtime-common';
 import type { LooseSingleCardDocument } from '@cardstack/runtime-common';
diff --git a/packages/catalog-realm/crm-app/document.gts b/packages/catalog-realm/crm-app/document.gts
index 85f26ba1a2b..436baa63849 100644
--- a/packages/catalog-realm/crm-app/document.gts
+++ b/packages/catalog-realm/crm-app/document.gts
@@ -3,8 +3,8 @@ import {
   contains,
   StringField,
   field,
-} from 'https://cardstack.com/base/card-api';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import MarkdownField from '@cardstack/base/markdown';
 
 export class Document extends CardDef {
   static displayName = 'Document';
diff --git a/packages/catalog-realm/crm-app/fields/amount-with-currency.gts b/packages/catalog-realm/crm-app/fields/amount-with-currency.gts
index 21586c56d3b..88aa8270188 100644
--- a/packages/catalog-realm/crm-app/fields/amount-with-currency.gts
+++ b/packages/catalog-realm/crm-app/fields/amount-with-currency.gts
@@ -1,6 +1,6 @@
-import NumberField from 'https://cardstack.com/base/number';
-import { FieldDef, field, contains } from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+import NumberField from '@cardstack/base/number';
+import { FieldDef, field, contains } from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import CurrencyField from './currency';
 import { action } from '@ember/object';
 import { BoxelInputGroup } from '@cardstack/boxel-ui/components';
diff --git a/packages/catalog-realm/crm-app/fields/contact-link.gts b/packages/catalog-realm/crm-app/fields/contact-link.gts
index 4a2c16b07c4..d47c848f612 100644
--- a/packages/catalog-realm/crm-app/fields/contact-link.gts
+++ b/packages/catalog-realm/crm-app/fields/contact-link.gts
@@ -4,8 +4,8 @@ import {
   contains,
   StringField,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import UrlField from '@cardstack/base/url';
 
 import {
   BoxelSelect,
diff --git a/packages/catalog-realm/crm-app/fields/currency.gts b/packages/catalog-realm/crm-app/fields/currency.gts
index 1041902fddd..a9b3612b17a 100644
--- a/packages/catalog-realm/crm-app/fields/currency.gts
+++ b/packages/catalog-realm/crm-app/fields/currency.gts
@@ -4,8 +4,8 @@ import {
   Component,
   CardDef,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import CurrencyDollarIcon from '@cardstack/boxel-icons/currency-dollar';
 import { BoxelSelect } from '@cardstack/boxel-ui/components';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/catalog-realm/crm-app/kanban-resource.gts b/packages/catalog-realm/crm-app/kanban-resource.gts
index 25646461c66..da93d02c8e0 100644
--- a/packages/catalog-realm/crm-app/kanban-resource.gts
+++ b/packages/catalog-realm/crm-app/kanban-resource.gts
@@ -1,6 +1,6 @@
 import { tracked } from '@glimmer/tracking';
 import { DndColumn } from '@cardstack/boxel-ui/components';
-import { CardDef } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
 
 import { Resource } from 'ember-modify-based-class-resource';
 
diff --git a/packages/catalog-realm/crm-app/lead.gts b/packages/catalog-realm/crm-app/lead.gts
index 7d474ce8c8c..0a1f367d55f 100644
--- a/packages/catalog-realm/crm-app/lead.gts
+++ b/packages/catalog-realm/crm-app/lead.gts
@@ -1,4 +1,4 @@
-import { field, contains } from 'https://cardstack.com/base/card-api';
+import { field, contains } from '@cardstack/base/card-api';
 import { Contact } from './contact';
 import { StatusTagField } from './contact-status-tag';
 
diff --git a/packages/catalog-realm/crm-app/representative.gts b/packages/catalog-realm/crm-app/representative.gts
index 05f50b488d8..e6f7a9af606 100644
--- a/packages/catalog-realm/crm-app/representative.gts
+++ b/packages/catalog-realm/crm-app/representative.gts
@@ -1,4 +1,4 @@
-import { field, contains } from 'https://cardstack.com/base/card-api';
+import { field, contains } from '@cardstack/base/card-api';
 import { Contact } from './contact';
 import PresentationAnalytics from '@cardstack/boxel-icons/presentation-analytics';
 import { StatusTagField } from './contact-status-tag';
diff --git a/packages/catalog-realm/crm-app/tag.gts b/packages/catalog-realm/crm-app/tag.gts
index 9a442de331a..5435edf72e4 100644
--- a/packages/catalog-realm/crm-app/tag.gts
+++ b/packages/catalog-realm/crm-app/tag.gts
@@ -4,8 +4,8 @@ import {
   contains,
   field,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import ColorField from '@cardstack/base/color';
 import TagIcon from '@cardstack/boxel-icons/tag';
 import { Pill } from '@cardstack/boxel-ui/components';
 
diff --git a/packages/catalog-realm/crm-app/task-planner.gts b/packages/catalog-realm/crm-app/task-planner.gts
index 382f0a95b24..82d33c28710 100644
--- a/packages/catalog-realm/crm-app/task-planner.gts
+++ b/packages/catalog-realm/crm-app/task-planner.gts
@@ -3,7 +3,7 @@ import {
   CardContext,
   CreateCardFn,
   SaveCardFn,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { CRMTaskStatusField } from './shared';
 import GlimmerComponent from '@glimmer/component';
 import { TaskPlanner, TaskCard } from './components/base-task-planner';
diff --git a/packages/catalog-realm/crm-app/task.gts b/packages/catalog-realm/crm-app/task.gts
index f41c5185519..3f12133738d 100644
--- a/packages/catalog-realm/crm-app/task.gts
+++ b/packages/catalog-realm/crm-app/task.gts
@@ -6,7 +6,7 @@ import {
   field,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import {
   FieldContainer,
   Pill,
diff --git a/packages/catalog-realm/crm-app/todo.gts b/packages/catalog-realm/crm-app/todo.gts
index 5b570763135..50db4865c96 100644
--- a/packages/catalog-realm/crm-app/todo.gts
+++ b/packages/catalog-realm/crm-app/todo.gts
@@ -3,8 +3,8 @@ import {
   field,
   contains,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import MarkdownField from '@cardstack/base/markdown';
 
 export class Todo extends CardDef {
   static displayName = 'Todo';
diff --git a/packages/catalog-realm/crm-app/urgency-tag.gts b/packages/catalog-realm/crm-app/urgency-tag.gts
index 251aeda7e0b..9d0629fd9ef 100644
--- a/packages/catalog-realm/crm-app/urgency-tag.gts
+++ b/packages/catalog-realm/crm-app/urgency-tag.gts
@@ -4,9 +4,9 @@ import {
   contains,
   StringField,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import ColorField from '@cardstack/base/color';
 
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/packages/catalog-realm/crm-app/user.gts b/packages/catalog-realm/crm-app/user.gts
index 913119795f7..bb013fbb683 100644
--- a/packages/catalog-realm/crm-app/user.gts
+++ b/packages/catalog-realm/crm-app/user.gts
@@ -3,7 +3,7 @@ import {
   StringField,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export class User extends CardDef {
   static displayName = 'User';
diff --git a/packages/catalog-realm/cycling-mileage/cycling-mileage-log.gts b/packages/catalog-realm/cycling-mileage/cycling-mileage-log.gts
index 5fd55fe127e..0a1f9f63294 100644
--- a/packages/catalog-realm/cycling-mileage/cycling-mileage-log.gts
+++ b/packages/catalog-realm/cycling-mileage/cycling-mileage-log.gts
@@ -5,10 +5,10 @@ import {
   FieldDef,
   StringField,
   field,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import { Component } from 'https://cardstack.com/base/card-api';
-import Date from 'https://cardstack.com/base/date';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import { Component } from '@cardstack/base/card-api';
+import Date from '@cardstack/base/date';
 import {
   Chart,
   registerables,
diff --git a/packages/catalog-realm/daily-report-dashboard/Skill/daily-report-skill.json b/packages/catalog-realm/daily-report-dashboard/Skill/daily-report-skill.json
index b4a13ea1f55..7d515a8b49c 100644
--- a/packages/catalog-realm/daily-report-dashboard/Skill/daily-report-skill.json
+++ b/packages/catalog-realm/daily-report-dashboard/Skill/daily-report-skill.json
@@ -18,7 +18,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/catalog-realm/daily-report-dashboard/activity-log.gts b/packages/catalog-realm/daily-report-dashboard/activity-log.gts
index 1420e194be7..241d731a557 100644
--- a/packages/catalog-realm/daily-report-dashboard/activity-log.gts
+++ b/packages/catalog-realm/daily-report-dashboard/activity-log.gts
@@ -4,10 +4,10 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
+import DateTimeField from '@cardstack/base/datetime';
+import TextAreaField from '@cardstack/base/text-area';
 import ClockIcon from '@cardstack/boxel-icons/clock'; // ² Activity icon
 import { formatDateTime } from '@cardstack/boxel-ui/helpers'; // ³ Formatting helpers
 
diff --git a/packages/catalog-realm/daily-report-dashboard/daily-report-dashboard.gts b/packages/catalog-realm/daily-report-dashboard/daily-report-dashboard.gts
index febcec4ae9c..037f7efadd9 100644
--- a/packages/catalog-realm/daily-report-dashboard/daily-report-dashboard.gts
+++ b/packages/catalog-realm/daily-report-dashboard/daily-report-dashboard.gts
@@ -1,7 +1,7 @@
 import { array } from '@ember/helper';
 import { gt } from '@cardstack/boxel-ui/helpers';
-import { CardDef, field, linksTo } from 'https://cardstack.com/base/card-api';
-import { Component, realmURL } from 'https://cardstack.com/base/card-api';
+import { CardDef, field, linksTo } from '@cardstack/base/card-api';
+import { Component, realmURL } from '@cardstack/base/card-api';
 import { Button, BoxelInput } from '@cardstack/boxel-ui/components';
 import { on } from '@ember/modifier';
 import { action } from '@ember/object';
diff --git a/packages/catalog-realm/daily-report-dashboard/daily-report.gts b/packages/catalog-realm/daily-report-dashboard/daily-report.gts
index 86d7e67e6ab..de399f43c77 100644
--- a/packages/catalog-realm/daily-report-dashboard/daily-report.gts
+++ b/packages/catalog-realm/daily-report-dashboard/daily-report.gts
@@ -4,10 +4,10 @@ import {
   contains,
   linksTo,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import DateField from 'https://cardstack.com/base/date';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import DateField from '@cardstack/base/date';
+import MarkdownField from '@cardstack/base/markdown';
 import CalendarIcon from '@cardstack/boxel-icons/calendar';
 import { formatDateTime } from '@cardstack/boxel-ui/helpers';
 import { PolicyManual } from './policy-manual';
diff --git a/packages/catalog-realm/daily-report-dashboard/policy-manual.gts b/packages/catalog-realm/daily-report-dashboard/policy-manual.gts
index b997fadaaa7..8c6ffcfd600 100644
--- a/packages/catalog-realm/daily-report-dashboard/policy-manual.gts
+++ b/packages/catalog-realm/daily-report-dashboard/policy-manual.gts
@@ -4,13 +4,13 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import DateField from 'https://cardstack.com/base/date';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown';
+import DateField from '@cardstack/base/date';
 import BookOpenIcon from '@cardstack/boxel-icons/book-open';
 import { formatDateTime } from '@cardstack/boxel-ui/helpers';
-import { AbsoluteCodeRefField } from 'https://cardstack.com/base/code-ref';
+import { AbsoluteCodeRefField } from '@cardstack/base/code-ref';
 
 export class PolicyManual extends CardDef {
   static displayName = 'Policy Manual';
diff --git a/packages/catalog-realm/email-template-editor/email-template-editor.gts b/packages/catalog-realm/email-template-editor/email-template-editor.gts
index 0a908d8bb04..a5504f05353 100644
--- a/packages/catalog-realm/email-template-editor/email-template-editor.gts
+++ b/packages/catalog-realm/email-template-editor/email-template-editor.gts
@@ -4,9 +4,9 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
+import TextAreaField from '@cardstack/base/text-area';
 import ColorField from '../fields/color'; // ² Color field for customization
 import { tracked } from '@glimmer/tracking';
 import { fn, concat } from '@ember/helper';
diff --git a/packages/catalog-realm/event-ticket/event-ticket.gts b/packages/catalog-realm/event-ticket/event-ticket.gts
index 11e054a8d4d..bf1114cbdfd 100644
--- a/packages/catalog-realm/event-ticket/event-ticket.gts
+++ b/packages/catalog-realm/event-ticket/event-ticket.gts
@@ -3,11 +3,11 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import DateField from 'https://cardstack.com/base/date';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import DateField from '@cardstack/base/date';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
 import MusicIcon from '@cardstack/boxel-icons/music';
 import {
   formatDateTime,
diff --git a/packages/catalog-realm/field-spec/audio-field-spec.gts b/packages/catalog-realm/field-spec/audio-field-spec.gts
index f2ac49025cc..26cfba9c2d1 100644
--- a/packages/catalog-realm/field-spec/audio-field-spec.gts
+++ b/packages/catalog-realm/field-spec/audio-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import AudioField from '../fields/audio';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/color-field-spec.gts b/packages/catalog-realm/field-spec/color-field-spec.gts
index f012c8e756b..9db39b7e412 100644
--- a/packages/catalog-realm/field-spec/color-field-spec.gts
+++ b/packages/catalog-realm/field-spec/color-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import ColorField from '../fields/color';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/date-field-spec.gts b/packages/catalog-realm/field-spec/date-field-spec.gts
index 7d377e8e859..a9f621af535 100644
--- a/packages/catalog-realm/field-spec/date-field-spec.gts
+++ b/packages/catalog-realm/field-spec/date-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import DateField from '../fields/date';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/date-range-field-spec.gts b/packages/catalog-realm/field-spec/date-range-field-spec.gts
index dde772a50fa..e2c77a42528 100644
--- a/packages/catalog-realm/field-spec/date-range-field-spec.gts
+++ b/packages/catalog-realm/field-spec/date-range-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import DateRangeField from '../fields/date/date-range';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/datetime-field-spec.gts b/packages/catalog-realm/field-spec/datetime-field-spec.gts
index 5c95eb5cea3..dc09f9a6d97 100644
--- a/packages/catalog-realm/field-spec/datetime-field-spec.gts
+++ b/packages/catalog-realm/field-spec/datetime-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import DateTimeField from '../fields/date-time';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/datetime-stamp-field-spec.gts b/packages/catalog-realm/field-spec/datetime-stamp-field-spec.gts
index b628a45b696..eb2b78350a1 100644
--- a/packages/catalog-realm/field-spec/datetime-stamp-field-spec.gts
+++ b/packages/catalog-realm/field-spec/datetime-stamp-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import DatetimeStampField from '../fields/datetime-stamp';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/day-field-spec.gts b/packages/catalog-realm/field-spec/day-field-spec.gts
index fd79b23b33a..4bfb731d607 100644
--- a/packages/catalog-realm/field-spec/day-field-spec.gts
+++ b/packages/catalog-realm/field-spec/day-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import DayField from '../fields/date/day';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/duration-field-spec.gts b/packages/catalog-realm/field-spec/duration-field-spec.gts
index 5cff564fed6..adfabac3795 100644
--- a/packages/catalog-realm/field-spec/duration-field-spec.gts
+++ b/packages/catalog-realm/field-spec/duration-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import DurationField from '../fields/time/duration';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/geo-point-spec.gts b/packages/catalog-realm/field-spec/geo-point-spec.gts
index c1e2060fb4c..e026677d214 100644
--- a/packages/catalog-realm/field-spec/geo-point-spec.gts
+++ b/packages/catalog-realm/field-spec/geo-point-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import GeoPointField from '../fields/geo-point';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/geo-search-point-spec.gts b/packages/catalog-realm/field-spec/geo-search-point-spec.gts
index 898ec4761c1..6447a104451 100644
--- a/packages/catalog-realm/field-spec/geo-search-point-spec.gts
+++ b/packages/catalog-realm/field-spec/geo-search-point-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import GeoSearchPointField from '../fields/geo-search-point';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/image-field-spec.gts b/packages/catalog-realm/field-spec/image-field-spec.gts
index eb461d9b06f..db98baafbdb 100644
--- a/packages/catalog-realm/field-spec/image-field-spec.gts
+++ b/packages/catalog-realm/field-spec/image-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import ImageField from '../fields/image';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/month-day-field-spec.gts b/packages/catalog-realm/field-spec/month-day-field-spec.gts
index ffba68da3a0..5f5c0812398 100644
--- a/packages/catalog-realm/field-spec/month-day-field-spec.gts
+++ b/packages/catalog-realm/field-spec/month-day-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import MonthDayField from '../fields/date/month-day';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/month-field-spec.gts b/packages/catalog-realm/field-spec/month-field-spec.gts
index 6d1b169b7ff..543597dbe33 100644
--- a/packages/catalog-realm/field-spec/month-field-spec.gts
+++ b/packages/catalog-realm/field-spec/month-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import MonthField from '../fields/date/month';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/month-year-field-spec.gts b/packages/catalog-realm/field-spec/month-year-field-spec.gts
index 91ff08325ad..333b3b3e8f0 100644
--- a/packages/catalog-realm/field-spec/month-year-field-spec.gts
+++ b/packages/catalog-realm/field-spec/month-year-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import MonthYearField from '../fields/date/month-year';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/multiple-image-field-spec.gts b/packages/catalog-realm/field-spec/multiple-image-field-spec.gts
index e55a1c20f81..9e7367a58e4 100644
--- a/packages/catalog-realm/field-spec/multiple-image-field-spec.gts
+++ b/packages/catalog-realm/field-spec/multiple-image-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import MultipleImageField from '../fields/multiple-image';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/number-field-spec.gts b/packages/catalog-realm/field-spec/number-field-spec.gts
index 61c2a5ab4d2..778b724c6db 100644
--- a/packages/catalog-realm/field-spec/number-field-spec.gts
+++ b/packages/catalog-realm/field-spec/number-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import NumberField from '../fields/number';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/quantity-field-spec.gts b/packages/catalog-realm/field-spec/quantity-field-spec.gts
index 7a3ea251014..3701b7917fb 100644
--- a/packages/catalog-realm/field-spec/quantity-field-spec.gts
+++ b/packages/catalog-realm/field-spec/quantity-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import QuantityField from '../fields/quantity';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/quarter-field-spec.gts b/packages/catalog-realm/field-spec/quarter-field-spec.gts
index 186025a8d8a..31cf0c54a03 100644
--- a/packages/catalog-realm/field-spec/quarter-field-spec.gts
+++ b/packages/catalog-realm/field-spec/quarter-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import QuarterField from '../fields/date/quarter';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/rating-field-spec.gts b/packages/catalog-realm/field-spec/rating-field-spec.gts
index 8292a423cf0..8c1890a09dc 100644
--- a/packages/catalog-realm/field-spec/rating-field-spec.gts
+++ b/packages/catalog-realm/field-spec/rating-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import RatingField from '../fields/rating';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/recurring-pattern-field-spec.gts b/packages/catalog-realm/field-spec/recurring-pattern-field-spec.gts
index 6e451fc5cba..81101c649af 100644
--- a/packages/catalog-realm/field-spec/recurring-pattern-field-spec.gts
+++ b/packages/catalog-realm/field-spec/recurring-pattern-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import RecurringPatternField from '../fields/recurring-pattern';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/relative-time-field-spec.gts b/packages/catalog-realm/field-spec/relative-time-field-spec.gts
index baf262a1ed2..3545f7dce10 100644
--- a/packages/catalog-realm/field-spec/relative-time-field-spec.gts
+++ b/packages/catalog-realm/field-spec/relative-time-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import RelativeTimeField from '../fields/time/relative-time';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/time-field-spec.gts b/packages/catalog-realm/field-spec/time-field-spec.gts
index 39a55ba8dde..1f1a9d2ceb3 100644
--- a/packages/catalog-realm/field-spec/time-field-spec.gts
+++ b/packages/catalog-realm/field-spec/time-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import TimeField from '../fields/time';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/time-period-field-spec.gts b/packages/catalog-realm/field-spec/time-period-field-spec.gts
index b3f59639f4a..55ac6589e45 100644
--- a/packages/catalog-realm/field-spec/time-period-field-spec.gts
+++ b/packages/catalog-realm/field-spec/time-period-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import TimePeriodField from '../fields/time-period';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/time-range-field-spec.gts b/packages/catalog-realm/field-spec/time-range-field-spec.gts
index a746b995d95..4989032eb9c 100644
--- a/packages/catalog-realm/field-spec/time-range-field-spec.gts
+++ b/packages/catalog-realm/field-spec/time-range-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import TimeRangeField from '../fields/time/time-range';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/week-field-spec.gts b/packages/catalog-realm/field-spec/week-field-spec.gts
index 7ffa9e5513b..f5955dc80bf 100644
--- a/packages/catalog-realm/field-spec/week-field-spec.gts
+++ b/packages/catalog-realm/field-spec/week-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import WeekField from '../fields/date/week';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/field-spec/year-field-spec.gts b/packages/catalog-realm/field-spec/year-field-spec.gts
index 3bc8320352b..6614cb9bcb0 100644
--- a/packages/catalog-realm/field-spec/year-field-spec.gts
+++ b/packages/catalog-realm/field-spec/year-field-spec.gts
@@ -4,12 +4,12 @@ import {
   SpecReadmeSection,
   ExamplesWithInteractive,
   SpecModuleSection,
-} from 'https://cardstack.com/base/spec';
+} from '@cardstack/base/spec';
 import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import YearField from '../fields/date/year';
 import CodeSnippet from '../components/code-snippet';
 
diff --git a/packages/catalog-realm/fields-preview/amount-with-currency.gts b/packages/catalog-realm/fields-preview/amount-with-currency.gts
index 42cf525773c..2f890325c98 100644
--- a/packages/catalog-realm/fields-preview/amount-with-currency.gts
+++ b/packages/catalog-realm/fields-preview/amount-with-currency.gts
@@ -6,8 +6,8 @@ import {
   contains,
   type BaseDefConstructor,
   type Field,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { FieldContainer } from '@cardstack/boxel-ui/components';
 import { getField } from '@cardstack/runtime-common';
 
diff --git a/packages/catalog-realm/fields-preview/contact-link.gts b/packages/catalog-realm/fields-preview/contact-link.gts
index aa51b35efa3..4e9d1f72f2b 100644
--- a/packages/catalog-realm/fields-preview/contact-link.gts
+++ b/packages/catalog-realm/fields-preview/contact-link.gts
@@ -7,8 +7,8 @@ import {
   containsMany,
   type BaseDefConstructor,
   type Field,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { FieldContainer } from '@cardstack/boxel-ui/components';
 import { getField } from '@cardstack/runtime-common';
 
diff --git a/packages/catalog-realm/fields-preview/featured-image.gts b/packages/catalog-realm/fields-preview/featured-image.gts
index 3edf0aec541..ff0c3c9ebeb 100644
--- a/packages/catalog-realm/fields-preview/featured-image.gts
+++ b/packages/catalog-realm/fields-preview/featured-image.gts
@@ -7,8 +7,8 @@ import {
   containsMany,
   type BaseDefConstructor,
   type Field,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { FieldContainer } from '@cardstack/boxel-ui/components';
 import { getField } from '@cardstack/runtime-common';
 
diff --git a/packages/catalog-realm/fields-preview/qr-code.gts b/packages/catalog-realm/fields-preview/qr-code.gts
index 39df4d17f6c..73f2cd4837b 100644
--- a/packages/catalog-realm/fields-preview/qr-code.gts
+++ b/packages/catalog-realm/fields-preview/qr-code.gts
@@ -6,8 +6,8 @@ import {
   linksTo,
   type BaseDefConstructor,
   type Field,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { FieldContainer } from '@cardstack/boxel-ui/components';
 import { getField } from '@cardstack/runtime-common';
 
diff --git a/packages/catalog-realm/fields/amount-with-currency.gts b/packages/catalog-realm/fields/amount-with-currency.gts
index 21586c56d3b..88aa8270188 100644
--- a/packages/catalog-realm/fields/amount-with-currency.gts
+++ b/packages/catalog-realm/fields/amount-with-currency.gts
@@ -1,6 +1,6 @@
-import NumberField from 'https://cardstack.com/base/number';
-import { FieldDef, field, contains } from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+import NumberField from '@cardstack/base/number';
+import { FieldDef, field, contains } from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import CurrencyField from './currency';
 import { action } from '@ember/object';
 import { BoxelInputGroup } from '@cardstack/boxel-ui/components';
diff --git a/packages/catalog-realm/fields/audio.gts b/packages/catalog-realm/fields/audio.gts
index 1d7956555c6..5fdbf92685d 100644
--- a/packages/catalog-realm/fields/audio.gts
+++ b/packages/catalog-realm/fields/audio.gts
@@ -3,11 +3,11 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import DateTimeField from '@cardstack/base/datetime';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/fields/avatar.gts b/packages/catalog-realm/fields/avatar.gts
index 033b355eae2..adffdb0790d 100644
--- a/packages/catalog-realm/fields/avatar.gts
+++ b/packages/catalog-realm/fields/avatar.gts
@@ -3,8 +3,8 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import UserIcon from '@cardstack/boxel-icons/user';
 import { getAvataarsUrl, AvataaarsModel } from '../utils/external/avataar';
 import AvatarComponent from './components/avatar';
diff --git a/packages/catalog-realm/fields/color.gts b/packages/catalog-realm/fields/color.gts
index 85b04189bbe..3a5b6640e4f 100644
--- a/packages/catalog-realm/fields/color.gts
+++ b/packages/catalog-realm/fields/color.gts
@@ -1,5 +1,5 @@
-import { Component } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { Swatch } from '@cardstack/boxel-ui/components';
 import PaletteIcon from '@cardstack/boxel-icons/palette';
 import ColorPickerField from './color-field/components/color-picker-field';
diff --git a/packages/catalog-realm/fields/contact-link.gts b/packages/catalog-realm/fields/contact-link.gts
index d0d5523ede3..386175772d9 100644
--- a/packages/catalog-realm/fields/contact-link.gts
+++ b/packages/catalog-realm/fields/contact-link.gts
@@ -4,8 +4,8 @@ import {
   contains,
   StringField,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import UrlField from '@cardstack/base/url';
 
 import {
   BoxelSelect,
diff --git a/packages/catalog-realm/fields/currency.gts b/packages/catalog-realm/fields/currency.gts
index 1041902fddd..a9b3612b17a 100644
--- a/packages/catalog-realm/fields/currency.gts
+++ b/packages/catalog-realm/fields/currency.gts
@@ -4,8 +4,8 @@ import {
   Component,
   CardDef,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import CurrencyDollarIcon from '@cardstack/boxel-icons/currency-dollar';
 import { BoxelSelect } from '@cardstack/boxel-ui/components';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/catalog-realm/fields/date-time.gts b/packages/catalog-realm/fields/date-time.gts
index be03714ee3a..4708f3f39a6 100644
--- a/packages/catalog-realm/fields/date-time.gts
+++ b/packages/catalog-realm/fields/date-time.gts
@@ -4,7 +4,7 @@ import {
   primitive,
   serialize,
   queryableValue,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { fn } from '@ember/helper';
 import { BoxelInput } from '@cardstack/boxel-ui/components';
 import { not, eq } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/fields/date.gts b/packages/catalog-realm/fields/date.gts
index 595a87ae968..438e85092e2 100644
--- a/packages/catalog-realm/fields/date.gts
+++ b/packages/catalog-realm/fields/date.gts
@@ -1,5 +1,5 @@
-import { Component } from 'https://cardstack.com/base/card-api';
-import BaseDateField from 'https://cardstack.com/base/date';
+import { Component } from '@cardstack/base/card-api';
+import BaseDateField from '@cardstack/base/date';
 import CalendarIcon from '@cardstack/boxel-icons/calendar';
 import { eq } from '@cardstack/boxel-ui/helpers';
 import { formatDateTime } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/fields/date/date-range.gts b/packages/catalog-realm/fields/date/date-range.gts
index cd0a8fc159f..accaa0d7b80 100644
--- a/packages/catalog-realm/fields/date/date-range.gts
+++ b/packages/catalog-realm/fields/date/date-range.gts
@@ -3,8 +3,8 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import BaseDateField from 'https://cardstack.com/base/date';
+} from '@cardstack/base/card-api';
+import BaseDateField from '@cardstack/base/date';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { gt, eq, not } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/fields/date/day.gts b/packages/catalog-realm/fields/date/day.gts
index 336f6699047..2dd37b3c879 100644
--- a/packages/catalog-realm/fields/date/day.gts
+++ b/packages/catalog-realm/fields/date/day.gts
@@ -3,8 +3,8 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
 import { action } from '@ember/object';
 import { BoxelSelect } from '@cardstack/boxel-ui/components';
 import { not } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/fields/date/month-day.gts b/packages/catalog-realm/fields/date/month-day.gts
index 440c542083d..f39d78853f6 100644
--- a/packages/catalog-realm/fields/date/month-day.gts
+++ b/packages/catalog-realm/fields/date/month-day.gts
@@ -3,8 +3,8 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { BoxelSelect } from '@cardstack/boxel-ui/components';
diff --git a/packages/catalog-realm/fields/date/month-year.gts b/packages/catalog-realm/fields/date/month-year.gts
index e3529193462..d8df3b80509 100644
--- a/packages/catalog-realm/fields/date/month-year.gts
+++ b/packages/catalog-realm/fields/date/month-year.gts
@@ -3,8 +3,8 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { action } from '@ember/object';
 import CalendarEventIcon from '@cardstack/boxel-icons/calendar-event';
 import { formatDateTime, not } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/fields/date/month.gts b/packages/catalog-realm/fields/date/month.gts
index c5a33d87600..3586878ff06 100644
--- a/packages/catalog-realm/fields/date/month.gts
+++ b/packages/catalog-realm/fields/date/month.gts
@@ -3,8 +3,8 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
 import { action } from '@ember/object';
 import { formatDateTime, not } from '@cardstack/boxel-ui/helpers';
 import { BoxelSelect } from '@cardstack/boxel-ui/components';
diff --git a/packages/catalog-realm/fields/date/quarter.gts b/packages/catalog-realm/fields/date/quarter.gts
index 01dbb88fe54..ae4b4a34b98 100644
--- a/packages/catalog-realm/fields/date/quarter.gts
+++ b/packages/catalog-realm/fields/date/quarter.gts
@@ -3,8 +3,8 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { BoxelSelect } from '@cardstack/boxel-ui/components';
diff --git a/packages/catalog-realm/fields/date/week.gts b/packages/catalog-realm/fields/date/week.gts
index dd540263cef..34baa543602 100644
--- a/packages/catalog-realm/fields/date/week.gts
+++ b/packages/catalog-realm/fields/date/week.gts
@@ -3,8 +3,8 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { action } from '@ember/object';
 import CalendarEventIcon from '@cardstack/boxel-icons/calendar-event';
 import { formatDateTime, not } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/fields/date/year.gts b/packages/catalog-realm/fields/date/year.gts
index efae62f512e..fead0d61023 100644
--- a/packages/catalog-realm/fields/date/year.gts
+++ b/packages/catalog-realm/fields/date/year.gts
@@ -3,8 +3,8 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
 import { action } from '@ember/object';
 import CalendarEventIcon from '@cardstack/boxel-icons/calendar-event';
 import { BoxelSelect } from '@cardstack/boxel-ui/components';
diff --git a/packages/catalog-realm/fields/datetime-stamp.gts b/packages/catalog-realm/fields/datetime-stamp.gts
index f0628b55545..f9bb995361d 100644
--- a/packages/catalog-realm/fields/datetime-stamp.gts
+++ b/packages/catalog-realm/fields/datetime-stamp.gts
@@ -1,5 +1,5 @@
-import { Component } from 'https://cardstack.com/base/card-api';
-import BaseDateTimeField from 'https://cardstack.com/base/datetime';
+import { Component } from '@cardstack/base/card-api';
+import BaseDateTimeField from '@cardstack/base/datetime';
 import ClockAlertIcon from '@cardstack/boxel-icons/clock-alert';
 import { formatDateTime } from '@cardstack/boxel-ui/helpers';
 
diff --git a/packages/catalog-realm/fields/discrete-range-field.gts b/packages/catalog-realm/fields/discrete-range-field.gts
index 939ed7f0e58..494a8375e9f 100644
--- a/packages/catalog-realm/fields/discrete-range-field.gts
+++ b/packages/catalog-realm/fields/discrete-range-field.gts
@@ -3,8 +3,8 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
 import { StepRangeScroller } from '../components/step-range-scroller';
 
 export class DiscreteRangeField extends CardDef {
diff --git a/packages/catalog-realm/fields/featured-image.gts b/packages/catalog-realm/fields/featured-image.gts
index 523975c73b0..2e78c5c29f9 100644
--- a/packages/catalog-realm/fields/featured-image.gts
+++ b/packages/catalog-realm/fields/featured-image.gts
@@ -6,10 +6,10 @@ import {
   contains,
   StringField,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import { ImageSizeField } from 'https://cardstack.com/base/base64-image';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import { ImageSizeField } from '@cardstack/base/base64-image';
+import UrlField from '@cardstack/base/url';
 import { FieldContainer } from '@cardstack/boxel-ui/components';
 import { FailureBordered } from '@cardstack/boxel-ui/icons';
 import PhotoIcon from '@cardstack/boxel-icons/photo';
diff --git a/packages/catalog-realm/fields/file-content.gts b/packages/catalog-realm/fields/file-content.gts
index 9682413f5af..ce6987ec561 100644
--- a/packages/catalog-realm/fields/file-content.gts
+++ b/packages/catalog-realm/fields/file-content.gts
@@ -5,8 +5,8 @@ import {
   contains,
   containsMany,
   field,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import FileCodeIcon from '@cardstack/boxel-icons/file-code';
 
 export class FileContentField extends FieldDef {
diff --git a/packages/catalog-realm/fields/geo-point.gts b/packages/catalog-realm/fields/geo-point.gts
index f966dcde440..49711541032 100644
--- a/packages/catalog-realm/fields/geo-point.gts
+++ b/packages/catalog-realm/fields/geo-point.gts
@@ -3,8 +3,8 @@ import {
   contains,
   FieldDef,
   field,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
 import MapPinIcon from '@cardstack/boxel-icons/map-pin';
 
 import GeoPointEditField from './geo-point/components/geo-point-edit-field';
diff --git a/packages/catalog-realm/fields/geo-search-point.gts b/packages/catalog-realm/fields/geo-search-point.gts
index 25991a08ca6..8f9e7226e47 100644
--- a/packages/catalog-realm/fields/geo-search-point.gts
+++ b/packages/catalog-realm/fields/geo-search-point.gts
@@ -2,8 +2,8 @@ import {
   Component,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import MapPinIcon from '@cardstack/boxel-icons/map-pin';
 import GeoPointField from './geo-point';
 import GeoSearchPointEditField from './geo-search-point/components/geo-search-point-edit-field';
diff --git a/packages/catalog-realm/fields/image.gts b/packages/catalog-realm/fields/image.gts
index f2952dd44a3..d66bfd10bff 100644
--- a/packages/catalog-realm/fields/image.gts
+++ b/packages/catalog-realm/fields/image.gts
@@ -5,8 +5,8 @@ import {
   field,
   contains,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import UrlField from '@cardstack/base/url';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { on } from '@ember/modifier';
@@ -23,7 +23,7 @@ import { Button } from '@cardstack/boxel-ui/components';
 import NotificationBubble from '../components/notification-bubble';
 import UploadImageCommand from '../commands/upload-image';
 import { realmURL as realmURLSymbol } from '@cardstack/runtime-common';
-import ImageCard from 'https://cardstack.com/base/image';
+import ImageCard from '@cardstack/base/image';
 import SaveCardCommand from '@cardstack/boxel-host/commands/save-card';
 
 import ImagePresentation from './image/components/image-presentation';
diff --git a/packages/catalog-realm/fields/leaflet-map-config-field.gts b/packages/catalog-realm/fields/leaflet-map-config-field.gts
index 97f16cefeba..894c6baff33 100644
--- a/packages/catalog-realm/fields/leaflet-map-config-field.gts
+++ b/packages/catalog-realm/fields/leaflet-map-config-field.gts
@@ -1,8 +1,8 @@
-import { Component, FieldDef } from 'https://cardstack.com/base/card-api';
+import { Component, FieldDef } from '@cardstack/base/card-api';
 import { action } from '@ember/object';
 import { BoxelInput } from '@cardstack/boxel-ui/components';
-import StringField from 'https://cardstack.com/base/string';
-import { contains, field } from 'https://cardstack.com/base/card-api';
+import StringField from '@cardstack/base/string';
+import { contains, field } from '@cardstack/base/card-api';
 
 class AtomTemplate extends Component<typeof LeafletMapConfigField> {
   get displayValue() {
diff --git a/packages/catalog-realm/fields/multiple-image.gts b/packages/catalog-realm/fields/multiple-image.gts
index 95a159db6fb..67edea5d2d9 100644
--- a/packages/catalog-realm/fields/multiple-image.gts
+++ b/packages/catalog-realm/fields/multiple-image.gts
@@ -10,7 +10,7 @@ import {
   FieldDef,
   field,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/packages/catalog-realm/fields/number.gts b/packages/catalog-realm/fields/number.gts
index f01373319c1..51d27bf70b3 100644
--- a/packages/catalog-realm/fields/number.gts
+++ b/packages/catalog-realm/fields/number.gts
@@ -1,10 +1,10 @@
 import { eq, not } from '@cardstack/boxel-ui/helpers';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import BaseNumberField, {
   deserializeForUI,
   serializeForUI,
-} from 'https://cardstack.com/base/number';
-import { TextInputValidator } from 'https://cardstack.com/base/text-input-validator';
+} from '@cardstack/base/number';
+import { TextInputValidator } from '@cardstack/base/text-input-validator';
 import { NumberSerializer } from '@cardstack/runtime-common';
 import { getFormattedDisplayValue } from './number/util/index';
 
diff --git a/packages/catalog-realm/fields/qr-code.gts b/packages/catalog-realm/fields/qr-code.gts
index 3729cc3d5f2..5ab6adf9ea0 100644
--- a/packages/catalog-realm/fields/qr-code.gts
+++ b/packages/catalog-realm/fields/qr-code.gts
@@ -1,16 +1,16 @@
-import { FieldDef } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { FieldDef } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import {
   Component,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import Modifier, { NamedArgs } from 'ember-modifier';
 import QRCodeIcon from '@cardstack/boxel-icons/qr-code';
 //@ts-ignore
 import QRCode from 'https://cdn.jsdelivr.net/npm/qrcode@1.5.4/+esm';
-import ColorField from 'https://cardstack.com/base/color';
-import NumberField from 'https://cardstack.com/base/number';
+import ColorField from '@cardstack/base/color';
+import NumberField from '@cardstack/base/number';
 
 class QRConfigField extends FieldDef {
   @field foreground = contains(ColorField);
diff --git a/packages/catalog-realm/fields/quantity.gts b/packages/catalog-realm/fields/quantity.gts
index e2c53ef979f..ac638767447 100644
--- a/packages/catalog-realm/fields/quantity.gts
+++ b/packages/catalog-realm/fields/quantity.gts
@@ -1,13 +1,13 @@
 // External dependencies
-import { Component } from 'https://cardstack.com/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { on } from '@ember/modifier';
 import { lte, gte, not } from '@cardstack/boxel-ui/helpers';
 
 import NumberField, {
   deserializeForUI,
   serializeForUI,
-} from 'https://cardstack.com/base/number';
-import { TextInputValidator } from 'https://cardstack.com/base/text-input-validator';
+} from '@cardstack/base/number';
+import { TextInputValidator } from '@cardstack/base/text-input-validator';
 import { NumberSerializer } from '@cardstack/runtime-common';
 import Grid2x2Icon from '@cardstack/boxel-icons/grid-2x2';
 
diff --git a/packages/catalog-realm/fields/rating.gts b/packages/catalog-realm/fields/rating.gts
index 4bd5bf09f95..8296239115a 100644
--- a/packages/catalog-realm/fields/rating.gts
+++ b/packages/catalog-realm/fields/rating.gts
@@ -1,4 +1,4 @@
-import { Component } from 'https://cardstack.com/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { on } from '@ember/modifier';
 import { fn } from '@ember/helper';
 import { lte, not } from '@cardstack/boxel-ui/helpers';
@@ -6,8 +6,8 @@ import { lte, not } from '@cardstack/boxel-ui/helpers';
 import NumberField, {
   deserializeForUI,
   serializeForUI,
-} from 'https://cardstack.com/base/number';
-import { TextInputValidator } from 'https://cardstack.com/base/text-input-validator';
+} from '@cardstack/base/number';
+import { TextInputValidator } from '@cardstack/base/text-input-validator';
 import { NumberSerializer } from '@cardstack/runtime-common';
 
 import { getNumericValue, hasValue } from './number/util/index';
diff --git a/packages/catalog-realm/fields/recurring-pattern.gts b/packages/catalog-realm/fields/recurring-pattern.gts
index 08efbc72998..63f56e61ede 100644
--- a/packages/catalog-realm/fields/recurring-pattern.gts
+++ b/packages/catalog-realm/fields/recurring-pattern.gts
@@ -3,9 +3,9 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/fields/slider.gts b/packages/catalog-realm/fields/slider.gts
index 7fe737d0bd6..a21974c3927 100644
--- a/packages/catalog-realm/fields/slider.gts
+++ b/packages/catalog-realm/fields/slider.gts
@@ -1,12 +1,12 @@
-import { Component } from 'https://cardstack.com/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { BoxelInput } from '@cardstack/boxel-ui/components';
 import { not } from '@cardstack/boxel-ui/helpers';
 
 import NumberField, {
   deserializeForUI,
   serializeForUI,
-} from 'https://cardstack.com/base/number';
-import { TextInputValidator } from 'https://cardstack.com/base/text-input-validator';
+} from '@cardstack/base/number';
+import { TextInputValidator } from '@cardstack/base/text-input-validator';
 import { NumberSerializer } from '@cardstack/runtime-common';
 
 import { getNumericValue, getFormattedDisplayValue } from './number/util/index';
diff --git a/packages/catalog-realm/fields/theme-code-ref.gts b/packages/catalog-realm/fields/theme-code-ref.gts
index 877f4b490f0..4929b50238d 100644
--- a/packages/catalog-realm/fields/theme-code-ref.gts
+++ b/packages/catalog-realm/fields/theme-code-ref.gts
@@ -1,4 +1,4 @@
-import CodeRefField from 'https://cardstack.com/base/code-ref';
+import CodeRefField from '@cardstack/base/code-ref';
 import type { ResolvedCodeRef } from '@cardstack/runtime-common';
 import { BoxelSelect } from '@cardstack/boxel-ui/components';
 
@@ -6,28 +6,28 @@ const THEME_CODE_REF_OPTIONS: Array<{ label: string; ref: ResolvedCodeRef }> = [
   {
     label: 'Theme',
     ref: {
-      module: 'https://cardstack.com/base/theme',
+      module: '@cardstack/base/theme',
       name: 'default',
     },
   },
   {
     label: 'Style Reference',
     ref: {
-      module: 'https://cardstack.com/base/style-reference',
+      module: '@cardstack/base/style-reference',
       name: 'default',
     },
   },
   {
     label: 'Brand Guide',
     ref: {
-      module: 'https://cardstack.com/base/brand-guide',
+      module: '@cardstack/base/brand-guide',
       name: 'default',
     },
   },
   {
     label: 'Structured Theme',
     ref: {
-      module: 'https://cardstack.com/base/structured-theme',
+      module: '@cardstack/base/structured-theme',
       name: 'default',
     },
   },
diff --git a/packages/catalog-realm/fields/time-period.gts b/packages/catalog-realm/fields/time-period.gts
index 3d42463d6fa..5fd50a6a27e 100644
--- a/packages/catalog-realm/fields/time-period.gts
+++ b/packages/catalog-realm/fields/time-period.gts
@@ -3,9 +3,9 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import DateField from 'https://cardstack.com/base/date';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import DateField from '@cardstack/base/date';
+import StringField from '@cardstack/base/string';
 import { BoxelInput } from '@cardstack/boxel-ui/components';
 import { action } from '@ember/object';
 import { not } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/fields/time.gts b/packages/catalog-realm/fields/time.gts
index 4cd45b7a53a..8811b69e716 100644
--- a/packages/catalog-realm/fields/time.gts
+++ b/packages/catalog-realm/fields/time.gts
@@ -3,8 +3,8 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { action } from '@ember/object';
 import { eq, not } from '@cardstack/boxel-ui/helpers';
 import { formatDateTime } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/fields/time/duration.gts b/packages/catalog-realm/fields/time/duration.gts
index 04176d1a0f5..5392685978a 100644
--- a/packages/catalog-realm/fields/time/duration.gts
+++ b/packages/catalog-realm/fields/time/duration.gts
@@ -3,8 +3,8 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
 import { tracked } from '@glimmer/tracking';
 import HourglassIcon from '@cardstack/boxel-icons/hourglass';
 import AlertCircleIcon from '@cardstack/boxel-icons/alert-circle';
diff --git a/packages/catalog-realm/fields/time/relative-time.gts b/packages/catalog-realm/fields/time/relative-time.gts
index 0fe0ade631a..3034e87f790 100644
--- a/packages/catalog-realm/fields/time/relative-time.gts
+++ b/packages/catalog-realm/fields/time/relative-time.gts
@@ -3,9 +3,9 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import { action } from '@ember/object';
 import ClockIcon from '@cardstack/boxel-icons/clock';
 import { BoxelSelect } from '@cardstack/boxel-ui/components';
diff --git a/packages/catalog-realm/fields/time/time-range.gts b/packages/catalog-realm/fields/time/time-range.gts
index 62fd3b68e0f..38e7ab8b34b 100644
--- a/packages/catalog-realm/fields/time/time-range.gts
+++ b/packages/catalog-realm/fields/time/time-range.gts
@@ -3,7 +3,7 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import ClockIcon from '@cardstack/boxel-icons/clock';
 import TimeField from '../time';
 
diff --git a/packages/catalog-realm/flashcard/flashcard.gts b/packages/catalog-realm/flashcard/flashcard.gts
index 6fea2be6362..f434b724805 100644
--- a/packages/catalog-realm/flashcard/flashcard.gts
+++ b/packages/catalog-realm/flashcard/flashcard.gts
@@ -4,9 +4,9 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown';
 import { on } from '@ember/modifier';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/catalog-realm/flight/flight.gts b/packages/catalog-realm/flight/flight.gts
index 41d15a4edca..6633f4fb74b 100644
--- a/packages/catalog-realm/flight/flight.gts
+++ b/packages/catalog-realm/flight/flight.gts
@@ -3,11 +3,11 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateTimeField from '@cardstack/base/datetime';
+import UrlField from '@cardstack/base/url';
 import { dayjsFormat } from '@cardstack/boxel-ui/helpers';
 import PlaneIcon from '@cardstack/boxel-icons/plane';
 import ClockIcon from '@cardstack/boxel-icons/clock';
diff --git a/packages/catalog-realm/focus-timer/focus-timer.gts b/packages/catalog-realm/focus-timer/focus-timer.gts
index 81e574ad982..e5a45958792 100644
--- a/packages/catalog-realm/focus-timer/focus-timer.gts
+++ b/packages/catalog-realm/focus-timer/focus-timer.gts
@@ -4,11 +4,11 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import DateTimeField from '@cardstack/base/datetime';
 import { Button, Pill } from '@cardstack/boxel-ui/components'; // ² Enhanced UI components
 import {
   formatDateTime,
diff --git a/packages/catalog-realm/furniture-tear-sheet/furniture-tear-sheet.gts b/packages/catalog-realm/furniture-tear-sheet/furniture-tear-sheet.gts
index 65f5f0da4d3..a691f6bd422 100644
--- a/packages/catalog-realm/furniture-tear-sheet/furniture-tear-sheet.gts
+++ b/packages/catalog-realm/furniture-tear-sheet/furniture-tear-sheet.gts
@@ -3,11 +3,11 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import MarkdownField from '@cardstack/base/markdown';
+import UrlField from '@cardstack/base/url';
 import { currencyFormat } from '@cardstack/boxel-ui/helpers';
 import HomeIcon from '@cardstack/boxel-icons/home';
 
diff --git a/packages/catalog-realm/game-leaderboard/components/player-preview.gts b/packages/catalog-realm/game-leaderboard/components/player-preview.gts
index cfbb563743f..bd9207f3727 100644
--- a/packages/catalog-realm/game-leaderboard/components/player-preview.gts
+++ b/packages/catalog-realm/game-leaderboard/components/player-preview.gts
@@ -1,4 +1,4 @@
-import { CardDef } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
 import GlimmerComponent from '@glimmer/component';
 
 interface PlayerPreviewSignature {
diff --git a/packages/catalog-realm/game-leaderboard/game-leaderboard.gts b/packages/catalog-realm/game-leaderboard/game-leaderboard.gts
index db86f9b15ce..642c18a32c5 100644
--- a/packages/catalog-realm/game-leaderboard/game-leaderboard.gts
+++ b/packages/catalog-realm/game-leaderboard/game-leaderboard.gts
@@ -4,8 +4,8 @@ import {
   field,
   contains,
   getCardMeta,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import GamepadIcon from '@cardstack/boxel-icons/gamepad-2';
 import { realmURL } from '@cardstack/runtime-common';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/catalog-realm/game-quiz/fields/quiz-difficulty.gts b/packages/catalog-realm/game-quiz/fields/quiz-difficulty.gts
index 6a6abd53645..1027dd4e2b3 100644
--- a/packages/catalog-realm/game-quiz/fields/quiz-difficulty.gts
+++ b/packages/catalog-realm/game-quiz/fields/quiz-difficulty.gts
@@ -2,14 +2,14 @@ import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import { fn } from '@ember/helper';
 import { RadioInput } from '@cardstack/boxel-ui/components';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import {
   Component,
   FieldDef,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 class QuizDifficultyEdit extends Component<typeof QuizDifficultyField> {
   @tracked label = this.args.model.label;
diff --git a/packages/catalog-realm/game-quiz/fields/quiz-question.gts b/packages/catalog-realm/game-quiz/fields/quiz-question.gts
index 9f3c9187df4..3f117c433cb 100644
--- a/packages/catalog-realm/game-quiz/fields/quiz-question.gts
+++ b/packages/catalog-realm/game-quiz/fields/quiz-question.gts
@@ -4,8 +4,8 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { get, array } from '@ember/helper';
 import { eq } from '@cardstack/boxel-ui/helpers';
 
diff --git a/packages/catalog-realm/game-quiz/game-quiz.gts b/packages/catalog-realm/game-quiz/game-quiz.gts
index b89df22cdb6..90c2e4de08b 100644
--- a/packages/catalog-realm/game-quiz/game-quiz.gts
+++ b/packages/catalog-realm/game-quiz/game-quiz.gts
@@ -5,11 +5,11 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import DateTimeField from '@cardstack/base/datetime';
 
 // Boxel UI components and helpers
 import {
diff --git a/packages/catalog-realm/game-record/game-record.gts b/packages/catalog-realm/game-record/game-record.gts
index 71614d0e3fa..10895681649 100644
--- a/packages/catalog-realm/game-record/game-record.gts
+++ b/packages/catalog-realm/game-record/game-record.gts
@@ -5,15 +5,15 @@ import {
   containsMany,
   linksTo,
   Component,
-} from 'https://cardstack.com/base/card-api';
-
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateField from 'https://cardstack.com/base/date';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import UrlField from 'https://cardstack.com/base/url';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import enumField from 'https://cardstack.com/base/enum';
+} from '@cardstack/base/card-api';
+
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateField from '@cardstack/base/date';
+import DateTimeField from '@cardstack/base/datetime';
+import UrlField from '@cardstack/base/url';
+import MarkdownField from '@cardstack/base/markdown';
+import enumField from '@cardstack/base/enum';
 import {
   formatDateTime,
   or,
diff --git a/packages/catalog-realm/game-records-board/game-records-board.gts b/packages/catalog-realm/game-records-board/game-records-board.gts
index b177f41e34d..9fd6d740dfd 100644
--- a/packages/catalog-realm/game-records-board/game-records-board.gts
+++ b/packages/catalog-realm/game-records-board/game-records-board.gts
@@ -4,8 +4,8 @@ import {
   field,
   contains,
   getCardMeta,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import GamepadIcon from '@cardstack/boxel-icons/gamepad-2';
 import { CardList } from '../components/card-list';
 import { realmURL } from '@cardstack/runtime-common';
diff --git a/packages/catalog-realm/game-result/game-result.gts b/packages/catalog-realm/game-result/game-result.gts
index c383444ef27..15264b96462 100644
--- a/packages/catalog-realm/game-result/game-result.gts
+++ b/packages/catalog-realm/game-result/game-result.gts
@@ -6,17 +6,17 @@ import {
   FieldDef,
   Component,
   getCardMeta,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
-import StringField from 'https://cardstack.com/base/string';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+import StringField from '@cardstack/base/string';
+import DateTimeField from '@cardstack/base/datetime';
 import GamepadIcon from '@cardstack/boxel-icons/gamepad-2';
 import { RadioInput, FieldContainer } from '@cardstack/boxel-ui/components';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { fn } from '@ember/helper';
 import { htmlSafe } from '@ember/template';
-import { AbsoluteCodeRefField } from 'https://cardstack.com/base/code-ref';
+import { AbsoluteCodeRefField } from '@cardstack/base/code-ref';
 import GitBranch from '@cardstack/boxel-icons/git-branch';
 
 export type GameResultStatusType = 'Win' | 'Lose' | 'Draw';
diff --git a/packages/catalog-realm/gaming-hub/gaming-hub.gts b/packages/catalog-realm/gaming-hub/gaming-hub.gts
index 509358c8bb5..0f937efcc6f 100644
--- a/packages/catalog-realm/gaming-hub/gaming-hub.gts
+++ b/packages/catalog-realm/gaming-hub/gaming-hub.gts
@@ -5,9 +5,9 @@ import {
   linksTo,
   Component,
   getComponent,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
-import StringField from 'https://cardstack.com/base/string';
+import StringField from '@cardstack/base/string';
 
 import { Button, CardContainer } from '@cardstack/boxel-ui/components';
 
diff --git a/packages/catalog-realm/gaming-platform/gaming-platform.gts b/packages/catalog-realm/gaming-platform/gaming-platform.gts
index 29ab9d65b3c..5f844427694 100644
--- a/packages/catalog-realm/gaming-platform/gaming-platform.gts
+++ b/packages/catalog-realm/gaming-platform/gaming-platform.gts
@@ -3,13 +3,13 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import UrlField from 'https://cardstack.com/base/url';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import DateTimeField from '@cardstack/base/datetime';
+import UrlField from '@cardstack/base/url';
 
 import { formatDateTime } from '@cardstack/boxel-ui/helpers';
 import { concat } from '@ember/helper';
diff --git a/packages/catalog-realm/gaming-player/gaming-player.gts b/packages/catalog-realm/gaming-player/gaming-player.gts
index 0d56ecd96d8..10a1baefd4e 100644
--- a/packages/catalog-realm/gaming-player/gaming-player.gts
+++ b/packages/catalog-realm/gaming-player/gaming-player.gts
@@ -5,15 +5,15 @@ import {
   containsMany,
   linksToMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateField from 'https://cardstack.com/base/date';
-import UrlField from 'https://cardstack.com/base/url';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import EmailField from 'https://cardstack.com/base/email';
+} from '@cardstack/base/card-api';
+
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import DateField from '@cardstack/base/date';
+import UrlField from '@cardstack/base/url';
+import MarkdownField from '@cardstack/base/markdown';
+import EmailField from '@cardstack/base/email';
 
 import { formatNumber, gt, lt, subtract } from '@cardstack/boxel-ui/helpers';
 
diff --git a/packages/catalog-realm/github-event/github-event.gts b/packages/catalog-realm/github-event/github-event.gts
index b347eb45f89..389c1fed5f7 100644
--- a/packages/catalog-realm/github-event/github-event.gts
+++ b/packages/catalog-realm/github-event/github-event.gts
@@ -1,7 +1,7 @@
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import { JsonField } from 'https://cardstack.com/base/commands/search-card-result';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import { JsonField } from '@cardstack/base/commands/search-card-result';
 
 export class GithubEventCard extends CardDef {
   static displayName = 'GitHub Event';
diff --git a/packages/catalog-realm/golf-scorecard/golf-scorecard.gts b/packages/catalog-realm/golf-scorecard/golf-scorecard.gts
index 2d731098aed..fb88bd0c636 100644
--- a/packages/catalog-realm/golf-scorecard/golf-scorecard.gts
+++ b/packages/catalog-realm/golf-scorecard/golf-scorecard.gts
@@ -5,11 +5,11 @@ import {
   field,
   contains,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateField from 'https://cardstack.com/base/date';
-import BooleanField from 'https://cardstack.com/base/boolean';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateField from '@cardstack/base/date';
+import BooleanField from '@cardstack/base/boolean';
 import { cn } from '@cardstack/boxel-ui/helpers';
 import TrophyIcon from '@cardstack/boxel-icons/trophy';
 
diff --git a/packages/catalog-realm/grid.json b/packages/catalog-realm/grid.json
index a684486514f..4c2a1717960 100644
--- a/packages/catalog-realm/grid.json
+++ b/packages/catalog-realm/grid.json
@@ -5,7 +5,7 @@
     "relationships": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/cards-grid",
+        "module": "@cardstack/base/cards-grid",
         "name": "CardsGrid"
       }
     }
diff --git a/packages/catalog-realm/hello-world.json b/packages/catalog-realm/hello-world.json
index e5cad7ca1e9..cdbe89c996d 100644
--- a/packages/catalog-realm/hello-world.json
+++ b/packages/catalog-realm/hello-world.json
@@ -7,7 +7,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/card-api",
+        "module": "@cardstack/base/card-api",
         "name": "CardDef"
       }
     }
diff --git a/packages/catalog-realm/homework-grader/homework.gts b/packages/catalog-realm/homework-grader/homework.gts
index 870963b0a8e..a2f489e1f50 100644
--- a/packages/catalog-realm/homework-grader/homework.gts
+++ b/packages/catalog-realm/homework-grader/homework.gts
@@ -8,12 +8,12 @@ import {
   CardDef,
   FieldDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import TextAreaField from 'https://cardstack.com/base/text-area';
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import NumberField from 'https://cardstack.com/base/number';
-import { Skill } from 'https://cardstack.com/base/skill';
+} from '@cardstack/base/card-api';
+import TextAreaField from '@cardstack/base/text-area';
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown';
+import NumberField from '@cardstack/base/number';
+import { Skill } from '@cardstack/base/skill';
 import { on } from '@ember/modifier';
 import { tracked } from '@glimmer/tracking';
 
diff --git a/packages/catalog-realm/leaflet-map/leaflet-map.gts b/packages/catalog-realm/leaflet-map/leaflet-map.gts
index e07ba976237..20bc43b01f8 100644
--- a/packages/catalog-realm/leaflet-map/leaflet-map.gts
+++ b/packages/catalog-realm/leaflet-map/leaflet-map.gts
@@ -1,12 +1,12 @@
 import MapIcon from '@cardstack/boxel-icons/map';
 
-import StringField from 'https://cardstack.com/base/string';
+import StringField from '@cardstack/base/string';
 import {
   CardDef,
   contains,
   field,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import GeoPointField from '../fields/geo-point';
 import { MapRender } from '../components/map-render';
diff --git a/packages/catalog-realm/lease-calculator-2/lease-calculator-2.gts b/packages/catalog-realm/lease-calculator-2/lease-calculator-2.gts
index ab780761e3b..f50dc6aea2a 100644
--- a/packages/catalog-realm/lease-calculator-2/lease-calculator-2.gts
+++ b/packages/catalog-realm/lease-calculator-2/lease-calculator-2.gts
@@ -3,12 +3,12 @@ import {
   field,
   contains,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import TextAreaField from 'https://cardstack.com/base/text-area';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import TextAreaField from '@cardstack/base/text-area';
+import { Component } from '@cardstack/base/card-api';
 
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/packages/catalog-realm/lease-calculator/lease-calculator.gts b/packages/catalog-realm/lease-calculator/lease-calculator.gts
index 1314e228815..fe23439f2b8 100644
--- a/packages/catalog-realm/lease-calculator/lease-calculator.gts
+++ b/packages/catalog-realm/lease-calculator/lease-calculator.gts
@@ -4,10 +4,10 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
 import { subtract, multiply, divide, gt } from '@cardstack/boxel-ui/helpers';
 import { currencyFormat } from '@cardstack/boxel-ui/helpers';
 import { concat } from '@ember/helper';
diff --git a/packages/catalog-realm/link-tree/link-tree.gts b/packages/catalog-realm/link-tree/link-tree.gts
index 986939c13dc..8a830ad6407 100644
--- a/packages/catalog-realm/link-tree/link-tree.gts
+++ b/packages/catalog-realm/link-tree/link-tree.gts
@@ -5,11 +5,11 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import UrlField from 'https://cardstack.com/base/url';
-import ColorField from 'https://cardstack.com/base/color';
-import BooleanField from 'https://cardstack.com/base/boolean';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import UrlField from '@cardstack/base/url';
+import ColorField from '@cardstack/base/color';
+import BooleanField from '@cardstack/base/boolean';
 import { concat } from '@ember/helper';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/packages/catalog-realm/llm-model-environment/Environment/3f6cde92-99b2-4bb5-a471-20d907cb682b.json b/packages/catalog-realm/llm-model-environment/Environment/3f6cde92-99b2-4bb5-a471-20d907cb682b.json
index c663a3faa34..7de47fbd4e4 100644
--- a/packages/catalog-realm/llm-model-environment/Environment/3f6cde92-99b2-4bb5-a471-20d907cb682b.json
+++ b/packages/catalog-realm/llm-model-environment/Environment/3f6cde92-99b2-4bb5-a471-20d907cb682b.json
@@ -249,7 +249,7 @@
       },
       "shortcutSettings.3.requiredSkills.0": {
         "links": {
-          "self": "https://cardstack.com/base/Skill/boxel-environment"
+          "self": "@cardstack/base/Skill/boxel-environment"
         }
       }
     },
diff --git a/packages/catalog-realm/llm-model-environment/environment.gts b/packages/catalog-realm/llm-model-environment/environment.gts
index d6ab13bf6c9..315744f3f48 100644
--- a/packages/catalog-realm/llm-model-environment/environment.gts
+++ b/packages/catalog-realm/llm-model-environment/environment.gts
@@ -19,10 +19,10 @@ import {
   containsMany,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import { Skill } from 'https://cardstack.com/base/skill';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import { Skill } from '@cardstack/base/skill';
 import { includes, uniqBy } from 'lodash';
 
 import SettingsIcon from '@cardstack/boxel-icons/settings';
diff --git a/packages/catalog-realm/llm-model-environment/model.gts b/packages/catalog-realm/llm-model-environment/model.gts
index 5a522c249e1..0fcf9e46a8c 100644
--- a/packages/catalog-realm/llm-model-environment/model.gts
+++ b/packages/catalog-realm/llm-model-environment/model.gts
@@ -4,15 +4,15 @@ import {
   field,
   contains,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { eq } from '@cardstack/boxel-ui/helpers';
 import { on } from '@ember/modifier';
-import { Component } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import { action } from '@ember/object';
 
-import BooleanField from 'https://cardstack.com/base/boolean';
+import BooleanField from '@cardstack/base/boolean';
 
 import BrainIcon from '@cardstack/boxel-icons/brain';
 
diff --git a/packages/catalog-realm/map/map.gts b/packages/catalog-realm/map/map.gts
index ff1d6182103..76d4dfc1728 100644
--- a/packages/catalog-realm/map/map.gts
+++ b/packages/catalog-realm/map/map.gts
@@ -1,12 +1,12 @@
-import NumberField from 'https://cardstack.com/base/number';
+import NumberField from '@cardstack/base/number';
 import {
   CardDef,
   field,
   contains,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-import AddressField from 'https://cardstack.com/base/address';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import AddressField from '@cardstack/base/address';
+import { Component } from '@cardstack/base/card-api';
 import MapIcon from '@cardstack/boxel-icons/map';
 
 function or(value: number | undefined, defaultValue: number) {
diff --git a/packages/catalog-realm/minecraft-invite/minecraft-invite.gts b/packages/catalog-realm/minecraft-invite/minecraft-invite.gts
index 0ebdf857d35..5f743d7bdcf 100644
--- a/packages/catalog-realm/minecraft-invite/minecraft-invite.gts
+++ b/packages/catalog-realm/minecraft-invite/minecraft-invite.gts
@@ -5,12 +5,12 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { dayjsFormat } from '@cardstack/boxel-ui/helpers';
-import StringField from 'https://cardstack.com/base/string';
-import DateField from 'https://cardstack.com/base/date';
-import TextAreaField from 'https://cardstack.com/base/text-area';
-import UrlField from 'https://cardstack.com/base/url';
+import StringField from '@cardstack/base/string';
+import DateField from '@cardstack/base/date';
+import TextAreaField from '@cardstack/base/text-area';
+import UrlField from '@cardstack/base/url';
 
 export class MinecraftInvite extends CardDef {
   static displayName = 'Minecraft Invite';
diff --git a/packages/catalog-realm/mood-selector-playlist/mood-selector-playlist.gts b/packages/catalog-realm/mood-selector-playlist/mood-selector-playlist.gts
index 0b21d243200..1db96ec2b11 100644
--- a/packages/catalog-realm/mood-selector-playlist/mood-selector-playlist.gts
+++ b/packages/catalog-realm/mood-selector-playlist/mood-selector-playlist.gts
@@ -7,8 +7,8 @@ import {
   containsMany,
   linksTo,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { Button } from '@cardstack/boxel-ui/components';
 import { gt } from '@cardstack/boxel-ui/helpers';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/catalog-realm/mortgage-calculator/mortgage-calculator.gts b/packages/catalog-realm/mortgage-calculator/mortgage-calculator.gts
index ab9cfa3302f..2bfcd3189f3 100644
--- a/packages/catalog-realm/mortgage-calculator/mortgage-calculator.gts
+++ b/packages/catalog-realm/mortgage-calculator/mortgage-calculator.gts
@@ -1,10 +1,10 @@
-import NumberField from 'https://cardstack.com/base/number';
+import NumberField from '@cardstack/base/number';
 import {
   CardDef,
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { concat } from '@ember/helper';
 import { htmlSafe } from '@ember/template';
 import GlimmerComponent from '@glimmer/component';
diff --git a/packages/catalog-realm/multiple-choice/multiple-choice.gts b/packages/catalog-realm/multiple-choice/multiple-choice.gts
index 6136faf7a6b..2d1b9371234 100644
--- a/packages/catalog-realm/multiple-choice/multiple-choice.gts
+++ b/packages/catalog-realm/multiple-choice/multiple-choice.gts
@@ -1,13 +1,13 @@
-import NumberField from 'https://cardstack.com/base/number';
+import NumberField from '@cardstack/base/number';
 import {
   CardDef,
   field,
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import DateTimeField from '@cardstack/base/datetime';
 import { on } from '@ember/modifier';
 import { fn } from '@ember/helper';
 import { eq, or, bool } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/music-album/music-album.gts b/packages/catalog-realm/music-album/music-album.gts
index 76807ebc027..cedd9d6e765 100644
--- a/packages/catalog-realm/music-album/music-album.gts
+++ b/packages/catalog-realm/music-album/music-album.gts
@@ -3,10 +3,10 @@ import {
   contains,
   linksToMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import UrlField from '@cardstack/base/url';
 import { and, gt } from '@cardstack/boxel-ui/helpers';
 
 import { SongCard } from '../song/song';
diff --git a/packages/catalog-realm/music-coder/music-coder.gts b/packages/catalog-realm/music-coder/music-coder.gts
index b7f93af9223..81487fbf202 100644
--- a/packages/catalog-realm/music-coder/music-coder.gts
+++ b/packages/catalog-realm/music-coder/music-coder.gts
@@ -4,10 +4,10 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import TextAreaField from '@cardstack/base/text-area';
 import { tracked } from '@glimmer/tracking';
 import { on } from '@ember/modifier';
 import Modifier from 'ember-modifier';
diff --git a/packages/catalog-realm/music-hub/music-hub.gts b/packages/catalog-realm/music-hub/music-hub.gts
index 2e879706e87..d72db9cf65a 100644
--- a/packages/catalog-realm/music-hub/music-hub.gts
+++ b/packages/catalog-realm/music-hub/music-hub.gts
@@ -6,8 +6,8 @@ import {
   linksTo,
   linksToMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { Button } from '@cardstack/boxel-ui/components';
 import { eq, gt } from '@cardstack/boxel-ui/helpers';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/musician-landing-page/musician-landing-page.gts b/packages/catalog-realm/musician-landing-page/musician-landing-page.gts
index ec9f58ddf54..df643ee88b0 100644
--- a/packages/catalog-realm/musician-landing-page/musician-landing-page.gts
+++ b/packages/catalog-realm/musician-landing-page/musician-landing-page.gts
@@ -5,13 +5,13 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
-import StringField from 'https://cardstack.com/base/string';
-import TextAreaField from 'https://cardstack.com/base/text-area';
-import UrlField from 'https://cardstack.com/base/url';
-import DateField from 'https://cardstack.com/base/date';
-import ColorField from 'https://cardstack.com/base/color';
+import StringField from '@cardstack/base/string';
+import TextAreaField from '@cardstack/base/text-area';
+import UrlField from '@cardstack/base/url';
+import DateField from '@cardstack/base/date';
+import ColorField from '@cardstack/base/color';
 
 import { dayjsFormat, gt } from '@cardstack/boxel-ui/helpers';
 
diff --git a/packages/catalog-realm/news-feed/author.gts b/packages/catalog-realm/news-feed/author.gts
index ec505ead739..3597888bed0 100644
--- a/packages/catalog-realm/news-feed/author.gts
+++ b/packages/catalog-realm/news-feed/author.gts
@@ -3,7 +3,7 @@ import {
   StringField,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export class Author extends CardDef {
   static displayName = 'Author';
diff --git a/packages/catalog-realm/news-feed/communication-log.gts b/packages/catalog-realm/news-feed/communication-log.gts
index eb7dc5bceb8..06f9630c837 100644
--- a/packages/catalog-realm/news-feed/communication-log.gts
+++ b/packages/catalog-realm/news-feed/communication-log.gts
@@ -14,8 +14,8 @@ import {
   contains,
   linksTo,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { not } from '@cardstack/boxel-ui/helpers';
 
 import { Post, EventPost, ReminderPost } from './post';
diff --git a/packages/catalog-realm/news-feed/post.gts b/packages/catalog-realm/news-feed/post.gts
index f7b7f3ee7c3..2c0838a6d58 100644
--- a/packages/catalog-realm/news-feed/post.gts
+++ b/packages/catalog-realm/news-feed/post.gts
@@ -4,10 +4,10 @@ import {
   contains,
   Component,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import TextAreaField from 'https://cardstack.com/base/text-area';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import TextAreaField from '@cardstack/base/text-area';
+import DateTimeField from '@cardstack/base/datetime';
 import GeoSearchPointField from '../fields/geo-search-point';
 
 import { formatDateTime, not } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/online-customer/online-customer.gts b/packages/catalog-realm/online-customer/online-customer.gts
index 89a9c0a6d62..aa424ae2c15 100644
--- a/packages/catalog-realm/online-customer/online-customer.gts
+++ b/packages/catalog-realm/online-customer/online-customer.gts
@@ -4,10 +4,10 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateTimeField from '@cardstack/base/datetime';
 import ContactLinkField from '../fields/contact-link';
 
 import {
diff --git a/packages/catalog-realm/online-order/online-order.gts b/packages/catalog-realm/online-order/online-order.gts
index d39c5f35a59..4621de6c9a4 100644
--- a/packages/catalog-realm/online-order/online-order.gts
+++ b/packages/catalog-realm/online-order/online-order.gts
@@ -3,12 +3,12 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import EmailField from 'https://cardstack.com/base/email';
-import AddressField from 'https://cardstack.com/base/address';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateTimeField from '@cardstack/base/datetime';
+import EmailField from '@cardstack/base/email';
+import AddressField from '@cardstack/base/address';
 
 import { Pill } from '@cardstack/boxel-ui/components';
 import {
diff --git a/packages/catalog-realm/online-product/online-product.gts b/packages/catalog-realm/online-product/online-product.gts
index 7969f73c320..a7bbfd18ef7 100644
--- a/packages/catalog-realm/online-product/online-product.gts
+++ b/packages/catalog-realm/online-product/online-product.gts
@@ -3,12 +3,12 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import UrlField from 'https://cardstack.com/base/url';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import UrlField from '@cardstack/base/url';
+import TextAreaField from '@cardstack/base/text-area';
 
 import { Button, Pill } from '@cardstack/boxel-ui/components';
 import {
diff --git a/packages/catalog-realm/online-store/online-store.gts b/packages/catalog-realm/online-store/online-store.gts
index 1e081204972..d752b2b51a2 100644
--- a/packages/catalog-realm/online-store/online-store.gts
+++ b/packages/catalog-realm/online-store/online-store.gts
@@ -3,14 +3,14 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { type LooseSingleCardDocument } from '@cardstack/runtime-common';
-import StringField from 'https://cardstack.com/base/string';
-import UrlField from 'https://cardstack.com/base/url';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import TextAreaField from 'https://cardstack.com/base/text-area';
-import ColorField from 'https://cardstack.com/base/color';
-import EmailField from 'https://cardstack.com/base/email';
+import StringField from '@cardstack/base/string';
+import UrlField from '@cardstack/base/url';
+import MarkdownField from '@cardstack/base/markdown';
+import TextAreaField from '@cardstack/base/text-area';
+import ColorField from '@cardstack/base/color';
+import EmailField from '@cardstack/base/email';
 
 import { Button } from '@cardstack/boxel-ui/components';
 import { eq, gt, formatNumber } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/photo-collage/photo-collage.gts b/packages/catalog-realm/photo-collage/photo-collage.gts
index 75b945fff79..4d5caeecb30 100644
--- a/packages/catalog-realm/photo-collage/photo-collage.gts
+++ b/packages/catalog-realm/photo-collage/photo-collage.gts
@@ -1,4 +1,4 @@
-import BooleanField from 'https://cardstack.com/base/boolean';
+import BooleanField from '@cardstack/base/boolean';
 import {
   CardDef,
   field,
@@ -6,9 +6,9 @@ import {
   containsMany,
   Component,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import UrlField from '@cardstack/base/url';
 
 export class PhotoItem extends FieldDef {
   static displayName = 'Photo';
diff --git a/packages/catalog-realm/piano/piano.gts b/packages/catalog-realm/piano/piano.gts
index 011d38e2556..d259a246cdb 100644
--- a/packages/catalog-realm/piano/piano.gts
+++ b/packages/catalog-realm/piano/piano.gts
@@ -4,10 +4,10 @@ import {
   FieldDef,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import BooleanField from '@cardstack/base/boolean';
+import NumberField from '@cardstack/base/number';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/player-progress/player-progress.gts b/packages/catalog-realm/player-progress/player-progress.gts
index 9c5cc8a8061..a61ab30e1bd 100644
--- a/packages/catalog-realm/player-progress/player-progress.gts
+++ b/packages/catalog-realm/player-progress/player-progress.gts
@@ -5,14 +5,14 @@ import {
   containsMany,
   linksTo,
   Component,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateField from 'https://cardstack.com/base/date';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import UrlField from 'https://cardstack.com/base/url';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateField from '@cardstack/base/date';
+import DateTimeField from '@cardstack/base/datetime';
+import UrlField from '@cardstack/base/url';
+import MarkdownField from '@cardstack/base/markdown';
 
 import {
   formatDateTime,
diff --git a/packages/catalog-realm/player/player.gts b/packages/catalog-realm/player/player.gts
index b350271366f..6e868026d72 100644
--- a/packages/catalog-realm/player/player.gts
+++ b/packages/catalog-realm/player/player.gts
@@ -4,7 +4,7 @@ import {
   contains,
   StringField,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import AvatarField from '../fields/avatar';
 
 export class Player extends CardDef {
diff --git a/packages/catalog-realm/playlist/playlist.gts b/packages/catalog-realm/playlist/playlist.gts
index 3bfcb9a950a..aa02870c06e 100644
--- a/packages/catalog-realm/playlist/playlist.gts
+++ b/packages/catalog-realm/playlist/playlist.gts
@@ -5,13 +5,13 @@ import {
   contains,
   linksToMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import UrlField from 'https://cardstack.com/base/url';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateField from 'https://cardstack.com/base/date';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import UrlField from '@cardstack/base/url';
+import BooleanField from '@cardstack/base/boolean';
+import DateField from '@cardstack/base/date';
+import TextAreaField from '@cardstack/base/text-area';
 import MusicIcon from '@cardstack/boxel-icons/music';
 import { and, gt, eq, add } from '@cardstack/boxel-ui/helpers';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/catalog-realm/pr-card/components/isolated/header-section.gts b/packages/catalog-realm/pr-card/components/isolated/header-section.gts
index 842fa172763..fa004df18e2 100644
--- a/packages/catalog-realm/pr-card/components/isolated/header-section.gts
+++ b/packages/catalog-realm/pr-card/components/isolated/header-section.gts
@@ -3,7 +3,7 @@ import ExternalLinkIcon from '@cardstack/boxel-icons/external-link';
 import CopyIcon from '@cardstack/boxel-icons/copy';
 import { Pill } from '@cardstack/boxel-ui/components';
 import { on } from '@ember/modifier';
-import type { CardOrFieldTypeIcon } from 'https://cardstack.com/base/card-api';
+import type { CardOrFieldTypeIcon } from '@cardstack/base/card-api';
 
 interface HeaderSectionSignature {
   Args: {
diff --git a/packages/catalog-realm/pr-card/fields/ci-status-field.gts b/packages/catalog-realm/pr-card/fields/ci-status-field.gts
index 4e1392270f7..b2b86078bbf 100644
--- a/packages/catalog-realm/pr-card/fields/ci-status-field.gts
+++ b/packages/catalog-realm/pr-card/fields/ci-status-field.gts
@@ -5,7 +5,7 @@ import {
   field,
   contains,
   realmURL,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import {
   buildCiItems,
diff --git a/packages/catalog-realm/pr-card/fields/review-status-field.gts b/packages/catalog-realm/pr-card/fields/review-status-field.gts
index 9c3ba0fe255..4c89871cb14 100644
--- a/packages/catalog-realm/pr-card/fields/review-status-field.gts
+++ b/packages/catalog-realm/pr-card/fields/review-status-field.gts
@@ -5,7 +5,7 @@ import {
   field,
   contains,
   realmURL,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { Pill } from '@cardstack/boxel-ui/components';
 import { eq } from '@cardstack/boxel-ui/helpers';
 import type { GithubEventCard } from '../../github-event/github-event';
diff --git a/packages/catalog-realm/pr-card/pr-card.gts b/packages/catalog-realm/pr-card/pr-card.gts
index 7129a4eae74..599257586b7 100644
--- a/packages/catalog-realm/pr-card/pr-card.gts
+++ b/packages/catalog-realm/pr-card/pr-card.gts
@@ -6,9 +6,9 @@ import {
   contains,
   containsMany,
   realmURL,
-} from 'https://cardstack.com/base/card-api';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import DatetimeField from 'https://cardstack.com/base/datetime';
+} from '@cardstack/base/card-api';
+import MarkdownField from '@cardstack/base/markdown';
+import DatetimeField from '@cardstack/base/datetime';
 import { FileContentField } from '../fields/file-content';
 import GitPullRequestIcon from '@cardstack/boxel-icons/git-pull-request';
 import ExternalLinkIcon from '@cardstack/boxel-icons/external-link';
diff --git a/packages/catalog-realm/practice-quiz/practice-quiz.gts b/packages/catalog-realm/practice-quiz/practice-quiz.gts
index d7149e6e177..fcce22b2371 100644
--- a/packages/catalog-realm/practice-quiz/practice-quiz.gts
+++ b/packages/catalog-realm/practice-quiz/practice-quiz.gts
@@ -6,11 +6,11 @@ import {
   containsMany,
   Component,
   FieldDef,
-} from 'https://cardstack.com/base/card-api'; // ⁽¹⁾ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+} from '@cardstack/base/card-api'; // ⁽¹⁾ Core imports
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import DateTimeField from '@cardstack/base/datetime';
 import { Button, Pill } from '@cardstack/boxel-ui/components'; // ⁽²⁾ UI components
 import {
   formatDateTime,
diff --git a/packages/catalog-realm/product-rotater/components/product-catalog.gts b/packages/catalog-realm/product-rotater/components/product-catalog.gts
index c7768fab9f4..303faeff7fb 100644
--- a/packages/catalog-realm/product-rotater/components/product-catalog.gts
+++ b/packages/catalog-realm/product-rotater/components/product-catalog.gts
@@ -4,8 +4,8 @@ import {
   field,
   contains,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import { ProductRotationImage } from './product-rotation-image';
 
diff --git a/packages/catalog-realm/product-rotater/components/product-rotation-image.gts b/packages/catalog-realm/product-rotater/components/product-rotation-image.gts
index 6b8a673a68b..2cfcd2fe625 100644
--- a/packages/catalog-realm/product-rotater/components/product-rotation-image.gts
+++ b/packages/catalog-realm/product-rotater/components/product-rotation-image.gts
@@ -3,9 +3,9 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import ImageField from '../../fields/image';
 
 class ProductRotationImageEmbedded extends Component<
diff --git a/packages/catalog-realm/product-rotater/product-rotater.gts b/packages/catalog-realm/product-rotater/product-rotater.gts
index 8b682290fac..02b9ffeaad7 100644
--- a/packages/catalog-realm/product-rotater/product-rotater.gts
+++ b/packages/catalog-realm/product-rotater/product-rotater.gts
@@ -5,11 +5,11 @@ import {
   contains,
   linksToMany,
   type CardContext,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import PackageIcon from '@cardstack/boxel-icons/package';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BaseImageCard from 'https://cardstack.com/base/image';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BaseImageCard from '@cardstack/base/image';
 import ImageField from '../fields/image';
 import { on } from '@ember/modifier';
 import { action } from '@ember/object';
diff --git a/packages/catalog-realm/recording-studio/recording-studio.gts b/packages/catalog-realm/recording-studio/recording-studio.gts
index 4cbac6c5c64..49b02579dd3 100644
--- a/packages/catalog-realm/recording-studio/recording-studio.gts
+++ b/packages/catalog-realm/recording-studio/recording-studio.gts
@@ -3,10 +3,10 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import BooleanField from '@cardstack/base/boolean';
+import NumberField from '@cardstack/base/number';
 import MusicIcon from '@cardstack/boxel-icons/music';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/packages/catalog-realm/resources/get-fields-resource.gts b/packages/catalog-realm/resources/get-fields-resource.gts
index 59b590109d5..fab74a3e01d 100644
--- a/packages/catalog-realm/resources/get-fields-resource.gts
+++ b/packages/catalog-realm/resources/get-fields-resource.gts
@@ -11,7 +11,7 @@ import {
   BaseDef,
   type Field,
   getFields,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 interface GetFieldsResourceArgs {
   named: {
diff --git a/packages/catalog-realm/reward-card-program/reward-card-program-tracker.gts b/packages/catalog-realm/reward-card-program/reward-card-program-tracker.gts
index 8ed35ef2ae2..2ad8fcd15bb 100644
--- a/packages/catalog-realm/reward-card-program/reward-card-program-tracker.gts
+++ b/packages/catalog-realm/reward-card-program/reward-card-program-tracker.gts
@@ -6,11 +6,11 @@ import {
   containsMany,
   linksTo,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateField from 'https://cardstack.com/base/date';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import BooleanField from '@cardstack/base/boolean';
+import DateField from '@cardstack/base/date';
+import MarkdownField from '@cardstack/base/markdown';
 import { RewardCardProgram, Benefit } from './reward-card-program';
 import { gt, eq, and, or } from '@cardstack/boxel-ui/helpers';
 import { formatDateTime, formatCurrency } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/reward-card-program/reward-card-program.gts b/packages/catalog-realm/reward-card-program/reward-card-program.gts
index 3221ad2ca9b..8ee3ca3abba 100644
--- a/packages/catalog-realm/reward-card-program/reward-card-program.gts
+++ b/packages/catalog-realm/reward-card-program/reward-card-program.gts
@@ -7,13 +7,13 @@ import {
   linksTo,
   linksToMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateField from 'https://cardstack.com/base/date';
-import UrlField from 'https://cardstack.com/base/url';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import DateField from '@cardstack/base/date';
+import UrlField from '@cardstack/base/url';
+import MarkdownField from '@cardstack/base/markdown';
 import { gt } from '@cardstack/boxel-ui/helpers';
 import { formatCurrency, formatNumber } from '@cardstack/boxel-ui/helpers';
 import AmountWithCurrency from '../fields/amount-with-currency';
diff --git a/packages/catalog-realm/route/route.gts b/packages/catalog-realm/route/route.gts
index 2df309f7a7c..c8ad94fcb0e 100644
--- a/packages/catalog-realm/route/route.gts
+++ b/packages/catalog-realm/route/route.gts
@@ -1,12 +1,12 @@
 import MapIcon from '@cardstack/boxel-icons/map';
-import StringField from 'https://cardstack.com/base/string';
+import StringField from '@cardstack/base/string';
 import {
   Component,
   contains,
   containsMany,
   CardDef,
   field,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { MapRender, type Coordinate } from '../components/map-render';
 import LeafletMapConfigField from '../fields/leaflet-map-config-field';
 import GeoSearchPointField, {
diff --git a/packages/catalog-realm/school-calendar/components/calendar-event.gts b/packages/catalog-realm/school-calendar/components/calendar-event.gts
index b8ebd384803..50ef2b91ced 100644
--- a/packages/catalog-realm/school-calendar/components/calendar-event.gts
+++ b/packages/catalog-realm/school-calendar/components/calendar-event.gts
@@ -5,11 +5,11 @@ import {
   field,
   contains,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import BooleanField from 'https://cardstack.com/base/boolean';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import DateTimeField from '@cardstack/base/datetime';
+import MarkdownField from '@cardstack/base/markdown';
+import BooleanField from '@cardstack/base/boolean';
 import { EventRsvp } from './event-rsvp';
 import EventIcon from '@cardstack/boxel-icons/calendar-plus';
 import { dayjsFormat } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/school-calendar/components/event-rsvp.gts b/packages/catalog-realm/school-calendar/components/event-rsvp.gts
index c9e103a2331..4cdf12f9311 100644
--- a/packages/catalog-realm/school-calendar/components/event-rsvp.gts
+++ b/packages/catalog-realm/school-calendar/components/event-rsvp.gts
@@ -6,12 +6,12 @@ import {
   field,
   contains,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import NumberField from 'https://cardstack.com/base/number';
-import EmailField from 'https://cardstack.com/base/email';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import BooleanField from '@cardstack/base/boolean';
+import NumberField from '@cardstack/base/number';
+import EmailField from '@cardstack/base/email';
+import TextAreaField from '@cardstack/base/text-area';
 import { Button } from '@cardstack/boxel-ui/components';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/catalog-realm/school-calendar/components/schedule-item.gts b/packages/catalog-realm/school-calendar/components/schedule-item.gts
index 7239b506c30..00ab7441434 100644
--- a/packages/catalog-realm/school-calendar/components/schedule-item.gts
+++ b/packages/catalog-realm/school-calendar/components/schedule-item.gts
@@ -4,9 +4,9 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown';
 import ClockIcon from '@cardstack/boxel-icons/clock';
 import { htmlSafe } from '@ember/template';
 
diff --git a/packages/catalog-realm/school-calendar/school-calendar.gts b/packages/catalog-realm/school-calendar/school-calendar.gts
index 11f7375d4d0..bb5e7a672d2 100644
--- a/packages/catalog-realm/school-calendar/school-calendar.gts
+++ b/packages/catalog-realm/school-calendar/school-calendar.gts
@@ -4,9 +4,9 @@ import {
   field,
   contains,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import DateField from 'https://cardstack.com/base/date';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import DateField from '@cardstack/base/date';
 import { CalendarEvent } from './components/calendar-event';
 import { ScheduleItem } from './components/schedule-item';
 import CalendarIcon from '@cardstack/boxel-icons/calendar';
diff --git a/packages/catalog-realm/skill-family.gts b/packages/catalog-realm/skill-family.gts
index 05a66a2e475..dfc87d038fd 100644
--- a/packages/catalog-realm/skill-family.gts
+++ b/packages/catalog-realm/skill-family.gts
@@ -1,13 +1,13 @@
 import { fn } from '@ember/helper';
 import { gt, eq } from '@cardstack/boxel-ui/helpers';
-import { Skill } from 'https://cardstack.com/base/skill';
+import { Skill } from '@cardstack/base/skill';
 import {
   field,
   contains,
   linksToMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import MarkdownField from '@cardstack/base/markdown';
 import { Statement } from './statement';
 import { tracked } from '@glimmer/tracking';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/solitaire/solitaire.gts b/packages/catalog-realm/solitaire/solitaire.gts
index d5b91dab2dc..9545e3d0514 100644
--- a/packages/catalog-realm/solitaire/solitaire.gts
+++ b/packages/catalog-realm/solitaire/solitaire.gts
@@ -6,10 +6,10 @@ import {
   contains,
   containsMany,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
diff --git a/packages/catalog-realm/song-builder/song-builder.gts b/packages/catalog-realm/song-builder/song-builder.gts
index 822f8e60a69..5b7a70a51f0 100644
--- a/packages/catalog-realm/song-builder/song-builder.gts
+++ b/packages/catalog-realm/song-builder/song-builder.gts
@@ -6,11 +6,11 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import TextAreaField from 'https://cardstack.com/base/text-area';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import TextAreaField from '@cardstack/base/text-area';
+import MarkdownField from '@cardstack/base/markdown';
 import { Button } from '@cardstack/boxel-ui/components'; // ² UI components
 import { eq, gt } from '@cardstack/boxel-ui/helpers';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/song/song.gts b/packages/catalog-realm/song/song.gts
index e21151a315d..9af3104f7fc 100644
--- a/packages/catalog-realm/song/song.gts
+++ b/packages/catalog-realm/song/song.gts
@@ -2,10 +2,10 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import UrlField from 'https://cardstack.com/base/url';
-import BooleanField from 'https://cardstack.com/base/boolean';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import UrlField from '@cardstack/base/url';
+import BooleanField from '@cardstack/base/boolean';
 import { concat } from '@ember/helper';
 import { htmlSafe } from '@ember/template';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/catalog-realm/sparkling-water-catalog/sparkling-water-catalog.gts b/packages/catalog-realm/sparkling-water-catalog/sparkling-water-catalog.gts
index 45f7930152d..929a6b183aa 100644
--- a/packages/catalog-realm/sparkling-water-catalog/sparkling-water-catalog.gts
+++ b/packages/catalog-realm/sparkling-water-catalog/sparkling-water-catalog.gts
@@ -4,12 +4,12 @@ import {
   contains,
   linksToMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import GlimmerComponent from '@glimmer/component';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import ColorField from 'https://cardstack.com/base/color';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import MarkdownField from '@cardstack/base/markdown';
+import ColorField from '@cardstack/base/color';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { fn, concat, array } from '@ember/helper';
diff --git a/packages/catalog-realm/spotify-track/spotify-track.gts b/packages/catalog-realm/spotify-track/spotify-track.gts
index 4030326631c..80ccc15c284 100644
--- a/packages/catalog-realm/spotify-track/spotify-track.gts
+++ b/packages/catalog-realm/spotify-track/spotify-track.gts
@@ -5,8 +5,8 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
 import NumberField from '../fields/number'; // ² Import catalog number field
 import DateField from '../fields/date'; // ³ Import catalog date field
 import AudioField from '../fields/audio'; // ⁴ Import catalog audio field with waveform
diff --git a/packages/catalog-realm/spreadsheet-chart/spreadsheet-chart.gts b/packages/catalog-realm/spreadsheet-chart/spreadsheet-chart.gts
index fd7430b3194..0d43dbca8c6 100644
--- a/packages/catalog-realm/spreadsheet-chart/spreadsheet-chart.gts
+++ b/packages/catalog-realm/spreadsheet-chart/spreadsheet-chart.gts
@@ -4,9 +4,9 @@ import {
   contains,
   linksTo,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import { tracked } from '@glimmer/tracking';
 import { on } from '@ember/modifier';
 import { eq } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/spreadsheet/spreadsheet.gts b/packages/catalog-realm/spreadsheet/spreadsheet.gts
index d7d62a5a988..b706a83cdbe 100644
--- a/packages/catalog-realm/spreadsheet/spreadsheet.gts
+++ b/packages/catalog-realm/spreadsheet/spreadsheet.gts
@@ -4,9 +4,9 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import TextAreaField from '@cardstack/base/text-area';
 import { Button } from '@cardstack/boxel-ui/components';
 import { tracked } from '@glimmer/tracking';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/sprint-planner/components/base-task-planner.gts b/packages/catalog-realm/sprint-planner/components/base-task-planner.gts
index 18ad5af1e76..7e51c3df5dd 100644
--- a/packages/catalog-realm/sprint-planner/components/base-task-planner.gts
+++ b/packages/catalog-realm/sprint-planner/components/base-task-planner.gts
@@ -9,7 +9,7 @@ import {
   CardContext,
   CardDef,
   BaseDef,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { type getCards } from '@cardstack/runtime-common';
 import type { Query } from '@cardstack/runtime-common/query';
 import { IconPlus } from '@cardstack/boxel-ui/icons';
diff --git a/packages/catalog-realm/sprint-planner/kanban-resource.gts b/packages/catalog-realm/sprint-planner/kanban-resource.gts
index 25646461c66..da93d02c8e0 100644
--- a/packages/catalog-realm/sprint-planner/kanban-resource.gts
+++ b/packages/catalog-realm/sprint-planner/kanban-resource.gts
@@ -1,6 +1,6 @@
 import { tracked } from '@glimmer/tracking';
 import { DndColumn } from '@cardstack/boxel-ui/components';
-import { CardDef } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
 
 import { Resource } from 'ember-modify-based-class-resource';
 
diff --git a/packages/catalog-realm/sprint-planner/sprint-planner.gts b/packages/catalog-realm/sprint-planner/sprint-planner.gts
index 157ce04d278..cc1c7bb3804 100644
--- a/packages/catalog-realm/sprint-planner/sprint-planner.gts
+++ b/packages/catalog-realm/sprint-planner/sprint-planner.gts
@@ -14,7 +14,7 @@ import {
   Component,
   linksTo,
   realmURL,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { SprintTaskStatusField, Project } from './sprint-task';
 import { TaskPlanner, TaskCard } from './components/base-task-planner';
 
diff --git a/packages/catalog-realm/sprint-planner/sprint-task.gts b/packages/catalog-realm/sprint-planner/sprint-task.gts
index e47ef30a502..40b04afaa9c 100644
--- a/packages/catalog-realm/sprint-planner/sprint-task.gts
+++ b/packages/catalog-realm/sprint-planner/sprint-task.gts
@@ -17,7 +17,7 @@ import {
   field,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { Task, TaskStatusField, getDueDateStatus } from './task';
 import { User } from './user';
 
diff --git a/packages/catalog-realm/sprint-planner/tag.gts b/packages/catalog-realm/sprint-planner/tag.gts
index 8577cd7672d..0d0c8683f5f 100644
--- a/packages/catalog-realm/sprint-planner/tag.gts
+++ b/packages/catalog-realm/sprint-planner/tag.gts
@@ -1,5 +1,5 @@
-import { Component } from 'https://cardstack.com/base/card-api';
-import TagCard from 'https://cardstack.com/base/tag';
+import { Component } from '@cardstack/base/card-api';
+import TagCard from '@cardstack/base/tag';
 
 import { BoxelTag } from '@cardstack/boxel-ui/components';
 import { getContrastColor } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/sprint-planner/task.gts b/packages/catalog-realm/sprint-planner/task.gts
index 2c99b1df073..84733c567e1 100644
--- a/packages/catalog-realm/sprint-planner/task.gts
+++ b/packages/catalog-realm/sprint-planner/task.gts
@@ -11,10 +11,10 @@ import ChevronsDown from '@cardstack/boxel-icons/chevrons-down';
 import ChevronsUp from '@cardstack/boxel-icons/chevrons-up';
 import CircleEqual from '@cardstack/boxel-icons/circle-equal';
 import { addWeeks, isThisWeek, isToday } from 'date-fns';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import ColorField from 'https://cardstack.com/base/color';
-import DateRangeField from 'https://cardstack.com/base/date-range-field';
-import NumberField from 'https://cardstack.com/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import ColorField from '@cardstack/base/color';
+import DateRangeField from '@cardstack/base/date-range-field';
+import NumberField from '@cardstack/base/number';
 import {
   Component,
   FieldDef,
@@ -23,7 +23,7 @@ import {
   field,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { Tag } from './tag';
 import { Todo } from './todo';
 import { User } from './user';
diff --git a/packages/catalog-realm/sprint-planner/todo.gts b/packages/catalog-realm/sprint-planner/todo.gts
index 5b570763135..50db4865c96 100644
--- a/packages/catalog-realm/sprint-planner/todo.gts
+++ b/packages/catalog-realm/sprint-planner/todo.gts
@@ -3,8 +3,8 @@ import {
   field,
   contains,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import MarkdownField from '@cardstack/base/markdown';
 
 export class Todo extends CardDef {
   static displayName = 'Todo';
diff --git a/packages/catalog-realm/sprint-planner/user.gts b/packages/catalog-realm/sprint-planner/user.gts
index 913119795f7..bb013fbb683 100644
--- a/packages/catalog-realm/sprint-planner/user.gts
+++ b/packages/catalog-realm/sprint-planner/user.gts
@@ -3,7 +3,7 @@ import {
   StringField,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export class User extends CardDef {
   static displayName = 'User';
diff --git a/packages/catalog-realm/statement.gts b/packages/catalog-realm/statement.gts
index 12ced2cb8b2..85caa11d23b 100644
--- a/packages/catalog-realm/statement.gts
+++ b/packages/catalog-realm/statement.gts
@@ -5,9 +5,9 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown';
 
 // Position field to define where a statement appears relative to another
 class PositionField extends FieldDef {
diff --git a/packages/catalog-realm/story-board/story-board.gts b/packages/catalog-realm/story-board/story-board.gts
index e99fd22b5d6..ce90bebb125 100644
--- a/packages/catalog-realm/story-board/story-board.gts
+++ b/packages/catalog-realm/story-board/story-board.gts
@@ -5,13 +5,13 @@ import {
   Component,
   type CardContext,
   ViewCardFn,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import GlimmerComponent from '@glimmer/component';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import UrlField from 'https://cardstack.com/base/url';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import UrlField from '@cardstack/base/url';
+import DateTimeField from '@cardstack/base/datetime';
+import MarkdownField from '@cardstack/base/markdown';
 import { on } from '@ember/modifier';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/catalog-realm/study-goal/study-goal.gts b/packages/catalog-realm/study-goal/study-goal.gts
index 8e0b5f7cacf..9065bc657a4 100644
--- a/packages/catalog-realm/study-goal/study-goal.gts
+++ b/packages/catalog-realm/study-goal/study-goal.gts
@@ -4,13 +4,13 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number'; // ⁽¹⁾ Added for progress tracking
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateField from 'https://cardstack.com/base/date';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number'; // ⁽¹⁾ Added for progress tracking
+import BooleanField from '@cardstack/base/boolean';
+import DateField from '@cardstack/base/date';
+import DateTimeField from '@cardstack/base/datetime';
+import TextAreaField from '@cardstack/base/text-area';
 import { Button, Pill } from '@cardstack/boxel-ui/components'; // ² UI components
 import {
   formatDateTime,
diff --git a/packages/catalog-realm/study-hub/study-hub.gts b/packages/catalog-realm/study-hub/study-hub.gts
index df75f9d3179..7728701f1d1 100644
--- a/packages/catalog-realm/study-hub/study-hub.gts
+++ b/packages/catalog-realm/study-hub/study-hub.gts
@@ -6,9 +6,9 @@ import {
   linksToMany,
   Component,
   linksTo,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 
 import { StudyResource } from '../study-resource/study-resource';
 import { StudyGoal } from '../study-goal/study-goal';
diff --git a/packages/catalog-realm/study-note/study-note.gts b/packages/catalog-realm/study-note/study-note.gts
index b23498d546e..632f8cab62d 100644
--- a/packages/catalog-realm/study-note/study-note.gts
+++ b/packages/catalog-realm/study-note/study-note.gts
@@ -5,10 +5,10 @@ import {
   contains,
   Component,
   containsMany,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
+import DateTimeField from '@cardstack/base/datetime';
+import MarkdownField from '@cardstack/base/markdown';
 import { formatDateTime, gt, lt, subtract } from '@cardstack/boxel-ui/helpers'; // ³ Formatters
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/catalog-realm/study-resource/study-resource.gts b/packages/catalog-realm/study-resource/study-resource.gts
index e7a8d5135c4..23c79cfadc7 100644
--- a/packages/catalog-realm/study-resource/study-resource.gts
+++ b/packages/catalog-realm/study-resource/study-resource.gts
@@ -5,12 +5,12 @@ import {
   contains,
   Component,
   containsMany,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateTimeField from '@cardstack/base/datetime';
+import MarkdownField from '@cardstack/base/markdown';
+import UrlField from '@cardstack/base/url';
 import {
   formatDateTime,
   formatDuration,
diff --git a/packages/catalog-realm/study-session/study-session.gts b/packages/catalog-realm/study-session/study-session.gts
index adb96341d72..ad1ced218db 100644
--- a/packages/catalog-realm/study-session/study-session.gts
+++ b/packages/catalog-realm/study-session/study-session.gts
@@ -4,12 +4,12 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api'; // ¹ Core imports
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import DateTimeField from '@cardstack/base/datetime';
+import MarkdownField from '@cardstack/base/markdown';
 import { Button, Pill } from '@cardstack/boxel-ui/components'; // ² Enhanced UI components
 import {
   formatDateTime,
diff --git a/packages/catalog-realm/stylish-fashion-influencer-linktree/stylish-fashion-influencer-linktree.gts b/packages/catalog-realm/stylish-fashion-influencer-linktree/stylish-fashion-influencer-linktree.gts
index c9a042d9232..be0a48ce0a7 100644
--- a/packages/catalog-realm/stylish-fashion-influencer-linktree/stylish-fashion-influencer-linktree.gts
+++ b/packages/catalog-realm/stylish-fashion-influencer-linktree/stylish-fashion-influencer-linktree.gts
@@ -5,10 +5,10 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import UrlField from 'https://cardstack.com/base/url';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import UrlField from '@cardstack/base/url';
+import ColorField from '@cardstack/base/color';
 import { concat } from '@ember/helper';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/catalog-realm/submission-workflow-card/submission-workflow-card.gts b/packages/catalog-realm/submission-workflow-card/submission-workflow-card.gts
index 939afd6498a..1349e9b1811 100644
--- a/packages/catalog-realm/submission-workflow-card/submission-workflow-card.gts
+++ b/packages/catalog-realm/submission-workflow-card/submission-workflow-card.gts
@@ -7,8 +7,8 @@ import {
   linksTo,
   field,
   realmURL,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { concat } from '@ember/helper';
 import { htmlSafe } from '@ember/template';
 import { eq } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/system-card/model-configuration.gts b/packages/catalog-realm/system-card/model-configuration.gts
index 9de28740b43..8d7f8fdb735 100644
--- a/packages/catalog-realm/system-card/model-configuration.gts
+++ b/packages/catalog-realm/system-card/model-configuration.gts
@@ -1,16 +1,16 @@
 import { eq } from '@cardstack/boxel-ui/helpers';
-import { ModelConfiguration as BaseModelConfiguration } from 'https://cardstack.com/base/system-card';
+import { ModelConfiguration as BaseModelConfiguration } from '@cardstack/base/system-card';
 import {
   field,
   contains,
   containsMany,
   linksTo,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import enumField from 'https://cardstack.com/base/enum';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import enumField from '@cardstack/base/enum';
 import { OpenRouterModel } from '@cardstack/openrouter/openrouter-model';
 
 const PurposeField = enumField(StringField, {
diff --git a/packages/catalog-realm/tennis-camp/tennis-camp.gts b/packages/catalog-realm/tennis-camp/tennis-camp.gts
index 4c36944b106..934c3af53f6 100644
--- a/packages/catalog-realm/tennis-camp/tennis-camp.gts
+++ b/packages/catalog-realm/tennis-camp/tennis-camp.gts
@@ -3,14 +3,14 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import DateField from 'https://cardstack.com/base/date';
-import EmailField from 'https://cardstack.com/base/email';
-import PhoneNumberField from 'https://cardstack.com/base/phone-number';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import MarkdownField from '@cardstack/base/markdown';
+import DateField from '@cardstack/base/date';
+import EmailField from '@cardstack/base/email';
+import PhoneNumberField from '@cardstack/base/phone-number';
+import UrlField from '@cardstack/base/url';
 import { concat } from '@ember/helper';
 import { Button } from '@cardstack/boxel-ui/components';
 import { currencyFormat, dayjsFormat } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/theme-generation/Skill/theme-design.json b/packages/catalog-realm/theme-generation/Skill/theme-design.json
index 9f145c681b2..a33730fe6e0 100644
--- a/packages/catalog-realm/theme-generation/Skill/theme-design.json
+++ b/packages/catalog-realm/theme-generation/Skill/theme-design.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Skill",
-        "module": "https://cardstack.com/base/skill"
+        "module": "@cardstack/base/skill"
       }
     },
     "type": "card",
diff --git a/packages/catalog-realm/theme-generation/ThemeCreator/f29cce63-ba80-4afd-8a32-8f4e43d62a65.json b/packages/catalog-realm/theme-generation/ThemeCreator/f29cce63-ba80-4afd-8a32-8f4e43d62a65.json
index c5ba927bdd2..842a18e5c28 100644
--- a/packages/catalog-realm/theme-generation/ThemeCreator/f29cce63-ba80-4afd-8a32-8f4e43d62a65.json
+++ b/packages/catalog-realm/theme-generation/ThemeCreator/f29cce63-ba80-4afd-8a32-8f4e43d62a65.json
@@ -12,7 +12,7 @@
       "prompt": "Create a theme in deep crimson, with bold contrast, minimal typography, and clean UI surfaces suitable for dashboards.",
       "codeRef": {
         "name": "default",
-        "module": "https://cardstack.com/base/structured-theme"
+        "module": "@cardstack/base/structured-theme"
       },
       "cardInfo": {
         "notes": null,
diff --git a/packages/catalog-realm/theme-generation/theme-creator.gts b/packages/catalog-realm/theme-generation/theme-creator.gts
index 512277d7721..238a21ae255 100644
--- a/packages/catalog-realm/theme-generation/theme-creator.gts
+++ b/packages/catalog-realm/theme-generation/theme-creator.gts
@@ -7,12 +7,12 @@ import {
   linksTo,
   realmInfo,
   realmURL,
-} from 'https://cardstack.com/base/card-api';
-import RealmField from 'https://cardstack.com/base/realm';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import NumberField from 'https://cardstack.com/base/number';
-import { Skill } from 'https://cardstack.com/base/skill';
-import LLMModelField from 'https://cardstack.com/base/llm-model';
+} from '@cardstack/base/card-api';
+import RealmField from '@cardstack/base/realm';
+import MarkdownField from '@cardstack/base/markdown';
+import NumberField from '@cardstack/base/number';
+import { Skill } from '@cardstack/base/skill';
+import LLMModelField from '@cardstack/base/llm-model';
 import { Alert, Button, RealmIcon } from '@cardstack/boxel-ui/components';
 import { copyCardURLToClipboard } from '@cardstack/boxel-ui/helpers';
 import { Copy as CopyIcon } from '@cardstack/boxel-ui/icons';
diff --git a/packages/catalog-realm/threejs-car-customizer/threejs-car-customizer.gts b/packages/catalog-realm/threejs-car-customizer/threejs-car-customizer.gts
index 34b4191b3e3..8bc4b3d2109 100644
--- a/packages/catalog-realm/threejs-car-customizer/threejs-car-customizer.gts
+++ b/packages/catalog-realm/threejs-car-customizer/threejs-car-customizer.gts
@@ -1,4 +1,4 @@
-import StringField from 'https://cardstack.com/base/string';
+import StringField from '@cardstack/base/string';
 import { eq } from '@cardstack/boxel-ui/helpers';
 // ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══
 import {
@@ -6,7 +6,7 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api'; // ¹ Core imports
+} from '@cardstack/base/card-api'; // ¹ Core imports
 import ColorField from '../fields/color';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/packages/catalog-realm/time-machine/album.gts b/packages/catalog-realm/time-machine/album.gts
index e59d3c25627..c005490cb60 100644
--- a/packages/catalog-realm/time-machine/album.gts
+++ b/packages/catalog-realm/time-machine/album.gts
@@ -2,8 +2,8 @@ import {
   CardDef,
   field,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { PolaroidImage } from './polaroid-image';
diff --git a/packages/catalog-realm/time-machine/image-generator.gts b/packages/catalog-realm/time-machine/image-generator.gts
index 6ec0cd4fb92..aee12fe0888 100644
--- a/packages/catalog-realm/time-machine/image-generator.gts
+++ b/packages/catalog-realm/time-machine/image-generator.gts
@@ -4,13 +4,13 @@ import {
   contains,
   linksToMany,
   type CardContext,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import { on } from '@ember/modifier';
-import StringField from 'https://cardstack.com/base/string';
-import BaseImageCard from 'https://cardstack.com/base/image';
+import StringField from '@cardstack/base/string';
+import BaseImageCard from '@cardstack/base/image';
 import SaveCardCommand from '@cardstack/boxel-host/commands/save-card';
 import { realmURL as realmURLSymbol } from '@cardstack/runtime-common';
 import { or, not } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/catalog-realm/time-machine/polaroid-image.gts b/packages/catalog-realm/time-machine/polaroid-image.gts
index d24a8d1c244..a92421bbfd6 100644
--- a/packages/catalog-realm/time-machine/polaroid-image.gts
+++ b/packages/catalog-realm/time-machine/polaroid-image.gts
@@ -3,8 +3,8 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import ImageField from '../fields/image';
 import Polaroid from '../components/polaroid';
 
diff --git a/packages/catalog-realm/time-machine/year-range-field.gts b/packages/catalog-realm/time-machine/year-range-field.gts
index ea7c560a5ad..111df658031 100644
--- a/packages/catalog-realm/time-machine/year-range-field.gts
+++ b/packages/catalog-realm/time-machine/year-range-field.gts
@@ -3,8 +3,8 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
 import { StepRangeScroller } from '../components/step-range-scroller';
 
 export class YearRangeField extends FieldDef {
diff --git a/packages/catalog-realm/todo-mvc/todo-mvc.gts b/packages/catalog-realm/todo-mvc/todo-mvc.gts
index 8d060e8a4dd..38f98e5c458 100644
--- a/packages/catalog-realm/todo-mvc/todo-mvc.gts
+++ b/packages/catalog-realm/todo-mvc/todo-mvc.gts
@@ -5,10 +5,10 @@ import {
   field,
   contains,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateField from 'https://cardstack.com/base/date';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import BooleanField from '@cardstack/base/boolean';
+import DateField from '@cardstack/base/date';
 import { eq, gt, not } from '@cardstack/boxel-ui/helpers';
 import { fn } from '@ember/helper';
 import { on } from '@ember/modifier';
diff --git a/packages/catalog-realm/tournament/tournament.gts b/packages/catalog-realm/tournament/tournament.gts
index c642a9370d4..c2fdb5e9550 100644
--- a/packages/catalog-realm/tournament/tournament.gts
+++ b/packages/catalog-realm/tournament/tournament.gts
@@ -4,13 +4,13 @@ import {
   contains,
   linksTo,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import UrlField from 'https://cardstack.com/base/url';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateTimeField from '@cardstack/base/datetime';
+import UrlField from '@cardstack/base/url';
+import MarkdownField from '@cardstack/base/markdown';
 
 import { formatDateTime, formatCurrency } from '@cardstack/boxel-ui/helpers';
 
diff --git a/packages/catalog-realm/travel-mapper/travel-mapper.gts b/packages/catalog-realm/travel-mapper/travel-mapper.gts
index c3c7dc62010..c15bc5e8e05 100644
--- a/packages/catalog-realm/travel-mapper/travel-mapper.gts
+++ b/packages/catalog-realm/travel-mapper/travel-mapper.gts
@@ -1,12 +1,12 @@
 import MapIcon from '@cardstack/boxel-icons/map';
-import StringField from 'https://cardstack.com/base/string';
+import StringField from '@cardstack/base/string';
 import {
   Component,
   contains,
   CardDef,
   field,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { MapRender, type Coordinate } from '../components/map-render';
 import { Route } from '../route/route';
 import LeafletMapConfigField from '../fields/leaflet-map-config-field';
diff --git a/packages/catalog-realm/tsconfig.json b/packages/catalog-realm/tsconfig.json
index 5c4ffe44e44..644694b16a8 100644
--- a/packages/catalog-realm/tsconfig.json
+++ b/packages/catalog-realm/tsconfig.json
@@ -22,7 +22,7 @@
     "strict": true,
     "experimentalDecorators": true,
     "paths": {
-      "https://cardstack.com/base/*": [
+      "@cardstack/base/*": [
         "../base/*"
       ],
       "@cardstack/host/tests/*": [
diff --git a/packages/catalog-realm/utils/create-option-select.gts b/packages/catalog-realm/utils/create-option-select.gts
index 27e62d3d02e..28c848f155f 100644
--- a/packages/catalog-realm/utils/create-option-select.gts
+++ b/packages/catalog-realm/utils/create-option-select.gts
@@ -1,6 +1,6 @@
 import { fn } from '@ember/helper';
-import { Component } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { BoxelSelect, RadioInput } from '@cardstack/boxel-ui/components';
 
 type OptionLike = string | { label: string; value: string };
diff --git a/packages/catalog-realm/video-game/video-game.gts b/packages/catalog-realm/video-game/video-game.gts
index 4b6b47777fd..5ca28bd83ce 100644
--- a/packages/catalog-realm/video-game/video-game.gts
+++ b/packages/catalog-realm/video-game/video-game.gts
@@ -2,14 +2,14 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateField from 'https://cardstack.com/base/date';
-import UrlField from 'https://cardstack.com/base/url';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import DateField from '@cardstack/base/date';
+import UrlField from '@cardstack/base/url';
+import MarkdownField from '@cardstack/base/markdown';
 
 import { Game } from '../base-entity/game';
 
diff --git a/packages/catalog-realm/workflow-planner/workflow-planner.gts b/packages/catalog-realm/workflow-planner/workflow-planner.gts
index 03c2e9771cd..8b85c70a9c4 100644
--- a/packages/catalog-realm/workflow-planner/workflow-planner.gts
+++ b/packages/catalog-realm/workflow-planner/workflow-planner.gts
@@ -5,14 +5,14 @@ import {
   contains,
   containsMany,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateField from 'https://cardstack.com/base/date';
-import DateRangeField from 'https://cardstack.com/base/date-range-field';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown';
+import BooleanField from '@cardstack/base/boolean';
+import DateField from '@cardstack/base/date';
+import DateRangeField from '@cardstack/base/date-range-field';
 import { gt } from '@cardstack/boxel-ui/helpers';
 import { concat } from '@ember/helper';
 import { htmlSafe } from '@ember/template';
diff --git a/packages/catalog-realm/youtube-thumbnail-composer/fields/background-element.gts b/packages/catalog-realm/youtube-thumbnail-composer/fields/background-element.gts
index e5e84428303..5e1186540e7 100644
--- a/packages/catalog-realm/youtube-thumbnail-composer/fields/background-element.gts
+++ b/packages/catalog-realm/youtube-thumbnail-composer/fields/background-element.gts
@@ -8,10 +8,10 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import ColorField from 'https://cardstack.com/base/color';
-import NumberField from 'https://cardstack.com/base/number';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import ColorField from '@cardstack/base/color';
+import NumberField from '@cardstack/base/number';
+import UrlField from '@cardstack/base/url';
 
 // Local imports
 import ImageField from '../../fields/image';
diff --git a/packages/catalog-realm/youtube-thumbnail-composer/fields/text-element.gts b/packages/catalog-realm/youtube-thumbnail-composer/fields/text-element.gts
index 05e60d6032b..26bf10ad365 100644
--- a/packages/catalog-realm/youtube-thumbnail-composer/fields/text-element.gts
+++ b/packages/catalog-realm/youtube-thumbnail-composer/fields/text-element.gts
@@ -11,11 +11,11 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import ColorField from 'https://cardstack.com/base/color';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import ColorField from '@cardstack/base/color';
+import BooleanField from '@cardstack/base/boolean';
+import NumberField from '@cardstack/base/number';
 
 // Local imports
 import { createOptionSelectField } from '../../utils/create-option-select';
diff --git a/packages/catalog-realm/youtube-thumbnail-composer/fields/visual-element.gts b/packages/catalog-realm/youtube-thumbnail-composer/fields/visual-element.gts
index 249fd22322b..1ace8759552 100644
--- a/packages/catalog-realm/youtube-thumbnail-composer/fields/visual-element.gts
+++ b/packages/catalog-realm/youtube-thumbnail-composer/fields/visual-element.gts
@@ -12,11 +12,11 @@ import {
   field,
   contains,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import ColorField from 'https://cardstack.com/base/color';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import ColorField from '@cardstack/base/color';
+import BooleanField from '@cardstack/base/boolean';
+import NumberField from '@cardstack/base/number';
 
 // Local imports
 import { createOptionSelectField } from '../../utils/create-option-select';
diff --git a/packages/catalog-realm/youtube-thumbnail-composer/youtube-thumbnail-composer.gts b/packages/catalog-realm/youtube-thumbnail-composer/youtube-thumbnail-composer.gts
index b473e29302d..02eb8c1ba88 100644
--- a/packages/catalog-realm/youtube-thumbnail-composer/youtube-thumbnail-composer.gts
+++ b/packages/catalog-realm/youtube-thumbnail-composer/youtube-thumbnail-composer.gts
@@ -39,10 +39,10 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
 
 // Local imports
 import { VisualElement } from './fields/visual-element';
diff --git a/packages/eslint-plugin-boxel/README.md b/packages/eslint-plugin-boxel/README.md
index 152130da418..e6e32b23428 100644
--- a/packages/eslint-plugin-boxel/README.md
+++ b/packages/eslint-plugin-boxel/README.md
@@ -40,6 +40,7 @@ Then configure the rules you want to use under the rules section:
 | [no-duplicate-imports](docs/rules/no-duplicate-imports.md)             | Prevent duplicate imports from the same module                                                                     | ✅  | 🔧 |
 | [no-forbidden-head-tags](docs/rules/no-forbidden-head-tags.md)         | disallow forbidden HTML elements in `static head` templates — only `<title>`, `<meta>`, and `<link>` are permitted | ✅  |    |
 | [no-literal-realm-urls](docs/rules/no-literal-realm-urls.md)           | Disallow environment-specific realm URLs in code; use portable prefixes like @cardstack/catalog/ instead           |    | 🔧 |
+| [no-new-url-for-card-id](docs/rules/no-new-url-for-card-id.md)         | Disallow `new URL()` on card/module identifiers that may be in prefix form; use `cardIdToURL()` instead            | ✅  | 🔧 |
 | [template-missing-invokable](docs/rules/template-missing-invokable.md) | disallow missing helpers, modifiers, or components in \<template\> with auto-fix to import them                    | ✅  | 🔧 |
 
 <!-- end auto-generated rules list -->
diff --git a/packages/eslint-plugin-boxel/docs/rules/missing-card-api-import.md b/packages/eslint-plugin-boxel/docs/rules/missing-card-api-import.md
index adf485b3357..19993c2e745 100644
--- a/packages/eslint-plugin-boxel/docs/rules/missing-card-api-import.md
+++ b/packages/eslint-plugin-boxel/docs/rules/missing-card-api-import.md
@@ -19,7 +19,7 @@ export class Payment extends FieldDef {
 The auto-fix will add the missing import:
 
 ```js
-import { FieldDef } from 'https://cardstack.com/base/card-api';
+import { FieldDef } from '@cardstack/base/card-api';
 
 export class Payment extends FieldDef {
   // ...
@@ -40,8 +40,8 @@ export class Payment extends FieldDef {
 Will be fixed to:
 
 ```js
-import { FieldDef, field, linksTo, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { FieldDef, field, linksTo, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class Payment extends FieldDef {
   @field chain = linksTo(Chain);
@@ -52,7 +52,7 @@ export class Payment extends FieldDef {
 ### Partially imported card-api exports
 
 ```js
-import { contains, field } from 'https://cardstack.com/base/card-api';
+import { contains, field } from '@cardstack/base/card-api';
 
 export class Payment extends FieldDef {
   @field address = contains(StringField);
@@ -62,8 +62,8 @@ export class Payment extends FieldDef {
 Will be fixed to:
 
 ```js
-import { contains, field, FieldDef } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { contains, field, FieldDef } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class Payment extends FieldDef {
   @field address = contains(StringField);
@@ -87,11 +87,11 @@ Example configuration:
       "error",
       {
         "importMappings": {
-          "FieldDef": ["FieldDef", "https://cardstack.com/base/card-api"],
-          "field": ["field", "https://cardstack.com/base/card-api"],
-          "contains": ["contains", "https://cardstack.com/base/card-api"],
-          "linksTo": ["linksTo", "https://cardstack.com/base/card-api"],
-          "StringField": ["default", "https://cardstack.com/base/string"]
+          "FieldDef": ["FieldDef", "@cardstack/base/card-api"],
+          "field": ["field", "@cardstack/base/card-api"],
+          "contains": ["contains", "@cardstack/base/card-api"],
+          "linksTo": ["linksTo", "@cardstack/base/card-api"],
+          "StringField": ["default", "@cardstack/base/string"]
         }
       }
     ]
diff --git a/packages/eslint-plugin-boxel/docs/rules/no-new-url-for-card-id.md b/packages/eslint-plugin-boxel/docs/rules/no-new-url-for-card-id.md
new file mode 100644
index 00000000000..24b962ce5e5
--- /dev/null
+++ b/packages/eslint-plugin-boxel/docs/rules/no-new-url-for-card-id.md
@@ -0,0 +1,40 @@
+# Disallow `new URL()` on card/module identifiers that may be in prefix form; use `cardIdToURL()` instead (`@cardstack/boxel/no-new-url-for-card-id`)
+
+💼 This rule is enabled in the ✅ `recommended` config.
+
+🔧 This rule is automatically fixable by the [`--fix` CLI option](https://eslint.org/docs/latest/user-guide/command-line-interface#--fix).
+
+<!-- end auto-generated rule header -->
+
+Disallow `new URL()` on card/module identifiers that may be in prefix form; use `cardIdToURL()` instead.
+
+Card and module identifiers can be in prefix form (e.g. `@cardstack/base/card-api`) which is not a valid URL. Passing these to `new URL()` throws `TypeError: Invalid URL`. Use `cardIdToURL()` from `@cardstack/runtime-common` which resolves prefix-form identifiers through the import map before creating a URL.
+
+## Examples
+
+### Invalid
+
+```js
+let url = new URL(cardId);
+let url = new URL(ref.module);
+let url = new URL(spec.id);
+let url = new URL(moduleIdentifier);
+```
+
+### Valid
+
+```js
+let url = cardIdToURL(cardId);
+let url = cardIdToURL(ref.module);
+let url = cardIdToURL(spec.id);
+
+// Two-argument form is fine (relative URL resolution)
+let url = new URL(path, baseURL);
+
+// String literal URLs are fine
+let url = new URL('https://example.com');
+
+// Variables that are always HTTP URLs are fine
+let url = new URL(realmURL);
+let url = new URL(response.url);
+```
diff --git a/packages/eslint-plugin-boxel/lib/recommended-rules.js b/packages/eslint-plugin-boxel/lib/recommended-rules.js
index 3cdec192f98..d51d2420442 100644
--- a/packages/eslint-plugin-boxel/lib/recommended-rules.js
+++ b/packages/eslint-plugin-boxel/lib/recommended-rules.js
@@ -8,5 +8,6 @@ module.exports = {
   "@cardstack/boxel/missing-card-api-import": "error",
   "@cardstack/boxel/no-duplicate-imports": "error",
   "@cardstack/boxel/no-forbidden-head-tags": "error",
+  "@cardstack/boxel/no-new-url-for-card-id": "error",
   "@cardstack/boxel/template-missing-invokable": "error"
 }
\ No newline at end of file
diff --git a/packages/eslint-plugin-boxel/lib/rules/no-literal-realm-urls.js b/packages/eslint-plugin-boxel/lib/rules/no-literal-realm-urls.js
index 18a2e57186c..16f8d652000 100644
--- a/packages/eslint-plugin-boxel/lib/rules/no-literal-realm-urls.js
+++ b/packages/eslint-plugin-boxel/lib/rules/no-literal-realm-urls.js
@@ -31,7 +31,7 @@ const DEFAULT_REALM_MAPPINGS = [
   // {
   //   prefix: '@cardstack/base/',
   //   urls: [
-  //     'https://cardstack.com/base/',
+  //     '@cardstack/base/',
   //   ],
   // },
 ];
diff --git a/packages/eslint-plugin-boxel/lib/rules/no-new-url-for-card-id.js b/packages/eslint-plugin-boxel/lib/rules/no-new-url-for-card-id.js
new file mode 100644
index 00000000000..d49de7a8e8b
--- /dev/null
+++ b/packages/eslint-plugin-boxel/lib/rules/no-new-url-for-card-id.js
@@ -0,0 +1,123 @@
+'use strict';
+
+//------------------------------------------------------------------------------
+// Rule Definition
+//------------------------------------------------------------------------------
+
+// Variable name patterns that indicate a card/module identifier which may be
+// in prefix form (e.g. @cardstack/base/card-api) and therefore cannot be
+// passed to `new URL()` directly.  Use `cardIdToURL()` instead.
+const CARD_ID_PATTERNS = [
+  /^card(?:Id|URL|Url|DefRef)$/i,
+  /^module(?:Identifier|URL|Url|Href|Ref)$/i,
+  /^(?:spec|source|target)(?:Id|Url|URL|Ref)$/i,
+  /^(?:code|adopts)Ref$/i,
+  /^dep$/i,
+  /^id$/,
+  /^url$/,
+  /^value$/,
+  /Id$/,
+];
+
+// Property access patterns like ref.module, codeRef.module, spec.id
+const CARD_ID_PROPERTY_PATTERNS = [
+  /\.module$/,
+  /\.id$/,
+  /\.moduleHref$/,
+  /\.sourceUrl$/,
+];
+
+function getArgumentText(node, sourceCode) {
+  return sourceCode.getText(node);
+}
+
+function looksLikeCardId(argNode, sourceCode) {
+  // Skip string literals that are clearly URLs
+  if (argNode.type === 'Literal' && typeof argNode.value === 'string') {
+    if (/^https?:\/\//.test(argNode.value) || /^data:/.test(argNode.value) || /^blob:/.test(argNode.value)) {
+      return false;
+    }
+  }
+
+  // Skip template literals (usually constructed URLs)
+  if (argNode.type === 'TemplateLiteral') {
+    return false;
+  }
+
+  let text = getArgumentText(argNode, sourceCode);
+
+  // Check member expression patterns (ref.module, spec.id, etc.)
+  if (argNode.type === 'MemberExpression') {
+    for (let pattern of CARD_ID_PROPERTY_PATTERNS) {
+      if (pattern.test(text)) {
+        return true;
+      }
+    }
+  }
+
+  // Check variable name patterns
+  if (argNode.type === 'Identifier') {
+    for (let pattern of CARD_ID_PATTERNS) {
+      if (pattern.test(argNode.name)) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+/** @type {import('eslint').Rule.RuleModule} */
+module.exports = {
+  meta: {
+    type: 'problem',
+    docs: {
+      description:
+        'Disallow `new URL()` on card/module identifiers that may be in prefix form; use `cardIdToURL()` instead',
+      category: 'Best Practices',
+      recommended: true,
+    },
+    fixable: 'code',
+    schema: [],
+    messages: {
+      noNewUrlForCardId:
+        'Use `cardIdToURL({{arg}})` instead of `new URL({{arg}})` — the argument may be a prefix-form identifier like @cardstack/base/... which is not a valid URL.',
+    },
+  },
+
+  create(context) {
+    return {
+      NewExpression(node) {
+        // Only match `new URL(...)`
+        if (
+          node.callee.type !== 'Identifier' ||
+          node.callee.name !== 'URL'
+        ) {
+          return;
+        }
+
+        // Only single-argument form (two-argument `new URL(path, base)` is fine)
+        if (node.arguments.length !== 1) {
+          return;
+        }
+
+        let arg = node.arguments[0];
+        let sourceCode = context.sourceCode || context.getSourceCode();
+
+        if (!looksLikeCardId(arg, sourceCode)) {
+          return;
+        }
+
+        let argText = getArgumentText(arg, sourceCode);
+        context.report({
+          node,
+          messageId: 'noNewUrlForCardId',
+          data: { arg: argText },
+          fix(fixer) {
+            return fixer.replaceText(node, `cardIdToURL(${argText})`);
+          },
+        });
+      },
+    };
+  },
+};
diff --git a/packages/eslint-plugin-boxel/tests/lib/rules/missing-card-api-import-test.js b/packages/eslint-plugin-boxel/tests/lib/rules/missing-card-api-import-test.js
index acd010353a3..a1c54d5e92b 100644
--- a/packages/eslint-plugin-boxel/tests/lib/rules/missing-card-api-import-test.js
+++ b/packages/eslint-plugin-boxel/tests/lib/rules/missing-card-api-import-test.js
@@ -21,8 +21,8 @@ ruleTester.run('missing-card-api-import', rule, {
         field,
         FieldDef,
         linksTo,
-      } from 'https://cardstack.com/base/card-api';
-      import StringField from 'https://cardstack.com/base/string';
+      } from '@cardstack/base/card-api';
+      import StringField from '@cardstack/base/string';
 
       import { Chain } from './chain';
 
@@ -33,7 +33,7 @@ ruleTester.run('missing-card-api-import', rule, {
   `,
     {
       code: `
-        import { FieldDef } from 'https://cardstack.com/base/card-api';
+        import { FieldDef } from '@cardstack/base/card-api';
 
         export class AddressField extends FieldDef {}
 
@@ -42,7 +42,7 @@ ruleTester.run('missing-card-api-import', rule, {
       options: [
         {
           importMappings: {
-            AddressField: ['AddressField', 'https://cardstack.com/base/card-api'],
+            AddressField: ['AddressField', '@cardstack/base/card-api'],
           },
         },
       ],
@@ -55,8 +55,8 @@ ruleTester.run('missing-card-api-import', rule, {
         contains,
         field,
         linksTo,
-      } from 'https://cardstack.com/base/card-api';
-      import StringField from 'https://cardstack.com/base/string';
+      } from '@cardstack/base/card-api';
+      import StringField from '@cardstack/base/string';
 
       import { Chain } from './chain';
 
@@ -69,8 +69,8 @@ ruleTester.run('missing-card-api-import', rule, {
         contains,
         field,
         linksTo, FieldDef,
-      } from 'https://cardstack.com/base/card-api';
-      import StringField from 'https://cardstack.com/base/string';
+      } from '@cardstack/base/card-api';
+      import StringField from '@cardstack/base/string';
 
       import { Chain } from './chain';
 
@@ -82,7 +82,7 @@ ruleTester.run('missing-card-api-import', rule, {
       options: [
         {
           importMappings: {
-            FieldDef: ['FieldDef', 'https://cardstack.com/base/card-api'],
+            FieldDef: ['FieldDef', '@cardstack/base/card-api'],
           },
         },
       ],
@@ -99,8 +99,8 @@ ruleTester.run('missing-card-api-import', rule, {
         field,
         linksTo,
         FieldDef
-      } from 'https://cardstack.com/base/card-api';
-      import StringField from 'https://cardstack.com/base/string';
+      } from '@cardstack/base/card-api';
+      import StringField from '@cardstack/base/string';
 
       import { Chain } from './chain';
 
@@ -113,8 +113,8 @@ ruleTester.run('missing-card-api-import', rule, {
         field,
         linksTo,
         FieldDef, contains
-      } from 'https://cardstack.com/base/card-api';
-      import StringField from 'https://cardstack.com/base/string';
+      } from '@cardstack/base/card-api';
+      import StringField from '@cardstack/base/string';
 
       import { Chain } from './chain';
 
@@ -126,7 +126,7 @@ ruleTester.run('missing-card-api-import', rule, {
       options: [
         {
           importMappings: {
-            contains: ['contains', 'https://cardstack.com/base/card-api'],
+            contains: ['contains', '@cardstack/base/card-api'],
           },
         },
       ],
@@ -142,8 +142,8 @@ ruleTester.run('missing-card-api-import', rule, {
         FieldDef,
         contains,
         linksTo,
-      } from 'https://cardstack.com/base/card-api';
-      import StringField from 'https://cardstack.com/base/string';
+      } from '@cardstack/base/card-api';
+      import StringField from '@cardstack/base/string';
 
       export class Payment extends FieldDef {
         @field address = contains(StringField);
@@ -153,8 +153,8 @@ ruleTester.run('missing-card-api-import', rule, {
         FieldDef,
         contains,
         linksTo, field,
-      } from 'https://cardstack.com/base/card-api';
-      import StringField from 'https://cardstack.com/base/string';
+      } from '@cardstack/base/card-api';
+      import StringField from '@cardstack/base/string';
 
       export class Payment extends FieldDef {
         @field address = contains(StringField);
@@ -163,7 +163,7 @@ ruleTester.run('missing-card-api-import', rule, {
       options: [
         {
           importMappings: {
-            field: ['field', 'https://cardstack.com/base/card-api'],
+            field: ['field', '@cardstack/base/card-api'],
           },
         },
       ],
@@ -181,19 +181,19 @@ ruleTester.run('missing-card-api-import', rule, {
         contains,
         field,
         linksTo,
-      } from 'https://cardstack.com/base/card-api';
+      } from '@cardstack/base/card-api';
 
       export class Payment extends FieldDef {
         @field address = contains(StringField);
       }
       `,
-      output: `import StringField from 'https://cardstack.com/base/string';
+      output: `import StringField from '@cardstack/base/string';
 import {
         FieldDef,
         contains,
         field,
         linksTo,
-      } from 'https://cardstack.com/base/card-api';
+      } from '@cardstack/base/card-api';
 
       export class Payment extends FieldDef {
         @field address = contains(StringField);
@@ -202,7 +202,7 @@ import {
       options: [
         {
           importMappings: {
-            StringField: ['default', 'https://cardstack.com/base/string'],
+            StringField: ['default', '@cardstack/base/string'],
           },
         },
       ],
@@ -214,8 +214,8 @@ import {
       ],
     },
     {
-      code: `import { FieldDef, field } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+      code: `import { FieldDef, field } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class CurrencyField extends FieldDef {
   static displayName = "Currency";
@@ -226,8 +226,8 @@ export class CurrencyField extends FieldDef {
     }
   });
 }`,
-      output: `import { FieldDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+      output: `import { FieldDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class CurrencyField extends FieldDef {
   static displayName = "Currency";
@@ -241,9 +241,9 @@ export class CurrencyField extends FieldDef {
       options: [
         {
           importMappings: {
-            field: ['field', 'https://cardstack.com/base/card-api'],
-            contains: ['contains', 'https://cardstack.com/base/card-api'],
-            Component: ['Component', 'https://cardstack.com/base/card-api'],
+            field: ['field', '@cardstack/base/card-api'],
+            contains: ['contains', '@cardstack/base/card-api'],
+            Component: ['Component', '@cardstack/base/card-api'],
           },
         },
       ],
diff --git a/packages/eslint-plugin-boxel/tests/lib/rules/no-literal-realm-urls-test.js b/packages/eslint-plugin-boxel/tests/lib/rules/no-literal-realm-urls-test.js
index 08be65e79bf..22385187cc0 100644
--- a/packages/eslint-plugin-boxel/tests/lib/rules/no-literal-realm-urls-test.js
+++ b/packages/eslint-plugin-boxel/tests/lib/rules/no-literal-realm-urls-test.js
@@ -123,14 +123,14 @@ ruleTester.run('no-literal-realm-urls', rule, {
 
     // --- Custom realm mappings via options ---
     {
-      code: `let id = 'https://cardstack.com/base/card-api';`,
+      code: `let id = '@cardstack/base/card-api';`,
       output: `let id = '@cardstack/base/card-api';`,
       options: [
         {
           realmMappings: [
             {
               prefix: '@cardstack/base/',
-              urls: ['https://cardstack.com/base/'],
+              urls: ['@cardstack/base/'],
             },
           ],
         },
diff --git a/packages/eslint-plugin-boxel/tests/lib/rules/no-new-url-for-card-id-test.js b/packages/eslint-plugin-boxel/tests/lib/rules/no-new-url-for-card-id-test.js
new file mode 100644
index 00000000000..517641fac2d
--- /dev/null
+++ b/packages/eslint-plugin-boxel/tests/lib/rules/no-new-url-for-card-id-test.js
@@ -0,0 +1,93 @@
+'use strict';
+
+const rule = require('../../../lib/rules/no-new-url-for-card-id');
+const RuleTester = require('eslint').RuleTester;
+
+const ruleTester = new RuleTester({
+  parserOptions: {
+    ecmaVersion: 2022,
+    sourceType: 'module',
+  },
+});
+
+ruleTester.run('no-new-url-for-card-id', rule, {
+  valid: [
+    // Already using cardIdToURL
+    { code: `let url = cardIdToURL(cardId);` },
+    // String literal URL — safe
+    { code: `let url = new URL('https://example.com');` },
+    // Two-argument form — relative URL resolution, safe
+    { code: `let url = new URL(path, baseURL);` },
+    // Variable name that doesn't match card ID patterns
+    { code: `let url = new URL(realmURL);` },
+    { code: `let url = new URL(fileUrl);` },
+    { code: `let url = new URL(response.url);` },
+    // Template literal — usually constructed URLs
+    { code: 'let url = new URL(`${base}/path`);' },
+    // Literal http URL
+    { code: `let url = new URL('http://localhost:4201/base/');` },
+  ],
+
+  invalid: [
+    // Variable named cardId
+    {
+      code: `let url = new URL(cardId);`,
+      output: `let url = cardIdToURL(cardId);`,
+      errors: [{ messageId: 'noNewUrlForCardId' }],
+    },
+    // Variable named moduleURL
+    {
+      code: `let url = new URL(moduleURL);`,
+      output: `let url = cardIdToURL(moduleURL);`,
+      errors: [{ messageId: 'noNewUrlForCardId' }],
+    },
+    // Variable named moduleIdentifier
+    {
+      code: `let url = new URL(moduleIdentifier);`,
+      output: `let url = cardIdToURL(moduleIdentifier);`,
+      errors: [{ messageId: 'noNewUrlForCardId' }],
+    },
+    // Property access ref.module
+    {
+      code: `let url = new URL(ref.module);`,
+      output: `let url = cardIdToURL(ref.module);`,
+      errors: [{ messageId: 'noNewUrlForCardId' }],
+    },
+    // Property access spec.id
+    {
+      code: `let url = new URL(spec.id);`,
+      output: `let url = cardIdToURL(spec.id);`,
+      errors: [{ messageId: 'noNewUrlForCardId' }],
+    },
+    // Variable named dep
+    {
+      code: `let url = new URL(dep);`,
+      output: `let url = cardIdToURL(dep);`,
+      errors: [{ messageId: 'noNewUrlForCardId' }],
+    },
+    // Variable named sourceUrl
+    {
+      code: `let url = new URL(sourceUrl);`,
+      output: `let url = cardIdToURL(sourceUrl);`,
+      errors: [{ messageId: 'noNewUrlForCardId' }],
+    },
+    // Variable named id
+    {
+      code: `let url = new URL(id);`,
+      output: `let url = cardIdToURL(id);`,
+      errors: [{ messageId: 'noNewUrlForCardId' }],
+    },
+    // Variable ending in Id
+    {
+      code: `let url = new URL(selectedCardId);`,
+      output: `let url = cardIdToURL(selectedCardId);`,
+      errors: [{ messageId: 'noNewUrlForCardId' }],
+    },
+    // codeRef.module
+    {
+      code: `let url = new URL(codeRef.module);`,
+      output: `let url = cardIdToURL(codeRef.module);`,
+      errors: [{ messageId: 'noNewUrlForCardId' }],
+    },
+  ],
+});
diff --git a/packages/experiments-realm/BrandGuide/1fc32354-8201-4f79-b400-c7c94b507174.json b/packages/experiments-realm/BrandGuide/1fc32354-8201-4f79-b400-c7c94b507174.json
index 7f33da81e5d..47a772d93b8 100644
--- a/packages/experiments-realm/BrandGuide/1fc32354-8201-4f79-b400-c7c94b507174.json
+++ b/packages/experiments-realm/BrandGuide/1fc32354-8201-4f79-b400-c7c94b507174.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "default",
-        "module": "https://cardstack.com/base/brand-guide"
+        "module": "@cardstack/base/brand-guide"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/DetailedStyleReference/8af54c49-13b5-4bd4-9b2d-95dd569c1f44.json b/packages/experiments-realm/DetailedStyleReference/8af54c49-13b5-4bd4-9b2d-95dd569c1f44.json
index 229e8785ff5..74ae942c44c 100644
--- a/packages/experiments-realm/DetailedStyleReference/8af54c49-13b5-4bd4-9b2d-95dd569c1f44.json
+++ b/packages/experiments-realm/DetailedStyleReference/8af54c49-13b5-4bd4-9b2d-95dd569c1f44.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "default",
-        "module": "https://cardstack.com/base/detailed-style-reference"
+        "module": "@cardstack/base/detailed-style-reference"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/DetailedStyleReference/d39cd4d0-6e92-4e87-bc1d-65f2bbe6c101.json b/packages/experiments-realm/DetailedStyleReference/d39cd4d0-6e92-4e87-bc1d-65f2bbe6c101.json
index 0b2a3ec1b67..c300161d45c 100644
--- a/packages/experiments-realm/DetailedStyleReference/d39cd4d0-6e92-4e87-bc1d-65f2bbe6c101.json
+++ b/packages/experiments-realm/DetailedStyleReference/d39cd4d0-6e92-4e87-bc1d-65f2bbe6c101.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "default",
-        "module": "https://cardstack.com/base/detailed-style-reference"
+        "module": "@cardstack/base/detailed-style-reference"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/ProductCatalog/main.json b/packages/experiments-realm/ProductCatalog/main.json
index 7610994bea1..94b3b83a7b3 100644
--- a/packages/experiments-realm/ProductCatalog/main.json
+++ b/packages/experiments-realm/ProductCatalog/main.json
@@ -18,7 +18,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/cardstack-brand-guide"
+          "self": "@cardstack/base/Theme/cardstack-brand-guide"
         }
       }
     }
diff --git a/packages/experiments-realm/Skill/092ea552-8e78-478f-8602-3a43388101e5.json b/packages/experiments-realm/Skill/092ea552-8e78-478f-8602-3a43388101e5.json
index b4927b524a9..00127087a7e 100644
--- a/packages/experiments-realm/Skill/092ea552-8e78-478f-8602-3a43388101e5.json
+++ b/packages/experiments-realm/Skill/092ea552-8e78-478f-8602-3a43388101e5.json
@@ -9,7 +9,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/experiments-realm/Skill/637843ff-dfd4-4cfc-9ee9-1234824f4775.json b/packages/experiments-realm/Skill/637843ff-dfd4-4cfc-9ee9-1234824f4775.json
index 772c1233f46..1d7c56424a1 100644
--- a/packages/experiments-realm/Skill/637843ff-dfd4-4cfc-9ee9-1234824f4775.json
+++ b/packages/experiments-realm/Skill/637843ff-dfd4-4cfc-9ee9-1234824f4775.json
@@ -9,7 +9,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/experiments-realm/Skill/a9725283-dd68-414b-8533-aa2855d4c7c0.json b/packages/experiments-realm/Skill/a9725283-dd68-414b-8533-aa2855d4c7c0.json
index a9a48717e86..177182f8a1e 100644
--- a/packages/experiments-realm/Skill/a9725283-dd68-414b-8533-aa2855d4c7c0.json
+++ b/packages/experiments-realm/Skill/a9725283-dd68-414b-8533-aa2855d4c7c0.json
@@ -9,7 +9,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/experiments-realm/Skill/app-generator.json b/packages/experiments-realm/Skill/app-generator.json
index 7a398b43441..b6b4bb5bd74 100644
--- a/packages/experiments-realm/Skill/app-generator.json
+++ b/packages/experiments-realm/Skill/app-generator.json
@@ -2,14 +2,14 @@
   "data": {
     "type": "card",
     "attributes": {
-      "instructions": "The user has shared with you a product requirement document for an application they want to build. You must build that. Look at the domain for the area they are interested in and use your general knowledge to ensure data structures and the linkages between them are created.\n\nYou are a software engineer specializing in Boxel development. Boxel is a platform where people can create Cards, which under the hood are built out of glimmer components and ember. You are designed to assist users with code-related queries, troubleshooting, and best practices in this specific domain. You should ask for clarification when the user's query is ambiguous or lacks detail, but should also be able to make reasonable assumptions based on typical software engineering practices.\n\nIf the user wants to make something, they mostly want to create a Card. Cards are independent linkable items that get an ID. Fields are contained within cards, so sometimes a user wants a custom field (derived from FieldDef), but usually it's creating a card (derived from CardDef).\n\nUse typescript for the code. Basic interaction for editing fields is handled for you by boxel, you don't need to create that (e.g. StringField has an edit template that allows a user to edit the data). Computed fields can support more complex work, and update automatically for you. Interaction (button clicks, filtering on user typed content) will require work on templates that will happen elsewhere and is not yours to do.\n\nNever leave sections of code unfilled or with placeholders, finish all code you write.\n\nPut all classes in the same codeblock/file, and have all CardDefs exported (e.g. export class MyCard extends CardDef)\n\n\nYou have available:\n\nStringField\nMarkdownField\nNumberField\nBooleanField\nDateField\nDateTimeField\n\nConstruct any more complex data structures from these\n\nFields do not have default values.\n\nUse the () => format when *and only when* you need to define classes out of order\n\nEXAMPLE CODE, you MUST include the imports shown in this example :\n\n```gts\n\nimport { Component, CardDef, FieldDef, linksTo, linksToMany, field, contains, containsMany } from 'https://cardstack.com/base/card-api';\nimport StringField from 'https://cardstack.com/base/string';\nimport BooleanField from 'https://cardstack.com/base/boolean';\nimport DateField from 'https://cardstack.com/base/date';\nimport DateTimeField from 'https://cardstack.com/base/datetime';\nimport NumberField from 'https://cardstack.com/base/number';\n\nimport MarkdownField from 'https://cardstack.com/base/markdown';\n\n\n\nclass MyCustomField extends FieldDef {\n  @field nestedField = contains(NumberField);\n  @field nestedOtherField = contains(BooleanField);\n}\n\nexport class OutOfOrderDeclaration extends CardDef {\n    static displayName = 'OutOfOrderDeclaration';\n\n    @field linkToCardDefinedLaterInFile = linksTo(() => MyCustomCard);\n}\n\nexport class MyCustomCard  extends CardDef {\n  static displayName = 'BoxelBuddyGuestList';\n\n  @field structuredData = contains(MyCustomField);\n\n  // linksTo and linksToMany \n  @field linkedData = linksToMany(AnotherCard);\n\n  // A field that is computed from other data in the card\n @field computedData = contains(NumberField, {\n   computeVia: function (this: MyCustomCard) {\n     // implementation logic here\n     return 1;\n   },\n });\n \nexport class InOrderDeclaration extends CardDef {\n    static displayName = 'InOrderDeclaration';\n\n    @field linkToCardDefinedLaterInFile = linksTo(MyCustomCard);\n}\n\n}\n```\n\nImportant:\n\nIf a user is asking  you to make, help or create something, assume they mean a boxel card unless they specifically request an image or logo.\n\n\nRemember to define a field the following syntax is used:\n\n  @field fieldname = contains(FieldType);\n  @field fieldname = containsMany(FieldType);\n\nAnd for linking to other cards:\n\n  @field fieldname = linksTo(CardType);\n  @field fieldname = linksToMany(CardType);\n\nYou must also write an app card. The app card definition should extend AppCard. Here is the code you must use to import the AppCard: `import { AppCard } from '/experiments/app-card';`\n\nYou can ask followups\n\nYou can propose new/improved data structures.\n\nTalk through the problem and structures, specifying how each should link to each other (this is very important), then write the code. \n\nYOU MUST CONSIDER LINKS BETWEEN THESE TYPES. Make sure common entities are extracted as their own types and that linksTo or linksToMany are used to connect the cards that need to be connected.\n\nPut it in a codeblock.\n\nRemember, if in the code a card class is used before it is defined, you must use the () => syntax. All CardDef classes should be exported classes.\n\nAsk the user if they want you to use the generated code to create a new app module.",
+      "instructions": "The user has shared with you a product requirement document for an application they want to build. You must build that. Look at the domain for the area they are interested in and use your general knowledge to ensure data structures and the linkages between them are created.\n\nYou are a software engineer specializing in Boxel development. Boxel is a platform where people can create Cards, which under the hood are built out of glimmer components and ember. You are designed to assist users with code-related queries, troubleshooting, and best practices in this specific domain. You should ask for clarification when the user's query is ambiguous or lacks detail, but should also be able to make reasonable assumptions based on typical software engineering practices.\n\nIf the user wants to make something, they mostly want to create a Card. Cards are independent linkable items that get an ID. Fields are contained within cards, so sometimes a user wants a custom field (derived from FieldDef), but usually it's creating a card (derived from CardDef).\n\nUse typescript for the code. Basic interaction for editing fields is handled for you by boxel, you don't need to create that (e.g. StringField has an edit template that allows a user to edit the data). Computed fields can support more complex work, and update automatically for you. Interaction (button clicks, filtering on user typed content) will require work on templates that will happen elsewhere and is not yours to do.\n\nNever leave sections of code unfilled or with placeholders, finish all code you write.\n\nPut all classes in the same codeblock/file, and have all CardDefs exported (e.g. export class MyCard extends CardDef)\n\n\nYou have available:\n\nStringField\nMarkdownField\nNumberField\nBooleanField\nDateField\nDateTimeField\n\nConstruct any more complex data structures from these\n\nFields do not have default values.\n\nUse the () => format when *and only when* you need to define classes out of order\n\nEXAMPLE CODE, you MUST include the imports shown in this example :\n\n```gts\n\nimport { Component, CardDef, FieldDef, linksTo, linksToMany, field, contains, containsMany } from '@cardstack/base/card-api';\nimport StringField from '@cardstack/base/string';\nimport BooleanField from '@cardstack/base/boolean';\nimport DateField from '@cardstack/base/date';\nimport DateTimeField from '@cardstack/base/datetime';\nimport NumberField from '@cardstack/base/number';\n\nimport MarkdownField from '@cardstack/base/markdown';\n\n\n\nclass MyCustomField extends FieldDef {\n  @field nestedField = contains(NumberField);\n  @field nestedOtherField = contains(BooleanField);\n}\n\nexport class OutOfOrderDeclaration extends CardDef {\n    static displayName = 'OutOfOrderDeclaration';\n\n    @field linkToCardDefinedLaterInFile = linksTo(() => MyCustomCard);\n}\n\nexport class MyCustomCard  extends CardDef {\n  static displayName = 'BoxelBuddyGuestList';\n\n  @field structuredData = contains(MyCustomField);\n\n  // linksTo and linksToMany \n  @field linkedData = linksToMany(AnotherCard);\n\n  // A field that is computed from other data in the card\n @field computedData = contains(NumberField, {\n   computeVia: function (this: MyCustomCard) {\n     // implementation logic here\n     return 1;\n   },\n });\n \nexport class InOrderDeclaration extends CardDef {\n    static displayName = 'InOrderDeclaration';\n\n    @field linkToCardDefinedLaterInFile = linksTo(MyCustomCard);\n}\n\n}\n```\n\nImportant:\n\nIf a user is asking  you to make, help or create something, assume they mean a boxel card unless they specifically request an image or logo.\n\n\nRemember to define a field the following syntax is used:\n\n  @field fieldname = contains(FieldType);\n  @field fieldname = containsMany(FieldType);\n\nAnd for linking to other cards:\n\n  @field fieldname = linksTo(CardType);\n  @field fieldname = linksToMany(CardType);\n\nYou must also write an app card. The app card definition should extend AppCard. Here is the code you must use to import the AppCard: `import { AppCard } from '/experiments/app-card';`\n\nYou can ask followups\n\nYou can propose new/improved data structures.\n\nTalk through the problem and structures, specifying how each should link to each other (this is very important), then write the code. \n\nYOU MUST CONSIDER LINKS BETWEEN THESE TYPES. Make sure common entities are extracted as their own types and that linksTo or linksToMany are used to connect the cards that need to be connected.\n\nPut it in a codeblock.\n\nRemember, if in the code a card class is used before it is defined, you must use the () => syntax. All CardDef classes should be exported classes.\n\nAsk the user if they want you to use the generated code to create a new app module.",
       "cardTitle": "Boxel App Generator",
       "cardDescription": "Helps you generate code for a Boxel application",
       "cardThumbnailURL": null
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/experiments-realm/Skill/d82e819a-506a-4538-bc6e-3f26413f93eb.json b/packages/experiments-realm/Skill/d82e819a-506a-4538-bc6e-3f26413f93eb.json
index fa80f37ee56..031e5a09f5c 100644
--- a/packages/experiments-realm/Skill/d82e819a-506a-4538-bc6e-3f26413f93eb.json
+++ b/packages/experiments-realm/Skill/d82e819a-506a-4538-bc6e-3f26413f93eb.json
@@ -2,14 +2,14 @@
   "data": {
     "type": "card",
     "attributes": {
-      "instructions": "The user has shared with you a product requirement document for an application they want to build. You must build that. Look at the domain for the area they are interested in and use your general knowledge to ensure data structures and the linkages between them are created.\n\nYou are a software engineer specializing in Boxel development. Boxel is a platform where people can create Cards, which under the hood are built out of glimmer components and ember. You are designed to assist users with code-related queries, troubleshooting, and best practices in this specific domain. You should aim to provide accurate and practical advice, code examples, and explanations related to Boxel, TypeScript and Glimmer. It should ask for clarification when the user's query is ambiguous or lacks detail, but should also be able to make reasonable assumptions based on typical software engineering practices.\n\nIf the user wants to make something, they mostly want to create a Card. Cards are independent linkable items that get an ID. Fields are contained within cards, so sometimes a user wants a custom field (derived from FieldDef), but usually it's creating a card (derived from CardDef).\n\nUse typescript for the code. Basic interaction for editing fields is handled for you by boxel, you don't need to create that (e.g. StringField has an edit template that allows a user to edit the data). Computed fields can support more complex work, and update automatically for you. Interaction (button clicks, filtering on user typed content) will require work on templates that will happen elsewhere and is not yours to do.\n\nNever leave sections of code unfilled or with placeholders, finish all code you write.\n\nPut all classes in the same codeblock/file, and have all CardDefs exported (e.g. export class MyCard extends CardDef)\n\n\nYou have available:\n\nStringField\nMarkdownField\nNumberField\nBooleanField\nDateField\nDateTimeField\n\nConstruct any more complex data structures from these\n\nFields do not have default values.\n\nUse the () => format when *and only when* you need to define classes out of order\n\nEXAMPLE CODE, you MUST include the imports shown in this example :\n\n```gts\n\nimport { CardDef, FieldDef, linksTo, linksToMany, field, contains, containsMany } from 'https://cardstack.com/base/card-api';\nimport { Component } from 'https://cardstack.com/base/card-api';\n\n\nimport StringField from 'https://cardstack.com/base/string';\nimport BooleanField from 'https://cardstack.com/base/boolean';\nimport DateField from 'https://cardstack.com/base/date';\nimport DateTimeField from 'https://cardstack.com/base/datetime';\nimport NumberField from 'https://cardstack.com/base/number';\n\nimport MarkdownField from 'https://cardstack.com/base/markdown';\n\n\n\nclass MyCustomField extends FieldDef {\n  @field nestedField = contains(NumberField);\n  @field nestedOtherField = contains(BooleanField);\n}\n\nexport class OutOfOrderDeclaration extends CardDef {\n    static displayName = 'OutOfOrderDeclaration';\n\n    @field linkToCardDefinedLaterInFile = linksTo(() => MyCustomCard);\n}\n\nexport class MyCustomCard  extends CardDef {\n  static displayName = 'BoxelBuddyGuestList';\n\n  @field structuredData = contains(MyCustomField);\n\n  // linksTo and linksToMany \n  @field linkedData = linksToMany(AnotherCard);\n\n  // A field that is computed from other data in the card\n @field computedData = contains(NumberField, {\n   computeVia: function (this: MyCustomCard) {\n     // implementation logic here\n     return 1;\n   },\n });\n \nexport class InOrderDeclaration extends CardDef {\n    static displayName = 'InOrderDeclaration';\n\n    @field linkToCardDefinedLaterInFile = linksTo(MyCustomCard);\n}\n\n}\n```\n\nImportant:\n\nIf a user is asking  you to make, help or create something, assume they mean a boxel card unless they specifically request an image or logo.\n\n\nRemember to define a field the following syntax is used:\n\n  @field fieldname = contains(FieldType);\n  @field fieldname = containsMany(FieldType);\n\nAnd for linking to other cards:\n\n  @field fieldname = linksTo(CardType);\n  @field fieldname = linksToMany(CardType);\n\nYou can ask followups\n\nYou can propose new/improved data structures\n\nTalk through the problem and structures, specifying how each should link to each other (this is very important), then write the code. \n\nYOU MUST CONSIDER LINKS BETWEEN THESE TYPES. Make sure common entities are extracted as their own types and that linksTo or linksToMany are used to connect the cards that need to be connected.\n\nPut it in a codeblock.",
+      "instructions": "The user has shared with you a product requirement document for an application they want to build. You must build that. Look at the domain for the area they are interested in and use your general knowledge to ensure data structures and the linkages between them are created.\n\nYou are a software engineer specializing in Boxel development. Boxel is a platform where people can create Cards, which under the hood are built out of glimmer components and ember. You are designed to assist users with code-related queries, troubleshooting, and best practices in this specific domain. You should aim to provide accurate and practical advice, code examples, and explanations related to Boxel, TypeScript and Glimmer. It should ask for clarification when the user's query is ambiguous or lacks detail, but should also be able to make reasonable assumptions based on typical software engineering practices.\n\nIf the user wants to make something, they mostly want to create a Card. Cards are independent linkable items that get an ID. Fields are contained within cards, so sometimes a user wants a custom field (derived from FieldDef), but usually it's creating a card (derived from CardDef).\n\nUse typescript for the code. Basic interaction for editing fields is handled for you by boxel, you don't need to create that (e.g. StringField has an edit template that allows a user to edit the data). Computed fields can support more complex work, and update automatically for you. Interaction (button clicks, filtering on user typed content) will require work on templates that will happen elsewhere and is not yours to do.\n\nNever leave sections of code unfilled or with placeholders, finish all code you write.\n\nPut all classes in the same codeblock/file, and have all CardDefs exported (e.g. export class MyCard extends CardDef)\n\n\nYou have available:\n\nStringField\nMarkdownField\nNumberField\nBooleanField\nDateField\nDateTimeField\n\nConstruct any more complex data structures from these\n\nFields do not have default values.\n\nUse the () => format when *and only when* you need to define classes out of order\n\nEXAMPLE CODE, you MUST include the imports shown in this example :\n\n```gts\n\nimport { CardDef, FieldDef, linksTo, linksToMany, field, contains, containsMany } from '@cardstack/base/card-api';\nimport { Component } from '@cardstack/base/card-api';\n\n\nimport StringField from '@cardstack/base/string';\nimport BooleanField from '@cardstack/base/boolean';\nimport DateField from '@cardstack/base/date';\nimport DateTimeField from '@cardstack/base/datetime';\nimport NumberField from '@cardstack/base/number';\n\nimport MarkdownField from '@cardstack/base/markdown';\n\n\n\nclass MyCustomField extends FieldDef {\n  @field nestedField = contains(NumberField);\n  @field nestedOtherField = contains(BooleanField);\n}\n\nexport class OutOfOrderDeclaration extends CardDef {\n    static displayName = 'OutOfOrderDeclaration';\n\n    @field linkToCardDefinedLaterInFile = linksTo(() => MyCustomCard);\n}\n\nexport class MyCustomCard  extends CardDef {\n  static displayName = 'BoxelBuddyGuestList';\n\n  @field structuredData = contains(MyCustomField);\n\n  // linksTo and linksToMany \n  @field linkedData = linksToMany(AnotherCard);\n\n  // A field that is computed from other data in the card\n @field computedData = contains(NumberField, {\n   computeVia: function (this: MyCustomCard) {\n     // implementation logic here\n     return 1;\n   },\n });\n \nexport class InOrderDeclaration extends CardDef {\n    static displayName = 'InOrderDeclaration';\n\n    @field linkToCardDefinedLaterInFile = linksTo(MyCustomCard);\n}\n\n}\n```\n\nImportant:\n\nIf a user is asking  you to make, help or create something, assume they mean a boxel card unless they specifically request an image or logo.\n\n\nRemember to define a field the following syntax is used:\n\n  @field fieldname = contains(FieldType);\n  @field fieldname = containsMany(FieldType);\n\nAnd for linking to other cards:\n\n  @field fieldname = linksTo(CardType);\n  @field fieldname = linksToMany(CardType);\n\nYou can ask followups\n\nYou can propose new/improved data structures\n\nTalk through the problem and structures, specifying how each should link to each other (this is very important), then write the code. \n\nYOU MUST CONSIDER LINKS BETWEEN THESE TYPES. Make sure common entities are extracted as their own types and that linksTo or linksToMany are used to connect the cards that need to be connected.\n\nPut it in a codeblock.",
       "cardTitle": "Boxel coder",
       "cardDescription": "Helps you write boxel card defs",
       "cardThumbnailURL": null
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/experiments-realm/Skill/generate-product-requirements.json b/packages/experiments-realm/Skill/generate-product-requirements.json
index 1f8f962c32c..b8261133b83 100644
--- a/packages/experiments-realm/Skill/generate-product-requirements.json
+++ b/packages/experiments-realm/Skill/generate-product-requirements.json
@@ -9,7 +9,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/experiments-realm/Spec/1.json b/packages/experiments-realm/Spec/1.json
index 89e69be72aa..3b8749073dd 100644
--- a/packages/experiments-realm/Spec/1.json
+++ b/packages/experiments-realm/Spec/1.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/10.json b/packages/experiments-realm/Spec/10.json
index bf4c596a9c6..16ae07149f3 100644
--- a/packages/experiments-realm/Spec/10.json
+++ b/packages/experiments-realm/Spec/10.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/11.json b/packages/experiments-realm/Spec/11.json
index 11f51ef7c4e..52eca067205 100644
--- a/packages/experiments-realm/Spec/11.json
+++ b/packages/experiments-realm/Spec/11.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/2.json b/packages/experiments-realm/Spec/2.json
index 129d31272b7..5bda790408b 100644
--- a/packages/experiments-realm/Spec/2.json
+++ b/packages/experiments-realm/Spec/2.json
@@ -11,7 +11,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     },
diff --git a/packages/experiments-realm/Spec/4ed85faa-741a-4adc-95ea-beb532b60c40.json b/packages/experiments-realm/Spec/4ed85faa-741a-4adc-95ea-beb532b60c40.json
index c8a166ead5e..91c6824104f 100644
--- a/packages/experiments-realm/Spec/4ed85faa-741a-4adc-95ea-beb532b60c40.json
+++ b/packages/experiments-realm/Spec/4ed85faa-741a-4adc-95ea-beb532b60c40.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/6.json b/packages/experiments-realm/Spec/6.json
index d2b3e8dea91..a623aa7657c 100644
--- a/packages/experiments-realm/Spec/6.json
+++ b/packages/experiments-realm/Spec/6.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/7.json b/packages/experiments-realm/Spec/7.json
index d9c5a60701f..c1d4b45c4d2 100644
--- a/packages/experiments-realm/Spec/7.json
+++ b/packages/experiments-realm/Spec/7.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/7705e324-4949-43f8-a6fe-4f3c94c365f5.json b/packages/experiments-realm/Spec/7705e324-4949-43f8-a6fe-4f3c94c365f5.json
index 9f72595089a..353755e8b03 100644
--- a/packages/experiments-realm/Spec/7705e324-4949-43f8-a6fe-4f3c94c365f5.json
+++ b/packages/experiments-realm/Spec/7705e324-4949-43f8-a6fe-4f3c94c365f5.json
@@ -49,7 +49,7 @@
       },
       "adoptsFrom": {
         "name": "Spec",
-        "module": "https://cardstack.com/base/spec"
+        "module": "@cardstack/base/spec"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/Spec/a0bd867f-e0fc-46fb-9a0e-c4f5ee2953c6.json b/packages/experiments-realm/Spec/a0bd867f-e0fc-46fb-9a0e-c4f5ee2953c6.json
index 4470168d57f..04bafceb0e2 100644
--- a/packages/experiments-realm/Spec/a0bd867f-e0fc-46fb-9a0e-c4f5ee2953c6.json
+++ b/packages/experiments-realm/Spec/a0bd867f-e0fc-46fb-9a0e-c4f5ee2953c6.json
@@ -54,7 +54,7 @@
         ]
       },
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/app.json b/packages/experiments-realm/Spec/app.json
index ff8e3e9a41b..0890ed92d5f 100644
--- a/packages/experiments-realm/Spec/app.json
+++ b/packages/experiments-realm/Spec/app.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/author.json b/packages/experiments-realm/Spec/author.json
index 9681292bc61..0059514b66a 100644
--- a/packages/experiments-realm/Spec/author.json
+++ b/packages/experiments-realm/Spec/author.json
@@ -22,7 +22,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/blog-post.json b/packages/experiments-realm/Spec/blog-post.json
index be9096ff456..cfff474fe36 100644
--- a/packages/experiments-realm/Spec/blog-post.json
+++ b/packages/experiments-realm/Spec/blog-post.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/blog.json b/packages/experiments-realm/Spec/blog.json
index 010e8c42aeb..f889014e1ae 100644
--- a/packages/experiments-realm/Spec/blog.json
+++ b/packages/experiments-realm/Spec/blog.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/crm-app.json b/packages/experiments-realm/Spec/crm-app.json
index 298c515f01b..c80d9b84da6 100644
--- a/packages/experiments-realm/Spec/crm-app.json
+++ b/packages/experiments-realm/Spec/crm-app.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/fc715f41-c280-4b0c-a732-e8e1a85a97dd.json b/packages/experiments-realm/Spec/fc715f41-c280-4b0c-a732-e8e1a85a97dd.json
index 915dad65a24..4a1388f00d7 100644
--- a/packages/experiments-realm/Spec/fc715f41-c280-4b0c-a732-e8e1a85a97dd.json
+++ b/packages/experiments-realm/Spec/fc715f41-c280-4b0c-a732-e8e1a85a97dd.json
@@ -54,7 +54,7 @@
         ]
       },
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/fields/contact-link-field.json b/packages/experiments-realm/Spec/fields/contact-link-field.json
index 21f98208e67..bddca3860c7 100644
--- a/packages/experiments-realm/Spec/fields/contact-link-field.json
+++ b/packages/experiments-realm/Spec/fields/contact-link-field.json
@@ -11,7 +11,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/fields/featured-image-field.json b/packages/experiments-realm/Spec/fields/featured-image-field.json
index 27a39f07c14..599eca50045 100644
--- a/packages/experiments-realm/Spec/fields/featured-image-field.json
+++ b/packages/experiments-realm/Spec/fields/featured-image-field.json
@@ -11,7 +11,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/fields/rating-field.json b/packages/experiments-realm/Spec/fields/rating-field.json
index e21b3b3d986..672604791ab 100644
--- a/packages/experiments-realm/Spec/fields/rating-field.json
+++ b/packages/experiments-realm/Spec/fields/rating-field.json
@@ -11,7 +11,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/plant-info.json b/packages/experiments-realm/Spec/plant-info.json
index 0fa8e27fbb2..5b0047d05db 100644
--- a/packages/experiments-realm/Spec/plant-info.json
+++ b/packages/experiments-realm/Spec/plant-info.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/puppy.json b/packages/experiments-realm/Spec/puppy.json
index 31c4315d931..9c6ed913133 100644
--- a/packages/experiments-realm/Spec/puppy.json
+++ b/packages/experiments-realm/Spec/puppy.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/sprint-planner.json b/packages/experiments-realm/Spec/sprint-planner.json
index 8d4af82f9bb..27a92d7898c 100644
--- a/packages/experiments-realm/Spec/sprint-planner.json
+++ b/packages/experiments-realm/Spec/sprint-planner.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/sprint-task.json b/packages/experiments-realm/Spec/sprint-task.json
index 25a515bd2b1..2613e6028b7 100644
--- a/packages/experiments-realm/Spec/sprint-task.json
+++ b/packages/experiments-realm/Spec/sprint-task.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/tag.json b/packages/experiments-realm/Spec/tag.json
index a24626458c5..97b351e233e 100644
--- a/packages/experiments-realm/Spec/tag.json
+++ b/packages/experiments-realm/Spec/tag.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/task.json b/packages/experiments-realm/Spec/task.json
index f4454ab0876..d3e460a5b5d 100644
--- a/packages/experiments-realm/Spec/task.json
+++ b/packages/experiments-realm/Spec/task.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/team-member.json b/packages/experiments-realm/Spec/team-member.json
index bab547abc2c..9fc71d23835 100644
--- a/packages/experiments-realm/Spec/team-member.json
+++ b/packages/experiments-realm/Spec/team-member.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/team.json b/packages/experiments-realm/Spec/team.json
index 230120b7831..6be41a06a56 100644
--- a/packages/experiments-realm/Spec/team.json
+++ b/packages/experiments-realm/Spec/team.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Spec/todo.json b/packages/experiments-realm/Spec/todo.json
index 48adb0a18c3..e324fecc578 100644
--- a/packages/experiments-realm/Spec/todo.json
+++ b/packages/experiments-realm/Spec/todo.json
@@ -12,7 +12,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/Theme/bubblegum.json b/packages/experiments-realm/Theme/bubblegum.json
index b3af1c7e537..a0ec7e6e03c 100644
--- a/packages/experiments-realm/Theme/bubblegum.json
+++ b/packages/experiments-realm/Theme/bubblegum.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Theme",
-        "module": "https://cardstack.com/base/card-api"
+        "module": "@cardstack/base/card-api"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/Theme/doom64.json b/packages/experiments-realm/Theme/doom64.json
index 9071df29352..559ef4d4b73 100644
--- a/packages/experiments-realm/Theme/doom64.json
+++ b/packages/experiments-realm/Theme/doom64.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Theme",
-        "module": "https://cardstack.com/base/card-api"
+        "module": "@cardstack/base/card-api"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/Theme/neo-brutalism.json b/packages/experiments-realm/Theme/neo-brutalism.json
index 9809b899946..999312adb8c 100644
--- a/packages/experiments-realm/Theme/neo-brutalism.json
+++ b/packages/experiments-realm/Theme/neo-brutalism.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Theme",
-        "module": "https://cardstack.com/base/card-api"
+        "module": "@cardstack/base/card-api"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/Theme/retro-arcade.json b/packages/experiments-realm/Theme/retro-arcade.json
index a068ab5449b..9320516239d 100644
--- a/packages/experiments-realm/Theme/retro-arcade.json
+++ b/packages/experiments-realm/Theme/retro-arcade.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Theme",
-        "module": "https://cardstack.com/base/card-api"
+        "module": "@cardstack/base/card-api"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/Theme/starry-night.json b/packages/experiments-realm/Theme/starry-night.json
index 18f686d04fb..8ae9e800549 100644
--- a/packages/experiments-realm/Theme/starry-night.json
+++ b/packages/experiments-realm/Theme/starry-night.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "Theme",
-        "module": "https://cardstack.com/base/card-api"
+        "module": "@cardstack/base/card-api"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/animated.gts b/packages/experiments-realm/animated.gts
index e2db045279a..e6be039ec74 100644
--- a/packages/experiments-realm/animated.gts
+++ b/packages/experiments-realm/animated.gts
@@ -18,8 +18,8 @@ import { fadeOut } from 'ember-animated/motions/opacity';
 import fade from 'ember-animated/transitions/fade';
 import { toLeft, toRight } from 'ember-animated/transitions/move-over';
 
-import { CardDef } from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 
 import { BoxelContainer, IconButton } from '@cardstack/boxel-ui/components';
 import { gte, lte } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/experiments-realm/app-card.gts b/packages/experiments-realm/app-card.gts
index b9c9f5db36f..e9ecd1db6f4 100644
--- a/packages/experiments-realm/app-card.gts
+++ b/packages/experiments-realm/app-card.gts
@@ -1,6 +1,6 @@
-import BooleanField from 'https://cardstack.com/base/boolean';
-import CodeRefField from 'https://cardstack.com/base/code-ref';
-import Base64ImageField from 'https://cardstack.com/base/base64-image';
+import BooleanField from '@cardstack/base/boolean';
+import CodeRefField from '@cardstack/base/code-ref';
+import Base64ImageField from '@cardstack/base/base64-image';
 import {
   CardDef,
   field,
@@ -13,7 +13,7 @@ import {
   type CardContext,
   type CreateCardFn,
   FieldsTypeFor,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { CardContainer } from '@cardstack/boxel-ui/components';
 import { and, bool, cn } from '@cardstack/boxel-ui/helpers';
 import {
diff --git a/packages/experiments-realm/asset.gts b/packages/experiments-realm/asset.gts
index d5d71544735..b6c17ce6463 100644
--- a/packages/experiments-realm/asset.gts
+++ b/packages/experiments-realm/asset.gts
@@ -5,8 +5,8 @@ import {
   FieldDef,
   Component,
   relativeTo,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import CurrencyIcon from '@cardstack/boxel-icons/currency';
 import CircleDotIcon from '@cardstack/boxel-icons/circle-dot';
 
diff --git a/packages/experiments-realm/atom-examples.gts b/packages/experiments-realm/atom-examples.gts
index 5bbe82c9090..f7bcbb6c6a9 100644
--- a/packages/experiments-realm/atom-examples.gts
+++ b/packages/experiments-realm/atom-examples.gts
@@ -10,8 +10,8 @@ import {
   Component,
   FieldDef,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-import DateField from 'https://cardstack.com/base/date';
+} from '@cardstack/base/card-api';
+import DateField from '@cardstack/base/date';
 import AtomIcon from '@cardstack/boxel-icons/atom';
 import { Button } from '@cardstack/boxel-ui/components';
 import { Author } from './author';
diff --git a/packages/experiments-realm/authenticated-image-tester.gts b/packages/experiments-realm/authenticated-image-tester.gts
index e2d9e5997dc..9ea449e4c6f 100644
--- a/packages/experiments-realm/authenticated-image-tester.gts
+++ b/packages/experiments-realm/authenticated-image-tester.gts
@@ -3,8 +3,8 @@ import {
   Component,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { htmlSafe } from '@ember/template';
 
 class AuthenticatedImageTesterIsolated extends Component<
diff --git a/packages/experiments-realm/author.gts b/packages/experiments-realm/author.gts
index c9de5d9924b..49ed0ed048d 100644
--- a/packages/experiments-realm/author.gts
+++ b/packages/experiments-realm/author.gts
@@ -1,6 +1,6 @@
 import { FeaturedImageField } from './fields/featured-image';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+import MarkdownField from '@cardstack/base/markdown';
+import TextAreaField from '@cardstack/base/text-area';
 import {
   Component,
   CardDef,
@@ -9,8 +9,8 @@ import {
   containsMany,
   linksTo,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-import EmailField from 'https://cardstack.com/base/email';
+} from '@cardstack/base/card-api';
+import EmailField from '@cardstack/base/email';
 
 import Email from '@cardstack/boxel-icons/mail';
 import Linkedin from '@cardstack/boxel-icons/linkedin';
diff --git a/packages/experiments-realm/bilingual-blog.gts b/packages/experiments-realm/bilingual-blog.gts
index aceeaccb236..36e6003a8b1 100644
--- a/packages/experiments-realm/bilingual-blog.gts
+++ b/packages/experiments-realm/bilingual-blog.gts
@@ -2,7 +2,7 @@ import {
   field,
   contains,
   StringField,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { BlogPost } from './blog-post';
 import Langugages from '@cardstack/boxel-icons/languages';
 
diff --git a/packages/experiments-realm/blog-app.gts b/packages/experiments-realm/blog-app.gts
index 45c7b221b42..c51fa848563 100644
--- a/packages/experiments-realm/blog-app.gts
+++ b/packages/experiments-realm/blog-app.gts
@@ -13,7 +13,7 @@ import {
   contains,
   StringField,
   type CardContext,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import {
   type LooseSingleCardDocument,
diff --git a/packages/experiments-realm/blog-category.gts b/packages/experiments-realm/blog-category.gts
index 27908b0943a..f912cdb4d95 100644
--- a/packages/experiments-realm/blog-category.gts
+++ b/packages/experiments-realm/blog-category.gts
@@ -4,9 +4,9 @@ import {
   Component,
   CardDef,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import ColorField from '@cardstack/base/color';
 import { BlogApp as BlogAppCard } from './blog-app';
 import { htmlSafe } from '@ember/template';
 import { cssVar, getContrastColor } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/experiments-realm/blog-post.gts b/packages/experiments-realm/blog-post.gts
index 511d7b58f67..243e7922cab 100644
--- a/packages/experiments-realm/blog-post.gts
+++ b/packages/experiments-realm/blog-post.gts
@@ -1,8 +1,8 @@
 import { FeaturedImageField } from './fields/featured-image';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import NumberField from 'https://cardstack.com/base/number';
+import DateTimeField from '@cardstack/base/datetime';
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown';
+import NumberField from '@cardstack/base/number';
 import {
   CardDef,
   field,
@@ -11,7 +11,7 @@ import {
   Component,
   getCardMeta,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import CalendarCog from '@cardstack/boxel-icons/calendar-cog';
 import BlogIcon from '@cardstack/boxel-icons/notebook';
diff --git a/packages/experiments-realm/board-annotation.gts b/packages/experiments-realm/board-annotation.gts
index 14351e7aefe..744f1168e4f 100644
--- a/packages/experiments-realm/board-annotation.gts
+++ b/packages/experiments-realm/board-annotation.gts
@@ -3,14 +3,14 @@ import {
   field,
   contains,
   primitive,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { concat, fn } from '@ember/helper';
 import { htmlSafe } from '@ember/template';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { RadioInput } from '@cardstack/boxel-ui/components';
 import { not } from '@cardstack/boxel-ui/helpers';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
 
 let groupNumber = 0;
 class BodyBalance extends FieldDef {
diff --git a/packages/experiments-realm/booking.gts b/packages/experiments-realm/booking.gts
index 18230b3ae84..b017867aa1a 100644
--- a/packages/experiments-realm/booking.gts
+++ b/packages/experiments-realm/booking.gts
@@ -5,9 +5,9 @@ import {
   field,
   Component,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import DateTimeField from '@cardstack/base/datetime';
 import { Person } from './person';
 import CalendarCheck from '@cardstack/boxel-icons/calendar-check';
 
diff --git a/packages/experiments-realm/boom-pet.gts b/packages/experiments-realm/boom-pet.gts
index 303124fc7fd..a824036a1ca 100644
--- a/packages/experiments-realm/boom-pet.gts
+++ b/packages/experiments-realm/boom-pet.gts
@@ -6,7 +6,7 @@ import {
   FieldDef,
   StringField,
   serialize,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 // this field explodes when serialized (saved)
 export class BoomField extends FieldDef {
diff --git a/packages/experiments-realm/bot-request-demo.gts b/packages/experiments-realm/bot-request-demo.gts
index 7d9b0db76c1..e35e6f90973 100644
--- a/packages/experiments-realm/bot-request-demo.gts
+++ b/packages/experiments-realm/bot-request-demo.gts
@@ -1,4 +1,4 @@
-import { CardDef, Component } from 'https://cardstack.com/base/card-api';
+import { CardDef, Component } from '@cardstack/base/card-api';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import { on } from '@ember/modifier';
diff --git a/packages/experiments-realm/bucket-list.gts b/packages/experiments-realm/bucket-list.gts
index 6f2f6e6e809..1694ff12736 100644
--- a/packages/experiments-realm/bucket-list.gts
+++ b/packages/experiments-realm/bucket-list.gts
@@ -5,7 +5,7 @@ import {
   containsMany,
   StringField,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { ChipsEditor } from './components/chips-editor';
 
 // BucketList Isolated View - now uses the reusable ChipsComponent
diff --git a/packages/experiments-realm/carving-turn-diagram.gts b/packages/experiments-realm/carving-turn-diagram.gts
index 918605805b4..7e962eb4016 100644
--- a/packages/experiments-realm/carving-turn-diagram.gts
+++ b/packages/experiments-realm/carving-turn-diagram.gts
@@ -42,8 +42,8 @@ import {
   contains,
   containsMany,
   field,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { RadioInput } from '@cardstack/boxel-ui/components';
 import { tracked } from '@glimmer/tracking';
 import type Owner from '@ember/owner';
diff --git a/packages/experiments-realm/carving-turn-entry.json b/packages/experiments-realm/carving-turn-entry.json
index 7fc20fd970e..2484050b356 100644
--- a/packages/experiments-realm/carving-turn-entry.json
+++ b/packages/experiments-realm/carving-turn-entry.json
@@ -11,7 +11,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
diff --git a/packages/experiments-realm/chain.gts b/packages/experiments-realm/chain.gts
index 665f2801af4..b9f9ac65f1f 100644
--- a/packages/experiments-realm/chain.gts
+++ b/packages/experiments-realm/chain.gts
@@ -3,9 +3,9 @@ import {
   field,
   CardDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import { FieldContainer } from '@cardstack/boxel-ui/components';
 import Link from '@cardstack/boxel-icons/link';
 
diff --git a/packages/experiments-realm/chess-game.gts b/packages/experiments-realm/chess-game.gts
index 549c907ed51..1f1bf905a31 100644
--- a/packages/experiments-realm/chess-game.gts
+++ b/packages/experiments-realm/chess-game.gts
@@ -1,10 +1,10 @@
 import {
   Component as BoxelComponent,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import Component from '@glimmer/component';
-import StringField from 'https://cardstack.com/base/string';
-import { contains, field } from 'https://cardstack.com/base/card-api';
+import StringField from '@cardstack/base/string';
+import { contains, field } from '@cardstack/base/card-api';
 import { on } from '@ember/modifier';
 import { cn } from '@cardstack/boxel-ui/helpers';
 import { not } from '@cardstack/boxel-ui/helpers';
@@ -37,7 +37,7 @@ import {
 import Modifier from 'ember-modifier';
 import { Resource } from 'ember-modify-based-class-resource';
 
-import BooleanField from 'https://cardstack.com/base/boolean';
+import BooleanField from '@cardstack/base/boolean';
 import { tracked } from '@glimmer/tracking';
 import ChessIcon from '@cardstack/boxel-icons/chess';
 
diff --git a/packages/experiments-realm/commands/create-patch-card-instance-request.ts b/packages/experiments-realm/commands/create-patch-card-instance-request.ts
index 5ad64a1725b..676a2d7b3ae 100644
--- a/packages/experiments-realm/commands/create-patch-card-instance-request.ts
+++ b/packages/experiments-realm/commands/create-patch-card-instance-request.ts
@@ -1,7 +1,7 @@
 import { Command } from '@cardstack/runtime-common';
 
-import { PatchCardInput } from 'https://cardstack.com/base/command';
-import { StringField, contains, field } from 'https://cardstack.com/base/card-api';
+import { PatchCardInput } from '@cardstack/base/command';
+import { StringField, contains, field } from '@cardstack/base/card-api';
 
 import UseAiAssistantCommand from '@cardstack/boxel-host/commands/ai-assistant';
 import SendBotTriggerEventCommand from '@cardstack/boxel-host/commands/send-bot-trigger-event';
diff --git a/packages/experiments-realm/commands/create-show-card-request.ts b/packages/experiments-realm/commands/create-show-card-request.ts
index ae7229e948f..f431d183a7e 100644
--- a/packages/experiments-realm/commands/create-show-card-request.ts
+++ b/packages/experiments-realm/commands/create-show-card-request.ts
@@ -1,6 +1,6 @@
 import { Command } from '@cardstack/runtime-common';
 
-import { CardDef, StringField, contains, field } from 'https://cardstack.com/base/card-api';
+import { CardDef, StringField, contains, field } from '@cardstack/base/card-api';
 
 import UseAiAssistantCommand from '@cardstack/boxel-host/commands/ai-assistant';
 import SendBotTriggerEventCommand from '@cardstack/boxel-host/commands/send-bot-trigger-event';
diff --git a/packages/experiments-realm/components/base-task-planner.gts b/packages/experiments-realm/components/base-task-planner.gts
index 6c08b035771..9cd960a2fd0 100644
--- a/packages/experiments-realm/components/base-task-planner.gts
+++ b/packages/experiments-realm/components/base-task-planner.gts
@@ -2,7 +2,7 @@ import {
   CardContext,
   CardDef,
   BaseDef,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { tracked } from '@glimmer/tracking';
 import { TrackedMap } from 'tracked-built-ins';
 import GlimmerComponent from '@glimmer/component';
diff --git a/packages/experiments-realm/components/card-list.gts b/packages/experiments-realm/components/card-list.gts
index 53d210d2ace..11365580ee1 100644
--- a/packages/experiments-realm/components/card-list.gts
+++ b/packages/experiments-realm/components/card-list.gts
@@ -1,6 +1,6 @@
 import GlimmerComponent from '@glimmer/component';
 
-import { type CardContext } from 'https://cardstack.com/base/card-api';
+import { type CardContext } from '@cardstack/base/card-api';
 
 import {
   type Query,
diff --git a/packages/experiments-realm/components/grid.gts b/packages/experiments-realm/components/grid.gts
index d8b56055b71..b0c9524a6c0 100644
--- a/packages/experiments-realm/components/grid.gts
+++ b/packages/experiments-realm/components/grid.gts
@@ -1,6 +1,6 @@
 import GlimmerComponent from '@glimmer/component';
 
-import { type CardContext } from 'https://cardstack.com/base/card-api';
+import { type CardContext } from '@cardstack/base/card-api';
 
 import { type Query } from '@cardstack/runtime-common';
 
diff --git a/packages/experiments-realm/components/layout.gts b/packages/experiments-realm/components/layout.gts
index 9c4974d252f..29ed0b71300 100644
--- a/packages/experiments-realm/components/layout.gts
+++ b/packages/experiments-realm/components/layout.gts
@@ -1,7 +1,7 @@
 import GlimmerComponent from '@glimmer/component';
 import type { TemplateOnlyComponent } from '@ember/component/template-only';
 import { htmlSafe } from '@ember/template';
-import { type CardOrFieldTypeIcon } from 'https://cardstack.com/base/card-api';
+import { type CardOrFieldTypeIcon } from '@cardstack/base/card-api';
 import ImageIcon from '@cardstack/boxel-icons/image';
 import { FilterList } from '@cardstack/boxel-ui/components';
 import { element } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/experiments-realm/components/page-layout.gts b/packages/experiments-realm/components/page-layout.gts
index 8c70647c478..fffe722eee3 100644
--- a/packages/experiments-realm/components/page-layout.gts
+++ b/packages/experiments-realm/components/page-layout.gts
@@ -1,6 +1,6 @@
 import GlimmerComponent from '@glimmer/component';
 
-import type { Format } from 'https://cardstack.com/base/card-api';
+import type { Format } from '@cardstack/base/card-api';
 
 import { cn } from '@cardstack/boxel-ui/helpers';
 
diff --git a/packages/experiments-realm/components/status-pill.gts b/packages/experiments-realm/components/status-pill.gts
index 02d4cd2182f..9ba981d3569 100644
--- a/packages/experiments-realm/components/status-pill.gts
+++ b/packages/experiments-realm/components/status-pill.gts
@@ -1,7 +1,7 @@
 import GlimmerComponent from '@glimmer/component';
 import { Pill } from '@cardstack/boxel-ui/components';
 import { cssVar, getContrastColor } from '@cardstack/boxel-ui/helpers';
-import { CardOrFieldTypeIcon } from 'https://cardstack.com/base/card-api';
+import { CardOrFieldTypeIcon } from '@cardstack/base/card-api';
 
 interface StatusPillSignature {
   Args: {
diff --git a/packages/experiments-realm/contact-card.gts b/packages/experiments-realm/contact-card.gts
index 41f4d19999e..718c1b1efad 100644
--- a/packages/experiments-realm/contact-card.gts
+++ b/packages/experiments-realm/contact-card.gts
@@ -1,5 +1,5 @@
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import {
   Component,
   CardDef,
@@ -8,7 +8,7 @@ import {
   contains,
   containsMany,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import ContactIcon from '@cardstack/boxel-icons/contact';
 
 class Alias extends CardDef {
diff --git a/packages/experiments-realm/country.gts b/packages/experiments-realm/country.gts
index df24490ec73..c63ae2c0093 100644
--- a/packages/experiments-realm/country.gts
+++ b/packages/experiments-realm/country.gts
@@ -4,8 +4,8 @@ import {
   Component,
   CardDef,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import World from '@cardstack/boxel-icons/world';
 import { BoxelSelect } from '@cardstack/boxel-ui/components';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/experiments-realm/crm-app.gts b/packages/experiments-realm/crm-app.gts
index 40e2e58188f..636cd9952b8 100644
--- a/packages/experiments-realm/crm-app.gts
+++ b/packages/experiments-realm/crm-app.gts
@@ -22,7 +22,7 @@ import {
   Component,
   realmURL,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import { not, eq } from '@cardstack/boxel-ui/helpers';
 import {
diff --git a/packages/experiments-realm/crm/account.gts b/packages/experiments-realm/crm/account.gts
index ba1ce3d3130..3b536a713f6 100644
--- a/packages/experiments-realm/crm/account.gts
+++ b/packages/experiments-realm/crm/account.gts
@@ -8,9 +8,9 @@ import {
   linksToMany,
   realmURL,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-import WebsiteField from 'https://cardstack.com/base/website';
-import AddressField from 'https://cardstack.com/base/address';
+} from '@cardstack/base/card-api';
+import WebsiteField from '@cardstack/base/website';
+import AddressField from '@cardstack/base/address';
 
 import type { LooseSingleCardDocument } from '@cardstack/runtime-common';
 import { Query } from '@cardstack/runtime-common';
diff --git a/packages/experiments-realm/crm/company.gts b/packages/experiments-realm/crm/company.gts
index 90bef23248a..631d701023b 100644
--- a/packages/experiments-realm/crm/company.gts
+++ b/packages/experiments-realm/crm/company.gts
@@ -1,14 +1,14 @@
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import WebsiteField from 'https://cardstack.com/base/website';
-import AddressField from 'https://cardstack.com/base/address';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import WebsiteField from '@cardstack/base/website';
+import AddressField from '@cardstack/base/address';
 import {
   Component,
   CardDef,
   field,
   contains,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import { CrmApp } from '../crm-app';
 import {
diff --git a/packages/experiments-realm/crm/contact-status-tag.gts b/packages/experiments-realm/crm/contact-status-tag.gts
index 5985d6cef37..eaee27a6420 100644
--- a/packages/experiments-realm/crm/contact-status-tag.gts
+++ b/packages/experiments-realm/crm/contact-status-tag.gts
@@ -4,8 +4,8 @@ import {
   contains,
   StringField,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import ColorField from '@cardstack/base/color';
 
 import ContactIcon from '@cardstack/boxel-icons/contact';
 
diff --git a/packages/experiments-realm/crm/contact.gts b/packages/experiments-realm/crm/contact.gts
index 4ca036fb453..aaf1adb019d 100644
--- a/packages/experiments-realm/crm/contact.gts
+++ b/packages/experiments-realm/crm/contact.gts
@@ -1,4 +1,4 @@
-import StringField from 'https://cardstack.com/base/string';
+import StringField from '@cardstack/base/string';
 import {
   Component,
   CardDef,
@@ -6,9 +6,9 @@ import {
   contains,
   linksTo,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
-import { ContactPhoneNumber } from 'https://cardstack.com/base/phone-number';
-import EmailField from 'https://cardstack.com/base/email';
+} from '@cardstack/base/card-api';
+import { ContactPhoneNumber } from '@cardstack/base/phone-number';
+import EmailField from '@cardstack/base/email';
 
 import {
   Avatar,
diff --git a/packages/experiments-realm/crm/customer.gts b/packages/experiments-realm/crm/customer.gts
index 1473bc11c32..963406a3089 100644
--- a/packages/experiments-realm/crm/customer.gts
+++ b/packages/experiments-realm/crm/customer.gts
@@ -1,4 +1,4 @@
-import { field, contains } from 'https://cardstack.com/base/card-api';
+import { field, contains } from '@cardstack/base/card-api';
 import { Contact } from './contact';
 import HeartHandshakeIcon from '@cardstack/boxel-icons/heart-handshake';
 import { StatusTagField } from './contact-status-tag';
diff --git a/packages/experiments-realm/crm/deal-event.gts b/packages/experiments-realm/crm/deal-event.gts
index b5877e001f4..1d7115c39ef 100644
--- a/packages/experiments-realm/crm/deal-event.gts
+++ b/packages/experiments-realm/crm/deal-event.gts
@@ -3,13 +3,13 @@ import {
   field,
   CardDef,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { Representative } from '../crm/representative';
-import { Component } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+import { Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateTimeField from '@cardstack/base/datetime';
+import TextAreaField from '@cardstack/base/text-area';
 import {
   FieldContainer,
   BoxelSelect,
diff --git a/packages/experiments-realm/crm/deal-priority.gts b/packages/experiments-realm/crm/deal-priority.gts
index 47b748543f3..5c9c2a2e195 100644
--- a/packages/experiments-realm/crm/deal-priority.gts
+++ b/packages/experiments-realm/crm/deal-priority.gts
@@ -4,9 +4,9 @@ import {
   contains,
   StringField,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import ColorField from '@cardstack/base/color';
 
 import { BoxelSelect } from '@cardstack/boxel-ui/components';
 
diff --git a/packages/experiments-realm/crm/deal-status.gts b/packages/experiments-realm/crm/deal-status.gts
index 075b895426c..109a599192b 100644
--- a/packages/experiments-realm/crm/deal-status.gts
+++ b/packages/experiments-realm/crm/deal-status.gts
@@ -4,9 +4,9 @@ import {
   contains,
   StringField,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import ColorField from '@cardstack/base/color';
 
 import FilterSearch from '@cardstack/boxel-icons/filter-search';
 import FilePen from '@cardstack/boxel-icons/file-pen';
diff --git a/packages/experiments-realm/crm/deal.gts b/packages/experiments-realm/crm/deal.gts
index 6ad8cab607b..839f08b70ec 100644
--- a/packages/experiments-realm/crm/deal.gts
+++ b/packages/experiments-realm/crm/deal.gts
@@ -10,14 +10,14 @@ import {
   realmURL,
   FieldDef,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateField from 'https://cardstack.com/base/date';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import AddressField from 'https://cardstack.com/base/address';
-import WebsiteField from 'https://cardstack.com/base/website';
-import PercentageField from 'https://cardstack.com/base/percentage';
+} from '@cardstack/base/card-api';
+
+import BooleanField from '@cardstack/base/boolean';
+import DateField from '@cardstack/base/date';
+import MarkdownField from '@cardstack/base/markdown';
+import AddressField from '@cardstack/base/address';
+import WebsiteField from '@cardstack/base/website';
+import PercentageField from '@cardstack/base/percentage';
 
 import { Query } from '@cardstack/runtime-common';
 import type { LooseSingleCardDocument } from '@cardstack/runtime-common';
diff --git a/packages/experiments-realm/crm/document.gts b/packages/experiments-realm/crm/document.gts
index 85f26ba1a2b..436baa63849 100644
--- a/packages/experiments-realm/crm/document.gts
+++ b/packages/experiments-realm/crm/document.gts
@@ -3,8 +3,8 @@ import {
   contains,
   StringField,
   field,
-} from 'https://cardstack.com/base/card-api';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import MarkdownField from '@cardstack/base/markdown';
 
 export class Document extends CardDef {
   static displayName = 'Document';
diff --git a/packages/experiments-realm/crm/lead.gts b/packages/experiments-realm/crm/lead.gts
index 7d474ce8c8c..0a1f367d55f 100644
--- a/packages/experiments-realm/crm/lead.gts
+++ b/packages/experiments-realm/crm/lead.gts
@@ -1,4 +1,4 @@
-import { field, contains } from 'https://cardstack.com/base/card-api';
+import { field, contains } from '@cardstack/base/card-api';
 import { Contact } from './contact';
 import { StatusTagField } from './contact-status-tag';
 
diff --git a/packages/experiments-realm/crm/representative.gts b/packages/experiments-realm/crm/representative.gts
index 05f50b488d8..e6f7a9af606 100644
--- a/packages/experiments-realm/crm/representative.gts
+++ b/packages/experiments-realm/crm/representative.gts
@@ -1,4 +1,4 @@
-import { field, contains } from 'https://cardstack.com/base/card-api';
+import { field, contains } from '@cardstack/base/card-api';
 import { Contact } from './contact';
 import PresentationAnalytics from '@cardstack/boxel-icons/presentation-analytics';
 import { StatusTagField } from './contact-status-tag';
diff --git a/packages/experiments-realm/crm/task-planner.gts b/packages/experiments-realm/crm/task-planner.gts
index 201145baab9..c0ae1fa251d 100644
--- a/packages/experiments-realm/crm/task-planner.gts
+++ b/packages/experiments-realm/crm/task-planner.gts
@@ -3,7 +3,7 @@ import {
   CardContext,
   CreateCardFn,
   SaveCardFn,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { CRMTaskStatusField } from './shared';
 import GlimmerComponent from '@glimmer/component';
 import { TaskPlanner, TaskCard } from '../components/base-task-planner';
diff --git a/packages/experiments-realm/crm/task.gts b/packages/experiments-realm/crm/task.gts
index f916f6d4e4a..546535f6386 100644
--- a/packages/experiments-realm/crm/task.gts
+++ b/packages/experiments-realm/crm/task.gts
@@ -6,7 +6,7 @@ import {
   field,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import {
   FieldContainer,
   Pill,
diff --git a/packages/experiments-realm/crm/urgency-tag.gts b/packages/experiments-realm/crm/urgency-tag.gts
index 8459affb54f..3b939590413 100644
--- a/packages/experiments-realm/crm/urgency-tag.gts
+++ b/packages/experiments-realm/crm/urgency-tag.gts
@@ -4,9 +4,9 @@ import {
   contains,
   StringField,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import ColorField from '@cardstack/base/color';
 
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/packages/experiments-realm/cycling-mileage-log.gts b/packages/experiments-realm/cycling-mileage-log.gts
index a3fc69d0c2d..d2ae4cccd10 100644
--- a/packages/experiments-realm/cycling-mileage-log.gts
+++ b/packages/experiments-realm/cycling-mileage-log.gts
@@ -5,10 +5,10 @@ import {
   FieldDef,
   StringField,
   field,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import { Component } from 'https://cardstack.com/base/card-api';
-import Date from 'https://cardstack.com/base/date';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import { Component } from '@cardstack/base/card-api';
+import Date from '@cardstack/base/date';
 import {
   Chart,
   registerables,
diff --git a/packages/experiments-realm/datetime-test.gts b/packages/experiments-realm/datetime-test.gts
index 517af1e9b7d..80a5760baaf 100644
--- a/packages/experiments-realm/datetime-test.gts
+++ b/packages/experiments-realm/datetime-test.gts
@@ -3,9 +3,9 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import DateTimeField from '@cardstack/base/datetime';
+import StringField from '@cardstack/base/string';
 import { formatDateTime } from '@cardstack/boxel-ui/helpers';
 
 export class DateTimeTest extends CardDef {
diff --git a/packages/experiments-realm/default/5b09feb0-ed5f-4ee5-8836-36cbcb789a72.json b/packages/experiments-realm/default/5b09feb0-ed5f-4ee5-8836-36cbcb789a72.json
index 79e42c402b9..a9a13f3af64 100644
--- a/packages/experiments-realm/default/5b09feb0-ed5f-4ee5-8836-36cbcb789a72.json
+++ b/packages/experiments-realm/default/5b09feb0-ed5f-4ee5-8836-36cbcb789a72.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "default",
-        "module": "https://cardstack.com/base/brand-guide"
+        "module": "@cardstack/base/brand-guide"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/default/bc851156-f2f9-4ad9-8467-c610fde73c0e.json b/packages/experiments-realm/default/bc851156-f2f9-4ad9-8467-c610fde73c0e.json
index eb29618d6d9..a60eed4f8f2 100644
--- a/packages/experiments-realm/default/bc851156-f2f9-4ad9-8467-c610fde73c0e.json
+++ b/packages/experiments-realm/default/bc851156-f2f9-4ad9-8467-c610fde73c0e.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "default",
-        "module": "https://cardstack.com/base/structured-theme"
+        "module": "@cardstack/base/structured-theme"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/default/c9ac9b4a-762b-4e89-ab35-3938286e8bde.json b/packages/experiments-realm/default/c9ac9b4a-762b-4e89-ab35-3938286e8bde.json
index dfae64706bf..53a67dbcc02 100644
--- a/packages/experiments-realm/default/c9ac9b4a-762b-4e89-ab35-3938286e8bde.json
+++ b/packages/experiments-realm/default/c9ac9b4a-762b-4e89-ab35-3938286e8bde.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "default",
-        "module": "https://cardstack.com/base/style-reference"
+        "module": "@cardstack/base/style-reference"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/default/neo-brutalist.json b/packages/experiments-realm/default/neo-brutalist.json
index 82d5a707219..f83d5a1c2a0 100644
--- a/packages/experiments-realm/default/neo-brutalist.json
+++ b/packages/experiments-realm/default/neo-brutalist.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "default",
-        "module": "https://cardstack.com/base/style-reference"
+        "module": "@cardstack/base/style-reference"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/default/playful-illustration.json b/packages/experiments-realm/default/playful-illustration.json
index 1ec6fa0d3ab..16b00a5dc4c 100644
--- a/packages/experiments-realm/default/playful-illustration.json
+++ b/packages/experiments-realm/default/playful-illustration.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "default",
-        "module": "https://cardstack.com/base/style-reference"
+        "module": "@cardstack/base/style-reference"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/default/vintage-luxury.json b/packages/experiments-realm/default/vintage-luxury.json
index 4e03baafd45..cbc8ef2934c 100644
--- a/packages/experiments-realm/default/vintage-luxury.json
+++ b/packages/experiments-realm/default/vintage-luxury.json
@@ -3,7 +3,7 @@
     "meta": {
       "adoptsFrom": {
         "name": "default",
-        "module": "https://cardstack.com/base/style-reference"
+        "module": "@cardstack/base/style-reference"
       }
     },
     "type": "card",
diff --git a/packages/experiments-realm/demo-fields.gts b/packages/experiments-realm/demo-fields.gts
index 2732d32c863..2ad91c444a0 100644
--- a/packages/experiments-realm/demo-fields.gts
+++ b/packages/experiments-realm/demo-fields.gts
@@ -1,14 +1,14 @@
-import EmailField from 'https://cardstack.com/base/email';
-import PercentageField from 'https://cardstack.com/base/percentage';
-import WebsiteField from 'https://cardstack.com/base/website';
-import RealmField from 'https://cardstack.com/base/realm';
-import ColorField from 'https://cardstack.com/base/color';
-import UrlField from 'https://cardstack.com/base/url';
-import PhoneNumberField from 'https://cardstack.com/base/phone-number';
-import AddressField from 'https://cardstack.com/base/address';
-import CountryField from 'https://cardstack.com/base/country';
-import DateRangeField from 'https://cardstack.com/base/date-range-field';
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
+import EmailField from '@cardstack/base/email';
+import PercentageField from '@cardstack/base/percentage';
+import WebsiteField from '@cardstack/base/website';
+import RealmField from '@cardstack/base/realm';
+import ColorField from '@cardstack/base/color';
+import UrlField from '@cardstack/base/url';
+import PhoneNumberField from '@cardstack/base/phone-number';
+import AddressField from '@cardstack/base/address';
+import CountryField from '@cardstack/base/country';
+import DateRangeField from '@cardstack/base/date-range-field';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
 
 export class DemoFields extends CardDef {
   static displayName = 'Demo Fields';
diff --git a/packages/experiments-realm/dnd.gts b/packages/experiments-realm/dnd.gts
index 53dc7f8978b..57649fd7c8d 100644
--- a/packages/experiments-realm/dnd.gts
+++ b/packages/experiments-realm/dnd.gts
@@ -6,11 +6,11 @@ import {
   field,
   CardDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import MarkdownField from '@cardstack/base/markdown';
 import { fn } from '@ember/helper';
 import { on } from '@ember/modifier';
 import Package from '@cardstack/boxel-icons/package';
diff --git a/packages/experiments-realm/embedded-view-driver.gts b/packages/experiments-realm/embedded-view-driver.gts
index 669adc8ff2c..6d832a26ad8 100644
--- a/packages/experiments-realm/embedded-view-driver.gts
+++ b/packages/experiments-realm/embedded-view-driver.gts
@@ -3,7 +3,7 @@ import {
   Component,
   CardDef,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import ViewIcon from '@cardstack/boxel-icons/view';
 
 export class EmbeddedViewDriver extends CardDef {
diff --git a/packages/experiments-realm/employee.gts b/packages/experiments-realm/employee.gts
index c763f373c85..2144e6c3bda 100644
--- a/packages/experiments-realm/employee.gts
+++ b/packages/experiments-realm/employee.gts
@@ -2,8 +2,8 @@ import {
   contains,
   field,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { Person } from './person';
 
 export class Employee extends Person {
diff --git a/packages/experiments-realm/event.gts b/packages/experiments-realm/event.gts
index 81084983dff..55fd3e45c8a 100644
--- a/packages/experiments-realm/event.gts
+++ b/packages/experiments-realm/event.gts
@@ -1,5 +1,5 @@
 import { Person as PersonCard } from './person';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+import DateTimeField from '@cardstack/base/datetime';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 
@@ -10,7 +10,7 @@ import {
   CardDef,
   linksTo,
   StringField,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import TextAreaField from '../base/text-area';
 import { FieldContainer, BoxelSelect } from '@cardstack/boxel-ui/components';
 import CalendarPlus from '@cardstack/boxel-icons/calendar-plus';
diff --git a/packages/experiments-realm/exchange-rate.gts b/packages/experiments-realm/exchange-rate.gts
index 3c0d3d878aa..39e6b7f9cd7 100644
--- a/packages/experiments-realm/exchange-rate.gts
+++ b/packages/experiments-realm/exchange-rate.gts
@@ -3,10 +3,10 @@ import {
   field,
   contains,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { Currency } from './asset';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
 import { MonetaryAmount } from './monetary-amount';
 import ExchangeIcon from '@cardstack/boxel-icons/exchange';
 
diff --git a/packages/experiments-realm/experiments_fields_preview.gts b/packages/experiments-realm/experiments_fields_preview.gts
index 4a748422750..da9fbdf3f4d 100644
--- a/packages/experiments-realm/experiments_fields_preview.gts
+++ b/packages/experiments-realm/experiments_fields_preview.gts
@@ -1,9 +1,9 @@
-import EmailField from 'https://cardstack.com/base/email';
-import PhoneNumberField from 'https://cardstack.com/base/phone-number';
-import UrlField from 'https://cardstack.com/base/url';
-import WebsiteField from 'https://cardstack.com/base/website';
-import AddressField from 'https://cardstack.com/base/address';
-import PercentageField from 'https://cardstack.com/base/percentage';
+import EmailField from '@cardstack/base/email';
+import PhoneNumberField from '@cardstack/base/phone-number';
+import UrlField from '@cardstack/base/url';
+import WebsiteField from '@cardstack/base/website';
+import AddressField from '@cardstack/base/address';
+import PercentageField from '@cardstack/base/percentage';
 
 import { FeaturedImageField } from './fields/featured-image';
 import { ContactLinkField } from './fields/contact-link';
@@ -17,8 +17,8 @@ import {
   containsMany,
   type BaseDefConstructor,
   type Field,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { FieldContainer } from '@cardstack/boxel-ui/components';
 import { eq } from '@cardstack/boxel-ui/helpers';
 import { getField } from '@cardstack/runtime-common';
diff --git a/packages/experiments-realm/fields/amount-with-currency.gts b/packages/experiments-realm/fields/amount-with-currency.gts
index 68966cbefae..1c4a5166311 100644
--- a/packages/experiments-realm/fields/amount-with-currency.gts
+++ b/packages/experiments-realm/fields/amount-with-currency.gts
@@ -1,6 +1,6 @@
-import NumberField from 'https://cardstack.com/base/number';
-import { FieldDef, field, contains } from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+import NumberField from '@cardstack/base/number';
+import { FieldDef, field, contains } from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { CurrencyField } from './currency';
 import { action } from '@ember/object';
 import { BoxelInputGroup } from '@cardstack/boxel-ui/components';
diff --git a/packages/experiments-realm/fields/contact-link.gts b/packages/experiments-realm/fields/contact-link.gts
index 4a2c16b07c4..d47c848f612 100644
--- a/packages/experiments-realm/fields/contact-link.gts
+++ b/packages/experiments-realm/fields/contact-link.gts
@@ -4,8 +4,8 @@ import {
   contains,
   StringField,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import UrlField from '@cardstack/base/url';
 
 import {
   BoxelSelect,
diff --git a/packages/experiments-realm/fields/currency.gts b/packages/experiments-realm/fields/currency.gts
index 341aaa3ac3f..34e71a4c265 100644
--- a/packages/experiments-realm/fields/currency.gts
+++ b/packages/experiments-realm/fields/currency.gts
@@ -4,8 +4,8 @@ import {
   Component,
   CardDef,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import CurrencyDollarIcon from '@cardstack/boxel-icons/currency-dollar';
 import { BoxelSelect } from '@cardstack/boxel-ui/components';
 import { tracked } from '@glimmer/tracking';
diff --git a/packages/experiments-realm/fields/featured-image.gts b/packages/experiments-realm/fields/featured-image.gts
index 14f8eb57e93..af2b1ae143a 100644
--- a/packages/experiments-realm/fields/featured-image.gts
+++ b/packages/experiments-realm/fields/featured-image.gts
@@ -6,10 +6,10 @@ import {
   contains,
   StringField,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import { ImageSizeField } from 'https://cardstack.com/base/base64-image';
-import UrlField from 'https://cardstack.com/base/url';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import { ImageSizeField } from '@cardstack/base/base64-image';
+import UrlField from '@cardstack/base/url';
 import { FieldContainer } from '@cardstack/boxel-ui/components';
 import { FailureBordered } from '@cardstack/boxel-ui/icons';
 import PhotoIcon from '@cardstack/boxel-icons/photo';
diff --git a/packages/experiments-realm/file-links-example.gts b/packages/experiments-realm/file-links-example.gts
index 6a20796ebf6..ce8e07d6bc1 100644
--- a/packages/experiments-realm/file-links-example.gts
+++ b/packages/experiments-realm/file-links-example.gts
@@ -6,9 +6,9 @@ import {
   field,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { gt } from '@cardstack/boxel-ui/helpers';
-import { FileDef } from 'https://cardstack.com/base/file-api';
+import { FileDef } from '@cardstack/base/file-api';
 
 /**
  * Example card demonstrating the use of FileDef with linksTo and linksToMany.
diff --git a/packages/experiments-realm/file-search-playground.gts b/packages/experiments-realm/file-search-playground.gts
index 1f69ec29911..a7a41b83e21 100644
--- a/packages/experiments-realm/file-search-playground.gts
+++ b/packages/experiments-realm/file-search-playground.gts
@@ -4,24 +4,24 @@ import {
   linksToMany,
   CardDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
-import enumField from 'https://cardstack.com/base/enum';
-import { FileDef } from 'https://cardstack.com/base/file-api';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
+import enumField from '@cardstack/base/enum';
+import { FileDef } from '@cardstack/base/file-api';
 
 const fileSearchQuery = {
   filter: {
     every: [
       {
         type: {
-          module: 'https://cardstack.com/base/file-api',
+          module: '@cardstack/base/file-api',
           name: 'FileDef',
         },
       },
       {
         on: {
-          module: 'https://cardstack.com/base/file-api',
+          module: '@cardstack/base/file-api',
           name: 'FileDef',
         },
         contains: {
diff --git a/packages/experiments-realm/friend.gts b/packages/experiments-realm/friend.gts
index 1633bbb1263..caec8e64a81 100644
--- a/packages/experiments-realm/friend.gts
+++ b/packages/experiments-realm/friend.gts
@@ -4,9 +4,9 @@ import {
   field,
   CardDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
 import { GridContainer } from '@cardstack/boxel-ui/components';
 import UserPlus from '@cardstack/boxel-icons/user-plus';
 
diff --git a/packages/experiments-realm/friends.gts b/packages/experiments-realm/friends.gts
index b43b5b3945c..84aba80d440 100644
--- a/packages/experiments-realm/friends.gts
+++ b/packages/experiments-realm/friends.gts
@@ -4,8 +4,8 @@ import {
   field,
   CardDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { Friend } from './friend';
 import { GridContainer } from '@cardstack/boxel-ui/components';
 import UsersIcon from '@cardstack/boxel-icons/users';
diff --git a/packages/experiments-realm/garden-app.gts b/packages/experiments-realm/garden-app.gts
index 75273a2888a..3e20b8318b7 100644
--- a/packages/experiments-realm/garden-app.gts
+++ b/packages/experiments-realm/garden-app.gts
@@ -1,6 +1,6 @@
 // @ts-expect-error: Module '/catalog/app-card' may not be available during compilation
 import { AppCard } from '/experiments/app-card';
-// import { Component } from 'https://cardstack.com/base/card-api';
+// import { Component } from '@cardstack/base/card-api';
 import FlowerIcon from '@cardstack/boxel-icons/flower';
 
 export class GardenAppCard extends AppCard {
diff --git a/packages/experiments-realm/garden-design.gts b/packages/experiments-realm/garden-design.gts
index d7b2068e194..236e420b759 100644
--- a/packages/experiments-realm/garden-design.gts
+++ b/packages/experiments-realm/garden-design.gts
@@ -1,15 +1,15 @@
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
 import {
   CardDef,
   field,
   contains,
   realmURL,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
-import CoordinateField from 'https://cardstack.com/base/coordinate';
-import PositionedCardField from 'https://cardstack.com/base/positioned-card';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
+import CoordinateField from '@cardstack/base/coordinate';
+import PositionedCardField from '@cardstack/base/positioned-card';
 import { on } from '@ember/modifier';
 import { action } from '@ember/object';
 import type Owner from '@ember/owner';
diff --git a/packages/experiments-realm/google-image-search.gts b/packages/experiments-realm/google-image-search.gts
index 4957306633a..fb76c2d0f83 100644
--- a/packages/experiments-realm/google-image-search.gts
+++ b/packages/experiments-realm/google-image-search.gts
@@ -3,14 +3,14 @@ import {
   Component,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
-import { commandData } from 'https://cardstack.com/base/resources/command-data';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
+import { commandData } from '@cardstack/base/resources/command-data';
 import {
   SearchGoogleImagesInput,
   SearchGoogleImagesResult,
-} from 'https://cardstack.com/base/command';
+} from '@cardstack/base/command';
 import SearchGoogleImagesCommand from '@cardstack/boxel-host/commands/search-google-images';
 import { Button, FieldContainer } from '@cardstack/boxel-ui/components';
 import { IconSearchThick } from '@cardstack/boxel-ui/icons';
diff --git a/packages/experiments-realm/ikea-product.gts b/packages/experiments-realm/ikea-product.gts
index 9f96c470618..eab6fded6b0 100644
--- a/packages/experiments-realm/ikea-product.gts
+++ b/packages/experiments-realm/ikea-product.gts
@@ -3,11 +3,11 @@ import {
   Component,
   field,
   contains
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import type BrandGuide from 'https://cardstack.com/base/brand-guide';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import MarkdownField from '@cardstack/base/markdown';
+import type BrandGuide from '@cardstack/base/brand-guide';
 import { formatCurrency } from '@cardstack/boxel-ui/helpers';
 
 export class IkeaProduct extends CardDef {
diff --git a/packages/experiments-realm/image-def-playground.gts b/packages/experiments-realm/image-def-playground.gts
index 9f5925fe674..c02496fe272 100644
--- a/packages/experiments-realm/image-def-playground.gts
+++ b/packages/experiments-realm/image-def-playground.gts
@@ -6,9 +6,9 @@ import {
   field,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { gt } from '@cardstack/boxel-ui/helpers';
-import { ImageDef } from 'https://cardstack.com/base/image-file-def';
+import { ImageDef } from '@cardstack/base/image-file-def';
 
 /**
  * Playground card for demonstrating ImageDef capabilities.
diff --git a/packages/experiments-realm/image-upload-tester.gts b/packages/experiments-realm/image-upload-tester.gts
index 344f88061f7..188e0f40b18 100644
--- a/packages/experiments-realm/image-upload-tester.gts
+++ b/packages/experiments-realm/image-upload-tester.gts
@@ -3,9 +3,9 @@ import {
   Component,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
-import UrlField from 'https://cardstack.com/base/url';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import UrlField from '@cardstack/base/url';
+import StringField from '@cardstack/base/string';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { on } from '@ember/modifier';
@@ -13,7 +13,7 @@ import { fn } from '@ember/helper';
 import { not } from '@cardstack/boxel-ui/helpers';
 import UploadImageCommand from '@cardstack/catalog/commands/upload-image';
 import { Button, FieldContainer } from '@cardstack/boxel-ui/components';
-import RealmField from 'https://cardstack.com/base/realm';
+import RealmField from '@cardstack/base/realm';
 
 class ImageUploadTesterIsolated extends Component<typeof ImageUploadTester> {
   @tracked isUploading = false;
diff --git a/packages/experiments-realm/in-this-file.gts b/packages/experiments-realm/in-this-file.gts
index 3dc9a3a3fac..10cf39ba349 100644
--- a/packages/experiments-realm/in-this-file.gts
+++ b/packages/experiments-realm/in-this-file.gts
@@ -3,8 +3,8 @@ import {
   field,
   CardDef,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export const exportedVar = 'exported var';
 
diff --git a/packages/experiments-realm/index.json b/packages/experiments-realm/index.json
index b1ab639953c..ca17f6167ba 100644
--- a/packages/experiments-realm/index.json
+++ b/packages/experiments-realm/index.json
@@ -3,7 +3,7 @@
     "type": "card",
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/cards-grid",
+        "module": "@cardstack/base/cards-grid",
         "name": "CardsGrid"
       }
     }
diff --git a/packages/experiments-realm/kanban-resource.gts b/packages/experiments-realm/kanban-resource.gts
index 25646461c66..da93d02c8e0 100644
--- a/packages/experiments-realm/kanban-resource.gts
+++ b/packages/experiments-realm/kanban-resource.gts
@@ -1,6 +1,6 @@
 import { tracked } from '@glimmer/tracking';
 import { DndColumn } from '@cardstack/boxel-ui/components';
-import { CardDef } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
 
 import { Resource } from 'ember-modify-based-class-resource';
 
diff --git a/packages/experiments-realm/leaflet-gtfs.gts b/packages/experiments-realm/leaflet-gtfs.gts
index f838f4091e0..dca2dd1b2bb 100644
--- a/packages/experiments-realm/leaflet-gtfs.gts
+++ b/packages/experiments-realm/leaflet-gtfs.gts
@@ -1,11 +1,11 @@
-import { CardDef } from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
+import { CardDef } from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
 import {
   Component,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import Modifier, { NamedArgs } from 'ember-modifier';
 //@ts-expect-error no types available
 import jszip from 'https://cdn.jsdelivr.net/npm/jszip@3.10.1/+esm';
diff --git a/packages/experiments-realm/leaflet-map.gts b/packages/experiments-realm/leaflet-map.gts
index ac01944dcfd..52d78f0758b 100644
--- a/packages/experiments-realm/leaflet-map.gts
+++ b/packages/experiments-realm/leaflet-map.gts
@@ -1,11 +1,11 @@
-import { CardDef } from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
+import { CardDef } from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
 import {
   Component,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import Modifier, { NamedArgs } from 'ember-modifier';
 import { action } from '@ember/object';
 import MapIcon from '@cardstack/boxel-icons/map';
diff --git a/packages/experiments-realm/llm-model-environment/Environment/3f6cde92-99b2-4bb5-a471-20d907cb682b.json b/packages/experiments-realm/llm-model-environment/Environment/3f6cde92-99b2-4bb5-a471-20d907cb682b.json
index c663a3faa34..7de47fbd4e4 100644
--- a/packages/experiments-realm/llm-model-environment/Environment/3f6cde92-99b2-4bb5-a471-20d907cb682b.json
+++ b/packages/experiments-realm/llm-model-environment/Environment/3f6cde92-99b2-4bb5-a471-20d907cb682b.json
@@ -249,7 +249,7 @@
       },
       "shortcutSettings.3.requiredSkills.0": {
         "links": {
-          "self": "https://cardstack.com/base/Skill/boxel-environment"
+          "self": "@cardstack/base/Skill/boxel-environment"
         }
       }
     },
diff --git a/packages/experiments-realm/llm-model-environment/environment.gts b/packages/experiments-realm/llm-model-environment/environment.gts
index d6ab13bf6c9..315744f3f48 100644
--- a/packages/experiments-realm/llm-model-environment/environment.gts
+++ b/packages/experiments-realm/llm-model-environment/environment.gts
@@ -19,10 +19,10 @@ import {
   containsMany,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import { Skill } from 'https://cardstack.com/base/skill';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import { Skill } from '@cardstack/base/skill';
 import { includes, uniqBy } from 'lodash';
 
 import SettingsIcon from '@cardstack/boxel-icons/settings';
diff --git a/packages/experiments-realm/llm-model-environment/model.gts b/packages/experiments-realm/llm-model-environment/model.gts
index 5a522c249e1..0fcf9e46a8c 100644
--- a/packages/experiments-realm/llm-model-environment/model.gts
+++ b/packages/experiments-realm/llm-model-environment/model.gts
@@ -4,15 +4,15 @@ import {
   field,
   contains,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { eq } from '@cardstack/boxel-ui/helpers';
 import { on } from '@ember/modifier';
-import { Component } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import { action } from '@ember/object';
 
-import BooleanField from 'https://cardstack.com/base/boolean';
+import BooleanField from '@cardstack/base/boolean';
 
 import BrainIcon from '@cardstack/boxel-icons/brain';
 
diff --git a/packages/experiments-realm/local-inherit.gts b/packages/experiments-realm/local-inherit.gts
index ff121443f4e..15ba6d082e1 100644
--- a/packages/experiments-realm/local-inherit.gts
+++ b/packages/experiments-realm/local-inherit.gts
@@ -3,7 +3,7 @@ import {
   field,
   CardDef,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 class GrandParent extends CardDef {
   static displayName = 'local grandparent';
diff --git a/packages/experiments-realm/map.gts b/packages/experiments-realm/map.gts
index 4eba79784af..925b418aeff 100644
--- a/packages/experiments-realm/map.gts
+++ b/packages/experiments-realm/map.gts
@@ -1,12 +1,12 @@
-import NumberField from 'https://cardstack.com/base/number';
+import NumberField from '@cardstack/base/number';
 import {
   CardDef,
   field,
   contains,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-import AddressField from 'https://cardstack.com/base/address';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import AddressField from '@cardstack/base/address';
+import { Component } from '@cardstack/base/card-api';
 import MapIcon from '@cardstack/boxel-icons/map';
 
 function or(value: number | undefined, defaultValue: number) {
diff --git a/packages/experiments-realm/markdown-skill.gts b/packages/experiments-realm/markdown-skill.gts
index f9ed096c59c..69d071fdd67 100644
--- a/packages/experiments-realm/markdown-skill.gts
+++ b/packages/experiments-realm/markdown-skill.gts
@@ -1,8 +1,8 @@
-import { contains, field, linksTo } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import { MarkdownDef } from 'https://cardstack.com/base/markdown-file-def';
-import { Skill } from 'https://cardstack.com/base/skill';
+import { contains, field, linksTo } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown';
+import { MarkdownDef } from '@cardstack/base/markdown-file-def';
+import { Skill } from '@cardstack/base/skill';
 
 export class MarkdownSkill extends Skill {
   static displayName = 'Markdown Skill';
diff --git a/packages/experiments-realm/meeting-minutes-with-contact-info.gts b/packages/experiments-realm/meeting-minutes-with-contact-info.gts
index 63f6b1499e7..dbc7e99012a 100644
--- a/packages/experiments-realm/meeting-minutes-with-contact-info.gts
+++ b/packages/experiments-realm/meeting-minutes-with-contact-info.gts
@@ -3,9 +3,9 @@ import {
   StringField,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
-import EmailField from 'https://cardstack.com/base/email';
-import PhoneNumberField from 'https://cardstack.com/base/phone-number';
+} from '@cardstack/base/card-api';
+import EmailField from '@cardstack/base/email';
+import PhoneNumberField from '@cardstack/base/phone-number';
 export class MeetingMinutesWithContactInfo extends MeetingMinutes {
   static displayName = 'Meeting Minutes';
   @field name = contains(StringField);
diff --git a/packages/experiments-realm/meeting-minutes.gts b/packages/experiments-realm/meeting-minutes.gts
index 5b19060b71e..ab963070f5e 100644
--- a/packages/experiments-realm/meeting-minutes.gts
+++ b/packages/experiments-realm/meeting-minutes.gts
@@ -1,4 +1,4 @@
-import { CardDef } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
 
 export class MeetingMinutes extends CardDef {
   static displayName = 'Meeting Minutes';
diff --git a/packages/experiments-realm/monetary-amount.gts b/packages/experiments-realm/monetary-amount.gts
index 3c7929c6f68..a490c2db9c6 100644
--- a/packages/experiments-realm/monetary-amount.gts
+++ b/packages/experiments-realm/monetary-amount.gts
@@ -1,11 +1,11 @@
-import NumberField from 'https://cardstack.com/base/number';
+import NumberField from '@cardstack/base/number';
 import {
   FieldDef,
   field,
   contains,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { Currency } from './asset';
 import { action } from '@ember/object';
 import { BoxelInputGroup } from '@cardstack/boxel-ui/components';
diff --git a/packages/experiments-realm/nested-query-field-playground.gts b/packages/experiments-realm/nested-query-field-playground.gts
index efe62026247..a5edbbac277 100644
--- a/packages/experiments-realm/nested-query-field-playground.gts
+++ b/packages/experiments-realm/nested-query-field-playground.gts
@@ -6,8 +6,8 @@ import {
   CardDef,
   Component,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import { Friend } from './friend';
 
diff --git a/packages/experiments-realm/person.gts b/packages/experiments-realm/person.gts
index ca90fadf973..1af86619a82 100644
--- a/packages/experiments-realm/person.gts
+++ b/packages/experiments-realm/person.gts
@@ -4,10 +4,10 @@ import {
   field,
   Component,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import StringField from 'https://cardstack.com/base/string';
-import AddressField from 'https://cardstack.com/base/address';
+} from '@cardstack/base/card-api';
+import BooleanField from '@cardstack/base/boolean';
+import StringField from '@cardstack/base/string';
+import AddressField from '@cardstack/base/address';
 import { Pet } from './pet';
 import { GridContainer } from '@cardstack/boxel-ui/components';
 import { Trips } from './trips';
diff --git a/packages/experiments-realm/pet-person.gts b/packages/experiments-realm/pet-person.gts
index 06fa63ce7ca..e72ecd8c597 100644
--- a/packages/experiments-realm/pet-person.gts
+++ b/packages/experiments-realm/pet-person.gts
@@ -5,8 +5,8 @@ import {
   field,
   Component,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { Pet } from './pet';
 import { Person } from './person';
 import { GridContainer } from '@cardstack/boxel-ui/components';
diff --git a/packages/experiments-realm/pet.gts b/packages/experiments-realm/pet.gts
index 5bb093eebd2..26b4acf89df 100644
--- a/packages/experiments-realm/pet.gts
+++ b/packages/experiments-realm/pet.gts
@@ -4,10 +4,10 @@ import {
   CardDef,
   Component,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import BooleanField from '@cardstack/base/boolean';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
 import { GridContainer } from '@cardstack/boxel-ui/components';
 import PawPrintIcon from '@cardstack/boxel-icons/paw-print';
 
diff --git a/packages/experiments-realm/pets.gts b/packages/experiments-realm/pets.gts
index 4c96aee85f5..fcf4fd84a54 100644
--- a/packages/experiments-realm/pets.gts
+++ b/packages/experiments-realm/pets.gts
@@ -5,8 +5,8 @@ import {
   field,
   contains,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
-import enumField, { enumConfig } from 'https://cardstack.com/base/enum';
+} from '@cardstack/base/card-api';
+import enumField, { enumConfig } from '@cardstack/base/enum';
 import CatIcon from '@cardstack/boxel-icons/cat';
 import DogIcon from '@cardstack/boxel-icons/dog';
 import BirdIcon from '@cardstack/boxel-icons/bird';
diff --git a/packages/experiments-realm/pickup-games-scheduler.gts b/packages/experiments-realm/pickup-games-scheduler.gts
index a7cfbc0fec8..2b70bc1fca5 100644
--- a/packages/experiments-realm/pickup-games-scheduler.gts
+++ b/packages/experiments-realm/pickup-games-scheduler.gts
@@ -4,11 +4,11 @@ import {
   field,
   linksToMany,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateTimeField from '@cardstack/base/datetime';
 import { format as formatDate } from 'date-fns';
 import CalendarClockIcon from '@cardstack/boxel-icons/calendar-clock';
 
diff --git a/packages/experiments-realm/plant-info.gts b/packages/experiments-realm/plant-info.gts
index 4da168138f5..eda681f97be 100644
--- a/packages/experiments-realm/plant-info.gts
+++ b/packages/experiments-realm/plant-info.gts
@@ -5,8 +5,8 @@ import {
   containsMany,
   StringField,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 
 import { BoxelDropdown, Menu, Button } from '@cardstack/boxel-ui/components';
 import { menuItemFunc } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/experiments-realm/polymorphic-field.gts b/packages/experiments-realm/polymorphic-field.gts
index e570169aa7a..a0691f6d61f 100644
--- a/packages/experiments-realm/polymorphic-field.gts
+++ b/packages/experiments-realm/polymorphic-field.gts
@@ -6,7 +6,7 @@ import {
   StringField,
   FieldDef,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { on } from '@ember/modifier';
 
 export class TestField extends FieldDef {
diff --git a/packages/experiments-realm/post.gts b/packages/experiments-realm/post.gts
index c6d3115192c..c06d1d1d6a6 100644
--- a/packages/experiments-realm/post.gts
+++ b/packages/experiments-realm/post.gts
@@ -5,9 +5,9 @@ import {
   Component,
   CardDef,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import TextAreaField from 'https://cardstack.com/base/text-area';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import TextAreaField from '@cardstack/base/text-area';
 import { Person } from './person';
 import FileTextIcon from '@cardstack/boxel-icons/file-text';
 
diff --git a/packages/experiments-realm/product-catalog.gts b/packages/experiments-realm/product-catalog.gts
index 3f0e1b8d9f2..7fbf726b29f 100644
--- a/packages/experiments-realm/product-catalog.gts
+++ b/packages/experiments-realm/product-catalog.gts
@@ -4,7 +4,7 @@ import {
   Component,
   field,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { IkeaProduct } from './ikea-product';
 import { on } from '@ember/modifier';
 import { fn } from '@ember/helper';
diff --git a/packages/experiments-realm/product.gts b/packages/experiments-realm/product.gts
index 0d6d884d7fc..ed96e126817 100644
--- a/packages/experiments-realm/product.gts
+++ b/packages/experiments-realm/product.gts
@@ -1,6 +1,6 @@
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import NumberField from 'https://cardstack.com/base/number';
+import MarkdownField from '@cardstack/base/markdown';
+import BooleanField from '@cardstack/base/boolean';
+import NumberField from '@cardstack/base/number';
 import { Seller as SellerCard } from './seller';
 import {
   MonetaryAmount as MonetaryAmountField,
@@ -14,8 +14,8 @@ import {
   containsMany,
   StringField,
   FieldsTypeFor,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import GlimmerComponent from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/packages/experiments-realm/puppy-card.gts b/packages/experiments-realm/puppy-card.gts
index 8a180f40c6e..8287e0223b9 100644
--- a/packages/experiments-realm/puppy-card.gts
+++ b/packages/experiments-realm/puppy-card.gts
@@ -1,11 +1,11 @@
-import Base64ImageField from 'https://cardstack.com/base/base64-image';
-import StringField from 'https://cardstack.com/base/string';
+import Base64ImageField from '@cardstack/base/base64-image';
+import StringField from '@cardstack/base/string';
 import {
   MaybeBase64Field,
   CardDef,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import DogIcon from '@cardstack/boxel-icons/dog';
 
 export class PuppyCard extends CardDef {
diff --git a/packages/experiments-realm/query-field-playground.gts b/packages/experiments-realm/query-field-playground.gts
index b99e8d1e34c..907dd9fedf8 100644
--- a/packages/experiments-realm/query-field-playground.gts
+++ b/packages/experiments-realm/query-field-playground.gts
@@ -5,10 +5,10 @@ import {
   linksToMany,
   CardDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
-import enumField from 'https://cardstack.com/base/enum';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
+import enumField from '@cardstack/base/enum';
 
 import { Friend } from './friend';
 
diff --git a/packages/experiments-realm/ratings-summary.gts b/packages/experiments-realm/ratings-summary.gts
index 27cae9be6f9..606851efbe3 100644
--- a/packages/experiments-realm/ratings-summary.gts
+++ b/packages/experiments-realm/ratings-summary.gts
@@ -8,9 +8,9 @@ import {
   field,
   Component,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import BooleanField from '@cardstack/base/boolean';
+import NumberField from '@cardstack/base/number';
 
 import { cn, eq } from '@cardstack/boxel-ui/helpers';
 import { Star, StarHalfFill, StarFilled } from '@cardstack/boxel-ui/icons';
diff --git a/packages/experiments-realm/re-export.gts b/packages/experiments-realm/re-export.gts
index 506313dab41..c57062115af 100644
--- a/packages/experiments-realm/re-export.gts
+++ b/packages/experiments-realm/re-export.gts
@@ -3,9 +3,9 @@ import {
   FieldDef,
   BaseDef as BDef,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 
 export const exportedVar = 'exported var';
 
@@ -19,4 +19,4 @@ export default NumberField;
 
 export { Person as Human } from './person';
 
-export { default as Date } from 'https://cardstack.com/base/date';
+export { default as Date } from '@cardstack/base/date';
diff --git a/packages/experiments-realm/review.gts b/packages/experiments-realm/review.gts
index 4e1c0cc98ef..b2065cded2d 100644
--- a/packages/experiments-realm/review.gts
+++ b/packages/experiments-realm/review.gts
@@ -2,7 +2,7 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { setBackgroundImage } from './components/layout';
 import { formatDatetime } from './blog-app';
 import { categoryStyle } from './blog-category';
diff --git a/packages/experiments-realm/seller.gts b/packages/experiments-realm/seller.gts
index f8a0afef417..f584f0533d0 100644
--- a/packages/experiments-realm/seller.gts
+++ b/packages/experiments-realm/seller.gts
@@ -1,5 +1,5 @@
-import { CardDef } from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import StoreIcon from '@cardstack/boxel-icons/store';
 
 export class Seller extends CardDef {
diff --git a/packages/experiments-realm/set-llm-example.gts b/packages/experiments-realm/set-llm-example.gts
index 3ca2f435064..5f359aeff0a 100644
--- a/packages/experiments-realm/set-llm-example.gts
+++ b/packages/experiments-realm/set-llm-example.gts
@@ -1,4 +1,4 @@
-import { CardDef, Component } from 'https://cardstack.com/base/card-api';
+import { CardDef, Component } from '@cardstack/base/card-api';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { on } from '@ember/modifier';
diff --git a/packages/experiments-realm/shopping-cart.gts b/packages/experiments-realm/shopping-cart.gts
index a786a315e08..d4aaaf4b2ea 100644
--- a/packages/experiments-realm/shopping-cart.gts
+++ b/packages/experiments-realm/shopping-cart.gts
@@ -1,4 +1,4 @@
-import NumberField from 'https://cardstack.com/base/number';
+import NumberField from '@cardstack/base/number';
 import {
   CardDef,
   FieldDef,
@@ -7,8 +7,8 @@ import {
   containsMany,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { Product as ProductCard } from './product';
 import { MonetaryAmount, MonetaryAmountEmbedded } from './monetary-amount';
 import { Currency } from './asset';
diff --git a/packages/experiments-realm/simple-search-card.gts b/packages/experiments-realm/simple-search-card.gts
index cd3e863a587..f1325c2ba5e 100644
--- a/packages/experiments-realm/simple-search-card.gts
+++ b/packages/experiments-realm/simple-search-card.gts
@@ -4,12 +4,12 @@ import {
   Component,
   CardDef,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-import { commandData } from 'https://cardstack.com/base/resources/command-data';
+} from '@cardstack/base/card-api';
+import { commandData } from '@cardstack/base/resources/command-data';
 import {
   SearchCardsResult,
   SearchCardsByTypeAndTitleInput,
-} from 'https://cardstack.com/base/commands/search-card-result';
+} from '@cardstack/base/commands/search-card-result';
 import { SearchCardsByTypeAndTitleCommand } from '@cardstack/boxel-host/commands/search-cards';
 
 export class SimpleSearchCard extends CardDef {
diff --git a/packages/experiments-realm/sprint-planner.gts b/packages/experiments-realm/sprint-planner.gts
index 33528425936..595f7e2fcf1 100644
--- a/packages/experiments-realm/sprint-planner.gts
+++ b/packages/experiments-realm/sprint-planner.gts
@@ -4,7 +4,7 @@ import {
   Component,
   linksTo,
   realmURL,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { SprintTaskStatusField, Project } from './sprint-task';
 import LayoutKanbanIcon from '@cardstack/boxel-icons/layout-kanban';
 import { TaskPlanner, TaskCard } from './components/base-task-planner';
diff --git a/packages/experiments-realm/sprint-task.gts b/packages/experiments-realm/sprint-task.gts
index ce76b17f260..12a98d4db5f 100644
--- a/packages/experiments-realm/sprint-task.gts
+++ b/packages/experiments-realm/sprint-task.gts
@@ -6,7 +6,7 @@ import {
   field,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import {
   Avatar,
   Pill,
diff --git a/packages/experiments-realm/submission-card/components/card/fitted-template.gts b/packages/experiments-realm/submission-card/components/card/fitted-template.gts
index 6b2aef9da26..f98d11517ee 100644
--- a/packages/experiments-realm/submission-card/components/card/fitted-template.gts
+++ b/packages/experiments-realm/submission-card/components/card/fitted-template.gts
@@ -1,4 +1,4 @@
-import { Component } from 'https://cardstack.com/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 
 import GitBranchIcon from '@cardstack/boxel-icons/git-branch';
 import MessageIcon from '@cardstack/boxel-icons/message';
diff --git a/packages/experiments-realm/submission-card/components/card/isolated-template.gts b/packages/experiments-realm/submission-card/components/card/isolated-template.gts
index 7821edfbecf..e09c437b2ce 100644
--- a/packages/experiments-realm/submission-card/components/card/isolated-template.gts
+++ b/packages/experiments-realm/submission-card/components/card/isolated-template.gts
@@ -1,6 +1,6 @@
 import { on } from '@ember/modifier';
 
-import { Component, realmURL } from 'https://cardstack.com/base/card-api';
+import { Component, realmURL } from '@cardstack/base/card-api';
 import type { Query } from '@cardstack/runtime-common';
 
 import { eq, or } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/experiments-realm/submission-card/components/portal/realm-tabs.gts b/packages/experiments-realm/submission-card/components/portal/realm-tabs.gts
index 777f2906b77..2bfa383d988 100644
--- a/packages/experiments-realm/submission-card/components/portal/realm-tabs.gts
+++ b/packages/experiments-realm/submission-card/components/portal/realm-tabs.gts
@@ -2,7 +2,7 @@ import GlimmerComponent from '@glimmer/component';
 import { on } from '@ember/modifier';
 import { fn } from '@ember/helper';
 
-import type { RealmMetaField } from 'https://cardstack.com/base/command';
+import type { RealmMetaField } from '@cardstack/base/command';
 
 import { eq } from '@cardstack/boxel-ui/helpers';
 import { Pill } from '@cardstack/boxel-ui/components';
diff --git a/packages/experiments-realm/submission-card/submission-card-portal.gts b/packages/experiments-realm/submission-card/submission-card-portal.gts
index 71ada8b9815..c59766d1f59 100644
--- a/packages/experiments-realm/submission-card/submission-card-portal.gts
+++ b/packages/experiments-realm/submission-card/submission-card-portal.gts
@@ -8,14 +8,14 @@ import {
   contains,
   field,
   realmURL,
-} from 'https://cardstack.com/base/card-api';
-import CardList from 'https://cardstack.com/base/components/card-list';
+} from '@cardstack/base/card-api';
+import CardList from '@cardstack/base/components/card-list';
 import type {
   GetAllRealmMetasResult,
   RealmMetaField,
-} from 'https://cardstack.com/base/command';
-import { commandData } from 'https://cardstack.com/base/resources/command-data';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/command';
+import { commandData } from '@cardstack/base/resources/command-data';
+import StringField from '@cardstack/base/string';
 
 import GetAllRealmMetasCommand from '@cardstack/boxel-host/commands/get-all-realm-metas';
 import BotIcon from '@cardstack/boxel-icons/bot';
diff --git a/packages/experiments-realm/submission-card/submission-card.gts b/packages/experiments-realm/submission-card/submission-card.gts
index f019d3f6a8e..ce9c17ff988 100644
--- a/packages/experiments-realm/submission-card/submission-card.gts
+++ b/packages/experiments-realm/submission-card/submission-card.gts
@@ -6,8 +6,8 @@ import {
   containsMany,
   field,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import BotIcon from '@cardstack/boxel-icons/bot';
 import FileCodeIcon from '@cardstack/boxel-icons/file-code';
diff --git a/packages/experiments-realm/tag.gts b/packages/experiments-realm/tag.gts
index 8577cd7672d..0d0c8683f5f 100644
--- a/packages/experiments-realm/tag.gts
+++ b/packages/experiments-realm/tag.gts
@@ -1,5 +1,5 @@
-import { Component } from 'https://cardstack.com/base/card-api';
-import TagCard from 'https://cardstack.com/base/tag';
+import { Component } from '@cardstack/base/card-api';
+import TagCard from '@cardstack/base/tag';
 
 import { BoxelTag } from '@cardstack/boxel-ui/components';
 import { getContrastColor } from '@cardstack/boxel-ui/helpers';
diff --git a/packages/experiments-realm/task.gts b/packages/experiments-realm/task.gts
index 21d5c4802e7..7bef529925c 100644
--- a/packages/experiments-realm/task.gts
+++ b/packages/experiments-realm/task.gts
@@ -6,11 +6,11 @@ import {
   linksToMany,
   Component,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateRangeField from 'https://cardstack.com/base/date-range-field';
-import ColorField from 'https://cardstack.com/base/color';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import DateRangeField from '@cardstack/base/date-range-field';
+import ColorField from '@cardstack/base/color';
 
 import { Tag } from './tag';
 import { User } from './user';
diff --git a/packages/experiments-realm/todo.gts b/packages/experiments-realm/todo.gts
index 5b570763135..50db4865c96 100644
--- a/packages/experiments-realm/todo.gts
+++ b/packages/experiments-realm/todo.gts
@@ -3,8 +3,8 @@ import {
   field,
   contains,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import MarkdownField from '@cardstack/base/markdown';
 
 export class Todo extends CardDef {
   static displayName = 'Todo';
diff --git a/packages/experiments-realm/transaction.gts b/packages/experiments-realm/transaction.gts
index 440337e46bf..384e22cff21 100644
--- a/packages/experiments-realm/transaction.gts
+++ b/packages/experiments-realm/transaction.gts
@@ -4,15 +4,15 @@ import {
   Component,
   CardDef,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import BooleanField from '@cardstack/base/boolean';
+import StringField from '@cardstack/base/string';
 import { FieldContainer } from '@cardstack/boxel-ui/components';
 import { GridContainer } from '@cardstack/boxel-ui/components';
-import BigIntegerField from 'https://cardstack.com/base/big-integer';
-import NumberField from 'https://cardstack.com/base/number';
+import BigIntegerField from '@cardstack/base/big-integer';
+import NumberField from '@cardstack/base/number';
 import { Chain } from './chain';
-import EthereumAddressField from 'https://cardstack.com/base/ethereum-address';
+import EthereumAddressField from '@cardstack/base/ethereum-address';
 import ShieldCheckIcon from '@cardstack/boxel-icons/shield-check';
 
 export class Transaction extends CardDef {
diff --git a/packages/experiments-realm/trip-info.gts b/packages/experiments-realm/trip-info.gts
index 9574febaff7..420b3fe6ac5 100644
--- a/packages/experiments-realm/trip-info.gts
+++ b/packages/experiments-realm/trip-info.gts
@@ -1,5 +1,5 @@
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import {
   CardDef,
   FieldDef,
@@ -7,8 +7,8 @@ import {
   field,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 import { CardContainer, FieldContainer } from '@cardstack/boxel-ui/components';
 import { Country } from './country';
 import MapPinIcon from '@cardstack/boxel-icons/map-pin';
diff --git a/packages/experiments-realm/trips.gts b/packages/experiments-realm/trips.gts
index 36278fa987c..4601a53b8ad 100644
--- a/packages/experiments-realm/trips.gts
+++ b/packages/experiments-realm/trips.gts
@@ -3,7 +3,7 @@ import {
   field,
   Component,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { Country } from './country';
 
 export class Trips extends FieldDef {
diff --git a/packages/experiments-realm/tsconfig.json b/packages/experiments-realm/tsconfig.json
index 64b185a4dfd..4f5749bd040 100644
--- a/packages/experiments-realm/tsconfig.json
+++ b/packages/experiments-realm/tsconfig.json
@@ -22,7 +22,7 @@
     "strict": true,
     "experimentalDecorators": true,
     "paths": {
-      "https://cardstack.com/base/*": [
+      "@cardstack/base/*": [
         "../base/*"
       ],
       "@cardstack/host/tests/*": [
diff --git a/packages/experiments-realm/update-room-skills-example.gts b/packages/experiments-realm/update-room-skills-example.gts
index dbcb2493296..1c207355057 100644
--- a/packages/experiments-realm/update-room-skills-example.gts
+++ b/packages/experiments-realm/update-room-skills-example.gts
@@ -3,8 +3,8 @@ import {
   Component,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { action } from '@ember/object';
 import { fn } from '@ember/helper';
 import { on } from '@ember/modifier';
diff --git a/packages/experiments-realm/user.gts b/packages/experiments-realm/user.gts
index cb407b4f1f6..4c59d652ee8 100644
--- a/packages/experiments-realm/user.gts
+++ b/packages/experiments-realm/user.gts
@@ -3,8 +3,8 @@ import {
   StringField,
   contains,
   field,
-} from 'https://cardstack.com/base/card-api';
-import EmailField from 'https://cardstack.com/base/email';
+} from '@cardstack/base/card-api';
+import EmailField from '@cardstack/base/email';
 
 export class User extends CardDef {
   static displayName = 'User';
diff --git a/packages/host/app/commands/add-field-to-card-definition.ts b/packages/host/app/commands/add-field-to-card-definition.ts
index 80b431f9b21..11985d8d3a1 100644
--- a/packages/host/app/commands/add-field-to-card-definition.ts
+++ b/packages/host/app/commands/add-field-to-card-definition.ts
@@ -2,14 +2,13 @@ import { service } from '@ember/service';
 
 import { ModuleSyntax } from '@cardstack/runtime-common/module-syntax';
 
-import type { FieldType } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import WriteTextFileCommand from './write-text-file';
 
 import type CardService from '../services/card-service';
+import type { FieldType } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class AddFieldToCardDefinitionCommand extends HostBaseCommand<
   typeof BaseCommandModule.AddFieldToCardDefinitionInput
diff --git a/packages/host/app/commands/ai-assistant.ts b/packages/host/app/commands/ai-assistant.ts
index 877b218e565..336b18ea2f1 100644
--- a/packages/host/app/commands/ai-assistant.ts
+++ b/packages/host/app/commands/ai-assistant.ts
@@ -2,11 +2,6 @@ import { service } from '@ember/service';
 
 import { isCardInstance } from '@cardstack/runtime-common';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
-import type { Skill } from 'https://cardstack.com/base/skill';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import CreateAiAssistantRoomCommand from './create-ai-assistant-room';
@@ -19,6 +14,9 @@ import UpdateRoomSkillsCommand from './update-room-skills';
 import type MatrixService from '../services/matrix-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type StoreService from '../services/store';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { Skill } from '@cardstack/base/skill';
 
 export default class UseAiAssistantCommand extends HostBaseCommand<
   typeof BaseCommandModule.UseAiAssistantInput,
@@ -41,7 +39,7 @@ export default class UseAiAssistantCommand extends HostBaseCommand<
   async loadCardAPI() {
     if (!this.#cardAPI) {
       this.#cardAPI = await this.loaderService.loader.import<typeof CardAPI>(
-        'https://cardstack.com/base/card-api',
+        '@cardstack/base/card-api',
       );
     }
     return this.#cardAPI;
diff --git a/packages/host/app/commands/apply-markdown-edit.ts b/packages/host/app/commands/apply-markdown-edit.ts
index b1b8a76dab4..978738fca5e 100644
--- a/packages/host/app/commands/apply-markdown-edit.ts
+++ b/packages/host/app/commands/apply-markdown-edit.ts
@@ -1,5 +1,3 @@
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import { FieldPathParser } from '../lib/field-path-parser';
 import HostBaseCommand from '../lib/host-base-command';
 
@@ -7,6 +5,8 @@ import GetCardCommand from './get-card';
 import PatchFieldsCommand from './patch-fields';
 import SendRequestViaProxyCommand from './send-request-via-proxy';
 
+import type * as BaseCommandModule from '@cardstack/base/command';
+
 const escapeForTag = (value: string) =>
   value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 
diff --git a/packages/host/app/commands/apply-search-replace-block.ts b/packages/host/app/commands/apply-search-replace-block.ts
index 3ee48ce8375..a2e17afad17 100644
--- a/packages/host/app/commands/apply-search-replace-block.ts
+++ b/packages/host/app/commands/apply-search-replace-block.ts
@@ -4,10 +4,10 @@ import {
   SEPARATOR_MARKER,
 } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
+import type * as BaseCommandModule from '@cardstack/base/command';
+
 let standardErrorMessage =
   'Unable to process the code patch due to invalid code coming from AI';
 export const APPLY_SEARCH_REPLACE_BLOCK_ERROR_MESSAGES = {
diff --git a/packages/host/app/commands/ask-ai.ts b/packages/host/app/commands/ask-ai.ts
index b87f44b5f74..d78486baad7 100644
--- a/packages/host/app/commands/ask-ai.ts
+++ b/packages/host/app/commands/ask-ai.ts
@@ -1,7 +1,5 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import CreateAiAssistantRoomCommand from './create-ai-assistant-room';
@@ -10,6 +8,7 @@ import SendAiAssistantMessageCommand from './send-ai-assistant-message';
 
 import type MatrixService from '../services/matrix-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class AskAiCommand extends HostBaseCommand<
   typeof BaseCommandModule.AskAiInput,
diff --git a/packages/host/app/commands/bot-requests/create-listing-pr-request.ts b/packages/host/app/commands/bot-requests/create-listing-pr-request.ts
index 7cbe61e8dba..f37ef928aab 100644
--- a/packages/host/app/commands/bot-requests/create-listing-pr-request.ts
+++ b/packages/host/app/commands/bot-requests/create-listing-pr-request.ts
@@ -2,8 +2,6 @@ import { service } from '@ember/service';
 
 import { isCardInstance } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../../lib/host-base-command';
 
 import UseAiAssistantCommand from '../ai-assistant';
@@ -12,6 +10,7 @@ import SendBotTriggerEventCommand from './send-bot-trigger-event';
 
 import type MatrixService from '../../services/matrix-service';
 import type StoreService from '../../services/store';
+import type * as BaseCommandModule from '@cardstack/base/command';
 import type { Listing } from '@cardstack/catalog/catalog-app/listing/listing';
 
 export default class CreateListingPRRequestCommand extends HostBaseCommand<
diff --git a/packages/host/app/commands/bot-requests/send-bot-trigger-event.ts b/packages/host/app/commands/bot-requests/send-bot-trigger-event.ts
index 213befd6bb8..534ae10560f 100644
--- a/packages/host/app/commands/bot-requests/send-bot-trigger-event.ts
+++ b/packages/host/app/commands/bot-requests/send-bot-trigger-event.ts
@@ -2,12 +2,11 @@ import { service } from '@ember/service';
 
 import { isBotTriggerEvent } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-import type { BotTriggerEvent } from 'https://cardstack.com/base/matrix-event';
-
 import HostBaseCommand from '../../lib/host-base-command';
 
 import type MatrixService from '../../services/matrix-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { BotTriggerEvent } from '@cardstack/base/matrix-event';
 
 export default class SendBotTriggerEventCommand extends HostBaseCommand<
   typeof BaseCommandModule.SendBotTriggerEventInput
diff --git a/packages/host/app/commands/cancel-indexing-job.ts b/packages/host/app/commands/cancel-indexing-job.ts
index 282cc4ddb0a..41924b4b555 100644
--- a/packages/host/app/commands/cancel-indexing-job.ts
+++ b/packages/host/app/commands/cancel-indexing-job.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type RealmService from '../services/realm';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class CancelIndexingJobCommand extends HostBaseCommand<
   typeof BaseCommandModule.RealmUrlCard,
diff --git a/packages/host/app/commands/check-correctness.ts b/packages/host/app/commands/check-correctness.ts
index 4d4f644c85e..6de9e776b84 100644
--- a/packages/host/app/commands/check-correctness.ts
+++ b/packages/host/app/commands/check-correctness.ts
@@ -4,12 +4,11 @@ import {
   isCardDocumentString,
   isCardErrorJSONAPI,
   type CardErrorJSONAPI,
+  cardIdToURL,
 } from '@cardstack/runtime-common';
 
 import ENV from '@cardstack/host/config/environment';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type CardService from '../services/card-service';
@@ -17,6 +16,7 @@ import type CommandService from '../services/command-service';
 import type RealmService from '../services/realm';
 import type RealmServerService from '../services/realm-server';
 import type StoreService from '../services/store';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 const cardIndexingTimeout = ENV.cardRenderTimeout;
 
@@ -192,14 +192,14 @@ export default class CheckCorrectnessCommand extends HostBaseCommand<
     targetRef: string,
   ): { moduleURL: URL; realmURL: URL; fileURL: URL } | undefined {
     try {
-      let fileURL = new URL(targetRef);
+      let fileURL = cardIdToURL(targetRef);
       let realmURL = this.realm.realmOfURL(fileURL);
       if (!realmURL) {
         return undefined;
       }
 
       let moduleHref = fileURL.href.replace(/\.gts$/, '');
-      let moduleURL = new URL(moduleHref);
+      let moduleURL = cardIdToURL(moduleHref);
       return { moduleURL, realmURL, fileURL };
     } catch {
       return undefined;
@@ -263,7 +263,7 @@ export default class CheckCorrectnessCommand extends HostBaseCommand<
 
   private async isEmptyFileContent(targetRef: string): Promise<boolean> {
     try {
-      let fileUrl = new URL(targetRef);
+      let fileUrl = cardIdToURL(targetRef);
       let { status, content } = await this.cardService.getSource(fileUrl);
       return status === 200 && content.trim() === '';
     } catch {
diff --git a/packages/host/app/commands/copy-and-edit.ts b/packages/host/app/commands/copy-and-edit.ts
index f01d1068738..5d125cb2cb3 100644
--- a/packages/host/app/commands/copy-and-edit.ts
+++ b/packages/host/app/commands/copy-and-edit.ts
@@ -2,9 +2,6 @@ import { service } from '@ember/service';
 
 import { isCardInstance } from '@cardstack/runtime-common';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import CopyCardToRealmCommand from './copy-card';
@@ -12,6 +9,8 @@ import CopyCardToRealmCommand from './copy-card';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class CopyAndEditCommand extends HostBaseCommand<
   typeof BaseCommandModule.CopyAndEditInput,
@@ -34,7 +33,7 @@ export default class CopyAndEditCommand extends HostBaseCommand<
   private async loadCardAPI() {
     if (!this.#cardAPI) {
       this.#cardAPI = await this.loaderService.loader.import<typeof CardAPI>(
-        'https://cardstack.com/base/card-api',
+        '@cardstack/base/card-api',
       );
     }
     return this.#cardAPI;
diff --git a/packages/host/app/commands/copy-card-to-stack.ts b/packages/host/app/commands/copy-card-to-stack.ts
index 432c096918a..3ea9b269f4a 100644
--- a/packages/host/app/commands/copy-card-to-stack.ts
+++ b/packages/host/app/commands/copy-card-to-stack.ts
@@ -2,8 +2,6 @@ import { service } from '@ember/service';
 
 import { isCardInstance, realmURL } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import CopyCardToRealmCommand from './copy-card';
@@ -12,6 +10,7 @@ import type CardService from '../services/card-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class CopyCardToStackCommand extends HostBaseCommand<
   typeof BaseCommandModule.CopyCardToStackInput,
diff --git a/packages/host/app/commands/copy-card.ts b/packages/host/app/commands/copy-card.ts
index 3e890e10d72..87fc7f789dd 100644
--- a/packages/host/app/commands/copy-card.ts
+++ b/packages/host/app/commands/copy-card.ts
@@ -1,12 +1,11 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type CardService from '../services/card-service';
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class CopyCardToRealmCommand extends HostBaseCommand<
   typeof BaseCommandModule.CopyCardToRealmInput,
diff --git a/packages/host/app/commands/copy-file-to-realm.ts b/packages/host/app/commands/copy-file-to-realm.ts
index b4f8d526257..c4d3561df02 100644
--- a/packages/host/app/commands/copy-file-to-realm.ts
+++ b/packages/host/app/commands/copy-file-to-realm.ts
@@ -1,12 +1,11 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 import { findNonConflictingFilename } from '../utils/file-name';
 
 import type CardService from '../services/card-service';
 import type RealmService from '../services/realm';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class CopyFileToRealmCommand extends HostBaseCommand<
   typeof BaseCommandModule.CopyFileToRealmInput,
diff --git a/packages/host/app/commands/copy-source.ts b/packages/host/app/commands/copy-source.ts
index 0ccb4156dfa..e6c9edf45ba 100644
--- a/packages/host/app/commands/copy-source.ts
+++ b/packages/host/app/commands/copy-source.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type CardService from '../services/card-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class CopySourceCommand extends HostBaseCommand<
   typeof BaseCommandModule.CopySourceInput,
diff --git a/packages/host/app/commands/create-ai-assistant-room.ts b/packages/host/app/commands/create-ai-assistant-room.ts
index aa0faa03eab..b7daf9d9dca 100644
--- a/packages/host/app/commands/create-ai-assistant-room.ts
+++ b/packages/host/app/commands/create-ai-assistant-room.ts
@@ -9,13 +9,12 @@ import {
   DEFAULT_LLM,
 } from '@cardstack/runtime-common/matrix-constants';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type MatrixService from '../services/matrix-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
+
+import type { FileDef } from '@cardstack/base/file-api';
 
 export default class CreateAiAssistantRoomCommand extends HostBaseCommand<
   typeof BaseCommandModule.CreateAIAssistantRoomInput,
diff --git a/packages/host/app/commands/create-and-open-submission-workflow-card.ts b/packages/host/app/commands/create-and-open-submission-workflow-card.ts
index 5bd72a341b2..46c7541de4b 100644
--- a/packages/host/app/commands/create-and-open-submission-workflow-card.ts
+++ b/packages/host/app/commands/create-and-open-submission-workflow-card.ts
@@ -1,4 +1,4 @@
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 import HostBaseCommand from '../lib/host-base-command';
 
diff --git a/packages/host/app/commands/create-specs.ts b/packages/host/app/commands/create-specs.ts
index 05d6568f575..5e89e9c2872 100644
--- a/packages/host/app/commands/create-specs.ts
+++ b/packages/host/app/commands/create-specs.ts
@@ -17,11 +17,6 @@ import {
   isResolvedCodeRef,
 } from '@cardstack/runtime-common/code-ref';
 
-import type { BaseDef, CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-import type { Spec } from 'https://cardstack.com/base/spec';
-import type { SpecType } from 'https://cardstack.com/base/spec';
-
 import HostBaseCommand from '../lib/host-base-command';
 import {
   type CardOrFieldDeclaration,
@@ -36,6 +31,10 @@ import type CardService from '../services/card-service';
 import type ModuleContentsService from '../services/module-contents-service';
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
+import type { BaseDef, CardDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { SpecType } from '@cardstack/base/spec';
+import type { Spec } from '@cardstack/base/spec';
 
 class SpecTypeGuesser {
   constructor(private declaration: ModuleDeclaration) {}
@@ -100,7 +99,7 @@ class SpecTypeGuesser {
     return (
       superModule === '@glimmer/component' ||
       (superName === 'Component' &&
-        superModule === 'https://cardstack.com/base/card-api') ||
+        superModule === '@cardstack/base/card-api') ||
       superName === 'GlimmerComponent' ||
       superName?.includes('Component')
     );
diff --git a/packages/host/app/commands/create-submission-workflow.ts b/packages/host/app/commands/create-submission-workflow.ts
index b49cbd36e17..0e19cd627e0 100644
--- a/packages/host/app/commands/create-submission-workflow.ts
+++ b/packages/host/app/commands/create-submission-workflow.ts
@@ -3,7 +3,7 @@ import { service } from '@ember/service';
 import { isCardInstance } from '@cardstack/runtime-common';
 import type { LooseSingleCardDocument } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 import HostBaseCommand from '../lib/host-base-command';
 
diff --git a/packages/host/app/commands/full-reindex-realm.ts b/packages/host/app/commands/full-reindex-realm.ts
index 80fd76c8e2a..482b91d408c 100644
--- a/packages/host/app/commands/full-reindex-realm.ts
+++ b/packages/host/app/commands/full-reindex-realm.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type RealmService from '../services/realm';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class FullReindexRealmCommand extends HostBaseCommand<
   typeof BaseCommandModule.RealmUrlCard,
diff --git a/packages/host/app/commands/generate-example-cards.ts b/packages/host/app/commands/generate-example-cards.ts
index 6f253d0cae2..b9defe1cd43 100644
--- a/packages/host/app/commands/generate-example-cards.ts
+++ b/packages/host/app/commands/generate-example-cards.ts
@@ -10,9 +10,6 @@ import {
   type ResolvedCodeRef,
 } from '@cardstack/runtime-common/code-ref';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import {
   buildAttachedFileURLs,
   buildExamplePrompt,
@@ -31,6 +28,8 @@ import type CardService from '../services/card-service';
 import type MatrixService from '../services/matrix-service';
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class GenerateExampleCardsCommand extends HostBaseCommand<
   typeof BaseCommandModule.CreateInstancesInput,
diff --git a/packages/host/app/commands/generate-readme-spec.ts b/packages/host/app/commands/generate-readme-spec.ts
index 829d283729f..0cdf6ac9137 100644
--- a/packages/host/app/commands/generate-readme-spec.ts
+++ b/packages/host/app/commands/generate-readme-spec.ts
@@ -1,9 +1,5 @@
 import { service } from '@ember/service';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-import type { SpecType } from 'https://cardstack.com/base/spec';
-
 import HostBaseCommand from '../lib/host-base-command';
 import { devSkillId } from '../lib/utils';
 
@@ -11,6 +7,9 @@ import OneShotLlmRequestCommand from './one-shot-llm-request';
 import PatchCardInstanceCommand from './patch-card-instance';
 
 import type CommandService from '../services/command-service';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { SpecType } from '@cardstack/base/spec';
 
 export default class GenerateReadmeSpecCommand extends HostBaseCommand<
   typeof BaseCommandModule.GenerateReadmeSpecInput,
diff --git a/packages/host/app/commands/generate-theme-example.ts b/packages/host/app/commands/generate-theme-example.ts
index 693c1029f35..58b11394d2b 100644
--- a/packages/host/app/commands/generate-theme-example.ts
+++ b/packages/host/app/commands/generate-theme-example.ts
@@ -1,8 +1,5 @@
 import { service } from '@ember/service';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import {
   buildAttachedFileURLs,
   buildExamplePrompt,
@@ -16,6 +13,8 @@ import OneShotLlmRequestCommand from './one-shot-llm-request';
 
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class GenerateThemeExampleCommand extends HostBaseCommand<
   typeof BaseCommandModule.GenerateThemeExampleInput,
diff --git a/packages/host/app/commands/get-all-realm-metas.ts b/packages/host/app/commands/get-all-realm-metas.ts
index adc0b21efde..d042bc9b015 100644
--- a/packages/host/app/commands/get-all-realm-metas.ts
+++ b/packages/host/app/commands/get-all-realm-metas.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type Realm from '../services/realm';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class GetAllRealmMetasCommand extends HostBaseCommand<
   undefined,
diff --git a/packages/host/app/commands/get-card-type-schema.ts b/packages/host/app/commands/get-card-type-schema.ts
index 54a27a36568..da4670508da 100644
--- a/packages/host/app/commands/get-card-type-schema.ts
+++ b/packages/host/app/commands/get-card-type-schema.ts
@@ -8,8 +8,8 @@ import {
   generateJsonSchemaForCardType,
 } from '@cardstack/runtime-common/helpers/ai';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 import HostBaseCommand from '../lib/host-base-command';
 
diff --git a/packages/host/app/commands/get-card.ts b/packages/host/app/commands/get-card.ts
index 04d89d27dcc..ba9892efbe4 100644
--- a/packages/host/app/commands/get-card.ts
+++ b/packages/host/app/commands/get-card.ts
@@ -1,11 +1,10 @@
 import { service } from '@ember/service';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type StoreService from '../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class GetCardCommand extends HostBaseCommand<
   typeof BaseCommandModule.CardIdCard,
diff --git a/packages/host/app/commands/get-events-from-room.ts b/packages/host/app/commands/get-events-from-room.ts
index 2d2981c0151..07b481d17d2 100644
--- a/packages/host/app/commands/get-events-from-room.ts
+++ b/packages/host/app/commands/get-events-from-room.ts
@@ -1,14 +1,12 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
-import type { MatrixEvent } from 'https://cardstack.com/base/matrix-event';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type { RoomResource } from '../resources/room';
 import type MatrixService from '../services/matrix-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { MatrixEvent } from '@cardstack/base/matrix-event';
 
 export default class GetEventsFromRoomCommand extends HostBaseCommand<
   typeof BaseCommandModule.GetEventsFromRoomInput,
diff --git a/packages/host/app/commands/get-user-system-card.ts b/packages/host/app/commands/get-user-system-card.ts
index 01e4e5ff0fd..97c8fcf7adf 100644
--- a/packages/host/app/commands/get-user-system-card.ts
+++ b/packages/host/app/commands/get-user-system-card.ts
@@ -2,11 +2,10 @@ import { service } from '@ember/service';
 
 import ENV from '@cardstack/host/config/environment';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type MatrixService from '../services/matrix-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 const { defaultSystemCardId } = ENV;
 
diff --git a/packages/host/app/commands/invalidate-realm-urls.ts b/packages/host/app/commands/invalidate-realm-urls.ts
index bbde59f118c..79b1ee0e8dc 100644
--- a/packages/host/app/commands/invalidate-realm-urls.ts
+++ b/packages/host/app/commands/invalidate-realm-urls.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type RealmService from '../services/realm';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class InvalidateRealmUrlsCommand extends HostBaseCommand<
   typeof BaseCommandModule.InvalidateRealmUrlsInput,
diff --git a/packages/host/app/commands/invite-user-to-room.ts b/packages/host/app/commands/invite-user-to-room.ts
index 8804fb894e9..a270916b15d 100644
--- a/packages/host/app/commands/invite-user-to-room.ts
+++ b/packages/host/app/commands/invite-user-to-room.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type MatrixService from '../services/matrix-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class InviteUserToRoomCommand extends HostBaseCommand<
   typeof BaseCommandModule.InviteUserToRoomInput
diff --git a/packages/host/app/commands/lint-and-fix.ts b/packages/host/app/commands/lint-and-fix.ts
index 5f1a422fd04..66be0d1ffe8 100644
--- a/packages/host/app/commands/lint-and-fix.ts
+++ b/packages/host/app/commands/lint-and-fix.ts
@@ -2,12 +2,11 @@ import { service } from '@ember/service';
 
 import { SupportedMimeType } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 import { formatLintIssues } from '../utils/lint-formatting';
 
 import type NetworkService from '../services/network';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class LintAndFixCommand extends HostBaseCommand<
   typeof BaseCommandModule.LintAndFixInput,
diff --git a/packages/host/app/commands/listing-action-build.ts b/packages/host/app/commands/listing-action-build.ts
index bed17b6e9a6..129c7356c97 100644
--- a/packages/host/app/commands/listing-action-build.ts
+++ b/packages/host/app/commands/listing-action-build.ts
@@ -2,8 +2,6 @@ import { service } from '@ember/service';
 
 import { DEFAULT_CODING_LLM } from '@cardstack/runtime-common/matrix-constants';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 import { devSkillId, skillCardURL } from '../lib/utils';
 
@@ -15,6 +13,7 @@ import SwitchSubmodeCommand from './switch-submode';
 import UpdateRoomSkillsCommand from './update-room-skills';
 
 import type StoreService from '../services/store';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 import type { Listing } from '@cardstack/catalog/catalog-app/listing/listing';
 
diff --git a/packages/host/app/commands/listing-action-init.ts b/packages/host/app/commands/listing-action-init.ts
index fb8a6f11433..4c8eb6aee52 100644
--- a/packages/host/app/commands/listing-action-init.ts
+++ b/packages/host/app/commands/listing-action-init.ts
@@ -2,8 +2,6 @@ import { service } from '@ember/service';
 
 import { DEFAULT_REMIX_LLM } from '@cardstack/runtime-common/matrix-constants';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 import { skillCardURL } from '../lib/utils';
 
@@ -15,6 +13,7 @@ import UpdateRoomSkillsCommand from './update-room-skills';
 
 import type RealmServerService from '../services/realm-server';
 import type StoreService from '../services/store';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 import type { Listing } from '@cardstack/catalog/catalog-app/listing/listing';
 
diff --git a/packages/host/app/commands/listing-create.ts b/packages/host/app/commands/listing-create.ts
index d08771639f9..941e4e57346 100644
--- a/packages/host/app/commands/listing-create.ts
+++ b/packages/host/app/commands/listing-create.ts
@@ -11,6 +11,7 @@ import {
   SupportedMimeType,
   isFieldDef,
   isResolvedCodeRef,
+  cardIdToURL,
   trimExecutableExtension,
 } from '@cardstack/runtime-common';
 import {
@@ -19,11 +20,6 @@ import {
   identifyCard,
 } from '@cardstack/runtime-common/code-ref';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
-import type { Spec } from 'https://cardstack.com/base/spec';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import CreateSpecCommand from './create-specs';
@@ -35,11 +31,14 @@ import type NetworkService from '../services/network';
 import type RealmService from '../services/realm';
 import type RealmServerService from '../services/realm-server';
 import type StoreService from '../services/store';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { Spec } from '@cardstack/base/spec';
 
 type ListingType = 'card' | 'skill' | 'theme' | 'field';
 
-const BASE_CARD_API_MODULE = 'https://cardstack.com/base/card-api';
-const BASE_SKILL_MODULE = 'https://cardstack.com/base/skill';
+const BASE_CARD_API_MODULE = '@cardstack/base/card-api';
+const BASE_SKILL_MODULE = '@cardstack/base/skill';
 
 const listingSubClass: Record<ListingType, string> = {
   card: 'CardListing',
@@ -102,7 +101,7 @@ export default class ListingCreateCommand extends HostBaseCommand<
       }
 
       // Only allow modulesToCreate that belong to a realm we can read
-      const url = new URL(dep);
+      const url = cardIdToURL(dep);
       const realmURL = this.realm.realmOfURL(url);
       if (!realmURL) {
         return false;
diff --git a/packages/host/app/commands/listing-generate-example.ts b/packages/host/app/commands/listing-generate-example.ts
index 2e03a13c63d..b03ad4c8dba 100644
--- a/packages/host/app/commands/listing-generate-example.ts
+++ b/packages/host/app/commands/listing-generate-example.ts
@@ -3,14 +3,13 @@ import { service } from '@ember/service';
 import { resolveAdoptsFrom } from '@cardstack/runtime-common/code-ref';
 import { realmURL } from '@cardstack/runtime-common/constants';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import { GenerateExampleCardsOneShotCommand } from './generate-example-cards';
 
 import type RealmService from '../services/realm';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class ListingGenerateExampleCommand extends HostBaseCommand<
   typeof BaseCommandModule.GenerateListingExampleInput,
diff --git a/packages/host/app/commands/listing-install.ts b/packages/host/app/commands/listing-install.ts
index 907421bb5c1..18bf3d1306e 100644
--- a/packages/host/app/commands/listing-install.ts
+++ b/packages/host/app/commands/listing-install.ts
@@ -8,6 +8,7 @@ import type {
 import {
   type ResolvedCodeRef,
   RealmPaths,
+  logger,
   join,
   planModuleInstall,
   planInstanceInstall,
@@ -16,8 +17,8 @@ import {
   isCardInstance,
   isSingleCardDocument,
   type Relationship,
+  cardIdToURL,
 } from '@cardstack/runtime-common';
-import { logger } from '@cardstack/runtime-common';
 import type {
   AtomicOperation,
   AtomicOperationResult,
@@ -25,14 +26,13 @@ import type {
 import type { CopyInstanceMeta } from '@cardstack/runtime-common/catalog';
 import type { CopyModuleMeta } from '@cardstack/runtime-common/catalog';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type CardService from '../services/card-service';
 import type RealmServerService from '../services/realm-server';
 import type StoreService from '../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 import type { Listing } from '@cardstack/catalog/catalog-app/listing/listing';
 
 const log = logger('catalog:install');
@@ -107,7 +107,7 @@ export default class ListingInstallCommand extends HostBaseCommand<
     let sourceOperations = await Promise.all(
       plan.modulesToInstall.map(async (moduleMeta: CopyModuleMeta) => {
         let { sourceModule, targetModule } = moduleMeta;
-        let res = await this.cardService.getSource(new URL(sourceModule));
+        let res = await this.cardService.getSource(cardIdToURL(sourceModule));
         let moduleResource: ModuleResource = {
           type: 'source',
           attributes: { content: res.content },
diff --git a/packages/host/app/commands/listing-remix.ts b/packages/host/app/commands/listing-remix.ts
index c8a15eb9dba..1369b87914a 100644
--- a/packages/host/app/commands/listing-remix.ts
+++ b/packages/host/app/commands/listing-remix.ts
@@ -7,8 +7,6 @@ import {
 } from '@cardstack/runtime-common';
 import { DEFAULT_CODING_LLM } from '@cardstack/runtime-common/matrix-constants';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import { skillCardURL, devSkillId, envSkillId } from '../lib/utils';
@@ -21,6 +19,7 @@ import UpdatePlaygroundSelectionCommand from './update-playground-selection';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type RealmServerService from '../services/realm-server';
+import type * as BaseCommandModule from '@cardstack/base/command';
 import type { Listing } from '@cardstack/catalog/catalog-app/listing/listing';
 
 export default class RemixCommand extends HostBaseCommand<
diff --git a/packages/host/app/commands/listing-update-specs.ts b/packages/host/app/commands/listing-update-specs.ts
index 7e284171a77..f248438baf5 100644
--- a/packages/host/app/commands/listing-update-specs.ts
+++ b/packages/host/app/commands/listing-update-specs.ts
@@ -6,15 +6,14 @@ import { isCardInstance, SupportedMimeType } from '@cardstack/runtime-common';
 
 import { realmURL as realmURLSymbol } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-import type { Spec } from 'https://cardstack.com/base/spec';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import CreateSpecCommand from './create-specs';
 
 import type NetworkService from '../services/network';
 import type RealmService from '../services/realm';
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { Spec } from '@cardstack/base/spec';
 
 export default class ListingUpdateSpecsCommand extends HostBaseCommand<
   typeof BaseCommandModule.ListingUpdateSpecsInput,
@@ -48,7 +47,7 @@ export default class ListingUpdateSpecsCommand extends HostBaseCommand<
         return false;
       }
       try {
-        const url = new URL(dep);
+        const url = cardIdToURL(dep);
         const realmURL = this.realm.realmOfURL(url);
         if (!realmURL) {
           return false;
diff --git a/packages/host/app/commands/listing-use.ts b/packages/host/app/commands/listing-use.ts
index 8ed65b72c49..cbdb331338e 100644
--- a/packages/host/app/commands/listing-use.ts
+++ b/packages/host/app/commands/listing-use.ts
@@ -9,17 +9,15 @@ import {
   RealmPaths,
 } from '@cardstack/runtime-common';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
-import type { Skill } from 'https://cardstack.com/base/skill';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import CopyCardToRealmCommand from './copy-card';
 import SaveCardCommand from './save-card';
 
 import type RealmServerService from '../services/realm-server';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { Skill } from '@cardstack/base/skill';
 import type { Listing } from '@cardstack/catalog/catalog-app/listing/listing';
 
 export default class ListingUseCommand extends HostBaseCommand<
diff --git a/packages/host/app/commands/one-shot-llm-request.ts b/packages/host/app/commands/one-shot-llm-request.ts
index de081616ed2..d152d7bd478 100644
--- a/packages/host/app/commands/one-shot-llm-request.ts
+++ b/packages/host/app/commands/one-shot-llm-request.ts
@@ -4,9 +4,6 @@ import { isCardInstance, logger } from '@cardstack/runtime-common';
 // Conventional module-scoped logger (pattern used elsewhere like store & realm events)
 const oneShotLogger = logger('llm:oneshot');
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-import type { Skill } from 'https://cardstack.com/base/skill';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import { prettifyMessages } from '../utils/prettify-messages';
@@ -20,6 +17,8 @@ import type CommandService from '../services/command-service';
 import type MatrixService from '../services/matrix-service';
 import type RealmServerService from '../services/realm-server';
 import type StoreService from '../services/store';
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { Skill } from '@cardstack/base/skill';
 
 export default class OneShotLlmRequestCommand extends HostBaseCommand<
   typeof BaseCommandModule.OneShotLLMRequestInput,
diff --git a/packages/host/app/commands/open-ai-assistant-room.ts b/packages/host/app/commands/open-ai-assistant-room.ts
index 4fbfabe81d9..c93630ffcd3 100644
--- a/packages/host/app/commands/open-ai-assistant-room.ts
+++ b/packages/host/app/commands/open-ai-assistant-room.ts
@@ -1,12 +1,11 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type AiAssistantPanelService from '../services/ai-assistant-panel-service';
 import type MatrixService from '../services/matrix-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class OpenAiAssistantRoomCommand extends HostBaseCommand<
   typeof BaseCommandModule.OpenAiAssistantRoomInput
diff --git a/packages/host/app/commands/open-create-listing-modal.ts b/packages/host/app/commands/open-create-listing-modal.ts
index d3d26009fd4..8c7c8d53c4b 100644
--- a/packages/host/app/commands/open-create-listing-modal.ts
+++ b/packages/host/app/commands/open-create-listing-modal.ts
@@ -3,11 +3,10 @@ import { service } from '@ember/service';
 import { isFieldDef } from '@cardstack/runtime-common';
 import { loadCardDef } from '@cardstack/runtime-common/code-ref';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class OpenCreateListingModalCommand extends HostBaseCommand<
   typeof BaseCommandModule.ListingCreateInput
diff --git a/packages/host/app/commands/open-in-interact-mode.ts b/packages/host/app/commands/open-in-interact-mode.ts
index 451f08da977..bcda676561e 100644
--- a/packages/host/app/commands/open-in-interact-mode.ts
+++ b/packages/host/app/commands/open-in-interact-mode.ts
@@ -2,11 +2,10 @@ import { service } from '@ember/service';
 
 import type { Format } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class OpenInInteractModeCommand extends HostBaseCommand<
   typeof BaseCommandModule.ShowCardInput
diff --git a/packages/host/app/commands/open-workspace.ts b/packages/host/app/commands/open-workspace.ts
index 9c78e01356d..a2cc2747833 100644
--- a/packages/host/app/commands/open-workspace.ts
+++ b/packages/host/app/commands/open-workspace.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class OpenWorkspaceCommand extends HostBaseCommand<
   typeof BaseCommandModule.RealmUrlCard
diff --git a/packages/host/app/commands/patch-card-instance.ts b/packages/host/app/commands/patch-card-instance.ts
index c16a004c061..1c3b95ca861 100644
--- a/packages/host/app/commands/patch-card-instance.ts
+++ b/packages/host/app/commands/patch-card-instance.ts
@@ -9,15 +9,13 @@ import {
   generateJsonSchemaForCardType,
 } from '@cardstack/runtime-common/helpers/ai';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type CommandService from '../services/command-service';
-
 import type StoreService from '../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 interface Configuration {
   cardType: typeof CardDef;
diff --git a/packages/host/app/commands/patch-code.ts b/packages/host/app/commands/patch-code.ts
index 8d8dd5e6505..86fedceae25 100644
--- a/packages/host/app/commands/patch-code.ts
+++ b/packages/host/app/commands/patch-code.ts
@@ -2,8 +2,6 @@ import { service } from '@ember/service';
 
 import { hasExecutableExtension } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 import { parseSearchReplace } from '../lib/search-replace-block-parsing';
 import { isReady } from '../resources/file';
@@ -18,6 +16,7 @@ import type CommandService from '../services/command-service';
 import type MonacoService from '../services/monaco-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type RealmService from '../services/realm';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 interface FileInfo {
   exists: boolean;
diff --git a/packages/host/app/commands/patch-fields.ts b/packages/host/app/commands/patch-fields.ts
index 6ec4292995d..221a65c7eed 100644
--- a/packages/host/app/commands/patch-fields.ts
+++ b/packages/host/app/commands/patch-fields.ts
@@ -7,9 +7,6 @@ import {
 } from '@cardstack/runtime-common/helpers/ai';
 import { Loader } from '@cardstack/runtime-common/loader';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import { FieldPathParser } from '../lib/field-path-parser';
 import HostBaseCommand from '../lib/host-base-command';
 
@@ -17,6 +14,8 @@ import type { ValidateFieldPathResult } from '../lib/field-path-parser';
 
 import type CardService from '../services/card-service';
 import type StoreService from '../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 interface Configuration {
   cardType: typeof CardDef;
@@ -76,8 +75,8 @@ export default class PatchFieldsCommand extends HostBaseCommand<
   ): Promise<ValidateFieldPathResult> {
     // Load card-api dynamically to get getFields function
     const cardApi = await this.loaderService.loader.import<
-      typeof import('https://cardstack.com/base/card-api')
-    >('https://cardstack.com/base/card-api');
+      typeof import('@cardstack/base/card-api')
+    >('@cardstack/base/card-api');
 
     return FieldPathParser.validatedFieldPath(
       fieldPath,
@@ -218,8 +217,8 @@ export default class PatchFieldsCommand extends HostBaseCommand<
 
     if (configuredCardType) {
       const cardApi = await loaderForSchema.import<
-        typeof import('https://cardstack.com/base/card-api')
-      >('https://cardstack.com/base/card-api');
+        typeof import('@cardstack/base/card-api')
+      >('@cardstack/base/card-api');
       const cardFields = cardApi.getFields(configuredCardType, {
         usedLinksToFieldsOnly: false,
       });
diff --git a/packages/host/app/commands/patch-theme.ts b/packages/host/app/commands/patch-theme.ts
index c22b6ceb4d8..d3d2da089bb 100644
--- a/packages/host/app/commands/patch-theme.ts
+++ b/packages/host/app/commands/patch-theme.ts
@@ -1,10 +1,10 @@
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-import type { Skill } from 'https://cardstack.com/base/skill';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import UseAiAssistantCommand from './ai-assistant';
 
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { Skill } from '@cardstack/base/skill';
+
 export default class PatchThemeCommand extends HostBaseCommand<
   typeof BaseCommandModule.PatchThemeInput,
   typeof BaseCommandModule.SendAiAssistantMessageResult
diff --git a/packages/host/app/commands/populate-with-sample-data.ts b/packages/host/app/commands/populate-with-sample-data.ts
index dfad9cb66fc..866096b5088 100644
--- a/packages/host/app/commands/populate-with-sample-data.ts
+++ b/packages/host/app/commands/populate-with-sample-data.ts
@@ -8,9 +8,6 @@ import {
 
 import { isBaseInstance, realmURL } from '@cardstack/runtime-common/constants';
 
-import type { CardDef, FieldDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import SendAiAssistantMessageCommand from './send-ai-assistant-message';
@@ -19,6 +16,8 @@ import type AiAssistantPanelService from '../services/ai-assistant-panel-service
 import type CommandService from '../services/command-service';
 import type MatrixService from '../services/matrix-service';
 import type StoreService from '../services/store';
+import type { CardDef, FieldDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class PopulateWithSampleDataCommand extends HostBaseCommand<
   typeof BaseCommandModule.CardIdCard,
diff --git a/packages/host/app/commands/preview-format.ts b/packages/host/app/commands/preview-format.ts
index dbbc998e05e..25009cd4207 100644
--- a/packages/host/app/commands/preview-format.ts
+++ b/packages/host/app/commands/preview-format.ts
@@ -1,13 +1,12 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import ShowCardCommand from './show-card';
 import SwitchSubmodeCommand from './switch-submode';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class PreviewFormatCommand extends HostBaseCommand<
   typeof BaseCommandModule.PreviewFormatInput
diff --git a/packages/host/app/commands/read-card-for-ai-assistant.ts b/packages/host/app/commands/read-card-for-ai-assistant.ts
index e6d68a182d3..da689472e0d 100644
--- a/packages/host/app/commands/read-card-for-ai-assistant.ts
+++ b/packages/host/app/commands/read-card-for-ai-assistant.ts
@@ -2,14 +2,13 @@ import { service } from '@ember/service';
 
 import { isCardInstance } from '@cardstack/runtime-common';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type MatrixService from '../services/matrix-service';
 import type StoreService from '../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { FileDef } from '@cardstack/base/file-api';
 
 export default class ReadCardForAssistantCommand extends HostBaseCommand<
   typeof BaseCommandModule.CardIdCard,
diff --git a/packages/host/app/commands/read-file-for-ai-assistant.ts b/packages/host/app/commands/read-file-for-ai-assistant.ts
index 0d7adb785d4..51196d320f7 100644
--- a/packages/host/app/commands/read-file-for-ai-assistant.ts
+++ b/packages/host/app/commands/read-file-for-ai-assistant.ts
@@ -1,11 +1,10 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type MatrixService from '../services/matrix-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { FileDef } from '@cardstack/base/file-api';
 
 export default class ReadFileForAssistantCommand extends HostBaseCommand<
   typeof BaseCommandModule.FileUrlCard,
diff --git a/packages/host/app/commands/read-source.ts b/packages/host/app/commands/read-source.ts
index b0e87d84f3d..cdf588fe6d7 100644
--- a/packages/host/app/commands/read-source.ts
+++ b/packages/host/app/commands/read-source.ts
@@ -2,11 +2,10 @@ import { service } from '@ember/service';
 
 import { SupportedMimeType } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type NetworkService from '../services/network';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class ReadSourceCommand extends HostBaseCommand<
   typeof BaseCommandModule.ReadSourceInput,
diff --git a/packages/host/app/commands/read-text-file.ts b/packages/host/app/commands/read-text-file.ts
index 345f8239038..c9201bea78d 100644
--- a/packages/host/app/commands/read-text-file.ts
+++ b/packages/host/app/commands/read-text-file.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type NetworkService from '../services/network';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class ReadTextFileCommand extends HostBaseCommand<
   typeof BaseCommandModule.ReadTextFileInput,
diff --git a/packages/host/app/commands/register-bot.ts b/packages/host/app/commands/register-bot.ts
index ad06581eb39..32981861bef 100644
--- a/packages/host/app/commands/register-bot.ts
+++ b/packages/host/app/commands/register-bot.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type RealmServerService from '../services/realm-server';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 type RegisterBotResult = {
   botRegistrationId: string;
diff --git a/packages/host/app/commands/reindex-realm.ts b/packages/host/app/commands/reindex-realm.ts
index 4ef27f8f362..8a13b621c43 100644
--- a/packages/host/app/commands/reindex-realm.ts
+++ b/packages/host/app/commands/reindex-realm.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type RealmService from '../services/realm';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class ReindexRealmCommand extends HostBaseCommand<
   typeof BaseCommandModule.RealmUrlCard,
diff --git a/packages/host/app/commands/save-card.ts b/packages/host/app/commands/save-card.ts
index f7e94887854..e3590fd8f14 100644
--- a/packages/host/app/commands/save-card.ts
+++ b/packages/host/app/commands/save-card.ts
@@ -2,12 +2,11 @@ import { service } from '@ember/service';
 
 import { isCardInstance } from '@cardstack/runtime-common';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type StoreService from '../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class SaveCardCommand extends HostBaseCommand<
   typeof BaseCommandModule.SaveCardInput,
diff --git a/packages/host/app/commands/search-and-choose.ts b/packages/host/app/commands/search-and-choose.ts
index 97e785e7aa0..e1cc2f1d831 100644
--- a/packages/host/app/commands/search-and-choose.ts
+++ b/packages/host/app/commands/search-and-choose.ts
@@ -2,8 +2,6 @@ import { logger } from '@cardstack/runtime-common';
 import type { ResolvedCodeRef } from '@cardstack/runtime-common';
 import { isResolvedCodeRef } from '@cardstack/runtime-common/code-ref';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import { prettifyPrompts } from '../utils/prettify-prompts';
@@ -14,6 +12,9 @@ import { SearchCardsByTypeAndTitleCommand } from './search-cards';
 // Command-level logger (general lifecycle + decisions)
 const log = logger('commands:search-and-choose');
 
+import type * as BaseCommandModule from '@cardstack/base/command';
+
+
 export default class SearchAndChooseCommand extends HostBaseCommand<
   typeof BaseCommandModule.SearchAndChooseInput,
   typeof BaseCommandModule.SearchAndChooseResult
diff --git a/packages/host/app/commands/search-cards.ts b/packages/host/app/commands/search-cards.ts
index a3b9c52e02f..58ea910e2a9 100644
--- a/packages/host/app/commands/search-cards.ts
+++ b/packages/host/app/commands/search-cards.ts
@@ -3,13 +3,12 @@ import { service } from '@ember/service';
 import type { Filter } from '@cardstack/runtime-common';
 import { assertQuery } from '@cardstack/runtime-common';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type RealmServerService from '../services/realm-server';
 import type StoreService from '../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export class SearchCardsByTypeAndTitleCommand extends HostBaseCommand<
   typeof BaseCommandModule.SearchCardsByTypeAndTitleInput,
diff --git a/packages/host/app/commands/search-google-images.ts b/packages/host/app/commands/search-google-images.ts
index 7a65527d345..c7b0dfad27d 100644
--- a/packages/host/app/commands/search-google-images.ts
+++ b/packages/host/app/commands/search-google-images.ts
@@ -1,9 +1,9 @@
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import SendRequestViaProxyCommand from './send-request-via-proxy';
 
+import type * as BaseCommandModule from '@cardstack/base/command';
+
 export default class SearchGoogleImagesCommand extends HostBaseCommand<
   typeof BaseCommandModule.SearchGoogleImagesInput,
   typeof BaseCommandModule.SearchGoogleImagesResult
diff --git a/packages/host/app/commands/send-ai-assistant-message.ts b/packages/host/app/commands/send-ai-assistant-message.ts
index fede19faa18..8ec9d3cf187 100644
--- a/packages/host/app/commands/send-ai-assistant-message.ts
+++ b/packages/host/app/commands/send-ai-assistant-message.ts
@@ -4,14 +4,6 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { APP_BOXEL_MESSAGE_MSGTYPE } from '@cardstack/runtime-common/matrix-constants';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-import type {
-  CardMessageContent,
-  Tool,
-} from 'https://cardstack.com/base/matrix-event';
-
 import { addPatchTools } from '../commands/utils';
 import HostBaseCommand from '../lib/host-base-command';
 
@@ -20,6 +12,10 @@ import type CommandService from '../services/command-service';
 import type MatrixService from '../services/matrix-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type RealmService from '../services/realm';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { FileDef } from '@cardstack/base/file-api';
+import type { CardMessageContent, Tool } from '@cardstack/base/matrix-event';
 
 export default class SendAiAssistantMessageCommand extends HostBaseCommand<
   typeof BaseCommandModule.SendAiAssistantMessageInput,
@@ -46,7 +42,7 @@ export default class SendAiAssistantMessageCommand extends HostBaseCommand<
   async loadCardAPI() {
     if (!this.#cardAPI) {
       this.#cardAPI = await this.loaderService.loader.import<typeof CardAPI>(
-        'https://cardstack.com/base/card-api',
+        '@cardstack/base/card-api',
       );
     }
     return this.#cardAPI;
diff --git a/packages/host/app/commands/send-request-via-proxy.ts b/packages/host/app/commands/send-request-via-proxy.ts
index 8d636fc8b5f..c046e1b7dbe 100644
--- a/packages/host/app/commands/send-request-via-proxy.ts
+++ b/packages/host/app/commands/send-request-via-proxy.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type RealmServerService from '../services/realm-server';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class SendRequestViaProxyCommand extends HostBaseCommand<
   typeof BaseCommandModule.SendRequestViaProxyInput,
diff --git a/packages/host/app/commands/serialize-card.ts b/packages/host/app/commands/serialize-card.ts
index b894f9324ef..c49f9b931fa 100644
--- a/packages/host/app/commands/serialize-card.ts
+++ b/packages/host/app/commands/serialize-card.ts
@@ -1,12 +1,11 @@
 import { service } from '@ember/service';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type CardService from '../services/card-service';
 import type StoreService from '../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class SerializeCardCommand extends HostBaseCommand<
   typeof BaseCommandModule.CardIdCard,
diff --git a/packages/host/app/commands/set-active-llm.ts b/packages/host/app/commands/set-active-llm.ts
index 570f250b283..d889261daaa 100644
--- a/packages/host/app/commands/set-active-llm.ts
+++ b/packages/host/app/commands/set-active-llm.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type MatrixService from '../services/matrix-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class SetActiveLLMCommand extends HostBaseCommand<
   typeof BaseCommandModule.SetActiveLLMInput,
diff --git a/packages/host/app/commands/set-user-system-card.ts b/packages/host/app/commands/set-user-system-card.ts
index 09d7fdbb44f..0bab9f5e81a 100644
--- a/packages/host/app/commands/set-user-system-card.ts
+++ b/packages/host/app/commands/set-user-system-card.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type MatrixService from '../services/matrix-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class SetUserSystemCardCommand extends HostBaseCommand<
   typeof BaseCommandModule.CardIdCard,
diff --git a/packages/host/app/commands/show-card.ts b/packages/host/app/commands/show-card.ts
index 6101aff695e..cf0d255866a 100644
--- a/packages/host/app/commands/show-card.ts
+++ b/packages/host/app/commands/show-card.ts
@@ -5,16 +5,16 @@ import {
   identifyCard,
   internalKeyFor,
   isCardErrorJSONAPI,
+  cardIdToURL,
 } from '@cardstack/runtime-common';
 
-import type { CardDef, Format } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type PlaygroundPanelService from '../services/playground-panel-service';
 import type StoreService from '../services/store';
+import type { CardDef, Format } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class ShowCardCommand extends HostBaseCommand<
   typeof BaseCommandModule.ShowCardInput,
@@ -71,7 +71,7 @@ export default class ShowCardCommand extends HostBaseCommand<
         operatorModeStateService.state.codeSelection !== cardDefRef.name
       ) {
         await operatorModeStateService.updateCodePath(
-          new URL(cardDefRef.module + '.gts'),
+          cardIdToURL(cardDefRef.module + '.gts'),
           'preview',
         );
       }
diff --git a/packages/host/app/commands/show-file.ts b/packages/host/app/commands/show-file.ts
index 9b28ef1de39..8961c6410d2 100644
--- a/packages/host/app/commands/show-file.ts
+++ b/packages/host/app/commands/show-file.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class ShowFileCommand extends HostBaseCommand<
   typeof BaseCommandModule.FileUrlCard
diff --git a/packages/host/app/commands/summarize-session.ts b/packages/host/app/commands/summarize-session.ts
index 281e20d3ead..0fa45ace9a8 100644
--- a/packages/host/app/commands/summarize-session.ts
+++ b/packages/host/app/commands/summarize-session.ts
@@ -1,7 +1,5 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import SendRequestViaProxyCommand from './send-request-via-proxy';
@@ -9,6 +7,7 @@ import SendRequestViaProxyCommand from './send-request-via-proxy';
 import type CommandService from '../services/command-service';
 import type MatrixService from '../services/matrix-service';
 import type RealmServerService from '../services/realm-server';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class SummarizeSessionCommand extends HostBaseCommand<
   typeof BaseCommandModule.SummarizeSessionInput,
diff --git a/packages/host/app/commands/switch-submode.ts b/packages/host/app/commands/switch-submode.ts
index 474e1b53f39..dc8bce3326a 100644
--- a/packages/host/app/commands/switch-submode.ts
+++ b/packages/host/app/commands/switch-submode.ts
@@ -1,7 +1,5 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import { Submodes } from '../components/submode-switcher';
 
 import HostBaseCommand from '../lib/host-base-command';
@@ -10,6 +8,7 @@ import WriteTextFileCommand from './write-text-file';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type StoreService from '../services/store';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class SwitchSubmodeCommand extends HostBaseCommand<
   typeof BaseCommandModule.SwitchSubmodeInput,
diff --git a/packages/host/app/commands/sync-openrouter-models.ts b/packages/host/app/commands/sync-openrouter-models.ts
index f530c9278b7..0237282dd04 100644
--- a/packages/host/app/commands/sync-openrouter-models.ts
+++ b/packages/host/app/commands/sync-openrouter-models.ts
@@ -3,12 +3,11 @@ import { service } from '@ember/service';
 import { SupportedMimeType } from '@cardstack/runtime-common';
 import type { AtomicOperation } from '@cardstack/runtime-common/atomic-document';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type CardService from '../services/card-service';
 import type NetworkService from '../services/network';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 const OPENROUTER_MODELS_URL = 'https://openrouter.ai/api/v1/models';
 const BATCH_SIZE = 20;
diff --git a/packages/host/app/commands/transform-cards.ts b/packages/host/app/commands/transform-cards.ts
index 56494ec9de8..6f28dec4d66 100644
--- a/packages/host/app/commands/transform-cards.ts
+++ b/packages/host/app/commands/transform-cards.ts
@@ -1,13 +1,13 @@
 import { getClass } from '@cardstack/runtime-common';
 
-import type { VisitCardsInput } from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import ReadSourceCommand from './read-source';
 import { SearchCardsByQueryCommand } from './search-cards';
 import WriteTextFileCommand from './write-text-file';
 
+import type { VisitCardsInput } from '@cardstack/base/command';
+
 export default class TransformCardsCommand extends HostBaseCommand<
   typeof VisitCardsInput
 > {
diff --git a/packages/host/app/commands/unregister-bot.ts b/packages/host/app/commands/unregister-bot.ts
index 31e99b19e8e..f39c4f3267c 100644
--- a/packages/host/app/commands/unregister-bot.ts
+++ b/packages/host/app/commands/unregister-bot.ts
@@ -1,10 +1,9 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type RealmServerService from '../services/realm-server';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class UnregisterBotCommand extends HostBaseCommand<
   typeof BaseCommandModule.UnregisterBotInput,
diff --git a/packages/host/app/commands/update-code-path-with-selection.ts b/packages/host/app/commands/update-code-path-with-selection.ts
index 40f5409b5ef..08fca1308b7 100644
--- a/packages/host/app/commands/update-code-path-with-selection.ts
+++ b/packages/host/app/commands/update-code-path-with-selection.ts
@@ -1,11 +1,10 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type RecentFilesService from '../services/recent-files-service';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class UpdateCodePathWithSelectionCommand extends HostBaseCommand<
   typeof BaseCommandModule.UpdateCodePathWithSelectionInput
diff --git a/packages/host/app/commands/update-playground-selection.ts b/packages/host/app/commands/update-playground-selection.ts
index d2149aa8006..f782b71eb24 100644
--- a/packages/host/app/commands/update-playground-selection.ts
+++ b/packages/host/app/commands/update-playground-selection.ts
@@ -1,11 +1,10 @@
 import { service } from '@ember/service';
 
-import type { Format } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 
 import type PlaygroundPanelService from '../services/playground-panel-service';
+import type { Format } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class UpdatePlaygroundSelectionCommand extends HostBaseCommand<
   typeof BaseCommandModule.UpdatePlaygroundSelectionInput
diff --git a/packages/host/app/commands/update-room-skills.ts b/packages/host/app/commands/update-room-skills.ts
index 04984c9ec40..a9185563dfd 100644
--- a/packages/host/app/commands/update-room-skills.ts
+++ b/packages/host/app/commands/update-room-skills.ts
@@ -3,18 +3,17 @@ import { service } from '@ember/service';
 import { isCardInstance } from '@cardstack/runtime-common';
 import { APP_BOXEL_ROOM_SKILLS_EVENT_TYPE } from '@cardstack/runtime-common/matrix-constants';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-import type { SerializedFile } from 'https://cardstack.com/base/file-api';
-
-import type * as SkillModule from 'https://cardstack.com/base/skill';
-
 import { isSkillCard } from '../lib/file-def-manager';
 
 import HostBaseCommand from '../lib/host-base-command';
 
 import type MatrixService from '../services/matrix-service';
 import type StoreService from '../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
+import type { SerializedFile } from '@cardstack/base/file-api';
+
+import type * as SkillModule from '@cardstack/base/skill';
 
 export default class UpdateRoomSkillsCommand extends HostBaseCommand<
   typeof BaseCommandModule.UpdateRoomSkillsInput
diff --git a/packages/host/app/commands/utils.ts b/packages/host/app/commands/utils.ts
index 2dc62e48548..23722f21531 100644
--- a/packages/host/app/commands/utils.ts
+++ b/packages/host/app/commands/utils.ts
@@ -15,20 +15,19 @@ import {
   getPatchTool,
 } from '@cardstack/runtime-common/helpers/ai';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
+import GetEventsFromRoomCommand from './get-events-from-room';
+
+import type LoaderService from '../services/loader-service';
+import type MessageService from '../services/message-service';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as CardAPI from '@cardstack/base/card-api';
 import type {
   CardMessageEvent,
   CommandResultEvent,
   MatrixEvent,
   RealmEventContent,
   Tool,
-} from 'https://cardstack.com/base/matrix-event';
-
-import GetEventsFromRoomCommand from './get-events-from-room';
-
-import type LoaderService from '../services/loader-service';
-import type MessageService from '../services/message-service';
+} from '@cardstack/base/matrix-event';
 
 export async function waitForMatrixEvent(
   commandContext: CommandContext,
diff --git a/packages/host/app/commands/write-text-file.ts b/packages/host/app/commands/write-text-file.ts
index 09ace13b6c0..03c5b407397 100644
--- a/packages/host/app/commands/write-text-file.ts
+++ b/packages/host/app/commands/write-text-file.ts
@@ -1,13 +1,12 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import HostBaseCommand from '../lib/host-base-command';
 import { findNonConflictingFilename } from '../utils/file-name';
 
 import type CardService from '../services/card-service';
 import type { SaveType } from '../services/card-service';
 import type RealmService from '../services/realm';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default class WriteTextFileCommand extends HostBaseCommand<
   typeof BaseCommandModule.WriteTextFileInput,
diff --git a/packages/host/app/components/ai-assistant/attached-file-dropdown-menu.gts b/packages/host/app/components/ai-assistant/attached-file-dropdown-menu.gts
index 997110baa42..55c52941bd8 100644
--- a/packages/host/app/components/ai-assistant/attached-file-dropdown-menu.gts
+++ b/packages/host/app/components/ai-assistant/attached-file-dropdown-menu.gts
@@ -29,11 +29,11 @@ import type CardService from '@cardstack/host/services/card-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
+import { Submodes } from '../submode-switcher';
 
-import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event';
+import type { FileDef } from '@cardstack/base/file-api';
 
-import { Submodes } from '../submode-switcher';
+import type { CodePatchStatus } from '@cardstack/base/matrix-event';
 
 export default class AttachedFileDropdownMenu extends Component<{
   Args: {
diff --git a/packages/host/app/components/ai-assistant/attachment-picker/attach-button.gts b/packages/host/app/components/ai-assistant/attachment-picker/attach-button.gts
index 3f1ad25e0c2..c4651190d30 100644
--- a/packages/host/app/components/ai-assistant/attachment-picker/attach-button.gts
+++ b/packages/host/app/components/ai-assistant/attachment-picker/attach-button.gts
@@ -12,7 +12,7 @@ import { eq } from '@cardstack/boxel-ui/helpers';
 
 import { chooseCard, baseCardRef, chooseFile } from '@cardstack/runtime-common';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
+import type { FileDef } from '@cardstack/base/file-api';
 
 interface AttachButtonTriggerSignature {
   Element: HTMLButtonElement;
diff --git a/packages/host/app/components/ai-assistant/attachment-picker/attached-items.gts b/packages/host/app/components/ai-assistant/attachment-picker/attached-items.gts
index 32f11cb7009..b1fb85d5e0e 100644
--- a/packages/host/app/components/ai-assistant/attachment-picker/attached-items.gts
+++ b/packages/host/app/components/ai-assistant/attachment-picker/attached-items.gts
@@ -31,8 +31,8 @@ import { urlForRealmLookup } from '@cardstack/host/lib/utils';
 
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
+import type { CardDef } from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
 
 import type { TrackedSet } from 'tracked-built-ins';
 
diff --git a/packages/host/app/components/ai-assistant/attachment-picker/index.gts b/packages/host/app/components/ai-assistant/attachment-picker/index.gts
index 9e75e34b221..127aadaaaea 100644
--- a/packages/host/app/components/ai-assistant/attachment-picker/index.gts
+++ b/packages/host/app/components/ai-assistant/attachment-picker/index.gts
@@ -10,11 +10,11 @@ import {
 
 import type { FileUploadState } from '@cardstack/host/lib/file-upload-state';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import AttachButton from './attach-button';
 import AttachedItems from './attached-items';
 
+import type { FileDef } from '@cardstack/base/file-api';
+
 import type { WithBoundArgs } from '@glint/template';
 import type { TrackedSet } from 'tracked-built-ins';
 
diff --git a/packages/host/app/components/ai-assistant/attachment-picker/usage.gts b/packages/host/app/components/ai-assistant/attachment-picker/usage.gts
index 1e956acee9b..a78e7af10e3 100644
--- a/packages/host/app/components/ai-assistant/attachment-picker/usage.gts
+++ b/packages/host/app/components/ai-assistant/attachment-picker/usage.gts
@@ -10,10 +10,10 @@ import { TrackedSet } from 'tracked-built-ins';
 
 import CardCatalogModal from '@cardstack/host/components/card-catalog/modal';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import AiAssistantAttachmentPicker from './index';
 
+import type { FileDef } from '@cardstack/base/file-api';
+
 export default class AiAssistantCardPickerUsage extends Component {
   cardIds: TrackedArray<string> = new TrackedArray([]);
   @tracked maxNumberOfCards: number | undefined = undefined;
diff --git a/packages/host/app/components/ai-assistant/code-block/apply-code-patch-button.gts b/packages/host/app/components/ai-assistant/code-block/apply-code-patch-button.gts
index 830126f2554..c480724ab40 100644
--- a/packages/host/app/components/ai-assistant/code-block/apply-code-patch-button.gts
+++ b/packages/host/app/components/ai-assistant/code-block/apply-code-patch-button.gts
@@ -7,10 +7,10 @@ import type { CodeData } from '@cardstack/host/lib/formatted-message/utils';
 
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 
-import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event';
-
 import ApplyButton from '../../ai-assistant/apply-button';
 
+import type { CodePatchStatus } from '@cardstack/base/matrix-event';
+
 export interface ApplyCodePatchButtonSignature {
   Args: {
     patchCodeStatus: CodePatchStatus | 'ready' | 'applying';
diff --git a/packages/host/app/components/ai-assistant/code-block/diff-editor-header.gts b/packages/host/app/components/ai-assistant/code-block/diff-editor-header.gts
index 686327df78b..0e69ebdaa6c 100644
--- a/packages/host/app/components/ai-assistant/code-block/diff-editor-header.gts
+++ b/packages/host/app/components/ai-assistant/code-block/diff-editor-header.gts
@@ -13,11 +13,11 @@ import type MatrixService from '@cardstack/host/services/matrix-service';
 
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event';
-
 import AttachedFileDropdownMenu from '../attached-file-dropdown-menu';
 
+import type { FileDef } from '@cardstack/base/file-api';
+import type { CodePatchStatus } from '@cardstack/base/matrix-event';
+
 export interface CodeBlockDiffEditorHeaderSignature {
   Args: {
     codeData: Partial<CodeData>;
diff --git a/packages/host/app/components/ai-assistant/message/aibot-message.gts b/packages/host/app/components/ai-assistant/message/aibot-message.gts
index c45a9b268b1..eb6ff47704a 100644
--- a/packages/host/app/components/ai-assistant/message/aibot-message.gts
+++ b/packages/host/app/components/ai-assistant/message/aibot-message.gts
@@ -34,10 +34,10 @@ import { getCodeDiffResultResource } from '@cardstack/host/resources/code-diff';
 import type CommandService from '@cardstack/host/services/command-service';
 import type { MonacoSDK } from '@cardstack/host/services/monaco-service';
 
-import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event';
-
 import Message from './text-content';
 
+import type { CodePatchStatus } from '@cardstack/base/matrix-event';
+
 interface Signature {
   Element: HTMLDivElement;
   Args: {
diff --git a/packages/host/app/components/ai-assistant/message/attachments.gts b/packages/host/app/components/ai-assistant/message/attachments.gts
index 3cca1a6a185..265f2ebec1a 100644
--- a/packages/host/app/components/ai-assistant/message/attachments.gts
+++ b/packages/host/app/components/ai-assistant/message/attachments.gts
@@ -10,8 +10,8 @@ import FilePill from '@cardstack/host/components/file-pill';
 
 import { urlForRealmLookup } from '@cardstack/host/lib/utils';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
+import type { CardDef } from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
 
 interface Signature {
   Element: HTMLDivElement;
diff --git a/packages/host/app/components/ai-assistant/message/index.gts b/packages/host/app/components/ai-assistant/message/index.gts
index 532f14df155..62d5c4bf0c3 100644
--- a/packages/host/app/components/ai-assistant/message/index.gts
+++ b/packages/host/app/components/ai-assistant/message/index.gts
@@ -29,13 +29,13 @@ import type MatrixService from '@cardstack/host/services/matrix-service';
 import type { MonacoSDK } from '@cardstack/host/services/monaco-service';
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import AiBotMessage from './aibot-message';
 import Attachments from './attachments';
 import Meta from './meta';
 import UserMessage from './user-message';
 
+import type { FileDef } from '@cardstack/base/file-api';
+
 import type { ComponentLike } from '@glint/template';
 
 interface Signature {
diff --git a/packages/host/app/components/card-catalog/modal.gts b/packages/host/app/components/card-catalog/modal.gts
index a6971f537c4..796f7fc468e 100644
--- a/packages/host/app/components/card-catalog/modal.gts
+++ b/packages/host/app/components/card-catalog/modal.gts
@@ -28,8 +28,6 @@ import {
 
 import type { Query } from '@cardstack/runtime-common/query';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
 import {
   suggestCardChooserTitle,
   getSuggestionWithLowestDepth,
@@ -47,6 +45,7 @@ import type RealmService from '../../services/realm';
 import type RealmServerService from '../../services/realm-server';
 import type StoreService from '../../services/store';
 import type { NewCardArgs } from '../card-search/utils';
+import type { CardDef } from '@cardstack/base/card-api';
 
 interface Signature {
   Args: {};
diff --git a/packages/host/app/components/card-pill.gts b/packages/host/app/components/card-pill.gts
index a868fd48b3a..c39fee904a5 100644
--- a/packages/host/app/components/card-pill.gts
+++ b/packages/host/app/components/card-pill.gts
@@ -18,11 +18,10 @@ import { FailureBordered, IconX } from '@cardstack/boxel-ui/icons';
 
 import { type getCard, GetCardContextName } from '@cardstack/runtime-common';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import AttachedFileDropdownMenu from './ai-assistant/attached-file-dropdown-menu';
 
 import type RealmService from '../services/realm';
+import type { FileDef } from '@cardstack/base/file-api';
 
 interface CardPillSignature {
   Element: HTMLDivElement | HTMLButtonElement;
diff --git a/packages/host/app/components/card-renderer.gts b/packages/host/app/components/card-renderer.gts
index 519018d41d5..8f409741791 100644
--- a/packages/host/app/components/card-renderer.gts
+++ b/packages/host/app/components/card-renderer.gts
@@ -24,7 +24,7 @@ import type {
   Format,
   Field,
   CardContext,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 interface Signature {
   Element: any;
diff --git a/packages/host/app/components/card-search/item-button.gts b/packages/host/app/components/card-search/item-button.gts
index 30732b96e51..26c6d733929 100644
--- a/packages/host/app/components/card-search/item-button.gts
+++ b/packages/host/app/components/card-search/item-button.gts
@@ -11,13 +11,12 @@ import { isCardInstance } from '@cardstack/runtime-common';
 
 import type RealmService from '@cardstack/host/services/realm';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
 import CardRenderer from '../card-renderer';
 
 import { removeFileExtension } from './utils';
 
 import type { NewCardArgs } from './utils';
+import type { CardDef } from '@cardstack/base/card-api';
 import type { ComponentLike } from '@glint/template';
 
 type ItemType = ComponentLike<{ Element: Element }> | CardDef | NewCardArgs;
@@ -37,7 +36,7 @@ interface Signature {
 // Render CardDef default fitted template for visual consistency of cards in search results
 let resultsCardRef = {
   name: 'CardDef',
-  module: 'https://cardstack.com/base/card-api',
+  module: '@cardstack/base/card-api',
 };
 
 function isNewCardArgs(item: ItemType): item is NewCardArgs {
diff --git a/packages/host/app/components/card-search/panel.gts b/packages/host/app/components/card-search/panel.gts
index c8b56b183da..758ad9242d6 100644
--- a/packages/host/app/components/card-search/panel.gts
+++ b/packages/host/app/components/card-search/panel.gts
@@ -32,8 +32,6 @@ import type RealmService from '@cardstack/host/services/realm';
 import type RealmServerService from '@cardstack/host/services/realm-server';
 import type RecentCards from '@cardstack/host/services/recent-cards-service';
 
-import type { CardContext, CardDef } from 'https://cardstack.com/base/card-api';
-
 import { SORT_OPTIONS, type SortOption } from './constants';
 import SearchBar from './search-bar';
 import SearchContent from './search-content';
@@ -44,6 +42,8 @@ import {
   shouldSkipSearchQuery,
 } from './utils';
 
+import type { CardContext, CardDef } from '@cardstack/base/card-api';
+
 import type { WithBoundArgs } from '@glint/template';
 
 const OWNER_DESTROYED_ERROR = 'OWNER_DESTROYED_ERROR';
diff --git a/packages/host/app/components/card-search/search-content.gts b/packages/host/app/components/card-search/search-content.gts
index b521952d6c3..55cca59bc7c 100644
--- a/packages/host/app/components/card-search/search-content.gts
+++ b/packages/host/app/components/card-search/search-content.gts
@@ -17,6 +17,7 @@ import {
   type Filter,
   type getCard,
   GetCardContextName,
+  cardIdToURL,
 } from '@cardstack/runtime-common';
 
 import { cardTypeDisplayName } from '@cardstack/runtime-common/helpers/card-type-display-name';
@@ -28,8 +29,6 @@ import type RealmService from '@cardstack/host/services/realm';
 import type RealmServerService from '@cardstack/host/services/realm-server';
 import type StoreService from '@cardstack/host/services/store';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
 import {
   SECTION_DISPLAY_LIMIT_FOCUSED,
   SECTION_DISPLAY_LIMIT_UNFOCUSED,
@@ -44,6 +43,7 @@ import SearchResultSection from './search-result-section';
 import type { PrerenderedCard } from '../prerendered-card-search';
 
 import type { NewCardArgs } from './utils';
+import type { CardDef } from '@cardstack/base/card-api';
 import type { NamedArgs } from 'ember-modifier';
 
 interface ScrollToFocusedSectionSignature {
@@ -515,7 +515,7 @@ export default class SearchContent extends Component<Signature> {
       }
     }
     try {
-      const url = new URL(cardIdOrUrl);
+      const url = cardIdToURL(cardIdOrUrl);
       return `${url.origin}${url.pathname.split('/').slice(0, -1)?.join('/') ?? ''}/`;
     } catch {
       return '';
diff --git a/packages/host/app/components/card-search/utils.ts b/packages/host/app/components/card-search/utils.ts
index 5ad17081f5a..637662bddae 100644
--- a/packages/host/app/components/card-search/utils.ts
+++ b/packages/host/app/components/card-search/utils.ts
@@ -18,9 +18,8 @@ import {
   specRef,
 } from '@cardstack/runtime-common';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
 import type { SortOption } from './constants';
+import type { CardDef } from '@cardstack/base/card-api';
 
 export interface NewCardArgs {
   ref: CodeRef;
diff --git a/packages/host/app/components/file-pill.gts b/packages/host/app/components/file-pill.gts
index dbac57e5ef9..9c47b4ffb85 100644
--- a/packages/host/app/components/file-pill.gts
+++ b/packages/host/app/components/file-pill.gts
@@ -14,11 +14,10 @@ import { IconX, Download } from '@cardstack/boxel-ui/icons';
 
 import type { FileUploadStatus } from '@cardstack/host/lib/file-upload-state';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import AttachedFileDropdownMenu from './ai-assistant/attached-file-dropdown-menu';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
+import type { FileDef } from '@cardstack/base/file-api';
 
 interface FilePillSignature {
   Element: HTMLDivElement | HTMLButtonElement;
diff --git a/packages/host/app/components/host-mode/content.gts b/packages/host/app/components/host-mode/content.gts
index 56e8b987fea..6d285c6ef5e 100644
--- a/packages/host/app/components/host-mode/content.gts
+++ b/packages/host/app/components/host-mode/content.gts
@@ -14,15 +14,15 @@ import { meta } from '@cardstack/runtime-common/constants';
 
 import { getCard } from '@cardstack/host/resources/card-resource';
 
+import HostModeBreadcrumbs from './breadcrumbs';
+import HostModeCard from './card';
+import HostModeStack from './stack';
+
 import type {
   CardDef,
   ViewCardFn,
   CardCrudFunctions,
-} from 'https://cardstack.com/base/card-api';
-
-import HostModeBreadcrumbs from './breadcrumbs';
-import HostModeCard from './card';
-import HostModeStack from './stack';
+} from '@cardstack/base/card-api';
 
 interface Signature {
   Element: HTMLElement;
diff --git a/packages/host/app/components/matrix/room-message-command.gts b/packages/host/app/components/matrix/room-message-command.gts
index b409fe470bb..7ee55264b9e 100644
--- a/packages/host/app/components/matrix/room-message-command.gts
+++ b/packages/host/app/components/matrix/room-message-command.gts
@@ -36,12 +36,11 @@ import type { MonacoSDK } from '@cardstack/host/services/monaco-service';
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 import type RealmService from '@cardstack/host/services/realm';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
 import CodeBlock from '../ai-assistant/code-block';
 import CardRenderer from '../card-renderer';
 
 import type { ApplyButtonState } from '../ai-assistant/apply-button';
+import type { CardDef } from '@cardstack/base/card-api';
 
 interface Signature {
   Element: HTMLDivElement;
diff --git a/packages/host/app/components/matrix/room.gts b/packages/host/app/components/matrix/room.gts
index ee1b201fc70..0e75c3d9e8f 100644
--- a/packages/host/app/components/matrix/room.gts
+++ b/packages/host/app/components/matrix/room.gts
@@ -46,6 +46,7 @@ import {
   isCardInstance,
   resolveFileDefCodeRef,
   SupportedMimeType,
+  cardIdToURL,
 } from '@cardstack/runtime-common';
 import {
   DEFAULT_LLM_LIST,
@@ -75,9 +76,6 @@ import type SpecPanelService from '@cardstack/host/services/spec-panel-service';
 import type StoreService from '@cardstack/host/services/store';
 import { FileDefAttributesExtractor } from '@cardstack/host/utils/file-def-attributes-extractor';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import { errorJsonApiToErrorEntry } from '../../lib/window-error-handler';
 import AiAssistantActionBar from '../ai-assistant/action-bar';
 import AiAssistantAttachmentPicker from '../ai-assistant/attachment-picker';
@@ -95,6 +93,8 @@ import RoomMessage from './room-message';
 
 import type RoomData from '../../lib/matrix-classes/room';
 import type { RoomSkill } from '../../resources/room';
+import type { CardDef } from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
 import type { MatrixEvent } from 'matrix-js-sdk';
 
 const LOCAL_SOURCE_URL_PREFIX = 'boxel-local://';
@@ -1490,7 +1490,7 @@ export default class Room extends Component<Signature> {
     bytes: Uint8Array,
   ): Promise<FileDef> {
     let sourceUrl = this.buildLocalSourceUrl(localFile.name);
-    let fileDefCodeRef = resolveFileDefCodeRef(new URL(sourceUrl));
+    let fileDefCodeRef = resolveFileDefCodeRef(cardIdToURL(sourceUrl));
     let extractor = new FileDefAttributesExtractor({
       loaderService: this.loaderService,
       network: this.network,
diff --git a/packages/host/app/components/operator-mode/card-error-detail.gts b/packages/host/app/components/operator-mode/card-error-detail.gts
index ad6adab76cd..6ed68f925f6 100644
--- a/packages/host/app/components/operator-mode/card-error-detail.gts
+++ b/packages/host/app/components/operator-mode/card-error-detail.gts
@@ -1,10 +1,9 @@
 import Component from '@glimmer/component';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import ErrorDisplay from './error-display';
 
 import type { CardErrorJSONAPI } from '../../services/store';
+import type { FileDef } from '@cardstack/base/file-api';
 
 interface Signature {
   Args: {
diff --git a/packages/host/app/components/operator-mode/card-error.gts b/packages/host/app/components/operator-mode/card-error.gts
index eab0166e805..50dfb88de6b 100644
--- a/packages/host/app/components/operator-mode/card-error.gts
+++ b/packages/host/app/components/operator-mode/card-error.gts
@@ -11,12 +11,12 @@ import { FileAlert, ExclamationCircle } from '@cardstack/boxel-ui/icons';
 import type LoaderService from '@cardstack/host/services/loader-service';
 import type { CardErrorJSONAPI } from '@cardstack/host/services/store';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import { htmlComponent } from '../../lib/html-component';
 
 import CardErrorDetail from './card-error-detail';
 
+import type { FileDef } from '@cardstack/base/file-api';
+
 interface Signature {
   Args: {
     error: CardErrorJSONAPI;
diff --git a/packages/host/app/components/operator-mode/card-schema-editor.gts b/packages/host/app/components/operator-mode/card-schema-editor.gts
index 27c5fd4d5d0..0d042d84fca 100644
--- a/packages/host/app/components/operator-mode/card-schema-editor.gts
+++ b/packages/host/app/components/operator-mode/card-schema-editor.gts
@@ -41,10 +41,10 @@ import type OperatorModeStateService from '@cardstack/host/services/operator-mod
 import type RealmService from '@cardstack/host/services/realm';
 import { calculateTotalOwnFields } from '@cardstack/host/utils/schema-editor';
 
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
-
 import ContextMenuButton from './context-menu-button';
 
+import type { BaseDef } from '@cardstack/base/card-api';
+
 interface Signature {
   Args: {
     card: typeof BaseDef;
diff --git a/packages/host/app/components/operator-mode/choose-file-modal.gts b/packages/host/app/components/operator-mode/choose-file-modal.gts
index da95bdc4414..fd98c83fc6a 100644
--- a/packages/host/app/components/operator-mode/choose-file-modal.gts
+++ b/packages/host/app/components/operator-mode/choose-file-modal.gts
@@ -39,10 +39,10 @@ import type OperatorModeStateService from '@cardstack/host/services/operator-mod
 import type RealmService from '@cardstack/host/services/realm';
 import type StoreService from '@cardstack/host/services/store';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import IndexedFileTree from '../editor/indexed-file-tree';
 
+import type { FileDef } from '@cardstack/base/file-api';
+
 interface Signature {
   Args: {};
 }
diff --git a/packages/host/app/components/operator-mode/code-submode.gts b/packages/host/app/components/operator-mode/code-submode.gts
index 6e7f3bfd93b..dfb17e136c8 100644
--- a/packages/host/app/components/operator-mode/code-submode.gts
+++ b/packages/host/app/components/operator-mode/code-submode.gts
@@ -40,6 +40,7 @@ import {
   type getCard,
   type LocalPath,
   CardContextName,
+  cardIdToURL,
 } from '@cardstack/runtime-common';
 import { isEquivalentBodyPosition } from '@cardstack/runtime-common/schema-analysis-plugin';
 
@@ -64,14 +65,6 @@ import type RecentFilesService from '@cardstack/host/services/recent-files-servi
 import type SpecPanelService from '@cardstack/host/services/spec-panel-service';
 import type StoreService from '@cardstack/host/services/store';
 
-import type {
-  BaseDef,
-  CardDef,
-  Format,
-  CardContext,
-} from 'https://cardstack.com/base/card-api';
-import type { SpecType } from 'https://cardstack.com/base/spec';
-
 import {
   CodeModePanelWidths,
   CodeModePanelHeights,
@@ -93,6 +86,13 @@ import DetailPanel from './detail-panel';
 import SubmodeLayout from './submode-layout';
 
 import type { NewFileOptions } from './new-file-button';
+import type {
+  BaseDef,
+  CardDef,
+  Format,
+  CardContext,
+} from '@cardstack/base/card-api';
+import type { SpecType } from '@cardstack/base/spec';
 
 interface Signature {
   Args: {
@@ -630,8 +630,8 @@ export default class CodeSubmode extends Component<Signature> {
 
   @action private async openSearchResultInEditor(cardId: string) {
     let codePath = cardId.endsWith('.json')
-      ? new URL(cardId)
-      : new URL(cardId + '.json');
+      ? cardIdToURL(cardId)
+      : cardIdToURL(cardId + '.json');
     await this.operatorModeStateService.updateCodePath(codePath);
   }
 
diff --git a/packages/host/app/components/operator-mode/code-submode/module-inspector.gts b/packages/host/app/components/operator-mode/code-submode/module-inspector.gts
index 21e562f38eb..395307ca09e 100644
--- a/packages/host/app/components/operator-mode/code-submode/module-inspector.gts
+++ b/packages/host/app/components/operator-mode/code-submode/module-inspector.gts
@@ -84,13 +84,9 @@ import type StoreService from '@cardstack/host/services/store';
 import { PlaygroundSelections } from '@cardstack/host/utils/local-storage-keys';
 import { runWhileActive } from '@cardstack/host/utils/run-while-active';
 
-import type {
-  CardDef,
-  Format,
-  ViewCardFn,
-} from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-import type { Spec } from 'https://cardstack.com/base/spec';
+import type { CardDef, Format, ViewCardFn } from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
+import type { Spec } from '@cardstack/base/spec';
 
 import type { ComponentLike } from '@glint/template';
 
diff --git a/packages/host/app/components/operator-mode/code-submode/playground/instance-chooser-dropdown.gts b/packages/host/app/components/operator-mode/code-submode/playground/instance-chooser-dropdown.gts
index e0e238cec02..e886eb6fbd9 100644
--- a/packages/host/app/components/operator-mode/code-submode/playground/instance-chooser-dropdown.gts
+++ b/packages/host/app/components/operator-mode/code-submode/playground/instance-chooser-dropdown.gts
@@ -17,9 +17,8 @@ import {
 
 import CardRenderer from '@cardstack/host/components/card-renderer';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import type { FieldOption, SelectedInstance } from './playground-panel';
+import type { FileDef } from '@cardstack/base/file-api';
 
 const getItemTitle = (selection: SelectedInstance | undefined) => {
   if (!selection) {
diff --git a/packages/host/app/components/operator-mode/code-submode/playground/playground-panel.gts b/packages/host/app/components/operator-mode/code-submode/playground/playground-panel.gts
index 23299299b8e..b4242e31d65 100644
--- a/packages/host/app/components/operator-mode/code-submode/playground/playground-panel.gts
+++ b/packages/host/app/components/operator-mode/code-submode/playground/playground-panel.gts
@@ -28,6 +28,7 @@ import {
   isSpecCard,
   type Permissions,
   PermissionsContextName,
+  cardIdToURL,
 } from '@cardstack/runtime-common';
 
 import {
@@ -72,16 +73,6 @@ import type RecentCardsService from '@cardstack/host/services/recent-cards-servi
 import type RecentFilesService from '@cardstack/host/services/recent-files-service';
 import type StoreService from '@cardstack/host/services/store';
 
-import type {
-  CardContext,
-  CardDef,
-  FieldDef,
-  Format,
-  ViewCardFn,
-} from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-import type { Spec } from 'https://cardstack.com/base/spec';
-
 import PrerenderedCardSearch from '../../../prerendered-card-search';
 import CardError from '../../card-error';
 import FormatChooser from '../format-chooser';
@@ -92,6 +83,16 @@ import InstanceSelectDropdown from './instance-chooser-dropdown';
 import PlaygroundPreview from './playground-preview';
 import SpecSearch from './spec-search';
 
+import type {
+  CardContext,
+  CardDef,
+  FieldDef,
+  Format,
+  ViewCardFn,
+} from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
+import type { Spec } from '@cardstack/base/spec';
+
 export type SelectedInstance = {
   card: CardDef | FileDef;
   fieldIndex: number | undefined;
@@ -425,7 +426,7 @@ export default class PlaygroundPanel extends Component<Signature> {
       return undefined;
     }
     try {
-      let cardURL = new URL(selectedCardId);
+      let cardURL = cardIdToURL(selectedCardId);
       return this.realm.realmOfURL(cardURL)?.href;
     } catch {
       return undefined;
diff --git a/packages/host/app/components/operator-mode/code-submode/playground/playground-preview.gts b/packages/host/app/components/operator-mode/code-submode/playground/playground-preview.gts
index 892a7f676c5..82c7b569a94 100644
--- a/packages/host/app/components/operator-mode/code-submode/playground/playground-preview.gts
+++ b/packages/host/app/components/operator-mode/code-submode/playground/playground-preview.gts
@@ -15,12 +15,8 @@ import CardRenderer from '@cardstack/host/components/card-renderer';
 import FittedFormatGallery from '@cardstack/host/components/operator-mode/preview-panel/fitted-format-gallery';
 import type { EnhancedRealmInfo } from '@cardstack/host/services/realm';
 
-import type {
-  CardDef,
-  FieldDef,
-  Format,
-} from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
+import type { CardDef, FieldDef, Format } from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
 
 interface Signature {
   Args: {
diff --git a/packages/host/app/components/operator-mode/code-submode/playground/playground.gts b/packages/host/app/components/operator-mode/code-submode/playground/playground.gts
index aa8570a47a4..ac8232d7f28 100644
--- a/packages/host/app/components/operator-mode/code-submode/playground/playground.gts
+++ b/packages/host/app/components/operator-mode/code-submode/playground/playground.gts
@@ -5,10 +5,10 @@ import { not } from '@cardstack/boxel-ui/helpers';
 import { isFieldDef, isFileDef, isPrimitive } from '@cardstack/runtime-common';
 import type { ResolvedCodeRef } from '@cardstack/runtime-common';
 
-import type { BaseDef, ViewCardFn } from 'https://cardstack.com/base/card-api';
-
 import PlaygroundPanel from './playground-panel';
 
+import type { BaseDef, ViewCardFn } from '@cardstack/base/card-api';
+
 interface UnsupportedMessageSignature {
   Args: {
     cardOrField?: typeof BaseDef;
diff --git a/packages/host/app/components/operator-mode/code-submode/schema-editor.gts b/packages/host/app/components/operator-mode/code-submode/schema-editor.gts
index 5bc4f4fdec3..3a044149e49 100644
--- a/packages/host/app/components/operator-mode/code-submode/schema-editor.gts
+++ b/packages/host/app/components/operator-mode/code-submode/schema-editor.gts
@@ -24,7 +24,7 @@ import {
   isSelectedItemIncompatibleWithSchemaEditor,
 } from '@cardstack/host/utils/schema-editor';
 
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
+import type { BaseDef } from '@cardstack/base/card-api';
 
 import type { WithBoundArgs } from '@glint/template';
 
diff --git a/packages/host/app/components/operator-mode/code-submode/spec-preview-badge.gts b/packages/host/app/components/operator-mode/code-submode/spec-preview-badge.gts
index 53c2f0bcebf..ba72ac27a1f 100644
--- a/packages/host/app/components/operator-mode/code-submode/spec-preview-badge.gts
+++ b/packages/host/app/components/operator-mode/code-submode/spec-preview-badge.gts
@@ -6,7 +6,7 @@ import Check from '@cardstack/boxel-icons/check';
 import { BoxelButton } from '@cardstack/boxel-ui/components';
 import { IconPlus } from '@cardstack/boxel-ui/icons';
 
-import type { Spec } from 'https://cardstack.com/base/spec';
+import type { Spec } from '@cardstack/base/spec';
 
 interface SpecPreviewBadgeSignature {
   Args: {
diff --git a/packages/host/app/components/operator-mode/code-submode/spec-preview.gts b/packages/host/app/components/operator-mode/code-submode/spec-preview.gts
index fcf975f1e36..d978c5c46eb 100644
--- a/packages/host/app/components/operator-mode/code-submode/spec-preview.gts
+++ b/packages/host/app/components/operator-mode/code-submode/spec-preview.gts
@@ -32,6 +32,7 @@ import {
   CardContextName,
   isSpecCard,
   loadCardDef,
+  cardIdToURL,
 } from '@cardstack/runtime-common';
 
 import CardRenderer from '@cardstack/host/components/card-renderer';
@@ -48,15 +49,14 @@ import type SpecPanelService from '@cardstack/host/services/spec-panel-service';
 import type StoreService from '@cardstack/host/services/store';
 import { runWhileActive } from '@cardstack/host/utils/run-while-active';
 
-import type { CardContext } from 'https://cardstack.com/base/card-api';
-import type { Spec } from 'https://cardstack.com/base/spec';
-
 import ElementTracker, {
   type RenderedCardForOverlayActions,
 } from '../../../resources/element-tracker';
 import Overlays from '../overlays';
 
 import type { CardDefOrId } from '../stack-item';
+import type { CardContext } from '@cardstack/base/card-api';
+import type { Spec } from '@cardstack/base/spec';
 import type { WithBoundArgs } from '@glint/template';
 
 interface Signature {
@@ -173,7 +173,7 @@ class SpecPreviewContent extends GlimmerComponent<ContentSignature> {
       return;
     }
 
-    const selectedUrl = new URL(this.selectedId);
+    const selectedUrl = cardIdToURL(this.selectedId);
     await this.operatorModeStateService.updateCodePath(selectedUrl);
   }
 
diff --git a/packages/host/app/components/operator-mode/container.gts b/packages/host/app/components/operator-mode/container.gts
index ff3717135a5..8f5b4605ce3 100644
--- a/packages/host/app/components/operator-mode/container.gts
+++ b/packages/host/app/components/operator-mode/container.gts
@@ -34,8 +34,6 @@ import { getCard } from '@cardstack/host/resources/card-resource';
 
 import type MessageService from '@cardstack/host/services/message-service';
 
-import type { CardContext } from 'https://cardstack.com/base/card-api';
-
 import CardCatalogModal from '../card-catalog/modal';
 import PrerenderedCardSearch from '../prerendered-card-search';
 import { Submodes } from '../submode-switcher';
@@ -49,6 +47,7 @@ import type MatrixService from '../../services/matrix-service';
 import type OperatorModeStateService from '../../services/operator-mode-state-service';
 import type RealmServerService from '../../services/realm-server';
 import type StoreService from '../../services/store';
+import type { CardContext } from '@cardstack/base/card-api';
 const waiter = buildWaiter('operator-mode-container:saveCard-waiter');
 
 interface Signature {
diff --git a/packages/host/app/components/operator-mode/copy-button.gts b/packages/host/app/components/operator-mode/copy-button.gts
index 73bf7c3ed56..f2c9bfbeb6c 100644
--- a/packages/host/app/components/operator-mode/copy-button.gts
+++ b/packages/host/app/components/operator-mode/copy-button.gts
@@ -20,12 +20,11 @@ import {
 
 import type { StackItem } from '@cardstack/host/lib/stack-item';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
 import consumeContext from '../../helpers/consume-context';
 
 import type OperatorModeStateService from '../../services/operator-mode-state-service';
 import type RealmService from '../../services/realm';
+import type { CardDef } from '@cardstack/base/card-api';
 
 interface Signature {
   Args: {
diff --git a/packages/host/app/components/operator-mode/create-file-modal.gts b/packages/host/app/components/operator-mode/create-file-modal.gts
index 0c9887a5d83..8fde243af72 100644
--- a/packages/host/app/components/operator-mode/create-file-modal.gts
+++ b/packages/host/app/components/operator-mode/create-file-modal.gts
@@ -53,10 +53,6 @@ import CopyCardToRealmCommand from '@cardstack/host/commands/copy-card';
 
 import type RealmService from '@cardstack/host/services/realm';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type { Spec } from 'https://cardstack.com/base/spec';
-import type { SpecType } from 'https://cardstack.com/base/spec';
-
 import { cleanseString } from '../../lib/utils';
 
 import ModalContainer from '../modal-container';
@@ -71,6 +67,9 @@ import type CardService from '../../services/card-service';
 import type CommandService from '../../services/command-service';
 import type NetworkService from '../../services/network';
 import type StoreService from '../../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type { SpecType } from '@cardstack/base/spec';
+import type { Spec } from '@cardstack/base/spec';
 
 export type NewFileType =
   | 'duplicate-instance'
@@ -836,7 +835,7 @@ export default class CreateFileModal extends Component<Signature> {
 
     let componentImport = isFileDef
       ? ''
-      : `\nimport { Component } from 'https://cardstack.com/base/card-api';`;
+      : `\nimport { Component } from '@cardstack/base/card-api';`;
 
     // There is actually only one possible declaration collision: `className` and `parent`,
     // reconcile that particular collision as necessary.
diff --git a/packages/host/app/components/operator-mode/create-listing-modal.gts b/packages/host/app/components/operator-mode/create-listing-modal.gts
index b679fa93135..5f08d64c606 100644
--- a/packages/host/app/components/operator-mode/create-listing-modal.gts
+++ b/packages/host/app/components/operator-mode/create-listing-modal.gts
@@ -21,6 +21,7 @@ import { IconX, IconPlus } from '@cardstack/boxel-ui/icons';
 import {
   chooseCard,
   isResolvedCodeRef,
+  cardIdToURL,
   removeFileExtension,
   type ResolvedCodeRef,
 } from '@cardstack/runtime-common';
@@ -164,7 +165,7 @@ export default class CreateListingModal extends Component<Signature> {
       }
       await this.operatorModeStateService.updateSubmode(Submodes.Code);
       await this.operatorModeStateService.updateCodePath(
-        new URL(cardUrl + '.json'),
+        cardIdToURL(cardUrl + '.json'),
         'preview',
       );
       this.operatorModeStateService.updateCardPreviewFormat('isolated');
diff --git a/packages/host/app/components/operator-mode/detail-panel-selector.gts b/packages/host/app/components/operator-mode/detail-panel-selector.gts
index 1b878b6f41c..236abc0689b 100644
--- a/packages/host/app/components/operator-mode/detail-panel-selector.gts
+++ b/packages/host/app/components/operator-mode/detail-panel-selector.gts
@@ -22,7 +22,7 @@ import {
   isReexportCardOrField,
 } from '@cardstack/host/resources/module-contents';
 
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
+import type { BaseDef } from '@cardstack/base/card-api';
 
 interface SelectorItemOptions {
   action: Function;
diff --git a/packages/host/app/components/operator-mode/detail-panel.gts b/packages/host/app/components/operator-mode/detail-panel.gts
index d27320b433a..2ef3b23bb59 100644
--- a/packages/host/app/components/operator-mode/detail-panel.gts
+++ b/packages/host/app/components/operator-mode/detail-panel.gts
@@ -56,8 +56,6 @@ import type CommandService from '@cardstack/host/services/command-service';
 import type RealmService from '@cardstack/host/services/realm';
 import type StoreService from '@cardstack/host/services/store';
 
-import type { CardDef, BaseDef } from 'https://cardstack.com/base/card-api';
-
 import { lastModifiedDate } from '../../resources/last-modified-date';
 
 import { PanelSection } from './code-submode/inner-container';
@@ -81,6 +79,7 @@ import type { SelectorItem } from './detail-panel-selector';
 import type { ModuleAnalysis } from '../../resources/module-contents';
 
 import type OperatorModeStateService from '../../services/operator-mode-state-service';
+import type { CardDef, BaseDef } from '@cardstack/base/card-api';
 
 interface Signature {
   Element: HTMLElement;
diff --git a/packages/host/app/components/operator-mode/edit-field-modal.gts b/packages/host/app/components/operator-mode/edit-field-modal.gts
index 058ae97e889..fc93da073e0 100644
--- a/packages/host/app/components/operator-mode/edit-field-modal.gts
+++ b/packages/host/app/components/operator-mode/edit-field-modal.gts
@@ -30,6 +30,7 @@ import {
   type CodeRef,
   isCardInstance,
   moduleFrom,
+  cardIdToURL,
 } from '@cardstack/runtime-common';
 
 import type { ModuleSyntax } from '@cardstack/runtime-common/module-syntax';
@@ -47,11 +48,11 @@ import type OperatorModeStateService from '@cardstack/host/services/operator-mod
 import type RealmService from '@cardstack/host/services/realm';
 import type StoreService from '@cardstack/host/services/store';
 
-import type { BaseDef, FieldType } from 'https://cardstack.com/base/card-api';
-import type { Spec } from 'https://cardstack.com/base/spec';
-
 import { SelectedTypePill } from './create-file-modal';
 
+import type { BaseDef, FieldType } from '@cardstack/base/card-api';
+import type { Spec } from '@cardstack/base/spec';
+
 interface Signature {
   Args: {
     file: Ready;
@@ -127,7 +128,7 @@ export default class EditFieldModal extends Component<Signature> {
     // When adding a new field, we want to default to the base string card
     if (!field) {
       let ref = {
-        module: 'https://cardstack.com/base/card-api', // This seems fundamental enough to be hardcoded
+        module: '@cardstack/base/card-api', // This seems fundamental enough to be hardcoded
         name: 'StringField',
       };
       this.isFieldDef = true;
@@ -141,8 +142,8 @@ export default class EditFieldModal extends Component<Signature> {
         throw error;
       }
 
-      this.fieldModuleURL = new URL(ref.module);
-      this.cardURL = new URL(ref.module);
+      this.fieldModuleURL = cardIdToURL(ref.module);
+      this.cardURL = cardIdToURL(ref.module);
       this.fieldRef = ref;
       return;
     }
@@ -160,8 +161,8 @@ export default class EditFieldModal extends Component<Signature> {
       });
 
       let moduleRef = moduleFrom(ref);
-      this.fieldModuleURL = new URL(moduleRef);
-      this.cardURL = new URL(moduleRef);
+      this.fieldModuleURL = cardIdToURL(moduleRef);
+      this.cardURL = cardIdToURL(moduleRef);
       this.fieldRef = ref;
 
       // Field's card can descend from a FieldDef or a CardDef, so we need to determine which one it is. We do this by checking the field's type -
@@ -185,11 +186,11 @@ export default class EditFieldModal extends Component<Signature> {
       if (spec && isCardInstance<Spec>(spec)) {
         this.fieldCard = await loadCardDef(spec.ref, {
           loader: this.loaderService.loader,
-          relativeTo: new URL(specId),
+          relativeTo: cardIdToURL(specId),
         });
 
         this.isFieldDef = spec.isField;
-        this.cardURL = new URL(spec.id);
+        this.cardURL = cardIdToURL(spec.id);
         this.fieldRef = spec.ref;
 
         // This transforms relative module paths, such as "../person", to absolute ones -
diff --git a/packages/host/app/components/operator-mode/error-display.gts b/packages/host/app/components/operator-mode/error-display.gts
index 204b0825ca1..2ed453865f9 100644
--- a/packages/host/app/components/operator-mode/error-display.gts
+++ b/packages/host/app/components/operator-mode/error-display.gts
@@ -21,11 +21,11 @@ import type CommandService from '@cardstack/host/services/command-service';
 import type ErrorDisplayService from '@cardstack/host/services/error-display';
 import type { DisplayedErrorProvider } from '@cardstack/host/services/error-display';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-import type { BoxelErrorForContext } from 'https://cardstack.com/base/matrix-event';
-
 import SendErrorToAIAssistant from './send-error-to-ai-assistant';
 
+import type { FileDef } from '@cardstack/base/file-api';
+import type { BoxelErrorForContext } from '@cardstack/base/matrix-event';
+
 interface Signature {
   Element: HTMLElement;
   Args: {
diff --git a/packages/host/app/components/operator-mode/host-submode.gts b/packages/host/app/components/operator-mode/host-submode.gts
index de3f900a38b..f3b44b268be 100644
--- a/packages/host/app/components/operator-mode/host-submode.gts
+++ b/packages/host/app/components/operator-mode/host-submode.gts
@@ -24,13 +24,12 @@ import type OperatorModeStateService from '@cardstack/host/services/operator-mod
 import type RealmService from '@cardstack/host/services/realm';
 import type StoreService from '@cardstack/host/services/store';
 
-import type { ViewCardFn } from 'https://cardstack.com/base/card-api';
-
 import HostModeContent from '../host-mode/content';
 
 import SubmodeLayout from './submode-layout';
 
 import type { PublishError } from './publish-realm-modal';
+import type { ViewCardFn } from '@cardstack/base/card-api';
 
 interface HostSubmodeSignature {
   Element: HTMLElement;
diff --git a/packages/host/app/components/operator-mode/interact-submode.gts b/packages/host/app/components/operator-mode/interact-submode.gts
index cdbc6ff087f..610a053de1a 100644
--- a/packages/host/app/components/operator-mode/interact-submode.gts
+++ b/packages/host/app/components/operator-mode/interact-submode.gts
@@ -49,6 +49,7 @@ import {
   type LocalPath,
   type ResolvedCodeRef,
   type Filter,
+  cardIdToURL,
 } from '@cardstack/runtime-common';
 
 import CopyCardToStackCommand from '@cardstack/host/commands/copy-card-to-stack';
@@ -61,13 +62,6 @@ import {
 
 import { stackBackgroundsResource } from '@cardstack/host/resources/stack-backgrounds';
 
-import type {
-  CardContext,
-  CardDef,
-  Format,
-} from 'https://cardstack.com/base/card-api';
-import type { Spec } from 'https://cardstack.com/base/spec';
-
 import consumeContext from '../../helpers/consume-context';
 
 import CopyButton from './copy-button';
@@ -93,6 +87,8 @@ import type Realm from '../../services/realm';
 import type RealmServer from '../../services/realm-server';
 import type RecentCardsService from '../../services/recent-cards-service';
 import type StoreService from '../../services/store';
+import type { CardContext, CardDef, Format } from '@cardstack/base/card-api';
+import type { Spec } from '@cardstack/base/spec';
 
 const waiter = buildWaiter('operator-mode:interact-submode-waiter');
 
@@ -424,7 +420,7 @@ export default class InteractSubmode extends Component {
         title: loadedCard.cardTitle,
       };
     } else {
-      let cardUrl = card instanceof URL ? card : new URL(card as string);
+      let cardUrl = card instanceof URL ? card : cardIdToURL(card as string);
       let loadedCard = await this.store.get(cardUrl.href);
       if (isCardInstance(loadedCard)) {
         cardToDelete = {
@@ -504,7 +500,7 @@ export default class InteractSubmode extends Component {
   private openSelectedSearchResultInStack = restartableTask(
     async (cardId: string) => {
       let waiterToken = waiter.beginAsync();
-      let url = new URL(cardId);
+      let url = cardIdToURL(cardId);
       try {
         let searchSheetTrigger = this.searchSheetTrigger; // Will be set by showSearchWithTrigger
 
diff --git a/packages/host/app/components/operator-mode/operator-mode-overlays.gts b/packages/host/app/components/operator-mode/operator-mode-overlays.gts
index d4923a2585b..8c8de3ae03e 100644
--- a/packages/host/app/components/operator-mode/operator-mode-overlays.gts
+++ b/packages/host/app/components/operator-mode/operator-mode-overlays.gts
@@ -40,12 +40,6 @@ import {
   getMenuItems,
 } from '@cardstack/runtime-common';
 
-import type {
-  CardCrudFunctions,
-  CardDef,
-  Format,
-} from 'https://cardstack.com/base/card-api';
-
 import { detectStackItemTypeForTarget } from '../../lib/stack-item';
 
 import { removeFileExtension } from '../card-search/utils';
@@ -57,6 +51,11 @@ import type { StackItemRenderedCardForOverlayActions } from './stack-item';
 
 import type { CardDefOrId } from './stack-item';
 import type StoreService from '../../services/store';
+import type {
+  CardCrudFunctions,
+  CardDef,
+  Format,
+} from '@cardstack/base/card-api';
 
 export default class OperatorModeOverlays extends Overlays {
   overlayClassName = 'actions-overlay';
diff --git a/packages/host/app/components/operator-mode/overlays.gts b/packages/host/app/components/operator-mode/overlays.gts
index ea193339691..b5115fc2edc 100644
--- a/packages/host/app/components/operator-mode/overlays.gts
+++ b/packages/host/app/components/operator-mode/overlays.gts
@@ -12,20 +12,15 @@ import { dropTask } from 'ember-concurrency';
 import { velcro } from 'ember-velcro';
 import { isEqual, omit } from 'lodash';
 
-import { localId as localIdSymbol } from '@cardstack/runtime-common';
+import { cardIdToURL, localId as localIdSymbol } from '@cardstack/runtime-common';
 
 import type CardService from '@cardstack/host/services/card-service';
 import type RealmService from '@cardstack/host/services/realm';
 
-import type {
-  CardDef,
-  Format,
-  ViewCardFn,
-} from 'https://cardstack.com/base/card-api';
-
 import type { CardDefOrId } from './stack-item';
 
 import type { RenderedCardForOverlayActions } from '../../resources/element-tracker';
+import type { CardDef, Format, ViewCardFn } from '@cardstack/base/card-api';
 import type { MiddlewareState } from '@floating-ui/dom';
 
 interface OverlaySignature {
@@ -263,7 +258,7 @@ export default class Overlays extends Component<OverlaySignature> {
       format = canWrite ? format : 'isolated';
       if (this.args.viewCard) {
         let target =
-          typeof cardDefOrId === 'string' ? new URL(cardId) : cardDefOrId;
+          typeof cardDefOrId === 'string' ? cardIdToURL(cardId) : cardDefOrId;
         await this.args.viewCard(
           target,
           format,
diff --git a/packages/host/app/components/operator-mode/preview-panel/fitted-format-gallery.gts b/packages/host/app/components/operator-mode/preview-panel/fitted-format-gallery.gts
index ab09148c09c..be4f89d7a3d 100644
--- a/packages/host/app/components/operator-mode/preview-panel/fitted-format-gallery.gts
+++ b/packages/host/app/components/operator-mode/preview-panel/fitted-format-gallery.gts
@@ -12,7 +12,7 @@ import {
   FITTED_FORMATS,
 } from '@cardstack/runtime-common';
 
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
+import type { BaseDef } from '@cardstack/base/card-api';
 
 interface Signature {
   Args: {
diff --git a/packages/host/app/components/operator-mode/preview-panel/index.gts b/packages/host/app/components/operator-mode/preview-panel/index.gts
index b6db2446a30..f4d7111e9b3 100644
--- a/packages/host/app/components/operator-mode/preview-panel/index.gts
+++ b/packages/host/app/components/operator-mode/preview-panel/index.gts
@@ -41,18 +41,18 @@ import type OperatorModeStateService from '@cardstack/host/services/operator-mod
 
 import type RealmService from '@cardstack/host/services/realm';
 
+import FormatChooser from '../code-submode/format-chooser';
+
+import FittedFormatGallery from './fitted-format-gallery';
+import MetadataPanel from './metadata-panel';
+
 import type {
   BaseDef,
   CardContext,
   CardDef,
   Format,
   ViewCardFn,
-} from 'https://cardstack.com/base/card-api';
-
-import FormatChooser from '../code-submode/format-chooser';
-
-import FittedFormatGallery from './fitted-format-gallery';
-import MetadataPanel from './metadata-panel';
+} from '@cardstack/base/card-api';
 
 interface Signature {
   Element: HTMLElement;
diff --git a/packages/host/app/components/operator-mode/preview-panel/metadata-panel.gts b/packages/host/app/components/operator-mode/preview-panel/metadata-panel.gts
index 476e2327308..f4d1b203fec 100644
--- a/packages/host/app/components/operator-mode/preview-panel/metadata-panel.gts
+++ b/packages/host/app/components/operator-mode/preview-panel/metadata-panel.gts
@@ -7,8 +7,8 @@ import { TrackedObject } from 'tracked-built-ins';
 
 import type StoreService from '@cardstack/host/services/store';
 
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
+import type { BaseDef } from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
 
 interface Signature {
   Args: {
diff --git a/packages/host/app/components/operator-mode/remove-field-modal.gts b/packages/host/app/components/operator-mode/remove-field-modal.gts
index f2c2b41e4bb..e2f285b01bd 100644
--- a/packages/host/app/components/operator-mode/remove-field-modal.gts
+++ b/packages/host/app/components/operator-mode/remove-field-modal.gts
@@ -16,7 +16,7 @@ import type { Ready } from '@cardstack/host/resources/file';
 
 import type { FieldOfType } from '@cardstack/host/services/card-type-service';
 
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
+import type { BaseDef } from '@cardstack/base/card-api';
 
 interface Signature {
   Args: {
diff --git a/packages/host/app/components/operator-mode/send-error-to-ai-assistant.gts b/packages/host/app/components/operator-mode/send-error-to-ai-assistant.gts
index f22e343d07f..329b4675c70 100644
--- a/packages/host/app/components/operator-mode/send-error-to-ai-assistant.gts
+++ b/packages/host/app/components/operator-mode/send-error-to-ai-assistant.gts
@@ -9,11 +9,10 @@ import { Button } from '@cardstack/boxel-ui/components';
 import OpenAiAssistantRoomCommand from '@cardstack/host/commands/open-ai-assistant-room';
 import SendAiAssistantMessageCommand from '@cardstack/host/commands/send-ai-assistant-message';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import type AiAssistantPanelService from '../../services/ai-assistant-panel-service';
 import type CommandService from '../../services/command-service';
 import type MatrixService from '../../services/matrix-service';
+import type { FileDef } from '@cardstack/base/file-api';
 
 interface Signature {
   Element: HTMLButtonElement;
diff --git a/packages/host/app/components/operator-mode/stack-item.gts b/packages/host/app/components/operator-mode/stack-item.gts
index da2abcc9182..12540eda02f 100644
--- a/packages/host/app/components/operator-mode/stack-item.gts
+++ b/packages/host/app/components/operator-mode/stack-item.gts
@@ -64,12 +64,6 @@ import {
 } from '@cardstack/host/lib/stack-item';
 import { urlForRealmLookup } from '@cardstack/host/lib/utils';
 
-import type {
-  CardContext,
-  CardCrudFunctions,
-  CardDef,
-} from 'https://cardstack.com/base/card-api';
-
 import consumeContext from '../../helpers/consume-context';
 import ElementTracker, {
   type RenderedCardForOverlayActions,
@@ -85,6 +79,11 @@ import type CardService from '../../services/card-service';
 import type OperatorModeStateService from '../../services/operator-mode-state-service';
 import type RealmService from '../../services/realm';
 import type StoreService from '../../services/store';
+import type {
+  CardContext,
+  CardCrudFunctions,
+  CardDef,
+} from '@cardstack/base/card-api';
 
 export interface StackItemComponentAPI {
   clearSelections: () => void;
diff --git a/packages/host/app/components/operator-mode/stack.gts b/packages/host/app/components/operator-mode/stack.gts
index c04492f1bbf..f2eeff0ca27 100644
--- a/packages/host/app/components/operator-mode/stack.gts
+++ b/packages/host/app/components/operator-mode/stack.gts
@@ -12,19 +12,18 @@ import {
 
 import type { StackItem } from '@cardstack/host/lib/stack-item';
 
+import OperatorModeStackItem, {
+  type StackItemComponentAPI,
+} from './stack-item';
+
+import type { CardDefOrId } from './stack-item';
 import type {
   CreateCardFn,
   DeleteCardFn,
   EditCardFn,
   SaveCardFn,
   ViewCardFn,
-} from 'https://cardstack.com/base/card-api';
-
-import OperatorModeStackItem, {
-  type StackItemComponentAPI,
-} from './stack-item';
-
-import type { CardDefOrId } from './stack-item';
+} from '@cardstack/base/card-api';
 
 interface Signature {
   Element: HTMLElement;
diff --git a/packages/host/app/components/prerendered-card-search.gts b/packages/host/app/components/prerendered-card-search.gts
index 0888b7cdb52..4652020300d 100644
--- a/packages/host/app/components/prerendered-card-search.gts
+++ b/packages/host/app/components/prerendered-card-search.gts
@@ -21,14 +21,14 @@ import {
   type ResolvedCodeRef,
 } from '@cardstack/runtime-common';
 
-import type { CardContext, CardDef } from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import { type HTMLComponent, htmlComponent } from '../lib/html-component';
 import { getLivePrerenderedSearch } from '../resources/live-prerendered-search';
 import { getPrerenderedSearch } from '../resources/prerendered-search';
 import { getSearch } from '../resources/search';
 
+import type { CardContext, CardDef } from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
+
 const OWNER_DESTROYED_ERROR =
   "Cannot call `.lookup('renderer:-dom')` after the owner has been destroyed";
 
diff --git a/packages/host/app/helpers/subscribe-to-realms.ts b/packages/host/app/helpers/subscribe-to-realms.ts
index 5401ae17125..5998d2a7495 100644
--- a/packages/host/app/helpers/subscribe-to-realms.ts
+++ b/packages/host/app/helpers/subscribe-to-realms.ts
@@ -4,7 +4,7 @@ import { isEqual } from 'lodash';
 
 import { subscribeToRealm } from '@cardstack/runtime-common';
 
-import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event';
+import type { RealmEventContent } from '@cardstack/base/matrix-event';
 
 interface Signature {
   Args: {
diff --git a/packages/host/app/lib/command-definitions.ts b/packages/host/app/lib/command-definitions.ts
index 397272d88f5..988c8068ef6 100644
--- a/packages/host/app/lib/command-definitions.ts
+++ b/packages/host/app/lib/command-definitions.ts
@@ -1,4 +1,4 @@
-import type * as SkillModule from 'https://cardstack.com/base/skill';
+import type * as SkillModule from '@cardstack/base/skill';
 
 export function isValidCommandDefinition(
   commandDefinition?: SkillModule.CommandField,
diff --git a/packages/host/app/lib/field-path-parser.ts b/packages/host/app/lib/field-path-parser.ts
index 942289e2f3a..ff167824a77 100644
--- a/packages/host/app/lib/field-path-parser.ts
+++ b/packages/host/app/lib/field-path-parser.ts
@@ -1,4 +1,4 @@
-import type { CardDef } from 'https://cardstack.com/base/card-api';
+import type { CardDef } from '@cardstack/base/card-api';
 
 export type ValidateFieldPathResult =
   | {
diff --git a/packages/host/app/lib/file-def-manager.ts b/packages/host/app/lib/file-def-manager.ts
index d359fad5f35..a46c5185131 100644
--- a/packages/host/app/lib/file-def-manager.ts
+++ b/packages/host/app/lib/file-def-manager.ts
@@ -22,27 +22,23 @@ import {
 import { canonicalizeMatrixMediaKey } from '@cardstack/runtime-common/ai/matrix-utils';
 import { basicMappings } from '@cardstack/runtime-common/helpers/ai';
 
-import type { default as Base64ImageFieldType } from 'https://cardstack.com/base/base64-image';
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as FileAPI from 'https://cardstack.com/base/file-api';
-import type {
-  FileDef,
-  SerializedFile,
-} from 'https://cardstack.com/base/file-api';
-import type {
-  CommandDefinitionSchema,
-  Tool,
-} from 'https://cardstack.com/base/matrix-event';
-
-import type { MatrixEvent } from 'https://cardstack.com/base/matrix-event';
-import type * as SkillModule from 'https://cardstack.com/base/skill';
-
 import type CardService from '../services/card-service';
 import type CommandService from '../services/command-service';
 import type LoaderService from '../services/loader-service';
 import type { ExtendedClient } from '../services/matrix-sdk-loader';
 import type NetworkService from '../services/network';
+import type { default as Base64ImageFieldType } from '@cardstack/base/base64-image';
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type * as FileAPI from '@cardstack/base/file-api';
+import type { FileDef, SerializedFile } from '@cardstack/base/file-api';
+import type {
+  CommandDefinitionSchema,
+  Tool,
+} from '@cardstack/base/matrix-event';
+
+import type { MatrixEvent } from '@cardstack/base/matrix-event';
+import type * as SkillModule from '@cardstack/base/skill';
 
 export const isSkillCard = Symbol.for('is-skill-card');
 
diff --git a/packages/host/app/lib/gc-card-store.ts b/packages/host/app/lib/gc-card-store.ts
index 53e1b0ff952..bf4aa679d59 100644
--- a/packages/host/app/lib/gc-card-store.ts
+++ b/packages/host/app/lib/gc-card-store.ts
@@ -30,9 +30,9 @@ import type {
   CardStore,
   GetSearchResourceFuncOpts,
   StoreSearchResource,
-} from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
+} from '@cardstack/base/card-api';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
 
 export type ReferenceCount = Map<string, number>;
 
diff --git a/packages/host/app/lib/host-base-command.ts b/packages/host/app/lib/host-base-command.ts
index d1edb1bb320..ae2995462aa 100644
--- a/packages/host/app/lib/host-base-command.ts
+++ b/packages/host/app/lib/host-base-command.ts
@@ -5,10 +5,9 @@ import { Command, type CommandContext } from '@cardstack/runtime-common';
 
 import { baseRealm } from '@cardstack/runtime-common';
 
-import type { CardDefConstructor } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
-
 import type LoaderService from '../services/loader-service';
+import type { CardDefConstructor } from '@cardstack/base/card-api';
+import type * as BaseCommandModule from '@cardstack/base/command';
 
 export default abstract class HostBaseCommand<
   CardInputType extends CardDefConstructor | undefined,
diff --git a/packages/host/app/lib/isolated-render.gts b/packages/host/app/lib/isolated-render.gts
index 407b488fa62..31640bcc4f0 100644
--- a/packages/host/app/lib/isolated-render.gts
+++ b/packages/host/app/lib/isolated-render.gts
@@ -9,7 +9,7 @@ import { resetTracking } from '@glimmer/validator';
 
 import { CardError } from '@cardstack/runtime-common/error';
 
-import type { Format } from 'https://cardstack.com/base/card-api';
+import type { Format } from '@cardstack/base/card-api';
 
 import type { ComponentLike } from '@glint/template';
 
diff --git a/packages/host/app/lib/matrix-classes/message-builder.ts b/packages/host/app/lib/matrix-classes/message-builder.ts
index 6c129dc6cf6..c12e7dd9617 100644
--- a/packages/host/app/lib/matrix-classes/message-builder.ts
+++ b/packages/host/app/lib/matrix-classes/message-builder.ts
@@ -38,8 +38,15 @@ import type LoaderService from '@cardstack/host/services/loader-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type StoreService from '@cardstack/host/services/store';
 
-import type { CommandStatus } from 'https://cardstack.com/base/command';
-import type { SerializedFile } from 'https://cardstack.com/base/file-api';
+import { Message } from './message';
+
+import MessageCodePatchResult from './message-code-patch-result';
+
+import MessageCommand from './message-command';
+
+import type { RoomMember } from './member';
+import type { CommandStatus } from '@cardstack/base/command';
+import type { SerializedFile } from '@cardstack/base/file-api';
 import type {
   CardMessageContent,
   CardMessageEvent,
@@ -48,14 +55,8 @@ import type {
   CommandResultEvent,
   MatrixEvent as DiscreteMatrixEvent,
   MessageEvent,
-} from 'https://cardstack.com/base/matrix-event';
-import type { Skill } from 'https://cardstack.com/base/skill';
-
-import { Message } from './message';
-import MessageCodePatchResult from './message-code-patch-result';
-import MessageCommand from './message-command';
-
-import type { RoomMember } from './member';
+} from '@cardstack/base/matrix-event';
+import type { Skill } from '@cardstack/base/skill';
 
 const ErrorMessage: Record<string, string> = {
   ['M_TOO_LARGE']: 'Message is too large',
diff --git a/packages/host/app/lib/matrix-classes/message-code-patch-result.ts b/packages/host/app/lib/matrix-classes/message-code-patch-result.ts
index 62d875383e9..64409e3ac8f 100644
--- a/packages/host/app/lib/matrix-classes/message-code-patch-result.ts
+++ b/packages/host/app/lib/matrix-classes/message-code-patch-result.ts
@@ -8,9 +8,8 @@ import type CommandService from '@cardstack/host/services/command-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type StoreService from '@cardstack/host/services/store';
 
-import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event';
-
 import type { Message } from './message';
+import type { CodePatchStatus } from '@cardstack/base/matrix-event';
 
 export default class MessageCodePatchResult {
   @tracked index: number;
diff --git a/packages/host/app/lib/matrix-classes/message-command.ts b/packages/host/app/lib/matrix-classes/message-command.ts
index 8a64cf83678..03826536e80 100644
--- a/packages/host/app/lib/matrix-classes/message-command.ts
+++ b/packages/host/app/lib/matrix-classes/message-command.ts
@@ -11,10 +11,9 @@ import type CommandService from '@cardstack/host/services/command-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type StoreService from '@cardstack/host/services/store';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type { SerializedFile } from 'https://cardstack.com/base/file-api';
-
 import type { Message } from './message';
+import type { CardDef } from '@cardstack/base/card-api';
+import type { SerializedFile } from '@cardstack/base/file-api';
 
 type CommandStatus = 'applied' | 'ready' | 'applying' | 'invalid';
 
diff --git a/packages/host/app/lib/matrix-classes/message.ts b/packages/host/app/lib/matrix-classes/message.ts
index a48cf56f9ca..aad7f595ff6 100644
--- a/packages/host/app/lib/matrix-classes/message.ts
+++ b/packages/host/app/lib/matrix-classes/message.ts
@@ -11,13 +11,12 @@ import {
   type HtmlTagGroup,
 } from '@cardstack/host/lib/formatted-message/utils';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import type { RoomMember } from './member';
 
 import type MessageCodePatchResult from './message-code-patch-result';
 
 import type MessageCommand from './message-command';
+import type { FileDef } from '@cardstack/base/file-api';
 import type { EventStatus } from 'matrix-js-sdk';
 
 const ErrorMessage: Record<string, string> = {
diff --git a/packages/host/app/lib/matrix-classes/room.ts b/packages/host/app/lib/matrix-classes/room.ts
index 91bdcfd2d7c..1d17dc57f04 100644
--- a/packages/host/app/lib/matrix-classes/room.ts
+++ b/packages/host/app/lib/matrix-classes/room.ts
@@ -9,13 +9,13 @@ import {
   type LLMMode,
 } from '@cardstack/runtime-common/matrix-constants';
 
-import type { SerializedFile } from 'https://cardstack.com/base/file-api';
+import Mutex from '../mutex';
+
+import type { SerializedFile } from '@cardstack/base/file-api';
 import type {
   ActiveLLMEvent,
   MatrixEvent as DiscreteMatrixEvent,
-} from 'https://cardstack.com/base/matrix-event';
-
-import Mutex from '../mutex';
+} from '@cardstack/base/matrix-event';
 
 import type { IEvent } from 'matrix-js-sdk';
 
diff --git a/packages/host/app/lib/realm-utils.ts b/packages/host/app/lib/realm-utils.ts
index 24a46614676..cdd6f4643db 100644
--- a/packages/host/app/lib/realm-utils.ts
+++ b/packages/host/app/lib/realm-utils.ts
@@ -1,4 +1,8 @@
-import { cardIdToURL, RealmPaths } from '@cardstack/runtime-common';
+import {
+  cardIdToURL,
+  isRegisteredPrefix,
+  RealmPaths,
+} from '@cardstack/runtime-common';
 
 /**
  * Normalizes realm URLs by ensuring they have trailing slashes and
@@ -12,9 +16,11 @@ import { cardIdToURL, RealmPaths } from '@cardstack/runtime-common';
  * // Returns: ['http://localhost:4201/test/', 'http://localhost:4201/demo/']
  */
 export function normalizeRealms(realms: string[]): string[] {
-  return realms.map((r) => {
-    return new RealmPaths(new URL(r)).url;
-  });
+  return realms
+    .filter((r) => !isRegisteredPrefix(r))
+    .map((r) => {
+      return new RealmPaths(new URL(r)).url;
+    });
 }
 
 /**
diff --git a/packages/host/app/lib/stack-item.ts b/packages/host/app/lib/stack-item.ts
index 2f84e9d9572..51ecb23331c 100644
--- a/packages/host/app/lib/stack-item.ts
+++ b/packages/host/app/lib/stack-item.ts
@@ -2,7 +2,7 @@ import { isFileDefInstance } from '@cardstack/runtime-common';
 import type { Deferred } from '@cardstack/runtime-common';
 import type { Store, StoreReadType } from '@cardstack/runtime-common';
 
-import type { Format } from 'https://cardstack.com/base/card-api';
+import type { Format } from '@cardstack/base/card-api';
 
 interface Args {
   format: Format;
diff --git a/packages/host/app/lib/utils.ts b/packages/host/app/lib/utils.ts
index 3887b5897ee..cf907f2f417 100644
--- a/packages/host/app/lib/utils.ts
+++ b/packages/host/app/lib/utils.ts
@@ -13,7 +13,7 @@ export {
 
 import ENV from '@cardstack/host/config/environment';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
+import type { CardDef } from '@cardstack/base/card-api';
 
 export function stripFileExtension(path: string): string {
   return path.replace(/\.[^/.]+$/, '');
diff --git a/packages/host/app/resources/card-collection.ts b/packages/host/app/resources/card-collection.ts
index 0dc3ef5bbe9..75385ddf72d 100644
--- a/packages/host/app/resources/card-collection.ts
+++ b/packages/host/app/resources/card-collection.ts
@@ -17,9 +17,8 @@ import {
   type CardErrorJSONAPI as CardError,
 } from '@cardstack/runtime-common';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
 import type StoreService from '../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
 
 interface Args {
   named: {
diff --git a/packages/host/app/resources/card-resource.ts b/packages/host/app/resources/card-resource.ts
index 189304b0427..814d11084eb 100644
--- a/packages/host/app/resources/card-resource.ts
+++ b/packages/host/app/resources/card-resource.ts
@@ -11,9 +11,8 @@ import { isCardInstance, isFileDefInstance } from '@cardstack/runtime-common';
 
 import type { StoreReadType } from '@cardstack/runtime-common';
 
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
-
 import type StoreService from '../services/store';
+import type { BaseDef } from '@cardstack/base/card-api';
 
 interface Args {
   named: {
diff --git a/packages/host/app/resources/card-type.ts b/packages/host/app/resources/card-type.ts
index 0df11e3a09a..2c9f5a08083 100644
--- a/packages/host/app/resources/card-type.ts
+++ b/packages/host/app/resources/card-type.ts
@@ -8,7 +8,7 @@ import type { Type } from '@cardstack/host/services/card-type-service';
 
 import type CardTypeService from '@cardstack/host/services/card-type-service';
 
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
+import type { BaseDef } from '@cardstack/base/card-api';
 
 interface Args {
   named: {
diff --git a/packages/host/app/resources/code-diff.ts b/packages/host/app/resources/code-diff.ts
index 93f42c643d0..143a6d063e5 100644
--- a/packages/host/app/resources/code-diff.ts
+++ b/packages/host/app/resources/code-diff.ts
@@ -7,10 +7,10 @@ import { Resource } from 'ember-modify-based-class-resource';
 import type CardService from '@cardstack/host/services/card-service';
 import type CommandService from '@cardstack/host/services/command-service';
 
-import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event';
-
 import ApplySearchReplaceBlockCommand from '../commands/apply-search-replace-block';
 
+import type { CodePatchStatus } from '@cardstack/base/matrix-event';
+
 interface CodeDiffResourceArgs {
   named: {
     fileUrl?: string | null;
diff --git a/packages/host/app/resources/directory.ts b/packages/host/app/resources/directory.ts
index ff485fd09e7..78b868bb229 100644
--- a/packages/host/app/resources/directory.ts
+++ b/packages/host/app/resources/directory.ts
@@ -12,11 +12,10 @@ import {
   type Relationship,
 } from '@cardstack/runtime-common';
 
-import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event';
-
 import type LoaderService from '../services/loader-service';
 import type MessageService from '../services/message-service';
 import type NetworkService from '../services/network';
+import type { RealmEventContent } from '@cardstack/base/matrix-event';
 
 const log = logger('resource:directory');
 
diff --git a/packages/host/app/resources/element-tracker.ts b/packages/host/app/resources/element-tracker.ts
index 1b161efe26b..7698f081582 100644
--- a/packages/host/app/resources/element-tracker.ts
+++ b/packages/host/app/resources/element-tracker.ts
@@ -6,11 +6,7 @@ import type { SafeString } from '@ember/template';
 import Modifier from 'ember-modifier';
 import { TrackedArray } from 'tracked-built-ins';
 
-import type {
-  CardDef,
-  Format,
-  FieldType,
-} from 'https://cardstack.com/base/card-api';
+import type { CardDef, Format, FieldType } from '@cardstack/base/card-api';
 
 import type { ArgsFor } from 'ember-modifier';
 
diff --git a/packages/host/app/resources/file.ts b/packages/host/app/resources/file.ts
index eea0862ee60..38e320f4a77 100644
--- a/packages/host/app/resources/file.ts
+++ b/packages/host/app/resources/file.ts
@@ -17,11 +17,10 @@ import type OperatorModeStateService from '@cardstack/host/services/operator-mod
 import type RecentFilesService from '@cardstack/host/services/recent-files-service';
 import type StoreService from '@cardstack/host/services/store';
 
-import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event';
-
 import type LoaderService from '../services/loader-service';
 import type MessageService from '../services/message-service';
 import type NetworkService from '../services/network';
+import type { RealmEventContent } from '@cardstack/base/matrix-event';
 
 const log = logger('resource:file');
 const realmEventsLogger = logger('realm:events');
diff --git a/packages/host/app/resources/inheritance-chain.ts b/packages/host/app/resources/inheritance-chain.ts
index e8d44a2083b..2e831623152 100644
--- a/packages/host/app/resources/inheritance-chain.ts
+++ b/packages/host/app/resources/inheritance-chain.ts
@@ -4,12 +4,12 @@ import { tracked } from '@glimmer/tracking';
 import { task } from 'ember-concurrency';
 import { Resource } from 'ember-modify-based-class-resource';
 
-import { loadCardDef } from '@cardstack/runtime-common';
+import { loadCardDef, cardIdToURL } from '@cardstack/runtime-common';
 
 import type { Type } from '@cardstack/host/services/card-type-service';
 import type LoaderService from '@cardstack/host/services/loader-service';
 
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
+import type { BaseDef } from '@cardstack/base/card-api';
 
 interface Args {
   named: {
@@ -64,7 +64,7 @@ export class InheritanceChainResource extends Resource<Args> {
 
         let superCard = await loadCardDef(cardType.codeRef, {
           loader: this.loaderService.loader,
-          relativeTo: new URL(url),
+          relativeTo: cardIdToURL(url),
         });
 
         cardInheritanceChain.push({
diff --git a/packages/host/app/resources/live-prerendered-search.ts b/packages/host/app/resources/live-prerendered-search.ts
index d8362d5705c..1d687915b22 100644
--- a/packages/host/app/resources/live-prerendered-search.ts
+++ b/packages/host/app/resources/live-prerendered-search.ts
@@ -13,15 +13,14 @@ import { TrackedArray } from 'tracked-built-ins';
 import type { QueryResultsMeta, Format } from '@cardstack/runtime-common';
 import { Loader } from '@cardstack/runtime-common/loader';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import { PrerenderedCard } from '../components/prerendered-card-search';
 import { normalizeRealms, resolveCardRealmUrl } from '../lib/realm-utils';
 
 import type LoaderService from '../services/loader-service';
 import type RenderService from '../services/render-service';
 import type RenderStoreService from '../services/render-store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
 
 const waiter = buildWaiter('live-prerendered-search-resource:render-waiter');
 
diff --git a/packages/host/app/resources/prerendered-search.ts b/packages/host/app/resources/prerendered-search.ts
index 9a37a5f83a7..3ee267c4b5e 100644
--- a/packages/host/app/resources/prerendered-search.ts
+++ b/packages/host/app/resources/prerendered-search.ts
@@ -22,13 +22,12 @@ import type { Query, Format } from '@cardstack/runtime-common';
 import type { PrerenderedCardCollectionDocument } from '@cardstack/runtime-common/document-types';
 import { isPrerenderedCardCollectionDocument } from '@cardstack/runtime-common/document-types';
 
-import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event';
-
 import { PrerenderedCard } from '../components/prerendered-card-search';
 import { normalizeRealms, resolveCardRealmUrl } from '../lib/realm-utils';
 
 import type LoaderService from '../services/loader-service';
 import type RealmServerService from '../services/realm-server';
+import type { RealmEventContent } from '@cardstack/base/matrix-event';
 
 const waiter = buildWaiter('prerendered-search-resource:search-waiter');
 
diff --git a/packages/host/app/resources/room.ts b/packages/host/app/resources/room.ts
index 6508b96f6b9..0ce5dc7820d 100644
--- a/packages/host/app/resources/room.ts
+++ b/packages/host/app/resources/room.ts
@@ -30,25 +30,6 @@ import {
   type LLMMode,
 } from '@cardstack/runtime-common/matrix-constants';
 
-import type { SerializedFile } from 'https://cardstack.com/base/file-api';
-import type {
-  MatrixEvent as DiscreteMatrixEvent,
-  RoomCreateEvent,
-  RoomNameEvent,
-  InviteEvent,
-  JoinEvent,
-  LeaveEvent,
-  CardMessageEvent,
-  DebugMessageEvent,
-  MessageEvent,
-  CommandResultEvent,
-  RealmServerEvent,
-  CodePatchResultEvent,
-  ActiveLLMEvent,
-} from 'https://cardstack.com/base/matrix-event';
-
-import type { Skill } from 'https://cardstack.com/base/skill';
-
 import {
   RoomMember,
   type RoomMemberInterface,
@@ -65,6 +46,23 @@ import type MatrixService from '../services/matrix-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
+import type { SerializedFile } from '@cardstack/base/file-api';
+import type {
+  MatrixEvent as DiscreteMatrixEvent,
+  RoomCreateEvent,
+  RoomNameEvent,
+  InviteEvent,
+  JoinEvent,
+  LeaveEvent,
+  CardMessageEvent,
+  DebugMessageEvent,
+  MessageEvent,
+  CommandResultEvent,
+  RealmServerEvent,
+  CodePatchResultEvent,
+  ActiveLLMEvent,
+} from '@cardstack/base/matrix-event';
+import type { Skill } from '@cardstack/base/skill';
 import type { TaskInstance } from 'ember-concurrency';
 import type { IRoomEvent } from 'matrix-js-sdk';
 
diff --git a/packages/host/app/resources/search-data.ts b/packages/host/app/resources/search-data.ts
index 1553dacdbd4..f42a53d42b6 100644
--- a/packages/host/app/resources/search-data.ts
+++ b/packages/host/app/resources/search-data.ts
@@ -26,10 +26,9 @@ import {
 } from '@cardstack/runtime-common';
 import type { DataQuery } from '@cardstack/runtime-common/query';
 
-import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event';
-
 import type RealmServerService from '../services/realm-server';
 import type StoreService from '../services/store';
+import type { RealmEventContent } from '@cardstack/base/matrix-event';
 
 const waiter = buildWaiter('search-data-resource:search-waiter');
 
diff --git a/packages/host/app/resources/search.ts b/packages/host/app/resources/search.ts
index 4cd9bb5f208..090a3c4b4f4 100644
--- a/packages/host/app/resources/search.ts
+++ b/packages/host/app/resources/search.ts
@@ -28,12 +28,11 @@ import {
 } from '@cardstack/runtime-common';
 import type { Query } from '@cardstack/runtime-common/query';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event';
-
 import type RealmServerService from '../services/realm-server';
 import type StoreService from '../services/store';
+import type { CardDef } from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
+import type { RealmEventContent } from '@cardstack/base/matrix-event';
 
 const waiter = buildWaiter('search-resource:search-waiter');
 
diff --git a/packages/host/app/routes/command-runner.ts b/packages/host/app/routes/command-runner.ts
index bebd9c0c9d8..016b248b506 100644
--- a/packages/host/app/routes/command-runner.ts
+++ b/packages/host/app/routes/command-runner.ts
@@ -16,16 +16,12 @@ import {
   parseBoxelHostCommandSpecifier,
 } from '@cardstack/runtime-common';
 
-import type {
-  CardDef,
-  CardDefConstructor,
-} from 'https://cardstack.com/base/card-api';
-
 import { registerBoxelTransitionTo } from '../utils/register-boxel-transition';
 
 import type CardService from '../services/card-service';
 import type LoaderService from '../services/loader-service';
 import type RealmService from '../services/realm';
+import type { CardDef, CardDefConstructor } from '@cardstack/base/card-api';
 
 const commandRequestStorageKeyPrefix = 'boxel-command-request:';
 const commandRequestTtlMs = 5 * 60 * 1000;
diff --git a/packages/host/app/routes/module.ts b/packages/host/app/routes/module.ts
index 72dee9065a4..4db2695d8fa 100644
--- a/packages/host/app/routes/module.ts
+++ b/packages/host/app/routes/module.ts
@@ -30,6 +30,7 @@ import {
   getFieldDefinitions,
   CardError,
   unixTime,
+  cardIdToURL,
   type RenderRouteOptions,
 } from '@cardstack/runtime-common';
 import {
@@ -38,9 +39,6 @@ import {
   type SerializedError,
 } from '@cardstack/runtime-common/error';
 
-import type { CardDef, BaseDef } from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-
 import { createAuthErrorGuard } from '../utils/auth-error-guard';
 import { registerBoxelTransitionTo } from '../utils/register-boxel-transition';
 import { ensureMessageIncludesUrl, stripSelfDeps } from '../utils/render-error';
@@ -53,6 +51,8 @@ import type LoaderService from '../services/loader-service';
 import type NetworkService from '../services/network';
 import type RealmService from '../services/realm';
 import type RenderStoreService from '../services/render-store';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type { CardDef, BaseDef } from '@cardstack/base/card-api';
 
 export type Model = {
   id: string;
@@ -192,7 +192,7 @@ export async function buildModuleModel(
   context: ModuleModelContext,
 ): Promise<Model> {
   let parsedOptions = renderOptions ?? {};
-  let moduleURL = trimExecutableExtension(new URL(id));
+  let moduleURL = trimExecutableExtension(cardIdToURL(id));
   registerBoxelTransitionTo(context.router);
 
   if (parsedOptions.clearCache) {
@@ -282,7 +282,7 @@ export async function buildModuleModel(
         let consumes = (
           await context.loaderService.loader.getConsumedModules(id)
         ).filter((u) => u !== id);
-        deps = consumes.map((d) => trimExecutableExtension(new URL(d)).href);
+        deps = consumes.map((d) => trimExecutableExtension(cardIdToURL(d)).href);
         let lastModifiedRFC7321 = response.headers.get('last-modified');
         let createdAtRFC7321 = response.headers.get('x-created');
         if (!lastModifiedRFC7321) {
@@ -386,7 +386,7 @@ async function makeDefinition(
     return {
       type: 'definition',
       definition,
-      moduleURL: trimExecutableExtension(new URL(url)).href,
+      moduleURL: trimExecutableExtension(cardIdToURL(url)).href,
       types: typesMaybeError.types.map(({ refURL }) => refURL),
     };
   } catch (err: any) {
diff --git a/packages/host/app/routes/render.ts b/packages/host/app/routes/render.ts
index 632304e2606..e865a6cea91 100644
--- a/packages/host/app/routes/render.ts
+++ b/packages/host/app/routes/render.ts
@@ -32,9 +32,6 @@ import {
 import { Deferred } from '@cardstack/runtime-common/deferred';
 import { serializableError } from '@cardstack/runtime-common/error';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-
 import {
   windowErrorHandler,
   errorJsonApiToErrorEntry,
@@ -61,6 +58,8 @@ import type RealmService from '../services/realm';
 import type RealmServerService from '../services/realm-server';
 import type RenderErrorStateService from '../services/render-error-state';
 import type RenderStoreService from '../services/render-store';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type { CardDef } from '@cardstack/base/card-api';
 
 type RenderStatus = 'loading' | 'ready' | 'error' | 'unusable';
 
diff --git a/packages/host/app/routes/render/html.ts b/packages/host/app/routes/render/html.ts
index 70e84ea1812..5850e969e22 100644
--- a/packages/host/app/routes/render/html.ts
+++ b/packages/host/app/routes/render/html.ts
@@ -4,15 +4,10 @@ import { service } from '@ember/service';
 
 import { isValidFormat } from '@cardstack/runtime-common';
 
-import type {
-  BoxComponent,
-  CardDef,
-  Format,
-} from 'https://cardstack.com/base/card-api';
-
 import { getClass, getTypes } from './meta';
 
 import type { Model as ParentModel } from '../render';
+import type { BoxComponent, CardDef, Format } from '@cardstack/base/card-api';
 
 export interface Model {
   instance: CardDef;
diff --git a/packages/host/app/routes/render/icon.ts b/packages/host/app/routes/render/icon.ts
index 140ea64aeb8..200e8928fad 100644
--- a/packages/host/app/routes/render/icon.ts
+++ b/packages/host/app/routes/render/icon.ts
@@ -2,12 +2,8 @@ import Route from '@ember/routing/route';
 
 import { cardTypeIcon } from '@cardstack/runtime-common';
 
-import type {
-  CardOrFieldTypeIcon,
-  CardDef,
-} from 'https://cardstack.com/base/card-api';
-
 import type { Model as ParentModel } from '../render';
+import type { CardOrFieldTypeIcon, CardDef } from '@cardstack/base/card-api';
 
 export interface Model {
   Component: CardOrFieldTypeIcon;
diff --git a/packages/host/app/routes/render/meta.ts b/packages/host/app/routes/render/meta.ts
index 336ccc90008..37253540faa 100644
--- a/packages/host/app/routes/render/meta.ts
+++ b/packages/host/app/routes/render/meta.ts
@@ -22,11 +22,10 @@ import {
 
 import type CardService from '@cardstack/host/services/card-service';
 
-import type { BaseDef, CardDef } from 'https://cardstack.com/base/card-api';
-
 import { friendlyCardType } from '../../utils/render-error';
 
 import type { Model as ParentModel } from '../render';
+import type { BaseDef, CardDef } from '@cardstack/base/card-api';
 
 export type Model = PrerenderMeta | RenderError | undefined;
 
diff --git a/packages/host/app/services/ai-assistant-panel-service.ts b/packages/host/app/services/ai-assistant-panel-service.ts
index cb75bbd4075..76b76ad3fc1 100644
--- a/packages/host/app/services/ai-assistant-panel-service.ts
+++ b/packages/host/app/services/ai-assistant-panel-service.ts
@@ -12,12 +12,6 @@ import window from 'ember-window-mock';
 import { isCardInstance } from '@cardstack/runtime-common';
 import type { LLMMode } from '@cardstack/runtime-common/matrix-constants';
 
-import type { CardDef, Format } from 'https://cardstack.com/base/card-api';
-import type * as CommandModule from 'https://cardstack.com/base/command';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
-import type { Skill as SkillCard } from 'https://cardstack.com/base/skill';
-
 import CreateAiAssistantRoomCommand from '../commands/create-ai-assistant-room';
 
 import SummarizeSessionCommand from '../commands/summarize-session';
@@ -39,6 +33,10 @@ import type OperatorModeStateService from './operator-mode-state-service';
 import type ResetService from './reset';
 import type StoreService from './store';
 import type { Message } from '../lib/matrix-classes/message';
+import type { CardDef, Format } from '@cardstack/base/card-api';
+import type * as CommandModule from '@cardstack/base/command';
+import type { FileDef } from '@cardstack/base/file-api';
+import type { Skill as SkillCard } from '@cardstack/base/skill';
 
 export interface SessionRoomData {
   roomId: string;
@@ -89,7 +87,7 @@ export default class AiAssistantPanelService extends Service {
 
   private commandModuleResource = importResource(
     this,
-    () => 'https://cardstack.com/base/command',
+    () => '@cardstack/base/command',
   );
 
   get commandModule() {
diff --git a/packages/host/app/services/card-service.ts b/packages/host/app/services/card-service.ts
index 91c445ef690..d148f93ab49 100644
--- a/packages/host/app/services/card-service.ts
+++ b/packages/host/app/services/card-service.ts
@@ -16,15 +16,6 @@ import type { AtomicOperation } from '@cardstack/runtime-common/atomic-document'
 import { createAtomicDocument } from '@cardstack/runtime-common/atomic-document';
 import { validateWriteSize } from '@cardstack/runtime-common/write-size-validation';
 
-import type {
-  BaseDef,
-  CardDef,
-  FieldDef,
-  Field,
-  SerializeOpts,
-} from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-
 import LimitedSet from '../lib/limited-set';
 
 import type EnvironmentService from './environment-service';
@@ -33,6 +24,14 @@ import type MessageService from './message-service';
 import type NetworkService from './network';
 import type Realm from './realm';
 import type ResetService from './reset';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type {
+  BaseDef,
+  CardDef,
+  FieldDef,
+  Field,
+  SerializeOpts,
+} from '@cardstack/base/card-api';
 
 export type CardSaveSubscriber = (
   url: URL,
@@ -83,7 +82,7 @@ export default class CardService extends Service {
     let loader = this.loaderService.loader;
     if (!this.loaderToCardAPILoadingCache.has(loader)) {
       let apiPromise = loader.import<typeof CardAPI>(
-        'https://cardstack.com/base/card-api',
+        '@cardstack/base/card-api',
       );
       this.loaderToCardAPILoadingCache.set(loader, apiPromise);
       return apiPromise;
diff --git a/packages/host/app/services/card-type-service.ts b/packages/host/app/services/card-type-service.ts
index c1f319fdd40..3ad64057588 100644
--- a/packages/host/app/services/card-type-service.ts
+++ b/packages/host/app/services/card-type-service.ts
@@ -7,11 +7,11 @@ import {
   identifyCard,
   internalKeyFor,
   baseRealm,
+  cardIdToURL,
   moduleFrom,
   getAncestor,
   SupportedMimeType,
   isResolvedCodeRef,
-  cardIdToURL,
   type ResolvedCodeRef,
 } from '@cardstack/runtime-common';
 import { isCodeRef, type CodeRef } from '@cardstack/runtime-common/code-ref';
@@ -19,16 +19,11 @@ import type { Loader } from '@cardstack/runtime-common/loader';
 
 import type CardService from '@cardstack/host/services/card-service';
 
-import type {
-  BaseDef,
-  Field,
-  FieldType,
-} from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-
 import type LoaderService from '../services/loader-service';
 import type NetworkService from '../services/network';
 import type ResetService from '../services/reset';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type { BaseDef, Field, FieldType } from '@cardstack/base/card-api';
 
 export type CodeRefType = CodeRef & {
   displayName: string;
diff --git a/packages/host/app/services/code-semantics-service.ts b/packages/host/app/services/code-semantics-service.ts
index 876d5cc56d6..c25880118e0 100644
--- a/packages/host/app/services/code-semantics-service.ts
+++ b/packages/host/app/services/code-semantics-service.ts
@@ -17,8 +17,6 @@ import {
 
 import { isReady } from '@cardstack/host/resources/file';
 
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
-
 import {
   moduleContentsResource,
   type State,
@@ -32,6 +30,7 @@ import type LoaderService from './loader-service';
 import type OperatorModeStateService from './operator-mode-state-service';
 import type ResetService from './reset';
 import type { Ready } from '../resources/file';
+import type { BaseDef } from '@cardstack/base/card-api';
 
 export default class CodeSemanticsService extends Service {
   @service declare operatorModeStateService: OperatorModeStateService;
diff --git a/packages/host/app/services/command-service.ts b/packages/host/app/services/command-service.ts
index bc0ee776cc4..a6ccdb6b813 100644
--- a/packages/host/app/services/command-service.ts
+++ b/packages/host/app/services/command-service.ts
@@ -31,9 +31,6 @@ import PatchCodeCommand from '@cardstack/host/commands/patch-code';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type Realm from '@cardstack/host/services/realm';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event';
-
 import LimitedSet from '../lib/limited-set';
 
 import type LoaderService from './loader-service';
@@ -45,6 +42,8 @@ import type StoreService from './store';
 import type { CodeData } from '../lib/formatted-message/utils';
 import type MessageCodePatchResult from '../lib/matrix-classes/message-code-patch-result';
 import type MessageCommand from '../lib/matrix-classes/message-command';
+import type { CardDef } from '@cardstack/base/card-api';
+import type { CodePatchStatus } from '@cardstack/base/matrix-event';
 import type { IEvent } from 'matrix-js-sdk';
 
 const DELAY_FOR_APPLYING_UI = isTesting() ? 50 : 500;
diff --git a/packages/host/app/services/error-display.ts b/packages/host/app/services/error-display.ts
index 3739d38a588..bba31dc6ed2 100644
--- a/packages/host/app/services/error-display.ts
+++ b/packages/host/app/services/error-display.ts
@@ -2,9 +2,8 @@ import type Owner from '@ember/owner';
 import Service from '@ember/service';
 import { service } from '@ember/service';
 
-import type { BoxelErrorForContext } from 'https://cardstack.com/base/matrix-event';
-
 import type ResetService from './reset';
+import type { BoxelErrorForContext } from '@cardstack/base/matrix-event';
 
 export interface DisplayedErrorProvider {
   getError: () => BoxelErrorForContext;
diff --git a/packages/host/app/services/file-upload.ts b/packages/host/app/services/file-upload.ts
index ca629b4cf42..99de2557a7e 100644
--- a/packages/host/app/services/file-upload.ts
+++ b/packages/host/app/services/file-upload.ts
@@ -11,11 +11,10 @@ import {
   type LocalPath,
 } from '@cardstack/runtime-common';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import type NetworkService from './network';
 import type ResetService from './reset';
 import type StoreService from './store';
+import type { FileDef } from '@cardstack/base/file-api';
 
 export class FileUploadTask {
   @tracked state: 'picking' | 'uploading' | 'complete' | 'error' = 'picking';
diff --git a/packages/host/app/services/local-persistence-service.ts b/packages/host/app/services/local-persistence-service.ts
index 9b5e4ac313f..c55974b9ff3 100644
--- a/packages/host/app/services/local-persistence-service.ts
+++ b/packages/host/app/services/local-persistence-service.ts
@@ -3,13 +3,13 @@ import Service from '@ember/service';
 import window from 'ember-window-mock';
 import { v4 as uuidv4 } from 'uuid';
 
-import type { SerializedFileDef } from 'https://cardstack.com/base/file-api';
-
 import {
   AiAssistantMessageDrafts,
   CurrentRoomIdPersistenceKey,
 } from '../utils/local-storage-keys';
 
+import type { SerializedFileDef } from '@cardstack/base/file-api';
+
 const ONE_WEEK_MS = 7 * 24 * 60 * 60 * 1000;
 
 export type StoredFileDraft = Pick<
diff --git a/packages/host/app/services/matrix-sdk-loader.ts b/packages/host/app/services/matrix-sdk-loader.ts
index c38af6470be..e29a6d511d1 100644
--- a/packages/host/app/services/matrix-sdk-loader.ts
+++ b/packages/host/app/services/matrix-sdk-loader.ts
@@ -11,12 +11,11 @@ import { RealmAuthClient } from '@cardstack/runtime-common/realm-auth-client';
 import type { FileDefManager } from '@cardstack/host/lib/file-def-manager';
 import FileDefManagerImpl from '@cardstack/host/lib/file-def-manager';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as FileAPI from 'https://cardstack.com/base/file-api';
-
 import type MatrixService from './matrix-service';
 import type NetworkService from './network';
 import type ResetService from './reset';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type * as FileAPI from '@cardstack/base/file-api';
 import type * as MatrixSDK from 'matrix-js-sdk';
 
 type JoinedRoomsResponse = { joined_rooms: string[] };
diff --git a/packages/host/app/services/matrix-service.ts b/packages/host/app/services/matrix-service.ts
index 89bfbae17c3..ab5cdc777a6 100644
--- a/packages/host/app/services/matrix-service.ts
+++ b/packages/host/app/services/matrix-service.ts
@@ -83,31 +83,6 @@ import { getRandomBackgroundURL, iconURLFor } from '@cardstack/host/lib/utils';
 import { getMatrixProfile } from '@cardstack/host/resources/matrix-profile';
 import { clearLocalStorage } from '@cardstack/host/utils/local-storage-keys';
 
-import type { BaseDef, CardDef } from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type {
-  CardForAttachmentCard,
-  FileForAttachmentCard,
-} from 'https://cardstack.com/base/command';
-import type * as FileAPI from 'https://cardstack.com/base/file-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-import type {
-  BoxelContext,
-  BotTriggerContent,
-  CardMessageContent,
-  MatrixEvent as DiscreteMatrixEvent,
-  CodePatchResultContent,
-  CodePatchStatus,
-  CommandResultWithNoOutputContent,
-  CommandResultWithOutputContent,
-  RealmEventContent,
-  Tool,
-  CommandResultStatus,
-} from 'https://cardstack.com/base/matrix-event';
-
-import type * as SkillModule from 'https://cardstack.com/base/skill';
-import type { SystemCard } from 'https://cardstack.com/base/system-card';
-
 import UpdateRoomSkillsCommand from '../commands/update-room-skills';
 import { addPatchTools } from '../commands/utils';
 import { getUniqueValidCommandDefinitions } from '../lib/command-definitions';
@@ -132,6 +107,29 @@ import type RealmServerService from './realm-server';
 import type ResetService from './reset';
 import type StoreService from './store';
 import type { RoomResource } from '../resources/room';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type { BaseDef, CardDef } from '@cardstack/base/card-api';
+import type {
+  CardForAttachmentCard,
+  FileForAttachmentCard,
+} from '@cardstack/base/command';
+import type { FileDef } from '@cardstack/base/file-api';
+import type * as FileAPI from '@cardstack/base/file-api';
+import type {
+  BoxelContext,
+  BotTriggerContent,
+  CardMessageContent,
+  MatrixEvent as DiscreteMatrixEvent,
+  CodePatchResultContent,
+  CodePatchStatus,
+  CommandResultWithNoOutputContent,
+  CommandResultWithOutputContent,
+  RealmEventContent,
+  Tool,
+  CommandResultStatus,
+} from '@cardstack/base/matrix-event';
+import type * as SkillModule from '@cardstack/base/skill';
+import type { SystemCard } from '@cardstack/base/system-card';
 import type { MatrixClient } from 'matrix-js-sdk';
 import type {
   LoginResponse,
@@ -304,12 +302,12 @@ export default class MatrixService extends Service {
 
   private cardAPIModule = importResource(
     this,
-    () => 'https://cardstack.com/base/card-api',
+    () => '@cardstack/base/card-api',
   );
 
   private fileAPIModule = importResource(
     this,
-    () => 'https://cardstack.com/base/file-api',
+    () => '@cardstack/base/file-api',
   );
 
   private loadState = task(async () => {
diff --git a/packages/host/app/services/message-service.ts b/packages/host/app/services/message-service.ts
index 8d594da4dd8..b5319c6de51 100644
--- a/packages/host/app/services/message-service.ts
+++ b/packages/host/app/services/message-service.ts
@@ -2,10 +2,9 @@ import Service, { service } from '@ember/service';
 
 import { tracked } from '@glimmer/tracking';
 
-import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event';
-
 import type NetworkService from './network';
 import type ResetService from './reset';
+import type { RealmEventContent } from '@cardstack/base/matrix-event';
 
 export default class MessageService extends Service {
   @tracked listenerCallbacks: Map<string, ((ev: RealmEventContent) => void)[]> =
diff --git a/packages/host/app/services/module-contents-service.ts b/packages/host/app/services/module-contents-service.ts
index c3ce1c03746..4e93af04c20 100644
--- a/packages/host/app/services/module-contents-service.ts
+++ b/packages/host/app/services/module-contents-service.ts
@@ -24,10 +24,10 @@ import type { Type } from '@cardstack/host/services/card-type-service';
 import type LoaderService from '@cardstack/host/services/loader-service';
 import type NetworkService from '@cardstack/host/services/network';
 
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
-
 import { loadModule } from '../resources/import';
 
+import type { BaseDef } from '@cardstack/base/card-api';
+
 export interface CardOrField {
   cardType: Type;
   cardOrField: typeof BaseDef;
diff --git a/packages/host/app/services/network.ts b/packages/host/app/services/network.ts
index c452419d577..3f4d62cda62 100644
--- a/packages/host/app/services/network.ts
+++ b/packages/host/app/services/network.ts
@@ -4,7 +4,6 @@ import Service, { service } from '@ember/service';
 import {
   VirtualNetwork,
   authorizationMiddleware,
-  baseRealm,
   registerCardReferencePrefix,
   fetcher,
 } from '@cardstack/runtime-common';
@@ -51,10 +50,12 @@ export default class NetworkService extends Service {
 
   private makeVirtualNetwork() {
     let virtualNetwork = new VirtualNetwork(globalThis.fetch);
-    let resolvedBaseRealmURL = new URL(
-      withTrailingSlash(config.resolvedBaseRealmURL),
+    let baseURL = withTrailingSlash(config.resolvedBaseRealmURL);
+    registerCardReferencePrefix('@cardstack/base/', baseURL);
+    virtualNetwork.addImportMap(
+      '@cardstack/base/',
+      (rest) => new URL(rest, baseURL).href,
     );
-    virtualNetwork.addURLMapping(new URL(baseRealm.url), resolvedBaseRealmURL);
     shimExternals(virtualNetwork);
     virtualNetwork.addImportMap('@cardstack/boxel-icons/', (rest) => {
       return `${config.iconsURL}/@cardstack/boxel-icons/v1/icons/${rest}.js`;
diff --git a/packages/host/app/services/operator-mode-state-service.ts b/packages/host/app/services/operator-mode-state-service.ts
index 45b1a83ac71..2edb36c0722 100644
--- a/packages/host/app/services/operator-mode-state-service.ts
+++ b/packages/host/app/services/operator-mode-state-service.ts
@@ -46,10 +46,6 @@ import type RealmServer from '@cardstack/host/services/realm-server';
 import type RecentCardsService from '@cardstack/host/services/recent-cards-service';
 import type RecentFilesService from '@cardstack/host/services/recent-files-service';
 
-import type { CardDef, Format } from 'https://cardstack.com/base/card-api';
-
-import type { BoxelContext } from 'https://cardstack.com/base/matrix-event';
-
 import { removeFileExtension } from '../components/card-search/utils';
 
 import { ModuleInspectorSelections } from '../utils/local-storage-keys';
@@ -68,6 +64,8 @@ import type StoreService from './store';
 import type { Stack } from '../components/operator-mode/interact-submode';
 
 import type IndexController from '../controllers';
+import type { CardDef, Format } from '@cardstack/base/card-api';
+import type { BoxelContext } from '@cardstack/base/matrix-event';
 
 export interface CreateListingModalPayload {
   codeRef: CodeRef;
@@ -647,7 +645,7 @@ export default class OperatorModeStateService extends Service {
     if (codeRef && isResolvedCodeRef(codeRef)) {
       //(possibly) in a different module
       this._state.codeSelection = codeRef.name;
-      await this.updateCodePath(new URL(codeRef.module));
+      await this.updateCodePath(cardIdToURL(codeRef.module));
     } else if (
       codeRef &&
       'type' in codeRef &&
@@ -657,7 +655,7 @@ export default class OperatorModeStateService extends Service {
     ) {
       this._state.fieldSelection = codeRef.field;
       this._state.codeSelection = codeRef.card.name;
-      await this.updateCodePath(new URL(codeRef.card.module));
+      await this.updateCodePath(cardIdToURL(codeRef.card.module));
     } else if (localName && onLocalSelection) {
       //in the same module
       this._state.codeSelection = localName;
diff --git a/packages/host/app/services/playground-panel-service.ts b/packages/host/app/services/playground-panel-service.ts
index 822e910accc..58a9fbb8415 100644
--- a/packages/host/app/services/playground-panel-service.ts
+++ b/packages/host/app/services/playground-panel-service.ts
@@ -12,18 +12,13 @@ import { isCardInstance, localId, isLocalId } from '@cardstack/runtime-common';
 
 import { PlaygroundSelections } from '@cardstack/host/utils/local-storage-keys';
 
-import type {
-  CardDef,
-  BaseDef,
-  Format,
-} from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-
 import type CardService from './card-service';
 import type OperatorModeStateService from './operator-mode-state-service';
 import type ResetService from './reset';
 
 import type StoreService from './store';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type { CardDef, BaseDef, Format } from '@cardstack/base/card-api';
 
 export interface PlaygroundSelection {
   cardId: string; // for fields, this is their corresponding spec card's id, since fields do not have a card id
diff --git a/packages/host/app/services/realm-server.ts b/packages/host/app/services/realm-server.ts
index 7d79cef9bb9..cf9a96bc9f9 100644
--- a/packages/host/app/services/realm-server.ts
+++ b/packages/host/app/services/realm-server.ts
@@ -20,6 +20,7 @@ import {
   testRealmURL,
   type RealmInfo,
   type JWTPayload,
+  isRegisteredPrefix,
 } from '@cardstack/runtime-common';
 import {
   joinDMRoom,
@@ -275,6 +276,12 @@ export default class RealmServerService extends Service {
     }
   }
 
+  // Filter out prefix-form realm URLs (e.g. @cardstack/base/) which are
+  // not valid HTTP URLs and don't need federated auth.
+  resolveRealmUrls(realms: string[]): string[] {
+    return realms.filter((r) => !isRegisteredPrefix(r));
+  }
+
   getRealmServersForRealms(realms: string[]) {
     let testRealmOrigin = isTesting()
       ? new URL(testRealmURL).origin
@@ -292,6 +299,9 @@ export default class RealmServerService extends Service {
     let realmServerURLs = new Set<string>();
 
     for (let realmURL of realms) {
+      if (isRegisteredPrefix(realmURL)) {
+        continue; // prefix-form realm (e.g. @cardstack/base/) — no auth needed
+      }
       let normalizedRealmURL = ensureTrailingSlash(realmURL);
       if (
         testRealmOrigin &&
@@ -458,7 +468,12 @@ export default class RealmServerService extends Service {
       return { data: [], publicReadableRealms: new Set() };
     }
 
-    let uniqueRealmUrls = Array.from(new Set(realmUrls));
+    let uniqueRealmUrls = Array.from(
+      new Set(this.resolveRealmUrls(realmUrls)),
+    );
+    if (uniqueRealmUrls.length === 0) {
+      return { data: [], publicReadableRealms: new Set() };
+    }
     let realmServerURLs = this.getRealmServersForRealms(uniqueRealmUrls);
     // TODO remove this assertion after multi-realm server/federated identity is supported
     this.assertOwnRealmServer(realmServerURLs);
@@ -522,7 +537,12 @@ export default class RealmServerService extends Service {
       return { data: [], meta: { page: { total: 0 } } };
     }
 
-    let uniqueRealmUrls = Array.from(new Set(realmUrls));
+    let uniqueRealmUrls = Array.from(
+      new Set(this.resolveRealmUrls(realmUrls)),
+    );
+    if (uniqueRealmUrls.length === 0) {
+      return { data: [], meta: { page: { total: 0 } } };
+    }
     let realmServerURLs = this.getRealmServersForRealms(uniqueRealmUrls);
     // TODO remove this assertion after multi-realm server/federated identity is supported
     this.assertOwnRealmServer(realmServerURLs);
diff --git a/packages/host/app/services/realm.ts b/packages/host/app/services/realm.ts
index 87be0d2dd60..fc813c9d0a7 100644
--- a/packages/host/app/services/realm.ts
+++ b/packages/host/app/services/realm.ts
@@ -42,11 +42,6 @@ import ENV from '@cardstack/host/config/environment';
 
 import { assertNever } from '@cardstack/host/utils/assert-never';
 
-import type {
-  IndexRealmEventContent,
-  RealmEventContent,
-} from 'https://cardstack.com/base/matrix-event';
-
 import {
   syncTokenToServiceWorker,
   syncAllTokensToServiceWorker,
@@ -59,6 +54,10 @@ import type MessageService from './message-service';
 import type NetworkService from './network';
 import type RealmServerService from './realm-server';
 import type ResetService from './reset';
+import type {
+  IndexRealmEventContent,
+  RealmEventContent,
+} from '@cardstack/base/matrix-event';
 
 const log = logger('service:realm');
 
@@ -157,6 +156,15 @@ class RealmResource {
     return this.realmURL;
   }
 
+  // Resolved URL for HTTP operations (fetching _info, _config, etc.).
+  // Prefix-form URLs like @cardstack/base/ are resolved through the
+  // import map to their actual HTTP URL.
+  private get resolvedURL(): string {
+    return isRegisteredPrefix(this.realmURL)
+      ? cardIdToURL(this.realmURL).href
+      : this.realmURL;
+  }
+
   get token(): string | undefined {
     if (this.auth.type === 'logged-in') {
       return this.auth.token;
@@ -261,7 +269,7 @@ class RealmResource {
   private loginTask = task(async () => {
     try {
       let token = await this.matrixService.createRealmSession(
-        new URL(this.realmURL),
+        new URL(this.resolvedURL),
       );
       this.token = token;
     } catch (e: any) {
@@ -329,13 +337,13 @@ class RealmResource {
       };
       let response: Response;
       try {
-        response = await this.network.authedFetch(`${this.realmURL}_info`, {
+        response = await this.network.authedFetch(`${this.resolvedURL}_info`, {
           method: 'QUERY',
           headers: {
             ...headers,
             'Content-Type': 'application/json',
           },
-          body: JSON.stringify({ realms: [this.realmURL] }),
+          body: JSON.stringify({ realms: [this.resolvedURL] }),
         });
       } catch (error) {
         if (isTesting()) {
@@ -388,7 +396,7 @@ class RealmResource {
       Accept: SupportedMimeType.JSON,
       Authorization: `Bearer ${this.token}`,
     };
-    let response = await this.network.authedFetch(`${this.realmURL}_config`, {
+    let response = await this.network.authedFetch(`${this.resolvedURL}_config`, {
       method: 'PATCH',
       headers,
       body: JSON.stringify({
@@ -436,7 +444,7 @@ class RealmResource {
       Authorization: `Bearer ${this.token}`,
     };
     let response = await this.network.authedFetch(
-      `${this.realmURL}_permissions`,
+      `${this.resolvedURL}_permissions`,
       {
         headers,
       },
@@ -463,7 +471,7 @@ class RealmResource {
       Authorization: `Bearer ${this.token}`,
     };
     let response = await this.network.authedFetch(
-      `${this.realmURL}_publishability`,
+      `${this.resolvedURL}_publishability`,
       {
         headers,
       },
@@ -511,7 +519,7 @@ class RealmResource {
         Authorization: `Bearer ${this.token}`,
       };
       let response = await this.network.authedFetch(
-        `${this.realmURL}_permissions`,
+        `${this.resolvedURL}_permissions`,
         {
           method: 'PATCH',
           headers,
diff --git a/packages/host/app/services/recent-cards-service.ts b/packages/host/app/services/recent-cards-service.ts
index 47ee88b130e..f779d298e1f 100644
--- a/packages/host/app/services/recent-cards-service.ts
+++ b/packages/host/app/services/recent-cards-service.ts
@@ -13,15 +13,14 @@ import {
   trimJsonExtension,
 } from '@cardstack/runtime-common';
 
-import type { CardDef, BaseDef } from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-
 import { RecentCards } from '../utils/local-storage-keys';
 
 import type CardService from './card-service';
 import type RecentFilesService from './recent-files-service';
 import type ResetService from './reset';
 import type StoreService from './store';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type { CardDef, BaseDef } from '@cardstack/base/card-api';
 
 export interface RecentCard {
   cardId: string;
diff --git a/packages/host/app/services/render-service.ts b/packages/host/app/services/render-service.ts
index d8577651412..8e8bab58e61 100644
--- a/packages/host/app/services/render-service.ts
+++ b/packages/host/app/services/render-service.ts
@@ -26,18 +26,17 @@ import {
 
 import config from '@cardstack/host/config/environment';
 
+import { render, teardown } from '../lib/isolated-render';
+
+import type CardService from './card-service';
+import type LoaderService from './loader-service';
 import type {
   CardDef,
   Format,
   CardStore,
   BoxComponent,
-} from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
-import { render, teardown } from '../lib/isolated-render';
-
-import type CardService from './card-service';
-import type LoaderService from './loader-service';
+} from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
 import type { ComponentLike } from '@glint/template';
 import type { SimpleDocument, SimpleElement } from '@simple-dom/interface';
 import type { Tokenizer } from '@simple-dom/parser';
diff --git a/packages/host/app/services/render-store.ts b/packages/host/app/services/render-store.ts
index 15f9e1f8b25..e3a15cbdb3d 100644
--- a/packages/host/app/services/render-store.ts
+++ b/packages/host/app/services/render-store.ts
@@ -4,10 +4,10 @@ import type {
   LooseSingleResourceDocument,
 } from '@cardstack/runtime-common';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import StoreService from './store';
 
+import type { FileDef } from '@cardstack/base/file-api';
+
 export default class RenderStoreService extends StoreService {
   protected override isRenderStore = true;
 
diff --git a/packages/host/app/services/spec-panel-service.ts b/packages/host/app/services/spec-panel-service.ts
index bf9183e1cc3..7dabdfa4726 100644
--- a/packages/host/app/services/spec-panel-service.ts
+++ b/packages/host/app/services/spec-panel-service.ts
@@ -11,12 +11,11 @@ import { isCardInstance, isLocalId, localId } from '@cardstack/runtime-common';
 
 import { SpecSelection } from '@cardstack/host/utils/local-storage-keys';
 
-import type { CardDef, BaseDef } from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-
 import type CardService from './card-service';
 import type ResetService from './reset';
 import type StoreService from './store';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type { CardDef, BaseDef } from '@cardstack/base/card-api';
 
 export default class SpecPanelService extends Service {
   @tracked specSelection = window.localStorage.getItem(SpecSelection);
diff --git a/packages/host/app/services/store.ts b/packages/host/app/services/store.ts
index 5f10f4ee948..bcbcaf19013 100644
--- a/packages/host/app/services/store.ts
+++ b/packages/host/app/services/store.ts
@@ -68,12 +68,6 @@ import {
   resolveCardReference,
 } from '@cardstack/runtime-common';
 
-import type { CardDef, BaseDef } from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
-import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event';
-
 import CardStore, { getDeps, type ReferenceCount } from '../lib/gc-card-store';
 
 import { errorJsonApiToErrorEntry } from '../lib/window-error-handler';
@@ -103,6 +97,10 @@ import type RealmService from './realm';
 import type RealmServerService from './realm-server';
 import type ResetService from './reset';
 import type { SearchResource } from '../resources/search';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type { CardDef, BaseDef } from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
+import type { RealmEventContent } from '@cardstack/base/matrix-event';
 
 export { CardErrorJSONAPI, CardSaveSubscriber };
 
@@ -1608,7 +1606,7 @@ export default class StoreService extends Service implements StoreInterface {
   private async extractFileMetaDirectly(
     url: string,
   ): Promise<SingleFileMetaDocument | CardError> {
-    let fileDefCodeRef = resolveFileDefCodeRef(new URL(url));
+    let fileDefCodeRef = resolveFileDefCodeRef(cardIdToURL(url));
     let extractor = new FileDefAttributesExtractor({
       loaderService: this.loaderService,
       network: this.network,
diff --git a/packages/host/app/templates/index.gts b/packages/host/app/templates/index.gts
index efdc196919d..205d8964146 100644
--- a/packages/host/app/templates/index.gts
+++ b/packages/host/app/templates/index.gts
@@ -41,14 +41,13 @@ import type HostModeStateService from '@cardstack/host/services/host-mode-state-
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type StoreService from '@cardstack/host/services/store';
 
+import type HostModeService from '../services/host-mode-service';
+import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type {
   CardContext,
   CardDef,
   ViewCardFn,
-} from 'https://cardstack.com/base/card-api';
-
-import type HostModeService from '../services/host-mode-service';
-import type OperatorModeStateService from '../services/operator-mode-state-service';
+} from '@cardstack/base/card-api';
 
 export interface IndexComponentComponentSignature {
   Args: {
diff --git a/packages/host/app/templates/render/html.gts b/packages/host/app/templates/render/html.gts
index d5dd741c36a..5dd5c365af9 100644
--- a/packages/host/app/templates/render/html.gts
+++ b/packages/host/app/templates/render/html.gts
@@ -17,9 +17,8 @@ import { getCardCollection } from '@cardstack/host/resources/card-collection';
 import { getCard } from '@cardstack/host/resources/card-resource';
 import type RenderStoreService from '@cardstack/host/services/render-store';
 
-import type { CardContext } from 'https://cardstack.com/base/card-api';
-
 import type { Model } from '../../routes/render/html';
+import type { CardContext } from '@cardstack/base/card-api';
 
 interface Signature {
   Args: {
diff --git a/packages/host/app/utils/clipboard.ts b/packages/host/app/utils/clipboard.ts
index 760863510e3..57c6425d60f 100644
--- a/packages/host/app/utils/clipboard.ts
+++ b/packages/host/app/utils/clipboard.ts
@@ -1,6 +1,6 @@
 import config from '@cardstack/host/config/environment';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
+import type { CardDef } from '@cardstack/base/card-api';
 
 export async function copyCardURLToClipboard(
   card: CardDef | URL | string,
diff --git a/packages/host/app/utils/file-def-attributes-extractor.ts b/packages/host/app/utils/file-def-attributes-extractor.ts
index af494e0133b..319f7692a4a 100644
--- a/packages/host/app/utils/file-def-attributes-extractor.ts
+++ b/packages/host/app/utils/file-def-attributes-extractor.ts
@@ -1,6 +1,7 @@
 import { isEqual } from 'lodash';
 
 import {
+  baseRealm,
   baseRef,
   CardError,
   identifyCard,
@@ -15,8 +16,8 @@ import {
 } from '@cardstack/runtime-common';
 import { getFieldDefinitions } from '@cardstack/runtime-common/definitions';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type { BaseDef } from '@cardstack/base/card-api';
 
 import type { createAuthErrorGuard } from './auth-error-guard';
 
@@ -328,7 +329,7 @@ export class FileDefAttributesExtractor {
     try {
       let cardApiModule = await this.#loaderService.loader.import<
         typeof CardAPI
-      >('https://cardstack.com/base/card-api');
+      >(`${baseRealm.url}card-api`);
       let fields = getFieldDefinitions(
         cardApiModule,
         klass as unknown as typeof BaseDef,
diff --git a/packages/host/app/utils/render-error.ts b/packages/host/app/utils/render-error.ts
index bf1893f39fe..c3605ff3f3b 100644
--- a/packages/host/app/utils/render-error.ts
+++ b/packages/host/app/utils/render-error.ts
@@ -5,6 +5,7 @@ import {
   isCardError,
   type RenderError,
   trimExecutableExtension,
+  cardIdToURL,
 } from '@cardstack/runtime-common';
 import {
   CardError,
@@ -12,7 +13,7 @@ import {
   serializableError,
 } from '@cardstack/runtime-common/error';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
+import type { CardDef } from '@cardstack/base/card-api';
 
 export interface RenderErrorContext {
   cardId?: string;
@@ -388,11 +389,11 @@ export function stripSelfDeps(
       return undefined;
     }
     try {
-      return trimExecutableExtension(new URL(value)).href;
+      return trimExecutableExtension(cardIdToURL(value)).href;
     } catch (_e) {
       if (moduleURL) {
         try {
-          return trimExecutableExtension(new URL(value, moduleURL)).href;
+          return trimExecutableExtension(new URL(cardIdToURL(value).href, moduleURL)).href;
         } catch (_e2) {
           return value;
         }
@@ -435,7 +436,7 @@ export async function deriveCardTypeFromDoc(
   }
   let cardDef = await loadCardDef(adoptsFrom, {
     loader,
-    relativeTo: new URL(cardURL),
+    relativeTo: cardIdToURL(cardURL),
   });
   return friendlyCardType(cardDef as typeof CardDef);
 }
diff --git a/packages/host/app/utils/schema-editor.ts b/packages/host/app/utils/schema-editor.ts
index 799746c7894..cecad439fb6 100644
--- a/packages/host/app/utils/schema-editor.ts
+++ b/packages/host/app/utils/schema-editor.ts
@@ -6,7 +6,7 @@ import {
 } from '@cardstack/host/resources/module-contents';
 import type { Type } from '@cardstack/host/services/card-type-service';
 
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
+import type { BaseDef } from '@cardstack/base/card-api';
 
 export function calculateTotalOwnFields(
   card: typeof BaseDef,
diff --git a/packages/host/config/schema/1773324721387_schema.sql b/packages/host/config/schema/1774971105000_schema.sql
similarity index 100%
rename from packages/host/config/schema/1773324721387_schema.sql
rename to packages/host/config/schema/1774971105000_schema.sql
diff --git a/packages/host/ember-cli-build.js b/packages/host/ember-cli-build.js
index 67194b8be19..b8463ec17f7 100644
--- a/packages/host/ember-cli-build.js
+++ b/packages/host/ember-cli-build.js
@@ -77,7 +77,7 @@ module.exports = function (defaults) {
             new GlimmerScopedCSSWebpackPlugin(),
             new MonacoWebpackPlugin(),
             new webpack.IgnorePlugin({
-              resourceRegExp: /^https:\/\/cardstack\.com\/base/,
+              resourceRegExp: /^@cardstack\/(base|catalog|skills|openrouter)\//,
             }),
             new MomentLocalesPlugin({
               // 'en' is built into moment and cannot be removed. This strips the others.
diff --git a/packages/host/tests/acceptance/ai-assistant-test.gts b/packages/host/tests/acceptance/ai-assistant-test.gts
index dd118f539f9..61225d846d8 100644
--- a/packages/host/tests/acceptance/ai-assistant-test.gts
+++ b/packages/host/tests/acceptance/ai-assistant-test.gts
@@ -31,8 +31,6 @@ import type AiAssistantPanelService from '@cardstack/host/services/ai-assistant-
 import type MonacoService from '@cardstack/host/services/monaco-service';
 import { AiAssistantMessageDrafts } from '@cardstack/host/utils/local-storage-keys';
 
-import type { BoxelContext } from 'https://cardstack.com/base/matrix-event';
-
 import {
   setupLocalIndexing,
   setupOnSave,
@@ -70,6 +68,8 @@ import { setupMockMatrix } from '../helpers/mock-matrix';
 import { getRoomIdForRealmAndUser } from '../helpers/mock-matrix/_utils';
 import { setupApplicationTest } from '../helpers/setup';
 
+import type { BoxelContext } from '@cardstack/base/matrix-event';
+
 async function selectCardFromCatalog(cardId: string) {
   await click('[data-test-attach-button]');
   await click('[data-test-attach-card-btn]');
@@ -91,8 +91,8 @@ async function waitForSessionPreparationToFinish(
   });
 }
 
-let countryDefinition = `import { field, contains, CardDef } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+let countryDefinition = `import { field, contains, CardDef } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
   export class Country extends CardDef {
     static displayName = 'Country';
     @field name = contains(StringField);
@@ -407,8 +407,8 @@ module('Acceptance | AI Assistant tests', function (hooks) {
         'person.gts': { Person },
         'pet.gts': { Pet },
         'broken-card.gts': `
-          import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-          import StringField from 'https://cardstack.com/base/string';
+          import { CardDef, field, contains } from '@cardstack/base/card-api';
+          import StringField from '@cardstack/base/string';
           import { BrokenField } from './does-not-exist';
           export class BrokenCard extends CardDef {
             static displayName = 'Broken Card';
@@ -458,7 +458,7 @@ module('Acceptance | AI Assistant tests', function (hooks) {
           friends: [mangoPet],
         }),
         'plant.gts': `
-          import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
+          import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
           export class Plant extends CardDef {
             static displayName = "Plant";
             @field commonName = contains(StringField);
@@ -490,7 +490,7 @@ module('Acceptance | AI Assistant tests', function (hooks) {
             },
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/spec',
+                module: '@cardstack/base/spec',
                 name: 'Spec',
               },
             },
@@ -1172,9 +1172,7 @@ module('Acceptance | AI Assistant tests', function (hooks) {
     assert.dom('[data-test-attached-card]').doesNotExist();
     await click('[data-test-boxel-filter-list-button="All Cards"]');
     await click('[data-test-create-new-card-button]');
-    await click(
-      `[data-test-card-catalog-item="https://cardstack.com/base/types/card"]`,
-    );
+    await click(`[data-test-card-catalog-item="@cardstack/base/types/card"]`);
 
     await click(`[data-test-card-catalog-go-button]`);
 
diff --git a/packages/host/tests/acceptance/basic-test.gts b/packages/host/tests/acceptance/basic-test.gts
index f1598c3d249..42f8cc046cb 100644
--- a/packages/host/tests/acceptance/basic-test.gts
+++ b/packages/host/tests/acceptance/basic-test.gts
@@ -38,14 +38,14 @@ module('Acceptance | basic tests', function (hooks) {
     let loaderService = getService('loader-service');
     let loader = loaderService.loader;
     let { field, contains, CardDef, Component } = await loader.import<
-      typeof import('https://cardstack.com/base/card-api')
+      typeof import('@cardstack/base/card-api')
     >(`${baseRealm.url}card-api`);
     let { default: StringField } = await loader.import<
-      typeof import('https://cardstack.com/base/string')
+      typeof import('@cardstack/base/string')
     >(`${baseRealm.url}string`);
-    let { Spec } = await loader.import<
-      typeof import('https://cardstack.com/base/spec')
-    >(`${baseRealm.url}spec`);
+    let { Spec } = await loader.import<typeof import('@cardstack/base/spec')>(
+      `${baseRealm.url}spec`,
+    );
 
     class Index extends CardDef {
       static isolated = class Isolated extends Component<typeof this> {
diff --git a/packages/host/tests/acceptance/code-patches-test.gts b/packages/host/tests/acceptance/code-patches-test.gts
index 560e4af15db..c901633f4b2 100644
--- a/packages/host/tests/acceptance/code-patches-test.gts
+++ b/packages/host/tests/acceptance/code-patches-test.gts
@@ -51,8 +51,8 @@ import type { TestContextWithSave } from '../helpers';
 let mockedFileContent = 'Hello, world!';
 
 const testCardContent = `
-import { CardDef, Component, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { CardDef, Component, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class TestCard extends CardDef {
   static displayName = 'Test Card';
diff --git a/packages/host/tests/acceptance/code-submode-test.ts b/packages/host/tests/acceptance/code-submode-test.ts
index eaf8e35f4e7..3dd8735ada8 100644
--- a/packages/host/tests/acceptance/code-submode-test.ts
+++ b/packages/host/tests/acceptance/code-submode-test.ts
@@ -56,7 +56,7 @@ import {
 import { setupApplicationTest } from '../helpers/setup';
 
 const indexCardSource = `
-  import { CardDef, Component } from "https://cardstack.com/base/card-api";
+  import { CardDef, Component } from "@cardstack/base/card-api";
 
   export class Index extends CardDef {
     static isolated = class Isolated extends Component<typeof this> {
@@ -75,8 +75,8 @@ const postalCodeFieldSource = `
     field,
     Component,
     FieldDef,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
 
   export class PostalCode extends FieldDef {
     static displayName = 'Postal Code';
@@ -99,8 +99,8 @@ const addressFieldSource = `
     field,
     Component,
     FieldDef,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
   import { PostalCode } from './postal-code';
 
   export class Address extends FieldDef {
@@ -132,8 +132,8 @@ const countryCardSource = `
     field,
     Component,
     CardDef,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
 
   export class Country extends CardDef {
     static displayName = 'Country';
@@ -160,7 +160,7 @@ const tripsFieldSource = `
     field,
     Component,
     FieldDef,
-  } from 'https://cardstack.com/base/card-api';
+  } from '@cardstack/base/card-api';
   import { Country } from './country';
 
   export class Trips extends FieldDef {
@@ -178,8 +178,8 @@ const tripsFieldSource = `
 `;
 
 const personCardSource = `
-  import { contains, containsMany, field, linksTo, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, containsMany, field, linksTo, linksToMany, CardDef, Component } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
   import { Friend } from './friend';
   import { Pet } from "./pet";
   import { Address } from './address';
@@ -220,8 +220,8 @@ const personCardSource = `
 `;
 
 const petCardSource = `
-  import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class Pet extends CardDef {
     static displayName = 'Pet';
@@ -261,10 +261,10 @@ const employeeCardSource = `
     field,
     Component,
     CardDef
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
-  import DateField from 'https://cardstack.com/base/date';
-  import BooleanField from 'https://cardstack.com/base/boolean';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
+  import DateField from '@cardstack/base/date';
+  import BooleanField from '@cardstack/base/boolean';
   import { Person } from './person';
 
   export class Isolated extends Component<typeof Employee> {
@@ -299,8 +299,8 @@ const inThisFileSource = `
     field,
     CardDef,
     FieldDef,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
 
   export const exportedVar = 'exported var';
 
@@ -345,8 +345,8 @@ const inThisFileSource = `
 `;
 
 const friendCardSource = `
-  import { contains, linksTo, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, linksTo, field, CardDef, Component } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class Friend extends CardDef {
     static displayName = 'Friend';
@@ -2198,8 +2198,8 @@ module('Acceptance | code submode tests', function (_hooks) {
 
     test('card preview live updates when there is a change in module', async function (assert) {
       const personGts = `
-        import { contains, containsMany, field, linksTo, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, containsMany, field, linksTo, linksToMany, CardDef, Component } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         import { Friend } from './friend';
         import { Pet } from "./pet";
         import { Address } from './address';
diff --git a/packages/host/tests/acceptance/code-submode/card-playground-test.gts b/packages/host/tests/acceptance/code-submode/card-playground-test.gts
index 2280b107096..69e5425821c 100644
--- a/packages/host/tests/acceptance/code-submode/card-playground-test.gts
+++ b/packages/host/tests/acceptance/code-submode/card-playground-test.gts
@@ -61,16 +61,16 @@ import {
 } from '../../helpers/recent-files-cards';
 import { setupApplicationTest } from '../../helpers/setup';
 
-const codeRefDriverCard = `import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-  import { Component } from 'https://cardstack.com/base/card-api';
-  import CodeRefField from 'https://cardstack.com/base/code-ref';
+const codeRefDriverCard = `import { CardDef, field, contains } from '@cardstack/base/card-api';
+  import { Component } from '@cardstack/base/card-api';
+  import CodeRefField from '@cardstack/base/code-ref';
   export class CodeRefDriver extends CardDef {
     static displayName = "Code Ref Driver";
     @field ref = contains(CodeRefField);
 }`;
 
-const testSpecCard = `import { Component } from 'https://cardstack.com/base/card-api';
-  import { Spec } from 'https://cardstack.com/base/spec';
+const testSpecCard = `import { Component } from '@cardstack/base/card-api';
+  import { Spec } from '@cardstack/base/spec';
   export class TestSpec extends Spec {
     static displayName = 'TestSpec';
     static isolated = class Isolated extends Component<typeof this> {
@@ -80,9 +80,9 @@ const testSpecCard = `import { Component } from 'https://cardstack.com/base/card
     }
   }`;
 
-const authorCard = `import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-  import MarkdownField from 'https://cardstack.com/base/markdown';
-  import StringField from "https://cardstack.com/base/string";
+const authorCard = `import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+  import MarkdownField from '@cardstack/base/markdown';
+  import StringField from "@cardstack/base/string";
   export class Author extends CardDef {
     static displayName = 'Author';
     @field firstName = contains(StringField);
@@ -110,9 +110,9 @@ const authorCard = `import { contains, field, CardDef, Component } from "https:/
     }
 }`;
 
-const blogPostCard = `import { contains, field, linksTo, linksToMany, CardDef, Component, StringField } from "https://cardstack.com/base/card-api";
-  import DateTimeField from 'https://cardstack.com/base/datetime';
-  import MarkdownField from 'https://cardstack.com/base/markdown';
+const blogPostCard = `import { contains, field, linksTo, linksToMany, CardDef, Component, StringField } from "@cardstack/base/card-api";
+  import DateTimeField from '@cardstack/base/datetime';
+  import MarkdownField from '@cardstack/base/markdown';
   import { Author } from './author';
 
   export class Category extends CardDef {
@@ -157,7 +157,7 @@ const blogPostCard = `import { contains, field, linksTo, linksToMany, CardDef, C
     }
 }`;
 
-const personCard = `import { field, linksTo, CardDef } from 'https://cardstack.com/base/card-api';
+const personCard = `import { field, linksTo, CardDef } from '@cardstack/base/card-api';
   export class Pet extends CardDef {
     static displayName = 'Pet';
   }
@@ -167,8 +167,8 @@ const personCard = `import { field, linksTo, CardDef } from 'https://cardstack.c
   }
 `;
 
-const headPreviewCard = `import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+const headPreviewCard = `import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class HeadPreview extends CardDef {
     static displayName = 'Head Preview';
@@ -203,7 +203,7 @@ const localStyleReferenceCard = {
     },
     meta: {
       adoptsFrom: {
-        module: 'https://cardstack.com/base/style-reference',
+        module: '@cardstack/base/style-reference',
         name: 'default',
       },
     },
@@ -230,7 +230,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) {
 
     hooks.beforeEach(async function () {
       let loader = getService('loader-service').loader;
-      let cardsGrid: typeof import('https://cardstack.com/base/cards-grid');
+      let cardsGrid: typeof import('@cardstack/base/cards-grid');
       cardsGrid = await loader.import(`${baseRealm.url}cards-grid`);
       let { CardsGrid } = cardsGrid;
 
@@ -1001,9 +1001,9 @@ module('Acceptance | code-submode | card playground', function (_hooks) {
 
     test('playground preview for card with contained fields can live update when module changes', async function (assert) {
       // change: added "Hello" before rendering title on the template
-      const authorCard = `import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-        import MarkdownField from 'https://cardstack.com/base/markdown';
-        import StringField from "https://cardstack.com/base/string";
+      const authorCard = `import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+        import MarkdownField from '@cardstack/base/markdown';
+        import StringField from "@cardstack/base/string";
         export class Author extends CardDef {
           static displayName = 'Author';
           @field firstName = contains(StringField);
@@ -1046,10 +1046,10 @@ module('Acceptance | code-submode | card playground', function (_hooks) {
 
     test('playground preview for card with linked fields can live update when module changes', async function (assert) {
       // change: added "Hello" before rendering title on the template
-      const blogPostCard = `import { contains, field, linksTo, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api";
-        import DateTimeField from 'https://cardstack.com/base/datetime';
-        import MarkdownField from 'https://cardstack.com/base/markdown';
-        import StringField from "https://cardstack.com/base/string";
+      const blogPostCard = `import { contains, field, linksTo, linksToMany, CardDef, Component } from "@cardstack/base/card-api";
+        import DateTimeField from '@cardstack/base/datetime';
+        import MarkdownField from '@cardstack/base/markdown';
+        import StringField from "@cardstack/base/string";
         import { Author } from './author';
 
         export class Category extends CardDef {
@@ -1673,7 +1673,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) {
     let { setRealmPermissions, setActiveRealms, createAndJoinRoom } =
       mockMatrixUtils;
 
-    const boomPet = `import { contains, field, CardDef, Component, FieldDef, StringField, serialize } from 'https://cardstack.com/base/card-api';
+    const boomPet = `import { contains, field, CardDef, Component, FieldDef, StringField, serialize } from '@cardstack/base/card-api';
       // this field explodes when serialized (saved)
       export class BoomField extends FieldDef {
         @field cardTitle = contains(StringField);
@@ -1691,7 +1691,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) {
         @field boom = contains(BoomField);
       }
     `;
-    const boomPerson = `import { field, contains, CardDef, FieldDef, Component, StringField } from 'https://cardstack.com/base/card-api';
+    const boomPerson = `import { field, contains, CardDef, FieldDef, Component, StringField } from '@cardstack/base/card-api';
       export class BoomPerson extends CardDef {
         static displayName = 'Boom Person';
         @field firstName = contains(StringField);
@@ -1726,7 +1726,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) {
       }
     `;
     const syntaxError = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
       // missing StringField import
       export class Boom extends CardDef {
         @field firstName = contains(StringField);
@@ -1863,7 +1863,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) {
         // fix error
         await realm.write(
           'boom-person.gts',
-          `import { field, contains, CardDef, Component, StringField } from 'https://cardstack.com/base/card-api';
+          `import { field, contains, CardDef, Component, StringField } from '@cardstack/base/card-api';
           export class BoomPerson extends CardDef {
             static displayName = 'Boom Person';
             @field firstName = contains(StringField);
@@ -1907,7 +1907,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) {
       // fix error
       await realm.write(
         'boom-pet.gts',
-        `import { contains, field, CardDef, Component, FieldDef, StringField } from 'https://cardstack.com/base/card-api';
+        `import { contains, field, CardDef, Component, FieldDef, StringField } from '@cardstack/base/card-api';
             export class BoomPet extends CardDef {
               static displayName = 'Boom Pet';
               @field boom = contains(StringField);
@@ -1973,7 +1973,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) {
         // fix error
         await realm.write(
           'boom-person.gts',
-          `import { contains, field, CardDef, Component, FieldDef, StringField } from 'https://cardstack.com/base/card-api';
+          `import { contains, field, CardDef, Component, FieldDef, StringField } from '@cardstack/base/card-api';
            export class FailingField extends FieldDef {
              static displayName = 'Failing Field';
              @field cardTitle = contains(StringField);
diff --git a/packages/host/tests/acceptance/code-submode/create-file-test.gts b/packages/host/tests/acceptance/code-submode/create-file-test.gts
index 295e34792d4..7454febba4e 100644
--- a/packages/host/tests/acceptance/code-submode/create-file-test.gts
+++ b/packages/host/tests/acceptance/code-submode/create-file-test.gts
@@ -50,14 +50,14 @@ const files: Record<string, any> = {
       attributes: {},
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/cards-grid',
+          module: '@cardstack/base/cards-grid',
           name: 'CardsGrid',
         },
       },
     },
   },
   'error.gts': `
-    import { CardDef } from 'https://cardstack.com/base/card-api';
+    import { CardDef } from '@cardstack/base/card-api';
 
     export default class ErrorCard extends CardDef {
       static displayName = 'error';
@@ -69,8 +69,8 @@ const files: Record<string, any> = {
     }
   `,
   'pet.gts': `
-    import { contains, linksTo, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-    import StringField from "https://cardstack.com/base/string";
+    import { contains, linksTo, field, CardDef, Component } from "@cardstack/base/card-api";
+    import StringField from "@cardstack/base/string";
 
     export default class Pet extends CardDef {
       static displayName = 'Pet';
@@ -84,8 +84,8 @@ const files: Record<string, any> = {
     }
   `,
   'person.gts': `
-    import { contains, linksTo, field, CardDef } from "https://cardstack.com/base/card-api";
-    import StringField from "https://cardstack.com/base/string";
+    import { contains, linksTo, field, CardDef } from "@cardstack/base/card-api";
+    import StringField from "@cardstack/base/string";
     import Pet from "./pet";
 
     export class Person extends CardDef {
@@ -109,7 +109,7 @@ const files: Record<string, any> = {
       },
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/spec',
+          module: '@cardstack/base/spec',
           name: 'Spec',
         },
       },
@@ -126,7 +126,7 @@ const files: Record<string, any> = {
       },
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/spec',
+          module: '@cardstack/base/spec',
           name: 'Spec',
         },
       },
@@ -143,7 +143,7 @@ const files: Record<string, any> = {
       },
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/spec',
+          module: '@cardstack/base/spec',
           name: 'Spec',
         },
       },
@@ -177,7 +177,7 @@ const filesB: Record<string, any> = {
       attributes: {},
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/cards-grid',
+          module: '@cardstack/base/cards-grid',
           name: 'CardsGrid',
         },
       },
@@ -718,8 +718,8 @@ module('Acceptance | code submode | create-file tests', function (hooks) {
     test<TestContextWithSave>('can create a new card definition in different realm than inherited definition', async function (assert) {
       assert.expect(12);
       let expectedSrc = `
-import { CardDef } from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 export class TrèsTestCard extends CardDef {
   static displayName = "Très test card 😀";
 }`.trim();
@@ -800,7 +800,7 @@ export class TrèsTestCard extends CardDef {
           content,
           `
 import { Person } from './person';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 export class TestCard extends Person {
   static displayName = "Test Card";
 }`.trim(),
@@ -947,10 +947,10 @@ export class TestCard extends Person {
       await waitFor('[data-test-card-catalog-modal]');
 
       await waitFor(
-        `[data-test-card-catalog-item="https://cardstack.com/base/fields/biginteger-field"]`,
+        `[data-test-card-catalog-item="@cardstack/base/fields/biginteger-field"]`,
       );
       await click(
-        `[data-test-card-catalog-item="https://cardstack.com/base/fields/biginteger-field"]`,
+        `[data-test-card-catalog-item="@cardstack/base/fields/biginteger-field"]`,
       );
       await click('[data-test-card-catalog-go-button]');
 
@@ -968,8 +968,8 @@ export class TestCard extends Person {
         assert.strictEqual(
           content,
           `
-import BigInteger from 'https://cardstack.com/base/big-integer';
-import { Component } from 'https://cardstack.com/base/card-api';
+import BigInteger from '@cardstack/base/big-integer';
+import { Component } from '@cardstack/base/card-api';
 export class FieldThatExtendsFromBigInt extends BigInteger {
   static displayName = "Field that extends from big int";
 }`.trim(),
@@ -989,10 +989,10 @@ export class FieldThatExtendsFromBigInt extends BigInteger {
       await waitFor('[data-test-card-catalog-modal]');
 
       await waitFor(
-        `[data-test-card-catalog-item="https://cardstack.com/base/fields/biginteger-field"]`,
+        `[data-test-card-catalog-item="@cardstack/base/fields/biginteger-field"]`,
       );
       await click(
-        `[data-test-card-catalog-item="https://cardstack.com/base/fields/biginteger-field"]`,
+        `[data-test-card-catalog-item="@cardstack/base/fields/biginteger-field"]`,
       );
       await click('[data-test-card-catalog-go-button]');
       await fillIn(
@@ -1037,7 +1037,7 @@ export class FieldThatExtendsFromBigInt extends BigInteger {
           content,
           `
 import Pet from './pet';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 export class TestCard extends Pet {
   static displayName = "Test Card";
 }`.trim(),
@@ -1076,7 +1076,7 @@ export class TestCard extends Pet {
           content,
           `
 import PetParent from './pet';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 export class Pet extends PetParent {
   static displayName = "Pet";
 }`.trim(),
@@ -1114,7 +1114,7 @@ export class Pet extends PetParent {
           content,
           `
 import Pet from './pet';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 export class Map0 extends Pet {
   static displayName = "Map";
 }`.trim(),
@@ -1131,8 +1131,8 @@ export class Map0 extends Pet {
     test<TestContextWithSave>('can specify new directory as part of filename when creating a new definition', async function (assert) {
       assert.expect(2);
       let expectedSrc = `
-import { CardDef } from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 export class TestCard extends CardDef {
   static displayName = "Test Card";
 }`.trim();
@@ -1166,8 +1166,8 @@ export class TestCard extends CardDef {
     test<TestContextWithSave>('can handle filename with .gts extension in filename when creating a new definition', async function (assert) {
       assert.expect(2);
       let expectedSrc = `
-import { CardDef } from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 export class TestCard extends CardDef {
   static displayName = "Test Card";
 }`.trim();
@@ -1201,8 +1201,8 @@ export class TestCard extends CardDef {
     test<TestContextWithSave>('can handle leading "/" in filename when creating a new definition', async function (assert) {
       assert.expect(2);
       let expectedSrc = `
-import { CardDef } from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 export class TestCard extends CardDef {
   static displayName = "Test Card";
 }`.trim();
diff --git a/packages/host/tests/acceptance/code-submode/editor-test.ts b/packages/host/tests/acceptance/code-submode/editor-test.ts
index 508af2711d9..7897e5d9ce4 100644
--- a/packages/host/tests/acceptance/code-submode/editor-test.ts
+++ b/packages/host/tests/acceptance/code-submode/editor-test.ts
@@ -78,8 +78,8 @@ module('Acceptance | code submode | editor tests', function (hooks) {
         contents: {
           ...SYSTEM_CARD_FIXTURE_CONTENTS,
           'pet.gts': `
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class Pet extends CardDef {
           static displayName = 'Pet';
@@ -99,8 +99,8 @@ module('Acceptance | code submode | editor tests', function (hooks) {
         }
       `,
           'shipping-info.gts': `
-        import { contains, field, Component, FieldDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, Component, FieldDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class ShippingInfo extends FieldDef {
           static displayName = 'Shipping Info';
           @field preferredCarrier = contains(StringField);
@@ -119,8 +119,8 @@ module('Acceptance | code submode | editor tests', function (hooks) {
         }
       `,
           'address.gts': `
-        import { contains, field, Component, FieldDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, Component, FieldDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         import { ShippingInfo } from "./shipping-info";
         import { FieldContainer } from '@cardstack/boxel-ui/components';
 
@@ -155,8 +155,8 @@ module('Acceptance | code submode | editor tests', function (hooks) {
         }
       `,
           'person.gts': `
-        import { contains, linksTo, field, Component, CardDef, linksToMany } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, linksTo, field, Component, CardDef, linksToMany } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         import { Pet } from "./pet";
         import { Address } from "./address";
 
@@ -252,7 +252,7 @@ module('Acceptance | code submode | editor tests', function (hooks) {
               attributes: {},
               meta: {
                 adoptsFrom: {
-                  module: 'https://cardstack.com/base/cards-grid',
+                  module: '@cardstack/base/cards-grid',
                   name: 'CardsGrid',
                 },
               },
@@ -293,7 +293,7 @@ module('Acceptance | code submode | editor tests', function (hooks) {
               meta: {
                 adoptsFrom: {
                   name: 'Theme',
-                  module: 'https://cardstack.com/base/card-api',
+                  module: '@cardstack/base/card-api',
                 },
               },
               attributes: {
@@ -708,8 +708,8 @@ module('Acceptance | code submode | editor tests', function (hooks) {
 
   test<TestContextWithSave>('card definition change made in monaco editor is auto-saved', async function (assert) {
     let expected = `
-    import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-    import StringField from "https://cardstack.com/base/string";
+    import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+    import StringField from "@cardstack/base/string";
 
     export class Pet extends CardDef {
       static displayName = 'PetXXX';  // this is the change
diff --git a/packages/host/tests/acceptance/code-submode/field-playground-test.gts b/packages/host/tests/acceptance/code-submode/field-playground-test.gts
index d1614083de6..d6f051a439b 100644
--- a/packages/host/tests/acceptance/code-submode/field-playground-test.gts
+++ b/packages/host/tests/acceptance/code-submode/field-playground-test.gts
@@ -41,9 +41,9 @@ import { setupApplicationTest } from '../../helpers/setup';
 
 const { resolvedBaseRealmURL } = ENV;
 
-const authorCard = `import { contains, field, CardDef, Component, FieldDef } from "https://cardstack.com/base/card-api";
-  import MarkdownField from 'https://cardstack.com/base/markdown';
-  import StringField from "https://cardstack.com/base/string";
+const authorCard = `import { contains, field, CardDef, Component, FieldDef } from "@cardstack/base/card-api";
+  import MarkdownField from '@cardstack/base/markdown';
+  import StringField from "@cardstack/base/string";
   export class Author extends CardDef {
     static displayName = 'Author';
     @field firstName = contains(StringField);
@@ -100,10 +100,10 @@ const authorCard = `import { contains, field, CardDef, Component, FieldDef } fro
     }
 }`;
 
-const blogPostCard = `import { contains, containsMany, field, linksTo, CardDef, Component, FieldDef } from "https://cardstack.com/base/card-api";
-  import DateTimeField from 'https://cardstack.com/base/datetime';
-  import MarkdownField from 'https://cardstack.com/base/markdown';
-  import StringField from "https://cardstack.com/base/string";
+const blogPostCard = `import { contains, containsMany, field, linksTo, CardDef, Component, FieldDef } from "@cardstack/base/card-api";
+  import DateTimeField from '@cardstack/base/datetime';
+  import MarkdownField from '@cardstack/base/markdown';
+  import StringField from "@cardstack/base/string";
   import { Author } from './author';
 
   export class Status extends StringField {
@@ -193,7 +193,7 @@ const blogPostCard = `import { contains, containsMany, field, linksTo, CardDef,
     }
 }`;
 
-const petCard = `import { contains, containsMany, field, CardDef, Component, FieldDef, StringField } from 'https://cardstack.com/base/card-api';
+const petCard = `import { contains, containsMany, field, CardDef, Component, FieldDef, StringField } from '@cardstack/base/card-api';
   export class ToyField extends FieldDef {
     static displayName = 'Toy';
     @field cardTitle = contains(StringField);
@@ -239,7 +239,7 @@ const commentSpec2 = {
         ],
       },
       adoptsFrom: {
-        module: 'https://cardstack.com/base/spec',
+        module: '@cardstack/base/spec',
         name: 'Spec',
       },
     },
@@ -287,7 +287,7 @@ const commentSpec1 = {
         ],
       },
       adoptsFrom: {
-        module: 'https://cardstack.com/base/spec',
+        module: '@cardstack/base/spec',
         name: 'Spec',
       },
     },
@@ -379,7 +379,7 @@ module('Acceptance | code-submode | field playground', function (_hooks) {
                 },
                 meta: {
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/spec',
+                    module: '@cardstack/base/spec',
                     name: 'Spec',
                   },
                 },
@@ -425,7 +425,7 @@ module('Acceptance | code-submode | field playground', function (_hooks) {
                     ],
                   },
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/spec',
+                    module: '@cardstack/base/spec',
                     name: 'Spec',
                   },
                 },
@@ -464,7 +464,7 @@ module('Acceptance | code-submode | field playground', function (_hooks) {
                     ],
                   },
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/spec',
+                    module: '@cardstack/base/spec',
                     name: 'Spec',
                   },
                 },
@@ -1154,7 +1154,7 @@ module('Acceptance | code-submode | field playground', function (_hooks) {
                     ],
                   },
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/spec',
+                    module: '@cardstack/base/spec',
                     name: 'Spec',
                   },
                 },
@@ -1174,7 +1174,7 @@ module('Acceptance | code-submode | field playground', function (_hooks) {
                 },
                 meta: {
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/spec',
+                    module: '@cardstack/base/spec',
                     name: 'Spec',
                   },
                 },
diff --git a/packages/host/tests/acceptance/code-submode/file-def-navigation-test.gts b/packages/host/tests/acceptance/code-submode/file-def-navigation-test.gts
index 820ec9a41d6..066ed0f0837 100644
--- a/packages/host/tests/acceptance/code-submode/file-def-navigation-test.gts
+++ b/packages/host/tests/acceptance/code-submode/file-def-navigation-test.gts
@@ -31,9 +31,9 @@ module('Acceptance | code submode | file def navigation', function (hooks) {
 
   hooks.beforeEach(async function () {
     let loader = getService('loader-service').loader;
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
-    let string: typeof import('https://cardstack.com/base/string');
-    let fileApi: typeof import('https://cardstack.com/base/file-api');
+    let cardApi: typeof import('@cardstack/base/card-api');
+    let string: typeof import('@cardstack/base/string');
+    let fileApi: typeof import('@cardstack/base/file-api');
 
     cardApi = await loader.import(`${baseRealm.url}card-api`);
     string = await loader.import(`${baseRealm.url}string`);
diff --git a/packages/host/tests/acceptance/code-submode/file-tree-test.ts b/packages/host/tests/acceptance/code-submode/file-tree-test.ts
index 197cad1007b..d64dd071b2a 100644
--- a/packages/host/tests/acceptance/code-submode/file-tree-test.ts
+++ b/packages/host/tests/acceptance/code-submode/file-tree-test.ts
@@ -37,7 +37,7 @@ import { setupApplicationTest } from '../../helpers/setup';
 import type { TestRealmAdapter } from '../../helpers/adapter';
 
 const indexCardSource = `
-  import { CardDef, Component } from "https://cardstack.com/base/card-api";
+  import { CardDef, Component } from "@cardstack/base/card-api";
 
   export class Index extends CardDef {
     static isolated = class Isolated extends Component<typeof this> {
@@ -51,8 +51,8 @@ const indexCardSource = `
 `;
 
 const personCardSource = `
-  import { contains, containsMany, field, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, containsMany, field, linksToMany, CardDef, Component } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 import WriteTextFileCommand from '../../../app/commands/write-text-file';
   import { Friend } from './friend';
 
@@ -92,8 +92,8 @@ const employeeCardSource = `
     contains,
     field,
     Component,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
   import { Person } from './person';
 
   export class Employee extends Person {
@@ -116,8 +116,8 @@ const inThisFileSource = `
     field,
     CardDef,
     FieldDef,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
 
   export const exportedVar = 'exported var';
 
@@ -162,8 +162,8 @@ const inThisFileSource = `
 `;
 
 const friendCardSource = `
-  import { contains, linksTo, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, linksTo, field, CardDef, Component } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class Friend extends CardDef {
     static displayName = 'Friend';
@@ -991,7 +991,7 @@ module('Acceptance | code submode | file-tree tests', function (hooks) {
       ],
       submode: 'code',
       fileView: 'browser',
-      codePath: `https://cardstack.com/base/cards-grid.gts`,
+      codePath: `@cardstack/base/cards-grid.gts`,
     });
 
     await waitFor('[data-test-file="cards-grid.gts"]');
@@ -1013,7 +1013,7 @@ module('Acceptance | code submode | file-tree tests', function (hooks) {
       ],
       submode: 'code',
       fileView: 'browser',
-      codePath: `https://cardstack.com/base/cards-grid.gts`,
+      codePath: `@cardstack/base/cards-grid.gts`,
     });
 
     await waitFor('[data-test-togglable-left-panel]');
@@ -1089,7 +1089,7 @@ module('Acceptance | code submode | file-tree tests', function (hooks) {
     await writeTextFileCommand.execute({
       path: `${newDirName}/${newFileName}`,
       content:
-        'import { CardDef, Component } from "https://cardstack.com/base/card-api";\n\nexport class NewFile extends CardDef {\n  static isolated = class Isolated extends Component<typeof this> {\n    <template>\n      <div data-test-new-file>New File Content</div>\n    </template>\n  };\n}',
+        'import { CardDef, Component } from "@cardstack/base/card-api";\n\nexport class NewFile extends CardDef {\n  static isolated = class Isolated extends Component<typeof this> {\n    <template>\n      <div data-test-new-file>New File Content</div>\n    </template>\n  };\n}',
       realm: testRealmURL,
     });
     await settled();
diff --git a/packages/host/tests/acceptance/code-submode/head-format-preview-test.ts b/packages/host/tests/acceptance/code-submode/head-format-preview-test.ts
index 54aa2e29b5d..4b329722403 100644
--- a/packages/host/tests/acceptance/code-submode/head-format-preview-test.ts
+++ b/packages/host/tests/acceptance/code-submode/head-format-preview-test.ts
@@ -25,8 +25,8 @@ import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupApplicationTest } from '../../helpers/setup';
 
 const headPreviewWithDisallowedTagsSource = `
-  import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class HeadPreviewUnsafe extends CardDef {
     static displayName = 'Head Preview Unsafe';
@@ -46,8 +46,8 @@ const headPreviewWithDisallowedTagsSource = `
 `;
 
 const headPreviewCardSource = `
-  import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class HeadPreview extends CardDef {
     static displayName = 'Head Preview';
diff --git a/packages/host/tests/acceptance/code-submode/inspector-test.ts b/packages/host/tests/acceptance/code-submode/inspector-test.ts
index d1d1dc06b98..721414d1f30 100644
--- a/packages/host/tests/acceptance/code-submode/inspector-test.ts
+++ b/packages/host/tests/acceptance/code-submode/inspector-test.ts
@@ -69,7 +69,7 @@ const realmAFiles: Record<string, any> = {
       attributes: {},
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/cards-grid',
+          module: '@cardstack/base/cards-grid',
           name: 'CardsGrid',
         },
       },
@@ -78,7 +78,7 @@ const realmAFiles: Record<string, any> = {
 };
 
 const indexCardSource = `
-  import { CardDef, Component } from "https://cardstack.com/base/card-api";
+  import { CardDef, Component } from "@cardstack/base/card-api";
 
   export class Index extends CardDef {
     static isolated = class Isolated extends Component<typeof this> {
@@ -92,8 +92,8 @@ const indexCardSource = `
 `;
 
 const personCardSource = `
-  import { contains, containsMany, field, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, containsMany, field, linksToMany, CardDef, Component } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
   import { Friend } from './friend';
 
   export class Person extends CardDef {
@@ -127,8 +127,8 @@ const personCardSource = `
   }
 `;
 const petCardSource = `
-  import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class Pet extends CardDef {
     static displayName = 'Pet';
@@ -153,8 +153,8 @@ const employeeCardSource = `
     contains,
     field,
     Component,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
   import { Person } from './person';
 
   export class Employee extends Person {
@@ -179,8 +179,8 @@ const inThisFileSource = `
     field,
     CardDef,
     FieldDef,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
 
   export const exportedVar = 'exported var';
 
@@ -243,8 +243,8 @@ const commandModuleSource = `
 `;
 
 const friendCardSource = `
-  import { contains, linksTo, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, linksTo, field, CardDef, Component } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class Friend extends CardDef {
     static displayName = 'Friend';
@@ -279,8 +279,8 @@ const exportsSource = `
     field,
     CardDef,
     FieldDef
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
 
   export class AncestorCard1 extends CardDef {
     static displayName = 'AncestorCard1';
@@ -307,8 +307,8 @@ const specialExportsSource = `
     contains,
     field,
     CardDef
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
 
   class AncestorCard extends CardDef {
     static displayName = 'Ancestor';
@@ -333,7 +333,7 @@ const importsSource = `
     field,
     linksTo,
     linksToMany
-  } from 'https://cardstack.com/base/card-api';
+  } from '@cardstack/base/card-api';
 
   export class ChildCard1 extends AncestorCard2 {
     static displayName = 'ChildCard1';
@@ -370,9 +370,9 @@ const reExportSource = `
     FieldDef,
     BaseDef as BDef,
     contains,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
-  import NumberField from 'https://cardstack.com/base/number';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
+  import NumberField from '@cardstack/base/number';
 
   export const exportedVar = 'exported var';
 
@@ -385,16 +385,16 @@ const reExportSource = `
   export default NumberField;
   export { Person as Human } from './person';
 
-  export { default as Date } from 'https://cardstack.com/base/date';
+  export { default as Date } from '@cardstack/base/date';
 `;
 
 const fileDefSource = `
-  import { FileDef } from 'https://cardstack.com/base/file-api';
+  import { FileDef } from '@cardstack/base/file-api';
   import {
     contains,
     field,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
 
   export class CustomFileDef extends FileDef {
     static displayName = 'custom file';
@@ -403,7 +403,7 @@ const fileDefSource = `
 `;
 
 const pngDefModuleSource = `
-  export { PngDef } from 'https://cardstack.com/base/png-image-def';
+  export { PngDef } from '@cardstack/base/png-image-def';
 `;
 
 const localInheritSource = `
@@ -412,7 +412,7 @@ const localInheritSource = `
     field,
     CardDef,
     FieldDef,
-  } from 'https://cardstack.com/base/card-api';
+  } from '@cardstack/base/card-api';
 
   class GrandParent extends CardDef {
     static displayName = 'local grandparent';
@@ -2020,7 +2020,7 @@ module('Acceptance | code submode | inspector tests', function (hooks) {
     assert.expect(11);
     let expectedSrc = `
 import { ExportedCard } from './in-this-file';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 export class TestCard extends ExportedCard {
   static displayName = "Test Card";
 }`.trim();
@@ -2129,7 +2129,7 @@ export class TestCard extends ExportedCard {
         content,
         `
 import { ExportedField } from './in-this-file';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 export class TestField extends ExportedField {
   static displayName = "Test Field";
 }`.trim(),
@@ -2234,7 +2234,7 @@ export class TestFileDef extends CustomFileDef {
     assert.expect(4);
     let expectedSrc = `
 import { ExportedCard as ExportedCardParent } from './in-this-file';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 export class ExportedCard extends ExportedCardParent {
   static displayName = "Exported Card";
 }`.trim();
diff --git a/packages/host/tests/acceptance/code-submode/recent-files-test.ts b/packages/host/tests/acceptance/code-submode/recent-files-test.ts
index d15c7055c82..8487e1ce6a8 100644
--- a/packages/host/tests/acceptance/code-submode/recent-files-test.ts
+++ b/packages/host/tests/acceptance/code-submode/recent-files-test.ts
@@ -37,7 +37,7 @@ import {
 import { setupApplicationTest } from '../../helpers/setup';
 
 const indexCardSource = `
-  import { CardDef, Component } from "https://cardstack.com/base/card-api";
+  import { CardDef, Component } from "@cardstack/base/card-api";
 
   export class Index extends CardDef {
     static isolated = class Isolated extends Component<typeof this> {
@@ -51,8 +51,8 @@ const indexCardSource = `
 `;
 
 const personCardSource = `
-  import { contains, containsMany, field, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, containsMany, field, linksToMany, CardDef, Component } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
   import { Friend } from './friend';
 
   export class Person extends CardDef {
@@ -91,8 +91,8 @@ const employeeCardSource = `
     contains,
     field,
     Component,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
   import { Person } from './person';
 
   export class Employee extends Person {
@@ -115,8 +115,8 @@ const inThisFileSource = `
     field,
     CardDef,
     FieldDef,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
 
   export const exportedVar = 'exported var';
 
@@ -161,8 +161,8 @@ const inThisFileSource = `
 `;
 
 const friendCardSource = `
-  import { contains, linksTo, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, linksTo, field, CardDef, Component } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class Friend extends CardDef {
     static displayName = 'Friend';
@@ -512,8 +512,8 @@ module('Acceptance | code submode | recent files tests', function (hooks) {
 
   test('displays recent files in base realm', async function (assert) {
     setRecentFiles([
-      ['https://cardstack.com/base/', 'code-ref.gts'],
-      ['https://cardstack.com/base/', 'spec.gts'],
+      ['@cardstack/base/', 'code-ref.gts'],
+      ['@cardstack/base/', 'spec.gts'],
       // @ts-ignore error on purpose
       'a-non-url-to-ignore',
     ]);
@@ -528,7 +528,7 @@ module('Acceptance | code submode | recent files tests', function (hooks) {
         ],
       ],
       submode: 'code',
-      codePath: `https://cardstack.com/base/date.gts`,
+      codePath: `@cardstack/base/date.gts`,
       fileView: 'browser',
       openDirs: {},
     });
@@ -580,10 +580,10 @@ module('Acceptance | code submode | recent files tests', function (hooks) {
     );
 
     assert.deepEqual(removedCursorPositions, [
-      ['https://cardstack.com/base/', 'field-component.gts'],
-      ['https://cardstack.com/base/', 'date.gts'],
-      ['https://cardstack.com/base/', 'code-ref.gts'],
-      ['https://cardstack.com/base/', 'spec.gts'],
+      ['@cardstack/base/', 'field-component.gts'],
+      ['@cardstack/base/', 'date.gts'],
+      ['@cardstack/base/', 'code-ref.gts'],
+      ['@cardstack/base/', 'spec.gts'],
     ]);
   });
 
diff --git a/packages/host/tests/acceptance/code-submode/schema-editor-test.ts b/packages/host/tests/acceptance/code-submode/schema-editor-test.ts
index 30d61a78734..5d0e83b4424 100644
--- a/packages/host/tests/acceptance/code-submode/schema-editor-test.ts
+++ b/packages/host/tests/acceptance/code-submode/schema-editor-test.ts
@@ -34,7 +34,7 @@ import { setupApplicationTest } from '../../helpers/setup';
 import '@cardstack/runtime-common/helpers/code-equality-assertion';
 
 const indexCardSource = `
-  import { CardDef, Component } from "https://cardstack.com/base/card-api";
+  import { CardDef, Component } from "@cardstack/base/card-api";
 
   export class Index extends CardDef {
     static isolated = class Isolated extends Component<typeof this> {
@@ -48,7 +48,7 @@ const indexCardSource = `
 `;
 
 const personCardSource = `
-  import { contains, containsMany, field, linksToMany, CardDef, Component, StringField } from "https://cardstack.com/base/card-api";
+  import { contains, containsMany, field, linksToMany, CardDef, Component, StringField } from "@cardstack/base/card-api";
   import { Friend } from './friend';
 
   export class Person extends CardDef {
@@ -89,10 +89,10 @@ const employeeCardSource = `
     linksTo,
     Component,
     FieldDef,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
-  import BooleanField from 'https://cardstack.com/base/boolean';
-  import DateField from 'https://cardstack.com/base/date';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
+  import BooleanField from '@cardstack/base/boolean';
+  import DateField from '@cardstack/base/date';
   import { Person } from './person';
 
   class Supervisor extends Person {
@@ -145,8 +145,8 @@ const inThisFileSource = `
     field,
     CardDef,
     FieldDef,
-  } from 'https://cardstack.com/base/card-api';
-  import StringField from 'https://cardstack.com/base/string';
+  } from '@cardstack/base/card-api';
+  import StringField from '@cardstack/base/string';
 
   export const exportedVar = 'exported var';
 
@@ -191,8 +191,8 @@ const inThisFileSource = `
 `;
 
 const friendCardSource = `
-  import { contains, linksTo, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, linksTo, field, CardDef, Component } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class Friend extends CardDef {
     static displayName = 'Friend';
@@ -227,7 +227,7 @@ const ambiguousDisplayNamesCardSource = `
     field,
     linksTo,
     Component,
-  } from 'https://cardstack.com/base/card-api';
+  } from '@cardstack/base/card-api';
 
   export class Editor extends CardDef {
     static displayName = 'Author Bio';
@@ -621,10 +621,10 @@ module('Acceptance | code submode | schema editor tests', function (hooks) {
 
     await click('[data-test-choose-card-button]');
     await waitFor(
-      '[data-test-card-catalog-item="https://cardstack.com/base/fields/biginteger-field"]',
+      '[data-test-card-catalog-item="@cardstack/base/fields/biginteger-field"]',
     );
     await click(
-      '[data-test-card-catalog-item="https://cardstack.com/base/fields/biginteger-field"]',
+      '[data-test-card-catalog-item="@cardstack/base/fields/biginteger-field"]',
     );
     await click('[data-test-card-catalog-go-button]');
     // There is some additional thing we are waiting on here, probably the
@@ -648,11 +648,11 @@ module('Acceptance | code submode | schema editor tests', function (hooks) {
     await fillIn('[data-test-search-field]', 'Date');
 
     await waitFor(
-      '[data-test-card-catalog-item="https://cardstack.com/base/fields/date-field"]',
+      '[data-test-card-catalog-item="@cardstack/base/fields/date-field"]',
     );
 
     await click(
-      '[data-test-card-catalog-item="https://cardstack.com/base/fields/date-field"]',
+      '[data-test-card-catalog-item="@cardstack/base/fields/date-field"]',
     );
     await click('[data-test-card-catalog-go-button]');
     // There is some additional thing we are waiting on here, probably the
@@ -722,10 +722,10 @@ module('Acceptance | code submode | schema editor tests', function (hooks) {
     await click('[data-test-add-field-button]');
     await click('[data-test-choose-card-button]');
     await waitFor(
-      '[data-test-card-catalog-item="https://cardstack.com/base/fields/biginteger-field"]',
+      '[data-test-card-catalog-item="@cardstack/base/fields/biginteger-field"]',
     );
     await click(
-      '[data-test-card-catalog-item="https://cardstack.com/base/fields/biginteger-field"]',
+      '[data-test-card-catalog-item="@cardstack/base/fields/biginteger-field"]',
     );
     await click('[data-test-card-catalog-go-button]');
     await fillIn('[data-test-field-name-input]', 'luckyNumbers');
@@ -902,10 +902,10 @@ module('Acceptance | code submode | schema editor tests', function (hooks) {
     // Edit the field to be a "contains" BigInteger field, named friendCount
     await click('[data-test-choose-card-button]');
     await waitFor(
-      '[data-test-card-catalog-item="https://cardstack.com/base/fields/biginteger-field"]',
+      '[data-test-card-catalog-item="@cardstack/base/fields/biginteger-field"]',
     );
     await click(
-      '[data-test-card-catalog-item="https://cardstack.com/base/fields/biginteger-field"]',
+      '[data-test-card-catalog-item="@cardstack/base/fields/biginteger-field"]',
     );
     await click('[data-test-card-catalog-go-button]');
     await fillIn('[data-test-field-name-input]', 'friendCount');
@@ -985,7 +985,7 @@ module('Acceptance | code submode | schema editor tests', function (hooks) {
       assert.codeEqual(
         content,
         `
-  import { contains, containsMany, field, linksToMany, CardDef, Component, StringField } from "https://cardstack.com/base/card-api";
+  import { contains, containsMany, field, linksToMany, CardDef, Component, StringField } from "@cardstack/base/card-api";
   import { Friend } from './friend';
 
   export class Person extends CardDef {
@@ -1049,7 +1049,7 @@ module('Acceptance | code submode | schema editor tests', function (hooks) {
       assert.codeEqual(
         content,
         `
-  import { contains, containsMany, field, linksToMany, CardDef, Component, StringField } from "https://cardstack.com/base/card-api";
+  import { contains, containsMany, field, linksToMany, CardDef, Component, StringField } from "@cardstack/base/card-api";
   import { Friend } from './friend';
 
   export class Person extends CardDef {
@@ -1125,7 +1125,7 @@ module('Acceptance | code submode | schema editor tests', function (hooks) {
     await waitFor('[data-test-tooltip-content]');
     assert
       .dom('[data-test-tooltip-content]')
-      .hasText('https://cardstack.com/base/card-api (BaseDef)');
+      .hasText('@cardstack/base/card-api (BaseDef)');
 
     await triggerEvent(
       '[data-test-card-schema="Base"] [data-test-card-schema-navigational-button]',
diff --git a/packages/host/tests/acceptance/code-submode/spec-test.gts b/packages/host/tests/acceptance/code-submode/spec-test.gts
index c52f450862d..d9269545ee0 100644
--- a/packages/host/tests/acceptance/code-submode/spec-test.gts
+++ b/packages/host/tests/acceptance/code-submode/spec-test.gts
@@ -44,8 +44,8 @@ import '@cardstack/runtime-common/helpers/code-equality-assertion';
 const testRealm2URL = `http://test-realm/test2/`;
 
 const personCardSource = `
-  import { contains, containsMany, field, linksTo, linksToMany, CardDef, Component, FieldDef } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, containsMany, field, linksTo, linksToMany, CardDef, Component, FieldDef } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class PersonField extends FieldDef {
     static displayName = 'PersonField';
@@ -82,8 +82,8 @@ const personCardSource = `
 `;
 
 const person1CardSource = `
-  import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class Person1 extends CardDef {
     static displayName = 'Person1';
@@ -91,8 +91,8 @@ const person1CardSource = `
 `;
 
 const petCardSource = `
-  import { contains, field, Component, CardDef, FieldDef } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, field, Component, CardDef, FieldDef } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class PetField extends FieldDef {
     static displayName = 'PetField';
@@ -125,8 +125,8 @@ const petCardSource = `
 `;
 
 const employeeCardSource = `
-  import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export default class Employee extends CardDef {
     static displayName = 'Employee';
@@ -140,8 +140,8 @@ const employeeCardSource = `
 `;
 
 const newSkillCardSource = `
-  import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-  import { Skill } from 'https://cardstack.com/base/skill';
+  import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+  import { Skill } from '@cardstack/base/skill';
 
   export class NewSkill extends Skill {
     static displayName = 'NewSkill';
@@ -153,7 +153,7 @@ const newSkillCardSource = `
 `;
 
 const specCardSource = `
-  import { Spec } from 'https://cardstack.com/base/spec';
+  import { Spec } from '@cardstack/base/spec';
 
   export class TestSpec extends Spec {
     static displayName = 'TestSpec';
@@ -166,7 +166,7 @@ const primitiveFieldCardSource = `
     Component,
     FieldDef,
     primitive,
-  } from 'https://cardstack.com/base/card-api';
+  } from '@cardstack/base/card-api';
 
    export class PrimitiveField extends FieldDef {
     static displayName = 'PrimitiveField';
@@ -179,8 +179,8 @@ const primitiveFieldCardSource = `
 `;
 
 const quoteFieldCardSource = `
-  import { contains, field, Component, FieldDef } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, field, Component, FieldDef } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class QuoteField extends FieldDef {
     static displayName = 'QuoteField';
@@ -204,7 +204,7 @@ const polymorphicFieldCardSource = `
     contains,
     StringField,
     FieldDef,
-  } from 'https://cardstack.com/base/card-api';
+  } from '@cardstack/base/card-api';
   import { on } from '@ember/modifier';
 
   export class TestField extends FieldDef {
diff --git a/packages/host/tests/acceptance/commands-test.gts b/packages/host/tests/acceptance/commands-test.gts
index 455a01976aa..df53f60d66f 100644
--- a/packages/host/tests/acceptance/commands-test.gts
+++ b/packages/host/tests/acceptance/commands-test.gts
@@ -45,10 +45,6 @@ import {
   waitForRealmState,
 } from '@cardstack/host/commands/utils';
 
-import type { SearchCardsByTypeAndTitleInput } from 'https://cardstack.com/base/command';
-
-import type { Skill } from 'https://cardstack.com/base/skill';
-
 import {
   setupLocalIndexing,
   setupOnSave,
@@ -76,6 +72,9 @@ import { setupMockMatrix } from '../helpers/mock-matrix';
 import { setupApplicationTest } from '../helpers/setup';
 import { suspendGlobalErrorHook } from '../helpers/uncaught-exceptions';
 
+import type { SearchCardsByTypeAndTitleInput } from '@cardstack/base/command';
+import type { Skill } from '@cardstack/base/skill';
+
 let matrixRoomId = '';
 let maybeBoomShouldBoom = true;
 let savedMeetingCardId: string | undefined;
diff --git a/packages/host/tests/acceptance/file-def-test.gts b/packages/host/tests/acceptance/file-def-test.gts
index 480a1c7d9f8..7ec65cdac5e 100644
--- a/packages/host/tests/acceptance/file-def-test.gts
+++ b/packages/host/tests/acceptance/file-def-test.gts
@@ -5,8 +5,6 @@ import { module, test } from 'qunit';
 
 import { Deferred, baseRealm, type Realm } from '@cardstack/runtime-common';
 
-import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event';
-
 import {
   SYSTEM_CARD_FIXTURE_CONTENTS,
   setupAcceptanceTestRealm,
@@ -20,6 +18,8 @@ import {
 import { setupMockMatrix } from '../helpers/mock-matrix';
 import { setupApplicationTest } from '../helpers/setup';
 
+import type { RealmEventContent } from '@cardstack/base/matrix-event';
+
 module('Acceptance | file def', function (hooks) {
   let realm: Realm;
 
@@ -59,11 +59,11 @@ module('Acceptance | file def', function (hooks) {
     setupAuthEndpoints();
 
     let loader = getService('loader-service').loader;
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
-    let string: typeof import('https://cardstack.com/base/string');
-    let markdown: typeof import('https://cardstack.com/base/markdown');
-    let markdownFileDef: typeof import('https://cardstack.com/base/markdown-file-def');
-    let skillModule: typeof import('https://cardstack.com/base/skill');
+    let cardApi: typeof import('@cardstack/base/card-api');
+    let string: typeof import('@cardstack/base/string');
+    let markdown: typeof import('@cardstack/base/markdown');
+    let markdownFileDef: typeof import('@cardstack/base/markdown-file-def');
+    let skillModule: typeof import('@cardstack/base/skill');
 
     cardApi = await loader.import(`${baseRealm.url}card-api`);
     string = await loader.import(`${baseRealm.url}string`);
diff --git a/packages/host/tests/acceptance/host-mode-test.gts b/packages/host/tests/acceptance/host-mode-test.gts
index 3f5ae00a9a1..d13731a677b 100644
--- a/packages/host/tests/acceptance/host-mode-test.gts
+++ b/packages/host/tests/acceptance/host-mode-test.gts
@@ -85,8 +85,8 @@ module('Acceptance | host mode tests', function (hooks) {
     setExpiresInSec(60 * 60);
 
     let loader = getService('loader-service').loader;
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
-    let string: typeof import('https://cardstack.com/base/string');
+    let cardApi: typeof import('@cardstack/base/card-api');
+    let string: typeof import('@cardstack/base/string');
     cardApi = await loader.import(`${baseRealm.url}card-api`);
     string = await loader.import(`${baseRealm.url}string`);
 
@@ -203,15 +203,15 @@ module('Acceptance | host mode tests', function (hooks) {
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
           },
         },
         'broken-card.gts': `
-          import { contains, field, Component, CardDef } from 'https://cardstack.com/base/card-api';
-          import StringField from 'https://cardstack.com/base/string';
+          import { contains, field, Component, CardDef } from '@cardstack/base/card-api';
+          import StringField from '@cardstack/base/string';
           export class BrokenCard extends CardDef {
             static displayName = 'BrokenCard';
             @field name = contains(StringField);
diff --git a/packages/host/tests/acceptance/host-submode-test.gts b/packages/host/tests/acceptance/host-submode-test.gts
index 4dfd4806be2..7263d76c659 100644
--- a/packages/host/tests/acceptance/host-submode-test.gts
+++ b/packages/host/tests/acceptance/host-submode-test.gts
@@ -30,8 +30,8 @@ import { setupMockMatrix } from '../helpers/mock-matrix';
 import { setupApplicationTest } from '../helpers/setup';
 
 const personCardSource = `
-  import { contains, containsMany, field, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  import { contains, containsMany, field, linksToMany, CardDef, Component } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
 
   export class Person extends CardDef {
     static displayName = 'Person';
diff --git a/packages/host/tests/acceptance/interact-submode-creation-and-permissions-test.gts b/packages/host/tests/acceptance/interact-submode-creation-and-permissions-test.gts
index fc738cd441e..cedcd76c368 100644
--- a/packages/host/tests/acceptance/interact-submode-creation-and-permissions-test.gts
+++ b/packages/host/tests/acceptance/interact-submode-creation-and-permissions-test.gts
@@ -191,7 +191,7 @@ module(
         await fillIn('[data-test-search-field]', 'Skill');
         // Select a card from catalog entries
         await click(
-          `[data-test-card-catalog-item="https://cardstack.com/base/cards/skill"]`,
+          `[data-test-card-catalog-item="@cardstack/base/cards/skill"]`,
         );
 
         await click(`[data-test-card-catalog-go-button]`);
@@ -216,7 +216,7 @@ module(
         await click('[data-test-create-new-card-button]');
         await fillIn('[data-test-search-field]', 'Skill');
         await click(
-          `[data-test-card-catalog-item="https://cardstack.com/base/cards/skill"]`,
+          `[data-test-card-catalog-item="@cardstack/base/cards/skill"]`,
         );
 
         let id: string | undefined;
@@ -302,7 +302,7 @@ module(
         await click('[data-test-create-new-card-button]');
         await fillIn('[data-test-search-field]', 'Skill');
         await click(
-          `[data-test-card-catalog-item="https://cardstack.com/base/cards/skill"]`,
+          `[data-test-card-catalog-item="@cardstack/base/cards/skill"]`,
         );
 
         let id: string | undefined;
@@ -920,17 +920,13 @@ module(
           .dom('[data-test-highlights-card-container="ai-app-generator"]')
           .exists();
         assert
-          .dom(
-            '[data-test-card="https://cardstack.com/base/ai-app-generator"] textarea',
-          )
+          .dom('[data-test-card="@cardstack/base/ai-app-generator"] textarea')
           .hasValue(
             'Create a sprint-planning tool that lets users define backlogs, estimate stories, assign owners, and track burndown.',
           );
         await click('[data-test-boxel-button][title="About Me"]');
         assert
-          .dom(
-            '[data-test-card="https://cardstack.com/base/ai-app-generator"] textarea',
-          )
+          .dom('[data-test-card="@cardstack/base/ai-app-generator"] textarea')
           .hasValue(
             'Build a personal portfolio page with your background, skills, and contact information',
           );
@@ -1023,13 +1019,11 @@ module(
           'Design a travel planner dashboard that tracks itineraries, bookings, and budgets';
 
         await fillIn(
-          '[data-test-card="https://cardstack.com/base/ai-app-generator"] textarea',
+          '[data-test-card="@cardstack/base/ai-app-generator"] textarea',
           typedPrompt,
         );
         assert
-          .dom(
-            '[data-test-card="https://cardstack.com/base/ai-app-generator"] textarea',
-          )
+          .dom('[data-test-card="@cardstack/base/ai-app-generator"] textarea')
           .hasValue(typedPrompt);
 
         await click('[data-test-create-this-for-me]');
diff --git a/packages/host/tests/acceptance/interact-submode-test.gts b/packages/host/tests/acceptance/interact-submode-test.gts
index 34102dc96bf..efbc704f0a9 100644
--- a/packages/host/tests/acceptance/interact-submode-test.gts
+++ b/packages/host/tests/acceptance/interact-submode-test.gts
@@ -19,11 +19,6 @@ import {
 } from '@cardstack/runtime-common';
 import type { Realm } from '@cardstack/runtime-common/realm';
 
-import type {
-  IncrementalIndexEventContent,
-  RealmEventContent,
-} from 'https://cardstack.com/base/matrix-event';
-
 import {
   percySnapshot,
   testRealmURL,
@@ -36,6 +31,11 @@ import {
   testRealm2URL,
 } from '../helpers/interact-submode-setup';
 
+import type {
+  IncrementalIndexEventContent,
+  RealmEventContent,
+} from '@cardstack/base/matrix-event';
+
 module('Acceptance | interact submode tests', function (hooks) {
   let realm: Realm;
 
diff --git a/packages/host/tests/acceptance/interact-submode/create-file-test.gts b/packages/host/tests/acceptance/interact-submode/create-file-test.gts
index ec43ebd9dc4..6a44c7d7248 100644
--- a/packages/host/tests/acceptance/interact-submode/create-file-test.gts
+++ b/packages/host/tests/acceptance/interact-submode/create-file-test.gts
@@ -33,7 +33,7 @@ const testRealmFiles: Record<string, any> = {
     iconURL: 'https://boxel-images.boxel.ai/icons/Letter-t.png',
   },
   'pet.gts': `
-    import { CardDef, Component } from "https://cardstack.com/base/card-api";
+    import { CardDef, Component } from "@cardstack/base/card-api";
     export default class Pet extends CardDef {
       static displayName = 'Pet';
       static embedded = class Embedded extends Component<typeof this> {
@@ -44,7 +44,7 @@ const testRealmFiles: Record<string, any> = {
     }
   `,
   'person.gts': `
-    import { linksTo, field, CardDef } from "https://cardstack.com/base/card-api";
+    import { linksTo, field, CardDef } from "@cardstack/base/card-api";
     import Pet from "./pet";
     export class Person extends CardDef {
       static displayName = 'Person';
@@ -52,7 +52,7 @@ const testRealmFiles: Record<string, any> = {
     }
   `,
   'author.gts': `
-    import { Component, field, contains, StringField } from 'https://cardstack.com/base/card-api';
+    import { Component, field, contains, StringField } from '@cardstack/base/card-api';
     import { Person } from './person';
     export class Author extends Person {
       static displayName = "Author";
@@ -155,14 +155,14 @@ const userRealmFiles: Record<string, any> = {
     iconURL: 'https://boxel-images.boxel.ai/icons/Letter-a.png',
   },
   'plant.gts': `
-    import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
+    import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
     export class Plant extends CardDef {
       static displayName = "Plant";
       @field commonName = contains(StringField);
     }
   `,
   'garden.gts': `
-    import { CardDef, field, linksToMany } from 'https://cardstack.com/base/card-api';
+    import { CardDef, field, linksToMany } from '@cardstack/base/card-api';
     import { Plant } from './plant';
     export class Garden extends CardDef {
       static displayName = "Garden";
@@ -219,7 +219,7 @@ module('Acceptance | interact submode | create-file tests', function (hooks) {
 
   hooks.beforeEach(async function () {
     let loader = getService('loader-service').loader;
-    let cardsGrid: typeof import('https://cardstack.com/base/cards-grid');
+    let cardsGrid: typeof import('@cardstack/base/cards-grid');
     cardsGrid = await loader.import(`${baseRealm.url}cards-grid`);
     let { CardsGrid } = cardsGrid;
 
diff --git a/packages/host/tests/acceptance/operator-mode-acceptance-test.gts b/packages/host/tests/acceptance/operator-mode-acceptance-test.gts
index bc1ade73e73..2db1ce54a55 100644
--- a/packages/host/tests/acceptance/operator-mode-acceptance-test.gts
+++ b/packages/host/tests/acceptance/operator-mode-acceptance-test.gts
@@ -95,8 +95,8 @@ module('Acceptance | operator mode tests', function (hooks) {
     setExpiresInSec(60 * 60);
 
     let loader = getService('loader-service').loader;
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
-    let string: typeof import('https://cardstack.com/base/string');
+    let cardApi: typeof import('@cardstack/base/card-api');
+    let string: typeof import('@cardstack/base/string');
     cardApi = await loader.import(`${baseRealm.url}card-api`);
     string = await loader.import(`${baseRealm.url}string`);
 
@@ -319,7 +319,7 @@ module('Acceptance | operator mode tests', function (hooks) {
             },
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/spec',
+                module: '@cardstack/base/spec',
                 name: 'Spec',
               },
             },
@@ -418,7 +418,7 @@ module('Acceptance | operator mode tests', function (hooks) {
             attributes: {},
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
@@ -429,7 +429,7 @@ module('Acceptance | operator mode tests', function (hooks) {
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
diff --git a/packages/host/tests/acceptance/prerender-html-test.gts b/packages/host/tests/acceptance/prerender-html-test.gts
index b3aef30d07d..ae78091d087 100644
--- a/packages/host/tests/acceptance/prerender-html-test.gts
+++ b/packages/host/tests/acceptance/prerender-html-test.gts
@@ -47,7 +47,7 @@ module('Acceptance | prerender | html', function (hooks) {
     (globalThis as any).__boxel_definitions_recursing_depth = 0;
     (globalThis as any).__doNotSuppressRenderRouteError = true;
     let loader = getService('loader-service').loader;
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
+    let cardApi: typeof import('@cardstack/base/card-api');
     cardApi = await loader.import(`${baseRealm.url}card-api`);
 
     let {
diff --git a/packages/host/tests/acceptance/prerender-meta-test.gts b/packages/host/tests/acceptance/prerender-meta-test.gts
index 2ea9ccbe899..4d2062c6d76 100644
--- a/packages/host/tests/acceptance/prerender-meta-test.gts
+++ b/packages/host/tests/acceptance/prerender-meta-test.gts
@@ -40,7 +40,7 @@ module('Acceptance | prerender | meta', function (hooks) {
 
   hooks.beforeEach(async function () {
     let loader = getService('loader-service').loader;
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
+    let cardApi: typeof import('@cardstack/base/card-api');
     cardApi = await loader.import(`${baseRealm.url}card-api`);
 
     let {
diff --git a/packages/host/tests/acceptance/prerender-module-test.gts b/packages/host/tests/acceptance/prerender-module-test.gts
index 154fbed14d6..a78e5b6c95f 100644
--- a/packages/host/tests/acceptance/prerender-module-test.gts
+++ b/packages/host/tests/acceptance/prerender-module-test.gts
@@ -49,7 +49,7 @@ module('Acceptance | prerender | module', function (hooks) {
     optionsSegment = DEFAULT_MODULE_OPTIONS_SEGMENT,
   ) => `/module/${encodeURIComponent(url)}/${nonce}/${optionsSegment}`;
   const PERSON_MODULE = `
-    import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
+    import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
 
     export class Person extends CardDef {
       static displayName = 'Person';
@@ -57,7 +57,7 @@ module('Acceptance | prerender | module', function (hooks) {
     }
   `;
   const PARENT_MODULE = `
-    import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
+    import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
 
     export class Parent extends CardDef {
       static displayName = 'Parent';
@@ -66,7 +66,7 @@ module('Acceptance | prerender | module', function (hooks) {
   `;
   const CHILD_MODULE = `
     import { Parent } from './parent';
-    import { field, contains, StringField } from 'https://cardstack.com/base/card-api';
+    import { field, contains, StringField } from '@cardstack/base/card-api';
 
     export class Child extends Parent {
       static displayName = 'Child';
@@ -187,7 +187,7 @@ module('Acceptance | prerender | module', function (hooks) {
   test('identifies shimmed modules', async function (assert) {
     let loaderService = getService('loader-service');
     let loader = loaderService.loader;
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
+    let cardApi: typeof import('@cardstack/base/card-api');
     cardApi = await loader.import(`${baseRealm.url}card-api`);
 
     let { field, contains, CardDef, StringField } = cardApi;
@@ -314,7 +314,7 @@ module('Acceptance | prerender | module', function (hooks) {
     await adapter.write(
       'person.gts',
       `
-      import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
+      import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
 
       export class Person extends CardDef {
         static displayName = 'Updated Person';
diff --git a/packages/host/tests/acceptance/theme-card-test.gts b/packages/host/tests/acceptance/theme-card-test.gts
index e28fe026250..e868468fa69 100644
--- a/packages/host/tests/acceptance/theme-card-test.gts
+++ b/packages/host/tests/acceptance/theme-card-test.gts
@@ -207,8 +207,8 @@ module('Acceptance | theme-card-test', function (hooks) {
     setupAuthEndpoints();
 
     let loader = getService('loader-service').loader;
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
-    let booleanMod: typeof import('https://cardstack.com/base/boolean');
+    let cardApi: typeof import('@cardstack/base/card-api');
+    let booleanMod: typeof import('@cardstack/base/boolean');
     cardApi = await loader.import(`${baseRealm.url}card-api`);
     booleanMod = await loader.import(`${baseRealm.url}boolean`);
 
@@ -250,7 +250,7 @@ module('Acceptance | theme-card-test', function (hooks) {
               meta: {
                 adoptsFrom: {
                   name: 'default',
-                  module: 'https://cardstack.com/base/structured-theme',
+                  module: '@cardstack/base/structured-theme',
                 },
               },
               type: 'card',
@@ -276,7 +276,7 @@ module('Acceptance | theme-card-test', function (hooks) {
               meta: {
                 adoptsFrom: {
                   name: 'default',
-                  module: 'https://cardstack.com/base/style-reference',
+                  module: '@cardstack/base/style-reference',
                 },
               },
               type: 'card',
@@ -323,7 +323,7 @@ module('Acceptance | theme-card-test', function (hooks) {
               meta: {
                 adoptsFrom: {
                   name: 'default',
-                  module: 'https://cardstack.com/base/structured-theme',
+                  module: '@cardstack/base/structured-theme',
                 },
               },
               type: 'card',
@@ -340,7 +340,7 @@ module('Acceptance | theme-card-test', function (hooks) {
               meta: {
                 adoptsFrom: {
                   name: 'default',
-                  module: 'https://cardstack.com/base/structured-theme',
+                  module: '@cardstack/base/structured-theme',
                 },
               },
               type: 'card',
@@ -360,7 +360,7 @@ module('Acceptance | theme-card-test', function (hooks) {
               meta: {
                 adoptsFrom: {
                   name: 'default',
-                  module: 'https://cardstack.com/base/structured-theme',
+                  module: '@cardstack/base/structured-theme',
                 },
               },
               type: 'card',
@@ -380,7 +380,7 @@ module('Acceptance | theme-card-test', function (hooks) {
               meta: {
                 adoptsFrom: {
                   name: 'default',
-                  module: 'https://cardstack.com/base/structured-theme',
+                  module: '@cardstack/base/structured-theme',
                 },
               },
               type: 'card',
diff --git a/packages/host/tests/acceptance/workspace-chooser-delete-test.gts b/packages/host/tests/acceptance/workspace-chooser-delete-test.gts
index 6b17769a974..3a10061157b 100644
--- a/packages/host/tests/acceptance/workspace-chooser-delete-test.gts
+++ b/packages/host/tests/acceptance/workspace-chooser-delete-test.gts
@@ -60,7 +60,7 @@ module('Acceptance | workspace-chooser-delete', function (hooks) {
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
@@ -71,13 +71,13 @@ module('Acceptance | workspace-chooser-delete', function (hooks) {
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'CardDef',
               },
             },
           },
         },
-        'person.gts': `import { CardDef } from "https://cardstack.com/base/card-api";
+        'person.gts': `import { CardDef } from "@cardstack/base/card-api";
 
 export class Person extends CardDef {}
 `,
@@ -102,7 +102,7 @@ export class Person extends CardDef {}
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
@@ -129,7 +129,7 @@ export class Person extends CardDef {}
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
diff --git a/packages/host/tests/acceptance/workspace-chooser-test.gts b/packages/host/tests/acceptance/workspace-chooser-test.gts
index 0bf94884e3b..19aac880f2b 100644
--- a/packages/host/tests/acceptance/workspace-chooser-test.gts
+++ b/packages/host/tests/acceptance/workspace-chooser-test.gts
@@ -81,7 +81,7 @@ module('Acceptance | workspace-chooser', function (hooks) {
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
@@ -107,7 +107,7 @@ module('Acceptance | workspace-chooser', function (hooks) {
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
diff --git a/packages/host/tests/acceptance/workspace-delete-multiple-test.gts b/packages/host/tests/acceptance/workspace-delete-multiple-test.gts
index 52c990849c7..41b6090e9ac 100644
--- a/packages/host/tests/acceptance/workspace-delete-multiple-test.gts
+++ b/packages/host/tests/acceptance/workspace-delete-multiple-test.gts
@@ -45,10 +45,10 @@ module('Acceptance | workspace-delete-multiple', function (hooks) {
     let loaderService = getService('loader-service');
     let loader = loaderService.loader;
     let { field, contains, CardDef, Component } = await loader.import<
-      typeof import('https://cardstack.com/base/card-api')
+      typeof import('@cardstack/base/card-api')
     >(`${baseRealm.url}card-api`);
     let { default: StringField } = await loader.import<
-      typeof import('https://cardstack.com/base/string')
+      typeof import('@cardstack/base/string')
     >(`${baseRealm.url}string`);
 
     class Pet extends CardDef {
diff --git a/packages/host/tests/cards/ModelConfiguration/test-claude-37-sonnet.json b/packages/host/tests/cards/ModelConfiguration/test-claude-37-sonnet.json
index 8408f29c13d..4800268d38f 100644
--- a/packages/host/tests/cards/ModelConfiguration/test-claude-37-sonnet.json
+++ b/packages/host/tests/cards/ModelConfiguration/test-claude-37-sonnet.json
@@ -20,7 +20,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/system-card",
+        "module": "@cardstack/base/system-card",
         "name": "ModelConfiguration"
       }
     }
diff --git a/packages/host/tests/cards/ModelConfiguration/test-claude-sonnet-45.json b/packages/host/tests/cards/ModelConfiguration/test-claude-sonnet-45.json
index 0c303dd8d53..75131ea1d19 100644
--- a/packages/host/tests/cards/ModelConfiguration/test-claude-sonnet-45.json
+++ b/packages/host/tests/cards/ModelConfiguration/test-claude-sonnet-45.json
@@ -20,7 +20,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/system-card",
+        "module": "@cardstack/base/system-card",
         "name": "ModelConfiguration"
       }
     }
diff --git a/packages/host/tests/cards/ModelConfiguration/test-claude-sonnet-46.json b/packages/host/tests/cards/ModelConfiguration/test-claude-sonnet-46.json
index 09f7dfeeaaf..7a9e9fb7db3 100644
--- a/packages/host/tests/cards/ModelConfiguration/test-claude-sonnet-46.json
+++ b/packages/host/tests/cards/ModelConfiguration/test-claude-sonnet-46.json
@@ -20,7 +20,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/system-card",
+        "module": "@cardstack/base/system-card",
         "name": "ModelConfiguration"
       }
     }
diff --git a/packages/host/tests/cards/ModelConfiguration/test-gpt.json b/packages/host/tests/cards/ModelConfiguration/test-gpt.json
index c44aad040c4..043dd85f12b 100644
--- a/packages/host/tests/cards/ModelConfiguration/test-gpt.json
+++ b/packages/host/tests/cards/ModelConfiguration/test-gpt.json
@@ -21,7 +21,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/system-card",
+        "module": "@cardstack/base/system-card",
         "name": "ModelConfiguration"
       }
     }
diff --git a/packages/host/tests/cards/SystemCard/default.json b/packages/host/tests/cards/SystemCard/default.json
index c6a4e6c8af5..b0ea2aac775 100644
--- a/packages/host/tests/cards/SystemCard/default.json
+++ b/packages/host/tests/cards/SystemCard/default.json
@@ -31,7 +31,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/system-card",
+        "module": "@cardstack/base/system-card",
         "name": "SystemCard"
       }
     }
diff --git a/packages/host/tests/cards/ai-command-example.gts b/packages/host/tests/cards/ai-command-example.gts
index 6983af6fc6d..2d96886c46b 100644
--- a/packages/host/tests/cards/ai-command-example.gts
+++ b/packages/host/tests/cards/ai-command-example.gts
@@ -1,5 +1,13 @@
 import { on } from '@ember/modifier';
 
+import {
+  CardDef,
+  Component,
+  StringField,
+  field,
+  contains,
+} from '@cardstack/base/card-api';
+import { Skill } from '@cardstack/base/skill';
 import CreateAiAssistantRoomCommand from '@cardstack/boxel-host/commands/create-ai-assistant-room';
 import SendAiAssistantMessageCommand from '@cardstack/boxel-host/commands/send-ai-assistant-message';
 
@@ -8,15 +16,6 @@ import { CardContainer } from '@cardstack/boxel-ui/components';
 
 import { Command } from '@cardstack/runtime-common';
 
-import {
-  CardDef,
-  Component,
-  StringField,
-  field,
-  contains,
-} from 'https://cardstack.com/base/card-api';
-import { Skill } from 'https://cardstack.com/base/skill';
-
 export class WeatherLocationInput extends CardDef {
   @field location = contains(StringField);
 }
diff --git a/packages/host/tests/cards/article.gts b/packages/host/tests/cards/article.gts
index 11dbe42d55e..3c8787876f0 100644
--- a/packages/host/tests/cards/article.gts
+++ b/packages/host/tests/cards/article.gts
@@ -1,5 +1,5 @@
-import { contains, field } from 'https://cardstack.com/base/card-api';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+import { contains, field } from '@cardstack/base/card-api';
+import DateTimeField from '@cardstack/base/datetime';
 
 import { Post } from './post';
 
diff --git a/packages/host/tests/cards/big-card.gts b/packages/host/tests/cards/big-card.gts
index 21f8e43ff89..600489d54d3 100644
--- a/packages/host/tests/cards/big-card.gts
+++ b/packages/host/tests/cards/big-card.gts
@@ -1,5 +1,5 @@
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class BigCard extends CardDef {
   static displayName = 'Big Card';
diff --git a/packages/host/tests/cards/book.gts b/packages/host/tests/cards/book.gts
index eeaddf0dbd0..7223388620a 100644
--- a/packages/host/tests/cards/book.gts
+++ b/packages/host/tests/cards/book.gts
@@ -1,7 +1,7 @@
-import { contains, field, CardDef } from 'https://cardstack.com/base/card-api';
-import DateField from 'https://cardstack.com/base/date';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
+import { contains, field, CardDef } from '@cardstack/base/card-api';
+import DateField from '@cardstack/base/date';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
 
 import { PersonField } from './person';
 
diff --git a/packages/host/tests/cards/booking.gts b/packages/host/tests/cards/booking.gts
index 27f28f54f23..6be71608550 100644
--- a/packages/host/tests/cards/booking.gts
+++ b/packages/host/tests/cards/booking.gts
@@ -4,9 +4,9 @@ import {
   field,
   Component,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import DateTimeField from '@cardstack/base/datetime';
+import StringField from '@cardstack/base/string';
 
 import { PersonField } from './person';
 import { PostField } from './post';
diff --git a/packages/host/tests/cards/boom-pet.gts b/packages/host/tests/cards/boom-pet.gts
index 64172a0e073..c2a1ce7338b 100644
--- a/packages/host/tests/cards/boom-pet.gts
+++ b/packages/host/tests/cards/boom-pet.gts
@@ -1,11 +1,6 @@
-import BooleanField from 'https://cardstack.com/base/boolean';
-import {
-  CardDef,
-  Component,
-  field,
-  contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import BooleanField from '@cardstack/base/boolean';
+import { CardDef, Component, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class Pet extends CardDef {
   static displayName = 'Pet';
diff --git a/packages/host/tests/cards/captain.gts b/packages/host/tests/cards/captain.gts
index e0534c419e9..ff9b34cd9b8 100644
--- a/packages/host/tests/cards/captain.gts
+++ b/packages/host/tests/cards/captain.gts
@@ -3,7 +3,7 @@ import {
   field,
   CardDef,
   StringField,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export class Boat extends CardDef {
   @field name = contains(StringField);
diff --git a/packages/host/tests/cards/card-with-error.gts b/packages/host/tests/cards/card-with-error.gts
index b69c2a368e0..dbdbfd6dd2e 100644
--- a/packages/host/tests/cards/card-with-error.gts
+++ b/packages/host/tests/cards/card-with-error.gts
@@ -1,5 +1,5 @@
-import { contains, field, CardDef } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { contains, field, CardDef } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class Boom extends CardDef {
   @field boom = contains(StringField, {
diff --git a/packages/host/tests/cards/chain.gts b/packages/host/tests/cards/chain.gts
index 4060c174f86..c9aa472b72d 100644
--- a/packages/host/tests/cards/chain.gts
+++ b/packages/host/tests/cards/chain.gts
@@ -1,6 +1,6 @@
-import { contains, field, CardDef } from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
+import { contains, field, CardDef } from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
 
 let CHAIN_IDS: Record<string, number> = {
   'Ethereum Mainnet': 1,
diff --git a/packages/host/tests/cards/dog.gts b/packages/host/tests/cards/dog.gts
index a539f143eb6..44ab84a2718 100644
--- a/packages/host/tests/cards/dog.gts
+++ b/packages/host/tests/cards/dog.gts
@@ -1,5 +1,5 @@
-import { contains, field, CardDef } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { contains, field, CardDef } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import SillyNumberField from './silly-number';
 
diff --git a/packages/host/tests/cards/event.gts b/packages/host/tests/cards/event.gts
index ec065bc95dd..efab66ecd7c 100644
--- a/packages/host/tests/cards/event.gts
+++ b/packages/host/tests/cards/event.gts
@@ -1,6 +1,6 @@
-import { contains, field, CardDef } from 'https://cardstack.com/base/card-api';
-import DateField from 'https://cardstack.com/base/date';
-import StringField from 'https://cardstack.com/base/string';
+import { contains, field, CardDef } from '@cardstack/base/card-api';
+import DateField from '@cardstack/base/date';
+import StringField from '@cardstack/base/string';
 
 export class Event extends CardDef {
   @field cardTitle = contains(StringField);
diff --git a/packages/host/tests/cards/file-query-card.gts b/packages/host/tests/cards/file-query-card.gts
index 341033feb39..0eca11cc9d6 100644
--- a/packages/host/tests/cards/file-query-card.gts
+++ b/packages/host/tests/cards/file-query-card.gts
@@ -3,13 +3,13 @@ import {
   linksToMany,
   field,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import { FileDef } from 'https://cardstack.com/base/file-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import { FileDef } from '@cardstack/base/file-api';
+import StringField from '@cardstack/base/string';
 
 const fileSearchQuery = {
   filter: {
-    type: { module: 'https://cardstack.com/base/file-api', name: 'FileDef' },
+    type: { module: '@cardstack/base/file-api', name: 'FileDef' },
   },
   realm: '$thisRealm',
 };
diff --git a/packages/host/tests/cards/friend.gts b/packages/host/tests/cards/friend.gts
index 9ecad4e8ff0..4d5e474827f 100644
--- a/packages/host/tests/cards/friend.gts
+++ b/packages/host/tests/cards/friend.gts
@@ -1,10 +1,5 @@
-import {
-  contains,
-  linksTo,
-  field,
-  CardDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { contains, linksTo, field, CardDef } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class Friend extends CardDef {
   @field firstName = contains(StringField);
diff --git a/packages/host/tests/cards/friends.gts b/packages/host/tests/cards/friends.gts
index 313465ee15e..e67127a93c3 100644
--- a/packages/host/tests/cards/friends.gts
+++ b/packages/host/tests/cards/friends.gts
@@ -3,8 +3,8 @@ import {
   linksToMany,
   field,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class Friends extends CardDef {
   @field firstName = contains(StringField);
diff --git a/packages/host/tests/cards/index.json b/packages/host/tests/cards/index.json
index f692959b90e..a0bba41b841 100644
--- a/packages/host/tests/cards/index.json
+++ b/packages/host/tests/cards/index.json
@@ -4,7 +4,7 @@
     "attributes": {},
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/cards-grid",
+        "module": "@cardstack/base/cards-grid",
         "name": "CardsGrid"
       }
     }
diff --git a/packages/host/tests/cards/payment-method.gts b/packages/host/tests/cards/payment-method.gts
index fb28ebbaf29..c868ee0ae60 100644
--- a/packages/host/tests/cards/payment-method.gts
+++ b/packages/host/tests/cards/payment-method.gts
@@ -1,5 +1,5 @@
-import { contains, field, FieldDef } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { contains, field, FieldDef } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import { Payment } from './payment';
 
diff --git a/packages/host/tests/cards/payment.gts b/packages/host/tests/cards/payment.gts
index 9aa06cc30b8..1b970f6b551 100644
--- a/packages/host/tests/cards/payment.gts
+++ b/packages/host/tests/cards/payment.gts
@@ -1,10 +1,5 @@
-import {
-  contains,
-  field,
-  FieldDef,
-  linksTo,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { contains, field, FieldDef, linksTo } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import { Chain } from './chain';
 
diff --git a/packages/host/tests/cards/person.gts b/packages/host/tests/cards/person.gts
index b101984b7ec..8005f44f335 100644
--- a/packages/host/tests/cards/person.gts
+++ b/packages/host/tests/cards/person.gts
@@ -1,7 +1,5 @@
 import { on } from '@ember/modifier';
 
-import CreateAiAssistantRoomCommand from '@cardstack/boxel-host/commands/create-ai-assistant-room';
-import SendAiAssistantMessageCommand from '@cardstack/boxel-host/commands/send-ai-assistant-message';
 // import SwitchSubmodeCommand from '@cardstack/boxel-host/commands/switch-submode';
 
 import {
@@ -10,9 +8,11 @@ import {
   Component,
   CardDef,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
+import CreateAiAssistantRoomCommand from '@cardstack/boxel-host/commands/create-ai-assistant-room';
+import SendAiAssistantMessageCommand from '@cardstack/boxel-host/commands/send-ai-assistant-message';
 
 export class Person extends CardDef {
   @field firstName = contains(StringField);
diff --git a/packages/host/tests/cards/pet-person.gts b/packages/host/tests/cards/pet-person.gts
index a76c4790646..93c1a851ab1 100644
--- a/packages/host/tests/cards/pet-person.gts
+++ b/packages/host/tests/cards/pet-person.gts
@@ -1,5 +1,3 @@
-import { GridContainer } from '@cardstack/boxel-ui/components';
-
 import {
   contains,
   linksTo,
@@ -8,8 +6,10 @@ import {
   Component,
   CardDef,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+
+import { GridContainer } from '@cardstack/boxel-ui/components';
 
 import { Person } from './person';
 import { Pet } from './pet';
diff --git a/packages/host/tests/cards/pet.gts b/packages/host/tests/cards/pet.gts
index 79bd2b048cf..2c987321a71 100644
--- a/packages/host/tests/cards/pet.gts
+++ b/packages/host/tests/cards/pet.gts
@@ -4,8 +4,8 @@ import {
   field,
   Component,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import { Person } from './person';
 
diff --git a/packages/host/tests/cards/post.gts b/packages/host/tests/cards/post.gts
index 1923b289ccc..db6b7eee389 100644
--- a/packages/host/tests/cards/post.gts
+++ b/packages/host/tests/cards/post.gts
@@ -5,10 +5,10 @@ import {
   CardDef,
   Component,
   FieldDef,
-} from 'https://cardstack.com/base/card-api';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import DateTimeField from '@cardstack/base/datetime';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
 
 import { PersonField } from './person';
 import { Publication } from './publication';
diff --git a/packages/host/tests/cards/publication.gts b/packages/host/tests/cards/publication.gts
index 0b679876cfd..232dda8ed39 100644
--- a/packages/host/tests/cards/publication.gts
+++ b/packages/host/tests/cards/publication.gts
@@ -5,7 +5,7 @@ import {
   field,
   contains,
   StringField,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import { Post } from './post';
 
diff --git a/packages/host/tests/cards/puppy-card.gts b/packages/host/tests/cards/puppy-card.gts
index 48566435719..0b8022ebdcc 100644
--- a/packages/host/tests/cards/puppy-card.gts
+++ b/packages/host/tests/cards/puppy-card.gts
@@ -1,11 +1,11 @@
-import Base64ImageField from 'https://cardstack.com/base/base64-image';
+import Base64ImageField from '@cardstack/base/base64-image';
 import {
   MaybeBase64Field,
   CardDef,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class PuppyCard extends CardDef {
   static displayName = 'Puppy Card';
diff --git a/packages/host/tests/cards/silly-number.gts b/packages/host/tests/cards/silly-number.gts
index 5a12a1d3123..2db021b2c9f 100644
--- a/packages/host/tests/cards/silly-number.gts
+++ b/packages/host/tests/cards/silly-number.gts
@@ -4,7 +4,7 @@ import {
   queryableValue,
   formatQuery,
   primitive,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 class View extends Component<typeof SillyNumberField> {
   <template>{{this.value}}</template>
diff --git a/packages/host/tests/cards/skill-card-title-editing.json b/packages/host/tests/cards/skill-card-title-editing.json
index cbf50b2b61b..39475ef0086 100644
--- a/packages/host/tests/cards/skill-card-title-editing.json
+++ b/packages/host/tests/cards/skill-card-title-editing.json
@@ -9,7 +9,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/host/tests/cards/skill-pirate-speak.json b/packages/host/tests/cards/skill-pirate-speak.json
index 772c1233f46..1d7c56424a1 100644
--- a/packages/host/tests/cards/skill-pirate-speak.json
+++ b/packages/host/tests/cards/skill-pirate-speak.json
@@ -9,7 +9,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/host/tests/cards/skill-seo.json b/packages/host/tests/cards/skill-seo.json
index a9a48717e86..177182f8a1e 100644
--- a/packages/host/tests/cards/skill-seo.json
+++ b/packages/host/tests/cards/skill-seo.json
@@ -9,7 +9,7 @@
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/skill",
+        "module": "@cardstack/base/skill",
         "name": "Skill"
       }
     }
diff --git a/packages/host/tests/cards/type-examples.gts b/packages/host/tests/cards/type-examples.gts
index fbdaf726e08..6415d905f02 100644
--- a/packages/host/tests/cards/type-examples.gts
+++ b/packages/host/tests/cards/type-examples.gts
@@ -1,14 +1,14 @@
-import BooleanField from 'https://cardstack.com/base/boolean';
+import BooleanField from '@cardstack/base/boolean';
 import {
   contains,
   containsMany,
   field,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import DateField from 'https://cardstack.com/base/date';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import NumberField from 'https://cardstack.com/base/number';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import DateField from '@cardstack/base/date';
+import DateTimeField from '@cardstack/base/datetime';
+import NumberField from '@cardstack/base/number';
+import StringField from '@cardstack/base/string';
 
 export class TypeExamples extends CardDef {
   static displayName = 'Type Examples';
diff --git a/packages/host/tests/cards/vendor.gts b/packages/host/tests/cards/vendor.gts
index 0b61e4e1f4a..64005f27d3f 100644
--- a/packages/host/tests/cards/vendor.gts
+++ b/packages/host/tests/cards/vendor.gts
@@ -3,8 +3,8 @@ import {
   field,
   CardDef,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 import { PaymentMethod } from './payment-method';
 
diff --git a/packages/host/tests/helpers/adapter.ts b/packages/host/tests/helpers/adapter.ts
index 5a45814004a..73b5beb5bf8 100644
--- a/packages/host/tests/helpers/adapter.ts
+++ b/packages/host/tests/helpers/adapter.ts
@@ -27,16 +27,15 @@ import type {
   TokenClaims,
 } from '@cardstack/runtime-common/realm';
 
-import type {
-  FileWatcherEventContent,
-  RealmEventContent,
-} from 'https://cardstack.com/base/matrix-event';
-
 import { WebMessageStream, messageCloseHandler } from './stream';
 
 import { createJWT, testRealmURL } from '.';
 
 import type { MockUtils } from './mock-matrix/_utils';
+import type {
+  FileWatcherEventContent,
+  RealmEventContent,
+} from '@cardstack/base/matrix-event';
 import type ms from 'ms';
 
 interface Dir {
@@ -49,7 +48,7 @@ interface File {
   content: string | object | Uint8Array;
 }
 
-type CardAPI = typeof import('https://cardstack.com/base/card-api');
+type CardAPI = typeof import('@cardstack/base/card-api');
 
 class TokenExpiredError extends Error {}
 class JsonWebTokenError extends Error {}
diff --git a/packages/host/tests/helpers/base-realm.ts b/packages/host/tests/helpers/base-realm.ts
index 338c612fdb2..baac8173157 100644
--- a/packages/host/tests/helpers/base-realm.ts
+++ b/packages/host/tests/helpers/base-realm.ts
@@ -2,27 +2,27 @@ import { getService } from '@universal-ember/test-support';
 
 import { baseRealm } from '@cardstack/runtime-common';
 
-import type * as Base64ImageFieldModule from 'https://cardstack.com/base/base64-image';
-import type * as BigIntegerModule from 'https://cardstack.com/base/big-integer';
-import type * as BooleanFieldModule from 'https://cardstack.com/base/boolean';
-import type * as CardAPIModule from 'https://cardstack.com/base/card-api';
-import type * as CardsGridModule from 'https://cardstack.com/base/cards-grid';
-import type * as CodeRefModule from 'https://cardstack.com/base/code-ref';
-import type * as DateFieldModule from 'https://cardstack.com/base/date';
-import type * as DateTimeFieldModule from 'https://cardstack.com/base/datetime';
-import type * as EmailFieldModule from 'https://cardstack.com/base/email';
-import type * as EnumModule from 'https://cardstack.com/base/enum';
-import type * as EthereumAddressModule from 'https://cardstack.com/base/ethereum-address';
-import type * as FileApiModule from 'https://cardstack.com/base/file-api';
-import type * as MarkdownFieldModule from 'https://cardstack.com/base/markdown';
-import type * as NumberFieldModule from 'https://cardstack.com/base/number';
-import type * as PhoneNumberFieldModule from 'https://cardstack.com/base/phone-number';
-import type * as RealmFieldModule from 'https://cardstack.com/base/realm';
-import type * as RichMarkdownModule from 'https://cardstack.com/base/rich-markdown';
-import type * as SkillModule from 'https://cardstack.com/base/skill';
-import type * as StringFieldModule from 'https://cardstack.com/base/string';
-import type * as SystemCardModule from 'https://cardstack.com/base/system-card';
-import type * as TextAreaFieldModule from 'https://cardstack.com/base/text-area';
+import type * as Base64ImageFieldModule from '@cardstack/base/base64-image';
+import type * as BigIntegerModule from '@cardstack/base/big-integer';
+import type * as BooleanFieldModule from '@cardstack/base/boolean';
+import type * as CardAPIModule from '@cardstack/base/card-api';
+import type * as CardsGridModule from '@cardstack/base/cards-grid';
+import type * as CodeRefModule from '@cardstack/base/code-ref';
+import type * as DateFieldModule from '@cardstack/base/date';
+import type * as DateTimeFieldModule from '@cardstack/base/datetime';
+import type * as EmailFieldModule from '@cardstack/base/email';
+import type * as EnumModule from '@cardstack/base/enum';
+import type * as EthereumAddressModule from '@cardstack/base/ethereum-address';
+import type * as FileApiModule from '@cardstack/base/file-api';
+import type * as MarkdownFieldModule from '@cardstack/base/markdown';
+import type * as NumberFieldModule from '@cardstack/base/number';
+import type * as PhoneNumberFieldModule from '@cardstack/base/phone-number';
+import type * as RealmFieldModule from '@cardstack/base/realm';
+import type * as SkillModule from '@cardstack/base/skill';
+import type * as StringFieldModule from '@cardstack/base/string';
+import type * as SystemCardModule from '@cardstack/base/system-card';
+import type * as RichMarkdownModule from '@cardstack/base/rich-markdown';
+import type * as TextAreaFieldModule from '@cardstack/base/text-area';
 
 type StringField = (typeof StringFieldModule)['default'];
 let StringField: StringField;
diff --git a/packages/host/tests/helpers/cards/view-card-demo.ts b/packages/host/tests/helpers/cards/view-card-demo.ts
index d5a4e49e578..0552869ae31 100644
--- a/packages/host/tests/helpers/cards/view-card-demo.ts
+++ b/packages/host/tests/helpers/cards/view-card-demo.ts
@@ -7,8 +7,8 @@ export const viewCardDemoCardSource = `
     field,
     contains,
     Component,
-  } from "https://cardstack.com/base/card-api";
-  import StringField from "https://cardstack.com/base/string";
+  } from "@cardstack/base/card-api";
+  import StringField from "@cardstack/base/string";
   import { fn } from '@ember/helper'
 
   export class ViewCardDemo extends CardDef {
diff --git a/packages/host/tests/helpers/index.gts b/packages/host/tests/helpers/index.gts
index 46aa39da84c..e0c66013649 100644
--- a/packages/host/tests/helpers/index.gts
+++ b/packages/host/tests/helpers/index.gts
@@ -56,12 +56,6 @@ import {
   normalizeRenderError,
 } from '@cardstack/host/utils/render-error';
 
-import type {
-  CardStore,
-  CardDef,
-  FieldDef,
-} from 'https://cardstack.com/base/card-api';
-
 import { TestRealmAdapter } from './adapter';
 import { testRealmServerMatrixUsername, setupMockMatrix } from './mock-matrix';
 import percySnapshot from './percy-snapshot';
@@ -72,6 +66,7 @@ import { getTestRealmRegistry } from './test-realm-registry';
 import visitOperatorMode from './visit-operator-mode';
 
 import type { MockUtils } from './mock-matrix/_utils';
+import type { CardStore, CardDef, FieldDef } from '@cardstack/base/card-api';
 
 import type { SimpleElement } from '@simple-dom/interface';
 
@@ -103,7 +98,7 @@ export {
 
 const { sqlSchema } = ENV;
 
-type CardAPI = typeof import('https://cardstack.com/base/card-api');
+type CardAPI = typeof import('@cardstack/base/card-api');
 type ModuleHooks = {
   after: (callback: () => void | Promise<void>) => void;
 };
@@ -994,7 +989,7 @@ export const SYSTEM_CARD_FIXTURE_CONTENTS: RealmContents = {
       },
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/system-card',
+          module: '@cardstack/base/system-card',
           name: 'ModelConfiguration',
         },
       },
@@ -1023,7 +1018,7 @@ export const SYSTEM_CARD_FIXTURE_CONTENTS: RealmContents = {
       },
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/system-card',
+          module: '@cardstack/base/system-card',
           name: 'ModelConfiguration',
         },
       },
@@ -1052,7 +1047,7 @@ export const SYSTEM_CARD_FIXTURE_CONTENTS: RealmContents = {
       },
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/system-card',
+          module: '@cardstack/base/system-card',
           name: 'ModelConfiguration',
         },
       },
@@ -1081,7 +1076,7 @@ export const SYSTEM_CARD_FIXTURE_CONTENTS: RealmContents = {
       },
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/system-card',
+          module: '@cardstack/base/system-card',
           name: 'ModelConfiguration',
         },
       },
@@ -1120,7 +1115,7 @@ export const SYSTEM_CARD_FIXTURE_CONTENTS: RealmContents = {
       },
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/system-card',
+          module: '@cardstack/base/system-card',
           name: 'SystemCard',
         },
       },
diff --git a/packages/host/tests/helpers/indexer.ts b/packages/host/tests/helpers/indexer.ts
index 4bc13e672e9..dc873c213b8 100644
--- a/packages/host/tests/helpers/indexer.ts
+++ b/packages/host/tests/helpers/indexer.ts
@@ -22,10 +22,10 @@ import {
   coerceTypes,
 } from '@cardstack/runtime-common';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
 import { testRealmURL } from './index';
 
+import type { CardDef } from '@cardstack/base/card-api';
+
 const defaultIndexEntry = {
   realm_version: 1,
   realm_url: testRealmURL,
diff --git a/packages/host/tests/helpers/interact-submode-setup.gts b/packages/host/tests/helpers/interact-submode-setup.gts
index 048184f1859..f839d5aaaa7 100644
--- a/packages/host/tests/helpers/interact-submode-setup.gts
+++ b/packages/host/tests/helpers/interact-submode-setup.gts
@@ -54,12 +54,12 @@ export function setupInteractSubmodeTests(
     setupAuthEndpoints();
 
     let loader = getService('loader-service').loader;
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
-    let string: typeof import('https://cardstack.com/base/string');
-    let spec: typeof import('https://cardstack.com/base/spec');
-    let cardsGrid: typeof import('https://cardstack.com/base/cards-grid');
-    let fileApi: typeof import('https://cardstack.com/base/file-api');
-    let imageFileApi: typeof import('https://cardstack.com/base/image-file-def');
+    let cardApi: typeof import('@cardstack/base/card-api');
+    let string: typeof import('@cardstack/base/string');
+    let spec: typeof import('@cardstack/base/spec');
+    let cardsGrid: typeof import('@cardstack/base/cards-grid');
+    let fileApi: typeof import('@cardstack/base/file-api');
+    let imageFileApi: typeof import('@cardstack/base/image-file-def');
     cardApi = await loader.import(`${baseRealm.url}card-api`);
     string = await loader.import(`${baseRealm.url}string`);
     spec = await loader.import(`${baseRealm.url}spec`);
diff --git a/packages/host/tests/helpers/mock-matrix/_client.ts b/packages/host/tests/helpers/mock-matrix/_client.ts
index a62d13abe15..6682b6776f0 100644
--- a/packages/host/tests/helpers/mock-matrix/_client.ts
+++ b/packages/host/tests/helpers/mock-matrix/_client.ts
@@ -32,17 +32,15 @@ import type { ExtendedClient } from '@cardstack/host/services/matrix-sdk-loader'
 
 import { assertNever } from '@cardstack/host/utils/assert-never';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type { SerializedFile } from 'https://cardstack.com/base/file-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-import type { MatrixEvent as DiscreteMatrixEvent } from 'https://cardstack.com/base/matrix-event';
-import type { CommandField } from 'https://cardstack.com/base/skill';
-
 import type { MockSDK } from './_sdk';
-
 import type { ServerState } from './_server-state';
-
 import type { Config } from '../mock-matrix';
+import type { CardDef } from '@cardstack/base/card-api';
+import type { SerializedFile } from '@cardstack/base/file-api';
+import type { FileDef } from '@cardstack/base/file-api';
+import type { MatrixEvent as DiscreteMatrixEvent } from '@cardstack/base/matrix-event';
+import type { CommandField } from '@cardstack/base/skill';
+
 import type {
   MSC3575SlidingSyncRequest,
   MSC3575SlidingSyncResponse,
diff --git a/packages/host/tests/helpers/mock-matrix/_utils.ts b/packages/host/tests/helpers/mock-matrix/_utils.ts
index 5dc2dfbef27..681ef2ceed1 100644
--- a/packages/host/tests/helpers/mock-matrix/_utils.ts
+++ b/packages/host/tests/helpers/mock-matrix/_utils.ts
@@ -5,12 +5,11 @@ import { APP_BOXEL_REALM_EVENT_TYPE } from '@cardstack/runtime-common/matrix-con
 
 import type RealmService from '@cardstack/host/services/realm';
 
-import type { RealmEvent } from 'https://cardstack.com/base/matrix-event';
-
 import { setupAuthEndpoints } from '../';
 
 import type { MockSDK } from './_sdk';
 import type { Config } from '../mock-matrix';
+import type { RealmEvent } from '@cardstack/base/matrix-event';
 
 import type * as MatrixSDK from 'matrix-js-sdk';
 
diff --git a/packages/host/tests/helpers/playground.ts b/packages/host/tests/helpers/playground.ts
index 774e30330a6..a586032b757 100644
--- a/packages/host/tests/helpers/playground.ts
+++ b/packages/host/tests/helpers/playground.ts
@@ -12,10 +12,10 @@ import {
   SpecSelection,
 } from '@cardstack/host/utils/local-storage-keys';
 
-import type { Format } from 'https://cardstack.com/base/card-api';
-
 import { testRealmURL, visitOperatorMode } from './index';
 
+import type { Format } from '@cardstack/base/card-api';
+
 export type { Format, PlaygroundSelection };
 
 export const assertCardExists = (
diff --git a/packages/host/tests/helpers/render-component.ts b/packages/host/tests/helpers/render-component.ts
index a2838d92e29..578922f8766 100644
--- a/packages/host/tests/helpers/render-component.ts
+++ b/packages/host/tests/helpers/render-component.ts
@@ -5,17 +5,13 @@ import { render, getContext } from '@ember/test-helpers';
 import type { Loader } from '@cardstack/runtime-common';
 import { baseRealm } from '@cardstack/runtime-common';
 
-import type {
-  BaseDef,
-  Format,
-  Field,
-} from 'https://cardstack.com/base/card-api';
+import type { BaseDef, Format, Field } from '@cardstack/base/card-api';
 
 import type { ComponentLike } from '@glint/template';
 
 async function cardApi(
   loader: Loader,
-): Promise<typeof import('https://cardstack.com/base/card-api')> {
+): Promise<typeof import('@cardstack/base/card-api')> {
   return await loader.import(`${baseRealm.url}card-api`);
 }
 
diff --git a/packages/host/tests/integration/commands/add-field-to-card-definition-command-test.gts b/packages/host/tests/integration/commands/add-field-to-card-definition-command-test.gts
index ace6aa4f0e5..ea37195f71b 100644
--- a/packages/host/tests/integration/commands/add-field-to-card-definition-command-test.gts
+++ b/packages/host/tests/integration/commands/add-field-to-card-definition-command-test.gts
@@ -47,8 +47,8 @@ module(
           mockMatrixUtils,
           contents: {
             'person.gts': `
-          import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           export class Person extends CardDef {
             static displayName = 'Person';
             @field firstName = contains(StringField);
@@ -75,7 +75,7 @@ module(
         fieldName: 'lastName',
         fieldDefinitionType: 'field',
         fieldRef: {
-          module: 'https://cardstack.com/base/string',
+          module: '@cardstack/base/string',
           name: 'default',
         },
         fieldType: 'contains',
@@ -86,8 +86,8 @@ module(
       assert.strictEqual(
         response,
         `
-          import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           export class Person extends CardDef {
             static displayName = 'Person';
             @field firstName = contains(StringField);
@@ -114,7 +114,7 @@ module(
         fieldDefinitionType: 'field',
         fieldType: 'contains',
         fieldRef: {
-          module: 'https://cardstack.com/base/string',
+          module: '@cardstack/base/string',
           name: 'default',
         },
         incomingRelativeTo: undefined,
@@ -134,8 +134,8 @@ module(
       assert.strictEqual(
         response,
         `
-          import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           export class Person extends CardDef {
             static displayName = 'Person';
             @field firstName = contains(StringField);
diff --git a/packages/host/tests/integration/commands/apply-markdown-edit-test.gts b/packages/host/tests/integration/commands/apply-markdown-edit-test.gts
index b0ccf864cc6..6bb2fec5264 100644
--- a/packages/host/tests/integration/commands/apply-markdown-edit-test.gts
+++ b/packages/host/tests/integration/commands/apply-markdown-edit-test.gts
@@ -9,8 +9,6 @@ import { baseRealm, type Loader } from '@cardstack/runtime-common';
 import ApplyMarkdownEditCommand from '@cardstack/host/commands/apply-markdown-edit';
 import RealmService from '@cardstack/host/services/realm';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
 import {
   setupCardLogs,
   setupIntegrationTestRealm,
@@ -25,6 +23,8 @@ import {
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type { CardDef } from '@cardstack/base/card-api';
+
 class StubRealmService extends RealmService {
   get defaultReadableRealm() {
     return {
@@ -115,8 +115,8 @@ module('Integration | commands | apply-markdown-edit', function (hooks) {
         mockMatrixUtils,
         contents: {
           'article.gts': `
-          import { CardDef, field, contains } from "https://cardstack.com/base/card-api";
-          import MarkdownField from "https://cardstack.com/base/markdown";
+          import { CardDef, field, contains } from "@cardstack/base/card-api";
+          import MarkdownField from "@cardstack/base/markdown";
 
           export class Article extends CardDef {
             static displayName = 'Article';
diff --git a/packages/host/tests/integration/commands/apply-search-replace-block-test.gts b/packages/host/tests/integration/commands/apply-search-replace-block-test.gts
index 26dfbaca5dd..0781d648d8f 100644
--- a/packages/host/tests/integration/commands/apply-search-replace-block-test.gts
+++ b/packages/host/tests/integration/commands/apply-search-replace-block-test.gts
@@ -25,10 +25,10 @@ module('Integration | commands | apply-search-replace-block', function (hooks) {
   field,
   CardDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import DateTimeField from '@cardstack/base/datetime';
+import NumberField from '@cardstack/base/number';
 
 export class Task extends CardDef {
   static displayName = 'Task';
@@ -38,10 +38,10 @@ export class Task extends CardDef {
   @field priority = contains(NumberField);
 }`;
     const codeBlock = `${SEARCH_MARKER}
-import NumberField from 'https://cardstack.com/base/number';
+import NumberField from '@cardstack/base/number';
 ${SEPARATOR_MARKER}
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
 ${REPLACE_MARKER}`;
 
     let result = await applyCommand.execute({
@@ -54,11 +54,11 @@ ${REPLACE_MARKER}`;
   field,
   CardDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import DateTimeField from '@cardstack/base/datetime';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
 
 export class Task extends CardDef {
   static displayName = 'Task';
diff --git a/packages/host/tests/integration/commands/check-correctness-test.gts b/packages/host/tests/integration/commands/check-correctness-test.gts
index 587142f3c23..e7b713f481b 100644
--- a/packages/host/tests/integration/commands/check-correctness-test.gts
+++ b/packages/host/tests/integration/commands/check-correctness-test.gts
@@ -44,9 +44,9 @@ module('Integration | commands | check-correctness', function (hooks) {
         mockMatrixUtils,
         contents: {
           'pet.gts': `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
-          import BooleanField from "https://cardstack.com/base/boolean";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
+          import BooleanField from "@cardstack/base/boolean";
           export class Pet extends CardDef {
             static displayName = 'Pet';
             @field name = contains(StringField);
diff --git a/packages/host/tests/integration/commands/copy-and-edit-test.gts b/packages/host/tests/integration/commands/copy-and-edit-test.gts
index 7ebf25b6341..dd418e33c8f 100644
--- a/packages/host/tests/integration/commands/copy-and-edit-test.gts
+++ b/packages/host/tests/integration/commands/copy-and-edit-test.gts
@@ -8,8 +8,6 @@ import { realmURL as realmURLSymbol } from '@cardstack/runtime-common';
 import CopyAndEditCommand from '@cardstack/host/commands/copy-and-edit';
 import { StackItem } from '@cardstack/host/lib/stack-item';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
 import {
   setupIntegrationTestRealm,
   setupLocalIndexing,
@@ -20,6 +18,8 @@ import {
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type { CardDef } from '@cardstack/base/card-api';
+
 const otherRealmURL = 'http://other-realm/test2/';
 
 module('Integration | commands | copy-and-edit', function (hooks) {
@@ -40,8 +40,8 @@ module('Integration | commands | copy-and-edit', function (hooks) {
         realmURL: testRealmURL,
         contents: {
           'content-card.gts': `
-          import { CardDef, contains, field, linksTo, linksToMany } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { CardDef, contains, field, linksTo, linksToMany } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class Child extends CardDef {
             static displayName = 'Child';
@@ -93,8 +93,8 @@ module('Integration | commands | copy-and-edit', function (hooks) {
             },
           },
           'simple-card.gts': `
-          import { CardDef, field, contains } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { CardDef, field, contains } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class Theme extends CardDef {
             static displayName = 'Theme';
@@ -113,7 +113,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
               },
               meta: {
                 adoptsFrom: {
-                  module: 'https://cardstack.com/base/theme',
+                  module: '@cardstack/base/theme',
                   name: 'default',
                 },
               },
@@ -150,8 +150,8 @@ module('Integration | commands | copy-and-edit', function (hooks) {
         realmURL: otherRealmURL,
         contents: {
           'content-card.gts': `
-          import { CardDef, contains, field } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { CardDef, contains, field } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class Child extends CardDef {
             static displayName = 'Child';
diff --git a/packages/host/tests/integration/commands/copy-card-test.gts b/packages/host/tests/integration/commands/copy-card-test.gts
index f88670eca28..1cf08c27d6f 100644
--- a/packages/host/tests/integration/commands/copy-card-test.gts
+++ b/packages/host/tests/integration/commands/copy-card-test.gts
@@ -7,8 +7,6 @@ import CopyCardToRealmCommand from '@cardstack/host/commands/copy-card';
 import CopyCardToStackCommand from '@cardstack/host/commands/copy-card-to-stack';
 import { StackItem } from '@cardstack/host/lib/stack-item';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
 import {
   setupIntegrationTestRealm,
   setupLocalIndexing,
@@ -19,6 +17,8 @@ import {
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type { CardDef } from '@cardstack/base/card-api';
+
 const testRealm2URL = 'http://test-realm/test2/';
 
 module('Integration | commands | copy-card', function (hooks) {
@@ -39,8 +39,8 @@ module('Integration | commands | copy-card', function (hooks) {
         realmURL: testRealmURL,
         contents: {
           'pet.gts': `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           export class Pet extends CardDef {
             static displayName = 'Pet';
             @field firstName = contains(StringField);
@@ -72,7 +72,7 @@ module('Integration | commands | copy-card', function (hooks) {
               type: 'card',
               meta: {
                 adoptsFrom: {
-                  module: 'https://cardstack.com/base/cards-grid',
+                  module: '@cardstack/base/cards-grid',
                   name: 'CardsGrid',
                 },
               },
diff --git a/packages/host/tests/integration/commands/copy-source-test.gts b/packages/host/tests/integration/commands/copy-source-test.gts
index 6153c7cc69a..53ea8c88a42 100644
--- a/packages/host/tests/integration/commands/copy-source-test.gts
+++ b/packages/host/tests/integration/commands/copy-source-test.gts
@@ -51,8 +51,8 @@ module('Integration | commands | copy-source', function (hooks) {
         realmURL: testRealmURL,
         contents: {
           'person.gts': `
-          import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           export class Person extends CardDef {
             static displayName = 'Person';
             @field firstName = contains(StringField);
diff --git a/packages/host/tests/integration/commands/create-spec-test.gts b/packages/host/tests/integration/commands/create-spec-test.gts
index c1afd097601..11bb678817f 100644
--- a/packages/host/tests/integration/commands/create-spec-test.gts
+++ b/packages/host/tests/integration/commands/create-spec-test.gts
@@ -6,8 +6,6 @@ import type { Loader } from '@cardstack/runtime-common/loader';
 
 import CreateSpecCommand from '@cardstack/host/commands/create-specs';
 
-import type { Spec } from 'https://cardstack.com/base/spec';
-
 import {
   testRealmURL,
   setupCardLogs,
@@ -22,6 +20,8 @@ import { setupBaseRealm } from '../../helpers/base-realm';
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type { Spec } from '@cardstack/base/spec';
+
 module('Integration | Command | create-specs', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
@@ -84,19 +84,19 @@ module('Integration | Command | create-specs', function (hooks) {
         mockMatrixUtils,
         realmURL: testRealmURL,
         contents: {
-          'test-card.gts': `import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+          'test-card.gts': `import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class TestCard extends CardDef {
   static displayName = 'Test Card';
   @field name = contains(StringField);
 }`,
-          'test-field.gts': `import { FieldDef } from 'https://cardstack.com/base/card-api';
+          'test-field.gts': `import { FieldDef } from '@cardstack/base/card-api';
 
 export class TestField extends FieldDef {
   static displayName = 'Test Field';
 }`,
-          'app-card.gts': `import { CardDef } from 'https://cardstack.com/base/card-api';
+          'app-card.gts': `import { CardDef } from '@cardstack/base/card-api';
 
 export class AppCard extends CardDef {
   static displayName = 'App Card';
@@ -111,7 +111,7 @@ export default class TestComponent extends Component {
 export default class TestCommand extends Command {
   static displayName = 'Test Command';
 }`,
-          'test-spec.gts': `import { Spec } from 'https://cardstack.com/base/spec';
+          'test-spec.gts': `import { Spec } from '@cardstack/base/spec';
 
 export class TestSpec extends Spec {
   static displayName = 'Test Spec';
diff --git a/packages/host/tests/integration/commands/generate-example-cards-one-shot-test.gts b/packages/host/tests/integration/commands/generate-example-cards-one-shot-test.gts
index 30ff98e9d6a..3fe04296acc 100644
--- a/packages/host/tests/integration/commands/generate-example-cards-one-shot-test.gts
+++ b/packages/host/tests/integration/commands/generate-example-cards-one-shot-test.gts
@@ -77,8 +77,8 @@ module(
         setupIntegrationTestRealm({
           mockMatrixUtils,
           contents: {
-            'test-card.gts': `import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+            'test-card.gts': `import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class TestCard extends CardDef {
   static displayName = 'Test Card';
diff --git a/packages/host/tests/integration/commands/open-create-listing-modal-test.gts b/packages/host/tests/integration/commands/open-create-listing-modal-test.gts
index 6a5cc4cfac7..383898f36c2 100644
--- a/packages/host/tests/integration/commands/open-create-listing-modal-test.gts
+++ b/packages/host/tests/integration/commands/open-create-listing-modal-test.gts
@@ -39,8 +39,8 @@ module('Integration | commands | open-create-listing-modal', function (hooks) {
               FieldDef,
               contains,
               field,
-            } from "https://cardstack.com/base/card-api";
-            import StringField from "https://cardstack.com/base/string";
+            } from "@cardstack/base/card-api";
+            import StringField from "@cardstack/base/string";
 
             export class PetName extends FieldDef {
               static displayName = 'Pet Name';
diff --git a/packages/host/tests/integration/commands/patch-code-test.gts b/packages/host/tests/integration/commands/patch-code-test.gts
index 4377c2268c8..2b542664074 100644
--- a/packages/host/tests/integration/commands/patch-code-test.gts
+++ b/packages/host/tests/integration/commands/patch-code-test.gts
@@ -52,9 +52,9 @@ module('Integration | commands | patch-code', function (hooks) {
   field,
   CardDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 export class Task extends CardDef {
   static displayName = 'Task';
   @field cardTitle = contains(StringField);
@@ -135,9 +135,9 @@ import {
   field,
   CardDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 export class Task extends CardDef {
   static displayName = 'Task';
   @field cardTitle = contains(StringField);
diff --git a/packages/host/tests/integration/commands/patch-instance-test.gts b/packages/host/tests/integration/commands/patch-instance-test.gts
index e5cee817dfc..75aaddc5b13 100644
--- a/packages/host/tests/integration/commands/patch-instance-test.gts
+++ b/packages/host/tests/integration/commands/patch-instance-test.gts
@@ -10,8 +10,6 @@ import PatchCardInstanceCommand from '@cardstack/host/commands/patch-card-instan
 
 import type CommandService from '@cardstack/host/services/command-service';
 
-import type { CardDef as CardDefType } from 'https://cardstack.com/base/card-api';
-
 import {
   testRealmURL,
   setupIntegrationTestRealm,
@@ -36,6 +34,8 @@ import {
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type { CardDef as CardDefType } from '@cardstack/base/card-api';
+
 module('Integration | commands | patch-instance', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
diff --git a/packages/host/tests/integration/commands/preview-format-test.gts b/packages/host/tests/integration/commands/preview-format-test.gts
index 599024919ed..53304b12152 100644
--- a/packages/host/tests/integration/commands/preview-format-test.gts
+++ b/packages/host/tests/integration/commands/preview-format-test.gts
@@ -69,9 +69,9 @@ module('Integration | Command | preview-format', function (hooks) {
         mockMatrixUtils,
         contents: {
           'rental-item.gts': `
-          import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-          import StringField from 'https://cardstack.com/base/string';
-          import NumberField from 'https://cardstack.com/base/number';
+          import { CardDef, field, contains } from '@cardstack/base/card-api';
+          import StringField from '@cardstack/base/string';
+          import NumberField from '@cardstack/base/number';
 
           export class RentalItem extends CardDef {
             static displayName = 'RentalItem';
diff --git a/packages/host/tests/integration/commands/read-card-for-ai-assistant-test.gts b/packages/host/tests/integration/commands/read-card-for-ai-assistant-test.gts
index eeba687e1fe..ec7d4953199 100644
--- a/packages/host/tests/integration/commands/read-card-for-ai-assistant-test.gts
+++ b/packages/host/tests/integration/commands/read-card-for-ai-assistant-test.gts
@@ -52,9 +52,9 @@ module('Integration | commands | read-card-for-ai-assistant', function (hooks) {
         mockMatrixUtils,
         contents: {
           'person.gts': `
-            import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-            import StringField from "https://cardstack.com/base/string";
-            import NumberField from "https://cardstack.com/base/number";
+            import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+            import StringField from "@cardstack/base/string";
+            import NumberField from "@cardstack/base/number";
 
             export class Person extends CardDef {
               @field firstName = contains(StringField);
diff --git a/packages/host/tests/integration/commands/schema-generation-test.gts b/packages/host/tests/integration/commands/schema-generation-test.gts
index db56cb00eed..b3557debd9a 100644
--- a/packages/host/tests/integration/commands/schema-generation-test.gts
+++ b/packages/host/tests/integration/commands/schema-generation-test.gts
@@ -11,10 +11,10 @@ import { HostCommandClasses } from '@cardstack/host/commands';
 
 import type HostBaseCommand from '@cardstack/host/lib/host-base-command';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type * as CardAPI from '@cardstack/base/card-api';
+
 module(
   'Integration | Command | host command schema generation test',
   function (hooks) {
diff --git a/packages/host/tests/integration/commands/search-and-choose-test.gts b/packages/host/tests/integration/commands/search-and-choose-test.gts
index 5b4bdf61a9a..7dcec30afd3 100644
--- a/packages/host/tests/integration/commands/search-and-choose-test.gts
+++ b/packages/host/tests/integration/commands/search-and-choose-test.gts
@@ -85,16 +85,16 @@ module('Integration | commands | search-and-choose', function (hooks) {
   setupRealmCacheTeardown(hooks);
 
   hooks.beforeEach(async function () {
-    const choiceSource = `import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+    const choiceSource = `import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 // choice-source-marker
 export class Choice extends CardDef {
   static displayName = 'Choice';
   @field cardTitle = contains(StringField);
 }`;
-    const contextSource = `import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+    const contextSource = `import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 // context-source-marker
 export class ContextCard extends CardDef {
diff --git a/packages/host/tests/integration/commands/search-command-test.gts b/packages/host/tests/integration/commands/search-command-test.gts
index 94b609c9540..e371e06eefd 100644
--- a/packages/host/tests/integration/commands/search-command-test.gts
+++ b/packages/host/tests/integration/commands/search-command-test.gts
@@ -47,8 +47,8 @@ module('Integration | commands | search', function (hooks) {
 
   hooks.beforeEach(async function () {
     loader = getService('loader-service').loader;
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
-    let string: typeof import('https://cardstack.com/base/string');
+    let cardApi: typeof import('@cardstack/base/card-api');
+    let string: typeof import('@cardstack/base/string');
 
     cardApi = await loader.import(`${baseRealm.url}card-api`);
     string = await loader.import(`${baseRealm.url}string`);
diff --git a/packages/host/tests/integration/commands/show-card-test.gts b/packages/host/tests/integration/commands/show-card-test.gts
index 97a9505a19f..1ede6a7f8ee 100644
--- a/packages/host/tests/integration/commands/show-card-test.gts
+++ b/packages/host/tests/integration/commands/show-card-test.gts
@@ -19,8 +19,6 @@ import { StackItem } from '@cardstack/host/lib/stack-item';
 import type { OperatorModeState } from '@cardstack/host/services/operator-mode-state-service';
 import RealmService from '@cardstack/host/services/realm';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-
 import {
   setupCardLogs,
   setupIntegrationTestRealm,
@@ -34,6 +32,8 @@ import {
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type * as CardAPI from '@cardstack/base/card-api';
+
 class StubRealmService extends RealmService {
   get defaultReadableRealm() {
     return {
@@ -154,8 +154,8 @@ module('Integration | Command | show-card', function (hooks) {
         mockMatrixUtils,
         contents: {
           'person.gts': `
-          import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-          import StringField from 'https://cardstack.com/base/string';
+          import { CardDef, field, contains } from '@cardstack/base/card-api';
+          import StringField from '@cardstack/base/string';
 
           export class Person extends CardDef {
             static displayName = 'Person';
@@ -169,8 +169,8 @@ module('Integration | Command | show-card', function (hooks) {
           }
         `,
           'pet.gts': `
-          import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-          import StringField from 'https://cardstack.com/base/string';
+          import { CardDef, field, contains } from '@cardstack/base/card-api';
+          import StringField from '@cardstack/base/string';
 
           export class Pet extends CardDef {
             static displayName = 'Pet';
diff --git a/packages/host/tests/integration/commands/switch-submode-test.gts b/packages/host/tests/integration/commands/switch-submode-test.gts
index 368ebd189c8..13129e4aaa2 100644
--- a/packages/host/tests/integration/commands/switch-submode-test.gts
+++ b/packages/host/tests/integration/commands/switch-submode-test.gts
@@ -10,8 +10,6 @@ import SwitchSubmodeCommand from '@cardstack/host/commands/switch-submode';
 import RealmService from '@cardstack/host/services/realm';
 import type StoreService from '@cardstack/host/services/store';
 
-import type { CardDef as CardDefType } from 'https://cardstack.com/base/card-api';
-
 import {
   setupIntegrationTestRealm,
   setupLocalIndexing,
@@ -24,6 +22,8 @@ import { CardDef, setupBaseRealm } from '../../helpers/base-realm';
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type { CardDef as CardDefType } from '@cardstack/base/card-api';
+
 let store: StoreService;
 
 class StubRealmService extends RealmService {
diff --git a/packages/host/tests/integration/commands/transform-cards-test.gts b/packages/host/tests/integration/commands/transform-cards-test.gts
index c6b2fe1b082..d5447958de7 100644
--- a/packages/host/tests/integration/commands/transform-cards-test.gts
+++ b/packages/host/tests/integration/commands/transform-cards-test.gts
@@ -13,8 +13,6 @@ import TransformCardsCommand from '@cardstack/host/commands/transform-cards';
 
 import RealmService from '@cardstack/host/services/realm';
 
-import type * as CommandModule from 'https://cardstack.com/base/command';
-
 import {
   setupCardLogs,
   setupIntegrationTestRealm,
@@ -26,6 +24,8 @@ import {
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type * as CommandModule from '@cardstack/base/command';
+
 class StubRealmService extends RealmService {
   get defaultReadableRealm() {
     return {
@@ -61,9 +61,9 @@ module('Integration | commands | transform-cards', function (hooks) {
 
   hooks.beforeEach(async function () {
     loader = getService('loader-service').loader;
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
-    let string: typeof import('https://cardstack.com/base/string');
-    let CommandModule: typeof import('https://cardstack.com/base/command');
+    let cardApi: typeof import('@cardstack/base/card-api');
+    let string: typeof import('@cardstack/base/string');
+    let CommandModule: typeof import('@cardstack/base/command');
 
     cardApi = await loader.import(`${baseRealm.url}card-api`);
     string = await loader.import(`${baseRealm.url}string`);
diff --git a/packages/host/tests/integration/commands/update-room-skills-test.gts b/packages/host/tests/integration/commands/update-room-skills-test.gts
index 5645a75577f..7871e308115 100644
--- a/packages/host/tests/integration/commands/update-room-skills-test.gts
+++ b/packages/host/tests/integration/commands/update-room-skills-test.gts
@@ -16,9 +16,6 @@ import type { Loader } from '@cardstack/runtime-common/loader';
 import UpdateRoomSkillsCommand from '@cardstack/host/commands/update-room-skills';
 import RealmService from '@cardstack/host/services/realm';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type { SerializedFile } from 'https://cardstack.com/base/file-api';
-
 import {
   setupCardLogs,
   setupIntegrationTestRealm,
@@ -33,6 +30,9 @@ import { setupBaseRealm, CommandField, Skill } from '../../helpers/base-realm';
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type * as CardAPI from '@cardstack/base/card-api';
+import type { SerializedFile } from '@cardstack/base/file-api';
+
 class StubRealmService extends RealmService {
   get defaultReadableRealm() {
     return {
diff --git a/packages/host/tests/integration/commands/use-ai-assistant-test.gts b/packages/host/tests/integration/commands/use-ai-assistant-test.gts
index 185279e8e51..11637c60c98 100644
--- a/packages/host/tests/integration/commands/use-ai-assistant-test.gts
+++ b/packages/host/tests/integration/commands/use-ai-assistant-test.gts
@@ -17,10 +17,6 @@ import OpenAiAssistantRoomCommand from '@cardstack/host/commands/open-ai-assista
 import type CommandService from '@cardstack/host/services/command-service';
 import RealmService from '@cardstack/host/services/realm';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
-import type { Skill } from 'https://cardstack.com/base/skill';
-
 import {
   setupIntegrationTestRealm,
   setupLocalIndexing,
@@ -33,6 +29,9 @@ import {
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type { CardDef } from '@cardstack/base/card-api';
+import type { Skill } from '@cardstack/base/skill';
+
 let commandService: CommandService;
 
 class StubRealmService extends RealmService {
@@ -76,7 +75,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
               },
               meta: {
                 adoptsFrom: {
-                  module: 'https://cardstack.com/base/card-api',
+                  module: '@cardstack/base/card-api',
                   name: 'CardDef',
                 },
               },
@@ -90,7 +89,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
               },
               meta: {
                 adoptsFrom: {
-                  module: 'https://cardstack.com/base/card-api',
+                  module: '@cardstack/base/card-api',
                   name: 'CardDef',
                 },
               },
diff --git a/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts
index 5f9e641054f..db85c2a057e 100644
--- a/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts
+++ b/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts
@@ -254,16 +254,16 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
       realmURL: readOnlyRealmURL,
       contents: {
         'pet.gts': `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           export class Pet extends CardDef {
             static displayName = 'Pet';
             @field name = contains(StringField);
           }
         `,
         'person.gts': `
-          import { contains, field, linksTo, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, linksTo, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           import { Pet } from "./pet";
           export class Person extends CardDef {
             static displayName = 'Person';
diff --git a/packages/host/tests/integration/components/ai-assistant-panel/debug-message-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/debug-message-test.gts
index 67a8c3891a0..6d01aac4cef 100644
--- a/packages/host/tests/integration/components/ai-assistant-panel/debug-message-test.gts
+++ b/packages/host/tests/integration/components/ai-assistant-panel/debug-message-test.gts
@@ -20,9 +20,6 @@ import OperatorMode from '@cardstack/host/components/operator-mode/container';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 
-import type { SerializedFile } from 'https://cardstack.com/base/file-api';
-import type { CardMessageContent } from 'https://cardstack.com/base/matrix-event';
-
 import {
   testRealmURL,
   setupCardLogs,
@@ -38,6 +35,9 @@ import { setupMockMatrix } from '../../../helpers/mock-matrix';
 import { renderComponent } from '../../../helpers/render-component';
 import { setupRenderingTest } from '../../../helpers/setup';
 
+import type { SerializedFile } from '@cardstack/base/file-api';
+import type { CardMessageContent } from '@cardstack/base/matrix-event';
+
 module('Integration | ai-assistant-panel | debug-message', function (hooks) {
   const realmName = 'Debug Message Test Realm';
   let loader: Loader;
diff --git a/packages/host/tests/integration/components/ai-assistant-panel/skills-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/skills-test.gts
index 7f14f849593..8e3e6199b91 100644
--- a/packages/host/tests/integration/components/ai-assistant-panel/skills-test.gts
+++ b/packages/host/tests/integration/components/ai-assistant-panel/skills-test.gts
@@ -25,8 +25,6 @@ import OperatorMode from '@cardstack/host/components/operator-mode/container';
 
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import {
   envSkillId,
   testRealmURL,
@@ -54,6 +52,8 @@ import { setupMockMatrix } from '../../../helpers/mock-matrix';
 import { renderComponent } from '../../../helpers/render-component';
 import { setupRenderingTest } from '../../../helpers/setup';
 
+import type { FileDef } from '@cardstack/base/file-api';
+
 module('Integration | ai-assistant-panel | skills', function (hooks) {
   const realmName = 'Operator Mode Workspace';
   let loader: Loader;
@@ -182,7 +182,7 @@ module('Integration | ai-assistant-panel | skills', function (hooks) {
             import { Command } from '@cardstack/runtime-common';
             import { SearchCardsByTypeAndTitleCommand } from '@cardstack/boxel-host/commands/search-cards';
             import ShowCardCommand from '@cardstack/boxel-host/commands/show-card';
-            import type { SearchCardsByTypeAndTitleInput } from 'https://cardstack.com/base/commands/search-card-result';
+            import type { SearchCardsByTypeAndTitleInput } from '@cardstack/base/commands/search-card-result';
 
             export default class SearchAndOpenCardCommand extends Command<
               typeof SearchCardsByTypeAndTitleInput,
diff --git a/packages/host/tests/integration/components/ai-module-creation-test.gts b/packages/host/tests/integration/components/ai-module-creation-test.gts
index dd313b8ea8e..bda1bb6d47a 100644
--- a/packages/host/tests/integration/components/ai-module-creation-test.gts
+++ b/packages/host/tests/integration/components/ai-module-creation-test.gts
@@ -21,8 +21,6 @@ import ENV from '@cardstack/host/config/environment';
 
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 
-import type { CardMessageContent } from 'https://cardstack.com/base/matrix-event';
-
 import {
   testRealmURL,
   setupCardLogs,
@@ -34,6 +32,8 @@ import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { renderComponent } from '../../helpers/render-component';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type { CardMessageContent } from '@cardstack/base/matrix-event';
+
 class MockRouterService extends Service {
   replaceWith(_route: any, _args: any) {
     // This is a stub method that does nothing
@@ -193,7 +193,7 @@ module('Integration | create app module via ai-assistant', function (hooks) {
     );
 
     // Remove catalog app card dependency for now since we don't have catalog in tests
-    const moduleCode = `import { Component, CardDef, FieldDef, linksTo, linksToMany, field, contains, containsMany } from 'https://cardstack.com/base/card-api';\nimport StringField from 'https://cardstack.com/base/string';\nimport BooleanField from 'https://cardstack.com/base/boolean';\nimport DateField from 'https://cardstack.com/base/date';\nimport DateTimeField from 'https://cardstack.com/base/datetime';\nimport NumberField from 'https://cardstack.com/base/number';\nimport MarkdownField from 'https://cardstack.com/base/markdown';\n\nexport class Tour extends CardDef {\n  static displayName = 'Tour';\n\n  @field tourID = contains(StringField);\n  @field date = contains(DateField);\n  @field time = contains(DateTimeField);\n  @field parentNames = contains(StringField);\n  @field contactInformation = contains(StringField);\n  @field notes = contains(MarkdownField);\n\n  @field parents = linksToMany(() => Parent);\n}\n\nexport class Student extends CardDef {\n  static displayName = 'Student';\n\n  @field studentID = contains(StringField);\n  @field name = contains(StringField);\n  @field age = contains(NumberField);\n  @field enrollmentDate = contains(DateField);\n  @field parentInformation = contains(MarkdownField);\n  @field allergiesMedicalNotes = contains(MarkdownField);\n  @field attendanceRecords = containsMany(MarkdownField);\n  \n  @field parents = linksToMany(() => Parent);\n  @field classes = linksToMany(() => Class);\n}\n\nexport class Parent extends CardDef {\n  static displayName = 'Parent';\n\n  @field parentID = contains(StringField);\n  @field name = contains(StringField);\n  @field contactInformation = contains(StringField);\n  \n  @field students = linksToMany(Student);\n  @field tours = linksToMany(Tour);\n}\n\nexport class Staff extends CardDef {\n  static displayName = 'Staff';\n\n  @field staffID = contains(StringField);\n  @field name = contains(StringField);\n  @field role = contains(StringField);\n  @field contactInformation = contains(StringField);\n  @field schedule = contains(MarkdownField);\n}\n\nexport class Class extends CardDef {\n  static displayName = 'Class';\n\n  @field classID = contains(StringField);\n  @field name = contains(StringField);\n  @field schedule = contains(MarkdownField);\n  \n  @field instructor = linksTo(Staff);\n  @field enrolledStudents = linksToMany(Student);\n}\n\nexport class Communication extends CardDef {\n  static displayName = 'Communication';\n\n  @field communicationID = contains(StringField);\n  @field date = contains(DateField);\n  @field type = contains(StringField);\n  @field content = contains(MarkdownField);\n  @field followUpDate = contains(DateField);\n}\n\nexport class PreschoolCRMApp extends CardDef {\n  static displayName = 'Preschool CRM';\n\n  @field tours = containsMany(Tour);\n  @field students = containsMany(Student);\n  @field parents = containsMany(Parent);\n  @field staff = containsMany(Staff);\n  @field classes = containsMany(Class);\n  @field communications = containsMany(Communication);\n}\n`;
+    const moduleCode = `import { Component, CardDef, FieldDef, linksTo, linksToMany, field, contains, containsMany } from '@cardstack/base/card-api';\nimport StringField from '@cardstack/base/string';\nimport BooleanField from '@cardstack/base/boolean';\nimport DateField from '@cardstack/base/date';\nimport DateTimeField from '@cardstack/base/datetime';\nimport NumberField from '@cardstack/base/number';\nimport MarkdownField from '@cardstack/base/markdown';\n\nexport class Tour extends CardDef {\n  static displayName = 'Tour';\n\n  @field tourID = contains(StringField);\n  @field date = contains(DateField);\n  @field time = contains(DateTimeField);\n  @field parentNames = contains(StringField);\n  @field contactInformation = contains(StringField);\n  @field notes = contains(MarkdownField);\n\n  @field parents = linksToMany(() => Parent);\n}\n\nexport class Student extends CardDef {\n  static displayName = 'Student';\n\n  @field studentID = contains(StringField);\n  @field name = contains(StringField);\n  @field age = contains(NumberField);\n  @field enrollmentDate = contains(DateField);\n  @field parentInformation = contains(MarkdownField);\n  @field allergiesMedicalNotes = contains(MarkdownField);\n  @field attendanceRecords = containsMany(MarkdownField);\n  \n  @field parents = linksToMany(() => Parent);\n  @field classes = linksToMany(() => Class);\n}\n\nexport class Parent extends CardDef {\n  static displayName = 'Parent';\n\n  @field parentID = contains(StringField);\n  @field name = contains(StringField);\n  @field contactInformation = contains(StringField);\n  \n  @field students = linksToMany(Student);\n  @field tours = linksToMany(Tour);\n}\n\nexport class Staff extends CardDef {\n  static displayName = 'Staff';\n\n  @field staffID = contains(StringField);\n  @field name = contains(StringField);\n  @field role = contains(StringField);\n  @field contactInformation = contains(StringField);\n  @field schedule = contains(MarkdownField);\n}\n\nexport class Class extends CardDef {\n  static displayName = 'Class';\n\n  @field classID = contains(StringField);\n  @field name = contains(StringField);\n  @field schedule = contains(MarkdownField);\n  \n  @field instructor = linksTo(Staff);\n  @field enrolledStudents = linksToMany(Student);\n}\n\nexport class Communication extends CardDef {\n  static displayName = 'Communication';\n\n  @field communicationID = contains(StringField);\n  @field date = contains(DateField);\n  @field type = contains(StringField);\n  @field content = contains(MarkdownField);\n  @field followUpDate = contains(DateField);\n}\n\nexport class PreschoolCRMApp extends CardDef {\n  static displayName = 'Preschool CRM';\n\n  @field tours = containsMany(Tour);\n  @field students = containsMany(Student);\n  @field parents = containsMany(Parent);\n  @field staff = containsMany(Staff);\n  @field classes = containsMany(Class);\n  @field communications = containsMany(Communication);\n}\n`;
 
     simulateRemoteMessage(roomId, '@aibot:localhost', {
       msgtype: APP_BOXEL_MESSAGE_MSGTYPE,
diff --git a/packages/host/tests/integration/components/ask-ai-test.gts b/packages/host/tests/integration/components/ask-ai-test.gts
index 182e2e07ef5..07dbf5b2d3c 100644
--- a/packages/host/tests/integration/components/ask-ai-test.gts
+++ b/packages/host/tests/integration/components/ask-ai-test.gts
@@ -60,7 +60,7 @@ module('Integration | ask-ai', function (hooks) {
   hooks.beforeEach(async function () {
     operatorModeStateService = getService('operator-mode-state-service');
 
-    const petCard = `import { CardDef, Component, contains, field, StringField } from "https://cardstack.com/base/card-api";
+    const petCard = `import { CardDef, Component, contains, field, StringField } from "@cardstack/base/card-api";
       export class Pet extends CardDef {
         static displayName = 'Pet';
         @field cardTitle = contains(StringField);
diff --git a/packages/host/tests/integration/components/card-basics-test.gts b/packages/host/tests/integration/components/card-basics-test.gts
index 521a0cf4e1d..b9b2f692722 100644
--- a/packages/host/tests/integration/components/card-basics-test.gts
+++ b/packages/host/tests/integration/components/card-basics-test.gts
@@ -35,11 +35,6 @@ import {
   type CodeRef,
 } from '@cardstack/runtime-common';
 
-import type {
-  BaseDef,
-  SignatureFor,
-} from 'https://cardstack.com/base/card-api';
-
 import {
   cleanWhiteSpace,
   p,
@@ -92,6 +87,8 @@ import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { renderCard } from '../../helpers/render-component';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type { BaseDef, SignatureFor } from '@cardstack/base/card-api';
+
 let loader: Loader;
 
 module('Integration | card-basics', function (hooks) {
diff --git a/packages/host/tests/integration/components/card-catalog-test.gts b/packages/host/tests/integration/components/card-catalog-test.gts
index 27f7dc9dcd1..ae48a035409 100644
--- a/packages/host/tests/integration/components/card-catalog-test.gts
+++ b/packages/host/tests/integration/components/card-catalog-test.gts
@@ -42,11 +42,11 @@ module('Integration | card-catalog', function (hooks) {
 
   hooks.beforeEach(async function () {
     let loader = getService('loader-service').loader;
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
-    let string: typeof import('https://cardstack.com/base/string');
-    let textArea: typeof import('https://cardstack.com/base/text-area');
-    let cardsGrid: typeof import('https://cardstack.com/base/cards-grid');
-    let spec: typeof import('https://cardstack.com/base/spec');
+    let cardApi: typeof import('@cardstack/base/card-api');
+    let string: typeof import('@cardstack/base/string');
+    let textArea: typeof import('@cardstack/base/text-area');
+    let cardsGrid: typeof import('@cardstack/base/cards-grid');
+    let spec: typeof import('@cardstack/base/spec');
     cardApi = await loader.import(`${baseRealm.url}card-api`);
     string = await loader.import(`${baseRealm.url}string`);
     textArea = await loader.import(`${baseRealm.url}text-area`);
diff --git a/packages/host/tests/integration/components/card-copy-test.gts b/packages/host/tests/integration/components/card-copy-test.gts
index 6de42bd60eb..c26a4d8a16e 100644
--- a/packages/host/tests/integration/components/card-copy-test.gts
+++ b/packages/host/tests/integration/components/card-copy-test.gts
@@ -18,11 +18,6 @@ import type { Realm } from '@cardstack/runtime-common/realm';
 
 import OperatorMode from '@cardstack/host/components/operator-mode/container';
 
-import type {
-  IncrementalIndexEventContent,
-  IndexRealmEventContent,
-} from 'https://cardstack.com/base/matrix-event';
-
 import {
   SYSTEM_CARD_FIXTURE_CONTENTS,
   percySnapshot,
@@ -38,6 +33,11 @@ import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { renderComponent } from '../../helpers/render-component';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type {
+  IncrementalIndexEventContent,
+  IndexRealmEventContent,
+} from '@cardstack/base/matrix-event';
+
 const testRealm2URL = `http://test-realm/test2/`;
 const readOnlyRealmURL = `http://test-realm/test-read-only/`;
 let loader: Loader;
@@ -109,8 +109,8 @@ module('Integration | card-copy', function (hooks) {
       ].filter((a) => a.length > 0);
       operatorModeStateService.restore({ stacks });
     };
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
-    let string: typeof import('https://cardstack.com/base/string');
+    let cardApi: typeof import('@cardstack/base/card-api');
+    let string: typeof import('@cardstack/base/string');
     cardApi = await loader.import(`${baseRealm.url}card-api`);
     string = await loader.import(`${baseRealm.url}string`);
 
@@ -175,7 +175,7 @@ module('Integration | card-copy', function (hooks) {
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
@@ -250,7 +250,7 @@ module('Integration | card-copy', function (hooks) {
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
@@ -291,7 +291,7 @@ module('Integration | card-copy', function (hooks) {
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
@@ -640,7 +640,7 @@ module('Integration | card-copy', function (hooks) {
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
diff --git a/packages/host/tests/integration/components/card-delete-test.gts b/packages/host/tests/integration/components/card-delete-test.gts
index fea6ba30608..cba523db96c 100644
--- a/packages/host/tests/integration/components/card-delete-test.gts
+++ b/packages/host/tests/integration/components/card-delete-test.gts
@@ -11,8 +11,6 @@ import type { Realm } from '@cardstack/runtime-common/realm';
 
 import OperatorMode from '@cardstack/host/components/operator-mode/container';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
 import {
   testRealmURL,
   testModuleRealm,
@@ -28,9 +26,10 @@ import { renderComponent } from '../../helpers/render-component';
 import { setupRenderingTest } from '../../helpers/setup';
 
 import type { TestRealmAdapter } from '../../helpers/adapter';
+import type { CardDef } from '@cardstack/base/card-api';
 
 let loader: Loader;
-let cardApi: typeof import('https://cardstack.com/base/card-api');
+let cardApi: typeof import('@cardstack/base/card-api');
 let setCardInOperatorModeState: (
   leftCards: string[],
   rightCards?: string[],
@@ -101,8 +100,8 @@ module('Integration | card-delete', function (hooks) {
       ].filter((a) => a.length > 0);
       operatorModeStateService.restore({ stacks });
     };
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
-    let string: typeof import('https://cardstack.com/base/string');
+    let cardApi: typeof import('@cardstack/base/card-api');
+    let string: typeof import('@cardstack/base/string');
     cardApi = await loader.import(`${baseRealm.url}card-api`);
     string = await loader.import(`${baseRealm.url}string`);
 
@@ -137,7 +136,7 @@ module('Integration | card-delete', function (hooks) {
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
diff --git a/packages/host/tests/integration/components/loading-test.gts b/packages/host/tests/integration/components/loading-test.gts
index 36eef567afb..2d102580f54 100644
--- a/packages/host/tests/integration/components/loading-test.gts
+++ b/packages/host/tests/integration/components/loading-test.gts
@@ -4,8 +4,6 @@ import { module, test } from 'qunit';
 import { baseRealm } from '@cardstack/runtime-common';
 import type { Loader } from '@cardstack/runtime-common/loader';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-
 import {
   testRealmURL,
   setupCardLogs,
@@ -19,12 +17,14 @@ import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { renderCard } from '../../helpers/render-component';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type { CardDef } from '@cardstack/base/card-api';
+
 module('Integration | loading', function (hooks) {
   setupRenderingTest(hooks);
 
   const realmName = 'Operator Mode Workspace';
   let loader: Loader;
-  let cardApi: typeof import('https://cardstack.com/base/card-api');
+  let cardApi: typeof import('@cardstack/base/card-api');
 
   hooks.beforeEach(function () {
     loader = getService('loader-service').loader;
@@ -49,7 +49,7 @@ module('Integration | loading', function (hooks) {
     let cardWithBrokenIconDefSource = `
       import NonExistentIcon from '@cardstack/boxel-icons/non-existent';
 
-      import { CardDef } from 'https://cardstack.com/base/card-api';
+      import { CardDef } from '@cardstack/base/card-api';
 
       export class CardWithBrokenIcon extends CardDef {
         static icon = NonExistentIcon;
diff --git a/packages/host/tests/integration/components/operator-mode-card-catalog-test.gts b/packages/host/tests/integration/components/operator-mode-card-catalog-test.gts
index 821070bf87a..9ce16612abd 100644
--- a/packages/host/tests/integration/components/operator-mode-card-catalog-test.gts
+++ b/packages/host/tests/integration/components/operator-mode-card-catalog-test.gts
@@ -523,10 +523,7 @@ module('Integration | operator-mode | card catalog', function (hooks) {
     await waitFor(`[data-test-cards-grid-item]`);
     await click(`[data-test-create-new-card-button]`);
     await waitFor(`[data-test-card-catalog-item]`);
-    await fillIn(
-      `[data-test-search-field]`,
-      `https://cardstack.com/base/types/card`,
-    );
+    await fillIn(`[data-test-search-field]`, `@cardstack/base/types/card`);
 
     await waitFor('[data-test-card-catalog-item]', {
       count: 1,
@@ -1315,9 +1312,7 @@ module('Integration | operator-mode | card catalog', function (hooks) {
     await click('[data-test-create-new-card-button]');
     await waitFor(`[data-test-card-catalog-item]`);
     await fillIn(`[data-test-search-field]`, `Skill`);
-    await click(
-      '[data-test-card-catalog-item="https://cardstack.com/base/cards/skill"]',
-    );
+    await click('[data-test-card-catalog-item="@cardstack/base/cards/skill"]');
     await click('[data-test-card-catalog-go-button]');
 
     await fillIn('[data-test-field="cardTitle"] input', 'New Skill');
diff --git a/packages/host/tests/integration/components/operator-mode-links-test.gts b/packages/host/tests/integration/components/operator-mode-links-test.gts
index a80417c9a58..232cc67ba83 100644
--- a/packages/host/tests/integration/components/operator-mode-links-test.gts
+++ b/packages/host/tests/integration/components/operator-mode-links-test.gts
@@ -153,10 +153,10 @@ module('Integration | operator-mode | links', function (hooks) {
 
     await click('[data-test-add-new="spec"]');
     await waitFor(
-      `[data-test-card-catalog-item="https://cardstack.com/base/fields/biginteger-field"]`,
+      `[data-test-card-catalog-item="@cardstack/base/fields/biginteger-field"]`,
     );
     await click(
-      `[data-test-card-catalog-item="https://cardstack.com/base/fields/biginteger-field"]`,
+      `[data-test-card-catalog-item="@cardstack/base/fields/biginteger-field"]`,
     );
     await click('[data-test-card-catalog-go-button]');
 
diff --git a/packages/host/tests/integration/components/operator-mode-ui-test.gts b/packages/host/tests/integration/components/operator-mode-ui-test.gts
index b8c4eadbc3f..91549cf1714 100644
--- a/packages/host/tests/integration/components/operator-mode-ui-test.gts
+++ b/packages/host/tests/integration/components/operator-mode-ui-test.gts
@@ -95,8 +95,8 @@ module('Integration | operator-mode | ui', function (hooks) {
     await ctx.testRealm.write(
       'file-link-card.gts',
       `
-        import { CardDef, Component, field, contains, linksTo, StringField } from 'https://cardstack.com/base/card-api';
-        import { FileDef } from 'https://cardstack.com/base/file-api';
+        import { CardDef, Component, field, contains, linksTo, StringField } from '@cardstack/base/card-api';
+        import { FileDef } from '@cardstack/base/file-api';
 
         export class FileLinkCard extends CardDef {
           static displayName = 'File Link Card';
diff --git a/packages/host/tests/integration/components/operator-mode/setup.gts b/packages/host/tests/integration/components/operator-mode/setup.gts
index 26bed7aed1a..fcffa1394af 100644
--- a/packages/host/tests/integration/components/operator-mode/setup.gts
+++ b/packages/host/tests/integration/components/operator-mode/setup.gts
@@ -68,11 +68,11 @@ export function setupOperatorModeTests(
   });
 
   hooks.beforeEach(async function () {
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
-    let string: typeof import('https://cardstack.com/base/string');
-    let textArea: typeof import('https://cardstack.com/base/text-area');
-    let cardsGrid: typeof import('https://cardstack.com/base/cards-grid');
-    let spec: typeof import('https://cardstack.com/base/spec');
+    let cardApi: typeof import('@cardstack/base/card-api');
+    let string: typeof import('@cardstack/base/string');
+    let textArea: typeof import('@cardstack/base/text-area');
+    let cardsGrid: typeof import('@cardstack/base/cards-grid');
+    let spec: typeof import('@cardstack/base/spec');
 
     cardApi = await loader.import(`${baseRealm.url}card-api`);
     string = await loader.import(`${baseRealm.url}string`);
@@ -98,7 +98,7 @@ export function setupOperatorModeTests(
 
     // use string source so we can get the transpiled scoped CSS
     let friendWithCSSSource = `
-      import { Component, field, contains, linksTo, CardDef, StringField } from 'https://cardstack.com/base/card-api';
+      import { Component, field, contains, linksTo, CardDef, StringField } from '@cardstack/base/card-api';
       export class FriendWithCSS extends CardDef {
         static displayName = 'Friend';
         @field cardTitle = contains(StringField);
diff --git a/packages/host/tests/integration/components/overlay-menu-items-test.gts b/packages/host/tests/integration/components/overlay-menu-items-test.gts
index 5c815e36bbd..3d057a67675 100644
--- a/packages/host/tests/integration/components/overlay-menu-items-test.gts
+++ b/packages/host/tests/integration/components/overlay-menu-items-test.gts
@@ -12,8 +12,6 @@ import type { Loader } from '@cardstack/runtime-common/loader';
 
 import OperatorMode from '@cardstack/host/components/operator-mode/container';
 
-import type { GetMenuItemParams } from 'https://cardstack.com/base/card-api';
-
 import {
   testRealmURL,
   testModuleRealm,
@@ -28,6 +26,8 @@ import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { renderComponent } from '../../helpers/render-component';
 import { setupRenderingTest } from '../../helpers/setup';
 
+import type { GetMenuItemParams } from '@cardstack/base/card-api';
+
 let loader: Loader;
 let setCardInOperatorModeState: (leftCards: string[]) => void;
 
@@ -69,8 +69,8 @@ module('Integration | overlay-menu-items', function (hooks) {
       });
     };
 
-    let cardApi: typeof import('https://cardstack.com/base/card-api');
-    let string: typeof import('https://cardstack.com/base/string');
+    let cardApi: typeof import('@cardstack/base/card-api');
+    let string: typeof import('@cardstack/base/string');
     cardApi = await loader.import(`${baseRealm.url}card-api`);
     string = await loader.import(`${baseRealm.url}string`);
 
@@ -127,7 +127,7 @@ module('Integration | overlay-menu-items', function (hooks) {
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/cards-grid',
+                module: '@cardstack/base/cards-grid',
                 name: 'CardsGrid',
               },
             },
diff --git a/packages/host/tests/integration/components/prerendered-card-search-test.gts b/packages/host/tests/integration/components/prerendered-card-search-test.gts
index e943c17ef5a..d93f337d96b 100644
--- a/packages/host/tests/integration/components/prerendered-card-search-test.gts
+++ b/packages/host/tests/integration/components/prerendered-card-search-test.gts
@@ -112,7 +112,7 @@ module(`Integration | prerendered-card-search`, function (hooks) {
     }
 
     const BookGtsImpl = `
-    import { Component, field, contains, linksTo, CardDef, StringField } from 'https://cardstack.com/base/card-api';
+    import { Component, field, contains, linksTo, CardDef, StringField } from '@cardstack/base/card-api';
     import { PersonField } from './person';
     import { Publisher } from './publisher';
     export class Book extends CardDef {
@@ -146,8 +146,8 @@ module(`Integration | prerendered-card-search`, function (hooks) {
 
     const FileDefMismatchGtsImpl = `
     import { byteStreamToUint8Array } from '@cardstack/runtime-common';
-    import { Component, BaseDefComponent, field, contains, StringField } from 'https://cardstack.com/base/card-api';
-    import { FileDef as BaseFileDef, type ByteStream } from 'https://cardstack.com/base/file-api';
+    import { Component, BaseDefComponent, field, contains, StringField } from '@cardstack/base/card-api';
+    import { FileDef as BaseFileDef, type ByteStream } from '@cardstack/base/file-api';
 
     class Isolated extends Component<typeof FileDef> {
       <template>
diff --git a/packages/host/tests/integration/components/preview-test.gts b/packages/host/tests/integration/components/preview-test.gts
index 4bf926f5715..0910fe779a4 100644
--- a/packages/host/tests/integration/components/preview-test.gts
+++ b/packages/host/tests/integration/components/preview-test.gts
@@ -10,14 +10,14 @@ import type { Loader } from '@cardstack/runtime-common/loader';
 
 import CardRenderer from '@cardstack/host/components/card-renderer';
 
-import type { Format } from 'https://cardstack.com/base/card-api';
-
 import { percySnapshot, testRealmURL } from '../../helpers';
 import { renderComponent } from '../../helpers/render-component';
 import { setupRenderingTest } from '../../helpers/setup';
 
-let cardApi: typeof import('https://cardstack.com/base/card-api');
-let string: typeof import('https://cardstack.com/base/string');
+import type { Format } from '@cardstack/base/card-api';
+
+let cardApi: typeof import('@cardstack/base/card-api');
+let string: typeof import('@cardstack/base/string');
 
 class MockLocalIndexer extends Service {
   url = new URL(testRealmURL);
diff --git a/packages/host/tests/integration/components/serialization-test.gts b/packages/host/tests/integration/components/serialization-test.gts
index 573a5533387..1a93bfd8c1c 100644
--- a/packages/host/tests/integration/components/serialization-test.gts
+++ b/packages/host/tests/integration/components/serialization-test.gts
@@ -28,8 +28,6 @@ import type { Loader } from '@cardstack/runtime-common/loader';
 
 import type CardService from '@cardstack/host/services/card-service';
 
-import type { CardDef as CardDefType } from 'https://cardstack.com/base/card-api';
-
 import {
   p,
   cleanWhiteSpace,
@@ -74,6 +72,7 @@ import { renderCard } from '../../helpers/render-component';
 import { setupRenderingTest } from '../../helpers/setup';
 
 import type { Captain } from '../../cards/captain';
+import type { CardDef as CardDefType } from '@cardstack/base/card-api';
 
 let loader: Loader;
 
diff --git a/packages/host/tests/integration/components/text-suggestion-test.gts b/packages/host/tests/integration/components/text-suggestion-test.gts
index 5c51b0bd4e8..585bb69f845 100644
--- a/packages/host/tests/integration/components/text-suggestion-test.gts
+++ b/packages/host/tests/integration/components/text-suggestion-test.gts
@@ -21,8 +21,8 @@ import {
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
-let cardApi: typeof import('https://cardstack.com/base/card-api');
-let string: typeof import('https://cardstack.com/base/string');
+let cardApi: typeof import('@cardstack/base/card-api');
+let string: typeof import('@cardstack/base/string');
 let loader: Loader;
 
 module('Integration | text-suggestion | card-chooser-title', function (hooks) {
diff --git a/packages/host/tests/integration/field-configuration-test.gts b/packages/host/tests/integration/field-configuration-test.gts
index 520e465477d..9e5fbd282ce 100644
--- a/packages/host/tests/integration/field-configuration-test.gts
+++ b/packages/host/tests/integration/field-configuration-test.gts
@@ -11,13 +11,6 @@ import type {
 } from '@cardstack/runtime-common';
 import type { Loader } from '@cardstack/runtime-common/loader';
 
-import type {
-  CardStore,
-  CardDef as CardDefType,
-  StoreSearchResource,
-} from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import {
   testRealmURL,
   setupCardLogs,
@@ -40,6 +33,13 @@ import { setupMockMatrix } from '../helpers/mock-matrix';
 import { renderCard } from '../helpers/render-component';
 import { setupRenderingTest } from '../helpers/setup';
 
+import type {
+  CardStore,
+  CardDef as CardDefType,
+  StoreSearchResource,
+} from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
+
 let loader: Loader;
 
 class DeferredLinkStore implements CardStore {
diff --git a/packages/host/tests/integration/message-service-subscription-test.gts b/packages/host/tests/integration/message-service-subscription-test.gts
index 39c0871bff2..649b89f7ec9 100644
--- a/packages/host/tests/integration/message-service-subscription-test.gts
+++ b/packages/host/tests/integration/message-service-subscription-test.gts
@@ -18,8 +18,6 @@ import SubscribeToRealms from '@cardstack/host/helpers/subscribe-to-realms';
 
 import { renderComponent } from '@cardstack/host/tests/helpers/render-component';
 
-import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event';
-
 import {
   testRealmURL,
   setupCardLogs,
@@ -31,6 +29,8 @@ import {
 import { setupMockMatrix } from '../helpers/mock-matrix';
 import { setupRenderingTest } from '../helpers/setup';
 
+import type { RealmEventContent } from '@cardstack/base/matrix-event';
+
 let loader: Loader;
 
 module('Integration | message service subscription', function (hooks) {
diff --git a/packages/host/tests/integration/realm-indexing-test.gts b/packages/host/tests/integration/realm-indexing-test.gts
index bad0bc0e64e..a8eb607307d 100644
--- a/packages/host/tests/integration/realm-indexing-test.gts
+++ b/packages/host/tests/integration/realm-indexing-test.gts
@@ -124,7 +124,7 @@ module(`Integration | realm indexing`, function (hooks) {
           data: {
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'CardDef',
               },
             },
@@ -149,7 +149,7 @@ module(`Integration | realm indexing`, function (hooks) {
         },
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/card-api',
+            module: '@cardstack/base/card-api',
             name: 'CardDef',
           },
           realmURL: 'http://test-realm/test/',
@@ -251,7 +251,7 @@ module(`Integration | realm indexing`, function (hooks) {
           data: {
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'CardDef',
               },
             },
@@ -261,15 +261,15 @@ module(`Integration | realm indexing`, function (hooks) {
           data: {
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'CardDef',
               },
             },
           },
         },
         'pet.gts': `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class Pet extends CardDef {
             @field firstName = contains(StringField);
@@ -301,7 +301,7 @@ module(`Integration | realm indexing`, function (hooks) {
           },
           meta: {
             adoptsFrom: {
-              module: 'https://cardstack.com/base/card-api',
+              module: '@cardstack/base/card-api',
               name: 'CardDef',
             },
           },
@@ -820,7 +820,7 @@ module(`Integration | realm indexing`, function (hooks) {
             },
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/spec',
+                module: '@cardstack/base/spec',
                 name: 'Spec',
               },
             },
@@ -862,7 +862,7 @@ module(`Integration | realm indexing`, function (hooks) {
         },
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/spec',
+            module: '@cardstack/base/spec',
             name: 'Spec',
           },
           lastModified: adapter.lastModifiedMap.get(
@@ -932,7 +932,7 @@ module(`Integration | realm indexing`, function (hooks) {
             },
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/spec',
+                module: '@cardstack/base/spec',
                 name: 'Spec',
               },
             },
@@ -992,7 +992,7 @@ module(`Integration | realm indexing`, function (hooks) {
         },
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/spec',
+            module: '@cardstack/base/spec',
             name: 'Spec',
           },
           lastModified: adapter.lastModifiedMap.get(
@@ -2678,7 +2678,7 @@ module(`Integration | realm indexing`, function (hooks) {
             },
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/spec',
+                module: '@cardstack/base/spec',
                 name: 'Spec',
               },
             },
@@ -3078,7 +3078,7 @@ module(`Integration | realm indexing`, function (hooks) {
             relationships: {},
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/spec',
+                module: '@cardstack/base/spec',
                 name: 'Spec',
               },
             },
@@ -3132,7 +3132,7 @@ module(`Integration | realm indexing`, function (hooks) {
         },
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/spec',
+            module: '@cardstack/base/spec',
             name: 'Spec',
           },
           lastModified: adapter.lastModifiedMap.get(
@@ -4493,32 +4493,32 @@ module(`Integration | realm indexing`, function (hooks) {
         'http://localhost:4206/@cardstack/boxel-icons/v1/icons/rectangle-ellipsis',
         'http://localhost:4206/@cardstack/boxel-icons/v1/icons/trash-2',
         'http://localhost:4206/@cardstack/boxel-icons/v1/icons/wand',
-        'https://cardstack.com/base/-private',
-        'https://cardstack.com/base/card-api',
-        'https://cardstack.com/base/card-serialization',
-        'https://cardstack.com/base/contains-many-component',
-        'https://cardstack.com/base/default-templates/atom',
-        'https://cardstack.com/base/default-templates/card-info',
-        'https://cardstack.com/base/default-templates/embedded',
-        'https://cardstack.com/base/default-templates/field-edit',
-        'https://cardstack.com/base/default-templates/fitted',
-        'https://cardstack.com/base/default-templates/head',
-        'https://cardstack.com/base/default-templates/isolated-and-edit',
-        'https://cardstack.com/base/default-templates/markdown',
-        'https://cardstack.com/base/default-templates/missing-template',
-        'https://cardstack.com/base/field-component',
-        'https://cardstack.com/base/field-support',
-        'https://cardstack.com/base/helpers/sanitized-html',
-        'https://cardstack.com/base/helpers/set-background-image',
-        'https://cardstack.com/base/links-to-editor',
-        'https://cardstack.com/base/links-to-many-component',
-        'https://cardstack.com/base/menu-items',
-        'https://cardstack.com/base/number',
-        'https://cardstack.com/base/query-field-support',
-        'https://cardstack.com/base/shared-state',
-        'https://cardstack.com/base/string',
-        'https://cardstack.com/base/text-input-validator',
-        'https://cardstack.com/base/watched-array',
+        '@cardstack/base/-private',
+        '@cardstack/base/card-api',
+        '@cardstack/base/card-serialization',
+        '@cardstack/base/contains-many-component',
+        '@cardstack/base/default-templates/atom',
+        '@cardstack/base/default-templates/card-info',
+        '@cardstack/base/default-templates/embedded',
+        '@cardstack/base/default-templates/field-edit',
+        '@cardstack/base/default-templates/fitted',
+        '@cardstack/base/default-templates/head',
+        '@cardstack/base/default-templates/isolated-and-edit',
+        '@cardstack/base/default-templates/markdown',
+        '@cardstack/base/default-templates/missing-template',
+        '@cardstack/base/field-component',
+        '@cardstack/base/field-support',
+        '@cardstack/base/helpers/sanitized-html',
+        '@cardstack/base/helpers/set-background-image',
+        '@cardstack/base/links-to-editor',
+        '@cardstack/base/links-to-many-component',
+        '@cardstack/base/menu-items',
+        '@cardstack/base/number',
+        '@cardstack/base/query-field-support',
+        '@cardstack/base/shared-state',
+        '@cardstack/base/string',
+        '@cardstack/base/text-input-validator',
+        '@cardstack/base/watched-array',
         'https://packages/@cardstack/boxel-host/commands/copy-and-edit',
         'https://packages/@cardstack/boxel-host/commands/copy-card',
         'https://packages/@cardstack/boxel-host/commands/create-ai-assistant-room',
@@ -4625,36 +4625,36 @@ module(`Integration | realm indexing`, function (hooks) {
         'http://localhost:4206/@cardstack/boxel-icons/v1/icons/toggle-left',
         'http://localhost:4206/@cardstack/boxel-icons/v1/icons/trash-2',
         'http://localhost:4206/@cardstack/boxel-icons/v1/icons/wand',
-        'https://cardstack.com/base/-private',
-        'https://cardstack.com/base/boolean',
-        'https://cardstack.com/base/card-api',
-        'https://cardstack.com/base/card-serialization',
-        'https://cardstack.com/base/code-ref',
-        'https://cardstack.com/base/contains-many-component',
-        'https://cardstack.com/base/default-templates/atom',
-        'https://cardstack.com/base/default-templates/card-info',
-        'https://cardstack.com/base/default-templates/embedded',
-        'https://cardstack.com/base/default-templates/field-edit',
-        'https://cardstack.com/base/default-templates/fitted',
-        'https://cardstack.com/base/default-templates/head',
-        'https://cardstack.com/base/default-templates/isolated-and-edit',
-        'https://cardstack.com/base/default-templates/markdown',
-        'https://cardstack.com/base/default-templates/missing-template',
-        'https://cardstack.com/base/field-component',
-        'https://cardstack.com/base/field-support',
-        'https://cardstack.com/base/helpers/sanitized-html',
-        'https://cardstack.com/base/helpers/set-background-image',
-        'https://cardstack.com/base/links-to-editor',
-        'https://cardstack.com/base/links-to-many-component',
-        'https://cardstack.com/base/markdown',
-        'https://cardstack.com/base/menu-items',
-        'https://cardstack.com/base/number',
-        'https://cardstack.com/base/query-field-support',
-        'https://cardstack.com/base/shared-state',
-        'https://cardstack.com/base/spec',
-        'https://cardstack.com/base/string',
-        'https://cardstack.com/base/text-input-validator',
-        'https://cardstack.com/base/watched-array',
+        '@cardstack/base/-private',
+        '@cardstack/base/boolean',
+        '@cardstack/base/card-api',
+        '@cardstack/base/card-serialization',
+        '@cardstack/base/code-ref',
+        '@cardstack/base/contains-many-component',
+        '@cardstack/base/default-templates/atom',
+        '@cardstack/base/default-templates/card-info',
+        '@cardstack/base/default-templates/embedded',
+        '@cardstack/base/default-templates/field-edit',
+        '@cardstack/base/default-templates/fitted',
+        '@cardstack/base/default-templates/head',
+        '@cardstack/base/default-templates/isolated-and-edit',
+        '@cardstack/base/default-templates/markdown',
+        '@cardstack/base/default-templates/missing-template',
+        '@cardstack/base/field-component',
+        '@cardstack/base/field-support',
+        '@cardstack/base/helpers/sanitized-html',
+        '@cardstack/base/helpers/set-background-image',
+        '@cardstack/base/links-to-editor',
+        '@cardstack/base/links-to-many-component',
+        '@cardstack/base/markdown',
+        '@cardstack/base/menu-items',
+        '@cardstack/base/number',
+        '@cardstack/base/query-field-support',
+        '@cardstack/base/shared-state',
+        '@cardstack/base/spec',
+        '@cardstack/base/string',
+        '@cardstack/base/text-input-validator',
+        '@cardstack/base/watched-array',
         'https://packages/@cardstack/boxel-host/commands/copy-and-edit',
         'https://packages/@cardstack/boxel-host/commands/copy-card',
         'https://packages/@cardstack/boxel-host/commands/create-ai-assistant-room',
diff --git a/packages/host/tests/integration/realm-test.gts b/packages/host/tests/integration/realm-test.gts
index f2794734e71..07af99c372b 100644
--- a/packages/host/tests/integration/realm-test.gts
+++ b/packages/host/tests/integration/realm-test.gts
@@ -16,9 +16,6 @@ import {
 import stripScopedCSSGlimmerAttributes from '@cardstack/runtime-common/helpers/strip-scoped-css-glimmer-attributes';
 import type { Loader } from '@cardstack/runtime-common/loader';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as StringFieldMod from 'https://cardstack.com/base/string';
-
 import {
   testRealmURL,
   testRealmInfo,
@@ -44,6 +41,9 @@ import {
 import { setupMockMatrix } from '../helpers/mock-matrix';
 import { setupRenderingTest } from '../helpers/setup';
 
+import type * as CardAPI from '@cardstack/base/card-api';
+import type * as StringFieldMod from '@cardstack/base/string';
+
 import '@cardstack/runtime-common/helpers/code-equality-assertion';
 
 let loader: Loader;
@@ -80,7 +80,7 @@ module('Integration | realm', function (hooks) {
           data: {
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'CardDef',
               },
             },
@@ -116,7 +116,7 @@ module('Integration | realm', function (hooks) {
         },
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/card-api',
+            module: '@cardstack/base/card-api',
             name: 'CardDef',
           },
           lastModified: adapter.lastModifiedMap.get(
@@ -411,7 +411,7 @@ module('Integration | realm', function (hooks) {
           data: {
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'CardDef',
               },
             },
@@ -480,7 +480,7 @@ module('Integration | realm', function (hooks) {
               type: 'card',
               meta: {
                 adoptsFrom: {
-                  module: 'https://cardstack.com/base/card-api',
+                  module: '@cardstack/base/card-api',
                   name: 'CardDef',
                 },
               },
@@ -556,7 +556,7 @@ module('Integration | realm', function (hooks) {
               type: 'card',
               meta: {
                 adoptsFrom: {
-                  module: 'https://cardstack.com/base/card-api',
+                  module: '@cardstack/base/card-api',
                   name: 'CardDef',
                 },
               },
@@ -592,7 +592,7 @@ module('Integration | realm', function (hooks) {
               type: 'card',
               meta: {
                 adoptsFrom: {
-                  module: 'https://cardstack.com/base/card-api',
+                  module: '@cardstack/base/card-api',
                   name: 'CardDef',
                 },
               },
@@ -2722,7 +2722,7 @@ module('Integration | realm', function (hooks) {
           data: {
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'CardDef',
               },
             },
@@ -2732,7 +2732,7 @@ module('Integration | realm', function (hooks) {
           data: {
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'CardDef',
               },
             },
@@ -2903,10 +2903,10 @@ module('Integration | realm', function (hooks) {
 
   test('realm can serve card source delete request', async function (assert) {
     let { field, contains, CardDef } = await loader.import<typeof CardAPI>(
-      'https://cardstack.com/base/card-api',
+      '@cardstack/base/card-api',
     );
     let { default: StringField } = await loader.import<typeof StringFieldMod>(
-      'https://cardstack.com/base/string',
+      '@cardstack/base/string',
     );
 
     class Person extends CardDef {
@@ -3028,7 +3028,7 @@ module('Integration | realm', function (hooks) {
             attributes: {},
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'CardDef',
               },
             },
@@ -3419,7 +3419,7 @@ module('Integration | realm', function (hooks) {
             attributes: {},
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'CardDef',
               },
             },
@@ -3475,7 +3475,7 @@ module('Integration | realm', function (hooks) {
 
   test('requests do not contain entries that match patterns in ignore files', async function (assert) {
     const cardSource = `
-      import { CardDef } from 'https://cardstack.com/base/card-api';
+      import { CardDef } from '@cardstack/base/card-api';
       export class Post extends CardDef {}
     `;
 
@@ -3656,7 +3656,7 @@ posts/ignore-me.gts
             type: 'card',
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'FieldDef',
               },
             },
diff --git a/packages/host/tests/integration/resources/search-data-test.ts b/packages/host/tests/integration/resources/search-data-test.ts
index 31ea5d7f301..bd96154e3f0 100644
--- a/packages/host/tests/integration/resources/search-data-test.ts
+++ b/packages/host/tests/integration/resources/search-data-test.ts
@@ -50,8 +50,8 @@ module(`Integration | search data resource`, function (hooks) {
   let loader: Loader;
   let loaderService: LoaderService;
   let realm: Realm;
-  let cardApi: typeof import('https://cardstack.com/base/card-api');
-  let string: typeof import('https://cardstack.com/base/string');
+  let cardApi: typeof import('@cardstack/base/card-api');
+  let string: typeof import('@cardstack/base/string');
 
   setupRenderingTest(hooks);
   hooks.beforeEach(function () {
diff --git a/packages/host/tests/integration/resources/search-test.ts b/packages/host/tests/integration/resources/search-test.ts
index 4ed5d520057..15e7bd60b7d 100644
--- a/packages/host/tests/integration/resources/search-test.ts
+++ b/packages/host/tests/integration/resources/search-test.ts
@@ -56,8 +56,8 @@ module(`Integration | search resource`, function (hooks) {
   let loaderService: LoaderService;
   let storeService: StoreService;
   let realm: Realm;
-  let cardApi: typeof import('https://cardstack.com/base/card-api');
-  let string: typeof import('https://cardstack.com/base/string');
+  let cardApi: typeof import('@cardstack/base/card-api');
+  let string: typeof import('@cardstack/base/string');
 
   setupRenderingTest(hooks);
   hooks.beforeEach(function () {
diff --git a/packages/host/tests/integration/store-test.gts b/packages/host/tests/integration/store-test.gts
index 70f0c16183b..2c2890aadbd 100644
--- a/packages/host/tests/integration/store-test.gts
+++ b/packages/host/tests/integration/store-test.gts
@@ -38,10 +38,6 @@ import type RealmService from '@cardstack/host/services/realm';
 import type StoreService from '@cardstack/host/services/store';
 import type { CardErrorJSONAPI } from '@cardstack/host/services/store';
 
-import type { CardDef as CardDefType } from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event';
-
 import {
   testRealmURL,
   setupLocalIndexing,
@@ -70,6 +66,9 @@ import { renderComponent } from '../helpers/render-component';
 import { setupRenderingTest } from '../helpers/setup';
 
 import type { TestRealmAdapter } from '../helpers/adapter';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type { CardDef as CardDefType } from '@cardstack/base/card-api';
+import type { RealmEventContent } from '@cardstack/base/matrix-event';
 
 module('Integration | Store', function (hooks) {
   setupRenderingTest(hooks);
@@ -728,7 +727,7 @@ module('Integration | Store', function (hooks) {
       await testRealm.write(
         `boom-person.gts`,
         `
-        import { contains, field, CardDef, Component, StringField } from 'https://cardstack.com/base/card-api';
+        import { contains, field, CardDef, Component, StringField } from '@cardstack/base/card-api';
 
         export class BoomPerson extends CardDef {
           static displayName = 'Boom Person';
@@ -1222,8 +1221,8 @@ module('Integration | Store', function (hooks) {
         [
           'gallery.gts',
           `
-            import { CardDef, field, linksTo, linksToMany } from "https://cardstack.com/base/card-api";
-            import { FileDef } from "https://cardstack.com/base/file-api";
+            import { CardDef, field, linksTo, linksToMany } from "@cardstack/base/card-api";
+            import { FileDef } from "@cardstack/base/file-api";
 
             export class Gallery extends CardDef {
               @field hero = linksTo(FileDef);
@@ -1277,7 +1276,7 @@ module('Integration | Store', function (hooks) {
                 },
                 meta: {
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/file-api',
+                    module: '@cardstack/base/file-api',
                     name: 'FileDef',
                   },
                 },
@@ -1293,7 +1292,7 @@ module('Integration | Store', function (hooks) {
                 },
                 meta: {
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/file-api',
+                    module: '@cardstack/base/file-api',
                     name: 'FileDef',
                   },
                 },
@@ -1309,7 +1308,7 @@ module('Integration | Store', function (hooks) {
                 },
                 meta: {
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/file-api',
+                    module: '@cardstack/base/file-api',
                     name: 'FileDef',
                   },
                 },
@@ -1378,8 +1377,8 @@ module('Integration | Store', function (hooks) {
         [
           'gallery.gts',
           `
-            import { CardDef, field, linksTo } from "https://cardstack.com/base/card-api";
-            import { FileDef } from "https://cardstack.com/base/file-api";
+            import { CardDef, field, linksTo } from "@cardstack/base/card-api";
+            import { FileDef } from "@cardstack/base/file-api";
 
             export class Gallery extends CardDef {
               @field hero = linksTo(FileDef);
@@ -1666,8 +1665,8 @@ module('Integration | Store', function (hooks) {
     await testRealm.write(
       `person.gts`,
       `
-      import { contains, field, Component, CardDef, } from 'https://cardstack.com/base/card-api';
-      import StringField from 'https://cardstack.com/base/string';
+      import { contains, field, Component, CardDef, } from '@cardstack/base/card-api';
+      import StringField from '@cardstack/base/string';
 
       export class Person extends CardDef {
         @field name = contains(StringField);
@@ -1770,7 +1769,7 @@ module('Integration | Store', function (hooks) {
     await testRealm.write(
       `foo.gts`,
       `
-        import { contains, CardDef } from 'https://cardstack.com/base/card-api';
+        import { contains, CardDef } from '@cardstack/base/card-api';
         export class Foo extends CardDef {}
       `.trim(),
     );
@@ -1807,7 +1806,7 @@ module('Integration | Store', function (hooks) {
     await testRealm.write(
       `foo.gts`,
       `
-        import { contains, CardDef } from 'https://cardstack.com/base/card-api';
+        import { contains, CardDef } from '@cardstack/base/card-api';
         export class Foo extends CardDef {}
       `.trim(),
     );
diff --git a/packages/host/tests/unit/ai-function-generation-test.ts b/packages/host/tests/unit/ai-function-generation-test.ts
index 8d91fa737f9..84951376686 100644
--- a/packages/host/tests/unit/ai-function-generation-test.ts
+++ b/packages/host/tests/unit/ai-function-generation-test.ts
@@ -15,18 +15,18 @@ import {
 } from '@cardstack/runtime-common/helpers/ai';
 import type { Loader } from '@cardstack/runtime-common/loader';
 
-import type { primitive as primitiveType } from 'https://cardstack.com/base/card-api';
-
 import { setupLocalIndexing, setupOnSave, setupCardLogs } from '../helpers';
 import { setupRenderingTest } from '../helpers/setup';
 
-let cardApi: typeof import('https://cardstack.com/base/card-api');
-let string: typeof import('https://cardstack.com/base/string');
-let number: typeof import('https://cardstack.com/base/number');
-let biginteger: typeof import('https://cardstack.com/base/big-integer');
-let date: typeof import('https://cardstack.com/base/date');
-let datetime: typeof import('https://cardstack.com/base/datetime');
-let boolean: typeof import('https://cardstack.com/base/boolean');
+import type { primitive as primitiveType } from '@cardstack/base/card-api';
+
+let cardApi: typeof import('@cardstack/base/card-api');
+let string: typeof import('@cardstack/base/string');
+let number: typeof import('@cardstack/base/number');
+let biginteger: typeof import('@cardstack/base/big-integer');
+let date: typeof import('@cardstack/base/date');
+let datetime: typeof import('@cardstack/base/datetime');
+let boolean: typeof import('@cardstack/base/boolean');
 let primitive: typeof primitiveType;
 let mappings: Map<typeof cardApi.FieldDef, any>;
 
diff --git a/packages/host/tests/unit/box-test.ts b/packages/host/tests/unit/box-test.ts
index 06f0c325db7..fc2c4734fea 100644
--- a/packages/host/tests/unit/box-test.ts
+++ b/packages/host/tests/unit/box-test.ts
@@ -8,7 +8,7 @@ import { baseRealm } from '@cardstack/runtime-common';
 
 import { setupRenderingTest } from '../helpers/setup';
 
-let cardApi: typeof import('https://cardstack.com/base/card-api');
+let cardApi: typeof import('@cardstack/base/card-api');
 
 let loader: Loader;
 
diff --git a/packages/host/tests/unit/card-def-menu-items-test.ts b/packages/host/tests/unit/card-def-menu-items-test.ts
index f35014355fb..f8f6dc7c63b 100644
--- a/packages/host/tests/unit/card-def-menu-items-test.ts
+++ b/packages/host/tests/unit/card-def-menu-items-test.ts
@@ -9,13 +9,10 @@ import {
   type Loader,
 } from '@cardstack/runtime-common';
 
-import type {
-  CardDef,
-  GetMenuItemParams,
-} from 'https://cardstack.com/base/card-api';
-
 import { setupRenderingTest } from '../helpers/setup';
 
+import type { CardDef, GetMenuItemParams } from '@cardstack/base/card-api';
+
 let getDefaultCardMenuItems: (
   card: CardDef,
   params: GetMenuItemParams,
diff --git a/packages/host/tests/unit/code-ref-test.ts b/packages/host/tests/unit/code-ref-test.ts
index 315fa36b14c..96ec6c1e0b9 100644
--- a/packages/host/tests/unit/code-ref-test.ts
+++ b/packages/host/tests/unit/code-ref-test.ts
@@ -12,8 +12,6 @@ import {
 } from '@cardstack/runtime-common';
 import * as CodeRefSerializer from '@cardstack/runtime-common/serializers/code-ref';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-
 import {
   testRealmURL,
   setupCardLogs,
@@ -25,6 +23,8 @@ import {
 import { setupMockMatrix } from '../helpers/mock-matrix';
 import { setupRenderingTest } from '../helpers/setup';
 
+import type * as CardAPI from '@cardstack/base/card-api';
+
 module('code-ref', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
@@ -42,16 +42,16 @@ module('code-ref', function (hooks) {
         mockMatrixUtils,
         contents: {
           'person.gts': `
-          import { contains, field, CardDef } from 'https://cardstack.com/base/card-api';
-          import StringField from 'https://cardstack.com/base/string';
+          import { contains, field, CardDef } from '@cardstack/base/card-api';
+          import StringField from '@cardstack/base/string';
           export class Person extends CardDef {
             static displayName = 'Person';
             @field firstName = contains(StringField);
           }
         `,
           'code-ref-test.ts': `
-          import { contains, field, Component, CardDef } from 'https://cardstack.com/base/card-api';
-          import CodeRefField from 'https://cardstack.com/base/code-ref';
+          import { contains, field, Component, CardDef } from '@cardstack/base/card-api';
+          import CodeRefField from '@cardstack/base/code-ref';
 
           export class TestCard extends CardDef {
             @field ref = contains(CodeRefField);
@@ -84,9 +84,7 @@ module('code-ref', function (hooks) {
         meta: { adoptsFrom: ref },
       },
     };
-    let api = await loader.import<typeof CardAPI>(
-      'https://cardstack.com/base/card-api',
-    );
+    let api = await loader.import<typeof CardAPI>('@cardstack/base/card-api');
     let person = await api.createFromSerialized<any>(doc.data, doc, undefined);
     assert.strictEqual(person.firstName, 'Mango', 'card data is correct');
   });
@@ -104,9 +102,7 @@ module('code-ref', function (hooks) {
         meta: { adoptsFrom },
       },
     };
-    let api = await loader.import<typeof CardAPI>(
-      'https://cardstack.com/base/card-api',
-    );
+    let api = await loader.import<typeof CardAPI>('@cardstack/base/card-api');
     let testCard = await api.createFromSerialized<any>(
       doc.data,
       doc,
diff --git a/packages/host/tests/unit/file-def-menu-items-test.ts b/packages/host/tests/unit/file-def-menu-items-test.ts
index 3b7655926ce..878f85ba6ac 100644
--- a/packages/host/tests/unit/file-def-menu-items-test.ts
+++ b/packages/host/tests/unit/file-def-menu-items-test.ts
@@ -5,11 +5,11 @@ import type { MenuItemOptions } from '@cardstack/boxel-ui/helpers';
 
 import { baseRealm, type Loader } from '@cardstack/runtime-common';
 
-import type { GetMenuItemParams } from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
-
 import { setupRenderingTest } from '../helpers/setup';
 
+import type { GetMenuItemParams } from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
+
 let getDefaultFileMenuItems: (
   file: FileDef,
   params: GetMenuItemParams,
diff --git a/packages/host/tests/unit/garbage-collection-test.ts b/packages/host/tests/unit/garbage-collection-test.ts
index cff3b1ee93d..b6c642b918b 100644
--- a/packages/host/tests/unit/garbage-collection-test.ts
+++ b/packages/host/tests/unit/garbage-collection-test.ts
@@ -15,9 +15,6 @@ import CardStore, {
   type ReferenceCount,
 } from '@cardstack/host/lib/gc-card-store';
 
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type { CardDef as CardInstance } from 'https://cardstack.com/base/card-api';
-
 import { saveCard, testRealmURL } from '../helpers';
 import {
   CardDef,
@@ -31,6 +28,9 @@ import {
 } from '../helpers/base-realm';
 import { setupRenderingTest } from '../helpers/setup';
 
+import type { CardDef as CardInstance } from '@cardstack/base/card-api';
+import type * as CardAPI from '@cardstack/base/card-api';
+
 let loader: Loader;
 
 module('Unit | identity-context garbage collection', function (hooks) {
diff --git a/packages/host/tests/unit/index-query-engine-test.ts b/packages/host/tests/unit/index-query-engine-test.ts
index 61f9c659579..8f238d6f39b 100644
--- a/packages/host/tests/unit/index-query-engine-test.ts
+++ b/packages/host/tests/unit/index-query-engine-test.ts
@@ -22,9 +22,6 @@ import ENV from '@cardstack/host/config/environment';
 import { shimExternals } from '@cardstack/host/lib/externals';
 import type SQLiteAdapter from '@cardstack/host/lib/sqlite-adapter';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-
 import {
   testRealmURL,
   p,
@@ -34,12 +31,15 @@ import {
   serializeCard,
 } from '../helpers';
 
-let cardApi: typeof import('https://cardstack.com/base/card-api');
-let string: typeof import('https://cardstack.com/base/string');
-let date: typeof import('https://cardstack.com/base/date');
-let number: typeof import('https://cardstack.com/base/number');
-let boolean: typeof import('https://cardstack.com/base/boolean');
-let codeRef: typeof import('https://cardstack.com/base/code-ref');
+import type { CardDef } from '@cardstack/base/card-api';
+import type * as CardAPI from '@cardstack/base/card-api';
+
+let cardApi: typeof import('@cardstack/base/card-api');
+let string: typeof import('@cardstack/base/string');
+let date: typeof import('@cardstack/base/date');
+let number: typeof import('@cardstack/base/number');
+let boolean: typeof import('@cardstack/base/boolean');
+let codeRef: typeof import('@cardstack/base/code-ref');
 let { resolvedBaseRealmURL } = ENV;
 
 module('Unit | query', function (hooks) {
@@ -2782,7 +2782,7 @@ module('Unit | query', function (hooks) {
         deps: [],
         types: [
           `${testRealmURL}person/Person`,
-          'https://cardstack.com/base/card-api/CardDef',
+          '@cardstack/base/card-api/CardDef',
         ],
         last_modified: '1',
         resource_created_at: '1',
@@ -2796,7 +2796,7 @@ module('Unit | query', function (hooks) {
         deps: [],
         types: [
           `${testRealmURL}person/Person`,
-          'https://cardstack.com/base/card-api/CardDef',
+          '@cardstack/base/card-api/CardDef',
         ],
         last_modified: '3',
         resource_created_at: '3',
@@ -2810,7 +2810,7 @@ module('Unit | query', function (hooks) {
         deps: [],
         types: [
           `${testRealmURL}person/Person`,
-          'https://cardstack.com/base/card-api/CardDef',
+          '@cardstack/base/card-api/CardDef',
         ],
         last_modified: '2',
         resource_created_at: '2',
@@ -2909,15 +2909,15 @@ module('Unit | query', function (hooks) {
         realm_version: 1,
         realm_url: testRealmURL,
         deps: [],
-        types: [personKey, 'https://cardstack.com/base/card-api/CardDef'],
+        types: [personKey, '@cardstack/base/card-api/CardDef'],
         embedded_html: {
           [personKey]: '<div>Van Gogh (Person embedded template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Van Gogh (CardDef embedded template)</div>',
         },
         fitted_html: {
           [personKey]: '<div>Van Gogh (Person fitted template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Van Gogh (CardDef fitted template)</div>',
         },
         atom_html: 'Van Gogh',
@@ -2930,15 +2930,15 @@ module('Unit | query', function (hooks) {
         realm_version: 1,
         realm_url: testRealmURL,
         deps: [],
-        types: [personKey, 'https://cardstack.com/base/card-api/CardDef'],
+        types: [personKey, '@cardstack/base/card-api/CardDef'],
         embedded_html: {
           [personKey]: '<div>Jimmy (Person embedded template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Jimmy (CardDef embedded template)</div>',
         },
         fitted_html: {
           [personKey]: '<div>Jimmy (Person fitted template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Jimmy (CardDef fitted template)</div>',
         },
         atom_html: 'Jimmy',
@@ -2952,21 +2952,17 @@ module('Unit | query', function (hooks) {
         realm_version: 1,
         realm_url: testRealmURL,
         deps: [],
-        types: [
-          fancyPersonKey,
-          personKey,
-          'https://cardstack.com/base/card-api/CardDef',
-        ],
+        types: [fancyPersonKey, personKey, '@cardstack/base/card-api/CardDef'],
         embedded_html: {
           [fancyPersonKey]: '<div>Donald (FancyPerson embedded template)</div>',
           [personKey]: '<div>Donald (Person embedded template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Donald (CardDef embedded template)</div>',
         },
         fitted_html: {
           [fancyPersonKey]: '<div>Donald (FancyPerson fitted template)</div>',
           [personKey]: '<div>Donald (Person fitted template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Donald (CardDef fitted template)</div>',
         },
         atom_html: 'Donald',
@@ -3149,15 +3145,15 @@ module('Unit | query', function (hooks) {
         realm_version: 1,
         realm_url: testRealmURL,
         deps: [],
-        types: [personKey, 'https://cardstack.com/base/card-api/CardDef'],
+        types: [personKey, '@cardstack/base/card-api/CardDef'],
         embedded_html: {
           [personKey]: '<div>Van Gogh (Person embedded template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Van Gogh (CardDef embedded template)</div>',
         },
         fitted_html: {
           [personKey]: '<div>Van Gogh (Person fitted template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Van Gogh (CardDef fitted template)</div>',
         },
         atom_html: 'Van Gogh',
@@ -3170,21 +3166,17 @@ module('Unit | query', function (hooks) {
         realm_version: 1,
         realm_url: testRealmURL,
         deps: [],
-        types: [
-          fancyPersonKey,
-          personKey,
-          'https://cardstack.com/base/card-api/CardDef',
-        ],
+        types: [fancyPersonKey, personKey, '@cardstack/base/card-api/CardDef'],
         embedded_html: {
           [fancyPersonKey]: '<div>Jimmy (FancyPerson embedded template)</div>',
           [personKey]: '<div>Jimmy (Person embedded template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Jimmy (CardDef embedded template)</div>',
         },
         fitted_html: {
           [fancyPersonKey]: '<div>Jimmy (FancyPerson fitted template)</div>',
           [personKey]: '<div>Jimmy (Person fitted template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Jimmy (CardDef fitted template)</div>',
         },
         atom_html: 'Jimmy',
@@ -3198,21 +3190,17 @@ module('Unit | query', function (hooks) {
         realm_version: 1,
         realm_url: testRealmURL,
         deps: [],
-        types: [
-          fancyPersonKey,
-          personKey,
-          'https://cardstack.com/base/card-api/CardDef',
-        ],
+        types: [fancyPersonKey, personKey, '@cardstack/base/card-api/CardDef'],
         embedded_html: {
           [fancyPersonKey]: '<div>Donald (FancyPerson embedded template)</div>',
           [personKey]: '<div>Donald (Person embedded template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Donald (CardDef embedded template)</div>',
         },
         fitted_html: {
           [fancyPersonKey]: '<div>Donald (FancyPerson fitted template)</div>',
           [personKey]: '<div>Donald (Person fitted template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Donald (CardDef fitted template)</div>',
         },
         atom_html: 'Donald',
@@ -3230,13 +3218,13 @@ module('Unit | query', function (hooks) {
         embedded_html: {
           [fancyPersonKey]: '<div>Paper (FancyPerson embedded template)</div>',
           [personKey]: '<div>Paper (Person embedded template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Paper (CardDef embedded template)</div>',
         },
         fitted_html: {
           [fancyPersonKey]: '<div>Paper (FancyPerson fitted template)</div>',
           [personKey]: '<div>Paper (Person fitted template)</div>',
-          'https://cardstack.com/base/card-api/CardDef':
+          '@cardstack/base/card-api/CardDef':
             '<div>Paper (CardDef fitted template)</div>',
         },
         atom_html: 'Paper',
diff --git a/packages/host/tests/unit/lib/command-definitions-test.ts b/packages/host/tests/unit/lib/command-definitions-test.ts
index 2a0b1da1ebe..8ff630df040 100644
--- a/packages/host/tests/unit/lib/command-definitions-test.ts
+++ b/packages/host/tests/unit/lib/command-definitions-test.ts
@@ -5,7 +5,7 @@ import {
   isValidCommandDefinition,
 } from '@cardstack/host/lib/command-definitions';
 
-import type * as SkillModule from 'https://cardstack.com/base/skill';
+import type * as SkillModule from '@cardstack/base/skill';
 
 function asCommand(command: unknown): SkillModule.CommandField {
   return command as unknown as SkillModule.CommandField;
diff --git a/packages/host/tests/unit/lib/field-path-parser-test.ts b/packages/host/tests/unit/lib/field-path-parser-test.ts
index 88d66ef2704..62f8c01eb02 100644
--- a/packages/host/tests/unit/lib/field-path-parser-test.ts
+++ b/packages/host/tests/unit/lib/field-path-parser-test.ts
@@ -2,7 +2,7 @@ import { module, test } from 'qunit';
 
 import { FieldPathParser } from '@cardstack/host/lib/field-path-parser';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
+import type { CardDef } from '@cardstack/base/card-api';
 
 module('Unit | Utility | field-path-parser', function () {
   module('parseFieldPath', function () {
@@ -279,7 +279,7 @@ module('Unit | Utility | field-path-parser', function () {
       });
       const mockCardType = {
         isCardDef: true,
-      } as unknown as typeof import('https://cardstack.com/base/card-api').CardDef;
+      } as unknown as typeof import('@cardstack/base/card-api').CardDef;
 
       const result = await FieldPathParser.validatedFieldPath(
         ['firstName'],
@@ -307,7 +307,7 @@ module('Unit | Utility | field-path-parser', function () {
       };
       const mockCardType = {
         isCardDef: true,
-      } as unknown as typeof import('https://cardstack.com/base/card-api').CardDef;
+      } as unknown as typeof import('@cardstack/base/card-api').CardDef;
 
       const result = await FieldPathParser.validatedFieldPath(
         ['address', 'street'],
@@ -326,7 +326,7 @@ module('Unit | Utility | field-path-parser', function () {
       });
       const mockCardType = {
         isCardDef: true,
-      } as unknown as typeof import('https://cardstack.com/base/card-api').CardDef;
+      } as unknown as typeof import('@cardstack/base/card-api').CardDef;
 
       const result = await FieldPathParser.validatedFieldPath(
         ['tags', '[0]'],
@@ -355,7 +355,7 @@ module('Unit | Utility | field-path-parser', function () {
       };
       const mockCardType = {
         isCardDef: true,
-      } as unknown as typeof import('https://cardstack.com/base/card-api').CardDef;
+      } as unknown as typeof import('@cardstack/base/card-api').CardDef;
 
       const result = await FieldPathParser.validatedFieldPath(
         ['products', '[1]', 'price'],
@@ -375,7 +375,7 @@ module('Unit | Utility | field-path-parser', function () {
       });
       const mockCardType = {
         isCardDef: true,
-      } as unknown as typeof import('https://cardstack.com/base/card-api').CardDef;
+      } as unknown as typeof import('@cardstack/base/card-api').CardDef;
 
       const result = await FieldPathParser.validatedFieldPath(
         ['pet'],
@@ -402,7 +402,7 @@ module('Unit | Utility | field-path-parser', function () {
       };
       const mockCardType = {
         isCardDef: true,
-      } as unknown as typeof import('https://cardstack.com/base/card-api').CardDef;
+      } as unknown as typeof import('@cardstack/base/card-api').CardDef;
 
       const result = await FieldPathParser.validatedFieldPath(
         ['pets'],
@@ -429,7 +429,7 @@ module('Unit | Utility | field-path-parser', function () {
       };
       const mockCardType = {
         isCardDef: true,
-      } as unknown as typeof import('https://cardstack.com/base/card-api').CardDef;
+      } as unknown as typeof import('@cardstack/base/card-api').CardDef;
 
       const result = await FieldPathParser.validatedFieldPath(
         ['pets', '[0]'],
@@ -457,7 +457,7 @@ module('Unit | Utility | field-path-parser', function () {
       };
       const mockCardType = {
         isCardDef: true,
-      } as unknown as typeof import('https://cardstack.com/base/card-api').CardDef;
+      } as unknown as typeof import('@cardstack/base/card-api').CardDef;
 
       const result = await FieldPathParser.validatedFieldPath(
         ['address', 'country'],
@@ -485,7 +485,7 @@ module('Unit | Utility | field-path-parser', function () {
       };
       const mockCardType = {
         isCardDef: true,
-      } as unknown as typeof import('https://cardstack.com/base/card-api').CardDef;
+      } as unknown as typeof import('@cardstack/base/card-api').CardDef;
 
       const result = await FieldPathParser.validatedFieldPath(
         ['address', 'routes', '[0]'],
@@ -504,7 +504,7 @@ module('Unit | Utility | field-path-parser', function () {
       });
       const mockCardType = {
         isCardDef: true,
-      } as unknown as typeof import('https://cardstack.com/base/card-api').CardDef;
+      } as unknown as typeof import('@cardstack/base/card-api').CardDef;
 
       const result = await FieldPathParser.validatedFieldPath(
         ['nonExistent'],
@@ -524,7 +524,7 @@ module('Unit | Utility | field-path-parser', function () {
       });
       const mockCardType = {
         isCardDef: true,
-      } as unknown as typeof import('https://cardstack.com/base/card-api').CardDef;
+      } as unknown as typeof import('@cardstack/base/card-api').CardDef;
 
       const result = await FieldPathParser.validatedFieldPath(
         ['name', '[0]'],
@@ -543,7 +543,7 @@ module('Unit | Utility | field-path-parser', function () {
       });
       const mockCardType = {
         isCardDef: true,
-      } as unknown as typeof import('https://cardstack.com/base/card-api').CardDef;
+      } as unknown as typeof import('@cardstack/base/card-api').CardDef;
 
       const result = await FieldPathParser.validatedFieldPath(
         ['author', 'name'],
@@ -562,7 +562,7 @@ module('Unit | Utility | field-path-parser', function () {
       });
       const mockCardType = {
         isCardDef: true,
-      } as unknown as typeof import('https://cardstack.com/base/card-api').CardDef;
+      } as unknown as typeof import('@cardstack/base/card-api').CardDef;
 
       const result = await FieldPathParser.validatedFieldPath(
         ['friends', '[0]', 'name'],
diff --git a/packages/host/tests/unit/loader-test.ts b/packages/host/tests/unit/loader-test.ts
index 0f120481704..a5e8c0b08e6 100644
--- a/packages/host/tests/unit/loader-test.ts
+++ b/packages/host/tests/unit/loader-test.ts
@@ -112,8 +112,8 @@ module('Unit | loader', function (hooks) {
           }
         `,
           'person.gts': `
-          import { contains, field, CardDef } from 'https://cardstack.com/base/card-api';
-          import StringField from 'https://cardstack.com/base/string';
+          import { contains, field, CardDef } from '@cardstack/base/card-api';
+          import StringField from '@cardstack/base/string';
           export class Person extends CardDef {
             static displayName = 'Person';
             @field firstName = contains(StringField);
diff --git a/packages/host/tests/unit/plan-install-test.ts b/packages/host/tests/unit/plan-install-test.ts
index c26adafbd42..7c41b630af1 100644
--- a/packages/host/tests/unit/plan-install-test.ts
+++ b/packages/host/tests/unit/plan-install-test.ts
@@ -10,12 +10,12 @@ import {
   InstallPlan,
 } from '@cardstack/runtime-common';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type { Spec } from 'https://cardstack.com/base/spec';
+import type { CardDef } from '@cardstack/base/card-api';
+import type { Spec } from '@cardstack/base/spec';
 
 const sourceRealmURL = new URL('https://localhost:4201/catalog/');
 const targetRealmURL = new URL('https://localhost:4201/experiments/');
-const baseRealmURL = new URL('https://cardstack.com/base/');
+// baseRealm URL is now the prefix '@cardstack/base/'
 
 module('Unit | Catalog | Install Plan Builder', function () {
   test('when listing name is not provided, just provides uuid (in this case uuid="xyz")', function (assert) {
diff --git a/packages/host/tests/unit/services/render-service-test.ts b/packages/host/tests/unit/services/render-service-test.ts
index 508af4bc9ea..e7fcd9d61c6 100644
--- a/packages/host/tests/unit/services/render-service-test.ts
+++ b/packages/host/tests/unit/services/render-service-test.ts
@@ -10,8 +10,8 @@ import {
 
 import { CardStoreWithErrors } from '@cardstack/host/services/render-service';
 
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
+import type { CardDef } from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
 
 const prefix = '@test-prefix/';
 const targetRealm = 'http://test-realm/test/';
@@ -78,7 +78,7 @@ module('Unit | Service | render-service', function (hooks) {
         type: 'card',
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/card-api',
+            module: '@cardstack/base/card-api',
             name: 'CardDef',
           },
         },
@@ -134,7 +134,7 @@ module('Unit | Service | render-service', function (hooks) {
         type: 'file-meta',
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/file-api',
+            module: '@cardstack/base/file-api',
             name: 'FileDef',
           },
         },
diff --git a/packages/host/tsconfig.json b/packages/host/tsconfig.json
index 58e08a928b9..5ccf1516538 100644
--- a/packages/host/tsconfig.json
+++ b/packages/host/tsconfig.json
@@ -33,7 +33,7 @@
       "@cardstack/boxel-host/commands/*": [
         "app/commands/*"
       ],
-      "https://cardstack.com/base/*": [
+      "@cardstack/base/*": [
         "../base/*"
       ],
       "@cardstack/catalog/*": [
diff --git a/packages/matrix/helpers/isolated-realm-server.ts b/packages/matrix/helpers/isolated-realm-server.ts
index 95e733e7211..1daa02f6524 100644
--- a/packages/matrix/helpers/isolated-realm-server.ts
+++ b/packages/matrix/helpers/isolated-realm-server.ts
@@ -245,7 +245,7 @@ export async function startServer({
     `--toUrl='http://localhost:4205/skills/'`,
   ]);
   workerArgs = workerArgs.concat([
-    `--fromUrl='https://cardstack.com/base/'`,
+    `--fromUrl='@cardstack/base/'`,
     `--toUrl='http://localhost:4205/base/'`,
   ]);
 
@@ -288,7 +288,7 @@ export async function startServer({
   serverArgs = serverArgs.concat([
     `--username='base_realm'`,
     `--path='${baseRealmDir}'`,
-    `--fromUrl='https://cardstack.com/base/'`,
+    `--fromUrl='@cardstack/base/'`,
     `--toUrl='http://localhost:4205/base/'`,
   ]);
 
diff --git a/packages/matrix/tests/commands.spec.ts b/packages/matrix/tests/commands.spec.ts
index d3a261c12ea..8a36c51de25 100644
--- a/packages/matrix/tests/commands.spec.ts
+++ b/packages/matrix/tests/commands.spec.ts
@@ -48,7 +48,7 @@ test.describe('Commands', () => {
         },
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/card-api',
+            module: '@cardstack/base/card-api',
             name: 'CardDef',
           },
         },
@@ -105,7 +105,7 @@ test.describe('Commands', () => {
         },
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/card-api',
+            module: '@cardstack/base/card-api',
             name: 'CardDef',
           },
         },
@@ -160,7 +160,7 @@ test.describe('Commands', () => {
         },
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/card-api',
+            module: '@cardstack/base/card-api',
             name: 'CardDef',
           },
         },
@@ -310,7 +310,7 @@ test.describe('Commands', () => {
     await page.locator('[data-test-search-field]').fill('Skill');
     await page
       .locator(
-        '[data-test-card-catalog-item="https://cardstack.com/base/cards/skill"]',
+        '[data-test-card-catalog-item="@cardstack/base/cards/skill"]',
       )
       .click();
     await page.locator('[data-test-card-catalog-go-button]').click();
diff --git a/packages/matrix/tests/correctness-checks.spec.ts b/packages/matrix/tests/correctness-checks.spec.ts
index f89c7c49c08..4348139b527 100644
--- a/packages/matrix/tests/correctness-checks.spec.ts
+++ b/packages/matrix/tests/correctness-checks.spec.ts
@@ -519,8 +519,8 @@ ${originalContent}
     const modulePath = 'import-check.gts';
     const moduleUrl = `${realmURL}${modulePath}`;
     const originalModuleSource = `
-import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 export class ImportCheck extends CardDef {
   @field title = contains(StringField);
   static isolated = class Isolated extends Component<typeof this> {
@@ -532,8 +532,8 @@ export class ImportCheck extends CardDef {
 `.trim();
     const originalModuleContent = `${originalModuleSource}\n`;
     const brokenModuleContent = originalModuleContent.replace(
-      `https://cardstack.com/base/card-api'`,
-      `https://cardstack.com/base/card-api-broken'`,
+      `@cardstack/base/card-api'`,
+      `@cardstack/base/card-api-broken'`,
     );
 
     await postCardSource(page, realmURL, modulePath, originalModuleContent);
@@ -718,16 +718,16 @@ ${brokenModuleContent}
       failingResult.data.attributes.errors.some(
         (err: string) =>
           err.includes(moduleUrl.replace('.gts', '')) &&
-          err.includes('https://cardstack.com/base/card-api-broken not found'),
+          err.includes('@cardstack/base/card-api-broken not found'),
       ),
     ).toBe(true);
 
     const fixMessageBody = `\`\`\`
 ${moduleUrl}
 ╔═══ SEARCH ════╗
-} from 'https://cardstack.com/base/card-api-broken';
+} from '@cardstack/base/card-api-broken';
 ╠═══════════════╣
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 ╚═══ REPLACE ═══╝
 \`\`\``;
     await applyPatchMessage(fixMessageBody);
diff --git a/packages/matrix/tests/glimmer-scoped-css.spec.ts b/packages/matrix/tests/glimmer-scoped-css.spec.ts
index ebbddae95b4..bb585df61b7 100644
--- a/packages/matrix/tests/glimmer-scoped-css.spec.ts
+++ b/packages/matrix/tests/glimmer-scoped-css.spec.ts
@@ -29,8 +29,8 @@ test.describe('glimmer-scoped-css', () => {
       realmURL,
       'sample-card.gts',
       `
-      import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
-      import { Component } from 'https://cardstack.com/base/card-api';
+      import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
+      import { Component } from '@cardstack/base/card-api';
       export class SampleCard extends CardDef {
         @field name = contains(StringField);
         static isolated = class Isolated extends Component<typeof this> {
@@ -86,8 +86,8 @@ test.describe('glimmer-scoped-css', () => {
       realmURL,
       'sample-card.gts',
       `
-      import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
-      import { Component } from 'https://cardstack.com/base/card-api';
+      import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
+      import { Component } from '@cardstack/base/card-api';
       export class SampleCard extends CardDef {
         @field name = contains(StringField);
         static isolated = class Isolated extends Component<typeof this> {
diff --git a/packages/matrix/tests/head-tags.spec.ts b/packages/matrix/tests/head-tags.spec.ts
index 391e9537aab..d81845d0598 100644
--- a/packages/matrix/tests/head-tags.spec.ts
+++ b/packages/matrix/tests/head-tags.spec.ts
@@ -109,8 +109,8 @@ test.describe('Head tags', () => {
       import { action } from '@ember/object';
       import { consume } from 'ember-provide-consume-context';
       import { on } from '@ember/modifier';
-      import { contains, field, CardDef, Component, type CardCrudFunctions } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef, Component, type CardCrudFunctions } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       import { CardCrudFunctionsContextName } from '@cardstack/runtime-common';
 
       export class DefaultHeadCard extends CardDef {
@@ -154,8 +154,8 @@ test.describe('Head tags', () => {
       import { action } from '@ember/object';
       import { consume } from 'ember-provide-consume-context';
       import { on } from '@ember/modifier';
-      import { contains, field, CardDef, Component, type CardCrudFunctions } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef, Component, type CardCrudFunctions } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       import { CardCrudFunctionsContextName } from '@cardstack/runtime-common';
 
       export class CustomHeadCard extends CardDef {
diff --git a/packages/matrix/tests/host-mode.spec.ts b/packages/matrix/tests/host-mode.spec.ts
index 45d79282f57..f9fffd6fea7 100644
--- a/packages/matrix/tests/host-mode.spec.ts
+++ b/packages/matrix/tests/host-mode.spec.ts
@@ -41,7 +41,7 @@ test.describe('Host mode', () => {
       realmURL,
       'host-mode-isolated-card.gts',
       `
-        import { CardDef, Component } from 'https://cardstack.com/base/card-api';
+        import { CardDef, Component } from '@cardstack/base/card-api';
 
         export class HostModeIsolatedCard extends CardDef {
           static isolated = class Isolated extends Component<typeof this> {
@@ -58,7 +58,7 @@ test.describe('Host mode', () => {
       realmURL,
       'white-paper-card.gts',
       `
-        import { CardDef, Component } from 'https://cardstack.com/base/card-api';
+        import { CardDef, Component } from '@cardstack/base/card-api';
 
         export class WhitePaperCard extends CardDef {
           static prefersWideFormat = true;
@@ -142,7 +142,7 @@ test.describe('Host mode', () => {
       realmURL,
       'card-with-head-title.gts',
       `
-        import { CardDef, Component } from 'https://cardstack.com/base/card-api';
+        import { CardDef, Component } from '@cardstack/base/card-api';
 
         export class CardWithHeadTitle extends CardDef {
           static displayName = 'Card With Head Title';
diff --git a/packages/matrix/tests/live-cards.spec.ts b/packages/matrix/tests/live-cards.spec.ts
index 561ab4638b7..b98bb39a850 100644
--- a/packages/matrix/tests/live-cards.spec.ts
+++ b/packages/matrix/tests/live-cards.spec.ts
@@ -36,7 +36,7 @@ test.describe('Live Cards', () => {
         },
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/card-api',
+            module: '@cardstack/base/card-api',
             name: 'CardDef',
           },
         },
@@ -63,7 +63,7 @@ test.describe('Live Cards', () => {
         },
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/card-api',
+            module: '@cardstack/base/card-api',
             name: 'CardDef',
           },
         },
@@ -83,8 +83,8 @@ test.describe('Live Cards', () => {
       realmURL,
       'sample-card.gts',
       `
-      import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
-      import { Component } from 'https://cardstack.com/base/card-api';
+      import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
+      import { Component } from '@cardstack/base/card-api';
       export class SampleCard extends CardDef {
         @field name = contains(StringField);
         static isolated = class Isolated extends Component<typeof this> {
@@ -125,8 +125,8 @@ test.describe('Live Cards', () => {
       realmURL,
       `sample-card.gts`,
       `
-          import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
-          import { Component } from 'https://cardstack.com/base/card-api';
+          import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
+          import { Component } from '@cardstack/base/card-api';
           export class SampleCard extends CardDef {
             @field name = contains(StringField);
             static isolated = class Isolated extends Component<typeof this> {
@@ -179,7 +179,7 @@ test.describe('Live Cards', () => {
         },
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/card-api',
+            module: '@cardstack/base/card-api',
             name: 'CardDef',
           },
         },
diff --git a/packages/matrix/tests/publish-realm.spec.ts b/packages/matrix/tests/publish-realm.spec.ts
index 2d5e1eeed73..be7c29fc9dc 100644
--- a/packages/matrix/tests/publish-realm.spec.ts
+++ b/packages/matrix/tests/publish-realm.spec.ts
@@ -155,8 +155,8 @@ test.describe('Publish realm', () => {
       privateRealmURL,
       'secret-card.gts',
       `
-        import { CardDef, field, contains } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { CardDef, field, contains } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class SecretCard extends CardDef {
           @field name = contains(StringField);
@@ -183,8 +183,8 @@ test.describe('Publish realm', () => {
       defaultRealmURL,
       'dependent-card.gts',
       `
-        import { CardDef, field, contains, linksTo } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { CardDef, field, contains, linksTo } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         import { SecretCard } from "${privateRealmURL}secret-card";
 
         export class DependentCard extends CardDef {
diff --git a/packages/matrix/tests/skills.spec.ts b/packages/matrix/tests/skills.spec.ts
index 7510be425cd..ef5c6395c57 100644
--- a/packages/matrix/tests/skills.spec.ts
+++ b/packages/matrix/tests/skills.spec.ts
@@ -368,7 +368,7 @@ test.describe('Skills', () => {
     await page.locator('[data-test-search-field]').fill('Skill');
     await page
       .locator(
-        '[data-test-card-catalog-item="https://cardstack.com/base/cards/skill"]',
+        '[data-test-card-catalog-item="@cardstack/base/cards/skill"]',
       )
       .click();
     await page.locator('[data-test-card-catalog-go-button]').click();
diff --git a/packages/matrix/tsconfig.json b/packages/matrix/tsconfig.json
index 4d7b2616f1f..3f0561dcce7 100644
--- a/packages/matrix/tsconfig.json
+++ b/packages/matrix/tsconfig.json
@@ -23,7 +23,7 @@
     "experimentalDecorators": true,
     "strict": true,
     "paths": {
-      "https://cardstack.com/base/*": [
+      "@cardstack/base/*": [
         "../base/*"
       ],
       "@cardstack/boxel-ui": [
diff --git a/packages/openrouter-realm/index.gts b/packages/openrouter-realm/index.gts
index 448c1a60864..040fa19c55b 100644
--- a/packages/openrouter-realm/index.gts
+++ b/packages/openrouter-realm/index.gts
@@ -10,12 +10,12 @@ import {
   getCardMeta,
   realmInfo,
   realmURL,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import DateTimeField from 'https://cardstack.com/base/datetime';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import DateTimeField from '@cardstack/base/datetime';
 import { type Query, type Filter } from '@cardstack/runtime-common';
 
-import CardList from 'https://cardstack.com/base/components/card-list';
+import CardList from '@cardstack/base/components/card-list';
 
 class Isolated extends Component<typeof OpenRouterIndex> {
   @tracked filterText = '';
diff --git a/packages/openrouter-realm/openrouter-model.gts b/packages/openrouter-realm/openrouter-model.gts
index 691228a6ce8..376d4c5ed72 100644
--- a/packages/openrouter-realm/openrouter-model.gts
+++ b/packages/openrouter-realm/openrouter-model.gts
@@ -7,10 +7,10 @@ import {
   field,
   contains,
   containsMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
 import { tracked } from '@glimmer/tracking';
 import { on } from '@ember/modifier';
 
diff --git a/packages/postgres/migrations/1774971105000_migrate-base-realm-permissions-url.js b/packages/postgres/migrations/1774971105000_migrate-base-realm-permissions-url.js
new file mode 100644
index 00000000000..b2f981942e2
--- /dev/null
+++ b/packages/postgres/migrations/1774971105000_migrate-base-realm-permissions-url.js
@@ -0,0 +1,36 @@
+/**
+ * Migrate base realm permission URLs from the old canonical
+ * https://cardstack.com/base/ to the environment-appropriate resolved URL,
+ * matching how all other realm permissions are stored.
+ */
+
+const OLD_BASE = 'https://cardstack.com/base/';
+
+function getNewBase() {
+  switch (process.env.REALM_SENTRY_ENVIRONMENT) {
+    case 'staging':
+      return 'https://realms-staging.stack.cards/base/';
+    case 'production':
+      return 'https://app.boxel.ai/base/';
+    default:
+      return 'http://localhost:4201/base/';
+  }
+}
+
+exports.up = (pgm) => {
+  let newBase = getNewBase();
+  pgm.sql(
+    `UPDATE realm_user_permissions
+     SET realm_url = '${newBase}'
+     WHERE realm_url = '${OLD_BASE}'`,
+  );
+};
+
+exports.down = (pgm) => {
+  let newBase = getNewBase();
+  pgm.sql(
+    `UPDATE realm_user_permissions
+     SET realm_url = '${OLD_BASE}'
+     WHERE realm_url = '${newBase}'`,
+  );
+};
diff --git a/packages/postgres/tsconfig.json b/packages/postgres/tsconfig.json
index 9d31d6383c2..132190f8f2b 100644
--- a/packages/postgres/tsconfig.json
+++ b/packages/postgres/tsconfig.json
@@ -24,7 +24,7 @@
     "skipLibCheck": true,
     "strict": true,
     "paths": {
-      "https://cardstack.com/base/*": [
+      "@cardstack/base/*": [
         "../base/*"
       ],
       "@cardstack/boxel-ui": [
diff --git a/packages/realm-server/.claude/settings.local.json b/packages/realm-server/.claude/settings.local.json
new file mode 100644
index 00000000000..136586c288a
--- /dev/null
+++ b/packages/realm-server/.claude/settings.local.json
@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(find:*)"
+    ]
+  }
+}
diff --git a/packages/realm-server/catalog-to-catalog.patch b/packages/realm-server/catalog-to-catalog.patch
new file mode 100644
index 00000000000..a151ed2c157
--- /dev/null
+++ b/packages/realm-server/catalog-to-catalog.patch
@@ -0,0 +1,1179 @@
+--- ./realms/localhost_4201/_published/a40a7808-69f7-4f97-a4e4-d00b6dea5b6b/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/_published/a40a7808-69f7-4f97-a4e4-d00b6dea5b6b/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/_published/a40a7808-69f7-4f97-a4e4-d00b6dea5b6b/boxel-ai-website/HomeLayout/homepage.json
++++ ./realms/localhost_4201/_published/a40a7808-69f7-4f97-a4e4-d00b6dea5b6b/boxel-ai-website/HomeLayout/homepage.json
+@@ -77,7 +77,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/_published/a40a7808-69f7-4f97-a4e4-d00b6dea5b6b/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/_published/a40a7808-69f7-4f97-a4e4-d00b6dea5b6b/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/_published/a40a7808-69f7-4f97-a4e4-d00b6dea5b6b/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/_published/a40a7808-69f7-4f97-a4e4-d00b6dea5b6b/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/_published/a40a7808-69f7-4f97-a4e4-d00b6dea5b6b/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/_published/a40a7808-69f7-4f97-a4e4-d00b6dea5b6b/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/_published/a40a7808-69f7-4f97-a4e4-d00b6dea5b6b/index.json
++++ ./realms/localhost_4201/_published/a40a7808-69f7-4f97-a4e4-d00b6dea5b6b/index.json
+@@ -77,7 +77,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/_published/c1adae14-9bd5-4518-a9b4-89571cc3a225/Document/642b6134-dd2e-4248-be59-e3e4b1cb77e8.json
++++ ./realms/localhost_4201/_published/c1adae14-9bd5-4518-a9b4-89571cc3a225/Document/642b6134-dd2e-4248-be59-e3e4b1cb77e8.json
+@@ -17,7 +17,7 @@
+       },
+       "adoptsFrom": {
+         "name": "Document",
+-        "module": "@cardstack/catalog/crm-app/document"
++        "module": "cardstack://catalog/crm-app/document"
+       },
+       "lastModified": 1770174644,
+       "resourceCreatedAt": 1770174644
+--- ./realms/localhost_4201/_published/c1adae14-9bd5-4518-a9b4-89571cc3a225/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/_published/c1adae14-9bd5-4518-a9b4-89571cc3a225/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/_published/c1adae14-9bd5-4518-a9b4-89571cc3a225/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/_published/c1adae14-9bd5-4518-a9b4-89571cc3a225/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/_published/c1adae14-9bd5-4518-a9b4-89571cc3a225/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/_published/c1adae14-9bd5-4518-a9b4-89571cc3a225/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/_published/c1adae14-9bd5-4518-a9b4-89571cc3a225/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/_published/c1adae14-9bd5-4518-a9b4-89571cc3a225/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/_published/c1adae14-9bd5-4518-a9b4-89571cc3a225/index.json
++++ ./realms/localhost_4201/_published/c1adae14-9bd5-4518-a9b4-89571cc3a225/index.json
+@@ -30,7 +30,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "heroSection": {
+--- ./realms/localhost_4201/_published/fc960848-3621-4ac9-897a-174cdf6c1e1e/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/_published/fc960848-3621-4ac9-897a-174cdf6c1e1e/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/_published/fc960848-3621-4ac9-897a-174cdf6c1e1e/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/_published/fc960848-3621-4ac9-897a-174cdf6c1e1e/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/_published/fc960848-3621-4ac9-897a-174cdf6c1e1e/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/_published/fc960848-3621-4ac9-897a-174cdf6c1e1e/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/_published/fc960848-3621-4ac9-897a-174cdf6c1e1e/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/_published/fc960848-3621-4ac9-897a-174cdf6c1e1e/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/_published/fc960848-3621-4ac9-897a-174cdf6c1e1e/index.json
++++ ./realms/localhost_4201/_published/fc960848-3621-4ac9-897a-174cdf6c1e1e/index.json
+@@ -45,7 +45,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "catalogSection": {
+--- ./realms/localhost_4201/_published/bf50ed1b-eedf-4d0f-bead-b8c753c729d4/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/_published/bf50ed1b-eedf-4d0f-bead-b8c753c729d4/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/_published/bf50ed1b-eedf-4d0f-bead-b8c753c729d4/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/_published/bf50ed1b-eedf-4d0f-bead-b8c753c729d4/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/_published/bf50ed1b-eedf-4d0f-bead-b8c753c729d4/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/_published/bf50ed1b-eedf-4d0f-bead-b8c753c729d4/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/_published/bf50ed1b-eedf-4d0f-bead-b8c753c729d4/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/_published/bf50ed1b-eedf-4d0f-bead-b8c753c729d4/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/_published/bf50ed1b-eedf-4d0f-bead-b8c753c729d4/index.json
++++ ./realms/localhost_4201/_published/bf50ed1b-eedf-4d0f-bead-b8c753c729d4/index.json
+@@ -45,7 +45,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "catalogSection": {
+--- ./realms/localhost_4201/_published/d291c94e-dd7f-437d-bb76-42e2df6bc5bb/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/_published/d291c94e-dd7f-437d-bb76-42e2df6bc5bb/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/_published/d291c94e-dd7f-437d-bb76-42e2df6bc5bb/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/_published/d291c94e-dd7f-437d-bb76-42e2df6bc5bb/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/_published/d291c94e-dd7f-437d-bb76-42e2df6bc5bb/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/_published/d291c94e-dd7f-437d-bb76-42e2df6bc5bb/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/_published/d291c94e-dd7f-437d-bb76-42e2df6bc5bb/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/_published/d291c94e-dd7f-437d-bb76-42e2df6bc5bb/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/_published/d291c94e-dd7f-437d-bb76-42e2df6bc5bb/index.json
++++ ./realms/localhost_4201/_published/d291c94e-dd7f-437d-bb76-42e2df6bc5bb/index.json
+@@ -45,7 +45,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "catalogSection": {
+--- ./realms/localhost_4201/_published/235909f1-2eda-4b86-b601-cdd4f10b0937/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/_published/235909f1-2eda-4b86-b601-cdd4f10b0937/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/_published/235909f1-2eda-4b86-b601-cdd4f10b0937/boxel-ai-website/HomeLayout/homepage.json
++++ ./realms/localhost_4201/_published/235909f1-2eda-4b86-b601-cdd4f10b0937/boxel-ai-website/HomeLayout/homepage.json
+@@ -77,7 +77,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/_published/235909f1-2eda-4b86-b601-cdd4f10b0937/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/_published/235909f1-2eda-4b86-b601-cdd4f10b0937/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/_published/235909f1-2eda-4b86-b601-cdd4f10b0937/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/_published/235909f1-2eda-4b86-b601-cdd4f10b0937/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/_published/235909f1-2eda-4b86-b601-cdd4f10b0937/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/_published/235909f1-2eda-4b86-b601-cdd4f10b0937/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/_published/e48c3633-060d-4f4a-b11a-68bd8e863077/HomeLayoutCard/c722fbcd-3ffe-4535-ad8f-a25a6cd87265.json
++++ ./realms/localhost_4201/_published/e48c3633-060d-4f4a-b11a-68bd8e863077/HomeLayoutCard/c722fbcd-3ffe-4535-ad8f-a25a6cd87265.json
+@@ -116,7 +116,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     },
+--- ./realms/localhost_4201/_published/e48c3633-060d-4f4a-b11a-68bd8e863077/index.json
++++ ./realms/localhost_4201/_published/e48c3633-060d-4f4a-b11a-68bd8e863077/index.json
+@@ -116,7 +116,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     },
+--- ./realms/localhost_4201/_published/48f92bba-edb8-461f-a5a9-ba4e05ea500e/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/_published/48f92bba-edb8-461f-a5a9-ba4e05ea500e/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/_published/48f92bba-edb8-461f-a5a9-ba4e05ea500e/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/_published/48f92bba-edb8-461f-a5a9-ba4e05ea500e/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/_published/48f92bba-edb8-461f-a5a9-ba4e05ea500e/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/_published/48f92bba-edb8-461f-a5a9-ba4e05ea500e/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/_published/48f92bba-edb8-461f-a5a9-ba4e05ea500e/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/_published/48f92bba-edb8-461f-a5a9-ba4e05ea500e/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/_published/48f92bba-edb8-461f-a5a9-ba4e05ea500e/index.json
++++ ./realms/localhost_4201/_published/48f92bba-edb8-461f-a5a9-ba4e05ea500e/index.json
+@@ -45,7 +45,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "catalogSection": {
+--- ./realms/localhost_4201/user/yhomepage/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/user/yhomepage/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/user/yhomepage/boxel-ai-website/HomeLayout/homepage.json
++++ ./realms/localhost_4201/user/yhomepage/boxel-ai-website/HomeLayout/homepage.json
+@@ -77,7 +77,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/yhomepage/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/user/yhomepage/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/user/yhomepage/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/user/yhomepage/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/yhomepage/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/user/yhomepage/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/yhomepage/index.json
++++ ./realms/localhost_4201/user/yhomepage/index.json
+@@ -77,7 +77,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/homepage20260219/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/user/homepage20260219/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/user/homepage20260219/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/user/homepage20260219/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/user/homepage20260219/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/user/homepage20260219/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/homepage20260219/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/user/homepage20260219/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/homepage20260219/index.json
++++ ./realms/localhost_4201/user/homepage20260219/index.json
+@@ -45,7 +45,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "catalogSection": {
+--- ./realms/localhost_4201/user/xhomepage/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/user/xhomepage/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/user/xhomepage/boxel-ai-website/HomeLayout/homepage.json
++++ ./realms/localhost_4201/user/xhomepage/boxel-ai-website/HomeLayout/homepage.json
+@@ -77,7 +77,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/xhomepage/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/user/xhomepage/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/user/xhomepage/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/user/xhomepage/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/xhomepage/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/user/xhomepage/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/xhomepage/index.json
++++ ./realms/localhost_4201/user/xhomepage/index.json
+@@ -77,7 +77,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/aallen90-hilarious-marmoset/placeholders/SimpleGrid/test-grid.json
++++ ./realms/localhost_4201/user/aallen90-hilarious-marmoset/placeholders/SimpleGrid/test-grid.json
+@@ -40,7 +40,7 @@
+     "relationships": {
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         },
+         "data": {
+           "type": "card",
+@@ -886,7 +886,7 @@
+         "applicationScenarios": "# Context-Specific Box Element Usage\n\n**Same primitives, different densities.**\n\n## Complex Dashboards\n\n**Goal:** Display hundreds of data points without overwhelming cognition.\n\n**Strategy:**  \n- Use Mini-Cards in masonry grids (irregular heights OK, but snap to 8px grid)\n- Mono font for all metadata—creates scannable rhythm\n- Compact spacing (`0.5rem` gaps between boxes)\n- Corner labels for quick entity identification\n- Color only for status (Teal = selected, Lime = success, Red = error)\n\n**Result:** Information density that feels organized, not chaotic. Think Bloomberg Terminal meets Apple Notes.\n\n## Code/Logic Editors\n\n**Goal:** Make complex logic visually parseable.\n\n**Strategy:**  \n- Dark mode default (reduces eye strain during long sessions)\n- Syntax highlighting using brand colors: Teal for functions, Lime for strings, Purple for keywords\n- Visible 1px borders between code blocks\n- Line numbers in Mono font along left gutter\n- Box Elements for each function/class definition\n\n**Result:** Code becomes modular and visual. New developers can understand structure at a glance.\n\n## Mobile Interfaces\n\n**Goal:** Maintain Box Element logic on small screens.\n\n**Strategy:**  \n- Collapse multi-column grids to single column\n- Maintain 1px borders and `0.625rem` radius (looks great even at phone scale)\n- Full-width Box Elements (edge-to-edge within safe area)\n- Increase tap target size to 44px minimum while keeping visual element compact inside\n- Stackable panels with Splitters for user-controlled density\n\n**Result:** Mobile doesn't feel like a compromised desktop. It feels like a *touch-optimized Box Element system*.\n\n**Scenario truth:** If your design system breaks when you change screen size or use case, it's not a system—it's a collection of one-off solutions. Box Elements scale because their rules scale."
+       },
+       "links": {
+-        "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++        "self": "cardstack://catalog/Theme/boxel-brand-guide"
+       }
+     },
+     {
+--- ./realms/localhost_4201/user/aallen90-hilarious-marmoset/SkillPlus/cde1da56-877f-4379-af85-78db07aaea80.json
++++ ./realms/localhost_4201/user/aallen90-hilarious-marmoset/SkillPlus/cde1da56-877f-4379-af85-78db07aaea80.json
+@@ -20,7 +20,7 @@
+       },
+       "adoptsFrom": {
+         "name": "SkillPlus",
+-        "module": "@cardstack/catalog/skill-plus"
++        "module": "cardstack://catalog/skill-plus"
+       },
+       "lastModified": 1770262809,
+       "resourceCreatedAt": 1770256012
+--- ./realms/localhost_4201/user/homepage20260224/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/user/homepage20260224/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/user/homepage20260224/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/user/homepage20260224/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/user/homepage20260224/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/user/homepage20260224/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/homepage20260224/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/user/homepage20260224/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/homepage20260224/index.json
++++ ./realms/localhost_4201/user/homepage20260224/index.json
+@@ -45,7 +45,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "catalogSection": {
+--- ./realms/localhost_4201/user/homepage20260223/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/user/homepage20260223/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/user/homepage20260223/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/user/homepage20260223/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/user/homepage20260223/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/user/homepage20260223/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/homepage20260223/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/user/homepage20260223/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/homepage20260223/index.json
++++ ./realms/localhost_4201/user/homepage20260223/index.json
+@@ -45,7 +45,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "catalogSection": {
+--- ./realms/localhost_4201/user/homepage20260225/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/user/homepage20260225/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/user/homepage20260225/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/user/homepage20260225/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/user/homepage20260225/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/user/homepage20260225/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/homepage20260225/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/user/homepage20260225/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/homepage20260225/index.json
++++ ./realms/localhost_4201/user/homepage20260225/index.json
+@@ -45,7 +45,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "catalogSection": {
+--- ./realms/localhost_4201/user/steady-loon/Document/642b6134-dd2e-4248-be59-e3e4b1cb77e8.json
++++ ./realms/localhost_4201/user/steady-loon/Document/642b6134-dd2e-4248-be59-e3e4b1cb77e8.json
+@@ -17,7 +17,7 @@
+       },
+       "adoptsFrom": {
+         "name": "Document",
+-        "module": "@cardstack/catalog/crm-app/document"
++        "module": "cardstack://catalog/crm-app/document"
+       },
+       "lastModified": 1770174644,
+       "resourceCreatedAt": 1770174644
+--- ./realms/localhost_4201/user/steady-loon/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/user/steady-loon/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/user/steady-loon/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/user/steady-loon/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/user/steady-loon/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/user/steady-loon/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/steady-loon/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/user/steady-loon/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/steady-loon/index.json
++++ ./realms/localhost_4201/user/steady-loon/index.json
+@@ -30,7 +30,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "heroSection": {
+--- ./realms/localhost_4201/user/ahomepage/boxel-ai-website/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/user/ahomepage/boxel-ai-website/sections/FooterSection/footer.json
+@@ -42,7 +42,7 @@
+             },
+             {
+               "linkText": "Catalog",
+-              "linkUrl": "@cardstack/catalog/index"
++              "linkUrl": "cardstack://catalog/index"
+             },
+             {
+               "linkText": "Skills",
+--- ./realms/localhost_4201/user/ahomepage/boxel-ai-website/HomeLayout/homepage.json
++++ ./realms/localhost_4201/user/ahomepage/boxel-ai-website/HomeLayout/homepage.json
+@@ -77,7 +77,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/ahomepage/boxel-ai-website/examples/brand-voice-skill.gts
++++ ./realms/localhost_4201/user/ahomepage/boxel-ai-website/examples/brand-voice-skill.gts
+@@ -1,6 +1,6 @@
+ import { field, containsMany } from '@cardstack/base/card-api';
+ import StringField from '@cardstack/base/string';
+-import { SkillPlus } from '@cardstack/catalog/skill-plus';
++import { SkillPlus } from 'cardstack://catalog/skill-plus';
+ 
+ export class BrandVoiceSkill extends SkillPlus {
+   static displayName = 'Brand Voice Skill';
+--- ./realms/localhost_4201/user/ahomepage/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/user/ahomepage/boxel-ai-website/DocsLayout/docs-page.json
+@@ -32,7 +32,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/ahomepage/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/user/ahomepage/boxel-ai-website/Site/boxel-site.json
+@@ -30,12 +30,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/sections/FooterSection/footer.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/sections/FooterSection/footer.json
+@@ -43,7 +43,7 @@
+               "cardTitle": "Pricing"
+             },
+             {
+-              "linkUrl": "@cardstack/catalog/index",
++              "linkUrl": "cardstack://catalog/index",
+               "linkText": "Catalog",
+               "cardTitle": "Catalog"
+             },
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/Page/docs-page.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/Page/docs-page.json
+@@ -24,7 +24,7 @@
+     "relationships": {
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/Page/product-page.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/Page/product-page.json
+@@ -24,7 +24,7 @@
+     "relationships": {
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/Page/community-page.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/Page/community-page.json
+@@ -24,7 +24,7 @@
+     "relationships": {
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/Page/blog-page.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/Page/blog-page.json
+@@ -24,7 +24,7 @@
+     "relationships": {
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/Page/pricing-page.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/Page/pricing-page.json
+@@ -24,7 +24,7 @@
+     "relationships": {
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/HomeLayout/homepage.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/HomeLayout/homepage.json
+@@ -77,7 +77,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "sections.0.content": {
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/examples/Project/web-redesign.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/examples/Project/web-redesign.json
+@@ -22,7 +22,7 @@
+     "relationships": {
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/examples/Task/design-review.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/examples/Task/design-review.json
+@@ -22,7 +22,7 @@
+     "relationships": {
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/examples/BrandVoiceSkill/brand-voice.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/examples/BrandVoiceSkill/brand-voice.json
+@@ -27,7 +27,7 @@
+     "relationships": {
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/examples/Report/quarterly-report.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/examples/Report/quarterly-report.json
+@@ -21,7 +21,7 @@
+     "relationships": {
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/examples/Invoice/consulting-invoice.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/examples/Invoice/consulting-invoice.json
+@@ -22,7 +22,7 @@
+     "relationships": {
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/examples/Invoice/product-invoice.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/examples/Invoice/product-invoice.json
+@@ -22,7 +22,7 @@
+     "relationships": {
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/DocsLayout/docs-page.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/DocsLayout/docs-page.json
+@@ -37,7 +37,7 @@
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
+--- ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/Site/boxel-site.json
++++ ./realms/localhost_4201/user/unacceptable-gopher-82/boxel-ai-website/Site/boxel-site.json
+@@ -28,12 +28,12 @@
+       },
+       "brandGuide": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       },
+       "cardInfo.theme": {
+         "links": {
+-          "self": "@cardstack/catalog/Theme/boxel-brand-guide"
++          "self": "cardstack://catalog/Theme/boxel-brand-guide"
+         }
+       }
+     }
diff --git a/packages/realm-server/node-realm.ts b/packages/realm-server/node-realm.ts
index 62145bf00a9..5de2912e462 100644
--- a/packages/realm-server/node-realm.ts
+++ b/packages/realm-server/node-realm.ts
@@ -38,7 +38,7 @@ import type {
 import type {
   FileWatcherEventContent,
   RealmEventContent,
-} from 'https://cardstack.com/base/matrix-event';
+} from '@cardstack/base/matrix-event';
 import { APP_BOXEL_REALM_EVENT_TYPE } from '@cardstack/runtime-common/matrix-constants';
 import { createJWT, verifyJWT } from './jwt';
 
diff --git a/packages/realm-server/prerender/auth.ts b/packages/realm-server/prerender/auth.ts
index 8729543fa9a..b299d99986b 100644
--- a/packages/realm-server/prerender/auth.ts
+++ b/packages/realm-server/prerender/auth.ts
@@ -1,5 +1,7 @@
 import {
   ensureTrailingSlash,
+  cardIdToURL,
+  isRegisteredPrefix,
   type RealmPermissions,
 } from '@cardstack/runtime-common';
 import { createJWT } from '../jwt';
@@ -16,8 +18,11 @@ export function buildCreatePrerenderAuth(
     for (let [realmURL, realmPermissions] of Object.entries(
       permissions ?? {},
     )) {
+      let resolvedURL = isRegisteredPrefix(realmURL)
+        ? cardIdToURL(realmURL)
+        : new URL(realmURL);
       let resolvedRealmServerURL =
-        normalizedServerURL ?? ensureTrailingSlash(new URL(realmURL).origin);
+        normalizedServerURL ?? ensureTrailingSlash(resolvedURL.origin);
       sessions[realmURL] = createJWT(
         {
           user: userId,
diff --git a/packages/realm-server/scripts/migrate-realm-references.sh b/packages/realm-server/scripts/migrate-realm-references.sh
index c7f1e100c13..31920fefbf9 100755
--- a/packages/realm-server/scripts/migrate-realm-references.sh
+++ b/packages/realm-server/scripts/migrate-realm-references.sh
@@ -34,7 +34,8 @@
 #   # Equivalent explicit form
 #   ./migrate-realm-references.sh --dry-run https://realms-staging.stack.cards/catalog/ @cardstack/catalog/ /persistent/catalog /persistent/experiments
 #
-#   # More shortcut examples
+#   # Base realm uses https://cardstack.com/base/ in all environments
+#   ./migrate-realm-references.sh -e development -r base ./realms/
 #   ./migrate-realm-references.sh -e production -r base /persistent/base /persistent/catalog /persistent/experiments
 #   ./migrate-realm-references.sh -e development -r skills ./realms/
 #
@@ -99,7 +100,13 @@ if [ -n "$ENV" ] || [ -n "$REALM" ]; then
       ;;
   esac
 
-  FIND_STR="${BASE_URL}${REALM}/"
+  # The base realm used https://cardstack.com/base/ as its canonical URL
+  # across all environments (not the per-environment realm server URL).
+  if [ "$REALM" = "base" ]; then
+    FIND_STR="https://cardstack.com/base/"
+  else
+    FIND_STR="${BASE_URL}${REALM}/"
+  fi
   REPLACEMENT="@cardstack/${REALM}/"
 
   echo "Resolved: $FIND_STR -> $REPLACEMENT"
diff --git a/packages/realm-server/scripts/setup-submission-realm.sh b/packages/realm-server/scripts/setup-submission-realm.sh
index e04022f3c63..54fb4477a0e 100644
--- a/packages/realm-server/scripts/setup-submission-realm.sh
+++ b/packages/realm-server/scripts/setup-submission-realm.sh
@@ -28,7 +28,7 @@ if [ ! -f "$SUBMISSION_REALM_PATH/index.json" ]; then
     "type": "card",
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/cards-grid",
+        "module": "@cardstack/base/cards-grid",
         "name": "CardsGrid"
       }
     }
diff --git a/packages/realm-server/scripts/start-production.sh b/packages/realm-server/scripts/start-production.sh
index eb54bbbf969..0b277163f08 100755
--- a/packages/realm-server/scripts/start-production.sh
+++ b/packages/realm-server/scripts/start-production.sh
@@ -41,7 +41,7 @@ NODE_NO_WARNINGS=1 \
   --path='/persistent/base' \
   --username='base_realm' \
   --distURL='https://boxel-host.boxel.ai' \
-  --fromUrl='https://cardstack.com/base/' \
+  --fromUrl='@cardstack/base/' \
   --toUrl='https://app.boxel.ai/base/' \
   \
   --path='/persistent/catalog' \
diff --git a/packages/realm-server/scripts/start-staging.sh b/packages/realm-server/scripts/start-staging.sh
index 878548877a2..eadbb306e5e 100755
--- a/packages/realm-server/scripts/start-staging.sh
+++ b/packages/realm-server/scripts/start-staging.sh
@@ -41,7 +41,7 @@ NODE_NO_WARNINGS=1 \
   --path='/persistent/base' \
   --username='base_realm' \
   --distURL='https://boxel-host-staging.stack.cards' \
-  --fromUrl='https://cardstack.com/base/' \
+  --fromUrl='@cardstack/base/' \
   --toUrl='https://realms-staging.stack.cards/base/' \
   \
   --path='/persistent/catalog' \
diff --git a/packages/realm-server/scripts/start-worker-production.sh b/packages/realm-server/scripts/start-worker-production.sh
index 09df8f7bb95..211467c6c4c 100755
--- a/packages/realm-server/scripts/start-worker-production.sh
+++ b/packages/realm-server/scripts/start-worker-production.sh
@@ -19,7 +19,7 @@ NODE_NO_WARNINGS=1 \
   --prerendererUrl='http://boxel-prerender-manager.boxel-production-internal:4222' \
   --matrixURL='https://matrix.boxel.ai' \
   \
-  --fromUrl='https://cardstack.com/base/' \
+  --fromUrl='@cardstack/base/' \
   --toUrl='https://app.boxel.ai/base/' \
   \
   --fromUrl='https://app.boxel.ai/experiments/' \
diff --git a/packages/realm-server/scripts/start-worker-staging.sh b/packages/realm-server/scripts/start-worker-staging.sh
index e611ae94b51..e3b317d775d 100755
--- a/packages/realm-server/scripts/start-worker-staging.sh
+++ b/packages/realm-server/scripts/start-worker-staging.sh
@@ -19,7 +19,7 @@ NODE_NO_WARNINGS=1 \
   --prerendererUrl='http://boxel-prerender-manager.boxel-staging-internal:4222' \
   --matrixURL='https://matrix-staging.stack.cards' \
   \
-  --fromUrl='https://cardstack.com/base/' \
+  --fromUrl='@cardstack/base/' \
   --toUrl='https://realms-staging.stack.cards/base/' \
   \
   --fromUrl='https://realms-staging.stack.cards/experiments/' \
diff --git a/packages/realm-server/server.ts b/packages/realm-server/server.ts
index 53a251f3c7b..effda39bac2 100644
--- a/packages/realm-server/server.ts
+++ b/packages/realm-server/server.ts
@@ -860,7 +860,7 @@ export class RealmServer {
         type: 'card',
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/cards-grid',
+            module: '@cardstack/base/cards-grid',
             name: 'CardsGrid',
           },
         },
diff --git a/packages/realm-server/tests/atomic-endpoints-test.ts b/packages/realm-server/tests/atomic-endpoints-test.ts
index f721e634023..35a40a95b23 100644
--- a/packages/realm-server/tests/atomic-endpoints-test.ts
+++ b/packages/realm-server/tests/atomic-endpoints-test.ts
@@ -48,8 +48,8 @@ module(basename(__filename), function () {
         });
         test('can write single new module', async function (assert) {
           let source = `
-              import { field, CardDef, contains } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { field, CardDef, contains } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
               export class Place extends CardDef {
                 static displayName = 'Place';
                 @field name = contains(StringField);
@@ -105,24 +105,24 @@ module(basename(__filename), function () {
         });
         test('can write multiple new modules', async function (assert) {
           let place1Source = `
-              import { field, CardDef, contains } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { field, CardDef, contains } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
               export class Place extends CardDef {
                 static displayName = 'Place';
                 @field name = contains(StringField);
               }
               `.trim();
           let place2Source = `
-              import { field, CardDef, contains } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { field, CardDef, contains } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
               export class Place2 extends CardDef {
                 static displayName = 'Place2';
                 @field name = contains(StringField);
               }
               `.trim();
           let countrySource = `
-              import { field, contains } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { field, contains } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
               export class Country extends CardDef {
                 static displayName = 'Country';
                 @field name = contains(StringField);
@@ -333,16 +333,16 @@ module(basename(__filename), function () {
         });
         test('can write multiple modules that depend on each other', async function (assert) {
           let place1Source = `
-            import { field, CardDef, contains } from "https://cardstack.com/base/card-api";
-            import StringField from "https://cardstack.com/base/string";
+            import { field, CardDef, contains } from "@cardstack/base/card-api";
+            import StringField from "@cardstack/base/string";
             export class Place extends CardDef {
               static displayName = 'Place';
               @field name = contains(StringField);
             }
             `.trim();
           let place2Source = `
-            import { field, CardDef, contains } from "https://cardstack.com/base/card-api";
-            import StringField from "https://cardstack.com/base/string";
+            import { field, CardDef, contains } from "@cardstack/base/card-api";
+            import StringField from "@cardstack/base/string";
             import { Place } from './place'
             export class Place2 extends Place {
               static displayName = 'Place2';
@@ -427,8 +427,8 @@ module(basename(__filename), function () {
 
         test('can write multiple instances that depend on each other', async function (assert) {
           let placeSource = `
-              import { field, CardDef, contains, linksTo } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { field, CardDef, contains, linksTo } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
               import { Country } from './country'
               export class Place extends CardDef {
                 static displayName = 'Place';
@@ -437,8 +437,8 @@ module(basename(__filename), function () {
               }
               `.trim();
           let countrySource = `
-              import { field, CardDef, contains } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { field, CardDef, contains } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
               export class Country extends CardDef {
                 static displayName = 'Country';
                 @field name = contains(StringField);
@@ -558,8 +558,8 @@ module(basename(__filename), function () {
         });
         test('can write new instance with new module', async function (assert) {
           let source = `
-            import { field, CardDef, contains } from "https://cardstack.com/base/card-api";
-            import StringField from "https://cardstack.com/base/string";
+            import { field, CardDef, contains } from "@cardstack/base/card-api";
+            import StringField from "@cardstack/base/string";
             export class Place extends CardDef {
               static displayName = 'Place';
               @field name = contains(StringField);
@@ -624,8 +624,8 @@ module(basename(__filename), function () {
 
         test('update is a no-op when content is unchanged', async function (assert) {
           let source = `
-              import { field, CardDef, contains } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { field, CardDef, contains } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
               export class Place extends CardDef {
                 static displayName = 'Place';
                 @field name = contains(StringField);
@@ -737,8 +737,8 @@ module(basename(__filename), function () {
         });
         test('returns error when resource already exists', async function (assert) {
           let source = `
-              import { field, CardDef, contains } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { field, CardDef, contains } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
               export class Place extends CardDef {
                 static displayName = 'Place';
                 @field name = contains(StringField);
diff --git a/packages/realm-server/tests/card-dependencies-endpoint-test.ts b/packages/realm-server/tests/card-dependencies-endpoint-test.ts
index e725c7a11b0..828720e12ba 100644
--- a/packages/realm-server/tests/card-dependencies-endpoint-test.ts
+++ b/packages/realm-server/tests/card-dependencies-endpoint-test.ts
@@ -60,7 +60,7 @@ module(basename(__filename), function () {
           let result: string[] = JSON.parse(response.text.trim());
 
           assert.ok(
-            result.includes('https://cardstack.com/base/card-api'),
+            result.includes('@cardstack/base/card-api'),
             'card-api is a dependency',
           );
           assert.false(
@@ -80,7 +80,7 @@ module(basename(__filename), function () {
           let result: string[] = JSON.parse(response.text.trim());
 
           assert.ok(
-            result.includes('https://cardstack.com/base/card-api'),
+            result.includes('@cardstack/base/card-api'),
             'card-api is a dependency',
           );
           assert.false(
diff --git a/packages/realm-server/tests/card-endpoints-test.ts b/packages/realm-server/tests/card-endpoints-test.ts
index ffa4bc71601..9a592e78502 100644
--- a/packages/realm-server/tests/card-endpoints-test.ts
+++ b/packages/realm-server/tests/card-endpoints-test.ts
@@ -285,8 +285,8 @@ module(basename(__filename), function () {
               [
                 'gallery.gts',
                 `
-                import { CardDef, field, linksTo, linksToMany } from "https://cardstack.com/base/card-api";
-                import { FileDef } from "https://cardstack.com/base/file-api";
+                import { CardDef, field, linksTo, linksToMany } from "@cardstack/base/card-api";
+                import { FileDef } from "@cardstack/base/file-api";
 
                 export class Gallery extends CardDef {
                   @field hero = linksTo(FileDef);
@@ -401,8 +401,8 @@ module(basename(__filename), function () {
             [
               'tag.gts',
               `
-                import { CardDef, field, contains } from "https://cardstack.com/base/card-api";
-                import StringField from "https://cardstack.com/base/string";
+                import { CardDef, field, contains } from "@cardstack/base/card-api";
+                import StringField from "@cardstack/base/string";
 
                 export class Tag extends CardDef {
                   @field label = contains(StringField);
@@ -417,8 +417,8 @@ module(basename(__filename), function () {
             [
               'article.gts',
               `
-                import { CardDef, field, contains, linksTo } from "https://cardstack.com/base/card-api";
-                import StringField from "https://cardstack.com/base/string";
+                import { CardDef, field, contains, linksTo } from "@cardstack/base/card-api";
+                import StringField from "@cardstack/base/string";
                 import { Tag } from "./tag";
 
                 export class Article extends CardDef {
@@ -543,9 +543,9 @@ module(basename(__filename), function () {
               [
                 'skill-card.gts',
                 `
-                  import { CardDef, field, contains, linksTo } from "https://cardstack.com/base/card-api";
-                  import StringField from "https://cardstack.com/base/string";
-                  import { MarkdownDef } from "https://cardstack.com/base/markdown-file-def";
+                  import { CardDef, field, contains, linksTo } from "@cardstack/base/card-api";
+                  import StringField from "@cardstack/base/string";
+                  import { MarkdownDef } from "@cardstack/base/markdown-file-def";
 
                   export class SkillCard extends CardDef {
                     @field cardTitle = contains(StringField);
@@ -642,8 +642,8 @@ module(basename(__filename), function () {
             [
               'query-person-finder.gts',
               `
-                import { CardDef, field, contains, linksTo, linksToMany } from "https://cardstack.com/base/card-api";
-                import StringField from "https://cardstack.com/base/string";
+                import { CardDef, field, contains, linksTo, linksToMany } from "@cardstack/base/card-api";
+                import StringField from "@cardstack/base/string";
                 import { Person } from "./person";
 
                 export class QueryPersonFinder extends CardDef {
@@ -734,8 +734,8 @@ module(basename(__filename), function () {
             [
               'query-person-finder-nested.gts',
               `
-                import { CardDef, FieldDef, field, contains, linksTo, linksToMany } from "https://cardstack.com/base/card-api";
-                import StringField from "https://cardstack.com/base/string";
+                import { CardDef, FieldDef, field, contains, linksTo, linksToMany } from "@cardstack/base/card-api";
+                import StringField from "@cardstack/base/string";
                 import { Person } from "./person";
 
                 export class QueryLinksField extends FieldDef {
@@ -1148,7 +1148,7 @@ module(basename(__filename), function () {
                 attributes: {},
                 meta: {
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/card-api',
+                    module: '@cardstack/base/card-api',
                     name: 'CardDef',
                   },
                 },
@@ -1213,7 +1213,7 @@ module(basename(__filename), function () {
                 type: 'card',
                 meta: {
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/card-api',
+                    module: '@cardstack/base/card-api',
                     name: 'CardDef',
                   },
                 },
@@ -2147,7 +2147,7 @@ module(basename(__filename), function () {
                 attributes: {},
                 meta: {
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/card-api',
+                    module: '@cardstack/base/card-api',
                     name: 'CardDef',
                   },
                 },
@@ -3878,7 +3878,7 @@ module(basename(__filename), function () {
               attributes: {},
               meta: {
                 adoptsFrom: {
-                  module: 'https://cardstack.com/base/card-api',
+                  module: '@cardstack/base/card-api',
                   name: 'CardDef',
                 },
               },
@@ -3921,8 +3921,8 @@ module(basename(__filename), function () {
           },
           fileSystem: {
             'person.gts': `
-              import { CardDef, field, contains } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { CardDef, field, contains } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
 
               export class Person extends CardDef {
                 @field name = contains(StringField);
@@ -3951,7 +3951,7 @@ module(basename(__filename), function () {
           },
           fileSystem: {
             'favorite-finder.gts': `
-              import { CardDef, field, linksTo, linksToMany } from "https://cardstack.com/base/card-api";
+              import { CardDef, field, linksTo, linksToMany } from "@cardstack/base/card-api";
               import { Person } from "${providerRealmURL}person";
 
               export class FavoriteLookup extends CardDef {
@@ -4233,11 +4233,11 @@ function assertScopedCssUrlsContain(
 
 // These modules have CSS that CardDef consumes, so we expect to see them in all relationships of a prerendered card
 let cardDefModuleDependencies = [
-  'https://cardstack.com/base/default-templates/embedded.gts',
-  'https://cardstack.com/base/default-templates/isolated-and-edit.gts',
-  'https://cardstack.com/base/default-templates/field-edit.gts',
-  'https://cardstack.com/base/field-component.gts',
-  'https://cardstack.com/base/contains-many-component.gts',
-  'https://cardstack.com/base/links-to-editor.gts',
-  'https://cardstack.com/base/links-to-many-component.gts',
+  '@cardstack/base/default-templates/embedded.gts',
+  '@cardstack/base/default-templates/isolated-and-edit.gts',
+  '@cardstack/base/default-templates/field-edit.gts',
+  '@cardstack/base/field-component.gts',
+  '@cardstack/base/contains-many-component.gts',
+  '@cardstack/base/links-to-editor.gts',
+  '@cardstack/base/links-to-many-component.gts',
 ];
diff --git a/packages/realm-server/tests/card-reference-resolver-test.ts b/packages/realm-server/tests/card-reference-resolver-test.ts
index cbd8deb81b0..ef8eef537f5 100644
--- a/packages/realm-server/tests/card-reference-resolver-test.ts
+++ b/packages/realm-server/tests/card-reference-resolver-test.ts
@@ -182,7 +182,7 @@ module(basename(__filename), function () {
 
     test('resolves linksTo relationship with absolute URL and prefix-form resource ID', async function (assert) {
       // This mirrors the bug where a card at @cardstack/skills/Skill/boxel-environment
-      // has a relationship pointing to https://cardstack.com/base/Theme/brand-guide.
+      // has a relationship pointing to @cardstack/base/Theme/brand-guide.
       // relativizeDocument (via resolveCardReference) must handle the absolute
       // URL without using the prefix-form base.
       let doc: SingleCardDocument = {
@@ -193,7 +193,7 @@ module(basename(__filename), function () {
           relationships: {
             theme: {
               links: {
-                self: 'https://cardstack.com/base/Theme/brand-guide',
+                self: '@cardstack/base/Theme/brand-guide',
               },
             },
           },
@@ -214,7 +214,7 @@ module(basename(__filename), function () {
       assert.ok(rel, 'relationship exists after relativization');
       assert.strictEqual(
         rel.links.self,
-        'https://cardstack.com/base/Theme/brand-guide',
+        '@cardstack/base/Theme/brand-guide',
         'absolute URL to another realm is preserved as-is',
       );
     });
diff --git a/packages/realm-server/tests/card-source-endpoints-test.ts b/packages/realm-server/tests/card-source-endpoints-test.ts
index 7b089a924e7..3fee6d3cccc 100644
--- a/packages/realm-server/tests/card-source-endpoints-test.ts
+++ b/packages/realm-server/tests/card-source-endpoints-test.ts
@@ -27,7 +27,7 @@ import { expectIncrementalIndexEvent } from './helpers/indexing';
 import '@cardstack/runtime-common/helpers/code-equality-assertion';
 import stripScopedCSSGlimmerAttributes from '@cardstack/runtime-common/helpers/strip-scoped-css-glimmer-attributes';
 import { APP_BOXEL_REALM_EVENT_TYPE } from '@cardstack/runtime-common/matrix-constants';
-import type { MatrixEvent } from 'https://cardstack.com/base/matrix-event';
+import type { MatrixEvent } from '@cardstack/base/matrix-event';
 import isEqual from 'lodash/isEqual';
 
 module(basename(__filename), function () {
@@ -752,8 +752,8 @@ module(basename(__filename), function () {
             let response = await request
               .post('/test-card.gts')
               .set('Accept', 'application/vnd.card+source').send(`
-                import { contains, field, CardDef } from 'https://cardstack.com/base/card-api';
-                import StringField from 'https://cardstack.com/base/string';
+                import { contains, field, CardDef } from '@cardstack/base/card-api';
+                import StringField from '@cardstack/base/string';
 
                 export class TestCard extends CardDef {
                   @field field1 = contains(StringField);
@@ -801,8 +801,8 @@ module(basename(__filename), function () {
             let response = await request
               .post('/test-card.gts')
               .set('Accept', 'application/vnd.card+source').send(`
-                import { contains, field, CardDef } from 'https://cardstack.com/base/card-api';
-                import StringField from 'https://cardstack.com/base/string';
+                import { contains, field, CardDef } from '@cardstack/base/card-api';
+                import StringField from '@cardstack/base/string';
 
                 export class TestCard extends CardDef {
                   @field field1 = contains(StringField);
diff --git a/packages/realm-server/tests/cards/%F0%9F%98%80.gts b/packages/realm-server/tests/cards/%F0%9F%98%80.gts
index 513d62f9674..fc2207d0118 100644
--- a/packages/realm-server/tests/cards/%F0%9F%98%80.gts
+++ b/packages/realm-server/tests/cards/%F0%9F%98%80.gts
@@ -1,7 +1,7 @@
 // This is a file that contains url encoded file name to assert
 // that the realm server can handle this type of file
 
-import { CardDef } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
 export class Test extends CardDef {
   static displayName = 'test';
 }
diff --git a/packages/realm-server/tests/cards/chess-gallery.gts b/packages/realm-server/tests/cards/chess-gallery.gts
index 3dbc536e561..cb65f062c7c 100644
--- a/packages/realm-server/tests/cards/chess-gallery.gts
+++ b/packages/realm-server/tests/cards/chess-gallery.gts
@@ -1,11 +1,11 @@
-import DateField from 'https://cardstack.com/base/date';
+import DateField from '@cardstack/base/date';
 import {
   FieldDef,
   field,
   contains,
   StringField,
-} from 'https://cardstack.com/base/card-api';
-import { Component } from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import { Component } from '@cardstack/base/card-api';
 
 // This is intentionally using a FieldDef so it can replicate the error in
 // https://linear.app/cardstack/issue/CS-7797/indexer-hangs-when-encountering-instance-json-that-refers-to-a-field
diff --git a/packages/realm-server/tests/cards/code-ref-test.gts b/packages/realm-server/tests/cards/code-ref-test.gts
index fe1e70fdfae..e2a493957a0 100644
--- a/packages/realm-server/tests/cards/code-ref-test.gts
+++ b/packages/realm-server/tests/cards/code-ref-test.gts
@@ -3,8 +3,8 @@ import {
   field,
   Component,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import CodeRefField from 'https://cardstack.com/base/code-ref';
+} from '@cardstack/base/card-api';
+import CodeRefField from '@cardstack/base/code-ref';
 
 export class TestCard extends CardDef {
   @field ref = contains(CodeRefField);
diff --git a/packages/realm-server/tests/cards/family_photo_card.gts b/packages/realm-server/tests/cards/family_photo_card.gts
index 86b4cdba3f6..f599e68761f 100644
--- a/packages/realm-server/tests/cards/family_photo_card.gts
+++ b/packages/realm-server/tests/cards/family_photo_card.gts
@@ -4,9 +4,9 @@ import {
   field,
   CardDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import { PersonCard } from './person-with-error';
 
 export class FamilyPhotoCard extends CardDef {
diff --git a/packages/realm-server/tests/cards/friend-with-used-link.gts b/packages/realm-server/tests/cards/friend-with-used-link.gts
index 873cf3e4231..9c940ad36f1 100644
--- a/packages/realm-server/tests/cards/friend-with-used-link.gts
+++ b/packages/realm-server/tests/cards/friend-with-used-link.gts
@@ -5,8 +5,8 @@ import {
   field,
   CardDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class FriendWithUsedLink extends CardDef {
   @field firstName = contains(StringField);
diff --git a/packages/realm-server/tests/cards/friend.gts b/packages/realm-server/tests/cards/friend.gts
index 15fc8bc00ef..a715f3afe7d 100644
--- a/packages/realm-server/tests/cards/friend.gts
+++ b/packages/realm-server/tests/cards/friend.gts
@@ -5,8 +5,8 @@ import {
   field,
   CardDef,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class Friend extends CardDef {
   @field firstName = contains(StringField);
diff --git a/packages/realm-server/tests/cards/home.gts b/packages/realm-server/tests/cards/home.gts
index 19457eff667..4a444998b66 100644
--- a/packages/realm-server/tests/cards/home.gts
+++ b/packages/realm-server/tests/cards/home.gts
@@ -1,4 +1,4 @@
-import { Component, CardDef } from 'https://cardstack.com/base/card-api';
+import { Component, CardDef } from '@cardstack/base/card-api';
 
 export class Home extends CardDef {
   static isolated = class Isolated extends Component<typeof this> {
diff --git a/packages/realm-server/tests/cards/multiple-default-exports-card.gts b/packages/realm-server/tests/cards/multiple-default-exports-card.gts
index 308f6aa2bc8..69f7c6ed1be 100644
--- a/packages/realm-server/tests/cards/multiple-default-exports-card.gts
+++ b/packages/realm-server/tests/cards/multiple-default-exports-card.gts
@@ -1,4 +1,4 @@
-import { CardDef, Component } from 'https://cardstack.com/base/card-api';
+import { CardDef, Component } from '@cardstack/base/card-api';
 import MultipleDefaultExports from './multiple-default-exports';
 
 export class MultipleDefaultExportsCard extends CardDef {
diff --git a/packages/realm-server/tests/cards/person-with-error.gts b/packages/realm-server/tests/cards/person-with-error.gts
index 9ee58bc9582..953c23b7b4a 100644
--- a/packages/realm-server/tests/cards/person-with-error.gts
+++ b/packages/realm-server/tests/cards/person-with-error.gts
@@ -5,7 +5,7 @@ import {
   contains,
   realmURL,
   StringField,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 function removeFileExtension(cardUrl: string) {
   return cardUrl?.replace(/\.[^/.]+$/, '');
diff --git a/packages/realm-server/tests/cards/person.gts b/packages/realm-server/tests/cards/person.gts
index 3bea2be3c66..f49136dbe43 100644
--- a/packages/realm-server/tests/cards/person.gts
+++ b/packages/realm-server/tests/cards/person.gts
@@ -3,8 +3,8 @@ import {
   field,
   Component,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class Person extends CardDef {
   static displayName = 'Person';
diff --git a/packages/realm-server/tests/cards/query-test-cards.gts b/packages/realm-server/tests/cards/query-test-cards.gts
index d658e9bd3e6..75ba1ef8798 100644
--- a/packages/realm-server/tests/cards/query-test-cards.gts
+++ b/packages/realm-server/tests/cards/query-test-cards.gts
@@ -6,12 +6,12 @@ import {
   containsMany,
   FieldDef,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import CodeRefField from 'https://cardstack.com/base/code-ref';
-import DateField from 'https://cardstack.com/base/date';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import CodeRefField from '@cardstack/base/code-ref';
+import DateField from '@cardstack/base/date';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
 
 export class Address extends FieldDef {
   @field street = contains(StringField);
diff --git a/packages/realm-server/tests/cards/timers-card.gts b/packages/realm-server/tests/cards/timers-card.gts
index 1e541dba187..5b701b4c3d3 100644
--- a/packages/realm-server/tests/cards/timers-card.gts
+++ b/packages/realm-server/tests/cards/timers-card.gts
@@ -1,4 +1,4 @@
-import { CardDef, Component } from 'https://cardstack.com/base/card-api';
+import { CardDef, Component } from '@cardstack/base/card-api';
 
 // Success is the worker being able to process this module and not die/thrash
 export class TimersCard extends CardDef {
diff --git a/packages/realm-server/tests/cards/unused-card.gts b/packages/realm-server/tests/cards/unused-card.gts
index 98419e53f0f..06c5b107bad 100644
--- a/packages/realm-server/tests/cards/unused-card.gts
+++ b/packages/realm-server/tests/cards/unused-card.gts
@@ -3,8 +3,8 @@ import {
   field,
   Component,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class UnusedCard extends CardDef {
   @field firstName = contains(StringField);
diff --git a/packages/realm-server/tests/definition-lookup-test.ts b/packages/realm-server/tests/definition-lookup-test.ts
index 86fb971b964..b88a05b7419 100644
--- a/packages/realm-server/tests/definition-lookup-test.ts
+++ b/packages/realm-server/tests/definition-lookup-test.ts
@@ -132,7 +132,7 @@ module(basename(__filename), function () {
                       isPrimitive: true,
                       isComputed: false,
                       fieldOrCard: {
-                        module: 'https://cardstack.com/base/string',
+                        module: '@cardstack/base/string',
                         name: 'default',
                       },
                       serializerName: undefined,
@@ -180,7 +180,7 @@ module(basename(__filename), function () {
           },
           fileSystem: {
             'person.gts': `
-              import { CardDef, field, contains, StringField, Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, StringField, Component } from '@cardstack/base/card-api';
               export class Person extends CardDef {
                 static displayName = "Person";
                 @field name = contains(StringField);
diff --git a/packages/realm-server/tests/file-watcher-events-test.ts b/packages/realm-server/tests/file-watcher-events-test.ts
index 44cb39e1eda..6690a66b8f5 100644
--- a/packages/realm-server/tests/file-watcher-events-test.ts
+++ b/packages/realm-server/tests/file-watcher-events-test.ts
@@ -17,7 +17,7 @@ import type { PgAdapter } from '@cardstack/postgres';
 import type {
   RealmEvent,
   UpdateRealmEventContent,
-} from 'https://cardstack.com/base/matrix-event';
+} from '@cardstack/base/matrix-event';
 
 module(basename(__filename), function () {
   module('file watcher realm events', function (hooks) {
@@ -66,8 +66,8 @@ module(basename(__filename), function () {
       onRealmSetup,
       fileSystem: {
         'person.gts': `
-        import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class Person extends CardDef {
           @field firstName = contains(StringField);
@@ -298,8 +298,8 @@ module(basename(__filename), function () {
       realmEventTimestampStart = Date.now();
 
       let updatedPersonSource = `
-import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-import StringField from "https://cardstack.com/base/string";
+import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+import StringField from "@cardstack/base/string";
 
 export class Person extends CardDef {
   @field firstName = contains(StringField);
diff --git a/packages/realm-server/tests/helpers/index.ts b/packages/realm-server/tests/helpers/index.ts
index 682c15398e5..b25db2371a8 100644
--- a/packages/realm-server/tests/helpers/index.ts
+++ b/packages/realm-server/tests/helpers/index.ts
@@ -35,6 +35,8 @@ import {
   PUBLISHED_DIRECTORY_NAME,
   DEFAULT_CARD_SIZE_LIMIT_BYTES,
   DEFAULT_FILE_SIZE_LIMIT_BYTES,
+  ensureTrailingSlash,
+  registerCardReferencePrefix,
   type MatrixConfig,
   type QueuePublisher,
   type QueueRunner,
@@ -67,7 +69,7 @@ import type {
   MatrixEvent,
   RealmEvent,
   RealmEventContent,
-} from 'https://cardstack.com/base/matrix-event';
+} from '@cardstack/base/matrix-event';
 import { createRemotePrerenderer } from '../../prerender/remote-prerenderer';
 import { createPrerenderHttpServer } from '../../prerender/prerender-app';
 import { buildCreatePrerenderAuth } from '../../prerender/auth';
@@ -244,7 +246,12 @@ export function cleanWhiteSpace(text: string) {
 
 export function createVirtualNetwork() {
   let virtualNetwork = new VirtualNetwork();
-  virtualNetwork.addURLMapping(new URL(baseRealm.url), new URL(localBaseRealm));
+  let localBaseRealmURL = ensureTrailingSlash(localBaseRealm);
+  registerCardReferencePrefix(baseRealm.url, localBaseRealmURL);
+  virtualNetwork.addImportMap(
+    baseRealm.url,
+    (rest) => new URL(rest, localBaseRealmURL).href,
+  );
   return virtualNetwork;
 }
 
@@ -2054,7 +2061,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'ReadOnlyField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2063,7 +2070,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: true,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2072,7 +2079,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: true,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2081,7 +2088,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: true,
     fieldOrCard: {
       name: 'MaybeBase64Field',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2090,7 +2097,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'CardInfoField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: false,
   },
@@ -2099,7 +2106,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2108,7 +2115,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2117,7 +2124,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'MaybeBase64Field',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2126,7 +2133,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'MarkdownField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2135,7 +2142,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'Theme',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: false,
   },
@@ -2144,7 +2151,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'ReadOnlyField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2153,7 +2160,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: true,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2162,7 +2169,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: true,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2171,7 +2178,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: true,
     fieldOrCard: {
       name: 'MaybeBase64Field',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2180,7 +2187,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'CardInfoField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: false,
   },
@@ -2189,7 +2196,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2198,7 +2205,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2207,7 +2214,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'MaybeBase64Field',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2216,7 +2223,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'MarkdownField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2225,7 +2232,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'CSSField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2234,7 +2241,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'CssImportField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2243,7 +2250,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'Theme',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: false,
   },
@@ -2252,7 +2259,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'ReadOnlyField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2261,7 +2268,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: true,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2270,7 +2277,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'CardInfoField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: false,
   },
@@ -2279,7 +2286,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2288,7 +2295,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2297,7 +2304,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'MaybeBase64Field',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2306,7 +2313,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'MarkdownField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2315,7 +2322,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: true,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2324,7 +2331,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'CSSField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2333,7 +2340,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'CssImportField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2342,7 +2349,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: true,
     fieldOrCard: {
       name: 'MaybeBase64Field',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2351,7 +2358,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'Theme',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: false,
   },
@@ -2360,7 +2367,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'ReadOnlyField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2369,7 +2376,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: true,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2378,7 +2385,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'CardInfoField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: false,
   },
@@ -2387,7 +2394,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2396,7 +2403,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2405,7 +2412,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'MaybeBase64Field',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2414,7 +2421,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'MarkdownField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2423,7 +2430,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: true,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2432,7 +2439,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'CSSField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2441,7 +2448,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'CssImportField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2450,7 +2457,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: true,
     fieldOrCard: {
       name: 'MaybeBase64Field',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2459,7 +2466,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'Theme',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: false,
   },
@@ -2468,7 +2475,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'ReadOnlyField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2477,7 +2484,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: true,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2486,7 +2493,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'CardInfoField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: false,
   },
@@ -2495,7 +2502,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'StringField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2505,7 +2512,7 @@ export const cardDefinition: Definition['fields'] = {
       isComputed: false,
       fieldOrCard: {
         name: 'StringField',
-        module: 'https://cardstack.com/base/card-api',
+        module: '@cardstack/base/card-api',
       },
       isPrimitive: true,
     },
@@ -2515,7 +2522,7 @@ export const cardDefinition: Definition['fields'] = {
       isComputed: false,
       fieldOrCard: {
         name: 'MaybeBase64Field',
-        module: 'https://cardstack.com/base/card-api',
+        module: '@cardstack/base/card-api',
       },
       isPrimitive: true,
     },
@@ -2525,7 +2532,7 @@ export const cardDefinition: Definition['fields'] = {
       isComputed: true,
       fieldOrCard: {
         name: 'StringField',
-        module: 'https://cardstack.com/base/card-api',
+        module: '@cardstack/base/card-api',
       },
       isPrimitive: true,
     },
@@ -2534,7 +2541,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'CSSField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2543,7 +2550,7 @@ export const cardDefinition: Definition['fields'] = {
     isComputed: false,
     fieldOrCard: {
       name: 'CssImportField',
-      module: 'https://cardstack.com/base/card-api',
+      module: '@cardstack/base/card-api',
     },
     isPrimitive: true,
   },
@@ -2553,7 +2560,7 @@ export const cardDefinition: Definition['fields'] = {
       isComputed: true,
       fieldOrCard: {
         name: 'MaybeBase64Field',
-        module: 'https://cardstack.com/base/card-api',
+        module: '@cardstack/base/card-api',
       },
       isPrimitive: true,
     },
@@ -2563,7 +2570,7 @@ export const cardDefinition: Definition['fields'] = {
       isComputed: false,
       fieldOrCard: {
         name: 'Theme',
-        module: 'https://cardstack.com/base/card-api',
+        module: '@cardstack/base/card-api',
       },
       isPrimitive: false,
     },
diff --git a/packages/realm-server/tests/helpers/indexing.ts b/packages/realm-server/tests/helpers/indexing.ts
index cf504eecf96..70b9f3530a6 100644
--- a/packages/realm-server/tests/helpers/indexing.ts
+++ b/packages/realm-server/tests/helpers/indexing.ts
@@ -1,4 +1,4 @@
-import type { MatrixEvent } from 'https://cardstack.com/base/matrix-event';
+import type { MatrixEvent } from '@cardstack/base/matrix-event';
 import { findRealmEvent, waitUntil } from './index';
 import { APP_BOXEL_REALM_EVENT_TYPE } from '@cardstack/runtime-common/matrix-constants';
 import { trimJsonExtension } from '@cardstack/runtime-common';
@@ -7,7 +7,7 @@ import { every, param, query } from '@cardstack/runtime-common';
 import type {
   IncrementalIndexEventContent,
   IncrementalIndexInitiationContent,
-} from 'https://cardstack.com/base/matrix-event';
+} from '@cardstack/base/matrix-event';
 import { validate as uuidValidate } from 'uuid';
 
 interface IncrementalIndexEventTestContext {
diff --git a/packages/realm-server/tests/helpers/prettier-test-utils.ts b/packages/realm-server/tests/helpers/prettier-test-utils.ts
index 0a626ec09b0..ed4f5bb71b3 100644
--- a/packages/realm-server/tests/helpers/prettier-test-utils.ts
+++ b/packages/realm-server/tests/helpers/prettier-test-utils.ts
@@ -291,7 +291,7 @@ export function createErrorTestCases() {
   return {
     syntaxError: {
       name: 'Syntax Error',
-      source: `import { CardDef } from 'https://cardstack.com/base/card-api';
+      source: `import { CardDef } from '@cardstack/base/card-api';
 export class MyCard extends CardDef {
   @field name = contains(StringField);
   // Malformed syntax that prettier cannot parse
@@ -302,7 +302,7 @@ export class MyCard extends CardDef {
 
     configError: {
       name: 'Config Error',
-      source: `import { CardDef } from 'https://cardstack.com/base/card-api';
+      source: `import { CardDef } from '@cardstack/base/card-api';
 export class MyCard extends CardDef {
   @field name = contains(StringField);
 }`,
@@ -320,7 +320,7 @@ export class MyCard extends CardDef {
     largeFile: {
       name: 'Large File',
       source: `${'// Large comment line\n'.repeat(5000)}
-import { CardDef } from 'https://cardstack.com/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
 export class MyCard extends CardDef {
   @field name = contains(StringField);
 }`,
@@ -341,13 +341,13 @@ export function createConcurrentTestData(count: number = 5): Array<{
   const testData = [];
 
   for (let i = 0; i < count; i++) {
-    const source = `import { CardDef } from 'https://cardstack.com/base/card-api';
+    const source = `import { CardDef } from '@cardstack/base/card-api';
 export class MyCard${i} extends CardDef {
   @field name${i} = contains(StringField);
 }`;
 
-    const expectedOutput = `import StringField from 'https://cardstack.com/base/string';
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
+    const expectedOutput = `import StringField from '@cardstack/base/string';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
 
 export class MyCard${i} extends CardDef {
   @field name${i} = contains(StringField);
@@ -369,9 +369,9 @@ export class MyCard${i} extends CardDef {
  */
 export function createLargeFileTestCase(lineCount: number): string {
   const imports = [
-    "import { CardDef } from 'https://cardstack.com/base/card-api';",
-    "import { field, contains } from 'https://cardstack.com/base/card-api';",
-    "import StringField from 'https://cardstack.com/base/string';",
+    "import { CardDef } from '@cardstack/base/card-api';",
+    "import { field, contains } from '@cardstack/base/card-api';",
+    "import StringField from '@cardstack/base/string';",
     "import { tracked } from '@glimmer/tracking';",
     "import { action } from '@ember/object';",
     "import { fn } from '@ember/helper';",
diff --git a/packages/realm-server/tests/indexing-test.ts b/packages/realm-server/tests/indexing-test.ts
index 2908295fc39..de33d89500e 100644
--- a/packages/realm-server/tests/indexing-test.ts
+++ b/packages/realm-server/tests/indexing-test.ts
@@ -57,9 +57,9 @@ function makeTestRealmFileSystem(): Record<
 > {
   return {
     'person.gts': `
-      import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
-      import NumberField from "https://cardstack.com/base/number";
+      import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
+      import NumberField from "@cardstack/base/number";
 
       export class Person extends CardDef {
         @field firstName = contains(StringField);
@@ -90,7 +90,7 @@ function makeTestRealmFileSystem(): Record<
       }
     `,
     'pet-person.gts': `
-      import { contains, linksTo, field, CardDef, Component, StringField } from "https://cardstack.com/base/card-api";
+      import { contains, linksTo, field, CardDef, Component, StringField } from "@cardstack/base/card-api";
       import { Pet } from "./pet";
 
       export class PetPerson extends CardDef {
@@ -107,16 +107,16 @@ function makeTestRealmFileSystem(): Record<
       }
     `,
     'pet.gts': `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Pet extends CardDef {
         @field firstName = contains(StringField);
       }
     `,
     'fancy-person.gts': `
-      import { contains, field, Component } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, Component } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       import { Person } from "./person";
 
       export class FancyPerson extends Person {
@@ -134,8 +134,8 @@ function makeTestRealmFileSystem(): Record<
       }
     `,
     'post.gts': `
-      import { contains, field, linksTo, CardDef, Component } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, linksTo, CardDef, Component } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       import { Person } from "./person";
 
       export class Post extends CardDef {
@@ -151,8 +151,8 @@ function makeTestRealmFileSystem(): Record<
       }
     `,
     'boom.gts': `
-      import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Boom extends CardDef {
         @field firstName = contains(StringField);
@@ -167,8 +167,8 @@ function makeTestRealmFileSystem(): Record<
       }
     `,
     'boom2.gts': `
-      import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Boom extends CardDef {
         @field firstName = contains(StringField);
@@ -182,8 +182,8 @@ function makeTestRealmFileSystem(): Record<
       }
     `,
     'atom-boom.gts': `
-      import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Boom extends CardDef {
         @field firstName = contains(StringField);
@@ -198,8 +198,8 @@ function makeTestRealmFileSystem(): Record<
       }
     `,
     'embedded-boom.gts': `
-      import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Boom extends CardDef {
         @field firstName = contains(StringField);
@@ -214,8 +214,8 @@ function makeTestRealmFileSystem(): Record<
       }
     `,
     'fitted-boom.gts': `
-      import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Boom extends CardDef {
         @field firstName = contains(StringField);
@@ -395,15 +395,15 @@ function makeTestRealmFileSystem(): Record<
         attributes: {},
         meta: {
           adoptsFrom: {
-            module: 'https://cardstack.com/base/card-api',
+            module: '@cardstack/base/card-api',
             name: 'CardDef',
           },
         },
       },
     },
     'address.gts': `
-      import { contains, field, FieldDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, FieldDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Address extends FieldDef {
         @field street = contains(StringField);
@@ -411,7 +411,7 @@ function makeTestRealmFileSystem(): Record<
       }
     `,
     'order-page.gts': `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
       import { Address } from "./address";
 
       export class OrderPage extends CardDef {
@@ -440,7 +440,7 @@ function makeTestRealmFileSystem(): Record<
       import {
         FileDef as BaseFileDef,
         FileContentMismatchError,
-      } from "https://cardstack.com/base/file-api";
+      } from "@cardstack/base/file-api";
 
       export class FileDef extends BaseFileDef {
         static async extractAttributes() {
@@ -1069,7 +1069,7 @@ module(basename(__filename), function () {
         'deps include mismatch extractor module',
       );
       assert.ok(
-        deps.includes('https://cardstack.com/base/file-api'),
+        deps.includes('@cardstack/base/file-api'),
         'deps include base file-api for fallback',
       );
     });
@@ -1078,7 +1078,7 @@ module(basename(__filename), function () {
       // Mutate the index row so we can validate that the response must come from the index,
       // not from filesystem metadata.
       await testDbAdapter.execute(
-        `UPDATE boxel_index SET search_doc = '{"name":"from-index.txt","contentType":"application/x-index-test"}'::jsonb, pristine_doc = '{"id":"${testRealm}random-file.txt","type":"file-meta","attributes":{"name":"from-pristine.txt","contentType":"application/x-pristine","custom":"present"},"meta":{"adoptsFrom":{"module":"https://cardstack.com/base/file-api","name":"FileDef"}}}'::jsonb WHERE url = '${testRealm}random-file.txt'`,
+        `UPDATE boxel_index SET search_doc = '{"name":"from-index.txt","contentType":"application/x-index-test"}'::jsonb, pristine_doc = '{"id":"${testRealm}random-file.txt","type":"file-meta","attributes":{"name":"from-pristine.txt","contentType":"application/x-pristine","custom":"present"},"meta":{"adoptsFrom":{"module":"@cardstack/base/file-api","name":"FileDef"}}}'::jsonb WHERE url = '${testRealm}random-file.txt'`,
       );
       let response = await fetch(`${testRealm}random-file.txt`, {
         headers: { Accept: SupportedMimeType.FileMeta },
@@ -1105,7 +1105,7 @@ module(basename(__filename), function () {
       assert.deepEqual(
         doc.data.meta?.adoptsFrom,
         {
-          module: 'https://cardstack.com/base/text-file-def',
+          module: '@cardstack/base/text-file-def',
           name: 'TextFileDef',
         },
         'adoptsFrom sourced from pristine file resource',
@@ -1169,8 +1169,8 @@ module(basename(__filename), function () {
               permissions: permissions.provider,
               fileSystem: {
                 'article.gts': `
-                import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-                import StringField from "https://cardstack.com/base/string";
+                import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+                import StringField from "@cardstack/base/string";
                 export class Article extends CardDef {
                   @field title = contains(StringField);
                 }
@@ -1183,7 +1183,7 @@ module(basename(__filename), function () {
               permissions: permissions.consumer,
               fileSystem: {
                 'website.gts': `
-                import { contains, field, CardDef, linksTo } from "https://cardstack.com/base/card-api";
+                import { contains, field, CardDef, linksTo } from "@cardstack/base/card-api";
                 import { Article } from "${testRealm1URL}article" // importing from another realm;
                 export class Website extends CardDef {
                   @field linkedArticle = linksTo(Article);
@@ -1733,8 +1733,8 @@ module(basename(__filename), function () {
         await realm.write(
           'pet.gts',
           `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           export class Pet extends CardDef {
             @field firstName = contains(StringField);
           }
@@ -1761,8 +1761,8 @@ module(basename(__filename), function () {
         await realm.write(
           'person.gts',
           `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class Person extends CardDef {
             @field firstName = contains(StringField);
@@ -1796,7 +1796,7 @@ module(basename(__filename), function () {
         await realm.write(
           'filedef-mismatch.gts',
           `
-          import { FileDef as BaseFileDef } from "https://cardstack.com/base/file-api";
+          import { FileDef as BaseFileDef } from "@cardstack/base/file-api";
           import { buildName } from "./filedef-helper";
 
           export class FileDef extends BaseFileDef {
@@ -1970,7 +1970,7 @@ module(basename(__filename), function () {
         await realm.write(
           'deep-card.gts',
           `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
           import { MiddleField } from "./middle-field";
 
           export class DeepCard extends CardDef {
@@ -2046,7 +2046,7 @@ module(basename(__filename), function () {
           await realm.write(
             'middle-field.gts',
             `
-          import { contains, field, FieldDef } from "https://cardstack.com/base/card-api";
+          import { contains, field, FieldDef } from "@cardstack/base/card-api";
           import { LeafField } from "./leaf-field";
 
           export class MiddleField extends FieldDef {
@@ -2146,8 +2146,8 @@ module(basename(__filename), function () {
         await realm.write(
           'leaf-field.gts',
           `
-          import { contains, field, FieldDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, FieldDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class LeafField extends FieldDef {
             @field value = contains(StringField);
@@ -2230,8 +2230,8 @@ module(basename(__filename), function () {
         await realm.write(
           'module-a.gts',
           `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           import { value } from "./module-b";
 
           export class ModuleCard extends CardDef {
@@ -2346,8 +2346,8 @@ module(basename(__filename), function () {
         await realm.write(
           'person-rel.gts',
           `
-          import { CardDef, Component, contains, field, linksTo } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { CardDef, Component, contains, field, linksTo } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class PersonRel extends CardDef {
             @field name = contains(StringField);
@@ -2381,7 +2381,7 @@ module(basename(__filename), function () {
         await realm.write(
           'connection-field.gts',
           `
-          import { Component, FieldDef, field, linksTo, linksToMany } from "https://cardstack.com/base/card-api";
+          import { Component, FieldDef, field, linksTo, linksToMany } from "@cardstack/base/card-api";
           import { PersonRel } from "./person-rel";
 
           export class ConnectionField extends FieldDef {
@@ -2420,7 +2420,7 @@ module(basename(__filename), function () {
         await realm.write(
           'relationship-consumer.gts',
           `
-          import { CardDef, Component, contains, field } from "https://cardstack.com/base/card-api";
+          import { CardDef, Component, contains, field } from "@cardstack/base/card-api";
           import { ConnectionField } from "./connection-field";
 
           export class RelationshipConsumer extends CardDef {
@@ -2616,8 +2616,8 @@ module(basename(__filename), function () {
         await realm.write(
           'query-rel-target.gts',
           `
-            import { CardDef, Component, contains, field } from "https://cardstack.com/base/card-api";
-            import StringField from "https://cardstack.com/base/string";
+            import { CardDef, Component, contains, field } from "@cardstack/base/card-api";
+            import StringField from "@cardstack/base/string";
 
             export class QueryRelTarget extends CardDef {
               @field cardTitle = contains(StringField);
@@ -2634,8 +2634,8 @@ module(basename(__filename), function () {
         await realm.write(
           'query-rel-consumer.gts',
           `
-            import { CardDef, Component, contains, field, linksTo, linksToMany } from "https://cardstack.com/base/card-api";
-            import StringField from "https://cardstack.com/base/string";
+            import { CardDef, Component, contains, field, linksTo, linksToMany } from "@cardstack/base/card-api";
+            import StringField from "@cardstack/base/string";
 
             export class QueryRelConsumer extends CardDef {
               @field cardTitle = contains(StringField);
@@ -2768,8 +2768,8 @@ module(basename(__filename), function () {
         await realm.write(
           'query-rel-overlap-target.gts',
           `
-            import { CardDef, Component, contains, field } from "https://cardstack.com/base/card-api";
-            import StringField from "https://cardstack.com/base/string";
+            import { CardDef, Component, contains, field } from "@cardstack/base/card-api";
+            import StringField from "@cardstack/base/string";
 
             export class QueryRelOverlapTarget extends CardDef {
               @field cardTitle = contains(StringField);
@@ -2786,7 +2786,7 @@ module(basename(__filename), function () {
         await realm.write(
           'query-rel-overlap-consumer.gts',
           `
-            import { CardDef, Component, field, linksTo, linksToMany } from "https://cardstack.com/base/card-api";
+            import { CardDef, Component, field, linksTo, linksToMany } from "@cardstack/base/card-api";
 
             export class QueryRelOverlapConsumer extends CardDef {
               @field direct = linksTo(() => CardDef);
@@ -2907,8 +2907,8 @@ module(basename(__filename), function () {
         await realm.write(
           'second-rel.gts',
           `
-          import { CardDef, Component, contains, field } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { CardDef, Component, contains, field } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class SecondRel extends CardDef {
             @field name = contains(StringField);
@@ -2960,8 +2960,8 @@ module(basename(__filename), function () {
         await realm.write(
           'first-rel.gts',
           `
-          import { CardDef, Component, contains, field, linksTo } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { CardDef, Component, contains, field, linksTo } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           import { SecondRel } from "./second-rel";
 
           export class FirstRel extends CardDef {
@@ -3019,7 +3019,7 @@ module(basename(__filename), function () {
         await realm.write(
           'css-relationship-consumer.gts',
           `
-          import { CardDef, Component, field, linksTo } from "https://cardstack.com/base/card-api";
+          import { CardDef, Component, field, linksTo } from "@cardstack/base/card-api";
           import { FirstRel } from "./first-rel";
 
           export class CssRelationshipConsumer extends CardDef {
@@ -3123,8 +3123,8 @@ module(basename(__filename), function () {
         await realm.write(
           'loop-card.gts',
           `
-          import { CardDef, Component, contains, field, linksTo } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { CardDef, Component, contains, field, linksTo } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class LoopCard extends CardDef {
             @field name = contains(StringField);
@@ -3160,7 +3160,7 @@ module(basename(__filename), function () {
         await realm.write(
           'loop-consumer.gts',
           `
-          import { CardDef, Component, field, linksTo } from "https://cardstack.com/base/card-api";
+          import { CardDef, Component, field, linksTo } from "@cardstack/base/card-api";
           import { LoopCard } from "./loop-card";
 
           export class LoopConsumer extends CardDef {
@@ -3296,7 +3296,7 @@ module(basename(__filename), function () {
         await realm.write(
           'relationship-parent.gts',
           `
-          import { CardDef, Component, field, linksTo } from "https://cardstack.com/base/card-api";
+          import { CardDef, Component, field, linksTo } from "@cardstack/base/card-api";
 
           export class RelationshipParent extends CardDef {
             @field child = linksTo(() => CardDef);
@@ -3328,7 +3328,7 @@ module(basename(__filename), function () {
         await realm.write(
           'relationship-grandparent.gts',
           `
-          import { CardDef, Component, field, linksTo } from "https://cardstack.com/base/card-api";
+          import { CardDef, Component, field, linksTo } from "@cardstack/base/card-api";
 
           export class RelationshipGrandParent extends CardDef {
             @field parent = linksTo(() => CardDef);
@@ -3434,8 +3434,8 @@ module(basename(__filename), function () {
         await realm.write(
           'missing-child.gts',
           `
-          import { CardDef, contains, field } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { CardDef, contains, field } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class MissingChild extends CardDef {
             @field title = contains(StringField);
@@ -3513,7 +3513,7 @@ module(basename(__filename), function () {
         await realm.write(
           'filedef-mismatch.gts',
           `
-          import { FileDef as BaseFileDef } from "https://cardstack.com/base/file-api";
+          import { FileDef as BaseFileDef } from "@cardstack/base/file-api";
           import { MissingChild } from "./missing-child";
 
           export class FileDef extends BaseFileDef {
@@ -3525,8 +3525,8 @@ module(basename(__filename), function () {
         await realm.write(
           'relationship-file-parent.gts',
           `
-          import { CardDef, Component, field, linksTo, linksToMany } from "https://cardstack.com/base/card-api";
-          import { FileDef } from "https://cardstack.com/base/file-api";
+          import { CardDef, Component, field, linksTo, linksToMany } from "@cardstack/base/card-api";
+          import { FileDef } from "@cardstack/base/file-api";
 
           export class RelationshipFileParent extends CardDef {
             @field attachment = linksTo(() => FileDef);
@@ -3557,7 +3557,7 @@ module(basename(__filename), function () {
         await realm.write(
           'relationship-file-grandparent.gts',
           `
-          import { CardDef, Component, field, linksTo } from "https://cardstack.com/base/card-api";
+          import { CardDef, Component, field, linksTo } from "@cardstack/base/card-api";
 
           export class RelationshipFileGrandParent extends CardDef {
             @field parent = linksTo(() => CardDef);
@@ -3695,7 +3695,7 @@ module(basename(__filename), function () {
           import {
             FileDef as BaseFileDef,
             FileContentMismatchError,
-          } from "https://cardstack.com/base/file-api";
+          } from "@cardstack/base/file-api";
 
           export class FileDef extends BaseFileDef {
             static async extractAttributes() {
@@ -3763,8 +3763,8 @@ module(basename(__filename), function () {
         await realm.write(
           'file-relationship-consumer.gts',
           `
-          import { CardDef, Component, field, linksTo, linksToMany } from "https://cardstack.com/base/card-api";
-          import { FileDef } from "https://cardstack.com/base/file-api";
+          import { CardDef, Component, field, linksTo, linksToMany } from "@cardstack/base/card-api";
+          import { FileDef } from "@cardstack/base/file-api";
 
           export class FileRelationshipConsumer extends CardDef {
             @field primaryFile = linksTo(() => FileDef);
@@ -3874,8 +3874,8 @@ module(basename(__filename), function () {
         await realm.write(
           'post.gts',
           `
-        import { contains, linksTo, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, linksTo, field, CardDef, Component } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         import { Person } from "./person";
 
         export class Post extends CardDef {
@@ -3909,8 +3909,8 @@ module(basename(__filename), function () {
         await realm.write(
           'pet.gts',
           `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           import { Name } from "./name";
 
           export class Pet extends CardDef {
@@ -3957,8 +3957,8 @@ module(basename(__filename), function () {
         await realm.write(
           'name.gts',
           `
-          import { contains, field, FieldDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, FieldDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class Name extends FieldDef {
             @field firstName = contains(StringField);
@@ -3987,7 +3987,7 @@ module(basename(__filename), function () {
         await realm.write(
           'pet.gts',
           `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
           import { Name } from "./name";
 
           export class Pet extends CardDef {
@@ -4028,8 +4028,8 @@ module(basename(__filename), function () {
         await realm.write(
           'name.gts',
           `
-          import { contains, field, FieldDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, FieldDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class Name extends FieldDef {
             @field firstName = contains(StringField);
@@ -4079,8 +4079,8 @@ module(basename(__filename), function () {
         await realm.write(
           'person.gts',
           `
-          import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class Person extends CardDef {
             @field firstName = contains(StringField);
@@ -4169,8 +4169,8 @@ module(basename(__filename), function () {
         await realm.write(
           'post.gts',
           `
-        import { contains, linksTo, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, linksTo, field, CardDef, Component } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         import { Person } from "./person";
 
         export class Post extends CardDef {
@@ -4200,8 +4200,8 @@ module(basename(__filename), function () {
         mapOfWrites.set(
           'place.gts',
           `
-        import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Place extends CardDef {
           @field name = contains(StringField);
         }
@@ -4210,8 +4210,8 @@ module(basename(__filename), function () {
         mapOfWrites.set(
           'country.gts',
           `
-        import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Country extends CardDef {
           @field name = contains(StringField);
         }
@@ -4249,8 +4249,8 @@ module(basename(__filename), function () {
         mapOfWrites.set(
           'city.gts',
           `
-        import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class City extends CardDef {
           @field name = contains(StringField);
         }
diff --git a/packages/realm-server/tests/module-syntax-test.ts b/packages/realm-server/tests/module-syntax-test.ts
index e30f0840b68..463ff9fb757 100644
--- a/packages/realm-server/tests/module-syntax-test.ts
+++ b/packages/realm-server/tests/module-syntax-test.ts
@@ -29,7 +29,7 @@ module(basename(__filename), function () {
         },
         fieldName: 'age',
         fieldRef: {
-          module: 'https://cardstack.com/base/number',
+          module: '@cardstack/base/number',
           name: 'default',
         },
         fieldType: 'contains',
@@ -44,8 +44,8 @@ module(basename(__filename), function () {
 
     test('can get the code for a card', async function (assert) {
       let src = `
-      import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Person extends CardDef {
         @field firstName = contains(StringField);
@@ -62,8 +62,8 @@ module(basename(__filename), function () {
     test('can add a field to a card', async function (assert) {
       let mod = addField(
         `
-      import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       export class Person extends CardDef {
         @field firstName = contains(StringField);
         static embedded = class Embedded extends Component<typeof this> {
@@ -76,9 +76,9 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-      import NumberField from "https://cardstack.com/base/number";
-      import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import NumberField from "@cardstack/base/number";
+      import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       export class Person extends CardDef {
         @field firstName = contains(StringField);
         @field age = contains(NumberField);
@@ -91,9 +91,9 @@ module(basename(__filename), function () {
       assert.strictEqual(
         mod.code(),
         `
-      import NumberField from "https://cardstack.com/base/number";
-      import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import NumberField from "@cardstack/base/number";
+      import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       export class Person extends CardDef {
         @field firstName = contains(StringField);
         @field age = contains(NumberField);
@@ -114,7 +114,7 @@ module(basename(__filename), function () {
         field?.card,
         {
           type: 'external',
-          module: 'https://cardstack.com/base/number',
+          module: '@cardstack/base/number',
           name: 'default',
         },
         'the field card is correct',
@@ -123,7 +123,7 @@ module(basename(__filename), function () {
         field?.type,
         {
           type: 'external',
-          module: 'https://cardstack.com/base/card-api',
+          module: '@cardstack/base/card-api',
           name: 'contains',
         },
         'the field type is correct',
@@ -132,7 +132,7 @@ module(basename(__filename), function () {
         field?.decorator,
         {
           type: 'external',
-          module: 'https://cardstack.com/base/card-api',
+          module: '@cardstack/base/card-api',
           name: 'field',
         },
         'the field decorator is correct',
@@ -147,7 +147,7 @@ module(basename(__filename), function () {
         },
         fieldName: 'lastName',
         fieldRef: {
-          module: 'https://cardstack.com/base/string',
+          module: '@cardstack/base/string',
           name: 'default',
         },
         fieldType: 'contains',
@@ -159,9 +159,9 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import NumberField from "https://cardstack.com/base/number";
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import NumberField from "@cardstack/base/number";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class Person extends CardDef {
           @field firstName = contains(StringField);
@@ -179,8 +179,8 @@ module(basename(__filename), function () {
       // 4 space indent
       let mod = addField(
         `
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Person extends CardDef {
             @field firstName = contains(StringField);
             static embedded = class Embedded extends Component<typeof this> {
@@ -192,9 +192,9 @@ module(basename(__filename), function () {
       assert.strictEqual(
         mod.code(),
         `
-        import NumberField from "https://cardstack.com/base/number";
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import NumberField from "@cardstack/base/number";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Person extends CardDef {
             @field firstName = contains(StringField);
             @field age = contains(NumberField);
@@ -211,8 +211,8 @@ module(basename(__filename), function () {
       // 2 space indent
       let mod = addField(
         `
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Person extends CardDef {
           static embedded = class Embedded extends Component<typeof this> {
             <template><h1><@fields.firstName/></h1></template>
@@ -223,9 +223,9 @@ module(basename(__filename), function () {
       assert.strictEqual(
         mod.code(),
         `
-        import NumberField from "https://cardstack.com/base/number";
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import NumberField from "@cardstack/base/number";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Person extends CardDef {
           @field age = contains(NumberField);
           static embedded = class Embedded extends Component<typeof this> {
@@ -240,8 +240,8 @@ module(basename(__filename), function () {
     test(`added field defaults to a 2 space indent if it's the only class member`, async function (assert) {
       let mod = addField(
         `
-      import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       export class Person extends CardDef {
       }
       `,
@@ -250,9 +250,9 @@ module(basename(__filename), function () {
       assert.strictEqual(
         mod.code(),
         `
-      import NumberField from "https://cardstack.com/base/number";
-      import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import NumberField from "@cardstack/base/number";
+      import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       export class Person extends CardDef {
         @field age = contains(NumberField);
       }
@@ -261,8 +261,8 @@ module(basename(__filename), function () {
       );
       mod = addField(
         `
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Person extends CardDef {}
       `,
       );
@@ -270,9 +270,9 @@ module(basename(__filename), function () {
       assert.strictEqual(
         mod.code(),
         `
-        import NumberField from "https://cardstack.com/base/number";
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import NumberField from "@cardstack/base/number";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Person extends CardDef {
           @field age = contains(NumberField);
         }
@@ -282,8 +282,8 @@ module(basename(__filename), function () {
 
       mod = addField(
         `
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Person extends CardDef {}
       `,
       );
@@ -291,9 +291,9 @@ module(basename(__filename), function () {
       assert.strictEqual(
         mod.code(),
         `
-        import NumberField from "https://cardstack.com/base/number";
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import NumberField from "@cardstack/base/number";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Person extends CardDef {
           @field age = contains(NumberField);
         }
@@ -306,8 +306,8 @@ module(basename(__filename), function () {
       // 4 space indent
       let mod = addField(
         `
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Person extends CardDef {
             @field firstName = contains(StringField);
             static embedded = class Embedded extends Component<typeof this> {
@@ -320,9 +320,9 @@ module(basename(__filename), function () {
       assert.strictEqual(
         mod.code(),
         `
-        import NumberField from "https://cardstack.com/base/number";
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import NumberField from "@cardstack/base/number";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Person extends CardDef {
             @field age = contains(NumberField);
             @field firstName = contains(StringField);
@@ -337,8 +337,8 @@ module(basename(__filename), function () {
 
     test('can add a base-card field to a card', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       export class Pet extends CardDef {
         @field petName = contains(StringField);
       }
@@ -360,8 +360,8 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import { contains, field, CardDef, linksTo } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef, linksTo } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Pet extends CardDef {
           @field petName = contains(StringField);
           @field card = linksTo(CardDef);
@@ -372,8 +372,8 @@ module(basename(__filename), function () {
 
     test('can add a base-field field to a card', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       export class Pet extends CardDef {
         @field petName = contains(StringField);
       }
@@ -395,8 +395,8 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import { contains, field, CardDef, FieldDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef, FieldDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Pet extends CardDef {
           @field petName = contains(StringField);
           @field field = contains(FieldDef);
@@ -407,8 +407,8 @@ module(basename(__filename), function () {
 
     test('can add a field to a card when the module url is relative', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       export class Pet extends CardDef {
         @field petName = contains(StringField);
       }
@@ -434,8 +434,8 @@ module(basename(__filename), function () {
         mod.code(),
         `
         import { Person as PersonCard } from "./person";
-        import { contains, field, CardDef, linksTo } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef, linksTo } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Pet extends CardDef {
           @field petName = contains(StringField);
           @field bestFriend = linksTo(PersonCard);
@@ -446,8 +446,8 @@ module(basename(__filename), function () {
 
     test('can add a field to a card when the module url is from another realm', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       export class Pet extends CardDef {
         @field petName = contains(StringField);
       }
@@ -473,8 +473,8 @@ module(basename(__filename), function () {
         mod.code(),
         `
         import { Person as PersonCard } from "http://localhost:4202/test/person";
-        import { contains, field, CardDef, linksTo } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef, linksTo } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Pet extends CardDef {
           @field petName = contains(StringField);
           @field bestFriend = linksTo(PersonCard);
@@ -485,7 +485,7 @@ module(basename(__filename), function () {
 
     test("can add a field to a card that doesn't have any fields", async function (assert) {
       let src = `
-        import { CardDef } from "https://cardstack.com/base/card-api";
+        import { CardDef } from "@cardstack/base/card-api";
 
         export class Person extends CardDef { }
       `;
@@ -495,7 +495,7 @@ module(basename(__filename), function () {
         cardBeingModified: { module: `${testRealm}dir/person`, name: 'Person' },
         fieldName: 'firstName',
         fieldRef: {
-          module: 'https://cardstack.com/base/string',
+          module: '@cardstack/base/string',
           name: 'default',
         },
         fieldType: 'contains',
@@ -508,8 +508,8 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-          import StringField from "https://cardstack.com/base/string";
-          import { CardDef, field, contains } from "https://cardstack.com/base/card-api";
+          import StringField from "@cardstack/base/string";
+          import { CardDef, field, contains } from "@cardstack/base/card-api";
 
           export class Person extends CardDef {
             @field firstName = contains(StringField);
@@ -520,8 +520,8 @@ module(basename(__filename), function () {
 
     test('can add a field to an interior card that is the field of card that is exported', async function (assert) {
       let src = `
-      import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       class Details extends CardDef {
         @field favoriteColor = contains(StringField);
@@ -546,7 +546,7 @@ module(basename(__filename), function () {
         fieldName: 'age',
         fieldDefinitionType: 'field',
         fieldRef: {
-          module: 'https://cardstack.com/base/number',
+          module: '@cardstack/base/number',
           name: 'default',
         },
         fieldType: 'contains',
@@ -558,9 +558,9 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import NumberField from "https://cardstack.com/base/number";
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import NumberField from "@cardstack/base/number";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         class Details extends CardDef {
           @field favoriteColor = contains(StringField);
@@ -580,8 +580,8 @@ module(basename(__filename), function () {
 
     test('can add a field to an interior card that is the ancestor of card that is exported', async function (assert) {
       let src = `
-      import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       class Person extends CardDef {
         @field firstName = contains(StringField);
@@ -604,7 +604,7 @@ module(basename(__filename), function () {
         fieldName: 'age',
         fieldDefinitionType: 'field',
         fieldRef: {
-          module: 'https://cardstack.com/base/number',
+          module: '@cardstack/base/number',
           name: 'default',
         },
         fieldType: 'contains',
@@ -616,9 +616,9 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import NumberField from "https://cardstack.com/base/number";
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import NumberField from "@cardstack/base/number";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         class Person extends CardDef {
           @field firstName = contains(StringField);
@@ -637,8 +637,8 @@ module(basename(__filename), function () {
 
     test('can add a field to an interior card within a module that also has non card declarations', async function (assert) {
       let src = `
-      import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Foo {}
 
@@ -665,7 +665,7 @@ module(basename(__filename), function () {
         fieldName: 'age',
         fieldDefinitionType: 'field',
         fieldRef: {
-          module: 'https://cardstack.com/base/number',
+          module: '@cardstack/base/number',
           name: 'default',
         },
         fieldType: 'contains',
@@ -677,9 +677,9 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import NumberField from "https://cardstack.com/base/number";
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import NumberField from "@cardstack/base/number";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class Foo {}
 
@@ -701,8 +701,8 @@ module(basename(__filename), function () {
 
     test('can add a containsMany field', async function (assert) {
       let src = `
-      import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Person extends CardDef {
         @field firstName = contains(StringField);
@@ -718,7 +718,7 @@ module(basename(__filename), function () {
         fieldName: 'aliases',
         fieldDefinitionType: 'field',
         fieldRef: {
-          module: 'https://cardstack.com/base/string',
+          module: '@cardstack/base/string',
           name: 'default',
         },
         fieldType: 'containsMany',
@@ -730,8 +730,8 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import { contains, field, Component, CardDef, containsMany } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, Component, CardDef, containsMany } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class Person extends CardDef {
           @field firstName = contains(StringField);
@@ -751,7 +751,7 @@ module(basename(__filename), function () {
         field?.type,
         {
           type: 'external',
-          module: 'https://cardstack.com/base/card-api',
+          module: '@cardstack/base/card-api',
           name: 'containsMany',
         },
         'the field type is correct',
@@ -760,8 +760,8 @@ module(basename(__filename), function () {
 
     test('can add a linksTo field', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
       export class Person extends CardDef {
         @field firstName = contains(StringField);
       }
@@ -785,8 +785,8 @@ module(basename(__filename), function () {
         mod.code(),
         `
         import { Pet as PetCard } from "${testRealm}dir/pet";
-        import { contains, field, CardDef, linksTo } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef, linksTo } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class Person extends CardDef {
           @field firstName = contains(StringField);
           @field pet = linksTo(PetCard);
@@ -802,7 +802,7 @@ module(basename(__filename), function () {
         field?.type,
         {
           type: 'external',
-          module: 'https://cardstack.com/base/card-api',
+          module: '@cardstack/base/card-api',
           name: 'linksTo',
         },
         'the field type is correct',
@@ -811,8 +811,8 @@ module(basename(__filename), function () {
 
     test('can add a linksTo field with the same type as its enclosing card', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Person extends CardDef {
         @field firstName = contains(StringField);
@@ -836,8 +836,8 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import { contains, field, CardDef, linksTo } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef, linksTo } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class Person extends CardDef {
           @field firstName = contains(StringField);
@@ -854,7 +854,7 @@ module(basename(__filename), function () {
         field?.type,
         {
           type: 'external',
-          module: 'https://cardstack.com/base/card-api',
+          module: '@cardstack/base/card-api',
           name: 'linksTo',
         },
         'the field type is correct',
@@ -863,8 +863,8 @@ module(basename(__filename), function () {
 
     test('can add a contains field with a computed value', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Person extends CardDef {
         @field firstName = contains(StringField);
@@ -879,7 +879,7 @@ module(basename(__filename), function () {
         fieldType: 'contains',
         fieldDefinitionType: 'field',
         fieldRef: {
-          module: 'https://cardstack.com/base/string',
+          module: '@cardstack/base/string',
           name: 'default',
         },
         incomingRelativeTo: undefined,
@@ -894,8 +894,8 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class Person extends CardDef {
           @field firstName = contains(StringField);
@@ -912,8 +912,8 @@ module(basename(__filename), function () {
 
     test('can handle field card declaration collisions when adding field', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       const NumberField = "don't collide with me";
 
@@ -927,7 +927,7 @@ module(basename(__filename), function () {
         cardBeingModified: { module: `${testRealm}dir/person`, name: 'Person' },
         fieldName: 'age',
         fieldRef: {
-          module: 'https://cardstack.com/base/number',
+          module: '@cardstack/base/number',
           name: 'default',
         },
         fieldType: 'contains',
@@ -940,9 +940,9 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import NumberField0 from "https://cardstack.com/base/number";
-        import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import NumberField0 from "@cardstack/base/number";
+        import { contains, field, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         const NumberField = "don't collide with me";
 
@@ -959,8 +959,8 @@ module(basename(__filename), function () {
     // definition to ensure this field does not already exist in the adoption chain
     test('throws when adding a field with a name the card already has', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Person extends CardDef {
         @field firstName = contains(StringField);
@@ -975,7 +975,7 @@ module(basename(__filename), function () {
           },
           fieldName: 'firstName',
           fieldRef: {
-            module: 'https://cardstack.com/base/string',
+            module: '@cardstack/base/string',
             name: 'default',
           },
           fieldType: 'contains',
@@ -995,8 +995,8 @@ module(basename(__filename), function () {
 
     test('can remove a field from a card', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Person extends CardDef {
         @field firstName = contains(StringField);
@@ -1012,8 +1012,8 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class Person extends CardDef {
           @field lastName = contains(StringField);
@@ -1023,8 +1023,8 @@ module(basename(__filename), function () {
       assert.strictEqual(
         mod.code().trim(),
         `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Person extends CardDef {
         @field lastName = contains(StringField);
@@ -1042,8 +1042,8 @@ module(basename(__filename), function () {
 
     test('can use remove & add a field to achieve edit in place', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Person extends CardDef {
         @field firstName = contains(StringField);
@@ -1063,7 +1063,7 @@ module(basename(__filename), function () {
         cardBeingModified: { module: `${testRealm}dir/person`, name: 'Person' },
         fieldName: 'artistNames',
         fieldRef: {
-          module: 'https://cardstack.com/base/string',
+          module: '@cardstack/base/string',
           name: 'default',
         },
         fieldType: 'containsMany',
@@ -1077,8 +1077,8 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import { contains, field, CardDef, containsMany } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef, containsMany } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class Person extends CardDef {
           @field firstName = contains(StringField);
@@ -1092,8 +1092,8 @@ module(basename(__filename), function () {
 
     test('can use remove & add a field to achieve edit in place - when field is at the beginning', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Person extends CardDef {
         @field firstName = contains(StringField);
@@ -1113,7 +1113,7 @@ module(basename(__filename), function () {
         cardBeingModified: { module: `${testRealm}dir/person`, name: 'Person' },
         fieldName: 'firstNameAdjusted',
         fieldRef: {
-          module: 'https://cardstack.com/base/string',
+          module: '@cardstack/base/string',
           name: 'default',
         },
         fieldType: 'contains',
@@ -1127,8 +1127,8 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class Person extends CardDef {
           @field firstNameAdjusted = contains(StringField);
@@ -1142,8 +1142,8 @@ module(basename(__filename), function () {
 
     test('can use remove & add a field to achieve edit in place - when field is at the end', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Person extends CardDef {
         @field firstName = contains(StringField);
@@ -1163,7 +1163,7 @@ module(basename(__filename), function () {
         cardBeingModified: { module: `${testRealm}dir/person`, name: 'Person' },
         fieldName: 'streetNameAdjusted',
         fieldRef: {
-          module: 'https://cardstack.com/base/string',
+          module: '@cardstack/base/string',
           name: 'default',
         },
         fieldType: 'contains',
@@ -1177,8 +1177,8 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class Person extends CardDef {
           @field firstName = contains(StringField);
@@ -1192,8 +1192,8 @@ module(basename(__filename), function () {
 
     test('can remove the last field from a card', async function (assert) {
       let src = `
-      import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Person extends CardDef {
         @field firstName = contains(StringField);
@@ -1209,7 +1209,7 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import { CardDef } from "https://cardstack.com/base/card-api";
+        import { CardDef } from "@cardstack/base/card-api";
         export class Person extends CardDef { }
       `,
       );
@@ -1217,8 +1217,8 @@ module(basename(__filename), function () {
 
     test('can remove a linksTo field with the same type as its enclosing card', async function (assert) {
       let src = `
-      import { contains, field, CardDef, linksTo } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, CardDef, linksTo } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Friend extends CardDef {
         @field firstName = contains(StringField);
@@ -1234,8 +1234,8 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class Friend extends CardDef {
           @field firstName = contains(StringField);
@@ -1252,8 +1252,8 @@ module(basename(__filename), function () {
 
     test('can remove the field of an interior card that is the ancestor of a card that is exported', async function (assert) {
       let src = `
-      import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       class Person extends CardDef {
         @field firstName = contains(StringField);
@@ -1276,8 +1276,8 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         class Person extends CardDef {
           @field lastName = contains(StringField);
@@ -1292,8 +1292,8 @@ module(basename(__filename), function () {
 
     test('can remove the field of an interior card that is the field of a card that is exported', async function (assert) {
       let src = `
-      import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       class Details extends CardDef {
         @field nickName = contains(StringField);
@@ -1319,8 +1319,8 @@ module(basename(__filename), function () {
       assert.codeEqual(
         mod.code(),
         `
-        import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         class Details extends CardDef {
           @field favoriteColor = contains(StringField);
@@ -1337,8 +1337,8 @@ module(basename(__filename), function () {
 
     test('throws when field to remove does not actually exist', async function (assert) {
       let src = `
-      import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api";
-      import StringField from "https://cardstack.com/base/string";
+      import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+      import StringField from "@cardstack/base/string";
 
       export class Person extends CardDef {
         @field firstName = contains(StringField);
diff --git a/packages/realm-server/tests/node-realm-test.ts b/packages/realm-server/tests/node-realm-test.ts
index 3b59332cd57..c47673c31a8 100644
--- a/packages/realm-server/tests/node-realm-test.ts
+++ b/packages/realm-server/tests/node-realm-test.ts
@@ -7,7 +7,7 @@ import {
   upsertSessionRoom,
 } from '@cardstack/runtime-common';
 import type { MatrixClient } from '@cardstack/runtime-common/matrix-client';
-import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event';
+import type { RealmEventContent } from '@cardstack/base/matrix-event';
 import { NodeAdapter } from '../node-realm';
 import { insertUser, setupDB } from './helpers';
 
diff --git a/packages/realm-server/tests/prerender-server-test.ts b/packages/realm-server/tests/prerender-server-test.ts
index 1e86723f76c..e26a7690e72 100644
--- a/packages/realm-server/tests/prerender-server-test.ts
+++ b/packages/realm-server/tests/prerender-server-test.ts
@@ -32,8 +32,8 @@ module(basename(__filename), function () {
       realmURL,
       fileSystem: {
         'pet.gts': `
-          import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
-          import { Component } from 'https://cardstack.com/base/card-api';
+          import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
+          import { Component } from '@cardstack/base/card-api';
           export class Pet extends CardDef {
             static displayName = 'Pet';
             @field name = contains(StringField);
@@ -55,7 +55,7 @@ module(basename(__filename), function () {
             field,
             contains,
             StringField,
-          } from 'https://cardstack.com/base/card-api';
+          } from '@cardstack/base/card-api';
 
           export class CommandResult extends CardDef {
             static displayName = 'CommandResult';
@@ -185,7 +185,7 @@ module(basename(__filename), function () {
       assert.ok(
         (res.body.data.attributes.deps as string[]).find((d) =>
           d.match(
-            /^https:\/\/cardstack.com\/base\/card-api\.gts\..*glimmer-scoped\.css$/,
+            /^@cardstack\/base\/card-api\.gts\..*glimmer-scoped\.css$/,
           ),
         ),
         `glimmer scoped css from ${baseCardRef.module} is a dep`,
diff --git a/packages/realm-server/tests/prerendering-test.ts b/packages/realm-server/tests/prerendering-test.ts
index a6cdea4c4e2..a60795af62a 100644
--- a/packages/realm-server/tests/prerendering-test.ts
+++ b/packages/realm-server/tests/prerendering-test.ts
@@ -222,7 +222,7 @@ module(basename(__filename), function () {
           },
           fileSystem: {
             'person.gts': `
-              import { CardDef, field, contains, StringField, Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, StringField, Component } from '@cardstack/base/card-api';
               export class Person extends CardDef {
                 static displayName = "Person";
                 @field name = contains(StringField);
@@ -336,7 +336,7 @@ module(basename(__filename), function () {
       await realmAdapter.write(
         'person.gts',
         `
-          import { CardDef, field, contains, StringField, Component } from 'https://cardstack.com/base/card-api';
+          import { CardDef, field, contains, StringField, Component } from '@cardstack/base/card-api';
           export class Person extends CardDef {
             static displayName = "Updated Person";
             @field name = contains(StringField);
@@ -417,7 +417,7 @@ module(basename(__filename), function () {
       await realmAdapter.write(
         'filedef-mismatch.gts',
         `
-          import { FileDef as BaseFileDef } from "https://cardstack.com/base/file-api";
+          import { FileDef as BaseFileDef } from "@cardstack/base/file-api";
           import { MissingChild } from "./missing-child";
 
           export class FileDef extends BaseFileDef {
@@ -518,7 +518,7 @@ module(basename(__filename), function () {
             },
             fileSystem: {
               'person.gts': `
-              import { CardDef, field, contains, StringField, Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, StringField, Component } from '@cardstack/base/card-api';
               export class Person extends CardDef {
                 static displayName = "Person";
                 @field name = contains(StringField);
@@ -541,7 +541,7 @@ module(basename(__filename), function () {
                 },
               },
               'no-icon.gts': `
-                import { CardDef, field, contains, StringField, Component } from 'https://cardstack.com/base/card-api';
+                import { CardDef, field, contains, StringField, Component } from '@cardstack/base/card-api';
                 export class NoIcon extends CardDef {
                   static displayName = "No Icon";
                   static icon = class extends Component<typeof this> {
@@ -567,7 +567,7 @@ module(basename(__filename), function () {
                 },
               },
               'bad-icon-import.gts': `
-                import { CardDef, field, contains, StringField, Component } from 'https://cardstack.com/base/card-api';
+                import { CardDef, field, contains, StringField, Component } from '@cardstack/base/card-api';
                 export class BadIconImport extends CardDef {
                   static displayName = "Bad Icon Import";
                   static icon = undefined as any;
@@ -602,7 +602,7 @@ module(basename(__filename), function () {
                 },
               },
               'rejects.gts': `
-              import { CardDef, Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, Component } from '@cardstack/base/card-api';
               export class Rejects extends CardDef {
                 static isolated = class extends Component<typeof this> {
                   constructor(...args) {
@@ -624,7 +624,7 @@ module(basename(__filename), function () {
                 },
               },
               'rsvp-rejects.gts': `
-              import { CardDef, Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, Component } from '@cardstack/base/card-api';
               import * as RSVP from 'rsvp';
               export class RsvpRejects extends CardDef {
                 static isolated = class extends Component<typeof this> {
@@ -647,7 +647,7 @@ module(basename(__filename), function () {
                 },
               },
               'throws.gts': `
-              import { CardDef, Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, Component } from '@cardstack/base/card-api';
               export class Throws extends CardDef {
                 static isolated = class extends Component<typeof this> {
                   get explode() {
@@ -668,7 +668,7 @@ module(basename(__filename), function () {
                 },
               },
               'console-error.gts': `
-              import { CardDef, Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, Component } from '@cardstack/base/card-api';
               export class ConsoleError extends CardDef {
                 static isolated = class extends Component<typeof this> {
                   get explode() {
@@ -690,7 +690,7 @@ module(basename(__filename), function () {
                 },
               },
               'console-no-error.gts': `
-              import { CardDef, Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, Component } from '@cardstack/base/card-api';
               export class ConsoleNoError extends CardDef {
                 static isolated = class extends Component<typeof this> {
                   constructor(...args) {
@@ -712,7 +712,7 @@ module(basename(__filename), function () {
                 },
               },
               'directory-query.gts': `
-              import { CardDef, field, contains, linksTo, linksToMany, StringField, Component, queryableValue } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, linksTo, linksToMany, StringField, Component, queryableValue } from '@cardstack/base/card-api';
 
               export class Person extends CardDef {
                 static displayName = 'Person';
@@ -1583,7 +1583,7 @@ module(basename(__filename), function () {
             },
             fileSystem: {
               'person.gts': `
-                import { CardDef, field, contains, StringField, Component } from 'https://cardstack.com/base/card-api';
+                import { CardDef, field, contains, StringField, Component } from '@cardstack/base/card-api';
                 export class Person extends CardDef {
                   static displayName = "Person";
                   @field name = contains(StringField);
@@ -1593,7 +1593,7 @@ module(basename(__filename), function () {
                 }
               `,
               'dep-reset-consumer.gts': `
-                import { CardDef, field, linksTo, Component } from 'https://cardstack.com/base/card-api';
+                import { CardDef, field, linksTo, Component } from '@cardstack/base/card-api';
                 import { Person } from './person';
                 export class DepResetConsumer extends CardDef {
                   static displayName = 'Dep Reset Consumer';
@@ -1767,7 +1767,7 @@ module(basename(__filename), function () {
             },
             fileSystem: {
               'prerendered-search-live.gts': `
-              import { CardDef, Component, field, contains, StringField, linksTo } from 'https://cardstack.com/base/card-api';
+              import { CardDef, Component, field, contains, StringField, linksTo } from '@cardstack/base/card-api';
 
               export class LiveSearchResult extends CardDef {
                 static displayName = 'Live Search Result';
@@ -1903,7 +1903,7 @@ module(basename(__filename), function () {
                 },
               },
               'live-file-search-card.gts': `
-              import { CardDef, Component, field, contains, StringField, linksTo } from 'https://cardstack.com/base/card-api';
+              import { CardDef, Component, field, contains, StringField, linksTo } from '@cardstack/base/card-api';
 
               export class LiveFileSearchInner extends CardDef {
                 static displayName = 'Live File Search Inner';
@@ -1920,7 +1920,7 @@ module(basename(__filename), function () {
                     return {
                       filter: {
                         on: {
-                          module: 'https://cardstack.com/base/file-api',
+                          module: '@cardstack/base/file-api',
                           name: 'FileDef',
                         },
                         eq: {
@@ -2185,8 +2185,8 @@ module(basename(__filename), function () {
           },
           fileSystem: {
             'article.gts': `
-              import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { contains, field, CardDef } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
               export class Article extends CardDef {
                 @field title = contains(StringField);
               }
@@ -2214,7 +2214,7 @@ module(basename(__filename), function () {
           },
           fileSystem: {
             'website.gts': `
-              import { contains, field, CardDef, linksTo } from "https://cardstack.com/base/card-api";
+              import { contains, field, CardDef, linksTo } from "@cardstack/base/card-api";
               import { Article } from "${providerRealmURL}article" // importing from another realm;
               export class Website extends CardDef {
                 @field linkedArticle = linksTo(Article);
@@ -2232,8 +2232,8 @@ module(basename(__filename), function () {
               },
             },
             'auth-proxy.gts': `
-              import { contains, field, CardDef, linksTo, Component } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { contains, field, CardDef, linksTo, Component } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
               // define a local stand-in type so the consumer realm doesn't need to import provider modules
               export class RemoteArticle extends CardDef {
                 @field title = contains(StringField);
@@ -2440,8 +2440,8 @@ module(basename(__filename), function () {
 
     let makeQueryDirectoryFileSystem = () => ({
       'person.gts': `
-        import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         export class Person extends CardDef {
           @field name = contains(StringField);
@@ -2474,7 +2474,7 @@ module(basename(__filename), function () {
         },
       },
       'query-directory.gts': `
-        import { field, CardDef, Component, linksToMany } from "https://cardstack.com/base/card-api";
+        import { field, CardDef, Component, linksToMany } from "@cardstack/base/card-api";
         import { Person } from "./person";
 
         export class QueryDirectory extends CardDef {
@@ -2511,7 +2511,7 @@ module(basename(__filename), function () {
         },
       },
       'query-directory-proxy.gts': `
-        import { field, CardDef, Component, linksTo } from "https://cardstack.com/base/card-api";
+        import { field, CardDef, Component, linksTo } from "@cardstack/base/card-api";
         import { QueryDirectory } from "./query-directory";
 
         export class QueryDirectoryProxy extends CardDef {
@@ -2635,8 +2635,8 @@ module(basename(__filename), function () {
 
       let makeQueryDirectoryFileSystem = () => ({
         'person.gts': `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class Person extends CardDef {
             @field name = contains(StringField);
@@ -2669,7 +2669,7 @@ module(basename(__filename), function () {
           },
         },
         'query-directory.gts': `
-          import { field, CardDef, Component, linksToMany } from "https://cardstack.com/base/card-api";
+          import { field, CardDef, Component, linksToMany } from "@cardstack/base/card-api";
           import { Person } from "./person";
 
           export class QueryDirectory extends CardDef {
@@ -2706,7 +2706,7 @@ module(basename(__filename), function () {
           },
         },
         'query-directory-proxy.gts': `
-          import { field, CardDef, Component, linksTo } from "https://cardstack.com/base/card-api";
+          import { field, CardDef, Component, linksTo } from "@cardstack/base/card-api";
           import { QueryDirectory } from "./query-directory";
 
           export class QueryDirectoryProxy extends CardDef {
@@ -2866,8 +2866,8 @@ module(basename(__filename), function () {
             },
             fileSystem: {
               'person.gts': `
-              import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
-              import { Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
+              import { Component } from '@cardstack/base/card-api';
               export class Person extends CardDef {
                 static displayName = "Person";
                 @field name = contains(StringField);
@@ -2925,8 +2925,8 @@ module(basename(__filename), function () {
                 },
               },
               'cat.gts': `
-              import { CardDef, field, contains, linksTo, StringField } from 'https://cardstack.com/base/card-api';
-              import { Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, linksTo, StringField } from '@cardstack/base/card-api';
+              import { Component } from '@cardstack/base/card-api';
               import { Person } from '${realmURL1}person';
               export class Cat extends CardDef {
                 @field name = contains(StringField);
@@ -2936,7 +2936,7 @@ module(basename(__filename), function () {
               }
             `,
               'dog.gts': `
-              import { CardDef, field, contains, linksTo, StringField, Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, linksTo, StringField, Component } from '@cardstack/base/card-api';
               import { Person } from '${realmURL1}person';
               export class Dog extends CardDef {
                 static displayName = "Dog";
@@ -2949,7 +2949,7 @@ module(basename(__filename), function () {
               }
             `,
               'dog-many.gts': `
-              import { CardDef, field, contains, linksToMany, StringField, Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, linksToMany, StringField, Component } from '@cardstack/base/card-api';
               import { Person } from '${realmURL1}person';
               export class DogMany extends CardDef {
                 static displayName = "Dog Many";
@@ -2962,7 +2962,7 @@ module(basename(__filename), function () {
               }
             `,
               'dog-profile.gts': `
-              import { CardDef, FieldDef, field, contains, linksTo, linksToMany, StringField, Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, FieldDef, field, contains, linksTo, linksToMany, StringField, Component } from '@cardstack/base/card-api';
               import { Person } from '${realmURL1}person';
 
               class DogProfileField extends FieldDef {
@@ -2981,7 +2981,7 @@ module(basename(__filename), function () {
               }
             `,
               'non-isolated-links-card.gts': `
-              import { CardDef, FieldDef, field, contains, linksTo, linksToMany, StringField, Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, FieldDef, field, contains, linksTo, linksToMany, StringField, Component } from '@cardstack/base/card-api';
               import { Person } from '${realmURL1}person';
 
               class RelationshipField extends FieldDef {
@@ -3158,7 +3158,7 @@ module(basename(__filename), function () {
                   },
                   meta: {
                     adoptsFrom: {
-                      module: 'https://cardstack.com/base/brand-guide',
+                      module: '@cardstack/base/brand-guide',
                       name: 'default',
                     },
                   },
@@ -3203,8 +3203,8 @@ module(basename(__filename), function () {
                 },
               },
               'intentional-error.gts': `
-              import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
-              import { Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
+              import { Component } from '@cardstack/base/card-api';
               export class IntentionalError extends CardDef {
                 @field name = contains(StringField);
                 static displayName = "Intentional Error";
@@ -3233,8 +3233,8 @@ module(basename(__filename), function () {
                 },
               },
               'timer-error-card.gts': `
-              import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
-              import { Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
+              import { Component } from '@cardstack/base/card-api';
               export class TimerError extends CardDef {
                 @field name = contains(StringField);
                 static displayName = "Timer Error";
@@ -3262,8 +3262,8 @@ module(basename(__filename), function () {
                 },
               },
               'timer-timeout-card.gts': `
-              import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
-              import { Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
+              import { Component } from '@cardstack/base/card-api';
               setTimeout(() => {}, 0);
               setInterval(() => {}, 5);
               export class TimerTimeout extends CardDef {
@@ -3297,8 +3297,8 @@ module(basename(__filename), function () {
               // causing data-prerender-status to be set to 'unusable' by the error handler without
               // transitioning to the render-error route (so nothing overwrites our dataset).
               'unusable-error.gts': `
-              import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
-              import { Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
+              import { Component } from '@cardstack/base/card-api';
               export class UnusableError extends CardDef {
                 @field name = contains(StringField);
                 static displayName = "Unusable Error";
@@ -3324,7 +3324,7 @@ module(basename(__filename), function () {
                 },
               },
               'embedded-error.gts': `
-              import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
               export class EmbeddedError extends CardDef {
                 @field name = contains(StringField);
                 static displayName = "Embedded Error";
@@ -3366,8 +3366,8 @@ module(basename(__filename), function () {
             },
             fileSystem: {
               'dog.gts': `
-              import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api';
-              import { Component } from 'https://cardstack.com/base/card-api';
+              import { CardDef, field, contains, StringField } from '@cardstack/base/card-api';
+              import { Component } from '@cardstack/base/card-api';
               export class Dog extends CardDef {
                 @field name = contains(StringField);
                 static displayName = "Dog";
@@ -3428,7 +3428,7 @@ module(basename(__filename), function () {
           assert.ok(
             /data-test-card-thumbnail-placeholder/.test(
               result.embeddedHTML![
-                'https://cardstack.com/base/card-api/CardDef'
+                '@cardstack/base/card-api/CardDef'
               ],
             ),
             `failed to match embedded html:${JSON.stringify(result.embeddedHTML)}`,
@@ -3515,7 +3515,7 @@ module(basename(__filename), function () {
         test('types', function (assert) {
           assert.deepEqual(result.types, [
             `${realmURL2}cat/Cat`,
-            'https://cardstack.com/base/card-api/CardDef',
+            '@cardstack/base/card-api/CardDef',
           ]);
         });
 
@@ -5258,8 +5258,8 @@ module(basename(__filename), function () {
 
       let childRealmFileSystem: Record<string, any> = {
         'detail.gts': `
-          import { CardDef, field, contains, Component } from 'https://cardstack.com/base/card-api';
-          import StringField from 'https://cardstack.com/base/string';
+          import { CardDef, field, contains, Component } from '@cardstack/base/card-api';
+          import StringField from '@cardstack/base/string';
           export class Detail extends CardDef {
             static displayName = 'Detail';
             @field info = contains(StringField);
@@ -5286,8 +5286,8 @@ module(basename(__filename), function () {
 
       let parentRealmFileSystem: Record<string, any> = {
         'child-config.gts': `
-          import { CardDef, field, contains, linksTo, Component } from 'https://cardstack.com/base/card-api';
-          import StringField from 'https://cardstack.com/base/string';
+          import { CardDef, field, contains, linksTo, Component } from '@cardstack/base/card-api';
+          import StringField from '@cardstack/base/string';
           import { Detail } from '${childRealmURL}detail';
           export class ChildConfig extends CardDef {
             static displayName = 'Child Config';
@@ -5306,7 +5306,7 @@ module(basename(__filename), function () {
           }
         `,
         'parent-card.gts': `
-          import { CardDef, field, linksToMany, Component } from 'https://cardstack.com/base/card-api';
+          import { CardDef, field, linksToMany, Component } from '@cardstack/base/card-api';
           import { ChildConfig } from './child-config';
           export class ParentCard extends CardDef {
             static displayName = 'Parent Card';
diff --git a/packages/realm-server/tests/publish-unpublish-realm-test.ts b/packages/realm-server/tests/publish-unpublish-realm-test.ts
index ae338f2c7ff..0f32ccdab2c 100644
--- a/packages/realm-server/tests/publish-unpublish-realm-test.ts
+++ b/packages/realm-server/tests/publish-unpublish-realm-test.ts
@@ -363,7 +363,7 @@ module(basename(__filename), function () {
         let linkedCardModuleResponse = await request
           .post(`${sourceRealmPath}linked-card.gts`)
           .set('Accept', 'application/vnd.card+source').send(`
-            import { CardDef } from "https://cardstack.com/base/card-api";
+            import { CardDef } from "@cardstack/base/card-api";
             import { linkedCardTitle } from "./linked-card-title";
 
             export const _linkedCardTitle = linkedCardTitle;
@@ -661,7 +661,7 @@ module(basename(__filename), function () {
             },
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'CardDef',
               },
             },
diff --git a/packages/realm-server/tests/realm-endpoints-test.ts b/packages/realm-server/tests/realm-endpoints-test.ts
index 4a9a0a05202..73fa7193ae3 100644
--- a/packages/realm-server/tests/realm-endpoints-test.ts
+++ b/packages/realm-server/tests/realm-endpoints-test.ts
@@ -16,6 +16,7 @@ import {
 import type { Realm } from '@cardstack/runtime-common';
 import {
   baseRealm,
+  registerCardReferencePrefix,
   CachingDefinitionLookup,
   SupportedMimeType,
   type LooseSingleCardDocument,
@@ -60,7 +61,7 @@ import type {
   RealmEvent,
   RealmEventContent,
   UpdateRealmEventContent,
-} from 'https://cardstack.com/base/matrix-event';
+} from '@cardstack/base/matrix-event';
 
 const testRealm2URL = new URL('http://127.0.0.1:4445/test/');
 
@@ -807,7 +808,7 @@ module(basename(__filename), function () {
         field,
         Component,
         FieldDef,
-      } from 'https://cardstack.com/base/card-api';
+      } from '@cardstack/base/card-api';
       import { Country } from './country';
 
       export class TranspileTestField extends FieldDef {
@@ -1858,14 +1859,18 @@ module(basename(__filename), function () {
           virtualNetwork,
           testCreatePrerenderAuth,
         );
-        virtualNetwork.addURLMapping(new URL(baseRealm.url), localBaseRealmURL);
+        registerCardReferencePrefix(baseRealm.url, localBaseRealmURL.href);
+        virtualNetwork.addImportMap(
+          baseRealm.url,
+          (rest) => new URL(rest, localBaseRealmURL).href,
+        );
 
         ({ realm: base } = await createRealm({
           definitionLookup,
           withWorker: true,
           prerenderer,
           dir: basePath,
-          realmURL: baseRealm.url,
+          realmURL: localBaseRealmURL.href,
           virtualNetwork,
           publisher,
           runner,
diff --git a/packages/realm-server/tests/realm-endpoints/dependencies-test.ts b/packages/realm-server/tests/realm-endpoints/dependencies-test.ts
index 7150953624d..a746c6fd76d 100644
--- a/packages/realm-server/tests/realm-endpoints/dependencies-test.ts
+++ b/packages/realm-server/tests/realm-endpoints/dependencies-test.ts
@@ -39,8 +39,8 @@ module(`realm-endpoints/${basename(__filename)}`, function (hooks) {
     await testRealm.write(
       'dependencies-card.gts',
       `
-        import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { contains, field, CardDef } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         export class ResourceIndexCard extends CardDef {
           @field title = contains(StringField);
         }
@@ -67,7 +67,7 @@ module(`realm-endpoints/${basename(__filename)}`, function (hooks) {
     assert.false(entry.attributes.hasError);
     assert.true(
       entry.attributes.dependencies.includes(
-        'https://cardstack.com/base/card-api',
+        '@cardstack/base/card-api',
       ),
       'includes consumed card-api module dependency',
     );
diff --git a/packages/realm-server/tests/realm-endpoints/lint-test.ts b/packages/realm-server/tests/realm-endpoints/lint-test.ts
index 6a099a9ef26..36f305fe744 100644
--- a/packages/realm-server/tests/realm-endpoints/lint-test.ts
+++ b/packages/realm-server/tests/realm-endpoints/lint-test.ts
@@ -74,7 +74,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
       const testCases = [
         {
           name: 'Plain text request',
-          source: `import { CardDef } from 'https://cardstack.com/base/card-api';
+          source: `import { CardDef } from '@cardstack/base/card-api';
 export class MyCard extends CardDef {
   @field name = contains(StringField);
 }`,
@@ -226,7 +226,7 @@ computeVia.call({ title: 'Tic Tac Toe' });
     });
 
     test('fallback to eslint-only when prettier fails', async function (assert) {
-      const malformedSource = `import { CardDef } from 'https://cardstack.com/base/card-api';
+      const malformedSource = `import { CardDef } from '@cardstack/base/card-api';
 export class MyCard extends CardDef {
   @field name = contains(StringField);
   // Malformed syntax that prettier cannot parse
@@ -272,7 +272,7 @@ export class MyCard extends CardDef {
     });
 
     test('lint operations complete within performance threshold', async function (assert) {
-      const testSource = `import { CardDef } from 'https://cardstack.com/base/card-api';
+      const testSource = `import { CardDef } from '@cardstack/base/card-api';
 export class MyCard extends CardDef {
   @field name = contains(StringField);
 }`;
@@ -342,7 +342,7 @@ export class MyCard extends CardDef {
     test('memory usage during lint operations', async function (assert) {
       const initialMemory = process.memoryUsage().heapUsed;
 
-      const testSource = `import { CardDef } from 'https://cardstack.com/base/card-api';
+      const testSource = `import { CardDef } from '@cardstack/base/card-api';
 export class MyCard extends CardDef {
   @field name = contains(StringField);
 }`;
@@ -393,8 +393,8 @@ export class MyCard extends CardDef {
         )
         .set('X-HTTP-Method-Override', 'QUERY')
         .set('Accept', 'application/json')
-        .send(`import { CardDef } from 'https://cardstack.com/base/card-api';
-import { CardDef } from 'https://cardstack.com/base/card-api';
+        .send(`import { CardDef } from '@cardstack/base/card-api';
+import { CardDef } from '@cardstack/base/card-api';
 export class MyCard extends CardDef {
 @field name = contains(StringField)
 }
@@ -404,8 +404,8 @@ export class MyCard extends CardDef {
       let responseJson = JSON.parse(response.text);
       assert.strictEqual(
         responseJson.output,
-        `import StringField from 'https://cardstack.com/base/string';
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
+        `import StringField from '@cardstack/base/string';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
 
 export class MyCard extends CardDef {
   @field name = contains(StringField);
@@ -451,7 +451,7 @@ import MyComponent from 'somewhere';
         )
         .set('X-HTTP-Method-Override', 'QUERY')
         .set('Accept', 'application/json')
-        .send(`import { CardDef } from 'https://cardstack.com/base/card-api';
+        .send(`import { CardDef } from '@cardstack/base/card-api';
 import MyComponent from 'somewhere';
 
 export class MyCard extends CardDef {
@@ -468,8 +468,8 @@ export class MyCard extends CardDef {
       assert.strictEqual(
         responseJson.output,
         `import { eq } from '@cardstack/boxel-ui/helpers';
-import StringField from 'https://cardstack.com/base/string';
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
+import StringField from '@cardstack/base/string';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
 import MyComponent from 'somewhere';
 
 export class MyCard extends CardDef {
@@ -491,8 +491,8 @@ export class MyCard extends CardDef {
         )
         .set('X-HTTP-Method-Override', 'QUERY')
         .set('Accept', 'application/json')
-        .send(`import{CardDef}from 'https://cardstack.com/base/card-api';
-import{StringField}from 'https://cardstack.com/base/string';
+        .send(`import{CardDef}from '@cardstack/base/card-api';
+import{StringField}from '@cardstack/base/string';
 export class MyCard extends CardDef{
 @field name=contains(StringField);
 }`);
@@ -501,8 +501,8 @@ export class MyCard extends CardDef{
       let responseJson = JSON.parse(response.text);
       assert.strictEqual(
         responseJson.output,
-        `import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import { StringField } from 'https://cardstack.com/base/string';
+        `import { CardDef, field, contains } from '@cardstack/base/card-api';
+import { StringField } from '@cardstack/base/string';
 export class MyCard extends CardDef {
   @field name = contains(StringField);
 }
@@ -520,7 +520,7 @@ export class MyCard extends CardDef {
         )
         .set('X-HTTP-Method-Override', 'QUERY')
         .set('Accept', 'application/json')
-        .send(`import { CardDef } from 'https://cardstack.com/base/card-api';
+        .send(`import { CardDef } from '@cardstack/base/card-api';
 export class MyCard extends CardDef {
 }
 <template>
@@ -560,7 +560,7 @@ export class MyCard extends CardDef {
         )
         .set('X-HTTP-Method-Override', 'QUERY')
         .set('Accept', 'application/json')
-        .send(`import { CardDef } from 'https://cardstack.com/base/card-api';
+        .send(`import { CardDef } from '@cardstack/base/card-api';
 export class MyCard extends CardDef {
 }
 <template>
@@ -637,7 +637,7 @@ import MyComponent from 'somewhere';
         )
         .set('X-HTTP-Method-Override', 'QUERY')
         .set('Accept', 'application/json')
-        .send(`import { CardDef } from "https://cardstack.com/base/card-api";
+        .send(`import { CardDef } from "@cardstack/base/card-api";
 export class MyCard extends CardDef {
 @field name = contains(StringField, { cardDescription: "test description" });
 }`);
@@ -647,11 +647,11 @@ export class MyCard extends CardDef {
 
       // Should use single quotes based on prettier configuration
       assert.ok(
-        responseJson.output.includes("'https://cardstack.com/base/string'"),
+        responseJson.output.includes("'@cardstack/base/string'"),
         'Single quotes are used for imports',
       );
       assert.ok(
-        responseJson.output.includes("'https://cardstack.com/base/card-api'"),
+        responseJson.output.includes("'@cardstack/base/card-api'"),
         'Single quotes are used consistently',
       );
       assert.ok(
@@ -670,7 +670,7 @@ export class MyCard extends CardDef {
         .set('X-HTTP-Method-Override', 'QUERY')
         .set('Accept', 'application/json')
         .set('X-Filename', 'my-card.gts')
-        .send(`import { CardDef } from 'https://cardstack.com/base/card-api';
+        .send(`import { CardDef } from '@cardstack/base/card-api';
 export class MyCard extends CardDef {
 @field name = contains(StringField);
 }
@@ -680,8 +680,8 @@ export class MyCard extends CardDef {
       let responseJson = JSON.parse(response.text);
       assert.strictEqual(
         responseJson.output,
-        `import StringField from 'https://cardstack.com/base/string';
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
+        `import StringField from '@cardstack/base/string';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
 export class MyCard extends CardDef {
   @field name = contains(StringField);
 }
@@ -692,7 +692,7 @@ export class MyCard extends CardDef {
 
     test('handles large files within reasonable time', async function (assert) {
       // Create a large file with many imports and classes
-      let largeContent = `import { CardDef } from 'https://cardstack.com/base/card-api';\n`;
+      let largeContent = `import { CardDef } from '@cardstack/base/card-api';\n`;
       for (let i = 0; i < 100; i++) {
         largeContent += `
 export class MyCard${i} extends CardDef {
diff --git a/packages/realm-server/tests/realm-endpoints/publishability-test.ts b/packages/realm-server/tests/realm-endpoints/publishability-test.ts
index 270ee0de2d9..5f8f71f7144 100644
--- a/packages/realm-server/tests/realm-endpoints/publishability-test.ts
+++ b/packages/realm-server/tests/realm-endpoints/publishability-test.ts
@@ -32,8 +32,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
       realmURL,
       fileSystem: {
         'source-card.gts': `
-              import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { contains, field, CardDef } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
               import CreateAiAssistantRoomCommand from "@cardstack/boxel-host/commands/create-ai-assistant-room";
 
               // Ensure data: dependencies are ignored
@@ -118,8 +118,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
           },
           fileSystem: {
             'broken-card.gts': `
-        import { CardDef, field, contains } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        import { CardDef, field, contains } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
 
         // Intentionally broken: references an undefined symbol
         export class BrokenCard extends CardDef {
@@ -230,8 +230,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
             },
             fileSystem: {
               'secret-card.gts': `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class SecretCard extends CardDef {
             @field name = contains(StringField);
@@ -251,8 +251,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
             field,
             linksTo,
             CardDef,
-          } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           import { SecretCard } from "${privateRealmURL}secret-card";
 
           export class SourceCard extends CardDef {
@@ -359,8 +359,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
               },
               fileSystem: {
                 'secret-card.gts': `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class SecretCard extends CardDef {
             @field name = contains(StringField);
@@ -380,8 +380,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
             field,
             linksTo,
             CardDef,
-          } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           import { SecretCard } from "${privateRealmURL}secret-card";
 
           export class HelperCard extends CardDef {
@@ -395,8 +395,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
             field,
             linksTo,
             CardDef,
-          } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           import { HelperCard } from "./helper-card";
 
           export class SourceCard extends CardDef {
@@ -490,8 +490,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
               },
               fileSystem: {
                 'secret-card.gts': `
-            import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-            import StringField from "https://cardstack.com/base/string";
+            import { contains, field, CardDef } from "@cardstack/base/card-api";
+            import StringField from "@cardstack/base/string";
 
             export class SecretCard extends CardDef {
               @field name = contains(StringField);
@@ -511,8 +511,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
               field,
               linksTo,
               CardDef,
-            } from "https://cardstack.com/base/card-api";
-            import StringField from "https://cardstack.com/base/string";
+            } from "@cardstack/base/card-api";
+            import StringField from "@cardstack/base/string";
             import { SecretCard } from "${remoteRealmURL}secret-card";
 
             export class SourceCard extends CardDef {
@@ -603,8 +603,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
             },
             fileSystem: {
               'secret-card.gts': `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class SecretCard extends CardDef {
             @field name = contains(StringField);
@@ -624,8 +624,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
             field,
             linksTo,
             CardDef,
-          } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           import { SecretCard } from "${privateRealmURL}secret-card";
 
           export class SourceCard extends CardDef {
@@ -673,8 +673,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
           field,
           linksTo,
           CardDef,
-        } from "https://cardstack.com/base/card-api";
-        import StringField from "https://cardstack.com/base/string";
+        } from "@cardstack/base/card-api";
+        import StringField from "@cardstack/base/string";
         import { SourceCard } from "${sourceRealmURL}source-card";
 
         export class SecretCard extends CardDef {
@@ -725,8 +725,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
             },
             fileSystem: {
               'secret-card.gts': `
-          import { contains, field, CardDef } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class SecretCard extends CardDef {
             @field name = contains(StringField);
@@ -746,8 +746,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
             field,
             linksTo,
             CardDef,
-          } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
           import { SecretCard } from "${privateRealmURL}secret-card";
 
           export class SourceCard extends CardDef {
diff --git a/packages/realm-server/tests/realm-endpoints/reindex-test.ts b/packages/realm-server/tests/realm-endpoints/reindex-test.ts
index d0ca64e70f7..6faa15edcf7 100644
--- a/packages/realm-server/tests/realm-endpoints/reindex-test.ts
+++ b/packages/realm-server/tests/realm-endpoints/reindex-test.ts
@@ -3,7 +3,7 @@ import { basename, join } from 'path';
 import { readFileSync, utimesSync, writeFileSync } from 'fs';
 import type { SuperTest, Test } from 'supertest';
 import type { Realm } from '@cardstack/runtime-common';
-import type { MatrixEvent } from 'https://cardstack.com/base/matrix-event';
+import type { MatrixEvent } from '@cardstack/base/matrix-event';
 import type { Server } from 'http';
 import type { DirResult } from 'tmp';
 import {
@@ -21,8 +21,8 @@ import {
   field,
   Component,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class Person extends CardDef {
   static displayName = 'Person';
@@ -46,8 +46,8 @@ import {
   field,
   Component,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class Article extends CardDef {
   static displayName = 'Article';
diff --git a/packages/realm-server/tests/realm-endpoints/search-test.ts b/packages/realm-server/tests/realm-endpoints/search-test.ts
index 9e230b5ad6a..d9351985fff 100644
--- a/packages/realm-server/tests/realm-endpoints/search-test.ts
+++ b/packages/realm-server/tests/realm-endpoints/search-test.ts
@@ -535,8 +535,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
                 field,
                 CardDef,
                 Component,
-              } from 'https://cardstack.com/base/card-api';
-              import StringField from 'https://cardstack.com/base/string';
+              } from '@cardstack/base/card-api';
+              import StringField from '@cardstack/base/string';
 
               export class Friend extends CardDef {
                 @field firstName = contains(StringField);
@@ -953,8 +953,8 @@ module(`realm-endpoints/${basename(__filename)}`, function () {
           realmURL: testRealmURLFor('in-test/'),
           fileSystem: {
             'person.gts': `
-              import { contains, field, CardDef, Component } from 'https://cardstack.com/base/card-api';
-              import StringField from 'https://cardstack.com/base/string';
+              import { contains, field, CardDef, Component } from '@cardstack/base/card-api';
+              import StringField from '@cardstack/base/string';
               export class Person extends CardDef {
                 static displayName = 'Person';
                 @field firstName = contains(StringField);
diff --git a/packages/realm-server/tests/search-prerendered-test.ts b/packages/realm-server/tests/search-prerendered-test.ts
index 33260a4d18b..bcd53d8602e 100644
--- a/packages/realm-server/tests/search-prerendered-test.ts
+++ b/packages/realm-server/tests/search-prerendered-test.ts
@@ -39,8 +39,8 @@ module(basename(__filename), function () {
             },
             fileSystem: {
               'person.gts': `
-              import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
 
               export class Person extends CardDef {
                 @field firstName = contains(StringField);
@@ -245,8 +245,8 @@ module(basename(__filename), function () {
           },
           fileSystem: {
             'person.gts': `
-          import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class Person extends CardDef {
             @field firstName = contains(StringField);
@@ -270,8 +270,8 @@ module(basename(__filename), function () {
         `,
             'fancy-person.gts': `
           import { Person } from './person';
-          import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class FancyPerson extends Person {
             @field favoriteColor = contains(StringField);
@@ -636,8 +636,8 @@ module(basename(__filename), function () {
             },
             fileSystem: {
               'person.gts': `
-              import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-              import StringField from "https://cardstack.com/base/string";
+              import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+              import StringField from "@cardstack/base/string";
 
               export class Person extends CardDef {
                 @field firstName = contains(StringField);
@@ -761,8 +761,8 @@ module(basename(__filename), function () {
           },
           fileSystem: {
             'person.gts': `
-          import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class Person extends CardDef {
             @field firstName = contains(StringField);
@@ -786,8 +786,8 @@ module(basename(__filename), function () {
         `,
             'fancy-person.gts': `
           import { Person } from './person';
-          import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class FancyPerson extends Person {
             @field favoriteColor = contains(StringField);
@@ -1063,8 +1063,8 @@ module(basename(__filename), function () {
           },
           fileSystem: {
             'person.gts': `
-          import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api";
-          import StringField from "https://cardstack.com/base/string";
+          import { contains, field, CardDef, Component } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
 
           export class Person extends CardDef {
             @field firstName = contains(StringField);
@@ -1201,11 +1201,11 @@ function assertScopedCssUrlsContain(
 
 // These modules have CSS that CardDef consumes, so we expect to see them in all relationships of a prerendered card
 let cardDefModuleDependencies = [
-  'https://cardstack.com/base/default-templates/embedded.gts',
-  'https://cardstack.com/base/default-templates/isolated-and-edit.gts',
-  'https://cardstack.com/base/default-templates/field-edit.gts',
-  'https://cardstack.com/base/field-component.gts',
-  'https://cardstack.com/base/contains-many-component.gts',
-  'https://cardstack.com/base/links-to-editor.gts',
-  'https://cardstack.com/base/links-to-many-component.gts',
+  '@cardstack/base/default-templates/embedded.gts',
+  '@cardstack/base/default-templates/isolated-and-edit.gts',
+  '@cardstack/base/default-templates/field-edit.gts',
+  '@cardstack/base/field-component.gts',
+  '@cardstack/base/contains-many-component.gts',
+  '@cardstack/base/links-to-editor.gts',
+  '@cardstack/base/links-to-many-component.gts',
 ];
diff --git a/packages/realm-server/tests/server-endpoints/federated-types-test.ts b/packages/realm-server/tests/server-endpoints/federated-types-test.ts
index 7befe16ea37..bfcd01a3739 100644
--- a/packages/realm-server/tests/server-endpoints/federated-types-test.ts
+++ b/packages/realm-server/tests/server-endpoints/federated-types-test.ts
@@ -51,7 +51,7 @@ module(`server-endpoints/${basename(__filename)}`, function (_hooks) {
           },
           meta: {
             adoptsFrom: {
-              module: 'https://cardstack.com/base/card-api',
+              module: '@cardstack/base/card-api',
               name: 'CardDef',
             },
           },
diff --git a/packages/realm-server/tests/server-endpoints/index-responses-test.ts b/packages/realm-server/tests/server-endpoints/index-responses-test.ts
index 336917d2a4f..eb2b280fd98 100644
--- a/packages/realm-server/tests/server-endpoints/index-responses-test.ts
+++ b/packages/realm-server/tests/server-endpoints/index-responses-test.ts
@@ -57,7 +57,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
               },
             },
           },
-          'home.gts': `import { Component, CardDef } from 'https://cardstack.com/base/card-api';
+          'home.gts': `import { Component, CardDef } from '@cardstack/base/card-api';
                       export class Home extends CardDef {
                         static isolated = class Isolated extends Component<typeof this> {
                           <template>
@@ -70,8 +70,8 @@ module(`server-endpoints/${basename(__filename)}`, function () {
                             field,
                             Component,
                             CardDef,
-                          } from 'https://cardstack.com/base/card-api';
-                          import StringField from 'https://cardstack.com/base/string';
+                          } from '@cardstack/base/card-api';
+                          import StringField from '@cardstack/base/string';
 
                           export class Person extends CardDef {
                             static displayName = 'Person';
@@ -102,7 +102,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
             },
           },
           'isolated-card.gts': `
-              import { Component, CardDef } from 'https://cardstack.com/base/card-api';
+              import { Component, CardDef } from '@cardstack/base/card-api';
 
               export class IsolatedCard extends CardDef {
                 static isolated = class Isolated extends Component<typeof this> {
@@ -126,7 +126,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
           },
 
           'dollar-sign-card.gts': `
-            import { Component, CardDef } from 'https://cardstack.com/base/card-api';
+            import { Component, CardDef } from '@cardstack/base/card-api';
 
             export class DollarSignCard extends CardDef {
               static isolated = class Isolated extends Component<typeof this> {
@@ -151,7 +151,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
           },
 
           'head-card.gts': `
-            import { Component, CardDef } from 'https://cardstack.com/base/card-api';
+            import { Component, CardDef } from '@cardstack/base/card-api';
 
             export class HeadCard extends CardDef {
               static isolated = class Isolated extends Component<typeof this> {
@@ -182,7 +182,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
           },
 
           'unsafe-head-card.gts': `
-            import { Component, CardDef } from 'https://cardstack.com/base/card-api';
+            import { Component, CardDef } from '@cardstack/base/card-api';
 
             export class UnsafeHeadCard extends CardDef {
               static isolated = class Isolated extends Component<typeof this> {
@@ -217,7 +217,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
           },
 
           'scoped-css-card.gts': `
-            import { Component, CardDef } from 'https://cardstack.com/base/card-api';
+            import { Component, CardDef } from '@cardstack/base/card-api';
 
             export class ScopedCssCard extends CardDef {
               static isolated = class Isolated extends Component<typeof this> {
@@ -252,7 +252,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
           // can only be found by iterating over serialized.included resources.
 
           'linked-css-base.gts': `
-            import { Component, CardDef } from 'https://cardstack.com/base/card-api';
+            import { Component, CardDef } from '@cardstack/base/card-api';
 
             export class LinkedCssBase extends CardDef {
               static embedded = class Embedded extends Component<typeof this> {
@@ -264,7 +264,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
             `,
 
           'linked-css-child.gts': `
-            import { Component } from 'https://cardstack.com/base/card-api';
+            import { Component } from '@cardstack/base/card-api';
             import { LinkedCssBase } from './linked-css-base.gts';
 
             export class LinkedCssChild extends LinkedCssBase {
@@ -292,7 +292,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
             `,
 
           'linked-css-parent.gts': `
-            import { Component, CardDef, field, linksTo } from 'https://cardstack.com/base/card-api';
+            import { Component, CardDef, field, linksTo } from '@cardstack/base/card-api';
             import { LinkedCssBase } from './linked-css-base.gts';
 
             export class LinkedCssParent extends CardDef {
@@ -350,7 +350,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
               },
               meta: {
                 adoptsFrom: {
-                  module: 'https://cardstack.com/base/card-api',
+                  module: '@cardstack/base/card-api',
                   name: 'Theme',
                 },
               },
@@ -367,7 +367,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
               },
               meta: {
                 adoptsFrom: {
-                  module: 'https://cardstack.com/base/brand-guide',
+                  module: '@cardstack/base/brand-guide',
                   name: 'default',
                 },
               },
@@ -1310,7 +1310,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
                   },
                   meta: {
                     adoptsFrom: {
-                      module: 'https://cardstack.com/base/brand-guide',
+                      module: '@cardstack/base/brand-guide',
                       name: 'default',
                     },
                   },
@@ -1342,7 +1342,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
                   },
                   meta: {
                     adoptsFrom: {
-                      module: 'https://cardstack.com/base/card-api',
+                      module: '@cardstack/base/card-api',
                       name: 'CardDef',
                     },
                   },
diff --git a/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts b/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts
index ec091e6d8db..01cd54b2454 100644
--- a/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts
+++ b/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts
@@ -138,7 +138,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
                 attributes: { cardInfo: { name: 'Test Card' } },
                 meta: {
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/card-api',
+                    module: '@cardstack/base/card-api',
                     name: 'CardDef',
                   },
                 },
@@ -272,7 +272,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
                 },
                 meta: {
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/card-api',
+                    module: '@cardstack/base/card-api',
                     name: 'CardDef',
                   },
                 },
@@ -333,7 +333,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
                 attributes: { cardInfo: { name: 'Test Card' } },
                 meta: {
                   adoptsFrom: {
-                    module: 'https://cardstack.com/base/card-api',
+                    module: '@cardstack/base/card-api',
                     name: 'CardDef',
                   },
                 },
diff --git a/packages/realm-server/tests/server-endpoints/run-command-endpoint-test.ts b/packages/realm-server/tests/server-endpoints/run-command-endpoint-test.ts
index 779c5adf64e..5c2431546f6 100644
--- a/packages/realm-server/tests/server-endpoints/run-command-endpoint-test.ts
+++ b/packages/realm-server/tests/server-endpoints/run-command-endpoint-test.ts
@@ -110,7 +110,7 @@ module(`server-endpoints/${basename(__filename)}`, function () {
                 '@cardstack/boxel-host/commands/get-card-type-schema/default',
               commandInput: {
                 codeRef: {
-                  module: 'https://cardstack.com/base/card-api',
+                  module: '@cardstack/base/card-api',
                   name: 'CardDef',
                 },
               },
diff --git a/packages/realm-server/tests/server-endpoints/search-prerendered-test.ts b/packages/realm-server/tests/server-endpoints/search-prerendered-test.ts
index e04fc0c8ff8..a5783af8cf6 100644
--- a/packages/realm-server/tests/server-endpoints/search-prerendered-test.ts
+++ b/packages/realm-server/tests/server-endpoints/search-prerendered-test.ts
@@ -47,7 +47,7 @@ module(`server-endpoints/${basename(__filename)}`, function (_hooks) {
             },
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'CardDef',
               },
             },
@@ -63,7 +63,7 @@ module(`server-endpoints/${basename(__filename)}`, function (_hooks) {
             },
             meta: {
               adoptsFrom: {
-                module: 'https://cardstack.com/base/card-api',
+                module: '@cardstack/base/card-api',
                 name: 'CardDef',
               },
             },
diff --git a/packages/realm-server/tests/server-endpoints/search-test.ts b/packages/realm-server/tests/server-endpoints/search-test.ts
index f9c0e812fcb..b11298dc9b9 100644
--- a/packages/realm-server/tests/server-endpoints/search-test.ts
+++ b/packages/realm-server/tests/server-endpoints/search-test.ts
@@ -46,7 +46,7 @@ module(`server-endpoints/${basename(__filename)}`, function (_hooks) {
           },
           meta: {
             adoptsFrom: {
-              module: 'https://cardstack.com/base/card-api',
+              module: '@cardstack/base/card-api',
               name: 'CardDef',
             },
           },
@@ -62,7 +62,7 @@ module(`server-endpoints/${basename(__filename)}`, function (_hooks) {
           },
           meta: {
             adoptsFrom: {
-              module: 'https://cardstack.com/base/card-api',
+              module: '@cardstack/base/card-api',
               name: 'CardDef',
             },
           },
diff --git a/packages/realm-server/tests/server-endpoints/stripe-webhook-test.ts b/packages/realm-server/tests/server-endpoints/stripe-webhook-test.ts
index a65d6e5a435..357747a286a 100644
--- a/packages/realm-server/tests/server-endpoints/stripe-webhook-test.ts
+++ b/packages/realm-server/tests/server-endpoints/stripe-webhook-test.ts
@@ -22,7 +22,7 @@ import { APP_BOXEL_REALM_SERVER_EVENT_MSGTYPE } from '@cardstack/runtime-common/
 import type {
   MatrixEvent,
   RealmServerEventContent,
-} from 'https://cardstack.com/base/matrix-event';
+} from '@cardstack/base/matrix-event';
 import '@cardstack/runtime-common/helpers/code-equality-assertion';
 
 module(`server-endpoints/${basename(__filename)}`, function () {
diff --git a/packages/realm-server/tests/virtual-network-test.ts b/packages/realm-server/tests/virtual-network-test.ts
index 06f9cc705e5..7f29dac4172 100644
--- a/packages/realm-server/tests/virtual-network-test.ts
+++ b/packages/realm-server/tests/virtual-network-test.ts
@@ -9,7 +9,7 @@ module(basename(__filename), function () {
     test('will respond with real (not virtual) url when handler makes a redirect', async function (assert) {
       let virtualNetwork = new VirtualNetwork();
       virtualNetwork.addURLMapping(
-        new URL('https://cardstack.com/base/'),
+        new URL('http://test-base-realm/base/'),
         new URL('http://localhost:4201/base/'),
       );
       virtualNetwork.mount(async (_request: Request) => {
@@ -17,7 +17,7 @@ module(basename(__filename), function () {
         return new Response(null, {
           status: 302,
           headers: {
-            Location: 'https://cardstack.com/base/__boxel/assets/', // This virtual url should be converted to a real url so that the client can follow the redirect
+            Location: 'http://test-base-realm/base/__boxel/assets/', // This virtual url should be converted to a real url so that the client can follow the redirect
           },
         }) as ResponseWithNodeStream;
       });
diff --git a/packages/realm-server/tsconfig.json b/packages/realm-server/tsconfig.json
index 12a1902871e..ca7b0ef21c8 100644
--- a/packages/realm-server/tsconfig.json
+++ b/packages/realm-server/tsconfig.json
@@ -24,7 +24,7 @@
     "skipLibCheck": true,
     "strict": true,
     "paths": {
-      "https://cardstack.com/base/*": [
+      "@cardstack/base/*": [
         "../base/*"
       ],
       "@cardstack/boxel-ui": [
diff --git a/packages/runtime-common/ai/history.ts b/packages/runtime-common/ai/history.ts
index 3b7d2001516..6d40eb7313f 100644
--- a/packages/runtime-common/ai/history.ts
+++ b/packages/runtime-common/ai/history.ts
@@ -6,7 +6,7 @@ import type {
   MatrixEvent as DiscreteMatrixEvent,
   MessageEvent,
   RealmServerEvent,
-} from 'https://cardstack.com/base/matrix-event';
+} from '@cardstack/base/matrix-event';
 import type { MatrixClient } from 'matrix-js-sdk';
 import type { IRoomEvent } from 'matrix-js-sdk';
 
@@ -24,7 +24,7 @@ import {
 } from '../matrix-constants';
 
 import { downloadFile } from './matrix-utils';
-import type { SerializedFileDef } from 'https://cardstack.com/base/file-api';
+import type { SerializedFileDef } from '@cardstack/base/file-api';
 import { HistoryConstructionError } from './types';
 
 function getLog() {
diff --git a/packages/runtime-common/ai/matrix-utils.ts b/packages/runtime-common/ai/matrix-utils.ts
index 2b2a70f70b0..6f0da9d6c9b 100644
--- a/packages/runtime-common/ai/matrix-utils.ts
+++ b/packages/runtime-common/ai/matrix-utils.ts
@@ -14,11 +14,11 @@ import {
   APP_BOXEL_COMMAND_RESULT_EVENT_TYPE,
   APP_BOXEL_CODE_PATCH_RESULT_EVENT_TYPE,
 } from '../matrix-constants';
-import type { MatrixEvent as DiscreteMatrixEvent } from 'https://cardstack.com/base/matrix-event';
+import type { MatrixEvent as DiscreteMatrixEvent } from '@cardstack/base/matrix-event';
 import type { MatrixEvent } from 'matrix-js-sdk';
 import type { PromptParts } from './types';
 import { encodeUri } from 'matrix-js-sdk/lib/utils';
-import type { SerializedFileDef } from 'https://cardstack.com/base/file-api';
+import type { SerializedFileDef } from '@cardstack/base/file-api';
 import { isTextBasedContentType } from './modality';
 
 function getLog() {
diff --git a/packages/runtime-common/ai/prompt.ts b/packages/runtime-common/ai/prompt.ts
index ab277501bfe..8602ec068dc 100644
--- a/packages/runtime-common/ai/prompt.ts
+++ b/packages/runtime-common/ai/prompt.ts
@@ -37,8 +37,8 @@ import type {
   MatrixEventWithBoxelContext,
   SkillsConfigEvent,
   Tool,
-} from 'https://cardstack.com/base/matrix-event';
-import type { SerializedFileDef } from 'https://cardstack.com/base/file-api';
+} from '@cardstack/base/matrix-event';
+import type { SerializedFileDef } from '@cardstack/base/file-api';
 import {
   APP_BOXEL_CODE_PATCH_RESULT_EVENT_TYPE,
   APP_BOXEL_CODE_PATCH_RESULT_REL_TYPE,
diff --git a/packages/runtime-common/ai/types.ts b/packages/runtime-common/ai/types.ts
index e633387b7eb..22962028330 100644
--- a/packages/runtime-common/ai/types.ts
+++ b/packages/runtime-common/ai/types.ts
@@ -2,7 +2,7 @@ import type {
   BoxelContext,
   MatrixEvent as DiscreteMatrixEvent,
   Tool,
-} from 'https://cardstack.com/base/matrix-event';
+} from '@cardstack/base/matrix-event';
 import type { ReasoningEffort } from 'openai/resources/shared';
 import type { ToolChoice } from '../helpers/ai';
 import type { CardResource } from '../resource-types';
diff --git a/packages/runtime-common/bot-trigger.ts b/packages/runtime-common/bot-trigger.ts
index 3fd49a50a1f..5545c43e3b5 100644
--- a/packages/runtime-common/bot-trigger.ts
+++ b/packages/runtime-common/bot-trigger.ts
@@ -1,4 +1,4 @@
-import type { BotTriggerEvent } from 'https://cardstack.com/base/matrix-event';
+import type { BotTriggerEvent } from '@cardstack/base/matrix-event';
 import { BOT_TRIGGER_EVENT_TYPE } from './matrix-constants';
 
 export function isBotTriggerEvent(value: unknown): value is BotTriggerEvent {
diff --git a/packages/runtime-common/card-reference-resolver.ts b/packages/runtime-common/card-reference-resolver.ts
index a2da28dd8df..4c47af20b0d 100644
--- a/packages/runtime-common/card-reference-resolver.ts
+++ b/packages/runtime-common/card-reference-resolver.ts
@@ -1,3 +1,11 @@
+/**
+ * A card instance ID or module reference that may be either a full URL
+ * (e.g. "http://localhost:4201/base/card-api") or a registered prefix form
+ * (e.g. "@cardstack/base/card-api"). Use `cardIdToURL()` to safely convert
+ * to a URL — do NOT pass directly to `new URL()`.
+ */
+export type CardOrModuleRef = string;
+
 const prefixMappings = new Map<string, string>();
 
 export function registerCardReferencePrefix(
@@ -33,6 +41,17 @@ export function resolveCardReference(
   reference: string,
   relativeTo: URL | string | undefined,
 ): string {
+  if (typeof reference !== 'string') {
+    // Defensive: coerce URL objects to strings. This shouldn't happen but
+    // something is leaking URL objects into CodeRef.module fields.
+    if (reference instanceof URL) {
+      reference = reference.href;
+    } else {
+      throw new Error(
+        `resolveCardReference expected a string but received ${typeof reference}: ${String(reference)} (constructor: ${(reference as any)?.constructor?.name})`,
+      );
+    }
+  }
   for (let [prefix, target] of prefixMappings) {
     if (reference.startsWith(prefix)) {
       return new URL(reference.slice(prefix.length), target).href;
@@ -82,6 +101,6 @@ export function unresolveCardReference(resolvedURL: string): string {
 // Converts a card instance ID (which may be a registered prefix like
 // @cardstack/catalog/foo or a regular URL) to a URL object by resolving
 // the prefix to a real URL when needed.
-export function cardIdToURL(id: string): URL {
+export function cardIdToURL(id: CardOrModuleRef): URL {
   return new URL(resolveCardReference(id, undefined));
 }
diff --git a/packages/runtime-common/catalog.ts b/packages/runtime-common/catalog.ts
index 0b4040b8b32..90b482676b8 100644
--- a/packages/runtime-common/catalog.ts
+++ b/packages/runtime-common/catalog.ts
@@ -1,19 +1,22 @@
 import { isEqual, uniqWith, kebabCase } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
-import type { Spec } from 'https://cardstack.com/base/spec';
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import { RealmPaths, join } from './paths';
+import type { Spec } from '@cardstack/base/spec';
+import type { CardDef } from '@cardstack/base/card-api';
+import { join } from './paths';
 import type { ResolvedCodeRef } from './code-ref';
 import { resolveAdoptedCodeRef } from './code-ref';
-import { realmURL } from './constants';
+import { realmURL, baseRealm } from './constants';
 import { logger } from './log';
+import { RealmPaths } from './paths';
 import type { LocalPath } from './paths';
 import { cardIdToURL } from './card-reference-resolver';
 
 // @ts-ignore TODO: fix catalog types in runtime-common
 import type { Listing } from '@cardstack/catalog/listing/listing';
 
-const baseRealmPath = new RealmPaths(new URL('https://cardstack.com/base/'));
+function isInBaseRealm(id: string): boolean {
+  return id.startsWith(baseRealm.url);
+}
 
 // sourceCodeRef -- (installs module) --> targetCodeRef
 // sourceCodeRef: code ref of the code from the source realm
@@ -170,7 +173,7 @@ function resolveTargetCodeRef(
   codeRef: ResolvedCodeRef,
   resolver: ListingPathResolver,
 ): ResolvedCodeRef {
-  if (baseRealmPath.inRealm(cardIdToURL(codeRef.module))) {
+  if (isInBaseRealm(codeRef.module)) {
     return codeRef;
   } else {
     let targetModule = resolver.target(cardIdToURL(codeRef.module).href);
@@ -192,7 +195,7 @@ export function planModuleInstall(
     return { module: s.moduleHref, name: s.ref.name };
   });
   let modulesCopy = codeRefs.flatMap((sourceCodeRef: ResolvedCodeRef) => {
-    if (baseRealmPath.inRealm(cardIdToURL(sourceCodeRef.module))) {
+    if (isInBaseRealm(sourceCodeRef.module)) {
       return [];
     }
     let targetCodeRef = resolveTargetCodeRef(sourceCodeRef, resolver);
@@ -214,10 +217,10 @@ export function planInstanceInstall(
   for (let instance of instances) {
     let sourceCodeRef = resolveAdoptedCodeRef(instance);
     let lid = resolver.local(cardIdToURL(instance.id).href);
-    if (baseRealmPath.inRealm(cardIdToURL(instance.id))) {
+    if (isInBaseRealm(instance.id)) {
       throw new Error('Cannot install instance from base realm');
     }
-    if (!baseRealmPath.inRealm(cardIdToURL(sourceCodeRef.module))) {
+    if (!isInBaseRealm(sourceCodeRef.module)) {
       let targetCodeRef = resolveTargetCodeRef(sourceCodeRef, resolver);
       modulesCopy.push({
         sourceCodeRef,
diff --git a/packages/runtime-common/code-ref.ts b/packages/runtime-common/code-ref.ts
index b5025ca6afe..bbd1432b4e0 100644
--- a/packages/runtime-common/code-ref.ts
+++ b/packages/runtime-common/code-ref.ts
@@ -5,8 +5,8 @@ import type {
   CardDef,
   FieldDef,
   FieldConstructor,
-} from 'https://cardstack.com/base/card-api';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
+} from '@cardstack/base/card-api';
+import type { FileDef } from '@cardstack/base/file-api';
 import { Loader } from './loader';
 import {
   isField,
@@ -18,14 +18,14 @@ import {
 } from './constants';
 import { CardError } from './error';
 import { meta, relativeTo } from './constants';
-import { cardIdToURL } from './card-reference-resolver';
+import { cardIdToURL, type CardOrModuleRef } from './card-reference-resolver';
 import type { LooseCardResource, FileMetaResource } from './index';
 import { trimExecutableExtension } from './index';
 import { resolveCardReference } from './card-reference-resolver';
 import type { RuntimeDependencyTrackingContext } from './dependency-tracker';
 
 export type ResolvedCodeRef = {
-  module: string;
+  module: CardOrModuleRef;
   name: string;
 };
 
diff --git a/packages/runtime-common/commands.ts b/packages/runtime-common/commands.ts
index 7eec4122ca4..11bf180586e 100644
--- a/packages/runtime-common/commands.ts
+++ b/packages/runtime-common/commands.ts
@@ -3,8 +3,8 @@ import {
   isCardDef,
   codeRefWithAbsoluteURL,
 } from './code-ref';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type { CardDefConstructor } from 'https://cardstack.com/base/card-api';
+import type * as CardAPI from '@cardstack/base/card-api';
+import type { CardDefConstructor } from '@cardstack/base/card-api';
 import type { AttributesSchema, CardSchema } from './helpers/ai';
 import { generateJsonSchemaForCardType } from './helpers/ai';
 import { simpleHash } from './utils';
diff --git a/packages/runtime-common/constants.ts b/packages/runtime-common/constants.ts
index 0c85ca32bcf..4aa80ad1a43 100644
--- a/packages/runtime-common/constants.ts
+++ b/packages/runtime-common/constants.ts
@@ -1,8 +1,10 @@
-import { RealmPaths } from './paths';
 import type { ResolvedCodeRef } from './code-ref';
+import type { CardOrModuleRef } from './card-reference-resolver';
 import type { RealmPermissions } from './index';
 
-export const baseRealm = new RealmPaths(new URL('https://cardstack.com/base/'));
+export const baseRealm: { url: CardOrModuleRef } = {
+  url: '@cardstack/base/',
+};
 
 export const devSkillLocalPath = 'Skill/boxel-development';
 export const envSkillLocalPath = 'Skill/boxel-environment';
diff --git a/packages/runtime-common/definitions.ts b/packages/runtime-common/definitions.ts
index ac2c2d87406..931531b9fb2 100644
--- a/packages/runtime-common/definitions.ts
+++ b/packages/runtime-common/definitions.ts
@@ -6,9 +6,9 @@ import {
 } from './index';
 import type { CodeRef } from './code-ref';
 import type { SerializerName } from './serializers';
-import type { FieldType } from 'https://cardstack.com/base/card-api';
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
+import type { FieldType } from '@cardstack/base/card-api';
+import type { BaseDef } from '@cardstack/base/card-api';
+import type * as CardAPI from '@cardstack/base/card-api';
 import type { Query } from './query';
 
 export interface FieldDefinition {
diff --git a/packages/runtime-common/etc/eslint/missing-card-api-import-config.js b/packages/runtime-common/etc/eslint/missing-card-api-import-config.js
index 60d2cc942cf..8ec3fa7b507 100644
--- a/packages/runtime-common/etc/eslint/missing-card-api-import-config.js
+++ b/packages/runtime-common/etc/eslint/missing-card-api-import-config.js
@@ -4,46 +4,46 @@
 module.exports = {
   importMappings: {
     // card-api methods, classes and decorators
-    Component: ['Component', 'https://cardstack.com/base/card-api'],
-    CardDef: ['CardDef', 'https://cardstack.com/base/card-api'],
-    FieldDef: ['FieldDef', 'https://cardstack.com/base/card-api'],
-    field: ['field', 'https://cardstack.com/base/card-api'],
-    contains: ['contains', 'https://cardstack.com/base/card-api'],
-    linksTo: ['linksTo', 'https://cardstack.com/base/card-api'],
-    containsMany: ['containsMany', 'https://cardstack.com/base/card-api'],
-    linksToMany: ['linksToMany', 'https://cardstack.com/base/card-api'],
+    Component: ['Component', '@cardstack/base/card-api'],
+    CardDef: ['CardDef', '@cardstack/base/card-api'],
+    FieldDef: ['FieldDef', '@cardstack/base/card-api'],
+    field: ['field', '@cardstack/base/card-api'],
+    contains: ['contains', '@cardstack/base/card-api'],
+    linksTo: ['linksTo', '@cardstack/base/card-api'],
+    containsMany: ['containsMany', '@cardstack/base/card-api'],
+    linksToMany: ['linksToMany', '@cardstack/base/card-api'],
 
     // Base realm field defs
-    AddressField: ['default', 'https://cardstack.com/base/address'],
-    Base64ImageField: ['default', 'https://cardstack.com/base/base64-image'],
-    BigIntegerField: ['default', 'https://cardstack.com/base/big-integer'],
-    BooleanField: ['default', 'https://cardstack.com/base/boolean'],
-    CodeRefField: ['default', 'https://cardstack.com/base/code-ref'],
-    ColorField: ['default', 'https://cardstack.com/base/color'],
-    CoordinateField: ['default', 'https://cardstack.com/base/coordinate'],
-    CountryField: ['default', 'https://cardstack.com/base/country'],
-    DateField: ['default', 'https://cardstack.com/base/date'],
-    DateRangeField: ['default', 'https://cardstack.com/base/date-range-field'],
-    DateTimeField: ['default', 'https://cardstack.com/base/datetime'],
-    EmailField: ['default', 'https://cardstack.com/base/email'],
+    AddressField: ['default', '@cardstack/base/address'],
+    Base64ImageField: ['default', '@cardstack/base/base64-image'],
+    BigIntegerField: ['default', '@cardstack/base/big-integer'],
+    BooleanField: ['default', '@cardstack/base/boolean'],
+    CodeRefField: ['default', '@cardstack/base/code-ref'],
+    ColorField: ['default', '@cardstack/base/color'],
+    CoordinateField: ['default', '@cardstack/base/coordinate'],
+    CountryField: ['default', '@cardstack/base/country'],
+    DateField: ['default', '@cardstack/base/date'],
+    DateRangeField: ['default', '@cardstack/base/date-range-field'],
+    DateTimeField: ['default', '@cardstack/base/datetime'],
+    EmailField: ['default', '@cardstack/base/email'],
     EthereumAddressField: [
       'default',
-      'https://cardstack.com/base/ethereum-address',
+      '@cardstack/base/ethereum-address',
     ],
-    MarkdownField: ['default', 'https://cardstack.com/base/markdown'],
-    NumberField: ['default', 'https://cardstack.com/base/number'],
-    PercentageField: ['default', 'https://cardstack.com/base/percentage'],
-    PhoneNumberField: ['default', 'https://cardstack.com/base/phone-number'],
-    StringField: ['default', 'https://cardstack.com/base/string'],
-    TextAreaField: ['default', 'https://cardstack.com/base/text-area'],
-    URLField: ['default', 'https://cardstack.com/base/url'],
-    WebsiteField: ['default', 'https://cardstack.com/base/website'],
+    MarkdownField: ['default', '@cardstack/base/markdown'],
+    NumberField: ['default', '@cardstack/base/number'],
+    PercentageField: ['default', '@cardstack/base/percentage'],
+    PhoneNumberField: ['default', '@cardstack/base/phone-number'],
+    StringField: ['default', '@cardstack/base/string'],
+    TextAreaField: ['default', '@cardstack/base/text-area'],
+    URLField: ['default', '@cardstack/base/url'],
+    WebsiteField: ['default', '@cardstack/base/website'],
 
     // Enumerations
-    enumField: ['default', 'https://cardstack.com/base/enum'],
-    enumConfig: ['enumConfig', 'https://cardstack.com/base/enum'],
+    enumField: ['default', '@cardstack/base/enum'],
+    enumConfig: ['enumConfig', '@cardstack/base/enum'],
 
     // More
-    Skill: ['default', 'https://cardstack.com/base/skill'],
+    Skill: ['default', '@cardstack/base/skill'],
   },
 };
diff --git a/packages/runtime-common/etc/eslint/missing-invokables-config.js b/packages/runtime-common/etc/eslint/missing-invokables-config.js
index 4247a567fd9..04dd67b8569 100644
--- a/packages/runtime-common/etc/eslint/missing-invokables-config.js
+++ b/packages/runtime-common/etc/eslint/missing-invokables-config.js
@@ -9,8 +9,8 @@ module.exports = {
     bool: ['bool', '@cardstack/boxel-ui/helpers'],
     concat: ['concat', '@ember/helper'],
     divide: ['divide', '@cardstack/boxel-ui/helpers'],
-    enumOptions: ['enumOptions', 'https://cardstack.com/base/enum'],
-    enumValues: ['enumValues', 'https://cardstack.com/base/enum'],
+    enumOptions: ['enumOptions', '@cardstack/base/enum'],
+    enumValues: ['enumValues', '@cardstack/base/enum'],
     eq: ['eq', '@cardstack/boxel-ui/helpers'],
     fn: ['fn', '@ember/helper'],
     formatDateTime: ['formatDateTime', '@cardstack/boxel-ui/helpers'],
diff --git a/packages/runtime-common/etc/test-fixtures.ts b/packages/runtime-common/etc/test-fixtures.ts
index a7f1054764e..25d6e28e999 100644
--- a/packages/runtime-common/etc/test-fixtures.ts
+++ b/packages/runtime-common/etc/test-fixtures.ts
@@ -6,8 +6,8 @@ import {
   field,
   Component,
   CardDef,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class Person extends CardDef {
   static displayName = 'Person';
@@ -32,8 +32,8 @@ export function increment() {
 
 export function compiledCard(id = 'null', moduleName = '/dir/person.gts') {
   return `
-import { contains, field, Component, CardDef } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { contains, field, Component, CardDef } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { setComponentTemplate } from "@ember/component";
 import { createTemplateFactory } from "@ember/template-factory";
 export class Person extends CardDef {
diff --git a/packages/runtime-common/helpers/ai.ts b/packages/runtime-common/helpers/ai.ts
index 0cfb08f5311..3b8de9ed3a4 100644
--- a/packages/runtime-common/helpers/ai.ts
+++ b/packages/runtime-common/helpers/ai.ts
@@ -1,8 +1,8 @@
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
+import type * as CardAPI from '@cardstack/base/card-api';
 import { primitive } from '../constants';
 import type { Loader } from '../loader';
-import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type { Tool } from 'https://cardstack.com/base/matrix-event';
+import type { CardDef } from '@cardstack/base/card-api';
+import type { Tool } from '@cardstack/base/matrix-event';
 
 type ArraySchema = {
   type: 'array';
@@ -112,23 +112,23 @@ export interface CardSchema {
 export async function basicMappings(loader: Loader) {
   let mappings = new Map<typeof CardAPI.FieldDef, AttributesSchema>();
 
-  let string: typeof import('https://cardstack.com/base/string') =
-    await loader.import('https://cardstack.com/base/string');
-  let number: typeof import('https://cardstack.com/base/number') =
-    await loader.import('https://cardstack.com/base/number');
-  let biginteger: typeof import('https://cardstack.com/base/big-integer') =
-    await loader.import('https://cardstack.com/base/big-integer');
-  let date: typeof import('https://cardstack.com/base/date') =
-    await loader.import('https://cardstack.com/base/date');
-  let datetime: typeof import('https://cardstack.com/base/datetime') =
-    await loader.import('https://cardstack.com/base/datetime');
-  let boolean: typeof import('https://cardstack.com/base/boolean') =
-    await loader.import('https://cardstack.com/base/boolean');
-  let codeRef: typeof import('https://cardstack.com/base/code-ref') =
-    await loader.import('https://cardstack.com/base/code-ref');
-  let query: typeof import('https://cardstack.com/base/commands/search-card-result') =
+  let string: typeof import('@cardstack/base/string') =
+    await loader.import('@cardstack/base/string');
+  let number: typeof import('@cardstack/base/number') =
+    await loader.import('@cardstack/base/number');
+  let biginteger: typeof import('@cardstack/base/big-integer') =
+    await loader.import('@cardstack/base/big-integer');
+  let date: typeof import('@cardstack/base/date') =
+    await loader.import('@cardstack/base/date');
+  let datetime: typeof import('@cardstack/base/datetime') =
+    await loader.import('@cardstack/base/datetime');
+  let boolean: typeof import('@cardstack/base/boolean') =
+    await loader.import('@cardstack/base/boolean');
+  let codeRef: typeof import('@cardstack/base/code-ref') =
+    await loader.import('@cardstack/base/code-ref');
+  let query: typeof import('@cardstack/base/commands/search-card-result') =
     await loader.import(
-      'https://cardstack.com/base/commands/search-card-result',
+      '@cardstack/base/commands/search-card-result',
     );
 
   const { default: StringField } = string;
diff --git a/packages/runtime-common/helpers/card-type-display-name.ts b/packages/runtime-common/helpers/card-type-display-name.ts
index a11ad1bf676..d61421f74b6 100644
--- a/packages/runtime-common/helpers/card-type-display-name.ts
+++ b/packages/runtime-common/helpers/card-type-display-name.ts
@@ -2,7 +2,7 @@ import type {
   BaseDef,
   BaseDefConstructor,
   Field,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 import { getField } from '../code-ref';
 
diff --git a/packages/runtime-common/index.ts b/packages/runtime-common/index.ts
index 9e9294a3350..00f88879007 100644
--- a/packages/runtime-common/index.ts
+++ b/packages/runtime-common/index.ts
@@ -16,8 +16,8 @@ import {
   isRegisteredPrefix,
 } from './card-reference-resolver';
 
-import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event';
-import type { FileDef } from 'https://cardstack.com/base/file-api';
+import type { RealmEventContent } from '@cardstack/base/matrix-event';
+import type { FileDef } from '@cardstack/base/file-api';
 
 export interface LooseSingleResourceDocument<T extends LinkableResource> {
   data: LooseLinkableResource<T>;
@@ -188,6 +188,7 @@ export {
   unresolveCardReference,
   isRegisteredPrefix,
   cardIdToURL,
+  type CardOrModuleRef,
 } from './card-reference-resolver';
 
 export interface ResourceObject {
@@ -383,8 +384,8 @@ import type {
   CardDef,
   FieldDef,
   BaseDef,
-} from 'https://cardstack.com/base/card-api';
-import type * as CardAPI from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
+import type * as CardAPI from '@cardstack/base/card-api';
 import type { RealmInfo } from './realm';
 import type { PrerenderedCard, QueryResultsMeta } from './index-query-engine';
 
@@ -746,7 +747,7 @@ export async function apiFor(
     Loader.getLoaderFor(cardOrFieldOrClass) ??
     loaderFor(cardOrFieldOrClass as CardDef | FieldDef | BaseDef);
   let api = await loader.import<typeof CardAPI>(
-    'https://cardstack.com/base/card-api',
+    '@cardstack/base/card-api',
   );
   if (!api) {
     throw new Error(`could not load card API`);
diff --git a/packages/runtime-common/matrix-client.ts b/packages/runtime-common/matrix-client.ts
index 6720ae47bd2..0ce25508789 100644
--- a/packages/runtime-common/matrix-client.ts
+++ b/packages/runtime-common/matrix-client.ts
@@ -2,7 +2,7 @@ import { Sha256 } from '@aws-crypto/sha256-js';
 import { uint8ArrayToHex } from './index';
 import { REALM_ROOM_RETENTION_POLICY_MAX_LIFETIME } from './realm';
 import { Deferred } from './deferred';
-import type { MatrixEvent } from 'https://cardstack.com/base/matrix-event';
+import type { MatrixEvent } from '@cardstack/base/matrix-event';
 
 type JoinedRoomsResponse = { joined_rooms: string[] };
 
diff --git a/packages/runtime-common/module-syntax.ts b/packages/runtime-common/module-syntax.ts
index 5e8a77b2f7e..97f0ed18913 100644
--- a/packages/runtime-common/module-syntax.ts
+++ b/packages/runtime-common/module-syntax.ts
@@ -40,7 +40,7 @@ import { getBabelOptions } from './babel-options';
 
 import type { types as t } from '@babel/core';
 import type { NodePath } from '@babel/traverse';
-import type { FieldType } from 'https://cardstack.com/base/card-api';
+import type { FieldType } from '@cardstack/base/card-api';
 
 export type {
   PossibleCardOrFieldDeclaration,
diff --git a/packages/runtime-common/realm.ts b/packages/runtime-common/realm.ts
index a87cf8b5486..d65b6897b8e 100644
--- a/packages/runtime-common/realm.ts
+++ b/packages/runtime-common/realm.ts
@@ -146,7 +146,7 @@ import type {
   FileWatcherEventContent,
   RealmEventContent,
   UpdateRealmEventContent,
-} from 'https://cardstack.com/base/matrix-event';
+} from '@cardstack/base/matrix-event';
 import type {
   AtomicOperation,
   AtomicOperationResult,
@@ -4856,7 +4856,7 @@ function isGloballyPublicDependency(resourceUrl: string): boolean {
   ) {
     return true;
   }
-  return baseRealm.inRealm(parsed);
+  return resourceUrl.startsWith(baseRealm.url);
 }
 
 function lastModifiedHeader(
diff --git a/packages/runtime-common/resource-types.ts b/packages/runtime-common/resource-types.ts
index db4ce80efaf..7c0a64742eb 100644
--- a/packages/runtime-common/resource-types.ts
+++ b/packages/runtime-common/resource-types.ts
@@ -1,6 +1,6 @@
 import type { RealmInfo } from './realm';
 import { type CodeRef, isCodeRef, moduleFrom } from './code-ref';
-import { resolveCardReference } from './card-reference-resolver';
+import { resolveCardReference, type CardOrModuleRef } from './card-reference-resolver';
 import type { Query } from './query';
 
 // Metadata for a query-based linksTo/linksToMany field on a FileDef subclass,
@@ -110,7 +110,7 @@ export type LooseLinkableResource<T extends LinkableResource> = Omit<
   'id' | 'type'
 > & {
   type?: T['type'];
-  id?: string;
+  id?: CardOrModuleRef;
 };
 
 export type LooseCardResource = LooseLinkableResource<CardResource>;
@@ -118,7 +118,7 @@ export type LooseFileMetaResource = LooseLinkableResource<FileMetaResource>;
 
 //prerendered cards
 export interface PrerenderedCardResource {
-  id: string;
+  id: CardOrModuleRef;
   type: 'prerendered-card';
   attributes: {
     html: string;
diff --git a/packages/runtime-common/schema-analysis-plugin.ts b/packages/runtime-common/schema-analysis-plugin.ts
index 83ddd8fbd84..7574a0a869e 100644
--- a/packages/runtime-common/schema-analysis-plugin.ts
+++ b/packages/runtime-common/schema-analysis-plugin.ts
@@ -193,7 +193,7 @@ const coreVisitor = {
     let isCardApiFile =
       path.node.loc &&
       'filename' in path.node.loc &&
-      path.node.loc.filename === 'https://cardstack.com/base/card-api';
+      path.node.loc.filename === '@cardstack/base/card-api';
     let decoratorInfo = getNamedImportInfo(path.scope, expression.node.name);
     if (!decoratorInfo && !isCardApiFile) {
       return; // our @field decorator must originate from a named import
diff --git a/packages/runtime-common/serializers/big-integer.ts b/packages/runtime-common/serializers/big-integer.ts
index 18ff5a4c3be..6e6a0ae1877 100644
--- a/packages/runtime-common/serializers/big-integer.ts
+++ b/packages/runtime-common/serializers/big-integer.ts
@@ -1,7 +1,7 @@
 import type {
   BaseDefConstructor,
   BaseInstanceType,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export function queryableValue(val: bigint | undefined): string | undefined {
   return val == null ? undefined : String(val);
diff --git a/packages/runtime-common/serializers/boolean.ts b/packages/runtime-common/serializers/boolean.ts
index 94897d74182..0a1aad2ed28 100644
--- a/packages/runtime-common/serializers/boolean.ts
+++ b/packages/runtime-common/serializers/boolean.ts
@@ -1,7 +1,7 @@
 import type {
   BaseDefConstructor,
   BaseInstanceType,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export function queryableValue(val: any): boolean {
   return asBoolean(val);
diff --git a/packages/runtime-common/serializers/code-ref.ts b/packages/runtime-common/serializers/code-ref.ts
index 414e8bc7c6d..7bb07319499 100644
--- a/packages/runtime-common/serializers/code-ref.ts
+++ b/packages/runtime-common/serializers/code-ref.ts
@@ -1,7 +1,7 @@
 import type {
   BaseDefConstructor,
   BaseInstanceType,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import {
   type ResolvedCodeRef,
   isUrlLike,
@@ -11,7 +11,7 @@ import {
 import { resolveCardReference, cardIdToURL } from '../card-reference-resolver';
 // We only use a subset of SerializeOpts here; accept any to align with the
 // serializer interface without surfacing unused properties.
-import type { SerializeOpts } from 'https://cardstack.com/base/card-api';
+import type { SerializeOpts } from '@cardstack/base/card-api';
 
 export function queryableValue(
   codeRef: ResolvedCodeRef | {} | undefined,
diff --git a/packages/runtime-common/serializers/date.ts b/packages/runtime-common/serializers/date.ts
index 1330dcc4c6b..fd6222120df 100644
--- a/packages/runtime-common/serializers/date.ts
+++ b/packages/runtime-common/serializers/date.ts
@@ -2,7 +2,7 @@ import { parse, format } from 'date-fns';
 import type {
   BaseDefConstructor,
   BaseInstanceType,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export const dateFormat = `yyyy-MM-dd`;
 
diff --git a/packages/runtime-common/serializers/datetime.ts b/packages/runtime-common/serializers/datetime.ts
index 471e9e552bf..19354e49825 100644
--- a/packages/runtime-common/serializers/datetime.ts
+++ b/packages/runtime-common/serializers/datetime.ts
@@ -2,7 +2,7 @@ import { format, parseISO } from 'date-fns';
 import type {
   BaseDefConstructor,
   BaseInstanceType,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export const datetimeFormat = `yyyy-MM-dd'T'HH:mm`;
 
diff --git a/packages/runtime-common/serializers/email.ts b/packages/runtime-common/serializers/email.ts
index e2acb066379..38993d82709 100644
--- a/packages/runtime-common/serializers/email.ts
+++ b/packages/runtime-common/serializers/email.ts
@@ -1,7 +1,7 @@
 import type {
   BaseDefConstructor,
   BaseInstanceType,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export function queryableValue(value: unknown): string | undefined {
   let normalized = deserializeSync(value);
diff --git a/packages/runtime-common/serializers/ethereum-address.ts b/packages/runtime-common/serializers/ethereum-address.ts
index ed0337650ac..d407f24bb33 100644
--- a/packages/runtime-common/serializers/ethereum-address.ts
+++ b/packages/runtime-common/serializers/ethereum-address.ts
@@ -1,7 +1,7 @@
 import type {
   BaseDefConstructor,
   BaseInstanceType,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 import { isAddress, getAddress } from 'ethers';
 
 function isChecksumAddress(address: string): boolean {
diff --git a/packages/runtime-common/serializers/image-size.ts b/packages/runtime-common/serializers/image-size.ts
index 04684664da5..a21811ffbbe 100644
--- a/packages/runtime-common/serializers/image-size.ts
+++ b/packages/runtime-common/serializers/image-size.ts
@@ -1,7 +1,7 @@
 import type {
   BaseDefConstructor,
   BaseInstanceType,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export function queryableValue(
   val: 'actual' | 'contain' | 'cover' | undefined,
diff --git a/packages/runtime-common/serializers/index.ts b/packages/runtime-common/serializers/index.ts
index 1da122ce12c..9a02efbdeff 100644
--- a/packages/runtime-common/serializers/index.ts
+++ b/packages/runtime-common/serializers/index.ts
@@ -19,7 +19,7 @@ import type {
   BaseInstanceType,
   CardStore,
   DeserializeOpts,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export {
   DateSerializer,
diff --git a/packages/runtime-common/serializers/number.ts b/packages/runtime-common/serializers/number.ts
index 73ea2733666..e51986de483 100644
--- a/packages/runtime-common/serializers/number.ts
+++ b/packages/runtime-common/serializers/number.ts
@@ -1,7 +1,7 @@
 import type {
   BaseDefConstructor,
   BaseInstanceType,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export function queryableValue(val: number | undefined): number | undefined {
   return val != null ? val : undefined;
diff --git a/packages/runtime-common/serializers/phone.ts b/packages/runtime-common/serializers/phone.ts
index 34ccdb315af..10924f0b51f 100644
--- a/packages/runtime-common/serializers/phone.ts
+++ b/packages/runtime-common/serializers/phone.ts
@@ -2,7 +2,7 @@ import { parsePhoneNumber } from 'awesome-phonenumber';
 import type {
   BaseDefConstructor,
   BaseInstanceType,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 export function queryableValue(value: unknown): string | undefined {
   let normalized = deserializeSync(value);
diff --git a/packages/runtime-common/tsconfig.json b/packages/runtime-common/tsconfig.json
index ac3d5d029be..996104a722b 100644
--- a/packages/runtime-common/tsconfig.json
+++ b/packages/runtime-common/tsconfig.json
@@ -23,7 +23,7 @@
     "experimentalDecorators": true,
     "skipLibCheck": true,
     "paths": {
-      "https://cardstack.com/base/*": [
+      "@cardstack/base/*": [
         "../base/*"
       ],
       "@cardstack/boxel-ui": [
diff --git a/packages/runtime-common/utils.ts b/packages/runtime-common/utils.ts
index d00b2cb86fc..da64ea52a9d 100644
--- a/packages/runtime-common/utils.ts
+++ b/packages/runtime-common/utils.ts
@@ -1,4 +1,4 @@
-import type { BaseDef } from 'https://cardstack.com/base/card-api';
+import type { BaseDef } from '@cardstack/base/card-api';
 
 import type { JobInfo } from './worker';
 
diff --git a/packages/runtime-common/virtual-network.ts b/packages/runtime-common/virtual-network.ts
index 6254224cdbb..fb2b3e40ed6 100644
--- a/packages/runtime-common/virtual-network.ts
+++ b/packages/runtime-common/virtual-network.ts
@@ -1,5 +1,5 @@
 import { RealmPaths } from './paths';
-import { baseRealm, isNode } from './index';
+import { baseRealm, isNode, unresolveCardReference } from './index';
 import type { ModuleDescriptor } from './package-shim-handler';
 import {
   PackageShimHandler,
@@ -313,7 +313,7 @@ function shouldRetryFetch(url: URL) {
     return false;
   }
 
-  if (baseRealm.inRealm(url)) {
+  if (unresolveCardReference(url.href).startsWith(baseRealm.url)) {
     return true;
   }
 
diff --git a/packages/software-factory/.agents/skills/boxel-development/references/dev-command-development.md b/packages/software-factory/.agents/skills/boxel-development/references/dev-command-development.md
index f95dc885ac6..afec3be3b96 100644
--- a/packages/software-factory/.agents/skills/boxel-development/references/dev-command-development.md
+++ b/packages/software-factory/.agents/skills/boxel-development/references/dev-command-development.md
@@ -6,8 +6,8 @@ Commands extend `Command<InputCardDef, OutputCardDef | undefined>` and execute w
 
 ```gts
 import { Command } from '@cardstack/runtime-common';
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 class MyInput extends CardDef {
   @field targetRealm = contains(StringField);
diff --git a/packages/software-factory/.agents/skills/boxel-development/references/dev-core-patterns.md b/packages/software-factory/.agents/skills/boxel-development/references/dev-core-patterns.md
index 8afd7634a9c..3ce378da834 100644
--- a/packages/software-factory/.agents/skills/boxel-development/references/dev-core-patterns.md
+++ b/packages/software-factory/.agents/skills/boxel-development/references/dev-core-patterns.md
@@ -43,9 +43,9 @@ import {
   containsMany,
   linksToMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import DateField from 'https://cardstack.com/base/date';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import DateField from '@cardstack/base/date';
 import FileTextIcon from '@cardstack/boxel-icons/file-text';
 import { Author } from './author';
 
@@ -81,13 +81,8 @@ export class BlogPost extends CardDef {
 **CRITICAL:** Every FieldDef file must import FieldDef and MUST be exported:
 
 ```gts
-import {
-  FieldDef,
-  field,
-  contains,
-  Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { FieldDef, field, contains, Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import LocationIcon from '@cardstack/boxel-icons/map-pin';
 import { concat } from '@ember/helper';
 
diff --git a/packages/software-factory/.agents/skills/boxel-development/references/dev-data-management.md b/packages/software-factory/.agents/skills/boxel-development/references/dev-data-management.md
index a0486d931cd..fcf0326c819 100644
--- a/packages/software-factory/.agents/skills/boxel-development/references/dev-data-management.md
+++ b/packages/software-factory/.agents/skills/boxel-development/references/dev-data-management.md
@@ -161,7 +161,7 @@ Note: Use `null`, not an empty array `[]`
 
 - **Module paths**: Relative to JSON location, no `.gts` extension
   - Local: `"../author"` or `"../../shared/address-field"`
-  - Base: `"https://cardstack.com/base/string"`
+  - Base: `"@cardstack/base/string"`
 - **Relationship paths**: Relative paths, no `.json` extension
   - `"../Author/jane-doe"` not `"../Author/jane-doe.json"`
 - **Date formats**:
diff --git a/packages/software-factory/.agents/skills/boxel-development/references/dev-enumerations.md b/packages/software-factory/.agents/skills/boxel-development/references/dev-enumerations.md
index 21255d69340..e307cc6ed41 100644
--- a/packages/software-factory/.agents/skills/boxel-development/references/dev-enumerations.md
+++ b/packages/software-factory/.agents/skills/boxel-development/references/dev-enumerations.md
@@ -3,7 +3,7 @@
 **CRITICAL Import Syntax:**
 
 ```gts
-import enumField from 'https://cardstack.com/base/enum'; // Default import, not { enumField }
+import enumField from '@cardstack/base/enum'; // Default import, not { enumField }
 ```
 
 **Quick Start:**
@@ -45,10 +45,10 @@ Use `enumField(BaseField, { options })` to create a `FieldDef` with constrained
 
 ```gts
 // ✅ CORRECT
-import enumField from 'https://cardstack.com/base/enum';
+import enumField from '@cardstack/base/enum';
 
 // ❌ WRONG
-import { enumField } from 'https://cardstack.com/base/enum';
+import { enumField } from '@cardstack/base/enum';
 ```
 
 ## Quick Start
@@ -149,7 +149,7 @@ To make `null` selectable:
 **Define:**
 
 ```gts
-import enumField from 'https://cardstack.com/base/enum';
+import enumField from '@cardstack/base/enum';
 const Priority = enumField(StringField, { options: ['High', 'Medium', 'Low'] });
 ```
 
@@ -200,9 +200,9 @@ Both resolve to `@configuration.enum.options` for templates/formats.
 ## Complete Example
 
 ```gts
-import { CardDef, field, contains } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import enumField from 'https://cardstack.com/base/enum';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import enumField from '@cardstack/base/enum';
 import ArrowUpIcon from '@cardstack/boxel-icons/arrow-up';
 import ArrowDownIcon from '@cardstack/boxel-icons/arrow-down';
 
diff --git a/packages/software-factory/.agents/skills/boxel-development/references/dev-external-libraries.md b/packages/software-factory/.agents/skills/boxel-development/references/dev-external-libraries.md
index d47d407e894..d92d92b4559 100644
--- a/packages/software-factory/.agents/skills/boxel-development/references/dev-external-libraries.md
+++ b/packages/software-factory/.agents/skills/boxel-development/references/dev-external-libraries.md
@@ -46,8 +46,8 @@ Here is an example where we are:
 - adding some artificial delay using `await timeout(ms)` from `ember-concurrency`. Caution: do not use `setTimeout`.
 
 ```
-import { CardDef, field, contains, Component } from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+import { CardDef, field, contains, Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 import { tracked } from '@glimmer/tracking';
 import { restartableTask, timeout } from 'ember-concurrency';
 import { Button } from '@cardstack/boxel-ui/components';
diff --git a/packages/software-factory/.agents/skills/boxel-development/references/dev-file-def.md b/packages/software-factory/.agents/skills/boxel-development/references/dev-file-def.md
index 7282f1bcc4b..7aacd2778e5 100644
--- a/packages/software-factory/.agents/skills/boxel-development/references/dev-file-def.md
+++ b/packages/software-factory/.agents/skills/boxel-development/references/dev-file-def.md
@@ -37,24 +37,24 @@ FileDef                          → any file
 ## Import Paths
 
 ```gts
-import FileDef from 'https://cardstack.com/base/file-api';
+import FileDef from '@cardstack/base/file-api';
 
 // Image types
-import ImageDef from 'https://cardstack.com/base/image-file-def';
-import PngDef from 'https://cardstack.com/base/png-image-def';
-import JpgDef from 'https://cardstack.com/base/jpg-image-def';
-import SvgDef from 'https://cardstack.com/base/svg-image-def';
-import GifDef from 'https://cardstack.com/base/gif-image-def';
-import WebpDef from 'https://cardstack.com/base/webp-image-def';
-import AvifDef from 'https://cardstack.com/base/avif-image-def';
+import ImageDef from '@cardstack/base/image-file-def';
+import PngDef from '@cardstack/base/png-image-def';
+import JpgDef from '@cardstack/base/jpg-image-def';
+import SvgDef from '@cardstack/base/svg-image-def';
+import GifDef from '@cardstack/base/gif-image-def';
+import WebpDef from '@cardstack/base/webp-image-def';
+import AvifDef from '@cardstack/base/avif-image-def';
 
 // Document / text types
-import MarkdownDef from 'https://cardstack.com/base/markdown-file-def';
-import TextFileDef from 'https://cardstack.com/base/text-file-def';
-import TsFileDef from 'https://cardstack.com/base/ts-file-def';
-import GtsFileDef from 'https://cardstack.com/base/gts-file-def';
-import JsonFileDef from 'https://cardstack.com/base/json-file-def';
-import CsvFileDef from 'https://cardstack.com/base/csv-file-def';
+import MarkdownDef from '@cardstack/base/markdown-file-def';
+import TextFileDef from '@cardstack/base/text-file-def';
+import TsFileDef from '@cardstack/base/ts-file-def';
+import GtsFileDef from '@cardstack/base/gts-file-def';
+import JsonFileDef from '@cardstack/base/json-file-def';
+import CsvFileDef from '@cardstack/base/csv-file-def';
 ```
 
 ---
@@ -86,11 +86,11 @@ Additional fields added by subtype:
 ## Using FileDef in Cards
 
 ```gts
-import { CardDef, field, linksTo } from 'https://cardstack.com/base/card-api';
-import ImageDef from 'https://cardstack.com/base/image-file-def';
-import PngDef from 'https://cardstack.com/base/png-image-def';
-import FileDef from 'https://cardstack.com/base/file-api';
-import MarkdownDef from 'https://cardstack.com/base/markdown-file-def';
+import { CardDef, field, linksTo } from '@cardstack/base/card-api';
+import ImageDef from '@cardstack/base/image-file-def';
+import PngDef from '@cardstack/base/png-image-def';
+import FileDef from '@cardstack/base/file-api';
+import MarkdownDef from '@cardstack/base/markdown-file-def';
 
 export class ProductListing extends CardDef {
   @field photo = linksTo(PngDef); // Specifically PNG
@@ -143,7 +143,7 @@ These are completely different and are **not interchangeable**:
 |                          | `MarkdownDef`                                                                   | `MarkdownField`                                                             |
 | ------------------------ | ------------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
 | **Kind**                 | FileDef — a `.md` file in the realm                                             | FieldDef — inline text stored in the card's JSON                            |
-| **Import**               | `https://cardstack.com/base/markdown-file-def`                                  | `https://cardstack.com/base/markdown`                                       |
+| **Import**               | `@cardstack/base/markdown-file-def`                                             | `@cardstack/base/markdown`                                                  |
 | **Declaration**          | `@field notes = linksTo(MarkdownDef)`                                           | `@field notes = contains(MarkdownField)`                                    |
 | **Stored as**            | Separate `.md` file referenced by URL                                           | String embedded in the card's `.json`                                       |
 | **Has own URL?**         | ✅ Yes — shareable and reusable                                                 | ❌ No — owned by the containing card                                        |
diff --git a/packages/software-factory/.agents/skills/boxel-development/references/dev-file-editing.md b/packages/software-factory/.agents/skills/boxel-development/references/dev-file-editing.md
index 7af7f7937fe..6eb77d4fd68 100644
--- a/packages/software-factory/.agents/skills/boxel-development/references/dev-file-editing.md
+++ b/packages/software-factory/.agents/skills/boxel-development/references/dev-file-editing.md
@@ -55,7 +55,7 @@ http://realm/recipe-card.gts (new)
 ╔═══ SEARCH ════╗
 ╠═══════════════╣
 // ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══
-import { CardDef } from 'https://cardstack.com/base/card-api'; // ¹
+import { CardDef } from '@cardstack/base/card-api'; // ¹
 export class RecipeCard extends CardDef { // ²
   static displayName = 'Recipe';
 }
diff --git a/packages/software-factory/.agents/skills/boxel-development/references/dev-quick-reference.md b/packages/software-factory/.agents/skills/boxel-development/references/dev-quick-reference.md
index e58e0e8ca7c..6637b40db8b 100644
--- a/packages/software-factory/.agents/skills/boxel-development/references/dev-quick-reference.md
+++ b/packages/software-factory/.agents/skills/boxel-development/references/dev-quick-reference.md
@@ -8,9 +8,9 @@ import {
   field,
   contains,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 ```
 
 **UI Components:**
@@ -44,44 +44,44 @@ import {
   containsMany,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 // ² Base field imports (only what you use)
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import BooleanField from 'https://cardstack.com/base/boolean';
-import DateField from 'https://cardstack.com/base/date';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import TextAreaField from 'https://cardstack.com/base/text-area';
-import BigIntegerField from 'https://cardstack.com/base/big-integer';
-import CodeRefField from 'https://cardstack.com/base/code-ref';
-import Base64ImageField from 'https://cardstack.com/base/base64-image'; // 🚨 NEVER USE - embeds binary in JSON, crashes AI context; use FileDef types instead
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import DateField from '@cardstack/base/date';
+import DateTimeField from '@cardstack/base/datetime';
+import MarkdownField from '@cardstack/base/markdown';
+import TextAreaField from '@cardstack/base/text-area';
+import BigIntegerField from '@cardstack/base/big-integer';
+import CodeRefField from '@cardstack/base/code-ref';
+import Base64ImageField from '@cardstack/base/base64-image'; // 🚨 NEVER USE - embeds binary in JSON, crashes AI context; use FileDef types instead
 
 // ⁸ FileDef imports - for file fields (use linksTo, never contains)
-import FileDef from 'https://cardstack.com/base/file-api';
-import ImageDef from 'https://cardstack.com/base/image-file-def'; // any image
-import PngDef from 'https://cardstack.com/base/png-image-def'; // .png
-import JpgDef from 'https://cardstack.com/base/jpg-image-def'; // .jpg/.jpeg
-import SvgDef from 'https://cardstack.com/base/svg-image-def'; // .svg
-import GifDef from 'https://cardstack.com/base/gif-image-def'; // .gif
-import WebpDef from 'https://cardstack.com/base/webp-image-def'; // .webp
-import AvifDef from 'https://cardstack.com/base/avif-image-def'; // .avif
-import MarkdownDef from 'https://cardstack.com/base/markdown-file-def'; // .md (NOT same as MarkdownField)
-import TextFileDef from 'https://cardstack.com/base/text-file-def'; // .txt
-import TsFileDef from 'https://cardstack.com/base/ts-file-def'; // .ts
-import GtsFileDef from 'https://cardstack.com/base/gts-file-def'; // .gts
-import JsonFileDef from 'https://cardstack.com/base/json-file-def'; // .json
-import CsvFileDef from 'https://cardstack.com/base/csv-file-def'; // .csv
-import ColorField from 'https://cardstack.com/base/color';
-import EmailField from 'https://cardstack.com/base/email';
-import PercentageField from 'https://cardstack.com/base/percentage';
-import PhoneNumberField from 'https://cardstack.com/base/phone-number';
-import UrlField from 'https://cardstack.com/base/url';
-import AddressField from 'https://cardstack.com/base/address';
+import FileDef from '@cardstack/base/file-api';
+import ImageDef from '@cardstack/base/image-file-def'; // any image
+import PngDef from '@cardstack/base/png-image-def'; // .png
+import JpgDef from '@cardstack/base/jpg-image-def'; // .jpg/.jpeg
+import SvgDef from '@cardstack/base/svg-image-def'; // .svg
+import GifDef from '@cardstack/base/gif-image-def'; // .gif
+import WebpDef from '@cardstack/base/webp-image-def'; // .webp
+import AvifDef from '@cardstack/base/avif-image-def'; // .avif
+import MarkdownDef from '@cardstack/base/markdown-file-def'; // .md (NOT same as MarkdownField)
+import TextFileDef from '@cardstack/base/text-file-def'; // .txt
+import TsFileDef from '@cardstack/base/ts-file-def'; // .ts
+import GtsFileDef from '@cardstack/base/gts-file-def'; // .gts
+import JsonFileDef from '@cardstack/base/json-file-def'; // .json
+import CsvFileDef from '@cardstack/base/csv-file-def'; // .csv
+import ColorField from '@cardstack/base/color';
+import EmailField from '@cardstack/base/email';
+import PercentageField from '@cardstack/base/percentage';
+import PhoneNumberField from '@cardstack/base/phone-number';
+import UrlField from '@cardstack/base/url';
+import AddressField from '@cardstack/base/address';
 
 // ⚠️ EXTENDING BASE FIELDS: To customize a base field, import it and extend:
-// import BaseAddressField from 'https://cardstack.com/base/address';
+// import BaseAddressField from '@cardstack/base/address';
 // export class FancyAddressField extends BaseAddressField { }
 // Never import and define the same field name - it causes conflicts!
 
diff --git a/packages/software-factory/.agents/skills/boxel-development/references/dev-realm-search.md b/packages/software-factory/.agents/skills/boxel-development/references/dev-realm-search.md
index 109c7adf77a..557a2483b90 100644
--- a/packages/software-factory/.agents/skills/boxel-development/references/dev-realm-search.md
+++ b/packages/software-factory/.agents/skills/boxel-development/references/dev-realm-search.md
@@ -265,7 +265,7 @@ Some cards have CodeRef fields (e.g., `ref` on the Spec card). You can search by
 {
   "filter": {
     "on": {
-      "module": "https://cardstack.com/base/spec",
+      "module": "@cardstack/base/spec",
       "name": "Spec"
     },
     "eq": {
diff --git a/packages/software-factory/.agents/skills/boxel-development/references/dev-replicate-ai.md b/packages/software-factory/.agents/skills/boxel-development/references/dev-replicate-ai.md
index a6d68d02f74..7bda25357b2 100644
--- a/packages/software-factory/.agents/skills/boxel-development/references/dev-replicate-ai.md
+++ b/packages/software-factory/.agents/skills/boxel-development/references/dev-replicate-ai.md
@@ -31,7 +31,7 @@ https://gateway.ai.cloudflare.com/v1/{account}/{gateway}/replicate/v1/models/{ow
 **CRITICAL:** Enum `value` must exactly match API spec:
 
 ```gts
-import enumField from 'https://cardstack.com/base/enum';
+import enumField from '@cardstack/base/enum';
 
 const SizeField = enumField(StringField, {
   options: [
diff --git a/packages/software-factory/.agents/skills/boxel-development/references/dev-spec-usage.md b/packages/software-factory/.agents/skills/boxel-development/references/dev-spec-usage.md
index 4f19b8ac335..c6b0530ce80 100644
--- a/packages/software-factory/.agents/skills/boxel-development/references/dev-spec-usage.md
+++ b/packages/software-factory/.agents/skills/boxel-development/references/dev-spec-usage.md
@@ -2,7 +2,7 @@
 
 For each top-level card definition, create a Catalog Spec card instance in the target realm's `Spec/` folder using the `create_catalog_spec` tool. This makes the card discoverable in the Boxel catalog.
 
-The `create_catalog_spec` tool has the authoritative JSON schema for Spec card fields — use its parameter definitions to know which attributes and relationships are available. The tool auto-constructs the document with the correct `adoptsFrom` (`https://cardstack.com/base/spec#Spec`).
+The `create_catalog_spec` tool has the authoritative JSON schema for Spec card fields — use its parameter definitions to know which attributes and relationships are available. The tool auto-constructs the document with the correct `adoptsFrom` (`@cardstack/base/spec#Spec`).
 
 ## Usage
 
@@ -37,8 +37,8 @@ import { Author } from './author';
 **Field specs (contains/containsMany):**
 
 ```gts
-import StringField from 'https://cardstack.com/base/string';
-import AddressField from 'https://cardstack.com/base/address-field';
+import StringField from '@cardstack/base/string';
+import AddressField from '@cardstack/base/address-field';
 @field name = contains(StringField);
 @field addresses = containsMany(AddressField);
 ```
@@ -71,8 +71,8 @@ This document provides real-world usage examples for each spec type based on act
 
 ```typescript
 import { Author } from './author';
-import { Country } from 'https://cardstack.com/base/country';
-import { Skill } from 'https://cardstack.com/base/skill';
+import { Country } from '@cardstack/base/country';
+import { Skill } from '@cardstack/base/skill';
 ```
 
 #### Usage as a Field
@@ -109,8 +109,8 @@ export class BlogPost extends CardDef {
 #### Import
 
 ```typescript
-import StringField from 'https://cardstack.com/base/string';
-import DateField from 'https://cardstack.com/base/date';
+import StringField from '@cardstack/base/string';
+import DateField from '@cardstack/base/date';
 import { SocialMediaLink } from './social-media-link';
 ```
 
diff --git a/packages/software-factory/.agents/skills/boxel-development/references/dev-template-patterns.md b/packages/software-factory/.agents/skills/boxel-development/references/dev-template-patterns.md
index 8377e76ce85..9dc0263a672 100644
--- a/packages/software-factory/.agents/skills/boxel-development/references/dev-template-patterns.md
+++ b/packages/software-factory/.agents/skills/boxel-development/references/dev-template-patterns.md
@@ -285,9 +285,9 @@ import {
   contains,
   containsMany,
   Component,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
 import { get } from '@ember/helper';
 import { subtract } from '@cardstack/boxel-ui/helpers';
 
diff --git a/packages/software-factory/.agents/skills/boxel-development/references/dev-theme-design-system.md b/packages/software-factory/.agents/skills/boxel-development/references/dev-theme-design-system.md
index 88fecfcd0ff..638a8eac1d2 100644
--- a/packages/software-factory/.agents/skills/boxel-development/references/dev-theme-design-system.md
+++ b/packages/software-factory/.agents/skills/boxel-development/references/dev-theme-design-system.md
@@ -12,7 +12,7 @@
 "relationships": {
   "cardInfo.theme": {
     "links": {
-      "self": "https://cardstack.com/base/Theme/cardstack-brand-guide"
+      "self": "@cardstack/base/Theme/cardstack-brand-guide"
     }
   }
 }
@@ -31,19 +31,19 @@
 }
 ```
 
-- IMPORTANT: Never set `cardInfo.theme` on ThemeCards (cards adopting from `https://cardstack.com/base/theme/default` or its subclasses) to avoid cycles.
+- IMPORTANT: Never set `cardInfo.theme` on ThemeCards (cards adopting from `@cardstack/base/theme/default` or its subclasses) to avoid cycles.
 
 #### ThemeCard Types
 
-A ThemeCard is an instance of a card definition that inherits from `https://cardstack.com/base/theme/default` or from one of its subclasses.
+A ThemeCard is an instance of a card definition that inherits from `@cardstack/base/theme/default` or from one of its subclasses.
 
-| Type                     | URL                                                           | Description                                                                                  |
-| ------------------------ | ------------------------------------------------------------- | -------------------------------------------------------------------------------------------- |
-| Base Theme               | `https://cardstack.com/base/theme/default`                    | Root base class                                                                              |
-| Structured Theme         | `https://cardstack.com/base/structured-theme/default`         | MINIMUM template — includes all theme variables (except Brand variables)                     |
-| Style Reference          | `https://cardstack.com/base/style-reference/default`          | Extends `StructuredTheme` — adds fields for inspiration images, terms, and style description |
-| Detailed Style Reference | `https://cardstack.com/base/detailed-style-reference/default` | **PREFERRED** — extends `StyleReference` with detailed design system description             |
-| Brand Guide              | `https://cardstack.com/base/brand-guide/default`              | Extends `DetailedStyleReference` — adds brand-specific variables for colors and typography   |
+| Type                     | URL                                                | Description                                                                                  |
+| ------------------------ | -------------------------------------------------- | -------------------------------------------------------------------------------------------- |
+| Base Theme               | `@cardstack/base/theme/default`                    | Root base class                                                                              |
+| Structured Theme         | `@cardstack/base/structured-theme/default`         | MINIMUM template — includes all theme variables (except Brand variables)                     |
+| Style Reference          | `@cardstack/base/style-reference/default`          | Extends `StructuredTheme` — adds fields for inspiration images, terms, and style description |
+| Detailed Style Reference | `@cardstack/base/detailed-style-reference/default` | **PREFERRED** — extends `StyleReference` with detailed design system description             |
+| Brand Guide              | `@cardstack/base/brand-guide/default`              | Extends `DetailedStyleReference` — adds brand-specific variables for colors and typography   |
 
 > **When creating a Theme card:** Prefer `DetailedStyleReference`. At minimum, fill in `rootVariables` and `typography`. Add font URLs to `cssImports` as a string array — no `@import` needed (the system handles imports).
 
diff --git a/packages/software-factory/.agents/skills/boxel-file-structure/SKILL.md b/packages/software-factory/.agents/skills/boxel-file-structure/SKILL.md
index 6420101d95d..017c09b14d5 100644
--- a/packages/software-factory/.agents/skills/boxel-file-structure/SKILL.md
+++ b/packages/software-factory/.agents/skills/boxel-file-structure/SKILL.md
@@ -228,20 +228,20 @@ These realms contain shared definitions you can import from:
 
 **Production:**
 
-- `https://cardstack.com/base/` - Core types (CardDef, FieldDef, etc.)
+- `@cardstack/base/` - Core types (CardDef, FieldDef, etc.)
 - `https://app.boxel.ai/catalog/` - Catalog cards
 - `https://app.boxel.ai/skills/` - Skill cards
 
 **Staging:**
 
-- `https://cardstack.com/base/` - Same core types
+- `@cardstack/base/` - Same core types
 - `https://realms-staging.stack.cards/catalog/`
 - `https://realms-staging.stack.cards/skills/`
 
 ## Common Import Patterns
 
 ```gts
-// Core imports (always from cardstack.com/base)
+// Core imports (always from @cardstack/base)
 import {
   CardDef,
   FieldDef,
@@ -254,13 +254,13 @@ import {
   NumberField,
   BooleanField,
   Component,
-} from 'https://cardstack.com/base/card-api';
+} from '@cardstack/base/card-api';
 
 // Import from same workspace
 import { Author } from './author';
 
 // Import from base realm
-import { Skill } from 'https://cardstack.com/base/skill';
+import { Skill } from '@cardstack/base/skill';
 ```
 
 ## Query Structure (for API searches)
diff --git a/packages/software-factory/.agents/skills/software-factory-operations/SKILL.md b/packages/software-factory/.agents/skills/software-factory-operations/SKILL.md
index 1dc03ce401c..9bc9f6ab349 100644
--- a/packages/software-factory/.agents/skills/software-factory-operations/SKILL.md
+++ b/packages/software-factory/.agents/skills/software-factory-operations/SKILL.md
@@ -32,7 +32,7 @@ The agent has these tools during the execution loop. Use them by name — they a
 - `update_project({ path, attributes, relationships? })` — Update a Project card in the target realm. The tool's parameters include a dynamic JSON schema describing available fields — use it to know valid field names and types. The tool auto-constructs the JSON:API document with the correct `adoptsFrom`.
 - `update_ticket({ path, attributes, relationships? })` — Update a Ticket card. Same structured interface with dynamic field schema in the tool parameters.
 - `create_knowledge({ path, attributes, relationships? })` — Create or update a KnowledgeArticle card. Same structured interface with dynamic field schema in the tool parameters.
-- `create_catalog_spec({ path, attributes, relationships? })` — Create a Catalog Spec card in the target realm's `Spec/` folder. Makes a card definition discoverable in the Boxel catalog. Same structured interface with dynamic field schema. The tool auto-constructs the document with `adoptsFrom` pointing to `https://cardstack.com/base/spec#Spec`.
+- `create_catalog_spec({ path, attributes, relationships? })` — Create a Catalog Spec card in the target realm's `Spec/` folder. Makes a card definition discoverable in the Boxel catalog. Same structured interface with dynamic field schema. The tool auto-constructs the document with `adoptsFrom` pointing to `@cardstack/base/spec#Spec`.
 
 ### Testing
 
diff --git a/packages/software-factory/docs/phase-1-plan.md b/packages/software-factory/docs/phase-1-plan.md
index babf239dfb7..297cd869fa2 100644
--- a/packages/software-factory/docs/phase-1-plan.md
+++ b/packages/software-factory/docs/phase-1-plan.md
@@ -160,7 +160,7 @@ Rules:
 
 **IMPORTANT:** "Spec" has two completely different meanings in this system. All code, docs, and prompts must use the qualified form to avoid confusion:
 
-1. **Catalog Spec card** (`Spec/` folder, `.json` files) — A card instance that adopts from `https://cardstack.com/base/spec#Spec`. This is a **catalog entry** describing a card for inclusion in the Boxel catalog. It has fields like `ref` (CodeRef pointing to the card definition), `specType` (`'card'`|`'field'`|`'component'`), `readMe` (markdown description), `cardTitle`, and `cardDescription`. Example: `Spec/sticky-note.json` describes the StickyNote card.
+1. **Catalog Spec card** (`Spec/` folder, `.json` files) — A card instance that adopts from `@cardstack/base/spec#Spec`. This is a **catalog entry** describing a card for inclusion in the Boxel catalog. It has fields like `ref` (CodeRef pointing to the card definition), `specType` (`'card'`|`'field'`|`'component'`), `readMe` (markdown description), `cardTitle`, and `cardDescription`. Example: `Spec/sticky-note.json` describes the StickyNote card.
 
 2. **QUnit test file** (`.test.gts` files, co-located with card definitions) — A GTS file that exports a `runTests()` function containing QUnit test modules. The live-test infrastructure discovers these via `_mtimes` and runs them in the browser. Example: `sticky-note.test.gts` tests that StickyNote renders correctly.
 
@@ -251,7 +251,7 @@ The Catalog Spec card shape (from `packages/base/spec.gts`):
     },
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/spec",
+        "module": "@cardstack/base/spec",
         "name": "Spec"
       }
     }
@@ -293,7 +293,7 @@ Each tool's `execute` function looks up the correct per-realm JWT based on which
 
 Boxel-cli tools (`boxel-sync`, `boxel-push`, `boxel-pull`, etc.) are excluded from the agent's tool registry until CS-10520 lands (boxel-cli auth integration). The `ToolRegistry` is constructed with only `SCRIPT_TOOLS` and `REALM_API_TOOLS`. All file operations use the realm HTTP API directly.
 
-Card write tools (`update_project`, `update_ticket`, `create_knowledge`, `create_catalog_spec`) use **dynamic JSON schemas** fetched at startup from the realm server via `GetCardTypeSchemaCommand` (`_run-command`). DarkFactory schemas come from the source realm (`software-factory/`); the Spec card schema comes from the base realm (`https://cardstack.com/base/spec`). This ensures tool parameter definitions always match the actual card field definitions. Skills reference the tool schemas rather than hardcoding field names.
+Card write tools (`update_project`, `update_ticket`, `create_knowledge`, `create_catalog_spec`) use **dynamic JSON schemas** fetched at startup from the realm server via `GetCardTypeSchemaCommand` (`_run-command`). DarkFactory schemas come from the source realm (`software-factory/`); the Spec card schema comes from the base realm (`@cardstack/base/spec`). This ensures tool parameter definitions always match the actual card field definitions. Skills reference the tool schemas rather than hardcoding field names.
 
 Test generation rule:
 
diff --git a/packages/software-factory/docs/testing-strategy.md b/packages/software-factory/docs/testing-strategy.md
index a9c92a0a24b..2ce0fcb46ad 100644
--- a/packages/software-factory/docs/testing-strategy.md
+++ b/packages/software-factory/docs/testing-strategy.md
@@ -230,7 +230,7 @@ Examples:
 
 **IMPORTANT:** "Spec" has two completely different meanings in the software factory:
 
-1. **Catalog Spec card** (`Spec/` folder, `.json` files) — A card instance adopting from `https://cardstack.com/base/spec#Spec`. This is a catalog entry describing a card. Example: `Spec/sticky-note.json`.
+1. **Catalog Spec card** (`Spec/` folder, `.json` files) — A card instance adopting from `@cardstack/base/spec#Spec`. This is a catalog entry describing a card. Example: `Spec/sticky-note.json`.
 
 2. **QUnit test file** (`.test.gts` files, co-located with card definitions) — A GTS file that exports a `runTests()` function containing QUnit test modules. The live-test infrastructure discovers these via `_mtimes` and runs them in the browser. Example: `sticky-note.test.gts` tests that StickyNote renders correctly.
 
diff --git a/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-command-development.md b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-command-development.md
new file mode 100644
index 00000000000..3dbd895bc1a
--- /dev/null
+++ b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-command-development.md
@@ -0,0 +1,161 @@
+## Command Development Essentials
+
+Commands extend `Command<InputCardDef, OutputCardDef | undefined>` and execute workflows through host APIs.
+
+### Core Structure
+
+```gts
+import { Command } from '@cardstack/runtime-common';
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+
+class MyInput extends CardDef {
+  @field targetRealm = contains(StringField);
+}
+
+export class MyCommand extends Command<typeof MyInput, undefined> {
+  static actionVerb = 'Process';
+  async getInputType() { return MyInput; }
+  
+  protected async run(input: MyInput): Promise<undefined> {
+    // Validation first
+    if (!input.targetRealm) throw new Error('Target realm required');
+    
+    // Execute workflow
+    // Return result or undefined
+  }
+}
+```
+
+### Host Commands (IO Operations)
+
+**Never use `fetch` directly - always use host commands:**
+
+```gts
+import SaveCardCommand from '@cardstack/boxel-host/commands/save-card';
+import GetCardCommand from '@cardstack/boxel-host/commands/get-card';
+import SendRequestViaProxyCommand from '@cardstack/boxel-host/commands/send-request-via-proxy';
+import SearchCardsByQueryCommand from '@cardstack/boxel-host/commands/search-cards-by-query';
+
+// Save a card
+await new SaveCardCommand(this.commandContext).execute({
+  card: myCard,
+  realm: 'https://realm-url/'
+});
+
+// Get a card
+const card = await new GetCardCommand(this.commandContext).execute({
+  cardId: 'https://realm/Card/id'
+});
+
+// External API call
+const response = await new SendRequestViaProxyCommand(this.commandContext).execute({
+  url: 'https://api.example.com/endpoint',
+  method: 'POST',
+  requestBody: JSON.stringify(data),
+  headers: { 'Content-Type': 'application/json' }
+});
+```
+
+### OpenRouter API Pattern
+
+```gts
+const headers = {
+  'Content-Type': 'application/json',
+  'HTTP-Referer': 'https://realms-staging.stack.cards',
+  'X-Title': 'Your App Name'
+};
+
+const response = await new SendRequestViaProxyCommand(ctx).execute({
+  url: 'https://openrouter.ai/api/v1/chat/completions',
+  method: 'POST',
+  requestBody: JSON.stringify({
+    model: 'google/gemini-2.5-flash',
+    messages: [{ role: 'user', content: 'Your prompt' }]
+  }),
+  headers
+});
+
+if (!response.response.ok) throw new Error('API call failed');
+const data = await response.response.json();
+const text = data.choices?.[0]?.message?.content ?? '';
+```
+
+### Catalog Command Delegation
+
+**Reuse existing commands instead of reimplementing:**
+
+```gts
+import UploadImageCommand from 'https://realms-staging.stack.cards/catalog/commands/upload-image';
+
+const result = await new UploadImageCommand(this.commandContext).execute({
+  sourceImageUrl: dataUrl,
+  targetRealmUrl: input.realm
+});
+```
+
+### Query Pattern in Commands
+
+```gts
+import SearchCardsByQueryCommand from '@cardstack/boxel-host/commands/search-cards-by-query';
+
+const results = await new SearchCardsByQueryCommand(this.commandContext).execute({
+  query: {
+    filter: {
+      on: { module: new URL('./product', import.meta.url).href, name: 'Product' },
+      eq: { status: 'active' }
+    }
+  },
+  realmURLs: [input.realm]
+});
+```
+
+### Progress Tracking
+
+```gts
+import { tracked } from '@glimmer/tracking';
+
+export class MyCommand extends Command<typeof Input, undefined> {
+  @tracked step: 'idle' | 'processing' | 'completed' | 'error' = 'idle';
+  
+  protected async run(input: Input): Promise<undefined> {
+    this.step = 'processing';
+    try {
+      // Do work
+      this.step = 'completed';
+    } catch (e) {
+      this.step = 'error';
+      throw e;
+    }
+  }
+}
+```
+
+### Menu Integration
+
+```gts
+import { getCardMenuItems } from '@cardstack/runtime-common';
+
+[getCardMenuItems](params: GetCardMenuItemParams): MenuItemOptions[] {
+  return [{
+    label: 'My Action',
+    icon: MyIcon,
+    action: async () => {
+      await new MyCommand(params.commandContext).execute({
+        cardId: this.id,
+        realm: params.realmURL
+      });
+      await params.saveCard(this);
+    }
+  }, ...super[getCardMenuItems](params)];
+}
+```
+
+### Critical Rules
+
+- ✅ **Validate inputs first** - fail early with clear errors
+- ✅ **Use host commands for all IO** - never `fetch` directly
+- ✅ **Include `on` in queries** - for eq/contains/range filters
+- ✅ **Delegate to catalog commands** - don't reimplement uploads/services
+- ✅ **Wrap JSON parsing in try-catch** - handle malformed responses
+- ✅ **Track progress states** - use `@tracked` for UI feedback
\ No newline at end of file
diff --git a/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-core-patterns.md b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-core-patterns.md
new file mode 100644
index 00000000000..29e6a1a6285
--- /dev/null
+++ b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-core-patterns.md
@@ -0,0 +1,346 @@
+**Card with computed title:**
+```gts
+export class BlogPost extends CardDef {
+  @field headline = contains(StringField);
+  
+  @field title = contains(StringField, {
+    computeVia: function(this: BlogPost) {
+      return this.headline ?? 'Untitled Post';
+    }
+  });
+}
+```
+
+**Field definition:**
+```gts
+export class AddressField extends FieldDef {
+  @field street = contains(StringField);
+  @field city = contains(StringField);
+  
+  static embedded = class Embedded extends Component<typeof this> {
+    <template>
+      <div class="address">
+        <@fields.street /> <@fields.city />
+      </div>
+    </template>
+  };
+}
+```
+
+## Core Patterns
+
+### 1. Card Definition with Safe Computed Title
+```gts
+import { CardDef, field, contains, linksTo, containsMany, linksToMany, Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import DateField from '@cardstack/base/date';
+import FileTextIcon from '@cardstack/boxel-icons/file-text';
+import { Author } from './author';
+
+export class BlogPost extends CardDef {
+  static displayName = 'Blog Post';
+  static icon = FileTextIcon; // ✅ CORRECT: Boxel icons for static card/field type icons
+  static prefersWideFormat = true;
+  
+  @field headline = contains(StringField);
+  @field publishDate = contains(DateField);
+  @field author = linksTo(Author);
+  @field tags = containsMany(TagField);
+  @field relatedPosts = linksToMany(() => BlogPost);
+  
+  @field title = contains(StringField, {
+    computeVia: function(this: BlogPost) {
+      try {
+        const baseTitle = this.headline ?? 'Untitled Post';
+        const maxLength = 50;
+        if (baseTitle.length <= maxLength) return baseTitle;
+        return baseTitle.substring(0, maxLength - 3) + '...';
+      } catch (e) {
+        console.error('BlogPost: Error computing title', e);
+        return 'Untitled Post';
+      }
+    }
+  });
+}
+```
+
+### 2. Field Definition (Always Include Embedded Template)
+
+**CRITICAL:** Every FieldDef file must import FieldDef and MUST be exported:
+
+```gts
+import { FieldDef, field, contains, Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import LocationIcon from '@cardstack/boxel-icons/map-pin';
+import { concat } from '@ember/helper';
+
+export class AddressField extends FieldDef {
+  static displayName = 'Address';
+  static icon = LocationIcon; // ✅ CORRECT: Boxel icons for static card/field type icons
+  
+  @field street = contains(StringField);
+  @field city = contains(StringField);
+  @field postalCode = contains(StringField);
+  @field country = contains(StringField);
+  
+  static embedded = class Embedded extends Component<typeof this> {
+    <template>
+      <div class="address">
+        {{#if @model.street}}
+          <div><@fields.street /></div>
+        {{else}}
+          <div class="placeholder">Street address not provided</div>
+        {{/if}}
+        <div>
+          {{if @model.city @model.city "City"}}{{if @model.postalCode (concat ", " @model.postalCode) ""}}
+        </div>
+        {{#if @model.country}}
+          <div><@fields.country /></div>
+        {{else}}
+          <div class="placeholder">Country not specified</div>
+        {{/if}}
+      </div>
+      <style scoped>
+        .placeholder { font-style: italic; }
+      </style>
+    </template>
+  };
+}
+```
+
+### 3. Computed Properties with Safety
+
+**CRITICAL:** Avoid cycles and infinite recursion in computed fields.
+
+```gts
+// ❌ DANGEROUS: Self-reference causes infinite recursion
+@field title = contains(StringField, {
+  computeVia: function(this: BlogPost) {
+    return this.title || 'Untitled'; // STACK OVERFLOW!
+  }
+});
+
+// ✅ SAFE: Reference only base fields
+@field fullName = contains(StringField, {
+  computeVia: function(this: Person) {
+    try {
+      const first = this.firstName ?? '';
+      const last = this.lastName ?? '';
+      const full = first + ' ' + last;
+      return full.trim() || 'Name not provided';
+    } catch (e) {
+      console.error('Person: Error computing fullName', e);
+      return 'Name unavailable';
+    }
+  }
+});
+```
+
+### 4. Templates with Proper Computation Patterns
+
+**Remember:** When implementing templates via SEARCH/REPLACE, track all major sections with ⁿ and include the post-block notation `╰ ⁿ⁻ᵐ`
+
+```gts
+static isolated = class Isolated extends Component<typeof BlogPost> { // ³⁰ Isolated format
+  @tracked showComments = false;
+  
+  // ³¹ CRITICAL: Do ALL computation in functions, never in templates
+  get safeTitle() {
+    try {
+      return this.args?.model?.title ?? 'Untitled Post';
+    } catch (e) {
+      console.error('BlogPost: Error accessing title', e);
+      return 'Untitled Post';
+    }
+  }
+  
+  get commentButtonText() {
+    try {
+      const count = this.args?.model?.commentCount ?? 0;
+      return this.showComments ? `Hide Comments (${count})` : `Show Comments (${count})`;
+    } catch (e) {
+      console.error('BlogPost: Error computing comment button text', e);
+      return this.showComments ? 'Hide Comments' : 'Show Comments';
+    }
+  }
+  
+  // methods referenced from templates must be defined with fat arrow (=>) so that they are properly bound when invoked
+  toggleComments = () => {
+    this.showComments = !this.showComments;
+  }
+  
+  <template>
+    <!-- ³² Responsive surface that adapts from wide layouts down to mobile -->
+    <article class="blog-post-surface">
+      <header>
+        <time>{{if @model.publishDate (formatDateTime @model.publishDate 'MMMM D, YYYY') "Date not set"}}</time>
+        <h1>{{this.safeTitle}}</h1>
+        
+        {{#if @fields.author}}
+          <@fields.author />
+        {{else}}
+          <div class="author-placeholder">Author not specified</div>
+        {{/if}}
+      </header>
+      
+      <div class="post-content">
+        {{#if @model.body}}
+          <@fields.body />
+        {{else}}
+          <div class="content-placeholder">
+            <p>No content has been written yet. Click to start writing!</p>
+          </div>
+        {{/if}}
+      </div>
+      
+      <!-- ³³ Handle arrays with REQUIRED spacing -->
+      {{#if (gt @model.tags.length 0)}}
+        <section class="tags-section">
+          <h4>Tags</h4>
+          <div class="tags-container">
+            <@fields.tags @format="atom" />
+          </div>
+        </section>
+      {{/if}}
+      
+      {{#if (gt @model.commentCount 0)}}
+      <div>
+        <Button 
+          @kind="text-only" 
+          @size="extra-small" 
+          class="comment-button"
+          {{on 'click' this.toggleComments}}
+        >
+          <svg width='16' height='16' class="button-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/>
+          </svg>
+          {{this.commentButtonText}}
+        </Button>
+       </div>
+      {{/if}}
+      
+      {{#if this.showComments}}
+        <section class="comments-section">
+          <h3>Discussion</h3>
+          {{#if (gt @model.comments.length 0)}}
+            <div class="comments-container">
+              <@fields.comments @format="embedded" />
+            </div>
+          {{else}}
+            <p class="no-comments">No comments yet. Be the first to share your thoughts!</p>
+          {{/if}}
+        </section>
+      {{/if}}
+    </article>
+    
+    <style scoped> /* ³⁴ Component styles */
+      .blog-post-surface {
+        width: 100%;
+        max-width: 42rem;
+        margin: 0 auto;
+        padding: clamp(1.25rem, 4vw, 2rem);
+        display: flex;
+        flex-direction: column;
+        gap: clamp(1rem, 2.5vw, 1.5rem);
+        height: 100%;
+        min-height: 100%;
+        overflow-y: auto;
+        font-size: 0.875rem;
+        line-height: 1.3;
+      }
+      
+      @media (max-width: 800px) {
+        .blog-post-surface {
+          max-width: none;
+          padding: clamp(1rem, 6vw, 1.5rem);
+        }
+      }
+      
+      .blog-post-surface > header h1 {
+        font-size: clamp(1.125rem, 3vw, 1.5rem);
+        margin-top: 0.25rem;
+        line-height: 1.2;
+      }
+      
+      .post-content {
+        font-size: 0.8125rem;
+        line-height: 1.25;
+      }
+      
+      /* ³⁵ CRITICAL: Always style buttons completely - never use unstyled */
+      .comment-button {
+        /* Style Boxel components to match your design */
+        gap: var(--boxel-sp-2xs);
+      }
+      
+      .comment-button .button-icon {
+        width: 1rem;
+        height: 1rem;
+      }
+      
+      /* ³⁶ CRITICAL: Spacing for containsMany collections */
+      .tags-container > .containsMany-field {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 0.25rem; /* Essential spacing between tags */
+      }
+      
+      .comments-container > .containsMany-field {
+        display: flex;
+        flex-direction: column;
+        gap: 0.75rem; /* Essential spacing between comments */
+      }
+    </style>
+  </template>
+};
+```
+
+### WARNING: Do NOT Use Constructors for Default Values
+
+**CRITICAL:** Constructors should NOT be used for setting default values in Boxel cards. Use template fallbacks (if field is editable) or computeVia (only if field is strictly read-only) instead.
+
+```gts
+// ❌ WRONG - Never use constructors for defaults
+export class Todo extends CardDef {
+  constructor(owner: unknown, args: {}) {
+    super(owner, args);
+    this.createdDate = new Date(); // DON'T DO THIS
+    this.isCompleted = false;      // DON'T DO THIS
+  }
+}
+```
+
+### **CRITICAL: NEVER Create JavaScript Objects in Templates**
+
+**Templates are for simple display logic only.** Never call constructors, create objects, or perform complex operations in template expressions.
+
+```hbs
+<!-- ❌ WRONG: Creating objects in templates -->
+<span>{{if @model.currentMonth @model.currentMonth (formatDateTime (new Date()) "MMMM YYYY")}}</span>
+<div>{{someFunction(@model.data)}}</div>
+
+<!-- ✅ CORRECT: Move logic to JavaScript computed properties -->
+<span>{{if @model.currentMonth @model.currentMonth this.currentMonthDisplay}}</span>
+<div>{{this.processedData}}</div>
+```
+
+```gts
+// ✅ CORRECT: Define logic in JavaScript
+export class MyCard extends CardDef {
+  get currentMonthDisplay() {
+    return new Intl.DateTimeFormat('en-US', { 
+      month: 'long', 
+      year: 'numeric' 
+    }).format(new Date());
+  }
+  
+  get processedData() {
+    return this.args.model?.data ? this.processData(this.args.model.data) : 'No data';
+  }
+  
+  private processData(data: any) {
+    // Complex processing logic here
+    return result;
+  }
+}
+```
\ No newline at end of file
diff --git a/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-data-management.md b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-data-management.md
new file mode 100644
index 00000000000..b296ebc8816
--- /dev/null
+++ b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-data-management.md
@@ -0,0 +1,156 @@
+## File Organization
+
+### Single App Structure
+```
+my-realm/
+├── blog-post.gts          # Card definition (kebab-case)
+├── author.gts             # Another card
+├── address-field.gts      # Field definition (kebab-case-field)
+├── BlogPost/              # Instance directory (PascalCase)
+│   ├── hello-world.json   # Instance (any-name)
+│   └── second-post.json   
+└── Author/
+    └── jane-doe.json
+```
+
+### Related Cards App Structure
+**CRITICAL:** When creating apps with multiple related cards, organize them in common folders:
+
+```
+my-realm/
+├── ecommerce/             # Common folder for related cards
+│   ├── product.gts        # Card definitions
+│   ├── order.gts
+│   ├── customer.gts
+│   ├── Product/           # Instance directories
+│   │   └── laptop-pro.json
+│   └── Order/
+│       └── order-001.json
+├── blog/                  # Another app's folder
+│   ├── post.gts
+│   ├── author.gts
+│   └── Post/
+│       └── welcome.json
+└── shared/                # Shared components
+    └── address-field.gts  # Common field definitions
+```
+
+**Directory Discipline:** When creating files within a specific directory structure (e.g., `ecommerce/`), keep ALL related files within that structure. Don't create files outside the intended directory organization.
+
+**Relationship Path Tracking:** When creating related JSON instances, maintain a mental map of your file paths. Links between instances must use the exact relative paths you've created - consistency prevents broken relationships.
+
+## JSON Instance Format Quick Reference
+
+**When creating `.json` card instances via SEARCH/REPLACE, follow this structure:**
+
+**Naming:** Use natural names for JSON files (e.g., `Author/jane-doe.json`, `Product/laptop-pro.json`) - don't append `-sample-data`
+
+**Path Consistency:** When creating multiple related JSON instances, track the exact file paths you create. Relationship links must match these paths exactly - if you create `Author/dr-nakamura.json`, reference it as `"../Author/dr-nakamura"` from other instances.
+
+### Root Structure
+All data wrapped in a `data` object with:
+* `type`: Always `"card"` for instances
+* `attributes`: Field values go here
+* `relationships`: Links to other cards
+* `meta.adoptsFrom`: Connection to GTS definition
+
+### Instance Template
+```json
+{
+  "data": {
+    "type": "card",
+    "attributes": {
+      // Field values here
+    },
+    "relationships": {
+      // Card links here
+    },
+    "meta": {
+      "adoptsFrom": {
+        "module": "../path-to-gts-file",
+        "name": "CardDefClassName"
+      }
+    }
+  }
+}
+```
+
+### Field Value Patterns
+
+**Simple fields** (`contains(StringField)`, etc.):
+```json
+"attributes": {
+  "title": "My Title",
+  "price": 29.99,
+  "isActive": true
+}
+```
+
+**Compound fields** (`contains(AddressField)` - a FieldDef):
+```json
+"attributes": {
+  "address": {
+    "street": "4827 Riverside Terrace",
+    "city": "Portland",
+    "postalCode": "97205"
+  }
+}
+```
+
+**Array fields** (`containsMany`):
+```json
+"attributes": {
+  "tags": ["urgent", "review", "frontend"],
+  "phoneNumbers": [
+    { "number": "+1-503-555-0134", "type": "work" },
+    { "number": "+1-971-555-0198", "type": "mobile" }
+  ]
+}
+```
+
+### Relationship Patterns
+
+**Single link** (`linksTo`):
+```json
+"relationships": {
+  "author": {
+    "links": {
+      "self": "../Author/dr-nakamura"
+    }
+  }
+}
+```
+
+**Multiple links** (`linksToMany`) - note the `.0`, `.1` pattern:
+```json
+"relationships": {
+  "teamMembers.0": {
+    "links": { "self": "../Person/kai-nakamura" }
+  },
+  "teamMembers.1": {
+    "links": { "self": "../Person/esperanza-cruz" }
+  }
+}
+```
+
+**Empty linksToMany** - when no relationships exist:
+```json
+"relationships": {
+  "nextLevels": {
+    "links": {
+      "self": null
+    }
+  }
+}
+```
+Note: Use `null`, not an empty array `[]`
+
+### Path Conventions
+* **Module paths**: Relative to JSON location, no `.gts` extension
+  * Local: `"../author"` or `"../../shared/address-field"`
+  * Base: `"@cardstack/base/string"`
+* **Relationship paths**: Relative paths, no `.json` extension
+  * `"../Author/jane-doe"` not `"../Author/jane-doe.json"`
+* **Date formats**: 
+  * DateField: `"2024-11-15"`
+  * DateTimeField: `"2024-11-15T10:00:00Z"`
\ No newline at end of file
diff --git a/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-enumerations.md b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-enumerations.md
new file mode 100644
index 00000000000..455bce259a5
--- /dev/null
+++ b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-enumerations.md
@@ -0,0 +1,209 @@
+## Enum Field Essentials
+
+**CRITICAL Import Syntax:**
+```gts
+import enumField from '@cardstack/base/enum'; // Default import, not { enumField }
+```
+
+**Quick Start:**
+```gts
+const StatusField = enumField(StringField, { options: ['Open', 'Closed'] });
+@field status = contains(StatusField);
+```
+
+**Template:** `<@fields.status />` renders a BoxelSelect in edit mode.
+
+**Rich options with labels/icons:**
+```gts
+enumField(StringField, { 
+  options: [
+    { value: 'high', label: 'High Priority', icon: ArrowUpIcon },
+    { value: 'low', label: 'Low Priority', icon: ArrowDownIcon }
+  ]
+})
+```
+
+**Key helpers:**
+- `enumValues(card, 'fieldName')` → array of primitive values
+- `enumOptions(card, 'fieldName')` → normalized `{ value, label, icon? }`
+
+<!--more-->
+
+# Enum Fields
+
+## Purpose
+
+Use `enumField(BaseField, { options })` to create a `FieldDef` with constrained values and a default dropdown editor. Works with primitive bases (e.g., `StringField`, `NumberField`).
+
+## Import Syntax
+
+**CRITICAL:** Use default import, not destructured import:
+
+```gts
+// ✅ CORRECT
+import enumField from '@cardstack/base/enum';
+
+// ❌ WRONG
+import { enumField } from '@cardstack/base/enum';
+```
+
+## Quick Start
+
+**Define:**
+```gts
+const StatusField = enumField(StringField, { options: ['Open', 'Closed'] });
+```
+
+**Use:**
+```gts
+@field status = contains(StatusField);
+```
+
+**Template:**
+```hbs
+<@fields.status /> {{! Renders a BoxelSelect in edit mode }}
+```
+
+## Rich Options (Labels/Icons)
+
+```gts
+enumField(StringField, { 
+  options: [
+    { value: 'high', label: 'High', icon: ArrowUpIcon },
+    { value: 'medium', label: 'Medium', icon: MinusIcon },
+    { value: 'low', label: 'Low', icon: ArrowDownIcon }
+  ]
+})
+```
+
+Editor shows labels/icons; stored value is the primitive `value`.
+
+## Dynamic Options
+
+**Provide a function:**
+```gts
+enumField(StringField, { 
+  options: function() { 
+    return this.someList; 
+  }
+})
+```
+
+**Per-usage override:**
+```gts
+contains(Field, { 
+  configuration: enumConfig(function() { 
+    return { options: this.someList }; 
+  })
+})
+```
+
+**Note:** `this` is the containing card or field
+
+## Helpers
+
+**enumValues** - Get array of primitive values:
+```gts
+enumValues(card, 'enumFieldName') // → ['High', 'Medium', 'Low']
+```
+
+**enumOptions** - Get normalized option objects:
+```gts
+enumOptions(card, 'enumFieldName') // → [{ value, label, icon? }, ...]
+```
+
+## Null Handling
+
+If current value is `null` and `null` isn't in options, placeholder uses `unsetLabel` or "Choose…".
+
+To make `null` selectable:
+```gts
+{ value: null, label: 'None' }
+```
+
+## Limitations
+
+- **Compound field values:** Not yet supported
+- **Card values:** Not yet supported
+
+## Validation and Behavior
+
+- Duplicate values throw during option normalization
+- Query and serialization follow the base field
+- Enum wrapping does not change data shape
+
+## Minimal Example
+
+**Define:**
+```gts
+import enumField from '@cardstack/base/enum';
+const Priority = enumField(StringField, { options: ['High', 'Medium', 'Low'] });
+```
+
+**Use:**
+```gts
+class Task extends CardDef { 
+  @field priority = contains(Priority); 
+}
+```
+
+**Template:**
+```hbs
+<@fields.priority />
+{{enumValues @model 'priority'}} {{! ['High','Medium','Low'] }}
+```
+
+## Factory vs Usage (Clarity)
+
+**Factory defaults:**
+```gts
+enumField(Base, { options }) // For simple/static defaults
+```
+
+**Usage overrides:**
+```gts
+contains(Field, { 
+  configuration: enumConfig(function() { 
+    return { options }; 
+  })
+}) // For per-instance behavior
+```
+
+Both resolve to `@configuration.enum.options` for templates/formats.
+
+## Callback Context
+
+`computeVia`, `enumField` options functions, and `enumConfig` usage callbacks all receive the containing instance as `this`.
+
+**Prefer `function() { ... }` (not arrow)** to ensure `this` is bound to the parent instance.
+
+**Guidance:** Keep callbacks side-effect free; derive options synchronously from `this`.
+
+## Complete Example
+
+```gts
+import { CardDef, field, contains } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import enumField from '@cardstack/base/enum';
+import ArrowUpIcon from '@cardstack/boxel-icons/arrow-up';
+import ArrowDownIcon from '@cardstack/boxel-icons/arrow-down';
+
+const PriorityField = enumField(StringField, {
+  options: [
+    { value: 'high', label: 'High Priority', icon: ArrowUpIcon },
+    { value: 'medium', label: 'Medium Priority' },
+    { value: 'low', label: 'Low Priority', icon: ArrowDownIcon }
+  ]
+});
+
+export class Task extends CardDef {
+  @field taskName = contains(StringField);
+  @field priority = contains(PriorityField);
+  
+  @field title = contains(StringField, {
+    computeVia: function(this: Task) {
+      return this.taskName ?? 'Untitled Task';
+    }
+  });
+}
+```
\ No newline at end of file
diff --git a/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-external-libraries.md b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-external-libraries.md
new file mode 100644
index 00000000000..e6e0e96df96
--- /dev/null
+++ b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-external-libraries.md
@@ -0,0 +1,96 @@
+**Async loading pattern:**
+```gts
+import { task, restartableTask, timeout } from 'ember-concurrency';
+import Modifier from 'ember-modifier';
+
+private loadLibrary = task(async () => {
+  const script = document.createElement('script');
+  script.src = 'https://cdn.../library.js';
+  await new Promise((resolve, reject) => {
+    script.onload = resolve;
+    script.onerror = reject;
+    document.head.appendChild(script);
+  });
+});
+```
+
+**Key Rules:**
+1. Use Modifiers for DOM access
+2. Use ember-concurrency tasks for async
+3. Bind external data to model fields
+4. Provide loading states
+
+**Task types:**
+- `task` - Concurrent execution
+- `restartableTask` - Cancel previous, start new
+- `enqueueTask` - Sequential queue
+- `dropTask` - Ignore new while running
+
+## Async loading from within components
+
+For fetching data from external APIs, use `ember-concurrency`. The core of this principle are "tasks", which are a cancelable alternative to promises. The most used ones are `task`, and `restartableTask`:
+
+- task: Tasks run concurrently without any coordination, allowing multiple instances to execute simultaneously.
+- restartableTask: Cancels any running task and immediately starts a new one when performed, ensuring only the latest task runs.
+- enqueueTask: Queues tasks to run sequentially one after another, ensuring no overlap but preserving all tasks.
+- dropTask: Ignores new task requests while one is already running, preventing any additional instances from starting.
+- keepLatest: Drops intermediate queued tasks but keeps the most recent one to run after the current task completes.
+
+Here is an example where we are:
+- loading data when component is first rendered, 
+- reloading it when user clicks on a button,
+- adding some artificial delay using `await timeout(ms)` from `ember-concurrency`. Caution:  do not use `setTimeout`.
+
+```
+import { CardDef, field, contains, Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import { tracked } from '@glimmer/tracking';
+import { restartableTask, timeout } from 'ember-concurrency';
+import { Button } from '@cardstack/boxel-ui/components';
+import { on } from '@ember/modifier';
+import perform from 'ember-concurrency/helpers/perform';
+
+export class CurrencyLoader extends CardDef {
+  static displayName = 'Currency Loader';
+  
+  @field loadingStatus = contains(StringField);
+  @field currencies = contains(StringField);
+  
+  static isolated = class Isolated extends Component<typeof this> {
+    constructor(owner: any, args: any) {
+      super(owner, args);
+      this.loadCurrencies.perform();
+    }
+    
+    private loadCurrencies = restartableTask(async () => {
+      this.args.model.loadingStatus = 'Loading...';
+      const response = await fetch('/api/currencies');
+      await timeout(1000); // Visual feedback
+      
+      this.args.model.currencies = await response.json();
+      this.args.model.loadingStatus = "";
+    });
+    
+    <template>
+      <div>
+        <p>Status: {{@model.loadingStatus}}</p>
+        <p>Data: {{@model.currencies}}</p>
+        
+        <Button {{on 'click' (perform this.loadCurrencies)}}>
+          Reload Currencies
+        </Button>
+      </div>
+    </template>
+  };
+}
+```
+
+## External Libraries: Bringing Third-Party Power to Boxel
+
+**When to Use External Libraries:** Sometimes you need specialized functionality like 3D graphics (Three.js), data visualization (D3), or charts. Boxel plays well with external libraries when you follow the right patterns.
+
+**Key Rules:**
+1. **Always use Modifiers for DOM access** - Never manipulate DOM directly
+2. **Use ember-concurrency tasks** for async operations like loading libraries
+3. **Bind external data to model fields** for reactive updates
+4. **Use proper loading states** while libraries initialize
\ No newline at end of file
diff --git a/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-file-def.md b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-file-def.md
new file mode 100644
index 00000000000..2388a5439fa
--- /dev/null
+++ b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-file-def.md
@@ -0,0 +1,166 @@
+## FileDef — First-Class File Support
+
+`FileDef` is a **third kind of "def"** in Boxel, alongside `CardDef` and `FieldDef`. A FileDef instance represents a file that lives in the realm — an image, document, or other asset — with metadata automatically extracted during indexing.
+
+### Key Rules
+
+- **FileDef instances have their own identity** (like cards), so you reference them with `linksTo`, never `contains`
+- **Render them using the same display formats** — FileDefs have `isolated`, `embedded`, `fitted`, and `atom` templates
+- **Files are not editable via the card edit interface** — users replace them by uploading a new file
+
+---
+
+## Type Hierarchy
+
+```
+FileDef                          → any file
+  ├── ImageDef                   → any image (adds width, height)
+  │     ├── PngDef               → .png files
+  │     ├── JpgDef               → .jpg / .jpeg files
+  │     ├── SvgDef               → .svg files
+  │     ├── GifDef               → .gif files
+  │     ├── WebpDef              → .webp files
+  │     └── AvifDef              → .avif files
+  ├── MarkdownDef                → .md / .markdown (adds title, excerpt, content)
+  ├── TextFileDef                → .txt (adds title, excerpt, content)
+  ├── TsFileDef                  → .ts (adds title, excerpt, content)
+  ├── GtsFileDef                 → .gts (extends TsFileDef)
+  ├── JsonFileDef                → .json (adds title, excerpt, content)
+  └── CsvFileDef                 → .csv (adds title, excerpt, content, columns, columnCount, rowCount)
+```
+
+**Use the most specific type that fits.** Prefer `PngDef` over `ImageDef` when you specifically need PNG; prefer `ImageDef` over `FileDef` when any image format is acceptable.
+**This set is not extensible by Boxel users (currently).** The Boxel project provides these types and only new releases of boxel can add new ones. This may change in the future.
+
+---
+
+## Import Paths
+
+```gts
+import FileDef from '@cardstack/base/file-api';
+
+// Image types
+import ImageDef from '@cardstack/base/image-file-def';
+import PngDef from '@cardstack/base/png-image-def';
+import JpgDef from '@cardstack/base/jpg-image-def';
+import SvgDef from '@cardstack/base/svg-image-def';
+import GifDef from '@cardstack/base/gif-image-def';
+import WebpDef from '@cardstack/base/webp-image-def';
+import AvifDef from '@cardstack/base/avif-image-def';
+
+// Document / text types
+import MarkdownDef from '@cardstack/base/markdown-file-def';
+import TextFileDef from '@cardstack/base/text-file-def';
+import TsFileDef from '@cardstack/base/ts-file-def';
+import GtsFileDef from '@cardstack/base/gts-file-def';
+import JsonFileDef from '@cardstack/base/json-file-def';
+import CsvFileDef from '@cardstack/base/csv-file-def';
+```
+
+---
+
+## Available Fields
+
+Every FileDef instance exposes these base fields:
+
+| Field         | Type   | Description                  |
+| ------------- | ------ | ---------------------------- |
+| `id`          | string | URL identifier of the file   |
+| `url`         | string | Current URL of the file      |
+| `sourceUrl`   | string | Original source URL          |
+| `name`        | string | Filename (e.g. `photo.png`)  |
+| `contentType` | string | MIME type (e.g. `image/png`) |
+| `contentHash` | string | MD5 hash of file content     |
+| `contentSize` | number | File size in bytes           |
+
+Additional fields added by subtype:
+
+| Type                                                                   | Extra Fields                                                                |
+| ---------------------------------------------------------------------- | --------------------------------------------------------------------------- |
+| `ImageDef` + all image subtypes                                        | `width` (px), `height` (px)                                                 |
+| `MarkdownDef`, `TextFileDef`, `TsFileDef`, `GtsFileDef`, `JsonFileDef` | `title`, `excerpt`, `content` (full text)                                   |
+| `CsvFileDef`                                                           | `title`, `excerpt`, `content`, `columns` (array), `columnCount`, `rowCount` |
+
+---
+
+## Using FileDef in Cards
+
+```gts
+import { CardDef, field, linksTo } from '@cardstack/base/card-api';
+import ImageDef from '@cardstack/base/image-file-def';
+import PngDef from '@cardstack/base/png-image-def';
+import FileDef from '@cardstack/base/file-api';
+import MarkdownDef from '@cardstack/base/markdown-file-def';
+
+export class ProductListing extends CardDef {
+  @field photo = linksTo(PngDef); // Specifically PNG
+  @field banner = linksTo(ImageDef); // Any image format
+  @field attachment = linksTo(FileDef); // Any file type
+  @field readme = linksTo(MarkdownDef); // Markdown document
+}
+```
+
+---
+
+## Rendering File Fields in Templates
+
+Use `<@fields.fieldName />` exactly as with any other field. The built-in display components handle rendering automatically.
+
+```gts
+static isolated = class Isolated extends Component<typeof ProductListing> {
+  <template>
+    <div class='product'>
+      {{! Full image with filename and dimensions shown }}
+      <@fields.photo @format="isolated" />
+
+      {{! Responsive inline image filling its container }}
+      <@fields.banner @format="embedded" />
+
+      {{! Thumbnail + filename (good for lists/atom use) }}
+      <@fields.photo @format="atom" />
+
+      {{! Access raw metadata directly when needed }}
+      <p>{{@model.photo.name}} ({{@model.photo.width}}×{{@model.photo.height}}px)</p>
+      <p>Size: {{@model.attachment.contentSize}} bytes</p>
+    </div>
+  </template>
+};
+```
+
+**Image built-in formats:**
+
+- `isolated` → full-size image + filename + dimensions footer
+- `embedded` → responsive `<img>` that fills its container width
+- `fitted` → `background-image: cover` for fixed-size grid cells
+- `atom` → 20 px thumbnail + filename inline
+
+---
+
+## MarkdownDef vs MarkdownField
+
+These are completely different and are **not interchangeable**:
+
+|                          | `MarkdownDef`                                                                   | `MarkdownField`                                                             |
+| ------------------------ | ------------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
+| **Kind**                 | FileDef — a `.md` file in the realm                                             | FieldDef — inline text stored in the card's JSON                            |
+| **Import**               | `@cardstack/base/markdown-file-def`                                  | `@cardstack/base/markdown`                                       |
+| **Declaration**          | `@field notes = linksTo(MarkdownDef)`                                           | `@field notes = contains(MarkdownField)`                                    |
+| **Stored as**            | Separate `.md` file referenced by URL                                           | String embedded in the card's `.json`                                       |
+| **Has own URL?**         | ✅ Yes — shareable and reusable                                                 | ❌ No — owned by the containing card                                        |
+| **Editable in card UI?** | ❌ No — replaced by uploading a new file                                        | ✅ Yes — inline markdown editor                                             |
+| **Extra fields**         | `title`, `excerpt`, `content` auto-extracted                                    | Raw markdown string only                                                    |
+| **Use when**             | Stand-alone documents, content shared across cards, files managed outside Boxel | Inline rich text that belongs to the card, like a description or body field |
+
+---
+
+## FileDef vs Base64ImageField
+
+**🚨 Do NOT use `Base64ImageField` for images.** Use an image FileDef type instead.
+
+|                     | FileDef (`ImageDef`, `PngDef`, etc.) | `Base64ImageField`                       |
+| ------------------- | ------------------------------------ | ---------------------------------------- |
+| **Storage**         | Separate file in the realm           | Base64 data embedded in the card's JSON  |
+| **AI context cost** | ✅ Minimal — just a URL reference    | ❌ Extremely large — can exhaust context |
+| **Shareable**       | ✅ Yes — has its own URL             | ❌ No — embedded in one card             |
+| **Performance**     | ✅ Standard HTTP caching             | ❌ Bloated JSON payloads                 |
+| **Use**             | ✅ Always prefer this                | ⚠️ Avoid                                 |
diff --git a/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-file-editing.md b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-file-editing.md
new file mode 100644
index 00000000000..e37926c23cd
--- /dev/null
+++ b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-file-editing.md
@@ -0,0 +1,85 @@
+### SEARCH/REPLACE Essentials
+
+**Every .gts file line 1:**
+```gts
+// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══
+```
+
+**Creating new file:**
+```gts
+http://realm/card.gts (new)
+╔═══ SEARCH ════╗
+╠═══════════════╣
+// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══
+import { CardDef } from '...'; // ¹
+export class MyCard extends CardDef { } // ²
+╚═══ REPLACE ═══╝
+```
+╰ ¹⁻²
+
+**Modifying existing:**
+```gts
+https://realm/card.gts
+╔═══ SEARCH ════╗
+existing code with tracking markers
+╠═══════════════╣
+modified code with new markers // ⁵
+╚═══ REPLACE ═══╝
+```
+⁰ ⁵
+
+## File Editing System
+
+### Tracking Mode
+
+**MANDATORY for .gts Files:**
+1. All `.gts` files require tracking mode indicator on line 1:
+   ```gts
+   // ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══
+   ```
+2. Format: `// ⁿ description` using sequential superscripts: ¹, ², ³...
+3. Both SEARCH and REPLACE blocks must contain tracking markers
+
+### SEARCH/REPLACE Patterns
+
+#### Creating New File
+```gts
+http://realm/recipe-card.gts (new)
+╔═══ SEARCH ════╗
+╠═══════════════╣
+// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══
+import { CardDef } from '@cardstack/base/card-api'; // ¹
+export class RecipeCard extends CardDef { // ²
+  static displayName = 'Recipe';
+}
+╚═══ REPLACE ═══╝
+```
+⁰ ¹⁻²
+
+#### Modifying Existing File
+```gts
+https://example.com/recipe-card.gts
+╔═══ SEARCH ════╗
+export class RecipeCard extends CardDef {
+  static displayName = 'Recipe';
+  @field recipeName = contains(StringField);
+╠═══════════════╣
+export class RecipeCard extends CardDef {
+  static displayName = 'Recipe';
+  @field recipeName = contains(StringField);
+  @field servings = contains(NumberField); // ¹⁸ Added servings
+╚═══ REPLACE ═══╝
+```
+⁰ ¹⁸
+
+### File Type Rules
+
+- **`.gts` files** → ALWAYS require tracking mode and markers
+- **`.json` files** → Never use tracking comments
+
+### Best Practices
+
+- Keep search blocks small and precise
+- Include tracking comments in SEARCH blocks for uniqueness
+- Search text must match EXACTLY
+- Use placeholder comments for easy insertion points
\ No newline at end of file
diff --git a/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-quick-reference.md b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-quick-reference.md
new file mode 100644
index 00000000000..b7e934bd584
--- /dev/null
+++ b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-quick-reference.md
@@ -0,0 +1,104 @@
+**Core imports:**
+```gts
+import { CardDef, FieldDef, Component, field, contains, linksTo } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+```
+
+**UI Components:**
+```gts
+import { Button, Pill, BoxelSelect } from '@cardstack/boxel-ui/components';
+```
+
+**Helpers:**
+```gts
+import { eq, gt, and, or, not } from '@cardstack/boxel-ui/helpers';
+import { formatDateTime, formatCurrency } from '@cardstack/boxel-ui/helpers';
+```
+
+## Quick Reference
+
+**File Types:** `.gts` (definitions) | `.json` (instances)  
+**Core Pattern:** CardDef/FieldDef → contains/linksTo → Templates → Instances  
+**Essential Formats:** Every CardDef MUST implement `isolated`, `embedded`, AND `fitted` formats
+
+```gts
+// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══
+// ¹ Core imports - ALWAYS needed for definitions
+import { CardDef, FieldDef, Component, field, contains, containsMany, linksTo, linksToMany } from '@cardstack/base/card-api';
+
+// ² Base field imports (only what you use)
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import BooleanField from '@cardstack/base/boolean';
+import DateField from '@cardstack/base/date';
+import DateTimeField from '@cardstack/base/datetime';
+import MarkdownField from '@cardstack/base/markdown';
+import TextAreaField from '@cardstack/base/text-area';
+import BigIntegerField from '@cardstack/base/big-integer';
+import CodeRefField from '@cardstack/base/code-ref';
+import Base64ImageField from '@cardstack/base/base64-image'; // 🚨 NEVER USE - embeds binary in JSON, crashes AI context; use FileDef types instead
+
+// ⁸ FileDef imports - for file fields (use linksTo, never contains)
+import FileDef from '@cardstack/base/file-api';
+import ImageDef from '@cardstack/base/image-file-def';     // any image
+import PngDef from '@cardstack/base/png-image-def';        // .png
+import JpgDef from '@cardstack/base/jpg-image-def';        // .jpg/.jpeg
+import SvgDef from '@cardstack/base/svg-image-def';        // .svg
+import GifDef from '@cardstack/base/gif-image-def';        // .gif
+import WebpDef from '@cardstack/base/webp-image-def';      // .webp
+import AvifDef from '@cardstack/base/avif-image-def';      // .avif
+import MarkdownDef from '@cardstack/base/markdown-file-def'; // .md (NOT same as MarkdownField)
+import TextFileDef from '@cardstack/base/text-file-def';   // .txt
+import TsFileDef from '@cardstack/base/ts-file-def';       // .ts
+import GtsFileDef from '@cardstack/base/gts-file-def';     // .gts
+import JsonFileDef from '@cardstack/base/json-file-def';   // .json
+import CsvFileDef from '@cardstack/base/csv-file-def';     // .csv
+import ColorField from '@cardstack/base/color';
+import EmailField from '@cardstack/base/email';
+import PercentageField from '@cardstack/base/percentage';
+import PhoneNumberField from '@cardstack/base/phone-number';
+import UrlField from '@cardstack/base/url';
+import AddressField from '@cardstack/base/address';
+
+// ⚠️ EXTENDING BASE FIELDS: To customize a base field, import it and extend:
+// import BaseAddressField from '@cardstack/base/address';
+// export class FancyAddressField extends BaseAddressField { }
+// Never import and define the same field name - it causes conflicts!
+
+// ³ UI Component imports
+import { Button, Pill, Avatar, FieldContainer, CardContainer, BoxelSelect, ViewSelector } from '@cardstack/boxel-ui/components';
+
+// ⁴ Helper imports
+import { eq, gt, gte, lt, lte, and, or, not, cn, add, subtract, multiply, divide } from '@cardstack/boxel-ui/helpers';
+import { currencyFormat, formatDateTime, optional, pick } from '@cardstack/boxel-ui/helpers';
+import { concat, fn } from '@ember/helper';
+import { get } from '@ember/helper';
+import { on } from '@ember/modifier';
+import Modifier from 'ember-modifier';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+import { task, restartableTask } from 'ember-concurrency';
+// NOTE: 'if' is built into Glimmer templates - DO NOT import it
+
+// ⁶ TIMING RULE: NEVER use requestAnimationFrame
+// - DOM timing: Use Glimmer modifiers with cleanup
+// - Async coordination: Use task/restartableTask from ember-concurrency  
+// - Delays: Use await timeout(ms) from ember-concurrency, not setTimeout
+
+// ⁵ Icon imports
+import EmailIcon from '@cardstack/boxel-icons/mail';
+import PhoneIcon from '@cardstack/boxel-icons/phone';
+import RocketIcon from '@cardstack/boxel-icons/rocket';
+// Available from Lucide, Lucide Labs, and Tabler icon sets
+// NOTE: Only use for static card/field type icons, NOT in templates
+
+// CRITICAL IMPORT RULES:
+// ⚠️ If you don't see an import in the approved lists above, DO NOT assume it exists!
+// ⚠️ Only use imports explicitly shown in this guide - no exceptions!
+// - Verify any import exists in the approved lists before using
+// - Do NOT assume similar imports exist (e.g., don't assume IntegerField exists because NumberField does)
+// - If needed functionality isn't in approved imports, define it directly with a comment:
+//   // Defining custom helper - not yet available in Boxel environment
+//   function customHelper() { ... }
+```
\ No newline at end of file
diff --git a/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-replicate-ai.md b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-replicate-ai.md
new file mode 100644
index 00000000000..0ce1cc7c1de
--- /dev/null
+++ b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-replicate-ai.md
@@ -0,0 +1,111 @@
+### Replicate API Essentials
+
+**Gateway URL Pattern:**
+```
+https://gateway.ai.cloudflare.com/v1/{account}/{gateway}/replicate/v1/models/{owner}/{model}/predictions
+```
+
+**Required Headers:**
+```typescript
+{
+  'Content-Type': 'application/json',
+  'Prefer': 'wait'  // CRITICAL: Synchronous response
+}
+```
+
+**Request Structure:**
+```typescript
+{
+  input: {
+    prompt: string,
+    // Model-specific parameters (see API docs)
+  }
+}
+```
+
+### Enum Fields for API Parameters
+
+**CRITICAL:** Enum `value` must exactly match API spec:
+
+```gts
+import enumField from '@cardstack/base/enum';
+
+const SizeField = enumField(StringField, {
+  options: [
+    { value: '1K', label: '1K (1024px)' },
+    { value: '2K', label: '2K (2048px)' },
+    { value: 'custom', label: 'Custom' }
+  ]
+});
+```
+
+### API Call Pattern
+
+```gts
+import SendRequestViaProxyCommand from '@cardstack/boxel-host/commands/send-request-via-proxy';
+import UploadImageCommand from 'https://realms-staging.stack.cards/catalog/commands/upload-image';
+import GetCardCommand from '@cardstack/boxel-host/commands/get-card';
+import { CloudflareImage } from 'https://realms-staging.stack.cards/catalog/cloudflare-image';
+
+// Build request
+const requestBody = {
+  input: { prompt: input.prompt }
+};
+
+// Add conditional parameters
+if (input.size) requestBody.input.size = input.size;
+if (input.aspectRatio && input.size !== 'custom') {
+  requestBody.input.aspect_ratio = input.aspectRatio;
+}
+
+// Call API
+const response = await new SendRequestViaProxyCommand(ctx).execute({
+  url: 'https://gateway.ai.cloudflare.com/v1/.../replicate/v1/models/{owner}/{model}/predictions',
+  method: 'POST',
+  requestBody: JSON.stringify(requestBody),
+  headers: { 'Content-Type': 'application/json', 'Prefer': 'wait' }
+});
+
+// Parse response
+const data = await response.response.json();
+let imageUrl = Array.isArray(data.output) ? data.output[0] : data.output;
+
+// Upload result
+const uploaded = await new UploadImageCommand(ctx).execute({
+  sourceImageUrl: imageUrl,
+  targetRealmUrl: input.realm
+});
+
+return await new GetCardCommand(ctx).execute({ cardId: uploaded.cardId });
+```
+
+### Response Parsing
+
+```typescript
+// Handle multiple formats
+let imageUrl: string | undefined;
+
+if (data.output && Array.isArray(data.output)) {
+  imageUrl = data.output[0];
+} else if (typeof data.output === 'string') {
+  imageUrl = data.output;
+} else if (data.output?.url) {
+  imageUrl = data.output.url;
+}
+
+if (!imageUrl) throw new Error('No image URL in response');
+```
+
+### Common Mistakes
+
+❌ Missing `Prefer: wait` header → async URL instead of result  
+❌ Enum value mismatch → API rejects request  
+❌ Always sending optional params → API validation errors  
+❌ String booleans in API → Use actual `true`/`false`
+
+### Finding Model Schemas
+
+1. Visit `https://replicate.com/{owner}/{model}`
+2. Check API tab for exact schema
+3. Note required vs optional parameters
+4. Match enum values exactly
\ No newline at end of file
diff --git a/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-spec-usage.md b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-spec-usage.md
new file mode 100644
index 00000000000..9a73e71008d
--- /dev/null
+++ b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-spec-usage.md
@@ -0,0 +1,185 @@
+**Card specs (linksTo/linksToMany):**
+```gts
+import { Author } from './author';
+@field author = linksTo(Author);
+@field contributors = linksToMany(Author);
+```
+
+**Field specs (contains/containsMany):**
+```gts
+import StringField from '@cardstack/base/string';
+import AddressField from '@cardstack/base/address-field';
+@field name = contains(StringField);
+@field addresses = containsMany(AddressField);
+```
+
+**Component specs (direct template usage):**
+```hbs
+<BoxelSelect @options={{this.options}} />
+<Button @kind="primary" @size="small">Save</Button>
+```
+
+**Command specs (programmatic execution):**
+```ts
+const cmd = new MyCommand(commandContext);
+const result = await cmd.execute(input);
+```
+
+## Spec Usage Examples
+
+A Spec is a comprehensive documentation and metadata container for code within the Boxel ecosystem.
+
+This document provides real-world usage examples for each spec type based on actual implementations found in the Boxel repository.
+
+### Card Specs (`specType: 'card'`)
+(Cards are linked to using `linksTo` and `linksToMany` within consuming cards...)
+
+#### Import
+```typescript
+import { Author } from './author';
+import { Country } from '@cardstack/base/country';
+import { Skill } from '@cardstack/base/skill';
+```
+
+#### Usage as a Field
+```typescript
+export class BlogPost extends CardDef {
+  // Single card reference
+  @field author = linksTo(Author);
+  @field country = linksTo(Country);
+  
+  // Multiple card references
+  @field enabledSkills = linksToMany(Skill);
+  @field attachedCards = linksToMany(CardDef);
+}
+```
+
+#### Template Usage
+```handlebars
+{{! Display linked card in different formats }}
+<@fields.author @format="embedded" />
+<@fields.author @format="atom" />
+
+{{! Display collection of linked cards }}
+<div class="skills-container">
+  <@fields.enabledSkills @format="embedded" />
+</div>
+```
+
+### Field Specs (`specType: 'field'`)
+(Fields are embedded using `contains` and `containsMany` within cards.)
+
+#### Import
+```typescript
+import StringField from '@cardstack/base/string';
+import DateField from '@cardstack/base/date';
+import { SocialMediaLink } from './social-media-link';
+```
+
+#### Usage as a Field
+```typescript
+export class MinecraftInvite extends CardDef {
+  // Basic field types
+  @field celebrantName = contains(StringField);
+  @field age = contains(StringField);
+  @field date = contains(DateField);
+  
+  // Custom field types
+  @field socialLinks = containsMany(SocialMediaLink);
+}
+```
+
+#### Template Usage
+```handlebars
+{{! Display contained fields }}
+<@fields.celebrantName />
+<@fields.date @format="atom" />
+
+{{! Display collection of contained fields }}
+<div class="social-links">
+  <@fields.socialLinks @format="embedded" />
+</div>
+```
+
+### Component Specs (`specType: 'component'`)
+(Components are used directly in templates, extending GlimmerComponent...)
+
+#### Import
+```typescript
+import { BoxelSelect, Pill } from '@cardstack/boxel-ui/components';
+import { FilterDropdown } from './filter-dropdown';
+import { CardsGrid } from './cards-grid';
+```
+
+#### Usage in Templates
+```handlebars
+{{! Basic component usage }}
+<BoxelSelect
+  @placeholder="Select option"
+  @options={{this.options}}
+  @onChange={{this.onSelectOption}}
+/>
+
+{{! Custom components }}
+<FilterDropdown @filters={{this.filters}} />
+<CardsGrid @cards={{this.cards}} @columns={{3}} />
+
+{{! Component with content }}
+<Pill @variant="primary">
+  Active Status
+</Pill>
+```
+
+### App Specs (`specType: 'app'`)
+(Apps extend AppCard and are typically linked to like regular cards...)
+
+#### Import
+```typescript
+import { AppCard } from '/experiments/app-card';
+import { GardenAppCard } from './garden-app';
+```
+
+#### Usage as a Field
+```typescript
+export class Dashboard extends CardDef {
+  @field primaryApp = linksTo(GardenAppCard);
+  @field availableApps = linksToMany(AppCard);
+}
+```
+
+#### Template Usage
+```handlebars
+{{! Display app in card context }}
+<@fields.primaryApp @format="fitted" />
+
+{{! App navigation }}
+<div class="app-grid">
+  <@fields.availableApps @format="embedded" />
+</div>
+```
+
+### Command Specs (`specType: 'command'`)
+(Commands are instantiated and executed programmatically.)
+
+#### Import
+```typescript
+import { GenerateReadmeSpecCommand } from './generate-readme-spec';
+import { SwitchSubmodeCommand } from './switch-submode';
+import { UpdatePlaygroundSelectionCommand } from './update-playground-selection';
+```
+
+#### Template Usage
+
+When you need to execute commands in response to user interactions, you can just access the commandContext and invoke it as how you would a simple async function in javascript
+
+```typescript
+let commandContext = this.args.context?.commandContext;
+if (!commandContext) {
+   console.error('Command context not available');
+   return;
+}
+
+const someCommandInput = new CommandInput({...args})
+const myCommand = new MyCommand(commandContext);
+const result = await myCommand.execute(someCommandInput);
+```
\ No newline at end of file
diff --git a/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-template-patterns.md b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-template-patterns.md
new file mode 100644
index 00000000000..4918de991b6
--- /dev/null
+++ b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-template-patterns.md
@@ -0,0 +1,325 @@
+### Template Essentials
+
+**Field access patterns:**
+```hbs
+{{@model.title}}                    <!-- Raw data -->
+<@fields.title />                   <!-- Field's template -->
+<@fields.phone @format="atom" />    <!-- Compound field -->
+<@fields.items @format="embedded" /> <!-- Auto-collection -->
+```
+
+For theming, CSS variables, spacing scales, and CSS safety rules, see Module 3: Theme-First Design System.
+
+#### ⚠️ CRITICAL: @model Iteration vs @fields Delegation
+
+**Once you iterate with @model, you CANNOT delegate to @fields within that iteration.**
+
+```hbs
+<!-- ❌ BREAKS: Mixing @model iteration with @fields delegation -->
+{{#each @model.teamMembers as |member|}}
+  <@fields.member @format="embedded" />  <!-- NO ACCESS to @fields.member -->
+{{/each}}
+
+<!-- ✅ OPTION 1: Use delegated rendering for the whole collection -->
+<@fields.teamMembers @format="embedded" />
+
+<!-- ✅ OPTION 2: Commit to full @model control -->
+{{#each @model.teamMembers as |member|}}
+  <div class="custom-member">{{member.name}}</div>
+{{/each}}
+
+<!-- ✅ OPTION 3: If filtering needed, use query patterns -->
+<!-- Use PrerenderedCardSearch or getCards for filtered collections -->
+```
+
+**Why this breaks:** @fields provides field-level components. Once you're iterating with @model, you're working with raw data, not field components.
+
+**Decision Rule:** Before iterating, decide:
+- Need composability? → Use delegated rendering
+- Need filtering? → Use query patterns (PrerenderedCardSearch/getCards)
+- Need custom control? → Use @model but handle ALL rendering yourself
+
+### Accessing @fields by Index: The Bridge Pattern
+
+**Use Case:** You need to use `@model` data to find specific items in a `containsMany` or `linksToMany` collection, then render those items using their field templates for proper delegated rendering.
+
+**Key Concept:** The `get` helper allows you to access `@fields` array elements by index, creating a bridge between data-driven iteration and component-based rendering.
+
+#### When to Use This Pattern
+
+- **Filtering:** Show only items matching certain criteria
+- **Conditional rendering:** Display items based on model data
+- **Custom ordering:** Reorder items based on computed logic
+- **Highlighted selection:** Emphasize specific items in a collection
+
+#### Basic Pattern
+
+```hbs
+{{! Access a specific field by index }}
+{{#let (get @fields.shoppingList 0) as |firstItem|}}
+  {{#if firstItem}}
+    <firstItem @format="embedded" />
+  {{else}}
+    <div class="no-item">No first item</div>
+  {{/if}}
+{{/let}}
+
+{{! Access last item using subtract helper }}
+{{#let (get @fields.items (subtract @model.items.length 1)) as |lastItem|}}
+  {{#if lastItem}}
+    <lastItem @format="fitted" />
+  {{/if}}
+{{/let}}
+```
+
+#### Displaying Compound Fields
+
+**CRITICAL:** When displaying compound fields (FieldDef types) like `PhoneNumberField`, `AddressField`, or custom field definitions, you must use their format templates, not raw model access:
+
+```hbs
+<!-- ❌ WRONG: Shows [object Object] -->
+<p>Phone: {{@model.phone}}</p>
+
+<!-- ✅ CORRECT: Uses the field's atom format -->
+<p>Phone: <@fields.phone @format="atom" /></p>
+
+<!-- ✅ CORRECT: For full field display -->
+<div class="contact-info">
+  <@fields.phone @format="embedded" />
+</div>
+```
+
+**💡 Line-saving tip:** Keep self-closing tags compact:
+```hbs
+<!-- Good: Saves vertical space -->
+<@fields.author @format="embedded" />
+<@fields.phone @format="atom" />
+```
+
+#### @fields Delegation Rule
+
+**CRITICAL:** When delegating to embedded/fitted formats, you must iterate through `@fields`, not `@model`. Always use `@fields` for delegation, even for singular fields.
+
+```hbs
+<!-- ✅ CORRECT: Using @fields for both singular and collection fields -->
+<@fields.author @format="embedded" />
+<@fields.items @format="embedded" />
+{{#each @fields.items as |item|}}
+  <item @format="embedded" />
+{{/each}}
+
+<!-- ❌ WRONG: Can't iterate @model then try to delegate to @fields -->
+{{#each @model.items as |item|}}
+  <@fields.??? @format="embedded" /> <!-- This won't work -->
+{{/each}}
+```
+
+**containsMany Spacing Pattern:** Due to an additional wrapper div, target `.containsMany-field`:
+```css
+/* For grids */
+.products-grid > .containsMany-field {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  gap: 1rem;
+}
+
+/* For lists */
+.items-list > .containsMany-field {
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+}
+```
+
+### Template Fallback Value Patterns
+
+**CRITICAL:** Boxel cards boot with no data by default. Templates must gracefully handle null, undefined, and empty string values at ALL levels of data access to prevent runtime errors and provide meaningful visual fallbacks.
+
+#### Three Primary Patterns for Fallbacks
+
+**1. Inline if/else (for simple display fallbacks):**
+```hbs
+<span>{{if @model.eventTime (formatDateTime @model.eventTime "MMM D, h:mm A") "Event time to be announced"}}</span>
+<h2>{{if @model.title @model.title "Untitled Document"}}</h2>
+<p>Status: {{if @model.status @model.status "Status pending"}}</p>
+```
+
+**2. Block-based if/else (for complex content):**
+```hbs
+<div class="event-time">
+  {{#if @model.eventTime}}
+    <strong>{{formatDateTime @model.eventTime "MMM D, h:mm A"}}</strong>
+  {{else}}
+    <em class="placeholder">Event time to be announced</em>
+  {{/if}}
+</div>
+
+{{#if @model.description}}
+  <div class="description">
+    <@fields.description />
+  </div>
+{{else}}
+  <div class="empty-description">
+    <p>No description provided yet. Click to add one.</p>
+  </div>
+{{/if}}
+```
+
+**3. Unless for safety/validation checks (composed with other helpers):**
+```hbs
+{{unless (and @model.isValid @model.hasPermission) "⚠️ Cannot proceed - missing validation or permission"}}
+{{unless (or @model.email @model.phone) "Contact information required"}}
+{{unless (gt @model.items.length 0) "No items available"}}
+{{unless (eq @model.status "active") "Service unavailable"}}
+```
+
+**Best Practices:** Use descriptive placeholder text rather than generic "N/A", style placeholder text differently (lighter color, italic), use `unless` for safety checks and `if` for display fallbacks.
+
+**Icon Usage:** Avoid emoji in templates (unless the application specifically calls for it) due to OS/platform variations that cause legibility issues. Use Boxel icons only for static card/field type icons (`static icon` property). In templates, use inline SVG instead since we can't be sure which Boxel icons exist.
+
+### Template Array Handling Patterns
+
+**CRITICAL:** Templates must gracefully handle all array states to prevent errors. Arrays can be undefined, null, empty, or populated.
+
+#### The Three Array States
+
+Your templates must handle:
+1. **Completely undefined arrays** - Field doesn't exist or is null
+2. **Empty arrays** - Field exists but has no items (`[]`)
+3. **Arrays with actual data** - Field has one or more items
+
+#### Array Logic Pattern
+
+**❌ WRONG - Only checks for existence:**
+```hbs
+{{#if @model.goals}}
+  <ul class="goals-list">
+    {{#each @model.goals as |goal|}}
+      <li>{{goal}}</li>
+    {{/each}}
+  </ul>
+{{/if}}
+```
+
+**✅ CORRECT - Checks for length and provides empty state:**
+```hbs
+{{#if @model.goals.length}}
+  <div class="goals-section">
+    <h4>
+      <svg width='16' height='16' class="section-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+        <circle cx="12" cy="12" r="10"/>
+        <circle cx="12" cy="12" r="6"/>
+        <circle cx="12" cy="12" r="2"/>
+      </svg>
+      Daily Goals
+    </h4>
+    <ul class="goals-list">
+      {{#each @model.goals as |goal|}}
+        <li>{{goal}}</li>
+      {{/each}}
+    </ul>
+  </div>
+{{else}}
+  <div class="goals-section">
+    <h4>
+      <svg width='16' height='16' class="section-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+        <circle cx="12" cy="12" r="10"/>
+        <circle cx="12" cy="12" r="6"/>
+        <circle cx="12" cy="12" r="2"/>
+      </svg>
+      Daily Goals
+    </h4>
+    <p class="empty-state">No goals set yet. What would you like to accomplish?</p>
+  </div>
+{{/if}}
+```
+
+**Remember:** When implementing templates via SEARCH/REPLACE, include tracking markers ⁿ for style blocks
+
+### Real-World Example: Shopping List with Featured Items
+
+```gts
+import { CardDef, FieldDef, field, contains, containsMany, Component } from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import { get } from '@ember/helper';
+import { subtract } from '@cardstack/boxel-ui/helpers';
+
+export class FruitItem extends FieldDef {
+  static displayName = 'Fruit';
+  @field title = contains(StringField);
+  @field quantity = contains(NumberField);
+  
+  static embedded = class Embedded extends Component<typeof this> {
+    <template>
+      <div class="fruit-item">
+        <span>{{if @model.title @model.title "Unknown"}}</span>
+        <span>{{if @model.quantity @model.quantity 0}} units</span>
+      </div>
+    </template>
+  };
+}
+
+export class ShoppingList extends CardDef {
+  static displayName = 'Shopping List';
+  @field items = containsMany(FruitItem);
+  
+  static isolated = class Isolated extends Component<typeof this> {
+    <template>
+      <article>
+        <h1>{{@model.title}}</h1>
+        
+        {{! Show first and last items using get helper }}
+        <section class="featured">
+          <h2>First Item</h2>
+          {{#let (get @fields.items 0) as |item|}}
+            {{#if item}}
+              <item @format="embedded" />
+            {{else}}
+              <p>No items</p>
+            {{/if}}
+          {{/let}}
+          
+          <h2>Last Item</h2>
+          {{#let (get @fields.items (subtract @model.items.length 1)) as |item|}}
+            {{#if item}}
+              <item @format="embedded" />
+            {{/if}}
+          {{/let}}
+        </section>
+        
+        {{! Full list }}
+        <section>
+          <h2>All Items</h2>
+          {{#if @model.items.length}}
+            <@fields.items @format="embedded" class="items-container" />
+          {{else}}
+            <p>No items</p>
+          {{/if}}
+        </section>
+      </article>
+      
+      <style scoped>
+        .items-container {
+          gap: var(--boxel-sp-2xs);
+        }
+      </style>
+    </template>
+  };
+}
+```
+
+#### Important Notes
+
+**CRITICAL Safety Checks:**
+- Always wrap `get` results in `{{#if}}` to handle undefined indices
+- Use `subtract` helper for negative indexing (e.g., last item)
+- Validate array length before accessing by index
+
+**When NOT to Use:**
+- If you need to iterate all items → use `<@fields.items />` delegation
+- If you need custom rendering for each → use `{{#each @model.items}}` pattern
+- For simple filtering → use query patterns with PrerenderedCardSearch
+
+**Performance Consideration:**
+The `get` helper is efficient for accessing specific indices. For complex filtering or transformation, consider using query patterns or computed properties instead.
\ No newline at end of file
diff --git a/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-theme-design-system.md b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-theme-design-system.md
new file mode 100644
index 00000000000..30fb25876e9
--- /dev/null
+++ b/packages/software-factory/experiment_1/.agents/skills/boxel-development/references/dev-theme-design-system.md
@@ -0,0 +1,497 @@
+### Theme-First Principle
+
+- Always link a Theme before generating code or styling. (See 3.1 Theme Linking Rules)
+- All CSS in card templates must use theme variables (no hardcoded colors/spacing/fonts). (See 3.2 Canonical Theme Variables)
+- Theme linkage lives at `relationships.cardInfo.theme` on the card instance.
+
+### 3.1 Theme Linking Rules
+- Set this as the Default Theme for all new, non-ThemeCard instances:
+
+```json
+"relationships": {
+  "cardInfo.theme": {
+    "links": {
+      "self": "@cardstack/base/Theme/cardstack-brand-guide"
+    }
+  }
+}
+```
+- You must also set the remaining cardInfo properties in the card data attributes. Example:
+```json
+"attributes": {
+  "cardInfo": {
+    "notes": null,
+    "name": "[card title here]",
+    "summary": "[brief card description here]",
+    "cardThumbnailURL": "[card thumbnail url here]"
+  },
+}
+```
+- IMPORTANT: Never set `cardInfo.theme` on ThemeCards (cards adopting from `@cardstack/base/theme/default` or its subclasses) to avoid cycles.
+
+#### ThemeCard Types
+
+A ThemeCard is an instance of a card definition that inherits from `@cardstack/base/theme/default` or from one of its subclasses.
+
+| Type | URL | Description |
+|------|-----|-------------|
+| Base Theme | `@cardstack/base/theme/default` | Root base class |
+| Structured Theme | `@cardstack/base/structured-theme/default` | MINIMUM template — includes all theme variables (except Brand variables) |
+| Style Reference | `@cardstack/base/style-reference/default` | Extends `StructuredTheme` — adds fields for inspiration images, terms, and style description |
+| Detailed Style Reference | `@cardstack/base/detailed-style-reference/default` | **PREFERRED** — extends `StyleReference` with detailed design system description |
+| Brand Guide | `@cardstack/base/brand-guide/default` | Extends `DetailedStyleReference` — adds brand-specific variables for colors and typography |
+
+> **When creating a Theme card:** Prefer `DetailedStyleReference`. At minimum, fill in `rootVariables` and `typography`. Add font URLs to `cssImports` as a string array — no `@import` needed (the system handles imports).
+
+### 3.2 Canonical Theme Variables
+Use the variables directly (do not wrap with `hsl(var(...))`). Pair backgrounds with their foregrounds for contrast.
+
+Our design system is compatible with shadcn css variables.
+
+- Background Colors:
+```css
+--background
+--card
+--popover
+--primary
+--secondary
+--muted
+--accent
+--destructive
+--input
+--sidebar
+--sidebar-primary
+--sidebar-accent
+```
+
+- Foreground Colors:
+```css
+--foreground
+--card-foreground
+--popover-foreground
+--primary-foreground
+--secondary-foreground
+--muted-foreground
+--accent-foreground
+--destructive-foreground
+--sidebar-foreground
+--sidebar-primary-foreground
+--sidebar-accent-foreground
+```
+- Border Colors:
+```css
+--border
+--sidebar-border
+```
+- Css Outline Colors:
+```css
+--ring
+--sidebar-ring
+```
+- Chart Colors:
+```css
+--chart-1
+--chart-2
+--chart-3
+--chart-4
+--chart-5
+```
+
+- Fonts: (`font-family`)
+```css
+--font-sans
+--font-serif
+--font-mono
+```
+- Radius: (`border-radius`)
+```css
+--radius
+--boxel-border-radius-xxs
+--boxel-border-radius-xs
+--boxel-border-radius-sm
+--boxel-border-radius
+--boxel-border-radius-lg
+--boxel-border-radius-xl
+--boxel-border-radius-xxl
+```
+- Spacing:
+```css
+--spacing
+--boxel-sp-6xs
+--boxel-sp-5xs
+--boxel-sp-4xs
+--boxel-sp-3xs
+--boxel-sp-2xs
+--boxel-sp-xs
+--boxel-sp-sm
+--boxel-sp
+--boxel-sp-lg
+--boxel-sp-xl
+--boxel-sp-2xl
+--boxel-sp-3xl
+--boxel-sp-4xl
+--boxel-sp-5xl
+--boxel-sp-6xl
+```
+- Letter-spacing:
+```css
+--tracking-normal
+--boxel-lsp-xxl
+--boxel-lsp-xl
+--boxel-lsp-lg
+--boxel-lsp
+--boxel-lsp-sm
+--boxel-lsp-xs
+--boxel-lsp-xxs
+```
+- Shadows: (`box-shadow`)
+```css
+--shadow-2xs
+--shadow-xs
+--shadow-sm
+--shadow
+--shadow-md
+--shadow-lg
+--shadow-xl
+--shadow-2xl
+--boxel-box-shadow
+--boxel-box-shadow-hover
+--boxel-deep-box-shadow
+```
+
+- Font Sizes: (`font-size`)
+```css
+--boxel-font-size-2xl
+--boxel-font-size-xl
+--boxel-font-size-lg
+--boxel-font-size-md
+--boxel-font-size
+--boxel-font-size-sm
+--boxel-font-size-xs
+--boxel-heading-font-size
+--boxel-section-heading-font-size
+--boxel-subheading-font-size
+--boxel-body-font-size
+--boxel-caption-font-size
+```
+
+#### CSS Usage Examples:
+
+✅ Correct:
+```css
+background-color: var(--card);
+color: var(--card-foreground);
+border-color: var(--border);
+font-family: var(--font-serif);
+border-radius: var(--radius);
+padding: var(--spacing);
+margin-top: calc(var(--spacing) * 2);
+box-shadow: var(--shadow-lg);
+```
+❌ Incorrect:
+```css
+background-color: hsl(var(--background));   /* DO NOT wrap in hsl() */
+```
+
+### CSS Safety (All Formats)
+- Always use `<style scoped>`; only `/* */` comments (never `//`).
+- No global selectors (`:root`, `body`, `html`). Define variables at component root.
+- Conservative z-index (< 10). No fixed overlays beyond card bounds.
+- Prefer inline SVG; always avoid `url(#id)` in SVG.
+
+### Format Responsibilities (Theming-Aware)
+- Isolated: comfortable reading; scrollable surface; theme tokens for padding/typography.
+- Embedded: parent may clamp height; child respects theme tokens.
+- Fitted: no borders or border-radius (parent draws chrome); internal layout uses theme spacing/typography.
+- Spacing for collections: `.container > .containsMany-field { gap: var(--boxel-sp); }`
+
+### Sample Themed Template
+```gts
+  <template>
+    <article class='my-card' aria-labelledby='mc-title'>
+      <header class='mc-header'>
+        <h1 class='mc-title' id='mc-title'><@fields.cardTitle /></h1>
+        <p class='mc-summary'><@fields.cardDescription /></p>
+      </header>
+
+      <div class='mc-body'>
+        <div class='mc-main'>
+          <section aria-labelledby='mc-section-1'>
+            <h2 class='mc-section-heading' id='mc-section-1'>Section 1 Title</h2>
+            <p class='mc-prose'>Paragraph</p>
+            <ul class='items-grid'>
+              <li class='section-item'>
+                <h3 class='item-title'>Item 1</h3>
+                <p class='item-content'>Item 1 content</p>
+              </li>
+              <li class='section-item'>
+                <h3 class='item-title'>Item 2</h3>
+                <p class='item-content'>Item 2 content</p>
+              </li>
+              <li class='section-item'>
+                <h3 class='item-title'>Item 3</h3>
+                <p class='item-content'>Item 3 content</p>
+              </li>
+            </ul>
+          </section>
+          <section aria-labelledby='mc-section-2'>
+            <h2 class='mc-section-heading' id='mc-section-2'>Section 2 Title</h2>
+            <p class='mc-prose'>Paragraph</p>
+          </section>
+        </div>
+
+        <aside class='mc-sidebar'>
+          <section
+            class='sidebar-section'
+            aria-labelledby='sidebar-heading-1'
+          >
+            <h2 class='sidebar-heading' id='sidebar-heading-1'>Sidebar Title 1</h2>
+            <ul class='sidebar-list'>
+              <li class='sidebar-item'>
+                <span>Sidebar item 1</span>
+              </li>
+              <li class='sidebar-item'>
+                <span>Sidebar item 2</span>
+              </li>
+              <li class='sidebar-item'>
+                <span>Sidebar item 3</span>
+              </li>
+            </ul>
+          </section>
+
+          <section
+            class='sidebar-section'
+            aria-labelledby='sidebar-heading-2'
+          >
+            <h2 class='sidebar-heading' id='sidebar-heading-2'>Sidebar Title 2</h2>
+            <dl class='sidebar-dl'>
+              <div class='sidebar-dl-row'>
+                <dt>Sidebar item 1</dt>
+                <dd>Content</dd>
+              </div>
+              <div class='sidebar-dl-row'>
+                <dt>Sidebar item 2</dt>
+                <dd>Content</dd>
+              </div>
+            </dl>
+          </section>
+        </aside>
+      </div>
+
+      <footer class='mc-footer'>
+        <p>Footer text</p>
+        <nav aria-label='Footer links'>
+          <ul class='footer-links'>
+            <li><a href='#'>Link 1</a></li>
+            <li><a href='#'>Link 2</a></li>
+            <li><a href='#'>Link 3</a></li>
+          </ul>
+        </nav>
+      </footer>
+    </article>
+    <style scoped>
+      .my-card {
+        container-type: inline-size;
+        height: 100%;
+        overflow-y: auto;
+        padding: var(--boxel-sp-xl);
+        background-color: var(--background);
+        color: var(--foreground);
+        display: flex;
+        flex-direction: column;
+        gap: var(--boxel-sp-lg);
+        box-sizing: border-box;
+      }
+
+      /* Header */
+      .mc-header {
+        display: flex;
+        flex-direction: column;
+        gap: var(--boxel-sp-xs);
+        border-bottom: 1px solid var(--border);
+        padding-bottom: var(--boxel-sp-lg);
+      }
+      .mc-title {
+        font-size: var(--boxel-font-size-xl);
+        font-weight: 700;
+        letter-spacing: var(--boxel-lsp-xs);
+        margin: 0;
+      }
+      .mc-summary {
+        font-size: var(--boxel-font-size-sm);
+        line-height: var(--boxel-line-height-sm);
+        color: var(--muted-foreground);
+        margin: 0;
+      }
+
+      /* Body: main + sidebar */
+      .mc-body {
+        display: grid;
+        grid-template-columns: 1fr 16rem;
+        gap: var(--boxel-sp-lg);
+        align-items: start;
+      }
+
+      /* Main column */
+      .mc-main {
+        display: flex;
+        flex-direction: column;
+        gap: var(--boxel-sp-xl);
+      }
+      .mc-main section {
+        display: flex;
+        flex-direction: column;
+        gap: var(--boxel-sp-sm);
+      }
+      .mc-prose {
+        font-size: var(--boxel-font-size-sm);
+        line-height: var(--boxel-line-height);
+        color: var(--foreground);
+        margin: 0;
+      }
+      .mc-section-heading {
+        font-size: var(--boxel-font-size-lg);
+        font-weight: 600;
+        margin: 0;
+      }
+
+      /* Items grid */
+      .items-grid {
+        list-style: none;
+        margin: 0;
+        padding: 0;
+        display: grid;
+        grid-template-columns: repeat(auto-fill, minmax(12rem, 1fr));
+        gap: var(--boxel-sp);
+      }
+      .section-item {
+        display: flex;
+        flex-direction: column;
+        gap: var(--boxel-sp-xs);
+        background-color: var(--card);
+        color: var(--card-foreground);
+        padding: var(--boxel-sp);
+        border: 1px solid var(--border);
+        border-radius: var(--boxel-border-radius);
+        box-shadow: var(--shadow);
+      }
+      .item-title {
+        font-size: var(--boxel-font-size-sm);
+        font-weight: 600;
+        margin: 0;
+      }
+      .item-content {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+        margin: 0;
+        line-height: var(--boxel-line-height-sm);
+      }
+
+      /* Sidebar */
+      .mc-sidebar {
+        display: flex;
+        flex-direction: column;
+        gap: var(--boxel-sp);
+        background-color: var(--sidebar);
+        color: var(--sidebar-foreground);
+        border: 1px solid var(--sidebar-border);
+        border-radius: var(--boxel-border-radius);
+        padding: var(--boxel-sp);
+      }
+      .sidebar-section {
+        display: flex;
+        flex-direction: column;
+        gap: var(--boxel-sp-xs);
+      }
+      .sidebar-section + .sidebar-section {
+        border-top: 1px solid var(--sidebar-border);
+        padding-top: var(--boxel-sp);
+      }
+      .sidebar-heading {
+        font-size: var(--boxel-font-size-xs);
+        font-weight: 600;
+        text-transform: uppercase;
+        letter-spacing: var(--boxel-lsp-lg);
+        margin: 0;
+      }
+      .sidebar-list {
+        list-style: none;
+        margin: 0;
+        padding: 0;
+        display: flex;
+        flex-direction: column;
+        gap: var(--boxel-sp-5xs);
+      }
+      .sidebar-item {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-5xs);
+        font-size: var(--boxel-font-size-sm);
+      }
+
+      /* Definition list */
+      .sidebar-dl {
+        display: flex;
+        flex-direction: column;
+        gap: var(--boxel-sp-5xs);
+        margin: 0;
+      }
+      .sidebar-dl-row {
+        display: flex;
+        justify-content: space-between;
+        font-size: var(--boxel-font-size-xs);
+      }
+      .sidebar-dl-row dt {
+        color: var(--muted-foreground);
+      }
+      .sidebar-dl-row dd {
+        margin: 0;
+        font-weight: 500;
+      }
+
+      /* Footer */
+      .mc-footer {
+        border-top: 1px solid var(--border);
+        padding-top: var(--boxel-sp-sm);
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+        display: flex;
+        flex-wrap: wrap;
+        align-items: center;
+        justify-content: center;
+        gap: var(--boxel-sp-xs);
+      }
+      .mc-footer p {
+        font-size: inherit;
+        margin: 0;
+      }
+      .footer-links {
+        list-style: none;
+        margin: 0;
+        padding: 0;
+        display: flex;
+        align-items: center;
+        gap: 0;
+      }
+      .footer-links li + li::before {
+        content: '·';
+        margin-inline: var(--boxel-sp-xs);
+      }
+      .mc-footer a {
+        color: var(--muted-foreground);
+        text-decoration: underline;
+        text-underline-offset: 2px;
+      }
+      .mc-footer a:hover {
+        color: var(--foreground);
+      }
+
+      /* Responsive: stack on narrow containers */
+      @container (max-width: 600px) {
+        .mc-body {
+          grid-template-columns: 1fr;
+        }
+      }
+    </style>
+  </template>
+```
diff --git a/packages/software-factory/experiment_1/.agents/skills/boxel-file-structure/SKILL.md b/packages/software-factory/experiment_1/.agents/skills/boxel-file-structure/SKILL.md
new file mode 100644
index 00000000000..2cb33422171
--- /dev/null
+++ b/packages/software-factory/experiment_1/.agents/skills/boxel-file-structure/SKILL.md
@@ -0,0 +1,305 @@
+---
+name: boxel-file-structure
+description: Use when organizing files in a Boxel workspace, choosing filenames or directories for card definitions and instances, or validating JSON `adoptsFrom.module` paths and relationship links.
+---
+
+# Boxel File Structure Rules
+
+Rules for organizing files in a Boxel workspace when working locally with boxel-cli.
+
+## URL Structure
+
+```
+https://[realm-domain]/[username]/[workspace]/[path].[extension]
+Example: https://app.boxel.ai/sarah/pet-rescue/animals/dog.gts
+```
+
+## File Naming Conventions
+
+| Type | Convention | Example |
+|------|------------|---------|
+| Card definitions | `kebab-case.gts` | `blog-post.gts`, `grammy-award.gts` |
+| Instance directories | `PascalCase/` | `BlogPost/`, `GrammyAward/` |
+| Instance files | `kebab-case.json` | `my-first-post.json` |
+
+## Directory Structure
+
+```
+workspace/
+├── .realm.json           # Workspace config
+├── index.json            # Workspace index
+├── cards-grid.json       # Default cards grid
+├── blog-post.gts         # Card definition (kebab-case)
+├── BlogPost/             # Instance directory (PascalCase)
+│   ├── my-first-post.json
+│   └── another-post.json
+├── author.gts
+└── Author/
+    └── jane-doe.json
+```
+
+## Module Paths in JSON (CRITICAL)
+
+**The `adoptsFrom.module` path is relative to the JSON file location.**
+
+### ✅ Correct: Instance in subdirectory
+```
+grammy-award.gts          # Definition at root
+GrammyAward/              # Instances in PascalCase directory
+└── record-of-the-year.json
+```
+
+**In `GrammyAward/record-of-the-year.json`:**
+```json
+{
+  "meta": {
+    "adoptsFrom": {
+      "module": "../grammy-award",  // ← Go UP to parent, then to file
+      "name": "GrammyAward"
+    }
+  }
+}
+```
+
+### ❌ Wrong: Forgetting the relative path
+```json
+{
+  "meta": {
+    "adoptsFrom": {
+      "module": "./grammy-award",  // ← WRONG! This looks in GrammyAward/
+      "name": "GrammyAward"
+    }
+  }
+}
+```
+
+## Path Rules Summary
+
+| JSON Location | Definition Location | Module Path |
+|--------------|---------------------|-------------|
+| `root/Instance.json` | `root/card.gts` | `"./card"` |
+| `root/Card/instance.json` | `root/card.gts` | `"../card"` |
+| `root/Card/Sub/instance.json` | `root/card.gts` | `"../../card"` |
+| `root/Card/instance.json` | `root/other/card.gts` | `"../other/card"` |
+
+## Instance JSON Structure (Full)
+
+```json
+{
+  "data": {
+    "type": "card",
+    "attributes": {
+      "fieldName": "value",
+      "numberField": 123,
+      "boolField": true
+    },
+    "relationships": {
+      "author": {
+        "links": {
+          "self": "../Author/jane-doe"
+        }
+      }
+    },
+    "meta": {
+      "adoptsFrom": {
+        "module": "../card-definition",
+        "name": "CardClassName"
+      }
+    }
+  }
+}
+```
+
+## linksToMany Relationships (CRITICAL)
+
+**🔴 For `linksToMany` fields, use numbered keys like `fieldName.0`, `fieldName.1`, etc.**
+
+```json
+{
+  "data": {
+    "relationships": {
+      "tags.0": {
+        "links": {
+          "self": "../Tag/tech"
+        }
+      },
+      "tags.1": {
+        "links": {
+          "self": "../Tag/news"
+        }
+      },
+      "tags.2": {
+        "links": {
+          "self": "../Tag/tutorial"
+        }
+      }
+    }
+  }
+}
+```
+
+### ❌ Wrong: Array syntax (does NOT work)
+```json
+{
+  "relationships": {
+    "tags": {
+      "links": {
+        "self": ["../Tag/tech", "../Tag/news"]
+      }
+    }
+  }
+}
+```
+```
+
+### JSON Structure Rules
+
+| Section | Purpose | Required |
+|---------|---------|----------|
+| `data.type` | Always `"card"` | Yes |
+| `data.attributes` | Scalar field values (string, number, bool) | Yes |
+| `data.relationships` | Links to other cards (`linksTo`/`linksToMany`) | Only if has links |
+| `data.meta.adoptsFrom` | References the card definition | Yes |
+
+### Attributes vs Relationships
+
+**Use `attributes` for:**
+- StringField, NumberField, BooleanField values
+- FieldDef instances (embedded via `contains`)
+- Any non-card data
+
+**Use `relationships` for:**
+- CardDef references (`linksTo` → single link)
+- CardDef arrays (`linksToMany` → array of links)
+
+## The Cardinal Rule (linksTo vs contains)
+
+**🔴 CRITICAL - memorize this:**
+
+| Field Type | Definition uses | Instance uses |
+|------------|-----------------|---------------|
+| Extends `CardDef` | `linksTo` / `linksToMany` | `relationships` |
+| Extends `FieldDef` | `contains` / `containsMany` | `attributes` |
+
+```gts
+// In .gts definition:
+@field author = linksTo(Author);        // Author extends CardDef → relationships
+@field address = contains(AddressField); // AddressField extends FieldDef → attributes
+```
+
+```json
+// In .json instance:
+{
+  "attributes": {
+    "address": { "street": "123 Main", "city": "NYC" }
+  },
+  "relationships": {
+    "author": { "links": { "self": "../Author/jane" } }
+  }
+}
+```
+
+## Links Between Cards
+
+When linking to other cards, use the card's URL without `.json`:
+
+```json
+{
+  "data": {
+    "relationships": {
+      "author": {
+        "links": {
+          "self": "../Author/jane-doe"
+        }
+      }
+    }
+  }
+}
+```
+
+## Base Realms (Read-Only)
+
+These realms contain shared definitions you can import from:
+
+**Production:**
+- `@cardstack/base/` - Core types (CardDef, FieldDef, etc.)
+- `https://app.boxel.ai/catalog/` - Catalog cards
+- `https://app.boxel.ai/skills/` - Skill cards
+
+**Staging:**
+- `@cardstack/base/` - Same core types
+- `https://realms-staging.stack.cards/catalog/`
+- `https://realms-staging.stack.cards/skills/`
+
+## Common Import Patterns
+
+```gts
+// Core imports (always from @cardstack/base)
+import {
+  CardDef,
+  FieldDef,
+  field,
+  contains,
+  linksTo,
+  containsMany,
+  linksToMany,
+  StringField,
+  NumberField,
+  BooleanField,
+  Component,
+} from '@cardstack/base/card-api';
+
+// Import from same workspace
+import { Author } from './author';
+
+// Import from base realm
+import { Skill } from '@cardstack/base/skill';
+```
+
+## Query Structure (for API searches)
+
+When using the `/_search` API endpoint:
+
+```json
+{
+  "filter": {
+    "type": {
+      "module": "https://realm-url/card-name",
+      "name": "CardClassName"
+    }
+  }
+}
+```
+
+**With field filters:**
+```json
+{
+  "filter": {
+    "on": { "module": "https://realm-url/product", "name": "Product" },
+    "contains": { "name": "laptop" }
+  }
+}
+```
+
+**Operations:** `eq`, `contains`, `range`, `not`, `type`, `every` (AND), `any` (OR)
+
+## Common Mistakes
+
+| Mistake | Fix |
+|---------|-----|
+| `"module": "./card"` from subdirectory | Use `"../card"` |
+| `contains(CardDef)` | Use `linksTo(CardDef)` |
+| `linksTo(FieldDef)` | Use `contains(FieldDef)` |
+| Link in `attributes` | Move to `relationships` |
+| FieldDef in `relationships` | Move to `attributes` |
+| Missing `data` wrapper in JSON | Wrap everything in `{"data": {...}}` |
+| PascalCase for `.gts` files | Use `kebab-case.gts` |
+| kebab-case for instance dirs | Use `PascalCase/` |
+| `linksToMany` as array | Use numbered keys: `field.0`, `field.1`, etc. |
+
+## Essential Formats
+
+Every CardDef should implement these templates:
+- `isolated` - Full detail view (scrollable)
+- `embedded` - Compact summary for lists
+- `fitted` - Fixed dimensions for grids/dashboards (CRITICAL for good UX)
diff --git a/packages/software-factory/experiment_1/realms/guidance-tasks/KnowledgeArticle/agent-onboarding.json b/packages/software-factory/experiment_1/realms/guidance-tasks/KnowledgeArticle/agent-onboarding.json
new file mode 100644
index 00000000000..3431d306805
--- /dev/null
+++ b/packages/software-factory/experiment_1/realms/guidance-tasks/KnowledgeArticle/agent-onboarding.json
@@ -0,0 +1,37 @@
+{
+  "data": {
+    "type": "card",
+    "attributes": {
+      "cardInfo": {
+        "title": "Agent Onboarding Guide",
+        "description": "How to get started as an agent in the Dark Factory",
+        "thumbnailURL": null,
+        "notes": null
+      },
+      "articleTitle": "Agent Onboarding Guide",
+      "articleType": "onboarding",
+      "tags": [
+        "onboarding",
+        "agents",
+        "getting-started",
+        "workflow"
+      ],
+      "updatedAt": "2026-03-12T10:00:00Z",
+      "content": "# Agent Onboarding Guide\n\nWelcome to the Dark Factory. This guide explains how to operate effectively as an agent in this system.\n\n## Your Tools\n\nYou have access to the Boxel AI assistant with the following capabilities:\n- Read and write card data (Tickets, Knowledge Articles, Projects)\n- Navigate between linked cards\n- Search for cards by type and content\n- Update ticket status, notes, and links\n\n## Starting a Session\n\n1. **Find your assigned ticket** - Search for Ticket cards assigned to you, or check the Project dashboard\n2. **Read the full ticket** - Description, acceptance criteria, and agent notes from previous agents\n3. **Review linked knowledge** - Check the Related tab for knowledge articles\n4. **Check the project scope** - Open the Project card and read the Scope tab\n\n## Working a Ticket\n\n```\nBacklog → In Progress → (Review) → Done\n                ↓\n            Blocked (if stuck)\n```\n\n1. Set status to `in_progress` when you start\n2. Update `agentNotes` with your findings and decisions AS YOU WORK\n3. Link any `relatedTickets` you discover\n4. Link relevant `relatedKnowledge` articles\n5. If blocked, set status to `blocked` and document the blocker in agent notes\n6. Set status to `done` when acceptance criteria are met\n\n## Building Knowledge\n\nWhen you discover something important:\n- Create a `KnowledgeArticle` card\n- Choose the appropriate type (architecture, decision, runbook, context, api, onboarding)\n- Add relevant tags for discoverability\n- Link it to relevant tickets\n\n## Key Principles\n\n- **Leave the system better than you found it** - document everything\n- **Agent notes are for agents** - write as if briefing your replacement\n- **Links are navigation** - use them liberally to connect related work\n- **Status accuracy matters** - humans watch the dashboard"
+    },
+    "relationships": {
+      "cardInfo.theme": {
+        "links": {
+          "self": "@cardstack/base/Theme/cardstack-brand-guide"
+        }
+      }
+    },
+    "meta": {
+      "adoptsFrom": {
+        "module": "../darkfactory",
+        "name": "KnowledgeArticle"
+      },
+      "_touched": 1773327309668
+    }
+  }
+}
diff --git a/packages/software-factory/experiment_1/realms/guidance-tasks/Project/demo-project.json b/packages/software-factory/experiment_1/realms/guidance-tasks/Project/demo-project.json
new file mode 100644
index 00000000000..ca8b0db610d
--- /dev/null
+++ b/packages/software-factory/experiment_1/realms/guidance-tasks/Project/demo-project.json
@@ -0,0 +1,47 @@
+{
+  "data": {
+    "meta": {
+      "adoptsFrom": {
+        "name": "Project",
+        "module": "../darkfactory"
+      },
+      "_touched": 1773327316874
+    },
+    "type": "card",
+    "attributes": {
+      "risks": "- **Demo timeline:**  Very tight - scope must be controlled\n- **Agent context loss:** Mitigate with rich knowledge base\n- **Scope creep:** New features deferred to Phase 2",
+      "scope": "## Scope\n\n### In Scope\n- Agent task assignment and tracking\n- Project knowledge base management\n- Ticket lifecycle management (backlog → done)\n- Agent onboarding via knowledge articles\n- Human-readable dashboard\n\n### Out of Scope\n- External CI/CD integration (Phase 2)\n- Agent spawning/orchestration engine (Phase 2)\n- Real-time agent communication (Phase 2)\n\n### Constraints\n- Must be demonstrable by demo deadline\n- All data must be structured for agent consumption\n- Knowledge must be transferable between agent sessions",
+      "cardInfo": {
+        "name": null,
+        "notes": null,
+        "summary": null,
+        "cardThumbnailURL": null
+      },
+      "deadline": "2026-03-20",
+      "createdAt": "2026-03-12T10:00:00.000Z",
+      "objective": "Build and demonstrate a fully operational agent-driven software factory platform capable of autonomous project management, ticket resolution, and knowledge accumulation.",
+      "projectCode": "DFX-001",
+      "projectName": "Dark Factory Platform",
+      "projectStatus": "active",
+      "successCriteria": "- [ ] Agent can be assigned a ticket and complete it autonomously\n- [ ] Knowledge articles accessible and useful to new agents\n- [ ] Human can see project health at a glance on dashboard\n- [ ] Tickets can navigate to related knowledge and tickets\n- [ ] Project scope is clear and discoverable",
+      "technicalContext": "## Technical Context\n\n### Stack\n- **Platform:** Boxel (card-based data system)\n- **Agent Interface:** AI assistant with tool access\n- **Storage:** Boxel realm (JSON:API)\n\n### Key Concepts\n- **Tickets** track discrete work items with status, priority, and agent assignment\n- **Knowledge Articles** store durable context for incoming agents\n- **Agent Notes** on tickets preserve decision trail\n- **Linked entities** allow navigation between related work\n\n### Agent Workflow\n1. Agent opens assigned ticket\n2. Agent reads description + acceptance criteria\n3. Agent reviews linked knowledge articles\n4. Agent documents findings in Agent Notes\n5. Agent links related tickets\n6. Agent updates status and marks done"
+    },
+    "relationships": {
+      "teamAgents": {
+        "links": {
+          "self": null
+        }
+      },
+      "knowledgeBase.0": {
+        "links": {
+          "self": "../KnowledgeArticle/agent-onboarding"
+        }
+      },
+      "cardInfo.theme": {
+        "links": {
+          "self": "@cardstack/base/Theme/cardstack-brand-guide"
+        }
+      }
+    }
+  }
+}
diff --git a/packages/software-factory/experiment_1/realms/guidance-tasks/Ticket/ticket-001.json b/packages/software-factory/experiment_1/realms/guidance-tasks/Ticket/ticket-001.json
new file mode 100644
index 00000000000..ef1b91f05fe
--- /dev/null
+++ b/packages/software-factory/experiment_1/realms/guidance-tasks/Ticket/ticket-001.json
@@ -0,0 +1,59 @@
+{
+  "data": {
+    "meta": {
+      "adoptsFrom": {
+        "name": "Ticket",
+        "module": "../darkfactory"
+      },
+      "_touched": 1773327322050
+    },
+    "type": "card",
+    "attributes": {
+      "status": "done",
+      "summary": "Build core card schema for dark factory task tracking",
+      "cardInfo": {
+        "name": null,
+        "notes": null,
+        "summary": null,
+        "cardThumbnailURL": null
+      },
+      "priority": "critical",
+      "ticketId": "DFX-001",
+      "createdAt": "2026-03-12T10:00:00.000Z",
+      "updatedAt": "2026-03-12T10:30:00.000Z",
+      "agentNotes": "## Agent Notes\n\n**Status:** COMPLETED\n\nImplemented full schema in `darkfactory.gts`. Key decisions:\n- Used `linksToMany` for all cross-card relationships\n- Enum fields for status, priority, type\n- Tabbed UI pattern for ticket isolation format\n- Dashboard with status grid and progress bar on Project isolated view\n- `concat` helper used for dynamic inline styles",
+      "ticketType": "feature",
+      "actualHours": 3,
+      "description": "## Description\n\nDesign and implement the foundational CardDef schema for the Dark Factory platform. This includes:\n\n- `AgentProfile` - Agent identity and capabilities\n- `KnowledgeArticle` - Project knowledge base\n- `Ticket` - Work item tracking\n- `Project` - Top-level project with dashboard\n- `DarkFactory` - Workspace index card\n\n## Notes\nAll cards must support isolated, embedded, and fitted formats for full Boxel compatibility.",
+      "estimatedHours": 4,
+      "acceptanceCriteria": "- [x] All card definitions compile without errors\n- [x] Each card has isolated, embedded, and fitted formats\n- [x] Tickets can link to related tickets and knowledge articles\n- [x] Project dashboard shows live ticket status counts\n- [x] Dark factory theme applied consistently"
+    },
+    "relationships": {
+      "assignedAgent": {
+        "links": {
+          "self": null
+        }
+      },
+      "cardInfo.theme": {
+        "links": {
+          "self": "@cardstack/base/Theme/cardstack-brand-guide"
+        }
+      },
+      "project": {
+        "links": {
+          "self": "../Project/demo-project"
+        }
+      },
+      "relatedTickets": {
+        "links": {
+          "self": null
+        }
+      },
+      "relatedKnowledge": {
+        "links": {
+          "self": null
+        }
+      }
+    }
+  }
+}
diff --git a/packages/software-factory/experiment_1/realms/guidance-tasks/darkfactory-schema.gts b/packages/software-factory/experiment_1/realms/guidance-tasks/darkfactory-schema.gts
new file mode 100644
index 00000000000..f7a29095e5b
--- /dev/null
+++ b/packages/software-factory/experiment_1/realms/guidance-tasks/darkfactory-schema.gts
@@ -0,0 +1,183 @@
+// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══
+// ¹ Schema-only file: field definitions, enums, card schemas — no UI templates
+
+import {
+  CardDef,
+  field,
+  contains,
+  containsMany,
+  linksTo,
+  linksToMany,
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateTimeField from '@cardstack/base/datetime';
+import DateField from '@cardstack/base/date';
+import MarkdownField from '@cardstack/base/markdown';
+import TextAreaField from '@cardstack/base/text-area';
+import enumField from '@cardstack/base/enum';
+
+// ² Enum field definitions
+export const TicketStatusField = enumField(StringField, {
+  options: [
+    { value: 'backlog', label: 'Backlog' },
+    { value: 'in_progress', label: 'In Progress' },
+    { value: 'blocked', label: 'Blocked' },
+    { value: 'review', label: 'In Review' },
+    { value: 'done', label: 'Done' },
+  ],
+});
+
+export const TicketPriorityField = enumField(StringField, {
+  options: [
+    { value: 'critical', label: 'Critical' },
+    { value: 'high', label: 'High' },
+    { value: 'medium', label: 'Medium' },
+    { value: 'low', label: 'Low' },
+  ],
+});
+
+export const TicketTypeField = enumField(StringField, {
+  options: [
+    { value: 'feature', label: 'Feature' },
+    { value: 'bug', label: 'Bug' },
+    { value: 'task', label: 'Task' },
+    { value: 'research', label: 'Research' },
+    { value: 'infrastructure', label: 'Infrastructure' },
+  ],
+});
+
+export const ProjectStatusField = enumField(StringField, {
+  options: [
+    { value: 'planning', label: 'Planning' },
+    { value: 'active', label: 'Active' },
+    { value: 'on_hold', label: 'On Hold' },
+    { value: 'completed', label: 'Completed' },
+    { value: 'archived', label: 'Archived' },
+  ],
+});
+
+export const KnowledgeTypeField = enumField(StringField, {
+  options: [
+    { value: 'architecture', label: 'Architecture' },
+    { value: 'decision', label: 'Decision (ADR)' },
+    { value: 'runbook', label: 'Runbook' },
+    { value: 'context', label: 'Context' },
+    { value: 'api', label: 'API Reference' },
+    { value: 'onboarding', label: 'Onboarding' },
+  ],
+});
+
+// ³ AgentProfile — schema only
+export class AgentProfile extends CardDef {
+  static displayName = 'Agent Profile';
+
+  @field agentId = contains(StringField);
+  @field capabilities = containsMany(StringField);
+  @field specialization = contains(StringField);
+  @field notes = contains(MarkdownField);
+
+  @field title = contains(StringField, {
+    computeVia: function (this: AgentProfile) {
+      return this.agentId ?? 'Unnamed Agent';
+    },
+  });
+}
+
+// ⁴ KnowledgeArticle — schema only
+export class KnowledgeArticle extends CardDef {
+  static displayName = 'Knowledge Article';
+
+  @field articleTitle = contains(StringField);
+  @field articleType = contains(KnowledgeTypeField);
+  @field content = contains(MarkdownField);
+  @field tags = containsMany(StringField);
+  @field lastUpdatedBy = linksTo(() => AgentProfile);
+  @field updatedAt = contains(DateTimeField);
+
+  @field title = contains(StringField, {
+    computeVia: function (this: KnowledgeArticle) {
+      return this.cardInfo?.title ?? this.articleTitle ?? 'Untitled Article';
+    },
+  });
+}
+
+// ⁵ Ticket — schema only
+export class Ticket extends CardDef {
+  static displayName = 'Ticket';
+
+  @field ticketId = contains(StringField);
+  @field summary = contains(StringField);
+  @field description = contains(MarkdownField);
+  @field ticketType = contains(TicketTypeField);
+  @field status = contains(TicketStatusField);
+  @field priority = contains(TicketPriorityField);
+  @field project = linksTo(() => Project);
+  @field assignedAgent = linksTo(() => AgentProfile);
+  @field relatedTickets = linksToMany(() => Ticket);
+  @field relatedKnowledge = linksToMany(() => KnowledgeArticle);
+  @field acceptanceCriteria = contains(MarkdownField);
+  @field agentNotes = contains(MarkdownField);
+  @field estimatedHours = contains(NumberField);
+  @field actualHours = contains(NumberField);
+  @field createdAt = contains(DateTimeField);
+  @field updatedAt = contains(DateTimeField);
+
+  @field title = contains(StringField, {
+    computeVia: function (this: Ticket) {
+      return this.cardInfo?.title ?? this.summary ?? 'Untitled Ticket';
+    },
+  });
+}
+
+// ⁶ Project — schema only
+export class Project extends CardDef {
+  static displayName = 'Project';
+  static prefersWideFormat = true;
+
+  @field projectCode = contains(StringField);
+  @field projectName = contains(StringField);
+  @field projectStatus = contains(ProjectStatusField);
+  @field deadline = contains(DateField);
+  @field objective = contains(TextAreaField);
+  @field scope = contains(MarkdownField);
+  @field technicalContext = contains(MarkdownField);
+  @field tickets = linksToMany(() => Ticket, {
+    query: {
+      filter: {
+        on: {
+          module: new URL('./darkfactory-schema', import.meta.url).href,
+          name: 'Ticket',
+        },
+        eq: { 'project.id': '$this.id' },
+      },
+    },
+  });
+  @field knowledgeBase = linksToMany(() => KnowledgeArticle);
+  @field teamAgents = linksToMany(() => AgentProfile);
+  @field successCriteria = contains(MarkdownField);
+  @field risks = contains(MarkdownField);
+  @field createdAt = contains(DateTimeField);
+
+  @field title = contains(StringField, {
+    computeVia: function (this: Project) {
+      return this.cardInfo?.title ?? this.projectName ?? 'Untitled Project';
+    },
+  });
+}
+
+// ⁷ DarkFactory — schema only
+export class DarkFactory extends CardDef {
+  static displayName = 'Dark Factory';
+
+  @field factoryName = contains(StringField);
+  @field description = contains(MarkdownField);
+  @field activeProjects = linksToMany(() => Project);
+
+  @field title = contains(StringField, {
+    computeVia: function (this: DarkFactory) {
+      return this.cardInfo?.title ?? this.factoryName ?? 'Dark Factory';
+    },
+  });
+}
+// touched for re-index
diff --git a/packages/software-factory/experiment_1/realms/guidance-tasks/darkfactory-ui.gts b/packages/software-factory/experiment_1/realms/guidance-tasks/darkfactory-ui.gts
new file mode 100644
index 00000000000..430360118be
--- /dev/null
+++ b/packages/software-factory/experiment_1/realms/guidance-tasks/darkfactory-ui.gts
@@ -0,0 +1,1833 @@
+// ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══
+// ¹ UI file: all Component templates — imports schemas, adds fitted/embedded/isolated views
+
+import { Component } from '@cardstack/base/card-api';
+import { tracked } from '@glimmer/tracking';
+import { on } from '@ember/modifier';
+import { fn, concat } from '@ember/helper';
+import { eq, gt, and, not } from '@cardstack/boxel-ui/helpers';
+import { formatDateTime } from '@cardstack/boxel-ui/helpers';
+
+import {
+  AgentProfile,
+  KnowledgeArticle,
+  Ticket,
+  Project as ProjectSchema,
+  DarkFactory,
+} from './darkfactory-schema';
+
+// ² AgentProfile UI
+AgentProfile.fitted = class Fitted extends Component<typeof AgentProfile> {
+  <template>
+    <div class='agent-fitted'>
+      <div class='agent-icon'>🤖</div>
+      <div class='agent-info'>
+        <div class='agent-name'>{{if
+            @model.agentId
+            @model.agentId
+            'Unknown Agent'
+          }}</div>
+        {{#if @model.specialization}}
+          <div class='agent-spec'>{{@model.specialization}}</div>
+        {{/if}}
+      </div>
+    </div>
+    <style scoped>
+      .agent-fitted {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-xs);
+        padding: var(--boxel-sp-xs);
+        height: 100%;
+        background: var(--card);
+        color: var(--card-foreground);
+        font-family: var(--font-mono);
+      }
+      .agent-icon {
+        font-size: 1.25rem;
+      }
+      .agent-name {
+        font-size: var(--boxel-font-size-sm);
+        font-weight: 600;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      .agent-spec {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+    </style>
+  </template>
+};
+
+AgentProfile.embedded = class Embedded extends Component<typeof AgentProfile> {
+  <template>
+    <div class='agent-embedded'>
+      <span class='agent-icon'>🤖</span>
+      <div class='agent-details'>
+        <span class='agent-name'>{{if
+            @model.agentId
+            @model.agentId
+            'Unknown Agent'
+          }}</span>
+        {{#if @model.specialization}}
+          <span class='agent-spec'>{{@model.specialization}}</span>
+        {{/if}}
+      </div>
+    </div>
+    <style scoped>
+      .agent-embedded {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-xs);
+        padding: var(--boxel-sp-xs) var(--boxel-sp-sm);
+        background: var(--card);
+        color: var(--card-foreground);
+        border-radius: var(--boxel-border-radius-sm);
+        border: 1px solid var(--border);
+        font-family: var(--font-mono);
+      }
+      .agent-icon {
+        font-size: 1rem;
+      }
+      .agent-name {
+        font-size: var(--boxel-font-size-sm);
+        font-weight: 600;
+      }
+      .agent-spec {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+        margin-left: var(--boxel-sp-xs);
+      }
+    </style>
+  </template>
+};
+
+AgentProfile.isolated = class Isolated extends Component<typeof AgentProfile> {
+  <template>
+    <div class='agent-isolated'>
+      <div class='agent-header'>
+        <div class='agent-avatar'>🤖</div>
+        <div class='agent-meta'>
+          <h1 class='agent-id'>{{if
+              @model.agentId
+              @model.agentId
+              'Unknown Agent'
+            }}</h1>
+          {{#if @model.specialization}}<p
+              class='agent-spec'
+            >{{@model.specialization}}</p>{{/if}}
+        </div>
+      </div>
+      {{#if @model.capabilities.length}}
+        <div class='section'>
+          <h3 class='section-title'>Capabilities</h3>
+          <div class='capabilities'>
+            {{#each @model.capabilities as |cap|}}<span
+                class='capability-tag'
+              >{{cap}}</span>{{/each}}
+          </div>
+        </div>
+      {{/if}}
+      {{#if @model.notes}}
+        <div class='section'>
+          <h3 class='section-title'>Notes</h3>
+          <div class='notes'><@fields.notes /></div>
+        </div>
+      {{/if}}
+    </div>
+    <style scoped>
+      .agent-isolated {
+        padding: var(--boxel-sp-xl);
+        background: var(--card);
+        color: var(--card-foreground);
+        font-family: var(--font-mono);
+        min-height: 100%;
+      }
+      .agent-header {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-lg);
+        margin-bottom: var(--boxel-sp-xl);
+        padding-bottom: var(--boxel-sp-lg);
+        border-bottom: 2px solid var(--primary);
+      }
+      .agent-avatar {
+        font-size: 3rem;
+      }
+      .agent-id {
+        font-size: var(--boxel-font-size-xl);
+        font-weight: 700;
+        margin: 0;
+      }
+      .agent-spec {
+        color: var(--muted-foreground);
+        margin: var(--boxel-sp-xs) 0 0;
+      }
+      .section {
+        margin-top: var(--boxel-sp-lg);
+      }
+      .section-title {
+        font-size: var(--boxel-font-size-sm);
+        text-transform: uppercase;
+        letter-spacing: var(--boxel-lsp-xl);
+        color: var(--muted-foreground);
+        margin-bottom: var(--boxel-sp-sm);
+      }
+      .capabilities {
+        display: flex;
+        flex-wrap: wrap;
+        gap: var(--boxel-sp-xs);
+      }
+      .capability-tag {
+        padding: 2px var(--boxel-sp-xs);
+        background: var(--primary);
+        color: var(--primary-foreground);
+        border-radius: var(--boxel-border-radius-xs);
+        font-size: var(--boxel-font-size-xs);
+      }
+    </style>
+  </template>
+};
+
+// ³ KnowledgeArticle UI
+KnowledgeArticle.fitted = class Fitted extends Component<
+  typeof KnowledgeArticle
+> {
+  get typeLabel() {
+    const map: Record<string, string> = {
+      architecture: 'ARCH',
+      decision: 'ADR',
+      runbook: 'RUN',
+      context: 'CTX',
+      api: 'API',
+      onboarding: 'OBD',
+    };
+    return map[this.args.model?.articleType ?? ''] ?? 'DOC';
+  }
+  <template>
+    <div class='kb-fitted'>
+      <div class='kb-type-badge'>{{this.typeLabel}}</div>
+      <div class='kb-content'>
+        <div class='kb-title'>{{if
+            @model.articleTitle
+            @model.articleTitle
+            'Untitled'
+          }}</div>
+        {{#if @model.tags.length}}
+          <div class='kb-tags'>{{#each @model.tags as |tag|}}<span
+                class='tag'
+              >{{tag}}</span>{{/each}}</div>
+        {{/if}}
+      </div>
+    </div>
+    <style scoped>
+      .kb-fitted {
+        display: flex;
+        align-items: flex-start;
+        gap: var(--boxel-sp-xs);
+        padding: var(--boxel-sp-xs);
+        height: 100%;
+        background: var(--card);
+        color: var(--card-foreground);
+        font-family: var(--font-mono);
+        overflow: hidden;
+      }
+      .kb-type-badge {
+        flex-shrink: 0;
+        padding: 2px 5px;
+        background: var(--accent);
+        color: var(--accent-foreground);
+        border-radius: var(--boxel-border-radius-xs);
+        font-size: 0.65rem;
+        font-weight: 700;
+        letter-spacing: 0.05em;
+        border: 1px solid var(--border);
+      }
+      .kb-title {
+        font-size: var(--boxel-font-size-sm);
+        font-weight: 600;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+      .kb-tags {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 3px;
+        margin-top: 3px;
+      }
+      .tag {
+        font-size: 0.6rem;
+        padding: 1px 4px;
+        background: var(--muted);
+        color: var(--muted-foreground);
+        border-radius: 3px;
+      }
+    </style>
+  </template>
+};
+
+KnowledgeArticle.embedded = class Embedded extends Component<
+  typeof KnowledgeArticle
+> {
+  get typeLabel() {
+    const map: Record<string, string> = {
+      architecture: 'Architecture',
+      decision: 'ADR',
+      runbook: 'Runbook',
+      context: 'Context',
+      api: 'API Ref',
+      onboarding: 'Onboarding',
+    };
+    return map[this.args.model?.articleType ?? ''] ?? 'Document';
+  }
+  <template>
+    <div class='kb-embedded'>
+      <span class='kb-type'>{{this.typeLabel}}</span>
+      <span class='kb-title'>{{if
+          @model.articleTitle
+          @model.articleTitle
+          'Untitled'
+        }}</span>
+      {{#if @model.updatedAt}}<span class='kb-date'>{{formatDateTime
+            @model.updatedAt
+            'MMM D, YYYY'
+          }}</span>{{/if}}
+    </div>
+    <style scoped>
+      .kb-embedded {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-xs);
+        padding: var(--boxel-sp-xs) var(--boxel-sp-sm);
+        background: var(--card);
+        color: var(--card-foreground);
+        border-radius: var(--boxel-border-radius-sm);
+        border: 1px solid var(--border);
+        font-family: var(--font-mono);
+        font-size: var(--boxel-font-size-sm);
+      }
+      .kb-type {
+        padding: 1px 6px;
+        background: var(--accent);
+        color: var(--accent-foreground);
+        border-radius: var(--boxel-border-radius-xs);
+        font-size: var(--boxel-font-size-xs);
+        font-weight: 700;
+        text-transform: uppercase;
+      }
+      .kb-title {
+        font-weight: 500;
+        flex: 1;
+      }
+      .kb-date {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+        margin-left: auto;
+      }
+    </style>
+  </template>
+};
+
+KnowledgeArticle.isolated = class Isolated extends Component<
+  typeof KnowledgeArticle
+> {
+  <template>
+    <article class='kb-isolated'>
+      <header class='kb-header'>
+        <div class='kb-meta-row'>
+          {{#if @model.articleType}}<span
+              class='kb-type-badge'
+            ><@fields.articleType /></span>{{/if}}
+          {{#if @model.updatedAt}}<span class='kb-date'>Updated:
+              {{formatDateTime
+                @model.updatedAt
+                'MMM D, YYYY HH:mm'
+              }}</span>{{/if}}
+        </div>
+        <h1 class='kb-title'>{{if
+            @model.articleTitle
+            @model.articleTitle
+            'Untitled Article'
+          }}</h1>
+        {{#if @model.tags.length}}
+          <div class='kb-tags'>{{#each @model.tags as |tag|}}<span
+                class='tag'
+              >{{tag}}</span>{{/each}}</div>
+        {{/if}}
+        {{#if @model.lastUpdatedBy}}
+          <div class='kb-author'>Last updated by:
+            <@fields.lastUpdatedBy @format='embedded' /></div>
+        {{/if}}
+      </header>
+      <div class='kb-body'>
+        {{#if @model.content}}<@fields.content />{{else}}<p
+            class='placeholder'
+          >No content yet.</p>{{/if}}
+      </div>
+    </article>
+    <style scoped>
+      .kb-isolated {
+        padding: var(--boxel-sp-xl);
+        max-width: 60rem;
+        margin: 0 auto;
+        font-family: var(--font-sans);
+        background: var(--card);
+        color: var(--card-foreground);
+        min-height: 100%;
+        overflow-y: auto;
+      }
+      .kb-header {
+        border-bottom: 2px solid var(--primary);
+        padding-bottom: var(--boxel-sp-lg);
+        margin-bottom: var(--boxel-sp-xl);
+      }
+      .kb-meta-row {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-sm);
+        margin-bottom: var(--boxel-sp-sm);
+      }
+      .kb-type-badge {
+        padding: 2px 8px;
+        background: var(--accent);
+        color: var(--accent-foreground);
+        border-radius: var(--boxel-border-radius-xs);
+        font-size: var(--boxel-font-size-xs);
+        font-weight: 700;
+        font-family: var(--font-mono);
+        text-transform: uppercase;
+      }
+      .kb-date {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+        fontily: var(--font-mono);
+      }
+      .kb-title {
+        font-size: var(--boxel-font-size-xl);
+        font-weight: 700;
+        margin: var(--boxel-sp-sm) 0;
+      }
+      .kb-tags {
+        display: flex;
+        flex-wrap: wrap;
+        gap: var(--boxel-sp-xs);
+        margin-top: var(--boxel-sp-xs);
+      }
+      .tag {
+        padding: 2px 8px;
+        background: var(--muted);
+        color: var(--muted-foreground);
+        border-radius: var(--boxel-border-radius-xs);
+        font-size: var(--boxel-font-size-xs);
+        font-family: var(--font-mono);
+      }
+      .kb-author {
+        margin-top: var(--boxel-sp-sm);
+        font-size: var(--boxel-font-size-sm);
+        color: var(--muted-foreground);
+      }
+      .kb-body {
+        font-size: var(--boxel-font-size-sm);
+        line-height: 1.7;
+      }
+      .placeholder {
+        color: var(--muted-foreground);
+        font-style: italic;
+      }
+    </style>
+  </template>
+};
+
+// ⁴ Ticket UI
+Ticket.fitted = class Fitted extends Component<typeof Ticket> {
+  get statusAccent() {
+    const map: Record<string, string> = {
+      backlog: '#6b7280',
+      in_progress: '#3b82f6',
+      blocked: '#ef4444',
+      review: '#f59e0b',
+      done: '#22c55e',
+    };
+    return map[this.args.model?.status ?? ''] ?? '#6b7280';
+  }
+  get statusEmoji() {
+    const m: Record<string, string> = {
+      backlog: '📋',
+      in_progress: '⚙️',
+      blocked: '🔴',
+      review: '👁️',
+      done: '✅',
+    };
+    return m[this.args.model?.status ?? ''] ?? '📋';
+  }
+  get priorityDot() {
+    const m: Record<string, string> = {
+      critical: '#ff4444',
+      high: '#ff8800',
+      medium: '#ffcc00',
+      low: '#44ff44',
+    };
+    return m[this.args.model?.priority ?? ''] ?? '#888888';
+  }
+  <template>
+    <div
+      class='ticket-fitted'
+      style={{if
+        @model.status
+        (concat '--status-accent:' this.statusAccent)
+        '--status-accent:#6b7280'
+      }}
+    >
+      <div class='ticket-top'>
+        <span class='ticket-id'>{{if
+            @model.ticketId
+            @model.ticketId
+            '---'
+          }}</span>
+        <span class='status-emoji'>{{this.statusEmoji}}</span>
+        <span
+          class='priority-dot'
+          style={{concat 'background:' this.priorityDot}}
+        ></span>
+      </div>
+      <div class='ticket-summary'>{{if
+          @model.summary
+          @model.summary
+          'No summary'
+        }}</div>
+      {{#if @model.assignedAgent}}<div class='ticket-agent'>🤖
+          <@fields.assignedAgent @format='atom' /></div>{{/if}}
+    </div>
+    <style scoped>
+      .ticket-fitted {
+        display: flex;
+        flex-direction: column;
+        gap: 4px;
+        padding: var(--boxel-sp-xs) var(--boxel-sp-xs) var(--boxel-sp-xs)
+          calc(var(--boxel-sp-xs) + 3px);
+        height: 100%;
+        background: var(--card);
+        color: var(--card-foreground);
+        font-family: var(--font-mono);
+        overflow: hidden;
+        border: 1px solid var(--border);
+        border-left: 3px solid var(--status-accent, #6b7280);
+        border-radius: var(--boxel-border-radius-sm);
+      }
+      .ticket-top {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-xs);
+      }
+      .ticket-id {
+        font-size: 0.65rem;
+        color: var(--muted-foreground);
+        font-weight: 700;
+      }
+      .status-emoji {
+        font-size: 0.75rem;
+        margin-left: auto;
+      }
+      .priority-dot {
+        width: 7px;
+        height: 7px;
+        border-radius: 50%;
+        flex-shrink: 0;
+      }
+      .ticket-summary {
+        font-size: var(--boxel-font-size-xs);
+        font-weight: 500;
+        overflow: hidden;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        line-height: 1.3;
+        color: var(--card-foreground);
+      }
+      .ticket-agent {
+        font-size: 0.6rem;
+        color: var(--muted-foreground);
+        margin-top: auto;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+    </style>
+  </template>
+};
+
+Ticket.embedded = class Embedded extends Component<typeof Ticket> {
+  get statusEmoji() {
+    const m: Record<string, string> = {
+      backlog: '📋',
+      in_progress: '⚙️',
+      blocked: '🔴',
+      review: '👁️',
+      done: '✅',
+    };
+    return m[this.args.model?.status ?? ''] ?? '📋';
+  }
+  get priorityDot() {
+    const m: Record<string, string> = {
+      critical: '#ff4444',
+      high: '#ff8800',
+      medium: '#ffcc00',
+      low: '#44ff44',
+    };
+    return m[this.args.model?.priority ?? ''] ?? '#888888';
+  }
+  <template>
+    <div class='ticket-embedded'>
+      <span
+        class='priority-dot'
+        style={{concat 'background:' this.priorityDot}}
+      ></span>
+      <span class='status-emoji'>{{this.statusEmoji}}</span>
+      <span class='ticket-id'>{{if
+          @model.ticketId
+          @model.ticketId
+          '---'
+        }}</span>
+      <span class='ticket-summary'>{{if
+          @model.summary
+          @model.summary
+          'No summary'
+        }}</span>
+      {{#if @model.assignedAgent}}<span class='ticket-agent'>🤖
+          <@fields.assignedAgent @format='atom' /></span>{{/if}}
+    </div>
+    <style scoped>
+      .ticket-embedded {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-xs);
+        padding: var(--boxel-sp-xs) var(--boxel-sp-sm);
+        background: var(--card);
+        color: var(--card-foreground);
+        border-radius: var(--boxel-border-radius-sm);
+        border: 1px solid var(--border);
+        font-family: var(--font-mono);
+        font-size: var(--boxel-font-size-sm);
+      }
+      .priority-dot {
+        width: 8px;
+        height: 8px;
+        border-radius: 50%;
+        flex-shrink: 0;
+      }
+      .status-emoji {
+        font-size: 0.9rem;
+      }
+      .ticket-id {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+        font-weight: 700;
+      }
+      .ticket-summary {
+        flex: 1;
+        font-weight: 500;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      .ticket-agent {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+        margin-left: auto;
+        white-space: nowrap;
+      }
+    </style>
+  </template>
+};
+
+Ticket.isolated = class Isolated extends Component<typeof Ticket> {
+  @tracked activeTab: 'overview' | 'context' | 'related' = 'overview';
+  setTab = (tab: 'overview' | 'context' | 'related') => {
+    this.activeTab = tab;
+  };
+  get statusEmoji() {
+    const m: Record<string, string> = {
+      backlog: '📋',
+      in_progress: '⚙️',
+      blocked: '🔴',
+      review: '👁️',
+      done: '✅',
+    };
+    return m[this.args.model?.status ?? ''] ?? '📋';
+  }
+  get priorityColor() {
+    const m: Record<string, string> = {
+      critical: '#ff4444',
+      high: '#ff8800',
+      medium: '#ffcc00',
+      low: '#44ff44',
+    };
+    return m[this.args.model?.priority ?? ''] ?? '#888888';
+  }
+  <template>
+    <div class='ticket-isolated'>
+      <header class='ticket-header'>
+        <div class='ticket-meta-row'>
+          <span class='ticket-id-badge'>{{if
+              @model.ticketId
+              @model.ticketId
+              'NO-ID'
+            }}</span>
+          {{#if @model.ticketType}}<span class='type-badge'><@fields.ticketType
+              /></span>{{/if}}
+          <div class='header-right'>
+            {{#if @model.status}}<span
+                class='status-indicator'
+              >{{this.statusEmoji}} <@fields.status /></span>{{/if}}
+            {{#if @model.priority}}<span
+                class='priority-indicator'
+                style={{concat 'border-color:' this.priorityColor}}
+              ><@fields.priority /></span>{{/if}}
+          </div>
+        </div>
+        <h1 class='ticket-title'>{{if
+            @model.summary
+            @model.summary
+            'Untitled Ticket'
+          }}</h1>
+        <div class='ticket-agents-row'>
+          {{#if @model.assignedAgent}}
+            <span class='label'>Assigned:</span>
+            <@fields.assignedAgent @format='embedded' />
+          {{else}}
+            <span class='unassigned'>⚡ Unassigned</span>
+          {{/if}}
+          {{#if @model.estimatedHours}}<span class='hours-badge'>Est.
+              {{@model.estimatedHours}}h</span>{{/if}}
+          {{#if @model.actualHours}}<span class='hours-badge actual'>Act.
+              {{@model.actualHours}}h</span>{{/if}}
+        </div>
+      </header>
+      <nav class='ticket-tabs'>
+        <button
+          class={{if (eq this.activeTab 'overview') 'tab active' 'tab'}}
+          {{on 'click' (fn this.setTab 'overview')}}
+        >Overview</button>
+        <button
+          class={{if (eq this.activeTab 'context') 'tab active' 'tab'}}
+          {{on 'click' (fn this.setTab 'context')}}
+        >Agent Context</button>
+        <button
+          class={{if (eq this.activeTab 'related') 'tab active' 'tab'}}
+          {{on 'click' (fn this.setTab 'related')}}
+        >Related</button>
+      </nav>
+      {{#if (eq this.activeTab 'overview')}}
+        <section class='ticket-body'>
+          <div class='section'>
+            <h3 class='section-title'>Description</h3>
+            {{#if @model.description}}<div
+                class='markdown-content'
+              ><@fields.description /></div>{{else}}<p class='placeholder'>No
+                description provided.</p>{{/if}}
+          </div>
+          {{#if @model.acceptanceCriteria}}
+            <div class='section'>
+              <h3 class='section-title'>Acceptance Criteria</h3>
+              <div class='markdown-content'><@fields.acceptanceCriteria /></div>
+            </div>
+          {{/if}}
+        </section>
+      {{/if}}
+      {{#if (eq this.activeTab 'context')}}
+        <section class='ticket-body'>
+          <div class='section'>
+            <h3 class='section-title'>Agent Notes</h3>
+            {{#if @model.agentNotes}}<div
+                class='markdown-content'
+              ><@fields.agentNotes /></div>{{else}}<p class='placeholder'>No
+                agent notes yet. Document findings, decisions, and progress
+                here.</p>{{/if}}
+          </div>
+        </section>
+      {{/if}}
+      {{#if (eq this.activeTab 'related')}}
+        <section class='ticket-body'>
+          {{#if @model.relatedTickets.length}}
+            <div class='section'>
+              <h3 class='section-title'>Related Tickets</h3>
+              <div class='related-list'><@fields.relatedTickets
+                  @format='embedded'
+                /></div>
+            </div>
+          {{/if}}
+          {{#if @model.relatedKnowledge.length}}
+            <div class='section'>
+              <h3 class='section-title'>Knowledge Articles</h3>
+              <div class='related-list'><@fields.relatedKnowledge
+                  @format='embedded'
+                /></div>
+            </div>
+          {{/if}}
+          {{#if
+            (and
+              (not @model.relatedTickets.length)
+              (not @model.relatedKnowledge.length)
+            )
+          }}
+            <p class='placeholder'>No related items linked yet.</p>
+          {{/if}}
+        </section>
+      {{/if}}
+      {{#if @model.updatedAt}}
+        <footer class='ticket-footer'>Last updated:
+          {{formatDateTime @model.updatedAt 'MMM D, YYYY HH:mm'}}</footer>
+      {{/if}}
+    </div>
+    <style scoped>
+      .ticket-isolated {
+        display: flex;
+        flex-direction: column;
+        min-height: 100%;
+        background: var(--card);
+        color: var(--card-foreground);
+        font-family: var(--font-mono);
+        overflow-y: auto;
+      }
+      .ticket-header {
+        padding: var(--boxel-sp-xl);
+        background: var(--muted);
+        border-bottom: 2px solid var(--primary);
+      }
+      .ticket-meta-row {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-xs);
+        margin-bottom: var(--boxel-sp-sm);
+        flex-wrap: wrap;
+      }
+      .header-right {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-xs);
+        margin-left: auto;
+      }
+      .ticket-id-badge {
+        padding: 2px 8px;
+        background: var(--primary);
+        color: var(--primary-foreground);
+        border-radius: var(--boxel-border-radius-xs);
+        font-size: var(--boxel-font-size-xs);
+        font-weight: 700;
+      }
+      .type-badge {
+        padding: 2px 8px;
+        background: var(--secondary);
+        color: var(--secondary-foreground);
+        border-radius: var(--boxel-border-radius-xs);
+        font-size: var(--boxel-font-size-xs);
+        text-transform: uppercase;
+      }
+      .status-indicator {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+        padding: 2px 8px;
+        background: var(--muted);
+        border-radius: var(--boxel-border-radius-xs);
+        font-size: var(--boxel-font-size-xs);
+      }
+      .priority-indicator {
+        padding: 2px 8px;
+        border: 1px solid;
+        border-radius: var(--boxel-border-radius-xs);
+        font-size: var(--boxel-font-size-xs);
+      }
+      .ticket-title {
+        font-size: var(--boxel-font-size-xl);
+        font-weight: 700;
+        margin: var(--boxel-sp-sm) 0;
+        font-family: var(--font-sans);
+        color: var(--foreground);
+      }
+      .ticket-agents-row {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-sm);
+        flex-wrap: wrap;
+      }
+      .label {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+      }
+      .unassigned {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+        font-style: italic;
+      }
+      .hours-badge {
+        padding: 2px 6px;
+        background: var(--muted);
+        color: var(--muted-foreground);
+        border-radius: var(--boxel-border-radius-xs);
+        font-size: var(--boxel-font-size-xs);
+      }
+      .hours-badge.actual {
+        background: var(--accent);
+        color: var(--accent-foreground);
+      }
+      .ticket-tabs {
+        display: flex;
+        padding: 0 var(--boxel-sp-xl);
+        background: var(--card);
+        border-bottom: 1px solid var(--border);
+        gap: 2px;
+      }
+      .tab {
+        padding: var(--boxel-sp-xs) var(--boxel-sp-sm);
+        background: none;
+        border: none;
+        border-bottom: 2px solid transparent;
+        color: var(--muted-foreground);
+        cursor: pointer;
+        font-family: var(--font-mono);
+        font-size: var(--boxel-font-size-sm);
+        transition: color 0.15s;
+        margin-bottom: -1px;
+      }
+      .tab:hover {
+        color: var(--foreground);
+      }
+      .tab.active {
+        color: var(--primary);
+        border-bottom-color: var(--primary);
+      }
+      .ticket-body {
+        padding: var(--boxel-sp-xl);
+        flex: 1;
+      }
+      .section {
+        margin-bottom: var(--boxel-sp-xl);
+      }
+      .section-title {
+        font-size: var(--boxel-font-size-xs);
+        text-transform: uppercase;
+        letter-spacing: var(--boxel-lsp-xl);
+        color: var(--muted-foreground);
+        margin-bottom: var(--boxel-sp-sm);
+      }
+      .markdown-content {
+        font-family: var(--font-sans);
+        font-size: var(--boxel-font-size-sm);
+        line-height: 1.7;
+        color: var(--card-foreground);
+      }
+      .related-list {
+        display: flex;
+        flex-direction: column;
+      }
+      .related-list > .containsMany-field {
+        display: flex;
+        flex-direction: column;
+        gap: var(--boxel-sp-xs);
+      }
+      .placeholder {
+        color: var(--muted-foreground);
+        font-style: italic;
+        font-size: var(--boxel-font-size-sm);
+      }
+      .ticket-footer {
+        padding: var(--boxel-sp-sm) var(--boxel-sp-xl);
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+        border-top: 1px solid var(--border);
+        text-align: right;
+      }
+    </style>
+  </template>
+};
+
+export class Project extends ProjectSchema {
+
+static fitted = class Fitted extends Component<typeof ProjectSchema> {
+  get statusAccent() {
+    const m: Record<string, string> = {
+      planning: '#f59e0b',
+      active: '#22c55e',
+      on_hold: '#6b7280',
+      completed: '#3b82f6',
+      archived: '#9ca3af',
+    };
+    return m[this.args.model?.projectStatus ?? ''] ?? '#6b7280';
+  }
+  get statusEmoji() {
+    const m: Record<string, string> = {
+      planning: '🗺️',
+      active: '⚡',
+      on_hold: '⏸️',
+      completed: '🎯',
+      archived: '📦',
+    };
+    return m[this.args.model?.projectStatus ?? ''] ?? '📁';
+  }
+  get daysUntilDeadline() {
+    try {
+      if (!this.args.model?.deadline) return null;
+      const days = Math.ceil(
+        (new Date(this.args.model.deadline).getTime() - Date.now()) / 86400000,
+      );
+      return days;
+    } catch {
+      return null;
+    }
+  }
+  <template>
+    <div
+      class='project-fitted'
+      style={{concat '--status-accent:' this.statusAccent}}
+    >
+      <div class='project-header'>
+        <span class='project-code'>{{if
+            @model.projectCode
+            @model.projectCode
+            'PRJ'
+          }}</span>
+        <span class='status-emoji'>{{this.statusEmoji}}</span>
+      </div>
+      <div class='project-name'>{{if
+          @model.projectName
+          @model.projectName
+          'Unnamed Project'
+        }}</div>
+      <div class='project-stats'>
+        <span class='stat'>🎫 {{@model.tickets.length}}</span>
+        <span class='stat'>📚 {{@model.knowledgeBase.length}}</span>
+        {{#if this.daysUntilDeadline}}<span class='stat deadline'>⏱
+            {{this.daysUntilDeadline}}d</span>{{/if}}
+      </div>
+    </div>
+    <style scoped>
+      .project-fitted {
+        display: flex;
+        flex-direction: column;
+        gap: 4px;
+        padding: var(--boxel-sp-xs) var(--boxel-sp-xs) var(--boxel-sp-xs)
+          calc(var(--boxel-sp-xs) + 3px);
+        height: 100%;
+        background: var(--card);
+        color: var(--card-foreground);
+        font-family: var(--font-mono);
+        overflow: hidden;
+        border: 1px solid var(--border);
+        border-left: 3px solid var(--status-accent, #22c55e);
+        border-radius: var(--boxel-border-radius-sm);
+      }
+      .project-header {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+      }
+      .project-code {
+        font-size: 0.65rem;
+        font-weight: 700;
+        color: var(--muted-foreground);
+      }
+      .status-emoji {
+        font-size: 0.9rem;
+      }
+      .project-name {
+        font-size: var(--boxel-font-size-xs);
+        font-weight: 600;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        color: var(--card-foreground);
+      }
+      .project-stats {
+        display: flex;
+        gap: var(--boxel-sp-xs);
+        margin-top: auto;
+      }
+      .stat {
+        font-size: 0.6rem;
+        color: var(--muted-foreground);
+      }
+      .deadline {
+        color: var(--destructive);
+      }
+    </style>
+  </template>
+};
+
+static embedded = class Embedded extends Component<typeof ProjectSchema> {
+  get statusEmoji() {
+    const m: Record<string, string> = {
+      planning: '🗺️',
+      active: '⚡',
+      on_hold: '⏸️',
+      completed: '🎯',
+      archived: '📦',
+    };
+    return m[this.args.model?.projectStatus ?? ''] ?? '📁';
+  }
+  <template>
+    <div class='project-embedded'>
+      <span class='project-code'>{{if
+          @model.projectCode
+          @model.projectCode
+          'PRJ'
+        }}</span>
+      <span class='status-emoji'>{{this.statusEmoji}}</span>
+      <span class='project-name'>{{if
+          @model.projectName
+          @model.projectName
+          'Unnamed Project'
+        }}</span>
+      <div class='project-stats'>
+        <span class='stat'>🎫 {{@model.tickets.length}} tickets</span>
+        <span class='stat'>📚 {{@model.knowledgeBase.length}} docs</span>
+      </div>
+    </div>
+    <style scoped>
+      .project-embedded {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-xs);
+        padding: var(--boxel-sp-xs) var(--boxel-sp-sm);
+        background: var(--card);
+        color: var(--card-foreground);
+        border-radius: var(--boxel-border-radius-sm);
+        border: 1px solid var(--border);
+        font-family: var(--font-mono);
+      }
+      .project-code {
+        font-size: var(--boxel-font-size-xs);
+        font-weight: 700;
+        color: var(--muted-foreground);
+      }
+      .status-emoji {
+        font-size: 1rem;
+      }
+      .project-name {
+        font-size: var(--boxel-font-size-sm);
+        font-weight: 600;
+        flex: 1;
+      }
+      .project-stats {
+        display: flex;
+        gap: var(--boxel-sp-xs);
+        margin-left: auto;
+      }
+      .stat {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+      }
+    </style>
+  </template>
+};
+
+
+  static isolated = class Isolated extends Component<typeof ProjectSchema> {
+  @tracked activeTab: 'dashboard' | 'tickets' | 'knowledge' | 'scope' | 'team' =
+    'dashboard';
+  setTab = (tab: typeof this.activeTab) => {
+    this.activeTab = tab;
+  };
+  get statusEmoji() {
+    const m: Record<string, string> = {
+      planning: '🗺️',
+      active: '⚡',
+      on_hold: '⏸️',
+      completed: '🎯',
+      archived: '📦',
+    };
+    return m[this.args.model?.projectStatus ?? ''] ?? '📁';
+  }
+  get daysUntilDeadline() {
+    try {
+      if (!this.args.model?.deadline) return null;
+      return Math.ceil(
+        (new Date(this.args.model.deadline).getTime() - Date.now()) / 86400000,
+      );
+    } catch {
+      return null;
+    }
+  }
+  get deadlineColor() {
+    const d = this.daysUntilDeadline;
+    if (d === null) return 'var(--muted-foreground)';
+    if (d < 0) return '#ff4444';
+    if (d <= 3) return '#ff8800';
+    if (d <= 7) return '#ffcc00';
+    return '#44ff44';
+  }
+  get ticketsByStatus() {
+    try {
+      const tickets = this.args.model?.tickets ?? [];
+      const groups: Record<string, number> = {
+        backlog: 0,
+        in_progress: 0,
+        blocked: 0,
+        review: 0,
+        done: 0,
+      };
+      for (const t of tickets) {
+        const s = t.status ?? 'backlog';
+        if (s in groups) groups[s]++;
+      }
+      return groups;
+    } catch {
+      return { backlog: 0, in_progress: 0, blocked: 0, review: 0, done: 0 };
+    }
+  }
+  get totalTickets() {
+    return this.args.model?.tickets?.length ?? 0;
+  }
+  get completionPercent() {
+    const total = this.totalTickets;
+    return total === 0
+      ? 0
+      : Math.round((this.ticketsByStatus.done / total) * 100);
+  }
+  get progressBarWidth() {
+    return `${this.completionPercent}%`;
+  }
+
+  <template>
+    <div class='project-isolated'>
+      <header class='project-header'>
+        <div class='project-header-top'>
+          <div class='project-identity'>
+            <span class='project-code-large'>{{if
+                @model.projectCode
+                @model.projectCode
+                'PRJ'
+              }}</span>
+            <div class='status-pill'>
+              {{this.statusEmoji}}
+              {{#if @model.projectStatus}}<@fields.projectStatus />{{else}}<span
+                >Unknown</span>{{/if}}
+            </div>
+          </div>
+          <div class='deadline-section'>
+            {{#if @model.deadline}}
+              <div class='deadline-label'>DEADLINE</div>
+              <div
+                class='deadline-value'
+                style={{concat 'color:' this.deadlineColor}}
+              >
+                {{formatDateTime @model.deadline 'MMM D, YYYY'}}
+                {{#if this.daysUntilDeadline}}
+                  <span class='days-remaining'>
+                    {{#if
+                      (gt this.daysUntilDeadline 0)
+                    }}({{this.daysUntilDeadline}}d remaining){{else}}(OVERDUE by
+                      {{this.daysUntilDeadline}}
+                      days){{/if}}
+                  </span>
+                {{/if}}
+              </div>
+            {{else}}
+              <div class='deadline-label'>No deadline set</div>
+            {{/if}}
+          </div>
+        </div>
+        <h1 class='project-name'>{{if
+            @model.projectName
+            @model.projectName
+            'Unnamed Project'
+          }}</h1>
+        {{#if @model.objective}}<p
+            class='project-objective'
+          >{{@model.objective}}</p>{{/if}}
+        <div class='progress-section'>
+          <div class='progress-bar-track'>
+            <div
+              class='progress-bar-fill'
+              style={{concat 'width:' this.progressBarWidth}}
+            ></div>
+          </div>
+          <span class='progress-label'>{{this.completionPercent}}% complete ({{this.ticketsByStatus.done}}/{{this.totalTickets}}
+            tickets done)</span>
+        </div>
+      </header>
+
+      <nav class='project-tabs'>
+        <button
+          class={{if (eq this.activeTab 'dashboard') 'tab active' 'tab'}}
+          {{on 'click' (fn this.setTab 'dashboard')}}
+        >📊 Dashboard</button>
+        <button
+          class={{if (eq this.activeTab 'tickets') 'tab active' 'tab'}}
+          {{on 'click' (fn this.setTab 'tickets')}}
+        >🎫 Tickets ({{this.totalTickets}})</button>
+        <button
+          class={{if (eq this.activeTab 'knowledge') 'tab active' 'tab'}}
+          {{on 'click' (fn this.setTab 'knowledge')}}
+        >📚 Knowledge ({{@model.knowledgeBase.length}})</button>
+        <button
+          class={{if (eq this.activeTab 'scope') 'tab active' 'tab'}}
+          {{on 'click' (fn this.setTab 'scope')}}
+        >🗂️ Scope</button>
+        <button
+          class={{if (eq this.activeTab 'team') 'tab active' 'tab'}}
+          {{on 'click' (fn this.setTab 'team')}}
+        >🤖 Team ({{@model.teamAgents.length}})</button>
+      </nav>
+
+      {{#if (eq this.activeTab 'dashboard')}}
+        <section class='tab-content'>
+          <div class='status-grid'>
+            <div class='status-card backlog'><div
+                class='status-count'
+              >{{this.ticketsByStatus.backlog}}</div><div class='status-name'>📋
+                Backlog</div></div>
+            <div class='status-card in-progress'><div
+                class='status-count'
+              >{{this.ticketsByStatus.in_progress}}</div><div
+                class='status-name'
+              >⚙️ In Progress</div></div>
+            <div class='status-card blocked'><div
+                class='status-count'
+              >{{this.ticketsByStatus.blocked}}</div><div class='status-name'>🔴
+                Blocked</div></div>
+            <div class='status-card review'><div
+                class='status-count'
+              >{{this.ticketsByStatus.review}}</div><div class='status-name'>👁️
+                Review</div></div>
+            <div class='status-card done'><div
+                class='status-count'
+              >{{this.ticketsByStatus.done}}</div><div class='status-name'>✅
+                Done</div></div>
+          </div>
+          <div class='info-panels'>
+            {{#if @model.teamAgents.length}}
+              <div class='info-panel'><h3 class='panel-title'>Active Agents</h3><div
+                  class='agents-list'
+                ><@fields.teamAgents @format='embedded' /></div></div>
+            {{/if}}
+            {{#if @model.risks}}
+              <div class='info-panel risk-panel'><h3 class='panel-title'>⚠️
+                  Risks</h3><div class='panel-content'><@fields.risks
+                  /></div></div>
+            {{/if}}
+            {{#if @model.successCriteria}}
+              <div class='info-panel success-panel'><h3 class='panel-title'>🎯
+                  Success Criteria</h3><div
+                  class='panel-content'
+                ><@fields.successCriteria /></div></div>
+            {{/if}}
+          </div>
+        </section>
+      {{/if}}
+
+      {{#if (eq this.activeTab 'tickets')}}
+        <section class='tab-content'>
+          {{#if @model.tickets.length}}
+            <div class='tickets-grid'><@fields.tickets @format='fitted' /></div>
+          {{else}}
+            <div class='empty-state'><div class='empty-icon'>🎫</div><p>No
+                tickets yet. Create tickets to track work items.</p></div>
+          {{/if}}
+        </section>
+      {{/if}}
+
+      {{#if (eq this.activeTab 'knowledge')}}
+        <section class='tab-content'>
+          {{#if @model.knowledgeBase.length}}
+            <div class='knowledge-list'><@fields.knowledgeBase
+                @format='embedded'
+              /></div>
+          {{else}}
+            <div class='empty-state'><div class='empty-icon'>📚</div><p>No
+                knowledge articles yet.</p></div>
+          {{/if}}
+        </section>
+      {{/if}}
+
+      {{#if (eq this.activeTab 'scope')}}
+        <section class='tab-content'>
+          <div class='scope-section'>
+            <h3 class='section-title'>Project Scope</h3>
+            {{#if @model.scope}}<div class='markdown-content'><@fields.scope
+                /></div>{{else}}<p class='placeholder'>Define the project scope
+                here.</p>{{/if}}
+          </div>
+          {{#if @model.technicalContext}}
+            <div class='scope-section'><h3 class='section-title'>Technical
+                Context</h3><div
+                class='markdown-content'
+              ><@fields.technicalContext /></div></div>
+          {{/if}}
+        </section>
+      {{/if}}
+
+      {{#if (eq this.activeTab 'team')}}
+        <section class='tab-content'>
+          {{#if @model.teamAgents.length}}
+            <div class='team-grid'><@fields.teamAgents @format='fitted' /></div>
+          {{else}}
+            <div class='empty-state'><div class='empty-icon'>🤖</div><p>No
+                agents assigned yet.</p></div>
+          {{/if}}
+        </section>
+      {{/if}}
+    </div>
+
+    <style scoped>
+      .project-isolated {
+        display: flex;
+        flex-direction: column;
+        min-height: 100%;
+        background: var(--background);
+        color: var(--foreground);
+        font-family: var(--font-mono);
+        overflow-y: auto;
+      }
+      .project-header {
+        padding: var(--boxel-sp-xl);
+        background: var(--card);
+        border-bottom: 2px solid var(--primary);
+      }
+      .project-header-top {
+        display: flex;
+        align-items: flex-start;
+        justify-content: space-between;
+        margin-bottom: var(--boxel-sp-sm);
+        flex-wrap: wrap;
+        gap: var(--boxel-sp-sm);
+      }
+      .project-identity {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-sm);
+      }
+      .project-code-large {
+        padding: 3px 10px;
+        background: var(--primary);
+        color: var(--primary-foreground);
+        border-radius: var(--boxel-border-radius-xs);
+        font-size: var(--boxel-font-size-sm);
+        font-weight: 700;
+        letter-spacing: 0.1em;
+      }
+      .status-pill {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+        padding: 3px 10px;
+        background: var(--muted);
+        border: 1px solid var(--border);
+        border-radius: var(--boxel-border-radius-sm);
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+      }
+      .deadline-section {
+        text-align: right;
+      }
+      .deadline-label {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+        text-transform: uppercase;
+        letter-spacing: 0.08em;
+      }
+      .deadline-value {
+        font-size: var(--boxel-font-size-sm);
+        font-weight: 600;
+        margin-top: 2px;
+      }
+      .days-remaining {
+        font-size: var(--boxel-font-size-xs);
+        opacity: 0.8;
+      }
+      .project-name {
+        font-size: clamp(1.25rem, 3vw, 1.75rem);
+        font-weight: 700;
+        font-family: var(--font-sans);
+        color: var(--foreground);
+        margin: var(--boxel-sp-sm) 0;
+      }
+      .project-objective {
+        font-size: var(--boxel-font-size-sm);
+        color: var(--muted-foreground);
+        font-family: var(--font-sans);
+        line-height: 1.5;
+        margin-bottom: var(--boxel-sp-sm);
+      }
+      .progress-section {
+        margin-top: var(--boxel-sp-sm);
+      }
+      .progress-bar-track {
+        width: 100%;
+        height: 6px;
+        background: var(--muted);
+        border-radius: 3px;
+        overflow: hidden;
+        margin-bottom: 4px;
+      }
+      .progress-bar-fill {
+        height: 100%;
+        background: linear-gradient(90deg, var(--primary), var(--accent));
+        border-radius: 3px;
+        transition: width 0.3s ease;
+      }
+      .progress-label {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+      }
+      .project-tabs {
+        display: flex;
+        padding: 0 var(--boxel-sp-xl);
+        background: var(--card);
+        border-bottom: 1px solid var(--border);
+        gap: 2px;
+        overflow-x: auto;
+      }
+      .tab {
+        flex-shrink: 0;
+        padding: var(--boxel-sp-sm);
+        background: none;
+        border: none;
+        border-bottom: 2px solid transparent;
+        color: var(--muted-foreground);
+        cursor: pointer;
+        font-family: var(--font-mono);
+        font-size: var(--boxel-font-size-xs);
+        transition: color 0.15s;
+        margin-bottom: -1px;
+        white-space: nowrap;
+      }
+      .tab:hover {
+        color: var(--foreground);
+      }
+      .tab.active {
+        color: var(--primary);
+        border-bottom-color: var(--primary);
+      }
+      .tab-content {
+        padding: var(--boxel-sp-xl);
+      }
+      .status-grid {
+        display: grid;
+        grid-template-columns: repeat(5, 1fr);
+        gap: var(--boxel-sp-sm);
+        margin-bottom: var(--boxel-sp-xl);
+      }
+      @media (max-width: 700px) {
+        .status-grid {
+          grid-template-columns: repeat(3, 1fr);
+        }
+      }
+      .status-card {
+        padding: var(--boxel-sp-sm);
+        border-radius: var(--boxel-border-radius-sm);
+        border: 1px solid var(--border);
+        text-align: center;
+        border-top: 3px solid var(--border);
+      }
+      .status-card.backlog {
+        background: var(--muted);
+        border-top-color: #6b7280;
+      }
+      .status-card.in-progress {
+        background: var(--muted);
+        border-top-color: #3b82f6;
+      }
+      .status-card.blocked {
+        background: var(--muted);
+        border-top-color: #ef4444;
+      }
+      .status-card.review {
+        background: var(--muted);
+        border-top-color: #f59e0b;
+      }
+      .status-card.done {
+        background: var(--muted);
+        border-top-color: #22c55e;
+      }
+      .status-count {
+        font-size: 1.75rem;
+        font-weight: 700;
+        color: var(--foreground);
+        font-family: var(--font-sans);
+      }
+      .status-name {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+        margin-top: 2px;
+      }
+      .info-panels {
+        display: grid;
+        grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
+        gap: var(--boxel-sp-lg);
+      }
+      .info-panel {
+        padding: var(--boxel-sp-sm);
+        border: 1px solid var(--border);
+        border-radius: var(--boxel-border-radius-sm);
+        background: var(--card);
+      }
+      .risk-panel {
+        border-top: 3px solid #ef4444;
+      }
+      .success-panel {
+        border-top: 3px solid #22c55e;
+      }
+      .panel-title {
+        font-size: var(--boxel-font-size-xs);
+        text-transform: uppercase;
+        letter-spacing: var(--boxel-lsp-xl);
+        color: var(--muted-foreground);
+        margin-bottom: var(--boxel-sp-sm);
+      }
+      .panel-content {
+        font-size: var(--boxel-font-size-sm);
+        line-height: 1.6;
+        font-family: var(--font-sans);
+      }
+      .agents-list {
+        display: flex;
+        flex-direction: column;
+      }
+      .agents-list > .containsMany-field {
+        display: flex;
+        flex-direction: column;
+        gap: var(--boxel-sp-xs);
+      }
+      .tickets-grid {
+        display: grid;
+        grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
+        gap: var(--boxel-sp-sm);
+      }
+      .tickets-grid > .containsMany-field {
+        display: contents;
+      }
+      .knowledge-list {
+        display: flex;
+        flex-direction: column;
+      }
+      .knowledge-list > .containsMany-field {
+        display: flex;
+        flex-direction: column;
+        gap: var(--boxel-sp-xs);
+      }
+      .team-grid {
+        display: grid;
+        grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+        gap: var(--boxel-sp-sm);
+        min-height: 120px;
+      }
+      .team-grid > .containsMany-field {
+        display: contents;
+      }
+      .scope-section {
+        margin-bottom: var(--boxel-sp-xl);
+      }
+      .section-title {
+        font-size: var(--boxel-font-size-xs);
+        text-transform: uppercase;
+        letter-spacing: var(--boxel-lsp-xl);
+        color: var(--muted-foreground);
+        margin-bottom: var(--boxel-sp-sm);
+      }
+      .markdown-content {
+        font-family: var(--font-sans);
+        font-size: var(--boxel-font-size-sm);
+        line-height: 1.7;
+      }
+      .empty-state {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        padding: var(--boxel-sp-3xl);
+        color: var(--muted-foreground);
+        text-align: center;
+        gap: var(--boxel-sp-sm);
+      }
+      .empty-icon {
+        font-size: 3rem;
+      }
+      .placeholder {
+        color: var(--muted-foreground);
+        font-style: italic;
+        font-size: var(--boxel-font-size-sm);
+      }
+    </style>
+  </template>
+};
+}
+// ⁶ DarkFactory UI
+DarkFactory.fitted = class Fitted extends Component<typeof DarkFactory> {
+  <template>
+    <div class='factory-fitted'>
+      <div class='factory-icon'>🏭</div>
+      <div class='factory-info'>
+        <div class='factory-name'>{{if
+            @model.factoryName
+            @model.factoryName
+            'Dark Factory'
+          }}</div>
+        <div class='factory-stat'>{{@model.activeProjects.length}}
+          projects</div>
+      </div>
+    </div>
+    <style scoped>
+      .factory-fitted {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-xs);
+        padding: var(--boxel-sp-xs);
+        height: 100%;
+        background: var(--card);
+        color: var(--card-foreground);
+        font-family: var(--font-mono);
+      }
+      .factory-icon {
+        font-size: 1.5rem;
+      }
+      .factory-name {
+        font-size: var(--boxel-font-size-sm);
+        font-weight: 700;
+      }
+      .factory-stat {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+      }
+    </style>
+  </template>
+};
+
+DarkFactory.embedded = class Embedded extends Component<typeof DarkFactory> {
+  <template>
+    <div class='factory-embedded'>
+      <span class='factory-icon'>🏭</span>
+      <span class='factory-name'>{{if
+          @model.factoryName
+          @model.factoryName
+          'Dark Factory'
+        }}</span>
+      <span class='factory-stat'>{{@model.activeProjects.length}}
+        projects</span>
+    </div>
+    <style scoped>
+      .factory-embedded {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-xs);
+        padding: var(--boxel-sp-xs) var(--boxel-sp-sm);
+        background: var(--card);
+        color: var(--card-foreground);
+        border-radius: var(--boxel-border-radius-sm);
+        border: 1px solid var(--border);
+        font-family: var(--font-mono);
+      }
+      .factory-icon {
+        font-size: 1rem;
+      }
+      .factory-name {
+        font-size: var(--boxel-font-size-sm);
+        font-weight: 600;
+        flex: 1;
+      }
+      .factory-stat {
+        font-size: var(--boxel-font-size-xs);
+        color: var(--muted-foreground);
+      }
+    </style>
+  </template>
+};
+
+DarkFactory.isolated = class Isolated extends Component<typeof DarkFactory> {
+  <template>
+    <div class='factory-isolated'>
+      <header class='factory-header'>
+        <div class='factory-title-row'>
+          <span class='factory-glyph'>🏭</span>
+          <h1>{{if @model.factoryName @model.factoryName 'Dark Factory'}}</h1>
+        </div>
+        <p class='factory-subtitle'>Agent-Operated Software Factory</p>
+      </header>
+      {{#if @model.description}}<div
+          class='factory-desc section'
+        ><@fields.description /></div>{{/if}}
+      {{#if @model.activeProjects.length}}
+        <div class='section'>
+          <h3 class='section-title'>Active Projects</h3>
+          <div class='projects-list'><@fields.activeProjects
+              @format='embedded'
+            /></div>
+        </div>
+      {{else}}
+        <div class='empty-state'><p>No active projects. Create a Project card to
+            get started.</p></div>
+      {{/if}}
+    </div>
+    <style scoped>
+      .factory-isolated {
+        padding: var(--boxel-sp-xl);
+        min-height: 100%;
+        background: var(--background);
+        color: var(--foreground);
+        font-family: var(--font-mono);
+        overflow-y: auto;
+      }
+      .factory-header {
+        margin-bottom: var(--boxel-sp-xl);
+        padding-bottom: var(--boxel-sp-lg);
+        border-bottom: 2px solid var(--primary);
+      }
+      .factory-title-row {
+        display: flex;
+        align-items: center;
+        gap: var(--boxel-sp-sm);
+      }
+      .factory-glyph {
+        font-size: 2.5rem;
+      }
+      h1 {
+        font-size: var(--boxel-font-size-xl);
+        font-weight: 700;
+        margin: 0;
+        font-family: var(--font-sans);
+      }
+      .factory-subtitle {
+        font-size: var(--boxel-font-size-sm);
+        color: var(--muted-foreground);
+        margin-top: var(--boxel-sp-xs);
+      }
+      .section {
+        margin-bottom: var(--boxel-sp-xl);
+      }
+      .section-title {
+        font-size: var(--boxel-font-size-xs);
+        text-transform: uppercase;
+        letter-spacing: var(--boxel-lsp-xl);
+        color: var(--muted-foreground);
+        margin-bottom: var(--boxel-sp-sm);
+      }
+      .projects-list {
+        display: flex;
+        flex-direction: column;
+      }
+      .projects-list > .containsMany-field {
+        display: flex;
+        flex-direction: column;
+        gap: var(--boxel-sp-xs);
+      }
+      .empty-state {
+        color: var(--muted-foreground);
+        font-style: italic;
+        font-size: var(--boxel-font-size-sm);
+      }
+      .factory-desc {
+        font-family: var(--font-sans);
+        font-size: var(--boxel-font-size-sm);
+        line-height: 1.6;
+      }
+    </style>
+  </template>
+};
+
+export { AgentProfile, KnowledgeArticle, Ticket, DarkFactory };
+// touched for re-index
diff --git a/packages/software-factory/experiment_1/realms/guidance-tasks/index.json b/packages/software-factory/experiment_1/realms/guidance-tasks/index.json
new file mode 100644
index 00000000000..373d41fdd1a
--- /dev/null
+++ b/packages/software-factory/experiment_1/realms/guidance-tasks/index.json
@@ -0,0 +1,12 @@
+{
+  "data": {
+    "type": "card",
+    "meta": {
+      "adoptsFrom": {
+        "module": "@cardstack/base/cards-grid",
+        "name": "CardsGrid"
+      },
+      "_touched": 1773327352703
+    }
+  }
+}
diff --git a/packages/software-factory/prompts/examples/create-card.md b/packages/software-factory/prompts/examples/create-card.md
new file mode 100644
index 00000000000..346147fddd4
--- /dev/null
+++ b/packages/software-factory/prompts/examples/create-card.md
@@ -0,0 +1,35 @@
+# Example: Creating a Card Definition + Instance
+
+## Input
+
+Ticket: "Create a StickyNote card with title and body fields"
+
+## Expected Output
+
+```json
+[
+  {
+    "type": "invoke_tool",
+    "tool": "search-realm",
+    "toolArgs": { "query": "StickyNote", "realm": "target" }
+  },
+  {
+    "type": "create_file",
+    "path": "sticky-note.gts",
+    "realm": "target",
+    "content": "import { contains, field, CardDef, Component } from '@cardstack/base/card-api';\nimport StringField from '@cardstack/base/string';\nimport MarkdownField from '@cardstack/base/markdown';\n\nexport class StickyNote extends CardDef {\n  static displayName = 'Sticky Note';\n  @field title = contains(StringField);\n  @field body = contains(MarkdownField);\n\n  static fitted = class Fitted extends Component<typeof StickyNote> {\n    <template>\n      <div class='sticky-note'>\n        <h3>{{@model.title}}</h3>\n        <p>{{@model.body}}</p>\n      </div>\n      <style scoped>\n        .sticky-note { padding: 1rem; background: #fef3c7; border-radius: 8px; }\n        h3 { margin: 0 0 0.5rem; }\n      </style>\n    </template>\n  };\n}\n"
+  },
+  {
+    "type": "create_file",
+    "path": "StickyNote/welcome-note.json",
+    "realm": "target",
+    "content": "{\n  \"data\": {\n    \"type\": \"card\",\n    \"attributes\": {\n      \"title\": \"Welcome\",\n      \"body\": \"This is a sample sticky note.\"\n    },\n    \"meta\": {\n      \"adoptsFrom\": {\n        \"module\": \"../sticky-note\",\n        \"name\": \"StickyNote\"\n      }\n    }\n  }\n}\n"
+  },
+  {
+    "type": "create_test",
+    "path": "Tests/sticky-note.spec.ts",
+    "realm": "target",
+    "content": "import { test, expect } from '@playwright/test';\n\ntest('StickyNote renders title and body', async ({ page }) => {\n  // test implementation\n});\n"
+  }
+]
+```
diff --git a/packages/software-factory/prompts/examples/iterate-fix.md b/packages/software-factory/prompts/examples/iterate-fix.md
new file mode 100644
index 00000000000..aea7d2070af
--- /dev/null
+++ b/packages/software-factory/prompts/examples/iterate-fix.md
@@ -0,0 +1,37 @@
+# Example: Fixing Code After Test Failure
+
+## Input
+
+Previous actions created `sticky-note.gts` and a test spec. The test failed:
+
+```
+Failure: renders fitted view with title and body
+Error: Timed out 5000ms waiting for expect(locator).toHaveText("Welcome")
+Locator: page.locator('.sticky-note h3')
+```
+
+## Expected Output
+
+The agent identifies that the selector is wrong (the component uses a different class name) and fixes the implementation:
+
+```json
+[
+  {
+    "type": "invoke_tool",
+    "tool": "search-realm",
+    "toolArgs": { "query": "StickyNote", "realm": "target" }
+  },
+  {
+    "type": "update_file",
+    "path": "sticky-note.gts",
+    "realm": "target",
+    "content": "import { contains, field, CardDef, Component } from '@cardstack/base/card-api';\nimport StringField from '@cardstack/base/string';\nimport MarkdownField from '@cardstack/base/markdown';\n\nexport class StickyNote extends CardDef {\n  static displayName = 'Sticky Note';\n  @field title = contains(StringField);\n  @field body = contains(MarkdownField);\n\n  static fitted = class Fitted extends Component<typeof StickyNote> {\n    <template>\n      <div class='sticky-note'>\n        <h3 data-test-title>{{@model.title}}</h3>\n        <p data-test-body>{{@model.body}}</p>\n      </div>\n      <style scoped>\n        .sticky-note { padding: 1rem; background: #fef3c7; border-radius: 8px; }\n        h3 { margin: 0 0 0.5rem; }\n      </style>\n    </template>\n  };\n}\n"
+  },
+  {
+    "type": "update_test",
+    "path": "Tests/sticky-note.spec.ts",
+    "realm": "target",
+    "content": "import { test, expect } from '@playwright/test';\n\ntest.describe('StickyNote', () => {\n  test('renders fitted view with title and body', async ({ page }) => {\n    await page.goto('/StickyNote/welcome-note');\n    await expect(page.locator('[data-test-title]')).toHaveText('Welcome');\n    await expect(page.locator('[data-test-body]')).toContainText('sample sticky note');\n  });\n});\n"
+  }
+]
+```
diff --git a/packages/software-factory/prompts/system.md b/packages/software-factory/prompts/system.md
index bef657082a8..4f37d16bd36 100644
--- a/packages/software-factory/prompts/system.md
+++ b/packages/software-factory/prompts/system.md
@@ -11,7 +11,7 @@ inspect existing state before making changes — do not guess.
 
 - Every ticket must include at least one QUnit test file (.test.gts co-located with the card definition).
 - For each top-level card defined in the brief, create a Catalog Spec card
-  in the target realm's Spec/ folder (adoptsFrom https://cardstack.com/base/spec#Spec)
+  in the target realm's Spec/ folder (adoptsFrom @cardstack/base/spec#Spec)
   and at least one sample card instance linked via linkedExamples.
 - Use search_realm and read_file to inspect existing cards before creating files.
 - If you cannot proceed, call request_clarification with a description of what
diff --git a/packages/software-factory/prompts/ticket-implement.md b/packages/software-factory/prompts/ticket-implement.md
index beb7741cb93..11a7f2dc720 100644
--- a/packages/software-factory/prompts/ticket-implement.md
+++ b/packages/software-factory/prompts/ticket-implement.md
@@ -58,7 +58,7 @@ Implement this ticket:
 
 1. Use search_realm and read_file to inspect existing realm state
 2. Use write_file to create or update card definitions (.gts) and/or card instances (.json) in the target realm
-3. Create a Catalog Spec card in the Spec/ folder for the top-level card (adoptsFrom https://cardstack.com/base/spec#Spec)
+3. Create a Catalog Spec card in the Spec/ folder for the top-level card (adoptsFrom @cardstack/base/spec#Spec)
 4. Create at least one sample card instance and link it from the Catalog Spec via linkedExamples
 5. Use write_file to create QUnit test files (.test.gts) co-located with card definitions
 6. Call signal_done when all implementation and test files have been written
diff --git a/packages/software-factory/realm/Document/547f709b-a4d4-4d7d-b988-9141f1b6b604.json b/packages/software-factory/realm/Document/547f709b-a4d4-4d7d-b988-9141f1b6b604.json
index 54d9178aaa6..0666a517ca6 100644
--- a/packages/software-factory/realm/Document/547f709b-a4d4-4d7d-b988-9141f1b6b604.json
+++ b/packages/software-factory/realm/Document/547f709b-a4d4-4d7d-b988-9141f1b6b604.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/ai-automation-catalog.json b/packages/software-factory/realm/Document/ai-automation-catalog.json
index cbade2697c3..b4c6837b3f8 100644
--- a/packages/software-factory/realm/Document/ai-automation-catalog.json
+++ b/packages/software-factory/realm/Document/ai-automation-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/analytics-data-catalog.json b/packages/software-factory/realm/Document/analytics-data-catalog.json
index 58fa3be4f9b..1760518da58 100644
--- a/packages/software-factory/realm/Document/analytics-data-catalog.json
+++ b/packages/software-factory/realm/Document/analytics-data-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/career-hr-catalog.json b/packages/software-factory/realm/Document/career-hr-catalog.json
index 016e83eebc0..cf65b882d4d 100644
--- a/packages/software-factory/realm/Document/career-hr-catalog.json
+++ b/packages/software-factory/realm/Document/career-hr-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/commerce-business-catalog.json b/packages/software-factory/realm/Document/commerce-business-catalog.json
index ecdc4cab362..ff911b14556 100644
--- a/packages/software-factory/realm/Document/commerce-business-catalog.json
+++ b/packages/software-factory/realm/Document/commerce-business-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/communication-catalog.json b/packages/software-factory/realm/Document/communication-catalog.json
index 3493022471f..47a0105fcf9 100644
--- a/packages/software-factory/realm/Document/communication-catalog.json
+++ b/packages/software-factory/realm/Document/communication-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/design-creativity-catalog.json b/packages/software-factory/realm/Document/design-creativity-catalog.json
index c96050c9a79..7a62937d7ae 100644
--- a/packages/software-factory/realm/Document/design-creativity-catalog.json
+++ b/packages/software-factory/realm/Document/design-creativity-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/developer-devops-catalog.json b/packages/software-factory/realm/Document/developer-devops-catalog.json
index 78dc872948f..764e02f762b 100644
--- a/packages/software-factory/realm/Document/developer-devops-catalog.json
+++ b/packages/software-factory/realm/Document/developer-devops-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/documents-content-catalog.json b/packages/software-factory/realm/Document/documents-content-catalog.json
index e258b1b8d3b..46cce07aca3 100644
--- a/packages/software-factory/realm/Document/documents-content-catalog.json
+++ b/packages/software-factory/realm/Document/documents-content-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/finance-banking-catalog.json b/packages/software-factory/realm/Document/finance-banking-catalog.json
index c49575e3880..68e7f9484c3 100644
--- a/packages/software-factory/realm/Document/finance-banking-catalog.json
+++ b/packages/software-factory/realm/Document/finance-banking-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/health-wellness-catalog.json b/packages/software-factory/realm/Document/health-wellness-catalog.json
index 5cfb393ab85..410d15dd471 100644
--- a/packages/software-factory/realm/Document/health-wellness-catalog.json
+++ b/packages/software-factory/realm/Document/health-wellness-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/home-personal-catalog.json b/packages/software-factory/realm/Document/home-personal-catalog.json
index 4e750c376d7..59e7cab24fd 100644
--- a/packages/software-factory/realm/Document/home-personal-catalog.json
+++ b/packages/software-factory/realm/Document/home-personal-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/identity-security-catalog.json b/packages/software-factory/realm/Document/identity-security-catalog.json
index 01264863fa2..a02383dc5ad 100644
--- a/packages/software-factory/realm/Document/identity-security-catalog.json
+++ b/packages/software-factory/realm/Document/identity-security-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/learning-education-catalog.json b/packages/software-factory/realm/Document/learning-education-catalog.json
index 05c59af111c..61f52f75705 100644
--- a/packages/software-factory/realm/Document/learning-education-catalog.json
+++ b/packages/software-factory/realm/Document/learning-education-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/legal-compliance-catalog.json b/packages/software-factory/realm/Document/legal-compliance-catalog.json
index 1b9423cd0e3..1341cf0b729 100644
--- a/packages/software-factory/realm/Document/legal-compliance-catalog.json
+++ b/packages/software-factory/realm/Document/legal-compliance-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/media-production-catalog.json b/packages/software-factory/realm/Document/media-production-catalog.json
index 39de9dbf9fd..e9f487c6198 100644
--- a/packages/software-factory/realm/Document/media-production-catalog.json
+++ b/packages/software-factory/realm/Document/media-production-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/operations-catalog.json b/packages/software-factory/realm/Document/operations-catalog.json
index 72e37a428cb..99f8d70aa78 100644
--- a/packages/software-factory/realm/Document/operations-catalog.json
+++ b/packages/software-factory/realm/Document/operations-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/other-catalog.json b/packages/software-factory/realm/Document/other-catalog.json
index 819344e75e4..cdcf4ca7653 100644
--- a/packages/software-factory/realm/Document/other-catalog.json
+++ b/packages/software-factory/realm/Document/other-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/people-contacts-catalog.json b/packages/software-factory/realm/Document/people-contacts-catalog.json
index afa3e1719b6..52d209d65d2 100644
--- a/packages/software-factory/realm/Document/people-contacts-catalog.json
+++ b/packages/software-factory/realm/Document/people-contacts-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/projects-productivity-catalog.json b/packages/software-factory/realm/Document/projects-productivity-catalog.json
index bc9575f4809..c480f640835 100644
--- a/packages/software-factory/realm/Document/projects-productivity-catalog.json
+++ b/packages/software-factory/realm/Document/projects-productivity-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/reports-catalog.json b/packages/software-factory/realm/Document/reports-catalog.json
index 01cd59f0206..ac1fe3240e1 100644
--- a/packages/software-factory/realm/Document/reports-catalog.json
+++ b/packages/software-factory/realm/Document/reports-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/standards-guidelines-catalog.json b/packages/software-factory/realm/Document/standards-guidelines-catalog.json
index de40de51ced..c5fb9b2c3fc 100644
--- a/packages/software-factory/realm/Document/standards-guidelines-catalog.json
+++ b/packages/software-factory/realm/Document/standards-guidelines-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/Document/travel-logistics-catalog.json b/packages/software-factory/realm/Document/travel-logistics-catalog.json
index e9146224c87..ba54ecb3685 100644
--- a/packages/software-factory/realm/Document/travel-logistics-catalog.json
+++ b/packages/software-factory/realm/Document/travel-logistics-catalog.json
@@ -20,7 +20,7 @@
     "relationships": {
       "cardInfo.theme": {
         "links": {
-          "self": "https://cardstack.com/base/Theme/boxel-brand-guide"
+          "self": "@cardstack/base/Theme/boxel-brand-guide"
         }
       }
     }
diff --git a/packages/software-factory/realm/darkfactory.gts b/packages/software-factory/realm/darkfactory.gts
index 25b69f62607..0983cf48933 100644
--- a/packages/software-factory/realm/darkfactory.gts
+++ b/packages/software-factory/realm/darkfactory.gts
@@ -6,14 +6,14 @@ import {
   containsMany,
   linksTo,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import DateField from 'https://cardstack.com/base/date';
-import MarkdownField from 'https://cardstack.com/base/markdown';
-import TextAreaField from 'https://cardstack.com/base/text-area';
-import enumField from 'https://cardstack.com/base/enum';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateTimeField from '@cardstack/base/datetime';
+import DateField from '@cardstack/base/date';
+import MarkdownField from '@cardstack/base/markdown';
+import TextAreaField from '@cardstack/base/text-area';
+import enumField from '@cardstack/base/enum';
 
 export const TicketStatusField = enumField(StringField, {
   options: [
diff --git a/packages/software-factory/realm/document.gts b/packages/software-factory/realm/document.gts
index 2183a510ae5..d88be836929 100644
--- a/packages/software-factory/realm/document.gts
+++ b/packages/software-factory/realm/document.gts
@@ -1,13 +1,8 @@
 // ═══ [EDIT TRACKING: ON] Mark all changes with ⁿ ═══
 import { modifier } from 'ember-modifier'; // ¹ Modifier for DOM manipulation
-import {
-  Component,
-  CardDef,
-  field,
-  contains,
-} from 'https://cardstack.com/base/card-api'; // ² Core imports
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown'; // ³ Markdown for content
+import { Component, CardDef, field, contains } from '@cardstack/base/card-api'; // ² Core imports
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown'; // ³ Markdown for content
 import { gt } from '@cardstack/boxel-ui/helpers';
 import { on } from '@ember/modifier';
 import BookOpenIcon from '@cardstack/boxel-icons/book-open'; // ⁴ Document icon
diff --git a/packages/software-factory/realm/index.json b/packages/software-factory/realm/index.json
index b1ab639953c..ca17f6167ba 100644
--- a/packages/software-factory/realm/index.json
+++ b/packages/software-factory/realm/index.json
@@ -3,7 +3,7 @@
     "type": "card",
     "meta": {
       "adoptsFrom": {
-        "module": "https://cardstack.com/base/cards-grid",
+        "module": "@cardstack/base/cards-grid",
         "name": "CardsGrid"
       }
     }
diff --git a/packages/software-factory/realm/test-results.gts b/packages/software-factory/realm/test-results.gts
index b93f4cd0f8e..551434fd62b 100644
--- a/packages/software-factory/realm/test-results.gts
+++ b/packages/software-factory/realm/test-results.gts
@@ -6,12 +6,12 @@ import {
   contains,
   containsMany,
   linksTo,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import NumberField from 'https://cardstack.com/base/number';
-import DateTimeField from 'https://cardstack.com/base/datetime';
-import CodeRefField from 'https://cardstack.com/base/code-ref';
-import enumField from 'https://cardstack.com/base/enum';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import NumberField from '@cardstack/base/number';
+import DateTimeField from '@cardstack/base/datetime';
+import CodeRefField from '@cardstack/base/code-ref';
+import enumField from '@cardstack/base/enum';
 import { Project, Ticket } from './darkfactory';
 
 export const TestRunStatusField = enumField(StringField, {
diff --git a/packages/software-factory/realm/wiki.gts b/packages/software-factory/realm/wiki.gts
index 42ae1b5ab56..4842e3806c6 100644
--- a/packages/software-factory/realm/wiki.gts
+++ b/packages/software-factory/realm/wiki.gts
@@ -6,9 +6,9 @@ import {
   contains,
   containsMany,
   linksToMany,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
-import MarkdownField from 'https://cardstack.com/base/markdown';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
+import MarkdownField from '@cardstack/base/markdown';
 import { gt } from '@cardstack/boxel-ui/helpers';
 import { on } from '@ember/modifier';
 import { fn } from '@ember/helper';
diff --git a/packages/software-factory/scripts/lib/factory-implement.ts b/packages/software-factory/scripts/lib/factory-implement.ts
index 39f43847508..cff8d297587 100644
--- a/packages/software-factory/scripts/lib/factory-implement.ts
+++ b/packages/software-factory/scripts/lib/factory-implement.ts
@@ -726,7 +726,7 @@ const DARKFACTORY_CARD_TYPES = ['Project', 'Ticket', 'KnowledgeArticle'];
 
 /** Card types from base that the factory also needs schemas for. */
 const BASE_CARD_TYPES: { module: string; name: string }[] = [
-  { module: 'https://cardstack.com/base/spec', name: 'Spec' },
+  { module: '@cardstack/base/spec', name: 'Spec' },
 ];
 
 /**
diff --git a/packages/software-factory/scripts/lib/factory-tool-builder.ts b/packages/software-factory/scripts/lib/factory-tool-builder.ts
index a990364100b..0b52868f4fe 100644
--- a/packages/software-factory/scripts/lib/factory-tool-builder.ts
+++ b/packages/software-factory/scripts/lib/factory-tool-builder.ts
@@ -394,14 +394,14 @@ function buildCreateCatalogSpecTool(config: ToolBuilderConfig): FactoryTool {
         | undefined;
       let realmUrl = config.targetRealmUrl;
       let fetchOptions = buildFetchOptions(config, realmUrl);
-      // Spec cards adopt from https://cardstack.com/base/spec, not darkfactory
+      // Spec cards adopt from @cardstack/base/spec, not darkfactory
       let doc: LooseSingleCardDocument = {
         data: {
           type: 'card',
           attributes,
           meta: {
             adoptsFrom: {
-              module: 'https://cardstack.com/base/spec',
+              module: '@cardstack/base/spec',
               name: 'Spec',
             },
           },
diff --git a/packages/software-factory/scripts/smoke-tests/factory-prompt-smoke.ts b/packages/software-factory/scripts/smoke-tests/factory-prompt-smoke.ts
index d81a41b8283..ff0120c6394 100644
--- a/packages/software-factory/scripts/smoke-tests/factory-prompt-smoke.ts
+++ b/packages/software-factory/scripts/smoke-tests/factory-prompt-smoke.ts
@@ -112,8 +112,8 @@ const SAMPLE_PREVIOUS_ACTIONS: AgentAction[] = [
     type: 'create_file',
     path: 'sticky-note.gts',
     content:
-      'import { contains, field, CardDef } from "https://cardstack.com/base/card-api";\n' +
-      'import StringField from "https://cardstack.com/base/string";\n\n' +
+      'import { contains, field, CardDef } from "@cardstack/base/card-api";\n' +
+      'import StringField from "@cardstack/base/string";\n\n' +
       'export class StickyNote extends CardDef {\n' +
       '  @field title = contains(StringField);\n' +
       '}',
diff --git a/packages/software-factory/src/cli/smoke-test-realm.ts b/packages/software-factory/src/cli/smoke-test-realm.ts
index f9680888f18..847f2a081db 100644
--- a/packages/software-factory/src/cli/smoke-test-realm.ts
+++ b/packages/software-factory/src/cli/smoke-test-realm.ts
@@ -55,8 +55,8 @@ const HELLO_CARD_GTS = `import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class HelloCard extends CardDef {
   static displayName = 'Hello Card';
@@ -85,7 +85,7 @@ const HELLO_SPEC_CARD = {
     },
     meta: {
       adoptsFrom: {
-        module: 'https://cardstack.com/base/spec',
+        module: '@cardstack/base/spec',
         name: 'Spec',
       },
     },
diff --git a/packages/software-factory/src/harness/isolated-realm-stack.ts b/packages/software-factory/src/harness/isolated-realm-stack.ts
index e794cf0f002..cddb705c6cc 100644
--- a/packages/software-factory/src/harness/isolated-realm-stack.ts
+++ b/packages/software-factory/src/harness/isolated-realm-stack.ts
@@ -409,7 +409,7 @@ export async function startIsolatedRealmStack({
     `--toUrl=${actualRealmURL.href}`,
     `--fromUrl=${publicBaseRealmURL.href}`,
     `--toUrl=${actualBaseRealmURL.href}`,
-    '--fromUrl=https://cardstack.com/base/',
+    '--fromUrl=@cardstack/base/',
     `--toUrl=${publicBaseRealmURL.href}`,
     `--fromUrl=${sourceRealmURL.href}`,
     `--toUrl=${actualSourceRealmURL.href}`,
diff --git a/packages/software-factory/test-fixtures/bootstrap-target/home.gts b/packages/software-factory/test-fixtures/bootstrap-target/home.gts
index 0a949719afa..eab39b7066c 100644
--- a/packages/software-factory/test-fixtures/bootstrap-target/home.gts
+++ b/packages/software-factory/test-fixtures/bootstrap-target/home.gts
@@ -1,4 +1,4 @@
-import { Component, CardDef } from 'https://cardstack.com/base/card-api';
+import { Component, CardDef } from '@cardstack/base/card-api';
 
 export class Home extends CardDef {
   static isolated = class Isolated extends Component<typeof this> {
diff --git a/packages/software-factory/test-fixtures/darkfactory-adopter/home.gts b/packages/software-factory/test-fixtures/darkfactory-adopter/home.gts
index 96bddf57f5f..8e05293aa7b 100644
--- a/packages/software-factory/test-fixtures/darkfactory-adopter/home.gts
+++ b/packages/software-factory/test-fixtures/darkfactory-adopter/home.gts
@@ -1,4 +1,4 @@
-import { Component, CardDef } from 'https://cardstack.com/base/card-api';
+import { Component, CardDef } from '@cardstack/base/card-api';
 
 export class Home extends CardDef {
   static isolated = class Isolated extends Component<typeof this> {
diff --git a/packages/software-factory/test-fixtures/public-software-factory-source/home.gts b/packages/software-factory/test-fixtures/public-software-factory-source/home.gts
index 7716c8d2b81..483dfa29573 100644
--- a/packages/software-factory/test-fixtures/public-software-factory-source/home.gts
+++ b/packages/software-factory/test-fixtures/public-software-factory-source/home.gts
@@ -1,4 +1,4 @@
-import { Component, CardDef } from 'https://cardstack.com/base/card-api';
+import { Component, CardDef } from '@cardstack/base/card-api';
 
 export class Home extends CardDef {
   static isolated = class Isolated extends Component<typeof this> {
diff --git a/packages/software-factory/test-fixtures/test-realm-runner/hello.gts b/packages/software-factory/test-fixtures/test-realm-runner/hello.gts
index 0763fa43dfc..258d152c2a4 100644
--- a/packages/software-factory/test-fixtures/test-realm-runner/hello.gts
+++ b/packages/software-factory/test-fixtures/test-realm-runner/hello.gts
@@ -3,8 +3,8 @@ import {
   Component,
   field,
   contains,
-} from 'https://cardstack.com/base/card-api';
-import StringField from 'https://cardstack.com/base/string';
+} from '@cardstack/base/card-api';
+import StringField from '@cardstack/base/string';
 
 export class HelloCard extends CardDef {
   static displayName = 'Hello Card';
diff --git a/packages/software-factory/test-fixtures/test-realm-runner/home.gts b/packages/software-factory/test-fixtures/test-realm-runner/home.gts
index 4a12d04b177..af51a908618 100644
--- a/packages/software-factory/test-fixtures/test-realm-runner/home.gts
+++ b/packages/software-factory/test-fixtures/test-realm-runner/home.gts
@@ -1,4 +1,4 @@
-import { Component, CardDef } from 'https://cardstack.com/base/card-api';
+import { Component, CardDef } from '@cardstack/base/card-api';
 
 export class Home extends CardDef {
   static isolated = class Isolated extends Component<typeof this> {
diff --git a/packages/software-factory/tests/factory-tool-executor.spec.ts b/packages/software-factory/tests/factory-tool-executor.spec.ts
index 46ff960880a..f0c65916f2b 100644
--- a/packages/software-factory/tests/factory-tool-executor.spec.ts
+++ b/packages/software-factory/tests/factory-tool-executor.spec.ts
@@ -67,7 +67,7 @@ test('realm-search returns results from the test realm', async ({ realm }) => {
     query: JSON.stringify({
       filter: {
         type: {
-          module: 'https://cardstack.com/base/card-api',
+          module: '@cardstack/base/card-api',
           name: 'CardDef',
         },
       },
@@ -100,7 +100,7 @@ test('realm-write creates a card and realm-read retrieves it', async ({
       },
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/card-api',
+          module: '@cardstack/base/card-api',
           name: 'CardDef',
         },
       },
@@ -145,7 +145,7 @@ test('realm-delete removes a card from the test realm', async ({ realm }) => {
       attributes: {},
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/card-api',
+          module: '@cardstack/base/card-api',
           name: 'CardDef',
         },
       },
@@ -247,7 +247,7 @@ async function buildToolsForRealm(realm: {
   let specSchema = await fetchCardTypeSchema(
     realm.realmServerURL.href,
     baseRealmUrl,
-    { module: 'https://cardstack.com/base/spec', name: 'Spec' },
+    { module: '@cardstack/base/spec', name: 'Spec' },
     { authorization },
   );
   if (specSchema) {
@@ -387,7 +387,7 @@ test('create_catalog_spec writes and reads back a Spec card', async ({
     module: string;
     name: string;
   };
-  expect(adoptsFrom.module).toBe('https://cardstack.com/base/spec');
+  expect(adoptsFrom.module).toBe('@cardstack/base/spec');
   expect(adoptsFrom.name).toBe('Spec');
 });
 
diff --git a/packages/software-factory/tsconfig.json b/packages/software-factory/tsconfig.json
index 25fdae700d4..44423203ce5 100644
--- a/packages/software-factory/tsconfig.json
+++ b/packages/software-factory/tsconfig.json
@@ -25,7 +25,7 @@
     "skipLibCheck": true,
     "strict": true,
     "paths": {
-      "https://cardstack.com/base/*": ["../base/*"]
+      "@cardstack/base/*": ["../base/*"]
     },
     "types": ["@cardstack/local-types", "node"]
   },
diff --git a/packages/vscode-boxel-tools/src/skills.ts b/packages/vscode-boxel-tools/src/skills.ts
index 6d57fb91282..93c8cb17b5d 100644
--- a/packages/vscode-boxel-tools/src/skills.ts
+++ b/packages/vscode-boxel-tools/src/skills.ts
@@ -373,14 +373,14 @@ export class SkillList extends vscode.TreeItem {
         {
           by: 'title',
           on: {
-            module: 'https://cardstack.com/base/card-api',
+            module: '@cardstack/base/card-api',
             name: 'CardDef',
           },
         },
       ],
       filter: {
         type: {
-          module: 'https://cardstack.com/base/skill',
+          module: '@cardstack/base/skill',
           name: 'Skill',
         },
       },
diff --git a/packages/vscode-boxel-tools/tsconfig.json b/packages/vscode-boxel-tools/tsconfig.json
index e6c5429fb18..f4138c97243 100644
--- a/packages/vscode-boxel-tools/tsconfig.json
+++ b/packages/vscode-boxel-tools/tsconfig.json
@@ -11,7 +11,7 @@
     "experimentalDecorators": true,
     "skipLibCheck": true,
     "paths": {
-      "https://cardstack.com/base/*": [
+      "@cardstack/base/*": [
         "../base/*"
       ],
       "@cardstack/runtime-common/*": [
diff --git a/packages/workspace-sync-cli/tests/helpers/start-test-realm.ts b/packages/workspace-sync-cli/tests/helpers/start-test-realm.ts
index 36a8ebd25e5..b9716fa85e1 100644
--- a/packages/workspace-sync-cli/tests/helpers/start-test-realm.ts
+++ b/packages/workspace-sync-cli/tests/helpers/start-test-realm.ts
@@ -93,7 +93,7 @@ export async function startTestRealmServer(
     '--migrateDB',
     '--fromUrl=http://localhost:4205/test/',
     '--toUrl=http://localhost:4205/test/',
-    '--fromUrl=https://cardstack.com/base/',
+    '--fromUrl=@cardstack/base/',
     '--toUrl=http://localhost:4201/base/',
   ];
 
@@ -137,7 +137,7 @@ export async function startTestRealmServer(
     '--username=test_realm',
     '--fromUrl=http://localhost:4205/test/',
     '--toUrl=http://localhost:4205/test/',
-    '--fromUrl=https://cardstack.com/base/',
+    '--fromUrl=@cardstack/base/',
     '--toUrl=http://localhost:4201/base/',
   ];
 
diff --git a/packages/workspace-sync-cli/tsconfig.json b/packages/workspace-sync-cli/tsconfig.json
index 8e6c9862bf8..9eee03af846 100644
--- a/packages/workspace-sync-cli/tsconfig.json
+++ b/packages/workspace-sync-cli/tsconfig.json
@@ -28,7 +28,7 @@
     "skipLibCheck": true,
     "strict": true,
     "paths": {
-      "https://cardstack.com/base/*": ["../base/*"],
+      "@cardstack/base/*": ["../base/*"],
       "*": ["types/*"]
     },
     "types": ["@cardstack/local-types"]
diff --git a/scripts/migrate-index-to-cards-grid.js b/scripts/migrate-index-to-cards-grid.js
index 35378d99914..29b51bf23bf 100755
--- a/scripts/migrate-index-to-cards-grid.js
+++ b/scripts/migrate-index-to-cards-grid.js
@@ -55,7 +55,7 @@ async function processFile(filePath) {
       type: 'card',
       meta: {
         adoptsFrom: {
-          module: 'https://cardstack.com/base/cards-grid',
+          module: '@cardstack/base/cards-grid',
           name: 'CardsGrid',
         },
       },