@unbrained/pm-cli 2026.9.7 → 2026.9.9

package/dist/sdk/mcp/transport.js

@@ -1,261 +1,2 @@
-/**
- * @module sdk/mcp/transport
- *
- * Implements MCP 2026-07-28 Streamable HTTP header encoding, schema-derived
- * custom header extraction, and body/header parity validation.
- */
-
-!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]="5ffe7128-0fbb-59af-89ef-74d5d799a00d")}catch(e){}}();
-import { PM_MCP_ERROR_CODES, PM_MCP_PROTOCOL_VERSION, PmMcpProtocolError, isMcpRecord, resolveMcpRequestContext, } from "./protocol.js";
-const BASE64_SENTINEL_PATTERN = /^=\?base64\?([A-Za-z0-9+/]*={0,2})\?=$/u;
-const HEADER_NAME_TOKEN_PATTERN = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/u;
-const PLAIN_HEADER_VALUE_PATTERN = /^[\t\x20-\x7E]*$/u;
-const REQUIRED_NAME_METHODS = new Set([
-    "prompts/get",
-    "resources/read",
-    "tools/call",
-]);
-function normalizedHeaders(headers) {
-    const normalized = new Map();
-    for (const [name, value] of Object.entries(headers)) {
-        if (value === undefined)
-            continue;
-        const entry = typeof value === "string" ? value : value.join(", ");
-        normalized.set(name.toLowerCase(), entry);
-    }
-    return normalized;
-}
-function failHeader(message, header) {
-    throw new PmMcpProtocolError(message, PM_MCP_ERROR_CODES.headerMismatch, {
-        header,
-    });
-}
-/** Encode a name or primitive parameter into the protocol's safe header form. */
-export function encodeMcpHttpHeaderValue(value) {
-    const serialized = typeof value === "boolean" ? String(value).toLowerCase() : String(value);
-    if (serialized.length > 0 &&
-        serialized.trim() === serialized &&
-        PLAIN_HEADER_VALUE_PATTERN.test(serialized) &&
-        !BASE64_SENTINEL_PATTERN.test(serialized)) {
-        return serialized;
-    }
-    return `=?base64?${Buffer.from(serialized, "utf8").toString("base64")}?=`;
-}
-/** Decode and validate a mirrored MCP header value. */
-export function decodeMcpHttpHeaderValue(value, header) {
-    const sentinel = BASE64_SENTINEL_PATTERN.exec(value);
-    if (sentinel) {
-        const encoded = sentinel[1];
-        const decoded = Buffer.from(encoded, "base64");
-        if (decoded.toString("base64") !== encoded || decoded.length === 0) {
-            return failHeader("Malformed MCP Base64 header value", header);
-        }
-        return decoded.toString("utf8");
-    }
-    if (value.length === 0 ||
-        value.trim() !== value ||
-        !PLAIN_HEADER_VALUE_PATTERN.test(value)) {
-        return failHeader("Malformed MCP header value", header);
-    }
-    return value;
-}
-function containsHeaderAnnotation(value) {
-    if (Array.isArray(value))
-        return value.some(containsHeaderAnnotation);
-    if (!isMcpRecord(value))
-        return false;
-    return (Object.prototype.hasOwnProperty.call(value, "x-mcp-header") ||
-        Object.values(value).some(containsHeaderAnnotation));
-}
-/** Validate and normalize one schema-derived custom-header annotation. */
-function parseMcpHeaderAnnotation(propertySchema, propertyPath, names) {
-    const annotation = propertySchema["x-mcp-header"];
-    if (annotation === undefined)
-        return undefined;
-    const type = propertySchema.type;
-    if (typeof annotation !== "string" ||
-        !HEADER_NAME_TOKEN_PATTERN.test(annotation) ||
-        !["boolean", "integer", "string"].includes(String(type)) ||
-        names.has(annotation.toLowerCase())) {
-        throw new PmMcpProtocolError("Invalid MCP x-mcp-header annotation", PM_MCP_ERROR_CODES.invalidParams, { field: propertyPath.join("."), annotation });
-    }
-    names.add(annotation.toLowerCase());
-    return {
-        name: annotation,
-        path: propertyPath,
-        type: type,
-    };
-}
-/** Parse valid statically reachable custom-header annotations from a tool schema. */
-export function collectMcpHeaderAnnotations(schema) {
-    if (!isMcpRecord(schema)) {
-        throw new PmMcpProtocolError("Invalid MCP tool schema", PM_MCP_ERROR_CODES.invalidParams, { field: "inputSchema", expected: "object" });
-    }
-    const annotations = [];
-    const names = new Set();
-    const visitProperties = (node, path) => {
-        const properties = node.properties;
-        if (properties === undefined)
-            return;
-        if (!isMcpRecord(properties)) {
-            throw new PmMcpProtocolError("Invalid MCP tool schema properties", PM_MCP_ERROR_CODES.invalidParams, { field: "inputSchema.properties" });
-        }
-        for (const [property, propertySchema] of Object.entries(properties)) {
-            if (!isMcpRecord(propertySchema))
-                continue;
-            const propertyPath = [...path, property];
-            const annotation = parseMcpHeaderAnnotation(propertySchema, propertyPath, names);
-            if (annotation)
-                annotations.push(annotation);
-            for (const [keyword, nested] of Object.entries(propertySchema)) {
-                if (keyword !== "properties" &&
-                    keyword !== "x-mcp-header" &&
-                    containsHeaderAnnotation(nested)) {
-                    throw new PmMcpProtocolError("MCP x-mcp-header is not statically reachable", PM_MCP_ERROR_CODES.invalidParams, { field: propertyPath.join("."), keyword });
-                }
-            }
-            visitProperties(propertySchema, propertyPath);
-        }
-    };
-    for (const [keyword, nested] of Object.entries(schema)) {
-        if (keyword !== "properties" && containsHeaderAnnotation(nested)) {
-            throw new PmMcpProtocolError("MCP x-mcp-header is not statically reachable", PM_MCP_ERROR_CODES.invalidParams, { field: "inputSchema", keyword });
-        }
-    }
-    visitProperties(schema, []);
-    return annotations;
-}
-function valueAtPath(value, path) {
-    let current = value;
-    for (const part of path) {
-        if (!isMcpRecord(current))
-            return undefined;
-        current = current[part];
-    }
-    return current;
-}
-function mirroredName(method, params) {
-    const value = method === "resources/read" ? params.uri : params.name;
-    return typeof value === "string" ? value : undefined;
-}
-function buildMcpCustomRequestHeaders(params, toolSchema) {
-    const argumentsValue = isMcpRecord(params.arguments) ? params.arguments : {};
-    const headers = {};
-    for (const annotation of collectMcpHeaderAnnotations(toolSchema)) {
-        const value = valueAtPath(argumentsValue, annotation.path);
-        if (value === undefined || value === null)
-            continue;
-        const valid = (annotation.type === "integer" &&
-            typeof value === "number" &&
-            Number.isSafeInteger(value)) ||
-            (annotation.type === "boolean" && typeof value === "boolean") ||
-            (annotation.type === "string" && typeof value === "string");
-        if (!valid) {
-            throw new PmMcpProtocolError("Invalid MCP custom header argument", PM_MCP_ERROR_CODES.invalidParams, { field: annotation.path.join("."), expected: annotation.type });
-        }
-        headers[`Mcp-Param-${annotation.name}`] = encodeMcpHttpHeaderValue(value);
-    }
-    return headers;
-}
-/** Build required Streamable HTTP headers for one modern client request. */
-export function buildMcpHttpRequestHeaders(input) {
-    const params = isMcpRecord(input.request.params)
-        ? input.request.params
-        : undefined;
-    const context = resolveMcpRequestContext(params);
-    const method = input.request.method;
-    if (typeof method !== "string" || method.length === 0) {
-        return failHeader("Missing MCP request method", "Mcp-Method");
-    }
-    const headers = {
-        Accept: "application/json, text/event-stream",
-        "Content-Type": "application/json",
-        "MCP-Protocol-Version": context.protocolVersion,
-        "Mcp-Method": method,
-    };
-    const name = mirroredName(method, params);
-    if (REQUIRED_NAME_METHODS.has(method)) {
-        if (name === undefined)
-            return failHeader("Missing MCP request name", "Mcp-Name");
-        headers["Mcp-Name"] = encodeMcpHttpHeaderValue(name);
-    }
-    if (method === "tools/call" && input.toolSchema !== undefined) {
-        Object.assign(headers, buildMcpCustomRequestHeaders(params, input.toolSchema));
-    }
-    return headers;
-}
-function validateMcpRequiredRequestHeaders(headers, request) {
-    const method = request.method;
-    if (typeof method !== "string" || method.length === 0) {
-        failHeader("Missing MCP request method", "Mcp-Method");
-    }
-    const params = isMcpRecord(request.params) ? request.params : undefined;
-    const expectedProtocol = resolveMcpRequestContext(params).protocolVersion;
-    if (headers.get("mcp-protocol-version") !== expectedProtocol) {
-        failHeader("MCP protocol header does not match request metadata", "MCP-Protocol-Version");
-    }
-    if (headers.get("mcp-method") !== method) {
-        failHeader("MCP method header does not match request body", "Mcp-Method");
-    }
-    if (REQUIRED_NAME_METHODS.has(method)) {
-        const headerName = headers.get("mcp-name");
-        const name = mirroredName(method, params);
-        if (headerName === undefined ||
-            name === undefined ||
-            decodeMcpHttpHeaderValue(headerName, "Mcp-Name") !== name) {
-            failHeader("MCP name header does not match request body", "Mcp-Name");
-        }
-    }
-    if (headers.has("last-event-id")) {
-        // The preceding match is an mcp-deprecation-negative-control: no resume/redelivery.
-        failHeader("MCP SSE resumability is not supported", "Last-Event-ID");
-    }
-}
-function customHeaderMatches(annotation, value, decoded) {
-    if (annotation.type === "integer") {
-        return (typeof value === "number" &&
-            Number.isSafeInteger(value) &&
-            Number(decoded) === value);
-    }
-    if (annotation.type === "boolean") {
-        return typeof value === "boolean" && decoded === String(value);
-    }
-    return typeof value === "string" && decoded === value;
-}
-function validateMcpCustomRequestHeaders(input) {
-    const argumentsValue = isMcpRecord(input.params.arguments)
-        ? input.params.arguments
-        : {};
-    for (const annotation of collectMcpHeaderAnnotations(input.toolSchema)) {
-        const value = valueAtPath(argumentsValue, annotation.path);
-        const header = `Mcp-Param-${annotation.name}`;
-        const mirrored = input.headers.get(header.toLowerCase());
-        if (value === undefined || value === null) {
-            if (mirrored !== undefined)
-                failHeader("Unexpected MCP parameter header", header);
-            continue;
-        }
-        if (mirrored === undefined)
-            failHeader("Missing MCP parameter header", header);
-        if (!customHeaderMatches(annotation, value, decodeMcpHttpHeaderValue(mirrored, header))) {
-            failHeader("MCP parameter header does not match request body", header);
-        }
-    }
-}
-/** Validate required Streamable HTTP headers against the JSON-RPC body. */
-export function validateMcpHttpRequestHeaders(input) {
-    const headers = normalizedHeaders(input.headers);
-    const method = typeof input.request.method === "string" ? input.request.method : "";
-    validateMcpRequiredRequestHeaders(headers, input.request);
-    if (method !== "tools/call" || input.toolSchema === undefined)
-        return;
-    validateMcpCustomRequestHeaders({
-        headers,
-        params: input.request.params,
-        toolSchema: input.toolSchema,
-    });
-}
-/** Required protocol version exposed for clients constructing headers manually. */
-export const PM_MCP_HTTP_PROTOCOL_VERSION = PM_MCP_PROTOCOL_VERSION;
+!(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]="7d591d0b-f009-519c-8024-c6fa18effb8e")}catch(e2){}})();import{PM_MCP_ERROR_CODES,PM_MCP_PROTOCOL_VERSION,PmMcpProtocolError,isMcpRecord,resolveMcpRequestContext}from"./protocol.js";const BASE64_SENTINEL_PATTERN=/^=\?base64\?([A-Za-z0-9+/]*={0,2})\?=$/u;const HEADER_NAME_TOKEN_PATTERN=/^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/u;const PLAIN_HEADER_VALUE_PATTERN=/^[\t\x20-\x7E]*$/u;const REQUIRED_NAME_METHODS=new Set(["prompts/get","resources/read","tools/call"]);function normalizedHeaders(headers){const normalized=new Map;for(const[name,value]of Object.entries(headers)){if(value===void 0)continue;const entry=typeof value==="string"?value:value.join(", ");normalized.set(name.toLowerCase(),entry)}return normalized}function failHeader(message,header){throw new PmMcpProtocolError(message,PM_MCP_ERROR_CODES.headerMismatch,{header})}function encodeMcpHttpHeaderValue(value){const serialized=typeof value==="boolean"?String(value).toLowerCase():String(value);if(serialized.length>0&&serialized.trim()===serialized&&PLAIN_HEADER_VALUE_PATTERN.test(serialized)&&!BASE64_SENTINEL_PATTERN.test(serialized)){return serialized}return`=?base64?${Buffer.from(serialized,"utf8").toString("base64")}?=`}function decodeMcpHttpHeaderValue(value,header){const sentinel=BASE64_SENTINEL_PATTERN.exec(value);if(sentinel){const encoded=sentinel[1];const decoded=Buffer.from(encoded,"base64");if(decoded.toString("base64")!==encoded||decoded.length===0){return failHeader("Malformed MCP Base64 header value",header)}return decoded.toString("utf8")}if(value.length===0||value.trim()!==value||!PLAIN_HEADER_VALUE_PATTERN.test(value)){return failHeader("Malformed MCP header value",header)}return value}function containsHeaderAnnotation(value){if(Array.isArray(value))return value.some(containsHeaderAnnotation);if(!isMcpRecord(value))return false;return Object.prototype.hasOwnProperty.call(value,"x-mcp-header")||Object.values(value).some(containsHeaderAnnotation)}function parseMcpHeaderAnnotation(propertySchema,propertyPath,names){const annotation=propertySchema["x-mcp-header"];if(annotation===void 0)return void 0;const type=propertySchema.type;if(typeof annotation!=="string"||!HEADER_NAME_TOKEN_PATTERN.test(annotation)||!["boolean","integer","string"].includes(String(type))||names.has(annotation.toLowerCase())){throw new PmMcpProtocolError("Invalid MCP x-mcp-header annotation",PM_MCP_ERROR_CODES.invalidParams,{field:propertyPath.join("."),annotation})}names.add(annotation.toLowerCase());return{name:annotation,path:propertyPath,type}}function collectMcpHeaderAnnotations(schema){if(!isMcpRecord(schema)){throw new PmMcpProtocolError("Invalid MCP tool schema",PM_MCP_ERROR_CODES.invalidParams,{field:"inputSchema",expected:"object"})}const annotations=[];const names=new Set;const visitProperties=(node,path)=>{const properties=node.properties;if(properties===void 0)return;if(!isMcpRecord(properties)){throw new PmMcpProtocolError("Invalid MCP tool schema properties",PM_MCP_ERROR_CODES.invalidParams,{field:"inputSchema.properties"})}for(const[property,propertySchema]of Object.entries(properties)){if(!isMcpRecord(propertySchema))continue;const propertyPath=[...path,property];const annotation=parseMcpHeaderAnnotation(propertySchema,propertyPath,names);if(annotation)annotations.push(annotation);for(const[keyword,nested]of Object.entries(propertySchema)){if(keyword!=="properties"&&keyword!=="x-mcp-header"&&containsHeaderAnnotation(nested)){throw new PmMcpProtocolError("MCP x-mcp-header is not statically reachable",PM_MCP_ERROR_CODES.invalidParams,{field:propertyPath.join("."),keyword})}}visitProperties(propertySchema,propertyPath)}};for(const[keyword,nested]of Object.entries(schema)){if(keyword!=="properties"&&containsHeaderAnnotation(nested)){throw new PmMcpProtocolError("MCP x-mcp-header is not statically reachable",PM_MCP_ERROR_CODES.invalidParams,{field:"inputSchema",keyword})}}visitProperties(schema,[]);return annotations}function valueAtPath(value,path){let current=value;for(const part of path){if(!isMcpRecord(current))return void 0;current=current[part]}return current}function mirroredName(method,params){const value=method==="resources/read"?params.uri:params.name;return typeof value==="string"?value:void 0}function buildMcpCustomRequestHeaders(params,toolSchema){const argumentsValue=isMcpRecord(params.arguments)?params.arguments:{};const headers={};for(const annotation of collectMcpHeaderAnnotations(toolSchema)){const value=valueAtPath(argumentsValue,annotation.path);if(value===void 0||value===null)continue;const valid=annotation.type==="integer"&&typeof value==="number"&&Number.isSafeInteger(value)||annotation.type==="boolean"&&typeof value==="boolean"||annotation.type==="string"&&typeof value==="string";if(!valid){throw new PmMcpProtocolError("Invalid MCP custom header argument",PM_MCP_ERROR_CODES.invalidParams,{field:annotation.path.join("."),expected:annotation.type})}headers[`Mcp-Param-${annotation.name}`]=encodeMcpHttpHeaderValue(value)}return headers}function buildMcpHttpRequestHeaders(input){const params=isMcpRecord(input.request.params)?input.request.params:void 0;const context=resolveMcpRequestContext(params);const method=input.request.method;if(typeof method!=="string"||method.length===0){return failHeader("Missing MCP request method","Mcp-Method")}const headers={Accept:"application/json, text/event-stream","Content-Type":"application/json","MCP-Protocol-Version":context.protocolVersion,"Mcp-Method":method};const name=mirroredName(method,params);if(REQUIRED_NAME_METHODS.has(method)){if(name===void 0)return failHeader("Missing MCP request name","Mcp-Name");headers["Mcp-Name"]=encodeMcpHttpHeaderValue(name)}if(method==="tools/call"&&input.toolSchema!==void 0){Object.assign(headers,buildMcpCustomRequestHeaders(params,input.toolSchema))}return headers}function validateMcpRequiredRequestHeaders(headers,request){const method=request.method;if(typeof method!=="string"||method.length===0){failHeader("Missing MCP request method","Mcp-Method")}const params=isMcpRecord(request.params)?request.params:void 0;const expectedProtocol=resolveMcpRequestContext(params).protocolVersion;if(headers.get("mcp-protocol-version")!==expectedProtocol){failHeader("MCP protocol header does not match request metadata","MCP-Protocol-Version")}if(headers.get("mcp-method")!==method){failHeader("MCP method header does not match request body","Mcp-Method")}if(REQUIRED_NAME_METHODS.has(method)){const headerName=headers.get("mcp-name");const name=mirroredName(method,params);if(headerName===void 0||name===void 0||decodeMcpHttpHeaderValue(headerName,"Mcp-Name")!==name){failHeader("MCP name header does not match request body","Mcp-Name")}}if(headers.has("last-event-id")){failHeader("MCP SSE resumability is not supported","Last-Event-ID")}}function customHeaderMatches(annotation,value,decoded){if(annotation.type==="integer"){return typeof value==="number"&&Number.isSafeInteger(value)&&Number(decoded)===value}if(annotation.type==="boolean"){return typeof value==="boolean"&&decoded===String(value)}return typeof value==="string"&&decoded===value}function validateMcpCustomRequestHeaders(input){const argumentsValue=isMcpRecord(input.params.arguments)?input.params.arguments:{};for(const annotation of collectMcpHeaderAnnotations(input.toolSchema)){const value=valueAtPath(argumentsValue,annotation.path);const header=`Mcp-Param-${annotation.name}`;const mirrored=input.headers.get(header.toLowerCase());if(value===void 0||value===null){if(mirrored!==void 0)failHeader("Unexpected MCP parameter header",header);continue}if(mirrored===void 0)failHeader("Missing MCP parameter header",header);if(!customHeaderMatches(annotation,value,decodeMcpHttpHeaderValue(mirrored,header))){failHeader("MCP parameter header does not match request body",header)}}}function validateMcpHttpRequestHeaders(input){const headers=normalizedHeaders(input.headers);const method=typeof input.request.method==="string"?input.request.method:"";validateMcpRequiredRequestHeaders(headers,input.request);if(method!=="tools/call"||input.toolSchema===void 0)return;validateMcpCustomRequestHeaders({headers,params:input.request.params,toolSchema:input.toolSchema})}const PM_MCP_HTTP_PROTOCOL_VERSION=PM_MCP_PROTOCOL_VERSION;export{PM_MCP_HTTP_PROTOCOL_VERSION,buildMcpHttpRequestHeaders,collectMcpHeaderAnnotations,decodeMcpHttpHeaderValue,encodeMcpHttpHeaderValue,validateMcpHttpRequestHeaders};
 //# sourceMappingURL=transport.js.map
