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

package/dist/git-helpers.js

@@ -29,6 +29,69 @@ export function getGitBranch(cwd) {
     const out = r.stdout.trim();
     return out.length > 0 ? out : null;
 }
+/**
+ * Verify that `ref` resolves to a commit. Returns `{ valid: true }` on
+ * success, otherwise `{ valid: false, suggestions }` listing nearby
+ * branch / tag names so the caller can offer a did-you-mean.
+ *
+ * Cheap (`git rev-parse --verify` + `git for-each-ref`) — only run when
+ * the user passes an explicit ref.
+ */
+export function verifyGitRef(cwd, ref) {
+    if (!isGitRepo(cwd))
+        return { valid: false, suggestions: [] };
+    const r = runGit(cwd, ['rev-parse', '--verify', '--quiet', `${ref}^{commit}`]);
+    if (r.ok)
+        return { valid: true };
+    // Collect candidate names from local + remote refs, then rank by Levenshtein.
+    const candidates = listRefNames(cwd);
+    const suggestions = nearestRefs(ref, candidates, 3);
+    return { valid: false, suggestions };
+}
+function listRefNames(cwd) {
+    const out = new Set();
+    const local = runGit(cwd, ['for-each-ref', '--format=%(refname:short)', 'refs/heads']);
+    if (local.ok)
+        for (const line of parseLines(local.stdout))
+            out.add(line);
+    const remote = runGit(cwd, ['for-each-ref', '--format=%(refname:short)', 'refs/remotes']);
+    if (remote.ok)
+        for (const line of parseLines(remote.stdout))
+            out.add(line);
+    const tags = runGit(cwd, ['for-each-ref', '--format=%(refname:short)', 'refs/tags']);
+    if (tags.ok)
+        for (const line of parseLines(tags.stdout))
+            out.add(line);
+    return [...out];
+}
+function nearestRefs(query, refs, k) {
+    const scored = refs.map((r) => ({ r, d: levenshtein(query, r) }));
+    scored.sort((a, b) => a.d - b.d);
+    return scored.slice(0, k).map((s) => s.r);
+}
+function levenshtein(a, b) {
+    if (a === b)
+        return 0;
+    const al = a.length;
+    const bl = b.length;
+    if (al === 0)
+        return bl;
+    if (bl === 0)
+        return al;
+    let prev = new Array(bl + 1);
+    let curr = new Array(bl + 1);
+    for (let j = 0; j <= bl; j += 1)
+        prev[j] = j;
+    for (let i = 1; i <= al; i += 1) {
+        curr[0] = i;
+        for (let j = 1; j <= bl; j += 1) {
+            const cost = a.charCodeAt(i - 1) === b.charCodeAt(j - 1) ? 0 : 1;
+            curr[j] = Math.min((prev[j] ?? 0) + 1, (curr[j - 1] ?? 0) + 1, (prev[j - 1] ?? 0) + cost);
+        }
+        [prev, curr] = [curr, prev];
+    }
+    return prev[bl] ?? Math.max(al, bl);
+}
 export function getChangedFiles(cwd, opts = {}) {
     if (!isGitRepo(cwd))
         return [];

package/dist/impact-render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"impact-render.d.ts","sourceRoot":"","sources":["../src/impact-render.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,WAAW,oBAAoB;IACnC,kEAAkE;IAClE,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,gDAAgD;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AA6BD,UAAU,SAAS;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,SAAS,EAAE,CAAC;CACvB;AAED,uEAAuE;AACvE,wBAAgB,eAAe,CAC7B,MAAM,EAAE,eAAe,EACvB,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC5C,SAAS,EAAE,CA0Cb;AAiCD,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,eAAe,EACvB,IAAI,GAAE,oBAAyB,GAC9B,MAAM,CAgER;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,eAAe,EACvB,IAAI,GAAE,oBAAyB,GAC9B,MAAM,CAyGR;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,eAAe,EACvB,IAAI,GAAE,oBAAyB,GAC9B,MAAM,CAiIR"}
+{"version":3,"file":"impact-render.d.ts","sourceRoot":"","sources":["../src/impact-render.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,WAAW,oBAAoB;IACnC,kEAAkE;IAClE,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,gDAAgD;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AA6BD,UAAU,SAAS;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,SAAS,EAAE,CAAC;CACvB;AAED,uEAAuE;AACvE,wBAAgB,eAAe,CAC7B,MAAM,EAAE,eAAe,EACvB,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC5C,SAAS,EAAE,CAiDb;AAiCD,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,eAAe,EACvB,IAAI,GAAE,oBAAyB,GAC9B,MAAM,CAgER;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,eAAe,EACvB,IAAI,GAAE,oBAAyB,GAC9B,MAAM,CAyGR;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,eAAe,EACvB,IAAI,GAAE,oBAAyB,GAC9B,MAAM,CAiIR"}

package/dist/impact-render.js

@@ -36,6 +36,11 @@ export function buildImpactTree(impact, opts = {}) {
         for (let i = 0; i < chain.length - 1; i += 1) {
             const importer = chain[i];
             const target = chain[i + 1];
+            // Skip self-references — a file cannot import itself in the
+            // dependency tree we render. (Cycles do exist in import graphs,
+            // but the renderer's job is reviewer clarity, not topology.)
+            if (importer === target)
+                continue;
             const set = importers.get(target) ?? new Set();
             set.add(importer);
             importers.set(target, set);
@@ -45,6 +50,10 @@ export function buildImpactTree(impact, opts = {}) {
     for (const target of impact.normalizedTargets) {
         const set = importers.get(target) ?? new Set();
         for (const dep of impact.directDependents) {
+            // Skip self — a target appearing in its own directDependents list
+            // is a graph artifact, not a real edge to render.
+            if (dep === target)
+                continue;
             // Heuristic: every direct dependent is a candidate importer of every
             // target (the real graph is captured in dependencyPathExamples).
             // We only add direct dependents if they don't already appear as

package/dist/index.d.ts

@@ -23,6 +23,7 @@ export * from './plan-review.js';
 export * from './onboarding.js';
 export * from './onboarding-report.js';
 export * from './onboarding-drafts.js';
+export * from './onboarding-drafts-merge.js';
 export * from './onboarding-diff.js';
 export * from './onboarding-adoption.js';
 export * from './adoption-state.js';

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -23,6 +23,7 @@ export * from "./plan-review.js";
 export * from "./onboarding.js";
 export * from "./onboarding-report.js";
 export * from "./onboarding-drafts.js";
+export * from "./onboarding-drafts-merge.js";
 export * from "./onboarding-diff.js";
 export * from "./onboarding-adoption.js";
 export * from "./adoption-state.js";

package/dist/ingest-drafts.js

@@ -341,8 +341,7 @@ function renderRulesDraft(model) {
   })`);
     }
     return `${header('Rules inferred from repository ingestion.')}
-// Local helper — keep this file self-contained (no @shrkcrft/* imports).
-function defineRule<T>(rule: T): T { return rule; }
+import { defineRule } from '@shrkcrft/rules';
 
 export const ingestedRules = [
 ${entries.join(',\n')}
@@ -359,8 +358,7 @@ function renderPathsDraft(model) {
     patterns: ${JSON.stringify(p.patterns)},
   })`);
     return `${header('Path conventions inferred from repository ingestion.')}
-// Local helper — keep this file self-contained (no @shrkcrft/* imports).
-function definePath<T>(path: T): T { return path; }
+import { definePath } from '@shrkcrft/paths';
 
 export const ingestedPaths = [
 ${entries.join(',\n')}
@@ -380,8 +378,7 @@ function renderBoundariesDraft(model) {
     suggestedFix: ${JSON.stringify(b.suggestedFix)},
   })`);
     return `${header('Dependency-boundary rules inferred from repository ingestion.')}
-// Local helper — keep this file self-contained (no @shrkcrft/* imports).
-function defineBoundary<T>(rule: T): T { return rule; }
+import { defineBoundary } from '@shrkcrft/boundaries';
 
 export const ingestedBoundaries = [
 ${entries.join(',\n')}
@@ -398,8 +395,7 @@ function renderConstructsDraft(model) {
     files: ${JSON.stringify(c.paths)},
   })`);
     return `${header('Constructs inferred from repository ingestion.')}
-// Local helper — keep this file self-contained (no @shrkcrft/* imports).
-function defineConstruct<T>(construct: T): T { return construct; }
+import { defineConstruct } from '@shrkcrft/plugin-api';
 
 export const ingestedConstructs = [
 ${entries.join(',\n')}

package/dist/migration-profile-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migration-profile-registry.d.ts","sourceRoot":"","sources":["../src/migration-profile-registry.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAGvE,eAAO,MAAM,iCAAiC,6CAA6C,CAAC;AAE5F,oBAAY,sBAAsB;IAChC,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,sBAAsB,CAAC;IACxC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;IAChD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAkCD,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,qBAAqB,GAChC,OAAO,CAAC;IACT,OAAO,EAAE,SAAS,sBAAsB,EAAE,CAAC;IAC3C,MAAM,EAAE,SAAS,8BAA8B,EAAE,CAAC;CACnD,CAAC,CAkFD;AAED,wBAAsB,8BAA8B,CAClD,UAAU,EAAE,qBAAqB,GAChC,OAAO,CAAC,SAAS,iBAAiB,EAAE,CAAC,CAGvC"}
+{"version":3,"file":"migration-profile-registry.d.ts","sourceRoot":"","sources":["../src/migration-profile-registry.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAEvE,eAAO,MAAM,iCAAiC,6CAA6C,CAAC;AAE5F,oBAAY,sBAAsB;IAChC,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,sBAAsB,CAAC;IACxC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;IAChD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAkCD,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,qBAAqB,GAChC,OAAO,CAAC;IACT,OAAO,EAAE,SAAS,sBAAsB,EAAE,CAAC;IAC3C,MAAM,EAAE,SAAS,8BAA8B,EAAE,CAAC;CACnD,CAAC,CAkFD;AAED,wBAAsB,8BAA8B,CAClD,UAAU,EAAE,qBAAqB,GAChC,OAAO,CAAC,SAAS,iBAAiB,EAAE,CAAC,CAGvC"}

package/dist/migration-profile-registry.js

@@ -1,10 +1,18 @@
+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;
+};
 /**
  * Migration profile registry. Loads pack-contributed migration profiles
  * via `migrationProfileFiles` on pack manifests. Engine ships zero built-ins.
  */
 import { existsSync } from 'node:fs';
 import * as nodePath from 'node:path';
-import { importModuleViaLoader } from '@shrkcrft/core';
+import { pathToFileURL } from 'node:url';
 export const MIGRATION_PROFILE_REGISTRY_SCHEMA = 'sharkcraft.migration-profile-registry/v1';
 export var MigrationProfileSource;
 (function (MigrationProfileSource) {
@@ -12,7 +20,7 @@ export var MigrationProfileSource;
     MigrationProfileSource["Pack"] = "pack";
 })(MigrationProfileSource || (MigrationProfileSource = {}));
 async function importDefault(file) {
-    const mod = (await importModuleViaLoader(file));
+    const mod = (await import(__rewriteRelativeImportExtension(pathToFileURL(file).href)));
     if (Array.isArray(mod.default))
         return mod.default;
     if (mod.default && typeof mod.default === 'object')

package/dist/onboarding-drafts-merge.d.ts

@@ -0,0 +1,71 @@
+/**
+ * Three-way merge for onboarding drafts.
+ *
+ * When `shrk onboard --write-drafts` re-runs against a project that has
+ * hand-edited drafts, the safe behaviour is to merge the new proposal
+ * against the user's current file and the snapshot we wrote last time:
+ *
+ *   - base    : `.sharkcraft/onboarding-drafts-snapshots/<file>` (what we
+ *               wrote last). When absent, the merge degrades to a strict
+ *               "matches proposal → no-op, otherwise conflict" rule.
+ *   - ours    : the current `sharkcraft/onboarding/<file>` content.
+ *   - theirs  : the freshly rendered proposal we are about to write.
+ *
+ * The merge always returns an intended `body`. The caller decides whether
+ * to write it (e.g. `abortOnConflict` keeps the file unchanged).
+ */
+export declare enum DraftMergeStatus {
+    /** File did not exist; the proposal was written verbatim. */
+    Created = "created",
+    /** Current file already matches the proposal — nothing to do. */
+    Unchanged = "unchanged",
+    /** Current file matches the snapshot; the proposal was applied. */
+    CleanUpdate = "clean-update",
+    /** Proposal matches the snapshot; the user's edits were kept. */
+    UserKept = "user-kept",
+    /** Disjoint single-region edits on both sides; auto-merged. */
+    AutoMerged = "auto-merged",
+    /** Both sides changed the same region — conflict markers emitted. */
+    Conflict = "conflict",
+    /** Both sides changed but `abortOnConflict` was set — file untouched. */
+    Aborted = "aborted"
+}
+export interface IDraftMergeOptions {
+    /** When true, return status=Aborted and leave the file unchanged on conflict. */
+    abortOnConflict?: boolean;
+    /** Header line in the `<<<<<<< ours` marker. Default 'ours'. */
+    oursLabel?: string;
+    /** Header line in the `>>>>>>> theirs` marker. Default 'incoming proposal'. */
+    theirsLabel?: string;
+}
+export interface IDraftMergeResult {
+    status: DraftMergeStatus;
+    /** What should be written. For Aborted, this is the unchanged `ours`. */
+    body: string;
+    /** Number of conflict regions in `body` (0 unless status=Conflict). */
+    conflictRegions: number;
+}
+/**
+ * Resolve the snapshot path for a given draft file.
+ *
+ * @param projectRoot Absolute repo root.
+ * @param draftPath   Absolute path of the draft file.
+ */
+export declare function snapshotPathFor(projectRoot: string, draftPath: string): string;
+export declare function readSnapshot(snapshotPath: string): string | null;
+export declare function writeSnapshot(snapshotPath: string, body: string): void;
+/**
+ * Three-way merge a single draft file.
+ *
+ * Truth table:
+ *   - !exists(ours)           → Created (body = theirs)
+ *   - ours === theirs         → Unchanged
+ *   - base === null:
+ *       - ours === theirs     → Unchanged
+ *       - otherwise           → Conflict (or Aborted)
+ *   - ours === base           → CleanUpdate (body = theirs)
+ *   - theirs === base         → UserKept (body = ours)
+ *   - otherwise               → diff3Lines → AutoMerged | Conflict | Aborted
+ */
+export declare function threeWayMergeDraft(base: string | null, ours: string | null, theirs: string, options?: IDraftMergeOptions): IDraftMergeResult;
+//# sourceMappingURL=onboarding-drafts-merge.d.ts.map

package/dist/onboarding-drafts-merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"onboarding-drafts-merge.d.ts","sourceRoot":"","sources":["../src/onboarding-drafts-merge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,oBAAY,gBAAgB;IAC1B,6DAA6D;IAC7D,OAAO,YAAY;IACnB,iEAAiE;IACjE,SAAS,cAAc;IACvB,mEAAmE;IACnE,WAAW,iBAAiB;IAC5B,iEAAiE;IACjE,QAAQ,cAAc;IACtB,+DAA+D;IAC/D,UAAU,gBAAgB;IAC1B,qEAAqE;IACrE,QAAQ,aAAa;IACrB,yEAAyE;IACzE,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,iFAAiF;IACjF,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gEAAgE;IAChE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,+EAA+E;IAC/E,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,gBAAgB,CAAC;IACzB,yEAAyE;IACzE,IAAI,EAAE,MAAM,CAAC;IACb,uEAAuE;IACvE,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAG9E;AAED,wBAAgB,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAOhE;AAED,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAGtE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,kBAAuB,GAC/B,iBAAiB,CAiBnB"}

package/dist/onboarding-drafts-merge.js

@@ -0,0 +1,174 @@
+/**
+ * Three-way merge for onboarding drafts.
+ *
+ * When `shrk onboard --write-drafts` re-runs against a project that has
+ * hand-edited drafts, the safe behaviour is to merge the new proposal
+ * against the user's current file and the snapshot we wrote last time:
+ *
+ *   - base    : `.sharkcraft/onboarding-drafts-snapshots/<file>` (what we
+ *               wrote last). When absent, the merge degrades to a strict
+ *               "matches proposal → no-op, otherwise conflict" rule.
+ *   - ours    : the current `sharkcraft/onboarding/<file>` content.
+ *   - theirs  : the freshly rendered proposal we are about to write.
+ *
+ * The merge always returns an intended `body`. The caller decides whether
+ * to write it (e.g. `abortOnConflict` keeps the file unchanged).
+ */
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import * as nodePath from 'node:path';
+export var DraftMergeStatus;
+(function (DraftMergeStatus) {
+    /** File did not exist; the proposal was written verbatim. */
+    DraftMergeStatus["Created"] = "created";
+    /** Current file already matches the proposal — nothing to do. */
+    DraftMergeStatus["Unchanged"] = "unchanged";
+    /** Current file matches the snapshot; the proposal was applied. */
+    DraftMergeStatus["CleanUpdate"] = "clean-update";
+    /** Proposal matches the snapshot; the user's edits were kept. */
+    DraftMergeStatus["UserKept"] = "user-kept";
+    /** Disjoint single-region edits on both sides; auto-merged. */
+    DraftMergeStatus["AutoMerged"] = "auto-merged";
+    /** Both sides changed the same region — conflict markers emitted. */
+    DraftMergeStatus["Conflict"] = "conflict";
+    /** Both sides changed but `abortOnConflict` was set — file untouched. */
+    DraftMergeStatus["Aborted"] = "aborted";
+})(DraftMergeStatus || (DraftMergeStatus = {}));
+/**
+ * Resolve the snapshot path for a given draft file.
+ *
+ * @param projectRoot Absolute repo root.
+ * @param draftPath   Absolute path of the draft file.
+ */
+export function snapshotPathFor(projectRoot, draftPath) {
+    const rel = nodePath.relative(nodePath.join(projectRoot, 'sharkcraft', 'onboarding'), draftPath);
+    return nodePath.join(projectRoot, '.sharkcraft', 'onboarding-drafts-snapshots', rel);
+}
+export function readSnapshot(snapshotPath) {
+    if (!existsSync(snapshotPath))
+        return null;
+    try {
+        return readFileSync(snapshotPath, 'utf8');
+    }
+    catch {
+        return null;
+    }
+}
+export function writeSnapshot(snapshotPath, body) {
+    mkdirSync(nodePath.dirname(snapshotPath), { recursive: true });
+    writeFileSync(snapshotPath, body, 'utf8');
+}
+/**
+ * Three-way merge a single draft file.
+ *
+ * Truth table:
+ *   - !exists(ours)           → Created (body = theirs)
+ *   - ours === theirs         → Unchanged
+ *   - base === null:
+ *       - ours === theirs     → Unchanged
+ *       - otherwise           → Conflict (or Aborted)
+ *   - ours === base           → CleanUpdate (body = theirs)
+ *   - theirs === base         → UserKept (body = ours)
+ *   - otherwise               → diff3Lines → AutoMerged | Conflict | Aborted
+ */
+export function threeWayMergeDraft(base, ours, theirs, options = {}) {
+    if (ours === null) {
+        return { status: DraftMergeStatus.Created, body: theirs, conflictRegions: 0 };
+    }
+    if (ours === theirs) {
+        return { status: DraftMergeStatus.Unchanged, body: ours, conflictRegions: 0 };
+    }
+    if (base === null) {
+        return wholeFileConflict(ours, theirs, options);
+    }
+    if (ours === base) {
+        return { status: DraftMergeStatus.CleanUpdate, body: theirs, conflictRegions: 0 };
+    }
+    if (theirs === base) {
+        return { status: DraftMergeStatus.UserKept, body: ours, conflictRegions: 0 };
+    }
+    return diff3Lines(base, ours, theirs, options);
+}
+/**
+ * Coarse-grained line-level three-way merge.
+ *
+ * Strips the common prefix and suffix lines, then inspects the centre:
+ *   - centre(ours) === centre(base)   → take theirs
+ *   - centre(theirs) === centre(base) → take ours
+ *   - centre(ours) === centre(theirs) → take either
+ *   - otherwise                       → emit conflict markers around the centre
+ *
+ * Multiple disjoint edit regions fall through to conflict; that's a
+ * deliberate trade-off — anything subtler than a single contiguous edit
+ * is exactly the case a human should review.
+ */
+function diff3Lines(base, ours, theirs, options) {
+    const baseLines = base.split('\n');
+    const oursLines = ours.split('\n');
+    const theirsLines = theirs.split('\n');
+    let prefix = 0;
+    const maxPrefix = Math.min(baseLines.length, oursLines.length, theirsLines.length);
+    while (prefix < maxPrefix &&
+        baseLines[prefix] === oursLines[prefix] &&
+        baseLines[prefix] === theirsLines[prefix]) {
+        prefix += 1;
+    }
+    let suffix = 0;
+    const maxSuffix = Math.min(baseLines.length, oursLines.length, theirsLines.length) - prefix;
+    while (suffix < maxSuffix &&
+        baseLines[baseLines.length - 1 - suffix] === oursLines[oursLines.length - 1 - suffix] &&
+        baseLines[baseLines.length - 1 - suffix] === theirsLines[theirsLines.length - 1 - suffix]) {
+        suffix += 1;
+    }
+    const baseCentre = baseLines.slice(prefix, baseLines.length - suffix).join('\n');
+    const oursCentre = oursLines.slice(prefix, oursLines.length - suffix).join('\n');
+    const theirsCentre = theirsLines.slice(prefix, theirsLines.length - suffix).join('\n');
+    const headLines = oursLines.slice(0, prefix);
+    const tailLines = oursLines.slice(oursLines.length - suffix);
+    if (oursCentre === baseCentre) {
+        // Only theirs diverged.
+        const merged = [...headLines, ...theirsLines.slice(prefix, theirsLines.length - suffix), ...tailLines].join('\n');
+        return { status: DraftMergeStatus.AutoMerged, body: merged, conflictRegions: 0 };
+    }
+    if (theirsCentre === baseCentre) {
+        // Only ours diverged.
+        return { status: DraftMergeStatus.UserKept, body: ours, conflictRegions: 0 };
+    }
+    if (oursCentre === theirsCentre) {
+        // Both sides made identical changes.
+        const merged = [...headLines, ...oursLines.slice(prefix, oursLines.length - suffix), ...tailLines].join('\n');
+        return { status: DraftMergeStatus.AutoMerged, body: merged, conflictRegions: 0 };
+    }
+    if (options.abortOnConflict) {
+        return { status: DraftMergeStatus.Aborted, body: ours, conflictRegions: 1 };
+    }
+    const oursLabel = options.oursLabel ?? 'ours';
+    const theirsLabel = options.theirsLabel ?? 'incoming proposal';
+    const markerOpen = `<<<<<<< ${oursLabel}`;
+    const markerMid = '=======';
+    const markerClose = `>>>>>>> ${theirsLabel}`;
+    const conflictBlock = [
+        markerOpen,
+        oursCentre,
+        markerMid,
+        theirsCentre,
+        markerClose,
+    ];
+    const body = [...headLines, ...conflictBlock, ...tailLines].join('\n');
+    return { status: DraftMergeStatus.Conflict, body, conflictRegions: 1 };
+}
+function wholeFileConflict(ours, theirs, options) {
+    if (options.abortOnConflict) {
+        return { status: DraftMergeStatus.Aborted, body: ours, conflictRegions: 1 };
+    }
+    const oursLabel = options.oursLabel ?? 'ours';
+    const theirsLabel = options.theirsLabel ?? 'incoming proposal';
+    const body = [
+        `<<<<<<< ${oursLabel}`,
+        ours.replace(/\n$/, ''),
+        '=======',
+        theirs.replace(/\n$/, ''),
+        `>>>>>>> ${theirsLabel}`,
+        '',
+    ].join('\n');
+    return { status: DraftMergeStatus.Conflict, body, conflictRegions: 1 };
+}

package/dist/onboarding-drafts.d.ts

@@ -1,8 +1,13 @@
 import type { IOnboardingPlan } from './onboarding.js';
 import type { IImportedAgentRulesBundle } from './onboarding-agent-import.js';
+import { DraftMergeStatus } from './onboarding-drafts-merge.js';
 export interface IWrittenDraft {
     path: string;
     bytes: number;
+    /** Three-way merge status for this draft. */
+    mergeStatus: DraftMergeStatus;
+    /** Number of conflict regions emitted into `path` (0 unless status=Conflict). */
+    conflictRegions: number;
 }
 export interface IWriteOnboardingDraftsOptions {
     projectRoot: string;
@@ -14,10 +19,19 @@ export interface IWriteOnboardingDraftsOptions {
      * The file is still under the onboarding/ subdir — never written to rules.ts.
      */
     importedAgentRules?: IImportedAgentRulesBundle;
+    /**
+     * When true, conflicts leave the existing file unchanged and report status
+     * via the result. Useful for CI gates.
+     */
+    abortOnConflict?: boolean;
 }
 export interface IWriteOnboardingDraftsResult {
     outDir: string;
     files: IWrittenDraft[];
+    /** Total number of draft files that ended in a Conflict status. */
+    conflicts: number;
+    /** Total number of draft files left untouched because abortOnConflict was set. */
+    aborted: number;
 }
 /**
  * Write onboarding drafts under sharkcraft/onboarding/. This function NEVER

package/dist/onboarding-drafts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onboarding-drafts.d.ts","sourceRoot":"","sources":["../src/onboarding-drafts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAA8B,MAAM,iBAAiB,CAAC;AAEnF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAE9E,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,6BAA6B;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,qFAAqF;IACrF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,yBAAyB,CAAC;CAChD;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,aAAa,EAAE,CAAC;CACxB;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,6BAA6B,GACrC,4BAA4B,CA+B9B"}
+{"version":3,"file":"onboarding-drafts.d.ts","sourceRoot":"","sources":["../src/onboarding-drafts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAA8B,MAAM,iBAAiB,CAAC;AAEnF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EACL,gBAAgB,EAMjB,MAAM,8BAA8B,CAAC;AAEtC,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,6CAA6C;IAC7C,WAAW,EAAE,gBAAgB,CAAC;IAC9B,iFAAiF;IACjF,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,6BAA6B;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,qFAAqF;IACrF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,yBAAyB,CAAC;IAC/C;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,mEAAmE;IACnE,SAAS,EAAE,MAAM,CAAC;IAClB,kFAAkF;IAClF,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,6BAA6B,GACrC,4BAA4B,CA+C9B"}

package/dist/onboarding-drafts.js

@@ -1,6 +1,7 @@
-import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import * as nodePath from 'node:path';
 import { renderOnboardingReport } from "./onboarding-report.js";
+import { DraftMergeStatus, readSnapshot, snapshotPathFor, threeWayMergeDraft, writeSnapshot, } from "./onboarding-drafts-merge.js";
 /**
  * Write onboarding drafts under sharkcraft/onboarding/. This function NEVER
  * writes outside that subdirectory (the caller can override the location, but
@@ -11,14 +12,24 @@ export function writeOnboardingDrafts(plan, options) {
         nodePath.join(options.projectRoot, 'sharkcraft', 'onboarding'));
     ensureDir(outDir);
     const files = [];
-    const write = (name, body) => {
+    const write = (name, proposal) => {
         const full = nodePath.join(outDir, name);
         // Belt-and-braces: refuse anything that escapes outDir.
         if (!full.startsWith(outDir + nodePath.sep)) {
             throw new Error(`draft path escapes outDir: ${name}`);
         }
-        writeFileSync(full, body, 'utf8');
-        files.push({ path: full, bytes: Buffer.byteLength(body, 'utf8') });
+        const merge = mergeDraft(options.projectRoot, full, proposal, options);
+        if (merge.status !== DraftMergeStatus.Aborted) {
+            writeFileSync(full, merge.body, 'utf8');
+            // Snapshot what we just wrote so the next run has a fresh `base`.
+            writeSnapshot(snapshotPathFor(options.projectRoot, full), merge.body);
+        }
+        files.push({
+            path: full,
+            bytes: Buffer.byteLength(merge.body, 'utf8'),
+            mergeStatus: merge.status,
+            conflictRegions: merge.conflictRegions,
+        });
     };
     write('onboarding-report.md', renderOnboardingReport(plan));
     write('inferred-rules.draft.ts', renderInferredRulesDraft(plan));
@@ -29,7 +40,30 @@ export function writeOnboardingDrafts(plan, options) {
     if (options.importedAgentRules && options.importedAgentRules.entries.length > 0) {
         write('imported-agent-rules.draft.ts', renderImportedAgentRulesDraft(options.importedAgentRules));
     }
-    return { outDir, files };
+    let conflicts = 0;
+    let aborted = 0;
+    for (const f of files) {
+        if (f.mergeStatus === DraftMergeStatus.Conflict)
+            conflicts += 1;
+        else if (f.mergeStatus === DraftMergeStatus.Aborted)
+            aborted += 1;
+    }
+    return { outDir, files, conflicts, aborted };
+}
+function mergeDraft(projectRoot, draftPath, proposal, options) {
+    const ours = existsSync(draftPath) ? safeRead(draftPath) : null;
+    const base = readSnapshot(snapshotPathFor(projectRoot, draftPath));
+    return threeWayMergeDraft(base, ours, proposal, {
+        abortOnConflict: options.abortOnConflict ?? false,
+    });
+}
+function safeRead(path) {
+    try {
+        return readFileSync(path, 'utf8');
+    }
+    catch {
+        return null;
+    }
 }
 // ─── Renderers ───────────────────────────────────────────────────────────────
 function renderInferredRulesDraft(plan) {

package/dist/ownership.js

@@ -1,6 +1,14 @@
+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, readFileSync } from 'node:fs';
 import * as nodePath from 'node:path';
-import { importModuleViaLoader } from '@shrkcrft/core';
+import { pathToFileURL } from 'node:url';
 export const OWNERSHIP_SCHEMA = 'sharkcraft.ownership-rule/v1';
 const DEFAULT_PATHS = ['sharkcraft/ownership.ts', 'CODEOWNERS', '.github/CODEOWNERS'];
 export async function loadOwnershipRules(cwd, configured) {
@@ -16,7 +24,7 @@ export async function loadOwnershipRules(cwd, configured) {
         if (full.endsWith('.ts') || full.endsWith('.js') || full.endsWith('.mjs') || full.endsWith('.cjs')) {
             try {
                 // pathToFileURL mirrors the resolver pattern in TypeScriptKnowledgeLoader.
-                const mod = (await importModuleViaLoader(full));
+                const mod = (await import(__rewriteRelativeImportExtension(pathToFileURL(full).href)));
                 const list = mod.default ?? mod.ownershipRules ?? [];
                 for (const r of list)
                     rules.push(normalize(r));

package/dist/pack-helper-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pack-helper-registry.d.ts","sourceRoot":"","sources":["../src/pack-helper-registry.ts"],"names":[],"mappings":"AAOA,OAAO,EAAsB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC5E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAGvE,eAAO,MAAM,2BAA2B,uCAAuC,CAAC;AAEhF,oBAAY,gBAAgB;IAC1B,KAAK,UAAU;IACf,IAAI,SAAS;IACb,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;IAChD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AA4BD,wBAAsB,eAAe,CACnC,UAAU,EAAE,qBAAqB,GAChC,OAAO,CAAC;IAAE,OAAO,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAAC,MAAM,EAAE,SAAS,sBAAsB,EAAE,CAAA;CAAE,CAAC,CAoF9F;AAED,wBAAsB,eAAe,CACnC,UAAU,EAAE,qBAAqB,GAChC,OAAO,CAAC,SAAS,gBAAgB,EAAE,CAAC,CAGtC;AAED,wBAAsB,cAAc,CAClC,UAAU,EAAE,qBAAqB,EACjC,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAGlC;AAED,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,qBAAqB,GAChC,OAAO,CAAC,SAAS,sBAAsB,EAAE,CAAC,CAG5C"}
+{"version":3,"file":"pack-helper-registry.d.ts","sourceRoot":"","sources":["../src/pack-helper-registry.ts"],"names":[],"mappings":"AAQA,OAAO,EAAsB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC5E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAEvE,eAAO,MAAM,2BAA2B,uCAAuC,CAAC;AAEhF,oBAAY,gBAAgB;IAC1B,KAAK,UAAU;IACf,IAAI,SAAS;IACb,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;IAChD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AA4BD,wBAAsB,eAAe,CACnC,UAAU,EAAE,qBAAqB,GAChC,OAAO,CAAC;IAAE,OAAO,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAAC,MAAM,EAAE,SAAS,sBAAsB,EAAE,CAAA;CAAE,CAAC,CAoF9F;AAED,wBAAsB,eAAe,CACnC,UAAU,EAAE,qBAAqB,GAChC,OAAO,CAAC,SAAS,gBAAgB,EAAE,CAAC,CAGtC;AAED,wBAAsB,cAAc,CAClC,UAAU,EAAE,qBAAqB,EACjC,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAGlC;AAED,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,qBAAqB,GAChC,OAAO,CAAC,SAAS,sBAAsB,EAAE,CAAC,CAG5C"}

package/dist/pack-helper-registry.js

@@ -1,3 +1,11 @@
+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;
+};
 /**
  * Pack helper registry. Loads pack-contributed and locally-configured
  * helpers via `helperFiles[]`. Engine still ships its profile-driven generic
@@ -5,8 +13,8 @@
  */
 import { existsSync } from 'node:fs';
 import * as nodePath from 'node:path';
+import { pathToFileURL } from 'node:url';
 import { validatePackHelper } from '@shrkcrft/plugin-api';
-import { importModuleViaLoader } from '@shrkcrft/core';
 export const PACK_HELPER_REGISTRY_SCHEMA = 'sharkcraft.pack-helper-registry/v1';
 export var PackHelperSource;
 (function (PackHelperSource) {
@@ -15,7 +23,7 @@ export var PackHelperSource;
     PackHelperSource["Fixture"] = "fixture";
 })(PackHelperSource || (PackHelperSource = {}));
 async function importDefault(file) {
-    const mod = (await importModuleViaLoader(file));
+    const mod = (await import(__rewriteRelativeImportExtension(pathToFileURL(file).href)));
     if (Array.isArray(mod.default))
         return mod.default;
     if (mod.default && typeof mod.default === 'object')