@unbrained/pm-cli 2026.7.1 → 2026.7.3

package/dist/cli-bundle/chunks/{history-repair-XA3LC4GA.js → history-repair-4WVBVHFR.js}

@@ -1,32 +1,32 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="3696f386-1731-5e09-adb5-74cebd450c27")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="76ee21ea-f1e5-5df7-adcb-385fcf85af39")}catch(e){}}();
 import {
   scanHistoryDrift
-} from "./chunk-OTUHB4HS.js";
+} from "./chunk-BE2SR6QL.js";
 import {
   executeHistoryRewrite,
   resolveHistorySubject
-} from "./chunk-RLDHZHQS.js";
+} from "./chunk-LBE5QFMZ.js";
 import "./chunk-T5RRNDA7.js";
 import {
   readHistoryEntries
-} from "./chunk-OGXLACHC.js";
+} from "./chunk-SU2E4AWU.js";
 import {
   historyEntriesToRaw,
   reanchorHistoryEntries,
   replayHash,
   toReplayDocument,
   verifyHistoryChain
-} from "./chunk-SLMUGTK3.js";
-import "./chunk-UZIWVBE6.js";
+} from "./chunk-7CLLC75T.js";
+import "./chunk-YSGTMDWC.js";
 import {
   listAllFrontMatterWithBody,
   readLocatedItem
-} from "./chunk-JSU5P7VS.js";
-import "./chunk-QCWF6IYD.js";
+} from "./chunk-4WB6S4YX.js";
+import "./chunk-YSDFIY7N.js";
 import {
   nowIso
-} from "./chunk-AXIDKKAT.js";
+} from "./chunk-CXR3CMBQ.js";
 import {
   EXIT_CODE,
   PmCliError,
@@ -39,7 +39,7 @@ import {
   resolvePmRoot,
   runActiveOnWriteHooks,
   writeFileAtomic
-} from "./chunk-7R4QEMZZ.js";
+} from "./chunk-L4SLHV6G.js";
 
 // dist/cli/commands/history-repair.js
 import fs from "node:fs/promises";
@@ -49,6 +49,92 @@ function toAuthor(candidate, defaultAuthor) {
   const trimmed = resolved.trim();
   return trimmed.length > 0 ? trimmed : "unknown";
 }
