@shrkcrft/cli 0.1.0-alpha.7 → 0.1.0-alpha.9

package/README.md

@@ -2,7 +2,7 @@
 
 SharkCraft CLI (`shrk`): structured project intelligence for AI coding agents.
 
-Part of [SharkCraft](https://github.com/shrkcrft/sharkcraft) — a deterministic, local-first toolkit that gives AI coding agents durable project context. See the main repo for documentation, examples, and the `shrk` CLI.
+Part of [SharkCraft](https://github.com/sharkcraft/sharkcraft) — a deterministic, local-first toolkit that gives AI coding agents durable project context. See the main repo for documentation, examples, and the `shrk` CLI.
 
 ## Install
 

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

@@ -1 +1 @@
-{"version":3,"file":"boundaries.command.d.ts","sourceRoot":"","sources":["../../src/commands/boundaries.command.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAwB,KAAK,eAAe,EAA+B,MAAM,wBAAwB,CAAC;AAGjH,eAAO,MAAM,qBAAqB,EAAE,eAuBnC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,eAqClC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,eAmDtC,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,eAyEpC,CAAC;AAsCF,uCAAuC;AACvC,eAAO,MAAM,wBAAwB,EAAE,eAqEtC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,eA0CtC,CAAC"}
+{"version":3,"file":"boundaries.command.d.ts","sourceRoot":"","sources":["../../src/commands/boundaries.command.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAwB,KAAK,eAAe,EAA+B,MAAM,wBAAwB,CAAC;AAGjH,eAAO,MAAM,qBAAqB,EAAE,eAuBnC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,eAqClC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,eAmDtC,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,eAyEpC,CAAC;AAsCF,uCAAuC;AACvC,eAAO,MAAM,wBAAwB,EAAE,eAmFtC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,eA0CtC,CAAC"}

package/dist/commands/boundaries.command.js

@@ -218,6 +218,18 @@ export const boundariesEnforceCommand = {
         const fileList = filesRaw
             ? filesRaw.split(',').map((s) => s.trim()).filter(Boolean)
             : [];
+        if (since) {
+            const { verifyGitRef } = await import('@shrkcrft/inspector');
+            const verify = verifyGitRef(cwd, since);
+            if (!verify.valid) {
+                process.stderr.write(`error: --since ref "${since}" does not resolve to a commit in this repository.\n` +
+                    (verify.suggestions && verify.suggestions.length > 0
+                        ? `\nDid you mean:\n${verify.suggestions.map((s) => `  --since ${s}`).join('\n')}\n`
+                        : '') +
+                    '\nUse `git branch -a` to list available refs.\n');
+                return 2;
+            }
+        }
         const wantChangedScope = changedOnly || staged || Boolean(since) || fileList.length > 0;
         const { filterViolationsToChangedScope } = await import('@shrkcrft/inspector');
         const filtered = wantChangedScope

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

@@ -1 +1 @@
-{"version":3,"file":"check.command.d.ts","sourceRoot":"","sources":["../../src/commands/check.command.ts"],"names":[],"mappings":"AAmBA,OAAO,EAML,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AAikBhC,eAAO,MAAM,YAAY,EAAE,eAmD1B,CAAC"}
+{"version":3,"file":"check.command.d.ts","sourceRoot":"","sources":["../../src/commands/check.command.ts"],"names":[],"mappings":"AAoBA,OAAO,EAML,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AA0kBhC,eAAO,MAAM,YAAY,EAAE,eAmD1B,CAAC"}

package/dist/commands/check.command.js

@@ -1,9 +1,8 @@
-import { buildAiReadinessReport, buildImportHygieneReport, buildPackDoctorReport, ChangedScopeMode, diagnoseActionHints, emitImportHygieneAllowlistDraft, filterViolationsToChangedScope, ImportHygieneFindingKind, inspectSharkcraft, isTodoReason, renderImportHygieneText, resolveChangedFiles, runDoctor, suggestBoundaryFixes, } from '@shrkcrft/inspector';
+import { buildAiReadinessReport, buildImportHygieneReport, buildPackDoctorReport, ChangedScopeMode, diagnoseActionHints, emitImportHygieneAllowlistDraft, filterViolationsToChangedScope, ImportHygieneFindingKind, inspectSharkcraft, isTodoReason, renderImportHygieneText, resolveChangedFiles, runDoctor, suggestBoundaryFixes, verifyGitRef, } from '@shrkcrft/inspector';
 import { mkdirSync, writeFileSync, readFileSync, existsSync } from 'node:fs';
 import * as nodePath from 'node:path';
 import { flagBool, flagNumber, flagString, flagVars, resolveCwd, } from "../command-registry.js";
 import { asJson, header, kv } from "../output/format-output.js";
-import { maybeRunInWatchMode } from "../output/watch-loop.js";
 import { validateTemplateVariables } from '@shrkcrft/templates';
 import { FileChangeType, planGeneration } from '@shrkcrft/generator';
 import { evaluateBoundaries, loadTsconfigPaths, scanImports, summarizeImports, } from '@shrkcrft/boundaries';
@@ -153,6 +152,13 @@ async function checkImports(args) {
     const cwd = resolveCwd(args);
     const changedOnly = flagBool(args, 'changed-only');
     const since = flagString(args, 'since');
+    if (since) {
+        const verify = verifyGitRef(cwd, since);
+        if (!verify.valid) {
+            process.stderr.write(renderSinceRefError(since, verify.suggestions ?? []));
+            return 2;
+        }
+    }
     let files;
     if (changedOnly || since) {
         const changed = resolveChangedFiles({
@@ -294,6 +300,13 @@ function readChangedScopeOptions(args, cwd) {
         : [];
     if (!changedOnly && !staged && !since && files.length === 0)
         return null;
+    if (since) {
+        const verify = verifyGitRef(cwd, since);
+        if (!verify.valid) {
+            process.stderr.write(renderSinceRefError(since, verify.suggestions ?? []));
+            process.exit(2);
+        }
+    }
     const out = { projectRoot: cwd };
     if (files.length > 0)
         out.files = files;
@@ -305,23 +318,20 @@ function readChangedScopeOptions(args, cwd) {
         out.includeWorktree = true;
     return out;
 }
-async function checkBoundaries(args) {
-    const watchExit = await maybeRunInWatchMode(args, checkBoundariesOnce, {
-        defaultPaths: BOUNDARIES_DEFAULT_WATCH_PATHS,
-    });
-    if (watchExit !== null)
-        return watchExit;
-    return checkBoundariesOnce(args);
+function renderSinceRefError(ref, suggestions) {
+    const lines = [];
+    lines.push(`error: --since ref "${ref}" does not resolve to a commit in this repository.`);
+    if (suggestions.length > 0) {
+        lines.push('');
+        lines.push('Did you mean:');
+        for (const s of suggestions)
+            lines.push(`  --since ${s}`);
+    }
+    lines.push('');
+    lines.push('Use `git branch -a` to list available refs, or skip --since to use the working tree.');
+    return lines.join('\n') + '\n';
 }
-const BOUNDARIES_DEFAULT_WATCH_PATHS = [
-    'sharkcraft',
-    'packages',
-    'apps',
-    'libs',
-    'src',
-    'tools',
-];
-async function checkBoundariesOnce(args) {
+async function checkBoundaries(args) {
     const cwd = resolveCwd(args);
     const inspection = await inspectSharkcraft({ cwd });
     const rules = inspection.boundaryRegistry.list();
@@ -521,8 +531,8 @@ async function checkBoundariesOnce(args) {
 // ────────────────────────────────────────────────────────────────────────
 export const checkCommand = {
     name: 'check',
-    description: 'Run SharkCraft-level validation across knowledge / rules / templates / pipelines / packs / action hints / doctor. `check boundaries [--watch [--paths a,b] [--debounce N] [--once]]` re-runs the boundary scan on file changes.',
-    usage: 'shrk [--cwd <dir>] check [packs|pipelines|knowledge|generation|boundaries|imports] [--strict] [--min-score <0-100>] [--json] [--watch [--paths <list>] [--debounce N] [--once]]',
+    description: 'Run SharkCraft-level validation across knowledge / rules / templates / pipelines / packs / action hints / doctor.',
+    usage: 'shrk [--cwd <dir>] check [packs|pipelines|knowledge|generation] [--strict] [--min-score <0-100>] [--json]',
     async run(args) {
         const sub = args.positional[0];
         if (sub === 'generation')

package/dist/commands/command-catalog.d.ts.map

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

package/dist/commands/command-catalog.js

@@ -1108,7 +1108,13 @@ export const COMMAND_CATALOG = Object.freeze([
     }),
     entry({
         command: 'mcp serve',
-        description: 'Start the read-only MCP server (stdio).',
+        description: 'Start the read-only MCP server (stdio or --http).',
+        category: 'meta',
+        safetyLevel: SafetyLevel.ReadOnly,
+    }),
+    entry({
+        command: 'mcp install',
+        description: 'Print the MCP config snippet + path for Claude Code / Claude Desktop / Cursor / Cline (copy-paste, no file writes).',
         category: 'meta',
         safetyLevel: SafetyLevel.ReadOnly,
     }),
@@ -2260,6 +2266,13 @@ export const COMMAND_CATALOG = Object.freeze([
         safetyLevel: SafetyLevel.ReadOnly,
         mcpAvailable: true,
     }),
+    entry({
+        command: 'packs compat --fast',
+        description: 'Pack compat scan with regex-only export walker (legacy). Default is TS-AST based.',
+        category: 'packs',
+        safetyLevel: SafetyLevel.ReadOnly,
+        mcpAvailable: false,
+    }),
     entry({
         command: 'onboard adopt status --max-age-days',
         description: 'Adoption checkpoint status with custom max-age (default 30 days).',

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

@@ -1 +1 @@
-{"version":3,"file":"doctor.command.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.command.ts"],"names":[],"mappings":"AAqBA,OAAO,EAML,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AA0JhC,eAAO,MAAM,aAAa,EAAE,eAW3B,CAAC;AA0ZF,eAAO,MAAM,qBAAqB,EAAE,eAmCnC,CAAC;AAuDF,eAAO,MAAM,yBAAyB,EAAE,eAavC,CAAC;AAIF,eAAO,MAAM,wBAAwB,EAAE,eA2CtC,CAAC;AAgCF,eAAO,MAAM,6BAA6B,EAAE,eAa3C,CAAC"}
+{"version":3,"file":"doctor.command.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.command.ts"],"names":[],"mappings":"AAqBA,OAAO,EAML,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AAwJhC,eAAO,MAAM,aAAa,EAAE,eAW3B,CAAC;AA+ZF,eAAO,MAAM,qBAAqB,EAAE,eAmCnC,CAAC;AAuDF,eAAO,MAAM,yBAAyB,EAAE,eAavC,CAAC;AAIF,eAAO,MAAM,wBAAwB,EAAE,eA2CtC,CAAC;AAgCF,eAAO,MAAM,6BAA6B,EAAE,eAa3C,CAAC"}

package/dist/commands/doctor.command.js

@@ -38,7 +38,7 @@ function describeStrictMode(mode) {
         case 'all':
             return 'strict=all (every warning fails)';
         case 'warnings':
-            return 'strict=warnings (structural warnings fail, advisory excluded)';
+            return 'strict=warnings (structural warnings fail, hint-quality excluded)';
         case 'errors':
             return 'strict=errors (only errors fail)';
         case 'off':
@@ -59,10 +59,8 @@ function evaluateStrict(mode, checks, errorCount) {
     for (const c of checks) {
         if (c.severity !== DoctorSeverity.Warning)
             continue;
-        // `--strict=warnings` excludes anything the inspector flagged as
-        // advisory (action-hint quality today, any future advisory category
-        // tomorrow). `--strict=all` counts every warning, advisory or not.
-        if (mode === 'warnings' && c.advisory === true) {
+        const isHintQuality = c.id.startsWith('actionhints-');
+        if (mode === 'warnings' && isHintQuality) {
             excludedWarnings += 1;
         }
         else {
@@ -76,7 +74,7 @@ function evaluateStrict(mode, checks, errorCount) {
         excludedWarnings,
         reason: mode === 'all'
             ? 'any warning'
-            : 'structural warnings only (advisory excluded)',
+            : 'structural warnings only (hint-quality excluded)',
     };
 }
 function buildFilterOptions(args, suppressions) {
@@ -422,7 +420,7 @@ async function doctorCommandImpl(args) {
     void saveDoctorSuppressions;
     void existsSync;
     if (strictMode === 'warnings' && strictEval.excludedWarnings > 0) {
-        process.stdout.write(`  (strict=warnings excluded ${strictEval.excludedWarnings} advisory warning(s); use --strict=all to include)\n`);
+        process.stdout.write(`  (strict=warnings excluded ${strictEval.excludedWarnings} hint-quality warning(s); use --strict=all to include)\n`);
     }
     // Surface acknowledgement state. Bare suppressions don't qualify as
     // acknowledgements; expiring/expired ones get a callout so authors don't
@@ -481,7 +479,8 @@ async function doctorCommandImpl(args) {
     }
     // Failure-to-success hints surface only when something is wrong.
     if (overallExitCode !== 0 || result.summary.warnings > 0) {
-        process.stdout.write(renderFailureHints(doctorHints()));
+        const folderMissing = result.checks.some((c) => c.id === 'sharkcraft-folder' && (c.severity === 'error' || c.severity === 'warning'));
+        process.stdout.write(renderFailureHints(doctorHints({ sharkcraftFolderMissing: folderMissing })));
     }
     // When there are preview-eligible findings (action-hints,
     // knowledge-stale, template-drift, self-config, pack-conflict,

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

@@ -1 +1 @@
-{"version":3,"file":"help.command.d.ts","sourceRoot":"","sources":["../../src/commands/help.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAuB1C;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,eAAe;;;;cAK3C;QAAE,UAAU,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAA;KAAE,GAAG,MAAM;EA2FpF"}
+{"version":3,"file":"help.command.d.ts","sourceRoot":"","sources":["../../src/commands/help.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAyB1C;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,eAAe;;;;cAK3C;QAAE,UAAU,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAA;KAAE,GAAG,MAAM;EA2FpF"}

package/dist/commands/help.command.js

@@ -9,20 +9,22 @@ import { header } from "../output/format-output.js";
  */
 export function renderStartScreen() {
     const lines = [];
-    lines.push('SharkCraft CLI — deterministic, local-first project intelligence for AI coding agents.');
+    lines.push('SharkCraft CLI — the safety layer beneath your AI coding agent.');
     lines.push('Usage: shrk [--cwd <dir>] <command> [...args]');
     lines.push('');
+    lines.push('Prove it in 60 seconds:');
+    lines.push('  $ shrk check boundaries --changed-only --since main');
+    lines.push('  $ shrk review packet --v3 --since main');
+    lines.push('  $ shrk mcp install claude-code   — copy-paste the MCP entry');
+    lines.push('');
     lines.push('Core (always on):');
-    lines.push('  $ shrk recommend "<task>"        — what should I do?');
     lines.push('  $ shrk doctor                    — is the workspace healthy?');
-    lines.push('  $ shrk context --task "<task>"   — focused context for a task');
+    lines.push('  $ shrk recommend "<task>"        — what command should I reach for?');
     lines.push('  $ shrk init                      — create sharkcraft/ + config skeleton');
-    lines.push('  $ shrk check boundaries          — boundary enforcement');
     lines.push('  $ shrk surface list              — every command grouped by tier');
     lines.push('');
     lines.push('Discover the rest (extended tier — always callable):');
     lines.push('  $ shrk surface list              — full surface, grouped by tier and profile');
-    lines.push('  $ shrk surface profiles          — named profiles (small-app / monorepo / ci / agent / pack-author)');
     lines.push('  $ shrk surface explain <cmd>     — why a command has its current tier');
     lines.push('  $ shrk help <command>            — usage for a specific command');
     lines.push('  $ shrk --full-help               — the long, exhaustive help');
@@ -89,7 +91,7 @@ export function makeHelpCommand(registry) {
                 process.stdout.write(renderStartScreen());
                 return 0;
             }
-            process.stdout.write(`SharkCraft CLI — structured project intelligence for AI coding agents\n`);
+            process.stdout.write(`SharkCraft CLI — the safety layer beneath your AI coding agent.\n`);
             process.stdout.write(`Usage: shrk [--cwd <dir>] <command> [...args]\n`);
             process.stdout.write(header('Top-level commands'));
             for (const c of registry.list()) {

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

@@ -1 +1 @@
-{"version":3,"file":"init.command.d.ts","sourceRoot":"","sources":["../../src/commands/init.command.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAwB,KAAK,eAAe,EAA+B,MAAM,wBAAwB,CAAC;AAmSjH,eAAO,MAAM,WAAW,EAAE,eA2FzB,CAAC"}
+{"version":3,"file":"init.command.d.ts","sourceRoot":"","sources":["../../src/commands/init.command.ts"],"names":[],"mappings":"AAeA,OAAO,EAAwB,KAAK,eAAe,EAA+B,MAAM,wBAAwB,CAAC;AA4QjH,eAAO,MAAM,WAAW,EAAE,eA2FzB,CAAC"}

package/dist/commands/init.command.js

@@ -6,7 +6,6 @@ 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";
@@ -109,13 +108,8 @@ async function applyPresetInit(cwd, mode) {
             process.stdout.write(bullet(`(warning) ${warn}`) + '\n');
         }
         process.stdout.write('\nNext:\n');
-        for (const cmd of preset.recommendedNextCommands ?? [
-            'shrk init --zero-config --write',
-            'shrk doctor',
-            'shrk context --task "<task>"',
-        ]) {
-            process.stdout.write(bullet(`$ ${cmd}`) + '\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');
         if (!mode.skipGitignore) {
             const patch = ensureSharkcraftGitignore({ cwd, dryRun: true });
             process.stdout.write('\n' + renderGitignorePatch(patch, true));
@@ -134,11 +128,6 @@ 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`);
@@ -175,29 +164,20 @@ async function applyPresetInit(cwd, mode) {
             process.stdout.write('\n' + renderGitignorePatch(patch, false));
         }
     }
-    if (pathsAdvisory.annotated) {
-        renderPathsAdvisory(pathsAdvisory);
-    }
-    process.stdout.write('\nNext:\n');
-    for (const cmd of preset.recommendedNextCommands ?? [
-        'shrk doctor',
-        'shrk context --task "<task>"',
-    ]) {
-        process.stdout.write(bullet(`$ ${cmd}`) + '\n');
+    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');
+        }
     }
-    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');
@@ -231,10 +211,6 @@ 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');

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,eAiCxB,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,eAiDxB,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>]',
+    usage: 'shrk [--cwd <dir>] mcp serve [--verbose] [--watch] [--http] [--port <n>] [--host <h>]   |   shrk mcp install [<harness>]',
     async run(args) {
         const sub = args.positional[0];
         if (sub === 'serve') {
@@ -35,10 +35,139 @@ export const mcpCommand = {
                 return 1;
             }
         }
-        process.stderr.write('Usage: shrk mcp serve [--http] [--port N] [--watch]\n');
+        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');
         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/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,eA4N5B,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,eA2O5B,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). `--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]',
+    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]',
     async run(args) {
         // Dispatch sub-verb: `shrk onboard adopt [...]`.
         if (args.positional[0] === 'adopt') {
@@ -15,6 +15,7 @@ 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');
@@ -35,6 +36,7 @@ export const onboardCommand = {
             written = writeOnboardingDrafts(plan, {
                 projectRoot: cwd,
                 ...(importedAgentRules ? { importedAgentRules } : {}),
+                abortOnConflict,
             });
         }
         const diff = diffMode ? buildOnboardingDiff(inspection, plan) : undefined;
@@ -166,8 +168,18 @@ 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)\n`);
+                process.stdout.write(`  + ${f.path} (${f.bytes} bytes) [${f.mergeStatus}]\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.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;AAIhC,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;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"}

package/dist/commands/packs-new.js

@@ -1,8 +1,15 @@
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
 import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import * as nodePath from 'node:path';
 import { flagBool, flagString, resolveCwd, } from "../command-registry.js";
 import { asJson, header, kv } from "../output/format-output.js";
-import { importModuleViaLoader } from '@shrkcrft/core';
 const VALID_KINDS = new Set([
     'generic',
     'framework',
@@ -638,7 +645,7 @@ async function runRuntimePackTest(input) {
     if (existsSync(entry)) {
         try {
             const { pathToFileURL } = await import('node:url');
-            const mod = (await importModuleViaLoader(entry));
+            const mod = (await import(__rewriteRelativeImportExtension(pathToFileURL(entry).href + `?bust=${Date.now()}`)));
             const value = mod.default ?? mod;
             const shape = describeShape(value);
             modules.push({
@@ -685,7 +692,7 @@ async function runRuntimePackTest(input) {
             continue;
         try {
             const { pathToFileURL } = await import('node:url');
-            const mod = (await importModuleViaLoader(full));
+            const mod = (await import(__rewriteRelativeImportExtension(pathToFileURL(full).href + `?bust=${Date.now()}`)));
             const value = mod.default;
             const arr = Array.isArray(value) ? value : null;
             modules.push({

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

@@ -1 +1 @@
-{"version":3,"file":"packs.command.d.ts","sourceRoot":"","sources":["../../src/commands/packs.command.ts"],"names":[],"mappings":"AAoBA,OAAO,EAIL,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AAQhC,eAAO,MAAM,yBAAyB,EAAE,eAoCvC,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,eAsGzC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,eA+CnC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,eAuD9B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eAsE7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,eAqDjC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,eAyFhC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,eAqEhC,CAAC;AA4DF,eAAO,MAAM,gBAAgB,EAAE,eA+K9B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,eAmCtC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,eAmFhC,CAAC;AAMF,eAAO,MAAM,qBAAqB,EAAE,eA4BnC,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,eA+E/B,CAAC"}
+{"version":3,"file":"packs.command.d.ts","sourceRoot":"","sources":["../../src/commands/packs.command.ts"],"names":[],"mappings":"AAqBA,OAAO,EAIL,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AAOhC,eAAO,MAAM,yBAAyB,EAAE,eAoCvC,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,eAsGzC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,eA+CnC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,eAuD9B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eAsE7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,eAqDjC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,eAyFhC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,eAqEhC,CAAC;AA4DF,eAAO,MAAM,gBAAgB,EAAE,eA+K9B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,eAmCtC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,eAyFhC,CAAC;AAMF,eAAO,MAAM,qBAAqB,EAAE,eA4BnC,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,eA+E/B,CAAC"}