pm-ops 2026.7.22 → 2026.7.25

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 ([ops-owhy](https://github.com/unbraind/pm-ops/blob/main/.agents/pm/issues/ops-owhy.toon))
+
+### Other
+
+- Adopt pm field-aware merge driver for multi-agent branch-merge safety ([ops-3ype](https://github.com/unbraind/pm-ops/blob/main/.agents/pm/chores/ops-3ype.toon))
+
 ## 2026.7.19 - 2026-07-19
 
 ### Other

package/README.md

@@ -295,6 +295,16 @@ MIT © unbrained
 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
-(guarded — 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). To (re)run manually: `npm run merge:install`. After merging a branch that
-touched `.agents/pm/`, run `pm history-repair --all` to reconcile history verification.
+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

@@ -1521,7 +1521,7 @@ function emitResult(structured, format, outputPath, formatter) {
 // ---------------------------------------------------------------------------
 export default defineExtension({
     name: "pm-ops",
-    version: "2026.7.22",
+    version: "2026.7.25",
     activate(api) {
         if (typeof api.registerRenderer === "function") {
             api.registerRenderer("toon", renderCommandResult);

package/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "pm-ops",
-  "version": "2026.7.22",
+  "version": "2026.7.25",
   "description": "Multi-repo fleet operations for pm-cli",
   "author": "@unbraind",
   "entry": "./dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pm-ops",
-  "version": "2026.7.22",
+  "version": "2026.7.25",
   "description": "Multi-repo fleet operations for pm-cli",
   "repository": {
     "type": "git",
@@ -28,13 +28,13 @@
     "check": "npm run typecheck",
     "audit:prod": "node --input-type=module -e \"import { spawnSync } from 'node:child_process'; import { devNull } from 'node:os'; const env = { ...process.env, npm_config_userconfig: devNull, NPM_CONFIG_USERCONFIG: devNull }; for (const key of Object.keys(env)) if (key.toLowerCase() === 'npm_config_allow_scripts') delete env[key]; const cmd = process.platform === 'win32' ? 'npm.cmd' : 'npm'; const r = spawnSync(cmd, ['audit', '--omit=dev'], { stdio: 'inherit', env }); process.exit(r.status ?? 1);\"",
     "pack:dry-run": "npm pack --dry-run",
-    "changelog": "pm-changelog --pm-root .agents/pm --mode prepend --output CHANGELOG.md --release-version-from-package --since-previous-tag --until-release-tag --item-url-base https://github.com/unbraind/pm-ops/blob/main/.agents/pm",
-    "changelog:full": "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-ops/blob/main/.agents/pm",
-    "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-ops/blob/main/.agents/pm --check",
+    "changelog": "pm-changelog --pm-root .agents/pm --mode prepend --output CHANGELOG.md --release-version-from-package --since-previous-tag --until-release-tag --item-url-base https://github.com/unbraind/pm-ops/blob/main/.agents/pm --respect-item-release",
+    "changelog:full": "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-ops/blob/main/.agents/pm --respect-item-release",
+    "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-ops/blob/main/.agents/pm --respect-item-release --check",
     "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",
-    "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-ops/blob/main/.agents/pm --pm-bin ./node_modules/.bin/pm --github-step-summary",
-    "prepare": "if command -v pm >/dev/null 2>&1; then pm merge install; fi",
+    "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-ops/blob/main/.agents/pm --respect-item-release --pm-bin ./node_modules/.bin/pm --github-step-summary",
+    "prepare": "node scripts/prepare-merge-driver.mjs",
     "merge:install": "pm merge install"
   },
   "peerDependencies": {
@@ -42,8 +42,8 @@
   },
   "devDependencies": {
     "@types/node": "26.1.1",
-    "@unbrained/pm-cli": "^2026.7.21",
-    "pm-changelog": "2026.7.18",
+    "@unbrained/pm-cli": "^2026.7.22",
+    "pm-changelog": "^2026.7.24",
     "typescript": "7.0.2"
   },
   "keywords": [