@ontrails/warden 1.0.0-beta.18 → 1.0.0-beta.19

package/src/rules/index.ts

@@ -2,7 +2,7 @@ import { activationOrphan } from './activation-orphan.js';
 import { circularRefs } from './circular-refs.js';
 import { contourExists } from './contour-exists.js';
 import { contextNoSurfaceTypes } from './context-no-surface-types.js';
-import { crossDeclarations } from './cross-declarations.js';
+import { composesDeclarations } from './composes-declarations.js';
 import { deadInternalTrail } from './dead-internal-trail.js';
 import { draftFileMarking } from './draft-file-marking.js';
 import { draftVisibleDebt } from './draft-visible-debt.js';
@@ -17,12 +17,15 @@ import { layerFieldNameDrift } from './layer-field-name-drift.js';
 import { missingVisibility } from './missing-visibility.js';
 import { missingReconcile } from './missing-reconcile.js';
 import { noDevPermitInSource } from './no-dev-permit-in-source.js';
+import { noDestructuredCompose } from './no-destructured-compose.js';
 import { noLegacyLayerImports } from './no-legacy-layer-imports.js';
 import { noDirectImplementationCall } from './no-direct-implementation-call.js';
 import { noNativeErrorResult } from './no-native-error-result.js';
+import { noRedundantResultErrorWrap } from './no-redundant-result-error-wrap.js';
 import { noSyncResultAssumption } from './no-sync-result-assumption.js';
 import { noThrowInDetourRecover } from './no-throw-in-detour-recover.js';
 import { noThrowInImplementation } from './no-throw-in-implementation.js';
+import { noTopLevelSurface } from './no-top-level-surface.js';
 import { onReferencesExist } from './on-references-exist.js';
 import { orphanedSignal } from './orphaned-signal.js';
 import { ownerProjectionParity } from './owner-projection-parity.js';
@@ -37,9 +40,21 @@ import { resolvedImportBoundary } from './resolved-import-boundary.js';
 import { resourceDeclarations } from './resource-declarations.js';
 import { resourceExists } from './resource-exists.js';
 import { resourceIdGrammar } from './resource-id-grammar.js';
+import { resourceMockCoverage } from './resource-mock-coverage.js';
 import { scheduledDestroyIntent } from './scheduled-destroy-intent.js';
 import { signalGraphCoaching } from './signal-graph-coaching.js';
 import { staticResourceAccessorPreference } from './static-resource-accessor-preference.js';
+import {
+  forkWithoutPreservedBlaze,
+  markerSchemaUnsupported,
+  versionPinnedCompose,
+} from './trail-versioning-source.js';
+import {
+  deprecationWithoutGuidance,
+  pendingForce,
+  versionGap,
+  versionWithoutExamples,
+} from './trail-versioning-topo.js';
 import type { TopoAwareWardenRule, WardenRule } from './types.js';
 import { unmaterializedActivationSource } from './unmaterialized-activation-source.js';
 import { unreachableDetourShadowing } from './unreachable-detour-shadowing.js';
