mirror of
https://github.com/garrytan/gstack.git
synced 2026-05-08 14:34:49 +02:00
f44de365c5
* feat: gstack-gbrain-mcp-verify helper for remote MCP probe
Probes a remote gbrain MCP endpoint with bearer auth. POSTs initialize,
classifies failures into NETWORK / AUTH / MALFORMED with one-line
remediation hints, and runs a tools/list capability probe to detect
sources_add MCP support (forward-compat for when gbrain ships URL ingest).
Token consumed from GBRAIN_MCP_TOKEN env, never argv. Required to set
both 'application/json' AND 'text/event-stream' in Accept; that gotcha
costs 10 minutes of debugging when missed (regression-tested).
Live-verified against wintermute (gbrain v0.27.1).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat: gstack-artifacts-init + gstack-artifacts-url helpers
artifacts-init replaces brain-init with provider choice (gh / glab /
manual), per-user gstack-artifacts-$USER repo, HTTPS-canonical storage in
~/.gstack-artifacts-remote.txt, and a "send this to your brain admin"
hookup printout. Always prints the command, never auto-executes — gbrain
v0.26.x has no admin-scope MCP probe (codex Finding #3).
artifacts-url centralizes HTTPS↔SSH/host/owner-repo conversion so callers
don't each string-mangle (codex Finding #10). The remote-conflict check in
artifacts-init compares at the canonical level so re-running with HTTPS
input doesn't trip on a stored SSH URL for the same logical repo.
The "URL form not supported" branch prints a two-line clone-then-path
form for gbrain v0.26.x; the supported branch is a one-liner with --url
ready for when gbrain ships URL ingest.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat: extend gstack-gbrain-detect with mcp_mode + artifacts_remote
Adds two new fields to detect's JSON output:
- gbrain_mcp_mode: local-stdio | remote-http | none
Resolved via 3-tier fallback (codex Finding D3): claude mcp get --json
→ claude mcp list text-grep → ~/.claude.json jq read. If Anthropic moves
the file format, the first two tiers absorb it.
- gstack_artifacts_remote: HTTPS URL from ~/.gstack-artifacts-remote.txt
Falls back to ~/.gstack-brain-remote.txt during the v1.27.0.0 migration
window so detect doesn't return empty between upgrade and migration.
Existing detect tests still pass (15/15). New 19 tests cover every fallback
tier independently, plus a schema regression for /sync-gbrain compat.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat: setup-gbrain Path 4 (remote MCP) + artifacts rename
Path 4 lets users paste an HTTPS MCP URL + bearer token and registers it
as an HTTP-transport MCP without needing a local gbrain CLI install. The
flow:
- Step 2 gains a fourth option (Remote gbrain MCP)
- Step 4 adds Path 4 sub-flow: collect URL, secret-read bearer, verify
via gstack-gbrain-mcp-verify (NETWORK / AUTH / MALFORMED classifier)
- Step 5 (local doctor), Step 7.5 (transcript ingest), Step 5a's stdio
branch all skip on Path 4
- Step 5a adds an HTTP+bearer registration form: claude mcp add
--transport http --header "Authorization: Bearer ..."
- Step 7 renamed "session memory sync" → "artifacts sync" and now calls
gstack-artifacts-init (which always prints the brain-admin hookup
command — no auto-execute, codex Finding #3)
- Step 8 CLAUDE.md block branches: remote-http includes URL + server
version (never the token); local-stdio keeps engine + config-file
- Step 9 smoke test on Path 4 prints the curl-equivalent for
post-restart verification (MCP tools aren't visible mid-session)
- Step 10 verdict block has separate templates per mode
Idempotency: re-running with gbrain_mcp_mode=remote-http already in
detect output skips Step 2 entirely and goes to verification.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* refactor: rename gbrain_sync_mode → artifacts_sync_mode (v1.27.0.0 prep)
Hard rename, no dual-read alias (codex Finding D4). The on-disk migration
script (Phase C, separate commit) renames the config key in users'
~/.gstack/config.yaml and any CLAUDE.md blocks.
Touched call sites:
- bin/gstack-config defaults + validation + list/defaults output
- bin/gstack-gbrain-detect (gstack_brain_sync_mode field still emitted
with the same name for downstream-tool compat; reads new key)
- bin/gstack-brain-sync, bin/gstack-brain-enqueue, bin/gstack-brain-uninstall
- bin/gstack-timeline-log (comment ref)
- scripts/resolvers/preamble/generate-brain-sync-block.ts: renames key,
branches on gbrain_mcp_mode=remote-http to emit "ARTIFACTS_SYNC:
remote-mode (managed by brain server <host>)" instead of the local
mode/queue/last_push line (codex Finding #11)
- bin/gstack-brain-restore + bin/gstack-gbrain-source-wireup: read
~/.gstack-artifacts-remote.txt with ~/.gstack-brain-remote.txt fallback
during the migration window
- bin/gstack-artifacts-init: tolerant of unrecognized URL forms (local
paths, file://, self-hosted gitea) so test infrastructure and unusual
remotes work without canonicalization
- test/brain-sync.test.ts: gstack-brain-init → gstack-artifacts-init
- test/skill-e2e-brain-privacy-gate.test.ts: artifacts_sync_mode keys
- test/gen-skill-docs.test.ts: budget 35K → 36.5K for the new MCP-mode
probe in the preamble resolver
- health/SKILL.md.tmpl, sync-gbrain/SKILL.md.tmpl: comment + verdict line
Hard delete:
- bin/gstack-brain-init (replaced by bin/gstack-artifacts-init in v1.27.0.0)
- test/gstack-brain-init-gh-mock.test.ts (replaced by gstack-artifacts-init.test.ts)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore: regenerate SKILL.md files after artifacts-sync rename
Mechanical regen via \`bun run gen:skill-docs --host all\`. All */SKILL.md
files reflect the renamed config key (gbrain_sync_mode →
artifacts_sync_mode), the renamed remote-helper file
(~/.gstack-artifacts-remote.txt with brain fallback), the renamed init
script (gstack-artifacts-init), and the new ARTIFACTS_SYNC: remote-mode
status line that fires when a remote-http MCP is registered.
Golden fixtures (test/fixtures/golden/*-ship-SKILL.md) refreshed to match
the regenerated default-ship output.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat: v1.27.0.0 migration — gstack-brain → gstack-artifacts rename
Journaled, interruption-safe migration. Six steps, each writes to
~/.gstack/.migrations/v1.27.0.0.journal on success; re-entry resumes
from the next un-done step. On final success, journal is replaced by
~/.gstack/.migrations/v1.27.0.0.done.
Steps:
1. gh_repo_renamed gh/glab repo rename gstack-brain-$USER →
gstack-artifacts-$USER (idempotent: detects
already-renamed and skips)
2. remote_txt_renamed mv ~/.gstack-brain-remote.txt → artifacts file,
rewriting URL path to match the new repo name
3. config_key_renamed sed -i in ~/.gstack/config.yaml flips
gbrain_sync_mode → artifacts_sync_mode
4. claude_md_block sed flips "- Memory sync:" → "- Artifacts sync:"
in cwd CLAUDE.md and ~/.gstack/CLAUDE.md
5. sources_swapped gbrain sources add NEW (verify) → remove OLD
(codex Finding #6: add-before-remove ordering,
no downtime window). On remote-MCP mode, prints
commands for the brain admin instead of executing.
6. done touchfile + delete journal
User opt-out: any "n" or "skip-for-now" answer at the initial prompt
writes a marker file that prevents re-prompting; user can re-invoke
via /setup-gbrain --rerun-migration.
11 unit tests cover: nothing-to-migrate, GitHub happy path, idempotent
re-run, journal-resume mid-flight, remote-MCP print-only path,
add-before-remove ordering verification, add-fail → old source stays
registered, CLAUDE.md field rewrite.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* test: regression suite + E2E for v1.27.0.0 rename
Three new regression tests guard the rename's blast radius (per codex
Findings #1, #8, #9, #12):
- test/no-stale-gstack-brain-refs.test.ts: greps bin/, scripts/, *.tmpl,
test/ for forbidden identifiers (gstack-brain-init, gbrain_sync_mode);
fails CI if any non-allowlisted file references them.
- test/post-rename-doc-regen.test.ts: confirms gen-skill-docs output has
no stale references in any */SKILL.md (the cross-product blind spot).
- test/setup-gbrain-path4-structure.test.ts: structural lint over the
Path 4 prose contract — STOP gates after verify failure, never-write-
token rules, mode-aware CLAUDE.md block, bearer always via env-var.
Two new gate-tier E2E tests (deterministic stub HTTP server, fixed inputs):
- test/skill-e2e-setup-gbrain-remote.test.ts: Path 4 happy path. Stubs
an HTTP MCP server, drives the skill via Agent SDK with a stubbed
bearer, asserts claude.json gets the http MCP entry, CLAUDE.md gets
the remote-http block, the secret token NEVER leaks to CLAUDE.md.
- test/skill-e2e-setup-gbrain-bad-token.test.ts: stub server returns 401;
asserts the AUTH classifier hint surfaces, no MCP registration occurs,
CLAUDE.md is unchanged. Regression guard for the "verify failed → STOP"
rule.
touchfiles.ts: setup-gbrain-remote and setup-gbrain-bad-token added at
gate-tier so CI catches Path 4 regressions on every PR.
Plus a few comment refs flipped: bin/gstack-jsonl-merge, bin/gstack-timeline-log
(legacy gstack-brain-init mentions in headers).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* release: v1.27.0.0 — /setup-gbrain Path 4 + brain → artifacts rename
Bumps VERSION 1.26.4.0 → 1.27.0.0 (MINOR per CLAUDE.md scale-aware bump
guidance: ~1500 line net change including a new path in /setup-gbrain,
two new bin helpers, a journaled migration, 59 new tests, and a config
key rename across the codebase).
CHANGELOG entry covers: Path 4 (Remote MCP) end-to-end, the brain →
artifacts rename, the journaled migration, the verify-helper error
classifier, the artifacts-init multi-host provider choice. Includes
the canonical Garry-voice headline + numbers table + audience close
per the release-summary format.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* test: demote setup-gbrain Path 4 E2E to periodic-tier
The Agent SDK E2E tests for Path 4 (skill-e2e-setup-gbrain-remote and
skill-e2e-setup-gbrain-bad-token) are inherently non-deterministic —
the model interprets "follow Path 4 only" prompts flexibly and can
skip Step 8 (CLAUDE.md write) or shortcut past the verify helper, which
makes the gate-tier assertions flaky.
The deterministic gate coverage for Path 4 is in
test/setup-gbrain-path4-structure.test.ts: a fast structural lint that
catches AUQ-pacing regressions and prose contract drift in <200ms with
zero token spend. That test is the right tool for catching the failure
mode the gate-tier was meant to guard against.
The Agent SDK E2E tests stay available on-demand for periodic-tier runs
(EVALS=1 EVALS_TIER=periodic bun test test/skill-e2e-setup-gbrain-*.test.ts).
Also tightened the verify-error assertion to the literal field shape
("error_class": "AUTH") instead of a substring match that false-matches
the parent claude session's "needs-auth" MCP discovery markers.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore: sync package.json version to 1.27.0.0
VERSION was bumped to 1.27.0.0 in f6ec11eb but package.json was not
updated in the same commit. The gen-skill-docs.test.ts assertion
"package.json version matches VERSION file" caught the drift.
This is the DRIFT_STALE_PKG case the /ship Step 12 idempotency check
is designed for; the fix is the documented sync-only repair (no
re-bump, package.json synced to existing VERSION).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
230 lines
7.5 KiB
Bash
Executable File
230 lines
7.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# gstack-brain-restore — bootstrap a new machine from an existing brain repo.
|
|
#
|
|
# Usage:
|
|
# gstack-brain-restore [<git-remote-url>]
|
|
#
|
|
# If no URL is given, reads from ~/.gstack-brain-remote.txt (written by
|
|
# gstack-brain-init on the original machine). Copy that file to the new
|
|
# machine before running this command.
|
|
#
|
|
# Safety gates (refuses with clear message):
|
|
# - ~/.gstack/.git already exists with a DIFFERENT remote
|
|
# - ~/.gstack/ contains non-allowlisted, non-gitignored user files
|
|
# that would be clobbered by restore
|
|
#
|
|
# What it does:
|
|
# 1. Clone the remote to a staging directory
|
|
# 2. Validate the repo is gstack-brain-shaped (.brain-allowlist, .gitattributes)
|
|
# 3. rsync-copy tracked files into ~/.gstack/ with skip-if-same-hash
|
|
# 4. Move staging's .git into ~/.gstack/.git
|
|
# 5. Register local git config merge drivers (they don't clone from remote)
|
|
# 6. Wire the cloned brain into gbrain via gstack-gbrain-source-wireup
|
|
# (best-effort; restore continues even if gbrain wireup fails)
|
|
#
|
|
# Env:
|
|
# GSTACK_HOME — override ~/.gstack
|
|
|
|
set -euo pipefail
|
|
|
|
GSTACK_HOME="${GSTACK_HOME:-$HOME/.gstack}"
|
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
CONFIG_BIN="$SCRIPT_DIR/gstack-config"
|
|
# v1.27.0.0+ canonical name; brain-remote is the legacy fallback during the
|
|
# migration window. The migration script renames the file in place.
|
|
if [ -f "$HOME/.gstack-artifacts-remote.txt" ]; then
|
|
REMOTE_FILE="$HOME/.gstack-artifacts-remote.txt"
|
|
else
|
|
REMOTE_FILE="$HOME/.gstack-brain-remote.txt"
|
|
fi
|
|
|
|
REMOTE_URL="${1:-}"
|
|
if [ -z "$REMOTE_URL" ]; then
|
|
if [ -f "$REMOTE_FILE" ]; then
|
|
REMOTE_URL=$(head -1 "$REMOTE_FILE" | tr -d '[:space:]')
|
|
fi
|
|
fi
|
|
|
|
if [ -z "$REMOTE_URL" ]; then
|
|
cat >&2 <<EOF
|
|
gstack-brain-restore: no remote URL provided.
|
|
|
|
Provide one of:
|
|
gstack-brain-restore <git-url>
|
|
or put the URL in $REMOTE_FILE (copy from the original machine)
|
|
EOF
|
|
exit 1
|
|
fi
|
|
|
|
# ---- safety gates ----
|
|
if [ -d "$GSTACK_HOME/.git" ]; then
|
|
EXISTING_REMOTE=$(git -C "$GSTACK_HOME" remote get-url origin 2>/dev/null || echo "")
|
|
if [ -n "$EXISTING_REMOTE" ] && [ "$EXISTING_REMOTE" != "$REMOTE_URL" ]; then
|
|
cat >&2 <<EOF
|
|
gstack-brain-restore: ~/.gstack/.git already points at:
|
|
$EXISTING_REMOTE
|
|
|
|
You asked to restore from:
|
|
$REMOTE_URL
|
|
|
|
Refusing to overwrite. Run 'gstack-brain-uninstall' first or pass a matching URL.
|
|
EOF
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
# ---- clone to staging ----
|
|
STAGING=$(mktemp -d "${TMPDIR:-/tmp}/gstack-brain-restore.XXXXXX")
|
|
trap 'rm -rf "$STAGING" 2>/dev/null' EXIT
|
|
|
|
echo "Cloning $REMOTE_URL to staging..."
|
|
if ! git clone --quiet "$REMOTE_URL" "$STAGING/repo" 2>/dev/null; then
|
|
echo "Clone failed. Check:" >&2
|
|
echo " - URL is correct: $REMOTE_URL" >&2
|
|
echo " - Auth: gh auth status (github) / glab auth status (gitlab)" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# ---- validate shape ----
|
|
if [ ! -f "$STAGING/repo/.brain-allowlist" ] || [ ! -f "$STAGING/repo/.gitattributes" ]; then
|
|
cat >&2 <<EOF
|
|
gstack-brain-restore: $REMOTE_URL does not look like a gstack-brain repo.
|
|
Missing: .brain-allowlist and/or .gitattributes
|
|
|
|
This command only works on repos created by gstack-brain-init.
|
|
EOF
|
|
exit 1
|
|
fi
|
|
|
|
# ---- validate target ~/.gstack/ has no non-gitignored user files ----
|
|
mkdir -p "$GSTACK_HOME"
|
|
if [ ! -d "$GSTACK_HOME/.git" ]; then
|
|
# No existing git → check if we'd clobber anything allowlisted.
|
|
# Read the new allowlist globs and see if any existing files would collide.
|
|
CLOBBER_RISK=$(python3 - "$GSTACK_HOME" "$STAGING/repo/.brain-allowlist" <<'PYEOF'
|
|
import sys, os, fnmatch
|
|
home, allowlist_path = sys.argv[1:3]
|
|
try:
|
|
with open(allowlist_path) as f:
|
|
globs = [l.strip() for l in f if l.strip() and not l.lstrip().startswith('#')]
|
|
except FileNotFoundError:
|
|
globs = []
|
|
risks = []
|
|
for root, dirs, files in os.walk(home):
|
|
dirs[:] = [d for d in dirs if d != '.git']
|
|
for name in files:
|
|
full = os.path.join(root, name)
|
|
rel = os.path.relpath(full, home)
|
|
for g in globs:
|
|
if fnmatch.fnmatchcase(rel, g):
|
|
risks.append(rel)
|
|
break
|
|
for r in risks[:5]:
|
|
print(r)
|
|
if len(risks) > 5:
|
|
print(f"...and {len(risks) - 5} more")
|
|
sys.exit(0 if not risks else 2)
|
|
PYEOF
|
|
) || true
|
|
if [ -n "$CLOBBER_RISK" ]; then
|
|
cat >&2 <<EOF
|
|
gstack-brain-restore: ~/.gstack/ has existing allowlisted files that would
|
|
be clobbered by restore:
|
|
|
|
$CLOBBER_RISK
|
|
|
|
Back these up first, or run this command on a machine with an empty
|
|
~/.gstack/. If these files are from an earlier gstack session on THIS
|
|
machine, you probably want to run gstack-brain-init instead (to create a
|
|
new brain repo with this machine's state).
|
|
EOF
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
# ---- copy tracked files in ----
|
|
echo "Copying tracked files into ~/.gstack/ ..."
|
|
# Use git-ls-tree to get exact tracked file list (avoids staged/untracked files).
|
|
cd "$STAGING/repo"
|
|
git ls-tree -r --name-only HEAD | while IFS= read -r rel_path; do
|
|
src="$STAGING/repo/$rel_path"
|
|
dst="$GSTACK_HOME/$rel_path"
|
|
mkdir -p "$(dirname "$dst")"
|
|
# Skip if identical (content hash). Otherwise copy.
|
|
if [ -f "$dst" ] && cmp -s "$src" "$dst"; then
|
|
continue
|
|
fi
|
|
cp "$src" "$dst"
|
|
done
|
|
|
|
# ---- move .git into place ----
|
|
if [ -d "$GSTACK_HOME/.git" ]; then
|
|
# Existing .git with matching remote — just fetch + fast-forward.
|
|
git -C "$GSTACK_HOME" fetch origin >/dev/null 2>&1 || true
|
|
else
|
|
mv "$STAGING/repo/.git" "$GSTACK_HOME/.git"
|
|
fi
|
|
|
|
# ---- register merge drivers (local git config; don't survive clones) ----
|
|
git -C "$GSTACK_HOME" config merge.jsonl-append.driver "$SCRIPT_DIR/gstack-jsonl-merge %O %A %B"
|
|
git -C "$GSTACK_HOME" config merge.jsonl-append.name "gstack JSONL append-only merger"
|
|
git -C "$GSTACK_HOME" config merge.union.driver "cat %A %B > %A.merged && mv %A.merged %A"
|
|
git -C "$GSTACK_HOME" config merge.union.name "union concat"
|
|
|
|
# ---- install pre-commit hook (same as init) ----
|
|
HOOK="$GSTACK_HOME/.git/hooks/pre-commit"
|
|
mkdir -p "$(dirname "$HOOK")"
|
|
cat > "$HOOK" <<'HOOK_EOF'
|
|
#!/usr/bin/env bash
|
|
set -uo pipefail
|
|
python3 -c "
|
|
import sys, re, subprocess
|
|
try:
|
|
out = subprocess.check_output(['git', 'diff', '--cached'], stderr=subprocess.DEVNULL).decode('utf-8', 'replace')
|
|
except Exception:
|
|
sys.exit(0)
|
|
patterns = [
|
|
('aws-access-key', re.compile(r'AKIA[0-9A-Z]{16}')),
|
|
('github-token', re.compile(r'\b(gh[pousr]_[A-Za-z0-9]{20,}|github_pat_[A-Za-z0-9_]{20,})')),
|
|
('openai-key', re.compile(r'\bsk-[A-Za-z0-9_-]{20,}')),
|
|
('pem-block', re.compile(r'-----BEGIN [A-Z ]{3,}-----')),
|
|
('jwt', re.compile(r'\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\b')),
|
|
('bearer-token-json',
|
|
re.compile(r'\"(authorization|api[_-]?key|apikey|token|secret|password)\"\s*:\s*\"[A-Za-z0-9_./+=-]{16,}\"',
|
|
re.IGNORECASE)),
|
|
]
|
|
for name, rx in patterns:
|
|
if rx.search(out):
|
|
sys.stderr.write(f'gstack-brain pre-commit: refusing commit — {name} detected.\n')
|
|
sys.exit(1)
|
|
sys.exit(0)
|
|
"
|
|
HOOK_EOF
|
|
chmod +x "$HOOK"
|
|
|
|
# ---- write remote helper file if missing ----
|
|
if [ ! -f "$REMOTE_FILE" ]; then
|
|
echo "$REMOTE_URL" > "$REMOTE_FILE"
|
|
chmod 600 "$REMOTE_FILE"
|
|
echo ""
|
|
echo "Wrote $REMOTE_FILE for future skill-run auto-detection."
|
|
fi
|
|
|
|
# ---- wire the cloned brain into gbrain (best-effort) ----
|
|
WIREUP_BIN="$SCRIPT_DIR/gstack-gbrain-source-wireup"
|
|
if [ -x "$WIREUP_BIN" ]; then
|
|
"$WIREUP_BIN" || >&2 echo "WARNING: gbrain wireup failed; run $WIREUP_BIN manually after fixing prereqs"
|
|
fi
|
|
|
|
cat <<EOF
|
|
|
|
gstack-brain-restore complete.
|
|
Local: $GSTACK_HOME
|
|
Remote: $REMOTE_URL
|
|
|
|
Next skill run will ask about privacy mode (one-time question) and then
|
|
sync automatically at skill boundaries.
|
|
|
|
Status anytime: gstack-brain-sync --status
|
|
EOF
|