@unbrained/pm-cli 2026.9.5 → 2026.9.6

package/dist/sdk/lifecycle/close.js

@@ -1,10 +1,5 @@
-/**
- * @module sdk/lifecycle/close
- *
- * Implements the pm close 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]="9f28f7d8-993b-5201-b606-d1eab0c3ff5c")}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]="0e166cbb-ef9c-5016-89a6-07f287e00a2e")}catch(e){}}();
 import { assertInitializedTracker } from "../environment/tracker-preflight.js";
 import { toItemRecord, isTerminalStatus, resolveItemTypeRegistry, resolveRuntimeStatusRegistry, EXIT_CODE, PmCliError, buildItemNotFoundError, listAllItemMetadataLight, locateItem, mutateItem, readLocatedItem, resolvePmRoot, readSettings, resolveAuthor, resolveIsoOrRelative, shouldCompletePlanOnClose, getActiveExtensionRegistrations, } from "../runtime-primitives.js";
 import { collectBlockedByIds, indexBlockedByIds } from "../actionability.js";
@@ -47,6 +42,16 @@ function findMissingCloseValidationFields(itemMetadata) {
     }
     return missing;
 }
+/** Build an argv-safe update that appends acceptance evidence without repeating a terminal transition. */
+function closeEvidenceRecovery(metadata, pmRoot, options = {}) {
+    const missing = findMissingCloseValidationFields(metadata);
+    if (missing.length === 0)
+        return undefined;
+    const values = { resolution: options.resolution, expected_result: options.expectedResult, actual_result: options.actualResult };
+    const missingFlags = missing.map((field) => `--${field.key.replaceAll("_", "-")}`);
+    const args = ["--pm-path", pmRoot, "update", metadata.id, ...missing.flatMap((field, index) => [missingFlags[index], values[field.key]?.trim() || "<value>"])];
+    return { missing: missingFlags, suggested_retry: renderPmCommand(args), suggested_retry_args: args };
+}
 async function duplicateChainReferencesClosingItem(loadItemById, initialDuplicateOf, closingId) {
     const visited = new Set();
     let current = initialDuplicateOf;
@@ -317,10 +322,11 @@ function clearCloseAssignee(metadata) {
     delete metadata.assignee;
     return ["assignee"];
 }
+/** Enforce terminal and closure policies before applying acceptance fields and the atomic lifecycle transition. */
 function mutateCloseMetadata(metadata, context) {
     if (isTerminalStatus(metadata.status, context.statusRegistry) &&
         !context.force) {
-        throw new PmCliError(`Item ${metadata.id} is already terminal; use --force to close again.`, EXIT_CODE.CONFLICT);
+        throw new PmCliError(`Item ${metadata.id} is already terminal; use pm update to append acceptance evidence, or --force only for an intentional repeat closure.`, EXIT_CODE.CONFLICT, { recovery: closeEvidenceRecovery(metadata, context.pmRoot, context.options) });
     }
     const inlineChangedFields = applyInlineCloseFields(metadata, context.options);
     const duplicateFallbackFields = applyDuplicateCloseMetadata(metadata, context.duplicateOf);
@@ -444,9 +450,11 @@ export async function closeItem(id, closeReasonText, options, global) {
             });
         },
     });
