@ontrails/trails 1.0.0-beta.24 → 1.0.0-beta.29

package/CHANGELOG.md

@@ -1,5 +1,194 @@
 # trails
 
+## 1.0.0-beta.29
+
+### Patch Changes
+
+- 52425c5: Consolidate registry verdicts behind one shared `packageRegistry` classifier.
+
+  `apps/trails/src/release` now derives every package's registry state — `complete`, `needs-publish`, `first-time-package`, `needs-tag-repair`, `tag-points-ahead`, `registry-inaccessible` — from a single `classifyPackageRegistryState` function, fed by an exact-version probe (`npm view <name>@<version>`). The release policy engine and the registry preflight both consume it, so their verdicts can no longer drift, and the missing "is the target version actually published" fact is now first-class.
+
+  The preflight check is phase-aware: `publish:registry-check` (ready) treats an unpublished target or a behind dist-tag as expected pre-publish work rather than a failure, while `publish:registry-check:published` still requires every package to be fully published and tagged. This fixes the confusing failure seen when the repo is several releases ahead of the published `beta` tag. Exact-version probes run with bounded concurrency so release checks stay responsive. No publish or dist-tag mutation is performed.
+
+  - @ontrails/commander@1.0.0-beta.29
+  - @ontrails/adapter-kit@1.0.0-beta.29
+  - @ontrails/cli@1.0.0-beta.29
+  - @ontrails/config@1.0.0-beta.29
+  - @ontrails/core@1.0.0-beta.29
+  - @ontrails/http@1.0.0-beta.29
+  - @ontrails/mcp@1.0.0-beta.29
+  - @ontrails/observe@1.0.0-beta.29
+  - @ontrails/permits@1.0.0-beta.29
+  - @ontrails/regrade@1.0.0-beta.29
+  - @ontrails/topographer@1.0.0-beta.29
+  - @ontrails/tracing@1.0.0-beta.29
+  - @ontrails/warden@1.0.0-beta.29
+  - @ontrails/wayfinder@1.0.0-beta.29
+
+## 1.0.0-beta.28
+
+### Patch Changes
+
+- 9d679cf: Make generated release publish policy gather CI proof only for `publish:auto`, reuse generated release PR head proof when it matches the released tree, tolerate duplicate pending checks after a required check has passed, and log registry readiness separately from publish authorization.
+- 32dc2f3: Let generated release PR labeling treat trusted Graphite merge-queue proof with green required CI as source stack evidence for `publish:auto`, alongside explicit `stack:boundary` labels.
+  - @ontrails/commander@1.0.0-beta.28
+  - @ontrails/adapter-kit@1.0.0-beta.28
+  - @ontrails/cli@1.0.0-beta.28
+  - @ontrails/config@1.0.0-beta.28
+  - @ontrails/core@1.0.0-beta.28
+  - @ontrails/http@1.0.0-beta.28
+  - @ontrails/mcp@1.0.0-beta.28
+  - @ontrails/observe@1.0.0-beta.28
+  - @ontrails/permits@1.0.0-beta.28
+  - @ontrails/regrade@1.0.0-beta.28
+  - @ontrails/topographer@1.0.0-beta.28
+  - @ontrails/tracing@1.0.0-beta.28
+  - @ontrails/warden@1.0.0-beta.28
+  - @ontrails/wayfinder@1.0.0-beta.28
+
+## 1.0.0-beta.27
+
+### Patch Changes
+
+- a4727ec: Sync Bun lockfile workspace metadata during package versioning so generated release PRs cannot carry stale first-party package versions.
+  - @ontrails/commander@1.0.0-beta.27
+  - @ontrails/adapter-kit@1.0.0-beta.27
+  - @ontrails/cli@1.0.0-beta.27
+  - @ontrails/config@1.0.0-beta.27
+  - @ontrails/core@1.0.0-beta.27
+  - @ontrails/http@1.0.0-beta.27
+  - @ontrails/mcp@1.0.0-beta.27
+  - @ontrails/observe@1.0.0-beta.27
+  - @ontrails/permits@1.0.0-beta.27
+  - @ontrails/regrade@1.0.0-beta.27
+  - @ontrails/topographer@1.0.0-beta.27
+  - @ontrails/tracing@1.0.0-beta.27
+  - @ontrails/warden@1.0.0-beta.27
+  - @ontrails/wayfinder@1.0.0-beta.27
+
+## 1.0.0-beta.26
+
+### Patch Changes
+
+- 40cd7b4: Add a release-pack coherence guard that runs packed package validation for generated release branches and package release metadata changes.
+- 1307568: Centralize Trails config module path conventions, move local config overrides to root `trails.config.local.*`, scaffold the matching gitignore entries, and load project-local Warden rules from `.trails/rules.ts` or `.trails/rules/`.
+- 0fe873a: Normalize generated project guidance and scaffold ignores around the root `trails.lock` and committed `.trails/` control model.
+- 38cd9d6: Add a shared Trails config file loader that treats `trails.config.ts` as the natural primary while supporting JSON, JSONC, YAML, and TOML peer formats. Release and Warden config loading now consume the same loader and local overrides can be authored as data files.
+- f8403c4: Collapse normal topo compilation onto one root `trails.lock` envelope that embeds the TopoGraph, hash, and summary while keeping legacy `.trails/trails.lock` plus `.trails/topo.lock` readers for migration compatibility.
+- 371d19e: Move the default `trails.db` location to the per-user Trails state store, expose deterministic state-store path helpers, stop scaffolding disposable `.trails/cache` and `.trails/state` directories, and update topo-store documentation for the global-state substrate.
+- Updated dependencies [4e75b85]
+- Updated dependencies [1307568]
+- Updated dependencies [ef09e46]
+- Updated dependencies [38cd9d6]
+- Updated dependencies [f8403c4]
+- Updated dependencies [371d19e]
+- Updated dependencies [ff48e41]
+  - @ontrails/regrade@1.0.0-beta.26
+  - @ontrails/config@1.0.0-beta.26
+  - @ontrails/core@1.0.0-beta.26
+  - @ontrails/warden@1.0.0-beta.26
+  - @ontrails/topographer@1.0.0-beta.26
+  - @ontrails/wayfinder@1.0.0-beta.26
+  - @ontrails/tracing@1.0.0-beta.26
+  - @ontrails/commander@1.0.0-beta.26
+  - @ontrails/adapter-kit@1.0.0-beta.26
+  - @ontrails/cli@1.0.0-beta.26
+  - @ontrails/http@1.0.0-beta.26
+  - @ontrails/mcp@1.0.0-beta.26
+  - @ontrails/observe@1.0.0-beta.26
+  - @ontrails/permits@1.0.0-beta.26
+
+## 1.0.0-beta.25
+
+### Minor Changes
+
+- b9a7d8a: Add generated release PR policy automation with managed publish/channel/release
+  labels, stack-boundary source evidence, and inverse active-changeset release
+  fact validation.
+
+### Patch Changes
+
+- 578731d: `trails doctor` now returns the underlying validation error when the app topo is invalid, instead of crashing with a redacted "Internal server error". The diagnostic command reports the diagnosis: validation failures surface with their category, message, and (with the commander detail rendering) the issue list.
+- c5258ea: Fix the scaffolded AGENTS.md layer guidance to say "cross-cutting trail wrapping" — the cross→compose vocabulary cutover had renamed the standard English collocation, so every generated app shipped the nonsense phrase "compose-cutting".
+- b991263: Retire the package-owned `regrade.downstream.report` trail wrapper so the Trails operator app owns the public Regrade surface while `@ontrails/regrade` exposes the reusable engine APIs and report schema.
+- c75c6cc: Collapse the duplicate `diff` trail into the canonical `survey.diff` contract while keeping `trails diff` available as a CLI route alias.
+- 7b7cd6a: Centralize the Trails operator root-directory and fresh-app lease preamble so topo-reading commands share the same load/release flow.
+- c36aca9: Preserve existing Result error boundaries directly and widen Warden pass-through
+  coaching beyond trail blazes.
+- c1bc0d3: Add the `wayfind.outline` source-navigation trail and expose it through the Trails CLI and MCP surfaces.
+- 0d213b1: Enrich compact `wayfind outline --review` text with existing trail intent, schema, and example-count facts when saved graph artifacts are available.
+- dbf4ff4: Emit structured CLI error envelopes for JSON/JSONL command failures and map compile-time Trails DB lock contention to a retryable timeout instead of a generic internal error.
+- 8e1c2ff: Wire adapter and error fact selection into the unified `trails wayfind` command.
+- da39b89: Add the unified `trails wayfind` navigation command over targets, filters, and
+  views, and remove the old `wayfind find` search alias during the v1 Wayfinder
+  surface cutover.
+- 2059666: Add relational `trails wayfind` flags for downstream, upstream, and nearby graph navigation.
+- 2c08afe: Expose MCP trail graph fact resources and enable them for the Trails operator MCP surface.
+- 4b538d1: Start the `trails wayfind --source live` cutover by routing live overview and ID lookup through the fresh app survey path.
+- dd98701: Update CLI and agent guidance to teach the unified Wayfinder navigation surface and live-source bridge.
+- f1e6efa: Expand the Wayfinder dogfood smoke to exercise the unified navigation command shape.
+- 60fa8f5: Expose the saved graph diff as a distinct `wayfind diff` CLI command and MCP tool.
+- a8e4dc3: Clean up the Wayfinder navigation grammar before RC, including explicit pattern/query/file selectors, target-bound dependency and impact flags, drift-first provenance fields, stricter fires declaration diagnostics, and updated operator dogfood coverage.
+- a528239: Keep Wayfinder artifact drift aligned with rejected and force-annotated topo compiles.
+- de79459: Expand Wayfinder dogfood smoke coverage across demo graph facts, relation views, and artifact provenance failures.
+- f757cd7: Publish Regrade's downstream report and AST rewrite APIs, and expose a dry-run
+  by default `trails regrade` operator command with explicit apply mode.
+- 9bcf34e: Add trail-owned CLI command projection metadata and serialize resolved command
+  route facts for downstream tools.
+- f7d97fc: Expose resolved CLI command routes through schema helpers, the Trails operator
+  schema command, and Wayfinder trail contract output.
+- 59d10da: Dogfood CLI command route aliases through the Trails operator, saved Topographer artifacts, and Wayfinder contract inspection.
+- df13faf: Tighten Wayfinder navigation review findings: carry adapter filters into included adapter facts, keep live-source outline off the operator MCP surface until host-root binding exists, make unknown MCP resources protocol errors, route secondary Wayfinder graph populations through unified flags, and keep undeclared string `ctx.compose()` calls as Warden errors.
+- Updated dependencies [60caabf]
+- Updated dependencies [a9fdbc7]
+- Updated dependencies [f8fd6ca]
+- Updated dependencies [b991263]
+- Updated dependencies [0fcc42b]
+- Updated dependencies [c36aca9]
+- Updated dependencies [c1bc0d3]
+- Updated dependencies [f556559]
+- Updated dependencies [75417bb]
+- Updated dependencies [6250729]
+- Updated dependencies [d73c38e]
+- Updated dependencies [3befcf1]
+- Updated dependencies [dbf4ff4]
+- Updated dependencies [14dc577]
+- Updated dependencies [4f48166]
+- Updated dependencies [2d9e73a]
+- Updated dependencies [da39b89]
+- Updated dependencies [2c08afe]
+- Updated dependencies [f1e6efa]
+- Updated dependencies [f1e6efa]
+- Updated dependencies [f1e6efa]
+- Updated dependencies [a8e4dc3]
+- Updated dependencies [a528239]
+- Updated dependencies [f757cd7]
+- Updated dependencies [a4f9cf6]
+- Updated dependencies [9bcf34e]
+- Updated dependencies [1d3ae74]
+- Updated dependencies [f7d97fc]
+- Updated dependencies [00c0cf8]
+- Updated dependencies [59d10da]
+- Updated dependencies [b313c58]
+- Updated dependencies [f245fa0]
+- Updated dependencies [d9c6e50]
+- Updated dependencies [f1e6efa]
+- Updated dependencies [caff950]
+- Updated dependencies [df13faf]
+  - @ontrails/commander@1.0.0-beta.25
+  - @ontrails/mcp@1.0.0-beta.25
+  - @ontrails/warden@1.0.0-beta.25
+  - @ontrails/regrade@1.0.0-beta.25
+  - @ontrails/core@1.0.0-beta.25
+  - @ontrails/http@1.0.0-beta.25
+  - @ontrails/topographer@1.0.0-beta.25
+  - @ontrails/wayfinder@1.0.0-beta.25
+  - @ontrails/cli@1.0.0-beta.25
+  - @ontrails/adapter-kit@1.0.0-beta.25
+  - @ontrails/observe@1.0.0-beta.25
+  - @ontrails/permits@1.0.0-beta.25
+  - @ontrails/tracing@1.0.0-beta.25
+
 ## 1.0.0-beta.24
 
 ### Patch Changes

