feat: workspace-aware scanning, createRequire resolution, and integration tests

.changeset/workspace-scanning-integration-tests.md

@@ -0,0 +1,5 @@
+---
+'@tanstack/intent': patch
+---
+
+Add workspace-aware scanning so `intent list` discovers skills in monorepo workspace packages when run from the root. Replace `resolveDepDir` with `createRequire`-based resolution that handles hoisted deps, pnpm symlinks, and export maps. The `resolveDepDir` public API signature changed from 4 parameters to 2 — callers using the old signature should update to `resolveDepDir(depName, parentDir)`. `detectPackageManager` now checks workspace root for lockfiles when scanning from a subdir.

.gitignore

@@ -61,3 +61,5 @@ vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
 
 .angular
+
+docs/superpowers

knip.json

@@ -14,7 +14,8 @@
         "src/intent-library.ts",
         "src/library-scanner.ts"
       ],
-      "ignore": ["meta/**"]
+      "ignore": ["meta/**"],
+      "ignoreDependencies": ["verdaccio", "@verdaccio/node-api"]
     }
   }
 }

packages/intent/package.json

@@ -30,12 +30,15 @@
     "yaml": "^2.7.0"
   },
   "devDependencies": {
-    "tsdown": "^0.19.0"
+    "@verdaccio/node-api": "6.0.0-6-next.76",
+    "tsdown": "^0.19.0",
+    "verdaccio": "^6.3.2"
   },
   "scripts": {
     "prepack": "npm run build",
     "build": "tsdown src/index.ts src/cli.ts src/setup.ts src/intent-library.ts src/library-scanner.ts --format esm --dts",
-    "test:lib": "vitest run",
+    "test:lib": "vitest run --exclude 'tests/integration/**'",
+    "test:integration": "vitest run tests/integration/",
     "test:types": "tsc --noEmit"
   }
 }

packages/intent/src/library-scanner.ts

