@ontrails/config 0.2.2 → 0.2.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @ontrails/config
 
+## 0.2.3
+
+### Patch Changes
+
+- [`807ebda`](https://github.com/outfitter-dev/trails/commit/807ebdaeabfee0cd06539dc9b86e3ba9a817ab40): Keep Warden scoped to the nearest fresh Trails app when a parent has another Trails source marker, and pass the operator's resolved project root to the shared Warden command.
+
 ## 0.2.2
 
 No changes in this release.

package/README.md

@@ -99,6 +99,8 @@ Each layer overrides the previous. Environment variables always win.
 - `trails.lock`
 - source-shaped projects with `src/trails/` or `trails/` when no committed marker exists above them
 
+A nested `trails/` directory inside another project's `src/` does not take over source-only root discovery unless its parent has its own `package.json`, `src/app.ts`, or `.git` marker. Use an explicit root for a nested project without one of those markers.
+
 `trails.config.local.*` is a per-developer override and does not mark a project root by itself. A bare `.trails/` directory also does not mark a root; it is the committed-control home for project-local sections after a project root is known.
 
 ## Workspace app identity

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ontrails/config",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/outfitter-dev/trails.git",
@@ -27,11 +27,11 @@
     "clean": "rm -rf dist *.tsbuildinfo"
   },
   "dependencies": {
-    "@ontrails/source": "^0.2.2",
+    "@ontrails/source": "^0.2.3",
     "yaml": "^2.8.3"
   },
   "peerDependencies": {
-    "@ontrails/core": "^0.2.2",
+    "@ontrails/core": "^0.2.3",
     "zod": "^4.3.5"
   }
 }

package/src/trails-conventions.ts

@@ -159,6 +159,39 @@ const findSourceRootMarkerIn = (
   return undefined;
 };
 
+const isIncidentalNestedSourceRoot = (
+  fallback: TrailsProjectRootResolution,
+  ancestorRoot: string,
+  ancestorMarkerPath: string
+): boolean => {
+  if (
+    (ancestorMarkerPath !== join(ancestorRoot, 'src', 'trails') &&
+      ancestorMarkerPath !== join(ancestorRoot, 'trails')) ||
+    fallback.markerPath !== join(fallback.rootDir, 'trails') ||
+    !isWithinBoundary(join(ancestorRoot, 'src'), fallback.rootDir)
+  ) {
+    return false;
+  }
+
+  return (
+    !isFile(join(fallback.rootDir, 'package.json')) &&
+    !isFile(join(fallback.rootDir, trailsAppEntryRelativePath)) &&
+    !isFile(join(fallback.rootDir, '.git')) &&
+    !isDirectory(join(fallback.rootDir, '.git'))
+  );
+};
+
+const shouldPreferSourceRoot = (
+  fallback: TrailsProjectRootResolution | undefined,
+  marker: Omit<TrailsProjectRootResolution, 'rootDir'> | undefined,
+  rootDir: string
+): boolean =>
+  marker !== undefined &&
+  (fallback === undefined ||
+    fallback.markerPath === marker.markerPath ||
+    (marker.markerPath !== undefined &&
+      isIncidentalNestedSourceRoot(fallback, rootDir, marker.markerPath)));
+
 export const findTrailsProjectRoot = ({
   boundaryDir,
   startDir = process.cwd(),
@@ -195,7 +228,12 @@ export const findTrailsProjectRoot = ({
     }
 
     const sourceMarker = findSourceRootMarkerIn(current);
-    if (sourceMarker !== undefined) {
+    if (
+      sourceMarker !== undefined &&
+      shouldPreferSourceRoot(sourceFallback, sourceMarker, current)
+    ) {
+      // src/trails also looks like a trails root from src; keep the outer owner
+      // when both markers point there or the inner marker is incidental.
       sourceFallback = { ...sourceMarker, rootDir: current };
     }