package/README.md

@@ -13,12 +13,13 @@ Common workflows:
 - `trails create` starts a new Trails project with generated trail, topo, surface, and verification files.
 - `trails add surface` adds another surface entrypoint to an existing project.
 - `trails topo` inspects topo state and manages pins/history.
-- `trails compile` writes committed topo artifacts.
-- `trails validate` checks committed topo artifacts for drift.
-- `trails wayfind overview` and adjacent `trails wayfind ...` commands read
-  saved topo artifacts through Wayfinder for local graph navigation.
+- `trails compile` writes root `trails.lock`.
+- `trails validate` checks root `trails.lock` for drift.
+- `trails wayfind`, `trails wayfind --trails --intent read`, `trails wayfind <id> --contract`, `trails wayfind <id> --deps`, `trails wayfind <id> --impact`, `trails wayfind pattern "wayfind.*"`, `trails wayfind query "release drift"`, `trails wayfind file <file> --outline`, and `trails wayfind diff ...` read graph artifacts and source outlines through Wayfinder for local navigation.
+- `trails schema <command...>` shows accepted CLI routes, aliases, flags, and schemas for an operator command.
 - `trails warden` runs Trails governance checks for contract and architecture drift.
-- `trails guide` shows available trails and examples from a project.
+- `trails regrade --root-dir <path> --json` dry-runs downstream migration checks; add `--apply` only to write safe rewrites.
+- `trails guide` remains available for compatibility; prefer `trails wayfind --source live --module <app-module>` or saved-artifact Wayfinder reads for agent navigation.
 
 Trails is contract-first: define trails once with typed input, Result output, examples, and meta; the framework derives CLI, MCP, HTTP, and future surfaces from the same contracts.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ontrails/trails",
