@unbrained/pm-cli 2026.9.3 → 2026.9.5

package/dist/sdk/environment/project-runtime-compatibility.js

@@ -5,7 +5,7 @@
  * leaving diagnosis reads available.
  */
 
-!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]="962636b0-ed3b-5ad0-ae0c-904435025986")}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]="f9737b75-b285-5fe9-a9ce-63e7c07626cb")}catch(e){}}();
 import fs from "node:fs";
 import path from "node:path";
 import { EXIT_CODE } from "../../core/shared/constants.js";
@@ -80,6 +80,8 @@ const GLOBAL_VALUE_FLAGS = new Set([
     "--pm-path",
 ]);
 const VERSION_PATTERN = /\b(\d{4})\.(\d{1,2})\.(\d{1,2})(?:-(\d+))?\b/u;
+/** First pm release whose history writer and reader support item-hash epoch 3. */
+export const HISTORY_ITEM_HASH_VERSION_3_INTRODUCED_IN = "2026.8.31";
 /** Return whether an invocation includes one of the exact mutation switches. */
 function hasAnyToken(argv, tokens) {
     return argv.some((token) => tokens.includes(token.split("=", 1)[0]));
@@ -194,6 +196,21 @@ export function comparePmDateVersions(left, right) {
     }
     return 0;
 }
