mirror of
https://github.com/garrytan/gstack.git
synced 2026-05-21 12:18:24 +08:00
merge: integrate origin/main (v0.18.1.0) into open-agents-learnings
Main moved forward 6 commits while this branch was local. Integrated
both sides preserving all functionality:
From main (v0.16.4.0 → v0.18.1.0):
- v0.17.0.0 — UX behavioral foundations + ux-audit (generateUXPrinciples,
{{UX_PRINCIPLES}} placeholder, triggers frontmatter on skills)
- v0.18.0.0 — Confusion Protocol, Hermes + GBrain hosts, brain-first
resolver (generateBrainHealthInstruction, generateConfusionProtocol,
generateGBrainContextLoad, generateGBrainSaveResults, hosts/gbrain.ts,
hosts/hermes.ts, scripts/resolvers/gbrain.ts, GBrain bash health check)
- v0.18.0.1 — ngrok Windows build fix
- 0cc830b6 — tilde-in-assignment permission fix
- cc42f14a — gstack compact design doc (tabled)
- 822e843a — headed browser auto-shutdown + disconnect cleanup (v0.18.1.0)
Integration approach: keep this branch's preamble.ts submodule refactor
as the structure of record. Extracted main's two new generators into
their own submodules:
- scripts/resolvers/preamble/generate-brain-health-instruction.ts
- scripts/resolvers/preamble/generate-confusion-protocol.ts
Updated scripts/resolvers/preamble/generate-preamble-bash.ts to absorb
main's GBrain health check (host-conditional on gbrain/hermes).
scripts/resolvers/index.ts now imports BOTH:
- This branch's adds: MODEL_OVERLAY, TASTE_PROFILE, BIN_DIR resolvers
- Main's adds: UX_PRINCIPLES, GBRAIN_CONTEXT_LOAD, GBRAIN_SAVE_RESULTS
resolvers
scripts/resolvers/design.ts keeps both generateTasteProfile (this
branch) and generateUXPrinciples (main). Sibling exports, no overlap.
scripts/gen-skill-docs.ts keeps both this branch's --model flag wiring
and main's edits.
Templates auto-merged where possible. The 35 generated SKILL.md /
golden conflicts auto-resolved via `bun run gen:skill-docs --host all`
followed by re-snapshotting the ship goldens for claude/codex/factory.
Verification:
- bun run gen:skill-docs --host all completes cleanly
- bun test: 1 pre-existing failure (gstack-community-dashboard Supabase
network test, 235s timeout). NOT related to merge — unchanged Supabase
test infra times out without live network. Flagged in PR body.
Token-ceiling warnings on plan-ceo-review (29K), office-hours (26K),
and ship (34K). These existed on origin/main before the merge — the
preamble grew substantially from main's GBrain + UX additions plus this
branch's continuous-checkpoint, context-health, model-overlay, taste-profile,
and feature-discovery additions. Worth a follow-up reduction pass but
doesn't block this merge.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -17,6 +17,11 @@ allowed-tools:
|
||||
- Agent
|
||||
- AskUserQuestion
|
||||
- WebSearch
|
||||
triggers:
|
||||
- review this pr
|
||||
- code review
|
||||
- check my diff
|
||||
- pre-landing review
|
||||
---
|
||||
<!-- AUTO-GENERATED from SKILL.md.tmpl — do not edit directly -->
|
||||
<!-- Regenerate: bun run gen:skill-docs -->
|
||||
@@ -433,6 +438,19 @@ AI makes completeness near-free. Always recommend the complete option over short
|
||||
|
||||
Include `Completeness: X/10` for each option (10=all edge cases, 7=happy path, 3=shortcut).
|
||||
|
||||
## Confusion Protocol
|
||||
|
||||
When you encounter high-stakes ambiguity during coding:
|
||||
- Two plausible architectures or data models for the same requirement
|
||||
- A request that contradicts existing patterns and you're unsure which to follow
|
||||
- A destructive operation where the scope is unclear
|
||||
- Missing context that would change your approach significantly
|
||||
|
||||
STOP. Name the ambiguity in one sentence. Present 2-3 options with tradeoffs.
|
||||
Ask the user. Do not guess on architectural or data model decisions.
|
||||
|
||||
This does NOT apply to routine coding, small features, or obvious changes.
|
||||
|
||||
## Continuous Checkpoint Mode
|
||||
|
||||
If `CHECKPOINT_MODE` is `"continuous"` (from preamble output): auto-commit work as
|
||||
@@ -956,6 +974,19 @@ git fetch origin <base> --quiet
|
||||
|
||||
Run `git diff origin/<base>` to get the full diff. This includes both committed and uncommitted changes against the latest base branch.
|
||||
|
||||
## Step 3.5: Slop scan (advisory)
|
||||
|
||||
Run a slop scan on changed files to catch AI code quality issues (empty catches,
|
||||
redundant `return await`, overcomplicated abstractions):
|
||||
|
||||
```bash
|
||||
bun run slop:diff origin/<base> 2>/dev/null || true
|
||||
```
|
||||
|
||||
If findings are reported, include them in the review output as an informational
|
||||
diagnostic. Slop findings are advisory, never blocking. If slop:diff is not
|
||||
available (e.g., slop-scan not installed), skip this step silently.
|
||||
|
||||
---
|
||||
|
||||
## Prior Learnings
|
||||
|
||||
@@ -17,6 +17,11 @@ allowed-tools:
|
||||
- Agent
|
||||
- AskUserQuestion
|
||||
- WebSearch
|
||||
triggers:
|
||||
- review this pr
|
||||
- code review
|
||||
- check my diff
|
||||
- pre-landing review
|
||||
---
|
||||
|
||||
{{PREAMBLE}}
|
||||
@@ -69,6 +74,19 @@ git fetch origin <base> --quiet
|
||||
|
||||
Run `git diff origin/<base>` to get the full diff. This includes both committed and uncommitted changes against the latest base branch.
|
||||
|
||||
## Step 3.5: Slop scan (advisory)
|
||||
|
||||
Run a slop scan on changed files to catch AI code quality issues (empty catches,
|
||||
redundant `return await`, overcomplicated abstractions):
|
||||
|
||||
```bash
|
||||
bun run slop:diff origin/<base> 2>/dev/null || true
|
||||
```
|
||||
|
||||
If findings are reported, include them in the review output as an informational
|
||||
diagnostic. Slop findings are advisory, never blocking. If slop:diff is not
|
||||
available (e.g., slop-scan not installed), skip this step silently.
|
||||
|
||||
---
|
||||
|
||||
{{LEARNINGS_SEARCH}}
|
||||
|
||||
Reference in New Issue
Block a user