+    const recovery = validateCloseMode === "warn" ? closeEvidenceRecovery(result.item, pmRoot) : undefined;
     return {
         item: toItemRecord(result.item),
         changed_fields: result.changedFields,
+        ...(recovery ? { recovery } : {}),
         warnings: [
             ...result.warnings,
             ...(await autoUnblockResolvedDependents(pmRoot, settings, trackerItems, located.id, author, statusRegistry)),
@@ -458,4 +466,4 @@ export function runClose(id, closeReasonText, options, global) {
     return closeItem(id, closeReasonText, options, global);
 }
 //# sourceMappingURL=close.js.map
-//# debugId=9f28f7d8-993b-5201-b606-d1eab0c3ff5c
+//# debugId=0e166cbb-ef9c-5016-89a6-07f287e00a2e

package/dist/sdk/lifecycle/create.js

@@ -4,7 +4,7 @@
  * Implements the pm create 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]="c9bfbfd4-3d34-5fa7-b264-6bf9ed5f7f81")}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]="44240cea-9996-5f86-acc5-ac0cfa71c586")}catch(e){}}();
 import { assertInitializedTracker } from "../environment/tracker-preflight.js";
 import { assertNoAmbiguousBareCommaEntry, looksLikeStructuredKeyValueEntry, resolveMutationStdinTokenFields, } from "../../core/item/parse.js";
 import { removeFileIfExists, writeFileAtomic, appendHistoryEntry, createHistoryEntry, generateItemId, normalizeItemId, canonicalDocument, normalizeItemMetadata, serializeItemDocument, assertParentReferenceIsNotSelf, isPlaceholderReferenceToken, normalizeParentReferenceValue, validateMissingParentReference, validateSprintOrReleaseValue, assertNoUnknownCsvKeys, looksLikeGenericKeyValueEntry, mergeAdditiveTags, parseCsvKv, parseOptionalNonNegativeInteger, parseOptionalNumber, parseTags, shouldResolveMutationStdinTokens, transferMutationStdinTokenPolicy, resolvePriority, getFocusedItem, normalizeStatusInput, isTerminalStatus, canonicalizeCommandOptionKey, commandOptionFlagLabel, resolveItemTypeRegistry, resolveCommandOptionPolicyState, resolveTypeDefinition, resolveTypeName, validateTypeOptions, acquireLock, printError, buildInvalidTypeError, resolveTypeSynonym, collectRuntimeCreateFieldValues, resolveItemTypesFilePath, resolveRuntimeFieldRegistry, resolveRuntimeStatusRegistry, EXIT_CODE, ITEM_METADATA_KEY_ORDER, PmCliError, nowIso, resolveIsoOrRelative, getActiveExtensionRegistrations, projectAfterCommandItemSnapshot, recordAfterCommandAffectedItem, runActiveCommandHandler, runActiveBeforeMutationHooks, runActiveOnWriteHooks, collectRegisteredItemFieldNames, applyRegisteredItemFieldDefaultsAndValidation, parseRegisteredItemFieldAssignments, listAllItemMetadataLight, locateItem, createMutationGuardSdk, getHistoryPath, getItemPath, resolvePmRoot, readSettings, resolveAuthor, } from "../runtime-primitives.js";
@@ -24,7 +24,7 @@ import { attachLinkedTestMutationProvenance } from "../test/trust.js";
 import { COMMON_UNSET_FIELD_DEFINITIONS_AFTER_AUTHOR, COMMON_UNSET_FIELD_DEFINITIONS_BEFORE_AUTHOR, parseCommandUnsetTargets, resolveRuntimeUnsetFieldDefinition, } from "./shared-unset-fields.js";
 import { ensureEnumValue } from "./recurrence-parsers.js";
 import { assertDependencyEdgesAllowed, assertDependencyTargetsResolvable, assertValidBareDependencyFlagValue, } from "../dependency-flag-validation.js";
-import { normalizeDependencySeedId, normalizeDependencySourceKind, } from "../dependency-provenance.js";
+import { normalizeDependencySeedId, normalizeItemReference, isExternalDependencyReference, normalizeDependencySourceKind, } from "../dependency-provenance.js";
 import { resolveCanonicalRelationshipKind } from "../relationships.js";
 import { supportsCreateExplicitEmpty } from "../agent/create-option-policy.js";
 import { parseEventEntries, parseReminderEntries, parseTypeOptionEntries, } from "./repeatable-metadata-parsers.js";
@@ -767,9 +767,6 @@ export function requireStringOption(value, flag) {
     }
     return normalized;
 }
