@telorun/ide-support 0.10.0 → 0.11.0

package/dist/completions/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/completions/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,gBAAgB,EAAE,KAAK,WAAW,EAAe,MAAM,mBAAmB,CAAC;AACrG,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAuI3E,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,GAAG,SAAS,EACtC,OAAO,CAAC,EAAE,qBAAqB,EAC/B,IAAI,CAAC,EAAE,WAAW,EAAE,GACnB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAyB7B"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/completions/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,gBAAgB,EAAE,KAAK,WAAW,EAAe,MAAM,mBAAmB,CAAC;AACrG,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AA8I3E,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,GAAG,SAAS,EACtC,OAAO,CAAC,EAAE,qBAAqB,EAC/B,IAAI,CAAC,EAAE,WAAW,EAAE,GACnB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAyB7B"}

package/dist/completions/build.js

@@ -1,5 +1,5 @@
 import { parseToAst } from "@telorun/analyzer";
-import { detectContext, lookupRefConstraint } from "./detect-context.js";
+import { detectContext, lookupRefConstraints } from "./detect-context.js";
 import { importSourceCompletions } from "./import-source.js";
 import { propKeyCompletions } from "./prop-keys.js";
 import { CAPABILITY_VALUES } from "./valid-capabilities.js";
@@ -36,16 +36,20 @@ function extractInFileResources(docs) {
  *  kind match. Falls back to listing every in-file resource so the
  *  user still sees something rather than nothing when the registry
  *  doesn't recognize the kind yet. */
-function refNameCompletions(docs, refKind, refConstraint, registry, replaceRange) {
+function refNameCompletions(docs, refKind, refConstraints, registry, replaceRange) {
     const resources = extractInFileResources(docs);
     let acceptable;
     if (refKind) {
         acceptable = new Set([refKind]);
     }
-    else if (refConstraint && registry) {
-        const kinds = registry.userFacingKindsForRef(refConstraint);
-        if (kinds)
-            acceptable = new Set(kinds);
+    else if (refConstraints.length > 0 && registry) {
+        // Union across the slot's accepted kinds: a resource satisfying any one of
+        // them fills the slot. A constraint the registry can't resolve contributes
+        // nothing rather than narrowing to the ones it could.
+        const resolved = refConstraints.map((c) => registry.userFacingKindsForRef(c));
+        if (resolved.some(Boolean)) {
+            acceptable = new Set(resolved.flatMap((kinds) => kinds ?? []));
+        }
     }
     const seen = new Set();
     const out = [];
@@ -74,10 +78,13 @@ function refConstrainedKinds(registry, parentDocKind, parentYamlPath) {
     const definition = registry.resolveDefinition(parentDocKind);
     if (!definition?.schema)
         return undefined;
-    const refString = lookupRefConstraint(definition.schema, parentYamlPath);
-    if (!refString)
+    const constraints = lookupRefConstraints(definition.schema, parentYamlPath);
+    if (constraints.length === 0)
+        return undefined;
+    const resolved = constraints.map((c) => registry.userFacingKindsForRef(c));
+    if (!resolved.some(Boolean))
         return undefined;
-    return registry.userFacingKindsForRef(refString);
+    return [...new Set(resolved.flatMap((kinds) => kinds ?? []))];
 }
 function kindCompletions(registry, docKind, yamlPath, replaceRange) {
     let kinds;
@@ -126,10 +133,10 @@ export async function buildCompletions(text, line, character, registry, adapter,
         return capabilityCompletions();
     if (ctx.type === "ref-name") {
         const definition = registry?.resolveDefinition(ctx.docKind);
-        const refConstraint = definition?.schema
-            ? lookupRefConstraint(definition.schema, ctx.yamlPath)
-            : undefined;
-        return refNameCompletions(astDocs, ctx.refKind, refConstraint, registry, ctx.replaceRange);
+        const refConstraints = definition?.schema
+            ? lookupRefConstraints(definition.schema, ctx.yamlPath)
+            : [];
+        return refNameCompletions(astDocs, ctx.refKind, refConstraints, registry, ctx.replaceRange);
     }
     if (ctx.type === "field-value") {
         if (ctx.field === "import-source") {

package/dist/completions/detect-context.d.ts

@@ -56,12 +56,15 @@ export declare function navigateSchema(schema: Record<string, any>, path: string
  *  completion to discover what kind of resource the user is targeting in an
  *  object-form ref. Walking stops at the first line with a strictly smaller
  *  indent (that's the parent's structural boundary). */
-/** Looks up the `x-telo-ref` string carried by the schema node at `yamlPath`
- *  inside `definitionSchema`. Checks both the property node directly and its
- *  peeled `anyOf` / `oneOf` branches, since some library schemas place the
- *  annotation at the property level and others inside a branch. Returns
- *  `undefined` when the path doesn't resolve or no ref constraint is declared. */
-export declare function lookupRefConstraint(definitionSchema: Record<string, any>, yamlPath: string[]): string | undefined;
+/** Every kind the `x-telo-ref` slot at `yamlPath` accepts, or an empty array
+ *  when the path doesn't resolve or declares no constraint.
+ *
+ *  All of them, not the first: a slot accepting `Invocable | Runnable` used to
+ *  complete only the invocables, because a single-constraint lookup stopped at
+ *  the first branch. The analyzer's accessor unions a `kind:` list and the
+ *  `anyOf` / `oneOf` branches alike, so completion now offers what the slot
+ *  actually takes. */
+export declare function lookupRefConstraints(definitionSchema: Record<string, any>, yamlPath: string[]): string[];
 /** Derive a `CompletionCtx` from the AST-resolved cursor (Approach B). The
  *  structural resolution lives in `resolveNodeAtPosition`; this only maps a
  *  resolved slot onto the completion the editor should offer. `docs` lets a

package/dist/completions/detect-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detect-context.d.ts","sourceRoot":"","sources":["../../src/completions/detect-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,YAAY,EAAE,YAAY,EAAE,CAAC;AAE7B,MAAM,MAAM,aAAa,GACrB;IACE,IAAI,EAAE,MAAM,CAAC;IACb;;;uEAGmE;IACnE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;+BAE2B;IAC3B,YAAY,EAAE,YAAY,CAAC;CAC5B,GACD;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GACtB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,GACpF;IACE;;;gDAG4C;IAC5C,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB;6DACyD;IACzD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,YAAY,CAAC;CAC5B,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,sDAAsD;IACtD,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AAuBN;;;;;sCAKsC;AACtC,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,IAAI,EAAE,MAAM,EAAE,GACb,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CA4BjC;AAoCD;;;;;wDAKwD;AACxD;;;;kFAIkF;AAClF,wBAAgB,mBAAmB,CACjC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACrC,QAAQ,EAAE,MAAM,EAAE,GACjB,MAAM,GAAG,SAAS,CAQpB;AAED;;;;oBAIoB;AACpB,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,WAAW,EAAE,GACnB,aAAa,GAAG,SAAS,CAsE3B"}
+{"version":3,"file":"detect-context.d.ts","sourceRoot":"","sources":["../../src/completions/detect-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACjG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,YAAY,EAAE,YAAY,EAAE,CAAC;AAE7B,MAAM,MAAM,aAAa,GACrB;IACE,IAAI,EAAE,MAAM,CAAC;IACb;;;uEAGmE;IACnE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;+BAE2B;IAC3B,YAAY,EAAE,YAAY,CAAC;CAC5B,GACD;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GACtB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,GACpF;IACE;;;gDAG4C;IAC5C,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB;6DACyD;IACzD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,YAAY,CAAC;CAC5B,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,sDAAsD;IACtD,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AAuBN;;;;;sCAKsC;AACtC,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,IAAI,EAAE,MAAM,EAAE,GACb,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CA4BjC;AAwCD;;;;;wDAKwD;AACxD;;;;;;;sBAOsB;AACtB,wBAAgB,oBAAoB,CAClC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACrC,QAAQ,EAAE,MAAM,EAAE,GACjB,MAAM,EAAE,CAIV;AAED;;;;oBAIoB;AACpB,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,WAAW,EAAE,GACnB,aAAa,GAAG,SAAS,CAsE3B"}

package/dist/completions/detect-context.js

@@ -1,4 +1,4 @@
-import { parseToAst } from "@telorun/analyzer";
+import { parseToAst, readRefSlot, refSlotAnnotation } from "@telorun/analyzer";
 import { resolveNodeAtPosition } from "./resolve-node.js";
 /** Returns every schema branch reachable from `node` after peeling `anyOf` /
  *  `oneOf` recursively. A branch with no combinators is its own only entry.
@@ -66,9 +66,12 @@ export function navigateSchema(schema, path) {
 /** Merge multiple peeled schema branches into one node for completion purposes.
  *  Property maps are unioned (first branch wins on key collision). `required`
  *  becomes the intersection so optional-in-any-branch keys still surface.
- *  `x-telo-ref` from the unpeeled parent is preserved so ref-aware lookups
- *  (`lookupRefConstraint`) still see the constraint when navigateSchema is
- *  called on a property that places the annotation alongside `anyOf`/`oneOf`. */
+ *
+ *  The parent's reference slot is re-stamped on the merged node, because peeling
+ *  is exactly what destroys it: for the canonical multi-kind shape
+ *  (`anyOf: [{x-telo-ref: A}, {x-telo-ref: B}]`) the constraint lives ONLY in the
+ *  branches, and merging them left a node declaring no slot at all. Re-emitted
+ *  through the analyzer's accessor so both annotation shapes survive the merge. */
 function unionLeaves(parent, leaves) {
     const properties = {};
     const requiredSets = [];
@@ -87,8 +90,9 @@ function unionLeaves(parent, leaves) {
         required = [...requiredSets[0]].filter((k) => requiredSets.every((s) => s.has(k)));
     }
     const out = { type: "object", properties, required };
-    if (typeof parent["x-telo-ref"] === "string")
-        out["x-telo-ref"] = parent["x-telo-ref"];
+    const slot = readRefSlot(parent);
+    if (slot && slot.kinds.length > 0)
+        out["x-telo-ref"] = refSlotAnnotation(slot);
     return out;
 }
 /** Walks up and down from `cursorLine` looking for a sibling line at the
@@ -97,22 +101,19 @@ function unionLeaves(parent, leaves) {
  *  completion to discover what kind of resource the user is targeting in an
  *  object-form ref. Walking stops at the first line with a strictly smaller
  *  indent (that's the parent's structural boundary). */
-/** Looks up the `x-telo-ref` string carried by the schema node at `yamlPath`
- *  inside `definitionSchema`. Checks both the property node directly and its
- *  peeled `anyOf` / `oneOf` branches, since some library schemas place the
- *  annotation at the property level and others inside a branch. Returns
- *  `undefined` when the path doesn't resolve or no ref constraint is declared. */
-export function lookupRefConstraint(definitionSchema, yamlPath) {
+/** Every kind the `x-telo-ref` slot at `yamlPath` accepts, or an empty array
+ *  when the path doesn't resolve or declares no constraint.
+ *
+ *  All of them, not the first: a slot accepting `Invocable | Runnable` used to
+ *  complete only the invocables, because a single-constraint lookup stopped at
+ *  the first branch. The analyzer's accessor unions a `kind:` list and the
+ *  `anyOf` / `oneOf` branches alike, so completion now offers what the slot
+ *  actually takes. */
+export function lookupRefConstraints(definitionSchema, yamlPath) {
     const node = navigateSchema(definitionSchema, yamlPath);
     if (!node)
-        return undefined;
-    if (typeof node["x-telo-ref"] === "string")
-        return node["x-telo-ref"];
-    for (const branch of peelCombinators(node)) {
-        if (typeof branch["x-telo-ref"] === "string")
-            return branch["x-telo-ref"];
-    }
-    return undefined;
+        return [];
+    return readRefSlot(node)?.kinds ?? [];
 }
 /** Derive a `CompletionCtx` from the AST-resolved cursor (Approach B). The
  *  structural resolution lives in `resolveNodeAtPosition`; this only maps a

package/dist/hover/build-hover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-hover.d.ts","sourceRoot":"","sources":["../../src/hover/build-hover.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAoF/C,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,GAAG,SAAS,EACtC,IAAI,CAAC,EAAE,WAAW,EAAE,GACnB,WAAW,GAAG,SAAS,CAOzB"}
+{"version":3,"file":"build-hover.d.ts","sourceRoot":"","sources":["../../src/hover/build-hover.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAyF/C,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,GAAG,SAAS,EACtC,IAAI,CAAC,EAAE,WAAW,EAAE,GACnB,WAAW,GAAG,SAAS,CAOzB"}

package/dist/hover/build-hover.js

@@ -1,4 +1,4 @@
-import { parseToAst, } from "@telorun/analyzer";
+import { parseToAst, readRefSlot, } from "@telorun/analyzer";
 import { navigateSchema } from "../completions/detect-context.js";
 import { resolveNodeAtPosition, scalarString, } from "../completions/resolve-node.js";
 import { CAPABILITY_DOCS } from "../completions/valid-capabilities.js";
@@ -57,9 +57,13 @@ function fieldHover(keyName, field) {
     if (typeof field.description === "string" && field.description) {
         lines.push("", field.description);
     }
-    const ref = field["x-telo-ref"];
-    if (typeof ref === "string")
-        lines.push("", `Reference → \`${ref}\``);
+    // Through the shared accessor, so a slot whose constraint sits in an `anyOf`
+    // branch — or in a `kind:` list — hovers like any other. Reading the raw
+    // annotation here meant those slots showed no reference line at all.
+    const refKinds = readRefSlot(field)?.kinds ?? [];
+    if (refKinds.length > 0) {
+        lines.push("", `Reference → ${refKinds.map((k) => `\`${k}\``).join(" | ")}`);
+    }
     if (Array.isArray(field.enum) && field.enum.length > 0) {
         lines.push("", `Allowed: ${field.enum.map((v) => `\`${v}\``).join(", ")}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telorun/ide-support",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Editor-host-agnostic IDE support (completions, diagnostic normalization) for Telo manifests.",
   "keywords": [
     "telo",
@@ -36,7 +36,7 @@
     "src/**"
   ],
   "dependencies": {
-    "@telorun/analyzer": "0.52.0"
+    "@telorun/analyzer": "0.54.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",

package/src/completions/build.ts

@@ -1,7 +1,7 @@
 import { parseToAst, type AnalysisRegistry, type AstDocument, type AstMap } from "@telorun/analyzer";
 import type { CompletionResult, IdeEnvironmentAdapter } from "../types.js";
 import type { ReplaceRange } from "./detect-context.js";
-import { detectContext, lookupRefConstraint } from "./detect-context.js";
+import { detectContext, lookupRefConstraints } from "./detect-context.js";
 import { importSourceCompletions } from "./import-source.js";
 import { propKeyCompletions } from "./prop-keys.js";
 import { CAPABILITY_VALUES } from "./valid-capabilities.js";
@@ -47,7 +47,7 @@ function extractInFileResources(docs: AstDocument[]): ResourceRecord[] {
 function refNameCompletions(
   docs: AstDocument[],
   refKind: string | undefined,
-  refConstraint: string | undefined,
+  refConstraints: string[],
   registry: AnalysisRegistry | undefined,
   replaceRange: ReplaceRange,
 ): CompletionResult[] {
@@ -56,9 +56,14 @@ function refNameCompletions(
 
   if (refKind) {
     acceptable = new Set([refKind]);
-  } else if (refConstraint && registry) {
-    const kinds = registry.userFacingKindsForRef(refConstraint);
-    if (kinds) acceptable = new Set(kinds);
+  } else if (refConstraints.length > 0 && registry) {
+    // Union across the slot's accepted kinds: a resource satisfying any one of
+    // them fills the slot. A constraint the registry can't resolve contributes
+    // nothing rather than narrowing to the ones it could.
+    const resolved = refConstraints.map((c) => registry.userFacingKindsForRef(c));
+    if (resolved.some(Boolean)) {
+      acceptable = new Set(resolved.flatMap((kinds) => kinds ?? []));
+    }
   }
 
   const seen = new Set<string>();
@@ -90,12 +95,14 @@ function refConstrainedKinds(
 ): string[] | undefined {
   const definition = registry.resolveDefinition(parentDocKind);
   if (!definition?.schema) return undefined;
-  const refString = lookupRefConstraint(
+  const constraints = lookupRefConstraints(
     definition.schema as Record<string, any>,
     parentYamlPath,
   );
-  if (!refString) return undefined;
-  return registry.userFacingKindsForRef(refString);
+  if (constraints.length === 0) return undefined;
+  const resolved = constraints.map((c) => registry.userFacingKindsForRef(c));
+  if (!resolved.some(Boolean)) return undefined;
+  return [...new Set(resolved.flatMap((kinds) => kinds ?? []))];
 }
 
 function kindCompletions(
@@ -154,10 +161,10 @@ export async function buildCompletions(
   if (ctx.type === "capability") return capabilityCompletions();
   if (ctx.type === "ref-name") {
     const definition = registry?.resolveDefinition(ctx.docKind);
-    const refConstraint = definition?.schema
-      ? lookupRefConstraint(definition.schema as Record<string, any>, ctx.yamlPath)
-      : undefined;
-    return refNameCompletions(astDocs, ctx.refKind, refConstraint, registry, ctx.replaceRange);
+    const refConstraints = definition?.schema
+      ? lookupRefConstraints(definition.schema as Record<string, any>, ctx.yamlPath)
+      : [];
+    return refNameCompletions(astDocs, ctx.refKind, refConstraints, registry, ctx.replaceRange);
   }
   if (ctx.type === "field-value") {
     if (ctx.field === "import-source") {

package/src/completions/detect-context.ts

@@ -1,4 +1,4 @@
-import { parseToAst, type AstDocument } from "@telorun/analyzer";
+import { parseToAst, readRefSlot, refSlotAnnotation, type AstDocument } from "@telorun/analyzer";
 import type { ReplaceRange } from "../types.js";
 import { resolveNodeAtPosition } from "./resolve-node.js";
 
@@ -108,9 +108,12 @@ export function navigateSchema(
 /** Merge multiple peeled schema branches into one node for completion purposes.
  *  Property maps are unioned (first branch wins on key collision). `required`
  *  becomes the intersection so optional-in-any-branch keys still surface.
- *  `x-telo-ref` from the unpeeled parent is preserved so ref-aware lookups
- *  (`lookupRefConstraint`) still see the constraint when navigateSchema is
- *  called on a property that places the annotation alongside `anyOf`/`oneOf`. */
+ *
+ *  The parent's reference slot is re-stamped on the merged node, because peeling
+ *  is exactly what destroys it: for the canonical multi-kind shape
+ *  (`anyOf: [{x-telo-ref: A}, {x-telo-ref: B}]`) the constraint lives ONLY in the
+ *  branches, and merging them left a node declaring no slot at all. Re-emitted
+ *  through the analyzer's accessor so both annotation shapes survive the merge. */
 function unionLeaves(
   parent: Record<string, any>,
   leaves: Record<string, any>[],
@@ -135,7 +138,8 @@ function unionLeaves(
     );
   }
   const out: Record<string, any> = { type: "object", properties, required };
-  if (typeof parent["x-telo-ref"] === "string") out["x-telo-ref"] = parent["x-telo-ref"];
+  const slot = readRefSlot(parent);
+  if (slot && slot.kinds.length > 0) out["x-telo-ref"] = refSlotAnnotation(slot);
   return out;
 }
 
@@ -145,22 +149,21 @@ function unionLeaves(
  *  completion to discover what kind of resource the user is targeting in an
  *  object-form ref. Walking stops at the first line with a strictly smaller
  *  indent (that's the parent's structural boundary). */
-/** Looks up the `x-telo-ref` string carried by the schema node at `yamlPath`
- *  inside `definitionSchema`. Checks both the property node directly and its
- *  peeled `anyOf` / `oneOf` branches, since some library schemas place the
- *  annotation at the property level and others inside a branch. Returns
- *  `undefined` when the path doesn't resolve or no ref constraint is declared. */
-export function lookupRefConstraint(
+/** Every kind the `x-telo-ref` slot at `yamlPath` accepts, or an empty array
+ *  when the path doesn't resolve or declares no constraint.
+ *
+ *  All of them, not the first: a slot accepting `Invocable | Runnable` used to
+ *  complete only the invocables, because a single-constraint lookup stopped at
+ *  the first branch. The analyzer's accessor unions a `kind:` list and the
+ *  `anyOf` / `oneOf` branches alike, so completion now offers what the slot
+ *  actually takes. */
+export function lookupRefConstraints(
   definitionSchema: Record<string, any>,
   yamlPath: string[],
-): string | undefined {
+): string[] {
   const node = navigateSchema(definitionSchema, yamlPath);
-  if (!node) return undefined;
-  if (typeof node["x-telo-ref"] === "string") return node["x-telo-ref"];
-  for (const branch of peelCombinators(node)) {
-    if (typeof branch["x-telo-ref"] === "string") return branch["x-telo-ref"];
-  }
-  return undefined;
+  if (!node) return [];
+  return readRefSlot(node)?.kinds ?? [];
 }
 
 /** Derive a `CompletionCtx` from the AST-resolved cursor (Approach B). The

package/src/hover/build-hover.ts

@@ -1,5 +1,6 @@
 import {
   parseToAst,
+  readRefSlot,
   type AnalysisRegistry,
   type AstDocument,
 } from "@telorun/analyzer";
@@ -65,8 +66,13 @@ function fieldHover(keyName: string, field: Record<string, any>): string {
   if (typeof field.description === "string" && field.description) {
     lines.push("", field.description);
   }
-  const ref = field["x-telo-ref"];
-  if (typeof ref === "string") lines.push("", `Reference → \`${ref}\``);
+  // Through the shared accessor, so a slot whose constraint sits in an `anyOf`
+  // branch — or in a `kind:` list — hovers like any other. Reading the raw
+  // annotation here meant those slots showed no reference line at all.
+  const refKinds = readRefSlot(field)?.kinds ?? [];
+  if (refKinds.length > 0) {
+    lines.push("", `Reference → ${refKinds.map((k) => `\`${k}\``).join(" | ")}`);
+  }
   if (Array.isArray(field.enum) && field.enum.length > 0) {
     lines.push("", `Allowed: ${field.enum.map((v: unknown) => `\`${v}\``).join(", ")}`);
   }