@kb-labs/devkit 1.0.0 → 1.2.0

package/.github/workflow-templates/deploy.yml

@@ -0,0 +1,28 @@
+name: Deploy
+
+# Deploys all services to VPS via docker compose
+# Triggered manually with a specific image tag
+#
+# Prerequisites:
+#   Add secrets in GitHub → Settings → Secrets → Actions:
+#     VPS_HOST     - server IP or hostname
+#     VPS_USER     - SSH username (e.g. deploy)
+#     VPS_SSH_KEY  - SSH private key
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: Image tag to deploy (e.g. release-1.0.0)
+        required: true
+        type: string
+
+jobs:
+  call:
+    uses: KirillBaranov/kb-labs-devkit/.github/workflows/deploy-reusable.yml@main
+    with:
+      image-tag: ${{ inputs.tag }}
+      compose-file: docker-compose.production.yml
+      deploy-dir: /opt/kb-labs
+      health-check-url: http://localhost:5050/api/v1/health
+    secrets: inherit

package/.github/workflow-templates/docker-build.yml

@@ -0,0 +1,25 @@
+name: Docker Build
+
+# Builds and pushes Docker image to ghcr.io
+#
+# Flow:
+#   rc branch   → build image tagged rc-<sha> (for testing)
+#   release tag → build image tagged release-x.y.z + latest (for deploy)
+#
+# Configure:
+#   - Set image-name to your service name (e.g. kb-labs-rest-api)
+#   - Set dockerfile path if not at repo root
+
+on:
+  push:
+    branches: [rc]
+    tags: ['release-*']
+  workflow_dispatch: {}
+
+jobs:
+  call:
+    uses: KirillBaranov/kb-labs-devkit/.github/workflows/docker-build-reusable.yml@main
+    with:
+      image-name: kb-labs-my-service  # TODO: change to your service name
+      dockerfile: Dockerfile
+      context: .

package/.github/workflows/deploy-reusable.yml