-  "version": "1.0.0-beta.24",
+  "version": "1.0.0-beta.29",
   "bin": {
     "trails": "./bin/trails.ts"
   },
@@ -27,23 +27,25 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.1.0",
-    "@ontrails/adapter-kit": "^1.0.0-beta.24",
-    "@ontrails/cli": "^1.0.0-beta.24",
-    "@ontrails/commander": "^1.0.0-beta.24",
-    "@ontrails/core": "^1.0.0-beta.24",
-    "@ontrails/http": "^1.0.0-beta.24",
-    "@ontrails/mcp": "^1.0.0-beta.24",
-    "@ontrails/observe": "^1.0.0-beta.24",
-    "@ontrails/permits": "^1.0.0-beta.24",
-    "@ontrails/topographer": "^1.0.0-beta.24",
-    "@ontrails/tracing": "^1.0.0-beta.24",
-    "@ontrails/warden": "^1.0.0-beta.24",
-    "@ontrails/wayfinder": "^1.0.0-beta.24",
+    "@ontrails/adapter-kit": "^1.0.0-beta.29",
+    "@ontrails/cli": "^1.0.0-beta.29",
+    "@ontrails/commander": "^1.0.0-beta.29",
+    "@ontrails/config": "^1.0.0-beta.29",
+    "@ontrails/core": "^1.0.0-beta.29",
+    "@ontrails/http": "^1.0.0-beta.29",
+    "@ontrails/mcp": "^1.0.0-beta.29",
+    "@ontrails/observe": "^1.0.0-beta.29",
+    "@ontrails/permits": "^1.0.0-beta.29",
+    "@ontrails/regrade": "^1.0.0-beta.29",
+    "@ontrails/topographer": "^1.0.0-beta.29",
+    "@ontrails/tracing": "^1.0.0-beta.29",
+    "@ontrails/warden": "^1.0.0-beta.29",
+    "@ontrails/wayfinder": "^1.0.0-beta.29",
     "commander": "^14.0.3",
     "typescript": "^5.9.3",
     "zod": "^4.3.5"
   },
   "devDependencies": {
-    "@ontrails/testing": "^1.0.0-beta.24"
+    "@ontrails/testing": "^1.0.0-beta.29"
   }
 }

