@telorun/sdk 0.58.0 → 0.59.0

package/dist/dispatch-invoke-ref.d.ts

@@ -1,10 +1,20 @@
 import type { InvokeContext } from "./cancellation.js";
 import type { ModuleContext } from "./module-context.js";
+import type { KindRef } from "./ref.js";
+import { type RefResolveContext } from "./resolve-ref-instance.js";
 import { type ResourceInstance } from "./resource-instance.js";
 /** The context a decorator kind composes to dispatch its wrapped target. */
-export interface DispatchContext {
+export interface DispatchContext extends RefResolveContext {
     invokeResolved<TInputs>(kind: string, name: string, instance: ResourceInstance, inputs: TInputs, ctx?: InvokeContext): Promise<unknown>;
     readonly moduleContext: ModuleContext;
+    /**
+     * Normalize a slot value to a {@link KindRef}: a `!ref` sentinel, an inline
+     * definition, or an already-normalized ref. Optional only so a caller holding
+     * a hand-built context still satisfies the interface — supply it whenever the
+     * slot can hold a value Phase 2.5 did not rewrite, which is every slot inside
+     * an `x-telo-scope` array.
+     */
+    ensureKindRef?(value: unknown): KindRef;
 }
 /**
  * Resolve a decorator's `invoke:` field to a live invocable and return a thunk

package/dist/dispatch-invoke-ref.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatch-invoke-ref.d.ts","sourceRoot":"","sources":["../src/dispatch-invoke-ref.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGzD,OAAO,EAAkB,KAAK,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/E,4EAA4E;AAC5E,MAAM,WAAW,eAAe;IAC9B,cAAc,CAAC,OAAO,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,OAAO,EACf,GAAG,CAAC,EAAE,aAAa,GAClB,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;CACvC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,eAAe,EACpB,QAAQ,EAAE,MAAM,MAAM,GACrB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC,CAgBlF"}
+{"version":3,"file":"dispatch-invoke-ref.d.ts","sourceRoot":"","sources":["../src/dispatch-invoke-ref.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAsB,KAAK,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACvF,OAAO,EAAkB,KAAK,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/E,4EAA4E;AAC5E,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,cAAc,CAAC,OAAO,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,OAAO,EACf,GAAG,CAAC,EAAE,aAAa,GAClB,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC;;;;;;OAMG;IACH,aAAa,CAAC,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC;CACzC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,eAAe,EACpB,QAAQ,EAAE,MAAM,MAAM,GACrB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC,CAyBlF"}

package/dist/dispatch-invoke-ref.js

@@ -12,10 +12,18 @@ import { getRefIdentity } from "./resource-instance.js";
  * invocation context applies unchanged.
  */
 export function resolveInvocableDispatcher(field, ctx, describe) {
-    const target = resolveRefInstance(field, ctx, isInvocableInstance, () => `${describe()}: 'invoke'`, "Telo.Invocable");
+    // A `!ref` inside an `x-telo-scope` array is never rewritten by Phase 2.5, so it
+    // arrives as the raw sentinel — which has no `name` and would otherwise fail with
+    // a message pointing nowhere. `ensureKindRef` is the same rescue `ctx.resolveRef`
+    // performs; both resolution paths have to normalize, or a slot works only
+    // depending on which one its kind happens to use.
+    const normalized = ctx.ensureKindRef && field !== null && typeof field === "object" && !isInvocableInstance(field)
+        ? ctx.ensureKindRef(field)
+        : field;
+    const target = resolveRefInstance(normalized, ctx, isInvocableInstance, () => `${describe()}: 'invoke'`, "Telo.Invocable");
     // Dispatch through the traced chokepoint needs the target's kind+name: from
-    // the `!ref` identity the kernel stamped at injection, else from the raw ref.
-    const id = getRefIdentity(target) ?? field;
+    // the `!ref` identity the kernel stamped at injection, else from the ref.
+    const id = getRefIdentity(target) ?? normalized;
     if (!id || typeof id.kind !== "string" || typeof id.name !== "string") {
         return (inputs, invokeCtx) => target.invoke(inputs, invokeCtx);
     }

package/dist/resolve-ref-instance.d.ts

@@ -1,7 +1,17 @@
 import type { ModuleContext } from "./module-context.js";
+import type { ResourceInstance } from "./resource-instance.js";
 /** The slice of `ResourceContext` needed to resolve a reference. */
 export interface RefResolveContext {
     readonly moduleContext: ModuleContext;
+    /**
+     * Resolve a bare name with the caller's own precedence — scope-local first,
+     * enclosing module as the fallback. Optional: a caller holding only a
+     * `{ moduleContext }` slice has no scope to prefer, and falls back to the
+     * module. Supplying it is what lets a `with:`-scoped resource reference a
+     * scoped sibling, and keeps `!ref` agreeing with the CEL `resources` layering
+     * about what a name means inside a scope.
+     */
+    resolveLocalInstance?(name: string): ResourceInstance | undefined;
 }
 /**
  * Resolve a `!ref` config field to a live instance of `T`. Controllers reach

package/dist/resolve-ref-instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-ref-instance.d.ts","sourceRoot":"","sources":["../src/resolve-ref-instance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIzD,oEAAoE;AACpE,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;CACvC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAClC,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,SAAS,IAAI,CAAC,EAC7C,QAAQ,EAAE,MAAM,MAAM,EACtB,OAAO,CAAC,EAAE,MAAM,GACf,CAAC,CAiCH"}
+{"version":3,"file":"resolve-ref-instance.d.ts","sourceRoot":"","sources":["../src/resolve-ref-instance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG/D,oEAAoE;AACpE,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC;;;;;;;OAOG;IACH,oBAAoB,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAAC;CACnE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAClC,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,SAAS,IAAI,CAAC,EAC7C,QAAQ,EAAE,MAAM,MAAM,EACtB,OAAO,CAAC,EAAE,MAAM,GACf,CAAC,CAiCH"}

package/dist/resolve-ref-instance.js

@@ -47,7 +47,7 @@ export function resolveRefInstance(value, ctx, guard, describe, expects) {
     // it is an alias that crosses no import boundary.
     const instance = ref.alias && ref.alias !== "Self"
         ? ctx.moduleContext.resolveImportedInstance(ref.alias, ref.name)
-        : ctx.moduleContext.getInstance(ref.name);
+        : (ctx.resolveLocalInstance?.(ref.name) ?? ctx.moduleContext.getInstance(ref.name));
     if (!guard(instance)) {
         const label = ref.alias ? `${ref.alias}.${ref.name}` : ref.name;
         throw new RuntimeError("ERR_REF_UNRESOLVED", `${describe()} reference '${label}' did not resolve to a ${target}` +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telorun/sdk",
-  "version": "0.58.0",
+  "version": "0.59.0",
   "description": "Telo SDK - Public API for Telo module authors.",
   "keywords": [
     "telo",

package/src/dispatch-invoke-ref.ts

@@ -2,11 +2,11 @@ import type { InvokeContext } from "./cancellation.js";
 import type { Invocable } from "./capabilities/invokable.js";
 import type { ModuleContext } from "./module-context.js";
 import type { KindRef } from "./ref.js";
-import { resolveRefInstance } from "./resolve-ref-instance.js";
+import { resolveRefInstance, type RefResolveContext } from "./resolve-ref-instance.js";
 import { getRefIdentity, type ResourceInstance } from "./resource-instance.js";
 
 /** The context a decorator kind composes to dispatch its wrapped target. */
-export interface DispatchContext {
+export interface DispatchContext extends RefResolveContext {
   invokeResolved<TInputs>(
     kind: string,
     name: string,
@@ -15,6 +15,14 @@ export interface DispatchContext {
     ctx?: InvokeContext,
   ): Promise<unknown>;
   readonly moduleContext: ModuleContext;
+  /**
+   * Normalize a slot value to a {@link KindRef}: a `!ref` sentinel, an inline
+   * definition, or an already-normalized ref. Optional only so a caller holding
+   * a hand-built context still satisfies the interface — supply it whenever the
+   * slot can hold a value Phase 2.5 did not rewrite, which is every slot inside
+   * an `x-telo-scope` array.
+   */
+  ensureKindRef?(value: unknown): KindRef;
 }
 
 /**
@@ -33,16 +41,25 @@ export function resolveInvocableDispatcher(
   ctx: DispatchContext,
   describe: () => string,
 ): (inputs: Record<string, unknown>, invokeCtx?: InvokeContext) => Promise<unknown> {
+  // A `!ref` inside an `x-telo-scope` array is never rewritten by Phase 2.5, so it
+  // arrives as the raw sentinel — which has no `name` and would otherwise fail with
+  // a message pointing nowhere. `ensureKindRef` is the same rescue `ctx.resolveRef`
+  // performs; both resolution paths have to normalize, or a slot works only
+  // depending on which one its kind happens to use.
+  const normalized =
+    ctx.ensureKindRef && field !== null && typeof field === "object" && !isInvocableInstance(field)
+      ? ctx.ensureKindRef(field)
+      : field;
   const target = resolveRefInstance(
-    field,
+    normalized,
     ctx,
     isInvocableInstance,
     () => `${describe()}: 'invoke'`,
     "Telo.Invocable",
   );
   // Dispatch through the traced chokepoint needs the target's kind+name: from
-  // the `!ref` identity the kernel stamped at injection, else from the raw ref.
-  const id = getRefIdentity(target as object) ?? (field as Partial<KindRef> | undefined);
+  // the `!ref` identity the kernel stamped at injection, else from the ref.
+  const id = getRefIdentity(target as object) ?? (normalized as Partial<KindRef> | undefined);
   if (!id || typeof id.kind !== "string" || typeof id.name !== "string") {
     return (inputs, invokeCtx) => target.invoke(inputs, invokeCtx);
   }

package/src/resolve-ref-instance.ts

@@ -1,10 +1,20 @@
 import type { ModuleContext } from "./module-context.js";
 import type { KindRef } from "./ref.js";
+import type { ResourceInstance } from "./resource-instance.js";
 import { RuntimeError } from "./types.js";
 
 /** The slice of `ResourceContext` needed to resolve a reference. */
 export interface RefResolveContext {
   readonly moduleContext: ModuleContext;
+  /**
+   * Resolve a bare name with the caller's own precedence — scope-local first,
+   * enclosing module as the fallback. Optional: a caller holding only a
+   * `{ moduleContext }` slice has no scope to prefer, and falls back to the
+   * module. Supplying it is what lets a `with:`-scoped resource reference a
+   * scoped sibling, and keeps `!ref` agreeing with the CEL `resources` layering
+   * about what a name means inside a scope.
+   */
+  resolveLocalInstance?(name: string): ResourceInstance | undefined;
 }
 
 /**
@@ -67,7 +77,7 @@ export function resolveRefInstance<T>(
   const instance =
     ref.alias && ref.alias !== "Self"
       ? ctx.moduleContext.resolveImportedInstance(ref.alias, ref.name)
-      : ctx.moduleContext.getInstance(ref.name);
+      : (ctx.resolveLocalInstance?.(ref.name) ?? ctx.moduleContext.getInstance(ref.name));
 
   if (!guard(instance)) {
     const label = ref.alias ? `${ref.alias}.${ref.name}` : ref.name;