From 1f202c34d2acf415af146e4afda5d0b1f8dd0000 Mon Sep 17 00:00:00 2001
From: tintinthong <justinthong93@gmail.com>
Date: Mon, 3 Feb 2025 10:54:46 +0800
Subject: [PATCH 1/8] add the addCardFilter arg

---
 packages/base/card-api.gts                | 11 ++++++++++-
 packages/base/field-component.gts         | 16 ++++++++++++++--
 packages/base/links-to-editor.gts         |  2 ++
 packages/base/links-to-many-component.gts | 13 ++++++++++---
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/packages/base/card-api.gts b/packages/base/card-api.gts
index cbc36354cc..42a3ede06d 100644
--- a/packages/base/card-api.gts
+++ b/packages/base/card-api.gts
@@ -44,6 +44,7 @@ import {
   type CardResourceMeta,
   CodeRef,
   CommandContext,
+  type Filter,
 } from '@cardstack/runtime-common';
 import type { ComponentLike } from '@glint/template';
 import { initSharedState } from './shared-state';
@@ -1092,7 +1093,13 @@ class LinksTo<CardT extends CardDefConstructor> implements Field<CardT> {
     }
     return class LinksToComponent extends GlimmerComponent<{
       Element: HTMLElement;
-      Args: { Named: { format?: Format; displayContainer?: boolean } };
+      Args: {
+        Named: {
+          format?: Format;
+          displayContainer?: boolean;
+          addCardFilter?: Filter;
+        };
+      };
       Blocks: {};
     }> {
       <template>
@@ -1101,6 +1108,7 @@ class LinksTo<CardT extends CardDefConstructor> implements Field<CardT> {
             <LinksToEditor
               @model={{(getInnerModel)}}
               @field={{linksToField}}
+              @addCardFilter={{@addCardFilter}}
               ...attributes
             />
           {{else}}
@@ -1816,6 +1824,7 @@ export type BaseDefComponent = ComponentLike<{
     fieldName: string | undefined;
     context?: CardContext;
     canEdit?: boolean;
+    addCardFilter?: Filter;
   };
 }>;
 
diff --git a/packages/base/field-component.gts b/packages/base/field-component.gts
index 1f33bafa39..a0360c4111 100644
--- a/packages/base/field-component.gts
+++ b/packages/base/field-component.gts
@@ -21,6 +21,7 @@ import {
   Loader,
   type CodeRef,
   type Permissions,
+  type Filter,
 } from '@cardstack/runtime-common';
 import type { ComponentLike } from '@glint/template';
 import { CardContainer } from '@cardstack/boxel-ui/components';
@@ -33,7 +34,13 @@ import Component from '@glimmer/component';
 
 export interface BoxComponentSignature {
   Element: HTMLElement; // This may not be true for some field components, but it's true more often than not
-  Args: { Named: { format?: Format; displayContainer?: boolean } };
+  Args: {
+    Named: {
+      format?: Format;
+      displayContainer?: boolean;
+      addCardFilter?: Filter;
+    };
+  };
   Blocks: {};
 }
 
@@ -185,7 +192,11 @@ export function getBoxComponent(
 
   let component: TemplateOnlyComponent<{
     Element: HTMLElement;
-    Args: { format?: Format; displayContainer?: boolean };
+    Args: {
+      format?: Format;
+      displayContainer?: boolean;
+      addCardFilter?: Filter;
+    };
   }> = <template>
     <CardContextConsumer as |context|>
       <PermissionsConsumer as |permissions|>
@@ -238,6 +249,7 @@ export function getBoxComponent(
                           (not field.computeVia)
                           permissions.canWrite
                         }}
+                        @addCardFilter={{@addCardFilter}}
                       />
                     </CardContainer>
                   </DefaultFormatsProvider>
diff --git a/packages/base/links-to-editor.gts b/packages/base/links-to-editor.gts
index 52571ad678..fdd294b39b 100644
--- a/packages/base/links-to-editor.gts
+++ b/packages/base/links-to-editor.gts
@@ -22,6 +22,7 @@ import {
   identifyCard,
   CardContextName,
   RealmURLContextName,
+  type Filter,
 } from '@cardstack/runtime-common';
 import { AddButton, IconButton } from '@cardstack/boxel-ui/components';
 import { IconMinusCircle } from '@cardstack/boxel-ui/icons';
@@ -33,6 +34,7 @@ interface Signature {
   Args: {
     model: Box<CardDef | null>;
     field: Field<typeof CardDef>;
+    addCardFilter?: Filter;
   };
 }
 
diff --git a/packages/base/links-to-many-component.gts b/packages/base/links-to-many-component.gts
index e456bfb658..1a5040bebe 100644
--- a/packages/base/links-to-many-component.gts
+++ b/packages/base/links-to-many-component.gts
@@ -29,6 +29,7 @@ import {
   getPlural,
   CardContextName,
   RealmURLContextName,
+  type Filter,
 } from '@cardstack/runtime-common';
 import { IconMinusCircle, IconX, FourLines } from '@cardstack/boxel-ui/icons';
 import { eq } from '@cardstack/boxel-ui/helpers';
@@ -52,6 +53,7 @@ interface Signature {
       boxedElement: Box<BaseDef>,
     ): typeof BaseDef;
     childFormat: 'atom' | 'fitted';
+    addCardFilter?: Filter;
   };
 }
 