+/** Resolve the item-hash epoch written by a known pm runtime release. */
+export function historyItemHashVersionForRuntime(version) {
+    return comparePmDateVersions(version, HISTORY_ITEM_HASH_VERSION_3_INTRODUCED_IN) !== -1
+        ? 3
+        : 2;
+}
+/** Find the oldest declaration that cannot select a reader for the executing writer epoch. */
+function findIncompatibleHistoryEpochPin(pins, writerItemHashVersion) {
+    if (writerItemHashVersion !== 3)
+        return undefined;
+    return pins
+        .filter((pin) => pin.history_epoch_compatible === false)
+        .map((pin) => ({ ...pin, declaration: pin.declaration ?? pin.version }))
+        .sort((left, right) => comparePmDateVersions(left.version, right.version))[0];
+}
 /** Read one optional JSON object without turning absence or corruption into startup failure. */
 function readJsonRecord(filePath) {
     try {
@@ -208,27 +225,61 @@ function readJsonRecord(filePath) {
         return null;
     }
 }
-/** Extract the highest explicit lower-bound pm date version from dependency declarations. */
-function dependencyPin(packageJson) {
-    const versions = [];
-    for (const field of [
+/** Extract explicit comparator and hyphen upper bounds from one range branch. */
+function rangeUpperBounds(alternative) {
+    const comparators = [
+        ...alternative.matchAll(/(<=|<)\s*v?(\d{4}\.\d{1,2}\.\d{1,2}(?:-\d+)?)/gu),
+    ].map((match) => ({ inclusive: match[1] === "<=", version: match[2] }));
+    const hyphen = alternative.match(/\b\d{4}\.\d{1,2}\.\d{1,2}(?:-\d+)?\s+-\s+v?(\d{4}\.\d{1,2}\.\d{1,2}(?:-\d+)?)/u);
+    return hyphen
+        ? [...comparators, { inclusive: true, version: hyphen[1] }]
+        : comparators;
+}
+/** Classify whether a range is bounded and can select an epoch-3 reader. */
+function analyzeHistoryEpochRange(specification) {
+    const alternativeBounds = specification
+        .split("||")
+        .map((alternative) => rangeUpperBounds(alternative));
+    return {
+        bounded: alternativeBounds.some((bounds) => bounds.length > 0),
+        compatible: alternativeBounds.some((bounds) => bounds.every((bound) => {
+            const comparison = comparePmDateVersions(HISTORY_ITEM_HASH_VERSION_3_INTRODUCED_IN, bound.version);
+            return (comparison !== null &&
+                (bound.inclusive ? comparison !== 1 : comparison === -1));
+        })),
+    };
+}
+/** Extract every supported pm declaration without letting one section hide another. */
+function dependencyPins(packageJson) {
+    return [
         "dependencies",
         "devDependencies",
         "optionalDependencies",
         "peerDependencies",
-    ]) {
+    ].flatMap((field) => {
         const dependencies = packageJson[field];
         if (typeof dependencies !== "object" || dependencies === null)
-            continue;
+            return [];
         const value = dependencies[PACKAGE_NAME];
         const specification = typeof value === "string" ? value.trim() : "";
         const version = /^[<!]/u.test(specification)
             ? undefined
             : specification.match(VERSION_PATTERN)?.[0];
-        if (version)
-            versions.push(version);
-    }
-    return versions.sort((left, right) => comparePmDateVersions(right, left))[0];
+        if (!version)
+            return [];
+        const exact = /^(?:=|v)?\d{4}\.\d{1,2}\.\d{1,2}(?:-\d+)?$/u.test(specification);
+        const range = analyzeHistoryEpochRange(specification);
+        return [
+            {
+                version,
+                constraint: exact ? "exact" : range.bounded ? "range" : "minimum",
+                ...(exact ? {} : { declaration: specification }),
+                history_epoch_compatible: exact
+                    ? comparePmDateVersions(version, HISTORY_ITEM_HASH_VERSION_3_INTRODUCED_IN) !== -1
+                    : range.compatible,
+            },
+        ];
+    });
 }
 /** Read npm's exact installed package coordinate from package-lock.json. */
 function packageLockPin(projectRoot) {
@@ -273,23 +324,42 @@ function textLockPin(projectRoot, file) {
 export function discoverProjectRuntimeVersionPins(projectRoot) {
     const pins = [];
     const projectPackage = readJsonRecord(path.join(projectRoot, "package.json"));
-    const declared = projectPackage ? dependencyPin(projectPackage) : undefined;
-    if (declared)
-        pins.push({ version: declared, source: "package.json" });
+    if (projectPackage) {
+        pins.push(...dependencyPins(projectPackage).map((pin) => ({
+            ...pin,
+            source: "package.json",
+        })));
+    }
     const installedPackage = readJsonRecord(path.join(projectRoot, "node_modules", "@unbrained", "pm-cli", "package.json"));
     const installedVersion = installedPackage?.version;
     if (typeof installedVersion === "string" &&
         parseDateVersion(installedVersion)) {
-        pins.push({ version: installedVersion, source: "installed-package" });
+        pins.push({
+            version: installedVersion,
+            source: "installed-package",
+            constraint: "exact",
+            history_epoch_compatible: historyItemHashVersionForRuntime(installedVersion) === 3,
+        });
     }
     const packageLockVersion = packageLockPin(projectRoot);
     if (packageLockVersion && parseDateVersion(packageLockVersion)) {
-        pins.push({ version: packageLockVersion, source: "package-lock.json" });
+        pins.push({
+            version: packageLockVersion,
+            source: "package-lock.json",
+            constraint: "exact",
+            history_epoch_compatible: historyItemHashVersionForRuntime(packageLockVersion) === 3,
+        });
     }
     for (const file of ["pnpm-lock.yaml", "yarn.lock"]) {
         const version = textLockPin(projectRoot, file);
-        if (version)
-            pins.push({ version, source: file });
+        if (version) {
+            pins.push({
+                version,
+                source: file,
+                constraint: "exact",
+                history_epoch_compatible: historyItemHashVersionForRuntime(version) === 3,
+            });
+        }
     }
     return pins;
 }
@@ -339,6 +409,9 @@ export function inspectProjectRuntimeCompatibility(options) {
     const newest = pins[0];
     const stale = newest !== undefined &&
         comparePmDateVersions(options.executingVersion, newest.version) === -1;
+    const writerItemHashVersion = historyItemHashVersionForRuntime(options.executingVersion);
+    const incompatibleEpochPin = findIncompatibleHistoryEpochPin(pins, writerItemHashVersion);
+    const historyEpochIncompatible = mutating && incompatibleEpochPin !== undefined;
     const warning = stale && !mutating
         ? {
             code: "project_runtime_stale_read",
@@ -353,7 +426,9 @@ export function inspectProjectRuntimeCompatibility(options) {
         }
         : undefined;
     return {
-        compatible: !mutating || !stale || options.allowStale === true,
+        compatible: !mutating ||
+            (!stale && !historyEpochIncompatible) ||
+            options.allowStale === true,
         executing_version: options.executingVersion,
         ...(newest
             ? { project_version: newest.version, source: newest.source }
@@ -361,8 +436,18 @@ export function inspectProjectRuntimeCompatibility(options) {
         ...(command ? { command } : {}),
         mutating,
         stale,
+        history_epoch_incompatible: historyEpochIncompatible,
+        writer_item_hash_version: writerItemHashVersion,
+        ...(incompatibleEpochPin
+            ? {
+                incompatible_project_version: incompatibleEpochPin.declaration,
+                incompatible_source: incompatibleEpochPin.source,
+            }
+            : {}),
         ...(warning ? { warning } : {}),
-        override_applied: stale && mutating && options.allowStale === true,
+        override_applied: mutating &&
+            (stale || historyEpochIncompatible) &&
+            options.allowStale === true,
     };
 }
 /** Refuse stale mutations with a stable SDK error and package-neutral recovery. */
@@ -370,6 +455,18 @@ export function assertProjectRuntimeCompatibility(options) {
     const result = inspectProjectRuntimeCompatibility(options);
     if (result.compatible)
         return result;
+    if (result.history_epoch_incompatible) {
+        throw new PmCliError(`pm ${result.executing_version} cannot write item-hash epoch ${result.writer_item_hash_version} into a project pinned to pm ${result.incompatible_project_version}.`, EXIT_CODE.CONFLICT, {
+            code: "project_runtime_history_epoch_incompatible",
+            reason: result.incompatible_source,
+            why: `The pinned runtime cannot read item_hash_version ${result.writer_item_hash_version}; allowing the write would break its health and validation gates.`,
+            nextSteps: [
+                `Upgrade the project's ${PACKAGE_NAME} pin to ${HISTORY_ITEM_HASH_VERSION_3_INTRODUCED_IN} or newer before mutating tracker history.`,
+                "For an intentional coordinated migration only, set PM_ALLOW_STALE_CLI=1 for this invocation and record why.",
+                "Read-only commands remain available without an override.",
+            ],
+        });
+    }
     throw new PmCliError(`pm ${result.executing_version} cannot mutate a project pinned to newer pm ${result.project_version}.`, EXIT_CODE.CONFLICT, {
         code: "project_runtime_stale_mutation",
         reason: result.source,
@@ -382,4 +479,4 @@ export function assertProjectRuntimeCompatibility(options) {
     });
 }
 //# sourceMappingURL=project-runtime-compatibility.js.map
-//# debugId=962636b0-ed3b-5ad0-ae0c-904435025986
+//# debugId=f9737b75-b285-5fe9-a9ce-63e7c07626cb

package/dist/sdk/generated/generated-error-code-catalog-part-1.js

@@ -1,6 +1,6 @@
 /** Generated partition 1 of the exhaustive error-code catalog. */
 
-!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]="0a4690e9-4cde-5218-81fb-5d59807fa344")}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]="2d5b7e84-f6a6-5c48-a72b-a929ab2186f7")}catch(e){}}();
 export const PM_ERROR_CODE_CATALOG_PART_1 = [
     {
         code: "acceptance_criteria_mutation_conflict",
@@ -1163,6 +1163,18 @@ export const PM_ERROR_CODE_CATALOG_PART_1 = [
         canonical_code: "history_author_acknowledge_target_unreadable",
         aliases: [],
     },
+    {
+        code: "history_baseline_unavailable",
+        meaning: "History baseline unavailable condition.",
+        stability: "provisional",
+        exit_code: 1,
+        class: "generic_failure",
+        recovery: "Inspect the structured error guidance and retry the suggested command.",
+        sources: ["core/history/projection.ts"],
+        emitting_commands: ["*"],
+        canonical_code: "history_baseline_unavailable",
+        aliases: [],
+    },
     {
         code: "history_drift_chain_mismatch",
         meaning: "History drift chain mismatch condition.",
@@ -1235,6 +1247,18 @@ export const PM_ERROR_CODE_CATALOG_PART_1 = [
         canonical_code: "history_drift_version_skew",
         aliases: ["validate_history_drift_version_skews"],
     },
+    {
+        code: "history_json_invalid",
+        meaning: "History json invalid condition.",
+        stability: "provisional",
+        exit_code: 1,
+        class: "generic_failure",
+        recovery: "Inspect the structured error guidance and retry the suggested command.",
+        sources: ["core/history/read.ts"],
+        emitting_commands: ["*"],
+        canonical_code: "history_json_invalid",
+        aliases: [],
+    },
     {
         code: "history_merge_conflict_markers_detected",
         meaning: "History merge conflict markers detected condition.",
@@ -1247,6 +1271,30 @@ export const PM_ERROR_CODE_CATALOG_PART_1 = [
         canonical_code: "merge_conflict_markers_detected",
         aliases: [],
     },
+    {
+        code: "history_replay_invalid",
+        meaning: "History replay invalid condition.",
+        stability: "provisional",
+        exit_code: 1,
+        class: "generic_failure",
+        recovery: "Inspect the structured error guidance and retry the suggested command.",
+        sources: ["core/history/projection.ts"],
+        emitting_commands: ["*"],
+        canonical_code: "history_replay_invalid",
+        aliases: [],
+    },
+    {
+        code: "history_salvage_refused",
+        meaning: "History salvage refused condition.",
+        stability: "provisional",
+        exit_code: 4,
+        class: "conflict",
+        recovery: "Inspect the structured error guidance and retry the suggested command.",
+        sources: ["sdk/history/salvage.ts"],
+        emitting_commands: ["*"],
+        canonical_code: "history_salvage_refused",
+        aliases: [],
+    },
     {
         code: "history_stream_over_compact_threshold",
         meaning: "History stream over compact threshold condition.",
@@ -1295,6 +1343,30 @@ export const PM_ERROR_CODE_CATALOG_PART_1 = [
         canonical_code: "history_unknown_author_events",
         aliases: ["validate_history_unknown_author_events"],
     },
+    {
+        code: "history_version_mapping_unavailable",
+        meaning: "History version mapping unavailable condition.",
+        stability: "provisional",
+        exit_code: 2,
+        class: "usage",
+        recovery: "Inspect the structured error guidance and retry the suggested command.",
+        sources: ["core/history/version-address.ts"],
+        emitting_commands: ["*"],
+        canonical_code: "history_version_mapping_unavailable",
+        aliases: [],
+    },
+    {
+        code: "history_version_pruned",
+        meaning: "History version pruned condition.",
+        stability: "provisional",
+        exit_code: 2,
+        class: "usage",
+        recovery: "Inspect the structured error guidance and retry the suggested command.",
+        sources: ["core/history/projection.ts"],
+        emitting_commands: ["*"],
+        canonical_code: "history_version_pruned",
+        aliases: [],
+    },
     {
         code: "host_environment_capacity_fault",
         meaning: "Host environment capacity fault condition.",
@@ -1797,6 +1869,18 @@ export const PM_ERROR_CODE_CATALOG_PART_1 = [
         canonical_code: "item_already_active",
         aliases: [],
     },
+    {
+        code: "item_document_encoding_invalid",
+        meaning: "Item document encoding invalid condition.",
+        stability: "provisional",
+        exit_code: 4,
+        class: "conflict",
+        recovery: "Inspect the structured error guidance and retry the suggested command.",
+        sources: ["core/store/item-store.ts"],
+        emitting_commands: ["*"],
+        canonical_code: "item_document_encoding_invalid",
+        aliases: [],
+    },
     {
         code: "item_document_invalid",
         meaning: "Item document invalid condition.",
@@ -1833,6 +1917,18 @@ export const PM_ERROR_CODE_CATALOG_PART_1 = [
         canonical_code: "item_id_collision",
         aliases: [],
     },
+    {
+        code: "item_identity_reserved",
+        meaning: "Item identity reserved condition.",
+        stability: "provisional",
+        exit_code: 4,
+        class: "conflict",
+        recovery: "Inspect the structured error guidance and retry the suggested command.",
+        sources: ["core/history/history.ts"],
+        emitting_commands: ["*"],
+        canonical_code: "item_identity_reserved",
+        aliases: [],
+    },
     {
         code: "item_not_found",
         meaning: "Item not found condition.",
@@ -2124,42 +2220,6 @@ export const PM_ERROR_CODE_CATALOG_PART_1 = [
         canonical_code: "merge_reconcile_receipt_evidence_untrusted",
         aliases: [],
     },
-    {
-        code: "merge_root_not_found",
-        meaning: "Merge root not found condition.",
-        stability: "stable",
-        exit_code: 3,
-        class: "not_found",
-        recovery: "Inspect the structured error guidance and retry the suggested command.",
-        sources: ["sdk/merge/install.ts"],
-        emitting_commands: ["*"],
-        canonical_code: "merge_root_not_found",
-        aliases: [],
-    },
-    {
-        code: "missing_allowed_values",
-        meaning: "Missing allowed values condition.",
-        stability: "provisional",
-        exit_code: 1,
-        class: "generic_failure",
-        recovery: "Inspect the structured error guidance and retry the suggested command.",
-        sources: ["sdk/agent/refusal-closure.ts"],
-        emitting_commands: ["*"],
-        canonical_code: "missing_allowed_values",
-        aliases: [],
-    },
-    {
-        code: "missing_budget",
-        meaning: "Missing budget condition.",
-        stability: "provisional",
-        exit_code: 1,
-        class: "generic_failure",
-        recovery: "Inspect the structured error guidance and retry the suggested command.",
-        sources: ["sdk/cli-contracts/flag-lexicon-contracts.ts"],
-        emitting_commands: ["*"],
-        canonical_code: "missing_budget",
-        aliases: [],
-    },
 ];
 //# sourceMappingURL=generated-error-code-catalog-part-1.js.map
-//# debugId=0a4690e9-4cde-5218-81fb-5d59807fa344
+//# debugId=2d5b7e84-f6a6-5c48-a72b-a929ab2186f7

package/dist/sdk/generated/generated-error-code-catalog-part-2.js

@@ -1,7 +1,43 @@
 /** Generated partition 2 of the exhaustive error-code catalog. */
 
-!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]="5d5a1c08-21ed-5823-8c1b-15f7907ab3b5")}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]="aa8f034d-d4b6-595b-af76-f7203d062971")}catch(e){}}();
 export const PM_ERROR_CODE_CATALOG_PART_2 = [
+    {
+        code: "merge_root_not_found",
+        meaning: "Merge root not found condition.",
+        stability: "stable",
+        exit_code: 3,
+        class: "not_found",
+        recovery: "Inspect the structured error guidance and retry the suggested command.",
+        sources: ["sdk/merge/install.ts"],
+        emitting_commands: ["*"],
+        canonical_code: "merge_root_not_found",
+        aliases: [],
+    },
+    {
+        code: "missing_allowed_values",
+        meaning: "Missing allowed values condition.",
+        stability: "provisional",
+        exit_code: 1,
+        class: "generic_failure",
+        recovery: "Inspect the structured error guidance and retry the suggested command.",
+        sources: ["sdk/agent/refusal-closure.ts"],
+        emitting_commands: ["*"],
+        canonical_code: "missing_allowed_values",
+        aliases: [],
+    },
+    {
+        code: "missing_budget",
+        meaning: "Missing budget condition.",
+        stability: "provisional",
+        exit_code: 1,
+        class: "generic_failure",
+        recovery: "Inspect the structured error guidance and retry the suggested command.",
+        sources: ["sdk/cli-contracts/flag-lexicon-contracts.ts"],
+        emitting_commands: ["*"],
+        canonical_code: "missing_budget",
+        aliases: [],
+    },
     {
         code: "missing_cli_flag",
         meaning: "Missing cli flag condition.",
@@ -499,6 +535,18 @@ export const PM_ERROR_CODE_CATALOG_PART_2 = [
         canonical_code: "profile_title_empty",
         aliases: [],
     },
+    {
+        code: "project_runtime_history_epoch_incompatible",
+        meaning: "Project runtime history epoch incompatible condition.",
+        stability: "provisional",
+        exit_code: 4,
+        class: "conflict",
+        recovery: "Inspect the structured error guidance and retry the suggested command.",
+        sources: ["sdk/environment/project-runtime-compatibility.ts"],
+        emitting_commands: ["*"],
+        canonical_code: "project_runtime_history_epoch_incompatible",
+        aliases: [],
+    },
     {
         code: "project_runtime_stale_mutation",
         meaning: "Project runtime stale mutation condition.",
@@ -2186,4 +2234,4 @@ export const PM_ERROR_CODE_CATALOG_PART_2 = [
     },
 ];
 //# sourceMappingURL=generated-error-code-catalog-part-2.js.map
-//# debugId=5d5a1c08-21ed-5823-8c1b-15f7907ab3b5
+//# debugId=aa8f034d-d4b6-595b-af76-f7203d062971

package/dist/sdk/governance/health.js

@@ -4,7 +4,7 @@
  * Implements the pm health command surface and its agent-facing runtime behavior.
  */
 
-!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]="f27cb24d-f2c8-5034-b655-84c577de7a16")}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]="9f0077a4-4f0a-540f-9951-2e8a640629c9")}catch(e){}}();
 import fs from "node:fs/promises";
 import path from "node:path";
 import { assertInitializedTracker } from "../environment/tracker-preflight.js";
