@boopkit/cli 0.1.1 → 0.1.3

package/dist/capability-versions.json

@@ -0,0 +1,17 @@
+{
+  "@boopkit/cap-api": "0.1.0",
+  "@boopkit/cap-cloud-storage": "0.1.0",
+  "@boopkit/cap-coding": "0.1.0",
+  "@boopkit/cap-database": "0.1.0",
+  "@boopkit/cap-email": "0.1.0",
+  "@boopkit/cap-hello": "0.1.0",
+  "@boopkit/cap-noticeboard": "0.1.0",
+  "@boopkit/cap-product-design": "0.1.0",
+  "@boopkit/cap-project-mgmt": "0.1.0",
+  "@boopkit/cap-services": "0.1.0",
+  "@boopkit/cap-skills": "0.1.0",
+  "@boopkit/cap-testing": "0.1.0",
+  "@boopkit/cap-users": "0.1.0",
+  "@boopkit/cap-web": "0.1.0",
+  "@boopkit/logger": "0.1.0"
+}

package/dist/commands/init.js

@@ -85,11 +85,19 @@ function runInit(name, options) {
         }
     }
     // --- Pre-flight: detect script conflicts before writing anything ---
+    // When running from npm (not the monorepo), capabilities can't be resolved
+    // until after npm install. Defer conflict check to after install in that case.
     const capabilityNames = profile.defaultCapabilities;
     const preflightScripts = {};
