@ontrails/trails 1.0.0-beta.3 → 1.0.0-beta.4

package/src/trails/create.ts

@@ -6,7 +6,7 @@
  */
 
 import type { FollowFn } from '@ontrails/core';
-import { Result, hike } from '@ontrails/core';
+import { Result, trail } from '@ontrails/core';
 import { z } from 'zod';
 
 // ---------------------------------------------------------------------------
@@ -146,7 +146,7 @@ const runCreate = async (
 // Route definition
 // ---------------------------------------------------------------------------
 
-export const createRoute = hike('create', {
+export const createRoute = trail('create', {
   description: 'Create a new Trails project',
   fields: {
     starter: {
@@ -157,7 +157,7 @@ export const createRoute = hike('create', {
           value: 'hello',
         },
         {
-          hint: '4 trails, hike, event, store',
+          hint: '4 trails, event, store',
           label: 'Entity CRUD',
           value: 'entity',
         },
@@ -175,13 +175,7 @@ export const createRoute = hike('create', {
       ],
     },
   },
-  follows: ['create.scaffold', 'add.surface', 'add.verify'],
-  implementation: async (input: BlazeInput, ctx) => {
-    if (!ctx.follow) {
-      return Result.err(new Error('create route requires ctx.follow'));
-    }
-    return await runCreate(ctx.follow, input);
-  },
+  follow: ['create.scaffold', 'add.surface', 'add.verify'],
   input: z.object({
     dir: z.string().optional().describe('Parent directory'),
     name: z.string().describe('Project name'),
@@ -200,4 +194,10 @@ export const createRoute = hike('create', {
     dir: z.string(),
     name: z.string(),
   }),
+  run: async (input: BlazeInput, ctx) => {
+    if (!ctx.follow) {
+      return Result.err(new Error('create route requires ctx.follow'));
+    }
+    return await runCreate(ctx.follow, input);
+  },
 });

package/src/trails/guide.ts

@@ -63,19 +63,6 @@ export const guideTrail = trail('guide', {
       name: 'List trail guidance',
     },
   ],
-  implementation: async (input, ctx) => {
-    const app = await loadApp(input.module, ctx.cwd ?? '.');
-
-    if (input.trailId) {
-      const item = app.get(input.trailId);
-      if (!item) {
-        return Result.err(new Error(`Trail not found: ${input.trailId}`));
-      }
-      return Result.ok(toGuideDetail(item as Trail<unknown, unknown>));
-    }
-
-    return Result.ok(toGuideEntries(app));
-  },
   input: z.object({
     module: z
       .string()
@@ -83,6 +70,7 @@ export const guideTrail = trail('guide', {
       .describe('Path to the app module'),
     trailId: z.string().optional().describe('Trail ID for detailed guidance'),
   }),
+  intent: 'read',
   output: z.union([
     z.array(
       z.object({
@@ -100,5 +88,17 @@ export const guideTrail = trail('guide', {
       kind: z.string(),
     }),
   ]),
-  readOnly: true,
+  run: async (input, ctx) => {
+    const app = await loadApp(input.module, ctx.cwd ?? '.');
+
+    if (input.trailId) {
+      const item = app.get(input.trailId);
+      if (!item) {
+        return Result.err(new Error(`Trail not found: ${input.trailId}`));
+      }
+      return Result.ok(toGuideDetail(item as Trail<unknown, unknown>));
+    }
+
+    return Result.ok(toGuideEntries(app));
+  },
 });

package/src/trails/survey.ts

@@ -32,11 +32,9 @@ export interface BriefReport {
     readonly outputSchemas: boolean;
     readonly examples: boolean;
     readonly detours: boolean;
-    readonly hikes: boolean;
     readonly events: boolean;
   };
   readonly trails: number;
-  readonly hikes: number;
   readonly events: number;
 }
 
@@ -73,10 +71,8 @@ export const generateBriefReport = (app: Topo): BriefReport => {
       detours: hasDetours,
       events: app.events.size > 0,
       examples: hasExamples,
-      hikes: app.hikes.size > 0,
       outputSchemas: hasOutputSchemas,
     },
-    hikes: app.hikes.size,
     name: app.name,
     trails: app.trails.size,
     version: '0.1.0',
@@ -88,14 +84,13 @@ export const generateBriefReport = (app: Topo): BriefReport => {
 // ---------------------------------------------------------------------------
 
 const safetyLabel = (entry: {
-  readOnly?: boolean;
-  destructive?: boolean;
+  intent?: 'read' | 'write' | 'destroy';
 }): string => {
-  if (entry.destructive) {
-    return 'destructive';
+  if (entry.intent === 'destroy') {
+    return 'destroy';
   }
-  if (entry.readOnly) {
-    return 'readOnly';
+  if (entry.intent === 'read') {
+    return 'read';
   }
   return '-';
 };
@@ -104,7 +99,7 @@ const formatTrailList = (app: Topo): object => {
   const items = app.list();
   const entries = items.map((item) => {
     const safety = safetyLabel(
-      item as unknown as { readOnly?: boolean; destructive?: boolean }
+      item as unknown as { intent?: 'read' | 'write' | 'destroy' }
     );
     const examples = Array.isArray(
       (item as unknown as { examples?: unknown[] }).examples
@@ -132,7 +127,7 @@ const formatTrailList = (app: Topo): object => {
  */
 const formatTrailDetail = (item: Trail<unknown, unknown>): object => {
   const safety = safetyLabel(
-    item as unknown as { readOnly?: boolean; destructive?: boolean }
+    item as unknown as { intent?: 'read' | 'write' | 'destroy' }
   );
 
   return {
@@ -218,27 +213,6 @@ export const surveyTrail = trail('survey', {
       name: 'Brief capability report',
     },
   ],
-  implementation: async (input, ctx) => {
-    const app = await loadApp(input.module, ctx.cwd ?? '.');
-
-    if (input.brief) {
-      return Result.ok(generateBriefReport(app));
-    }
-
-    if (input.diff) {
-      return await buildSurveyDiff(app, input.breakingOnly);
-    }
-
-    if (input.trailId) {
-      return buildSurveyDetail(app, input.trailId);
-    }
-
-    if (input.generate) {
-      return await buildSurveyGenerate(app);
-    }
-
-    return Result.ok(formatTrailList(app));
-  },
   input: z.object({
     breakingOnly: z
       .boolean()
@@ -256,6 +230,7 @@ export const surveyTrail = trail('survey', {
       .describe('Path to the app module'),
     trailId: z.string().optional().describe('Trail ID for detail view'),
   }),
+  intent: 'read',
   output: z.union([
     z.object({
       count: z.number(),
@@ -275,10 +250,8 @@ export const surveyTrail = trail('survey', {
         detours: z.boolean(),
         events: z.boolean(),
         examples: z.boolean(),
-        hikes: z.boolean(),
         outputSchemas: z.boolean(),
       }),
-      hikes: z.number(),
       name: z.string(),
       trails: z.number(),
       version: z.string(),
@@ -303,5 +276,25 @@ export const surveyTrail = trail('survey', {
       mapPath: z.string(),
     }),
   ]),
-  readOnly: true,
+  run: async (input, ctx) => {
+    const app = await loadApp(input.module, ctx.cwd ?? '.');
+
+    if (input.brief) {
+      return Result.ok(generateBriefReport(app));
+    }
+
+    if (input.diff) {
+      return await buildSurveyDiff(app, input.breakingOnly);
+    }
+
+    if (input.trailId) {
+      return buildSurveyDetail(app, input.trailId);
+    }
+
+    if (input.generate) {
+      return await buildSurveyGenerate(app);
+    }
+
+    return Result.ok(formatTrailList(app));
+  },
 });

package/src/trails/warden.ts

@@ -37,38 +37,6 @@ export const wardenTrail = trail('warden', {
       name: 'GitHub Actions annotations',
     },
   ],
-  implementation: async (input, ctx) => {
-    const rootDir = input.rootDir ?? ctx.cwd ?? process.cwd();
-    // oxlint-disable-next-line prefer-await-to-then -- catch converts rejection to undefined cleanly
-    const topo = await loadApp('./src/app.ts', rootDir).catch(
-      (): undefined => undefined
-    );
-
-    const report = await runWarden({
-      driftOnly: input.driftOnly,
-      lintOnly: input.lintOnly,
-      rootDir,
-      topo,
-    });
-
-    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);
-
-    return Result.ok({
-      diagnostics: report.diagnostics,
-      drift: report.drift,
-      errorCount: report.errorCount,
-      formatted,
-      passed: report.passed,
-      warnCount: report.warnCount,
-    });
-  },
   input: z.object({
     driftOnly: z.boolean().default(false).describe('Only run drift detection'),
     format: z
@@ -78,6 +46,7 @@ export const wardenTrail = trail('warden', {
     lintOnly: z.boolean().default(false).describe('Only run lint rules'),
     rootDir: z.string().optional().describe('Root directory to scan'),
   }),
+  intent: 'read',
   output: z.object({
     diagnostics: z.array(
       z.object({
@@ -100,5 +69,36 @@ export const wardenTrail = trail('warden', {
     passed: z.boolean(),
     warnCount: z.number(),
   }),
-  readOnly: true,
+  run: async (input, ctx) => {
+    const rootDir = input.rootDir ?? ctx.cwd ?? process.cwd();
+    // oxlint-disable-next-line prefer-await-to-then -- catch converts rejection to undefined cleanly
+    const topo = await loadApp('./src/app.ts', rootDir).catch(
+      (): undefined => undefined
+    );
+
+    const report = await runWarden({
+      driftOnly: input.driftOnly,
+      lintOnly: input.lintOnly,
+      rootDir,
+      topo,
+    });
+
+    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);
+
+    return Result.ok({
+      diagnostics: report.diagnostics,
+      drift: report.drift,
+      errorCount: report.errorCount,
+      formatted,
+      passed: report.passed,
+      warnCount: report.warnCount,
+    });
+  },
 });