@boopkit/cli 0.6.14 → 0.6.15

package/dist/lib/update.js

@@ -52,6 +52,7 @@ const capability_1 = require("./capability");
 const project_1 = require("./project");
 const safe_io_1 = require("./safe-io");
 const install_layout_1 = require("./install-layout");
+const script_merge_1 = require("./script-merge");
 /** The skill that splits a drifted SKILL.md — keep in step with the folder name boop-rm2l.8 gives it */
 exports.TRIAGE_SKILL = 'boop-skills-edit-triage';
 /** What to do about skills edited in SKILL.md, for a report that counts them */
@@ -87,6 +88,10 @@ function planCapabilityUpdate(targetDir, capabilityName, projectManifest) {
     if (!boopkit?.capability)
         return null;
     const newVersion = pkgJson.version || '0.0.0';
+    // The capability as this package declares it: the npm scripts merged below,
+    // and the skill migrations applied further down.
+    const capJsonPath = path.join(pkgDir, 'capability.json');
+    const capJson = fs.existsSync(capJsonPath) ? JSON.parse(fs.readFileSync(capJsonPath, 'utf-8')) : {};
     const meta = projectManifest.capabilityMeta?.[capabilityName];
     const storedHashes = meta?.fileHashes || {};
     const actions = [];
@@ -215,60 +220,59 @@ function planCapabilityUpdate(targetDir, capabilityName, projectManifest) {
         }
     }
     // Apply skill migration logic: upgrade deprecate+add pairs to migrate actions