@@ -28,7 +28,6 @@ import { EXIT_CODE, PM_CORE_REQUIRED_SUBDIRS, TYPE_TO_FOLDER, } from "../../core
 import { findFirstMergeConflictMarker } from "../../core/shared/conflict-markers.js";
 import { PmCliError } from "../../core/shared/errors.js";
 import { toNonEmptyStringOrUndefined } from "../../core/shared/primitives.js";
-import { sha256Hex } from "../../core/shared/serialization.js";
 import { nowIso } from "../../core/shared/time.js";
 import { parseItemDocument } from "../../core/item/item-format.js";
 import { effectiveItemFormatVersion, scanItemFormatVersions, } from "../../core/item/item-format-version.js";
@@ -47,7 +46,8 @@ import { buildCapabilityContractMetadata, buildRegistrationCollisionRemediation,
 import { scanStaleInProgressItems, } from "./stale-work.js";
 import { scanTrackedRuntimeCache } from "./tracked-runtime-cache.js";
 import { auditMergeDriverConfiguration, findGitWorkspaceRoot, } from "../merge/install.js";
-import { inspectMergeReceiptEvidence, isSafeReceiptId, partitionMergeReceipts, } from "../merge/receipts.js";
+import { inspectMergeReceiptEvidence, partitionMergeReceipts, } from "../merge/receipts.js";
+import { classifyHistoryMergeReceiptReferences, extractHistoryMergeReceiptDispositions, extractHistoryMergeReceiptReferences, } from "./merge-receipt-history.js";
 import { runHistoryRepair } from "../history-repair.js";
 import { resolveWorkspaceRelationshipKindRegistry } from "../graph/assembly.js";
 import { analyzeHierarchyIntegrity, } from "../graph/hierarchy-integrity.js";
@@ -279,41 +279,13 @@ async function scanItemIntegrity(pmRoot, typeToFolder, schema) {
     }
     return { paths, unreadable, conflictMarkers, parseFailures, formatVersions };
 }