@@ -91,9 +91,8 @@ function discoverSkills(skillsDir: string): Array<SkillEntry> {
 
 export async function scanLibrary(
   scriptPath: string,
-  projectRoot?: string,
+  _projectRoot?: string,
 ): Promise<LibraryScanResult> {
-  const nodeModulesDir = join(projectRoot ?? process.cwd(), 'node_modules')
   const packages: Array<LibraryPackage> = []
   const warnings: Array<string> = []
   const visited = new Set<string>()
@@ -132,7 +131,7 @@ export async function scanLibrary(
     })
 
     for (const depName of getDeps(pkg)) {
-      const depDir = resolveDepDir(depName, dir, name, nodeModulesDir)
+      const depDir = resolveDepDir(depName, dir)
       if (!depDir) continue
       const depPkg = readPkgJson(depDir)
       if (depPkg && hasIntentBin(depPkg)) {

packages/intent/src/scanner.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, readdirSync } from 'node:fs'
+import { existsSync, readFileSync, readdirSync, type Dirent } from 'node:fs'
 import { join, relative, sep } from 'node:path'
 import {
   detectGlobalNodeModules,
@@ -7,6 +7,11 @@ import {
   parseFrontmatter,
   resolveDepDir,
 } from './utils.js'
+import {
+  findWorkspaceRoot,
+  readWorkspacePatterns,
+  resolveWorkspacePackages,
+} from './setup.js'
 import type {
   InstalledVariant,
   IntentConfig,
@@ -16,7 +21,6 @@ import type {
   SkillEntry,
   VersionConflict,
 } from './types.js'
-import type { Dirent } from 'node:fs'
 
 // ---------------------------------------------------------------------------
 // Package manager detection
@@ -40,11 +44,17 @@ function detectPackageManager(root: string): PackageManager {
     )
   }
 
-  if (existsSync(join(root, 'pnpm-lock.yaml'))) return 'pnpm'
-  if (existsSync(join(root, 'bun.lockb')) || existsSync(join(root, 'bun.lock')))
-    return 'bun'
-  if (existsSync(join(root, 'yarn.lock'))) return 'yarn'
-  if (existsSync(join(root, 'package-lock.json'))) return 'npm'
+  const dirsToCheck = [root]
+  const wsRoot = findWorkspaceRoot(root)
+  if (wsRoot && wsRoot !== root) dirsToCheck.push(wsRoot)
+
+  for (const dir of dirsToCheck) {
+    if (existsSync(join(dir, 'pnpm-lock.yaml'))) return 'pnpm'
+    if (existsSync(join(dir, 'bun.lockb')) || existsSync(join(dir, 'bun.lock')))
+      return 'bun'
+    if (existsSync(join(dir, 'yarn.lock'))) return 'yarn'
+    if (existsSync(join(dir, 'package-lock.json'))) return 'npm'
+  }
   return 'unknown'
 }
 
@@ -337,8 +347,6 @@ export async function scanForIntents(root?: string): Promise<ScanResult> {
         : undefined,
     },
   }
-  const resolutionRoots = [nodeModulesDir]
-
   // Track registered package names to avoid duplicates across phases
   const packageIndexes = new Map<string, number>()
   const packageJsonCache = new Map<string, Record<string, unknown> | null>()
@@ -369,15 +377,6 @@ export async function scanForIntents(root?: string): Promise<ScanResult> {
         ? existsSync(detected.path)
         : false
     }
-
-    if (
-      nodeModules.global.exists &&
-      nodeModules.global.path &&
-      nodeModules.global.path !== nodeModulesDir &&
-      !resolutionRoots.includes(nodeModules.global.path)
-    ) {
-      resolutionRoots.push(nodeModules.global.path)
-    }
   }
 
   function readPkgJson(dirPath: string): Record<string, unknown> | null {
@@ -490,7 +489,7 @@ export async function scanForIntents(root?: string): Promise<ScanResult> {
     }
 
     for (const depName of getDeps(pkgJson)) {
-      const depDir = resolveDepDir(depName, pkgDir, pkgName, resolutionRoots)
+      const depDir = resolveDepDir(depName, pkgDir)
       if (!depDir || walkVisited.has(depDir)) continue
 
       tryRegister(depDir, depName)
@@ -524,20 +523,52 @@ export async function scanForIntents(root?: string): Promise<ScanResult> {
     }
 
     if (!projectPkg) return
+    walkDepsFromPkgJson(projectPkg, projectRoot, true)
+  }
 
-    for (const depName of getDeps(projectPkg, true)) {
-      const depDir = resolveDepDir(
-        depName,
-        projectRoot,
-        depName,
-        resolutionRoots,
-      )
+  /** Resolve and walk deps listed in a package.json. */
+  function walkDepsFromPkgJson(
+    pkgJson: Record<string, unknown>,
+    fromDir: string,
+    includeDevDeps = false,
+  ): void {
+    for (const depName of getDeps(pkgJson, includeDevDeps)) {
+      const depDir = resolveDepDir(depName, fromDir)
       if (depDir && !walkVisited.has(depDir)) {
+        tryRegister(depDir, depName)
         walkDeps(depDir, depName)
       }
     }
   }
 
+  /**
+   * In monorepos, discover workspace packages and walk their deps.
+   * Handles pnpm monorepos (workspace-specific node_modules) and ensures
+   * transitive skills packages are found through workspace package dependencies.
+   */
+  function walkWorkspacePackages(): void {
+    const workspacePatterns = readWorkspacePatterns(projectRoot)
+    if (!workspacePatterns) return
+
+    for (const wsDir of resolveWorkspacePackages(
+      projectRoot,
+      workspacePatterns,
+    )) {
+      const wsNodeModules = join(wsDir, 'node_modules')
+      if (existsSync(wsNodeModules)) {
+        for (const dirPath of listNodeModulesPackageDirs(wsNodeModules)) {
+          tryRegister(dirPath, 'unknown')
+        }
+      }
+
+      const wsPkg = readPkgJson(wsDir)
+      if (wsPkg) {
+        walkDepsFromPkgJson(wsPkg, wsDir)
+      }
+    }
+  }
+
+  walkWorkspacePackages()
   walkKnownPackages()
   walkProjectDeps()
 

packages/intent/src/setup.ts

@@ -480,7 +480,7 @@ export function readWorkspacePatterns(root: string): Array<string> | null {
  * Handles simple patterns like "packages/*" and "packages/**".
  * Each resolved directory must contain a package.json.
  */
-function resolveWorkspacePackages(
+export function resolveWorkspacePackages(
   root: string,
   patterns: Array<string>,
 ): Array<string> {
@@ -497,7 +497,13 @@ function resolveWorkspacePackages(
       collectPackageDirs(baseDir, dirs)
     } else if (pattern.endsWith('/*')) {
       // Single level: direct children
-      for (const entry of readdirSync(baseDir, { withFileTypes: true })) {
+      let entries: Array<import('node:fs').Dirent>
+      try {
+        entries = readdirSync(baseDir, { withFileTypes: true })
+      } catch {
+        continue
+      }
+      for (const entry of entries) {
         if (!entry.isDirectory()) continue
         const dir = join(baseDir, entry.name)
         if (existsSync(join(dir, 'package.json'))) {

packages/intent/src/utils.ts

@@ -1,11 +1,6 @@
 import { execFileSync } from 'node:child_process'
-import {
-  existsSync,
-  readFileSync,
-  readdirSync,
-  realpathSync,
-  type Dirent,
-} from 'node:fs'
+import { existsSync, readFileSync, readdirSync, type Dirent } from 'node:fs'
+import { createRequire } from 'node:module'
 import { dirname, join } from 'node:path'
 import { parse as parseYaml } from 'yaml'
 
@@ -144,57 +139,46 @@ export function detectGlobalNodeModules(packageManager: string): {
 }
 
 /**
- * Resolve the directory of a dependency by name. First checks the top-level
- * node_modules (hoisted layout — npm, yarn, bun), then resolves through the
- * parent package's real path to handle pnpm's virtual store layout where
- * transitive deps are siblings in the .pnpm virtual store node_modules.
+ * Resolve the directory of a dependency by name. Tries createRequire first
+ * (handles pnpm symlinks), then falls back to walking up node_modules
+ * directories (handles packages with export maps that block ./package.json).
  */
 export function resolveDepDir(
   depName: string,
   parentDir: string,
-  parentName: string,
-  nodeModulesDirs: string | Array<string>,
 ): string | null {
-  if (!parentName) return null
-
-  const roots = Array.isArray(nodeModulesDirs)
-    ? nodeModulesDirs
-    : [nodeModulesDirs]
-
-  // 1. Top-level (hoisted)
-  for (const nodeModulesDir of roots) {
-    const topLevel = join(nodeModulesDir, depName)
-    if (existsSync(join(topLevel, 'package.json'))) return topLevel
-  }
-
-  // 2. Resolve nested installs under the parent package (npm/pnpm/bun)
-  const nestedNodeModules = join(parentDir, 'node_modules', depName)
-  if (existsSync(join(nestedNodeModules, 'package.json'))) {
-    return nestedNodeModules
-  }
-
-  // 3. Resolve through parent's real path (pnpm virtual store)
+  // Try createRequire — works for most packages including pnpm virtual store
   try {
-    const realParent = realpathSync(parentDir)
-    const segments = parentName.split('/').length
-    let nmDir = realParent
-    for (let i = 0; i < segments; i++) {
-      nmDir = dirname(nmDir)
-    }
-    const nested = join(nmDir, depName)
-    if (existsSync(join(nested, 'package.json'))) return nested
+    const req = createRequire(join(parentDir, 'package.json'))
+    const pkgJsonPath = req.resolve(join(depName, 'package.json'))
+    return dirname(pkgJsonPath)
   } catch (err: unknown) {
     const code =
       err && typeof err === 'object' && 'code' in err
         ? (err as NodeJS.ErrnoException).code
         : undefined
-    if (code !== 'ENOENT' && code !== 'ENOTDIR') {
+    if (
+      code &&
+      code !== 'MODULE_NOT_FOUND' &&
+      code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED'
+    ) {
       console.warn(
         `Warning: could not resolve ${depName} from ${parentDir}: ${err instanceof Error ? err.message : String(err)}`,
       )
     }
   }
 
+  // Fallback: walk up from parentDir checking node_modules/<depName>.
+  // Handles packages with exports maps that don't expose ./package.json.
+  let dir = parentDir
+  while (true) {
+    const candidate = join(dir, 'node_modules', depName)
+    if (existsSync(join(candidate, 'package.json'))) return candidate
+    const parent = dirname(dir)
+    if (parent === dir) break
+    dir = parent
+  }
+
   return null
 }
 

packages/intent/tests/fixtures/integration/skills-leaf/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "@test-intent/skills-leaf",
+  "version": "1.0.0",
+  "intent": {
+    "version": 1,
+    "repo": "test/skills-leaf",
+    "docs": "https://example.com/docs"
+  },
+  "files": [
+    "skills"
+  ]
+}

packages/intent/tests/fixtures/integration/skills-leaf/skills/core/SKILL.md

@@ -0,0 +1,9 @@
+---
+name: core
+description: 'Core skill for integration testing'
+type: core
+---
+
+# Core Skill
+
+This is a test skill used by integration tests.

packages/intent/tests/fixtures/integration/wrapper-1/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@test-intent/wrapper-1",
+  "version": "1.0.0",
+  "dependencies": {
+    "@test-intent/skills-leaf": "1.0.0"
+  }
+}

packages/intent/tests/fixtures/integration/wrapper-2/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@test-intent/wrapper-2",
+  "version": "1.0.0",
+  "dependencies": {
+    "@test-intent/wrapper-1": "1.0.0"
+  }
+}

packages/intent/tests/fixtures/integration/wrapper-3/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@test-intent/wrapper-3",
+  "version": "1.0.0",
+  "dependencies": {
+    "@test-intent/wrapper-2": "1.0.0"
+  }
+}