-    const capJsonPath = path.join(pkgDir, 'capability.json');
-    if (fs.existsSync(capJsonPath)) {
-        const capJson = JSON.parse(fs.readFileSync(capJsonPath, 'utf-8'));
-        const migrations = capJson.skill_migrations;
-        if (migrations) {
-            for (const [newSkillName, oldFlatFilename] of Object.entries(migrations)) {
-                const oldRelPath = path.join('skills', oldFlatFilename);
-                const newPrefix = path.join('skills', newSkillName) + path.sep;
-                const oldStoredHash = storedHashes[oldRelPath];
-                if (!oldStoredHash)
-                    continue;
-                const oldFilePath = path.join(targetDir, oldRelPath);
-                const oldState = compareFileHash(oldFilePath, oldStoredHash);
-                if (oldState === 'modified') {
-                    // User modified the old file — keep it, and don't install the folder that replaces it.
-                    // A folder file already installed has its own comparison, so only an install is held back.
-                    for (const action of actions) {
-                        if (action.action === 'add' && (action.relativePath.startsWith(newPrefix) || action.relativePath === path.join('skills', newSkillName))) {
-                            action.action = 'skip';
-                            action.reason = `Skipped: old skill file '${oldRelPath}' was locally modified`;
-                            action.oldPath = oldRelPath;
-                            action.instruction = `boop installs this once ${oldRelPath} is gone; see what to do about that file.`;
-                        }
-                    }
-                    // Change deprecate to skip for the old file
-                    const oldAction = actions.find(a => a.relativePath === oldRelPath);
-                    if (oldAction) {
-                        const projectFile = path.join('skills', newSkillName, 'PROJECT.md');
-                        oldAction.action = 'skip';
-                        oldAction.reason = 'Locally modified (migration skipped)';
-                        oldAction.replacedBy = newSkillName;
-                        oldAction.instruction = `This is the old single-file form of the ${newSkillName} skill, and this project edited it. ` +
-                            `Move the rules this project needs from it into ${projectFile}, following the ${exports.TRIAGE_SKILL} skill, then delete it and run \`boop update\`.`;
+    const migrations = capJson.skill_migrations;
+    if (migrations) {
+        for (const [newSkillName, oldFlatFilename] of Object.entries(migrations)) {
+            const oldRelPath = path.join('skills', oldFlatFilename);
+            const newPrefix = path.join('skills', newSkillName) + path.sep;
+            const oldStoredHash = storedHashes[oldRelPath];
+            if (!oldStoredHash)
+                continue;
+            const oldFilePath = path.join(targetDir, oldRelPath);
+            const oldState = compareFileHash(oldFilePath, oldStoredHash);
+            if (oldState === 'modified') {
+                // User modified the old file — keep it, and don't install the folder that replaces it.
+                // A folder file already installed has its own comparison, so only an install is held back.
+                for (const action of actions) {
+                    if (action.action === 'add' && (action.relativePath.startsWith(newPrefix) || action.relativePath === path.join('skills', newSkillName))) {
+                        action.action = 'skip';
+                        action.reason = `Skipped: old skill file '${oldRelPath}' was locally modified`;
+                        action.oldPath = oldRelPath;
+                        action.instruction = `boop installs this once ${oldRelPath} is gone; see what to do about that file.`;
                     }
                 }
-                else if (oldState === 'match') {
-                    // Old file unmodified — convert deprecate to migrate
-                    const oldAction = actions.find(a => a.relativePath === oldRelPath);
-                    if (oldAction) {
-                        oldAction.action = 'migrate';
-                        oldAction.reason = `Migrated to folder: skills/${newSkillName}/`;
-                    }
-                    // Tag new folder files with the old path they're replacing
-                    for (const action of actions) {
-                        if (action.relativePath.startsWith(newPrefix) || action.relativePath === path.join('skills', newSkillName)) {
-                            action.oldPath = oldRelPath;
-                        }
+                // Change deprecate to skip for the old file
+                const oldAction = actions.find(a => a.relativePath === oldRelPath);
+                if (oldAction) {
+                    const projectFile = path.join('skills', newSkillName, 'PROJECT.md');
+                    oldAction.action = 'skip';
+                    oldAction.reason = 'Locally modified (migration skipped)';
+                    oldAction.replacedBy = newSkillName;
+                    oldAction.instruction = `This is the old single-file form of the ${newSkillName} skill, and this project edited it. ` +
+                        `Move the rules this project needs from it into ${projectFile}, following the ${exports.TRIAGE_SKILL} skill, then delete it and run \`boop update\`.`;
+                }
+            }
+            else if (oldState === 'match') {
+                // Old file unmodified — convert deprecate to migrate
+                const oldAction = actions.find(a => a.relativePath === oldRelPath);
+                if (oldAction) {
+                    oldAction.action = 'migrate';
+                    oldAction.reason = `Migrated to folder: skills/${newSkillName}/`;
+                }
+                // Tag new folder files with the old path they're replacing
+                for (const action of actions) {
+                    if (action.relativePath.startsWith(newPrefix) || action.relativePath === path.join('skills', newSkillName)) {
+                        action.oldPath = oldRelPath;
                     }
                 }
-                // oldState === 'missing': old file already gone, add new files normally
             }
+            // oldState === 'missing': old file already gone, add new files normally
         }
     }
-    const upToDate = actions.length === 0;
+    // A capability that ships a new command ships it as a file and a script; an
+    // update that delivered only the file left nothing able to run it (boop-ldou).
+    const scriptActions = (0, script_merge_1.planScriptUpdates)(capJson.scripts, (0, script_merge_1.readProjectScripts)(targetDir));
+    const upToDate = actions.length === 0 && !scriptActions.some(a => a.action === 'add');
     return {
         capability: capabilityName,
         targetDir,
@@ -276,6 +280,7 @@ function planCapabilityUpdate(targetDir, capabilityName, projectManifest) {
         currentVersion: meta?.version,
         newVersion,
         actions,
+        scriptActions,
         unchangedCount,
         upToDate,
     };
@@ -295,6 +300,8 @@ function executeUpdatePlan(plan, options = {}) {
         skippedDeleted: [],
         pruned: [],
         migrated: [],
+        scriptsAdded: [],
+        scriptsKept: [],
         unchangedCount: plan.unchangedCount,
         instructions: [],
     };
@@ -411,6 +418,11 @@ function executeUpdatePlan(plan, options = {}) {
             }
         }
     }
+    // Merge the capability's npm scripts, so a command it ships as file + script
+    // arrives whole. Additive only: a name the project already uses is left alone.
+    const scriptActions = plan.scriptActions ?? [];
+    result.scriptsAdded = (0, script_merge_1.applyScriptUpdates)(plan.targetDir, scriptActions);
+    result.scriptsKept = scriptActions.filter(a => a.action === 'keep');
     // Update .boop/config.json
     if (manifest) {
         if (!manifest.capabilityMeta) {
@@ -531,6 +543,14 @@ function formatUpdateSummary(result) {
     if (result.added.length > 0) {
         parts.push(`added ${result.added.length} new file${result.added.length === 1 ? '' : 's'}`);
     }
+    const scriptsAdded = result.scriptsAdded?.length || 0;
+    if (scriptsAdded > 0) {
+        parts.push(`added ${scriptsAdded} script${scriptsAdded === 1 ? '' : 's'}`);
+    }
+    const scriptsKept = result.scriptsKept?.length || 0;
+    if (scriptsKept > 0) {
+        parts.push(`kept ${scriptsKept} customised script${scriptsKept === 1 ? '' : 's'}`);
+    }
     if (result.pruned && result.pruned.length > 0) {
         parts.push(`pruned ${result.pruned.length} deprecated file${result.pruned.length === 1 ? '' : 's'}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boopkit/cli",
-  "version": "0.6.14",
+  "version": "0.6.15",
   "description": "boop: the opinionated bootstrap for founder friendly, AI-first web apps - code plus agent skills, composable from day one.",
   "main": "dist/cli.js",
   "workspaces": [