@@ -95,7 +97,13 @@ class LinksToManyEditor extends GlimmerComponent<Signature> {
       selectedCards?.map((card: any) => ({ not: { eq: { id: card.id } } })) ??
       [];
     let type = identifyCard(this.args.field.card) ?? baseCardRef;
-    let filter = { every: [{ type }, ...selectedCardsQuery] };
+    let filter = {
+      every: [
+        { type },
+        ...selectedCardsQuery,
+        ...(this.args.addCardFilter ? [this.args.addCardFilter] : []),
+      ],
+    };
     let chosenCard: CardDef | undefined = await chooseCard(
       { filter },
       {
@@ -397,14 +405,13 @@ export function getLinksToManyComponent({
         {{#if (shouldRenderEditor @format defaultFormats.cardDef isComputed)}}
           <LinksToManyEditor
             @model={{model}}
-            @arrayField={{arrayField}}
             @field={{field}}
-            @cardTypeFor={{cardTypeFor}}
             @childFormat={{getEditorChildFormat
               @format
               defaultFormats.cardDef
               model
             }}
+            @addCardFilter={{@addCardFilter}}
             ...attributes
           />
         {{else}}

From ce4ed574b0324d9be6b63bbb010876c54ecf5752 Mon Sep 17 00:00:00 2001
From: tintinthong <justinthong93@gmail.com>
Date: Tue, 4 Feb 2025 10:56:49 +0800
Subject: [PATCH 2/8] use subclassType rather than an additional filter and
 focus to narrow the type. Query system doesn't behave well with two types

---
 packages/base/card-api.gts                    |  8 +--
 packages/base/field-component.gts             |  8 +--
 packages/base/links-to-editor.gts             |  6 +-
 packages/base/links-to-many-component.gts     | 16 +++---
 packages/base/spec.gts                        | 21 ++++++-
 packages/runtime-common/code-ref.ts           | 57 +++++++++++++++++++
 packages/runtime-common/index-query-engine.ts |  3 +-
 7 files changed, 98 insertions(+), 21 deletions(-)

diff --git a/packages/base/card-api.gts b/packages/base/card-api.gts
index 42a3ede06d..15f47c965a 100644
--- a/packages/base/card-api.gts
+++ b/packages/base/card-api.gts
@@ -44,7 +44,7 @@ import {
   type CardResourceMeta,
   CodeRef,
   CommandContext,
-  type Filter,
+  type ResolvedCodeRef,
 } from '@cardstack/runtime-common';
 import type { ComponentLike } from '@glint/template';
 import { initSharedState } from './shared-state';
@@ -1097,7 +1097,7 @@ class LinksTo<CardT extends CardDefConstructor> implements Field<CardT> {
         Named: {
           format?: Format;
           displayContainer?: boolean;
-          addCardFilter?: Filter;
+          subclassType?: ResolvedCodeRef;
         };
       };
       Blocks: {};
@@ -1108,7 +1108,7 @@ class LinksTo<CardT extends CardDefConstructor> implements Field<CardT> {
             <LinksToEditor
               @model={{(getInnerModel)}}
               @field={{linksToField}}
-              @addCardFilter={{@addCardFilter}}
+              @subclassType={{@subclassType}}
               ...attributes
             />
           {{else}}
@@ -1824,7 +1824,7 @@ export type BaseDefComponent = ComponentLike<{
     fieldName: string | undefined;
     context?: CardContext;
     canEdit?: boolean;
-    addCardFilter?: Filter;
+    subclassType?: ResolvedCodeRef;
   };
 }>;
 
diff --git a/packages/base/field-component.gts b/packages/base/field-component.gts
index a0360c4111..9bf51d95d7 100644
--- a/packages/base/field-component.gts
+++ b/packages/base/field-component.gts
@@ -21,7 +21,7 @@ import {
   Loader,
   type CodeRef,
   type Permissions,
-  type Filter,
+  ResolvedCodeRef,
 } from '@cardstack/runtime-common';
 import type { ComponentLike } from '@glint/template';
 import { CardContainer } from '@cardstack/boxel-ui/components';
@@ -38,7 +38,7 @@ export interface BoxComponentSignature {
     Named: {
       format?: Format;
       displayContainer?: boolean;
-      addCardFilter?: Filter;
+      subclassType?: ResolvedCodeRef;
     };
   };
   Blocks: {};
@@ -195,7 +195,7 @@ export function getBoxComponent(
     Args: {
       format?: Format;
       displayContainer?: boolean;
-      addCardFilter?: Filter;
+      subclassType?: ResolvedCodeRef;
     };
   }> = <template>
     <CardContextConsumer as |context|>
@@ -249,7 +249,7 @@ export function getBoxComponent(
                           (not field.computeVia)
                           permissions.canWrite
                         }}
-                        @addCardFilter={{@addCardFilter}}
+                        @subclassType={{@subclassType}}
                       />
                     </CardContainer>
                   </DefaultFormatsProvider>
diff --git a/packages/base/links-to-editor.gts b/packages/base/links-to-editor.gts
index fdd294b39b..a8287aa4d3 100644
--- a/packages/base/links-to-editor.gts
+++ b/packages/base/links-to-editor.gts
@@ -22,7 +22,8 @@ import {
   identifyCard,
   CardContextName,
   RealmURLContextName,
-  type Filter,
+  type ResolvedCodeRef,
+  getNarrowestType,
 } from '@cardstack/runtime-common';
 import { AddButton, IconButton } from '@cardstack/boxel-ui/components';
 import { IconMinusCircle } from '@cardstack/boxel-ui/icons';
@@ -34,7 +35,7 @@ interface Signature {
   Args: {
     model: Box<CardDef | null>;
     field: Field<typeof CardDef>;
-    addCardFilter?: Filter;
+    subclassType?: ResolvedCodeRef;
   };
 }
 
@@ -145,6 +146,7 @@ export class LinksToEditor extends GlimmerComponent<Signature> {
 
   private chooseCard = restartableTask(async () => {
     let type = identifyCard(this.args.field.card) ?? baseCardRef;
+    type = await getNarrowestType(this.args.subclassType, type);
     let chosenCard: CardDef | undefined = await chooseCard(
       { filter: { type } },
       {
diff --git a/packages/base/links-to-many-component.gts b/packages/base/links-to-many-component.gts
index 1a5040bebe..87a8558655 100644
--- a/packages/base/links-to-many-component.gts
+++ b/packages/base/links-to-many-component.gts
@@ -29,7 +29,8 @@ import {
   getPlural,
   CardContextName,
   RealmURLContextName,
-  type Filter,
+  type ResolvedCodeRef,
+  getNarrowestType,
 } from '@cardstack/runtime-common';
 import { IconMinusCircle, IconX, FourLines } from '@cardstack/boxel-ui/icons';
 import { eq } from '@cardstack/boxel-ui/helpers';
@@ -53,7 +54,7 @@ interface Signature {
       boxedElement: Box<BaseDef>,
     ): typeof BaseDef;
     childFormat: 'atom' | 'fitted';
-    addCardFilter?: Filter;
+    subclassType?: ResolvedCodeRef;
   };
 }
 
@@ -97,12 +98,9 @@ class LinksToManyEditor extends GlimmerComponent<Signature> {
       selectedCards?.map((card: any) => ({ not: { eq: { id: card.id } } })) ??
       [];
     let type = identifyCard(this.args.field.card) ?? baseCardRef;
+    type = await getNarrowestType(this.args.subclassType, type);
     let filter = {
-      every: [
-        { type },
-        ...selectedCardsQuery,
-        ...(this.args.addCardFilter ? [this.args.addCardFilter] : []),
-      ],
+      every: [{ type }, ...selectedCardsQuery],
     };
     let chosenCard: CardDef | undefined = await chooseCard(
       { filter },
@@ -405,13 +403,15 @@ export function getLinksToManyComponent({
         {{#if (shouldRenderEditor @format defaultFormats.cardDef isComputed)}}
           <LinksToManyEditor
             @model={{model}}
+            @arrayField={{arrayField}}
             @field={{field}}
+            @cardTypeFor={{cardTypeFor}}
             @childFormat={{getEditorChildFormat
               @format
               defaultFormats.cardDef
               model
             }}
-            @addCardFilter={{@addCardFilter}}
+            @subclassType={{@subclassType}}
             ...attributes
           />
         {{else}}
diff --git a/packages/base/spec.gts b/packages/base/spec.gts
index 4d80874654..1ec01f4769 100644
--- a/packages/base/spec.gts
+++ b/packages/base/spec.gts
@@ -21,7 +21,12 @@ import {
   Pill,
   RealmIcon,
 } from '@cardstack/boxel-ui/components';
-import { loadCard, Loader } from '@cardstack/runtime-common';
+import {
+  codeRefWithAbsoluteURL,
+  Loader,
+  loadCard,
+  isResolvedCodeRef,
+} from '@cardstack/runtime-common';
 import { eq } from '@cardstack/boxel-ui/helpers';
 
 import GlimmerComponent from '@glimmer/component';
@@ -102,6 +107,18 @@ export class Spec extends CardDef {
       }
     });
 
+    get absoluteRef() {
+      if (!this.args.model.ref || !this.args.model.id) {
+        return undefined;
+      }
+      let url = new URL(this.args.model.id);
+      let ref = codeRefWithAbsoluteURL(this.args.model.ref, url);
+      if (!isResolvedCodeRef(ref)) {
+        throw new Error('ref is not a resolved code ref');
+      }
+      return ref;
+    }
+
     private get realmInfo() {
       return getCardMeta(this.args.model as CardDef, 'realmInfo');
     }
@@ -140,7 +157,7 @@ export class Spec extends CardDef {
           {{#if (eq @model.specType 'field')}}
             <@fields.containedExamples />
           {{else}}
-            <@fields.linkedExamples />
+            <@fields.linkedExamples @subclassType={{this.absoluteRef}} />
           {{/if}}
         </section>
         <section class='module section'>
diff --git a/packages/runtime-common/code-ref.ts b/packages/runtime-common/code-ref.ts
index 31bc5fe52a..b7e264c11b 100644
--- a/packages/runtime-common/code-ref.ts
+++ b/packages/runtime-common/code-ref.ts
@@ -227,3 +227,60 @@ export function humanReadable(ref: CodeRef): string {
 function assertNever(value: never) {
   return new Error(`should never happen ${value}`);
 }
+
+function refEquals(ref1: CodeRef, ref2: CodeRef): boolean {
+  // For now, let's only handle for resolved code refs
+  if (!isResolvedCodeRef(ref1) || !isResolvedCodeRef(ref2)) {
+    return false;
+  }
+  return ref1.name === ref1.module && ref1.module === ref2.module;
+}
+
+function myLoader(): Loader {
+  // we know this code is always loaded by an instance of our Loader, which sets
+  // import.meta.loader.
+
+  // When type-checking realm-server, tsc sees this file and thinks
+  // it will be transpiled to CommonJS and so it complains about this line. But
+  // this file is always loaded through our loader and always has access to import.meta.
+  // @ts-ignore
+  return (import.meta as any).loader;
+}
+
+async function getAncestorRef(codeRef: CodeRef) {
+  let card = await loadCard(codeRef, { loader: myLoader() });
+  let ancestor = getAncestor(card);
+  return identifyCard(ancestor);
+}
+
+//This function identifies the code ref identity of the card and verifies
+//that it is a child of the ancestor
+async function isInsideAncestorChain(
+  codeRef: CodeRef,
+  codeRefAncestor: CodeRef,
+): Promise<boolean | undefined> {
+  if (refEquals(codeRef, codeRefAncestor)) {
+    return true;
+  } else {
+    let newAncestorRef = await getAncestorRef(codeRef);
+    if (newAncestorRef) {
+      return isInsideAncestorChain(newAncestorRef, codeRefAncestor);
+    } else {
+      return undefined;
+    }
+  }
+}
+
+// utility to return subclassType when it exists and is part of the ancestor chain of type
+export async function getNarrowestType(
+  subclassType: CodeRef | undefined,
+  type: CodeRef,
+) {
+  let narrowTypeExists: boolean = false;
+  if (subclassType) {
+    narrowTypeExists =
+      (await isInsideAncestorChain(subclassType, type)) ?? false;
+  }
+  let narrowestType = narrowTypeExists && subclassType ? subclassType : type;
+  return narrowestType;
+}
diff --git a/packages/runtime-common/index-query-engine.ts b/packages/runtime-common/index-query-engine.ts
index b3df164edb..bae5a1fb56 100644
--- a/packages/runtime-common/index-query-engine.ts
+++ b/packages/runtime-common/index-query-engine.ts
@@ -172,7 +172,8 @@ export class IndexQueryEngine {
   }
 
   async #queryCards(query: CardExpression, loader: Loader) {
-    return this.#query(await this.makeExpression(query, loader));
+    let expression = await this.makeExpression(query, loader);
+    return this.#query(expression);
   }
 
   async getModule(

From 9f0fe1c46ed42c1e21674c559be299e0d25e178b Mon Sep 17 00:00:00 2001
From: tintinthong <justinthong93@gmail.com>
Date: Wed, 5 Feb 2025 12:30:03 +0800
Subject: [PATCH 3/8] fix ancestor logic

---
 packages/base/links-to-editor.gts         | 14 ++++++++++++-
 packages/base/links-to-many-component.gts | 14 ++++++++++++-
 packages/runtime-common/code-ref.ts       | 25 ++++++++---------------
 3 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/packages/base/links-to-editor.gts b/packages/base/links-to-editor.gts
index a8287aa4d3..e0f6be6c27 100644
--- a/packages/base/links-to-editor.gts
+++ b/packages/base/links-to-editor.gts
@@ -24,6 +24,7 @@ import {
   RealmURLContextName,
   type ResolvedCodeRef,
   getNarrowestType,
+  Loader,
 } from '@cardstack/runtime-common';
 import { AddButton, IconButton } from '@cardstack/boxel-ui/components';
 import { IconMinusCircle } from '@cardstack/boxel-ui/icons';
@@ -146,7 +147,7 @@ export class LinksToEditor extends GlimmerComponent<Signature> {
 
   private chooseCard = restartableTask(async () => {
     let type = identifyCard(this.args.field.card) ?? baseCardRef;
-    type = await getNarrowestType(this.args.subclassType, type);
+    type = await getNarrowestType(this.args.subclassType, type, myLoader());
     let chosenCard: CardDef | undefined = await chooseCard(
       { filter: { type } },
       {
@@ -164,3 +165,14 @@ export class LinksToEditor extends GlimmerComponent<Signature> {
     }
   });
 }
+
+function myLoader(): Loader {
+  // we know this code is always loaded by an instance of our Loader, which sets
+  // import.meta.loader.
+
+  // When type-checking realm-server, tsc sees this file and thinks
+  // it will be transpiled to CommonJS and so it complains about this line. But
+  // this file is always loaded through our loader and always has access to import.meta.
+  // @ts-ignore
+  return (import.meta as any).loader;
+}
diff --git a/packages/base/links-to-many-component.gts b/packages/base/links-to-many-component.gts
index 87a8558655..097e5d3e7a 100644
--- a/packages/base/links-to-many-component.gts
+++ b/packages/base/links-to-many-component.gts
@@ -31,6 +31,7 @@ import {
   RealmURLContextName,
   type ResolvedCodeRef,
   getNarrowestType,
+  Loader,
 } from '@cardstack/runtime-common';
 import { IconMinusCircle, IconX, FourLines } from '@cardstack/boxel-ui/icons';
 import { eq } from '@cardstack/boxel-ui/helpers';
@@ -98,7 +99,7 @@ class LinksToManyEditor extends GlimmerComponent<Signature> {
       selectedCards?.map((card: any) => ({ not: { eq: { id: card.id } } })) ??
       [];
     let type = identifyCard(this.args.field.card) ?? baseCardRef;
-    type = await getNarrowestType(this.args.subclassType, type);
+    type = await getNarrowestType(this.args.subclassType, type, myLoader());
     let filter = {
       every: [{ type }, ...selectedCardsQuery],
     };
@@ -488,3 +489,14 @@ export function getLinksToManyComponent({
     },
   });
 }
+
+function myLoader(): Loader {
+  // we know this code is always loaded by an instance of our Loader, which sets
+  // import.meta.loader.
+
+  // When type-checking realm-server, tsc sees this file and thinks
+  // it will be transpiled to CommonJS and so it complains about this line. But
+  // this file is always loaded through our loader and always has access to import.meta.
+  // @ts-ignore
+  return (import.meta as any).loader;
+}
diff --git a/packages/runtime-common/code-ref.ts b/packages/runtime-common/code-ref.ts
index b7e264c11b..16d5abe41d 100644
--- a/packages/runtime-common/code-ref.ts
+++ b/packages/runtime-common/code-ref.ts
@@ -233,22 +233,11 @@ function refEquals(ref1: CodeRef, ref2: CodeRef): boolean {
   if (!isResolvedCodeRef(ref1) || !isResolvedCodeRef(ref2)) {
     return false;
   }
-  return ref1.name === ref1.module && ref1.module === ref2.module;
+  return ref1.name === ref2.name && ref1.module === ref2.module;
 }
 
-function myLoader(): Loader {
-  // we know this code is always loaded by an instance of our Loader, which sets
-  // import.meta.loader.
-
-  // When type-checking realm-server, tsc sees this file and thinks
-  // it will be transpiled to CommonJS and so it complains about this line. But
-  // this file is always loaded through our loader and always has access to import.meta.
-  // @ts-ignore
-  return (import.meta as any).loader;
-}
-
-async function getAncestorRef(codeRef: CodeRef) {
-  let card = await loadCard(codeRef, { loader: myLoader() });
+async function getAncestorRef(codeRef: CodeRef, loader: Loader) {
+  let card = await loadCard(codeRef, { loader: loader });
   let ancestor = getAncestor(card);
   return identifyCard(ancestor);
 }
@@ -258,13 +247,14 @@ async function getAncestorRef(codeRef: CodeRef) {
 async function isInsideAncestorChain(
   codeRef: CodeRef,
   codeRefAncestor: CodeRef,
+  loader: Loader,
 ): Promise<boolean | undefined> {
   if (refEquals(codeRef, codeRefAncestor)) {
     return true;
   } else {
-    let newAncestorRef = await getAncestorRef(codeRef);
+    let newAncestorRef = await getAncestorRef(codeRef, loader);
     if (newAncestorRef) {
-      return isInsideAncestorChain(newAncestorRef, codeRefAncestor);
+      return isInsideAncestorChain(newAncestorRef, codeRefAncestor, loader);
     } else {
       return undefined;
     }
@@ -275,11 +265,12 @@ async function isInsideAncestorChain(
 export async function getNarrowestType(
   subclassType: CodeRef | undefined,
   type: CodeRef,
+  loader: Loader,
 ) {
   let narrowTypeExists: boolean = false;
   if (subclassType) {
     narrowTypeExists =
-      (await isInsideAncestorChain(subclassType, type)) ?? false;
+      (await isInsideAncestorChain(subclassType, type, loader)) ?? false;
   }
   let narrowestType = narrowTypeExists && subclassType ? subclassType : type;
   return narrowestType;

From b40292420f658bdf7aa340ad496f857d69e84be9 Mon Sep 17 00:00:00 2001
From: tintinthong <justinthong93@gmail.com>
Date: Wed, 5 Feb 2025 13:04:20 +0800
Subject: [PATCH 4/8] add test

---
 .../acceptance/code-submode/spec-test.gts     | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/packages/host/tests/acceptance/code-submode/spec-test.gts b/packages/host/tests/acceptance/code-submode/spec-test.gts
index 79b3043806..a91a4495a9 100644
--- a/packages/host/tests/acceptance/code-submode/spec-test.gts
+++ b/packages/host/tests/acceptance/code-submode/spec-test.gts
@@ -326,6 +326,33 @@ module('Spec preview', function (hooks) {
     await click('[data-test-create-spec-instance]');
     assert.dom('[data-test-exported-type]').hasText('card');
   });
+
+  test('can add linked examples to spec instance narrows the chooser by code ref inside of the instance', async function (assert) {
+    await visitOperatorMode({
+      stacks: [
+        [
+          {
+            id: `${testRealmURL}person-entry`,
+            format: 'edit',
+          },
+        ],
+      ],
+      submode: 'interact',
+    });
+    assert.dom('[data-test-links-to-many="linkedExamples"]').exists();
+    await click('[data-test-add-new]');
+    assert
+      .dom('[data-test-card-catalog-modal] [data-test-boxel-header-title]')
+      .containsText('Person');
+    assert.dom('[data-test-card-catalog-item]').exists({ count: 2 });
+    assert
+      .dom(`[data-test-card-catalog-item="${testRealmURL}Person/1"]`)
+      .exists();
+    assert
+      .dom(`[data-test-card-catalog-item="${testRealmURL}Person/fadhlan"]`)
+      .exists();
+  });
+
   test('title does not default to "default"', async function (assert) {
     await visitOperatorMode({
       submode: 'code',

From f69662ba28a1b4d1dec3d0ca9291e0017dffd818 Mon Sep 17 00:00:00 2001
From: tintinthong <justinthong93@gmail.com>
Date: Wed, 5 Feb 2025 13:11:25 +0800
Subject: [PATCH 5/8] fix lint

---
 packages/runtime-common/code-ref.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-common/code-ref.ts b/packages/runtime-common/code-ref.ts
index 16d5abe41d..b729c66598 100644
--- a/packages/runtime-common/code-ref.ts
+++ b/packages/runtime-common/code-ref.ts
@@ -267,7 +267,7 @@ export async function getNarrowestType(
   type: CodeRef,
   loader: Loader,
 ) {
-  let narrowTypeExists: boolean = false;
+  let narrowTypeExists = false;
   if (subclassType) {
     narrowTypeExists =
       (await isInsideAncestorChain(subclassType, type, loader)) ?? false;

From 258dca88996fa9ca66b8366d76270224f44885a4 Mon Sep 17 00:00:00 2001
From: tintinthong <justinthong93@gmail.com>
Date: Wed, 5 Feb 2025 16:42:19 +0800
Subject: [PATCH 6/8] revert

---
 packages/runtime-common/index-query-engine.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/runtime-common/index-query-engine.ts b/packages/runtime-common/index-query-engine.ts
index bae5a1fb56..b3df164edb 100644
--- a/packages/runtime-common/index-query-engine.ts
+++ b/packages/runtime-common/index-query-engine.ts
@@ -172,8 +172,7 @@ export class IndexQueryEngine {
   }
 
   async #queryCards(query: CardExpression, loader: Loader) {
-    let expression = await this.makeExpression(query, loader);
-    return this.#query(expression);
+    return this.#query(await this.makeExpression(query, loader));
   }
 
   async getModule(

From f0c74bb6d584fdedae3860638dee0636a5e69129 Mon Sep 17 00:00:00 2001
From: tintinthong <justinthong93@gmail.com>
Date: Wed, 5 Feb 2025 20:33:30 +0800
Subject: [PATCH 7/8] add proper stopping conditions

---
 packages/runtime-common/code-ref.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/runtime-common/code-ref.ts b/packages/runtime-common/code-ref.ts
index b729c66598..ed29f64bfd 100644
--- a/packages/runtime-common/code-ref.ts
+++ b/packages/runtime-common/code-ref.ts
@@ -6,7 +6,7 @@ import {
   type FieldDef,
 } from 'https://cardstack.com/base/card-api';
 import { Loader } from './loader';
-import { isField } from './constants';
+import { baseCardRef, isField } from './constants';
 import { CardError } from './error';
 import { trimExecutableExtension } from './index';
 
@@ -249,6 +249,9 @@ async function isInsideAncestorChain(
   codeRefAncestor: CodeRef,
   loader: Loader,
 ): Promise<boolean | undefined> {
+  if (refEquals(codeRef, baseCardRef)) {
+    return false;
+  }
   if (refEquals(codeRef, codeRefAncestor)) {
     return true;
   } else {
@@ -256,7 +259,7 @@ async function isInsideAncestorChain(
     if (newAncestorRef) {
       return isInsideAncestorChain(newAncestorRef, codeRefAncestor, loader);
     } else {
-      return undefined;
+      return false;
     }
   }
 }

From 9a66cd60c859a1022f520ca1695621648747f699 Mon Sep 17 00:00:00 2001
From: tintinthong <justinthong93@gmail.com>
Date: Wed, 5 Feb 2025 20:38:16 +0800
Subject: [PATCH 8/8] improve stopping condition

---
 packages/runtime-common/code-ref.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/runtime-common/code-ref.ts b/packages/runtime-common/code-ref.ts
index ed29f64bfd..c4b0d01111 100644
--- a/packages/runtime-common/code-ref.ts
+++ b/packages/runtime-common/code-ref.ts
@@ -249,7 +249,10 @@ async function isInsideAncestorChain(
   codeRefAncestor: CodeRef,
   loader: Loader,
 ): Promise<boolean | undefined> {
-  if (refEquals(codeRef, baseCardRef)) {
+  if (
+    refEquals(codeRef, baseCardRef) &&
+    !refEquals(codeRefAncestor, baseCardRef)
+  ) {
     return false;
   }
   if (refEquals(codeRef, codeRefAncestor)) {