dsh-git-badge 0.17.2 → 0.17.4

package/CHANGELOG.md

@@ -10,6 +10,41 @@ npm. 0.6.0 is the first release recorded here.
 
 ## [Unreleased]
 
+## [0.17.4] - 2026-09-18
+
+### Fixed
+
+- **The documented patcher command finally runs.** Every prompt the product
+  shows — the input-chip tooltip, the postinstall hint, the README — says
+  `npx dsh-git-badge apply`, and every one of them failed with
+  "could not determine executable to run": npm's npx auto-runs a bin only when
+  the bin's name matches the package name, and the package shipped two bins
+  (`dsh-git-badge-seam`, `dsh-git-badge-checkout`) that did not match. The
+  0.9.1 note below claimed npx runs a package's single bin under its own name —
+  wrong npm behavior, shipped untested; `npx dsh-git-badge-seam` fared no
+  better (404 — no *package* carries that name; npx resolves package names,
+  then looks up a bin inside them). The fix is the alias the prompts always
+  assumed: bin `"dsh-git-badge": "seam/apply.js"`. The alias also multiplexes
+  the checkout bin (`npx dsh-git-badge checkout <path|--clear>` dispatches to
+  `seam/checkout.js`), because npx cannot reach a package's second bin by
+  name at all — so the gh skill, the README and checkout's own usage text now
+  name the working form everywhere the old `dsh-git-badge-checkout` spelling
+  appeared. The legacy bins stay for direct invocation.
+
+## [0.17.3] - 2026-09-17
+
+### Fixed
+
+- **The default branch is now detected when `refs/remotes/origin/HEAD` is
+  missing.** `defaultBranchFor` read only that symref, so in a repo that has
+  none — `git clone --branch <x>`, a pruned ref, or any repo that was only ever
+  pushed to — it answered "no default branch" forever. Every default-branch rule
+  was therefore silently inert: the 0.17.2 merge row on `main` still said
+  `no pull request`, and the node half still suggested opening a pull request
+  FROM the default branch. The lookup now falls back, network-free, to the base
+  branch this module already probes (`origin/main`, then `origin/master`); a
+  repo whose default is neither still answers `undefined`, exactly as before.
+
 ## [0.17.2] - 2026-09-17
 
 ### Fixed
@@ -722,7 +757,8 @@ npm. 0.6.0 is the first release recorded here.
 - `detail=1` is annotated as having no consumer yet (the hover card remains
   pending). Its comment previously claimed `log -1` while the code ran `log -3`.
 
-[Unreleased]: https://github.com/Kevin-McIsaac/dsh-workspace-git-badge/compare/v0.17.2...HEAD
+[Unreleased]: https://github.com/Kevin-McIsaac/dsh-workspace-git-badge/compare/v0.17.3...HEAD
+[0.17.3]: https://github.com/Kevin-McIsaac/dsh-workspace-git-badge/releases/tag/v0.17.3
 [0.17.2]: https://github.com/Kevin-McIsaac/dsh-workspace-git-badge/releases/tag/v0.17.2
 [0.17.1]: https://github.com/Kevin-McIsaac/dsh-workspace-git-badge/releases/tag/v0.17.1
 [0.17.0]: https://github.com/Kevin-McIsaac/dsh-workspace-git-badge/releases/tag/v0.17.0

package/README.md

@@ -5,7 +5,7 @@ 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 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.
+- **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; 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.
 

package/lib/index.js