@@ -50,6 +65,11 @@ import { wardenRulesUseAst } from './warden-rules-use-ast.js';
 import { webhookRouteCollision } from './webhook-route-collision.js';
 
 export type {
+  WardenFix,
+  WardenFixCapability,
+  WardenFixClass,
+  WardenFixEdit,
+  WardenFixSafety,
   WardenGuidance,
   WardenGuidanceLink,
   WardenRuleLifecycle,
@@ -70,6 +90,8 @@ export {
   builtinWardenRuleMetadata,
   getWardenRuleMetadata,
   listWardenRuleMetadata,
+  wardenFixClasses,
+  wardenFixSafeties,
   wardenRuleConcerns,
   wardenRuleLifecycleStates,
   wardenRuleScopes,
@@ -82,7 +104,7 @@ export { noThrowInImplementation } from './no-throw-in-implementation.js';
 export { circularRefs } from './circular-refs.js';
 export { contourExists } from './contour-exists.js';
 export { contextNoSurfaceTypes } from './context-no-surface-types.js';
-export { crossDeclarations } from './cross-declarations.js';
+export { composesDeclarations } from './composes-declarations.js';
 export { deadInternalTrail } from './dead-internal-trail.js';
 export { draftFileMarking } from './draft-file-marking.js';
 export { draftVisibleDebt } from './draft-visible-debt.js';
@@ -97,12 +119,15 @@ export { missingVisibility } from './missing-visibility.js';
 export { missingReconcile } from './missing-reconcile.js';
 export { onReferencesExist } from './on-references-exist.js';
 export { noDevPermitInSource } from './no-dev-permit-in-source.js';
+export { noDestructuredCompose } from './no-destructured-compose.js';
 export { noLegacyLayerImports } from './no-legacy-layer-imports.js';
 export { noDirectImplementationCall } from './no-direct-implementation-call.js';
 export { noNativeErrorResult } from './no-native-error-result.js';
+export { noRedundantResultErrorWrap } from './no-redundant-result-error-wrap.js';
 export { noSyncResultAssumption } from './no-sync-result-assumption.js';
 export { implementationReturnsResult } from './implementation-returns-result.js';
 export { noThrowInDetourRecover } from './no-throw-in-detour-recover.js';
+export { noTopLevelSurface } from './no-top-level-surface.js';
 export { orphanedSignal } from './orphaned-signal.js';
 export { ownerProjectionParity } from './owner-projection-parity.js';
 export { permitGovernance } from './permit-governance.js';
@@ -116,9 +141,21 @@ export { resolvedImportBoundary } from './resolved-import-boundary.js';
 export { resourceDeclarations } from './resource-declarations.js';
 export { resourceExists } from './resource-exists.js';
 export { resourceIdGrammar } from './resource-id-grammar.js';
+export { resourceMockCoverage } from './resource-mock-coverage.js';
 export { scheduledDestroyIntent } from './scheduled-destroy-intent.js';
 export { signalGraphCoaching } from './signal-graph-coaching.js';
 export { staticResourceAccessorPreference } from './static-resource-accessor-preference.js';
+export {
+  forkWithoutPreservedBlaze,
+  markerSchemaUnsupported,
+  versionPinnedCompose,
+} from './trail-versioning-source.js';
+export {
+  deprecationWithoutGuidance,
+  pendingForce,
+  versionGap,
+  versionWithoutExamples,
+} from './trail-versioning-topo.js';
 export { unmaterializedActivationSource } from './unmaterialized-activation-source.js';
 export { unreachableDetourShadowing } from './unreachable-detour-shadowing.js';
 export { validDetourContract } from './valid-detour-contract.js';
@@ -134,7 +171,7 @@ export const wardenRules: ReadonlyMap<string, WardenRule> = new Map<
   [circularRefs.name, circularRefs],
   [contourExists.name, contourExists],
   [contextNoSurfaceTypes.name, contextNoSurfaceTypes],
-  [crossDeclarations.name, crossDeclarations],
+  [composesDeclarations.name, composesDeclarations],
   [deadInternalTrail.name, deadInternalTrail],
   [draftFileMarking.name, draftFileMarking],
   [draftVisibleDebt.name, draftVisibleDebt],
@@ -156,19 +193,26 @@ export const wardenRules: ReadonlyMap<string, WardenRule> = new Map<
   [resolvedImportBoundary.name, resolvedImportBoundary],
   [resourceIdGrammar.name, resourceIdGrammar],
   [resourceExists.name, resourceExists],
+  [resourceMockCoverage.name, resourceMockCoverage],
   [preferSchemaInference.name, preferSchemaInference],
   [staticResourceAccessorPreference.name, staticResourceAccessorPreference],
   [validDescribeRefs.name, validDescribeRefs],
   [noDevPermitInSource.name, noDevPermitInSource],
+  [noDestructuredCompose.name, noDestructuredCompose],
   [noDirectImplementationCall.name, noDirectImplementationCall],
   [noLegacyLayerImports.name, noLegacyLayerImports],
   [noNativeErrorResult.name, noNativeErrorResult],
+  [noRedundantResultErrorWrap.name, noRedundantResultErrorWrap],
   [noSyncResultAssumption.name, noSyncResultAssumption],
   [implementationReturnsResult.name, implementationReturnsResult],
   [noThrowInDetourRecover.name, noThrowInDetourRecover],
+  [noTopLevelSurface.name, noTopLevelSurface],
   [unreachableDetourShadowing.name, unreachableDetourShadowing],
   [wardenExportSymmetry.name, wardenExportSymmetry],
   [wardenRulesUseAst.name, wardenRulesUseAst],
+  [forkWithoutPreservedBlaze.name, forkWithoutPreservedBlaze],
+  [markerSchemaUnsupported.name, markerSchemaUnsupported],
+  [versionPinnedCompose.name, versionPinnedCompose],
 ]);
 
 /**
@@ -195,5 +239,9 @@ export const wardenTopoRules: ReadonlyMap<string, TopoAwareWardenRule> =
     [signalGraphCoaching.name, signalGraphCoaching],
     [unmaterializedActivationSource.name, unmaterializedActivationSource],
     [validDetourContract.name, validDetourContract],
+    [deprecationWithoutGuidance.name, deprecationWithoutGuidance],
+    [pendingForce.name, pendingForce],
+    [versionGap.name, versionGap],
+    [versionWithoutExamples.name, versionWithoutExamples],
     [webhookRouteCollision.name, webhookRouteCollision],
   ]);

package/src/rules/intent-propagation.ts

@@ -2,7 +2,7 @@ import type { Intent } from '@ontrails/core';
 import {
   collectNamedTrailIds,
   collectTrailIntentsById,
-  extractDefinitionCrossTargetIds,
+  extractDefinitionComposeTargetIds,
   findTrailDefinitions,
   offsetToLine,
   parse,
@@ -24,12 +24,12 @@ const buildIntentPropagationDiagnostic = (
 ): WardenDiagnostic => ({
   filePath,
   line,
-  message: `Trail "${trailId}" declares intent: 'read' but crosses "${targetTrailId}" with intent: '${targetIntent}'. Read trails must not compose write or destroy side effects.`,
+  message: `Trail "${trailId}" declares intent: 'read' but composes "${targetTrailId}" with intent: '${targetIntent}'. Read trails must not compose write or destroy side effects.`,
   rule: 'intent-propagation',
   severity: 'warn',
 });
 
-const buildDiagnosticsForCrossTargets = (
+const buildDiagnosticsForComposeTargets = (
   trailId: string,
   targetTrailIds: readonly string[],
   filePath: string,
@@ -64,9 +64,9 @@ const buildDiagnosticsForTrail = (
     return [];
   }
 
-  return buildDiagnosticsForCrossTargets(
+  return buildDiagnosticsForComposeTargets(
     def.id,
-    extractDefinitionCrossTargetIds(def.config, sourceCode, namedTrailIds),
+    extractDefinitionComposeTargetIds(def.config, sourceCode, namedTrailIds),
     filePath,
     offsetToLine(sourceCode, def.start),
     trailIntentsById
@@ -121,7 +121,7 @@ export const intentPropagation: ProjectAwareWardenRule = {
     return checkIntentPropagation(ast, sourceCode, filePath, trailIntentsById);
   },
   description:
-    "Warn when a trail declaring intent: 'read' crosses a trail whose normalized intent is write or destroy.",
+    "Warn when a trail declaring intent: 'read' composes a trail whose normalized intent is write or destroy.",
   name: 'intent-propagation',
   severity: 'warn',
 };

package/src/rules/metadata.ts

@@ -1,4 +1,6 @@
 import type {
+  WardenFixClass,
+  WardenFixSafety,
   WardenRule,
   WardenRuleConcern,
   WardenRuleLifecycleState,
@@ -41,6 +43,15 @@ export const wardenRuleLifecycleStates = [
   'deprecated',
 ] as const satisfies readonly WardenRuleLifecycleState[];
 
+export const wardenFixClasses = [
+  'term-rewrite',
+] as const satisfies readonly WardenFixClass[];
+
+export const wardenFixSafeties = [
+  'review',
+  'safe',
+] as const satisfies readonly WardenFixSafety[];
+
 type BuiltinWardenRuleMetadataInput = Omit<
   WardenRuleMetadata,
   'concern' | 'depth'
@@ -57,25 +68,31 @@ const depthByTier = {
 
 const concernByRuleName: Partial<Record<string, WardenRuleConcern>> = {
   'activation-orphan': 'signals',
+  'composes-declarations': 'composition',
   'context-no-surface-types': 'composition',
-  'cross-declarations': 'composition',
   'dead-internal-trail': 'composition',
+  'deprecation-without-guidance': 'lifecycle',
   'draft-file-marking': 'lifecycle',
   'draft-visible-debt': 'lifecycle',
   'error-mapping-completeness': 'results',
   'fires-declarations': 'signals',
+  'fork-without-preserved-blaze': 'lifecycle',
   'implementation-returns-result': 'results',
   'intent-propagation': 'composition',
+  'marker-schema-unsupported': 'lifecycle',
   'missing-reconcile': 'resources',
   'missing-visibility': 'composition',
+  'no-destructured-compose': 'composition',
   'no-dev-permit-in-source': 'permits',
   'no-direct-implementation-call': 'composition',
   'no-native-error-result': 'results',
+  'no-redundant-result-error-wrap': 'results',
   'no-sync-result-assumption': 'results',
   'no-throw-in-detour-recover': 'results',
   'no-throw-in-implementation': 'results',
   'on-references-exist': 'signals',
   'orphaned-signal': 'signals',
+  'pending-force': 'lifecycle',
   'permit-governance': 'permits',
   'public-output-schema': 'results',
   'read-intent-fires': 'signals',
@@ -83,11 +100,15 @@ const concernByRuleName: Partial<Record<string, WardenRuleConcern>> = {
   'resource-declarations': 'resources',
   'resource-exists': 'resources',
   'resource-id-grammar': 'resources',
+  'resource-mock-coverage': 'resources',
   'scheduled-destroy-intent': 'lifecycle',
   'signal-graph-coaching': 'signals',
   'static-resource-accessor-preference': 'resources',
   'unmaterialized-activation-source': 'lifecycle',
   'valid-detour-contract': 'results',
+  'version-gap': 'lifecycle',
+  'version-pinned-compose': 'composition',
+  'version-without-examples': 'lifecycle',
   'webhook-route-collision': 'composition',
 };
 
@@ -128,6 +149,11 @@ const builtinWardenRuleMetadataInput = {
     invariant: 'Contour reference graphs must be acyclic.',
     tier: 'project-static',
   },
+  'composes-declarations': {
+    ...durableExternal,
+    invariant: 'Declared composes stay aligned with ctx.compose() usage.',
+    tier: 'source-static',
+  },
   'context-no-surface-types': {
     ...durableExternal,
     invariant: 'Trail logic stays surface-agnostic.',
@@ -138,16 +164,17 @@ const builtinWardenRuleMetadataInput = {
     invariant: 'Declared contour references resolve to known contours.',
     tier: 'project-static',
   },
-  'cross-declarations': {
-    ...durableExternal,
-    invariant: 'Declared crosses stay aligned with ctx.cross() usage.',
-    tier: 'source-static',
-  },
   'dead-internal-trail': {
     ...durableExternal,
-    invariant: 'Internal trails should be reachable through declared crosses.',
+    invariant: 'Internal trails should be reachable through declared composes.',
     tier: 'project-static',
   },
+  'deprecation-without-guidance': {
+    ...durableExternal,
+    invariant:
+      'Deprecated trail version entries carry successor, migration, or note guidance.',
+    tier: 'topo-aware',
+  },
   'draft-file-marking': {
     ...durableExternal,
     invariant: 'Draft-authored state is visibly marked in filenames.',
@@ -181,9 +208,14 @@ const builtinWardenRuleMetadataInput = {
     invariant: 'Declared fires stay aligned with signal firing usage.',
     tier: 'source-static',
   },
+  'fork-without-preserved-blaze': {
+    ...durableExternal,
+    invariant: 'Fork version entries preserve their historical blaze.',
+    tier: 'source-static',
+  },
   'implementation-returns-result': {
     ...durableExternal,
-    invariant: 'Trail implementations return Result values.',
+    invariant: 'Blazes return Result values.',
     tier: 'source-static',
   },
   'incomplete-accessor-for-standard-op': {
@@ -198,7 +230,7 @@ const builtinWardenRuleMetadataInput = {
   },
   'intent-propagation': {
     ...durableExternal,
-    invariant: 'Composite trail intent cannot be safer than crossed trails.',
+    invariant: 'Composite trail intent cannot be safer than composed trails.',
     tier: 'project-static',
   },
   'layer-field-name-drift': {
@@ -207,6 +239,12 @@ const builtinWardenRuleMetadataInput = {
       'Layer input field reserved names are shared across surface projections.',
     tier: 'source-static',
   },
+  'marker-schema-unsupported': {
+    ...durableExternal,
+    invariant:
+      'Versioned schemas stay inside the supported marker projection subset.',
+    tier: 'source-static',
+  },
   'missing-reconcile': {
     ...durableExternal,
     invariant: 'Versioned CRUD store tables provide reconcile coverage.',
@@ -217,6 +255,12 @@ const builtinWardenRuleMetadataInput = {
     invariant: 'Composition-only trails declare internal visibility.',
     tier: 'project-static',
   },
+  'no-destructured-compose': {
+    ...durableExternal,
+    invariant:
+      'Trail blazes compose through ctx.compose() directly instead of destructuring compose from the context.',
+    tier: 'source-static',
+  },
   'no-dev-permit-in-source': {
     ...durableExternal,
     invariant:
@@ -225,10 +269,11 @@ const builtinWardenRuleMetadataInput = {
   },
   'no-direct-implementation-call': {
     ...durableExternal,
-    invariant: 'Application code composes trails through ctx.cross().',
+    invariant: 'Application code composes trails through ctx.compose().',
     tier: 'source-static',
   },
   'no-legacy-layer-imports': {
+    fix: { class: 'term-rewrite', safety: 'review' },
     invariant:
       'Legacy layer exports removed across TRL-475/TRL-476 (authLayer, autoIterateLayer, dateShortcutsLayer) do not reappear in committed source.',
     lifecycle: {
@@ -244,6 +289,12 @@ const builtinWardenRuleMetadataInput = {
     invariant: 'Result error boundaries carry specific TrailsError subclasses.',
     tier: 'source-static',
   },
+  'no-redundant-result-error-wrap': {
+    ...durableExternal,
+    invariant:
+      'Result error pass-throughs preserve the original Result boundary.',
+    tier: 'source-static',
+  },
   'no-sync-result-assumption': {
     ...durableExternal,
     invariant:
@@ -265,9 +316,24 @@ const builtinWardenRuleMetadataInput = {
         'Use detours for recoverable runtime strategies instead of throwing inside the blaze.',
       ],
       summary:
-        'Convert thrown implementation failures into explicit Result.err() outcomes.',
+        'Convert thrown failures in blazes into explicit Result.err() outcomes.',
     },
-    invariant: 'Trail implementations return Result.err() instead of throwing.',
+    invariant: 'Blazes return Result.err() instead of throwing.',
+    tier: 'source-static',
+  },
+  'no-top-level-surface': {
+    ...durableExternal,
+    guidance: {
+      docs: [{ label: 'Architecture', path: 'docs/architecture.md' }],
+      relatedRules: ['context-no-surface-types'],
+      steps: [
+        'Keep the topo-export module focused on exporting `topo(...)` as `default`, `graph`, or `app`.',
+        'Move `surface(...)`, `connectStdio(...)`, server start, or `.listen(...)` calls into a separate entry or bin module.',
+      ],
+      summary:
+        'Keep topo entry modules side-effect-free for survey, guide, compile, and lock generation.',
+    },
+    invariant: 'Topo export modules do not open surfaces at module top level.',
     tier: 'source-static',
   },
   'on-references-exist': {
@@ -287,6 +353,12 @@ const builtinWardenRuleMetadataInput = {
     scope: 'internal',
     tier: 'source-static',
   },
+  'pending-force': {
+    ...durableExternal,
+    invariant:
+      'Forced topo break audit events do not remain pending indefinitely.',
+    tier: 'topo-aware',
+  },
   'permit-governance': {
     ...durableExternal,
     guidance: {
@@ -395,6 +467,22 @@ const builtinWardenRuleMetadataInput = {
     invariant: 'Resource identifiers stay out of the scope separator grammar.',
     tier: 'source-static',
   },
+  'resource-mock-coverage': {
+    ...durableExternal,
+    guidance: {
+      docs: [trailContractDocs],
+      relatedRules: ['resource-declarations', 'resource-exists'],
+      steps: [
+        'Add a mock() factory so testAll(app) can provision the resource without production configuration.',
+        'If the resource genuinely cannot be mocked, declare unmockable: { reason } to record that intent.',
+      ],
+      summary:
+        'Make each resource declare a test mock or an explicit unmockable reason.',
+    },
+    invariant:
+      'Resource definitions declare a mock factory or an explicit unmockable reason.',
+    tier: 'source-static',
+  },
   'scheduled-destroy-intent': {
     ...durableExternal,
     invariant:
@@ -448,6 +536,23 @@ const builtinWardenRuleMetadataInput = {
       'Runtime detour contracts use error constructors and recover functions.',
     tier: 'topo-aware',
   },
+  'version-gap': {
+    ...durableExternal,
+    invariant:
+      'Trail version coverage remains contiguous through the current version.',
+    tier: 'topo-aware',
+  },
+  'version-pinned-compose': {
+    ...durableExternal,
+    invariant:
+      'Version-pinned ctx.compose() calls stay visible migration debt.',
+    tier: 'source-static',
+  },
+  'version-without-examples': {
+    ...durableExternal,
+    invariant: 'Live historical version entries include examples.',
+    tier: 'topo-aware',
+  },
   'warden-export-symmetry': {
     ...durableRepoLocal,
     invariant: 'The Warden package exports trail wrappers, not raw rules.',

package/src/rules/missing-visibility.ts

@@ -1,4 +1,4 @@
-import { collectCrossTargetTrailIds, parse } from './ast.js';
+import { collectComposeTargetTrailIds, parse } from './ast.js';
 import { isTestFile } from './scan.js';
 import {
   findTrailLikeSpecs,
@@ -28,13 +28,13 @@ const trailVisibility = (spec: TrailLikeSpec): 'internal' | 'public' => {
   return hasLegacyMetaInternal(spec) ? 'internal' : 'public';
 };
 
-const hasRequiredCrossInput = (spec: TrailLikeSpec): boolean => {
-  const crossInput = spec.properties.get('crossInput');
-  if (!crossInput) {
+const hasRequiredComposeInput = (spec: TrailLikeSpec): boolean => {
+  const composeInput = spec.properties.get('composeInput');
+  if (!composeInput) {
     return false;
   }
 
-  const fields = parseZodObjectShape(crossInput.value);
+  const fields = parseZodObjectShape(composeInput.value);
   return [...fields.values()].some((field) => field.required);
 };
 
@@ -45,7 +45,7 @@ const buildMissingVisibilityDiagnostic = (
 ): WardenDiagnostic => ({
   filePath,
   line,
-  message: `Trail "${trailId}" is crossed elsewhere and declares required crossInput fields, but it is still public. Consider visibility: 'internal' so surfaces do not expose a trail that only works through ctx.cross().`,
+  message: `Trail "${trailId}" is composed elsewhere and declares required composeInput fields, but it is still public. Consider visibility: 'internal' so surfaces do not expose a trail that only works through ctx.compose().`,
   rule: 'missing-visibility',
   severity: 'warn',
 });
@@ -53,7 +53,7 @@ const buildMissingVisibilityDiagnostic = (
 const checkMissingVisibility = (
   sourceCode: string,
   filePath: string,
-  crossedTrailIds: ReadonlySet<string>
+  composedTrailIds: ReadonlySet<string>
 ): readonly WardenDiagnostic[] => {
   if (isTestFile(filePath)) {
     return [];
@@ -65,8 +65,8 @@ const checkMissingVisibility = (
     if (
       spec.kind !== 'trail' ||
       trailVisibility(spec) === 'internal' ||
-      !crossedTrailIds.has(spec.id) ||
-      !hasRequiredCrossInput(spec)
+      !composedTrailIds.has(spec.id) ||
+      !hasRequiredComposeInput(spec)
     ) {
       continue;
     }
@@ -85,7 +85,7 @@ export const missingVisibility: ProjectAwareWardenRule = {
     return checkMissingVisibility(
       sourceCode,
       filePath,
-      ast ? collectCrossTargetTrailIds(ast, sourceCode) : new Set<string>()
+      ast ? collectComposeTargetTrailIds(ast, sourceCode) : new Set<string>()
     );
   },
   checkWithContext(
@@ -94,17 +94,17 @@ export const missingVisibility: ProjectAwareWardenRule = {
     context: ProjectContext
   ): readonly WardenDiagnostic[] {
     const ast = parse(filePath, sourceCode);
-    const localCrossTargetTrailIds = ast
-      ? collectCrossTargetTrailIds(ast, sourceCode)
+    const localComposeTargetTrailIds = ast
+      ? collectComposeTargetTrailIds(ast, sourceCode)
       : new Set<string>();
     return checkMissingVisibility(
       sourceCode,
       filePath,
-      context.crossTargetTrailIds ?? localCrossTargetTrailIds
+      context.composeTargetTrailIds ?? localComposeTargetTrailIds
     );
   },
   description:
-    'Coach when a crossed trail still looks composition-only because it declares required crossInput but remains public.',
+    'Coach when a composed trail still looks composition-only because it declares required composeInput but remains public.',
   name: 'missing-visibility',
   severity: 'warn',
 };