pm-graph 2026.7.21 → 2026.7.23

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2026.7.23 - 2026-07-23
+
+### Fixed
+
+- Recommend pm merge reconcile (2026.7.22) over raw history-repair in Multi-agent merge safety docs ([pm-graph-10e8](https://github.com/unbraind/pm-graph/blob/main/.agents/pm/issues/pm-graph-10e8.toon))
+
+### Other
+
+- Adopt pm field-aware merge driver for multi-agent branch-merge safety ([pm-graph-tjqb](https://github.com/unbraind/pm-graph/blob/main/.agents/pm/chores/pm-graph-tjqb.toon))
+
 ## 2026.7.18 - 2026-07-18
 
 ### Added

package/README.md

@@ -485,3 +485,22 @@ pm pm-graph ping
 ## Release Automation
 
 This package is release-ready for GitHub, npm, and Bun-compatible installs. CI runs type checking, build, production dependency audit, package packing, Bun install verification, and pm-changelog validation. The daily release workflow publishes only when commits exist after the latest release tag and uses pm-changelog to generate CHANGELOG.md and GitHub release notes.
+
+## Multi-agent merge safety
+
+This repo tracks its project management in `.agents/pm/` and ships a committed `.gitattributes`
+that maps those tracker artifacts to pm-cli's field-aware Git merge drivers, so concurrent-branch
+tracker edits merge cleanly instead of hard-conflicting. The driver definitions live in per-clone
+Git config; `npm install` / `npm ci` wires them automatically via the `prepare` script (a portable Node guard, `scripts/prepare-merge-driver.mjs`: it runs
+`pm merge install` only when the `pm` CLI is on `PATH`, and no-ops cleanly otherwise so
+production / `--omit=dev` installs are not broken; being Node-based it behaves identically
+on POSIX shells and Windows `cmd.exe`). To (re)run manually: `npm run merge:install`.
+
+After merging a branch that touched `.agents/pm/`, reconcile any residual history-hash drift with
+**`pm merge reconcile`** (pm-cli ≥ 2026.7.22): preview with `pm merge reconcile --dry-run`, apply with
+`pm merge reconcile --message "post-merge reconcile"`, then confirm with `pm validate`, which scans the
+whole tracker and flags remaining history drift across **every** affected item (`pm merge reconcile`
+itself lists each affected stream in its output; `pm history --verify <id>` spot-checks one item). The field-aware driver already unions every author's
+content, so `reconcile` only re-greens the hash chain (no data loss) — see the authoritative
+[pm-cli merge-safety guide](https://github.com/unbraind/pm-cli/blob/main/docs/MERGE_SAFETY.md). The
+older blunt `pm history-repair --all` remains available as a lower-level primitive.

package/dist/index.js

@@ -4,7 +4,7 @@ import { writeFileSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 const execFileAsync = promisify(execFile);
-const EXTENSION_VERSION = "2026.7.21";
+const EXTENSION_VERSION = "2026.7.23";
 // ---------------------------------------------------------------------------
 // Error contract
 // ---------------------------------------------------------------------------
@@ -2005,7 +2005,7 @@ export function activate(api) {
                         nodeCount: "Number of PmGraphNode entries in Neo4j (if connected)",
                         relationshipCount: "Number of relationships between PmGraphNode entries (if connected)",
                         lastSyncedAt: "Timestamp of the most recent sync (or null)",
-                        version: "2026.7.21",
+                        version: "2026.7.23",
                     },
                 };
             }

package/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "pm-graph",
-  "version": "2026.7.21",
+  "version": "2026.7.23",
   "description": "Knowledge graph and dependency graph extension for pm CLI workspaces, with optional Neo4j sync.",
   "entry": "./dist/index.js",
   "capabilities": [

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "pm-graph",
-  "version": "2026.7.21",
+  "version": "2026.7.23",
   "description": "Knowledge graph and dependency graph extension for pm CLI workspaces, with optional Neo4j sync.",
   "type": "module",
   "scripts": {
     "build": "tsc",
     "build:test": "tsc -p tsconfig.test.json",
     "typecheck": "tsc --noEmit",
-    "prepare": "npm run build",
+    "prepare": "node scripts/prepare-merge-driver.mjs",
     "check": "npm run typecheck",
     "audit:prod": "npm audit --omit=dev",
     "pack:dry-run": "npm pack --dry-run",
@@ -18,14 +18,15 @@
     "prepack": "npm run build",
     "test": "npm run build && npm run build:test && node --test dist-test/*.js",
     "prepublishOnly": "npm run release:check",
-    "release:notes": "pm-changelog --pm-root .agents/pm --stdout --since-previous-tag --until-release-tag --release-version-from-package --item-url-base https://github.com/unbraind/pm-graph/blob/main/.agents/pm --pm-bin ./node_modules/.bin/pm --github-step-summary"
+    "release:notes": "pm-changelog --pm-root .agents/pm --stdout --since-previous-tag --until-release-tag --release-version-from-package --item-url-base https://github.com/unbraind/pm-graph/blob/main/.agents/pm --pm-bin ./node_modules/.bin/pm --github-step-summary",
+    "merge:install": "pm merge install"
   },
   "dependencies": {
     "neo4j-driver": "^6.2.0"
   },
   "devDependencies": {
     "@types/node": "^26.1.1",
-    "@unbrained/pm-cli": "^2026.7.10",
+    "@unbrained/pm-cli": "^2026.7.22",
     "pm-changelog": "^2026.7.10",
     "typescript": "^7.0.2"
   },