@ontrails/trails 1.0.0-beta.30 → 1.0.0-beta.32

package/CHANGELOG.md

@@ -1,5 +1,94 @@
 # trails
 
+## 1.0.0-beta.32
+
+### Patch Changes
+
+- f3c4fef: Export a shared `escapeRegExp` helper from core and migrate first-party callers off local copies.
+- cb0a9d8: Export shared workspace package discovery helpers from core and migrate first-party discovery callers.
+- 8db145e: Move activation report derivation into Topographer and keep the Trails app
+  consuming the owner-held activation facts through a compatibility re-export.
+- 8e2603c: Rename read-only topo helper exports from `build*` to `derive*`.
+- 7a3a25f: Rename version lifecycle result paths from `file` to `filePath`.
+- fe72b84: Fold remaining Regrade and Warden scan-target surfaces onto the shared path-scope vocabulary.
+- Updated dependencies [3e5c0fc]
+- Updated dependencies [f3c4fef]
+- Updated dependencies [cb0a9d8]
+- Updated dependencies [8db145e]
+- Updated dependencies [2b819f4]
+- Updated dependencies [21c6dda]
+- Updated dependencies [860ef32]
+- Updated dependencies [fe72b84]
+  - @ontrails/adapter-kit@1.0.0-beta.32
+  - @ontrails/core@1.0.0-beta.32
+  - @ontrails/permits@1.0.0-beta.32
+  - @ontrails/warden@1.0.0-beta.32
+  - @ontrails/regrade@1.0.0-beta.32
+  - @ontrails/topographer@1.0.0-beta.32
+  - @ontrails/config@1.0.0-beta.32
+  - @ontrails/cli@1.0.0-beta.32
+  - @ontrails/commander@1.0.0-beta.32
+  - @ontrails/http@1.0.0-beta.32
+  - @ontrails/mcp@1.0.0-beta.32
+  - @ontrails/observe@1.0.0-beta.32
+  - @ontrails/tracing@1.0.0-beta.32
+  - @ontrails/wayfinder@1.0.0-beta.32
+
+## 1.0.0-beta.31
+
+### Patch Changes
+
+- e2f3d23: Default Regrade reports to actionable entries, add skip counts grouped by
+  reason, and expose an `includeEntries` option for full report inventories.
+- 9be2b7e: Load project-local Warden term-rewrite rules from the Regrade root so repo-owned
+  migration classes can run through `trails regrade`.
+- 47f782c: Add occurrence-level vocabulary regrade reports with plan, ledger,
+  and completion-gate facts. The Trails `regrade` operator command now supports
+  positional `<from> <to>` regrade runs and exposes the same capability through
+  the curated MCP surface.
+- ee9f3ae: Let Warden fix capabilities declare downstream scan targets and have Regrade
+  honor those targets for Warden-backed term-rewrite classes.
+
+  Dogfood the first safe facet-to-trailhead prose rewrite through project-local
+  Warden rules and Regrade.
+
+- 982a4d7: Add Regrade path-scope exclusion globs for vocabulary runs and expose them
+  through the `trails regrade` CLI/MCP contract.
+- 1540233: Add Regrade scan inventory summaries that group matched files by extension and
+  top-level path, with occurrence counts for vocabulary regrade reports.
+- de878bd: Let Trails project config provide default Regrade vocabulary scope settings,
+  with explicit CLI or MCP plan inputs overriding those defaults.
+- a0126d9: Add Warden `scope.exclude` globs through project config and the Trails CLI
+  wrapper so governance runs can exclude local notes, scratch space, and generated
+  state without dropping durable skills or plugin assets from scope.
+- a079073: Rename Regrade path-scope scan controls from `ignore` to `exclude` across CLI, MCP, and project config.
+- 6a26a08: Rename Warden governance scope controls from jurisdiction ignore settings to `scope.exclude` across config, CLI, and Trails surfaces.
+- Updated dependencies [e2f3d23]
+- Updated dependencies [9be2b7e]
+- Updated dependencies [47f782c]
+- Updated dependencies [ee9f3ae]
+- Updated dependencies [982a4d7]
+- Updated dependencies [1540233]
+- Updated dependencies [a0126d9]
+- Updated dependencies [4cd5d4e]
+- Updated dependencies [a079073]
+- Updated dependencies [6a26a08]
+- Updated dependencies [38907cc]
+  - @ontrails/regrade@1.0.0-beta.31
+  - @ontrails/warden@1.0.0-beta.31
+  - @ontrails/mcp@1.0.0-beta.31
+  - @ontrails/wayfinder@1.0.0-beta.31
+  - @ontrails/core@1.0.0-beta.31
+  - @ontrails/commander@1.0.0-beta.31
+  - @ontrails/adapter-kit@1.0.0-beta.31
+  - @ontrails/cli@1.0.0-beta.31
+  - @ontrails/config@1.0.0-beta.31
+  - @ontrails/http@1.0.0-beta.31
+  - @ontrails/observe@1.0.0-beta.31
+  - @ontrails/permits@1.0.0-beta.31
+  - @ontrails/topographer@1.0.0-beta.31
+  - @ontrails/tracing@1.0.0-beta.31
+
 ## 1.0.0-beta.30
 
 ### Patch Changes