@@ -0,0 +1,110 @@
+name: reusable-deploy
+
+# Reusable workflow: deploy to VPS via SSH + docker compose
+#
+# Usage in orchestrator repo (e.g. kb-labs root):
+#   jobs:
+#     call:
+#       uses: KirillBaranov/kb-labs-devkit/.github/workflows/deploy-reusable.yml@main
+#       with:
+#         image-tag: release-1.0.0
+#         compose-file: docker-compose.production.yml
+#       secrets: inherit
+#
+# Required secrets in calling repo:
+#   VPS_HOST, VPS_USER, VPS_SSH_KEY
+
+on:
+  workflow_call:
+    inputs:
+      image-tag:
+        description: Docker image tag to deploy (e.g. release-1.0.0)
+        required: true
+        type: string
+      compose-file:
+        description: Path to docker-compose file on VPS
+        required: false
+        default: docker-compose.production.yml
+        type: string
+      deploy-dir:
+        description: Working directory on VPS
+        required: false
+        default: /opt/kb-labs
+        type: string
+      registry:
+        description: Container registry host
+        required: false
+        default: ghcr.io
+        type: string
+      health-check-url:
+        description: URL to check after deploy (e.g. http://localhost:5050/api/v1/health)
+        required: false
+        default: ''
+        type: string
+      health-check-wait:
+        description: Seconds to wait before health check
+        required: false
+        default: '15'
+        type: string
+    secrets:
+      VPS_HOST:
+        required: true
+      VPS_USER:
+        required: true
+      VPS_SSH_KEY:
+        required: true
+
+jobs:
+  deploy:
+    name: Deploy to VPS
+    runs-on: ubuntu-latest
+    environment: production
+
+    steps:
+      - name: Deploy via SSH
+        uses: appleboy/ssh-action@v1
+        env:
+          DEPLOY_TAG: ${{ inputs.image-tag }}
+          DEPLOY_REGISTRY: ${{ inputs.registry }}/${{ github.repository_owner }}
+        with:
+          host: ${{ secrets.VPS_HOST }}
+          username: ${{ secrets.VPS_USER }}
+          key: ${{ secrets.VPS_SSH_KEY }}
+          envs: DEPLOY_TAG,DEPLOY_REGISTRY
+          script: |
+            set -euo pipefail
+            cd ${{ inputs.deploy-dir }}
+
+            echo "→ Deploying tag: $DEPLOY_TAG"
+            echo "→ Registry: $DEPLOY_REGISTRY"
+
+            # Save current tag for rollback
+            [ -f .current-tag ] && cp .current-tag .previous-tag
+            echo "$DEPLOY_TAG" > .current-tag
+
+            # Pull new images
+            TAG="$DEPLOY_TAG" REGISTRY="$DEPLOY_REGISTRY" \
+              docker compose -f ${{ inputs.compose-file }} pull
+
+            # Rolling update
+            TAG="$DEPLOY_TAG" REGISTRY="$DEPLOY_REGISTRY" \
+              docker compose -f ${{ inputs.compose-file }} up -d --remove-orphans
+
+            echo "→ Containers started, waiting ${{ inputs.health-check-wait }}s..."
+            sleep ${{ inputs.health-check-wait }}
+
+            # Show status
+            docker compose -f ${{ inputs.compose-file }} ps
+
+            # Health check (if URL provided)
+            if [ -n "${{ inputs.health-check-url }}" ]; then
+              echo "→ Health check: ${{ inputs.health-check-url }}"
+              wget -qO- "${{ inputs.health-check-url }}" \
+                && echo "✓ Health check passed" \
+                || { echo "✗ Health check failed!"; exit 1; }
+            fi
+
+            # Cleanup old images
+            docker image prune -f > /dev/null 2>&1 || true
+
+            echo "✓ Deploy complete: $DEPLOY_TAG"

package/.github/workflows/docker-build-reusable.yml

@@ -0,0 +1,110 @@
+name: reusable-docker-build
+
+# Reusable workflow: build Docker image and push to ghcr.io
+#
+# Usage in consumer repo:
+#   jobs:
+#     call:
+#       uses: KirillBaranov/kb-labs-devkit/.github/workflows/docker-build-reusable.yml@main
+#       with:
+#         image-name: kb-labs-rest-api
+#         dockerfile: Dockerfile
+#       secrets: inherit
+
+on:
+  workflow_call:
+    inputs:
+      image-name:
+        description: Docker image name (e.g. kb-labs-rest-api)
+        required: true
+        type: string
+      dockerfile:
+        description: Path to Dockerfile (relative to context)
+        required: false
+        default: Dockerfile
+        type: string
+      context:
+        description: Docker build context (default is repo root)
+        required: false
+        default: .
+        type: string
+      build-args:
+        description: Build args as multiline string (KEY=VALUE per line)
+        required: false
+        default: ''
+        type: string
+      platforms:
+        description: Target platforms (e.g. linux/amd64,linux/arm64)
+        required: false
+        default: linux/amd64
+        type: string
+      registry:
+        description: Container registry host
+        required: false
+        default: ghcr.io
+        type: string
+    outputs:
+      image-tag:
+        description: Full image tag that was pushed
+        value: ${{ jobs.build.outputs.image-tag }}
+      short-sha:
+        description: Short commit SHA used as tag
+        value: ${{ jobs.build.outputs.short-sha }}
+
+jobs:
+  build:
+    name: Build & Push
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    outputs:
+      image-tag: ${{ steps.meta.outputs.version }}
+      short-sha: ${{ steps.sha.outputs.short }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Get short SHA
+        id: sha
+        run: echo "short=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
+
+      - name: Log in to Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ inputs.registry }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ inputs.registry }}/${{ github.repository_owner }}/${{ inputs.image-name }}
+          tags: |
+            # rc branch → rc-<sha>
+            type=raw,value=rc-${{ steps.sha.outputs.short }},enable=${{ github.ref == 'refs/heads/rc' }}
+            # release tag → release-1.0.0
+            type=raw,value=${{ github.ref_name }},enable=${{ startsWith(github.ref, 'refs/tags/release-') }}
+            # always tag latest on release
+            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/release-') }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: ${{ inputs.context }}
+          file: ${{ inputs.dockerfile }}
+          platforms: ${{ inputs.platforms }}
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: ${{ inputs.build-args }}
+          cache-from: type=gha,scope=${{ inputs.image-name }}
+          cache-to: type=gha,mode=max,scope=${{ inputs.image-name }}

package/README.md

