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
29 changed files with 655 additions and 61 deletions
+3
View File
@@ -209,6 +209,9 @@ $B snapshot -D # verify deletion happened
$B diff https://staging.app.com https://prod.app.com
```
### 11. Show screenshots to the user
After `$B screenshot`, `$B snapshot -a -o`, or `$B responsive`, always use the Read tool on the output PNG(s) so the user can see them. Without this, screenshots are invisible.
## Snapshot Flags
The snapshot is your primary tool for understanding and interacting with pages.
+3
View File
@@ -102,6 +102,9 @@ $B snapshot -D # verify deletion happened
$B diff https://staging.app.com https://prod.app.com
```
### 11. Show screenshots to the user
After `$B screenshot`, `$B snapshot -a -o`, or `$B responsive`, always use the Read tool on the output PNG(s) so the user can see them. Without this, screenshots are invisible.
## Snapshot Flags
{{SNAPSHOT_FLAGS}}