package/src/app.ts

@@ -1,15 +1,23 @@
 import { topo } from '@ontrails/core';
 import {
   wayfindAdaptersTrail,
+  wayfindContoursTrail,
   wayfindContractTrail,
   wayfindDescribeTrail,
+  wayfindDiffTrail,
   wayfindErrorsTrail,
   wayfindExamplesTrail,
+  wayfindFacetsTrail,
   wayfindImpactTrail,
   wayfindNearbyTrail,
   wayfindOverviewTrail,
+  wayfindOutlineTrail,
+  wayfindResourcesTrail,
   wayfindSearchTrail,
+  wayfindSignalsTrail,
+  wayfindSurfacesTrail,
   wayfindTrailsTrail,
+  wayfindVersionsTrail,
 } from '@ontrails/wayfinder';
 
 import * as addSurface from './trails/add-surface.js';
@@ -30,6 +38,7 @@ import * as devStats from './trails/dev-stats.js';
 import * as doctor from './trails/doctor.js';
 import * as draftPromote from './trails/draft-promote.js';
 import * as guide from './trails/guide.js';
+import * as regrade from './trails/regrade.js';
 import * as releaseCheck from './trails/release-check.js';
 import * as releaseSmoke from './trails/release-smoke.js';
 import * as revise from './trails/revise.js';