@@ -990,6 +990,143 @@ To generate `tsup.external.json` manually (if needed):
 npx kb-devkit-tsup-external --generate
 ```
 
+### QA History Tracker
+
+Track QA metrics over time and detect regressions:
+
+```bash
+npx kb-devkit-qa-history save          # Save current QA results with git context
+npx kb-devkit-qa-history show          # Show last 20 runs
+npx kb-devkit-qa-history trends        # Show quality trends over time
+npx kb-devkit-qa-history regressions   # Detect new failures since last save
+```
+
+**Root commands:**
+```bash
+pnpm qa:save         # Save current QA state
+pnpm qa:history      # Show history
+pnpm qa:trends       # Show trends
+pnpm qa:regressions  # Detect regressions (exits 1 on regression)
+```
+
+### Core Gate
+
+Check if the 6 core platform monorepos meet zero-failure quality requirements. Reads from the last `pnpm qa` run — no recompilation:
+
+```bash
+npx kb-devkit-core-gate             # Gate check (exits 1 if core is broken)
+npx kb-devkit-core-gate --verbose   # Show failing packages
+npx kb-devkit-core-gate --json      # JSON output
+```
+
+**Core monorepos checked:** `kb-labs-cli`, `kb-labs-core`, `kb-labs-shared`, `kb-labs-sdk`, `kb-labs-rest-api`, `kb-labs-plugin`
+
+**Requirements:** build → zero failures, types → zero errors, lint → zero errors
+
+**Typical flow:**
+```bash
+pnpm qa          # Run checks
+pnpm core:gate   # Inspect core result
+```
+
+### Architecture Audit
+
+Analyze monorepo architecture and detect structural issues:
+
+```bash
+npx kb-devkit-architecture             # Full audit (JSON + HTML graph + markdown report)
+npx kb-devkit-architecture --json      # AI-readable JSON output
+npx kb-devkit-architecture --md        # Markdown report only
+npx kb-devkit-architecture --trends    # Compare with previous runs
+```
+
+**Detects 10 anomaly types** (scored by severity):
+- Circular dependencies (100), Layer violations (90), God packages (80)
+- Unstable core (75), Bidirectional dependencies (70)
+- Large packages >10K LOC (60), Orphan packages (60)
+- Many dependencies >10 (50), Deep chains >7 (50), Missing docs (40)
+
+### Freshness Tracker
+
+Detect stale packages — when package A uses an old build of dependency B:
+
+```bash
+npx kb-devkit-freshness                     # Default table output
+npx kb-devkit-freshness --json              # JSON for AI agents
+npx kb-devkit-freshness --only-stale        # Show only stale packages
+npx kb-devkit-freshness --suggest-rebuild   # Show rebuild order
+npx kb-devkit-freshness --package=cli-core  # Single package analysis
+npx kb-devkit-freshness --age-days=30       # Packages not built in 30+ days
+npx kb-devkit-freshness --high-impact=5     # Packages affecting 5+ others
+```
+
+### Config Checker
+
+Check all packages for configuration drift from standard DevKit templates:
+
+```bash
+npx kb-devkit-check-configs                      # Check all packages
+npx kb-devkit-check-configs --fix                # Auto-fix with backup
+npx kb-devkit-check-configs --package=cli-core   # Check specific package
+npx kb-devkit-check-configs --ci                 # CI mode (fail on drift)
+```
+
+**What it validates:**
+- Missing or modified config files vs standard templates
+- `tsup.config.ts` structure (nodePreset usage, `dts: true`, etc.)
+- Duplicate external/ignores declarations
+
+### Scripts Checker
+
+Validate that all packages have required scripts and devDependencies:
+
+```bash
+npx kb-devkit-check-scripts                      # Check all packages
+npx kb-devkit-check-scripts --fix                # Auto-add missing scripts
+npx kb-devkit-check-scripts --package=cli-core   # Check specific package
+```
+
+**Required scripts validated:** `clean`, `build`, `dev`, `lint`, `lint:fix`, `type-check`, `test`, `test:watch`
+
+### Deprecated Code Checker
+
+Find all `@deprecated` markers in the codebase with context:
+
+```bash
+npx kb-devkit-check-deprecated                       # Check all packages
+npx kb-devkit-check-deprecated --package cli-core    # Check specific package
+npx kb-devkit-check-deprecated --json                # JSON output
+npx kb-devkit-check-deprecated --stats               # Statistics only
+npx kb-devkit-check-deprecated --verbose             # Full context
+```
+
+**Finds:** JSDoc `@deprecated` tags, TypeScript `@deprecated` patterns, inline `// @deprecated` comments.
+
+### Build Readiness Checker
+
+Analyze whether packages can be successfully bundled (useful before creating standalone executables):
+
+```bash
+npx kb-devkit-check-build-readiness
+npx kb-devkit-check-build-readiness --package @kb-labs/cli-bin
+npx kb-devkit-check-build-readiness --fix
+```
+
+**Checks:** missing packages in imports, broken import paths, dependency chains that would fail bundling.
+
+### Config Migrator
+
+Mass migration to standardize all package configurations to current DevKit templates:
+
+```bash
+npx kb-devkit-migrate-configs                      # Dry run (preview only)
+npx kb-devkit-migrate-configs --apply              # Apply changes
+npx kb-devkit-migrate-configs --package=cli-core   # Migrate specific package
+npx kb-devkit-migrate-configs --force              # Skip confirmation prompts
+```
+
+Creates backups before applying changes and generates a migration report.
+
 ## ✨ Features
 
 - **TypeScript**: Ready-to-use `tsconfig` for libraries, Node services, and CLIs