+async function loadHistoryRepairItemReplay(subject, settings, historyEntries) {
+  const currentItemPath = subject.located?.itemPath ?? null;
+  const loadedItem = subject.located ? await readLocatedItem(subject.located, { schema: settings.schema }) : null;
+  if (!loadedItem) {
+    return {
+      currentItemReplay: null,
+      currentItemPath,
+      matchedChainBefore: null,
+      currentItemRawBeforeLock: null,
+      loadedItem: null
+    };
+  }
+  const currentItemReplay = toReplayDocument(loadedItem.document);
+  const lastOriginalAfterHash = historyEntries[historyEntries.length - 1]?.after_hash;
+  return {
+    currentItemReplay,
+    currentItemPath,
+    matchedChainBefore: replayHash(currentItemReplay) === lastOriginalAfterHash,
+    currentItemRawBeforeLock: loadedItem.raw,
+    loadedItem
+  };
+}
+function buildHistoryRepairMessage(params) {
+  if (typeof params.message === "string" && params.message.trim().length > 0) {
+    return params.message;
+  }
+  return `history-repair re-anchored ${params.entriesRehashed} entr${params.entriesRehashed === 1 ? "y" : "ies"}${params.entriesPatchRepaired > 0 ? `, repaired ${params.entriesPatchRepaired} patch(es)` : ""}${params.reconcileNeeded ? ", reconciled chain with on-disk item" : ""}.`;
+}
+function buildHistoryRepairEntries(params) {
+  const rewrittenEntries = [...params.reanchorEntries];
+  if (!params.changed) {
+    return { rewrittenEntries, auditEntryAdded: false };
+  }
+  const afterReplay = params.reconcileNeeded && params.currentItemReplay ? params.currentItemReplay : params.finalReplay;
+  rewrittenEntries.push({
+    ts: nowIso(),
+    author: params.author,
+    op: "history_repair",
+    patch: params.reconcileNeeded && params.currentItemReplay ? jsonPatch.compare(params.finalReplay, params.currentItemReplay) : [],
+    before_hash: replayHash(params.finalReplay),
+    after_hash: replayHash(afterReplay),
+    message: params.message
+  });
+  return { rewrittenEntries, auditEntryAdded: true };
+}
+function collectHistoryRepairWarnings(changed, skippedOps) {
+  const warnings = [];
+  if (!changed) {
+    warnings.push("history_repair_no_changes");
+  }
+  if (skippedOps > 0) {
+    warnings.push(`history_repair_skipped_unresolvable_ops:${skippedOps}`);
+  }
+  return warnings;
+}
+async function applyHistoryRepairRewrite(params) {
+  return executeHistoryRewrite({
+    pmRoot: params.pmRoot,
+    subject: params.subject,
+    settings: params.settings,
+    typeRegistry: params.typeRegistry,
+    historyRawBeforeLock: params.historyRawBeforeLock,
+    currentItemRawBeforeLock: params.currentItemRawBeforeLock,
+    operation: "history-repair",
+    author: params.author,
+    force: params.force,
+    itemDocument: params.loadedItem?.document ?? null,
+    applyRewrite: async ({ historyRawUnderLock }) => {
+      try {
+        await writeFileAtomic(params.historyPath, historyEntriesToRaw(params.rewrittenEntries));
+      } catch (error) {
+        if (historyRawUnderLock === null) {
+          await fs.rm(params.historyPath, { force: true });
+        } else {
+          await writeFileAtomic(params.historyPath, historyRawUnderLock);
+        }
+        throw error;
+      }
+    },
+    applyPostRewrite: async () => runActiveOnWriteHooks({
+      path: params.historyPath,
+      scope: "project",
+      op: "history_repair:history"
+    })
+  });
+}
 async function runHistoryRepair(id, options, global) {
   const pmRoot = resolvePmRoot(process.cwd(), global.path);
   if (!await pathExists(getSettingsPath(pmRoot))) {
@@ -67,91 +153,45 @@ async function runHistoryRepair(id, options, global) {
   }
   const chainBefore = verifyHistoryChain(historyEntries);
   const reanchor = reanchorHistoryEntries(historyEntries);
-  let currentItemReplay = null;
-  const currentItemPath = subject.located?.itemPath ?? null;
-  let matchedChainBefore = null;
-  const loadedItem = subject.located ? await readLocatedItem(subject.located, { schema: settings.schema }) : null;
-  const currentItemRawBeforeLock = loadedItem?.raw ?? null;
-  if (loadedItem) {
-    currentItemReplay = toReplayDocument(loadedItem.document);
-    const lastOriginalAfterHash = historyEntries[historyEntries.length - 1]?.after_hash;
-    matchedChainBefore = replayHash(currentItemReplay) === lastOriginalAfterHash;
-  }
+  const itemReplayContext = await loadHistoryRepairItemReplay(subject, settings, historyEntries);
   const finalReplay = reanchor.finalDocument;
-  const reconcileNeeded = currentItemReplay !== null && replayHash(finalReplay) !== replayHash(currentItemReplay);
+  const reconcileNeeded = itemReplayContext.currentItemReplay !== null && replayHash(finalReplay) !== replayHash(itemReplayContext.currentItemReplay);
   const changed = reanchor.entriesRehashed > 0 || reanchor.entriesPatchRepaired > 0 || reconcileNeeded;
   const author = toAuthor(options.author, settings.author_default);
   const dryRun = Boolean(options.dryRun);
-  const repairMessage = (
-    /* c8 ignore next -- generated repair summaries include optional clauses based on rare drift shapes. */
-    typeof options.message === "string" && options.message.trim().length > 0 ? options.message : `history-repair re-anchored ${reanchor.entriesRehashed} entr${reanchor.entriesRehashed === 1 ? "y" : "ies"}${reanchor.entriesPatchRepaired > 0 ? `, repaired ${reanchor.entriesPatchRepaired} patch(es)` : ""}${reconcileNeeded ? ", reconciled chain with on-disk item" : ""}.`
-  );
-  const rewrittenEntries = [...reanchor.entries];
-  let auditEntryAdded = false;
-  if (changed) {
-    if (reconcileNeeded && currentItemReplay) {
-      rewrittenEntries.push({
-        ts: nowIso(),
-        author,
-        op: "history_repair",
-        patch: jsonPatch.compare(finalReplay, currentItemReplay),
-        before_hash: replayHash(finalReplay),
-        after_hash: replayHash(currentItemReplay),
-        message: repairMessage
-      });
-    } else {
-      rewrittenEntries.push({
-        ts: nowIso(),
-        author,
-        op: "history_repair",
-        patch: [],
-        before_hash: replayHash(finalReplay),
-        after_hash: replayHash(finalReplay),
-        message: repairMessage
-      });
-    }
-    auditEntryAdded = true;
-  }
+  const repairMessage = buildHistoryRepairMessage({
+    message: options.message,
+    entriesRehashed: reanchor.entriesRehashed,
+    entriesPatchRepaired: reanchor.entriesPatchRepaired,
+    reconcileNeeded
+  });
+  const { rewrittenEntries, auditEntryAdded } = buildHistoryRepairEntries({
+    reanchorEntries: reanchor.entries,
+    changed,
+    reconcileNeeded,
+    currentItemReplay: itemReplayContext.currentItemReplay,
+    finalReplay,
+    author,
+    message: repairMessage
+  });
   const historyVerify = verifyHistoryChain(rewrittenEntries);
   if (!historyVerify.ok) {
     throw new PmCliError(`history-repair produced an invalid rewritten chain (${historyVerify.errors.join(", ")}).`, EXIT_CODE.GENERIC_FAILURE);
   }
-  const warnings = [];
-  if (!changed) {
-    warnings.push("history_repair_no_changes");
-  }
-  if (reanchor.skippedOps > 0) {
-    warnings.push(`history_repair_skipped_unresolvable_ops:${reanchor.skippedOps}`);
-  }
+  const warnings = collectHistoryRepairWarnings(changed, reanchor.skippedOps);
   if (changed && !dryRun) {
-    warnings.push(...await executeHistoryRewrite({
+    warnings.push(...await applyHistoryRepairRewrite({
       pmRoot,
       subject,
       settings,
       typeRegistry,
       historyRawBeforeLock,
-      currentItemRawBeforeLock,
-      operation: "history-repair",
+      currentItemRawBeforeLock: itemReplayContext.currentItemRawBeforeLock,
       author,
       force: options.force,
-      itemDocument: loadedItem?.document ?? null,
-      applyRewrite: async ({ historyRawUnderLock }) => {
-        try {
-          await writeFileAtomic(subject.historyPath, historyEntriesToRaw(rewrittenEntries));
-        } catch (error) {
-          if (historyRawUnderLock === null) {
-            await fs.rm(subject.historyPath, { force: true });
-          } else {
-            await writeFileAtomic(subject.historyPath, historyRawUnderLock);
-          }
-          throw error;
-        }
-      },
-      applyPostRewrite: async () => runActiveOnWriteHooks({
-        path: subject.historyPath,
-        scope: "project",
-        op: "history_repair:history"
-      })
+      loadedItem: itemReplayContext.loadedItem,
+      historyPath: subject.historyPath,
+      rewrittenEntries
     }));
   }
   return {
@@ -172,9 +212,9 @@ async function runHistoryRepair(id, options, global) {
       verify_errors: historyVerify.errors
     },
     item: {
-      exists: currentItemPath !== null,
-      path: currentItemPath,
-      matched_chain_before: matchedChainBefore
+      exists: itemReplayContext.currentItemPath !== null,
+      path: itemReplayContext.currentItemPath,
+      matched_chain_before: itemReplayContext.matchedChainBefore
     },
     warnings: [...new Set(warnings)].sort((left, right) => left.localeCompare(right)),
     generated_at: nowIso()
@@ -238,6 +278,6 @@ export {
   runHistoryRepair,
   runHistoryRepairAll
 };
-//# sourceMappingURL=history-repair-XA3LC4GA.js.map
+//# sourceMappingURL=history-repair-4WVBVHFR.js.map
 
-//# debugId=3696f386-1731-5e09-adb5-74cebd450c27
+//# debugId=76ee21ea-f1e5-5df7-adcb-385fcf85af39

package/dist/cli-bundle/chunks/history-repair-4WVBVHFR.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../../cli/commands/history-repair.ts"],"sourcesContent":["/**\n * @module cli/commands/history-repair\n *\n * Implements the pm history repair command surface and its agent-facing runtime behavior.\n */\nimport fs from \"node:fs/promises\";\nimport jsonPatch from \"fast-json-patch\";\nimport { pathExists, readFileIfExists, writeFileAtomic } from \"../../core/fs/fs-utils.js\";\nimport { executeHistoryRewrite } from \"../../core/history/history-rewrite.js\";\nimport {\n  historyEntriesToRaw,\n  reanchorHistoryEntries,\n  replayHash,\n  toReplayDocument,\n  verifyHistoryChain,\n  type ReplayDocument,\n} from \"../../core/history/replay.js\";\nimport { scanHistoryDrift } from \"../../core/history/drift-scan.js\";\nimport { resolveItemTypeRegistry } from \"../../core/item/type-registry.js\";\nimport { EXIT_CODE } from \"../../core/shared/constants.js\";\nimport type { GlobalOptions } from \"../../core/shared/command-types.js\";\nimport { PmCliError } from \"../../core/shared/errors.js\";\nimport { nowIso } from \"../../core/shared/time.js\";\nimport { getActiveExtensionRegistrations, runActiveOnWriteHooks } from \"../../core/extensions/index.js\";\nimport { listAllFrontMatterWithBody, readLocatedItem } from \"../../core/store/item-store.js\";\nimport { getSettingsPath, resolvePmRoot } from \"../../core/store/paths.js\";\nimport { readSettings } from \"../../core/store/settings.js\";\nimport type { HistoryEntry, HistoryPatchOp, ItemMetadata } from \"../../types/index.js\";\nimport { readHistoryEntries } from \"./history.js\";\nimport { resolveHistorySubject } from \"./history-redact.js\";\n\n/**\n * Documents the history repair command options payload exchanged by command, SDK, and package integrations.\n */\nexport interface HistoryRepairCommandOptions {\n  dryRun?: boolean;\n  author?: string;\n  message?: string;\n  force?: boolean;\n}\n\n/**\n * Documents the history repair result payload exchanged by command, SDK, and package integrations.\n */\nexport interface HistoryRepairResult {\n  id: string;\n  dry_run: boolean;\n  changed: boolean;\n  history: {\n    path: string;\n    entries_scanned: number;\n    chain_drift_before: boolean;\n    entries_rehashed: number;\n    entries_patch_repaired: number;\n    converted_replace_to_add: number;\n    skipped_ops: number;\n    reconciled_with_item: boolean;\n    audit_entry_added: boolean;\n    verify_ok: boolean;\n    verify_errors: string[];\n  };\n  item: {\n    exists: boolean;\n    path: string | null;\n    matched_chain_before: boolean | null;\n  };\n  warnings: string[];\n  generated_at: string;\n}\n\ninterface HistoryRepairItemReplayContext {\n  currentItemReplay: ReplayDocument | null;\n  currentItemPath: string | null;\n  matchedChainBefore: boolean | null;\n  currentItemRawBeforeLock: string | null;\n  loadedItem: Awaited<ReturnType<typeof readLocatedItem>> | null;\n}\n\nfunction toAuthor(candidate: string | undefined, defaultAuthor: string): string {\n  /* c8 ignore next -- PM_AUTHOR fallback branch is environment-dependent in CI. */\n  const resolved = candidate ?? process.env.PM_AUTHOR ?? defaultAuthor;\n  const trimmed = resolved.trim();\n  return trimmed.length > 0 ? trimmed : \"unknown\";\n}\n\nasync function loadHistoryRepairItemReplay(\n  subject: Awaited<ReturnType<typeof resolveHistorySubject>>,\n  settings: Awaited<ReturnType<typeof readSettings>>,\n  historyEntries: HistoryEntry[],\n): Promise<HistoryRepairItemReplayContext> {\n  const currentItemPath = subject.located?.itemPath ?? null;\n  const loadedItem = subject.located ? await readLocatedItem(subject.located, { schema: settings.schema }) : null;\n  if (!loadedItem) {\n    return {\n      currentItemReplay: null,\n      currentItemPath,\n      matchedChainBefore: null,\n      currentItemRawBeforeLock: null,\n      loadedItem: null,\n    };\n  }\n  const currentItemReplay = toReplayDocument(loadedItem.document);\n  const lastOriginalAfterHash = historyEntries[historyEntries.length - 1]?.after_hash;\n  return {\n    currentItemReplay,\n    currentItemPath,\n    matchedChainBefore: replayHash(currentItemReplay) === lastOriginalAfterHash,\n    currentItemRawBeforeLock: loadedItem.raw,\n    loadedItem,\n  };\n}\n\nfunction buildHistoryRepairMessage(params: {\n  message: string | undefined;\n  entriesRehashed: number;\n  entriesPatchRepaired: number;\n  reconcileNeeded: boolean;\n}): string {\n  if (typeof params.message === \"string\" && params.message.trim().length > 0) {\n    return params.message;\n  }\n  /* v8 ignore start -- message suffix/plural variants are deterministic formatting fallbacks around the covered repair outcomes */\n  return `history-repair re-anchored ${params.entriesRehashed} entr${\n    params.entriesRehashed === 1 ? \"y\" : \"ies\"\n  }${params.entriesPatchRepaired > 0 ? `, repaired ${params.entriesPatchRepaired} patch(es)` : \"\"}${\n    params.reconcileNeeded ? \", reconciled chain with on-disk item\" : \"\"\n  }.`;\n  /* v8 ignore stop */\n}\n\nfunction buildHistoryRepairEntries(params: {\n  reanchorEntries: HistoryEntry[];\n  changed: boolean;\n  reconcileNeeded: boolean;\n  currentItemReplay: ReplayDocument | null;\n  finalReplay: ReplayDocument;\n  author: string;\n  message: string;\n}): { rewrittenEntries: HistoryEntry[]; auditEntryAdded: boolean } {\n  const rewrittenEntries: HistoryEntry[] = [...params.reanchorEntries];\n  if (!params.changed) {\n    return { rewrittenEntries, auditEntryAdded: false };\n  }\n  const afterReplay = params.reconcileNeeded && params.currentItemReplay ? params.currentItemReplay : params.finalReplay;\n  rewrittenEntries.push({\n    ts: nowIso(),\n    author: params.author,\n    op: \"history_repair\",\n    patch: params.reconcileNeeded && params.currentItemReplay\n      ? (jsonPatch.compare(params.finalReplay, params.currentItemReplay) as HistoryPatchOp[])\n      : [],\n    before_hash: replayHash(params.finalReplay),\n    after_hash: replayHash(afterReplay),\n    message: params.message,\n  });\n  return { rewrittenEntries, auditEntryAdded: true };\n}\n\nfunction collectHistoryRepairWarnings(changed: boolean, skippedOps: number): string[] {\n  const warnings: string[] = [];\n  if (!changed) {\n    warnings.push(\"history_repair_no_changes\");\n  }\n  if (skippedOps > 0) {\n    warnings.push(`history_repair_skipped_unresolvable_ops:${skippedOps}`);\n  }\n  return warnings;\n}\n\nasync function applyHistoryRepairRewrite(params: {\n  pmRoot: string;\n  subject: Awaited<ReturnType<typeof resolveHistorySubject>>;\n  settings: Awaited<ReturnType<typeof readSettings>>;\n  typeRegistry: ReturnType<typeof resolveItemTypeRegistry>;\n  historyRawBeforeLock: string | null;\n  currentItemRawBeforeLock: string | null;\n  author: string;\n  force: boolean | undefined;\n  loadedItem: Awaited<ReturnType<typeof readLocatedItem>> | null;\n  historyPath: string;\n  rewrittenEntries: HistoryEntry[];\n}): Promise<string[]> {\n  return executeHistoryRewrite({\n    pmRoot: params.pmRoot,\n    subject: params.subject,\n    settings: params.settings,\n    typeRegistry: params.typeRegistry,\n    historyRawBeforeLock: params.historyRawBeforeLock,\n    currentItemRawBeforeLock: params.currentItemRawBeforeLock,\n    operation: \"history-repair\",\n    author: params.author,\n    force: params.force,\n    itemDocument: params.loadedItem?.document ?? null,\n    applyRewrite: async ({ historyRawUnderLock }) => {\n      try {\n        await writeFileAtomic(params.historyPath, historyEntriesToRaw(params.rewrittenEntries));\n      } catch (error) {\n        if (historyRawUnderLock === null) {\n          await fs.rm(params.historyPath, { force: true });\n        } else {\n          await writeFileAtomic(params.historyPath, historyRawUnderLock);\n        }\n        throw error;\n      }\n    },\n    applyPostRewrite: async () =>\n      runActiveOnWriteHooks({\n        path: params.historyPath,\n        scope: \"project\",\n        op: \"history_repair:history\",\n      }),\n  });\n}\n\n/**\n * Implements run history repair for the public runtime surface of this module.\n */\nexport async function runHistoryRepair(\n  id: string,\n  options: HistoryRepairCommandOptions,\n  global: GlobalOptions,\n): Promise<HistoryRepairResult> {\n  const pmRoot = resolvePmRoot(process.cwd(), global.path);\n  if (!(await pathExists(getSettingsPath(pmRoot)))) {\n    throw new PmCliError(`Tracker is not initialized at ${pmRoot}. Run pm init first.`, EXIT_CODE.NOT_FOUND);\n  }\n\n  const settings = await readSettings(pmRoot);\n  const typeRegistry = resolveItemTypeRegistry(settings, getActiveExtensionRegistrations());\n  const subject = await resolveHistorySubject(pmRoot, id, settings, typeRegistry.type_to_folder);\n\n  if (!(await pathExists(subject.historyPath))) {\n    throw new PmCliError(`No history stream exists for ${subject.id}.`, EXIT_CODE.NOT_FOUND);\n  }\n  const historyRawBeforeLock = await readFileIfExists(subject.historyPath);\n  const historyEntries = await readHistoryEntries(subject.historyPath, subject.id);\n  if (historyEntries.length === 0) {\n    throw new PmCliError(`No history entries exist for ${subject.id}; nothing to repair.`, EXIT_CODE.USAGE);\n  }\n\n  const chainBefore = verifyHistoryChain(historyEntries);\n  const reanchor = reanchorHistoryEntries(historyEntries);\n\n  const itemReplayContext = await loadHistoryRepairItemReplay(subject, settings, historyEntries);\n\n  const finalReplay = reanchor.finalDocument;\n  const reconcileNeeded =\n    itemReplayContext.currentItemReplay !== null && replayHash(finalReplay) !== replayHash(itemReplayContext.currentItemReplay);\n\n  const changed = reanchor.entriesRehashed > 0 || reanchor.entriesPatchRepaired > 0 || reconcileNeeded;\n  const author = toAuthor(options.author, settings.author_default);\n  const dryRun = Boolean(options.dryRun);\n\n  const repairMessage = buildHistoryRepairMessage({\n    message: options.message,\n    entriesRehashed: reanchor.entriesRehashed,\n    entriesPatchRepaired: reanchor.entriesPatchRepaired,\n    reconcileNeeded,\n  });\n  const { rewrittenEntries, auditEntryAdded } = buildHistoryRepairEntries({\n    reanchorEntries: reanchor.entries,\n    changed,\n    reconcileNeeded,\n    currentItemReplay: itemReplayContext.currentItemReplay,\n    finalReplay,\n    author,\n    message: repairMessage,\n  });\n\n  const historyVerify = verifyHistoryChain(rewrittenEntries);\n  if (!historyVerify.ok) {\n    throw new PmCliError(\n      `history-repair produced an invalid rewritten chain (${historyVerify.errors.join(\", \")}).`,\n      EXIT_CODE.GENERIC_FAILURE,\n    );\n  }\n\n  const warnings = collectHistoryRepairWarnings(changed, reanchor.skippedOps);\n\n  if (changed && !dryRun) {\n    warnings.push(\n      ...(await applyHistoryRepairRewrite({\n        pmRoot,\n        subject,\n        settings,\n        typeRegistry,\n        historyRawBeforeLock,\n        currentItemRawBeforeLock: itemReplayContext.currentItemRawBeforeLock,\n        author,\n        force: options.force,\n        loadedItem: itemReplayContext.loadedItem,\n        historyPath: subject.historyPath,\n        rewrittenEntries,\n      })),\n    );\n  }\n\n  return {\n    id: subject.id,\n    dry_run: dryRun,\n    changed,\n    history: {\n      path: subject.historyPath,\n      entries_scanned: historyEntries.length,\n      chain_drift_before: !chainBefore.ok,\n      entries_rehashed: reanchor.entriesRehashed,\n      entries_patch_repaired: reanchor.entriesPatchRepaired,\n      converted_replace_to_add: reanchor.convertedReplaceToAdd,\n      skipped_ops: reanchor.skippedOps,\n      reconciled_with_item: reconcileNeeded,\n      audit_entry_added: auditEntryAdded,\n      verify_ok: historyVerify.ok,\n      verify_errors: historyVerify.errors,\n    },\n    item: {\n      exists: itemReplayContext.currentItemPath !== null,\n      path: itemReplayContext.currentItemPath,\n      matched_chain_before: itemReplayContext.matchedChainBefore,\n    },\n    warnings: [...new Set(warnings)].sort((left, right) => left.localeCompare(right)),\n    generated_at: nowIso(),\n  };\n}\n\n/**\n * Documents the history repair all stream result payload exchanged by command, SDK, and package integrations.\n */\nexport interface HistoryRepairAllStreamResult {\n  id: string;\n  outcome: \"repaired\" | \"skipped_clean\" | \"failed\";\n  entries_rehashed?: number;\n  entries_patch_repaired?: number;\n  reconciled_with_item?: boolean;\n  error?: string;\n}\n\n/**\n * Documents the history repair all result payload exchanged by command, SDK, and package integrations.\n */\nexport interface HistoryRepairAllResult {\n  all: true;\n  dry_run: boolean;\n  scanned_streams: number;\n  drifted_streams: number;\n  /** One compact row per drifted stream (clean streams are summarized by the counts only). */\n  streams: HistoryRepairAllStreamResult[];\n  totals: { repaired: number; skipped_clean: number; failed: number };\n  warnings: string[];\n  generated_at: string;\n}\n\n/**\n * Enforce the `pm history-repair` target contract shared by the CLI and MCP\n * surfaces: exactly one of an item `<id>` or `--all` must be provided.\n */\nexport function assertHistoryRepairTarget(id: string | undefined, all: boolean): void {\n  if (all && id !== undefined) {\n    throw new PmCliError(\n      \"history-repair: <id> and --all are mutually exclusive; pass an item id to repair one stream or --all to repair every drifted stream.\",\n      EXIT_CODE.USAGE,\n    );\n  }\n  if (!all && id === undefined) {\n    throw new PmCliError(\n      \"history-repair: provide an item <id> or pass --all to repair every drifted stream.\",\n      EXIT_CODE.USAGE,\n    );\n  }\n}\n\n/**\n * Bulk drift repair: scan every item's history stream with the same drift scan\n * `pm health` uses, then run the audited single-stream repair (ownership check,\n * lock, no-drift verification, audit marker) for each drifted stream. One\n * failing stream never aborts the rest; failures are collected per row and the\n * caller decides the exit code from `totals.failed`.\n */\nexport async function runHistoryRepairAll(\n  options: HistoryRepairCommandOptions,\n  global: GlobalOptions,\n): Promise<HistoryRepairAllResult> {\n  const pmRoot = resolvePmRoot(process.cwd(), global.path);\n  if (!(await pathExists(getSettingsPath(pmRoot)))) {\n    throw new PmCliError(`Tracker is not initialized at ${pmRoot}. Run pm init first.`, EXIT_CODE.NOT_FOUND);\n  }\n\n  const settings = await readSettings(pmRoot);\n  const typeRegistry = resolveItemTypeRegistry(settings, getActiveExtensionRegistrations());\n  const itemReadWarnings: string[] = [];\n  const items = await listAllFrontMatterWithBody(\n    pmRoot,\n    settings.item_format,\n    typeRegistry.type_to_folder,\n    itemReadWarnings,\n    settings.schema,\n  );\n  const drift = await scanHistoryDrift(pmRoot, items as Array<ItemMetadata & { body: string }>);\n\n  const streams: HistoryRepairAllStreamResult[] = [];\n  const totals = { repaired: 0, skipped_clean: 0, failed: 0 };\n  for (const driftedId of drift.driftedItems) {\n    try {\n      const result = await runHistoryRepair(driftedId, options, global);\n      /* c8 ignore next -- mixed repaired/clean outcomes depend on live drift composition. */\n      const outcome = result.changed ? \"repaired\" : \"skipped_clean\";\n      totals[outcome] += 1;\n      streams.push({\n        id: driftedId,\n        outcome,\n        entries_rehashed: result.history.entries_rehashed,\n        entries_patch_repaired: result.history.entries_patch_repaired,\n        reconciled_with_item: result.history.reconciled_with_item,\n      });\n    } catch (error) {\n      totals.failed += 1;\n      streams.push({\n        id: driftedId,\n        outcome: \"failed\",\n        /* c8 ignore next -- non-Error throws are normalized in defensive fallback. */\n        error: error instanceof Error ? error.message : String(error),\n      });\n    }\n  }\n\n  return {\n    all: true,\n    dry_run: Boolean(options.dryRun),\n    scanned_streams: items.length,\n    drifted_streams: drift.driftedItems.length,\n    streams,\n    totals,\n    warnings: [...new Set(itemReadWarnings)].sort((left, right) => left.localeCompare(right)),\n    generated_at: nowIso(),\n  };\n}\n"],"names":[],"mappings":"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","debugId":"76ee21ea-f1e5-5df7-adcb-385fcf85af39"}

package/dist/cli-bundle/chunks/{history-repair-LCMOS45X.js → history-repair-PGYQJMGD.js}

@@ -1,30 +1,30 @@
 import {
   scanHistoryDrift
-} from "./chunk-KNPEF7QG.js";
+} from "./chunk-LOWVNZBZ.js";
 import {
   executeHistoryRewrite,
   resolveHistorySubject
-} from "./chunk-IZBR4NRW.js";
+} from "./chunk-F6WNBITZ.js";
 import "./chunk-WW4E2DC3.js";
 import {
   readHistoryEntries
-} from "./chunk-64HNBBFQ.js";
+} from "./chunk-Z5F6XZXE.js";
 import {
   historyEntriesToRaw,
   reanchorHistoryEntries,
   replayHash,
   toReplayDocument,
   verifyHistoryChain
-} from "./chunk-G7I7DEZA.js";
-import "./chunk-4DUVCVLZ.js";
+} from "./chunk-T4XBKJ3F.js";
+import "./chunk-4PFVUUYV.js";
 import {
   listAllFrontMatterWithBody,
   readLocatedItem
-} from "./chunk-3K2M5OYU.js";
-import "./chunk-BHO33VBQ.js";
+} from "./chunk-6KRFL33E.js";
+import "./chunk-3W2HJKJX.js";
 import {
   nowIso
-} from "./chunk-WYDHYJPO.js";
+} from "./chunk-AJHYQCBJ.js";
 import {
   EXIT_CODE,
   PmCliError,
@@ -37,7 +37,7 @@ import {
   resolvePmRoot,
   runActiveOnWriteHooks,
   writeFileAtomic
-} from "./chunk-RVUALSJF.js";
+} from "./chunk-KHVGM5CS.js";
 
 // dist/cli/commands/history-repair.js
 import fs from "node:fs/promises";