-function ensurePriority(rawPriority) {
-    return resolvePriority(rawPriority);
-}
 function mergeCreateOptionsWithTemplate(templateOptions, explicitOptions) {
     const merged = {};
     for (const [key, value] of Object.entries(templateOptions)) {
@@ -847,9 +844,6 @@ async function loadCreateTemplateOptionsFromRuntime(templateName, global, pmRoot
     /* c8 ignore next -- template runtime success path is covered by package-level integration tests. */
     return readTemplateOptionsFromRuntimeResult(handlerResult.result, templateName);
 }
-function ensureInitHasRun(pmRoot) {
-    return assertInitializedTracker(pmRoot);
-}
 /**
  * Resolve an optional string item-metadata field for {@link runCreate}: yields
  * `undefined` when the field is being cleared via `--unset <key>` or was never
@@ -913,7 +907,10 @@ async function inheritFocusedParent(parent, resolvedOptions, unsetKeys, pmRoot)
 }
 /** Normalize and locate a new item's parent reference, returning the normalized value plus any never-blocking missing-parent warnings the configured `parent_reference` policy produces when the target does not resolve. */
 async function validateCreateParentReference(pmRoot, settings, typeRegistry, itemId, parent, policy) {
-    const normalized = normalizeParentReferenceValue(parent);
+    const normalized = normalizeItemReference(normalizeParentReferenceValue(parent), settings.id_prefix);
+    if (isExternalDependencyReference(normalized)) {
+        return { parent: normalized, warnings: [] };
+    }
     assertParentReferenceIsNotSelf(itemId, normalized, settings.id_prefix);
     const parentLocated = await locateItem(pmRoot, normalized, settings.id_prefix, settings.item_format, typeRegistry.type_to_folder);
     if (parentLocated) {
@@ -1618,7 +1615,7 @@ async function writeCreatedItem(params) {
 export async function runCreate(options, global) {
     let resolvedOptions = normalizeLegacyNoneCreateOptions(await resolveCreateTransportInputs(options));
     const pmRoot = resolvePmRoot(process.cwd(), global.path);
-    await ensureInitHasRun(pmRoot);
+    await assertInitializedTracker(pmRoot);
     const settings = await readSettings(pmRoot);
     const statusRegistry = resolveRuntimeStatusRegistry(settings.schema);
     const runtimeFieldRegistry = resolveRuntimeFieldRegistry(settings.schema);
@@ -1683,7 +1680,7 @@ export async function runCreate(options, global) {
         ? parseStatusValue(resolvedOptions.status, statusRegistry)
         : resolveCreateDefaultStatus(typeDefinition, statusRegistry);
     const priority = resolvedOptions.priority !== undefined
-        ? ensurePriority(resolvedOptions.priority)
+        ? resolvePriority(resolvedOptions.priority)
         : 2;
     const unsetKeys = unsetTargets.metadataKeys;
     const tags = resolveCreateTags(unsetKeys, resolvedOptions);
@@ -1950,4 +1947,4 @@ export const _testOnlyCreateCommand = {
     typeOptionExampleValue,
 };
 //# sourceMappingURL=create.js.map
-//# debugId=c9bfbfd4-3d34-5fa7-b264-6bf9ed5f7f81
+//# debugId=44240cea-9996-5f86-acc5-ac0cfa71c586

package/dist/sdk/lifecycle/update.js

@@ -4,7 +4,7 @@
  * Implements the pm update 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]="78f8b369-1802-555d-a8cc-0147c0d8fb08")}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]="5a6614ac-62fd-5680-9eed-447bfb7a167f")}catch(e){}}();
 import { assertInitializedTracker } from "../environment/tracker-preflight.js";
 import { resolveMutationStdinTokenFields } from "../../core/item/parse.js";
 import { COMMON_MUTATION_COMMAND_OPTION_KEYS, canonicalizeCommandOptionKey, commandOptionFlagLabel, resolveItemTypeRegistry, resolveCommandOptionPolicyState, resolveTypeDefinition, resolveTypeName, validateTypeOptions, normalizeItemId, toItemRecord, buildInvalidTypeError, assertParentReferenceIsNotSelf, normalizeParentReferenceValue, validateMissingParentReference, validateSprintOrReleaseValue, applyAcceptanceCriteriaMutations, applyTagRemovals, assertNoUnknownCsvKeys, looksLikeGenericKeyValueEntry, mergeAdditiveTags, parseCsvKv, parseOptionalNonNegativeInteger, parseOptionalNumber, parseTags, shouldResolveMutationStdinTokens, transferMutationStdinTokenPolicy, splitAcceptanceCriteria, resolvePriority, normalizeStatusInput, isTerminalStatus, collectRuntimeUpdateFieldValues, resolveItemTypesFilePath, resolveRuntimeFieldRegistry, resolveRuntimeStatusRegistry, describeAllowedTransitions, evaluateTransition, resolveTypeWorkflows, EXIT_CODE, PmCliError, stableValueEquals, resolveIsoOrRelative, getActiveExtensionRegistrations, collectRegisteredItemFieldNames, applyRegisteredItemFieldDefaultsAndValidation, parseRegisteredItemFieldAssignments, buildItemNotFoundError, listAllItemMetadataLight, locateItem, readLocatedItem, resolvePmRoot, readSettings, resolveAuthor, } from "../runtime-primitives.js";
