@ontrails/trails 1.0.0-beta.15 → 1.0.0-beta.17

package/src/trails/warden.ts

@@ -1,59 +1,159 @@
 /**
  * `warden` trail -- Governance checks.
  *
- * Thin wrapper around `runWarden` and `formatWardenReport` from @ontrails/warden.
+ * Thin wrapper around the shared @ontrails/warden command surface.
  */
 
 import { Result, trail } from '@ontrails/core';
 import {
-  formatGitHubAnnotations,
-  formatJson,
-  formatSummary,
-  formatWardenReport,
-  runWarden,
+  diagnosticSchema,
+  runWardenCommand,
+  wardenDepthValues,
+  wardenDraftsValues,
+  wardenFailOnValues,
+  wardenFormatValues,
+  wardenLockValues,
 } from '@ontrails/warden';
 import { z } from 'zod';
 
-import { loadApp } from './load-app.js';
+import { resolveTrailRootDir } from './root-dir.js';
 
 // ---------------------------------------------------------------------------
 // Trail definition
 // ---------------------------------------------------------------------------
 
+const wardenInputSchema = z.object({
+  apps: z
+    .array(z.string())
+    .optional()
+    .describe('App names or module paths to govern'),
+  cached: z.boolean().default(false).describe('Alias for --lock cached'),
+  ci: z.boolean().default(false).describe('Use the CI Warden preset'),
+  configPath: z.string().optional().describe('Path to trails.config.ts'),
+  depth: z
+    .enum(wardenDepthValues)
+    .optional()
+    .describe('Cumulative analysis depth'),
+  drafts: z.enum(wardenDraftsValues).optional().describe('Draft state mode'),
+  excludeDrafts: z
+    .boolean()
+    .default(false)
+    .describe('Alias for --drafts exclude'),
+  failOn: z.enum(wardenFailOnValues).optional().describe('Failure threshold'),
+  format: z.enum(wardenFormatValues).optional().describe('Output format'),
+  github: z.boolean().default(false).describe('Alias for --format github'),
+  includeDrafts: z
+    .boolean()
+    .default(false)
+    .describe('Alias for --drafts include'),
+  json: z.boolean().default(false).describe('Alias for --format json'),
+  lock: z.enum(wardenLockValues).optional().describe('Lockfile mode'),
+  noLockMutation: z
+    .boolean()
+    .default(false)
+    .describe('Suppress lockfile mutation'),
+  onlyDrafts: z.boolean().default(false).describe('Alias for --drafts only'),
+  prePush: z.boolean().default(false).describe('Use the pre-push preset'),
+  refresh: z.boolean().default(false).describe('Alias for --lock refresh'),
+  rootDir: z.string().optional().describe('Root directory to scan'),
+  skipLock: z.boolean().default(false).describe('Alias for --lock skip'),
+  strict: z.boolean().default(false).describe('Alias for --fail-on warning'),
+  summary: z.boolean().default(false).describe('Alias for --format summary'),
+});
+
+type WardenTrailInput = z.infer<typeof wardenInputSchema>;
+
+const pushFlag = (args: string[], condition: boolean, flag: string): void => {
+  if (condition) {
+    args.push(flag);
+  }
+};
+
+const pushValue = (
+  args: string[],
+  flag: string,
+  value: string | undefined
+): void => {
+  if (value !== undefined) {
+    args.push(flag, value);
+  }
+};
+
+const pushApps = (
+  args: string[],
+  apps: readonly string[] | undefined
+): void => {
+  if (apps !== undefined && apps.length > 0) {
+    args.push('--apps', apps.join(','));
+  }
+};
+
+export const buildWardenCommandArgs = (
+  input: WardenTrailInput
+): readonly string[] => {
+  const args: string[] = [];
+
+  pushFlag(args, input.prePush, '--pre-push');
+  pushFlag(args, input.ci, '--ci');
+  pushValue(args, '--depth', input.depth);
+  if (input.strict) {
+    args.push('--strict');
+  } else {
+    pushValue(args, '--fail-on', input.failOn);
+  }
+  if (input.github) {
+    args.push('--github');
+  } else if (input.json) {
+    args.push('--json');
+  } else if (input.summary) {
+    args.push('--summary');
+  } else {
+    pushValue(args, '--format', input.format);
+  }
+  if (input.skipLock) {
+    args.push('--skip-lock');
+  } else if (input.refresh) {
+    args.push('--refresh');
+  } else if (input.cached) {
+    args.push('--cached');
+  } else {
+    pushValue(args, '--lock', input.lock);
+  }
+  if (input.onlyDrafts) {
+    args.push('--only-drafts');
+  } else if (input.excludeDrafts) {
+    args.push('--exclude-drafts');
+  } else if (input.includeDrafts) {
+    args.push('--include-drafts');
+  } else {
+    pushValue(args, '--drafts', input.drafts);
+  }
+  pushFlag(args, input.noLockMutation, '--no-lock-mutation');
+  pushValue(args, '--config-path', input.configPath);
+  pushApps(args, input.apps);
+
+  return args;
+};
+
 export const wardenTrail = trail('warden', {
   blaze: async (input, ctx) => {
-    const rootDir = input.rootDir ?? ctx.cwd ?? process.cwd();
-    // oxlint-disable-next-line prefer-await-to-then -- catch preserves graceful degradation
-    const topo = await loadApp(input.module, rootDir).catch(
-      (error: unknown): undefined => {
-        ctx.logger?.warn('Could not load app for topo-aware governance', {
-          error: error instanceof Error ? error.message : String(error),
-        });
-        return undefined;
-      }
-    );
-
-    const report = await runWarden({
-      driftOnly: input.driftOnly,
-      lintOnly: input.lintOnly,
-      rootDir,
-      topo,
+    const rootDirResult = resolveTrailRootDir(input.rootDir, ctx.cwd);
+    if (rootDirResult.isErr()) {
+      return Result.err(rootDirResult.error);
+    }
+    const rootDir = rootDirResult.value;
+    const result = await runWardenCommand({
+      args: buildWardenCommandArgs(input),
+      cwd: rootDir,
+      env: ctx.env ?? {},
     });
-
-    const formatters: Record<string, (r: typeof report) => string> = {
-      github: formatGitHubAnnotations,
-      json: formatJson,
-      summary: formatSummary,
-      text: formatWardenReport,
-    };
-    const formatter = formatters[input.format] ?? formatWardenReport;
-    const formatted = formatter(report);
+    const { report } = result;
 
     return Result.ok({
-      diagnostics: report.diagnostics,
+      diagnostics: [...report.diagnostics],
       drift: report.drift,
       errorCount: report.errorCount,
-      formatted,
+      formatted: result.output,
       passed: report.passed,
       warnCount: report.warnCount,
     });
@@ -62,8 +162,7 @@ export const wardenTrail = trail('warden', {
   examples: [
     {
       input: {
-        driftOnly: false,
-        lintOnly: false,
+        lock: 'skip',
       },
       name: 'Default warden run',
     },
@@ -74,29 +173,11 @@ export const wardenTrail = trail('warden', {
       name: 'GitHub Actions annotations',
     },
   ],
-  input: z.object({
-    driftOnly: z.boolean().default(false).describe('Only run drift detection'),
-    format: z
-      .enum(['text', 'json', 'github', 'summary'])
-      .default('text')
-      .describe('Output format: text, json, github, or summary'),
-    lintOnly: z.boolean().default(false).describe('Only run lint rules'),
-    module: z
-      .string()
-      .optional()
-      .describe('App module path (auto-discovered if omitted)'),
-    rootDir: z.string().optional().describe('Root directory to scan'),
-  }),
+  input: wardenInputSchema,
   intent: 'read',
   output: z.object({
     diagnostics: z.array(
-      z.object({
-        filePath: z.string(),
-        line: z.number(),
-        message: z.string(),
-        rule: z.string(),
-        severity: z.enum(['error', 'warn']),
-      })
+      diagnosticSchema.extend({ topoName: z.string().optional() })
     ),
     drift: z
       .object({

package/src/versions.ts

@@ -1,7 +1,6 @@
+import { scaffoldDependencyVersions } from './scaffold-versions.generated.js';
+
 interface PackageJson {
-  readonly catalog?: Record<string, string>;
-  readonly dependencies?: Record<string, string>;
-  readonly devDependencies?: Record<string, string>;
   readonly version?: string;
 }
 
@@ -11,9 +10,6 @@ const readPackageJson = async (url: URL): Promise<PackageJson> =>
 const appPackageJson = await readPackageJson(
   new URL('../package.json', import.meta.url)
 );
-const rootPackageJson = await readPackageJson(
-  new URL('../../../package.json', import.meta.url)
-);
 
 const requireVersion = (value: string | undefined, label: string): string => {
   if (typeof value !== 'string' || value.length === 0) {
@@ -22,9 +18,6 @@ const requireVersion = (value: string | undefined, label: string): string => {
   return value;
 };
 
-const rootCatalog = rootPackageJson.catalog ?? {};
-const rootDevDependencies = rootPackageJson.devDependencies ?? {};
-
 export const trailsPackageVersion = requireVersion(
   appPackageJson.version,
   '@ontrails/trails'
@@ -32,12 +25,4 @@ export const trailsPackageVersion = requireVersion(
 
 export const ontrailsPackageRange = `^${trailsPackageVersion}`;
 
-export const scaffoldDependencyVersions = {
-  bunTypes: requireVersion(rootDevDependencies['@types/bun'], '@types/bun'),
-  commander: requireVersion(rootCatalog['commander'], 'commander'),
-  lefthook: requireVersion(rootDevDependencies['lefthook'], 'lefthook'),
-  oxlint: requireVersion(rootDevDependencies['oxlint'], 'oxlint'),
-  typescript: requireVersion(rootDevDependencies['typescript'], 'typescript'),
-  ultracite: requireVersion(rootDevDependencies['ultracite'], 'ultracite'),
-  zod: requireVersion(rootCatalog['zod'], 'zod'),
-} as const;
+export { scaffoldDependencyVersions };

package/.turbo/turbo-build.log

@@ -1 +0,0 @@
-$ tsc -b

package/.turbo/turbo-lint.log

@@ -1,3 +0,0 @@
-$ oxlint ./src
-Found 0 warnings and 0 errors.
-Finished in 57ms on 38 files with 93 rules using 24 threads.

package/.turbo/turbo-typecheck.log

@@ -1 +0,0 @@
-$ tsc --noEmit

package/__tests__/examples.test.ts

@@ -1,45 +0,0 @@
-/* oxlint-disable eslint-plugin-jest/require-hook -- testExamples registers tests at module scope */
-import { afterAll, beforeAll } from 'bun:test';
-import { mkdirSync, rmSync, writeFileSync } from 'node:fs';
-import { join, resolve } from 'node:path';
-
-import { testExamples } from '@ontrails/testing';
-
-import { app } from '../src/app.js';
-
-const trailsWorkspaceDir = resolve(import.meta.dir, '..', '.trails');
-const trailsGitignorePath = join(trailsWorkspaceDir, '.gitignore');
-const trailsWorkspaceSubdirs = ['config', 'dev', 'generated'] as const;
-const trailsGitignore = `# Local config overrides
-config/
-
-# Development state
-dev/
-
-# Generated artifacts
-generated/
-
-# Shared Trails database
-trails.db
-trails.db-shm
-trails.db-wal
-`;
-
-const resetTrailsWorkspace = (): void => {
-  rmSync(trailsWorkspaceDir, { force: true, recursive: true });
-  mkdirSync(trailsWorkspaceDir, { recursive: true });
-  for (const subdir of trailsWorkspaceSubdirs) {
-    mkdirSync(join(trailsWorkspaceDir, subdir), { recursive: true });
-  }
-  writeFileSync(trailsGitignorePath, trailsGitignore);
-};
-
-beforeAll(() => {
-  resetTrailsWorkspace();
-});
-
-afterAll(() => {
-  resetTrailsWorkspace();
-});
-
-testExamples(app);

package/dist/bin/trails.d.ts

@@ -1,3 +0,0 @@
-#!/usr/bin/env bun
-import '../src/cli.js';
-//# sourceMappingURL=trails.d.ts.map

package/dist/bin/trails.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"trails.d.ts","sourceRoot":"","sources":["../../bin/trails.ts"],"names":[],"mappings":";AAEA,OAAO,eAAe,CAAC"}

package/dist/bin/trails.js

@@ -1,4 +0,0 @@
-#!/usr/bin/env bun
-/* oxlint-disable eslint-plugin-jest/require-hook -- CLI bin entrypoints execute at module scope */
-import '../src/cli.js';
-//# sourceMappingURL=trails.js.map

package/dist/bin/trails.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"trails.js","sourceRoot":"","sources":["../../bin/trails.ts"],"names":[],"mappings":";AACA,mGAAmG;AACnG,OAAO,eAAe,CAAC"}

package/dist/src/app.d.ts

@@ -1,2 +0,0 @@
-export declare const app: import("@ontrails/core").Topo;
-//# sourceMappingURL=app.d.ts.map

package/dist/src/app.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/app.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,GAAG,+BAqBf,CAAC"}

package/dist/src/app.js

@@ -1,22 +0,0 @@
-import { topo } from '@ontrails/core';
-import * as addSurface from './trails/add-surface.js';
-import * as addTrail from './trails/add-trail.js';
-import * as addVerify from './trails/add-verify.js';
-import * as create from './trails/create.js';
-import * as createScaffold from './trails/create-scaffold.js';
-import * as devClean from './trails/dev-clean.js';
-import * as devReset from './trails/dev-reset.js';
-import * as devStats from './trails/dev-stats.js';
-import * as draftPromote from './trails/draft-promote.js';
-import * as guide from './trails/guide.js';
-import * as survey from './trails/survey.js';
-import * as topoExport from './trails/topo-export.js';
-import * as topoHistory from './trails/topo-history.js';
-import * as topoPin from './trails/topo-pin.js';
-import * as topoShow from './trails/topo-show.js';
-import * as topoCommand from './trails/topo.js';
-import * as topoUnpin from './trails/topo-unpin.js';
-import * as topoVerify from './trails/topo-verify.js';
-import * as warden from './trails/warden.js';
-export const app = topo('trails', survey, topoCommand, topoShow, topoHistory, topoPin, topoUnpin, topoExport, topoVerify, devStats, devClean, devReset, guide, draftPromote, warden, create, createScaffold, addSurface, addVerify, addTrail);
-//# sourceMappingURL=app.js.map

package/dist/src/app.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEtC,OAAO,KAAK,UAAU,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAC;AAC7C,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,YAAY,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAC;AAC3C,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAC;AAC7C,OAAO,KAAK,UAAU,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,WAAW,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAC;AAChD,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAC;AAE7C,MAAM,CAAC,MAAM,GAAG,GAAG,IAAI,CACrB,QAAQ,EACR,MAAM,EACN,WAAW,EACX,QAAQ,EACR,WAAW,EACX,OAAO,EACP,SAAS,EACT,UAAU,EACV,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,YAAY,EACZ,MAAM,EACN,MAAM,EACN,cAAc,EACd,UAAU,EACV,SAAS,EACT,QAAQ,CACT,CAAC"}

package/dist/src/clack.d.ts

@@ -1,9 +0,0 @@
-/**
- * Clack-backed input resolver for the Trails CLI.
- *
- * This stays at the app layer so @ontrails/cli remains prompt-library agnostic.
- */
-import type { InputResolver } from '@ontrails/cli';
-/** Fill missing input by prompting with Clack when interactive. */
-export declare const resolveInputWithClack: InputResolver;
-//# sourceMappingURL=clack.d.ts.map

package/dist/src/clack.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"clack.d.ts","sourceRoot":"","sources":["../../src/clack.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAS,aAAa,EAAuB,MAAM,eAAe,CAAC;AAmF/E,mEAAmE;AACnE,eAAO,MAAM,qBAAqB,EAAE,aAoBnC,CAAC"}

package/dist/src/clack.js

@@ -1,84 +0,0 @@
-/**
- * Clack-backed input resolver for the Trails CLI.
- *
- * This stays at the app layer so @ontrails/cli remains prompt-library agnostic.
- */
-import { isInteractive } from '@ontrails/cli';
-import * as clack from '@clack/prompts';
-/** Check whether a field still needs input. */
-const needsInput = (field, current) => current[field.name] === undefined &&
-    field.required &&
-    field.default === undefined;
-/** Build Clack options from field options. */
-const toClackOptions = (field) => field.options?.map((option) => ({
-    ...(option.hint === undefined ? {} : { hint: option.hint }),
-    label: option.label ?? option.value,
-    value: option.value,
-})) ?? [];
-/** Normalize cancelled prompts to `undefined`. */
-const cancelable = async (value) => await (clack.isCancel(value) ? undefined : value);
-const fieldResolvers = {
-    boolean: async (field) => cancelable(await clack.confirm({
-        initialValue: field.default ?? false,
-        message: field.label,
-    })),
-    enum: async (field) => cancelable(await clack.select({
-        message: field.label,
-        options: toClackOptions(field),
-    })),
-    multiselect: async (field) => cancelable(await clack.multiselect({
-        initialValues: field.default ?? [],
-        message: field.label,
-        options: toClackOptions(field),
-    })),
-    number: async (field) => {
-        const raw = await clack.text({ message: field.label });
-        return clack.isCancel(raw) ? undefined : Number(raw);
-    },
-    'number[]': async (field) => {
-        const raw = await clack.text({
-            message: `${field.label} (comma-separated numbers)`,
-        });
-        if (clack.isCancel(raw)) {
-            return;
-        }
-        return String(raw)
-            .split(',')
-            .map((s) => Number(s.trim()));
-    },
-    string: async (field) => cancelable(await clack.text({ message: field.label })),
-    'string[]': async (field) => {
-        const raw = await clack.text({
-            message: `${field.label} (comma-separated)`,
-        });
-        if (clack.isCancel(raw)) {
-            return;
-        }
-        return String(raw)
-            .split(',')
-            .map((s) => s.trim());
-    },
-};
-/** Resolve a single field value with Clack. */
-const resolveField = (field) => {
-    const resolver = fieldResolvers[field.type];
-    return resolver(field);
-};
-/** Fill missing input by prompting with Clack when interactive. */
-export const resolveInputWithClack = async (fields, provided, options) => {
-    if (!isInteractive(options)) {
-        return provided;
-    }
-    const resolved = { ...provided };
-    for (const field of fields) {
-        if (!needsInput(field, resolved)) {
-            continue;
-        }
-        const value = await resolveField(field);
-        if (value !== undefined) {
-            resolved[field.name] = value;
-        }
-    }
-    return resolved;
-};
-//# sourceMappingURL=clack.js.map

package/dist/src/clack.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"clack.js","sourceRoot":"","sources":["../../src/clack.ts"],"names":[],"mappings":"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"}

package/dist/src/cli.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=cli.d.ts.map

package/dist/src/cli.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":""}

package/dist/src/cli.js

@@ -1,14 +0,0 @@
-import { outputModePreset } from '@ontrails/cli';
-import { surface } from '@ontrails/cli/commander';
-import { app } from './app.js';
-import { resolveInputWithClack } from './clack.js';
-import { trailsPackageVersion } from './versions.js';
-// oxlint-disable-next-line require-hook -- CLI entry point
-await surface(app, {
-    description: 'Agent-native, contract-first TypeScript framework',
-    name: 'trails',
-    presets: [outputModePreset()],
-    resolveInput: resolveInputWithClack,
-    version: trailsPackageVersion,
-});
-//# sourceMappingURL=cli.js.map

package/dist/src/cli.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,2DAA2D;AAC3D,MAAM,OAAO,CAAC,GAAG,EAAE;IACjB,WAAW,EAAE,mDAAmD;IAChE,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7B,YAAY,EAAE,qBAAqB;IACnC,OAAO,EAAE,oBAAoB;CAC9B,CAAC,CAAC"}

package/dist/src/trails/add-surface.d.ts

@@ -1,13 +0,0 @@
-/**
- * `add.surface` trail -- Add a surface to an existing project.
- *
- * Generates surface entry points and updates package.json dependencies.
- */
-export declare const addSurface: import("@ontrails/core").Trail<{
-    surface: "cli" | "http" | "mcp";
-    dir?: string | undefined;
-}, {
-    created: string;
-    dependency: string;
-}, never>;
-//# sourceMappingURL=add-surface.d.ts.map

package/dist/src/trails/add-surface.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"add-surface.d.ts","sourceRoot":"","sources":["../../../src/trails/add-surface.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAqHH,eAAO,MAAM,UAAU;;;;;;SA4BrB,CAAC"}

package/dist/src/trails/add-surface.js

@@ -1,110 +0,0 @@
-/**
- * `add.surface` trail -- Add a surface to an existing project.
- *
- * Generates surface entry points and updates package.json dependencies.
- */
-import { existsSync, mkdirSync } from 'node:fs';
-import { basename, dirname, join, resolve } from 'node:path';
-import { Result, trail } from '@ontrails/core';
-import { z } from 'zod';
-import { ontrailsPackageRange, scaffoldDependencyVersions, } from '../versions.js';
-import { findTopoPath } from './project.js';
-const generateCliEntry = (appImportPath) => `import { surface } from '@ontrails/cli/commander';
-
-import { app } from '${appImportPath}';
-
-await surface(app);
-`;
-const generateMcpEntry = (appImportPath) => `import { surface } from '@ontrails/mcp';
-
-import { app } from '${appImportPath}';
-
-await surface(app);
-`;
-const generateHttpEntry = (appImportPath) => `import { surface } from '@ontrails/hono';
-
-import { app } from '${appImportPath}';
-
-await surface(app, { port: 3000 });
-`;
-const surfaceEntryFiles = {
-    cli: 'src/cli.ts',
-    http: 'src/http.ts',
-    mcp: 'src/mcp.ts',
-};
-const surfaceDependencies = {
-    cli: ['@ontrails/cli'],
-    http: ['@ontrails/hono', '@ontrails/http'],
-    mcp: ['@ontrails/mcp'],
-};
-/** Resolve the entry file for a surface. */
-const getEntryFile = (surface) => surfaceEntryFiles[surface];
-// ---------------------------------------------------------------------------
-// Trail definition
-// ---------------------------------------------------------------------------
-/** Patch deps and optionally bin in a parsed package.json. */
-const patchPkgDeps = (pkg, surface, cwd) => {
-    const [depName = ''] = surfaceDependencies[surface];
-    const deps = (pkg['dependencies'] ?? {});
-    for (const dependency of surfaceDependencies[surface]) {
-        deps[dependency] = ontrailsPackageRange;
-    }
-    if (surface === 'cli') {
-        deps['commander'] = scaffoldDependencyVersions.commander;
-        pkg['bin'] = {
-            [pkg['name'] ?? basename(cwd)]: './src/cli.ts',
-        };
-    }
-    pkg['dependencies'] = Object.fromEntries(Object.entries(deps).toSorted(([a], [b]) => a.localeCompare(b)));
-    return depName;
-};
-/** Update package.json with surface dependency and CLI bin if needed. */
-const updatePkgJsonForSurface = async (cwd, surface) => {
-    const pkgPath = join(cwd, 'package.json');
-    if (!existsSync(pkgPath)) {
-        return surfaceDependencies[surface][0] ?? '';
-    }
-    const pkg = (await Bun.file(pkgPath).json());
-    const depName = patchPkgDeps(pkg, surface, cwd);
-    await Bun.write(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
-    return depName;
-};
-/** Create the entry file for a surface and return the relative path. */
-const writeSurfaceEntry = async (cwd, surface) => {
-    const entryFile = getEntryFile(surface);
-    const fullEntryPath = join(cwd, entryFile);
-    const appImport = (await findTopoPath(cwd)) ?? './app.js';
-    const generators = {
-        cli: generateCliEntry,
-        http: generateHttpEntry,
-        mcp: generateMcpEntry,
-    };
-    const content = generators[surface](appImport);
-    mkdirSync(dirname(fullEntryPath), { recursive: true });
-    await Bun.write(fullEntryPath, content);
-    return entryFile;
-};
-export const addSurface = trail('add.surface', {
-    blaze: async (input) => {
-        const cwd = resolve(input.dir ?? '.');
-        const { surface } = input;
-        const entryFile = getEntryFile(surface);
-        if (existsSync(join(cwd, entryFile))) {
-            return Result.err(new Error(`${surface.toUpperCase()} surface already exists. Nothing to do.`));
-        }
-        return Result.ok({
-            created: await writeSurfaceEntry(cwd, surface),
-            dependency: await updatePkgJsonForSurface(cwd, surface),
-        });
-    },
-    description: 'Add a surface to an existing project',
-    input: z.object({
-        dir: z.string().optional().describe('Project directory'),
-        surface: z.enum(['cli', 'http', 'mcp']).describe('Surface to add'),
-    }),
-    output: z.object({
-        created: z.string(),
-        dependency: z.string(),
-    }),
-});
-//# sourceMappingURL=add-surface.js.map

package/dist/src/trails/add-surface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"add-surface.js","sourceRoot":"","sources":["../../../src/trails/add-surface.ts"],"names":[],"mappings":"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"}