@telorun/analyzer 0.3.0 → 0.5.0

package/README.md

@@ -1,7 +1,3 @@
----
-description: "Telo: YAML-driven execution engine for declarative backends with micro-kernel architecture and language-agnostic design"
----
-
 # ⚡ Telo
 
 Runtime for declarative backends.

package/dist/analyzer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyzer.d.ts","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAa9B,OAAO,EAAsB,KAAK,kBAAkB,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAsP/F,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;gBAEzB,OAAO,GAAE,qBAA0B;IAI/C,OAAO,CACL,SAAS,EAAE,gBAAgB,EAAE,EAC7B,OAAO,CAAC,EAAE,eAAe,EACzB,QAAQ,CAAC,EAAE,gBAAgB,GAC1B,kBAAkB,EAAE;IAsPvB,aAAa,CACX,SAAS,EAAE,gBAAgB,EAAE,EAC7B,OAAO,CAAC,EAAE,eAAe,EACzB,QAAQ,CAAC,EAAE,gBAAgB,GAC1B,kBAAkB,EAAE;IAMvB,SAAS,CAAC,SAAS,EAAE,gBAAgB,EAAE,EAAE,QAAQ,EAAE,gBAAgB,GAAG,gBAAgB,EAAE;IAKxF,OAAO,CACL,SAAS,EAAE,gBAAgB,EAAE,EAC7B,QAAQ,EAAE,gBAAgB,GACzB;QAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE;CAiB5F"}
+{"version":3,"file":"analyzer.d.ts","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAa9B,OAAO,EAAsB,KAAK,kBAAkB,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAuP/F,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;gBAEzB,OAAO,GAAE,qBAA0B;IAI/C,OAAO,CACL,SAAS,EAAE,gBAAgB,EAAE,EAC7B,OAAO,CAAC,EAAE,eAAe,EACzB,QAAQ,CAAC,EAAE,gBAAgB,GAC1B,kBAAkB,EAAE;IAsSvB,aAAa,CACX,SAAS,EAAE,gBAAgB,EAAE,EAC7B,OAAO,CAAC,EAAE,eAAe,EACzB,QAAQ,CAAC,EAAE,gBAAgB,GAC1B,kBAAkB,EAAE;IAMvB,SAAS,CAAC,SAAS,EAAE,gBAAgB,EAAE,EAAE,QAAQ,EAAE,gBAAgB,GAAG,gBAAgB,EAAE;IAKxF,OAAO,CACL,SAAS,EAAE,gBAAgB,EAAE,EAC7B,QAAQ,EAAE,gBAAgB,GACzB;QAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE;CAiB5F"}

package/dist/analyzer.js

@@ -9,6 +9,7 @@ import { normalizeInlineResources } from "./normalize-inline-resources.js";
 import { celTypeSatisfiesJsonSchema, substituteCelFields, validateAgainstSchema, } from "./schema-compat.js";
 import { DiagnosticSeverity } from "./types.js";
 import { extractAccessChains, getManifestItem, pathMatchesScope, resolveContextAnnotations, resolveTypeFieldToSchema, validateChainAgainstSchema, } from "./validate-cel-context.js";
+import { validateExtends } from "./validate-extends.js";
 import { validateReferences } from "./validate-references.js";
 import { validateThrowsCoverage } from "./validate-throws-coverage.js";
 const TEMPLATE_REGEX = /\$\{\{\s*([^}]+?)\s*\}\}/g;