package/README.md

@@ -17,8 +17,8 @@ Common workflows:
 - `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 regrade --root-dir <path> --json` dry-runs downstream migration checks; add `--apply` only to write safe rewrites.
+- `trails warden` runs Trails governance checks for contract and architecture drift. Use `--scope-exclude <glob>` or project `warden.scope.exclude` config when local notes, scratch space, or generated state should not be governed by Warden.
+- `trails regrade --root-dir <path> --json` dry-runs downstream migration checks; add `--apply` only to write safe rewrites. Use `trails regrade <from> <to> --root-dir <path> --json` for occurrence-level vocabulary regrade reports that include the authored plan, observed ledger, completion gate, and scan inventory by file type and top-level path. Add `--exclude <glob>` to keep migration scope away from local notes, scratch space, generated state, or other paths that should not be scanned for that transition; project config can provide `regrade.scope` defaults and explicit plan inputs override them. The same `regrade` trail is exposed through MCP for agent-driven migration checks.
 - `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.30",
+  "version": "1.0.0-beta.32",
   "bin": {
     "trails": "./bin/trails.ts"
   },
@@ -27,25 +27,25 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.1.0",
-    "@ontrails/adapter-kit": "^1.0.0-beta.30",
-    "@ontrails/cli": "^1.0.0-beta.30",
-    "@ontrails/commander": "^1.0.0-beta.30",
-    "@ontrails/config": "^1.0.0-beta.30",
-    "@ontrails/core": "^1.0.0-beta.30",
-    "@ontrails/http": "^1.0.0-beta.30",
-    "@ontrails/mcp": "^1.0.0-beta.30",
-    "@ontrails/observe": "^1.0.0-beta.30",
-    "@ontrails/permits": "^1.0.0-beta.30",
-    "@ontrails/regrade": "^1.0.0-beta.30",
-    "@ontrails/topographer": "^1.0.0-beta.30",
-    "@ontrails/tracing": "^1.0.0-beta.30",
-    "@ontrails/warden": "^1.0.0-beta.30",
-    "@ontrails/wayfinder": "^1.0.0-beta.30",
+    "@ontrails/adapter-kit": "^1.0.0-beta.32",
+    "@ontrails/cli": "^1.0.0-beta.32",
+    "@ontrails/commander": "^1.0.0-beta.32",
+    "@ontrails/config": "^1.0.0-beta.32",
+    "@ontrails/core": "^1.0.0-beta.32",
+    "@ontrails/http": "^1.0.0-beta.32",
+    "@ontrails/mcp": "^1.0.0-beta.32",
+    "@ontrails/observe": "^1.0.0-beta.32",
+    "@ontrails/permits": "^1.0.0-beta.32",
+    "@ontrails/regrade": "^1.0.0-beta.32",
+    "@ontrails/topographer": "^1.0.0-beta.32",
+    "@ontrails/tracing": "^1.0.0-beta.32",
+    "@ontrails/warden": "^1.0.0-beta.32",
+    "@ontrails/wayfinder": "^1.0.0-beta.32",
     "commander": "^14.0.3",
     "typescript": "^5.9.3",
     "zod": "^4.3.5"
   },
   "devDependencies": {
-    "@ontrails/testing": "^1.0.0-beta.30"
+    "@ontrails/testing": "^1.0.0-beta.32"
   }
 }

package/src/cli.ts

@@ -247,6 +247,7 @@ const wardenValueFlags = new Set([
   '--drafts',
   '--fail-on',
   '--format',
+  '--scope-exclude',
   '--lock',
   '--root-dir',
 ]);

package/src/mcp-options.ts

@@ -14,6 +14,7 @@ export const trailsMcpIncludedTrails = [
   'doctor',
   'draft.promote',
   'guide',
+  'regrade',
   'release.check',
   'release.smoke',
   'revise',

package/src/regrade/config.ts

@@ -0,0 +1,152 @@
+import { loadTrailsConfigValue } from '@ontrails/config';
+import {
+  InternalError,
+  Result,
+  ValidationError,
+  pathScopeSchema,
+} from '@ontrails/core';
+import type { Result as TrailsResult } from '@ontrails/core';
+import { z } from 'zod';
+
+export const regradeConfigSchema = z
+  .object({
+    scope: pathScopeSchema.optional(),
+  })
+  .default({});
+
+export type RegradeConfig = z.output<typeof regradeConfigSchema>;
+
+interface RegradeConfigLoadResult {
+  readonly config?: RegradeConfig;
+  readonly configPath?: string;
+}
+
+interface ResolvableConfig {
+  readonly resolve: (options?: {
+    readonly cwd?: string;
+    readonly env?: Record<string, string | undefined>;
+  }) => unknown;
+}
+
+const isRecord = (value: unknown): value is Record<string, unknown> =>
+  typeof value === 'object' && value !== null && !Array.isArray(value);
+
+const isResultLike = (
+  value: unknown
+): value is {
+  readonly error?: unknown;
+  readonly isErr: () => boolean;
+  readonly isOk: () => boolean;
+  readonly value?: unknown;
+} =>
+  isRecord(value) &&
+  typeof value['isOk'] === 'function' &&
+  typeof value['isErr'] === 'function';
+
+const isResolvableConfig = (value: unknown): value is ResolvableConfig =>
+  isRecord(value) && typeof value['resolve'] === 'function';
+
+const errorMessage = (error: unknown): string =>
+  error instanceof Error ? error.message : String(error);
+
+const extractRegradeConfig = (
+  value: unknown
+): TrailsResult<RegradeConfig | undefined, ValidationError> => {
+  if (!(isRecord(value) && 'regrade' in value)) {
+    return Result.ok();
+  }
+
+  const parsed = regradeConfigSchema.safeParse(value['regrade']);
+  if (parsed.success) {
+    return Result.ok(parsed.data);
+  }
+
+  return Result.err(
+    new ValidationError('Invalid regrade config in Trails config file.', {
+      context: { issues: parsed.error.issues },
+    })
+  );
+};
+
+export const loadRegradeConfig = async ({
+  configPath,
+  env = {},
+  rootDir,
+}: {
+  readonly configPath?: string | undefined;
+  readonly env?: Record<string, string | undefined> | undefined;
+  readonly rootDir: string;
+}): Promise<
+  TrailsResult<RegradeConfigLoadResult, InternalError | ValidationError>
+> => {
+  try {
+    const loaded = await loadTrailsConfigValue({
+      configPath,
+      rootDir,
+    });
+    const exported = loaded.value;
+    if (exported === undefined) {
+      return Result.ok({});
+    }
+
+    if (isResolvableConfig(exported)) {
+      const resolved = await exported.resolve({ cwd: rootDir, env });
+      if (isResultLike(resolved)) {
+        if (resolved.isErr()) {
+          return Result.err(
+            new InternalError(
+              `Failed to resolve regrade config: ${errorMessage(resolved.error)}`
+            )
+          );
+        }
+        const configResult = extractRegradeConfig(resolved.value);
+        if (configResult.isErr()) {
+          return configResult;
+        }
+        return Result.ok({
+          ...(configResult.value === undefined
+            ? {}
+            : { config: configResult.value }),
+          ...(loaded.configPath === undefined
+            ? {}
+            : { configPath: loaded.configPath }),
+        });
+      }
+
+      const configResult = extractRegradeConfig(resolved);
+      if (configResult.isErr()) {
+        return configResult;
+      }
+      return Result.ok({
+        ...(configResult.value === undefined
+          ? {}
+          : { config: configResult.value }),
+        ...(loaded.configPath === undefined
+          ? {}
+          : { configPath: loaded.configPath }),
+      });
+    }
+
+    const configResult = extractRegradeConfig(exported);
+    if (configResult.isErr()) {
+      return configResult;
+    }
+    return Result.ok({
+      ...(configResult.value === undefined
+        ? {}
+        : { config: configResult.value }),
+      ...(loaded.configPath === undefined
+        ? {}
+        : { configPath: loaded.configPath }),
+    });
+  } catch (error) {
+    return Result.err(
+      new InternalError(
+        `Failed to load regrade config: ${errorMessage(error)}`,
+        {
+          cause: error instanceof Error ? error : new Error(String(error)),
+        }
+      )
+    );
+  }
+};

package/src/release/pack-coherence.ts

@@ -1,5 +1,6 @@
 import { readFile, readdir, writeFile } from 'node:fs/promises';
 import { join, relative } from 'node:path';
+import { escapeRegExp } from '@ontrails/core';
 
 export interface ReleasePackCoherenceInput {
   readonly branchName?: string | undefined;
@@ -234,9 +235,6 @@ export const findLockfileWorkspaceMetadataMismatches = ({
   return mismatches;
 };
 
-const escapeRegExp = (text: string): string =>
-  text.replaceAll(/[.*+?^${}()|[\]\\]/gu, '\\$&');
-
 const findWorkspaceBlockRange = (
   text: string,
   workspacePath: string

package/src/trails/create-adapter.ts

@@ -13,9 +13,16 @@ import type {
   AdapterTargetConformanceManifest,
   AdapterTargetPlacement,
 } from '@ontrails/adapter-kit';
-import { Result, trail, ValidationError } from '@ontrails/core';
-import { existsSync, readdirSync, readFileSync, realpathSync } from 'node:fs';
-import { dirname, join, relative, resolve } from 'node:path';
+import {
+  findWorkspacePackage,
+  listWorkspacePatterns,
+  Result,
+  trail,
+  ValidationError,
+} from '@ontrails/core';
+import type { WorkspaceRootManifest } from '@ontrails/core';
+import { existsSync, readFileSync, realpathSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
 import { z } from 'zod';
 
 import {
@@ -69,20 +76,11 @@ interface AdapterOperationPlan {
   readonly targetKey: string;
 }
 
-interface RootManifest {
-  readonly workspaces?: unknown;
-}
-
 interface WorkspacePackageManifest {
   readonly exports?: unknown;
   readonly name?: unknown;
 }
 
-interface WorkspacePackageName {
-  readonly name: string;
-  readonly workspacePath: string;
-}
-
 interface LocalNamedReexport {
   readonly local: string;
   readonly specifier: string;
@@ -123,27 +121,6 @@ const readJson = <T>(path: string): T | undefined => {
   }
 };
 
-const workspacePatternsFromManifest = (
-  manifest: RootManifest | undefined
-): readonly string[] => {
-  const { workspaces } = manifest ?? {};
-  if (Array.isArray(workspaces)) {
-    return workspaces.filter(
-      (pattern): pattern is string => typeof pattern === 'string'
-    );
-  }
-
-  const packages =
-    workspaces && typeof workspaces === 'object' && !Array.isArray(workspaces)
-      ? (workspaces as Record<string, unknown>)['packages']
-      : undefined;
-  return Array.isArray(packages)
-    ? packages.filter(
-        (pattern): pattern is string => typeof pattern === 'string'
-      )
-    : [];
-};
-
 const normalizeWorkspacePattern = (pattern: string): string =>
   pattern.replace(/^\.\//u, '').replace(/\/+$/u, '');
 
@@ -169,54 +146,14 @@ const rootWorkspaceIncludesPath = (
   rootDir: string,
   workspacePath: string
 ): boolean => {
-  const rootManifest = readJson<RootManifest>(join(rootDir, 'package.json'));
-  return workspacePatternsFromManifest(rootManifest).some((pattern) =>
+  const rootManifest = readJson<WorkspaceRootManifest>(
+    join(rootDir, 'package.json')
+  );
+  return listWorkspacePatterns(rootManifest).some((pattern) =>
     workspacePatternCoversPath(pattern, workspacePath)
   );
 };
 
-const workspaceDirsForPattern = (
-  rootDir: string,
-  pattern: string
-): readonly string[] => {
-  if (!pattern.endsWith('/*')) {
-    const workspaceDir = join(rootDir, pattern);
-    return existsSync(workspaceDir) ? [workspaceDir] : [];
-  }
-
-  const groupDir = join(rootDir, pattern.slice(0, -2));
-  if (!existsSync(groupDir)) {
-    return [];
-  }
-
-  return readdirSync(groupDir, { withFileTypes: true })
-    .filter((entry) => entry.isDirectory())
-    .map((entry) => join(groupDir, entry.name))
-    .toSorted();
-};
-
-const findWorkspacePackageName = (
-  rootDir: string,
-  packageName: string
-): WorkspacePackageName | undefined => {
-  const rootManifest = readJson<RootManifest>(join(rootDir, 'package.json'));
-  for (const pattern of workspacePatternsFromManifest(rootManifest)) {
-    for (const workspaceDir of workspaceDirsForPattern(rootDir, pattern)) {
-      const manifest = readJson<WorkspacePackageManifest>(
-        join(workspaceDir, 'package.json')
-      );
-      if (manifest?.name === packageName) {
-        return {
-          name: packageName,
-          workspacePath: relative(rootDir, workspaceDir),
-        };
-      }
-    }
-  }
-
-  return undefined;
-};
-
 const resolvePhysicalRootDir = (
   rootDir: string
 ): Result<string, ValidationError> => {
@@ -882,10 +819,13 @@ const buildExtractedPlan = (
   if (!packageNamePattern.test(packageName)) {
     return fail(packageNameMessage);
   }
-  const existingPackage = findWorkspacePackageName(rootDir, packageName);
+  const existingPackage = findWorkspacePackage<WorkspacePackageManifest>(
+    rootDir,
+    packageName
+  );
   if (existingPackage) {
     return fail(
-      `Workspace package name "${existingPackage.name}" already exists at ${existingPackage.workspacePath}.`
+      `Workspace package name "${packageName}" already exists at ${existingPackage.workspacePath}.`
     );
   }
 

package/src/trails/deprecate.ts

@@ -51,7 +51,7 @@ export const deprecateTrail = trail('deprecate', {
   }),
   intent: 'write',
   output: z.object({
-    file: z.string(),
+    filePath: z.string(),
     trailId: z.string(),
     updated: z.boolean(),
   }),

package/src/trails/guide.ts

@@ -10,8 +10,8 @@ import { z } from 'zod';
 import { withFreshOperatorApp } from './operator-context.js';
 import { trailDetailOutput } from './topo-output-schemas.js';
 import {
-  buildCurrentGuideEntries,
-  buildCurrentTopoDetail,
+  deriveCurrentGuideEntries,
+  deriveCurrentTopoDetail,
   readSurfaceLayerNamesFromContext,
 } from './topo-read-support.js';
 import { createIsolatedExampleInput } from './topo-support.js';
@@ -53,7 +53,7 @@ export const guideTrail = trail('guide', {
   blaze: async (input: GuideTrailInput, ctx) =>
     withFreshOperatorApp<GuideTrailOutput>(input, ctx, ({ lease, rootDir }) => {
       if (input.trailId) {
-        const detail = buildCurrentTopoDetail(lease.app, input.trailId, {
+        const detail = deriveCurrentTopoDetail(lease.app, input.trailId, {
           cliAliases: lease.cliAliases,
           rootDir,
           surfaceLayerNames: readSurfaceLayerNamesFromContext(ctx),
@@ -70,7 +70,7 @@ export const guideTrail = trail('guide', {
       }
 
       return Result.ok({
-        entries: buildCurrentGuideEntries(lease.app, {
+        entries: deriveCurrentGuideEntries(lease.app, {
           rootDir,
         }) as GuideEntry[],
         mode: 'list' as const,

package/src/trails/load-app.ts

@@ -19,6 +19,7 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 import {
   deriveSafePath,
   isTrailsError,
+  listWorkspacePackages,
   PermissionError,
   Result,
   ValidationError,
@@ -278,6 +279,8 @@ interface PackageJson {
   readonly workspaces?: unknown;
 }
 
+type NamedPackageJson = PackageJson & { readonly name: string };
+
 const readPackageJson = (packagePath: string): PackageJson | undefined => {
   try {
     return JSON.parse(readFileSync(packagePath, 'utf8')) as PackageJson;
@@ -327,20 +330,6 @@ const isPackageLocalImport = (
 const isScannableModule = (modulePath: string): boolean =>
   SCANNABLE_EXTENSIONS.has(extname(modulePath));
 
-const resolveImportedModulePath = (
-  importerPath: string,
-  importPath: string
-): string => {
-  const resolved = import.meta.resolve(
-    importPath,
-    pathToFileURL(importerPath).href
-  );
-  return resolveFilesystemModulePath(
-    fileURLToPath(resolved),
-    dirname(importerPath)
-  );
-};
-
 const readDirectoryEntries = (directoryPath: string): readonly string[] => {
   try {
     return readdirSync(directoryPath);
@@ -359,25 +348,18 @@ const safeStat = (
   }
 };
 
-const readWorkspacePatterns = (cwd: string): readonly string[] => {
-  const rootPackage = readPackageJson(join(cwd, 'package.json'));
-  const workspaces = rootPackage?.workspaces;
-  if (Array.isArray(workspaces)) {
-    return workspaces.filter(
-      (pattern): pattern is string => typeof pattern === 'string'
-    );
-  }
-  if (
-    typeof workspaces === 'object' &&
-    workspaces !== null &&
-    'packages' in workspaces &&
-    Array.isArray(workspaces.packages)
-  ) {
-    return workspaces.packages.filter(
-      (pattern): pattern is string => typeof pattern === 'string'
-    );
-  }
-  return [];
+const resolveImportedModulePath = (
+  importerPath: string,
+  importPath: string
+): string => {
+  const resolved = import.meta.resolve(
+    importPath,
+    pathToFileURL(importerPath).href
+  );
+  return resolveFilesystemModulePath(
+    fileURLToPath(resolved),
+    dirname(importerPath)
+  );
 };
 
 interface WorkspacePackage {
@@ -386,45 +368,12 @@ interface WorkspacePackage {
   readonly packageRoot: string;
 }
 
-const listWorkspacePackageRoots = (cwd: string): readonly string[] => {
-  const roots: string[] = [];
-  for (const pattern of readWorkspacePatterns(cwd)) {
-    if (pattern.endsWith('/*')) {
-      const baseDir = resolve(cwd, pattern.slice(0, -2));
-      for (const entry of readDirectoryEntries(baseDir)) {
-        const entryPath = join(baseDir, entry);
-        if (safeStat(entryPath)?.isDirectory()) {
-          roots.push(entryPath);
-        }
-      }
-      continue;
-    }
-
-    if (!pattern.includes('*')) {
-      roots.push(resolve(cwd, pattern));
-    }
-  }
-  return roots;
-};
-
-const readWorkspacePackages = (cwd: string): readonly WorkspacePackage[] => {
-  const packages: WorkspacePackage[] = [];
-  for (const packageRoot of listWorkspacePackageRoots(cwd)) {
-    const packageJson = readPackageJson(join(packageRoot, 'package.json'));
-    if (
-      packageJson !== undefined &&
-      typeof packageJson.name === 'string' &&
-      packageJson.name.length > 0
-    ) {
-      packages.push({
-        name: packageJson.name,
-        packageJson,
-        packageRoot,
-      });
-    }
-  }
-  return packages;
-};
+const readWorkspacePackages = (cwd: string): readonly WorkspacePackage[] =>
+  listWorkspacePackages<NamedPackageJson>(cwd).map((workspacePackage) => ({
+    name: workspacePackage.manifest.name,
+    packageJson: workspacePackage.manifest,
+    packageRoot: workspacePackage.packageRoot,
+  }));
 
 const parsePackageSpecifier = (
   importPath: string