-//# debugId=5ffe7128-0fbb-59af-89ef-74d5d799a00d

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

@@ -1,47 +1,2 @@
-
-!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;
-}
+!(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]="5fd3624a-d36b-58e6-8053-f2c0626e0c10")}catch(e2){}})();import{runHistoryRepair}from"../history-repair.js";import{isOriginalGitStateRestored}from"./receipt-operation.js";import{markMergeReceiptReconciled,summarizeMergeReceipt}from"./receipts.js";async function settleAbandonedMergeReceipts(params){if(params.cwd===null)return[];const settled=[];for(const receipt of params.receipts){if(receipt.operation===void 0||!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}export{settleAbandonedMergeReceipts};
 //# sourceMappingURL=abandoned-receipts.js.map
-//# debugId=cd45ee09-e4c3-5fc6-8253-1f1dc709a3a8

package/dist/sdk/merge/driver.js

@@ -1,213 +1,2 @@
-/**
- * @module sdk/merge/driver
- *
- * File-level git merge driver runner for tracker artifacts. Git invokes the
- * driver with the base (%O), ours (%A), and theirs (%B) temporary files; the
- * driver writes the merged content back to the ours path and reports whether
- * unresolvable conflicts remain. Conflicted artifacts are still written as
- * parseable documents (resolved toward the preferred side) so a conflicted
- * 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]="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";
-import { collectRegisteredItemFieldNames } from "../../core/extensions/item-fields.js";
-import { pathExists } from "../../core/fs/fs-utils.js";
-import { parseItemDocument } from "../../core/item/item-format.js";
-import { EXIT_CODE } from "../../core/shared/constants.js";
-import { PmCliError } from "../../core/shared/errors.js";
-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 = [
-    "item",
-    "history",
-    "relationship",
-    "json",
-];
-function resolveArtifact(value) {
-    const normalized = value.trim().toLowerCase();
-    if (MERGE_DRIVER_ARTIFACT_VALUES.includes(normalized)) {
-        return normalized;
-    }
-    throw new PmCliError(`Unknown merge artifact "${value}". Supported values: ${MERGE_DRIVER_ARTIFACT_VALUES.join(", ")}.`, EXIT_CODE.USAGE);
-}
-function resolvePreferredSide(value) {
-    if (value === undefined) {
-        return "ours";
-    }
-    const normalized = value.trim().toLowerCase();
-    if (normalized === "ours" || normalized === "theirs") {
-        return normalized;
-    }
-    throw new PmCliError(`Unknown --prefer value "${value}". Supported values: ours, theirs.`, EXIT_CODE.USAGE);
-}
-async function readSideFile(filePath, label) {
-    try {
-        return await readFile(filePath, "utf8");
-    }
-    catch {
-        throw new PmCliError(`Cannot read merge ${label} file at ${filePath}.`, EXIT_CODE.NOT_FOUND);
-    }
-}
-/**
- * Load the workspace settings when a tracker is initialized at the resolved pm
- * root, or fall back to format defaults when the driver runs outside a tracker
- * (git can invoke merge drivers before `pm init`, e.g. while rebasing the
- * commit that introduces the tracker).
- */
-async function loadOptionalSettings(global) {
-    const pmRoot = resolvePmRoot(process.cwd(), global.path);
-    if (!(await pathExists(getSettingsPath(pmRoot)))) {
-        return null;
-    }
-    return readSettings(pmRoot);
-}
-function itemFormatForPath(filePath, settings) {
-    if (filePath.endsWith(".md")) {
-        return "json_markdown";
-    }
-    if (filePath.endsWith(".toon")) {
-        return "toon";
-    }
-    return settings?.item_format ?? "toon";
-}
-/**
- * Execute one git merge-driver invocation for a tracker artifact. Reads the
- * three per-side versions, applies the artifact's field-aware merge semantics,
- * writes the merged content (parseable even when conflicted) to the output
- * path, and reports remaining conflicts so the CLI can exit non-zero and let
- * git mark the path unmerged.
- */
-export async function runMergeDriver(options, global) {
-    const artifact = resolveArtifact(options.artifact);
-    const preferred = resolvePreferredSide(options.prefer);
-    const outputPath = path.resolve(options.outputPath ?? options.oursPath);
-    const [baseRaw, oursRaw, theirsRaw] = await Promise.all([
-        readSideFile(options.basePath, "base"),
-        readSideFile(options.oursPath, "ours"),
-        readSideFile(options.theirsPath, "theirs"),
-    ]);
-    let merged;
-    let receiptInput;
-    const conflicts = [];
-    const result = {};
-    if (artifact === "history") {
-        const historyMerge = mergeHistoryStreams(baseRaw, oursRaw, theirsRaw);
-        merged = historyMerge.merged;
-        result.history = {
-            strategy: historyMerge.strategy,
-            common_entries: historyMerge.common_entries,
-            entries_from_ours: historyMerge.entries_from_ours,
-            entries_from_theirs: historyMerge.entries_from_theirs,
-            entries_total: historyMerge.entries_total,
-            reanchored: historyMerge.reanchored,
-        };
-    }
-    else if (artifact === "relationship") {
-        const relationshipMerge = mergeRelationshipEventStreams(baseRaw, oursRaw, theirsRaw);
-        merged = relationshipMerge.merged;
-        result.relationship = {
-            strategy: relationshipMerge.strategy,
-            common_entries: relationshipMerge.common_entries,
-            entries_from_ours: relationshipMerge.entries_from_ours,
-            entries_from_theirs: relationshipMerge.entries_from_theirs,
-            entries_total: relationshipMerge.entries_total,
-            reanchored: relationshipMerge.reanchored,
-        };
-    }
-    else if (artifact === "item") {
-        const settings = await loadOptionalSettings(global);
-        const itemFormat = itemFormatForPath(options.itemPath ?? outputPath, settings);
-        const extensionFieldNames = collectRegisteredItemFieldNames(getActiveExtensionRegistrations());
-        const itemMerge = mergeItemDocuments(baseRaw, oursRaw, theirsRaw, {
-            format: itemFormat,
-            schema: settings?.schema,
-            extensionFieldNames,
-            preferred,
-            conflictResolution: "latest_document_update",
-        });
-        merged = itemMerge.merged;
-        conflicts.push(...itemMerge.conflict_fields);
-        result.item = {
-            fields_from_theirs: itemMerge.fields_from_theirs,
-            union_fields: itemMerge.union_fields,
-            conflict_resolution: "latest_document_update",
-            requested_preference_applied: false,
-        };
-        if (options.itemPath !== undefined) {
-            const mergedDocument = parseItemDocument(merged, {
-                format: itemFormat,
-                schema: settings?.schema,
-                extensionFieldNames,
-            });
-            const mergedMetadata = mergedDocument.metadata;
-            const receiptFields = [
-                ...new Set([
-                    ...itemMerge.fields_from_theirs,
-                    ...itemMerge.union_fields,
-                    ...itemMerge.conflict_decisions.map((decision) => decision.field),
-                ]),
-            ];
-            receiptInput = {
-                cwd: process.cwd(),
-                itemPath: options.itemPath,
-                preferred,
-                conflictResolution: "latest_document_update",
-                fieldsFromTheirs: itemMerge.fields_from_theirs,
-                unionFields: itemMerge.union_fields,
-                mergedFieldHashes: Object.fromEntries(receiptFields.map((field) => [
-                    field,
-                    hashItemScalarDecisionValue(field === "body" ? mergedDocument.body : mergedMetadata[field]),
-                ])),
-                decisions: itemMerge.conflict_decisions,
-                operation: await captureMergeReceiptOperation(process.cwd(), options.itemPath),
-            };
-        }
-    }
-    else {
-        const jsonMerge = mergeJsonDocuments(baseRaw, oursRaw, theirsRaw, {
-            preferred,
-        });
-        merged = jsonMerge.merged;
-        conflicts.push(...jsonMerge.conflict_paths);
-        result.json = {
-            paths_from_theirs: jsonMerge.paths_from_theirs,
-        };
-    }
-    await writeFile(outputPath, merged, "utf8");
-    if (receiptInput !== undefined) {
-        const receipt = await writeMergeReceipt(receiptInput);
-        if (receipt !== null) {
-            result.receipt = summarizeMergeReceipt(receipt);
-        }
-    }
-    const guidance = [];
-    if (conflicts.length > 0) {
-        const receiptGuidance = result.receipt === undefined
-            ? 'Run "pm merge report" to inspect clone-local merge evidence.'
-            : `Run "pm merge report" and correlate receipt ${result.receipt.receipt_id} with item ${result.receipt.item_id}; clone-local discarded values are never copied into this result.`;
-        guidance.push(`Both branches changed ${conflicts.join(", ")}; the item driver kept the value from the later document update, with stable value order only as an equal-timestamp tie-break. --prefer does not apply to convergent item scalar conflicts. ${receiptGuidance} Review the merged file, re-apply the discarded change if needed, then "git add" it.`);
-    }
-    if (artifact === "history" && result.history?.reanchored) {
-        guidance.push('The merged history chain was re-anchored. Run "pm merge reconcile --dry-run" to inspect the complete post-merge repair, then "pm merge reconcile" to apply it; use --force only after explicitly accepting reported discards.');
-    }
-    return {
-        ok: conflicts.length === 0,
-        artifact,
-        output_path: outputPath,
-        requested_preference: preferred,
-        conflicts,
-        ...result,
-        guidance,
-        generated_at: nowIso(),
-    };
-}
+!(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]="47487ad3-22a0-52ac-8a42-ebaca439cb6e")}catch(e2){}})();import{readFile,writeFile}from"node:fs/promises";import path from"node:path";import{getActiveExtensionRegistrations}from"../../core/extensions/index.js";import{collectRegisteredItemFieldNames}from"../../core/extensions/item-fields.js";import{pathExists}from"../../core/fs/fs-utils.js";import{parseItemDocument}from"../../core/item/item-format.js";import{EXIT_CODE}from"../../core/shared/constants.js";import{PmCliError}from"../../core/shared/errors.js";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";const MERGE_DRIVER_ARTIFACT_VALUES=["item","history","relationship","json"];function resolveArtifact(value){const normalized=value.trim().toLowerCase();if(MERGE_DRIVER_ARTIFACT_VALUES.includes(normalized)){return normalized}throw new PmCliError(`Unknown merge artifact "${value}". Supported values: ${MERGE_DRIVER_ARTIFACT_VALUES.join(", ")}.`,EXIT_CODE.USAGE)}function resolvePreferredSide(value){if(value===void 0){return"ours"}const normalized=value.trim().toLowerCase();if(normalized==="ours"||normalized==="theirs"){return normalized}throw new PmCliError(`Unknown --prefer value "${value}". Supported values: ours, theirs.`,EXIT_CODE.USAGE)}async function readSideFile(filePath,label){try{return await readFile(filePath,"utf8")}catch{throw new PmCliError(`Cannot read merge ${label} file at ${filePath}.`,EXIT_CODE.NOT_FOUND)}}async function loadOptionalSettings(global2){const pmRoot=resolvePmRoot(process.cwd(),global2.path);if(!await pathExists(getSettingsPath(pmRoot))){return null}return readSettings(pmRoot)}function itemFormatForPath(filePath,settings){if(filePath.endsWith(".md")){return"json_markdown"}if(filePath.endsWith(".toon")){return"toon"}return settings?.item_format??"toon"}async function runMergeDriver(options,global2){const artifact=resolveArtifact(options.artifact);const preferred=resolvePreferredSide(options.prefer);const outputPath=path.resolve(options.outputPath??options.oursPath);const[baseRaw,oursRaw,theirsRaw]=await Promise.all([readSideFile(options.basePath,"base"),readSideFile(options.oursPath,"ours"),readSideFile(options.theirsPath,"theirs")]);let merged;let receiptInput;const conflicts=[];const result={};if(artifact==="history"){const historyMerge=mergeHistoryStreams(baseRaw,oursRaw,theirsRaw);merged=historyMerge.merged;result.history={strategy:historyMerge.strategy,common_entries:historyMerge.common_entries,entries_from_ours:historyMerge.entries_from_ours,entries_from_theirs:historyMerge.entries_from_theirs,entries_total:historyMerge.entries_total,reanchored:historyMerge.reanchored}}else if(artifact==="relationship"){const relationshipMerge=mergeRelationshipEventStreams(baseRaw,oursRaw,theirsRaw);merged=relationshipMerge.merged;result.relationship={strategy:relationshipMerge.strategy,common_entries:relationshipMerge.common_entries,entries_from_ours:relationshipMerge.entries_from_ours,entries_from_theirs:relationshipMerge.entries_from_theirs,entries_total:relationshipMerge.entries_total,reanchored:relationshipMerge.reanchored}}else if(artifact==="item"){const settings=await loadOptionalSettings(global2);const itemFormat=itemFormatForPath(options.itemPath??outputPath,settings);const extensionFieldNames=collectRegisteredItemFieldNames(getActiveExtensionRegistrations());const itemMerge=mergeItemDocuments(baseRaw,oursRaw,theirsRaw,{format:itemFormat,schema:settings?.schema,extensionFieldNames,preferred,conflictResolution:"latest_document_update"});merged=itemMerge.merged;conflicts.push(...itemMerge.conflict_fields);result.item={fields_from_theirs:itemMerge.fields_from_theirs,union_fields:itemMerge.union_fields,conflict_resolution:"latest_document_update",requested_preference_applied:false};if(options.itemPath!==void 0){const mergedDocument=parseItemDocument(merged,{format:itemFormat,schema:settings?.schema,extensionFieldNames});const mergedMetadata=mergedDocument.metadata;const receiptFields=[...new Set([...itemMerge.fields_from_theirs,...itemMerge.union_fields,...itemMerge.conflict_decisions.map(decision=>decision.field)])];receiptInput={cwd:process.cwd(),itemPath:options.itemPath,preferred,conflictResolution:"latest_document_update",fieldsFromTheirs:itemMerge.fields_from_theirs,unionFields:itemMerge.union_fields,mergedFieldHashes:Object.fromEntries(receiptFields.map(field=>[field,hashItemScalarDecisionValue(field==="body"?mergedDocument.body:mergedMetadata[field])])),decisions:itemMerge.conflict_decisions,operation:await captureMergeReceiptOperation(process.cwd(),options.itemPath)}}}else{const jsonMerge=mergeJsonDocuments(baseRaw,oursRaw,theirsRaw,{preferred});merged=jsonMerge.merged;conflicts.push(...jsonMerge.conflict_paths);result.json={paths_from_theirs:jsonMerge.paths_from_theirs}}await writeFile(outputPath,merged,"utf8");if(receiptInput!==void 0){const receipt=await writeMergeReceipt(receiptInput);if(receipt!==null){result.receipt=summarizeMergeReceipt(receipt)}}const guidance=[];if(conflicts.length>0){const receiptGuidance=result.receipt===void 0?'Run "pm merge report" to inspect clone-local merge evidence.':`Run "pm merge report" and correlate receipt ${result.receipt.receipt_id} with item ${result.receipt.item_id}; clone-local discarded values are never copied into this result.`;guidance.push(`Both branches changed ${conflicts.join(", ")}; the item driver kept the value from the later document update, with stable value order only as an equal-timestamp tie-break. --prefer does not apply to convergent item scalar conflicts. ${receiptGuidance} Review the merged file, re-apply the discarded change if needed, then "git add" it.`)}if(artifact==="history"&&result.history?.reanchored){guidance.push('The merged history chain was re-anchored. Run "pm merge reconcile --dry-run" to inspect the complete post-merge repair, then "pm merge reconcile" to apply it; use --force only after explicitly accepting reported discards.')}return{ok:conflicts.length===0,artifact,output_path:outputPath,requested_preference:preferred,conflicts,...result,guidance,generated_at:nowIso()}}export{MERGE_DRIVER_ARTIFACT_VALUES,runMergeDriver};
 //# sourceMappingURL=driver.js.map
