@ontrails/core 1.0.0-beta.14 → 1.0.0-beta.16

package/src/trails/index.ts

@@ -0,0 +1,9 @@
+export { deriveTrail } from './derive-trail.js';
+export type {
+  DeriveTrailInput,
+  DeriveTrailOperation,
+  DeriveTrailOutput,
+  DeriveTrailSpec,
+} from './derive-trail.js';
+export { ingest } from './ingest.js';
+export type { IngestOptions, IngestTransform } from './ingest.js';

package/src/trails/ingest.ts

@@ -0,0 +1,138 @@
+import { z } from 'zod';
+
+import { InternalError } from '../errors.js';
+import { composeLayers } from '../layer.js';
+import type { Layer } from '../layer.js';
+import { Result } from '../result.js';
+import type { Signal } from '../signal.js';
+import { trail } from '../trail.js';
+import type { Trail, TrailExample, TrailSpec } from '../trail.js';
+import type { TrailContext } from '../types.js';
+
+type SchemaValue<TSchema extends z.ZodType> = z.output<TSchema>;
+
+type ExampleBearingSchema<TSchema extends z.ZodType> = TSchema & {
+  readonly examples?: readonly Partial<SchemaValue<TSchema>>[] | undefined;
+};
+
+interface IngestBaseOptions<TSchema extends z.ZodType, TSignal> extends Omit<
+  TrailSpec<SchemaValue<TSchema>, void>,
+  'blaze' | 'examples' | 'fires' | 'input' | 'intent' | 'output' | 'pattern'
+> {
+  /** Override the derived trail id. Defaults to `${signal}.ingest`. */
+  readonly id?: string | undefined;
+  /** Validated external payload shape. */
+  readonly schema: TSchema;
+  /** Signal to fire after verification and optional transformation. */
+  readonly signal: Signal<TSignal>;
+  /** Optional per-trail verification layer, e.g. HMAC signature checks. */
+  readonly verify?: Layer | undefined;
+}
+
+export type IngestTransform<TInput, TSignal> = (
+  payload: TInput,
+  ctx: TrailContext
+) => TSignal | Promise<TSignal>;
+
+export interface IngestOptions<
+  TSchema extends z.ZodType,
+  TSignal,
+> extends IngestBaseOptions<TSchema, TSignal> {
+  readonly transform?:
+    | IngestTransform<SchemaValue<TSchema>, TSignal>
+    | undefined;
+}
+
+const deriveExampleName = (signalId: string, index: number): string =>
+  `Ingest ${signalId} ${index + 1}`;
+
+const deriveExamples = <TSchema extends z.ZodType>(
+  schema: ExampleBearingSchema<TSchema>,
+  signalId: string
+): readonly TrailExample<SchemaValue<TSchema>, void>[] | undefined => {
+  const { examples } = schema;
+  if (examples === undefined || examples.length === 0) {
+    return undefined;
+  }
+
+  return Object.freeze(
+    examples.map((example, index) => ({
+      input: example,
+      name: deriveExampleName(signalId, index),
+    }))
+  );
+};
+
+const createIngestBlaze =
+  <TSchema extends z.ZodType, TSignal>(
+    signalRef: Signal<TSignal>,
+    signalId: string,
+    trailId: string,
+    transform: IngestTransform<SchemaValue<TSchema>, TSignal> | undefined
+  ) =>
+  async (
+    input: SchemaValue<TSchema>,
+    ctx: TrailContext
+  ): Promise<Result<void, Error>> => {
+    if (ctx.fire === undefined) {
+      return Result.err(
+        new InternalError(
+          `ingest("${trailId}") requires topo-backed execution to fire "${signalId}"`
+        )
+      );
+    }
+
+    try {
+      const payload =
+        transform === undefined
+          ? (input as TSignal)
+          : await transform(input, ctx);
+      await ctx.fire(signalRef, payload);
+      return Result.ok();
+    } catch (error) {
+      const message = `ingest("${trailId}"): ${error instanceof Error ? error.message : String(error)}`;
+      return Result.err(
+        error instanceof Error
+          ? new InternalError(message, { cause: error })
+          : new InternalError(message)
+      );
+    }
+  };
+
+export const ingest = <
+  TSchema extends z.ZodType,
+  TSignal = SchemaValue<TSchema>,
+>(
+  options: IngestOptions<TSchema, TSignal>
+): Trail<SchemaValue<TSchema>, void> => {
+  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>(
+    signal,
+    signalId,
+    id,
+    transform
+  );
+  const baseTrail = trail(id, {
+    ...trailSpec,
+    blaze: baseBlaze,
+    examples: deriveExamples(schema as ExampleBearingSchema<TSchema>, signalId),
+    fires: [signal],
+    input: schema as z.ZodType<SchemaValue<TSchema>>,
+    intent: 'write',
+    output: z.void(),
+    pattern: 'ingest',
+  }) as Trail<SchemaValue<TSchema>, void>;
+
+  if (verify === undefined) {
+    return baseTrail;
+  }
+
+  // Verification is a per-factory concern, so compose it locally instead of
+  // mutating runner-wide layer configuration.
+  return Object.freeze({
+    ...baseTrail,
+    blaze: composeLayers([verify], baseTrail, baseTrail.blaze),
+  }) as Trail<SchemaValue<TSchema>, void>;
+};