@@ -45,7 +45,7 @@ import jsonPatch from "fast-json-patch";
 !(function() {
   try {
     var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {}, n = new e.Error().stack;
-    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "2f8c8809-b9f6-5bf1-8308-e6ece1e947b5");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "56565288-b529-5ce0-9fb0-6e5ec50cfb5c");
   } catch (e2) {
   }
 })();
@@ -54,6 +54,92 @@ function toAuthor(candidate, defaultAuthor) {
   const trimmed = resolved.trim();
   return trimmed.length > 0 ? trimmed : "unknown";
 }
+async function loadHistoryRepairItemReplay(subject, settings, historyEntries) {
+  const currentItemPath = subject.located?.itemPath ?? null;
+  const loadedItem = subject.located ? await readLocatedItem(subject.located, { schema: settings.schema }) : null;
+  if (!loadedItem) {
+    return {
+      currentItemReplay: null,
+      currentItemPath,
+      matchedChainBefore: null,
+      currentItemRawBeforeLock: null,
+      loadedItem: null
+    };
+  }
+  const currentItemReplay = toReplayDocument(loadedItem.document);
+  const lastOriginalAfterHash = historyEntries[historyEntries.length - 1]?.after_hash;
+  return {
+    currentItemReplay,
+    currentItemPath,
+    matchedChainBefore: replayHash(currentItemReplay) === lastOriginalAfterHash,
+    currentItemRawBeforeLock: loadedItem.raw,
+    loadedItem
+  };
+}
+function buildHistoryRepairMessage(params) {
+  if (typeof params.message === "string" && params.message.trim().length > 0) {
+    return params.message;
+  }
+  return `history-repair re-anchored ${params.entriesRehashed} entr${params.entriesRehashed === 1 ? "y" : "ies"}${params.entriesPatchRepaired > 0 ? `, repaired ${params.entriesPatchRepaired} patch(es)` : ""}${params.reconcileNeeded ? ", reconciled chain with on-disk item" : ""}.`;
+}
+function buildHistoryRepairEntries(params) {
+  const rewrittenEntries = [...params.reanchorEntries];
+  if (!params.changed) {
+    return { rewrittenEntries, auditEntryAdded: false };
+  }
+  const afterReplay = params.reconcileNeeded && params.currentItemReplay ? params.currentItemReplay : params.finalReplay;
+  rewrittenEntries.push({
+    ts: nowIso(),
+    author: params.author,
+    op: "history_repair",
+    patch: params.reconcileNeeded && params.currentItemReplay ? jsonPatch.compare(params.finalReplay, params.currentItemReplay) : [],
+    before_hash: replayHash(params.finalReplay),
+    after_hash: replayHash(afterReplay),
+    message: params.message
+  });
+  return { rewrittenEntries, auditEntryAdded: true };
+}
+function collectHistoryRepairWarnings(changed, skippedOps) {
+  const warnings = [];
+  if (!changed) {
+    warnings.push("history_repair_no_changes");
+  }
+  if (skippedOps > 0) {
+    warnings.push(`history_repair_skipped_unresolvable_ops:${skippedOps}`);
+  }
+  return warnings;
+}
+async function applyHistoryRepairRewrite(params) {
+  return executeHistoryRewrite({
+    pmRoot: params.pmRoot,
+    subject: params.subject,
+    settings: params.settings,
+    typeRegistry: params.typeRegistry,
+    historyRawBeforeLock: params.historyRawBeforeLock,
+    currentItemRawBeforeLock: params.currentItemRawBeforeLock,
+    operation: "history-repair",
+    author: params.author,
+    force: params.force,
+    itemDocument: params.loadedItem?.document ?? null,
+    applyRewrite: async ({ historyRawUnderLock }) => {
+      try {
+        await writeFileAtomic(params.historyPath, historyEntriesToRaw(params.rewrittenEntries));
+      } catch (error) {
+        if (historyRawUnderLock === null) {
+          await fs.rm(params.historyPath, { force: true });
+        } else {
+          await writeFileAtomic(params.historyPath, historyRawUnderLock);
+        }
+        throw error;
+      }
+    },
+    applyPostRewrite: async () => runActiveOnWriteHooks({
+      path: params.historyPath,
+      scope: "project",
+      op: "history_repair:history"
+    })
+  });
+}
 async function runHistoryRepair(id, options, global2) {
   const pmRoot = resolvePmRoot(process.cwd(), global2.path);
   if (!await pathExists(getSettingsPath(pmRoot))) {
@@ -72,91 +158,45 @@ async function runHistoryRepair(id, options, global2) {
   }
   const chainBefore = verifyHistoryChain(historyEntries);
   const reanchor = reanchorHistoryEntries(historyEntries);
-  let currentItemReplay = null;
-  const currentItemPath = subject.located?.itemPath ?? null;
-  let matchedChainBefore = null;
-  const loadedItem = subject.located ? await readLocatedItem(subject.located, { schema: settings.schema }) : null;
-  const currentItemRawBeforeLock = loadedItem?.raw ?? null;
-  if (loadedItem) {
-    currentItemReplay = toReplayDocument(loadedItem.document);
-    const lastOriginalAfterHash = historyEntries[historyEntries.length - 1]?.after_hash;
-    matchedChainBefore = replayHash(currentItemReplay) === lastOriginalAfterHash;
-  }
+  const itemReplayContext = await loadHistoryRepairItemReplay(subject, settings, historyEntries);
   const finalReplay = reanchor.finalDocument;
-  const reconcileNeeded = currentItemReplay !== null && replayHash(finalReplay) !== replayHash(currentItemReplay);
+  const reconcileNeeded = itemReplayContext.currentItemReplay !== null && replayHash(finalReplay) !== replayHash(itemReplayContext.currentItemReplay);
   const changed = reanchor.entriesRehashed > 0 || reanchor.entriesPatchRepaired > 0 || reconcileNeeded;
   const author = toAuthor(options.author, settings.author_default);
   const dryRun = Boolean(options.dryRun);
-  const repairMessage = (
-    /* c8 ignore next -- generated repair summaries include optional clauses based on rare drift shapes. */
-    typeof options.message === "string" && options.message.trim().length > 0 ? options.message : `history-repair re-anchored ${reanchor.entriesRehashed} entr${reanchor.entriesRehashed === 1 ? "y" : "ies"}${reanchor.entriesPatchRepaired > 0 ? `, repaired ${reanchor.entriesPatchRepaired} patch(es)` : ""}${reconcileNeeded ? ", reconciled chain with on-disk item" : ""}.`
-  );
-  const rewrittenEntries = [...reanchor.entries];
-  let auditEntryAdded = false;
-  if (changed) {
-    if (reconcileNeeded && currentItemReplay) {
-      rewrittenEntries.push({
-        ts: nowIso(),
-        author,
-        op: "history_repair",
-        patch: jsonPatch.compare(finalReplay, currentItemReplay),
-        before_hash: replayHash(finalReplay),
-        after_hash: replayHash(currentItemReplay),
-        message: repairMessage
-      });
-    } else {
-      rewrittenEntries.push({
-        ts: nowIso(),
-        author,
-        op: "history_repair",
-        patch: [],
-        before_hash: replayHash(finalReplay),
-        after_hash: replayHash(finalReplay),
-        message: repairMessage
-      });
-    }
-    auditEntryAdded = true;
-  }
+  const repairMessage = buildHistoryRepairMessage({
+    message: options.message,
+    entriesRehashed: reanchor.entriesRehashed,
+    entriesPatchRepaired: reanchor.entriesPatchRepaired,
+    reconcileNeeded
+  });
+  const { rewrittenEntries, auditEntryAdded } = buildHistoryRepairEntries({
+    reanchorEntries: reanchor.entries,
+    changed,
+    reconcileNeeded,
+    currentItemReplay: itemReplayContext.currentItemReplay,
+    finalReplay,
+    author,
+    message: repairMessage
+  });
   const historyVerify = verifyHistoryChain(rewrittenEntries);
   if (!historyVerify.ok) {
     throw new PmCliError(`history-repair produced an invalid rewritten chain (${historyVerify.errors.join(", ")}).`, EXIT_CODE.GENERIC_FAILURE);
   }
-  const warnings = [];
-  if (!changed) {
-    warnings.push("history_repair_no_changes");
-  }
-  if (reanchor.skippedOps > 0) {
-    warnings.push(`history_repair_skipped_unresolvable_ops:${reanchor.skippedOps}`);
-  }
+  const warnings = collectHistoryRepairWarnings(changed, reanchor.skippedOps);
   if (changed && !dryRun) {
-    warnings.push(...await executeHistoryRewrite({
+    warnings.push(...await applyHistoryRepairRewrite({
       pmRoot,
       subject,
       settings,
       typeRegistry,
       historyRawBeforeLock,
-      currentItemRawBeforeLock,
-      operation: "history-repair",
+      currentItemRawBeforeLock: itemReplayContext.currentItemRawBeforeLock,
       author,
       force: options.force,
-      itemDocument: loadedItem?.document ?? null,
-      applyRewrite: async ({ historyRawUnderLock }) => {
-        try {
-          await writeFileAtomic(subject.historyPath, historyEntriesToRaw(rewrittenEntries));
-        } catch (error) {
-          if (historyRawUnderLock === null) {
-            await fs.rm(subject.historyPath, { force: true });
-          } else {
-            await writeFileAtomic(subject.historyPath, historyRawUnderLock);
-          }
-          throw error;
-        }
-      },
-      applyPostRewrite: async () => runActiveOnWriteHooks({
-        path: subject.historyPath,
-        scope: "project",
-        op: "history_repair:history"
-      })
+      loadedItem: itemReplayContext.loadedItem,
+      historyPath: subject.historyPath,
+      rewrittenEntries
     }));
   }
   return {
@@ -177,9 +217,9 @@ async function runHistoryRepair(id, options, global2) {
       verify_errors: historyVerify.errors
     },
     item: {
-      exists: currentItemPath !== null,
-      path: currentItemPath,
-      matched_chain_before: matchedChainBefore
+      exists: itemReplayContext.currentItemPath !== null,
+      path: itemReplayContext.currentItemPath,
+      matched_chain_before: itemReplayContext.matchedChainBefore
     },
     warnings: [...new Set(warnings)].sort((left, right) => left.localeCompare(right)),
     generated_at: nowIso()
@@ -243,4 +283,4 @@ export {
   runHistoryRepair,
   runHistoryRepairAll
 };
-//# sourceMappingURL=history-repair-LCMOS45X.js.map
+//# sourceMappingURL=history-repair-PGYQJMGD.js.map