@unbrained/pm-cli 2026.10.11 → 2026.10.13

package/dist/sdk/merge/receipts.d.ts

@@ -5,207 +5,207 @@ import { DURABLE_VALUE_POLICY } from "./receipt-schema.js";
 export { isSafeReceiptId } from "./receipt-schema.js";
 /** One clone-local merge receipt with recoverable branch values. */
 export interface MergeDecisionReceipt {
-    /** Receipt schema version. */
-    version: 1;
-    /** Opaque receipt identity referenced from public history. */
-    id: string;
-    /** Repository-relative item path supplied by Git as `%P`. */
-    item_path: string;
-    /** Item id derived from the merged document path. */
-    item_id: string;
-    /** Side requested by the caller; stable-value decisions can retain either side. */
-    requested_preference?: MergePreferredSide;
-    /** Whether requested preference participates in item scalar selection. */
-    requested_preference_applied?: boolean;
-    /** Legacy schema-v1 key accepted while reading older clone-local receipts. */
-    preferred?: MergePreferredSide;
-    /** Scalar-conflict selection contract used by the item driver. */
-    conflict_resolution: ItemScalarConflictResolution;
-    /** Fields selected cleanly from the other branch. */
-    fields_from_theirs: string[];
-    /** Collections combined from both branches. */
-    union_fields: string[];
-    /** SHA-256 hashes of the merged values for every field represented by this receipt. Absent on legacy receipts, which cannot prove drift attribution. */
-    merged_field_hashes?: Record<string, string>;
-    /** Full recoverable scalar decisions, retained only in the clone. */
-    decisions: ItemMergeConflictDecision[];
-    /** Immutable original Git coordinates captured while the driver runs during a merge or rebase. */
-    operation?: MergeReceiptOperation;
-    /** Explicit audited disposition when the original Git state was restored instead of merging. */
-    settlement?: "original_git_state_restored";
-    /** Whether a reconciliation history event settled this receipt. */
-    state: "pending" | "reconciled";
-    /** Receipt creation timestamp. */
-    created_at: string;
-    /** Reconciliation timestamp, when consumed. */
-    reconciled_at?: string;
-    /** Whether decision values are recoverable locally or represented by hashes only. */
-    value_availability?: "clone_local" | "hash_only" | "bounded_inline" | "mixed";
-    /** Versioned rule governing which durable scalar previews may be committed. */
-    value_policy?: typeof DURABLE_VALUE_POLICY;
-    /** Runtime-only provenance assigned by the reader; serialized values are ignored. */
-    evidence_source?: "clone_local" | "durable";
+/** Receipt schema version. */
+version: 1;
+/** Opaque receipt identity referenced from public history. */
+id: string;
+/** Repository-relative item path supplied by Git as `%P`. */
+item_path: string;
+/** Item id derived from the merged document path. */
+item_id: string;
+/** Side requested by the caller; stable-value decisions can retain either side. */
+requested_preference?: MergePreferredSide;
+/** Whether requested preference participates in item scalar selection. */
+requested_preference_applied?: boolean;
+/** Legacy schema-v1 key accepted while reading older clone-local receipts. */
+preferred?: MergePreferredSide;
+/** Scalar-conflict selection contract used by the item driver. */
+conflict_resolution: ItemScalarConflictResolution;
+/** Fields selected cleanly from the other branch. */
+fields_from_theirs: string[];
+/** Collections combined from both branches. */
+union_fields: string[];
+/** SHA-256 hashes of the merged values for every field represented by this receipt. Absent on legacy receipts, which cannot prove drift attribution. */
+merged_field_hashes?: Record<string, string>;
+/** Full recoverable scalar decisions, retained only in the clone. */
+decisions: ItemMergeConflictDecision[];
+/** Immutable original Git coordinates captured while the driver runs during a merge or rebase. */
+operation?: MergeReceiptOperation;
+/** Explicit audited disposition when the original Git state was restored instead of merging. */
+settlement?: "original_git_state_restored";
+/** Whether a reconciliation history event settled this receipt. */
+state: "pending" | "reconciled";
+/** Receipt creation timestamp. */
+created_at: string;
+/** Reconciliation timestamp, when consumed. */
+reconciled_at?: string;
+/** Whether decision values are recoverable locally or represented by hashes only. */
+value_availability?: "clone_local" | "hash_only" | "bounded_inline" | "mixed";
+/** Versioned rule governing which durable scalar previews may be committed. */
+value_policy?: typeof DURABLE_VALUE_POLICY;
+/** Runtime-only provenance assigned by the reader; serialized values are ignored. */
+evidence_source?: "clone_local" | "durable";
 }
 /** Privacy-safe receipt summary suitable for committed history context. */
 export interface MergeDecisionReceiptSummary {
-    /** Opaque clone-local receipt identity. */
-    receipt_id: string;
-    /** Item whose merge produced the receipt. */
-    item_id: string;
-    /** Repository-relative item path. */
-    item_path: string;
-    /** Scalar fields that required a preferred-side decision. */
-    conflict_fields: string[];
-    /** Fields selected cleanly from the other branch. */
-    fields_from_theirs: string[];
-    /** Collections combined from both branches. */
-    union_fields: string[];
-    /** Side requested by the caller; decision hashes prove the actual retained values. */
-    requested_preference: MergePreferredSide;
-    /** Whether requested preference participated in item scalar selection. */
-    requested_preference_applied: boolean;
-    /** Scalar-conflict selection contract used by the item driver. */
-    conflict_resolution: ItemScalarConflictResolution;
-    /** Hashes proving the retained and discarded values without publishing them. */
-    decisions: Array<{
-        field: string;
-        retained_hash: string;
-        discarded_hash: string;
-    }>;
+/** Opaque clone-local receipt identity. */
+receipt_id: string;
+/** Item whose merge produced the receipt. */
+item_id: string;
+/** Repository-relative item path. */
+item_path: string;
+/** Scalar fields that required a preferred-side decision. */
+conflict_fields: string[];
+/** Fields selected cleanly from the other branch. */
+fields_from_theirs: string[];
+/** Collections combined from both branches. */
+union_fields: string[];
+/** Side requested by the caller; decision hashes prove the actual retained values. */
+requested_preference: MergePreferredSide;
+/** Whether requested preference participated in item scalar selection. */
+requested_preference_applied: boolean;
+/** Scalar-conflict selection contract used by the item driver. */
+conflict_resolution: ItemScalarConflictResolution;
+/** Hashes proving the retained and discarded values without publishing them. */
+decisions: Array<{
+field: string;
+retained_hash: string;
+discarded_hash: string;
+}>;
 }
 /** Structured result for the explicit clone-local merge report command. */
 export interface MergeReceiptReport {
-    /** Whether the report was read successfully. */
-    ok: true;
-    /** Number of receipts returned. */
-    count: number;
-    /** Receipts including recoverable values from the local clone only. */
-    receipts: MergeDecisionReceipt[];
-    /** ISO timestamp for the report. */
-    generated_at: string;
+/** Whether the report was read successfully. */
+ok: true;
+/** Number of receipts returned. */
+count: number;
+/** Receipts including recoverable values from the local clone only. */
+receipts: MergeDecisionReceipt[];
+/** ISO timestamp for the report. */
+generated_at: string;
 }
 /** Loss-aware merge receipt report for integrity gates and diagnostic adapters. */
 export interface MergeReceiptEvidenceReport {
-    /** Whether clone-local evidence resolved and every candidate was read and validated successfully. */
-    ok: boolean;
-    /** Whether clone-local evidence resolved and every discovered JSON candidate was read and validated successfully. */
-    complete: boolean;
-    /** Number of valid receipts returned. */
-    count: number;
-    /** Number of candidates rejected by bounded-file, schema, identity, or copy-consistency validation. */
-    invalid_evidence_count: number;
-    /** Bounded privacy-safe identities and reason codes for rejected evidence. */
-    invalid_evidence: MergeReceiptInvalidEvidence[];
-    /** Whether additional rejected evidence was omitted from the bounded detail list. */
-    invalid_evidence_truncated: boolean;
-    /** Whether the clone-local Git receipt directory was resolved successfully; always emitted by current implementations and optional for structural compatibility. */
-    clone_local_evidence_resolved?: boolean;
-    /** Receipts including recoverable values from the local clone only. */
-    receipts: MergeDecisionReceipt[];
-    /** ISO timestamp for the report. */
-    generated_at: string;
+/** Whether clone-local evidence resolved and every candidate was read and validated successfully. */
+ok: boolean;
+/** Whether clone-local evidence resolved and every discovered JSON candidate was read and validated successfully. */
+complete: boolean;
+/** Number of valid receipts returned. */
+count: number;
+/** Number of candidates rejected by bounded-file, schema, identity, or copy-consistency validation. */
+invalid_evidence_count: number;
+/** Bounded privacy-safe identities and reason codes for rejected evidence. */
+invalid_evidence: MergeReceiptInvalidEvidence[];
+/** Whether additional rejected evidence was omitted from the bounded detail list. */
+invalid_evidence_truncated: boolean;
+/** Whether the clone-local Git receipt directory was resolved successfully; always emitted by current implementations and optional for structural compatibility. */
+clone_local_evidence_resolved?: boolean;
+/** Receipts including recoverable values from the local clone only. */
+receipts: MergeDecisionReceipt[];
+/** ISO timestamp for the report. */
+generated_at: string;
 }
 /** Loss-aware receipt inspection result that never exposes malformed file contents. */
 export interface MergeReceiptEvidenceScan {
-    /** Valid receipts that passed bounded-file, schema, and identity validation. */
-    receipts: MergeDecisionReceipt[];
-    /** Number of JSON receipt candidates that could not be validated safely. */
-    invalid_evidence_count: number;
-    /** Bounded privacy-safe identities and reason codes for rejected evidence. */
-    invalid_evidence: MergeReceiptInvalidEvidence[];
-    /** Whether additional rejected evidence was omitted from the bounded detail list. */
-    invalid_evidence_truncated: boolean;
-    /** Whether the clone-local Git receipt directory was resolved successfully; always emitted by current implementations and optional for structural compatibility. */
-    clone_local_evidence_resolved?: boolean;
+/** Valid receipts that passed bounded-file, schema, and identity validation. */
+receipts: MergeDecisionReceipt[];
+/** Number of JSON receipt candidates that could not be validated safely. */
+invalid_evidence_count: number;
+/** Bounded privacy-safe identities and reason codes for rejected evidence. */
+invalid_evidence: MergeReceiptInvalidEvidence[];
+/** Whether additional rejected evidence was omitted from the bounded detail list. */
+invalid_evidence_truncated: boolean;
+/** Whether the clone-local Git receipt directory was resolved successfully; always emitted by current implementations and optional for structural compatibility. */
+clone_local_evidence_resolved?: boolean;
 }
 /** Stable privacy-safe classification for one rejected receipt candidate or source. */
 export interface MergeReceiptInvalidEvidence {
-    /** Evidence store that produced the rejected candidate. */
-    evidence_source: "clone_local" | "durable" | "clone_local_and_durable";
-    /** Stable failure class suitable for remediation routing and graph analytics. */
-    reason: "directory_unreadable" | "candidate_not_bounded_regular_file" | "candidate_unreadable" | "candidate_invalid_json" | "schema_or_identity_invalid" | "schema_invalid" | "identity_invalid" | "copy_provenance_mismatch";
-    /** Exact validation boundary when schema or identity evidence is rejected. */
-    validation_error?: "required_fields" | "receipt_id" | "item_id" | "item_path" | "filename" | "collections" | "enums" | "timestamps" | "durable_decisions" | "operation";
-    /** Exact schema coordinate, excluding rejected values and user-controlled field names. */
-    validation_path?: string;
-    /** Receipt identity when the bounded filename itself is a valid receipt id. */
-    receipt_id?: string;
-    /** SHA-256 locator for an unsafe or malformed candidate filename. */
-    candidate_name_hash?: string;
+/** Evidence store that produced the rejected candidate. */
+evidence_source: "clone_local" | "durable" | "clone_local_and_durable";
+/** Stable failure class suitable for remediation routing and graph analytics. */
+reason: "directory_unreadable" | "candidate_not_bounded_regular_file" | "candidate_unreadable" | "candidate_invalid_json" | "schema_or_identity_invalid" | "schema_invalid" | "identity_invalid" | "copy_provenance_mismatch";
+/** Exact validation boundary when schema or identity evidence is rejected. */
+validation_error?: "required_fields" | "receipt_id" | "item_id" | "item_path" | "filename" | "collections" | "enums" | "timestamps" | "durable_decisions" | "operation";
+/** Exact schema coordinate, excluding rejected values and user-controlled field names. */
+validation_path?: string;
+/** Receipt identity when the bounded filename itself is a valid receipt id. */
+receipt_id?: string;
+/** SHA-256 locator for an unsafe or malformed candidate filename. */
+candidate_name_hash?: string;
 }
 /** Revalidate one receipt and stage its atomic reconciled-state replacement. */
 declare function prepareReceiptSettlement(params: {
-    receiptPath: string;
-    receiptId: string;
-    evidenceSource: "clone_local" | "durable";
-    reconciledAt: string;
-    settlement?: "original_git_state_restored";
-    readReceipt?: (receiptPath: string) => Promise<string | null>;
+receiptPath: string;
+receiptId: string;
+evidenceSource: "clone_local" | "durable";
+reconciledAt: string;
+settlement?: "original_git_state_restored";
+readReceipt?: (receiptPath: string) => Promise<string | null>;
 }): Promise<{
-    path: string;
-    content: string;
-    fingerprints: string[];
-    modern: boolean;
+path: string;
+content: string;
+fingerprints: string[];
+modern: boolean;
 } | null>;
 /** Convert a raw receipt into privacy-safe history context. */
 export declare function summarizeMergeReceipt(receipt: MergeDecisionReceipt): MergeDecisionReceiptSummary;
 /** Persist one item-driver outcome in the clone-local Git directory. */
 export declare function writeMergeReceipt(params: {
-    cwd: string;
-    itemPath: string;
-    preferred: MergePreferredSide;
-    conflictResolution?: ItemScalarConflictResolution;
-    fieldsFromTheirs: string[];
-    unionFields: string[];
-    mergedFieldHashes?: Record<string, string>;
-    decisions: ItemMergeConflictDecision[];
-    operation?: MergeReceiptOperation;
+cwd: string;
+itemPath: string;
+preferred: MergePreferredSide;
+conflictResolution?: ItemScalarConflictResolution;
+fieldsFromTheirs: string[];
+unionFields: string[];
+mergedFieldHashes?: Record<string, string>;
+decisions: ItemMergeConflictDecision[];
+operation?: MergeReceiptOperation;
 }): Promise<MergeDecisionReceipt | null>;
 /** Distinguish a missing optional receipt store from an unreadable one. */
 declare function receiptDirectoryFailureMeansAbsent(directory: string, error: unknown, inspectAncestor?: (ancestor: string) => Promise<Pick<Stats, "isDirectory">>): Promise<boolean>;
 /** Inspect valid receipts and count invalid evidence without returning untrusted file contents. */
 export declare function inspectMergeReceiptEvidence(cwd: string, options?: {
-    /** Include receipts whose reconciliation state is already settled. */
-    includeReconciled?: boolean;
-    /** Include receipts that contain no discarded scalar values. */
-    includeLossless?: boolean;
-    /** Explicit tracker root used to locate durable receipt evidence. */
-    pmRoot?: string;
+/** Include receipts whose reconciliation state is already settled. */
+includeReconciled?: boolean;
+/** Include receipts that contain no discarded scalar values. */
+includeLossless?: boolean;
+/** Explicit tracker root used to locate durable receipt evidence. */
+pmRoot?: string;
 }): Promise<MergeReceiptEvidenceScan>;
 /** Read clone-local receipts with explicit reconciled/lossless classification controls. */
 export declare function listMergeReceipts(cwd: string, options?: {
-    includeReconciled?: boolean;
-    includeLossless?: boolean;
-    pmRoot?: string;
+includeReconciled?: boolean;
+includeLossless?: boolean;
+pmRoot?: string;
 }): Promise<MergeDecisionReceipt[]>;
 /** Split merge provenance into receipts with discarded values and receipts whose composition was lossless. */
 export declare function partitionMergeReceipts(receipts: MergeDecisionReceipt[]): {
-    /** Receipts that require an explicit decision because at least one competing scalar value was discarded. */
-    pendingDecisions: MergeDecisionReceipt[];
-    /** Receipts that record provenance without a discarded competing scalar value. */
-    lossless: MergeDecisionReceipt[];
+/** Receipts that require an explicit decision because at least one competing scalar value was discarded. */
+pendingDecisions: MergeDecisionReceipt[];
+/** Receipts that record provenance without a discarded competing scalar value. */
+lossless: MergeDecisionReceipt[];
 };
 /** Mark a receipt as represented by a committed merge history event. */
 export declare function markMergeReceiptReconciled(cwd: string, receipt: MergeDecisionReceipt, options?: {
-    requireExisting?: boolean;
-    settlement?: "original_git_state_restored";
+requireExisting?: boolean;
+settlement?: "original_git_state_restored";
 }): Promise<void>;
 /** Report pending or historical clone-local merge decisions. */
 export declare function runMergeReceiptReport(options: {
-    /** Include receipts already represented by merge history events. */
-    includeReconciled?: boolean;
-    /** Repository directory to inspect; defaults to the process working directory. */
-    cwd?: string;
+/** Include receipts already represented by merge history events. */
+includeReconciled?: boolean;
+/** Repository directory to inspect; defaults to the process working directory. */
+cwd?: string;
 }): Promise<MergeReceiptReport>;
 /** Inspect every receipt candidate and retain completeness diagnostics without exposing rejected file contents. */
 export declare function runMergeReceiptEvidenceReport(options: {
-    /** Include receipts already represented by merge history events. */
-    includeReconciled?: boolean;
-    /** Repository directory to inspect; defaults to the process working directory. */
-    cwd?: string;
+/** Include receipts already represented by merge history events. */
+includeReconciled?: boolean;
+/** Repository directory to inspect; defaults to the process working directory. */
+cwd?: string;
 }): Promise<MergeReceiptEvidenceReport>;
 /** Test-only seams for deterministic receipt-boundary fault coverage. */
 export declare const _testOnlyMergeReceipts: {
-    prepareReceiptSettlement: typeof prepareReceiptSettlement;
-    receiptDirectoryFailureMeansAbsent: typeof receiptDirectoryFailureMeansAbsent;
+prepareReceiptSettlement: typeof prepareReceiptSettlement;
+receiptDirectoryFailureMeansAbsent: typeof receiptDirectoryFailureMeansAbsent;
 };

