mirror of
https://github.com/garrytan/gstack.git
synced 2026-08-18 03:57:15 +02:00
merge: incorporate origin/main into community-mode branch
Conflicts resolved: - VERSION: keep 0.14.0.0 (our branch > main's 0.13.3.0) - package.json: same version resolution - CHANGELOG.md: keep both entries, 0.14.0.0 above 0.13.3.0 - .gitignore: merge both sides (our bun.lock + main's env patterns) Main brought in v0.13.3.0 "Lock It Down": pinned dependencies via bun.lock, gstack-slug non-git fallback, setup CI timeout, Windows lockfile fix, design doc discovery fix, autoplan sequential voices, community PR guardrails in CLAUDE.md. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -222,6 +222,24 @@ Examples of good bisection:
|
||||
When the user says "bisect commit" or "bisect and push," split staged/unstaged
|
||||
changes into logical commits and push.
|
||||
|
||||
## Community PR guardrails
|
||||
|
||||
When reviewing or merging community PRs, **always AskUserQuestion** before accepting
|
||||
any commit that:
|
||||
|
||||
1. **Touches ETHOS.md** — this file is Garry's personal builder philosophy. No edits
|
||||
from external contributors or AI agents, period.
|
||||
2. **Removes or softens promotional material** — YC references, founder perspective,
|
||||
and product voice are intentional. PRs that frame these as "unnecessary" or
|
||||
"too promotional" must be rejected.
|
||||
3. **Changes Garry's voice** — the tone, humor, directness, and perspective in skill
|
||||
templates, CHANGELOG, and docs are not generic. PRs that rewrite voice to be
|
||||
more "neutral" or "professional" must be rejected.
|
||||
|
||||
Even if the agent strongly believes a change improves the project, these three
|
||||
categories require explicit user approval via AskUserQuestion. No exceptions.
|
||||
No auto-merging. No "I'll just clean this up."
|
||||
|
||||
## CHANGELOG + VERSION style
|
||||
|
||||
**VERSION and CHANGELOG are branch-scoped.** Every feature branch that ships gets its
|
||||
|
||||
Reference in New Issue
Block a user