@@ -44,6 +53,7 @@ import * as topoUnpin from './trails/topo-unpin.js';
 import * as validate from './trails/validate.js';
 import * as warden from './trails/warden.js';
 import * as wardenGuide from './trails/warden-guide.js';
+import * as wayfind from './trails/wayfind.js';
 
 export const operatorApp = topo(
   'trails',
@@ -64,6 +74,7 @@ export const operatorApp = topo(
   devClean,
   devReset,
   guide,
+  regrade,
   releaseCheck,
   releaseSmoke,
   draftPromote,
@@ -85,22 +96,50 @@ const operatorTrails = Object.fromEntries(
   operatorApp.list().map((trailItem) => [trailItem.id, trailItem])
 );
 
-const cliWayfinderTrails = {
+const cliWayfinderCommandTrails = {
+  wayfindDiffTrail,
+  wayfindFileTrail: wayfind.wayfindFileTrail,
+  wayfindPatternTrail: wayfind.wayfindPatternTrail,
+  wayfindQueryTrail: wayfind.wayfindQueryTrail,
+  wayfindTrail: wayfind.wayfindTrail,
+};
+
+const cliWayfinderSupportTrails = {
   wayfindAdaptersTrail,
+  wayfindContoursTrail,
   wayfindContractTrail,
   wayfindDescribeTrail,
   wayfindErrorsTrail,
   wayfindExamplesTrail,
+  wayfindFacetsTrail,
   wayfindImpactTrail,
   wayfindNearbyTrail,
+  wayfindOutlineTrail,
   wayfindOverviewTrail,
+  wayfindResourcesTrail,
   wayfindSearchTrail,
+  wayfindSignalsTrail,
+  wayfindSurfacesTrail,
   wayfindTrailsTrail,
+  wayfindVersionsTrail,
+};
+
+const cliWayfinderTrails = {
+  ...cliWayfinderCommandTrails,
+  ...cliWayfinderSupportTrails,
 };
 
 export const trailsCliIncludedTrails = [
-  ...operatorApp.list().map((trailItem) => trailItem.id),
-  ...Object.values(cliWayfinderTrails).map((trailItem) => trailItem.id),
+  ...new Set([
+    ...operatorApp.list().map((trailItem) => trailItem.id),
+    ...Object.values(cliWayfinderCommandTrails).map(
+      (trailItem) => trailItem.id
+    ),
+  ]),
 ];
 
+export const trailsCliAliases = {
+  'survey.diff': [['diff']],
+} as const;
+
 export const app = topo('trails', operatorTrails, cliWayfinderTrails);

package/src/cli.ts

@@ -5,6 +5,7 @@ import { isAbsolute, join, resolve } from 'node:path';
 import {
   defaultOnResult,
   devPermitPreset,
+  deriveCliCommands,
   outputModePreset,
   permitPreset,
   tokenPreset,
@@ -16,13 +17,15 @@ import type {
   ResolveCliPermitFromToken,
 } from '@ontrails/cli';
 import { createProgram } from '@ontrails/commander';
+import type { CreateProgramOptions } from '@ontrails/commander';
 import { resolvePermitFromBearerToken } from '@ontrails/permits';
 import { deriveTopoGraph } from '@ontrails/topographer';
 
-import { app, trailsCliIncludedTrails } from './app.js';
+import { app, trailsCliAliases, trailsCliIncludedTrails } from './app.js';
 import { resolveInputWithClack } from './clack.js';
 import { getRetiredTopoCommandDiagnostic } from './retired-topo-command.js';
 import { attachCompletionsInstallCommand } from './run-completions-install.js';
+import { attachSchemaCommand } from './run-schema.js';
 import {
   applyAdapterCheckExitCode,
   tryAdapterCheckOutput,
@@ -49,6 +52,7 @@ import {
   runWatchLoop,
 } from './run-watch.js';
 import { tryWardenOutput } from './run-warden.js';
+import { tryWayfindOutlineOutput } from './run-wayfind-outline.js';
 import { tryLoadFreshAppLease } from './trails/load-app.js';
 import { resolveRunModulePath } from './trails/run.js';
 import { resolveTrailRootDir } from './trails/root-dir.js';
@@ -97,6 +101,9 @@ const buildOnResult =
     if (tryReleaseCheckOutput(resolvedCtx)) {
       return;
     }
+    if (tryWayfindOutlineOutput(resolvedCtx)) {
+      return;
+    }
     await defaultOnResult(resolvedCtx);
   };
 
@@ -293,7 +300,8 @@ const runSurfaceOnce = async (): Promise<void> => {
 
   const session = maybeInstallTraceSession();
   try {
-    const program = createProgram(app, {
+    const surfaceOptions = {
+      aliases: trailsCliAliases,
       description: 'Agent-native, contract-first TypeScript framework',
       include: trailsCliIncludedTrails,
       name: 'trails',
@@ -309,7 +317,13 @@ const runSurfaceOnce = async (): Promise<void> => {
       resolveInput: resolveInputWithClack,
       resolvePermitFromToken: resolveCliPermitFromToken,
       version: trailsPackageVersion,
-    });
+    } satisfies CreateProgramOptions;
+    const program = createProgram(app, surfaceOptions);
+    const schemaCommands = deriveCliCommands(app, surfaceOptions);
+    if (schemaCommands.isErr()) {
+      throw schemaCommands.error;
+    }
+    attachSchemaCommand(program, schemaCommands.value);
     attachCompletionsInstallCommand(program);
     await program.parseAsync(normalizeWardenArgv(process.argv));
   } finally {

package/src/local-state-io.ts

@@ -151,3 +151,23 @@ export const removeRootRelativeFileIfPresent = (
     );
   }
 };
+
+export const removeFileIfPresent = (
+  path: string
+): TrailsResult<boolean, Error> => {
+  if (!existsSync(path)) {
+    return Result.ok(false);
+  }
+
+  try {
+    rmSync(path, { force: true });
+    return Result.ok(true);
+  } catch (error) {
+    return Result.err(
+      new InternalError(`Failed to remove local state file "${path}"`, {
+        cause: asError(error),
+        context: { path },
+      })
+    );
+  }
+};

package/src/mcp-app.ts

@@ -2,12 +2,17 @@ import { topo } from '@ontrails/core';
 import {
   wayfindAdaptersTrail,
   wayfindContractTrail,
+  wayfindDescribeTrail,
+  wayfindDiffTrail,
   wayfindErrorsTrail,
   wayfindExamplesTrail,
   wayfindImpactTrail,
   wayfindNearbyTrail,
   wayfindOverviewTrail,
+  wayfindOutlineTrail,
+  wayfindResourcesTrail,
   wayfindSearchTrail,
+  wayfindSurfacesTrail,
   wayfindTrailsTrail,
 } from '@ontrails/wayfinder';
 
@@ -20,11 +25,16 @@ const operatorTrails = Object.fromEntries(
 export const trailsMcpApp = topo('trails', operatorTrails, {
   wayfindAdaptersTrail,
   wayfindContractTrail,
+  wayfindDescribeTrail,
+  wayfindDiffTrail,
   wayfindErrorsTrail,
   wayfindExamplesTrail,
   wayfindImpactTrail,
   wayfindNearbyTrail,
+  wayfindOutlineTrail,
   wayfindOverviewTrail,
+  wayfindResourcesTrail,
   wayfindSearchTrail,
+  wayfindSurfacesTrail,
   wayfindTrailsTrail,
 });

package/src/mcp-options.ts

@@ -11,7 +11,6 @@ export const trailsMcpIncludedTrails = [
   'dev.clean',
   'dev.reset',
   'dev.stats',
-  'diff',
   'doctor',
   'draft.promote',
   'guide',
@@ -37,6 +36,7 @@ export const trailsMcpIncludedTrails = [
   'warden.guide',
   'wayfind.adapters',
   'wayfind.contract',
+  'wayfind.diff',
   'wayfind.errors',
   'wayfind.examples',
   'wayfind.impact',
@@ -53,7 +53,6 @@ export const trailsMcpFacets = {
     mcp: { loading: 'deferred' },
     trails: [
       'survey',
-      'diff',
       'topo',
       'guide',
       'survey.brief',
@@ -72,6 +71,6 @@ export const trailsMcpSurfaceOptions = {
     'Trails framework operator surface. Use MCP resources for cold context, direct tools for high-signal work, and the inspect facet for saved topo reads.',
   facets: trailsMcpFacets,
   include: trailsMcpIncludedTrails,
-  mcpResources: { examples: true, surfaceMap: true },
+  mcpResources: { examples: true, graph: true, surfaceMap: true },
   name: 'trails',
 } satisfies CreateServerOptions;

package/src/project-writes.ts

@@ -151,12 +151,12 @@ export const renameContainedProjectPath = (
 ): TrailsResult<void, Error> => {
   const from = resolveProjectPath(projectDir, fromPath);
   if (from.isErr()) {
-    return Result.err(from.error);
+    return from;
   }
 
   const to = resolveProjectPath(projectDir, toPath);
   if (to.isErr()) {
-    return Result.err(to.error);
+    return to;
   }
 
   try {
@@ -238,7 +238,7 @@ const shouldApplyProjectOperation = (
   const { path } = operation;
   const target = resolveProjectPath(projectDir, path);
   if (target.isErr()) {
-    return Result.err(target.error);
+    return target;
   }
 
   return Result.ok(!existsSync(target.value));
@@ -257,7 +257,7 @@ const selectProjectOperations = (
       options
     );
     if (shouldApply.isErr()) {
-      return Result.err(shouldApply.error);
+      return shouldApply;
     }
     if (shouldApply.value) {
       selected.push(operation);
@@ -274,14 +274,14 @@ export const planProjectOperations = (
 ): TrailsResult<PlannedProjectOperation[], Error> => {
   const selected = selectProjectOperations(projectDir, operations, options);
   if (selected.isErr()) {
-    return Result.err(selected.error);
+    return selected;
   }
 
   const planned: PlannedProjectOperation[] = [];
   for (const operation of selected.value) {
     const result = planProjectOperation(projectDir, operation);
     if (result.isErr()) {
-      return Result.err(result.error);
+      return result;
     }
     planned.push(result.value);
   }
@@ -296,7 +296,7 @@ const applyProjectOperation = async (
     case 'mkdir': {
       const target = resolveProjectPath(projectDir, operation.path);
       if (target.isErr()) {
-        return Result.err(target.error);
+        return target;
       }
       try {
         mkdirSync(target.value, { recursive: true });
@@ -323,7 +323,7 @@ const applyProjectOperation = async (
     case 'write': {
       const target = resolveProjectPath(projectDir, operation.path);
       if (target.isErr()) {
-        return Result.err(target.error);
+        return target;
       }
       try {
         mkdirSync(dirname(target.value), { recursive: true });
@@ -358,18 +358,18 @@ export const applyProjectOperations = async (
 ): Promise<TrailsResult<PlannedProjectOperation[], Error>> => {
   const selected = selectProjectOperations(projectDir, operations, options);
   if (selected.isErr()) {
-    return Result.err(selected.error);
+    return selected;
   }
 
   const planned = planProjectOperations(projectDir, selected.value);
   if (planned.isErr()) {
-    return Result.err(planned.error);
+    return planned;
   }
 
   for (const operation of selected.value) {
     const applied = await applyProjectOperation(projectDir, operation);
     if (applied.isErr()) {
-      return Result.err(applied.error);
+      return applied;
     }
   }