/ship Step 11 adversarial review surfaced 7 CRITICAL issues. Five fixed
inline (no behavior regression, 26/26 tests still pass):
bin/gstack-gbrain-source-wireup:
1. **rm -rf path validation** (was: F-c-CRITICAL 9/10).
Added `safe_rm_worktree` helper that refuses any path not strictly under
$HOME/, plus dangerous-path allowlist for /, /Users, $HOME root. Replaces
raw `rm -rf "$WORKTREE"` calls (lines 161, 169 originally). If user sets
GSTACK_BRAIN_WORKTREE="" or "/", the helper now dies cleanly instead of
nuking the home dir or root.
2. **jq dependency probe** (was: F-c-CRITICAL 9/10).
`check_source_state` now hard-fails with a clear message if jq is missing,
instead of silently returning "absent" → re-add → die-on-duplicate. Plus
trims whitespace from jq output (`tr -d '[:space:]'`) to defend against
gbrain emitting `\n` for missing fields. Header comment claimed jq was a
transitive dep; now we enforce it.
3. **Python heredoc warns on JSON parse failure** (was: F-c-CRITICAL 8/10).
Previously `except Exception: pass` silently swallowed malformed JSON,
leaving _locked_url empty and defeating the URL-lock defense. Now writes
the parse error to a temp file and warns the user that the URL was not
locked. Also passes the config path via env var (GBRAIN_CONFIG_PATH)
instead of hardcoded `~/.gbrain/config.json`, respecting any HOME override.
4. **Multi-Mac source-id collision fix** (was: F-c-CRITICAL 9/10).
When `check_source_state` returns 1 (source exists at different path), the
helper used to remove + re-add. Two Macs sharing one Supabase brain would
ping-pong the local_path metadata on every sync. Now: if the existing
path's basename matches the local worktree's basename (likely another
machine's local copy of the SAME brain repo), skip re-registration and
sync against the local worktree. gbrain stores pages by content; metadata
is informational. No more ping-pong.
5. **Redact DB URL from sync-failure error message** (was: F-c-CRITICAL 7/10).
`gbrain sync` failures used to echo the full stderr (which can contain
the postgres connection string with password) into the user's terminal
and any log redirect. Now we sed-replace any `postgres://...` with
`postgres://***REDACTED***` before the die() call, and only show the
last 10 lines.
Bonus minor fix: `die()` now uses `$1` instead of `$*` for the warn
message, so the exit-code arg ($2) doesn't get appended to the warning text.
Acknowledged-but-deferred:
- GBRAIN_DATABASE_URL env exposure on Linux via /proc/$PID/environ. This is
a Linux-only concern; gstack is Mac-targeted today and macOS restricts
process env reads. Document as a follow-up if Linux support lands.
- gbrain version parser brittleness if gbrain switches to "v0.18.0" prefix.
Defensive only; current gbrain output matches `gbrain X.Y.Z` exactly.
- bash 3.2 PIPESTATUS reliability. Tests pass on the host bash version (3.2+
via macOS); modern bash 5.x is widely available.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
/ship Step 9 review surfaced 9 INFORMATIONAL findings on the new helper +
migration. Five auto-fixed with no behavior regression (26/26 tests pass):
bin/gstack-gbrain-source-wireup:
- Version compare: put floor "0.18.0" first in `sort -V` stdin so equal-or-
greater $v always sorts to position 2. Stable across sort implementations.
- _worktree_add_detached: drop `2>/dev/null` on the `worktree add`, surface
git's stderr through `prefix` so users see WHY adds fail (disk, perms).
- ensure_worktree: same observability fix on the `git checkout --detach` path
during HEAD-advance, so users see the actual git error before recovery.
- do_probe: replace `[ -d X ] || [ -f X ] && set=present` (precedence trap —
the `&&` short-circuits when the dir branch fails) with explicit if-block.
- do_probe: capture `check_source_state`'s return code explicitly via
`set +e; ...; rc=$?; set -e`. `$?` after an `if`/`elif` chain is fragile
under set -e and may not reach the elif under some shell versions.
- do_wireup: same explicit return-code capture for `ensure_worktree`. The
prior `ensure_worktree || { if [ $? = 2 ]; ...` pattern relied on `$?`
reflecting the function's return after `||`, which is implementation-defined.
gstack-upgrade/migrations/v1.15.1.0.sh:
- Trim whitespace from `gstack-config get gbrain_sync_mode` output via
`tr -d '[:space:]'`. Trailing newlines would mis-classify "off\n" as a
non-empty non-off mode and incorrectly invoke the helper.
Skipped findings (cosmetic / out of scope):
- `python3 -c` reads `~/.gbrain/config.json` via `expanduser` instead of
the helper's `$GBRAIN_CONFIG` variable (cosmetic; HONORS HOME override).
- Long sync-failure error message could truncate to last N lines (cosmetic
log readability).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The wireup helper previously read ~/.gbrain/config.json on every gbrain
subprocess invocation. On Garry's Mac, multiple concurrent test runs and
agent integrations were rewriting that file mid-sync, redirecting the
wireup at the wrong brain partway through a 4-min initial import.
This commit adds a `--database-url <url>` flag to the helper and locks
the URL at startup. Precedence:
1. --database-url flag (explicit caller intent)
2. GBRAIN_DATABASE_URL / DATABASE_URL env (CI / manual override)
3. read once from ~/.gbrain/config.json (default)
Whichever wins gets exported as GBRAIN_DATABASE_URL for every child
`gbrain` invocation. Per gbrain's loadConfig at src/core/config.ts:53,
env-var URLs override the file URL — so a process that flips config.json
between two of our gbrain calls can't redirect us. Defense-in-depth:
once the URL is locked, the wireup completes against the original brain
even under hostile filesystem conditions.
setup-gbrain/SKILL.md.tmpl Step 7 now reads the URL out of config.json
once (via python3 inline) and passes it explicitly with --database-url,
so even the very first wireup call is decoupled from config.json mutability.
Three new test cases cover the lock behavior:
- --database-url flag is exported to child gbrain calls
- falls back to ~/.gbrain/config.json when no flag and no env
- flag overrides env GBRAIN_DATABASE_URL and config.json values
The fake gbrain in the test suite now records GBRAIN_DATABASE_URL alongside
each call so tests can assert the helper exported the locked URL.
Total test count: 13 → 16 passing.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The new bin/gstack-gbrain-source-wireup is the single helper that registers
the gstack brain repo as a gbrain federated source via `git worktree`, runs
incremental sync, and supports --uninstall + --probe + --strict modes.
Replaces the dead `consumers.json + ingest_url + /ingest-repo` HTTP wireup
introduced in v1.12.0.0 — that endpoint never shipped on the gbrain side.
The federation surface (`gbrain sources` / `gbrain sync`) shipped in gbrain
v0.18.0; this helper adapts to its actual semantics (no `sources update`, so
path drift recovery is `remove + re-add`; no `--install-cron` either, so
freshness rides on the existing skill-end push hook).
Source-id derivation is multi-fallback: ~/.gstack/.git origin URL →
~/.gstack-brain-remote.txt → --source-id flag. This makes `--uninstall`
work even after `~/.gstack/.git` is destroyed by the parent uninstall script.
Worktree is `--detach`ed at $GSTACK_HOME's HEAD because main is already
checked out there; advance is a re-checkout of the parent's current HEAD,
not a `git pull`. Divergence recovery removes + re-adds the worktree.
Test suite covers 13 cases: fresh-state registration, idempotent re-runs,
drift recovery, --strict failure modes, source-id fallback chain, --probe
non-mutation, sync errors, and --uninstall. Fake gbrain on $PATH, real git
ops at GSTACK_HOME tmp dir.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Garry Tan