mirror of
https://github.com/garrytan/gstack.git
synced 2026-05-27 21:43:05 +02:00
66f3a180d3
* fix(gbrain-sync): --full produces an empty code index on first run of a new repo
`gbrain reindex-code` only RE-EMBEDS pages that already exist; it never walks
the filesystem. On a freshly-registered source (0 pages), a --full run that
called reindex-code alone found nothing ("No code pages to reindex"), finished
in ~1s, and left the code index permanently empty while still reporting OK.
Fix: --full now runs `sync --strategy code` FIRST to create pages via the file
walk, then runs `reindex-code` to honor the documented "full walk + reindex"
contract for both fresh and populated sources.
Contributed by @jetsetterfl via #1584.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(gbrain-local-status): classifier falsely reports broken-db inside repos with their own DATABASE_URL
The freshClassify probe ran `gbrain sources list --json` with the inherited
process env. When the probe ran from inside a repo with its own .env (an app
DATABASE_URL on a different port), Bun autoloaded the project's .env, gbrain
connected to the wrong database, and the classifier reported broken-db on
otherwise-healthy brains.
Fix: route the probe env through `buildGbrainEnv` from lib/gbrain-exec, the
same helper the sync orchestrator uses. DATABASE_URL is seeded from
~/.gbrain/config.json so the result is cwd-independent. The 60s cache can no
longer propagate a poisoned negative to clean directories.
Contributed by @jetsetterfl via #1583.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(retro): stale-base + bad-today-anchor pre-flight guard (#1624)
/retro silently produced confidently-wrong output when "today" drifted (model
session-context error) or when origin/<default> was materially behind the
actual remote — git log --since returned zero or near-zero commits and the
narrative was fabricated from nothing.
Adds Step 0.5 with four ordered pre-check branches before any window analysis:
A. No 'origin' remote → skip with "base freshness not verified" note
B. Detached HEAD → skip with "base freshness not verified" note
C. `git fetch origin <default>` fails (offline) → warn, proceed against
last-known origin/<default>
D. Fetch succeeded → compare today vs latest origin/<default> commit; if
gap > window-days, BLOCK with explicit citation of latest-commit date.
Skip paths still proceed to Step 1, but the disclosure is carried into the
retro narrative ("offline run, window not freshness-verified") so the output
is never silently confidently-wrong.
Atomic .tmpl + gen:skill-docs regen commit (T-Codex-3 pattern).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* test(retro): regression for #1624 stale-base pre-flight guard
13 static-invariant tests pinning the four ordered pre-check branches in
retro/SKILL.md.tmpl:Step 0.5:
A. no-remote skip — must check origin presence + set verdict
B. detached-HEAD skip — must gate behind prior verdict (ordering)
C. fetch-fail warn — must match `if !` or `||` shape, gate by verdict
D. stale-base BLOCK — must read latest-commit ISO date, cite remediation
Plus a disclosure-survives-to-narrative invariant: skip-path verdicts must be
named in prose so the retro output carries the cited reason rather than
silently misreporting.
Failing build if Step 0.5 is removed, branches re-ordered (no-remote no longer
wins), or the BLOCK message stops citing today/latest-commit/remediation
path.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(gbrain-sync): configurable timeouts + resume from gbrain checkpoint (#1611)
The memory and code stages hardcoded a 35-min spawn timeout. On brains with
~2000+ staged files, /sync-gbrain --full reliably SIGTERM'd the child at
exactly 35 minutes with exit 143. gbrain left ~/.gbrain/import-checkpoint.json
pointing at the staging dir, but gstack-memory-ingest's SIGTERM handler
unconditionally cleaned the dir up — so the next run found a checkpoint
pointing at nothing and restaged from scratch, repeating the SIGTERM forever.
Three changes:
1. Configurable timeouts via env (bounds 60_000ms - 86_400_000ms, default
2_100_000ms = 35min unchanged):
GSTACK_SYNC_MEMORY_TIMEOUT_MS
GSTACK_SYNC_CODE_TIMEOUT_MS
Out-of-range or non-numeric values warn and fall back to the default.
2. SIGTERM in gstack-memory-ingest no longer always cleans up the staging
dir. If gbrain has written ~/.gbrain/import-checkpoint.json pointing at
the active staging dir, the dir is PRESERVED for next-run resume.
Otherwise (no checkpoint pointing here, crash before gbrain ever
touched it) it's cleaned up as before.
3. Next /sync-gbrain run detects gbrain's checkpoint via decideResume() in
gstack-gbrain-sync.ts:
- no checkpoint → fresh ingest pass
- checkpoint + staging ok → set GSTACK_INGEST_RESUME_DIR; child
reuses staging dir and skips
writeStaged; gbrain import resumes
from processedIndex+1
- checkpoint + staging gone → warn "previous checkpoint stale
(staging dir gone), restaging from
scratch" and proceed
Reuses gbrain's own checkpoint as the source of truth (D1 — no double-store
state). Detect-then-fallback semantics per C1.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* test(gbrain-sync): regression for #1611 timeouts + resume
19 tests across three surfaces:
- resolveStageTimeoutMs (10 tests): undefined/empty → default; non-numeric,
zero, negative, below-floor, above-ceiling → warn + default; at-floor,
at-ceiling, valid mid-range → accepted as-is.
- decideResume (6 tests): no checkpoint, corrupt JSON, checkpoint + staging
ok, checkpoint + staging missing, checkpoint with no dir, checkpoint with
empty dir.
- SIGTERM staging preservation (3 static invariants): memory-ingest signal
handler must check stagingDirIsCheckpointed BEFORE cleanup; preserve
branch must come before cleanup branch (ordering); orchestrator must
pass GSTACK_INGEST_RESUME_DIR to the grandchild on resume.
Also threads process.env.HOME through readGbrainCheckpoint and
stagingDirIsCheckpointed so tests can redirect home. os.homedir() caches
at process start and ignores later mutation, so the env override is the
only reliable test injection point.
Failing build if the timeout bounds are removed, the resume detection
short-circuits incorrectly, or the SIGTERM handler regresses to
unconditional cleanup.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(review): pre-emit verification gate kills Django-shape FP class (#1539)
External user filed 4/8 false positives on a /review run against a Django +
DRF + PostgreSQL repo (Sprint 2.5). Every FP class was the same shape:
"resolvable in <5 minutes by viewing the actual code or running a simple
grep" — fields that don't exist on the model, dict.get()-might-be-None on a
form that returns {}-initialized cleaned_data, standard ORM save behavior
called out as data loss.
Extends the Confidence Calibration resolver (consumed by review, cso,
plan-eng-review, ship) with a Pre-emit verification gate:
Every finding MUST quote the specific code line that motivates it
(file:line + verbatim text). If the reviewer cannot produce the quote,
the finding is unverified — its confidence is forced to 4-5 so the
existing "Suppress from main report" rule fires automatically. The
finding still goes to the appendix for calibration audit, but the user
does not see it in the critical-pass output.
Reuses the existing suppression mechanism — no new code path. The FP
classes the gate kills are enumerated in the resolver text so reviewers
see the named patterns.
Framework-meta nudge included for Django Meta, Rails associations,
SQLAlchemy relationships, TypeORM decorators, Sequelize init, Prisma
generated client — the reviewer must quote the meta-construct that
generates the symbol, not just grep for the literal name. Deeper
framework-aware ORM verification (model introspection, migration-history-
aware checks) is deliberately deferred to a future wave per T-Codex-2.
Atomic .tmpl-equivalent (resolver) edit + gen:skill-docs regen commit
per T-Codex-3.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* test(review): regression for #1539 pre-emit verification gate
12 tests pinning the gate behavior:
- Resolver emits the gate header + #1539 reference
- Gate requires quoting file:line + verbatim text
- Unverified findings forced to confidence 4-5 (auto-suppress via
existing <7-rule, no new mechanism)
- Framework-meta nudge names Django, Rails, SQLAlchemy, TypeORM,
Sequelize, Prisma
- Deferred design doc reference present (1539-framework-aware-review.md)
- Four named FP classes from #1539 enumerated:
* field doesn't exist on model
* dict.get() might be None
* save() might lose fields
* update_fields might miss X
- All four downstream SKILL.md consumers (review, cso, plan-eng-review,
ship) carry the gate text after gen:skill-docs
- Existing confidence 9-10 'Show normally' + 3-4 'Suppress' rows
unchanged (regression on existing behavior)
Failing build if the gate is removed, the suppression mechanism is
re-invented separately, the framework-meta nudge drops a framework, or
gen:skill-docs stops propagating the gate to consumers.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(config): expose explain_level default
* fix(benchmark): parse positional prompt after flags
* fix(artifacts): reject malformed remote paths
* fix(learnings): preserve current entries in cross-project search
* fix(setup): register root gstack slash alias
* fix(memory): probe gitleaks without shell builtin
* fix(gbrain-lib): pin LC_ALL=C in varname validator (macOS locale guard)
In many macOS shells the default locale (e.g. en_US.UTF-8) makes bash
glob brackets like `[A-Z]` match lowercase letters too, so the existing
`case "$name" in [A-Z_][A-Z0-9_]*)` branch lets names like `lower-case`
through validation. The function then trips `printf -v "$varname"` and
`export "$varname"` with `not a valid identifier` errors that surface
mid-prompt, which is exactly what the validator was supposed to prevent.
Pinning `LC_ALL=C` inside the function gives ASCII-only bracket semantics
on both macOS and Linux, matching the documented `[A-Z_][A-Z0-9_]*`
contract. Declared `local` so it doesn't leak to the calling shell —
`gstack-gbrain-lib.sh` is documented as a sourced helper, so a bare
assignment would mutate the caller's locale for the rest of the process
(silently affecting downstream `sort`, `tr`, locale-aware globs in the
same shell, etc.).
The existing regression test
`test/gbrain-lib-verify.test.ts:'rejects invalid var names'`
already covers the macOS repro shape (passes `lower-case` and expects
the validator to reject + emit `invalid var name`). On Linux CI the
test silently passed because `LC_ALL=C` is the typical default; on
macOS dev boxes it fails.
Verified:
- `bun test test/gbrain-lib-verify.test.ts`: 22 pass, 0 fail (on macOS).
- `_gstack_gbrain_validate_varname lower-case; echo $?` → 2.
- `_gstack_gbrain_validate_varname FOO_BAR; echo $?` → 0.
- Caller's LC_ALL preserved across calls (confirmed via sourced bash).
* fix(land-and-deploy): detect merged PR after gh failure
After `gh pr merge` exits non-zero, the PR may already be MERGED server-side
(concurrent merge landed, or local cleanup phase failed AFTER the merge
succeeded). Calling `gh pr merge` a second time then errors with a confusing
"already merged" — and worse, the deploy workflow never runs because we
stopped on the first failure.
Adds a Post-failure PR-state check (§4a-postfail) that runs after ANY
non-zero exit from `gh pr merge`:
- state == MERGED → record MERGE_PATH=direct, OFFER (don't force)
stale-worktree cleanup on the base branch with
uncommitted-work guard, proceed to §4a CI watch
- state == OPEN → check autoMergeRequest; if non-null treat as
merge-queue wait; if null surface both errors and STOP
- state == CLOSED → STOP
Hard invariant: never retry `gh pr merge` after a non-zero exit. Server
state is authoritative.
Re-authored from PR #1620 into land-and-deploy/SKILL.md.tmpl (the source of
truth) instead of the generated SKILL.md, so the next gen:skill-docs run
preserves the change. Original diff by @davidfoy via #1620.
Related: cli/cli#3442, cli/cli#13380.
Contributed by @davidfoy via #1620.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix: detect PgBouncer transaction-mode pooler and set GBRAIN_PREPARE=true (#1435)
When gbrain connects through a PgBouncer transaction-mode pooler (port
6543), it auto-disables prepared statements. This breaks `gbrain search`
silently — the /sync-gbrain capability check fails and the GBrain Search
Guidance block never gets written to CLAUDE.md.
Three-layer fix:
1. **lib/gbrain-exec.ts** — `buildGbrainEnv()` now detects port 6543 in
the effective DATABASE_URL and sets `GBRAIN_PREPARE=true` in the env
passed to every gbrain spawn. This is the single chokepoint — all
gstack gbrain invocations inherit the fix. Caller can opt out with
`GBRAIN_PREPARE=false`.
2. **sync-gbrain/SKILL.md{,.tmpl}** — capability check now exports
`GBRAIN_PREPARE=true` explicitly and retries search up to 3x with 1s
delay for async index propagation under connection pooling.
3. **bin/gstack-gbrain-detect** — surfaces `gbrain_pooler_mode` field
("transaction" | "session" | null) in the preamble probe JSON so
/setup-gbrain and /sync-gbrain can advise users about pooler state.
Closes #1435
Built with [ClosedLoop.AI](https://closedloop.ai) | [GitHub](https://github.com/closedloop-ai/claude-plugins)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(supabase-provision): rewrite transaction/6543 -> session/5432 for new projects
- Single-object pooler API responses default to transaction-mode at 6543,
but the shared pooler tenant on new projects only listens on session/5432
- Add a `pool_mode == transaction && db_port == 6543` rewrite + stderr note
- Escape hatch via `GSTACK_SUPABASE_TRUST_API_PORT=1` for forward-compat
- 5 new tests covering rewrite, no-op shapes, env opt-out, array path
Fixes #1301.
* fix(browse): GSTACK_CHROMIUM_NO_SANDBOX opt-out for Ubuntu/AppArmor (#1562)
Ubuntu/AppArmor configurations often block unprivileged Chromium sandboxing
for headless agent sessions even for normal users — /qa hangs without
--no-sandbox. The kernel policy denies the unprivileged user namespaces
Chromium needs.
Adds GSTACK_CHROMIUM_NO_SANDBOX=1 as an explicit user override that forces
the sandbox off without changing the default for everyone else. Re-authored
from PR #1562 onto v1.42.2.0's shouldEnableChromiumSandbox() helper —
purely additive, preserves the headed-launch sandbox-on-by-default behavior
that v1.42.2.0 shipped to kill the --no-sandbox yellow infobar.
Three new regression tests cover:
- linux + override=1 → false (the named use case)
- darwin + override=1 → false (env wins on any platform)
- override=0 → does NOT trigger (must be exactly "1")
Original diff by @techcenter68 via #1562.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(browse): mirror isCustomChromium() guard in headless launch()
When BROWSE_EXTENSIONS_DIR is set alongside GSTACK_CHROMIUM_PATH pointing
at a baked-extension build (GBrowser / GStack Browser), the headless launch()
path was unconditionally adding --disable-extensions-except / --load-extension.
This causes the same ServiceWorkerState::SetWorkerId DCHECK crash that
launchHeaded() already guards against via isCustomChromium().
Mirror the existing guard: skip --load-extension flags when isCustomChromium()
returns true; always push the off-screen window geometry args.
* fix(browse): daemonize macOS/Linux server via setsid()
`Bun.spawn().unref()` only releases the child from Bun's event loop —
it does NOT call setsid(). The spawned bun server inherits the spawning
shell's process session. When the CLI runs inside a session-managed shell
that exits shortly after the CLI returns (Claude Code's per-command Bash
sandbox, Conductor, OpenClaw, CI step runners), the session leader's exit
sends SIGHUP to every PID in the session — killing the bun server and
its Chromium grandchildren within seconds of a successful `connect`.
Setting `BROWSE_PARENT_PID=0` (already done by the `connect` command and
pair-agent) disables the parent-process watchdog but does NOT save the
server here: SIGHUP from session teardown still reaps it.
Replace the macOS/Linux `Bun.spawn().unref()` with Node's
`child_process.spawn({ detached: true })`, which calls setsid() and
gives the server its own session leader role (PPID=1, STAT=Ss). This
mirrors the Windows path's rationale (PR #191 by @fqueiro) — same root
cause, different OS surface.
Verified on macOS in Conductor: pre-fix the server dies ~10–15s after
connect across separate Bash invocations; post-fix the same PID stays
alive (PPID=1, SESS=0, STAT=Ss) and responds to `status`/`goto`/
`snapshot` across many separate shell calls.
The `proc?.stderr` startup-error branch is removed since both platforms
now spawn with `stdio: 'ignore'`; both fall through to the on-disk
`browse-startup-error.log` written by `server.ts`'s start().catch.
* fix(design): bump image-gen timeout to 240s + pin gpt-image-2
The design binary calls /v1/responses (gpt-4o + image_generation tool,
quality:high, 1536x1024) but aborted the request after a hardcoded 120s.
That class of request consistently takes ~140-160s end-to-end, so every
generate/variants/evolve/iterate call aborted before the image returned.
In /design-shotgun this cascades: Step 3c launches N parallel agents,
each calling `$D generate`, each aborts at 120s and retries, all fail,
the comparison board never opens — the skill appears to hang indefinitely.
Reproduced the exact API call with a longer budget: HTTP 200, valid
image, 143.5s. A real /design-shotgun run after the patch generated 3
variants in parallel at 150.0s / 161.0s / 152.1s, all exit 0 — note the
161s case, which a naive 150s bump would still have failed.
- Bump AbortController timeout 120_000 -> 240_000 in generate.ts,
variants.ts, evolve.ts, iterate.ts (both call sites)
- Pin the image_generation tool to model "gpt-image-2"
design/test/variants-retry-after.test.ts: 5 pass, 0 fail. The
feedback-roundtrip.test.ts failures are a pre-existing browse-module
breakage (session.clearLoadedHtml undefined), unrelated to this change.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* test: fill coverage gaps for PRs #1606, #1612, #1620
Three cherry-picked PRs in this wave landed without unit-test coverage for
the specific invariant they protect:
#1606 (@andrey-esipov) — LC_ALL=C pin in _gstack_gbrain_validate_varname
8 tests by sourcing bin/gstack-gbrain-lib.sh and calling the validator
directly. Asserts uppercase/digit/underscore accepted, lowercase
REJECTED (the macOS-locale regression case), mixed-case rejected,
LC_ALL=C scoping is local (doesn't leak to caller).
#1612 (@bharat2913) — setsid daemonize via Node child_process.spawn
4 static-invariant tests on browse/src/cli.ts. The actual setsid
syscall is hard to assert without a real spawn, so we pin the source
shape: nodeSpawn imported from child_process; non-Windows branch uses
nodeSpawn(...) with detached:true and .unref(); comment documents
setsid/SIGHUP root cause; Bun.spawn() is NOT used on macOS/Linux.
#1620 (@davidfoy, re-authored into .tmpl per A3) — §4a-postfail
12 static invariants on land-and-deploy/SKILL.md.tmpl + generated
SKILL.md. Pins all three state branches (MERGED/OPEN/CLOSED), the
authoritative state query, the merge-SHA capture, non-destructive
worktree cleanup with uncommitted-work guard, autoMergeRequest probe
on OPEN, hard "never retry gh pr merge" rule, and atomic regen
propagation.
Failing build if any of the three invariants regresses.
Note: gbrain-lib-validate-varname.test.ts also surfaces a pre-existing
glob-pattern overpermissiveness (hyphens + dots accepted) — not in
#1606's scope; documented inline as a separate cleanup target.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* test(learnings): align injection-prevention tests with PR #1619 tagged-line shape
PR #1619 (preserve current entries in cross-project search) refactored
gstack-learnings-search to tag rows inline (`current\t<json>` vs
`cross\t<json>`) instead of filtering inside the bun block via
process.env.GSTACK_SEARCH_SLUG. The bun block no longer reads SLUG or
CROSS env vars — it parses the per-line tag and sets a per-entry
_crossProject flag.
The pre-existing test/learnings-injection.test.ts still asserted on the
old SLUG + CROSS env var shape. Updates:
- Remove the SLUG env var assertion (no longer set on bash command line)
- Remove the bun-block CROSS env var assertion (block reads the tag now,
not the env)
- Add a new positive assertion that the bun block parses the tag
(sourceTag | tabIndex | crossProject)
- Keep the shell-interpolation safety assertion unchanged — that's
independent of the SLUG refactor
The CROSS env var is still SET on the bash command line (it controls
whether the cross-project find runs at all), but the bun child no longer
reads it. The existing "env vars set on bash command line" test continues
to pin that.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* test(fixtures): regenerate ship-SKILL.md golden baselines
ship/SKILL.md consumes the Confidence Calibration resolver via the
preamble pipeline. This wave's #1539 pre-emit verification gate extends
the resolver text, which propagated to ship/SKILL.md via gen:skill-docs.
The golden fixtures in test/fixtures/golden/ matched the pre-#1539 shape
and failed the host-config regression check.
Refreshes claude-ship-SKILL.md, codex-ship-SKILL.md, and factory-ship-SKILL.md
to match the current generated output. Matches the Daegu wave's bisect
commit 23 ("test(fixtures): regenerate ship-SKILL.md golden baselines").
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* test(gbrain-detect): include gbrain_pooler_mode in schema regression (PR #1591)
PR #1591 (PgBouncer transaction-mode detection, @mikeangstadt) added
gbrain_pooler_mode to the gstack-gbrain-detect JSON output but did not
update the schema regression check in
test/gstack-gbrain-detect-mcp-mode.test.ts. Adding the key in alphabetical
order matching the rest of the schema array. Downstream sync-gbrain ignores
unknown keys, so this is forward-compat.
Without this, the test fails with a diff:
+ "gbrain_pooler_mode"
because keys is the actual set returned and the expected array was
pre-#1591.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(release): v1.43.0.0 — post-Daegu paper-cut wave
Bumps VERSION 1.42.2.0 → 1.43.0.0 (MINOR per scale-aware bump rules: new
env-var surface GSTACK_SYNC_*_TIMEOUT_MS + GSTACK_CHROMIUM_NO_SANDBOX,
behavior expansion in browse/src/browser-manager.ts headless launch,
three skill-template prompt changes affecting /retro, /review,
/sync-gbrain).
CHANGELOG entry leads with what stopped happening: /retro stops
fabricating retros against stale bases, /sync-gbrain stops SIGTERM-looping
35-min restarts on big brains, /review stops shipping framework FPs the
reviewer never grep'd.
18 fixes total — 15 community PRs + 3 self-filed silent-failure issues
(#1624, #1611, #1539) — in one bundled PR with 26 bisect commits and 7
new regression test files. Every wave-touched test file passes in
isolation.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(release): bump v1.43.0.0 → v1.43.2.0 for queue collision
CI check-version-stale flagged v1.43.0.0 already claimed by PR #1574
(garrytan/colombo-v3). PR #1639 (garrytan/muscat-v3) claims v1.43.1.0.
Next available MINOR slot is v1.43.2.0.
Bump VERSION + package.json + CHANGELOG entry header. No behavior
changes — purely re-versioning to clear the queue collision.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Jayesh Betala <jayesh.betala7@gmail.com>
Co-authored-by: Andrey Esipov <andrey.esipov@outlook.com>
Co-authored-by: David Foy <davidfoy@users.noreply.github.com>
Co-authored-by: mikeangstadt <mike.angstadt@closedloop.ai>
Co-authored-by: 0xDevNinja <manmit0x@gmail.com>
Co-authored-by: techcenter68 <techcenter68@users.noreply.github.com>
Co-authored-by: shohu <shohu33@gmail.com>
Co-authored-by: Bharat <bharat@theysaid.io>
Co-authored-by: Matteo Hertel <info@matteohertel.com>
337 lines
14 KiB
Cheetah
337 lines
14 KiB
Cheetah
---
|
|
name: sync-gbrain
|
|
preamble-tier: 2
|
|
version: 1.0.0
|
|
description: |
|
|
Keep gbrain current with this repo's code and refresh agent search
|
|
guidance in CLAUDE.md. Wraps the gstack-gbrain-sync orchestrator with
|
|
state probing, native code-surface registration, capability checks,
|
|
and a verdict block. Re-runnable, idempotent. Use when: "sync gbrain",
|
|
"refresh gbrain", "re-index this repo", "gbrain search isn't finding
|
|
things". (gstack)
|
|
triggers:
|
|
- sync gbrain
|
|
- refresh gbrain
|
|
- reindex repo
|
|
- update gbrain
|
|
allowed-tools:
|
|
- Bash
|
|
- Read
|
|
- Write
|
|
- Edit
|
|
- Glob
|
|
- Grep
|
|
- AskUserQuestion
|
|
---
|
|
|
|
{{PREAMBLE}}
|
|
|
|
# /sync-gbrain — Keep gbrain current and teach the agent to use it
|
|
|
|
You are running the canonical "keep this brain up to date" verb. /setup-gbrain
|
|
installs gbrain once; /sync-gbrain runs every time the user wants the brain
|
|
refreshed against this repo's current state, and refreshes the agent-side
|
|
guidance in CLAUDE.md so the coding agent knows when to prefer `gbrain`
|
|
search over Grep.
|
|
|
|
**Architecture (post-codex review):** This skill uses gbrain v0.20.0+'s
|
|
**native code surfaces** (`gbrain sources add`, `gbrain sync --strategy code`,
|
|
`gbrain reindex-code`, `gbrain code-def/code-refs/code-callers/code-callees`).
|
|
It does NOT use `gbrain import` (that path is for markdown directories).
|
|
It does NOT touch `~/.gstack/` indexing (the existing `gstack-gbrain-source-wireup`
|
|
owns that — never double-store).
|
|
|
|
## User-invocable
|
|
|
|
When the user types `/sync-gbrain`, run this skill. Argument modes (parsed by
|
|
the skill itself, not a dispatcher binary):
|
|
|
|
- `/sync-gbrain` — incremental sync (default; mtime fast-path; ~50ms steady-state)
|
|
- `/sync-gbrain --full` — full code reindex via `gbrain reindex-code` (~25-35 min on a big repo)
|
|
- `/sync-gbrain --code-only` — only run the code stage; skip memory + brain-sync
|
|
- `/sync-gbrain --dry-run` — preview what would sync; no writes anywhere
|
|
- `/sync-gbrain --no-memory` / `--no-brain-sync` — selectively skip stages
|
|
- `/sync-gbrain --quiet` — suppress per-stage output
|
|
|
|
Pass-through args go straight to the orchestrator at
|
|
`{{BIN_DIR}}/gstack-gbrain-sync.ts`.
|
|
|
|
---
|
|
|
|
## Step 1: State probe
|
|
|
|
Before doing anything, check that /setup-gbrain has been run on this Mac.
|
|
|
|
```bash
|
|
~/.claude/skills/gstack/bin/gstack-gbrain-detect 2>/dev/null
|
|
```
|
|
|
|
**Split-engine model (v1.34.0.0+).** Code stage runs locally against the
|
|
per-machine gbrain engine (PGLite or whatever `gbrain config` points to),
|
|
with each worktree of a repo registered as its own source. **Memory stage
|
|
also runs locally** in local-stdio MCP mode — `gstack-memory-ingest` shells
|
|
out to `gbrain import` against the same local engine. In remote-http MCP
|
|
mode (Path 4), the memory stage instead persists staged markdown to
|
|
`~/.gstack/transcripts/<run-id>/` and the artifacts pipeline pushes it to
|
|
the brain admin's pull job (plan D11). Brain-sync (the `gstack-brain-sync`
|
|
push to git) is the one stage that never touches local engine and runs
|
|
regardless of mode.
|
|
|
|
Practically: local PGLite stays code-only on remote-http machines; the
|
|
remote brain holds everything else. Local-stdio machines mix code +
|
|
transcripts in one local engine, as they always have.
|
|
|
|
Also check the per-repo trust policy. If `gstack-gbrain-repo-policy get` for
|
|
this repo returns `deny`, STOP:
|
|
|
|
> "This repo's gbrain trust policy is `deny`. Run `/setup-gbrain --repo` to
|
|
> change it before syncing."
|
|
|
|
---
|
|
|
|
## Step 1.5: Local engine pre-flight (plan D12)
|
|
|
|
Read `gbrain_local_status` from the Step 1 detect output. Branch as follows
|
|
BEFORE invoking the orchestrator:
|
|
|
|
- **`ok`**: proceed to Step 2 normally.
|
|
- **`no-cli`**: STOP. "Local gbrain CLI not installed. Run `/setup-gbrain`
|
|
first."
|
|
- **`missing-config`** AND `gbrain_mcp_mode == "remote-http"`: tell the user
|
|
"Your brain queries (the `mcp__gbrain__*` tools) work via remote MCP, but
|
|
symbol code search needs a local PGLite. Run `/setup-gbrain` and pick
|
|
'Yes' at the new 'local code index' prompt (Step 4.5), or run
|
|
`gbrain init --pglite --json --embedding-model voyage:voyage-code-3 --embedding-dimensions 1024`
|
|
directly (drop the voyage flags if `VOYAGE_API_KEY` isn't set). Continuing
|
|
without code stage."
|
|
Then proceed to Step 2 — the orchestrator's `runCodeImport()` and
|
|
`runMemoryIngest()` will return SKIP per plan D12; only `runBrainSyncPush()`
|
|
will run. Do NOT abort.
|
|
- **`missing-config`** AND `gbrain_mcp_mode != "remote-http"`: STOP. "Local
|
|
gbrain CLI is installed but no engine config. Run `/setup-gbrain` first."
|
|
- **`broken-config`** OR **`broken-db`**: STOP with a clear message:
|
|
```
|
|
Local gbrain config at ~/.gbrain/config.json points at an unreachable
|
|
engine (status: {gbrain_local_status}). Two options:
|
|
1. Re-run /setup-gbrain — Step 1.5 offers Retry / Switch to PGLite /
|
|
Switch brain mode / Quit (plan D4).
|
|
2. Repair manually: mv ~/.gbrain/config.json ~/.gbrain/config.json.bak
|
|
&& gbrain init --pglite --json --embedding-model voyage:voyage-code-3 \
|
|
--embedding-dimensions 1024 (drop voyage flags if VOYAGE_API_KEY unset)
|
|
Re-run /sync-gbrain after.
|
|
```
|
|
Do NOT continue — the orchestrator would skip code+memory and only run
|
|
brain-sync, which is a degraded state the user should fix explicitly.
|
|
|
|
This pre-flight short-circuits the orchestrator before it spends ~80ms
|
|
probing the engine again. The orchestrator independently runs the same
|
|
classifier for defense-in-depth, but Step 1.5's STOP is where the user
|
|
gets the actionable remediation message.
|
|
|
|
---
|
|
|
|
## Step 2: Run the orchestrator
|
|
|
|
Pass user args to the orchestrator. Do not paraphrase them — pass through
|
|
as-is.
|
|
|
|
```bash
|
|
bun run ~/.claude/skills/gstack/bin/gstack-gbrain-sync.ts <user-args>
|
|
```
|
|
|
|
The orchestrator runs three stages: code → memory → brain-sync (per the
|
|
plan's storage tiering). Each stage failure is non-fatal; subsequent stages
|
|
still run. State is persisted to `~/.gstack/.gbrain-sync-state.json` via
|
|
tmp-file + atomic rename. Concurrent runs are blocked by a lock file at
|
|
`~/.gstack/.sync-gbrain.lock` (5-min stale-takeover).
|
|
|
|
---
|
|
|
|
## Step 3: Code-index health check
|
|
|
|
After the sync run, query gbrain for the cwd source's page_count:
|
|
|
|
```bash
|
|
SOURCE_ID=$(grep -o '"source_id":"[^"]*"' ~/.gstack/.gbrain-sync-state.json 2>/dev/null \
|
|
| head -1 | sed 's/.*"source_id":"//;s/".*//')
|
|
PAGES=$(gbrain sources list --json 2>/dev/null \
|
|
| jq -r --arg id "$SOURCE_ID" '.sources[] | select(.id==$id) | .page_count' 2>/dev/null \
|
|
|| echo 0)
|
|
echo "cwd source: $SOURCE_ID, page_count: $PAGES"
|
|
```
|
|
|
|
If `PAGES` is 0 or empty AND the user did NOT pass `--no-code` AND mode was
|
|
not `--full`, AskUserQuestion via the format in the preamble:
|
|
|
|
> D1 — This repo has 0 indexed pages in gbrain. Run a full code reindex now?
|
|
>
|
|
> ELI10: gbrain hasn't indexed this repo's code yet. The semantic search
|
|
> tools (`gbrain search`, `code-def`, `code-refs`) will return nothing
|
|
> until we run a full pass. Takes ~25-35 minutes on a big Mac.
|
|
>
|
|
> Recommendation: A — the brain is unusable for code search until indexed,
|
|
> and Step 2 of this skill already verified gbrain is configured correctly.
|
|
>
|
|
> Note: options differ in kind, not coverage — no completeness score.
|
|
>
|
|
> A) Run /sync-gbrain --full now (recommended)
|
|
> B) Skip — I'll run it later
|
|
|
|
If A: re-invoke the orchestrator with `--full --code-only`.
|
|
If B: continue to Step 4 with the empty-corpus state recorded.
|
|
|
|
---
|
|
|
|
## Step 4: Refresh `## GBrain Search Guidance` block in CLAUDE.md
|
|
|
|
Capability check (per /plan-eng-review §6):
|
|
|
|
```bash
|
|
SLUG="_capability_check_$$"
|
|
CAPABILITY_OK=0
|
|
if [ -f ~/.gbrain/config.json ] && \
|
|
gbrain --version 2>/dev/null | grep -q '^gbrain '; then
|
|
# GBRAIN_PREPARE=true ensures prepared statements stay enabled when
|
|
# connecting through a PgBouncer transaction-mode pooler (port 6543).
|
|
# Without it, search silently returns no results (#1435).
|
|
export GBRAIN_PREPARE=true
|
|
if echo "ping" | gbrain put "$SLUG" >/dev/null 2>&1; then
|
|
# Retry search up to 3 times with 1s delay — under transaction-mode
|
|
# pooling the search index may not be visible on the next connection
|
|
# immediately after the put.
|
|
for _attempt in 1 2 3; do
|
|
if gbrain search "ping" 2>/dev/null | grep -q "$SLUG"; then
|
|
CAPABILITY_OK=1
|
|
break
|
|
fi
|
|
sleep 1
|
|
done
|
|
fi
|
|
fi
|
|
gbrain delete "$SLUG" 2>/dev/null || true
|
|
```
|
|
|
|
Then update CLAUDE.md based on capability state:
|
|
|
|
**If `CAPABILITY_OK=1`** — write or update the block. Idempotent: find the
|
|
HTML-comment-delimited block; replace its body if it exists; append at the
|
|
end of CLAUDE.md if it doesn't. NEVER duplicate. Block is machine-AGNOSTIC
|
|
(no engine, no page counts, no last-sync time — those are in the existing
|
|
`## GBrain Configuration` block).
|
|
|
|
Verbatim block content (copy exactly):
|
|
|
|
```markdown
|
|
## GBrain Search Guidance (configured by /sync-gbrain)
|
|
<!-- gstack-gbrain-search-guidance:start -->
|
|
|
|
GBrain is set up and synced on this machine. The agent should prefer gbrain
|
|
over Grep when the question is semantic or when you don't know the exact
|
|
identifier yet.
|
|
|
|
**This worktree is pinned to a worktree-scoped code source** via the
|
|
`.gbrain-source` file in the repo root (kubectl-style context). Any
|
|
`gbrain code-def`, `code-refs`, `code-callers`, `code-callees`, or `query`
|
|
call from anywhere under this worktree routes to that source by default —
|
|
no `--source` flag needed. Conductor sibling worktrees of the same repo
|
|
each have their own pin and their own indexed pages, so semantic results
|
|
match the actual code on disk in this worktree.
|
|
|
|
Two indexed corpora available via the `gbrain` CLI:
|
|
- This worktree's code (auto-pinned via `.gbrain-source`).
|
|
- `~/.gstack/` curated memory (registered as `gstack-brain-<user>` source via
|
|
the existing federation pipeline).
|
|
|
|
Prefer gbrain when:
|
|
- "Where is X handled?" / semantic intent, no exact string yet:
|
|
`gbrain search "<terms>"` or `gbrain query "<question>"`
|
|
- "Where is symbol Y defined?" / symbol-based code questions:
|
|
`gbrain code-def <symbol>` or `gbrain code-refs <symbol>`
|
|
- "What calls Y?" / "What does Y depend on?":
|
|
`gbrain code-callers <symbol>` / `gbrain code-callees <symbol>`
|
|
- "What did we decide last time?" / past plans, retros, learnings:
|
|
`gbrain search "<terms>" --source gstack-brain-<user>`
|
|
|
|
Grep is still right for known exact strings, regex, multiline patterns, and
|
|
file globs. Run `/sync-gbrain` after meaningful code changes; for ongoing
|
|
auto-sync across all worktrees, run `gbrain autopilot --install` once per
|
|
machine — gbrain's daemon handles incremental refresh on a schedule.
|
|
|
|
<!-- gstack-gbrain-search-guidance:end -->
|
|
```
|
|
|
|
Use the Read + Edit tools. The find-and-replace target is the entire region
|
|
from `<!-- gstack-gbrain-search-guidance:start -->` through
|
|
`<!-- gstack-gbrain-search-guidance:end -->`. If those markers are missing,
|
|
search for `## GBrain Search Guidance (configured by /sync-gbrain)` heading
|
|
and replace from there to the next `## ` or EOF. If no heading exists, append
|
|
the entire block at the end of CLAUDE.md.
|
|
|
|
**Atomic write:** write the new CLAUDE.md content to a tmp file alongside it
|
|
(e.g., `CLAUDE.md.sync-gbrain.tmp`) then `mv` to atomic-rename, so a crash
|
|
mid-write never leaves the file half-modified.
|
|
|
|
**If `CAPABILITY_OK=0`** — REMOVE the block entirely if present. Use the same
|
|
Edit tool to strip the start/end-marker region. The `## GBrain Configuration`
|
|
block stays in place (it's a record of the install, not a capability claim).
|
|
|
|
Do NOT crash if CLAUDE.md is missing or unwritable — log a warning and
|
|
continue.
|
|
|
|
---
|
|
|
|
## Step 5: Verdict block (idempotent doctor output)
|
|
|
|
Print a status block matching `/setup-gbrain` Step 10 conventions. Each row
|
|
is `[OK]/[FIX]/[WARN]/[ERR]`. Reuse `gbrain doctor --json --fast` for
|
|
informational rows but DO NOT gate the guidance block on doctor (per
|
|
/plan-eng-review §6 — doctor is too strict for unrelated reasons).
|
|
|
|
```
|
|
gbrain status: GREEN
|
|
|
|
CLI ............. OK <gbrain version>
|
|
Engine .......... OK <pglite|supabase>
|
|
Capability ...... OK write+search round-trip
|
|
CWD source ...... OK <gstack-code-{repo_slug}> (page_count=<N>)
|
|
~/.gstack source. OK <gstack-brain-{user}> (page_count=<N>) — managed by /setup-gbrain
|
|
Memory sync ..... OK <artifacts_sync_mode>
|
|
CLAUDE.md ....... OK ## GBrain Search Guidance present
|
|
Last sync ....... OK <last_sync from state file>
|
|
|
|
Run `/sync-gbrain` again any time gbrain feels off; safe and idempotent.
|
|
```
|
|
|
|
If any row is YELLOW or RED, the verdict line says so and the failing rows
|
|
surface a one-line "next action" (e.g., `Capability ...... ERR capability
|
|
check failed; CLAUDE.md guidance block REMOVED — run /setup-gbrain to repair`).
|
|
|
|
---
|
|
|
|
## Concurrency note
|
|
|
|
This skill is safe to run concurrently from multiple terminals on the same
|
|
Mac. The orchestrator acquires a lock at `~/.gstack/.sync-gbrain.lock` before
|
|
any state-file or CLAUDE.md mutation and exits with code 2 if another sync is
|
|
in flight. Stale locks (process died) auto-clear after 5 minutes.
|
|
|
|
## Cross-machine note
|
|
|
|
The `## GBrain Search Guidance` block is committed to the repo's CLAUDE.md
|
|
and travels with `git push`/`git pull` — NOT through `~/.gstack/.brain-allowlist`
|
|
(which is for `~/.gstack/` brain-sync only). On a different Mac with a synced
|
|
CLAUDE.md but no local gbrain, /sync-gbrain detects the mismatch via the
|
|
capability check and REMOVES the block (the local agent shouldn't be told to
|
|
use a tool that isn't installed).
|
|
|
|
## Status reporting
|
|
|
|
End with a Completion Status (per the preamble protocol):
|
|
- **DONE** — all stages green, CLAUDE.md guidance block present, verdict GREEN.
|
|
- **DONE_WITH_CONCERNS** — sync ran but at least one stage failed or capability
|
|
check failed. List which.
|
|
- **BLOCKED** — could not acquire lock, gbrain not on PATH, or per-repo policy
|
|
is deny. State the blocker.
|
|
- **NEEDS_CONTEXT** — /setup-gbrain has not been run, or `gbrain doctor` shows
|
|
a state that requires user decision (e.g., engine migration).
|