fix: resolve merge conflicts with origin/main (v0.5.1 + v0.5.2)

Merge main's gstack-slug helper, review dashboard, screenshot visibility,
and design-consultation enhancements into the office-hours branch.

Conflicts resolved:
- CHANGELOG: keep both 0.6.0 (ours) and 0.5.1/0.5.2 (main) entries
- VERSION: keep 0.6.0 (ours)
- design-consultation: use gstack-slug + office-hours naming
- plan-eng-review: use gstack-slug
- office-hours: adopt gstack-slug for SLUG/BRANCH computation

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Garry Tan
2026-03-17 09:20:38 -07:00
co-authored by Claude Opus 4.6
29 changed files with 655 additions and 61 deletions
+3 -2
View File
@@ -421,7 +421,7 @@ Compare screenshots and observations across pages for:
**Project-scoped:**
```bash
SLUG=$(git remote get-url origin 2>/dev/null | sed 's|.*[:/]\([^/]*/[^/]*\)\.git$|\1|;s|.*[:/]\([^/]*/[^/]*\)$|\1|' | tr '/' '-')
eval $(~/.claude/skills/gstack/bin/gstack-slug 2>/dev/null)
mkdir -p ~/.gstack/projects/$SLUG
```
Write to: `~/.gstack/projects/{slug}/{user}-{branch}-design-audit-{datetime}.md`
@@ -502,6 +502,7 @@ Tie everything to user goals and product objectives. Always suggest specific imp
8. **Responsive is design, not just "not broken."** A stacked desktop layout on mobile is not responsive design — it's lazy. Evaluate whether the mobile layout makes *design* sense.
9. **Document incrementally.** Write each finding to the report as you find it. Don't batch.
10. **Depth over breadth.** 5-10 well-documented findings with screenshots and specific suggestions > 20 vague observations.
11. **Show screenshots to the user.** After every `$B screenshot`, `$B snapshot -a -o`, or `$B responsive` command, use the Read tool on the output file(s) so the user can see them inline. For `responsive` (3 files), Read all three. This is critical — without it, screenshots are invisible to the user.
Record baseline design score and AI slop score at end of Phase 6.
@@ -627,7 +628,7 @@ Write the report to both local and project-scoped locations:
**Project-scoped:**
```bash
SLUG=$(git remote get-url origin 2>/dev/null | sed 's|.*[:/]\([^/]*/[^/]*\)\.git$|\1|;s|.*[:/]\([^/]*/[^/]*\)$|\1|' | tr '/' '-')
eval $(~/.claude/skills/gstack/bin/gstack-slug 2>/dev/null)
mkdir -p ~/.gstack/projects/$SLUG
```
Write to `~/.gstack/projects/{slug}/{user}-{branch}-design-audit-{datetime}.md`
+1 -1
View File
@@ -191,7 +191,7 @@ Write the report to both local and project-scoped locations:
**Project-scoped:**
```bash
SLUG=$(git remote get-url origin 2>/dev/null | sed 's|.*[:/]\([^/]*/[^/]*\)\.git$|\1|;s|.*[:/]\([^/]*/[^/]*\)$|\1|' | tr '/' '-')
eval $(~/.claude/skills/gstack/bin/gstack-slug 2>/dev/null)
mkdir -p ~/.gstack/projects/$SLUG
```
Write to `~/.gstack/projects/{slug}/{user}-{branch}-design-audit-{datetime}.md`