@shrkcrft/cli 0.1.0-alpha.1 → 0.1.0-alpha.11

package/dist/commands/init.command.js

@@ -6,6 +6,7 @@ import { listBuiltInSurfaceProfiles, suggestSurfaceProfile } from '@shrkcrft/ins
 import { INIT_FILES } from "../init/init-templates.js";
 import { buildDetectedBlock, renderDetectedBlockText } from "../init/detected-block.js";
 import { ensureSharkcraftGitignore, renderGitignorePatch } from "../init/gitignore.js";
+import { annotatePathsAgainstDisk } from "../init/paths-advisory.js";
 import { applySurfaceTextEdit } from "../surface/surface-config-writer.js";
 import { flagBool, flagString, resolveCwd } from "../command-registry.js";
 import { bullet, header } from "../output/format-output.js";
@@ -108,8 +109,13 @@ async function applyPresetInit(cwd, mode) {
             process.stdout.write(bullet(`(warning) ${warn}`) + '\n');
         }
         process.stdout.write('\nNext:\n');
-        process.stdout.write(bullet('$ shrk init --zero-config --write') + '\n');
-        process.stdout.write(bullet('Then prove it: $ shrk check boundaries --changed-only --since main') + '\n');
+        for (const cmd of preset.recommendedNextCommands ?? [
+            'shrk init --zero-config --write',
+            'shrk doctor',
+            'shrk context --task "<task>"',
+        ]) {
+            process.stdout.write(bullet(`$ ${cmd}`) + '\n');
+        }
         if (!mode.skipGitignore) {
             const patch = ensureSharkcraftGitignore({ cwd, dryRun: true });
             process.stdout.write('\n' + renderGitignorePatch(patch, true));
@@ -128,6 +134,11 @@ async function applyPresetInit(cwd, mode) {
             source: 'override',
         });
     }
+    // Workspace-shape advisory: when the preset emits path conventions
+    // that don't exist in this repo (common with generic presets in
+    // framework-specific repos), annotate paths.ts so the user knows
+    // which defaults to fix.
+    const pathsAdvisory = annotatePathsAgainstDisk(cwd, plan.sharkcraftDir);
     process.stdout.write(header('SharkCraft initialized'));
     process.stdout.write(`Preset: ${preset.id} — ${preset.title}\n`);
     process.stdout.write(`Folder: ${plan.sharkcraftDir}\n`);
@@ -164,20 +175,29 @@ async function applyPresetInit(cwd, mode) {
             process.stdout.write('\n' + renderGitignorePatch(patch, false));
         }
     }
-    process.stdout.write('\nProve it works (60 seconds):\n');
-    process.stdout.write(bullet('$ shrk check boundaries --changed-only --since main') + '\n');
-    process.stdout.write(bullet('$ shrk review packet --v3 --since main') + '\n');
-    process.stdout.write('\nOptional:\n');
-    process.stdout.write(bullet('$ shrk doctor') + '\n');
-    process.stdout.write(bullet('$ shrk mcp serve            # plug into Claude Code / Cursor / Cline') + '\n');
-    if (preset.recommendedNextCommands && preset.recommendedNextCommands.length > 0) {
-        process.stdout.write('\nPreset-specific next steps:\n');
-        for (const cmd of preset.recommendedNextCommands) {
-            process.stdout.write(bullet(`$ ${cmd}`) + '\n');
-        }
+    if (pathsAdvisory.annotated) {
+        renderPathsAdvisory(pathsAdvisory);
     }
+    process.stdout.write('\nNext:\n');
+    process.stdout.write(bullet('$ shrk doctor                            — verify the setup (shape-aware verdict)') + '\n');
+    process.stdout.write(bullet('$ shrk brief                             — single-page brief Claude reads first') + '\n');
+    process.stdout.write(bullet('$ shrk export claude-skill --write       — inline the rules into Claude\'s prompt via .claude/skills/') + '\n');
+    for (const cmd of preset.recommendedNextCommands ?? []) {
+        process.stdout.write(bullet(`$ ${cmd}`) + '\n');
+    }
+    process.stdout.write(bullet('Start the MCP server: `shrk mcp serve` (or run it via Claude Code)') + '\n');
     return 0;
 }
