pm-ops 2026.8.29 → 2026.9.2

package/dist/index.d.ts

@@ -1,5 +1,98 @@
 import type { ExtensionApi } from "@unbrained/pm-cli/sdk/authoring";
-import { type MergeDecisionReceipt } from "@unbrained/pm-cli/sdk/merge";
+import { type MergeDecisionReceipt, type MergeDriverConfigurationAuditResult, type MergeFenceAuditResult } from "@unbrained/pm-cli/sdk/merge";
+/** One recoverable scalar decision recorded by the field-aware merge driver. */
+interface MergeReceiptDecisionView {
+    /** Metadata field name, or `body`. */
+    field: string;
+    /** Common-ancestor value. */
+    base: unknown;
+    /** Current-branch value. */
+    ours: unknown;
+    /** Other-branch value. */
+    theirs: unknown;
+    /** Value retained in the merged item. */
+    retained: unknown;
+    /** Value not retained in the merged item. */
+    discarded: unknown;
+}
+/** Clone-local merge decision receipt projected for the fleet report. */
+interface MergeReceiptView {
+    /** Opaque clone-local receipt identity. */
+    id: string;
+    /** Item whose merge produced the receipt. */
+    item_id: string;
+    /** Repo-relative item path reported by the current pm SDK. */
+    item_path: string;
+    /** Raw `item_path` exactly as Git recorded it (quotes preserved). */
+    item_path_raw: string;
+    /** Whether a merge reconciliation history event consumed this receipt. */
+    state: "pending" | "reconciled";
+    /**
+     * Side the merge requested for unresolvable scalar conflicts (the SDK's
+     * `requested_preference`, folding the legacy `preferred` key). Under the
+     * SDK's `stable_value_order` contract the *retained* value is the
+     * direction-independent stable one, so this field reports the requested
+     * side while `decisions[].retained` reports what actually won.
+     */
+    preferred: "ours" | "theirs";
+    /** Fields selected cleanly from the other branch. */
+    fields_from_theirs: string[];
+    /** Collections combined from both branches. */
+    union_fields: string[];
+    /** Full recoverable scalar decisions, retained only in the clone. */
+    decisions: MergeReceiptDecisionView[];
+    /** Receipt creation timestamp. */
+    created_at: string;
+    /** Reconciliation timestamp, when consumed. */
+    reconciled_at?: string;
+}
+/** Per-repo merge-receipt report combining driver/fence audit and receipts. */
+interface RepoMergeReceipts {
+    /** Absolute repo path. */
+    path: string;
+    /** Package name, else directory basename. */
+    name: string | null;
+    /** Whether a git workspace was found (receipts are clone-local under `.git`). */
+    available: boolean;
+    /** Clone-local merge-driver configuration audit, or null outside git. */
+    driver: MergeDriverConfigurationAuditResult | null;
+    /** Committed `.gitattributes` merge-fence audit, or null outside git. */
+    fence: MergeFenceAuditResult | null;
+    /** Receipts projected for the report. */
+    receipts: MergeReceiptView[];
+    /** Receipts in `state: "pending"`. */
+    pending_count: number;
+    /** Receipts in `state: "reconciled"`. */
+    reconciled_count: number;
+}
+/** Aggregated merge-receipt report across one or many repos. */
+interface MergeReceiptsResult {
+    /** ISO timestamp for the report. */
+    generated_at: string;
+    /** Per-repo reports in the order passed on `--repos`. */
+    repos: RepoMergeReceipts[];
+    /** Fleet-wide rollups driving the gate. */
+    summary: {
+        /** Total repos scanned. */
+        total: number;
+        /** Repos with at least one pending receipt. */
+        with_pending: number;
+        /** Total pending receipts across the fleet. */
+        total_pending: number;
+        /** Total reconciled receipts across the fleet. */
+        total_reconciled: number;
+        /** Repos whose merge driver is missing from clone-local git config. */
+        missing_driver: number;
+        /** Repos with no committed `.gitattributes` merge fence. */
+        missing_fence: number;
+        /** Repos whose driver commands do not match this installation (reported, not gated — upstream #773). */
+        drifted_driver: number;
+        /** Repos whose committed fence drifted from the active schema in either direction (reported). */
+        drifted_fence: number;
+        /** Repos whose fence leaves item paths UNCOVERED, so they fall back to git's line merge (gated). */
+        unprotected_fence: number;
+    };
+}
 /**
  * Project a receipt's requested preference side for the fleet view.
  *
@@ -11,6 +104,13 @@ import { type MergeDecisionReceipt } from "@unbrained/pm-cli/sdk/merge";
  * gives the legacy/default arms a directly testable home.
  */
 export declare function receiptPreferredSide(receipt: Readonly<Pick<MergeDecisionReceipt, "requested_preference" | "preferred">>): "ours" | "theirs";