package/dist/sdk/merge/reconcile.d.ts

@@ -4,49 +4,49 @@ import { type HistoryRepairAllResult } from "../history-repair.js";
 import { type MergeDecisionReceiptSummary } from "./receipts.js";
 /** Options for the audited post-merge reconciliation workflow. */
 export interface MergeReconcileOptions {
-    /** Preview drifted streams without mutating history. */
-    dryRun?: boolean;
-    /** Attribution recorded on repair audit entries. */
-    author?: string;
-    /** Human-readable reason recorded on repair audit entries. */
-    message?: string;
-    /** Permit ownership overrides already supported by history repair. */
-    force?: boolean;
+/** Preview drifted streams without mutating history. */
+dryRun?: boolean;
+/** Attribution recorded on repair audit entries. */
+author?: string;
+/** Human-readable reason recorded on repair audit entries. */
+message?: string;
+/** Permit ownership overrides already supported by history repair. */
+force?: boolean;
 }
 /** Structured post-merge reconciliation and verification result. */
 export interface MergeReconcileResult {
-    /**
+/**
      * Whether reconciliation completed without repair failures or non-green
      * merge-critical validation. Dry-run previews therefore fail closed while
      * drift or pending merge decisions still require an apply pass.
      */
-    ok: boolean;
-    /** Whether this invocation only previewed repairs. */
-    dry_run: boolean;
-    /** Bulk history repair preview or apply result. */
-    repair: HistoryRepairAllResult;
-    /** Clone-local merge receipts represented by merge history events. */
-    receipts: {
-        pending_before: number;
-        reconciled: number;
-        /** Receipts proven to restore their original Git state; these do not represent applied merges. */
-        abandoned: number;
-        summaries: MergeDecisionReceiptSummary[];
-        /** Missing durable references discovered before this reconciliation. */
-        missing_history_references_before: number;
-        /** Pre-durable references eligible for explicit audited disposition. */
-        legacy_disposition_eligible: number;
-        /** Eligible references dispositioned by this apply pass. */
-        legacy_disposition_recorded: number;
-        /** Missing durable references still blocking health after this pass. */
-        missing_history_references_after: number;
-    };
-    /** Post-operation history-drift and storage-integrity validation. */
-    validation: ValidateResult;
-    /** Stable next-step guidance for Git hooks and interactive agents. */
-    guidance: string[];
-    /** ISO timestamp copied from the validation pass. */
-    generated_at: string;
+ok: boolean;
+/** Whether this invocation only previewed repairs. */
+dry_run: boolean;
+/** Bulk history repair preview or apply result. */
+repair: HistoryRepairAllResult;
+/** Clone-local merge receipts represented by merge history events. */
+receipts: {
+pending_before: number;
+reconciled: number;
+/** Receipts proven to restore their original Git state; these do not represent applied merges. */
+abandoned: number;
+summaries: MergeDecisionReceiptSummary[];
+/** Missing durable references discovered before this reconciliation. */
+missing_history_references_before: number;
+/** Pre-durable references eligible for explicit audited disposition. */
+legacy_disposition_eligible: number;
+/** Eligible references dispositioned by this apply pass. */
+legacy_disposition_recorded: number;
+/** Missing durable references still blocking health after this pass. */
+missing_history_references_after: number;
+};
+/** Post-operation history-drift and storage-integrity validation. */
+validation: ValidateResult;
+/** Stable next-step guidance for Git hooks and interactive agents. */
+guidance: string[];
+/** ISO timestamp copied from the validation pass. */
+generated_at: string;
 }
 /**
  * Preview or apply post-merge history reconciliation and immediately validate

package/dist/sdk/merge/reconcile.js

@@ -1,2 +1,2 @@
-(function(){try{var e=typeof window<"u"?window:typeof global<"u"?global:typeof globalThis<"u"?globalThis:typeof self<"u"?self:{},n=new e.Error().stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="9b07f6f1-2c84-583c-afb2-80f219d19863")}catch{}})();import{settleAbandonedMergeReceipts}from"./abandoned-receipts.js";import{readFile}from"node:fs/promises";import path from"node:path";import{EXIT_CODE}from"../../core/shared/constants.js";import{PmCliError}from"../../core/shared/errors.js";import{compareTimestampStrings}from"../../core/shared/time.js";import{resolvePmRoot}from"../../core/store/paths.js";import{mapWithFixedConcurrency}from"../extension/concurrency.js";import{runHealth}from"../governance/health.js";import{DURABLE_MERGE_RECEIPT_INTRODUCED_AT,extractHistoryMergeReceiptReferences,isPreDurableDispositionEligibleReference}from"../governance/merge-receipt-history.js";import{runValidate}from"../governance/validate.js";import{runHistoryRepair,runHistoryRepairAll}from"../history-repair.js";import{findGitWorkspaceRoot}from"./install.js";import{inspectMergeReceiptEvidence,markMergeReceiptReconciled,summarizeMergeReceipt}from"./receipts.js";const RECEIPT_ONLY_REPAIR_CONCURRENCY=4;function missingReceiptCoordinates(health){const integrity=health.checks.find(check=>check.name==="integrity"),counts=integrity?.details.counts,count=typeof counts=="object"&&counts!==null&&!Array.isArray(counts)&&typeof counts.missing_merge_receipt_history_references=="number"?counts.missing_merge_receipt_history_references:0,details=integrity?.details.missing_merge_receipt_history_reference_details,truncated=integrity?.details.missing_merge_receipt_history_reference_details_truncated===!0,coordinates=Array.isArray(details)?details.flatMap(detail=>{if(typeof detail!="object"||detail===null||Array.isArray(detail))return[];const record=detail;return typeof record.item_id=="string"&&typeof record.history_line=="number"&&Number.isSafeInteger(record.history_line)&&typeof record.receipt_id=="string"?[{item_id:record.item_id,history_line:record.history_line,receipt_id:record.receipt_id}]:[]}):[];return{count,truncated,coordinates}}async function identifyLegacyDispositionCandidates(pmRoot,coordinates){const candidates=[];for(const coordinate of coordinates){let raw;try{raw=await readFile(path.join(pmRoot,"history",`${coordinate.item_id}.jsonl`),"utf8")}catch{continue}const line=raw.split(/\r?\n/)[coordinate.history_line-1];if(line===void 0||line.trim().length===0)continue;let parsed;try{parsed=JSON.parse(line)}catch{continue}const reference=extractHistoryMergeReceiptReferences(parsed,coordinate.item_id).find(entry=>entry.receiptId===coordinate.receipt_id);reference===void 0||!isPreDurableDispositionEligibleReference(reference)||reference.eventTimestamp===void 0||compareTimestampStrings(reference.eventTimestamp,DURABLE_MERGE_RECEIPT_INTRODUCED_AT)>=0||candidates.push({...coordinate,original_event_ts:reference.eventTimestamp})}return candidates}async function recordLegacyReceiptDispositions(params){if(params.options.dryRun===!0||params.options.force!==!0||params.candidates.length===0)return 0;const byItem=new Map;for(const candidate of params.candidates){const itemCandidates=byItem.get(candidate.item_id)??[];itemCandidates.push(candidate),byItem.set(candidate.item_id,itemCandidates)}for(const[itemId,itemCandidates]of byItem)await runHistoryRepair(itemId,{author:params.options.author??params.global.author,message:params.options.message??"accept unrecoverable pre-durable merge receipt references",force:!0,auditOperation:"merge_reconcile",forceAuditEntry:!0,auditContext:{merge:{missing_receipt_dispositions:itemCandidates.map(candidate=>({receipt_id:candidate.receipt_id,original_history_line:candidate.history_line,original_event_ts:candidate.original_event_ts,reason:"legacy_clone_local_only"}))}}},params.global);return params.candidates.length}async function runReceiptOnlyRepair(params){try{return{status:"fulfilled",value:await runHistoryRepair(params.id,{dryRun:params.dryRun,author:params.options.author??params.global.author,message:params.options.message??"record field-aware branch merge provenance",force:params.options.force,auditOperation:"merge_reconcile",auditContext:params.auditContext,forceAuditEntry:!0,mergeReceiptProof:params.mergeReceiptProof},params.global)}}catch(reason){return{status:"rejected",reason}}}function appendReceiptOnlyResults(params){params.results.forEach((settled,index)=>{const id=params.receiptOnlyIds[index];if(settled.status==="fulfilled"){const outcome=settled.value.changed?"repaired":"skipped_clean";params.repair.streams.push({id,outcome,entries_rehashed:settled.value.history.entries_rehashed,entries_patch_repaired:settled.value.history.entries_patch_repaired,reconciled_with_item:settled.value.history.reconciled_with_item,...settled.value.merge_receipt_proof?{merge_receipt_proof:settled.value.merge_receipt_proof}:{},warnings:settled.value.warnings}),params.repair.totals[outcome]+=1;return}params.repair.streams.push({id,outcome:"failed",error:settled.reason instanceof Error?settled.reason.message:String(settled.reason)}),params.repair.totals.failed+=1})}async function settleProvenReceipts(params){if(params.dryRun||params.repair.totals.failed>0)return 0;const trustedReceiptIds=new Set(params.repair.streams.flatMap(stream=>stream.merge_receipt_proof?.trusted?stream.merge_receipt_proof.receipt_ids:[])),receiptsToSettle=params.pendingReceipts.filter(receipt=>trustedReceiptIds.has(receipt.id));return await Promise.all(receiptsToSettle.map(receipt=>markMergeReceiptReconciled(params.receiptWorkspaceRoot,receipt,{requireExisting:!0}))),receiptsToSettle.length}async function runMergeReconcile(options,global2){const dryRun=options.dryRun===!0,pmRoot=resolvePmRoot(process.cwd(),global2.path),preflightHealth=await runHealth(global2,{checkOnly:!0,full:!0,skipVectors:!0,skipDrift:!0}),missingBefore=missingReceiptCoordinates(preflightHealth),legacyDispositionCandidates=await identifyLegacyDispositionCandidates(pmRoot,missingBefore.coordinates),gitWorkspaceRoot=await findGitWorkspaceRoot(pmRoot),receiptWorkspaceRoot=gitWorkspaceRoot??pmRoot,receiptEvidence=await inspectMergeReceiptEvidence(receiptWorkspaceRoot,{includeLossless:!0,pmRoot});if(receiptEvidence.invalid_evidence_count>0)throw new PmCliError(`Merge reconciliation refused ${receiptEvidence.invalid_evidence_count} invalid receipt evidence file(s).`,EXIT_CODE.CONFLICT,{code:"merge_receipt_evidence_invalid",required:"Every clone-local and durable receipt candidate must pass bounded-file, schema, and identity validation.",recovery:{suggested_retry:"pm health --check-only --full"}});const recordedLegacyDispositionCount=await recordLegacyReceiptDispositions({candidates:legacyDispositionCandidates,options,global:global2}),pendingReceipts=receiptEvidence.receipts,abandonedReceiptIds=await settleAbandonedMergeReceipts({cwd:gitWorkspaceRoot,receipts:pendingReceipts,dryRun,author:options.author,message:options.message,global:global2}),abandonedIds=new Set(abandonedReceiptIds),receiptsByItem=new Map;for(const receipt of pendingReceipts.filter(entry=>!abandonedIds.has(entry.id))){const receipts=receiptsByItem.get(receipt.item_id)??[];receipts.push(receipt),receiptsByItem.set(receipt.item_id,receipts)}const auditContextById=Object.fromEntries([...receiptsByItem].map(([id,receipts])=>[id,{merge:{receipts:receipts.map(summarizeMergeReceipt)}}])),mergeReceiptProofById=Object.fromEntries([...receiptsByItem].map(([id,receipts])=>[id,{gitWorkspaceRoot,receipts}])),repair=await runHistoryRepairAll({dryRun,author:options.author??global2.author,message:options.message??"post-merge reconciliation of field-aware tracker history",force:options.force,auditOperation:"merge_reconcile",auditContextById,...pendingReceipts.length>0?{mergeReceiptProofById}:{}},global2),representedIds=new Set(repair.streams.map(stream=>stream.id)),receiptOnlyIds=[...receiptsByItem.keys()].filter(id=>!representedIds.has(id)),receiptOnlyResults=await mapWithFixedConcurrency(receiptOnlyIds,RECEIPT_ONLY_REPAIR_CONCURRENCY,id=>runReceiptOnlyRepair({id,dryRun,options,global:global2,auditContext:auditContextById[id],mergeReceiptProof:mergeReceiptProofById[id]}));appendReceiptOnlyResults({receiptOnlyIds,results:receiptOnlyResults,repair});const reconciledReceiptCount=await settleProvenReceipts({dryRun,pendingReceipts,repair,receiptWorkspaceRoot}),validation=await runValidate({checkHistoryDrift:!0,checkStorageIntegrity:!0},global2),postflightHealth=recordedLegacyDispositionCount===0?preflightHealth:await runHealth(global2,{checkOnly:!0,full:!0,skipVectors:!0,skipDrift:!0}),missingAfter=missingReceiptCoordinates(postflightHealth),mergeChecksGreen=validation.checks.every(check=>check.status==="ok"),receiptSettlementComplete=dryRun?pendingReceipts.length===0:reconciledReceiptCount+abandonedReceiptIds.length===pendingReceipts.length,ok=[repair.totals.failed===0,mergeChecksGreen,receiptSettlementComplete,missingAfter.count===0,!missingAfter.truncated].every(Boolean),boundedBatchGuidance=missingBefore.truncated||missingAfter.truncated?"Missing receipt coordinates exceed the bounded detail response; each reviewed --force pass can disposition only the reported eligible batch. Repeat dry-run and --force passes until receipts.missing_history_references_after=0 and pm merge reconcile returns ok=true.":void 0,guidance=(dryRun?["Review repair.streams, then rerun pm merge reconcile without --dry-run to apply audited repairs.",boundedBatchGuidance,"No Git hook is installed automatically; invoke this command from an explicit post-merge hook only when your repository policy opts in."]:ok?["Reconciliation is complete; commit changed history streams with the merge result.","Rerun pm merge reconcile --dry-run after future tracker-data merges as a non-mutating integrity check."]:["Reconciliation remains incomplete; inspect repair failures and non-green validation checks before retrying.",boundedBatchGuidance,...legacyDispositionCandidates.length>0&&recordedLegacyDispositionCount===0?["Pre-durable clone-local-only receipt references are eligible for an audited disposition; rerun with --force after reviewing receipts.legacy_disposition_eligible."]:[],"Do not commit repaired history streams as reconciled until pm merge reconcile returns ok=true."]).filter(message=>message!==void 0);return{ok,dry_run:dryRun,repair,receipts:{pending_before:pendingReceipts.length,reconciled:reconciledReceiptCount,abandoned:abandonedReceiptIds.length,summaries:pendingReceipts.map(summarizeMergeReceipt),missing_history_references_before:missingBefore.count,legacy_disposition_eligible:legacyDispositionCandidates.length,legacy_disposition_recorded:recordedLegacyDispositionCount,missing_history_references_after:missingAfter.count},validation,guidance,generated_at:validation.generated_at}}export{runMergeReconcile};
+(function(){try{var e=typeof window<"u"?window:typeof global<"u"?global:typeof globalThis<"u"?globalThis:typeof self<"u"?self:{},n=new e.Error().stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="7b1ffef4-9e2b-5ff9-8b8c-030ea89ea27e")}catch{}})();import{settleAbandonedMergeReceipts}from"./abandoned-receipts.js";import{readFile}from"node:fs/promises";import path from"node:path";import{EXIT_CODE}from"../../core/shared/constants.js";import{PmCliError}from"../../core/shared/errors.js";import{compareTimestampStrings}from"../../core/shared/time.js";import{resolvePmRoot}from"../../core/store/paths.js";import{mapWithFixedConcurrency}from"../extension/concurrency.js";import{runHealth}from"../governance/health.js";import{DURABLE_MERGE_RECEIPT_INTRODUCED_AT,extractHistoryMergeReceiptReferences,isPreDurableDispositionEligibleReference}from"../governance/merge-receipt-history.js";import{runValidate}from"../governance/validate.js";import{runHistoryRepair,runHistoryRepairAll}from"../history-repair.js";import{findGitWorkspaceRoot}from"./install.js";import{inspectMergeReceiptEvidence,markMergeReceiptReconciled,summarizeMergeReceipt}from"./receipts.js";const RECEIPT_ONLY_REPAIR_CONCURRENCY=4;function missingReceiptCoordinates(health){const integrity=health.checks.find(check=>check.name==="integrity"),counts=integrity?.details.counts,count=typeof counts=="object"&&counts!==null&&!Array.isArray(counts)&&typeof counts.missing_merge_receipt_history_references=="number"?counts.missing_merge_receipt_history_references:0,details=integrity?.details.missing_merge_receipt_history_reference_details,truncated=integrity?.details.missing_merge_receipt_history_reference_details_truncated===!0,coordinates=Array.isArray(details)?details.flatMap(detail=>{if(typeof detail!="object"||detail===null||Array.isArray(detail))return[];const record=detail;return typeof record.item_id=="string"&&typeof record.history_line=="number"&&Number.isSafeInteger(record.history_line)&&typeof record.receipt_id=="string"?[{item_id:record.item_id,history_line:record.history_line,receipt_id:record.receipt_id}]:[]}):[];return{count,truncated,coordinates}}async function identifyLegacyDispositionCandidates(pmRoot,coordinates){const candidates=[];for(const coordinate of coordinates){let raw;try{raw=await readFile(path.join(pmRoot,"history",`${coordinate.item_id}.jsonl`),"utf8")}catch{continue}const line=raw.split(/\r?\n/)[coordinate.history_line-1];if(line===void 0||line.trim().length===0)continue;let parsed;try{parsed=JSON.parse(line)}catch{continue}const reference=extractHistoryMergeReceiptReferences(parsed,coordinate.item_id).find(entry=>entry.receiptId===coordinate.receipt_id);reference===void 0||!isPreDurableDispositionEligibleReference(reference)||reference.eventTimestamp===void 0||compareTimestampStrings(reference.eventTimestamp,DURABLE_MERGE_RECEIPT_INTRODUCED_AT)>=0||candidates.push({...coordinate,original_event_ts:reference.eventTimestamp})}return candidates}async function recordLegacyReceiptDispositions(params){if(params.options.dryRun===!0||params.options.force!==!0||params.candidates.length===0)return 0;const byItem=new Map;for(const candidate of params.candidates){const itemCandidates=byItem.get(candidate.item_id)??[];itemCandidates.push(candidate),byItem.set(candidate.item_id,itemCandidates)}for(const[itemId,itemCandidates]of byItem)await runHistoryRepair(itemId,{author:params.options.author??params.global.author,message:params.options.message??"accept unrecoverable pre-durable merge receipt references",force:!0,auditOperation:"merge_reconcile",forceAuditEntry:!0,auditContext:{merge:{missing_receipt_dispositions:itemCandidates.map(candidate=>({receipt_id:candidate.receipt_id,original_history_line:candidate.history_line,original_event_ts:candidate.original_event_ts,reason:"legacy_clone_local_only"}))}}},params.global);return params.candidates.length}async function runReceiptOnlyRepair(params){try{return{status:"fulfilled",value:await runHistoryRepair(params.id,{dryRun:params.dryRun,author:params.options.author??params.global.author,message:params.options.message??"record field-aware branch merge provenance",force:params.options.force,auditOperation:"merge_reconcile",auditContext:params.auditContext,forceAuditEntry:!0,mergeReceiptProof:params.mergeReceiptProof},params.global)}}catch(reason){return{status:"rejected",reason}}}function appendReceiptOnlyResults(params){params.results.forEach((settled,index)=>{const id=params.receiptOnlyIds[index];if(settled.status==="fulfilled"){const outcome=settled.value.changed?"repaired":"skipped_clean";params.repair.streams.push({id,outcome,entries_rehashed:settled.value.history.entries_rehashed,entries_patch_repaired:settled.value.history.entries_patch_repaired,reconciled_with_item:settled.value.history.reconciled_with_item,...settled.value.merge_receipt_proof?{merge_receipt_proof:settled.value.merge_receipt_proof}:{},warnings:settled.value.warnings}),params.repair.totals[outcome]+=1;return}params.repair.streams.push({id,outcome:"failed",error:settled.reason instanceof Error?settled.reason.message:String(settled.reason)}),params.repair.totals.failed+=1})}async function settleProvenReceipts(params){if(params.dryRun||params.repair.totals.failed>0)return 0;const trustedReceiptIds=new Set(params.repair.streams.flatMap(stream=>stream.merge_receipt_proof?.trusted?stream.merge_receipt_proof.receipt_ids:[])),receiptsToSettle=params.pendingReceipts.filter(receipt=>trustedReceiptIds.has(receipt.id));return await Promise.all(receiptsToSettle.map(receipt=>markMergeReceiptReconciled(params.receiptWorkspaceRoot,receipt,{requireExisting:!0}))),receiptsToSettle.length}function receiptReviewGuidance(pendingCount,complete){if(!(pendingCount===0||complete))return'If receipt proof is unavailable or competing values were discarded, first review receipts.summaries and repair.streams and re-apply intended values. Only with explicit authority to accept that review, run pm merge reconcile --force --message "<reviewed receipt disposition and rationale>". This appends an audit event; it does not restore missing evidence or discarded values.'}async function runMergeReconcile(options,global2){const dryRun=options.dryRun===!0,pmRoot=resolvePmRoot(process.cwd(),global2.path),preflightHealth=await runHealth(global2,{checkOnly:!0,full:!0,skipVectors:!0,skipDrift:!0}),missingBefore=missingReceiptCoordinates(preflightHealth),legacyDispositionCandidates=await identifyLegacyDispositionCandidates(pmRoot,missingBefore.coordinates),gitWorkspaceRoot=await findGitWorkspaceRoot(pmRoot),receiptWorkspaceRoot=gitWorkspaceRoot??pmRoot,receiptEvidence=await inspectMergeReceiptEvidence(receiptWorkspaceRoot,{includeLossless:!0,pmRoot});if(receiptEvidence.invalid_evidence_count>0)throw new PmCliError(`Merge reconciliation refused ${receiptEvidence.invalid_evidence_count} invalid receipt evidence file(s).`,EXIT_CODE.CONFLICT,{code:"merge_receipt_evidence_invalid",required:"Every clone-local and durable receipt candidate must pass bounded-file, schema, and identity validation.",recovery:{suggested_retry:"pm health --check-only --full"}});const recordedLegacyDispositionCount=await recordLegacyReceiptDispositions({candidates:legacyDispositionCandidates,options,global:global2}),pendingReceipts=receiptEvidence.receipts,abandonedReceiptIds=await settleAbandonedMergeReceipts({cwd:gitWorkspaceRoot,receipts:pendingReceipts,dryRun,author:options.author,message:options.message,global:global2}),abandonedIds=new Set(abandonedReceiptIds),receiptsByItem=new Map;for(const receipt of pendingReceipts.filter(entry=>!abandonedIds.has(entry.id))){const receipts=receiptsByItem.get(receipt.item_id)??[];receipts.push(receipt),receiptsByItem.set(receipt.item_id,receipts)}const auditContextById=Object.fromEntries([...receiptsByItem].map(([id,receipts])=>[id,{merge:{receipts:receipts.map(summarizeMergeReceipt)}}])),mergeReceiptProofById=Object.fromEntries([...receiptsByItem].map(([id,receipts])=>[id,{gitWorkspaceRoot,receipts}])),repair=await runHistoryRepairAll({dryRun,author:options.author??global2.author,message:options.message??"post-merge reconciliation of field-aware tracker history",force:options.force,auditOperation:"merge_reconcile",auditContextById,...pendingReceipts.length>0?{mergeReceiptProofById}:{}},global2),representedIds=new Set(repair.streams.map(stream=>stream.id)),receiptOnlyIds=[...receiptsByItem.keys()].filter(id=>!representedIds.has(id)),receiptOnlyResults=await mapWithFixedConcurrency(receiptOnlyIds,RECEIPT_ONLY_REPAIR_CONCURRENCY,id=>runReceiptOnlyRepair({id,dryRun,options,global:global2,auditContext:auditContextById[id],mergeReceiptProof:mergeReceiptProofById[id]}));appendReceiptOnlyResults({receiptOnlyIds,results:receiptOnlyResults,repair});const reconciledReceiptCount=await settleProvenReceipts({dryRun,pendingReceipts,repair,receiptWorkspaceRoot}),validation=await runValidate({checkHistoryDrift:!0,checkStorageIntegrity:!0},global2),postflightHealth=recordedLegacyDispositionCount===0?preflightHealth:await runHealth(global2,{checkOnly:!0,full:!0,skipVectors:!0,skipDrift:!0}),missingAfter=missingReceiptCoordinates(postflightHealth),mergeChecksGreen=validation.checks.every(check=>check.status==="ok"),receiptSettlementComplete=dryRun?pendingReceipts.length===0:reconciledReceiptCount+abandonedReceiptIds.length===pendingReceipts.length,ok=[repair.totals.failed===0,mergeChecksGreen,receiptSettlementComplete,missingAfter.count===0,!missingAfter.truncated].every(Boolean),boundedBatchGuidance=missingBefore.truncated||missingAfter.truncated?"Missing receipt coordinates exceed the bounded detail response; each reviewed --force pass can disposition only the reported eligible batch. Repeat dry-run and --force passes until receipts.missing_history_references_after=0 and pm merge reconcile returns ok=true.":void 0,explicitReviewGuidance=receiptReviewGuidance(pendingReceipts.length,ok),guidance=(dryRun?["Review repair.streams, then rerun pm merge reconcile without --dry-run to apply audited repairs.",boundedBatchGuidance,explicitReviewGuidance,"No Git hook is installed automatically; invoke this command from an explicit post-merge hook only when your repository policy opts in."]:ok?["Reconciliation is complete; commit changed history streams with the merge result.","Rerun pm merge reconcile --dry-run after future tracker-data merges as a non-mutating integrity check."]:["Reconciliation remains incomplete; inspect repair failures and non-green validation checks before retrying.",boundedBatchGuidance,explicitReviewGuidance,...legacyDispositionCandidates.length>0&&recordedLegacyDispositionCount===0?["Pre-durable clone-local-only receipt references are eligible for an audited disposition; rerun with --force after reviewing receipts.legacy_disposition_eligible."]:[],"Do not commit repaired history streams as reconciled until pm merge reconcile returns ok=true."]).filter(message=>message!==void 0);return{ok,dry_run:dryRun,repair,receipts:{pending_before:pendingReceipts.length,reconciled:reconciledReceiptCount,abandoned:abandonedReceiptIds.length,summaries:pendingReceipts.map(summarizeMergeReceipt),missing_history_references_before:missingBefore.count,legacy_disposition_eligible:legacyDispositionCandidates.length,legacy_disposition_recorded:recordedLegacyDispositionCount,missing_history_references_after:missingAfter.count},validation,guidance,generated_at:validation.generated_at}}export{runMergeReconcile};
 //# sourceMappingURL=reconcile.js.map