-//# debugId=22b1f103-54de-5a63-a2d2-2f99181a73e2

package/dist/sdk/merge/index.js

@@ -1,17 +1,2 @@
-/**
- * @module sdk/merge
- *
- * Public SDK surface for multi-branch tracker merge semantics: field-aware
- * three-way merge primitives, the git merge-driver runner, and the repository
- * merge-configuration installer. The CLI `pm merge` command is a shim over
- * 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]="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";
+!(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]="4175f7f5-a689-5d05-982a-f92e21bc83e7")}catch(e2){}})();import{ITEM_SCALAR_MISSING_VALUE,ITEM_LATEST_TIMESTAMP_FIELDS,ITEM_UNION_COLLECTION_FIELDS,encodeItemScalarDecisionValue,hashItemScalarDecisionValue,isItemScalarMissingValue,mergeHistoryStreams,mergeItemDocuments,mergeJsonDocuments,mergeRelationshipEventStreams}from"./three-way.js";import{inspectMergeReceiptEvidence,listMergeReceipts,markMergeReceiptReconciled,runMergeReceiptEvidenceReport,runMergeReceiptReport,summarizeMergeReceipt}from"./receipts.js";import{MERGE_DRIVER_ARTIFACT_VALUES,runMergeDriver}from"./driver.js";import{auditMergeAttributeFence,auditMergeDriverConfiguration,buildMergeAttributePatterns,findGitWorkspaceRoot,PM_GITATTRIBUTES_END,PM_GITATTRIBUTES_START,PM_GITATTRIBUTES_V2_END,PM_GITATTRIBUTES_V2_START,refreshMergeAttributeFenceIfInstalled,resolveMergeInstallContext,runMergeInstall}from"./install.js";import{runMergeReconcile}from"./reconcile.js";export{ITEM_LATEST_TIMESTAMP_FIELDS,ITEM_SCALAR_MISSING_VALUE,ITEM_UNION_COLLECTION_FIELDS,MERGE_DRIVER_ARTIFACT_VALUES,PM_GITATTRIBUTES_END,PM_GITATTRIBUTES_START,PM_GITATTRIBUTES_V2_END,PM_GITATTRIBUTES_V2_START,auditMergeAttributeFence,auditMergeDriverConfiguration,buildMergeAttributePatterns,encodeItemScalarDecisionValue,findGitWorkspaceRoot,hashItemScalarDecisionValue,inspectMergeReceiptEvidence,isItemScalarMissingValue,listMergeReceipts,markMergeReceiptReconciled,mergeHistoryStreams,mergeItemDocuments,mergeJsonDocuments,mergeRelationshipEventStreams,refreshMergeAttributeFenceIfInstalled,resolveMergeInstallContext,runMergeDriver,runMergeInstall,runMergeReceiptEvidenceReport,runMergeReceiptReport,runMergeReconcile,summarizeMergeReceipt};
 //# sourceMappingURL=index.js.map
-//# debugId=5079995b-ef00-5fe3-b87d-0882ef976d10