+/**
+ * Render the merge-receipt report as a GitHub-flavoured markdown document: a
+ * fleet summary table, a per-repo driver/fence status line, and one row per
+ * receipt with its state, item id, repository-relative path, preferred side, and the
+ * retained/discarded values for every scalar conflict decision.
+ */
+export declare function renderMergeReceiptsMarkdown(result: MergeReceiptsResult): string;
 interface RepoMetrics {
     path: string;
     repo: string;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAA0C,MAAM,iCAAiC,CAAC;AAY5G,OAAO,EAKL,KAAK,oBAAoB,EAG1B,MAAM,6BAA6B,CAAC;AAiqDrC;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,sBAAsB,GAAG,WAAW,CAAC,CAAC,GAClF,MAAM,GAAG,QAAQ,CAEnB;AA4UD,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,uBAAuB,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,uBAAuB,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,wEAAwE;IACxE,sBAAsB,EAAE,MAAM,CAAC;IAC/B,sDAAsD;IACtD,yBAAyB,EAAE,MAAM,CAAC;IAClC,4EAA4E;IAC5E,sBAAsB,EAAE,MAAM,CAAC;IAC/B,wFAAwF;IACxF,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AA6KD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,WAAW,EAAE,GAAG,IAAI,CA0BvE;;;;kBAqNe,YAAY"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -1499,7 +1499,16 @@ function markdownCell(text, limit) {
     const truncated = escaped.slice(0, limit);
     return truncated.replace(/\\+$/, (slashes) => slashes.length % 2 === 0 ? slashes : slashes.slice(0, -1));
 }
-/** Render an unknown retained/discarded value as a short, single-line markdown cell. */
+/**
+ * Render an unknown retained/discarded value as a short, single-line markdown cell.
+ *
+ * `retained` and `discarded` are typed `unknown`, and a receipt written by an
+ * older pm merge driver can omit either one. pm 2026.8.31 always populates both
+ * for the conflict shapes the test lab produces, so this `undefined` arm is no
+ * longer reachable through a live merge — it is covered directly instead. Do not
+ * delete it: it is what keeps an older or partial receipt rendering as `-`
+ * rather than the string `"undefined"`.
+ */
 function describeDecisionValue(value) {
     if (value === undefined)
         return "-";
@@ -1512,7 +1521,7 @@ function describeDecisionValue(value) {
  * receipt with its state, item id, repository-relative path, preferred side, and the
  * retained/discarded values for every scalar conflict decision.
  */
-function renderMergeReceiptsMarkdown(result) {
+export function renderMergeReceiptsMarkdown(result) {
     const lines = [];
     lines.push("# pm-ops merge-receipts");
     lines.push("");
@@ -1541,6 +1550,10 @@ function renderMergeReceiptsMarkdown(result) {
         lines.push(renderMarkdownRow(["receipt", "item_id", "state", "item_path", "preferred", "field", "retained", "discarded"]));
         lines.push(renderMarkdownRow(["---", "---", "---", "---", "---", "---", "---", "---"]));
         for (const receipt of repo.receipts) {
+            // A receipt with no recoverable scalar decisions still deserves a row, so the
+            // report never silently omits a pending receipt. pm 2026.8.31 records at least
+            // one decision for every conflict the lab can produce, so this fallback is
+            // covered directly rather than through a live merge.
             const decisions = receipt.decisions.length > 0 ? receipt.decisions : [{ field: "-", retained: "-", discarded: "-" }];
             for (const decision of decisions) {
                 lines.push(renderMarkdownRow([
@@ -2034,7 +2047,7 @@ function renderDocstringsMarkdown(result) {
 const defineExtension = (module) => module;
 export default defineExtension({
     name: "pm-ops",
-    version: "2026.8.29",
+    version: "2026.9.2",
     activate(api) {
         if (typeof api.registerRenderer === "function") {
             // Derived from OPS_COMMAND_PATHS rather than restated. A literal copy is