@tekyzinc/gsd-t 2.20.7 → 2.21.0

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to GSD-T are documented here. Updated with each release.
 
+## [2.21.0] - 2026-02-17
+
+### Added
+- **gsd-t-triage-and-merge**: New command to auto-review unmerged GitHub branches, score impact (auto-merge / review / skip), merge safe branches, and optionally version bump + publish. Publish gate respects autonomy level — auto in Level 3, prompted in Level 1-2. Sensitive file detection for commands, CLI, templates, and scripts
+
 ## [2.20.7] - 2026-02-17
 
 ### Added

package/README.md

@@ -18,7 +18,7 @@ A methodology for reliable, parallelizable development using Claude Code with op
 npx @tekyzinc/gsd-t install
 ```
 
-This installs 38 GSD-T commands + 3 utility commands to `~/.claude/commands/` and the global CLAUDE.md to `~/.claude/CLAUDE.md`. Works on Windows, Mac, and Linux.
+This installs 39 GSD-T commands + 3 utility commands to `~/.claude/commands/` and the global CLAUDE.md to `~/.claude/CLAUDE.md`. Works on Windows, Mac, and Linux.
 
 ### Start Using It
 
@@ -145,6 +145,7 @@ This will replace changed command files, back up your CLAUDE.md if customized, a
 | `/user:gsd-t-log` | Sync progress Decision Log with recent git activity | Manual |
 | `/user:gsd-t-version-update` | Update GSD-T to latest version | Manual |
 | `/user:gsd-t-version-update-all` | Update GSD-T + all registered projects | Manual |
+| `/user:gsd-t-triage-and-merge` | Auto-review, merge, and publish GitHub branches | Manual |
 
 ### Backlog Management
 
@@ -281,8 +282,8 @@ get-stuff-done-teams/
 ├── LICENSE
 ├── bin/
 │   └── gsd-t.js                       # CLI installer
-├── commands/                          # 41 slash commands
-│   ├── gsd-t-*.md                     # 38 GSD-T workflow commands
+├── commands/                          # 42 slash commands
+│   ├── gsd-t-*.md                     # 39 GSD-T workflow commands
 │   ├── branch.md                      # Git branch helper
 │   ├── checkin.md                     # Auto-version + commit/push helper
 │   └── Claude-md.md                   # Reload CLAUDE.md directives

package/commands/gsd-t-help.md

@@ -55,6 +55,7 @@ UTILITIES                                                              Manual
   log                 Sync progress Decision Log with recent git activity
   version-update      Update GSD-T package to latest version
   version-update-all  Update GSD-T package + all registered projects
+  triage-and-merge    Auto-review, merge, and publish GitHub branches
 
 BACKLOG                                                                Manual
 ───────────────────────────────────────────────────────────────────────────────
@@ -303,6 +304,13 @@ Use these when user asks for help on a specific command:
 - **Use when**: Progress.md Decision Log is behind — catches up by scanning git commits since the last logged entry
 - **Features**: Incremental updates, first-time full reconstruction from git history, groups same-day changes
 
+### triage-and-merge
+- **Summary**: Auto-review unmerged GitHub branches, merge safe ones, and optionally publish
+- **Auto-invoked**: No
+- **Files**: Reads `CLAUDE.md`, `.gsd-t/progress.md`, `package.json`; updates `package.json`, `.gsd-t/progress.md`, `CHANGELOG.md`
+- **Use when**: Collaborators have pushed branches and you want to batch-review, merge, and publish without manual per-branch ceremony
+- **Features**: 3-tier impact scoring (auto-merge / review / skip), publish gate (auto in Level 3, prompted otherwise), conflict detection, sensitive file detection
+
 ### backlog-add
 - **Summary**: Capture a new backlog item with auto-categorization
 - **Auto-invoked**: No

package/commands/gsd-t-triage-and-merge.md

@@ -0,0 +1,167 @@
+# GSD-T: Triage and Merge — Auto-Review, Merge, and Publish GitHub Branches
+
+You are triaging unmerged GitHub branches for safety, then auto-merging, committing, and publishing those that pass all safety checks.
+
+## Step 1: Publish Gate
+
+Check the project's autonomy level in `CLAUDE.md`:
+
+- **Level 3 (Full Auto / "yolo")**: Auto-publish is ON. Skip the prompt and proceed.
+- **Level 1 or 2**: Ask the user before starting:
+  ```
+  Auto-publish after merge? This will version bump, npm publish, and deploy.
+  (yes/no)
+  ```
+  If **no**: triage and merge only — skip version bump, npm publish, and deploy (Steps 7-8).
+  If **yes**: full pipeline including publish.
+
+Store the decision for use in Step 7.
+
+## Step 2: Load Context
+
+Read:
+1. `CLAUDE.md` — project conventions, pre-commit gate, autonomy level
+2. `.gsd-t/progress.md` — current version and state
+3. `package.json` — current version number
+
+## Step 3: Fetch and Identify Branches
+
+```bash
+git fetch --all
+git branch -r --no-merged main
+```
+
+If no unmerged branches exist, report "No unmerged branches found" and stop.
+
+## Step 4: Triage Each Branch
+
+For each unmerged branch, collect:
+
+1. **Commit log**: `git log main..origin/{branch} --oneline`
+2. **Files changed**: `git diff main...origin/{branch} --stat`
+3. **Full diff**: `git diff main...origin/{branch}` (for impact scoring)
+4. **Conflict check**: `git merge --no-commit --no-ff origin/{branch}` then `git merge --abort`
+
+### Impact Scoring
+
+Score each branch on a 3-tier scale:
+
+| Tier | Criteria | Action |
+|------|----------|--------|
+| **Auto-merge** | Docs-only, contracts-only, templates with no behavior change, < 100 lines changed, no merge conflicts, no command file behavior changes | Merge automatically |
+| **Review** | Command file changes, CLI behavior changes, new files in `commands/`, template behavior changes, > 100 lines, wave/phase sequence changes | Show summary, ask user to confirm |
+| **Skip** | Merge conflicts, version-sensitive changes (package.json version), breaking changes to existing interfaces | Report why, do not merge |
+
+### Sensitive File Patterns (trigger Review tier)
+
+- `commands/*.md` — command behavior
+- `bin/gsd-t.js` — CLI installer
+- `templates/CLAUDE-global.md` — global config template
+- `scripts/*.js` — hook scripts
+- `package.json` — version/dependencies
+
+### Safe File Patterns (stay in Auto-merge tier)
+
+- `.gsd-t/contracts/*.md` — contract definitions
+- `.gsd-t/techdebt.md` — debt tracking
+- `docs/*.md` — documentation
+- `examples/**` — example files
+- `*.md` in root (except README.md with structural changes)
+
+## Step 5: Report Triage Results
+
+Display a summary table:
+
+```
+╔══════════════════════════════════════════════════════════════════════════════╗
+║                         Branch Triage Results                               ║
+╠══════════════════════════════════════════════════════════════════════════════╣
+
+  AUTO-MERGE
+  ──────────
+  ✓ {branch-name} — {commit count} commits, {lines} lines, {description}
+
+  NEEDS REVIEW
+  ────────────
+  ? {branch-name} — {commit count} commits, {lines} lines, {reason for review}
+
+  SKIPPED
+  ───────
+  ✗ {branch-name} — {reason} (conflicts / breaking changes)
+
+╚══════════════════════════════════════════════════════════════════════════════╝
+```
+
+## Step 6: Merge Safe Branches
+
+For each Auto-merge branch:
+1. `git merge origin/{branch} --no-edit`
+2. Verify merge succeeded
+3. Log the merge
+
+For each Review branch:
+1. Show the diff summary and reason it needs review
+2. Ask: "Merge {branch}? (yes/no)"
+3. If yes, merge it
+
+If ALL branches were skipped (none merged), report why and stop.
+
+## Step 7: Version Bump and Publish
+
+**If publish gate is OFF** (user declined in Step 1): Skip this step entirely. Report merged branches and stop.
+
+After all merges complete:
+
+1. **Determine version bump**:
+   - If any merged branch adds new commands → bump minor
+   - If merged branches are docs/contracts/fixes only → bump patch
+   - If any merged branch has breaking changes → bump minor (breaking = major, but those should be in Review tier)
+
+2. **Update files**:
+   - `package.json` — bump version
+   - `.gsd-t/progress.md` — update version + add Decision Log entry summarizing all merged branches
+   - `CHANGELOG.md` — add release entry listing what each branch contributed
+
+3. **Pre-Commit Gate**: Run the project-specific pre-commit checklist:
+   - If any merged branch changed command files → update GSD-T-README.md, README.md, CLAUDE-global template, gsd-t-help
+   - If any merged branch changed CLI → verify install/update/status/doctor work
+   - If any merged branch changed templates → verify gsd-t-init output
+
+4. **Commit**: `git add` changed files and commit:
+   ```
+   chore: version bump to v{version} for merged branch(es)
+   ```
+
+5. **Push**: `git push`
+
+6. **Publish**: `npm publish --access public`
+
+7. **Deploy**: Install globally and propagate:
+   ```bash
+   npm install -g @tekyzinc/gsd-t@{version}
+   gsd-t update-all
+   ```
+
+## Step 8: Report
+
+Display final summary:
+
+```
+Triage complete:
+  Merged:    {N} branches
+  Skipped:   {N} branches
+  Published: v{new-version}    (or "Skipped — publish gate off")
+```
+
+## Document Ripple
+
+After completing triage-and-merge, check if any of these need updating based on what was merged:
+
+1. **`.gsd-t/progress.md`** — Decision Log entry (always)
+2. **`CHANGELOG.md`** — Release notes (always, if publishing)
+3. **`README.md`** — If merged branches changed commands or structure
+4. **`docs/GSD-T-README.md`** — If merged branches changed commands or workflow
+5. **`templates/CLAUDE-global.md`** — If merged branches added commands
+6. **`commands/gsd-t-help.md`** — If merged branches added commands
+
+$ARGUMENTS

package/docs/GSD-T-README.md

@@ -114,6 +114,7 @@ GSD-T reads all state files and tells you exactly where you left off.
 | `/user:gsd-t-log` | Sync progress Decision Log with recent git activity | Manual |
 | `/user:gsd-t-version-update` | Update GSD-T to latest version | Manual |
 | `/user:gsd-t-version-update-all` | Update GSD-T + all registered projects | Manual |
+| `/user:gsd-t-triage-and-merge` | Auto-review, merge, and publish GitHub branches | Manual |
 
 ---
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tekyzinc/gsd-t",
-  "version": "2.20.7",
-  "description": "GSD-T: Contract-Driven Development for Claude Code — 41 slash commands with backlog management, impact analysis, test sync, and milestone archival",
+  "version": "2.21.0",
+  "description": "GSD-T: Contract-Driven Development for Claude Code — 42 slash commands with backlog management, impact analysis, test sync, and milestone archival",
   "author": "Tekyz, Inc.",
   "license": "MIT",
   "repository": {

package/templates/CLAUDE-global.md

@@ -58,6 +58,7 @@ PROJECT or FEATURE or SCAN
 | `/user:gsd-t-resume` | Restore context, continue |
 | `/user:gsd-t-version-update` | Update GSD-T to latest version |
 | `/user:gsd-t-version-update-all` | Update GSD-T + all registered projects |
+| `/user:gsd-t-triage-and-merge` | Auto-review, merge, and publish GitHub branches |
 | `/user:gsd-t-backlog-add` | Capture item, auto-categorize, append to backlog |
 | `/user:gsd-t-backlog-list` | Filtered, ordered view of backlog items |
 | `/user:gsd-t-backlog-move` | Reorder items by position (priority) |