@ontrails/core 1.0.0-beta.39 → 1.0.0-beta.41

package/src/trails/ingest.ts

@@ -17,7 +17,13 @@ type ExampleBearingSchema<TSchema extends z.ZodType> = TSchema & {
 
 interface IngestBaseOptions<TSchema extends z.ZodType, TSignal> extends Omit<
   TrailSpec<SchemaValue<TSchema>, void>,
-  'blaze' | 'examples' | 'fires' | 'input' | 'intent' | 'output' | 'pattern'
+  | 'implementation'
+  | 'examples'
+  | 'fires'
+  | 'input'
+  | 'intent'
+  | 'output'
+  | 'pattern'
 > {
   /** Override the derived trail id. Defaults to `${signal}.ingest`. */
   readonly id?: string | undefined;
@@ -63,7 +69,7 @@ const deriveExamples = <TSchema extends z.ZodType>(
   );
 };
 
-const createIngestBlaze =
+const createIngestImplementation =
   <TSchema extends z.ZodType, TSignal>(
     signalRef: Signal<TSignal>,
     signalId: string,
@@ -108,7 +114,7 @@ export const ingest = <
   const signalId = options.signal.id;
   const id = options.id ?? `${signalId}.ingest`;
   const { id: _id, schema, signal, transform, verify, ...trailSpec } = options;
-  const baseBlaze = createIngestBlaze<TSchema, TSignal>(
+  const baseImplementation = createIngestImplementation<TSchema, TSignal>(
     signal,
     signalId,
     id,
@@ -116,9 +122,12 @@ export const ingest = <
   );
   const baseSpec = {
     ...trailSpec,
-    blaze: baseBlaze as TrailSpec<unknown, unknown>['blaze'],
     examples: deriveExamples(schema as ExampleBearingSchema<TSchema>, signalId),
     fires: [signal],
+    implementation: baseImplementation as TrailSpec<
+      unknown,
+      unknown
+    >['implementation'],
     input: schema as z.ZodType<unknown>,
     intent: 'write',
     output: z.void(),
@@ -134,6 +143,10 @@ export const ingest = <
   // mutating runner-wide layer configuration.
   return Object.freeze({
     ...baseTrail,
-    blaze: composeLayers([verify], baseTrail, baseTrail.blaze),
+    implementation: composeLayers(
+      [verify],
+      baseTrail,
+      baseTrail.implementation
+    ),
   }) as Trail<SchemaValue<TSchema>, void>;
 };

package/src/trails-db.ts

@@ -6,7 +6,7 @@ import { sha256Hex } from './sha256.js';
 
 // Altitude ruling (TRL-1198, ADR-0051 lens): trails-db stays core-owned
 // shared framework infrastructure (ADR-0014) and stays on the barrel —
-// topographer, tracing, warden, wayfinder, and the operator app all
+// topography, tracing, warden, wayfinder, and the operator app all
 // consume it from `@ontrails/core`. What it may NOT do is assume runtime
 // capabilities eagerly: `bun:sqlite` and the node builtins load lazily at
 // first use so the barrel's module graph stays execution-portable.

package/src/type-utils.ts

@@ -42,7 +42,7 @@ export type TrailInput<T extends AnyTrail> = T extends {
 
 /** Extract the output type from a Trail. */
 export type TrailOutput<T extends AnyTrail> = T extends {
-  readonly blaze: Implementation<any, infer O>;
+  readonly implementation: Implementation<any, infer O>;
 }
   ? O
   : never;

package/src/types.ts

@@ -11,7 +11,7 @@ import type { TrailVersionReference } from './version-resolution.js';
 // Detour
 // ---------------------------------------------------------------------------
 
-/** A recovery path that activates when a trail's blaze fails with a matching error. */
+/** A recovery path that activates when a trail's implementation fails with a matching error. */
 export interface Detour<Input, Output, TErr extends TrailsError = TrailsError> {
   /* oxlint-disable-next-line no-explicit-any -- standard pattern for matching abstract+concrete class constructors */
   readonly on: abstract new (...args: any[]) => TErr;
@@ -69,7 +69,7 @@ export interface ComposeOptions {
    * Execute a specific live version of the composed trail.
    *
    * Omit to keep composition current by default. Historical revision entries
-   * transpose through the current trail; fork entries run their own blaze.
+   * transpose through the current trail; fork entries run their own implementation.
    */
   readonly version?: TrailVersionReference | undefined;
 }
@@ -277,7 +277,7 @@ export interface TrailContext {
   readonly trace?: TraceFn | undefined;
 }
 
-/** Trail context for blazes that declare trail composition. */
+/** Trail context for implementations that declare trail composition. */
 export interface ComposeTrailContext extends TrailContext {
   readonly compose: ComposeFn;
 }

package/src/validate-established-topo.ts

@@ -12,6 +12,7 @@ const PROJECTION_BLOCKING_RULES = new Set([
   'activation-source-definition-unique',
   'activation-source-edge-unique',
   'activation-source-kind-known',
+  'activation-queue-valid',
   'activation-schedule-valid',
   'resource-exists',
   'signal-fire-exists',
@@ -19,6 +20,11 @@ const PROJECTION_BLOCKING_RULES = new Set([
   'signal-origin-exists',
 ]);
 
+const isProjectionBlockingIssue = (issue: TopoDiagnostic): boolean =>
+  PROJECTION_BLOCKING_RULES.has(issue.rule) ||
+  (issue.rule === 'activation-source-input-compatible' &&
+    issue.sourceKind === 'queue');
+
 const keepProjectionBlockingIssues = (
   result: ReturnType<typeof validateTopo>
 ) => {
@@ -29,9 +35,7 @@ const keepProjectionBlockingIssues = (
   const issues = (
     result.error.context as { issues?: readonly TopoDiagnostic[] } | undefined
   )?.issues;
-  const remainingIssues = issues?.filter((issue) =>
-    PROJECTION_BLOCKING_RULES.has(issue.rule)
-  );
+  const remainingIssues = issues?.filter(isProjectionBlockingIssue);
 
   if (remainingIssues === undefined || remainingIssues.length === 0) {
     return Result.ok();

package/src/validate-topo.ts

@@ -12,12 +12,13 @@ import {
   activationSourceDeclarationSignature,
   activationSourceKey,
 } from './activation-source-projection.js';
-import type { AnyContour } from './contour.js';
-import { getContourReferences } from './contour.js';
+import type { AnyEntity } from './entity.js';
+import { getEntityReferences } from './entity.js';
 import { ValidationError } from './errors.js';
 import type { ActivationEntry } from './activation-source.js';
 import { isKnownActivationSourceKind } from './activation-source.js';
 import { isDraftId } from './draft.js';
+import { validateQueueSource } from './queue.js';
 import type { AnySignal } from './signal.js';
 import { validateScheduleSource } from './schedule.js';
 import { Result } from './result.js';
@@ -38,14 +39,14 @@ export type TopoDiagnosticCode = 'topo.missing-reference';
 
 export type TopoReferenceKind =
   | 'compose'
-  | 'contour-reference'
+  | 'entity-reference'
   | 'resource'
   | 'signal-fire'
   | 'signal-on'
   | 'signal-origin';
 
 export type TopoReferenceOwnerKind =
-  | 'contour'
+  | 'entity'
   | 'signal'
   | 'trail'
   | 'trail-version';
@@ -526,6 +527,21 @@ const checkActivationSources = (
         }
       }
 
+      const queueIssues = validateQueueSource(activation.source);
+      for (const issue of queueIssues) {
+        issues.push({
+          inputPath: [issue.field],
+          message: `Trail declares queue source "${activation.source.id}" with invalid ${issue.field}: ${issue.message}`,
+          rule: 'activation-queue-valid',
+          schemaIssues: [
+            { code: issue.field, message: issue.message, path: [issue.field] },
+          ],
+          sourceId: activation.source.id,
+          sourceKind: activation.source.kind,
+          trailId: id,
+        });
+      }
+
       const scheduleIssues = validateScheduleSource(activation.source);
       for (const issue of scheduleIssues) {
         issues.push({
@@ -626,25 +642,25 @@ const checkActivationSourceInputCompatibility = (
   return issues;
 };
 
-const checkContourReferences = (
-  contours: ReadonlyMap<string, AnyContour>,
+const checkEntityReferences = (
+  entities: ReadonlyMap<string, AnyEntity>,
   topo: Topo
 ): TopoDiagnostic[] => {
   const issues: TopoDiagnostic[] = [];
 
-  for (const [name, contourDef] of contours) {
-    for (const ref of getContourReferences(contourDef)) {
-      if (!topo.hasContour(ref.contour) && !isDraftId(ref.contour)) {
+  for (const [name, entityDef] of entities) {
+    for (const ref of getEntityReferences(entityDef)) {
+      if (!topo.hasEntity(ref.entity) && !isDraftId(ref.entity)) {
         issues.push(
           missingReferenceDiagnostic({
-            message: `Contour "${name}" references "${ref.contour}" which is not in the topo`,
+            message: `Entity "${name}" references "${ref.entity}" which is not in the topo`,
             reference: {
               fromId: name,
-              fromKind: 'contour',
-              missingId: ref.contour,
-              referenceKind: 'contour-reference',
+              fromKind: 'entity',
+              missingId: ref.entity,
+              referenceKind: 'entity-reference',
             },
-            rule: 'contour-reference-exists',
+            rule: 'entity-reference-exists',
             trailId: name,
           })
         );
@@ -686,7 +702,7 @@ export const validateTopo = (topo: Topo): Result<void, ValidationError> => {
   const issues = [
     ...checkComposes(topo.trails, topo),
     ...checkResources(topo.trails, topo),
-    ...checkContourReferences(topo.contours, topo),
+    ...checkEntityReferences(topo.entities, topo),
     ...checkExamples(topo.trails),
     ...checkSignalOrigins(topo.signals, topo),
     ...checkSignalReferences(topo.trails, topo.signals),