CalvinBackup/gstack
1
0
Fork 0
mirror of https://github.com/garrytan/gstack.git synced 2026-07-14 11:37:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge: resolve conflicts with origin/main (v0.11.11.0)

Browse Source 
Merge origin/main into wave3-bugfixes. Resolved conflicts:
- VERSION: bumped to 0.11.11.0 (above main's 0.11.10.0)
- CHANGELOG: added wave 3 entry above main's recent entries
- gen-skill-docs.ts: took main's find-based zsh compat fix
- SKILL.md files: regenerated from templates

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Garry Tan
2026-03-23 15:58:10 -07:00
parent 9d7fb1c3c2 f4bbfaa5bd
commit 9da0f14398
82 changed files with 2143 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files
review/SKILL.md
+23 -1
View File
@@ -48,7 +48,8 @@ echo "TELEMETRY: ${_TEL:-off}"
echo "TEL_PROMPTED: $_TEL_PROMPTED"
mkdir -p ~/.gstack/analytics
echo '{"skill":"review","ts":"'$(date -u +%Y-%m-%dT%H:%M:%SZ)'","repo":"'$(basename "$(git rev-parse --show-toplevel 2>/dev/null)" 2>/dev/null || echo "unknown")'"}' >> ~/.gstack/analytics/skill-usage.jsonl 2>/dev/null || true
for _PF in $(ls ~/.gstack/analytics/.pending-* 2>/dev/null); do [ -f "$_PF" ] && ~/.claude/skills/gstack/bin/gstack-telemetry-log --event-type skill_run --skill _pending_finalize --outcome unknown --session-id "$_SESSION_ID" 2>/dev/null || true; break; done
# zsh-compatible: use find instead of glob to avoid NOMATCH error
for _PF in $(find ~/.gstack/analytics -maxdepth 1 -name '.pending-*' 2>/dev/null); do [ -f "$_PF" ] && ~/.claude/skills/gstack/bin/gstack-telemetry-log --event-type skill_run --skill _pending_finalize --outcome unknown --session-id "$_SESSION_ID" 2>/dev/null || true; break; done
```
If `PROACTIVE` is `"false"`, do not proactively suggest gstack skills — only invoke
@@ -899,6 +900,27 @@ High-confidence findings (agreed on by multiple sources) should be prioritized f
---
## Step 5.8: Persist Eng Review result
After all review passes complete, persist the final `/review` outcome so `/ship` can
recognize that Eng Review was run on this branch.
Run:
```bash
~/.claude/skills/gstack/bin/gstack-review-log '{"skill":"review","timestamp":"TIMESTAMP","status":"STATUS","issues_found":N,"critical":N,"informational":N,"commit":"COMMIT"}'
```
Substitute:
- `TIMESTAMP` = ISO 8601 datetime
- `STATUS` = `"clean"` if there are no remaining unresolved findings after Fix-First handling and adversarial review, otherwise `"issues_found"`
- `issues_found` = total remaining unresolved findings
- `critical` = remaining unresolved critical findings
- `informational` = remaining unresolved informational findings
- `COMMIT` = output of `git rev-parse --short HEAD`
If the review exits early before a real review completes (for example, no diff against the base branch), do **not** write this entry.
## Important Rules
- **Read the FULL diff before commenting.** Do not flag issues already addressed in the diff.
review/SKILL.md.tmpl
+21
View File
@@ -250,6 +250,27 @@ If no documentation files exist, skip this step silently.
{{ADVERSARIAL_STEP}}
## Step 5.8: Persist Eng Review result
After all review passes complete, persist the final `/review` outcome so `/ship` can
recognize that Eng Review was run on this branch.
Run:
```bash
~/.claude/skills/gstack/bin/gstack-review-log '{"skill":"review","timestamp":"TIMESTAMP","status":"STATUS","issues_found":N,"critical":N,"informational":N,"commit":"COMMIT"}'
```
Substitute:
- `TIMESTAMP` = ISO 8601 datetime
- `STATUS` = `"clean"` if there are no remaining unresolved findings after Fix-First handling and adversarial review, otherwise `"issues_found"`
- `issues_found` = total remaining unresolved findings
- `critical` = remaining unresolved critical findings
- `informational` = remaining unresolved informational findings
- `COMMIT` = output of `git rev-parse --short HEAD`
If the review exits early before a real review completes (for example, no diff against the base branch), do **not** write this entry.
## Important Rules
- **Read the FULL diff before commenting.** Do not flag issues already addressed in the diff.