package/src/{internal/trails-db.ts → trails-db.ts}

@@ -2,28 +2,41 @@ import { Database } from 'bun:sqlite';
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
 
-import { NotFoundError } from '../errors.js';
+import { NotFoundError } from './errors.js';
 
 const TRAILS_DIR = '.trails';
 const TRAILS_DB_FILE = 'trails.db';
+const TRAILS_CACHE_DIR = 'cache';
+const TRAILS_STATE_DIR = 'state';
 const SCHEMA_VERSION_TABLE = 'meta_schema_versions';
-const WORKSPACE_SUBDIRS = ['config', 'dev', 'generated'] as const;
-const REQUIRED_GITIGNORE_LINES = [
+const WORKSPACE_SUBDIRS = [TRAILS_CACHE_DIR, TRAILS_STATE_DIR] as const;
+
+/**
+ * The canonical lines written to a freshly-bootstrapped
+ * `.trails/.gitignore`. Kept as the source of truth for every consumer that
+ * needs to either write the file (scaffold) or audit its content (tests).
+ *
+ * @see {@link WORKSPACE_GITIGNORE_CONTENT} for the rendered string form.
+ */
+export const WORKSPACE_GITIGNORE_LINES = [
   '# Local config overrides',
-  'config/',
+  'config.local.js',
+  'config.local.ts',
   '',
-  '# Development state',
-  'dev/',
+  '# Rebuildable cache',
+  'cache/',
   '',
-  '# Generated artifacts',
-  'generated/',
+  '# Mutable runtime state',
+  'state/',
   '',
-  '# Shared Trails database',
-  'trails.db',
-  'trails.db-shm',
-  'trails.db-wal',
-  '',
-];
+] as const;
+
+/**
+ * The canonical rendered `.trails/.gitignore` content. Use this when writing
+ * the file eagerly (e.g. during `trails create` scaffolding) or when asserting
+ * on the workspace bootstrap output.
+ */
+export const WORKSPACE_GITIGNORE_CONTENT = `${WORKSPACE_GITIGNORE_LINES.join('\n').trimEnd()}\n`;
 
 export interface TrailsDbLocationOptions {
   readonly path?: string;
@@ -40,31 +53,27 @@ interface SchemaVersionRow {
   readonly version: number;
 }
 
-const resolveRootDir = (rootDir?: string): string =>
+const deriveRootDir = (rootDir?: string): string =>
   resolve(rootDir ?? process.cwd());
 
-export const resolveTrailsDir = (options?: TrailsDbLocationOptions): string =>
-  join(resolveRootDir(options?.rootDir), TRAILS_DIR);
+export const deriveTrailsDir = (options?: TrailsDbLocationOptions): string =>
+  join(deriveRootDir(options?.rootDir), TRAILS_DIR);
 
-export const resolveTrailsDbPath = (
-  options?: TrailsDbLocationOptions
-): string =>
+export const deriveTrailsDbPath = (options?: TrailsDbLocationOptions): string =>
   options?.path
     ? resolve(options.path)
-    : join(resolveTrailsDir(options), TRAILS_DB_FILE);
+    : join(deriveTrailsDir(options), TRAILS_STATE_DIR, TRAILS_DB_FILE);
 
 const ensureDbParentDir = (dbPath: string): void => {
   mkdirSync(dirname(dbPath), { recursive: true });
 };
 
-const GITIGNORE_TEMPLATE = `${REQUIRED_GITIGNORE_LINES.join('\n').trimEnd()}\n`;
-
 const appendMissingGitignoreLines = (
   gitignorePath: string,
   content: string
 ): void => {
   const existingLines = new Set(content.split('\n').map((l) => l.trim()));
-  const missing = REQUIRED_GITIGNORE_LINES.filter(
+  const missing = WORKSPACE_GITIGNORE_LINES.filter(
     (line) => line !== '' && !existingLines.has(line)
   );
 
@@ -80,7 +89,7 @@ const ensureWorkspaceGitignore = (trailsDir: string): void => {
   const gitignorePath = join(trailsDir, '.gitignore');
 
   if (!existsSync(gitignorePath)) {
-    writeFileSync(gitignorePath, GITIGNORE_TEMPLATE);
+    writeFileSync(gitignorePath, WORKSPACE_GITIGNORE_CONTENT);
     return;
   }
 
@@ -90,8 +99,18 @@ const ensureWorkspaceGitignore = (trailsDir: string): void => {
   );
 };
 
-const ensureWorkspaceDir = (rootDir: string): void => {
-  const trailsDir = resolveTrailsDir({ rootDir });
+/**
+ * Bootstrap the `.trails/` workspace at `rootDir`.
+ *
+ * Creates the workspace directory plus the canonical `cache/` and `state/`
+ * subdirectories, then either writes a fresh `.gitignore` matching
+ * {@link WORKSPACE_GITIGNORE_CONTENT} or appends any missing canonical lines
+ * to an existing one. Safe to call repeatedly. This is the single canonical
+ * source of truth for workspace layout — scaffolding, configuration loading,
+ * and runtime DB initialization all flow through here.
+ */
+export const ensureTrailsWorkspace = (rootDir: string): void => {
+  const trailsDir = deriveTrailsDir({ rootDir });
   mkdirSync(trailsDir, { recursive: true });
   for (const subdir of WORKSPACE_SUBDIRS) {
     mkdirSync(join(trailsDir, subdir), { recursive: true });
@@ -140,13 +159,13 @@ const writeSubsystemVersion = (
 export const openWriteTrailsDb = (
   options?: TrailsDbLocationOptions
 ): Database => {
-  const rootDir = resolveRootDir(options?.rootDir);
-  const dbPath = resolveTrailsDbPath(
+  const rootDir = deriveRootDir(options?.rootDir);
+  const dbPath = deriveTrailsDbPath(
     options?.path ? { path: options.path, rootDir } : { rootDir }
   );
 
   if (options?.path === undefined) {
-    ensureWorkspaceDir(rootDir);
+    ensureTrailsWorkspace(rootDir);
   } else {
     ensureDbParentDir(dbPath);
   }
@@ -160,7 +179,7 @@ export const openWriteTrailsDb = (
 export const openReadTrailsDb = (
   options?: TrailsDbLocationOptions
 ): Database => {
-  const dbPath = resolveTrailsDbPath(options);
+  const dbPath = deriveTrailsDbPath(options);
   if (!existsSync(dbPath)) {
     throw new NotFoundError(
       `Trails database not found at "${dbPath}". Run a write operation first to initialize it.`

package/src/transport-error-map.ts

@@ -0,0 +1,174 @@
+import type {
+  ErrorCategory,
+  ErrorCategoryCodes,
+  ErrorClassRegistryEntry,
+  FixedErrorClassRegistryEntry,
+  TrailsError,
+} from './errors.js';
+import {
+  codesByCategory,
+  errorClasses,
+  exitCodeMap,
+  isTrailsError,
+  jsonRpcCodeMap,
+  statusCodeMap,
+} from './errors.js';
+import {
+  INTERNAL_ERROR_PUBLIC_MESSAGE,
+  redactErrorString,
+} from './error-projection.js';
+
+export const surfaceNames = ['cli', 'http', 'jsonRpc', 'mcp'] as const;
+
+export type SurfaceName = (typeof surfaceNames)[number];
+
+const surfaceCodeKeys = {
+  cli: 'exit',
+  http: 'http',
+  jsonRpc: 'jsonRpc',
+  mcp: 'jsonRpc',
+} as const satisfies Record<SurfaceName, keyof ErrorCategoryCodes>;
+
+export type SurfaceErrorMapper<T> = (error: TrailsError) => T;
+
+export type SurfaceErrorMappings<T> = Record<ErrorCategory, T>;
+
+/**
+ * Union of every surface-specific error code emitted by {@link surfaceErrorMap}.
+ *
+ * @remarks
+ * Previously parameterized by surface (`SurfaceErrorCode<'cli'>` etc.), but
+ * the generic collapsed to `number` because the underlying maps were typed as
+ * `Record<ErrorCategory, number>`. With `as const satisfies` on the maps the
+ * per-surface literals are now observable, but TypeScript cannot narrow
+ * `surfaceErrorMap[surface][error.category]` through a generic `TSurface`
+ * without an unsound cast. The non-generic union honestly reflects what
+ * `mapSurfaceError` returns at the call site.
+ */
+export type SurfaceErrorCode =
+  (typeof codesByCategory)[ErrorCategory][(typeof surfaceCodeKeys)[SurfaceName]];
+
+export interface SurfaceErrorProjection {
+  readonly category: ErrorCategory;
+  readonly code: SurfaceErrorCode;
+  readonly message: string;
+  readonly name: string;
+  readonly retryable: boolean;
+  readonly surface: SurfaceName;
+}
+
+export interface ErrorClassSurfaceProjection {
+  readonly category: ErrorCategory;
+  readonly code: SurfaceErrorCode;
+  readonly name: string;
+  readonly retryable: boolean;
+  readonly surface: SurfaceName;
+}
+
+export const createSurfaceErrorMapper =
+  <T>(mappings: SurfaceErrorMappings<T>): SurfaceErrorMapper<T> =>
+  (error) =>
+    mappings[error.category];
+
+export const surfaceErrorMap = {
+  cli: exitCodeMap,
+  http: statusCodeMap,
+  jsonRpc: jsonRpcCodeMap,
+  mcp: jsonRpcCodeMap,
+} as const satisfies Record<SurfaceName, SurfaceErrorMappings<number>>;
+
+export const surfaceErrorRegistry = {
+  cli: {
+    map: createSurfaceErrorMapper(surfaceErrorMap.cli),
+    values: surfaceErrorMap.cli,
+  },
+  http: {
+    map: createSurfaceErrorMapper(surfaceErrorMap.http),
+    values: surfaceErrorMap.http,
+  },
+  jsonRpc: {
+    map: createSurfaceErrorMapper(surfaceErrorMap.jsonRpc),
+    values: surfaceErrorMap.jsonRpc,
+  },
+  mcp: {
+    map: createSurfaceErrorMapper(surfaceErrorMap.mcp),
+    values: surfaceErrorMap.mcp,
+  },
+} as const;
+
+export const mapSurfaceError = (
+  surface: SurfaceName,
+  error: TrailsError
+): SurfaceErrorCode =>
+  codesByCategory[error.category][surfaceCodeKeys[surface]];
+
+export const projectSurfaceError = (
+  surface: SurfaceName,
+  error: TrailsError
+): SurfaceErrorProjection => ({
+  category: error.category,
+  code: mapSurfaceError(surface, error),
+  message: error.message,
+  name: error.name,
+  retryable: error.retryable,
+  surface,
+});
+
+export const projectPublicSurfaceError = (
+  surface: SurfaceName,
+  error: Error
+): SurfaceErrorProjection => {
+  if (isTrailsError(error)) {
+    const projection = projectSurfaceError(surface, error);
+    return {
+      ...projection,
+      message:
+        projection.category === 'internal'
+          ? INTERNAL_ERROR_PUBLIC_MESSAGE
+          : redactErrorString(projection.message),
+    };
+  }
+
+  return {
+    category: 'internal',
+    code: codesByCategory.internal[surfaceCodeKeys[surface]],
+    message: INTERNAL_ERROR_PUBLIC_MESSAGE,
+    name: 'InternalError',
+    retryable: false,
+    surface,
+  };
+};
+
+const isFixedErrorClassEntry = (
+  entry: ErrorClassRegistryEntry
+): entry is FixedErrorClassRegistryEntry => entry.category !== 'dynamic';
+
+const fixedErrorClassByName: ReadonlyMap<string, FixedErrorClassRegistryEntry> =
+  new Map(
+    errorClasses.flatMap((entry): [string, FixedErrorClassRegistryEntry][] =>
+      isFixedErrorClassEntry(entry) ? [[entry.name, entry]] : []
+    )
+  );
+
+/**
+ * Project a known error class name onto a surface without constructing it.
+ *
+ * Dynamic-category errors such as `RetryExhaustedError` return `undefined`
+ * because their surface code depends on the wrapped runtime error.
+ */
+export const projectErrorClassSurface = (
+  surface: SurfaceName,
+  errorName: string
+): ErrorClassSurfaceProjection | undefined => {
+  const entry = fixedErrorClassByName.get(errorName);
+  if (entry === undefined) {
+    return undefined;
+  }
+  return {
+    category: entry.category,
+    code: codesByCategory[entry.category][surfaceCodeKeys[surface]],
+    name: entry.name,
+    retryable: entry.retryable,
+    surface,
+  };
+};

package/src/type-utils.ts

@@ -13,11 +13,26 @@ import type { AnyTrail, Trail } from './trail.js';
 
 /** Extract the input type from a Trail. */
 export type TrailInput<T extends AnyTrail> =
-  T extends Trail<infer I, any> ? I : never;
+  T extends Trail<infer I, any, any> ? I : never;
 
 /** Extract the output type from a Trail. */
 export type TrailOutput<T extends AnyTrail> =
-  T extends Trail<any, infer O> ? O : never;
+  T extends Trail<any, infer O, any> ? O : never;
+
+/**
+ * Extract the cross-callable input type from a trail.
+ *
+ * When a trail declares `crossInput`, callers via `ctx.cross()` must pass
+ * both the public input fields and the composition-only fields. This type
+ * merges both schemas so the compiler enforces the full shape at the call
+ * site. Falls back to plain `TrailInput<T>` when no `crossInput` exists.
+ */
+export type CrossInput<T extends AnyTrail> =
+  T extends Trail<infer I, any, infer CI>
+    ? [CI] extends [never]
+      ? I
+      : I & CI
+    : never;
 
 /**
  * Extracts the full `Result<Output, Error>` type from a trail definition.