+function renderPathsAdvisory(advisory) {
+    process.stdout.write('\n');
+    process.stdout.write(header('Paths advisory'));
+    process.stdout.write('These preset-default paths do not exist in this repo:\n');
+    for (const p of advisory.missingPaths) {
+        process.stdout.write(bullet(p) + '\n');
+    }
+    process.stdout.write('\nEdit sharkcraft/paths.ts to match your real layout. ' +
+        'Run `shrk onboard --dry-run` to see what the engine infers.\n');
+}
 function applyLegacyInit(cwd, force) {
     const { root } = detectProjectRoot(cwd);
     const sharkcraftDir = nodePath.join(root, 'sharkcraft');
@@ -211,6 +231,10 @@ function applyLegacyInit(cwd, force) {
         for (const s of skipped)
             process.stdout.write(bullet(s) + '\n');
     }
+    const legacyAdvisory = annotatePathsAgainstDisk(cwd, sharkcraftDir);
+    if (legacyAdvisory.annotated) {
+        renderPathsAdvisory(legacyAdvisory);
+    }
     process.stdout.write('\nNext:\n');
     process.stdout.write(bullet('Run `shrk inspect` to see your project summary.') + '\n');
     process.stdout.write(bullet('Run `shrk knowledge list` to see what was seeded.') + '\n');
@@ -219,13 +243,23 @@ function applyLegacyInit(cwd, force) {
 }
 export const initCommand = {
     name: 'init',
-    description: 'Initialize a sharkcraft/ folder in the current repository. Pass --preset <id> to apply a built-in preset (default: generic). Use --zero-config or --preset auto to detect the workspace and pick a preset automatically. Use --legacy for the full pre-preset seed.',
-    usage: 'shrk init [--preset <id|auto>] [--zero-config] [--dry-run] [--write] [--legacy] [--force] [--merge] [--suggest-only] [--no-gitignore] [--surface-profile <id>]',
+    description: 'Initialize a sharkcraft/ folder in the current repository. Pass --preset <id> to apply a built-in preset (default: generic). Use --zero-config or --preset auto to detect the workspace and pick a preset automatically. Use --legacy for the full pre-preset seed. Pass --infer to scan the repo and populate sharkcraft/* with the real signals it finds (paths from disk, rules from tsconfig/package.json, boundaries from layer structure) — combines with --preset to add inferred entries on top of the preset baseline. Pass --with-claude-skill to also generate .claude/skills/<name>/SKILL.md so Claude Code picks up the rules automatically.',
+    usage: 'shrk init [--preset <id|auto>] [--zero-config] [--infer] [--dry-run] [--write] [--with-claude-skill] [--legacy] [--force] [--merge] [--suggest-only] [--no-gitignore] [--surface-profile <id>]',
     async run(args) {
         const force = flagBool(args, 'force');
         const merge = flagBool(args, 'merge');
         const cwd = resolveCwd(args);
+        const wantInfer = flagBool(args, 'infer');
         const skipGitignore = flagBool(args, 'no-gitignore');
+        // `--infer` mode short-circuits the preset path entirely. The
+        // inferred output IS the populated sharkcraft/*, no preset
+        // baseline to merge against. This is the cleaner contract: the
+        // user opted into "scan my repo and tell me what's there", and
+        // adding a preset's static defaults on top would muddy the
+        // confidence reporting in .inferred-report.md.
+        if (wantInfer) {
+            return runInferInit(cwd, args, force);
+        }
         if (flagBool(args, 'legacy')) {
             const code = applyLegacyInit(cwd, force);
             if (code === 0 && !skipGitignore) {
@@ -286,7 +320,7 @@ export const initCommand = {
         if (dryRun) {
             process.stdout.write(`Surface profile: ${surfaceDecision.profile} (${surfaceDecision.source}) — ${surfaceDecision.reason}\n`);
         }
-        return applyPresetInit(cwd, {
+        const presetCode = await applyPresetInit(cwd, {
             presetId,
             dryRun,
             force,
@@ -296,5 +330,139 @@ export const initCommand = {
             surfaceProfile: surfaceDecision.profile,
             surfaceProfileReason: surfaceDecision.reason,
         });
+        // `--with-claude-skill` chains the claude-skill export onto the init
+        // so a fresh user goes from `npx shrk init --with-claude-skill --write`
+        // to a working .claude/skills/<name>/SKILL.md in one step. Skipped in
+        // dry-run + when init itself didn't succeed.
+        if (presetCode === 0 &&
+            !dryRun &&
+            (flagBool(args, 'with-claude-skill') || flagBool(args, 'with-skill'))) {
+            const skillCode = await runClaudeSkillExportAfterInit(cwd, force);
+            // Init success is what we report; skill failure is logged but
+            // doesn't fail the init exit code (otherwise users would see a
+            // half-applied repo with a non-zero exit and panic).
+            if (skillCode !== 0) {
+                process.stderr.write('\n(claude-skill export failed — re-run `shrk export claude-skill --write` to retry.)\n');
+            }
+        }
+        return presetCode;
     },
 };
+/**
+ * Chain the claude-skill export onto a successful init. Loads the
+ * exporter lazily (it depends on inspectSharkcraft which has its own
+ * caching) and writes the skill file using the same `--force` semantics
+ * as init itself.
+ */
+/**
+ * `shrk init --infer` — scan the repo and populate `sharkcraft/*`
+ * with the real signals it finds, instead of writing preset defaults.
+ *
+ * Pipeline:
+ *   1. `inspectSharkcraft({ cwd })` builds the full inspection.
+ *   2. `buildOnboardingPlan(inspection)` extracts inferred paths,
+ *      rules, boundaries, pipelines, verification commands.
+ *   3. `synthesizeFromOnboarding(plan)` triages each entry by
+ *      confidence and emits populated `sharkcraft/*.ts` files plus
+ *      a companion `.inferred-report.md` + `.inferred-report.json`.
+ *   4. Writer respects `--dry-run` / `--write` / `--force` /
+ *      `--with-claude-skill` semantics consistently with the
+ *      preset-init path.
+ *
+ * Honest-by-default: every adopted entry is tagged with its source
+ * signal; medium-confidence rows get a `// TODO: review` marker; low-
+ * confidence rows are dropped from the populated files and listed in
+ * the report so the user knows exactly what was inferred vs needs
+ * authoring.
+ */
+async function runInferInit(cwd, args, force) {
+    const { inspectSharkcraft, buildOnboardingPlan, synthesizeFromOnboarding } = await import('@shrkcrft/inspector');
+    const dryRun = !flagBool(args, 'write');
+    const sharkcraftDir = nodePath.join(cwd, 'sharkcraft');
+    process.stdout.write(header('SharkCraft init — infer'));
+    process.stdout.write(`Folder: ${sharkcraftDir}\n`);
+    const inspection = await inspectSharkcraft({ cwd });
+    const plan = buildOnboardingPlan(inspection);
+    const result = synthesizeFromOnboarding(plan);
+    // Summary block — print BEFORE writing so the user can ctrl-C if the
+    // confidence triage doesn't look right.
+    process.stdout.write(`\nDetected profiles: ${plan.projectSummary.profiles.join(', ') || '(none)'}\n`);
+    process.stdout.write(`Inference triage: ${result.report.adoptedHigh.length} adopted directly · ` +
+        `${result.report.adoptedMedium.length} marked for review · ` +
+        `${result.report.dropped.length} dropped (in report).\n\n`);
+    const written = [];
+    const skipped = [];
+    const wouldWrite = [];
+    for (const file of result.files) {
+        const fullPath = nodePath.join(sharkcraftDir, file.path);
+        if (dryRun) {
+            wouldWrite.push(file.path);
+            continue;
+        }
+        mkdirSync(nodePath.dirname(fullPath), { recursive: true });
+        if (existsSync(fullPath) && !force) {
+            skipped.push(file.path);
+            continue;
+        }
+        writeFileSync(fullPath, file.content, 'utf8');
+        written.push(file.path);
+    }
+    if (dryRun) {
+        process.stdout.write('Would write:\n');
+        for (const p of wouldWrite)
+            process.stdout.write(bullet(p) + '\n');
+        process.stdout.write('\nRe-run with --write to persist.\n');
+        return 0;
+    }
+    if (written.length) {
+        process.stdout.write('Wrote:\n');
+        for (const p of written)
+            process.stdout.write(bullet(p) + '\n');
+    }
+    if (skipped.length) {
+        process.stdout.write('\nSkipped (already exist; use --force to overwrite):\n');
+        for (const p of skipped)
+            process.stdout.write(bullet(p) + '\n');
+    }
+    process.stdout.write(`\nRead the confidence report: \`${nodePath.join('sharkcraft', '.inferred-report.md')}\`\n` +
+        `It lists what was adopted high-confidence, what's marked for your review, ` +
+        `and what shrk can't infer (project-specific decisions you should author by hand).\n`);
+    process.stdout.write('\nNext:\n');
+    process.stdout.write(bullet('$ shrk doctor                            — verify the setup (shape-aware verdict)') + '\n');
+    process.stdout.write(bullet('$ shrk brief                             — single-page brief Claude reads first') + '\n');
+    process.stdout.write(bullet('$ shrk export claude-skill --write       — inline the rules into Claude\'s prompt') + '\n');
+    // Chain claude-skill if requested.
+    if (flagBool(args, 'with-claude-skill') || flagBool(args, 'with-skill')) {
+        const skillCode = await runClaudeSkillExportAfterInit(cwd, force);
+        if (skillCode !== 0) {
+            process.stderr.write('\n(claude-skill export failed — re-run `shrk export claude-skill --write` to retry.)\n');
+        }
+    }
+    // Gitignore + paths advisory same as preset path.
+    const skipGitignore = flagBool(args, 'no-gitignore');
+    if (!skipGitignore) {
+        const patch = ensureSharkcraftGitignore({ cwd, dryRun: false });
+        if (patch.added.length > 0) {
+            process.stdout.write('\n' + renderGitignorePatch(patch, false));
+        }
+    }
+    return 0;
+}
+async function runClaudeSkillExportAfterInit(cwd, force) {
+    const { inspectSharkcraft } = await import('@shrkcrft/inspector');
+    const { renderExport } = await import("../export/export-formats.js");
+    const inspection = await inspectSharkcraft({ cwd });
+    const result = renderExport(inspection, { format: 'claude-skill' });
+    const outputPath = nodePath.join(cwd, result.suggestedPath);
+    mkdirSync(nodePath.dirname(outputPath), { recursive: true });
+    if (existsSync(outputPath) && !force) {
+        process.stdout.write(`\nSkipped claude-skill export — ${result.suggestedPath} already exists. Pass --force to overwrite, or run \`shrk export claude-skill --write --force\`.\n`);
+        return 0;
+    }
+    writeFileSync(outputPath, result.content, 'utf8');
+    process.stdout.write('\n');
+    process.stdout.write(header('Claude-skill exported'));
+    process.stdout.write(`Wrote ${result.suggestedPath}\n` +
+        `  → Claude Code will auto-load this skill in any session opened against this repo.\n`);
+    return 0;
+}

package/dist/commands/mcp.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.command.d.ts","sourceRoot":"","sources":["../../src/commands/mcp.command.ts"],"names":[],"mappings":"AAMA,OAAO,EAKL,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AAKhC,eAAO,MAAM,UAAU,EAAE,eAiDxB,CAAC"}
+{"version":3,"file":"mcp.command.d.ts","sourceRoot":"","sources":["../../src/commands/mcp.command.ts"],"names":[],"mappings":"AAMA,OAAO,EAKL,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AAKhC,eAAO,MAAM,UAAU,EAAE,eAiCxB,CAAC"}

package/dist/commands/mcp.command.js

@@ -6,7 +6,7 @@ import { buildSurfaceSummary, findCommandInSummary } from "../surface/surface-su
 export const mcpCommand = {
     name: 'mcp',
     description: 'MCP server operations (subcommand required).',
-    usage: 'shrk [--cwd <dir>] mcp serve [--verbose] [--watch] [--http] [--port <n>] [--host <h>]   |   shrk mcp install [<harness>]',
+    usage: 'shrk [--cwd <dir>] mcp serve [--verbose] [--watch] [--http] [--port <n>] [--host <h>]',
     async run(args) {
         const sub = args.positional[0];
         if (sub === 'serve') {
@@ -35,139 +35,10 @@ export const mcpCommand = {
                 return 1;
             }
         }
-        if (sub === 'install') {
-            const harness = args.positional[1];
-            const showAll = flagBool(args, 'all-paths');
-            if (harness !== undefined && !HARNESSES.some((h) => h.id === harness)) {
-                process.stderr.write(`Unknown harness: ${harness}\nKnown: ${HARNESSES.map((h) => h.id).join(', ')}\n`);
-                return 2;
-            }
-            process.stdout.write(renderMcpInstallInstructions(harness, showAll));
-            return 0;
-        }
-        process.stderr.write('Usage:\n' +
-            '  shrk mcp serve [--http] [--port N] [--watch]\n' +
-            '  shrk mcp install [claude-code|claude-desktop|cursor|cline]\n');
+        process.stderr.write('Usage: shrk mcp serve [--http] [--port N] [--watch]\n');
         return 2;
     },
 };
-const HARNESSES = [
-    {
-        id: 'claude-code',
-        label: 'Claude Code (Anthropic CLI)',
-        configPaths: [
-            { os: '*', path: '<repo>/.mcp.json                    # project-scoped (preferred)' },
-            { os: '*', path: '~/.claude.json                      # user-scoped (fallback)' },
-        ],
-        note: 'Claude Code reads both; project-scoped wins when present.',
-    },
-    {
-        id: 'claude-desktop',
-        label: 'Claude Desktop',
-        configPaths: [
-            { os: 'darwin', path: '~/Library/Application Support/Claude/claude_desktop_config.json' },
-            { os: 'win32', path: '%APPDATA%\\Claude\\claude_desktop_config.json' },
-            { os: 'linux', path: '~/.config/Claude/claude_desktop_config.json' },
-        ],
-        note: 'Restart Claude Desktop after editing.',
-    },
-    {
-        id: 'cursor',
-        label: 'Cursor IDE',
-        configPaths: [
-            { os: '*', path: '~/.cursor/mcp.json                  # user-scoped' },
-            { os: '*', path: '<repo>/.cursor/mcp.json             # project-scoped' },
-        ],
-        note: 'Cursor merges both. Reload the IDE after editing.',
-    },
-    {
-        id: 'cline',
-        label: 'Cline (VS Code extension)',
-        configPaths: [
-            {
-                os: 'darwin',
-                path: '~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json',
-            },
-            {
-                os: 'win32',
-                path: '%APPDATA%\\Code\\User\\globalStorage\\saoudrizwan.claude-dev\\settings\\cline_mcp_settings.json',
-            },
-            {
-                os: 'linux',
-                path: '~/.config/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json',
-            },
-        ],
-        note: 'Reload the Cline panel after editing.',
-    },
-];
-function currentOs() {
-    const p = process.platform;
-    if (p === 'darwin' || p === 'win32' || p === 'linux')
-        return p;
-    return 'other';
-}
-function pathsForPlatform(target, showAll) {
-    if (showAll)
-        return target.configPaths.map((p) => p.path);
-    const os = currentOs();
-    const matched = target.configPaths.filter((p) => p.os === '*' || p.os === os);
-    // If the current OS has no specific entry, fall back to all to avoid an
-    // empty list. (`other` platforms like FreeBSD land here.)
-    if (matched.length === 0)
-        return target.configPaths.map((p) => p.path);
-    return matched.map((p) => p.path);
-}
-const SHARKCRAFT_MCP_SNIPPET = `{
-  "mcpServers": {
-    "sharkcraft": {
-      "command": "shrk",
-      "args": ["mcp", "serve"]
-    }
-  }
-}`;
-function renderMcpInstallInstructions(harness, showAll) {
-    const lines = [];
-    if (!harness) {
-        lines.push('SharkCraft MCP server entry (universal, stdio transport):');
-        lines.push('');
-        lines.push(SHARKCRAFT_MCP_SNIPPET);
-        lines.push('');
-        lines.push('Paste it into one of these harnesses (`shrk mcp install <id>` for exact paths):');
-        lines.push('');
-        for (const h of HARNESSES) {
-            lines.push(`  ${h.id.padEnd(16)} ${h.label}`);
-        }
-        lines.push('');
-        lines.push('After pasting, restart/reload the harness. The server is read-only — agents cannot write.');
-        return lines.join('\n') + '\n';
-    }
-    const target = HARNESSES.find((h) => h.id === harness);
-    if (!target) {
-        return (`Unknown harness: ${harness}\n` +
-            `Known: ${HARNESSES.map((h) => h.id).join(', ')}\n`);
-    }
-    const paths = pathsForPlatform(target, showAll);
-    const os = currentOs();
-    lines.push(`${target.label}`);
-    lines.push('');
-    lines.push(showAll || os === 'other'
-        ? 'Config file (all platforms):'
-        : `Config file (${os}; pass --all-paths to see every platform):`);
-    for (const p of paths)
-        lines.push(`  ${p}`);
-    lines.push('');
-    lines.push('Add this entry (merge with any existing `mcpServers` block):');
-    lines.push('');
-    lines.push(SHARKCRAFT_MCP_SNIPPET);
-    if (target.note) {
-        lines.push('');
-        lines.push(target.note);
-    }
-    lines.push('');
-    lines.push('Verify by asking the agent: "List MCP tools available." You should see ~250 sharkcraft tools.');
-    lines.push('The server is read-only — agents cannot write. Use `shrk apply --verify-signature` for writes.');
-    return lines.join('\n') + '\n';
-}
 /**
  * Build the MCP tier-gate resolver from the surface summary.
  * Returns a function that, given a tool, decides whether to refuse the

package/dist/commands/migrate.command.d.ts

@@ -0,0 +1,13 @@
+import { type ICommandHandler } from '../command-registry.js';
+/**
+ * `shrk migrate` — run a multi-step migration definition.
+ *
+ *   - shrk migrate plan <id>      preview what each step would do
+ *   - shrk migrate apply <id>     execute the migration (writes!)
+ *
+ * Migrations live in `sharkcraft/migrations/<id>.ts` by default; pass
+ * `--from <path>` to point at a specific file. Each migration file
+ * default-exports an `IMigration` (use `defineMigration({ ... })`).
+ */
+export declare const migrateCommand: ICommandHandler;
+//# sourceMappingURL=migrate.command.d.ts.map

package/dist/commands/migrate.command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate.command.d.ts","sourceRoot":"","sources":["../../src/commands/migrate.command.ts"],"names":[],"mappings":"AAUA,OAAO,EAIL,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AAGhC;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,EAAE,eAsI5B,CAAC"}

package/dist/commands/migrate.command.js

@@ -0,0 +1,152 @@
+import { existsSync } from 'node:fs';
+import * as nodePath from 'node:path';
+import { safeImport } from '@shrkcrft/core';
+import { applyMigration, planMigration, pruneMigrations, resumeMigration, } from '@shrkcrft/migrate';
+import { flagBool, flagString, resolveCwd, } from "../command-registry.js";
+import { asJson, header, kv } from "../output/format-output.js";
+/**
+ * `shrk migrate` — run a multi-step migration definition.
+ *
+ *   - shrk migrate plan <id>      preview what each step would do
+ *   - shrk migrate apply <id>     execute the migration (writes!)
+ *
+ * Migrations live in `sharkcraft/migrations/<id>.ts` by default; pass
+ * `--from <path>` to point at a specific file. Each migration file
+ * default-exports an `IMigration` (use `defineMigration({ ... })`).
+ */
+export const migrateCommand = {
+    name: 'migrate',
+    description: 'Orchestrate multi-step refactors: structural rewrites + shell + checks in one named, replayable migration.',
+    usage: 'shrk migrate plan <id> [--from <path>] [--json] | shrk migrate apply <id> [--from <path>] [--dry-run] [--no-stop-on-failure] [--json] | shrk migrate resume <id> [--from <path>] [--json] | shrk migrate prune [--older-than <days>] [--include-failed] [--dry-run] [--json]',
+    async run(args) {
+        const sub = args.positional[0];
+        if (sub !== 'plan' && sub !== 'apply' && sub !== 'resume' && sub !== 'prune') {
+            process.stderr.write(this.usage + '\n');
+            return 2;
+        }
+        const cwd = resolveCwd(args);
+        const wantJson = flagBool(args, 'json');
+        if (sub === 'prune') {
+            const olderThanRaw = flagString(args, 'older-than');
+            const olderThanDays = olderThanRaw !== undefined ? Number(olderThanRaw) : undefined;
+            if (olderThanDays !== undefined && (!Number.isFinite(olderThanDays) || olderThanDays < 0)) {
+                process.stderr.write(`Invalid --older-than: ${olderThanRaw}\n`);
+                return 2;
+            }
+            const result = pruneMigrations({
+                projectRoot: cwd,
+                ...(olderThanDays !== undefined ? { olderThanDays } : {}),
+                includeFailed: flagBool(args, 'include-failed'),
+                dryRun: flagBool(args, 'dry-run'),
+            });
+            if (wantJson) {
+                process.stdout.write(asJson(result) + '\n');
+                return 0;
+            }
+            process.stdout.write(header(`Migrate prune (${result.dryRun ? 'dry-run' : 'applied'})`));
+            process.stdout.write(kv('scanned', String(result.scanned)) + '\n');
+            process.stdout.write(kv('eligible', String(result.eligible)) + '\n');
+            process.stdout.write(kv('removed', String(result.removed)) + '\n');
+            for (const e of result.entries.slice(0, 50)) {
+                process.stdout.write(`  ${e.id}  (${e.overall}, ${e.ageDays}d, reason=${e.reason})\n`);
+            }
+            return 0;
+        }
+        const id = args.positional[1];
+        if (!id) {
+            process.stderr.write('Usage: shrk migrate ' + sub + ' <id>\n');
+            return 2;
+        }
+        const fromFlag = flagString(args, 'from');
+        const candidate = fromFlag
+            ? (nodePath.isAbsolute(fromFlag) ? fromFlag : nodePath.resolve(cwd, fromFlag))
+            : nodePath.resolve(cwd, 'sharkcraft', 'migrations', `${id}.ts`);
+        if (!existsSync(candidate)) {
+            process.stderr.write(`Migration file not found: ${candidate}\n`);
+            return 1;
+        }
+        const result = await safeImport(candidate);
+        if (!result.ok) {
+            process.stderr.write(`Migration load failed: ${result.error.message}\n`);
+            return 1;
+        }
+        const migration = result.module.default ?? result.module.migration;
+        if (!migration) {
+            process.stderr.write(`Migration module ${candidate} does not export a default migration.\n`);
+            return 1;
+        }
+        if (migration.id !== id) {
+            process.stderr.write(`Migration id mismatch: requested "${id}", file contains "${migration.id}".\n`);
+            return 1;
+        }
+        if (sub === 'plan') {
+            const plan = planMigration(migration, cwd);
+            if (wantJson) {
+                process.stdout.write(asJson(plan) + '\n');
+                return 0;
+            }
+            process.stdout.write(header(`Migration plan: ${plan.migration.title}`));
+            process.stdout.write(kv('id', plan.migration.id) + '\n');
+            process.stdout.write(kv('total steps', String(plan.plannedSteps.length)) + '\n');
+            process.stdout.write(kv('total edits', String(plan.totalEdits)) + '\n');
+            process.stdout.write(kv('files affected', String(plan.totalFiles)) + '\n');
+            for (const step of plan.plannedSteps) {
+                process.stdout.write(`\n  [${step.index + 1}/${plan.plannedSteps.length}] ${step.id} (${step.step.kind})\n`);
+                if (step.description)
+                    process.stdout.write(`     ${step.description}\n`);
+                if (step.rewritePlan) {
+                    process.stdout.write(`     files=${step.rewritePlan.files.length}  edits=${step.rewritePlan.totalEdits}\n`);
+                }
+                else if (step.step.kind === 'shell' || step.step.kind === 'check') {
+                    process.stdout.write(`     $ ${step.step.command}\n`);
+                }
+            }
+            return 0;
+        }
+        // apply / resume
+        const dryRun = flagBool(args, 'dry-run');
+        const noStop = flagBool(args, 'no-stop-on-failure');
+        let report;
+        let resumedFromIndex = 0;
+        const resumeDiagnostics = [];
+        if (sub === 'resume') {
+            const result = resumeMigration(migration, {
+                projectRoot: cwd,
+                dryRun,
+                stopOnFailure: !noStop,
+            });
+            report = result.report;
+            resumedFromIndex = result.resumedFromIndex;
+            for (const d of result.diagnostics)
+                resumeDiagnostics.push(d);
+        }
+        else {
+            report = applyMigration(migration, {
+                projectRoot: cwd,
+                dryRun,
+                stopOnFailure: !noStop,
+            });
+        }
+        if (wantJson) {
+            process.stdout.write(asJson({ ...report, resumedFromIndex, resumeDiagnostics }) + '\n');
+            return report.overall === 'fail' ? 1 : 0;
+        }
+        if (sub === 'resume') {
+            for (const d of resumeDiagnostics)
+                process.stdout.write(`! ${d}\n`);
+        }
+        process.stdout.write(header(`Migration ${dryRun ? '(dry-run)' : '(applied)'}: ${report.overall.toUpperCase()}`));
+        process.stdout.write(kv('id', report.migration.id) + '\n');
+        process.stdout.write(kv('total duration', `${report.totalDurationMs}ms`) + '\n');
+        for (const s of report.steps) {
+            process.stdout.write(`  [${s.status.padEnd(8)}] ${s.id} (${s.kind})  (${s.durationMs}ms)\n`);
+            process.stdout.write(`              ${s.message}\n`);
+            if (s.rewriteStats && s.rewriteStats.conflicts.length > 0) {
+                for (const c of s.rewriteStats.conflicts.slice(0, 5)) {
+                    process.stdout.write(`                conflict: ${c}\n`);
+                }
+            }
+        }
+        return report.overall === 'fail' ? 1 : 0;
+    },
+};

package/dist/commands/onboard.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onboard.command.d.ts","sourceRoot":"","sources":["../../src/commands/onboard.command.ts"],"names":[],"mappings":"AA6CA,OAAO,EAML,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AAGhC,eAAO,MAAM,cAAc,EAAE,eA2O5B,CAAC"}
+{"version":3,"file":"onboard.command.d.ts","sourceRoot":"","sources":["../../src/commands/onboard.command.ts"],"names":[],"mappings":"AA6CA,OAAO,EAML,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AAGhC,eAAO,MAAM,cAAc,EAAE,eA4N5B,CAAC"}

package/dist/commands/onboard.command.js

@@ -5,8 +5,8 @@ import { flagBool, flagNumber, flagString, flagList, resolveCwd, } from "../comm
 import { asJson, header, kv } from "../output/format-output.js";
 export const onboardCommand = {
     name: 'onboard',
-    description: 'Analyze an existing repository and produce a SharkCraft onboarding plan (rules / paths / templates / boundaries / pipelines + readiness estimate). Default is dry-run; `--write-drafts` writes advisory drafts under sharkcraft/onboarding/ (never overwrites rules.ts / paths.ts / templates.ts). Re-running `--write-drafts` against hand-edited drafts performs a three-way merge against the previous snapshot; conflicts emit conflict markers inside the draft (use `--abort-on-conflict` for CI to leave the file untouched and exit non-zero). `--scaffold-templates` drafts runnable template bodies. `--import-agents` parses AGENTS.md / CLAUDE.md / .cursor/rules into a draft. `--diff` compares the plan against the live config.',
-    usage: 'shrk [--cwd <dir>] onboard [--dry-run] [--write-drafts] [--abort-on-conflict] [--scaffold-templates] [--import-agents] [--diff] [--preset <id>] [--json]',
+    description: 'Analyze an existing repository and produce a SharkCraft onboarding plan (rules / paths / templates / boundaries / pipelines + readiness estimate). Default is dry-run; `--write-drafts` writes advisory drafts under sharkcraft/onboarding/ (never overwrites rules.ts / paths.ts / templates.ts). `--scaffold-templates` drafts runnable template bodies. `--import-agents` parses AGENTS.md / CLAUDE.md / .cursor/rules into a draft. `--diff` compares the plan against the live config.',
+    usage: 'shrk [--cwd <dir>] onboard [--dry-run] [--write-drafts] [--scaffold-templates] [--import-agents] [--diff] [--preset <id>] [--json]',
     async run(args) {
         // Dispatch sub-verb: `shrk onboard adopt [...]`.
         if (args.positional[0] === 'adopt') {
@@ -15,7 +15,6 @@ export const onboardCommand = {
         }
         const cwd = resolveCwd(args);
         const writeDrafts = flagBool(args, 'write-drafts');
-        const abortOnConflict = flagBool(args, 'abort-on-conflict');
         const scaffoldTemplates = flagBool(args, 'scaffold-templates');
         const importAgents = flagBool(args, 'import-agents');
         const diffMode = flagBool(args, 'diff');
@@ -36,7 +35,6 @@ export const onboardCommand = {
             written = writeOnboardingDrafts(plan, {
                 projectRoot: cwd,
                 ...(importedAgentRules ? { importedAgentRules } : {}),
-                abortOnConflict,
             });
         }
         const diff = diffMode ? buildOnboardingDiff(inspection, plan) : undefined;
@@ -168,18 +166,8 @@ export const onboardCommand = {
         if (writeDrafts && written) {
             process.stdout.write(`Wrote ${written.files.length} draft file(s) to:\n  ${written.outDir}\n`);
             for (const f of written.files) {
-                process.stdout.write(`  + ${f.path} (${f.bytes} bytes) [${f.mergeStatus}]\n`);
+                process.stdout.write(`  + ${f.path} (${f.bytes} bytes)\n`);
             }
-            if (written.conflicts > 0) {
-                process.stderr.write(`\nConflict regions emitted in ${written.conflicts} draft file(s). ` +
-                    'Resolve <<<<<<< / ======= / >>>>>>> markers before adopting.\n');
-            }
-            if (written.aborted > 0) {
-                process.stderr.write(`\n--abort-on-conflict: ${written.aborted} draft file(s) left unchanged due to conflicts.\n`);
-                return 1;
-            }
-            if (written.conflicts > 0)
-                return 2;
         }
         else if (dryRun) {
             process.stdout.write('Dry-run only. Re-run with `--write-drafts` to write advisory drafts.\n');

package/dist/commands/packs-new.d.ts

@@ -1,5 +1,5 @@
 import { type ICommandHandler } from '../command-registry.js';
-export type PackKind = 'generic' | 'framework' | 'architecture' | 'enterprise' | 'platform-adopter';
+export type PackKind = 'generic' | 'framework' | 'architecture' | 'enterprise';
 interface IScaffoldFile {
     /** Path relative to the new pack root. */
     relativePath: string;

package/dist/commands/packs-new.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packs-new.d.ts","sourceRoot":"","sources":["../../src/commands/packs-new.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AAGhC,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,cAAc,GAAG,YAAY,GAAG,kBAAkB,CAAC;AAUpG,UAAU,aAAa;IACrB,0CAA0C;IAC1C,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,kDAAkD;AAClD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,kBAAkB,GAAG,mBAAmB,CA+G/E;AA4TD,eAAO,MAAM,eAAe,EAAE,eAoG7B,CAAC;AAUF,eAAO,MAAM,gBAAgB,EAAE,eAqI9B,CAAC"}
+{"version":3,"file":"packs-new.d.ts","sourceRoot":"","sources":["../../src/commands/packs-new.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AAIhC,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,cAAc,GAAG,YAAY,CAAC;AAS/E,UAAU,aAAa;IACrB,0CAA0C;IAC1C,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,kDAAkD;AAClD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,kBAAkB,GAAG,mBAAmB,CAyG/E;AA0SD,eAAO,MAAM,eAAe,EAAE,eAoG7B,CAAC;AAUF,eAAO,MAAM,gBAAgB,EAAE,eAqI9B,CAAC"}