pm-presets 2026.7.19 → 2026.7.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,15 @@
1
1
  # Changelog
2
2
 
3
+ ## 2026.7.23 - 2026-07-23
4
+
5
+ ### Fixed
6
+
7
+ - Recommend pm merge reconcile (2026.7.22) over raw history-repair in Multi-agent merge safety docs ([pm-jau2](https://github.com/unbraind/pm-presets/blob/main/.agents/pm/issues/pm-jau2.toon))
8
+
9
+ ### Other
10
+
11
+ - Adopt pm field-aware merge driver for multi-agent branch-merge safety ([pm-8mdk](https://github.com/unbraind/pm-presets/blob/main/.agents/pm/chores/pm-8mdk.toon))
12
+
3
13
  ## 2026.7.19 - 2026-07-19
4
14
 
5
15
  ### Other
package/README.md CHANGED
@@ -298,3 +298,22 @@ for (const preset of PRESET_REGISTRY) {
298
298
  ## License
299
299
 
300
300
  MIT
301
+
302
+ ## Multi-agent merge safety
303
+
304
+ This repo tracks its project management in `.agents/pm/` and ships a committed `.gitattributes`
305
+ that maps those tracker artifacts to pm-cli's field-aware Git merge drivers, so concurrent-branch
306
+ tracker edits merge cleanly instead of hard-conflicting. The driver **definitions** live in
307
+ 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
308
+ `pm merge install` only when the `pm` CLI is on `PATH`, and no-ops cleanly otherwise so
309
+ production / `--omit=dev` installs are not broken; being Node-based it behaves identically
310
+ on POSIX shells and Windows `cmd.exe`). To (re)run manually: `npm run merge:install`.
311
+
312
+ After merging a branch that touched `.agents/pm/`, reconcile any residual history-hash drift with
313
+ **`pm merge reconcile`** (pm-cli ≥ 2026.7.22): preview with `pm merge reconcile --dry-run`, apply with
314
+ `pm merge reconcile --message "post-merge reconcile"`, then confirm with `pm validate`, which scans the
315
+ whole tracker and flags remaining history drift across **every** affected item (`pm merge reconcile`
316
+ 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
317
+ content, so `reconcile` only re-greens the hash chain (no data loss) — see the authoritative
318
+ [pm-cli merge-safety guide](https://github.com/unbraind/pm-cli/blob/main/docs/MERGE_SAFETY.md). The
319
+ older blunt `pm history-repair --all` remains available as a lower-level primitive.
package/manifest.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pm-presets",
3
- "version": "2026.7.19",
3
+ "version": "2026.7.23",
4
4
  "description": "All 7 official pm-cli workspace presets in one package: bug-triage, indie-dev, open-source, software-sprint, startup-roadmap, kanban, agent-workflow",
5
5
  "author": "@unbraind",
6
6
  "entry": "./dist/index.js",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pm-presets",
3
- "version": "2026.7.19",
3
+ "version": "2026.7.23",
4
4
  "description": "All 7 official pm-cli workspace presets in one package: bug-triage, indie-dev, open-source, software-sprint, startup-roadmap, kanban, agent-workflow",
5
5
  "repository": {
6
6
  "type": "git",
@@ -42,14 +42,16 @@
42
42
  "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-presets/blob/main/.agents/pm --check",
43
43
  "release:check": "npm run typecheck && npm run build && npm test && npm run audit:prod && npm run pack:dry-run && npm run changelog:check",
44
44
  "prepublishOnly": "npm run release:check",
45
- "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-presets/blob/main/.agents/pm --pm-bin ./node_modules/.bin/pm --github-step-summary"
45
+ "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-presets/blob/main/.agents/pm --pm-bin ./node_modules/.bin/pm --github-step-summary",
46
+ "prepare": "node scripts/prepare-merge-driver.mjs",
47
+ "merge:install": "pm merge install"
46
48
  },
47
49
  "peerDependencies": {
48
50
  "@unbrained/pm-cli": ">=2026.7.10"
49
51
  },
50
52
  "devDependencies": {
51
53
  "@types/node": "^26.1.0",
52
- "@unbrained/pm-cli": "^2026.7.10",
54
+ "@unbrained/pm-cli": "^2026.7.22",
53
55
  "pm-changelog": "^2026.7.10",
54
56
  "typescript": "^7.0.2"
55
57
  },