pm-context 2026.7.20 → 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-context-164t](https://github.com/unbraind/pm-context/blob/main/.agents/pm/issues/pm-context-164t.toon))
+
+### Other
+
+- Adopt pm field-aware merge driver for multi-agent branch-merge safety ([pm-context-4apx](https://github.com/unbraind/pm-context/blob/main/.agents/pm/chores/pm-context-4apx.toon))
+
 ## 2026.7.14 - 2026-07-14
 
 ### Fixed

package/README.md

@@ -116,3 +116,22 @@ Options:
 Project management is context management. `pm-context` makes that concrete by
 turning pm's source-of-truth items into portable context that can be reviewed,
 sent to another agent, or attached to a pull request.
+
+## 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

@@ -853,7 +853,7 @@ function setupCommands(api) {
 }
 export default defineExtension({
     name: "pm-context",
-    version: "2026.7.20",
+    version: "2026.7.23",
     description: "Generate deterministic pm context packs for agent handoffs, reviews, and status briefs",
     activate(api) {
         setupCommands(api);

package/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "pm-context",
-  "version": "2026.7.20",
+  "version": "2026.7.23",
   "description": "Generate deterministic pm context packs for agent handoffs, reviews, and status briefs",
   "author": "@unbraind",
   "entry": "dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pm-context",
-  "version": "2026.7.20",
+  "version": "2026.7.23",
   "description": "Generate deterministic pm context packs for agent handoffs, reviews, and status briefs",
   "type": "module",
   "main": "dist/index.js",
@@ -26,7 +26,9 @@
     "changelog:check": "pm-changelog --pm-root .agents/pm --mode replace --output CHANGELOG.md --all-release-tags --release-version-from-package --item-url-base https://github.com/unbraind/pm-context/blob/main/.agents/pm --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-context/blob/main/.agents/pm --pm-bin ./node_modules/.bin/pm --github-step-summary",
     "release:check": "npm run typecheck && npm run build && npm test && npm run audit:prod && npm run pack:dry-run && npm run changelog:check",
-    "prepublishOnly": "npm run release:check"
+    "prepublishOnly": "npm run release:check",
+    "prepare": "node scripts/prepare-merge-driver.mjs",
+    "merge:install": "pm merge install"
   },
   "keywords": [
     "pm-cli",
@@ -50,7 +52,7 @@
   },
   "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"
   },