@@ -15,7 +15,7 @@ import { applyLegacyNoneCollectionNormalizers, createLegacyNoneCollectionNormali
 import { ensureEnumValue as ensureEnum } from "./recurrence-parsers.js";
 import { parseEventEntries, parseReminderEntries, parseTypeOptionEntries, } from "./repeatable-metadata-parsers.js";
 import { assertDependencyEdgesAllowed, assertDependencyTargetsResolvable, assertValidBareDependencyFlagValue, } from "../dependency-flag-validation.js";
-import { normalizeDependencySeedId, normalizeDependencySourceKind, } from "../dependency-provenance.js";
+import { normalizeDependencySeedId, normalizeItemReference, isExternalDependencyReference, normalizeDependencySourceKind, } from "../dependency-provenance.js";
 import { resolveCanonicalRelationshipKind } from "../relationships.js";
 import { collectNewOrderingCycleWarnings } from "../graph/mutation-advisory.js";
 import { assertHierarchyMutationAllowed } from "../graph/hierarchy-integrity.js";
@@ -619,9 +619,6 @@ function matchesDependencySelector(value, selector) {
     }
     return true;
 }
-function ensurePriority(raw) {
-    return resolvePriority(raw);
-}
 function normalizeUpdatePolicyOptionKey(raw, typeName) {
     const canonical = canonicalizeCommandOptionKey("update", raw);
     if (!canonical) {
@@ -1152,9 +1149,6 @@ function assertUpdateHierarchyIntegrity(params) {
         return;
     assertHierarchyMutationAllowed(params.before, params.before.map((item) => item.id === params.document.metadata.id ? params.document.metadata : item), params.document.metadata.id, (status) => isTerminalStatus(status, params.statusRegistry), resolveWorkspaceRelationshipKindRegistry());
 }
-async function assertUpdateTrackerInitialized(pmRoot) {
-    await assertInitializedTracker(pmRoot);
-}
 function assertMatchingOrderRank(options) {
     if (options.order !== undefined &&
         options.rank !== undefined &&
@@ -1162,12 +1156,16 @@ function assertMatchingOrderRank(options) {
         throw new PmCliError("--order and --rank must match when both are provided", EXIT_CODE.USAGE);
     }
 }
+/** Canonicalize local parent input before self/existence checks; preserve explicit remote locators and explicit unsets. */
 async function resolveParentReferenceForUpdate(params) {
     if (params.options.parent === undefined ||
         params.unsetTargets.metadataKeys.has("parent")) {
         return { resolvedParentValue: undefined, warnings: [] };
     }
-    const resolvedParentValue = normalizeParentReferenceValue(params.options.parent);
+    const resolvedParentValue = normalizeItemReference(normalizeParentReferenceValue(params.options.parent), params.settings.id_prefix);
+    if (isExternalDependencyReference(resolvedParentValue)) {
+        return { resolvedParentValue, warnings: [] };
+    }
     assertParentReferenceIsNotSelf(params.id, resolvedParentValue, params.settings.id_prefix);
     const parentLocated = await locateItem(params.pmRoot, resolvedParentValue, params.settings.id_prefix, params.settings.item_format, params.typeRegistry.type_to_folder);
     if (parentLocated) {
@@ -1212,6 +1210,7 @@ async function collectWorkflowTransitionWarnings(params) {
     });
     return warning ? [warning] : [];
 }
+/** Delegate the configured close transition to the closure writer, applying other requested fields first and retaining its evidence. */
 async function routeCloseStatusUpdate(context) {
     if (!context.fieldFlags.status) {
         return undefined;
@@ -1349,11 +1348,12 @@ function applyStatusAndCloseReasonMutations(document, context, previousStatusNor
     applyStatusAndCompletionMutations(document, context, previousStatusNormalized, changedFields);
     applyCloseReasonMutations(document, context, previousStatusNormalized, changedFields);
 }
+/** Resolve priority and type changes against runtime registries before enforcing type-specific options and recording changed fields. */
 function applyPriorityTypeAndOptions(document, context, changedFields) {
     let activeTypeName = resolveTypeName(document.metadata.type, context.typeRegistry) ??
         document.metadata.type;
     if (context.options.priority !== undefined) {
-        document.metadata.priority = ensurePriority(context.options.priority);
+        document.metadata.priority = resolvePriority(context.options.priority);
         changedFields.push("priority");
     }
     if (context.options.type !== undefined) {
@@ -1829,7 +1829,7 @@ function mutateUpdateDocument(document, context) {
 async function runUpdateWithContext(id, options, global, execution = {}) {
     options = await resolveUpdateTransportOptions(options);
     const pmRoot = resolvePmRoot(process.cwd(), global.path);
-    await assertUpdateTrackerInitialized(pmRoot);
+    await assertInitializedTracker(pmRoot);
     const settings = await readSettings(pmRoot);
     const statusRegistry = resolveRuntimeStatusRegistry(settings.schema);
     const runtimeFieldRegistry = resolveRuntimeFieldRegistry(settings.schema);
@@ -2134,4 +2134,4 @@ export const _testOnlyUpdateCommand = {
     resolveRuntimeUnsetDefinition: (token, registry) => resolveRuntimeUnsetFieldDefinition(token, "update", registry),
 };
 //# sourceMappingURL=update.js.map
-//# debugId=78f8b369-1802-555d-a8cc-0147c0d8fb08
+//# debugId=5a6614ac-62fd-5680-9eed-447bfb7a167f

package/dist/sdk/lifecycle-policy.d.ts

@@ -1,3 +1,4 @@
+import { type PmCliErrorRecoveryPayload } from "../core/shared/errors.js";
 import type { ItemMetadata } from "../types/index.js";
 /** The author-controlled field from which a terminal reason was derived. */
 export type TerminalReasonSource = "explicit" | "duplicate" | "resolution" | "message" | "none";
@@ -37,6 +38,8 @@ export interface CloseOperationResult {
     item: Record<string, unknown>;
     /** Metadata fields changed by the transition. */
     changed_fields: string[];
+    /** Evidence-only update guidance when a successful warning close leaves acceptance fields missing. */
+    recovery?: PmCliErrorRecoveryPayload;
     /** Validation and lifecycle policy receipts. */
     warnings: string[];
 }

package/dist/sdk/lifecycle-policy.js

@@ -5,7 +5,7 @@
  * item enters a terminal lifecycle state.
  */
 
-!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]="a7ae3c89-b50b-5e4f-8273-8318bc976d84")}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]="89e3f65e-8455-5921-bcc1-45cf572d8585")}catch(e){}}();
 import { EXIT_CODE } from "../core/shared/constants.js";
 import { PmCliError } from "../core/shared/errors.js";
 /** Default terminal policy shared by CLI, SDK, and MCP operations. */
@@ -118,4 +118,4 @@ export function applyTerminalOrderingPolicy(metadata, policy) {
     };
 }
 //# sourceMappingURL=lifecycle-policy.js.map
-//# debugId=a7ae3c89-b50b-5e4f-8273-8318bc976d84
+//# debugId=89e3f65e-8455-5921-bcc1-45cf572d8585

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

@@ -0,0 +1,15 @@
+/**
+ * @module sdk/merge/abandoned-receipts
+ * Settles verified restored-origin receipts through an explicit history event.
+ */
+import type { GlobalOptions } from "../../core/shared/command-types.js";
+import { type MergeDecisionReceipt } from "./receipts.js";
+/** Preview or record restored-origin dispositions without treating them as applied merges. */
+export declare function settleAbandonedMergeReceipts(params: {
+    cwd: string | null;
+    receipts: readonly MergeDecisionReceipt[];
+    dryRun: boolean;
+    author?: string;
+    message?: string;
+    global: GlobalOptions;
+}): Promise<string[]>;

package/dist/sdk/merge/abandoned-receipts.js

@@ -0,0 +1,47 @@
+
+!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]="cd45ee09-e4c3-5fc6-8253-1f1dc709a3a8")}catch(e){}}();
+import { runHistoryRepair } from "../history-repair.js";
+import { isOriginalGitStateRestored } from "./receipt-operation.js";
+import { markMergeReceiptReconciled, summarizeMergeReceipt, } from "./receipts.js";
+/** Preview or record restored-origin dispositions without treating them as applied merges. */
+export async function settleAbandonedMergeReceipts(params) {
+    if (params.cwd === null)
+        return [];
+    const settled = [];
+    for (const receipt of params.receipts) {
+        if (receipt.operation === undefined ||
+            !(await isOriginalGitStateRestored(params.cwd, receipt.item_path, receipt.operation)))
+            continue;
+        const mergeAbandonmentProof = { gitWorkspaceRoot: params.cwd, receipt };
+        await runHistoryRepair(receipt.item_id, { dryRun: true, mergeAbandonmentProof }, params.global);
+        if (!params.dryRun) {
+            await runHistoryRepair(receipt.item_id, {
+                author: params.author ?? params.global.author,
+                mergeAbandonmentProof,
+                message: params.message ??
+                    "Settle rebase receipt after exact original Git state restoration",
+                auditOperation: "merge_reconcile",
+                forceAuditEntry: true,
+                auditContext: {
+                    merge: {
+                        abandoned_receipts: [
+                            {
+                                ...summarizeMergeReceipt(receipt),
+                                reason: "original_git_state_restored",
+                                operation: receipt.operation,
+                            },
+                        ],
+                    },
+                },
+            }, params.global);
+            await markMergeReceiptReconciled(params.cwd, receipt, {
+                requireExisting: true,
+                settlement: "original_git_state_restored",
+            });
+        }
+        settled.push(receipt.id);
+    }
+    return settled;
+}
+//# sourceMappingURL=abandoned-receipts.js.map
+//# debugId=cd45ee09-e4c3-5fc6-8253-1f1dc709a3a8