@@ -1493,48 +1630,63 @@ jobs:
 
 ## 📦 Complete Tools Summary
 
-DevKit provides **19 tools** for monorepo management and quality assurance:
-
-### Analysis Tools (8)
-1. **Import Checker** - Find broken imports, unused dependencies, circular deps
-2. **Export Checker** - Find unused exports and dead code
-3. **Duplicate Checker** - Find duplicate dependencies
-4. **Structure Checker** - Validate package structure
-5. **Naming Validator** - Enforce Pyramid Rule naming convention
-6. **Path Validator** - Validate workspace deps, exports, bin paths
-7. **TypeScript Types Audit** - Deep type safety analysis across monorepo
-8. **Visualizer** - Generate dependency graphs and stats
-
-### Automation Tools (8)
-1. **⚡ QA Runner** - Comprehensive quality checks with incremental builds (NEW!)
-2. **Quick Statistics** - Get health scores and metrics
-3. **Dependency Auto-Fixer** - Auto-fix dependency issues
-4. **CI Combo Tool** - Run all checks in one command
-5. **Build Order Calculator** - Determine correct build order
-6. **Types Order Calculator** - Calculate types generation order
-7. **Command Health Checker** - Verify all CLI commands work
-8. **TypeScript Types Checker** - Ensure all packages generate types
-
-### Infrastructure Tools (3)
-1. **Repository Sync** - Sync DevKit assets across projects
-2. **Path Aliases Generator** - Generate workspace path aliases
-3. **Tsup External Generator** - Generate external dependencies list
+DevKit provides **29 tools** for monorepo management and quality assurance:
+
+### Analysis Tools (12)
+1. **Import Checker** (`kb-devkit-check-imports`) - Broken imports, unused deps, circular deps
+2. **Export Checker** (`kb-devkit-check-exports`) - Unused exports and dead code
+3. **Duplicate Checker** (`kb-devkit-check-duplicates`) - Duplicate dependencies
+4. **Structure Checker** (`kb-devkit-check-structure`) - Package structure validation
+5. **Naming Validator** (`kb-devkit-validate-naming`) - Pyramid Rule naming convention
+6. **Path Validator** (`kb-devkit-check-paths`) - Workspace deps, exports, bin paths
+7. **TypeScript Types Audit** (`kb-devkit-types-audit`) - Deep type safety across monorepo
+8. **Visualizer** (`kb-devkit-visualize`) - Dependency graphs and stats
+9. **Architecture Audit** (`kb-devkit-architecture`) - Structural anomalies, layer violations
+10. **Deprecated Checker** (`kb-devkit-check-deprecated`) - Find `@deprecated` markers
+11. **Build Readiness** (`kb-devkit-check-build-readiness`) - Pre-bundle dependency analysis
+12. **Config Checker** (`kb-devkit-check-configs`) - Drift from standard templates
+
+### Automation Tools (11)
+1. **QA Runner** (`kb-devkit-qa`) - ⚡ Incremental builds + lint + types + tests
+2. **QA History** (`kb-devkit-qa-history`) - Track metrics over time, detect regressions
+3. **Core Gate** (`kb-devkit-core-gate`) - Zero-failure gate for 6 core monorepos
+4. **Quick Statistics** (`kb-devkit-stats`) - Health scores and metrics
+5. **Dependency Auto-Fixer** (`kb-devkit-fix-deps`) - Auto-fix dependency issues
+6. **CI Combo Tool** (`kb-devkit-ci`) - All static checks in one command
+7. **Build Order Calculator** (`kb-devkit-build-order`) - Correct build order with layers
+8. **Types Order Calculator** (`kb-devkit-types-order`) - Types generation order
+9. **Command Health Checker** (`kb-devkit-check-commands`) - Verify all CLI commands work
+10. **TypeScript Types Checker** (`kb-devkit-check-types`) - Ensure packages generate types
+11. **Scripts Checker** (`kb-devkit-check-scripts`) - Validate required package scripts
+
+### Infrastructure Tools (6)
+1. **Repository Sync** (`kb-devkit-sync`) - Sync DevKit assets across projects
+2. **Path Aliases Generator** (`kb-devkit-paths`) - Generate workspace path aliases
+3. **Tsup External Generator** (`kb-devkit-tsup-external`) - Generate external deps list
+4. **Freshness Tracker** (`kb-devkit-freshness`) - Detect stale packages in dep chains
+5. **Config Migrator** (`kb-devkit-migrate-configs`) - Mass migrate configs to current templates
+6. **Health Check** (`kb-devkit-health`) - Comprehensive health check with grade A–F
 
 ### Quick Access
 ```bash
 # Quality Assurance (recommended)
-npx kb-devkit-qa                    # ⚡ Incremental builds (~20s)
-npx kb-devkit-ci                    # All static checks
+npx kb-devkit-qa                      # ⚡ Incremental builds (~20s)
+npx kb-devkit-qa-history regressions  # Detect regressions
+npx kb-devkit-core-gate               # Zero-failure gate for core
+npx kb-devkit-ci                      # All static checks
 
 # Analysis
-npx kb-devkit-check-imports         # Imports
-npx kb-devkit-check-exports         # Exports
-npx kb-devkit-types-audit           # Type safety
+npx kb-devkit-check-imports           # Imports
+npx kb-devkit-check-exports           # Exports
+npx kb-devkit-types-audit             # Type safety
+npx kb-devkit-architecture --md       # Architecture report
+npx kb-devkit-freshness --only-stale  # Stale packages
 
 # Automation
-npx kb-devkit-fix-deps --dry-run    # Fix dependencies
-npx kb-devkit-build-order --layers  # Build order
-npx kb-devkit-stats --health        # Health score
+npx kb-devkit-fix-deps --dry-run      # Fix dependencies
+npx kb-devkit-build-order --layers    # Build order
+npx kb-devkit-stats --health          # Health score
+npx kb-devkit-check-configs           # Config drift
 ```
 
 ## License

