@warpgogol/forge 5.2.4 → 5.3.1

package/dist/src/onboarding/upgrade.js

@@ -23,56 +23,59 @@ Sweep batch 4: 73 Compass headers on headerless engine files (certification, com
   <history>RFC-0543</history>
 </CHANGE_SUMMARY>
 */
-import fs from "node:fs";
+import { resolveIo } from "../utils/io.js";
+import { hasGeneratedMarker, mergeEditableGenerated } from "../utils/index.js";
 import path from "node:path";
-import { execSync } from "node:child_process";
 import { stringify as stringifyYaml, parse as parseYaml } from "yaml";
 import { FORGE_CLI_BINDING_DEFAULTS, resolveForgeRoot, loadForgeConfig, serializeForgeConfig, resolvePmRunner, resolvePmInstall, } from "../config/forge-config.js";
 import { FORGE_SKILLS, discoverPackSkills } from "../registry.js";
 import { syncKnowledgeFile } from "../knowledge/index.js";
+import { writeFileIfChanged } from "../utils/fs-idempotent.js";
+import { writeSkillMarker, pruneStaleSkillDirs } from "./skill-markers.js";
+import { planPrettierignore, applyPrettierignore, } from "./prettierignore.js";
 import { generateNestedAgentsMd } from "./nested-agents-generate.js";
 import { scaffoldMemoryLayer } from "./memory-scaffold.js";
-function isMonorepoForge(workspaceRoot) {
-    return fs.existsSync(path.join(workspaceRoot, "packages", "forge", "package.json"));
+async function isMonorepoForge(workspaceRoot, io) {
+    return io.exists(path.join(workspaceRoot, "packages", "forge", "package.json"));
 }
-function updateNpmPackage(workspaceRoot, config, isDryRun) {
-    if (isMonorepoForge(workspaceRoot)) {
+async function updateNpmPackage(workspaceRoot, config, isDryRun, io) {
+    if (await isMonorepoForge(workspaceRoot, io)) {
         return { updated: false, skipped: "monorepo (local package, not npm-installed)" };
     }
     const pm = config.project.packageManager;
     const installCmd = resolvePmInstall(pm);
-    const fullCmd = `${installCmd} @warpgogol/forge@latest`;
+    const installArgs = installCmd.split(/\s+/);
     if (isDryRun) {
         return { updated: false, skipped: "dry-run" };
     }
-    try {
-        execSync(fullCmd, {
-            cwd: workspaceRoot,
-            stdio: "pipe",
-            timeout: 120_000,
-        });
+    const result = await io
+        .exec(installArgs[0], [...installArgs.slice(1), "@warpgogol/forge@latest"], {
+        cwd: workspaceRoot,
+        timeoutMs: 120_000,
+    })
+        .catch(() => null);
+    if (result && result.exitCode === 0) {
         return { updated: true, skipped: null };
     }
-    catch {
-        return { updated: false, skipped: "install failed (network error or registry unavailable)" };
-    }
+    return { updated: false, skipped: "install failed (network error or registry unavailable)" };
 }
-function readForgePackageVersion(forgeRoot) {
+async function readForgePackageVersion(forgeRoot, io) {
     const pkgPath = path.join(forgeRoot, "package.json");
-    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+    const pkg = JSON.parse(await io.readFile(pkgPath));
     return pkg.version ?? "0.0.0-unknown";
 }
-function checkLatestNpmVersion(workspaceRoot, installedVersion, isMonorepo) {
+async function checkLatestNpmVersion(workspaceRoot, installedVersion, isMonorepo, io) {
     if (isMonorepo) {
         return { latest: null, warning: null };
     }
     try {
-        const latest = execSync("npm view @warpgogol/forge version", {
+        const result = await io.exec("npm", ["view", "@warpgogol/forge", "version"], {
             cwd: workspaceRoot,
-            stdio: "pipe",
-            timeout: 15_000,
-            encoding: "utf8",
-        }).trim();
+            timeoutMs: 15_000,
+        });
+        if (result.exitCode !== 0)
+            throw new Error(result.stderr || "npm view failed");
+        const latest = result.stdout.trim();
         if (!latest || !/^\d+\.\d+\.\d+/.test(latest)) {
             return { latest: null, warning: null };
         }
@@ -97,21 +100,25 @@ function checkLatestNpmVersion(workspaceRoot, installedVersion, isMonorepo) {
         return { latest: null, warning: null };
     }
 }
-function syncForgeSkills(workspaceRoot, forgeRoot, skillsDir, dryRun) {
+async function syncForgeSkills(workspaceRoot, forgeRoot, skillsDir, dryRun, io) {
     const updated = [];
     const knowledgeConflicts = [];
     const agentsSkillsDir = path.join(workspaceRoot, skillsDir);
     for (const skill of FORGE_SKILLS) {
         const srcPath = path.join(forgeRoot, skill.path);
-        if (!fs.existsSync(srcPath))
+        if (!(await io.exists(srcPath)))
             continue;
         const skillName = skill.name;
         const destDir = path.join(agentsSkillsDir, skillName);
         const destPath = path.join(destDir, "SKILL.md");
         if (!dryRun) {
-            fs.mkdirSync(destDir, { recursive: true });
-            const content = fs.readFileSync(srcPath, "utf8");
-            fs.writeFileSync(destPath, content, "utf8");
+            await io.mkdir(destDir);
+            const content = await io.readFile(srcPath);
+            await writeFileIfChanged(destPath, content, io);
+            // RFC-1154: marker manifest lists SKILL.md + knowledge files that carry
+            // pure forge content. Merged/skipped knowledge files hold consumer
+            // entries — excluded so a stale dir is kept rather than deleted.
+            const markerFiles = ["SKILL.md"];
             // Sync knowledge files (append-only — never overwrite local entries)
             const fmMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
             if (fmMatch) {
@@ -125,11 +132,14 @@ function syncForgeSkills(workspaceRoot, forgeRoot, skillsDir, dryRun) {
                                 continue;
                             const kfSrcPath = path.join(skillSrcDir, kf);
                             const kfDestPath = path.join(destDir, kf);
-                            if (fs.existsSync(kfSrcPath)) {
+                            if (await io.exists(kfSrcPath)) {
                                 const syncResult = syncKnowledgeFile(kfSrcPath, kfDestPath);
                                 for (const id of syncResult.conflicts) {
                                     knowledgeConflicts.push(`${skillName}/${kf}#${id}`);
                                 }
+                                if (syncResult.action === "copied" || syncResult.action === "unchanged") {
+                                    markerFiles.push(kf);
+                                }
                             }
                         }
                     }
@@ -138,30 +148,36 @@ function syncForgeSkills(workspaceRoot, forgeRoot, skillsDir, dryRun) {
                     // Frontmatter parse error — SKILL-01 will catch in validation
                 }
             }
+            await writeSkillMarker(destDir, markerFiles, io);
         }
         updated.push(skillName);
     }
     return { updated, knowledgeConflicts };
 }
-function syncSharedKnowledge(workspaceRoot, forgeRoot, skillsDir, dryRun) {
+async function syncSharedKnowledge(workspaceRoot, forgeRoot, skillsDir, dryRun, io) {
     const updated = [];
     const knowledgeConflicts = [];
     const srcPath = path.join(forgeRoot, "skills", "shared", "knowledge", "learned-principles.md");
-    if (!fs.existsSync(srcPath))
+    if (!(await io.exists(srcPath)))
         return { updated, knowledgeConflicts };
     const destDir = path.join(workspaceRoot, skillsDir, "shared-knowledge");
     const destPath = path.join(destDir, "learned-principles.md");
     if (!dryRun) {
-        fs.mkdirSync(destDir, { recursive: true });
+        await io.mkdir(destDir);
         const syncResult = syncKnowledgeFile(srcPath, destPath);
         for (const id of syncResult.conflicts) {
             knowledgeConflicts.push(`shared-knowledge/learned-principles.md#${id}`);
         }
+        // RFC-1154: marker lists the file only when its content is purely forge's.
+        const markerFiles = syncResult.action === "copied" || syncResult.action === "unchanged"
+            ? ["learned-principles.md"]
+            : [];
+        await writeSkillMarker(destDir, markerFiles, io);
     }
     updated.push("shared-knowledge");
     return { updated, knowledgeConflicts };
 }
-function syncPackSkills(workspaceRoot, config, skillsDir, dryRun) {
+async function syncPackSkills(workspaceRoot, config, skillsDir, dryRun, io) {
     const updated = [];
     const skipped = [];
     const knowledgeConflicts = [];
@@ -176,7 +192,7 @@ function syncPackSkills(workspaceRoot, config, skillsDir, dryRun) {
     const forgeSkillNames = new Set(FORGE_SKILLS.map((s) => s.name));
     for (const skill of packSkills) {
         const srcPath = path.join(workspaceRoot, skill.dir, skill.path);
-        if (!fs.existsSync(srcPath))
+        if (!(await io.exists(srcPath)))
             continue;
         const skillName = skill.name;
         if (forgeSkillNames.has(skillName)) {
@@ -186,9 +202,12 @@ function syncPackSkills(workspaceRoot, config, skillsDir, dryRun) {
         const destDir = path.join(agentsSkillsDir, skillName);
         const destPath = path.join(destDir, "SKILL.md");
         if (!dryRun) {
-            fs.mkdirSync(destDir, { recursive: true });
-            const content = fs.readFileSync(srcPath, "utf8");
-            fs.writeFileSync(destPath, content, "utf8");
+            await io.mkdir(destDir);
+            const content = await io.readFile(srcPath);
+            await writeFileIfChanged(destPath, content, io);
+            // RFC-1154: same marker rule as forge skills — merged/skipped knowledge
+            // files carry consumer entries and are excluded from the manifest.
+            const markerFiles = ["SKILL.md"];
             // Sync knowledge files (append-only — never overwrite local entries)
             const fmMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
             if (fmMatch) {
@@ -202,11 +221,14 @@ function syncPackSkills(workspaceRoot, config, skillsDir, dryRun) {
                                 continue;
                             const kfSrcPath = path.join(skillSrcDir, kf);
                             const kfDestPath = path.join(destDir, kf);
-                            if (fs.existsSync(kfSrcPath)) {
+                            if (await io.exists(kfSrcPath)) {
                                 const syncResult = syncKnowledgeFile(kfSrcPath, kfDestPath);
                                 for (const id of syncResult.conflicts) {
                                     knowledgeConflicts.push(`${skillName}/${kf}#${id}`);
                                 }
+                                if (syncResult.action === "copied" || syncResult.action === "unchanged") {
+                                    markerFiles.push(kf);
+                                }
                             }
                         }
                     }
@@ -215,11 +237,62 @@ function syncPackSkills(workspaceRoot, config, skillsDir, dryRun) {
                     // Frontmatter parse error
                 }
             }
+            await writeSkillMarker(destDir, markerFiles, io);
         }
         updated.push(skillName);
     }
     return { updated, skipped, knowledgeConflicts };
 }
+/**
+ * RFC-1154 reconcile phase — runs on every forge upgrade, including the
+ * same-version noop path: markers for synced dirs, prune stale marked dirs,
+ * managed .prettierignore block. Idempotent; dry-run passes through.
+ */
+async function reconcileGeneratedSurface(workspaceRoot, forgeRoot, config, dryRun, io) {
+    const forgeSkillsResult = await syncForgeSkills(workspaceRoot, forgeRoot, config.paths.skillsDir, dryRun, io);
+    const packResult = await syncPackSkills(workspaceRoot, config, config.paths.skillsDir, dryRun, io);
+    const sharedKnowledgeResult = await syncSharedKnowledge(workspaceRoot, forgeRoot, config.paths.skillsDir, dryRun, io);
+    const currentSyncSet = new Set([
+        ...forgeSkillsResult.updated,
+        ...packResult.updated,
+        ...sharedKnowledgeResult.updated,
+    ]);
+    const warnings = [];
+    let prune = { pruned: [], keptWithConsumerFiles: [] };
+    if (!dryRun) {
+        try {
+            prune = await pruneStaleSkillDirs(path.join(workspaceRoot, config.paths.skillsDir), currentSyncSet, io);
+        }
+        catch (err) {
+            warnings.push(`stale skill dir prune failed: ${err.message}`);
+        }
+    }
+    let prettierignore = "skipped";
+    if (!dryRun) {
+        try {
+            prettierignore = await applyPrettierignore(workspaceRoot, await planPrettierignore(workspaceRoot, config.paths.skillsDir, io), io);
+        }
+        catch (err) {
+            warnings.push(`.prettierignore reconcile failed: ${err.message}`);
+        }
+    }
+    return {
+        updated: [
+            ...forgeSkillsResult.updated,
+            ...packResult.updated,
+            ...sharedKnowledgeResult.updated,
+        ],
+        knowledgeConflicts: [
+            ...forgeSkillsResult.knowledgeConflicts,
+            ...packResult.knowledgeConflicts,
+            ...sharedKnowledgeResult.knowledgeConflicts,
+        ],
+        skipped: packResult.skipped,
+        prune,
+        prettierignore,
+        warnings,
+    };
+}
 function addMissingBindingDefaults(config, dryRun) {
     if (!config.bindings)
         return [];
@@ -239,7 +312,7 @@ function addMissingBindingDefaults(config, dryRun) {
     }
     return added;
 }
-function updateSyncedVersion(workspaceRoot, config, version, dryRun) {
+async function updateSyncedVersion(workspaceRoot, config, version, dryRun, io) {
     if (dryRun)
         return;
     // Set the syncedVersion on the in-memory config (bindings already updated)
@@ -248,15 +321,16 @@ function updateSyncedVersion(workspaceRoot, config, version, dryRun) {
     // RFC-1118: serializeForgeConfig writes the declared profile id verbatim —
     // never the resolved StackProfile object, never drops an unresolvable id.
     const forgeYamlPath = path.join(workspaceRoot, "forge.yaml");
-    fs.writeFileSync(forgeYamlPath, stringifyYaml(serializeForgeConfig(config)), "utf8");
+    await io.writeFile(forgeYamlPath, stringifyYaml(serializeForgeConfig(config)));
 }
 export async function runUpgrade(input, context) {
     const { workspaceRoot, dryRun } = context;
+    const fio = resolveIo(context.io);
     const isDryRun = dryRun || input.flags["dry-run"] === true;
     const isUpdateNpm = input.flags["update-npm"] === true;
     // Step 0: Check forge.yaml exists
     const forgeYamlPath = path.join(workspaceRoot, "forge.yaml");
-    if (!fs.existsSync(forgeYamlPath)) {
+    if (!(await fio.exists(forgeYamlPath))) {
         return {
             data: {
                 command: "forge.upgrade",
@@ -267,12 +341,18 @@ export async function runUpgrade(input, context) {
                 bindingsAdded: [],
                 skippedSkills: [],
                 nestedAgentsGenerated: [],
+                nestedAgentsPlanned: [],
+                nestedAgentsPreserved: [],
+                nestedAgentsSkipped: [],
                 memoryScaffold: { created: [], gitignoreUpdated: false, skipped: [] },
                 npmUpdated: false,
                 npmUpdateSkipped: null,
                 latestNpmVersion: null,
                 npmVersionWarning: null,
                 doctorReport: null,
+                skillsPruned: [],
+                skillsKeptWithConsumerFiles: [],
+                prettierignore: "skipped",
             },
             nextSteps: [{ action: "Run 'forge create' to create forge.yaml first", kind: "required" }],
             exitCode: 1,
@@ -290,7 +370,7 @@ export async function runUpgrade(input, context) {
         catch {
             configForNpm = { project: { packageManager: "npm" } };
         }
-        const npmResult = updateNpmPackage(workspaceRoot, configForNpm, isDryRun);
+        const npmResult = await updateNpmPackage(workspaceRoot, configForNpm, isDryRun, fio);
         npmUpdated = npmResult.updated;
         npmUpdateSkipped = npmResult.skipped;
     }
@@ -299,7 +379,7 @@ export async function runUpgrade(input, context) {
     let toVersion;
     try {
         forgeRoot = context.forgeRoot ?? resolveForgeRoot(workspaceRoot);
-        toVersion = readForgePackageVersion(forgeRoot);
+        toVersion = await readForgePackageVersion(forgeRoot, fio);
     }
     catch (err) {
         return {
@@ -312,12 +392,18 @@ export async function runUpgrade(input, context) {
                 bindingsAdded: [],
                 skippedSkills: [],
                 nestedAgentsGenerated: [],
+                nestedAgentsPlanned: [],
+                nestedAgentsPreserved: [],
+                nestedAgentsSkipped: [],
                 memoryScaffold: { created: [], gitignoreUpdated: false, skipped: [] },
                 npmUpdated: false,
                 npmUpdateSkipped: null,
                 latestNpmVersion: null,
                 npmVersionWarning: null,
                 doctorReport: null,
+                skillsPruned: [],
+                skillsKeptWithConsumerFiles: [],
+                prettierignore: "skipped",
             },
             nextSteps: [
                 { action: "Install @warpgogol/forge first: npm install @warpgogol/forge", kind: "required" },
@@ -327,7 +413,7 @@ export async function runUpgrade(input, context) {
         };
     }
     // Step 1.5: Check npm for newer version (non-fatal)
-    const npmCheck = checkLatestNpmVersion(workspaceRoot, toVersion, isMonorepoForge(workspaceRoot));
+    const npmCheck = await checkLatestNpmVersion(workspaceRoot, toVersion, await isMonorepoForge(workspaceRoot, fio), fio);
     if (npmCheck.warning && context.outputFormat === "pretty") {
         context.logger.warn(`⚠ ${npmCheck.warning}`);
     }
@@ -347,12 +433,18 @@ export async function runUpgrade(input, context) {
                 bindingsAdded: [],
                 skippedSkills: [],
                 nestedAgentsGenerated: [],
+                nestedAgentsPlanned: [],
+                nestedAgentsPreserved: [],
+                nestedAgentsSkipped: [],
                 memoryScaffold: { created: [], gitignoreUpdated: false, skipped: [] },
                 npmUpdated: false,
                 npmUpdateSkipped: null,
                 latestNpmVersion: npmCheck.latest,
                 npmVersionWarning: npmCheck.warning,
                 doctorReport: null,
+                skillsPruned: [],
+                skillsKeptWithConsumerFiles: [],
+                prettierignore: "skipped",
             },
             nextSteps: [
                 { action: `Fix forge.yaml: ${err.message}`, kind: "required" },
@@ -363,23 +455,37 @@ export async function runUpgrade(input, context) {
     }
     const fromVersion = config.forge?.syncedVersion ?? null;
     if (fromVersion === toVersion) {
-        // Noop — versions match
+        // Noop version-wise — but the RFC-1154 reconcile (markers, stale-dir prune,
+        // managed .prettierignore) still runs so a same-version upgrade fixes lint debt.
+        const reconcile = await reconcileGeneratedSurface(workspaceRoot, forgeRoot, config, isDryRun, fio);
+        for (const kept of reconcile.prune.keptWithConsumerFiles) {
+            context.logger.warn(`forge.upgrade: kept stale skill dir ${kept}`);
+        }
+        for (const warn of reconcile.warnings) {
+            context.logger.warn(`forge.upgrade: ${warn}`);
+        }
         return {
             data: {
                 command: "forge.upgrade",
                 status: "noop",
                 fromVersion,
                 toVersion,
-                skillsUpdated: [],
+                skillsUpdated: reconcile.updated,
                 bindingsAdded: [],
-                skippedSkills: [],
+                skippedSkills: reconcile.skipped,
                 nestedAgentsGenerated: [],
+                nestedAgentsPlanned: [],
+                nestedAgentsPreserved: [],
+                nestedAgentsSkipped: [],
                 memoryScaffold: { created: [], gitignoreUpdated: false, skipped: [] },
                 npmUpdated: npmUpdated,
                 npmUpdateSkipped: npmUpdateSkipped,
                 latestNpmVersion: npmCheck.latest,
                 npmVersionWarning: npmCheck.warning,
                 doctorReport: null,
+                skillsPruned: reconcile.prune.pruned,
+                skillsKeptWithConsumerFiles: reconcile.prune.keptWithConsumerFiles,
+                prettierignore: reconcile.prettierignore,
             },
             nextSteps: npmCheck.warning
                 ? [{ action: npmCheck.warning, kind: "optional" }]
@@ -390,22 +496,19 @@ export async function runUpgrade(input, context) {
                 : `[forge.upgrade] Already up to date (v${toVersion})`,
         };
     }
-    // Step 3: Sync forge skills
-    const forgeSkillsResult = syncForgeSkills(workspaceRoot, forgeRoot, config.paths.skillsDir, isDryRun);
-    // Step 3b: Sync pack skills
-    const packResult = syncPackSkills(workspaceRoot, config, config.paths.skillsDir, isDryRun);
-    // Step 3c: Sync shared knowledge layer (RFC-0663)
-    const sharedKnowledgeResult = syncSharedKnowledge(workspaceRoot, forgeRoot, config.paths.skillsDir, isDryRun);
-    const skillsUpdated = [
-        ...forgeSkillsResult.updated,
-        ...packResult.updated,
-        ...sharedKnowledgeResult.updated,
-    ];
-    const knowledgeConflicts = [
-        ...forgeSkillsResult.knowledgeConflicts,
-        ...packResult.knowledgeConflicts,
-        ...sharedKnowledgeResult.knowledgeConflicts,
-    ];
+    // Step 3: RFC-1154 reconcile — sync forge+pack skills + shared knowledge,
+    // write .forge-managed markers, prune stale marked dirs, reconcile the
+    // managed .prettierignore block.
+    const reconcile = await reconcileGeneratedSurface(workspaceRoot, forgeRoot, config, isDryRun, fio);
+    const skillsUpdated = reconcile.updated;
+    const knowledgeConflicts = reconcile.knowledgeConflicts;
+    const packSkipped = reconcile.skipped;
+    for (const kept of reconcile.prune.keptWithConsumerFiles) {
+        context.logger.warn(`forge.upgrade: kept stale skill dir ${kept}`);
+    }
+    for (const warn of reconcile.warnings) {
+        context.logger.warn(`forge.upgrade: ${warn}`);
+    }
     if (knowledgeConflicts.length > 0) {
         context.logger.warn(`forge.upgrade: ${knowledgeConflicts.length} knowledge entr${knowledgeConflicts.length === 1 ? "y" : "ies"} ` +
             `diverge between package and project — local versions kept: ${knowledgeConflicts.join(", ")}`);
@@ -416,19 +519,51 @@ export async function runUpgrade(input, context) {
     const bindingsAdded = addMissingBindingDefaults(config, isDryRun);
     // Step 5: Update forge.syncedVersion
     if (!isDryRun) {
-        updateSyncedVersion(workspaceRoot, config, toVersion, false);
+        await updateSyncedVersion(workspaceRoot, config, toVersion, false, fio);
     }
-    // Step 5b: Generate nested AGENTS.md (RFC-0611)
+    // Step 5b: Generate nested AGENTS.md (RFC-0611). RFC-1153: the write path
+    // merges at the forge:custom boundary, and --dry-run previews which guides
+    // would be rewritten vs. skipped (the destructive step is no longer silent).
     let nestedAgentsGenerated = [];
-    if (!isDryRun) {
-        try {
-            const nestedResult = await generateNestedAgentsMd(workspaceRoot, config, false);
-            nestedAgentsGenerated = nestedResult.generated;
+    const nestedAgentsPlanned = [];
+    let nestedAgentsPreserved = [];
+    const nestedAgentsSkipped = [];
+    try {
+        const nestedResult = await generateNestedAgentsMd(workspaceRoot, config, isDryRun, undefined, fio);
+        if (isDryRun) {
+            for (const [relPath, rendered] of Object.entries(nestedResult.renderedFiles)) {
+                const absPath = path.join(workspaceRoot, relPath);
+                let existing = null;
+                if (await fio.exists(absPath)) {
+                    try {
+                        existing = await fio.readFile(absPath);
+                    }
+                    catch {
+                        // Unreadable — treat as absent; merge will emit a fresh file.
+                    }
+                }
+                if (existing !== null && !hasGeneratedMarker(existing)) {
+                    nestedAgentsSkipped.push(`${relPath} (hand-written)`);
+                    continue;
+                }
+                const merged = mergeEditableGenerated(rendered, existing, relPath);
+                if (merged === null) {
+                    nestedAgentsSkipped.push(`${relPath} (unmapped-customization)`);
+                }
+                else if (merged !== existing) {
+                    nestedAgentsPlanned.push(relPath);
+                }
+            }
         }
-        catch {
-            // Nested generation failure is non-fatal
+        else {
+            nestedAgentsGenerated = nestedResult.generated;
+            nestedAgentsPreserved = nestedResult.preserved;
+            nestedAgentsSkipped.push(...nestedResult.skipped);
         }
     }
+    catch {
+        // Nested generation failure is non-fatal
+    }
     // Step 6: Run doctor
     let doctorReport = null;
     if (!isDryRun) {
@@ -464,19 +599,25 @@ export async function runUpgrade(input, context) {
             toVersion,
             skillsUpdated,
             bindingsAdded,
-            skippedSkills: packResult.skipped,
+            skippedSkills: packSkipped,
             nestedAgentsGenerated,
+            nestedAgentsPlanned,
+            nestedAgentsPreserved,
+            nestedAgentsSkipped,
             memoryScaffold,
             npmUpdated,
             npmUpdateSkipped,
             latestNpmVersion: npmCheck.latest,
             npmVersionWarning: npmCheck.warning,
             doctorReport,
+            skillsPruned: reconcile.prune.pruned,
+            skillsKeptWithConsumerFiles: reconcile.prune.keptWithConsumerFiles,
+            prettierignore: reconcile.prettierignore,
         },
         nextSteps,
         exitCode: 0,
         summary: isDryRun
-            ? `[dry-run] forge.upgrade: would sync ${skillsUpdated.length} skill(s), add ${bindingsAdded.length} binding(s), update syncedVersion to ${toVersion}`
+            ? `[dry-run] forge.upgrade: would sync ${skillsUpdated.length} skill(s), add ${bindingsAdded.length} binding(s), update syncedVersion to ${toVersion}, rewrite ${nestedAgentsPlanned.length} nested AGENTS.md file(s)`
             : npmCheck.warning
                 ? `[forge.upgrade] OK — ${skillsUpdated.length} skill(s) synced, ${bindingsAdded.length} binding(s) added, syncedVersion → ${toVersion} — ⚠ ${npmCheck.warning}`
                 : `[forge.upgrade] OK — ${skillsUpdated.length} skill(s) synced, ${bindingsAdded.length} binding(s) added, syncedVersion → ${toVersion}` +

package/dist/src/onboarding/upgrade.js.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../../src/onboarding/upgrade.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../../src/onboarding/upgrade.ts"],"names":[],"mappings":"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"}

package/dist/src/onboarding/workspace-discovery.js

@@ -14,7 +14,7 @@ workspace type (app, service, package) by content markers.</purpose>
   <item>RFC-0640: accept optional workspaceTypes from profile for profile-driven detection, falling back to hardcoded detection when absent.</item>
 </CHANGE_SUMMARY>
 */
-import fs from "node:fs";
+import * as fs from "../utils/sync-fs.js";
 import path from "node:path";
 import { hasGeneratedMarker } from "../utils/index.js";
 const SKIP_DIRS = new Set([