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

package/src/trails/regrade.ts

@@ -66,6 +66,7 @@ import {
   regradePlanArtifactSchema,
   regradePlanPathForPlan,
   regradeSourceHash,
+  regradeSourceHashMatches,
   rootRelativePath,
 } from '../regrade/plan-artifact.js';
 import type {
@@ -1480,7 +1481,7 @@ const planStatusForReport = (
   artifact: RegradePlanArtifact,
   report: RegradeReport
 ): 'active' | 'stale' =>
-  artifact.sourceHash === regradeSourceHash(report) ? 'active' : 'stale';
+  regradeSourceHashMatches(artifact.sourceHash, report) ? 'active' : 'stale';
 
 const regradePlanGateContext = (
   report: RegradeReport
@@ -2573,6 +2574,7 @@ const runPreviewRegradePlan = async (
 
 const writeRegradeHistory = (params: {
   readonly artifact: RegradePlanArtifact;
+  readonly completedReport: RegradeReport;
   readonly planPath: string;
   readonly report: RegradeReport;
   readonly rootDir: string;
@@ -2596,6 +2598,7 @@ const writeRegradeHistory = (params: {
   }
   const appended = appendRegradeHistoryRun({
     artifact: params.artifact,
+    completedReport: params.completedReport,
     report: params.report,
     rootDir: params.rootDir,
   });
@@ -2630,6 +2633,24 @@ const writeRegradeHistory = (params: {
   return appended;
 };
 
+const historyReportForAppliedPlan = (
+  dryRunReport: RegradeReport,
+  appliedReport: RegradeReport
+): RegradeReport => ({
+  ...dryRunReport,
+  ...(appliedReport.apply === undefined ? {} : { apply: appliedReport.apply }),
+  ...(dryRunReport.run === undefined
+    ? {}
+    : {
+        run: {
+          ...dryRunReport.run,
+          report:
+            appliedReport.run?.report ??
+            transitionRunReportForRegradeReport(appliedReport),
+        },
+      }),
+});
+
 const runApplyRegradePlan = async (
   input: RegradeApplyPlanInput,
   rootDir: string,
@@ -2686,14 +2707,22 @@ const runApplyRegradePlan = async (
   if (applied.isErr()) {
     return applied;
   }
-  // The recorded run evidence is the freshness-gated dry-run report: its
-  // source hash is the lock state this run ran against (the staleness gate
-  // holds it equal to the plan's own sourceHash), and unlike the post-apply
-  // rescan it preserves the rewrite entries the run graduated.
+  const completionReport = await runPlanArtifactDryRun({
+    artifact: loaded.value.artifact,
+    includeEntries: input.includeEntries,
+    rootDir,
+  });
+  if (completionReport.isErr()) {
+    return completionReport;
+  }
+  // Keep the pre-apply occurrence evidence that explains what this run changed,
+  // while carrying the completed counters and a separate post-apply source
+  // stamp so a later no-op apply can still be recognized as a replay.
   const history = writeRegradeHistory({
     artifact: loaded.value.artifact,
+    completedReport: completionReport.value,
     planPath: loaded.value.path,
-    report: dryRunReport.value,
+    report: historyReportForAppliedPlan(dryRunReport.value, applied.value),
     rootDir,
   });
   if (history.isErr()) {
@@ -2828,7 +2857,8 @@ const runClassModeRegrade = (
 
 export const regradeTrail = trail('regrade', {
   args: ['from', 'to'],
-  blaze: async (input, ctx) => {
+  description: 'Run downstream migration checks and safe rewrites',
+  implementation: async (input, ctx) => {
     const rootDirResult = resolveTrailRootDir(input.rootDir, ctx.cwd);
     if (rootDirResult.isErr()) {
       return rootDirResult;
@@ -2865,7 +2895,6 @@ export const regradeTrail = trail('regrade', {
     }
     return Result.ok(outputResult.value);
   },
-  description: 'Run downstream migration checks and safe rewrites',
   input: regradeInputSchema,
   intent: 'write',
   output: regradeReportOutput,
@@ -2874,7 +2903,9 @@ export const regradeTrail = trail('regrade', {
 
 export const planRegradeTrail = trail('plan.regrade', {
   args: ['from', 'to'],
-  blaze: async (input, ctx) => {
+  cli: { path: ['regrade', 'plan'] },
+  description: 'Write or update a reviewed Regrade plan',
+  implementation: async (input, ctx) => {
     const rootDirResult = resolveTrailRootDir(input.rootDir, ctx.cwd);
     if (rootDirResult.isErr()) {
       return rootDirResult;
@@ -2910,8 +2941,6 @@ export const planRegradeTrail = trail('plan.regrade', {
     }
     return Result.ok(output.data);
   },
-  cli: { path: ['regrade', 'plan'] },
-  description: 'Write or update a reviewed Regrade plan',
   input: regradePlanInputSchema,
   intent: 'write',
   output: regradePlanArtifactSchema,
@@ -2919,7 +2948,9 @@ export const planRegradeTrail = trail('plan.regrade', {
 });
 
 export const listRegradesTrail = trail('list.regrades', {
-  blaze: async (input, ctx) => {
+  cli: { path: ['regrade', 'plans'] },
+  description: 'List active Regrade plans and freshness status',
+  implementation: async (input, ctx) => {
     const rootDirResult = resolveTrailRootDir(input.rootDir, ctx.cwd);
     if (rootDirResult.isErr()) {
       return rootDirResult;
@@ -2930,8 +2961,6 @@ export const listRegradesTrail = trail('list.regrades', {
     }
     return Result.ok(result.value);
   },
-  cli: { path: ['regrade', 'plans'] },
-  description: 'List active Regrade plans and freshness status',
   input: z.object({
     rootDir: z.string().optional().describe('Workspace root directory'),
   }),
@@ -2941,7 +2970,9 @@ export const listRegradesTrail = trail('list.regrades', {
 });
 
 export const checkRegradeTrail = trail('check.regrade', {
-  blaze: async (input, ctx) => {
+  cli: { path: ['regrade', 'check'] },
+  description: 'Check a saved Regrade plan gate without writing source',
+  implementation: async (input, ctx) => {
     const rootDirResult = resolveTrailRootDir(input.rootDir, ctx.cwd);
     if (rootDirResult.isErr()) {
       return rootDirResult;
@@ -2967,8 +2998,6 @@ export const checkRegradeTrail = trail('check.regrade', {
     }
     return Result.ok(output.value);
   },
-  cli: { path: ['regrade', 'check'] },
-  description: 'Check a saved Regrade plan gate without writing source',
   input: regradePlanReferenceInputSchema,
   intent: 'read',
   output: regradeCheckOutputSchema,
@@ -2976,7 +3005,9 @@ export const checkRegradeTrail = trail('check.regrade', {
 });
 
 export const previewRegradeTrail = trail('preview.regrade', {
-  blaze: async (input, ctx) => {
+  cli: { path: ['regrade', 'preview'] },
+  description: 'Preview a saved Regrade plan without writing source',
+  implementation: async (input, ctx) => {
     const rootDirResult = resolveTrailRootDir(input.rootDir, ctx.cwd);
     if (rootDirResult.isErr()) {
       return rootDirResult;
@@ -2991,8 +3022,6 @@ export const previewRegradeTrail = trail('preview.regrade', {
     }
     return Result.ok(output.value);
   },
-  cli: { path: ['regrade', 'preview'] },
-  description: 'Preview a saved Regrade plan without writing source',
   input: regradePlanReferenceInputSchema,
   intent: 'read',
   output: regradeReportOutput,
@@ -3000,7 +3029,9 @@ export const previewRegradeTrail = trail('preview.regrade', {
 });
 
 export const applyRegradeTrail = trail('apply.regrade', {
-  blaze: async (input, ctx) => {
+  cli: { path: ['regrade', 'apply'] },
+  description: 'Apply a saved Regrade plan and move it to history',
+  implementation: async (input, ctx) => {
     const rootDirResult = resolveTrailRootDir(input.rootDir, ctx.cwd);
     if (rootDirResult.isErr()) {
       return rootDirResult;
@@ -3019,8 +3050,6 @@ export const applyRegradeTrail = trail('apply.regrade', {
     }
     return Result.ok(output.value);
   },
-  cli: { path: ['regrade', 'apply'] },
-  description: 'Apply a saved Regrade plan and move it to history',
   input: regradeApplyPlanInputSchema,
   intent: 'write',
   output: regradeReportOutput,
@@ -3029,7 +3058,10 @@ export const applyRegradeTrail = trail('apply.regrade', {
 
 export const adjustRegradeTrail = trail('adjust.regrade', {
   args: ['transition'],
-  blaze: async (input, ctx) => {
+  cli: { path: ['regrade', 'adjust'] },
+  description:
+    'Pull a graduated Regrade transition back to an active plan for adjustment',
+  implementation: async (input, ctx) => {
     const rootDirResult = resolveTrailRootDir(input.rootDir, ctx.cwd);
     if (rootDirResult.isErr()) {
       return rootDirResult;
@@ -3052,9 +3084,6 @@ export const adjustRegradeTrail = trail('adjust.regrade', {
     }
     return Result.ok(output.data);
   },
-  cli: { path: ['regrade', 'adjust'] },
-  description:
-    'Pull a graduated Regrade transition back to an active plan for adjustment',
   input: regradeAdjustInputSchema,
   intent: 'write',
   output: regradePlanArtifactSchema,

package/src/trails/release-check.ts

@@ -62,7 +62,14 @@ const releaseCheckOutputSchema = z.object({
 });
 
 export const releaseCheckTrail = trail('release.check', {
-  blaze: async (input, ctx) => {
+  description: 'Check branch-local release rules',
+  examples: [
+    {
+      input: { baseRef: 'HEAD' },
+      name: 'Check release rules from the current HEAD',
+    },
+  ],
+  implementation: async (input, ctx) => {
     const rootDirResult = resolveTrailRootDir(input.rootDir, ctx.cwd);
     if (rootDirResult.isErr()) {
       return rootDirResult;
@@ -91,13 +98,6 @@ export const releaseCheckTrail = trail('release.check', {
       );
     }
   },
-  description: 'Check branch-local release rules',
-  examples: [
-    {
-      input: { baseRef: 'HEAD' },
-      name: 'Check release rules from the current HEAD',
-    },
-  ],
   input: releaseCheckInputSchema,
   intent: 'read',
   output: releaseCheckOutputSchema,

package/src/trails/release-smoke.ts

@@ -29,7 +29,8 @@ const releaseSmokeOutputSchema = z.object({
 });
 
 export const releaseSmokeTrail = trail('release.smoke', {
-  blaze: async (input) => {
+  description: 'Run local release confidence smoke checks',
+  implementation: async (input) => {
     try {
       const check = releaseSmokeCheckSchema.parse(input.check);
       return Result.ok(await runReleaseSmoke(check));
@@ -41,7 +42,6 @@ export const releaseSmokeTrail = trail('release.smoke', {
       );
     }
   },
-  description: 'Run local release confidence smoke checks',
   input: releaseSmokeInputSchema,
   intent: 'read',
   output: releaseSmokeOutputSchema,

package/src/trails/revise.ts

@@ -11,7 +11,8 @@ import {
 
 export const reviseTrail = trail('revise', {
   args: ['target'],
-  blaze: async (input, ctx) =>
+  description: 'Scaffold the next trail version entry',
+  implementation: async (input, ctx) =>
     withLifecycleApp(input, ctx.cwd, async (app, rootDir) => {
       const target = parseLifecycleTarget(input.target);
       if (target.isErr()) {
@@ -32,7 +33,6 @@ export const reviseTrail = trail('revise', {
       }
       return reviseTrailSource(rootDir, found.value, input.as);
     }),
-  description: 'Scaffold the next trail version entry',
   input: z.object({
     as: z
       .enum(['revision', 'fork'])

package/src/trails/run-example.ts

@@ -439,7 +439,15 @@ type RunExampleTrailInput = z.output<typeof runExampleTrailInputSchema>;
 
 export const runExampleTrail = trail('run.example', {
   args: ['id', 'exampleName'],
-  blaze: async (input: RunExampleTrailInput, ctx) =>
+  description: 'Run a named example on a trail and compare actual vs expected',
+  examples: [
+    {
+      description: 'Run a named example on a target trail',
+      input: buildHappyExampleInput(),
+      name: 'Run named example',
+    },
+  ],
+  implementation: async (input: RunExampleTrailInput, ctx) =>
     withOperatorRootDir(input, ctx, async (rootDir) => {
       const moduleResolution = await resolveRunModulePath(
         rootDir,
@@ -460,14 +468,6 @@ export const runExampleTrail = trail('run.example', {
         )
       );
     }),
-  description: 'Run a named example on a trail and compare actual vs expected',
-  examples: [
-    {
-      description: 'Run a named example on a target trail',
-      input: buildHappyExampleInput(),
-      name: 'Run named example',
-    },
-  ],
   input: runExampleTrailInputSchema,
   intent: 'write',
   output: runExampleComparisonSchema,

package/src/trails/run-examples.ts

@@ -99,7 +99,15 @@ type RunExamplesTrailInput = z.output<typeof runExamplesTrailInputSchema>;
 
 export const runExamplesTrail = trail('run.examples', {
   args: ['id'],
-  blaze: async (input: RunExamplesTrailInput, ctx) =>
+  description: "List a trail's examples without executing it",
+  examples: [
+    {
+      description: 'List examples authored on a target trail',
+      input: buildHappyExampleInput(),
+      name: 'List trail examples',
+    },
+  ],
+  implementation: async (input: RunExamplesTrailInput, ctx) =>
     withOperatorRootDir(input, ctx, async (rootDir) => {
       const moduleResolution = await resolveRunModulePath(
         rootDir,
@@ -115,14 +123,6 @@ export const runExamplesTrail = trail('run.examples', {
         buildExamplesListing(lease.app, input.id)
       );
     }),
-  description: "List a trail's examples without executing it",
-  examples: [
-    {
-      description: 'List examples authored on a target trail',
-      input: buildHappyExampleInput(),
-      name: 'List trail examples',
-    },
-  ],
   input: runExamplesTrailInputSchema,
   intent: 'read',
   output: runExamplesListingSchema,

package/src/trails/run.ts

@@ -37,11 +37,11 @@ import {
   run,
   trail,
 } from '@ontrails/core';
-import { buildWorkspaceTrailIndex } from '@ontrails/topographer';
+import { buildWorkspaceTrailIndex } from '@ontrails/topography';
 import type {
   WorkspaceTrailCollision,
   WorkspaceTrailEntry,
-} from '@ontrails/topographer';
+} from '@ontrails/topography';
 import { z } from 'zod';
 
 import {
@@ -371,7 +371,30 @@ const resolveInnerTrailInput = (
 
 export const runTrail = trail('run', {
   args: ['id'],
-  blaze: async (input: RunTrailInput, ctx) =>
+  description:
+    'Resolve a trail by ID in the current app and execute it through the shared pipeline',
+  examples: [
+    {
+      description:
+        'Resolve and execute a trail by ID, returning the inner trail Result value',
+      input: buildHappyExampleInput(),
+      name: 'Run trail by ID',
+    },
+    {
+      description: 'Reject an unknown trail ID with NotFoundError',
+      error: 'NotFoundError',
+      input: buildNotFoundExampleInput(),
+      name: 'Reject unknown trail ID',
+    },
+    {
+      description:
+        'Reject an ambiguous trail ID without --app with AmbiguousError so non-TTY callers see exit code 1',
+      error: 'AmbiguousError',
+      input: buildAmbiguousExampleInput(),
+      name: 'Reject ambiguous trail ID without --app',
+    },
+  ],
+  implementation: async (input: RunTrailInput, ctx) =>
     withOperatorRootDir(input, ctx, async (rootDir) => {
       const innerInput = resolveInnerTrailInput(input);
       if (innerInput.isErr()) {
@@ -404,29 +427,6 @@ export const runTrail = trail('run', {
         });
       });
     }),
-  description:
-    'Resolve a trail by ID in the current app and execute it through the shared pipeline',
-  examples: [
-    {
-      description:
-        'Resolve and execute a trail by ID, returning the inner trail Result value',
-      input: buildHappyExampleInput(),
-      name: 'Run trail by ID',
-    },
-    {
-      description: 'Reject an unknown trail ID with NotFoundError',
-      error: 'NotFoundError',
-      input: buildNotFoundExampleInput(),
-      name: 'Reject unknown trail ID',
-    },
-    {
-      description:
-        'Reject an ambiguous trail ID without --app with AmbiguousError so non-TTY callers see exit code 1',
-      error: 'AmbiguousError',
-      input: buildAmbiguousExampleInput(),
-      name: 'Reject ambiguous trail ID without --app',
-    },
-  ],
   input: runTrailInputSchema,
   intent: 'write',
   output: innerTrailResultSchema,

package/src/trails/survey.ts

@@ -20,7 +20,7 @@ import type {
   DiffResult,
   TopoGraph,
   TopoGraphOverlayRegistration,
-} from '@ontrails/topographer';
+} from '@ontrails/topography';
 import {
   createTopoStore,
   deriveTopoGraphDiff,
@@ -28,7 +28,7 @@ import {
   resolveTopoGraphVersionReference,
   TOPO_GRAPH_SCHEMA_VERSION,
   readTopoGraph,
-} from '@ontrails/topographer';
+} from '@ontrails/topography';
 import { z } from 'zod';
 
 import { writeIsolatedExampleJsonFile } from '../local-state-io.js';
@@ -275,14 +275,14 @@ const visibleDetailSeverity = (detail: string): DiffSeverity => {
     return status === 'archived' ? 'info' : 'warning';
   }
   if (
-    /^Version \d+ (?:kind changed:|Required (?:input|contour) field ".+" added|(?:Input|Output|Contour) field ".+" (?:removed|type changed:|changed from optional to required))/.test(
+    /^Version \d+ (?:kind changed:|Required (?:input|entity) field ".+" added|(?:Input|Output|Entity) field ".+" (?:removed|type changed:|changed from optional to required))/.test(
       detail
     )
   ) {
     return 'breaking';
   }
   if (
-    /^Version \d+ (?:marker changed:|Optional (?:input|contour) field ".+" added|Output field ".+" added)/.test(
+    /^Version \d+ (?:marker changed:|Optional (?:input|entity) field ".+" added|Output field ".+" added)/.test(
       detail
     )
   ) {
@@ -669,7 +669,7 @@ const diffEntryOutput = z.object({
   change: z.enum(['added', 'removed', 'modified']),
   details: z.array(z.string()).readonly(),
   id: z.string(),
-  kind: z.enum(['contour', 'trail', 'signal', 'resource']),
+  kind: z.enum(['entity', 'trail', 'signal', 'resource']),
   severity: z.enum(['info', 'warning', 'breaking']),
 });
 
@@ -729,16 +729,6 @@ const surveyMatchOutput = z.discriminatedUnion('kind', [
 
 export const surveyTrail = trail('survey', {
   args: ['id'],
-  blaze: async (input, ctx) =>
-    withResolvedSurveyApp(input, ctx.cwd, (app, rootDir, overlays) =>
-      dispatchSurvey(
-        app,
-        input,
-        rootDir,
-        overlays,
-        readSurfaceLayerNamesFromContext(ctx)
-      )
-    ),
   description: 'Full topo introspection',
   examples: [
     {
@@ -752,6 +742,16 @@ export const surveyTrail = trail('survey', {
       name: 'Lookup by ID',
     },
   ],
+  implementation: async (input, ctx) =>
+    withResolvedSurveyApp(input, ctx.cwd, (app, rootDir, overlays) =>
+      dispatchSurvey(
+        app,
+        input,
+        rootDir,
+        overlays,
+        readSurfaceLayerNamesFromContext(ctx)
+      )
+    ),
   input: z.object({
     id: z
       .string()
@@ -809,10 +809,6 @@ export const surveyTrail = trail('survey', {
 });
 
 export const surveyBriefTrail = trail('survey.brief', {
-  blaze: async (input, ctx) =>
-    withResolvedSurveyApp(input, ctx.cwd, (app, rootDir) =>
-      Result.ok(deriveCurrentTopoBrief(app, { rootDir }))
-    ),
   description: 'Summarize topo capabilities',
   examples: [
     {
@@ -821,16 +817,16 @@ export const surveyBriefTrail = trail('survey.brief', {
       name: 'Brief capability report',
     },
   ],
+  implementation: async (input, ctx) =>
+    withResolvedSurveyApp(input, ctx.cwd, (app, rootDir) =>
+      Result.ok(deriveCurrentTopoBrief(app, { rootDir }))
+    ),
   input: moduleInputSchema,
   intent: 'read',
   output: briefReportSchema,
 });
 
 export const surveySurfacesTrail = trail('survey.surfaces', {
-  blaze: async (input, ctx) =>
-    withResolvedSurveyApp(input, ctx.cwd, (app) =>
-      buildSurveySurfaceInventory(app)
-    ),
   description: 'Inventory shipped surface projections',
   examples: [
     {
@@ -839,6 +835,10 @@ export const surveySurfacesTrail = trail('survey.surfaces', {
       name: 'Shipped surface inventory',
     },
   ],
+  implementation: async (input, ctx) =>
+    withResolvedSurveyApp(input, ctx.cwd, (app) =>
+      buildSurveySurfaceInventory(app)
+    ),
   input: moduleInputSchema,
   intent: 'read',
   output: shippedSurfaceInventoryOutput,
@@ -846,10 +846,6 @@ export const surveySurfacesTrail = trail('survey.surfaces', {
 
 export const surveyDiffTrail = trail('survey.diff', {
   args: ['target'],
-  blaze: async (input, ctx) =>
-    withResolvedSurveyApp(input, ctx.cwd, (app, rootDir) =>
-      buildSurveyDiff(app, rootDir, input)
-    ),
   description: 'Diff the current topo against a saved TopoGraph',
   examples: [
     {
@@ -883,6 +879,10 @@ export const surveyDiffTrail = trail('survey.diff', {
       name: 'Reject empty breaking-only target',
     },
   ],
+  implementation: async (input, ctx) =>
+    withResolvedSurveyApp(input, ctx.cwd, (app, rootDir) =>
+      buildSurveyDiff(app, rootDir, input)
+    ),
   input: diffInputSchema,
   intent: 'read',
   output: diffOutput,
@@ -890,16 +890,6 @@ export const surveyDiffTrail = trail('survey.diff', {
 
 export const surveyTrailDetailTrail = trail('survey.trail', {
   args: ['id'],
-  blaze: async (input, ctx) =>
-    withResolvedSurveyApp(input, ctx.cwd, (app, rootDir, overlays) =>
-      buildSurveyTrailDetail(
-        app,
-        input.id,
-        rootDir,
-        overlays,
-        readSurfaceLayerNamesFromContext(ctx)
-      )
-    ),
   description: 'Inspect one trail by ID',
   examples: [
     {
@@ -911,6 +901,16 @@ export const surveyTrailDetailTrail = trail('survey.trail', {
       name: 'Trail detail',
     },
   ],
+  implementation: async (input, ctx) =>
+    withResolvedSurveyApp(input, ctx.cwd, (app, rootDir, overlays) =>
+      buildSurveyTrailDetail(
+        app,
+        input.id,
+        rootDir,
+        overlays,
+        readSurfaceLayerNamesFromContext(ctx)
+      )
+    ),
   input: detailInputSchema,
   intent: 'read',
   output: trailDetailOutput,
@@ -918,10 +918,6 @@ export const surveyTrailDetailTrail = trail('survey.trail', {
 
 export const surveyResourceTrail = trail('survey.resource', {
   args: ['id'],
-  blaze: async (input, ctx) =>
-    withResolvedSurveyApp(input, ctx.cwd, (app, rootDir) =>
-      buildSurveyResourceDetail(app, input.id, rootDir)
-    ),
   description: 'Inspect one resource by ID',
   examples: [
     {
@@ -934,6 +930,10 @@ export const surveyResourceTrail = trail('survey.resource', {
       name: 'Resource detail',
     },
   ],
+  implementation: async (input, ctx) =>
+    withResolvedSurveyApp(input, ctx.cwd, (app, rootDir) =>
+      buildSurveyResourceDetail(app, input.id, rootDir)
+    ),
   input: detailInputSchema,
   intent: 'read',
   output: resourceDetailOutput,
@@ -941,10 +941,6 @@ export const surveyResourceTrail = trail('survey.resource', {
 
 export const surveySignalTrail = trail('survey.signal', {
   args: ['id'],
-  blaze: async (input, ctx) =>
-    withResolvedSurveyApp(input, ctx.cwd, (app, rootDir) =>
-      buildSurveySignalDetail(app, input.id, rootDir)
-    ),
   description: 'Inspect one signal by ID',
   examples: [
     {
@@ -957,6 +953,10 @@ export const surveySignalTrail = trail('survey.signal', {
       name: 'Signal detail',
     },
   ],
+  implementation: async (input, ctx) =>
+    withResolvedSurveyApp(input, ctx.cwd, (app, rootDir) =>
+      buildSurveySignalDetail(app, input.id, rootDir)
+    ),
   input: detailInputSchema,
   intent: 'read',
   output: signalDetailOutput,

package/src/trails/topo-activation.ts

@@ -2,7 +2,7 @@ export {
   deriveActivationGraph,
   deriveDeclaredTrailActivation,
   deriveSignalActivationRelations,
-} from '@ontrails/topographer';
+} from '@ontrails/topography';
 export type {
   ActivationChainReport,
   ActivationEdgeReport,
@@ -11,4 +11,4 @@ export type {
   ActivationSourceReport,
   SignalActivationRelations,
   TrailActivationReport,
-} from '@ontrails/topographer';
+} from '@ontrails/topography';

package/src/trails/topo-history.ts

@@ -20,14 +20,6 @@ const topoHistoryTrailInputSchema = z.object({
 type TopoHistoryTrailInput = z.output<typeof topoHistoryTrailInputSchema>;
 
 export const topoHistoryTrail = trail('topo.history', {
-  blaze: (input: TopoHistoryTrailInput, ctx) => {
-    const rootDirResult = resolveTrailRootDir(input.rootDir, ctx.cwd);
-    if (rootDirResult.isErr()) {
-      return rootDirResult;
-    }
-    const rootDir = rootDirResult.value;
-    return Result.ok(listTopoHistory({ limit: input.limit, rootDir }));
-  },
   description: 'List saved topo snapshots, including pinned references',
   examples: [
     {
@@ -35,6 +27,14 @@ export const topoHistoryTrail = trail('topo.history', {
       name: 'Show topo history',
     },
   ],
+  implementation: (input: TopoHistoryTrailInput, ctx) => {
+    const rootDirResult = resolveTrailRootDir(input.rootDir, ctx.cwd);
+    if (rootDirResult.isErr()) {
+      return rootDirResult;
+    }
+    const rootDir = rootDirResult.value;
+    return Result.ok(listTopoHistory({ limit: input.limit, rootDir }));
+  },
   input: topoHistoryTrailInputSchema,
   intent: 'read',
   output: z.object({