CalvinBackup/gstack
1
0
Fork 0
mirror of https://github.com/garrytan/gstack.git synced 2026-09-13 08:29:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(gbrain-source-wireup): first sync targets the registered source, not --repo

Browse Source 
The wireup registered a federated source by id, then ran 'gbrain sync --repo $WORKTREE' — which resolves against the brain's DEFAULT source and (on gbrain 0.46.x) rewrites that source's local_path anchor to our worktree. Net effect: the user's primary knowledge source silently repointed at the gstack brain worktree while the just-registered source got zero pages, and pages_synced still reported success. The sync now targets the registered id ('gbrain sync --source $id', the same form the repo's own troubleshooting documents). Because the script's stated floor is gbrain >= 0.18.0 and nothing proves --source exists there, support is probed via 'gbrain sync --help' first: an older gbrain keeps the wrong-but-working --repo call with an upgrade warning instead of converting it into a hard failure. The probe sits after the GSTACK_BRAIN_NO_SYNC early-exit and is unreachable in --probe mode.

Regression tests (fail on v1.68.3.0): a no-skip sync case asserting the call log shows 'sync --source gstack-brain-<id>' and never 'sync --repo', and an old-gbrain fallback case (fake sync --help without --source) asserting --repo plus the upgrade warning.

Fixes #2662
This commit is contained in:
Garry Tan
2026-08-22 02:04:02 +00:00
parent 8b426b3050
commit ffa7b1f452
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/gstack-gbrain-source-wireup
+14 -1
View File
@@ -332,8 +332,21 @@ do_wireup() {
exit 0
fi
# #2662: `sync --repo <path>` resolves against the brain's DEFAULT source and
# can silently repoint that source's local_path anchor at our worktree while
# the source registered above gets nothing. Target the registered source by
# id. `--source` support is probed first (the documented floor is gbrain >=
# 0.18.0 and nothing proves the flag exists there): an older gbrain keeps the
# wrong-but-working --repo call with an upgrade warning, never a hard failure.
local sync_out sync_redacted
sync_out=$(gbrain sync --repo "$WORKTREE" 2>&1) || {
local -a sync_cmd
if gbrain sync --help 2>/dev/null | grep -q -- '--source'; then
sync_cmd=(gbrain sync --source "$id")
else
warn "this gbrain's sync lacks --source; falling back to 'sync --repo' (upgrade gbrain so the sync targets source $id directly — #2662)"
sync_cmd=(gbrain sync --repo "$WORKTREE")
fi
sync_out=$("${sync_cmd[@]}" 2>&1) || {
# Redact any postgres:// URLs from the error message in case gbrain logged
# a connection error containing the full DSN with password. The user sees
# "***REDACTED***" instead of credentials in their stderr or any log.