package/dist/sdk/merge/driver.js

@@ -9,7 +9,7 @@
  * merge never corrupts tracker storage the way raw conflict markers do.
  */
 
-!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]="5dc5f70c-0b04-51bb-983b-49b15be11587")}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]="22b1f103-54de-5a63-a2d2-2f99181a73e2")}catch(e){}}();
 import { readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { getActiveExtensionRegistrations } from "../../core/extensions/index.js";
@@ -22,6 +22,7 @@ import { nowIso } from "../../core/shared/time.js";
 import { getSettingsPath, resolvePmRoot } from "../../core/store/paths.js";
 import { readSettings } from "../../core/store/settings.js";
 import { hashItemScalarDecisionValue, mergeHistoryStreams, mergeItemDocuments, mergeJsonDocuments, mergeRelationshipEventStreams, } from "./three-way.js";
+import { captureMergeReceiptOperation } from "./receipt-operation.js";
 import { summarizeMergeReceipt, writeMergeReceipt, } from "./receipts.js";
 /** Supported values accepted by the merge driver artifact contract across CLI, SDK, and MCP surfaces. */
 export const MERGE_DRIVER_ARTIFACT_VALUES = [
@@ -166,6 +167,7 @@ export async function runMergeDriver(options, global) {
                     hashItemScalarDecisionValue(field === "body" ? mergedDocument.body : mergedMetadata[field]),
                 ])),
                 decisions: itemMerge.conflict_decisions,