@@ -263,7 +263,22 @@ function defaultBranchFor(toplevel, notify) {
 		serve: (state) => state.value
 	}, async (record) => {
 		const out = await runGit(toplevel, ["symbolic-ref", "--short", "refs/remotes/origin/HEAD"]);
-		const name = out.stdout === null ? "" : out.stdout.trim().replace(/^origin\//u, "");
+		let name = out.stdout === null ? "" : out.stdout.trim().replace(/^origin\//u, "");
+		if (name === "") {
+			// `refs/remotes/origin/HEAD` is absent far more often than not: `git
+			// clone --branch <x>`, a pruned ref, or any repo that was only ever
+			// pushed to never gets one. Reading the symref alone therefore answered
+			// "no default branch" forever, which silently disabled EVERY
+			// default-branch rule — the merge row's base-branch wording on `main`,
+			// and the node half's own "no pull-request suggestion on main". Fall
+			// back, network-free, to the same base branch this module already
+			// probes for its ahead/behind row. A repository whose default branch is
+			// neither main nor master still answers undefined, exactly as before.
+			for (const candidate of ["main", "master"]) {
+				const probe = await runGit(toplevel, ["rev-parse", "--verify", "--quiet", "refs/remotes/origin/" + candidate]);
+				if (probe.stdout !== null && probe.stdout.trim() !== "") { name = candidate; break; }
+			}
+		}
 		const value = name === "" ? void 0 : name;
 		if (record.value !== value) notify?.();
 		return value;

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "dsh-git-badge",
-  "version": "0.17.2",
+  "version": "0.17.4",
   "description": "Git status badges for DeepSeek Harness: an input-row chip on every install, plus sidebar session-row badges (git status, PR/CI action tokens) after one manual step: `npx dsh-git-badge apply`, then restart dsh web. Event-driven freshness over SSE.",
   "type": "module",
   "main": "lib/index.js",
   "bin": {
+    "dsh-git-badge": "seam/apply.js",
     "dsh-git-badge-seam": "seam/apply.js",
     "dsh-git-badge-checkout": "seam/checkout.js"
   },

package/seam/apply.js

@@ -37,7 +37,15 @@
  *                  a stable, user-level store shared by every way this tool
  *                  can run. See seam/store.js for the restart marker.
  *
- * Usage: apply.js apply | apply.js revert | apply.js status
+ * The package also declares this file under the package's own name
+ * (bin "dsh-git-badge"), because npx only auto-runs a bin whose name matches
+ * the package name: `npx dsh-git-badge apply` resolves, while
+ * `npx dsh-git-badge-seam` 404s (no PACKAGE carries that name). The alias
+ * multiplexes the checkout bin too — npx cannot reach a second bin by name,
+ * so the checkout verb dispatches here:
+ *
+ * Usage: npx dsh-git-badge apply | revert | status | checkout <path|--clear>
+ *        (equivalently apply.js <verb>; checkout delegates to checkout.js)
  */
 import { copyFileSync, existsSync, readFileSync } from "node:fs";
 import { MARKER } from "./anchors.js";
@@ -45,6 +53,16 @@ import { backupState, doPatch, doRestore, installPaths, inspect, KNOWN_GOOD_HASH
 import { installSkill } from "./skill.js";
 import { writeRestartMarker } from "./store.js";
 
+const VERDICT_EXIT_1 = new Set(["drift", "unreadable", "missing", "ours-corrupt"]);
+
+const verb = process.argv[2];
+if (verb === "checkout") {
+	// alias-bin multiplex: strip the verb so checkout.js sees argv[2] = <path|--clear>
+	process.argv.splice(2, 1);
+	await import("./checkout.js");
+	process.exit(0); // checkout's success path returns; every failure path exits inside
+}
+
 const paths = installPaths();
 if (paths === null) {
 	console.error("ERROR: cannot locate the DSH package. Set DSH_INSTALL to its root");
@@ -53,11 +71,8 @@ if (paths === null) {
 }
 const CLIENT = paths.client;
 
-const VERDICT_EXIT_1 = new Set(["drift", "unreadable", "missing", "ours-corrupt"]);
-
-const verb = process.argv[2];
 if (!verb || !["apply", "revert", "status"].includes(verb)) {
-	console.error("usage: apply.js apply|revert|status");
+	console.error("usage: dsh-git-badge apply|revert|status   (or: dsh-git-badge checkout <path|--clear>)");
 	process.exit(1);
 }
 
@@ -152,7 +167,7 @@ if (verb === "apply") {
 			console.error("REFUSING: anchor drift — nothing was written.");
 			console.error(`  anchor:   ${name} (found ${count} times, need exactly 1)`);
 			console.error("Upstream changed code this patch anchors on. Update the matching entry");
-			console.error("in anchors.js, then re-run: dsh-git-badge-seam status && dsh-git-badge-seam apply");
+			console.error("in anchors.js, then re-run: dsh-git-badge status && dsh-git-badge apply");
 			process.exit(1);
 		}
 		case "ours-corrupt":

package/seam/checkout.js

@@ -13,8 +13,12 @@
  * The registration is advisory and self-expiring (24h) — never let it fail the
  * work that earned it:
  *
- *   usage:  npx dsh-git-badge-checkout <path>     register this session
- *           npx dsh-git-badge-checkout --clear    forget this session
+ *   usage:  npx dsh-git-badge checkout <path>     register this session
+ *           npx dsh-git-badge checkout --clear    forget this session
+ *
+ *   (npx can only reach the bin named after the package; the checkout verb
+ *   dispatches to this file from apply.js. The legacy bin name
+ *   dsh-git-badge-checkout still works when invoked directly.)
  *
  * The path is validated as a real worktree of its repository before it is
  * written, so a typo cannot point the badge at an unrelated directory.
@@ -26,7 +30,7 @@ import { clearSessionCheckout, writeSessionCheckout } from "./store.js";
 
 function usage(message) {
 	if (message !== void 0) console.error(message);
-	console.error("usage: dsh-git-badge-checkout <path> | --clear");
+	console.error("usage: dsh-git-badge checkout <path> | --clear");
 }
 
 /** Worktree paths git lists for the repo containing `dir` — the node half's parser. */

package/skill/gh/SKILL.md

@@ -81,7 +81,7 @@ unstaged / untracked / unmerged), plus any in-progress operation marker
 
   If the switch lands you in — or out of — a linked worktree, register where you
   are so the session badge follows the right checkout:
-  `npx dsh-git-badge-checkout "$(git rev-parse --show-toplevel)"` (best effort;
+  `npx dsh-git-badge checkout "$(git rev-parse --show-toplevel)"` (best effort;
   ignore failure). Clearing back to the main checkout is the same command run
   against the main worktree — the badge treats the main checkout as the default.
   A session's cwd is fixed at creation, so this registration is the ONLY signal