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

package/README.md

@@ -167,3 +167,22 @@ MIT
 ## 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

@@ -798,7 +798,7 @@ function setupFlags(api) {
 // ---------------------------------------------------------------------------
 export default defineExtension({
     name: "pm-starter",
-    version: "2026.7.20",
+    version: "2026.7.23",
     activate(api) {
         // Register every capability group. Each helper is defensive enough to be
         // safely deleted when you fork this scaffold for a real extension.

package/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "pm-starter",
-  "version": "2026.7.20",
+  "version": "2026.7.23",
   "description": "Complete scaffold showing all 9 capability types: commands, renderers, hooks, schema, importers, search, parser, preflight, services. Includes plan workflow, context, and search integration examples plus guided setup. Use as a starting template for new extensions.",
   "author": "@unbraind",
   "entry": "./dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pm-starter",
-  "version": "2026.7.20",
+  "version": "2026.7.23",
   "description": "Complete starter/scaffold extension for pm-cli showing all capability types",
   "repository": {
     "type": "git",
@@ -33,14 +33,16 @@
     "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-starter/blob/main/.agents/pm --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-starter/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-starter/blob/main/.agents/pm --pm-bin ./node_modules/.bin/pm --github-step-summary",
+    "prepare": "node scripts/prepare-merge-driver.mjs",
+    "merge:install": "pm merge install"
   },
   "peerDependencies": {
     "@unbrained/pm-cli": ">=2026.7.5"
   },
   "devDependencies": {
     "@types/node": "^26.1.1",
-    "@unbrained/pm-cli": "^2026.7.5",
+    "@unbrained/pm-cli": "^2026.7.22",
     "pm-changelog": "^2026.6.30",
     "typescript": "^7.0.2"
   },