dsh-git-badge 0.19.0 → 0.20.1

package/CHANGELOG.md

@@ -10,6 +10,155 @@ npm. 0.6.0 is the first release recorded here.
 
 ## [Unreleased]
 
+## [0.20.1] - 2026-10-13
+
+### Fixed
+
+- **The row's token survives a status dot.** Upstream mounts the leading seat
+  only while a row's primary state is idle, and gives the 16px cell to its own
+  solid status dot otherwise: green for an unread completion, orange for a
+  pending interaction. A busy session that went idle therefore showed the dot
+  until the session was opened, while its checkout already had something to say.
+  The plugin now rides the row-action strip — the one per-row seat React mounts
+  in every state, hidden by CSS rather than unmounted — and paints the node
+  half's token over the dot from that marker plus one injected stylesheet. The
+  cell still decides: the fallback appears only when a solid dot occupies it, a
+  running spinner is left alone, `in sync` never replaces the dot, and the mark
+  is removed the moment the real seat returns. No upstream byte changes.
+
+## [0.20.0] - 2026-10-13
+
+### Added
+
+- **The session row shows its token as a leading glyph.** The node-half token
+  renders as a single glyph in the row's 16px leading cell, with the word as its
+  accessible name. It asks the same question the row card does (`pr=1`), so the
+  PR tokens `merge`, `review` and `fix CI` reach it too — not only the local
+  ones — and the two share one cache entry. With no token (clean and in sync) the
+  cell keeps the shared status mark. The seat is upstream's own
+  (`sidebar.session.row.leading`) — no patch and no install step.
+- **The leading glyph explains itself on the row's hover card.** The node half
+  attaches the winning rule's reason as `rowTokenWhy`, and the session-row hover
+  card renders the action as a label/value row — the glyph, the word and the
+  reason (for example `↑ push — no upstream configured`) — beside the checkout
+  and the pull request. The chip card renders the SAME `action` row from one
+  shared helper, so the two cannot describe the icon differently.
+- **New row tokens** for states the earlier table could not name: `resume` (a
+  paused operation), `resolve` (a PR that conflicts with its base), `review`
+  (changes requested, or a review required), `sync` (diverged), `update` (the
+  PR is behind its base) and `commit` (dirty work).
+- **Two ranking categories: `conflict` and `review`.** Both are row-only —
+  no `/gh` verb covers them — so they triage the row without entering the
+  action list the picker offers. They join the Settings → Plugins → Git Badge
+  order card.
+
+### Changed
+
+- **The session-row hover card leads with the action and names dirty work.** The
+  `action` label/value row is now the same header the chip card uses, and a
+  `changes` row appears when the checkout is dirty — so a higher-ranked token
+  (`push`, `review`, `merge`) can no longer hide uncommitted work. A clean row
+  keeps its short card. The `checkout` and `pull request` rows are unchanged.
+
+- **The chip's hover card leads with the action and splits the merge row.** The
+  checkout verdict is now a heading (the token glyph, the word and the reason)
+  instead of an `action` label/value row, the server's suggestion is named
+  `next step` with a `▸` marker, `files` is renamed `changes`, and the merge row
+  is split into `state` (the pull-request verdict) and `base` (the ahead/behind
+  counts). A labelled `branch` divider separates the checkout rows from the
+  branch rows. Both cards still share one action sentence.
+
+- **The node half is the single authority for the row's word.** `nextActions`
+  now returns `rowToken` alongside `actions` and `next`, and the route attaches
+  it to every status response. The client row reads that token instead of
+  re-deriving the rules, so the chip, the picker and the row cannot drift.
+  A stored order that predates the two new categories keeps its ranking, with
+  them appended (they rank last until reordered in Settings).
+- **The node half is also the single authority for the icon's COLOUR.**
+  `nextActions` returns `rowSeverity` (`error`, `warn`, `success` or `business`)
+  with the token, and the route attaches it to every token-bearing response. The
+  client holds one severity-to-colour map instead of a token-to-colour map, so
+  the chip and the row agree about how loud a state is. No pixel changes: the
+  severity of each token keeps the colour that token had.
+- **The glyph is the ONLY icon.** The drawn disc/tree mark is gone. Both surfaces
+  show the node half's token icon: the input chip at the head of its leading
+  cluster, the sidebar row in its 16px leading cell. A checkout with no token —
+  clean and in sync — draws NOTHING, because there is no action to name. The four
+  hairline tokens (`push`, `pull`, `sync`, `update`) are DRAWN as 12x12 arrows in
+  `currentColor`, because `↑ ↓ ⇄ ↻` are hairline strokes in the shell's font and no
+  weight makes them as solid as `✚ ✓ ✗ ◆`. The six text glyphs sit at 13px, and the
+  card's action-row glyph is bold for every token.
+- **A session is never iconless: the `in sync` disc.** With no rule at all, the
+  node half returns `rowToken: "in sync"` plus a reason and a colour role, so the
+  chip and the row draw a disc and the card explains it. The colour carries the
+  merge fact: `success` (green) when no commit is ahead of the base, `warn` (amber)
+  when some are — so a clean but unmerged feature branch no longer reads as all
+  clear. Only a non-repository still returns null.
+- **The idle disc's colour matches on every surface.** `mainAhead`/`mainBehind`
+  were detail-only, so the chip and the session row read a GREEN disc while the
+  chip's hover card read AMBER for the same checkout. The branch-vs-base relation
+  is cached (like the default branch) and attached to every response. The first
+  read may answer without it; the next one carries it.
+- **The merge icon is Remix Icon `git-merge-line`.** `merge` no longer renders
+  the text check `✓`, which read as "done" rather than "merge". Unicode has no
+  merge glyph, so the icon is Remix Icon's artwork, vendored verbatim as inline
+  SVG and rendered at 16px — the branch-into-a-trunk shape that GitHub, VS Code,
+  Font Awesome and Material all use. No icon font is involved.
+- **The chip card is ONE card.** The retired mark was the card's only anchor, so
+  the checkout's verdict rows and the branch's lineage rows merged into one card
+  on the leading cluster (glyph and branch together). Hovering either opens it,
+  and a clean checkout opens it from the branch name.
+- **The PR token's state glyph is coloured.** The `✓`/`✗`/`…` that follows
+  `PR#142` takes the CI colour (green passing, red failing, amber running). The
+  number and the link keep the chip's own muted colour, so only the state shouts.
+- **The install has one step again.** The session row no longer uses a patched
+  seat, so there is no `npx dsh-git-badge apply` and no `postinstall` hook. The
+  leading glyph and the hover card are upstream's own seats.
+- **The chip card's picker row is `next`.** The `/gh` invocation moved out of the
+  `action` row, which now mirrors the icon. The chip's own-checkout row is
+  `own checkout`, so `checkout` names what a session-row card describes.
+- **One word per action: `publish` is gone.** The no-upstream rule uses the
+  picker's verb `push`, so the chip and the row say the same word. The `publish`
+  RANKING CATEGORY keeps its name.
+
+### Fixed
+
+- **The `push` suggestion no longer offers a command git refuses.** A branch
+  created from `origin/main` tracks `origin/main`, so a bare `git push` is
+  refused under the default `push.default=simple` because the upstream branch
+  name does not match the local branch name. The push rule now detects that
+  case and suggests `git push -u <remote> <branch>`, which publishes under the
+  branch's own name and repairs the upstream in one step. The `/gh push` skill
+  gained the same case.
+
+### Removed
+
+- **The drawn status mark.** `StatusMark`, `badgeStatus`, `MARK_FILL` and
+  `STATUS_LABEL` are gone from the client, with the disc/tree geometry, the
+  three-state colour rule and the `git: <status>` accessible names. Worktree-ness
+  is named in the card's `worktree` row rather than drawn. With it went the
+  `mark`, `markShape` and `markFill` test helpers.
+- **The seam patcher.** `seam/anchors.js`, `seam/patch.js`, `seam/stub-index.js`
+  and the patch half of `seam/apply.js` are gone, together with the repo's
+  `seam/` snapshots and its `apply.sh` / `make-patch.sh` wrappers. The package's
+  only CLI verb is `checkout` (`seam/cli.js` + `seam/checkout.js`): there is no
+  `apply`, `status` or `revert` to run.
+- **The `dsh-git-badge-seam` bin.** No patcher answers to that name.
+- **The `sidebar.workspaces.sessionRow` word pill.** It was the patch's only
+  consumer. The row now shows the token glyph in its leading cell on every
+  install, so there is no second surface and no seam to maintain.
+- **The restart-pending marker** (`seamRestartPending` on the status response).
+  It existed only to tell the running UI that a patch had changed DSH files on
+  disk.
+- **The `postinstall` script.** It applied the patch at install time; with no
+  patch needed it would only churn the user's DSH package.
+
+### Migration
+
+- An install that an older version patched still works. To restore pristine
+  bytes, reinstall DSH (`npm i -g @deepseek-ai/dsh@latest`); the plugin has no
+  command for it any more. Nothing in the plugin needs the patch.
+
 ## [0.19.0] - 2026-10-12
 
 ### Fixed

