@unbrained/pm-cli 2026.9.2 → 2026.9.4

package/dist/sdk/init.js

@@ -4,7 +4,7 @@
  * Implements the pm init 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]="75c0d2d2-6a89-508f-b7dd-b43d55978b44")}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]="d06d4db7-8ab7-5a9f-84df-508bd305ea23")}catch(e){}}();
 import fs from "node:fs/promises";
 import path from "node:path";
 import readline from "node:readline/promises";
@@ -27,6 +27,8 @@ import { renderPmCommand } from "./command-line.js";
 import { runExtension } from "./extension.js";
 import { INIT_AGENT_GUIDANCE_MODE_VALUES, runInitAgentGuidance, } from "./init-agent-guidance.js";
 import { findGitWorkspaceRoot, installMergeFence } from "./merge/install.js";
+/** Symbol key for the captured working directory of an in-process init call. */
+export const INIT_INVOCATION_CWD = Symbol.for("pm.sdk.init-invocation-cwd");
 /** Implements summarize init result for the public runtime surface of this module. */
 export function summarizeInitResult(result) {
     return {
@@ -709,9 +711,21 @@ async function installInitMergeFence(pmRoot, gitWorkspaceRoot, warnings, install
         warnings.push(`merge_fence_skipped:install_failed:${error.context.code ?? "pm_error"}:${error.message}:run pm merge install after resolving the Git repository error`);
     }
 }
+async function ensureInitWorkspaceGitignore(workspaceRoot, pmRoot, agentGuidanceMode, warnings) {
+    if (workspaceRoot === undefined ||
+        workspaceRoot === null ||
+        agentGuidanceMode === "status") {
+        return;
+    }
+    const gitignore = await ensurePmGitignore(workspaceRoot, { pmRoot });
+    if (gitignore.changed) {
+        warnings.push(`updated:gitignore:${gitignore.path}`);
+    }
+}
 /** Implements run init for the public runtime surface of this module. */
 export async function runInit(prefixArg, global, options = {}) {
-    const cwd = process.cwd();
+    const invocationCwd = global[INIT_INVOCATION_CWD];
+    const cwd = typeof invocationCwd === "string" ? invocationCwd : process.cwd();
     const invocation = resolveInitInvocation(cwd, global, prefixArg, options.workspace);
     const pmRoot = invocation.pmRoot;
     prefixArg = resolveInitPrefixInput(invocation.prefixArg, options.idPrefix);
@@ -773,12 +787,7 @@ export async function runInit(prefixArg, global, options = {}) {
         settings = await readSettings(pmRoot);
     }
     await ensureInitTypeDirectories({ pmRoot, settings, createdDirs, warnings });
-    if (workspaceRoot && normalizedOptions.agentGuidanceMode !== "status") {
-        const gitignore = await ensurePmGitignore(workspaceRoot, { pmRoot });
-        if (gitignore.changed) {
-            warnings.push(`updated:gitignore:${gitignore.path}`);
-        }
-    }
+    await ensureInitWorkspaceGitignore(workspaceRoot, pmRoot, normalizedOptions.agentGuidanceMode, warnings);
     if (!settingsExists &&
         options.mergeFence !== false &&
         normalizedOptions.agentGuidanceMode !== "status") {
@@ -809,4 +818,4 @@ export async function runInit(prefixArg, global, options = {}) {
     };
 }
 //# sourceMappingURL=init.js.map
-//# debugId=75c0d2d2-6a89-508f-b7dd-b43d55978b44
+//# debugId=d06d4db7-8ab7-5a9f-84df-508bd305ea23

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

@@ -56,7 +56,9 @@ export interface MergeDriverResult {
     item?: {
         fields_from_theirs: string[];
         union_fields: string[];
-        conflict_resolution: "stable_value_order";
+        conflict_resolution: "latest_document_update";
+        /** Item scalars ignore branch-direction preference under the convergent recency policy. */
+        requested_preference_applied: false;
     };
     /** JSON-merge key accounting; present only for the json artifact. */
     json?: {

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]="2c8046a5-06aa-58f8-b347-e757086082d1")}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]="5dc5f70c-0b04-51bb-983b-49b15be11587")}catch(e){}}();
 import { readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { getActiveExtensionRegistrations } from "../../core/extensions/index.js";
@@ -18,11 +18,10 @@ 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 { sha256Hex, stableStringify } from "../../core/shared/serialization.js";
 import { nowIso } from "../../core/shared/time.js";
 import { getSettingsPath, resolvePmRoot } from "../../core/store/paths.js";
 import { readSettings } from "../../core/store/settings.js";
-import { mergeHistoryStreams, mergeItemDocuments, mergeJsonDocuments, mergeRelationshipEventStreams, } from "./three-way.js";
+import { hashItemScalarDecisionValue, mergeHistoryStreams, mergeItemDocuments, mergeJsonDocuments, mergeRelationshipEventStreams, } from "./three-way.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 = [
@@ -131,14 +130,15 @@ export async function runMergeDriver(options, global) {
             schema: settings?.schema,
             extensionFieldNames,
             preferred,
-            conflictResolution: "stable_value_order",
+            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: "stable_value_order",
+            conflict_resolution: "latest_document_update",
+            requested_preference_applied: false,
         };
         if (options.itemPath !== undefined) {
             const mergedDocument = parseItemDocument(merged, {
@@ -158,12 +158,12 @@ export async function runMergeDriver(options, global) {
                 cwd: process.cwd(),
                 itemPath: options.itemPath,
                 preferred,
-                conflictResolution: "stable_value_order",
+                conflictResolution: "latest_document_update",
                 fieldsFromTheirs: itemMerge.fields_from_theirs,
                 unionFields: itemMerge.union_fields,
                 mergedFieldHashes: Object.fromEntries(receiptFields.map((field) => [
                     field,
-                    sha256Hex(stableStringify(field === "body" ? mergedDocument.body : mergedMetadata[field])),
+                    hashItemScalarDecisionValue(field === "body" ? mergedDocument.body : mergedMetadata[field]),
                 ])),
                 decisions: itemMerge.conflict_decisions,
             };
@@ -191,7 +191,7 @@ export async function runMergeDriver(options, global) {
         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 direction-independent stable value. ${receiptGuidance} Review the merged file, re-apply the discarded change if needed, then "git add" it.`);
+        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.');
@@ -208,4 +208,4 @@ export async function runMergeDriver(options, global) {
     };
 }
 //# sourceMappingURL=driver.js.map
-//# debugId=2c8046a5-06aa-58f8-b347-e757086082d1
+//# debugId=5dc5f70c-0b04-51bb-983b-49b15be11587

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

@@ -6,7 +6,7 @@
  * merge-configuration installer. The CLI `pm merge` command is a shim over
  * this module so packages and hosts can reuse the same merge behavior.
  */
-export { ITEM_LATEST_TIMESTAMP_FIELDS, ITEM_UNION_COLLECTION_FIELDS, mergeHistoryStreams, mergeItemDocuments, mergeJsonDocuments, mergeRelationshipEventStreams, type HistoryMergeResult, type HistoryMergeStrategy, type ItemDocumentMergeResult, type JsonDocumentMergeResult, type ItemMergeConflictDecision, type MergePreferredSide, type RelationshipStreamMergeResult, } from "./three-way.js";
+export { ITEM_SCALAR_MISSING_VALUE, ITEM_LATEST_TIMESTAMP_FIELDS, ITEM_UNION_COLLECTION_FIELDS, encodeItemScalarDecisionValue, hashItemScalarDecisionValue, isItemScalarMissingValue, mergeHistoryStreams, mergeItemDocuments, mergeJsonDocuments, mergeRelationshipEventStreams, type HistoryMergeResult, type HistoryMergeStrategy, type ItemDocumentMergeResult, type JsonDocumentMergeResult, type ItemMergeConflictDecision, type ItemScalarConflictResolution, type ItemScalarResolutionBasis, type MergePreferredSide, type RelationshipStreamMergeResult, } from "./three-way.js";
 export { inspectMergeReceiptEvidence, listMergeReceipts, markMergeReceiptReconciled, runMergeReceiptEvidenceReport, runMergeReceiptReport, summarizeMergeReceipt, type MergeDecisionReceipt, type MergeDecisionReceiptSummary, type MergeReceiptEvidenceReport, type MergeReceiptEvidenceScan, type MergeReceiptInvalidEvidence, type MergeReceiptReport, } from "./receipts.js";
 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";

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]="0a17e896-d54a-5796-8be3-535179c4d6e0")}catch(e){}}();
-export { ITEM_LATEST_TIMESTAMP_FIELDS, ITEM_UNION_COLLECTION_FIELDS, mergeHistoryStreams, mergeItemDocuments, mergeJsonDocuments, mergeRelationshipEventStreams, } from "./three-way.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]="925be497-bdd3-527b-9a88-cf9c9f682ab2")}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=0a17e896-d54a-5796-8be3-535179c4d6e0
+//# debugId=925be497-bdd3-527b-9a88-cf9c9f682ab2

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

@@ -1,7 +1,8 @@
 import type { Stats } from "node:fs";
-import type { ItemMergeConflictDecision, MergePreferredSide } from "./three-way.js";
+import { type ItemMergeConflictDecision, type ItemScalarConflictResolution, type MergePreferredSide } from "./three-way.js";
 /** Return whether a receipt id is safe to expose in cleartext diagnostics. */
 export declare function isSafeReceiptId(value: string): boolean;
+declare const DURABLE_VALUE_POLICY: "bounded_non_sensitive_scalars_v1";
 /** One clone-local merge receipt with recoverable branch values. */
 export interface MergeDecisionReceipt {
     /** Receipt schema version. */
@@ -14,10 +15,12 @@ export interface MergeDecisionReceipt {
     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: "preferred_side" | "stable_value_order";
+    conflict_resolution: ItemScalarConflictResolution;
     /** Fields selected cleanly from the other branch. */
     fields_from_theirs: string[];
     /** Collections combined from both branches. */
@@ -33,7 +36,9 @@ export interface MergeDecisionReceipt {
     /** Reconciliation timestamp, when consumed. */
     reconciled_at?: string;
     /** Whether decision values are recoverable locally or represented by hashes only. */
-    value_availability?: "clone_local" | "hash_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";
 }
@@ -53,8 +58,10 @@ export interface MergeDecisionReceiptSummary {
     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: "preferred_side" | "stable_value_order";
+    conflict_resolution: ItemScalarConflictResolution;
     /** Hashes proving the retained and discarded values without publishing them. */
     decisions: Array<{
         field: string;
@@ -112,12 +119,15 @@ 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" | "copy_provenance_mismatch";
+    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";
     /** 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;
@@ -136,12 +146,13 @@ export declare function writeMergeReceipt(params: {
     cwd: string;
     itemPath: string;
     preferred: MergePreferredSide;
-    conflictResolution?: "preferred_side" | "stable_value_order";
+    conflictResolution?: ItemScalarConflictResolution;
     fieldsFromTheirs: string[];
     unionFields: string[];
     mergedFieldHashes?: Record<string, string>;
     decisions: ItemMergeConflictDecision[];
 }): 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?: {