dsh-git-badge 0.14.1 → 0.16.0

package/CHANGELOG.md

@@ -10,6 +10,171 @@ npm. 0.6.0 is the first release recorded here.
 
 ## [Unreleased]
 
+## [0.16.0] - 2026-09-16
+
+### Added
+
+- **A session now tells the badge which checkout it is working in.** dsh cannot
+  supply that fact — a session's `cwd` is immutable creation metadata and always
+  the main checkout — so the agent registers it explicitly:
+  `npx dsh-git-badge-checkout <path>` (shipped bin), run by the `git-worktree`
+  skill after `git worktree add` and by `/gh checkout` when a switch lands in or
+  out of a linked worktree. The node half prefers the registration, and
+  validates it: git's own worktree list must know the path, the entry expires
+  after 24h, and the name/branch come from git, never from the file. The
+  registration is self-clearing — removing it (or letting it expire) retires the
+  extra watcher and the badge returns to the session's own directory.
+
+- **A settings card for the ranking order: Settings → Plugins → Git Badge.**
+  The order now lives in this plugin's own `git-badge` settings namespace —
+  declared with a schema, validated and stored by the host, observed live — and
+  the card reorders the seven categories with up/down controls, Save/Discard,
+  and Reset to default. No file polling, no restart: a change applies to the
+  next status read. A pre-existing `~/.dsh/git-badge-next.json` seeds the
+  namespace as its base (and remains the fallback on hosts without the settings
+  stack), so an order configured before the card existed survives the upgrade.
+  `/gh order` still works for agent-driven changes.
+
+### Changed
+
+- **The ranking card sits in an expander, like the host's other plugin cards.**
+  Collapsed by default with the title and a one-line description; the list,
+  reorder controls, and Save/Discard/Reset live in the body, which auto-collapses
+  once a save settles clean. The card chrome reproduces the host's plugin-card
+  values inline (its CSS module is not exported to plugins), so it reads as one
+  of the set rather than loose content between it.
+
+- **PR inference is gone.** The badge no longer guesses a worktree from the
+  branch with an open pull request. The guess was invisible to the session that
+  made it and silently wrong whenever two trees were in play; a `worktreeInferred`
+  marker, the repository-wide `gh pr list` read that powered it, and the
+  inference wording in the hover all go with it. A session follows its
+  registration or stays on its own checkout — nothing else.
+
+## [0.15.0] - 2026-09-15
+
+### Changed
+
+- **Internal polish, no behaviour change:** the `detail=1` hover reads run in
+  one parallel batch (hover latency is the longest call, not the sum of seven
+  serial git spawns), the path-shortening and remote-URL conversion moved into
+  named helpers, and the three hover bodies share one row builder.
+
+### Added
+
+- **Merge-blocker phrasing in the branch hover.** A `BLOCKED` verdict says why
+  — `blocked: review required`, `blocked: checks failing`, `blocked: draft` —
+  combined with the ahead/behind-main counts when both apply, so a dead-end
+  word names the next action. CLEAN stays silent: the action row already
+  offers `/gh merge`.
+
+- **Staged names in the count's hover.** The stacked column gains a `staged:`
+  section above `unstaged` and `untracked`, completing the ✎n story — and
+  pairing with `/gh commit` when work is already staged.
+
+- **Two new `gh` verbs:** `/gh stash pop` (shows the top stash's subject,
+  confirms, and on conflict reports that the stash was NOT dropped) and
+  `/gh checkout <branch>` (states what is dirty and confirms when work would
+  carry over).
+
+### Added
+
+- **Unstaged names join the count's hover.** The ✎n tooltip stacks one column
+  with two sub-headers — `unstaged` (tracked, edited files; valid regardless of
+  the collapsed-untracked retry) above `untracked` — each capped at 20 with the
+  same last-two-segments shortening and "… and k more" arithmetic. The picker
+  question "what are these?" now answers for both halves of the count.
+
+- **The branch hover gains a merge-state row.** `main: N ahead, M behind`
+  against `origin/main` — in words, deliberately distinct from the upstream
+  sync arrows: "3 ahead, 0 behind" reads as "this is the PR's content";
+  "0 ahead, 5 behind" as "stale, rebase first". Absent entirely when in sync.
+
+- **The branch hover's commit list is signed and base-relative.** One mixed
+  list from `main...HEAD`: entries marked `+` are only on this branch (the
+  PR's content), `\u2212` only on main (what a rebase/merge brings in) — git's
+  own left-right verdict mapped onto the diff convention, sign before the
+  hash. Capped at 10 with the total from the same base; without a default
+  branch it degrades to the plain last 10, unsigned.
+
+- **A commits hover on the branch name.** Hovering the branch lists the
+  COMMITS THIS BRANCH ADDS (`log <upstream>..HEAD`) — hash + subject + age,
+  capped at 10 with the total from one `rev-list --count` so "… and k more" is
+  arithmetic — not the card's last-three-overall list. Hover-gated with the
+  rest of `detail=1`; absent when the branch adds nothing (no tooltip rather
+  than an empty one) and when there is no upstream (the publish suggestion
+  covers that case).
+
+### Changed
+
+- **The hover surfaces have one information architecture.** The branch name's
+  hover is the branch's LINEAGE and always renders: `upstream`, `sync` (in
+  words, "in sync with upstream" when clean), the commits this branch adds,
+  and the pull request when one exists. The status card loses its branch,
+  upstream, sync and pull-request rows — the branch name is the chip's own
+  text, and lineage facts belong beside the lineage surface — keeping action,
+  files, operation, worktree, checkout and stash.
+
+- **The status card no longer repeats what the other hovers own.** Its commits
+  row and untracked-names row are gone — commit listings live on the branch
+  name's hover, untracked names on the count's hover, and the server stopped
+  fetching the unused last-three-commits on every detail read. The card keeps
+  action, branch, upstream, sync, files, operation, PR, worktree, checkout,
+  stash.
+
+### Added
+
+- **A names-only hover on the ✎n count.** The count gets its own tooltip —
+  just the untracked list (one name per line, "… and k more"), no action row —
+  while the full card stays on the status mark. It shares the mark's lazy
+  detail fetch (resting on either triggers it once) and degrades to a plain
+  count without the Tooltip primitive or when nothing is untracked.
+
+### Added
+
+- **Untracked file names in the hover card.** The `✎n` count becomes
+  answerable — "what did I create here?" — with a `untracked:` row listing the
+  names, hover-gated with the rest of `detail=1` (computed when the card opens,
+  refreshed by the existing SSE invalidation; no per-edit cost). Posture: the
+  plugin's never-display-a-path rule is relaxed by an inch, not a mile —
+  RELATIVE names only, truncated to the last two path segments, capped at 20
+  with the total carried separately so "… and k more" is arithmetic, not a
+  guess. Collapsed-count payloads (huge untracked trees) omit the field
+  entirely rather than under-report with directory names.
+
+### Changed
+
+- **A smarter next-action state machine.** `nextStep` now ranks rule
+  candidates by category instead of first-match, and two new rules join the
+  table: a **diverged** branch (ahead AND behind) suggests `/gh sync` —
+  rebase-then-push, with the force-push confirmed by you — instead of a plain
+  pull that would discard the local-commit context; and a **merge-ready** PR
+  (GitHub's own `mergeState: CLEAN`, or checks passing + review approved)
+  suggests `/gh merge <n>` — the endgame action the old table could never see.
+- **Configurable ranking via `/gh order`.** The category order is one line of
+  JSON at `~/.dsh/git-badge-next.json`
+  (`{"order": ["operation","unmerged","sync","publish","merge","commit","checks"]}`);
+  any subset in any order, unlisted categories rank after in default order.
+  The `gh` skill gains the `sync`, `merge <n>` and `order` verbs — say
+  "/gh order commit first" and the agent edits the file. The server's ranked
+  `next` now carries the skill `args` directly, so the hover card and the (+)
+  picker lead with exactly what the server decided and only add secondary
+  actions around it.
+
+## [0.14.1] - 2026-09-15
+
+- **Skill alignment:** the `gh` skill gains an explicit handoff — one verb per
+  invocation is its whole job; the multi-step PR lifecycle (review, merge,
+  verify, cleanup) belongs to the `gh-pr` skill. The `gh-pr` skill states the
+  mirror scope: one-shot verbs are `gh`'s, lifecycle is its own. The catalog
+  stays global-only; repo conventions stay in `AGENTS.md`.
+
+- **The hover card is 33% wider** (360px → 480px) and its `action:` row now
+  carries a trailing what-comment in git-comment convention — e.g.
+  `action: /gh push  # push local commits to the remote` — so the row says
+  what the invocation does, not just which invocation it is. The picker in the
+  (+) menu shares the same descriptions.
+
 ## [0.14.1] - 2026-09-15
 
 ### Changed

package/README.md

@@ -5,13 +5,13 @@ Git status badges for [DeepSeek Harness](https://github.com/deepseek-ai/deepseek
 - **Input-row chip** — `● main ↑0 ↓2 ✎3` next to the access picker, showing the git state of the workspace the current conversation is attached to. Works on every install.
 - **Hover card** — rest a pointer on the chip for what won't fit: the file breakdown (`✎3` split into staged / unstaged / untracked), the last three commits, and the stash. Fetched only on hover, so the everyday badge pays nothing for it. Works on every install.
 - **PR / CI token** — `● main ↑0 ↓2 PR#142 ✗` when the branch has a GitHub pull request, read through your own `gh` CLI (the plugin never handles a credential). The token **links to the PR** — it opens in a new tab, and underlines when you hover or focus it. Invisible when `gh` cannot answer: not installed, not logged in, no GitHub remote, offline or rate-limited all render the unchanged chip, and a token with no URL to link to stays plain text.
-- **Worktree-aware** — a conversation's directory is fixed when it is created, so a conversation that does its work in a linked `git worktree` would otherwise keep reporting the main checkout. When exactly one linked worktree of that repository has an open pull request, the badge describes **that worktree** instead — its branch, counts, tree mark and PR/CI token (`🌳 chore/global-skills-tiering ↑0 ↓2 PR#391 ✓` rather than `● main`). The hover card names the tree in a `worktree` row, says it was inferred, and adds a `checkout` row with the conversation's own directory, so the main checkout's branch and dirty state stay one hover away. One candidate only — two open PRs across worktrees is a reason to say nothing rather than guess — and a session row always reports the checkout that session is working in.
+- **Worktree-aware** — a conversation's directory is fixed when it is created, so a conversation that does its work in a linked `git worktree` would otherwise keep reporting the main checkout. The session registers its checkout (`npx dsh-git-badge-checkout <path>`, run by the git-worktree and `/gh checkout` paths), and the badge describes **that worktree** instead — its branch, counts, tree mark and PR/CI token (`🌳 chore/global-skills-tiering ↑0 ↓2 PR#391 ✓` rather than `● main`). The hover card names the tree in a `worktree` row and adds a `checkout` row with the conversation's own directory, so the main checkout's branch and dirty state stay one hover away. Registrations are advisory: git's own worktree list validates the path, entries expire after 24h, and a workspace-targeted row always reports the checkout the registry owns.
 - **Sidebar session-row action token** — each session row shows the ONE thing that conversation needs from you, or nothing at all: `merge`, `fix CI`, `review`, `resolve`, `pull`, `push`. It is triage rather than status: `merge` appears only when GitHub itself reports `mergeStateStatus: CLEAN`, and every waiting state (draft, blocked, behind, checks still running) stays silent. Hovering the row adds a line naming the checkout and the pull request the action refers to. The token floats to the right of the row, is set heavier than the timestamp beside it, and is coloured by how much it needs you — red for a conflict or a failing build, amber for a requested review, green for `merge`, quiet grey for routine sync. Requires the `sidebar.workspaces.sessionRow` seam; without it the plugin degrades to chip-only and logs what's active to the browser console.
 - **Nothing on workspace rows.** A workspace cannot know which worktree its conversations are using, so a per-workspace badge could only guess or report the main checkout. The seam is on the session row for that reason.
 
 The leading **mark** belongs to the input chip: a circle filled with the status colour, or a **tree** when the checkout is a linked `git worktree`. The sidebar row deliberately carries no mark — see the row bullet above, where one word does the job a colour cannot. (`●`/`🌳` stand in for it here — it is a drawn SVG so that it can take the theme's status colours.)
 
-Event-driven freshness: working trees are watched and updates push over SSE — badges flip within ~1s of any commit, stage, or edit, including inside a linked worktree that is only inferred. One `git status --porcelain=v2` per sample, shared by every surface pointing at the same checkout, plus at most one `gh` read per repository-and-branch per ~90s and one repository-wide open-PR list per ~90s. The status API takes **no path**: the caller passes a session id (chip and sidebar rows) or a workspace id, and the server resolves the directory itself.
+Event-driven freshness: working trees are watched and updates push over SSE — badges flip within ~1s of any commit, stage, or edit, including inside a linked worktree the session registered. One `git status --porcelain=v2` per sample, shared by every surface pointing at the same checkout, plus at most one `gh` read per repository-and-branch per ~90s. The status API takes **no path**: the caller passes a session id (chip and sidebar rows) or a workspace id, and the server resolves the directory itself.
 
 Diagrams, the hover card's full field list and a walkthrough for git newcomers live
 in the [repo README](https://github.com/Kevin-McIsaac/dsh-workspace-git-badge) —