package/README.md

@@ -2,14 +2,14 @@
 
 Git status badges for [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness):
 
-- **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.
+- **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. The leading glyph is the action the node half picked; with no action the chip starts at the branch name. 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 ten 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. 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. It appears only when the session is **idle** — while a turn is running the row stays quiet, because the checkout is still moving and a suggestion would describe a state that is about to change. Requires the `sidebar.workspaces.sessionRow` seam for the row token itself; without it the row stays bare and the plugin logs what's active to the browser console. The hover-card line does **not** need the patch — it renders through upstream's own `sidebar.session.row.hover` seat.
-- **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.
+- **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. 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 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 an `own 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 glyph** — each session row shows the ONE thing that conversation needs from you: `resume`, `resolve`, `sync`, `pull`, `update`, `push`, `merge`, `commit`, `review`, `fix CI`, or `in sync` when there is nothing to do. The node half is the single authority: it ranks the rules and attaches a `rowToken` and its `rowSeverity` to every status response, so the chip, the picker and the row cannot drift. It is triage rather than status: `merge` appears only when GitHub itself reports `mergeStateStatus: CLEAN`, and every waiting state (draft, blocked, checks still running) stays silent. The token renders as a single coloured icon, in the row's 16px leading cell and at the head of the input chip: red for a conflict, a paused operation or a failing build, amber for a requested review, green for `merge`, quiet blue for routine sync, and amber for the `in sync` disc when commits are not yet merged. It appears only when the session is **idle** — while a turn is running upstream shows its own status dots there, because the checkout is still moving and a suggestion would describe a state that is about to change. With nothing to do the node emits `in sync`, so a session is never iconless: a disc in both surfaces, green when the branch is the default branch or its work is merged, amber when commits are not yet merged. The same hover card explains it. Hovering the row opens the row's usual hover card, which renders the action as a label/value row — the icon, the word and the reason (`↑ push — no upstream configured`) — beside the checkout and the pull request. **No patch and no install step:** the glyph rides upstream's own `sidebar.session.row.leading` seat, and the explanation rides `sidebar.session.row.hover`, so both work on a pristine install.
+- **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 token 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.)
+There is no drawn status mark: the leading **icon** is the node half's action token, and its colour is the severity. The same icon leads the input chip and the session row's 16px cell. Four tokens are drawn arrows, the idle verdict is a drawn disc, and the rest are text glyphs. The card's `worktree` row names a linked checkout.
 
 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 ~20s. 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.
 
@@ -25,7 +25,15 @@ dsh plugin --profile web add dsh-git-badge
 
 Restart the web process, refresh the browser. Requires Node ≥ 20 and `git` on PATH. `gh`, on PATH and authenticated, is optional — it only enables the PR/CI token.
 
-Seam details: [github.com/Kevin-McIsaac/dsh-workspace-git-badge](https://github.com/Kevin-McIsaac/dsh-workspace-git-badge) (SEAM.md / PR.md).
+**No seam patch.** `npx dsh-git-badge checkout <path>` (or the
+`dsh-git-badge-checkout` bin) is the only CLI verb: it registers the checkout a
+session is working in, so the badge follows a linked worktree.
+
+## Sidebar technical details
+
+Both surfaces ride upstream seats: the status icon on
+`sidebar.session.row.leading` (a 16px, idle-only cell), the hover card on
+`sidebar.session.row.hover`.
 
 ## Changelog