+    let preflight = true;
     for (const capName of capabilityNames) {
         const cap = (0, capability_1.getCapability)(capName);
-        if (!cap?.scripts)
+        if (!cap) {
+            // Can't resolve capabilities yet — will install first, then check
+            preflight = false;
+            break;
+        }
+        if (!cap.scripts)
             continue;
         for (const scriptName of Object.keys(cap.scripts)) {
             if (scriptName in preflightScripts) {
@@ -102,15 +110,19 @@ function runInit(name, options) {
     }
     // --- Create directory ---
     fs.mkdirSync(targetDir, { recursive: true });
-    // --- Collect hooks from capabilities ---
-    const hookEntries = [];
-    for (const capName of capabilityNames) {
-        const cap = (0, capability_1.getCapability)(capName);
-        if (cap?.hooks) {
-            hookEntries.push({ name: capName, hooks: cap.hooks });
+    // --- Collect hooks from capabilities (deferred if not resolvable yet) ---
+    let hookVars = (0, scaffold_1.collectHooks)([]);
+    const canResolveLocally = capabilityNames.every(n => (0, capability_1.getCapability)(n) !== null);
+    if (canResolveLocally) {
+        const hookEntries = [];
+        for (const capName of capabilityNames) {
+            const cap = (0, capability_1.getCapability)(capName);
+            if (cap?.hooks) {
+                hookEntries.push({ name: capName, hooks: cap.hooks });
+            }
         }
+        hookVars = (0, scaffold_1.collectHooks)(hookEntries);
     }
-    const hookVars = (0, scaffold_1.collectHooks)(hookEntries);
     // --- Scaffold kernel ---
     const variables = {
         projectName: name,
@@ -130,6 +142,65 @@ function runInit(name, options) {
         capabilities: [],
         createdAt: new Date().toISOString(),
     });
+    // --- Add capability package deps and install before resolving ---
+    // When running from npm (not the monorepo), capability packages aren't in
+    // the CLI's node_modules. We add them to the project's package.json first,
+    // run npm install, then resolve from the project's node_modules.
+    const capDeps = {};
+    for (const capName of capabilityNames) {
+        const pkgName = `@boopkit/cap-${capName}`;
+        capDeps[pkgName] = (0, scaffold_1.getBoopkitVersion)(pkgName);
+    }
+    (0, scaffold_1.mergePackageJson)(targetDir, undefined, undefined, capDeps, { skipBackup: true });
+    // Run npm install early so capability packages are available for resolution
+    if (shouldInstall) {
+        try {
+            console.log('\nInstalling dependencies...');
+            (0, child_process_1.execSync)('npm install', { cwd: targetDir, stdio: 'inherit' });
+        }
+        catch {
+            console.error('Warning: npm install failed. You can run it manually later.');
+        }
+    }
+    // Search paths for capability resolution: project dir first, then CLI root
+    const capSearchPaths = [targetDir];
+    // If hooks couldn't be collected before kernel scaffold (remote install),
+    // collect them now and re-scaffold kernel templates that use hook variables.
+    if (!canResolveLocally) {
+        const hookEntries = [];
+        for (const capName of capabilityNames) {
+            const cap = (0, capability_1.getCapability)(capName, capSearchPaths);
+            if (cap?.hooks) {
+                hookEntries.push({ name: capName, hooks: cap.hooks });
+            }
+        }
+        hookVars = (0, scaffold_1.collectHooks)(hookEntries);
+        // Re-scaffold kernel with correct hook variables
+        variables.hookImports = hookVars.hookImports;
+        variables.hookInit = hookVars.hookInit;
+        variables.hookPreRoutes = hookVars.hookPreRoutes;
+        variables.hookPostRoutes = hookVars.hookPostRoutes;
+        (0, scaffold_1.scaffoldKernel)(targetDir, variables, true);
+    }
+    // Post-install conflict check (when preflight was deferred)
+    if (!preflight) {
+        const postScripts = {};
+        for (const capName of capabilityNames) {
+            const cap = (0, capability_1.getCapability)(capName, capSearchPaths);
+            if (!cap?.scripts)
+                continue;
+            for (const scriptName of Object.keys(cap.scripts)) {
+                if (scriptName in postScripts) {
+                    console.error(`Error: Script "${scriptName}" conflicts between capabilities "${postScripts[scriptName]}" and "${capName}".`);
+                    // Already created the directory, but the project is incomplete — warn user
+                    console.error('The project directory has been partially created and may need cleanup.');
+                    process.exitCode = 1;
+                    return;
+                }
+                postScripts[scriptName] = capName;
+            }
+        }
+    }
     // --- Resolve and install capabilities ---
     const installedCapabilities = [];
     const allScripts = {};
@@ -137,13 +208,13 @@ function runInit(name, options) {
     const capabilityFiles = [];
     const cssCapMap = {};
     for (const capName of capabilityNames) {
-        const cap = (0, capability_1.getCapability)(capName);
+        const cap = (0, capability_1.getCapability)(capName, capSearchPaths);
         if (!cap) {
             console.error(`Warning: Capability "${capName}" not found, skipping.`);
             continue;
         }
         // Copy capability files (skills, scaffolded files, etc.)
-        const copied = (0, scaffold_1.copyCapabilityFiles)(targetDir, capName);
+        const copied = (0, scaffold_1.copyCapabilityFiles)(targetDir, capName, capSearchPaths);
         capabilityFiles.push(...copied);
         // Track CSS partials for annotation
         for (const f of copied) {
@@ -194,7 +265,7 @@ function runInit(name, options) {
     const capabilityConfig = {};
     const envEntries = [];
     for (const capName of installedCapabilities) {
-        const cap = (0, capability_1.getCapability)(capName);
+        const cap = (0, capability_1.getCapability)(capName, capSearchPaths);
         if (cap?.env && cap.env.length > 0) {
             const envConfig = {};
             for (const e of cap.env) {
@@ -239,7 +310,7 @@ function runInit(name, options) {
     const typeOrder = ['application', 'development', 'operations', 'demo'];
     const grouped = new Map();
     for (const capName of installedCapabilities) {
-        const cap = (0, capability_1.getCapability)(capName);
+        const cap = (0, capability_1.getCapability)(capName, capSearchPaths);
         const key = cap?.type ?? 'other';
         if (!grouped.has(key))
             grouped.set(key, []);
@@ -253,15 +324,8 @@ function runInit(name, options) {
         const label = typeLabels[type] ?? type;
         console.log(`    ${label}: ${caps.join(', ')}`);
     }
-    // --- npm install (after summary so output is clear) ---
+    // --- Post-install setup (CSS build, Prisma generate) ---
     if (shouldInstall) {
-        try {
-            console.log('\nInstalling dependencies...');
-            (0, child_process_1.execSync)('npm install', { cwd: targetDir, stdio: 'inherit' });
-        }
-        catch {
-            console.error('Warning: npm install failed. You can run it manually later.');
-        }
         // Build CSS if tailwind:build script exists
         const pkgPath = path.join(targetDir, 'package.json');
         const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
@@ -284,6 +348,13 @@ function runInit(name, options) {
                 console.error('Warning: Prisma generate failed. Run `npm run db:generate` manually.');
             }
         }
+        // Re-run npm install to pick up any new deps added by capability scaffolding
+        try {
+            (0, child_process_1.execSync)('npm install', { cwd: targetDir, stdio: 'inherit' });
+        }
+        catch {
+            // Already warned earlier if npm install has issues
+        }
     }
     console.log(`\nNext steps:`);
     console.log(`  cd ${name}`);

package/dist/lib/capability.d.ts

@@ -1,9 +1,10 @@
 import { CapabilityMetadata } from './config';
 /**
  * Resolve the directory of an installed @boopkit/cap-{name} package.
+ * Searches in the provided paths first, then falls back to boopRoot.
  * Returns null if not found.
  */
-export declare function getPackageDir(name: string): string | null;
+export declare function getPackageDir(name: string, searchPaths?: string[]): string | null;
 /**
  * List all capabilities by scanning package directory and capabilities/ source tree (test fixtures only).
  * Package resolution takes priority. Returns metadata for each valid capability.
@@ -12,6 +13,7 @@ export declare function listCapabilities(): CapabilityMetadata[];
 /**
  * Get a single capability's metadata by name.
  * Tries package resolution first, falls back to source tree.
+ * Pass searchPaths to resolve from a project's node_modules (e.g. during init).
  * Returns null if not found in either location.
  */
-export declare function getCapability(name: string): CapabilityMetadata | null;
+export declare function getCapability(name: string, searchPaths?: string[]): CapabilityMetadata | null;

package/dist/lib/capability.js

@@ -41,29 +41,31 @@ const path = __importStar(require("path"));
 const config_1 = require("./config");
 /**
  * Resolve the directory of an installed @boopkit/cap-{name} package.
+ * Searches in the provided paths first, then falls back to boopRoot.
  * Returns null if not found.
  */
-function getPackageDir(name) {
+function getPackageDir(name, searchPaths) {
     const pkgName = `@boopkit/cap-${name}`;
+    const paths = [...(searchPaths ?? []), (0, config_1.getBoopRoot)()];
     try {
         const pkgJsonPath = require.resolve(`${pkgName}/package.json`, {
-            paths: [(0, config_1.getBoopRoot)()],
+            paths,
         });
         return path.dirname(pkgJsonPath);
     }
     catch {
         // Fall back to scanning for a package whose capability.json has this name
-        return findPackageDirByCapabilityName(name);
+        return findPackageDirByCapabilityName(name, paths);
     }
 }
 /**
  * Read capability metadata from a package's capability.json.
  * Returns null if the package is not found or has no capability.json.
  */
-function getCapabilityFromPackage(name) {
+function getCapabilityFromPackage(name, searchPaths) {
     // getPackageDir already falls back to findPackageDirByCapabilityName on
     // require.resolve failure, so no secondary scan needed here.
-    const pkgDir = getPackageDir(name);
+    const pkgDir = getPackageDir(name, searchPaths);
     if (!pkgDir)
         return null;
     const capJsonPath = path.join(pkgDir, 'capability.json');
@@ -84,25 +86,27 @@ function getCapabilityFromPackage(name) {
  * has the given capability name. Handles mismatches between capability name
  * and package name (e.g. "users-and-accounts" → @boopkit/cap-users).
  */
-function findPackageDirByCapabilityName(name) {
-    const nodeModulesBoopkit = path.join((0, config_1.getBoopRoot)(), 'node_modules', '@boopkit');
-    if (!fs.existsSync(nodeModulesBoopkit))
-        return null;
-    const entries = fs.readdirSync(nodeModulesBoopkit, { withFileTypes: true });
-    for (const entry of entries) {
-        if ((!entry.isDirectory() && !entry.isSymbolicLink()) || !entry.name.startsWith('cap-'))
-            continue;
-        const dir = path.join(nodeModulesBoopkit, entry.name);
-        const capJsonPath = path.join(dir, 'capability.json');
-        if (!fs.existsSync(capJsonPath))
-            continue;
-        try {
-            const capJson = JSON.parse(fs.readFileSync(capJsonPath, 'utf-8'));
-            if (capJson.name === name)
-                return dir;
-        }
-        catch {
+function findPackageDirByCapabilityName(name, searchPaths) {
+    for (const basePath of searchPaths) {
+        const nodeModulesBoopkit = path.join(basePath, 'node_modules', '@boopkit');
+        if (!fs.existsSync(nodeModulesBoopkit))
             continue;
+        const entries = fs.readdirSync(nodeModulesBoopkit, { withFileTypes: true });
+        for (const entry of entries) {
+            if ((!entry.isDirectory() && !entry.isSymbolicLink()) || !entry.name.startsWith('cap-'))
+                continue;
+            const dir = path.join(nodeModulesBoopkit, entry.name);
+            const capJsonPath = path.join(dir, 'capability.json');
+            if (!fs.existsSync(capJsonPath))
+                continue;
+            try {
+                const capJson = JSON.parse(fs.readFileSync(capJsonPath, 'utf-8'));
+                if (capJson.name === name)
+                    return dir;
+            }
+            catch {
+                continue;
+            }
         }
     }
     return null;
@@ -149,11 +153,12 @@ function listCapabilities() {
 /**
  * Get a single capability's metadata by name.
  * Tries package resolution first, falls back to source tree.
+ * Pass searchPaths to resolve from a project's node_modules (e.g. during init).
  * Returns null if not found in either location.
  */
-function getCapability(name) {
+function getCapability(name, searchPaths) {
     // Try package first
-    const fromPackage = getCapabilityFromPackage(name);
+    const fromPackage = getCapabilityFromPackage(name, searchPaths);
     if (fromPackage)
         return fromPackage;
     // Fall back to source tree

package/dist/lib/scaffold.d.ts

@@ -35,7 +35,7 @@ export declare function hashFile(filePath: string): string;
  * Tries package resolution first (scaffold/ and skills/ dirs), falls back to source tree.
  * Returns list of copied file paths relative to targetDir, and file hashes.
  */
-export declare function copyCapabilityFiles(targetDir: string, capabilityName: string): string[];
+export declare function copyCapabilityFiles(targetDir: string, capabilityName: string, searchPaths?: string[]): string[];
 /**
  * Merge dependencies into an existing package.json.
  * Does not overwrite existing dependency versions.
@@ -45,7 +45,11 @@ export declare function copyCapabilityFiles(targetDir: string, capabilityName: s
  */
 /**
  * Read the version from a @boopkit/ package's package.json and return ^version.
- * Falls back to '*' if the package.json cannot be read.
+ * Fallback chain:
+ * 1. Monorepo packages/ dir (development)
+ * 2. require.resolve from CLI's node_modules
+ * 3. dist/capability-versions.json (baked at build time for npm installs)
+ * 4. '*' (last resort)
  */
 export declare function getBoopkitVersion(packageName: string): string;
 export declare function mergePackageJson(targetDir: string, dependencies?: string[], devDependencies?: string[], packages?: Record<string, string>, options?: {

package/dist/lib/scaffold.js

@@ -125,8 +125,8 @@ function hashFile(filePath) {
  * Tries package resolution first (scaffold/ and skills/ dirs), falls back to source tree.
  * Returns list of copied file paths relative to targetDir, and file hashes.
  */
-function copyCapabilityFiles(targetDir, capabilityName) {
-    const pkgDir = (0, capability_1.getPackageDir)(capabilityName);
+function copyCapabilityFiles(targetDir, capabilityName, searchPaths) {
+    const pkgDir = (0, capability_1.getPackageDir)(capabilityName, searchPaths);
     if (pkgDir) {
         // Read package.json for boopkit config
         const pkgJsonPath = path.join(pkgDir, 'package.json');
@@ -276,18 +276,47 @@ function scaffoldCapabilityFiles(targetDir, filesDir) {
  */
 /**
  * Read the version from a @boopkit/ package's package.json and return ^version.
- * Falls back to '*' if the package.json cannot be read.
+ * Fallback chain:
+ * 1. Monorepo packages/ dir (development)
+ * 2. require.resolve from CLI's node_modules
+ * 3. dist/capability-versions.json (baked at build time for npm installs)
+ * 4. '*' (last resort)
  */
 function getBoopkitVersion(packageName) {
     const pkgName = packageName.replace(/^@boopkit\//, '');
-    const pkgJsonPath = path.join((0, config_1.getBoopRoot)(), 'packages', pkgName, 'package.json');
+    // Try monorepo packages/ directory first (development)
+    const monorepoPkgJsonPath = path.join((0, config_1.getBoopRoot)(), 'packages', pkgName, 'package.json');
     try {
-        const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf-8'));
+        const pkg = JSON.parse(fs.readFileSync(monorepoPkgJsonPath, 'utf-8'));
         return `^${pkg.version}`;
     }
     catch {
-        return '*';
+        // Not in monorepo — try require.resolve (published CLI install)
     }
+    // Try resolving the installed package
+    try {
+        const resolvedPath = require.resolve(`${packageName}/package.json`, {
+            paths: [(0, config_1.getBoopRoot)()],
+        });
+        const pkg = JSON.parse(fs.readFileSync(resolvedPath, 'utf-8'));
+        return `^${pkg.version}`;
+    }
+    catch {
+        // Not found via require.resolve
+    }
+    // Try build-time version manifest (baked into dist/ at publish time)
+    try {
+        const manifestPath = path.join((0, config_1.getBoopRoot)(), 'dist', 'capability-versions.json');
+        const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
+        const fullName = packageName.startsWith('@') ? packageName : `@boopkit/${pkgName}`;
+        if (manifest[fullName]) {
+            return `^${manifest[fullName]}`;
+        }
+    }
+    catch {
+        // No manifest available
+    }
+    return '*';
 }
 function parseDep(dep) {
     // Handle scoped packages: @scope/name@version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boopkit/cli",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "CLI tool to scaffold new projects from boop profiles and capabilities",
   "main": "dist/cli.js",
   "workspaces": [
@@ -18,7 +18,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc && node tools/generate-version-manifest.js",
     "dev": "tsx src/cli.ts",
     "start": "node dist/cli.js",
     "test": "jest"