@sentropic/h2a 0.85.18 → 0.85.19

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.
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "h2a",
3
3
  "description": "h2a — the single sentropic CLI/plugin for human-centered coordination of conversational and coding agents. Bundles the h2a coordination bus (MCP) plus the read-only track-mcp system of record. Skills (h2a + track + harness) are rendered onto the host on demand by `h2a install-skills` from each package's single source — never copied into the plugin.",
4
- "version": "0.85.18",
4
+ "version": "0.85.19",
5
5
  "author": {
6
6
  "name": "Fabien Antoine"
7
7
  },
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "h2a",
3
- "version": "0.85.18",
3
+ "version": "0.85.19",
4
4
  "description": "Coordinate Claude, Codex and other CLI agents through the local h2a bus, objective loops and track system of record.",
5
5
  "author": {
6
6
  "name": "Fabien Antoine"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sentropic/h2a",
3
- "version": "0.85.18",
3
+ "version": "0.85.19",
4
4
  "description": "h2a — the unified CLI + core for human-to-agent coordination.",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -51,7 +51,7 @@
51
51
  "@hono/mcp": "^0.3.0",
52
52
  "@hono/node-server": "^2.0.4",
53
53
  "@modelcontextprotocol/sdk": "^1.29.0",
54
- "@sentropic/track": "^0.85.18",
54
+ "@sentropic/track": "^0.85.19",
55
55
  "hono": "^4.12.23"
56
56
  },
57
57
  "peerDependencies": {
@@ -70,6 +70,24 @@ established tracking flow; otherwise recommend it without recording it. Never cr
70
70
  duplicate follow-up work from speculation. A handoff closes the diagnosed blocking item; it does not
71
71
  satisfy or defer any remaining explicit objective.
72
72
 
73
+ ## Rebase, never cherry-pick
74
+
75
+ To move committed work between branches, rebase — never cherry-pick. Cherry-pick copies a commit under a
76
+ new SHA, so the same change now exists twice with different identities: history diverges, a later merge or
77
+ rebase sees "different" commits, and the duplicate resurfaces in diffs, reviews, and merge-loss checks.
78
+
79
+ - To retarget a branch onto an updated base, `git rebase <base>` (or `git rebase --onto <newbase> <upstream>`
80
+ to replay only a specific range). The commits keep their logical identity and the branch stays linear.
81
+ - To isolate one feature's commits from an entangled branch, `git rebase --onto origin/main <commit>~1 <branch>`
82
+ replays exactly that range onto the base — a rebase, not a copy.
83
+ - `git cherry-pick` is reserved for the narrow case of applying a change to a branch that will NEVER share
84
+ history with the source (e.g. a backport to a frozen release line). It is not a tool for normal
85
+ branch-to-branch movement, and never a substitute for rebasing a feature onto a fresh base.
86
+
87
+ Rationale: this is the same non-duplication discipline the branch-lifecycle event-containment gate enforces
88
+ for `.track` — a copied commit is a second identity for one change, and every downstream tool then has to
89
+ reconcile two things that should have been one.
90
+
73
91
  ## Discipline first
74
92
 
75
93
  Process skills (`harness/brainstorm`, `harness/debug`) decide HOW to approach the task — invoke them