+                operation: await captureMergeReceiptOperation(process.cwd(), options.itemPath),
             };
         }
     }
@@ -208,4 +210,4 @@ export async function runMergeDriver(options, global) {
     };
 }
 //# sourceMappingURL=driver.js.map
-//# debugId=5dc5f70c-0b04-51bb-983b-49b15be11587
+//# debugId=22b1f103-54de-5a63-a2d2-2f99181a73e2

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

@@ -11,3 +11,4 @@ export { inspectMergeReceiptEvidence, listMergeReceipts, markMergeReceiptReconci
 export { MERGE_DRIVER_ARTIFACT_VALUES, runMergeDriver, type MergeDriverArtifact, type MergeDriverOptions, type MergeDriverResult, } from "./driver.js";
 export { auditMergeAttributeFence, auditMergeDriverConfiguration, buildMergeAttributePatterns, findGitWorkspaceRoot, PM_GITATTRIBUTES_END, PM_GITATTRIBUTES_START, PM_GITATTRIBUTES_V2_END, PM_GITATTRIBUTES_V2_START, refreshMergeAttributeFenceIfInstalled, resolveMergeInstallContext, runMergeInstall, type MergeFenceAuditResult, type MergeDriverConfigurationAuditResult, type MergeFenceRefreshOutcome, type MergeInstallOptions, type MergeInstallContextResolution, type MergeInstallResult, } from "./install.js";
 export { runMergeReconcile, type MergeReconcileOptions, type MergeReconcileResult, } from "./reconcile.js";
+export type { MergeReceiptOperation } from "./receipt-operation.js";

package/dist/sdk/merge/index.js

@@ -7,11 +7,11 @@
  * this module so packages and hosts can reuse the same merge 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]="925be497-bdd3-527b-9a88-cf9c9f682ab2")}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]="5079995b-ef00-5fe3-b87d-0882ef976d10")}catch(e){}}();
 export { ITEM_SCALAR_MISSING_VALUE, ITEM_LATEST_TIMESTAMP_FIELDS, ITEM_UNION_COLLECTION_FIELDS, encodeItemScalarDecisionValue, hashItemScalarDecisionValue, isItemScalarMissingValue, mergeHistoryStreams, mergeItemDocuments, mergeJsonDocuments, mergeRelationshipEventStreams, } from "./three-way.js";
 export { inspectMergeReceiptEvidence, listMergeReceipts, markMergeReceiptReconciled, runMergeReceiptEvidenceReport, runMergeReceiptReport, summarizeMergeReceipt, } from "./receipts.js";
 export { MERGE_DRIVER_ARTIFACT_VALUES, runMergeDriver, } from "./driver.js";
 export { auditMergeAttributeFence, auditMergeDriverConfiguration, buildMergeAttributePatterns, findGitWorkspaceRoot, PM_GITATTRIBUTES_END, PM_GITATTRIBUTES_START, PM_GITATTRIBUTES_V2_END, PM_GITATTRIBUTES_V2_START, refreshMergeAttributeFenceIfInstalled, resolveMergeInstallContext, runMergeInstall, } from "./install.js";
 export { runMergeReconcile, } from "./reconcile.js";
 //# sourceMappingURL=index.js.map