@@ -210,9 +211,24 @@ export class StaticAnalyzer {
         // Register module identities and aliases.
         // The root module doc (Telo.Application or Telo.Library) provides its own
         // identity; imported modules surface their identity via resolvedModuleName/
-        // resolvedNamespace stamped onto the Telo.Import by the loader (so we don't
-        // need to include imported module manifests in the analysis set, avoiding false
-        // reference errors in the parent context).
+        // resolvedNamespace stamped onto the Telo.Import by the loader.
+        //
+        // Two alias scopes are tracked:
+        //  - `aliases` — the consumer's aliases, populated from Telo.Imports declared in
+        //    the entry manifest (its own module).
+        //  - `aliasesByModule` — per-imported-library aliases, populated from Telo.Imports
+        //    forwarded by the loader from inside imported libraries. A library may use
+        //    different alias names than the consumer for the same dependency; resolving
+        //    a forwarded def's `extends` / `capability` against the consumer's scope
+        //    would either fail or pick the wrong target. Each forwarded def is normalized
+        //    in its own library's scope.
+        const rootModules = new Set();
+        for (const m of manifests) {
+            if (isModuleKind(m.kind) && m.metadata?.name) {
+                rootModules.add(m.metadata.name);
+            }
+        }
+        const aliasesByModule = new Map();
         for (const m of manifests) {
             if (isModuleKind(m.kind)) {
                 const namespace = m.metadata.namespace ?? null;
@@ -226,26 +242,58 @@ export class StaticAnalyzer {
                 const exportedKinds = m.exports?.kinds ?? [];
                 const resolvedModuleName = m.metadata.resolvedModuleName;
                 const resolvedNamespace = m.metadata.resolvedNamespace;
+                const ownModule = m.metadata?.module;
                 if (alias && source) {
                     const targetModule = resolvedModuleName ?? source.split("/").filter(Boolean).pop() ?? source;
-                    aliases.registerImport(alias, targetModule, exportedKinds);
+                    // Module identity is registered globally so x-telo-ref resolution sees
+                    // transitively-imported modules regardless of which scope brought them in.
                     if (resolvedModuleName) {
                         defs.registerModuleIdentity(resolvedNamespace ?? null, resolvedModuleName);
                     }
+                    // Alias registration is scoped: consumer imports vs. imported-library imports.
+                    if (!ownModule || rootModules.has(ownModule)) {
+                        aliases.registerImport(alias, targetModule, exportedKinds);
+                    }
+                    else {
+                        let libResolver = aliasesByModule.get(ownModule);
+                        if (!libResolver) {
+                            libResolver = new AliasResolver();
+                            aliasesByModule.set(ownModule, libResolver);
+                        }
+                        libResolver.registerImport(alias, targetModule, exportedKinds);
+                    }
                 }
             }
         }
-        // Register definitions from Telo.Definition resources.
-        // Normalize alias-prefixed `capability` to canonical form so extendedBy lookup works
-        // (e.g. "Workflow.Backend" → "workflow.Backend" when "Workflow" is a known alias).
+        // Register definitions from Telo.Definition AND Telo.Abstract resources.
+        // Abstracts declare contracts that implementations target via `extends` (canonical)
+        // or `capability: <AbstractKind>` (legacy). Until they're registered, validateReferences
+        // can't resolve x-telo-ref entries pointing at library-declared abstracts — so abstracts
+        // must go through register() too, not just the kernel builtins in the constructor.
+        //
+        // Normalize alias-prefixed `capability` and `extends` to canonical form using the
+        // declaring scope's resolver, so `extendedBy` is keyed by canonical kind regardless
+        // of alias choices. `capability` covers the legacy implements-this-abstract overload;
+        // `extends` is the canonical first-class form.
         for (const m of manifests) {
-            if (m.kind === "Telo.Definition") {
-                const def = m;
-                const resolvedCapability = def.capability
-                    ? (aliases.resolveKind(def.capability) ?? def.capability)
-                    : def.capability;
-                defs.register(resolvedCapability !== def.capability ? { ...def, capability: resolvedCapability } : def);
-            }
+            if (m.kind !== "Telo.Definition" && m.kind !== "Telo.Abstract")
+                continue;
+            const def = m;
+            const ownModule = def.metadata?.module;
+            const scopeResolver = ownModule && !rootModules.has(ownModule)
+                ? (aliasesByModule.get(ownModule) ?? new AliasResolver())
+                : aliases;
+            const resolvedCapability = def.capability
+                ? (scopeResolver.resolveKind(def.capability) ?? def.capability)
+                : def.capability;
+            const resolvedExtends = def.extends
+                ? (scopeResolver.resolveKind(def.extends) ?? def.extends)
+                : def.extends;
+            const needsPatch = resolvedCapability !== def.capability || resolvedExtends !== def.extends;
+            const normalized = needsPatch
+                ? { ...def, capability: resolvedCapability, extends: resolvedExtends }
+                : def;
+            defs.register(normalized);
         }
         // Phase 2: extract inline resources from x-telo-ref slots into first-class manifests
         const allManifests = normalizeInlineResources(manifests, defs, aliases);
@@ -401,6 +449,8 @@ export class StaticAnalyzer {
         }
         // Validate resource references (Phase 3)
         diagnostics.push(...validateReferences(allManifests, { aliases, definitions: defs }));
+        // Validate `extends` fields and flag legacy `capability: <UserAbstract>` overload.
+        diagnostics.push(...validateExtends(allManifests, defs, aliases));
         // Validate throws: declarations and catches: coverage (rules 1, 2, 4, 7)
         diagnostics.push(...validateThrowsCoverage(allManifests, defs, aliases, this.celEnv));
         return diagnostics;

package/dist/builtins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builtins.d.ts","sourceRoot":"","sources":["../src/builtins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,eAAO,MAAM,eAAe,EAAE,kBAAkB,EA4I/C,CAAC"}
+{"version":3,"file":"builtins.d.ts","sourceRoot":"","sources":["../src/builtins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,eAAO,MAAM,eAAe,EAAE,kBAAkB,EAsJ/C,CAAC"}

package/dist/builtins.js

@@ -25,9 +25,13 @@ export const KERNEL_BUILTINS = [
                     additionalProperties: true,
                 },
                 capability: { type: "string" },
+                schema: { type: "object", additionalProperties: true },
             },
             required: ["metadata"],
-            additionalProperties: false,
+            // Telo.Abstract is an extension point by design — it must accept forward-compatible
+            // fields (e.g. inputType/outputType from the typed-abstracts plan) without requiring
+            // the analyzer to enumerate them here.
+            additionalProperties: true,
         },
     },
     {
@@ -53,6 +57,12 @@ export const KERNEL_BUILTINS = [
                 source: { type: "string" },
                 variables: { type: "object" },
                 secrets: { type: "object" },
+                runtime: {
+                    oneOf: [
+                        { type: "string" },
+                        { type: "array", items: { type: "string" } },
+                    ],
+                },
             },
             required: ["metadata", "source"],
             additionalProperties: false,

package/dist/definition-registry.d.ts

@@ -20,6 +20,7 @@ export declare class DefinitionRegistry {
      *  Used to compute definition $id values for the AJV schema store. */
     private readonly reverseIdentityMap;
     register(definition: ResourceDefinition): void;
+    private addExtendedBy;
     /** Register a module identity for x-telo-ref resolution.
      *  Call once per module doc (Telo.Application or Telo.Library) when the manifest is loaded.
      *  @param namespace  The module's metadata.namespace (e.g. "std"), or null for telo built-ins.

package/dist/definition-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definition-registry.d.ts","sourceRoot":"","sources":["../src/definition-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,OAAO,EAA0B,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG1F,+EAA+E;AAC/E,qBAAa,kBAAkB;;IAK7B;;sFAEkF;IAClF,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqB;IAEzD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAyC;IAC9D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAwC;IAClE,mEAAmE;IACnE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA+B;IAC1D;6DACyD;IACzD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IACzD;;0EAEsE;IACtE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6B;IAEhE,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,IAAI;IAwB9C;;;yFAGqF;IACrF,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAgB1E;4EACwE;IACxE,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAMnE;wFACoF;IACpF,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EAAE;IAWtE,OAAO,CAAC,iBAAiB;IAczB;;;;;;;;4FAQwF;IACxF,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAUhD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAIrD,+FAA+F;IAC/F,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIxD,gGAAgG;IAChG,kBAAkB,CAChB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,GACvD,iBAAiB,GAAG,SAAS;IAOhC;;qEAEiE;IACjE,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,kBAAkB,EAAE;IAgBxD,KAAK,IAAI,MAAM,EAAE;CAGlB"}
+{"version":3,"file":"definition-registry.d.ts","sourceRoot":"","sources":["../src/definition-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,OAAO,EAA0B,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG1F,+EAA+E;AAC/E,qBAAa,kBAAkB;;IAK7B;;sFAEkF;IAClF,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqB;IAEzD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAyC;IAC9D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAwC;IAClE,mEAAmE;IACnE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA+B;IAC1D;6DACyD;IACzD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IACzD;;0EAEsE;IACtE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6B;IAEhE,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,IAAI;IAiC9C,OAAO,CAAC,aAAa;IASrB;;;yFAGqF;IACrF,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAgB1E;4EACwE;IACxE,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAMnE;wFACoF;IACpF,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EAAE;IAWtE,OAAO,CAAC,iBAAiB;IAczB;;;;;;;;4FAQwF;IACxF,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAUhD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAIrD,+FAA+F;IAC/F,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIxD,gGAAgG;IAChG,kBAAkB,CAChB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,GACvD,iBAAiB,GAAG,SAAS;IAOhC;;qEAEiE;IACjE,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,kBAAkB,EAAE;IAgBxD,KAAK,IAAI,MAAM,EAAE;CAGlB"}

package/dist/definition-registry.js

@@ -28,14 +28,22 @@ export class DefinitionRegistry {
         const key = mod ? `${mod}.${name}` : name;
         this.defs.set(key, definition);
         this.fieldMaps.set(key, buildReferenceFieldMap(definition.schema ?? {}));
+        // `capability` populates extendedBy for backward-compat with the legacy pattern where
+        // a concrete definition overloaded `capability: <AbstractKind>` to mean "implements
+        // this abstract." The canonical pattern is `extends` (below). Both populate the index,
+        // unioned — so in-flight modules pre-migration keep working.
         if (definition.capability) {
-            const children = this.extendedBy.get(definition.capability);
-            if (children) {
-                children.push(key);
-            }
-            else {
-                this.extendedBy.set(definition.capability, [key]);
-            }
+            this.addExtendedBy(definition.capability, key);
+        }
+        // `extends` — first-class "implements-this-abstract" edge. Alias-form resolution
+        // happens in the analyzer before register() is called (analyzer.ts pre-resolves
+        // via aliases.resolveKind), so the value here is already the canonical kind string
+        // (e.g. "workflow.Backend"). If the analyzer could not resolve the alias (partial
+        // context, or the declaring file doesn't import the target's alias), the value
+        // stays as the original alias-prefixed form; validateExtends emits EXTENDS_MALFORMED
+        // or EXTENDS_UNKNOWN_TARGET depending on the case.
+        if (definition.extends) {
+            this.addExtendedBy(definition.extends, key);
         }
         // Auto-register the telo identity when any Telo built-in is registered.
         if (definition.kind === "Telo.Abstract" && mod === "Telo") {
@@ -47,6 +55,16 @@ export class DefinitionRegistry {
             this.tryRegisterSchema(mod, name, definition.schema);
         }
     }
+    addExtendedBy(parent, child) {
+        const children = this.extendedBy.get(parent);
+        if (children) {
+            if (!children.includes(child))
+                children.push(child);
+        }
+        else {
+            this.extendedBy.set(parent, [child]);
+        }
+    }
     /** Register a module identity for x-telo-ref resolution.
      *  Call once per module doc (Telo.Application or Telo.Library) when the manifest is loaded.
      *  @param namespace  The module's metadata.namespace (e.g. "std"), or null for telo built-ins.

package/dist/index.d.ts

@@ -1,10 +1,10 @@
-export { HttpAdapter } from "./adapters/http-adapter.js";
-export { RegistryAdapter } from "./adapters/registry-adapter.js";
 export { AnalysisRegistry } from "./analysis-registry.js";
 export { StaticAnalyzer } from "./analyzer.js";
 export { Loader } from "./manifest-loader.js";
-export { MODULE_KINDS, isModuleKind } from "./module-kinds.js";
+export { isModuleKind, MODULE_KINDS } from "./module-kinds.js";
 export type { ModuleKind } from "./module-kinds.js";
+export { HttpSource } from "./sources/http-source.js";
+export { RegistrySource } from "./sources/registry-source.js";
 export { DEFAULT_MANIFEST_FILENAME, DiagnosticSeverity } from "./types.js";
-export type { AnalysisDiagnostic, AnalysisOptions, LoaderInitOptions, LoadOptions, ManifestAdapter, Position, PositionIndex, Range } from "./types.js";
+export type { AnalysisDiagnostic, AnalysisOptions, LoaderInitOptions, LoadOptions, ManifestSource, Position, PositionIndex, Range } from "./types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC/D,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC3E,YAAY,EACR,kBAAkB,EAClB,eAAe,EAAE,iBAAiB,EAAE,WAAW,EAAE,eAAe,EAChE,QAAQ,EACR,aAAa,EACb,KAAK,EACR,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC/D,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC3E,YAAY,EACR,kBAAkB,EAClB,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,cAAc,EACd,QAAQ,EACR,aAAa,EACb,KAAK,EACR,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -1,7 +1,7 @@
-export { HttpAdapter } from "./adapters/http-adapter.js";
-export { RegistryAdapter } from "./adapters/registry-adapter.js";
 export { AnalysisRegistry } from "./analysis-registry.js";
 export { StaticAnalyzer } from "./analyzer.js";
 export { Loader } from "./manifest-loader.js";
-export { MODULE_KINDS, isModuleKind } from "./module-kinds.js";
+export { isModuleKind, MODULE_KINDS } from "./module-kinds.js";
+export { HttpSource } from "./sources/http-source.js";
+export { RegistrySource } from "./sources/registry-source.js";
 export { DEFAULT_MANIFEST_FILENAME, DiagnosticSeverity } from "./types.js";

package/dist/manifest-loader.d.ts

@@ -1,11 +1,11 @@
 import { type ResourceManifest } from "@telorun/sdk";
-import { type LoadOptions, type LoaderInitOptions, type ManifestAdapter } from "./types.js";
+import { type LoadOptions, type LoaderInitOptions, type ManifestSource } from "./types.js";
 export declare class Loader {
-    private static readonly moduleCache;
-    protected adapters: ManifestAdapter[];
+    private readonly moduleCache;
+    protected sources: ManifestSource[];
     private readonly celEnv;
-    constructor(extraAdaptersOrOptions?: ManifestAdapter[] | LoaderInitOptions);
-    register(adapter: ManifestAdapter): this;
+    constructor(extraSourcesOrOptions?: ManifestSource[] | LoaderInitOptions);
+    register(source: ManifestSource): this;
     private pick;
     resolveEntryPoint(url: string): Promise<string>;
     loadModule(url: string, options?: LoadOptions): Promise<ResourceManifest[]>;

package/dist/manifest-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest-loader.d.ts","sourceRoot":"","sources":["../src/manifest-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAOtE,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,eAAe,EAGrB,MAAM,YAAY,CAAC;AASpB,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAG/B;IAEJ,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAC;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;gBAEzB,sBAAsB,GAAE,eAAe,EAAE,GAAG,iBAAsB;IAmB9E,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAKxC,OAAO,CAAC,IAAI;IAMN,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK/C,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAqGnE,eAAe;YAoBf,eAAe;IAgEvB,iBAAiB,CACrB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QACT,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,gBAAgB,EAAE,CAAC;QAC9B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;KAClD,GAAG,IAAI,CAAC;IAiCH,eAAe,CACnB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,GAC5C,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAsCrC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAiEnE"}
+{"version":3,"file":"manifest-loader.d.ts","sourceRoot":"","sources":["../src/manifest-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAOtE,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGpB,MAAM,YAAY,CAAC;AASpB,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAGxB;IAEJ,SAAS,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;gBAEzB,qBAAqB,GAAE,cAAc,EAAE,GAAG,iBAAsB;IAmB5E,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI;IAKtC,OAAO,CAAC,IAAI;IAMN,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK/C,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAqGnE,eAAe;YAoBf,eAAe;IAgEvB,iBAAiB,CACrB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QACT,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,gBAAgB,EAAE,CAAC;QAC9B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;KAClD,GAAG,IAAI,CAAC;IAiCH,eAAe,CACnB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,GAC5C,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAsCrC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CA2GnE"}

package/dist/manifest-loader.js

@@ -1,7 +1,7 @@
 import { isCompiledValue } from "@telorun/sdk";
 import { isMap, isPair, isScalar, isSeq, parseAllDocuments } from "yaml";
-import { HttpAdapter } from "./adapters/http-adapter.js";
-import { RegistryAdapter } from "./adapters/registry-adapter.js";
+import { HttpSource } from "./sources/http-source.js";
+import { RegistrySource } from "./sources/registry-source.js";
 import { buildCelEnvironment } from "./cel-environment.js";
 import { isModuleKind } from "./module-kinds.js";
 import { precompileDoc } from "./precompile.js";
@@ -13,34 +13,34 @@ const SYSTEM_KINDS = new Set([
     "Telo.Definition",
 ]);
 export class Loader {
-    static moduleCache = new Map();
-    adapters;
+    moduleCache = new Map();
+    sources;
     celEnv;
-    constructor(extraAdaptersOrOptions = []) {
-        const options = Array.isArray(extraAdaptersOrOptions)
-            ? { extraAdapters: extraAdaptersOrOptions }
-            : extraAdaptersOrOptions;
-        const includeHttpAdapter = options.includeHttpAdapter ?? true;
-        const includeRegistryAdapter = options.includeRegistryAdapter ?? true;
-        this.adapters = [];
-        if (includeHttpAdapter)
-            this.adapters.push(new HttpAdapter());
-        if (includeRegistryAdapter)
-            this.adapters.push(new RegistryAdapter(options.registryUrl));
-        if (options.extraAdapters?.length) {
-            this.adapters.unshift(...options.extraAdapters);
+    constructor(extraSourcesOrOptions = []) {
+        const options = Array.isArray(extraSourcesOrOptions)
+            ? { extraSources: extraSourcesOrOptions }
+            : extraSourcesOrOptions;
+        const includeHttpSource = options.includeHttpSource ?? true;
+        const includeRegistrySource = options.includeRegistrySource ?? true;
+        this.sources = [];
+        if (includeHttpSource)
+            this.sources.push(new HttpSource());
+        if (includeRegistrySource)
+            this.sources.push(new RegistrySource(options.registryUrl));
+        if (options.extraSources?.length) {
+            this.sources.unshift(...options.extraSources);
         }
         this.celEnv = buildCelEnvironment(options.celHandlers);
     }
-    register(adapter) {
-        this.adapters.unshift(adapter);
+    register(source) {
+        this.sources.unshift(source);
         return this;
     }
     pick(url) {
-        const a = this.adapters.find((a) => a.supports(url));
-        if (!a)
-            throw new Error(`No adapter found for: ${url}`);
-        return a;
+        const s = this.sources.find((s) => s.supports(url));
+        if (!s)
+            throw new Error(`No source found for: ${url}`);
+        return s;
     }
     async resolveEntryPoint(url) {
         const { source } = await this.pick(url).read(url);
@@ -49,7 +49,7 @@ export class Loader {
     async loadModule(url, options) {
         const { text, source } = await this.pick(url).read(url);
         const cacheKey = `${options?.compile ? "compiled" : "raw"}:${source}`;
-        const cached = Loader.moduleCache.get(cacheKey);
+        const cached = this.moduleCache.get(cacheKey);
         if (cached && cached.text === text) {
             return cloneManifestArray(cached.manifests);
         }
@@ -126,8 +126,8 @@ export class Loader {
             const includePatterns = moduleManifest.include;
             if (includePatterns?.length) {
                 hasIncludes = true;
-                const adapter = this.pick(source);
-                const includedFiles = await this.resolveIncludes(source, includePatterns, adapter);
+                const picked = this.pick(source);
+                const includedFiles = await this.resolveIncludes(source, includePatterns, picked);
                 for (const includedUrl of includedFiles) {
                     const partialManifests = await this.loadPartialFile(includedUrl, moduleName, options);
                     resolved.push(...partialManifests);
@@ -135,22 +135,22 @@ export class Loader {
             }
         }
         if (!hasIncludes) {
-            Loader.moduleCache.set(cacheKey, { text, manifests: resolved });
+            this.moduleCache.set(cacheKey, { text, manifests: resolved });
         }
         return cloneManifestArray(resolved);
     }
-    async resolveIncludes(ownerSource, patterns, adapter) {
+    async resolveIncludes(ownerSource, patterns, source) {
         const hasGlobs = patterns.some((p) => /[*?{}\[\]]/.test(p));
         if (hasGlobs) {
-            if (!adapter.expandGlob) {
-                throw new Error(`Include patterns in '${ownerSource}' contain globs but the adapter for this source ` +
+            if (!source.expandGlob) {
+                throw new Error(`Include patterns in '${ownerSource}' contain globs but the source for this URL ` +
                     `does not support glob expansion. Use explicit file paths instead of patterns like: ` +
                     patterns.filter((p) => /[*?{}\[\]]/.test(p)).join(", "));
             }
-            return adapter.expandGlob(ownerSource, patterns);
+            return source.expandGlob(ownerSource, patterns);
         }
         // Literal relative paths — deduplicate in case the same file appears under multiple patterns.
-        return [...new Set(patterns.map((p) => adapter.resolveRelative(ownerSource, p)))];
+        return [...new Set(patterns.map((p) => source.resolveRelative(ownerSource, p)))];
     }
     async loadPartialFile(url, ownerModuleName, options) {
         const { text, source } = await this.pick(url).read(url);
@@ -228,10 +228,10 @@ export class Loader {
             // Otherwise fall through to owner lookup — this is likely a partial file
         }
         // Find the owning telo.yaml via parent-directory traversal
-        const adapter = this.pick(fileUrl);
-        if (!adapter.resolveOwnerOf)
+        const source = this.pick(fileUrl);
+        if (!source.resolveOwnerOf)
             return null;
-        const ownerUrl = await adapter.resolveOwnerOf(fileUrl);
+        const ownerUrl = await source.resolveOwnerOf(fileUrl);
         if (!ownerUrl)
             return null;
         // Load the owner module (which will load included files via include expansion)
@@ -277,7 +277,30 @@ export class Loader {
     }
     async loadManifests(entryUrl) {
         const visited = new Set([entryUrl]);
+        // Cache resolved library identity per import URL so a Telo.Import re-encountered
+        // through a different chain still gets `resolvedModuleName` / `resolvedNamespace`
+        // stamped — without re-loading the target. The early `visited` short-circuit used
+        // to silently leave duplicate Telo.Imports unstamped, which broke alias resolution
+        // when the same library was imported by two different files in the same analysis set.
+        const libraryIdentityByUrl = new Map();
         const entry = await this.loadModule(entryUrl);
+        // Forward Telo.Definition, Telo.Abstract, AND Telo.Import docs from imported
+        // libraries to the analyzer so its downstream passes can see them:
+        //  - Definitions / Abstracts feed cross-package `x-telo-ref` resolution and
+        //    `extends` target validation.
+        //  - Imports feed the per-library alias resolver — alias-form `extends` inside
+        //    a library (e.g. ai-openai's `extends: Ai.Model`) resolves against THAT
+        //    library's own `Telo.Import` declarations, not the root manifest's. Without
+        //    forwarding the imports, importing such a library would surface a spurious
+        //    EXTENDS_MALFORMED for an alias the library legitimately uses internally.
+        // Alias resolution itself stays in the analyzer; the loader's only semantic
+        // action is stamping `resolvedModuleName` / `resolvedNamespace` — recording the
+        // result of loading. Identity is cached per URL (see libraryIdentityByUrl above)
+        // because the same library can be reached through multiple chains, and every
+        // Telo.Import doc — including the duplicates short-circuited by `visited` —
+        // must end up stamped, otherwise per-scope alias resolution falls back to a
+        // path-derived string (e.g. "abstract-lib.yaml") and produces wrong canonical
+        // kinds.
         const importedDefs = [];
         const queue = [...entry];
         while (queue.length > 0) {
@@ -291,36 +314,52 @@ export class Loader {
             const importUrl = importSource.startsWith(".") || importSource.startsWith("/")
                 ? this.pick(base).resolveRelative(base, importSource)
                 : importSource;
-            if (visited.has(importUrl))
-                continue;
-            visited.add(importUrl);
-            let imported;
-            try {
-                imported = await this.loadModule(importUrl);
-            }
-            catch (err) {
-                const e = err instanceof Error ? err : new Error(String(err));
-                e.sourceLine = m.metadata?.sourceLine ?? 0;
-                throw e;
-            }
-            // Import target must be a Telo.Library. Check the Library branch
-            // explicitly rather than "anything that's a module kind" so that a
-            // future third kind can't silently slip past as a valid import target.
-            const importedLibrary = imported.find((im) => im.kind === "Telo.Library");
-            const importedApplication = imported.find((im) => im.kind === "Telo.Application");
-            if (importedApplication) {
-                const e = new Error(`Telo.Import target '${importSource}' is a Telo.Application. ` +
-                    `Only Telo.Library modules may be imported. Applications are run directly, not imported.`);
-                e.sourceLine = m.metadata?.sourceLine ?? 0;
-                throw e;
+            if (!visited.has(importUrl)) {
+                visited.add(importUrl);
+                let imported;
+                try {
+                    imported = await this.loadModule(importUrl);
+                }
+                catch (err) {
+                    const e = err instanceof Error ? err : new Error(String(err));
+                    e.sourceLine = m.metadata?.sourceLine ?? 0;
+                    throw e;
+                }
+                // Import target must be a Telo.Library. Check the Library branch
+                // explicitly rather than "anything that's a module kind" so that a
+                // future third kind can't silently slip past as a valid import target.
+                const importedLibrary = imported.find((im) => im.kind === "Telo.Library");
+                const importedApplication = imported.find((im) => im.kind === "Telo.Application");
+                if (importedApplication) {
+                    const e = new Error(`Telo.Import target '${importSource}' is a Telo.Application. ` +
+                        `Only Telo.Library modules may be imported. Applications are run directly, not imported.`);
+                    e.sourceLine = m.metadata?.sourceLine ?? 0;
+                    throw e;
+                }
+                if (importedLibrary?.metadata?.name) {
+                    libraryIdentityByUrl.set(importUrl, {
+                        name: importedLibrary.metadata.name,
+                        namespace: importedLibrary.metadata.namespace ?? null,
+                    });
+                }
+                for (const im of imported) {
+                    if (im.kind === "Telo.Definition" ||
+                        im.kind === "Telo.Abstract" ||
+                        im.kind === "Telo.Import") {
+                        importedDefs.push(im);
+                    }
+                    if (im.kind === "Telo.Import")
+                        queue.push(im);
+                }
             }
-            const importedModule = importedLibrary;
-            if (importedModule?.metadata?.name) {
+            // Stamp m with cached identity (works for both fresh and duplicate visits).
+            const identity = libraryIdentityByUrl.get(importUrl);
+            if (identity) {
                 const pi = m.metadata?.positionIndex;
                 m.metadata = {
                     ...m.metadata,
-                    resolvedModuleName: importedModule.metadata.name,
-                    resolvedNamespace: importedModule.metadata.namespace ?? null,
+                    resolvedModuleName: identity.name,
+                    resolvedNamespace: identity.namespace,
                 };
                 if (pi) {
                     Object.defineProperty(m.metadata, "positionIndex", {
@@ -331,12 +370,6 @@ export class Loader {
                     });
                 }
             }
-            for (const im of imported) {
-                if (im.kind === "Telo.Definition")
-                    importedDefs.push(im);
-                if (im.kind === "Telo.Import")
-                    queue.push(im);
-            }
         }
         return [...entry, ...importedDefs];
     }

package/dist/{adapters/http-adapter.d.ts → sources/http-source.d.ts}

@@ -1,5 +1,5 @@
-import { type ManifestAdapter } from "../types.js";
-export declare class HttpAdapter implements ManifestAdapter {
+import { type ManifestSource } from "../types.js";
+export declare class HttpSource implements ManifestSource {
     supports(url: string): boolean;
     read(url: string): Promise<{
         text: string;
@@ -7,4 +7,4 @@ export declare class HttpAdapter implements ManifestAdapter {
     }>;
     resolveRelative(base: string, relative: string): string;
 }
-//# sourceMappingURL=http-adapter.d.ts.map
+//# sourceMappingURL=http-source.d.ts.map

package/dist/sources/http-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-source.d.ts","sourceRoot":"","sources":["../../src/sources/http-source.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7E,qBAAa,UAAW,YAAW,cAAc;IAC/C,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIxB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAWlE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;CAIxD"}

package/dist/{adapters/http-adapter.js → sources/http-source.js}

@@ -1,5 +1,5 @@
 import { DEFAULT_MANIFEST_FILENAME } from "../types.js";
-export class HttpAdapter {
+export class HttpSource {
     supports(url) {
         return url.startsWith("http://") || url.startsWith("https://");
     }

package/dist/{adapters/registry-adapter.d.ts → sources/registry-source.d.ts}

@@ -1,5 +1,5 @@
-import { type ManifestAdapter } from "../types.js";
-export declare class RegistryAdapter implements ManifestAdapter {
+import { type ManifestSource } from "../types.js";
+export declare class RegistrySource implements ManifestSource {
     private registryUrl;
     constructor(registryUrl?: string);
     supports(url: string): boolean;
@@ -12,4 +12,4 @@ export declare class RegistryAdapter implements ManifestAdapter {
     private toRegistryUrl;
     private parseModuleRef;
 }
-//# sourceMappingURL=registry-adapter.d.ts.map
+//# sourceMappingURL=registry-source.d.ts.map

package/dist/sources/registry-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registry-source.d.ts","sourceRoot":"","sources":["../../src/sources/registry-source.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAI7E,qBAAa,cAAe,YAAW,cAAc;IACvC,OAAO,CAAC,WAAW;gBAAX,WAAW,SAAuB;IAEtD,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAWxB,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAWxE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAMvD,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,cAAc;CAmBvB"}

package/dist/{adapters/registry-adapter.js → sources/registry-source.js}

@@ -1,6 +1,6 @@
 import { DEFAULT_MANIFEST_FILENAME } from "../types.js";
 const DEFAULT_REGISTRY_URL = "https://registry.telo.run";
-export class RegistryAdapter {
+export class RegistrySource {
     registryUrl;
     constructor(registryUrl = DEFAULT_REGISTRY_URL) {
         this.registryUrl = registryUrl;