package/bin/devkit-architecture.mjs

@@ -42,6 +42,9 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+// Shared package discovery — supports both flat and categorized layouts
+import { findPackages } from './lib/find-packages.mjs';
+
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 // ANSI colors
@@ -80,38 +83,13 @@ const options = {
 // ============================
 
 /**
- * Find all packages in monorepo
+ * Extract repo name from a package.json path.
+ * Handles both flat (kb-labs-core/packages/...) and categorized (platform/kb-labs-core/packages/...) layouts.
  */
-function findPackages(rootDir) {
-  const packages = [];
-  const entries = fs.readdirSync(rootDir, { withFileTypes: true });
-
-  for (const entry of entries) {
-    if (!entry.isDirectory() || !entry.name.startsWith('kb-labs-')) {continue;}
-
-    const repoPath = path.join(rootDir, entry.name);
-    const packagesDir = path.join(repoPath, 'packages');
-
-    if (!fs.existsSync(packagesDir)) {continue;}
-
-    const packageDirs = fs.readdirSync(packagesDir, { withFileTypes: true });
-
-    for (const pkgDir of packageDirs) {
-      if (!pkgDir.isDirectory()) {continue;}
-
-      const packageJsonPath = path.join(packagesDir, pkgDir.name, 'package.json');
-
-      if (fs.existsSync(packageJsonPath)) {
-        packages.push({
-          path: packageJsonPath,
-          dir: path.join(packagesDir, pkgDir.name),
-          repository: entry.name,
-        });
-      }
-    }
-  }
-
-  return packages;
+function extractRepoFromPath(pkgPath) {
+  const parts = pkgPath.split(path.sep);
+  const repo = parts.find((p) => p.startsWith('kb-labs-'));
+  return repo || 'unknown';
 }
 
 /**
@@ -1074,7 +1052,11 @@ async function main() {
   }
 
   // Phase 1: Data Collection
-  const packages = findPackages(rootDir);
+  const packages = findPackages(rootDir).map((pkgPath) => ({
+    path: pkgPath,
+    dir: path.dirname(pkgPath),
+    repository: extractRepoFromPath(pkgPath),
+  }));
 
   if (packages.length === 0) {
     log('⚠️  No KB Labs packages found', 'yellow');

package/bin/devkit-build-order.mjs

@@ -49,36 +49,8 @@ const options = {
   package: args.find((arg) => arg.startsWith('--package='))?.split('=')[1],
 };
 
-/**
- * Find all packages
- */
-function findPackages(rootDir) {
-  const packages = [];
-  const entries = fs.readdirSync(rootDir, { withFileTypes: true });
-
-  for (const entry of entries) {
-    if (!entry.isDirectory() || !entry.name.startsWith('kb-labs-')) {continue;}
-
-    const repoPath = path.join(rootDir, entry.name);
-    const packagesDir = path.join(repoPath, 'packages');
-
-    if (!fs.existsSync(packagesDir)) {continue;}
-
-    const packageDirs = fs.readdirSync(packagesDir, { withFileTypes: true });
-
-    for (const pkgDir of packageDirs) {
-      if (!pkgDir.isDirectory()) {continue;}
-
-      const packageJsonPath = path.join(packagesDir, pkgDir.name, 'package.json');
-
-      if (fs.existsSync(packageJsonPath)) {
-        packages.push(packageJsonPath);
-      }
-    }
-  }
-
-  return packages;
-}
+// Shared package discovery — supports both flat and categorized layouts
+import { findPackages } from './lib/find-packages.mjs';
 
 /**
  * Build dependency graph

package/bin/devkit-check-build-readiness.mjs

@@ -22,6 +22,9 @@ import { readFileSync, existsSync, readdirSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 
+// Shared package discovery — supports both flat and categorized layouts
+import { findPackages } from './lib/find-packages.mjs';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const rootDir = join(__dirname, '../..');
 
@@ -34,31 +37,18 @@ console.log('🔍 KB Labs Build Readiness Checker\n');
 
 // Step 1: Find all workspace packages
 function findWorkspacePackages() {
-  const packages = [];
-  const monorepos = readdirSync(rootDir).filter(d => d.startsWith('kb-labs-'));
-
-  for (const monorepo of monorepos) {
-    const packagesDir = join(rootDir, monorepo, 'packages');
-    if (!existsSync(packagesDir)) {continue;}
-
-    for (const pkg of readdirSync(packagesDir)) {
-      const pkgJsonPath = join(packagesDir, pkg, 'package.json');
-      if (!existsSync(pkgJsonPath)) {continue;}
-
-      try {
-        const pkgJson = JSON.parse(readFileSync(pkgJsonPath, 'utf8'));
-        packages.push({
-          name: pkgJson.name,
-          path: join(packagesDir, pkg),
-          pkgJson,
-        });
-      } catch (e) {
-        // Skip invalid package.json
-      }
+  return findPackages(rootDir).map((pkgJsonPath) => {
+    try {
+      const pkgJson = JSON.parse(readFileSync(pkgJsonPath, 'utf8'));
+      return {
+        name: pkgJson.name,
+        path: dirname(pkgJsonPath),
+        pkgJson,
+      };
+    } catch (e) {
+      return null;
     }
-  }
-
-  return packages;
+  }).filter(Boolean);
 }
 
 // Step 2: Get import checker results