-//# debugId=925be497-bdd3-527b-9a88-cf9c9f682ab2
+//# debugId=5079995b-ef00-5fe3-b87d-0882ef976d10

package/dist/sdk/merge/receipt-operation.d.ts

@@ -0,0 +1,15 @@
+/** Immutable pre-rebase coordinates, without branch names or item contents. */
+export interface MergeReceiptOperation {
+    /** Git operation whose original state can be checked after it ends. */
+    kind: "rebase";
+    /** Commit from which the rebase began. */
+    original_head: string;
+    /** Original item blob at that commit. */
+    original_blob: string;
+}
+/** Capture a rebase's original commit and item blob, or omit unprovable coordinates. */
+export declare function captureMergeReceiptOperation(cwd: string, itemPath: string): Promise<MergeReceiptOperation | undefined>;
+/** Validate only the bounded, privacy-safe operation schema accepted by receipt readers. */
+export declare function isMergeReceiptOperation(value: unknown): value is MergeReceiptOperation;
+/** Prove HEAD, index, and working item all match the captured origin after Git leaves the operation. */
+export declare function isOriginalGitStateRestored(cwd: string, itemPath: string, operation: MergeReceiptOperation, expectedItemRaw?: string): Promise<boolean>;

package/dist/sdk/merge/receipt-operation.js

