fix: resolve merge conflicts with origin/main (v0.4.3 + v0.4.4)

Merge origin/main which added:
- v0.4.3: /document-release skill, simplified AskUserQuestion (always ELI16),
  runtime branch detection via _BRANCH preamble variable
- v0.4.4: 60-min update check TTL, --force flag for gstack-update-check

Resolved conflicts:
- VERSION: keep 0.6.0 (our version, above 0.4.4)
- CHANGELOG: all entries preserved (0.6.0 > 0.4.4 > 0.4.3 > 0.4.2)
- TODOS.md: keep both sections (Brainstorm/Design + Document-Release)
- test/skill-validation.test.ts: include all three new skills in arrays
  (brainstorm, debug, document-release)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Garry Tan
2026-03-16 17:44:33 -07:00
28 changed files with 1229 additions and 86 deletions
+26
View File
@@ -400,6 +400,32 @@
**Priority:** P2
**Depends on:** `garrytan/design` branch landing on main
## Document-Release
### Auto-invoke /document-release from /ship
**What:** Add Step 8.5 to /ship that reads document-release/SKILL.md and executes the doc update workflow after creating the PR.
**Why:** Zero-friction doc updates — user runs /ship and docs are automatically current. No extra command to remember.
**Context:** /ship currently ends at Step 8 (PR URL output). Step 8.5 would continue into the document-release workflow. Same pattern as /ship calling /review's checklist in Step 3.5.
**Effort:** S
**Priority:** P1
**Depends on:** /document-release shipped
### `{{DOC_VOICE}}` shared resolver
**What:** Create a placeholder resolver in gen-skill-docs.ts encoding the gstack voice guide (friendly, user-forward, lead with benefits). Inject into /ship Step 5, /document-release Step 5, and reference from CLAUDE.md.
**Why:** DRY — voice rules currently live inline in 3 places (CLAUDE.md CHANGELOG style section, /ship Step 5, /document-release Step 5). When the voice evolves, all three drift.
**Context:** Same pattern as `{{QA_METHODOLOGY}}` — shared block injected into multiple templates to prevent drift. ~20 lines in gen-skill-docs.ts.
**Effort:** S
**Priority:** P2
**Depends on:** None
## Completed
### Phase 1: Foundations (v0.2.0)