pm-jira 2026.7.22 → 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 +10 -0
- package/README.md +9 -3
- package/dist/index.js +1 -1
- package/manifest.json +1 -1
- package/package.json +3 -3
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-jira-xa9c](https://github.com/unbraind/pm-jira/blob/main/.agents/pm/issues/pm-jira-xa9c.toon))
|
|
8
|
+
|
|
9
|
+
### Other
|
|
10
|
+
|
|
11
|
+
- Adopt pm field-aware merge driver for multi-agent branch-merge safety ([pm-jira-pzau](https://github.com/unbraind/pm-jira/blob/main/.agents/pm/chores/pm-jira-pzau.toon))
|
|
12
|
+
|
|
3
13
|
## 2026.7.20-1 - 2026-07-20
|
|
4
14
|
|
|
5
15
|
### Added
|
package/README.md
CHANGED
|
@@ -381,14 +381,20 @@ drivers, so concurrent-branch tracker edits merge cleanly instead of hard-confli
|
|
|
381
381
|
|
|
382
382
|
The driver **definitions** live in per-clone Git config, so each clone must wire them
|
|
383
383
|
once. `npm install` / `npm ci` does this automatically via the `prepare` script
|
|
384
|
-
(
|
|
384
|
+
(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 it manually:
|
|
385
385
|
|
|
386
386
|
```bash
|
|
387
387
|
npm run merge:install # or: pm merge install
|
|
388
388
|
```
|
|
389
389
|
|
|
390
|
-
After merging a branch that touched `.agents/pm/`,
|
|
391
|
-
reconcile
|
|
390
|
+
After merging a branch that touched `.agents/pm/`, reconcile any residual history-hash drift with
|
|
391
|
+
**`pm merge reconcile`** (pm-cli ≥ 2026.7.22): preview with `pm merge reconcile --dry-run`, apply with
|
|
392
|
+
`pm merge reconcile --message "post-merge reconcile"`, then confirm with `pm validate`, which scans the
|
|
393
|
+
whole tracker and flags remaining history drift across **every** affected item (`pm merge reconcile`
|
|
394
|
+
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
|
|
395
|
+
content, so `reconcile` only re-greens the hash chain (no data loss) — see the authoritative
|
|
396
|
+
[pm-cli merge-safety guide](https://github.com/unbraind/pm-cli/blob/main/docs/MERGE_SAFETY.md). The
|
|
397
|
+
older blunt `pm history-repair --all` remains available as a lower-level primitive.
|
|
392
398
|
|
|
393
399
|
## Requirements
|
|
394
400
|
|
package/dist/index.js
CHANGED
|
@@ -1389,7 +1389,7 @@ const VALIDATE_FLAGS = [
|
|
|
1389
1389
|
];
|
|
1390
1390
|
export default defineExtension({
|
|
1391
1391
|
name: "pm-jira",
|
|
1392
|
-
version: "2026.7.
|
|
1392
|
+
version: "2026.7.23",
|
|
1393
1393
|
activate(api) {
|
|
1394
1394
|
// -----------------------------------------------------------------------
|
|
1395
1395
|
// schema — declare Jira provenance fields so the workspace knows them
|
package/manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pm-jira",
|
|
3
|
-
"version": "2026.7.
|
|
3
|
+
"version": "2026.7.23",
|
|
4
4
|
"description": "Jira issue sync for pm-cli",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"scripts": {
|
|
23
23
|
"build": "tsc",
|
|
24
24
|
"build:test": "tsc -p tsconfig.test.json",
|
|
25
|
-
"prepare": "
|
|
25
|
+
"prepare": "node scripts/prepare-merge-driver.mjs",
|
|
26
26
|
"merge:install": "pm merge install",
|
|
27
27
|
"test": "npm run build && npm run build:test && node --test dist-test/*.js",
|
|
28
28
|
"dev": "tsc --watch",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
46
|
"@types/node": "^26.1.1",
|
|
47
|
-
"@unbrained/pm-cli": "^2026.7.
|
|
47
|
+
"@unbrained/pm-cli": "^2026.7.22",
|
|
48
48
|
"pm-changelog": "^2026.7.8",
|
|
49
49
|
"typescript": "^7.0.2"
|
|
50
50
|
},
|