@@ -0,0 +1,97 @@
+/**
+ * @module sdk/merge/receipt-operation
+ * Records Git coordinates that let reconciliation prove a rebase restored its original state.
+ */
+
+!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]="7bef66b4-7131-5998-84bd-07983a25d762")}catch(e){}}();
+import { execFile } from "node:child_process";
+import { createHash } from "node:crypto";
+import { readdir } from "node:fs/promises";
+import path from "node:path";
+import { promisify } from "node:util";
+import { readBoundedRegularFile } from "./receipt-file-boundary.js";
+const execFileAsync = promisify(execFile);
+const GIT_OBJECT_ID = /^[a-f0-9]{40}(?:[a-f0-9]{24})?$/u;
+/** Capture a rebase's original commit and item blob, or omit unprovable coordinates. */
+export async function captureMergeReceiptOperation(cwd, itemPath) {
+    const trimmedItemPath = itemPath.trim();
+    const normalizedItemPath = /^(['"])(.*)\1$/su.exec(trimmedItemPath)?.[2] ?? trimmedItemPath;
+    for (const backend of ["rebase-merge", "rebase-apply"]) {
+        try {
+            const { stdout: marker } = await execFileAsync("git", [
+                "rev-parse",
+                "--path-format=absolute",
+                "--git-path",
+                `${backend}/orig-head`,
+            ], { cwd, timeout: 10_000 });
+            const originalHead = (await readBoundedRegularFile(marker.trim(), 128))?.trim();
+            if (originalHead === undefined || !GIT_OBJECT_ID.test(originalHead))
+                continue;
+            const { stdout } = await execFileAsync("git", ["rev-parse", "--verify", `${originalHead}:${normalizedItemPath}`], { cwd, timeout: 10_000 });
+            const originalBlob = stdout.trim();
+            return {
+                kind: "rebase",
+                original_head: originalHead,
+                original_blob: originalBlob,
+            };
+        }
+        catch {
+            // No evidence is safer than inferring an abandoned operation from item drift.
+        }
+    }
+    return undefined;
+}
+/** Validate only the bounded, privacy-safe operation schema accepted by receipt readers. */
+export function isMergeReceiptOperation(value) {
+    if (typeof value !== "object" || value === null || Array.isArray(value))
+        return false;
+    const record = value;
+    return (Object.keys(record).length === 3 &&
+        record.kind === "rebase" &&
+        typeof record.original_head === "string" &&
+        GIT_OBJECT_ID.test(record.original_head) &&
+        typeof record.original_blob === "string" &&
+        GIT_OBJECT_ID.test(record.original_blob));
+}
+/** Prove HEAD, index, and working item all match the captured origin after Git leaves the operation. */
+export async function isOriginalGitStateRestored(cwd, itemPath, operation, expectedItemRaw) {
+    if (expectedItemRaw !== undefined) {
+        const snapshotBlob = createHash(operation.original_blob.length === 40 ? "sha1" : "sha256")
+            .update(`blob ${Buffer.byteLength(expectedItemRaw)}\0`)
+            .update(expectedItemRaw)
+            .digest("hex");
+        if (snapshotBlob !== operation.original_blob)
+            return false;
+    }
+    try {
+        const { stdout: gitDirectory } = await execFileAsync("git", ["rev-parse", "--absolute-git-dir"], { cwd, timeout: 10_000 });
+        const activeMarkers = new Set([
+            "rebase-merge",
+            "rebase-apply",
+            "MERGE_HEAD",
+            "CHERRY_PICK_HEAD",
+            "REVERT_HEAD",
+        ]);
+        if ((await readdir(gitDirectory.trim())).some((entry) => activeMarkers.has(entry)))
+            return false;
+        const { stdout: head } = await execFileAsync("git", ["rev-parse", "HEAD"], {
+            cwd,
+            timeout: 10_000,
+        });
+        if (head.trim() !== operation.original_head)
+            return false;
+        const { stdout: originalBlob } = await execFileAsync("git", ["rev-parse", "--verify", `HEAD:${itemPath}`], { cwd, timeout: 10_000 });
+        if (originalBlob.trim() !== operation.original_blob)
+            return false;
+        const { stdout: blob } = await execFileAsync("git", ["hash-object", "--", path.resolve(cwd, itemPath)], { cwd, timeout: 10_000 });
+        if (blob.trim() !== operation.original_blob)
+            return false;
+        await execFileAsync("git", ["diff", "--cached", "--quiet", "HEAD", "--", itemPath], { cwd, timeout: 10_000 });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+//# sourceMappingURL=receipt-operation.js.map
+//# debugId=7bef66b4-7131-5998-84bd-07983a25d762

package/dist/sdk/merge/receipt-schema.d.ts

@@ -0,0 +1,20 @@
+import type { MergeDecisionReceipt, MergeReceiptInvalidEvidence } from "./receipts.js";
+/** Return whether a receipt id is safe to expose in cleartext diagnostics. */
+export declare function isSafeReceiptId(value: string): boolean;
+/** Versioned allowlist controlling which scalar evidence may enter tracked receipt sidecars. */
+export declare const DURABLE_VALUE_POLICY: "bounded_non_sensitive_scalars_v1";
+/** Return the narrowest validation class for untrusted receipt evidence. */
+export declare function receiptValidationError(value: unknown, evidenceSource: "clone_local" | "durable"): MergeReceiptInvalidEvidence["validation_error"] | null;
+/** Restore omitted non-selected slots from identified v1 clone-local writer contracts; never infer a missing retained or discarded value. */
+export declare function normalizeLegacyReceipt(value: unknown): unknown;
+/** Identify the rejected collection without exposing its values. */
+export declare function receiptCollectionValidationPath(value: unknown): string | undefined;
+/** Validate a complete receipt against its clone-local or durable evidence policy. */
+export declare function isMergeDecisionReceipt(value: unknown, evidenceSource: "clone_local" | "durable"): value is MergeDecisionReceipt;
+/** Extract a structurally valid precomputed SHA-256 decision hash. */
+export declare function isPrehashedValue(value: unknown): string | undefined;
+/** Convert a raw scalar into hashed evidence with an allowlisted preview. */
+export declare function durableValueEvidence(field: string, value: unknown): {
+    pm_value_hash: string;
+    pm_value?: unknown;
+};