-function mergeReceiptIdsFromHistoryEntry(value) {
-    if (typeof value !== "object" || value === null || Array.isArray(value)) {
-        return [];
-    }
-    const context = value.context;
-    if (typeof context !== "object" ||
-        context === null ||
-        Array.isArray(context)) {
-        return [];
-    }
-    const merge = context.merge;
-    if (typeof merge !== "object" || merge === null || Array.isArray(merge)) {
-        return [];
-    }
-    const receipts = merge.receipts;
-    if (!Array.isArray(receipts))
-        return [];
-    return receipts.flatMap((receipt) => {
-        if (typeof receipt !== "object" ||
-            receipt === null ||
-            Array.isArray(receipt)) {
-            return [];
-        }
-        const receiptId = receipt.receipt_id;
-        return typeof receiptId === "string" && receiptId.length > 0
-            ? [receiptId]
-            : [];
-    });
-}
 async function scanHistoryIntegrity(pmRoot) {
     const historyDir = path.join(pmRoot, "history");
     const unreadable = [];
     const conflictMarkers = [];
     const invalidJson = [];
     const mergeReceiptReferences = [];
+    const mergeReceiptDispositions = [];
     let files = [];
     try {
         files = (await fs.readdir(historyDir))
@@ -346,11 +318,12 @@ async function scanHistoryIntegrity(pmRoot) {
                 return;
             try {
                 const parsed = JSON.parse(line);
-                mergeReceiptReferences.push(...mergeReceiptIdsFromHistoryEntry(parsed).map((receiptId) => ({
+                mergeReceiptReferences.push(...extractHistoryMergeReceiptReferences(parsed, itemId).map((reference) => ({
                     itemId,
                     line: index + 1,
-                    receiptId,
+                    ...reference,
                 })));
+                mergeReceiptDispositions.push(...extractHistoryMergeReceiptDispositions(parsed, itemId, index + 1));
             }
             catch {
                 invalidJson.push({ id: itemId, line: index + 1 });
@@ -363,6 +336,7 @@ async function scanHistoryIntegrity(pmRoot) {
         conflictMarkers,
         invalidJson,
         mergeReceiptReferences,
+        mergeReceiptDispositions,
     };
 }
 function buildHierarchyIntegrityWarnings(analysis) {
@@ -405,15 +379,8 @@ async function buildIntegrityCheck(pmRoot, typeToFolder, schema, requireMergeDri
         pmRoot,
     });
     const availableMergeReceiptIds = new Set(mergeReceiptEvidence.receipts.map((receipt) => receipt.id));
-    const missingMergeReceiptReferences = historyScan.mergeReceiptReferences
-        .filter((reference) => !availableMergeReceiptIds.has(reference.receiptId))
-        .map((reference) => ({
-        item_id: reference.itemId,
-        history_line: reference.line,
-        ...(isSafeReceiptId(reference.receiptId)
-            ? { receipt_id: reference.receiptId }
-            : { receipt_reference_hash: sha256Hex(reference.receiptId) }),
-    }));
+    const historyReceiptClassification = classifyHistoryMergeReceiptReferences(historyScan.mergeReceiptReferences, availableMergeReceiptIds, historyScan.mergeReceiptDispositions);
+    const missingMergeReceiptReferences = historyReceiptClassification.missing;
     const pendingMergeReceipts = mergeReceiptEvidence.receipts.filter((receipt) => receipt.state === "pending");
     const { pendingDecisions: pendingMergeDecisions, lossless: losslessMergeReceipts, } = partitionMergeReceipts(pendingMergeReceipts);
     const mergeDriverInstallationMissing = mergeDriverAudit?.status === "missing" &&
@@ -483,6 +450,8 @@ async function buildIntegrityCheck(pmRoot, typeToFolder, schema, requireMergeDri
                     lossless_merge_receipts: losslessMergeReceipts.length,
                     invalid_merge_receipt_evidence: mergeReceiptEvidence.invalid_evidence_count,
                     missing_merge_receipt_history_references: missingMergeReceiptReferences.length,
+                    accepted_legacy_merge_receipt_references: historyReceiptClassification.acceptedLegacyCount,
+                    accepted_missing_merge_receipt_dispositions: historyReceiptClassification.acceptedDispositionCount,
                 },
                 item_unreadable: itemScan.unreadable,
                 item_conflict_markers: itemScan.conflictMarkers,
@@ -2375,4 +2344,4 @@ export const _testOnlyHealthCommand = {
     warningCode,
 };
 //# sourceMappingURL=health.js.map
-//# debugId=f27cb24d-f2c8-5034-b655-84c577de7a16
+//# debugId=9f0077a4-4f0a-540f-9951-2e8a640629c9