@tekyzinc/gsd-t 5.11.15 → 5.11.16

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to GSD-T are documented here. Updated with each release.
 
+## [5.11.16] - 2026-08-10
+
+### Added — typing the default branch name works in the main checkout
+
+Working directly in the main checkout is rare but real, and there was no way to
+ask for it: every name typed at the session-start prompt created a worktree.
+Naming the repo's own default branch now means "work here" — no worktree, no
+branch created — and it says so rather than going silent, since silence would
+read as the name being ignored.
+
+The default branch is asked of git, never assumed to be `main`: a repo on
+`trunk` treats trunk as its default, and `main` there is just another branch
+name. The typed name is matched case-insensitively, so `Main` is `main`.
+
+Choosing the main checkout opts out of the worktree, not out of the
+one-session-per-tree guard — a second live session there will still block
+writes, correctly.
+
+- `bin/gsd-t-pick-worktree.cjs`: `isDefaultBranch()` + the stay path
+- `~/.zshrc` (local): both prompts now mention `"main" = work in main`
+- `test/m111-pick-worktree.test.js`: 3 tests — stay, case-insensitive, and a `trunk` repo
+
 ## [5.11.15] - 2026-08-09
 
 ### Removed — the reply shortener (M107) is retired

package/README.md

@@ -1,6 +1,6 @@
 # GSD-T: Contract-Driven Development for Claude Code
 
-**v5.11.15** - A methodology for reliable, parallelizable development using Claude Code with optional Agent Teams support.
+**v5.11.16** - A methodology for reliable, parallelizable development using Claude Code with optional Agent Teams support.
 
 **Eliminates context rot** — task-level fresh dispatch (one subagent per task, ~10-20% context each) means compaction never triggers.
 **Compaction-proof debug loops** — `gsd-t headless --debug-loop` runs test-fix-retest cycles as separate `claude -p` sessions. A JSONL debug ledger persists all hypothesis/fix/learning history across fresh sessions. Anti-repetition preamble injection prevents retrying failed hypotheses. Escalation tiers (sonnet → opus → human) and a hard iteration ceiling enforced externally.

package/bin/gsd-t-pick-worktree.cjs

@@ -79,6 +79,21 @@ function main() {
   const home = path.join(process.env.HOME, "Worktrees", path.basename(cwd));
 
   if (wanted) {
+    // Asking for the repo's own default branch means "work here, in the main
+    // checkout" — not "make a worktree called main", which git refuses anyway
+    // because that branch is already checked out. Rare, but it is a real
+    // choice, and the only way to express it is to name it.
+    if (isDefaultBranch(cwd, branchNameFrom(wanted))) {
+      // Said out loud on stderr: every other path here is silent, but this one
+      // is a deliberate choice to work somewhere the house rules steer away
+      // from, and silence would read as "the name was ignored". stdout stays
+      // empty because the shell reads it as the directory to move to.
+      process.stderr.write(
+        `[GSD-T WORKTREE] staying in the main checkout on ${branchNameFrom(wanted)} — ` +
+        `no worktree created.\n`
+      );
+      stay();
+    }
     process.stdout.write(create(cwd, home, branchNameFrom(wanted)).path + "\n");
     return;
   }
@@ -99,6 +114,28 @@ function main() {
   process.stdout.write(free.path + "\n");
 }
 
+/**
+ * Is this the repo's own default branch — the one the main checkout sits on?
+ *
+ * Asked of git rather than matched against a list: a repo may use `master`,
+ * `trunk` or anything else, and a hardcoded list would send those repos into a
+ * worktree named after their own main branch. The branch currently checked out
+ * in the main tree IS the answer, since that is the thing being opted into.
+ *
+ * A repo git cannot answer for is not the default-branch case — it falls
+ * through to the ordinary worktree path, which fails loudly on its own if git
+ * is genuinely broken.
+ */
+function isDefaultBranch(repo, name) {
+  const r = spawnSync("git", ["branch", "--show-current"], {
+    cwd: repo, encoding: "utf8", timeout: 10000,
+  });
+  if (r.status !== 0) return false;
+  // Both sides lowercased: a branch name typed at a prompt is a value the user
+  // types, and "Main" must mean main.
+  return String(r.stdout || "").trim().toLowerCase() === String(name).toLowerCase();
+}
+
 // Turn what the user typed into a name git will accept, without silently
 // becoming a different branch than they asked for.
 function branchNameFrom(input) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tekyzinc/gsd-t",
-  "version": "5.11.15",
+  "version": "5.11.16",
   "description": "GSD-T: Contract-Driven Development for Claude Code — 54 slash commands with headless-by-default workflow spawning, unattended supervisor relay with event stream, graph-powered code analysis, real-time agent dashboard, task telemetry, doc-ripple enforcement, backlog management, impact analysis, test sync, milestone archival, and PRD generation",
   "author": "Tekyz, Inc.",
   "license": "MIT",