mirror of
https://github.com/garrytan/gstack.git
synced 2026-05-31 07:19:31 +02:00
64f9aafa1e
* fix(office-hours): #1671 — session writer was writing to the legacy file User-visible symptom: returning /office-hours users get the same closing pitch every visit, no matter how many times they've run the skill. The welcome_back tier (which exists specifically to skip the pitch for returning users) was unreachable. Live since 2026-04-18 / v1.0.0.0 on every fresh-$HOME user. Root cause: the v1.0.0.0 migration moved the read path to ~/.gstack/developer-profile.json but left the writer in office-hours/SKILL.md.tmpl writing to the legacy ~/.gstack/builder-profile.jsonl. Reader and writer disagreed on storage, so SESSION_COUNT never incremented and /office-hours always treated the user as a first-timer. Fix: - bin/gstack-developer-profile: new --log-session subcommand that read-modify-writes developer-profile.json's sessions[] array (atomic mktemp+mv, signals/resources/topics aggregation, gbrain-enqueue mirror of gstack-timeline-log:40). Naming matches the gstack-*-log family verb. - bin/gstack-developer-profile: do_read filters mode:"resources" entries when picking LAST_PROJECT/LAST_ASSIGNMENT/LAST_DESIGN_TITLE so the Phase 6 resources auto-append doesn't clobber real-session state. Latent bug that was masked by the broken writer; activated by the fix. - office-hours/SKILL.md.tmpl: lines 490 + 893 swap echo >> for --log-session. - test/gstack-developer-profile.test.ts: +8 tests covering --log-session contract (regression, aggregation, dedup, validation, ts handling) plus the mode-filter regression. All 8 fail on main, all 8 pass with this fix. - test/static-no-legacy-writes.test.ts: new static-grep invariant walking every skill dir to prevent future regressions onto the legacy file. Affected users: stranded builder-profile.jsonl entries are not recovered automatically by this PR. On their next /office-hours run, the first new session lands in welcome_back; past data stays in the legacy file (still readable by other tools during deprecation). Most pre-existing users have only a handful of stranded sessions. See docs/designs/FIX_1671_PROFILE_MIGRATION.md for scope decisions (RC2/RC3 follow-ups, what was intentionally left out, and why). Issue: #1671 * test(office-hours): refine #1671 invariant regex comment for literal-path scope Clarifies that the WRITE_PATTERN regex catches literal-path writes only; variable-indirected writes (FILE=...; echo >> "$FILE") are not detected. The SKILL.md.tmpl assertions in the same suite pin the exact #1671 regression class directly; this regex is a backstop, not a flow analyzer. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(timeline): pass read filters as data * feat(next-version): support monorepo VERSION paths via --version-path + .gstack/version-path The workspace-aware ship queue hardcoded the VERSION file at the repo root. In monorepos where versioning is subproject-scoped (one app inside a larger repo), every PR's VERSION lookup 404s, the queue silently empties, and parallel /ship sessions all bump from "current main + 1" — producing a cascade of slot collisions. Repro: tinas-second-brain repo. Root VERSION is absent; the real VERSION lives at "Tinas Second Brain/health-tracker/VERSION". In one day, four sequential collisions: 0.4.0.1 -> 0.5.0.0 -> 0.5.0.1 -> 0.5.0.2 -> 0.5.0.3. Fix: add a --version-path flag and a repo-local .gstack/version-path config file. Resolution priority: CLI flag > .gstack/version-path > "VERSION". The resolved path threads through all four call sites — git show origin/<base>:<path>, the GitHub Contents API, the GitLab files API, and the local sibling-worktree scan — and shows up in the JSON output as version_path so /ship and operators can see what got picked. The previous warning "could not fetch VERSION (fork or private)" was misleading whenever the real cause was wrong path. The new wording names the path that 404'd and hints at the two knobs. Backward-compatible: no flag, no config, no change in behavior. Tests: 6 unit tests for resolveVersionPath (priority, parsing, blank / missing / empty edge cases) + a second integration smoke that drives --version-path end-to-end and asserts it surfaces in JSON output. * fix(investigate): support standalone freeze hook path * fix(browse): clarify localhost bind failures * fix(migration): defer v1.40.0.0 done-marker until every repair succeeds (#1581) The v1.40.0.0 migration unconditionally `touch`ed its done-marker, even when the jq-gated `.brain-privacy-map.json` patch was skipped because jq was missing on the user's machine. On subsequent runs, the script short-circuited on the marker so the privacy-map repair never landed. Federation sync then silently dropped `/plan-eng-review` test plans. Track every failure mode via a single `incomplete` flag: jq missing, malformed JSON, jq mutation failure, tempfile creation failure, `mv` failure, allowlist append failure, gitattributes append failure. The marker is written only when `incomplete=0`, so the migration runner retries on the next /gstack-upgrade once the prerequisites are met. * test(migration): unit tests for v1.40.0.0 deferred done-marker fix (#1581) 8 cases pinning the fix: - Case 1 (happy path): jq present, fresh privacy-map → all three files patched, marker written. - Case 2 (regression for #1581): jq missing, privacy-map present → marker must NOT be written. Fails against the buggy script, passes against the fix. - Case 3 (recovery): jq missing, then jq restored → patch lands on second run. - Case 4 (idempotency): privacy-map already has correct entry → no mutation, marker written. - Case 5 (fresh-init): privacy-map file absent → allowlist + gitattrs patched, marker written. - Case 6 (malformed JSON): broken privacy-map JSON → no marker, no mutation. - Case 7 (jq mutation failure): fake jq returning 1 → no marker, tempfile cleaned up. - Case 8 (allowlist append failure): read-only allowlist → no marker. Tests use spawnSync('bash', [MIGRATION], …) with isolated tmpHomes. "jq missing" sets PATH to a curated dir of symlinks to standard utils, omitting jq; "jq mutation fails" uses an `exit 1` shim. Avoids blanket-clearing PATH (which would hide bash/grep/etc). * fix(brain-sync): make artifact sync work on Windows (discover-new + drain) Automatic artifact sync was fully non-functional on Windows (Git Bash): --discover-new enqueued nothing and the --once drain staged nothing, so artifacts_sync_mode looked active but no artifacts ever reached the repo. Three independent Windows-only causes in bin/gstack-brain-sync: 1. discover-new matched os.path.relpath (backslash separators on Windows) against the forward-slash allowlist globs, so no nested file ever matched. Normalized the relpath to "/". 2. discover-new enqueued via subprocess.run([gstack-brain-enqueue, rel]), but Windows Python cannot exec a bash-shebang script, so nothing was enqueued even once matched. Now appends to the queue in-process. 3. compute_paths_to_stage ends in print(p); Windows Python emits CRLF, the bash `read -r` keeps the trailing CR, and `git add -- "path<CR>"` matches nothing under `2>/dev/null || true`. Now strips the CR before staging. The in-process enqueue mirrors gstack-brain-enqueue's contract: one atomic O_APPEND write per record (each line < PIPE_BUF) so a parallel writer-shim append can't interleave mid-record, and the discover cursor advances only after the write succeeds, so a failed write retries instead of silently recording the file as synced. Skip-list entries are separator-normalized on both the discover and drain (compute_paths_to_stage) sides, so a backslash .brain-skip.txt entry can't be honored at discovery yet bypassed at commit. Adds test/brain-sync-windows-paths.test.ts (static invariants -- behavioral spawn tests cannot run on the Windows lane, since Node/Bun cannot exec the bin/ shebang scripts there) and wires it into windows-free-tests.yml. Verified red->green and end-to-end on Windows 11 / Git Bash; macOS/Linux behavior unchanged (os.sep is already "/", no CRLF, compute path logic unchanged besides the shared skip normalization). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix: detect bun.lock (Bun v1.2+ text lockfile) in diff-scope CONFIG gstack-diff-scope only matched the legacy binary lockfile `bun.lockb` but not the newer text-based `bun.lock` introduced in Bun v1.2+. Projects using current Bun versions were silently missing the SCOPE_CONFIG signal when only the lockfile changed. 🤖 Generated with [Qoder][https://qoder.com] * fix(ios-qa): resolve CoreDevice tunnel via devicectl + keep tunnel alive The daemon's tunnel bootstrap used `dns.resolve6` to look up `<device>.coredevice.local`, which fails with ESERVFAIL on macOS 26.x (Darwin 25.x) because Node's resolve6 path goes through libresolv and does NOT consult mDNSResponder. `dns.lookup` (getaddrinfo) does. Even when resolution works, CoreDevice in Xcode 26 only holds the USB tunnel up while a devicectl command is in-flight, so the IPv6 ULA becomes unroutable within ~10-15s of idle and subsequent proxy requests time out. Two-part fix: 1. Resolution order is now (a) `xcrun devicectl device info details --json-output` to read `result.connectionProperties.tunnelIPAddress` directly, (b) mDNS via `dns.lookup`, (c) legacy `dns.resolve6` as a last-ditch fallback. 2. After a successful bootstrap the daemon spawns a periodic `devicectl device info details` (~5s) to keep the tunnel session alive. Cleaned up on SIGINT/SIGTERM/exit. Adds tests for `getDeviceTunnelIPv6FromDevicectl`, the `resolveTunnelIPv6` fallback chain, and `startTunnelKeepalive`. Existing bootstrap tests updated to include the new `device info details` spawn step. Tested against: iPhone 12 Pro on iOS 26.x via Mac Mini M-series running macOS Sequoia 15.x / Darwin 25.3.0. * chore(release): v1.44.1.0 — 9-PR community fix wave (post-windhoek paper-cut) Bump VERSION + CHANGELOG entry. Wave covers /office-hours session counter, iOS QA macOS 26 tunnels, Windows brain-sync, browse server bind diagnostics, monorepo VERSION layouts, /investigate freeze hook on standalone installs, gstack-timeline-read quote injection, v1.40.0.0 migration on jq-less machines, bun.lock detection. 9 community PRs: #1676 #1635 #1627 #1648 #1664 #1589 #1672 #1649 #1673 9 contributors credited: @pryow @jbetala7 @cfeddersen @Gujiassh @spacegeologist @stedfn @daveowenatl @hiSandog @sternryan 4 issues closed: #1671 #1677 #1634 #1647 #1581 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> --------- Co-authored-by: Rook <rook@robomovers.com> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com> Co-authored-by: Jayesh Betala <jayesh.betala7@gmail.com> Co-authored-by: Christoph <astaran@herr-der-ringe-film.de> Co-authored-by: gujishh <baiaoshh@163.com> Co-authored-by: zhengzuo0-ai <zheng.zuo0@gmail.com> Co-authored-by: Stefan Neamtu <stefan.neamtu@nearone.org> Co-authored-by: Dave Owen <daveowen66@gmail.com> Co-authored-by: 陈家名 <chenjiaming@kezaihui.com> Co-authored-by: Ryan Stern <206953196+sternryan@users.noreply.github.com>
498 lines
17 KiB
Bash
Executable File
498 lines
17 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# gstack-brain-sync — drain queue, commit allowlisted paths, push to remote.
|
|
#
|
|
# Usage:
|
|
# gstack-brain-sync --once drain queue, commit, push (default)
|
|
# gstack-brain-sync --status print sync health as JSON
|
|
# gstack-brain-sync --skip-file <p> add <p> to ~/.gstack/.brain-skip.txt
|
|
# gstack-brain-sync --drop-queue --yes clear queue without committing
|
|
# gstack-brain-sync --discover-new scan allowlist dirs, enqueue changed files
|
|
#
|
|
# Invoked by the preamble at skill START and END boundaries. No persistent
|
|
# daemon. Typical run <1s when queue empty; ~200-800ms with network push.
|
|
#
|
|
# Singleton enforcement: flock on ~/.gstack/.brain-sync.lock. Concurrent
|
|
# invocations queue and serialize.
|
|
#
|
|
# Env:
|
|
# GSTACK_HOME — override ~/.gstack (aligns with writers).
|
|
|
|
set -uo pipefail
|
|
|
|
GSTACK_HOME="${GSTACK_HOME:-$HOME/.gstack}"
|
|
QUEUE="$GSTACK_HOME/.brain-queue.jsonl"
|
|
ALLOWLIST="$GSTACK_HOME/.brain-allowlist"
|
|
PRIVACY_MAP="$GSTACK_HOME/.brain-privacy-map.json"
|
|
SKIP_FILE="$GSTACK_HOME/.brain-skip.txt"
|
|
STATUS_FILE="$GSTACK_HOME/.brain-sync-status.json"
|
|
LAST_PUSH_FILE="$GSTACK_HOME/.brain-last-push"
|
|
LOCK_FILE="$GSTACK_HOME/.brain-sync.lock"
|
|
DISCOVER_CURSOR="$GSTACK_HOME/.brain-discover-cursor"
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
CONFIG_BIN="$SCRIPT_DIR/gstack-config"
|
|
|
|
# Remote-specific hint for auth errors (branch on origin URL).
|
|
remote_auth_hint() {
|
|
local url
|
|
url=$(git -C "$GSTACK_HOME" remote get-url origin 2>/dev/null || echo "")
|
|
case "$url" in
|
|
*github.com*|*@github.*) echo "run: gh auth status (and gh auth refresh if needed)" ;;
|
|
*gitlab*) echo "run: glab auth status" ;;
|
|
*) echo "check 'git remote -v' and your credentials" ;;
|
|
esac
|
|
}
|
|
|
|
write_status() {
|
|
# args: status_code message [extra_json_blob]
|
|
local code="$1"
|
|
local msg="$2"
|
|
local extra="${3:-{\}}"
|
|
local ts
|
|
ts=$(date -u +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || echo "")
|
|
python3 - "$STATUS_FILE" "$code" "$msg" "$ts" "$extra" <<'PYEOF' 2>/dev/null || true
|
|
import json, sys
|
|
path, code, msg, ts, extra = sys.argv[1:6]
|
|
try:
|
|
extra_obj = json.loads(extra) if extra else {}
|
|
except Exception:
|
|
extra_obj = {}
|
|
data = {"status": code, "message": msg, "ts": ts, **extra_obj}
|
|
with open(path, "w") as f:
|
|
json.dump(data, f)
|
|
f.write("\n")
|
|
PYEOF
|
|
}
|
|
|
|
# Read config; return 0 if sync active, 1 otherwise.
|
|
sync_active() {
|
|
if [ ! -d "$GSTACK_HOME/.git" ]; then
|
|
return 1
|
|
fi
|
|
local mode
|
|
mode=$("$CONFIG_BIN" get artifacts_sync_mode 2>/dev/null || echo off)
|
|
[ "$mode" = "off" ] && return 1
|
|
return 0
|
|
}
|
|
|
|
# Secret regex families — stdin scan. Exits 0 clean, 1 if hit.
|
|
# Echoes the matching pattern family name on hit. Uses python3 -c (not
|
|
# heredoc) so sys.stdin stays available for the diff content.
|
|
secret_scan_stdin() {
|
|
python3 -c "
|
|
import sys, re
|
|
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',
|
|
# JSON-embedded auth headers. The optional Bearer/Basic/Token prefix
|
|
# matters: real auth values include a literal space after the scheme
|
|
# name, but the value charset below does not include spaces, so
|
|
# without the optional prefix every Bearer token in a JSON blob slips
|
|
# past the scanner.
|
|
re.compile(r'\"(authorization|api[_-]?key|apikey|token|secret|password)\"\\s*:\\s*\"(Bearer |Basic |Token )?[A-Za-z0-9_./+=-]{16,}\"',
|
|
re.IGNORECASE)),
|
|
]
|
|
text = sys.stdin.read()
|
|
for name, rx in patterns:
|
|
m = rx.search(text)
|
|
if m:
|
|
snippet = m.group(0)
|
|
if len(snippet) > 30:
|
|
snippet = snippet[:30] + '...'
|
|
print(name + ':' + snippet)
|
|
sys.exit(1)
|
|
sys.exit(0)
|
|
"
|
|
}
|
|
|
|
# Compute matched allowlisted, privacy-filtered path set from queue.
|
|
# Output: newline-delimited relative paths that should be staged.
|
|
compute_paths_to_stage() {
|
|
local mode="$1"
|
|
python3 - "$GSTACK_HOME" "$QUEUE" "$ALLOWLIST" "$PRIVACY_MAP" "$SKIP_FILE" "$mode" <<'PYEOF'
|
|
import sys, json, os, fnmatch, glob
|
|
|
|
gstack_home, queue, allowlist_path, privacy_path, skip_path, mode = sys.argv[1:7]
|
|
|
|
def load_lines(path):
|
|
try:
|
|
with open(path) as f:
|
|
return [l.strip() for l in f if l.strip() and not l.lstrip().startswith("#")]
|
|
except FileNotFoundError:
|
|
return []
|
|
|
|
def load_privacy_map(path):
|
|
try:
|
|
with open(path) as f:
|
|
data = json.load(f)
|
|
# Expected: [{"pattern": "glob", "class": "artifact" | "behavioral"}]
|
|
return data if isinstance(data, list) else []
|
|
except (FileNotFoundError, json.JSONDecodeError):
|
|
return []
|
|
|
|
allowlist_globs = load_lines(allowlist_path)
|
|
privacy_map = load_privacy_map(privacy_path)
|
|
# Normalize skip entries to the POSIX form queued paths use, so a backslash
|
|
# entry in .brain-skip.txt still matches on Windows. The drain is the safety
|
|
# boundary that actually stages files, so it must normalize identically to
|
|
# discover_new — otherwise an explicitly-skipped file gets committed.
|
|
skip_lines = {s.replace(os.sep, "/") for s in load_lines(skip_path)}
|
|
|
|
# Read queue; collect unique file paths.
|
|
queue_paths = set()
|
|
try:
|
|
with open(queue) as f:
|
|
for line in f:
|
|
line = line.strip()
|
|
if not line:
|
|
continue
|
|
try:
|
|
obj = json.loads(line)
|
|
p = obj.get("file")
|
|
if isinstance(p, str):
|
|
queue_paths.add(p)
|
|
except json.JSONDecodeError:
|
|
continue
|
|
except FileNotFoundError:
|
|
pass
|
|
|
|
def path_matches_any(path, globs):
|
|
for pattern in globs:
|
|
if fnmatch.fnmatchcase(path, pattern):
|
|
return True
|
|
return False
|
|
|
|
def privacy_class(path, mapping):
|
|
for entry in mapping:
|
|
pat = entry.get("pattern")
|
|
if pat and fnmatch.fnmatchcase(path, pat):
|
|
return entry.get("class", "artifact")
|
|
# Default class when no pattern matches: artifact (safe default).
|
|
return "artifact"
|
|
|
|
# mode filter: 'off' → nothing; 'artifacts-only' → only artifact class;
|
|
# 'full' → both classes.
|
|
def mode_allows(cls, mode):
|
|
if mode == "off":
|
|
return False
|
|
if mode == "artifacts-only":
|
|
return cls == "artifact"
|
|
return True # full
|
|
|
|
final = []
|
|
for p in sorted(queue_paths):
|
|
if p in skip_lines:
|
|
continue
|
|
# Must be under GSTACK_HOME root. Reject absolute + reject ../ escape.
|
|
if p.startswith("/") or ".." in p.split("/"):
|
|
continue
|
|
# Must match at least one allowlist glob.
|
|
if not path_matches_any(p, allowlist_globs):
|
|
continue
|
|
# Must survive privacy mode filter.
|
|
cls = privacy_class(p, privacy_map)
|
|
if not mode_allows(cls, mode):
|
|
continue
|
|
# Must exist on disk — can't stage what isn't there.
|
|
if not os.path.exists(os.path.join(gstack_home, p)):
|
|
continue
|
|
final.append(p)
|
|
|
|
for p in final:
|
|
print(p)
|
|
PYEOF
|
|
}
|
|
|
|
subcmd_once() {
|
|
if ! sync_active; then
|
|
# Silent no-op when feature not initialized / disabled.
|
|
exit 0
|
|
fi
|
|
|
|
# Singleton lock via atomic mkdir. `flock(1)` isn't on macOS by default;
|
|
# `mkdir` is atomic on every POSIX filesystem. If another --once is already
|
|
# running, skip (don't wait) — the next skill boundary will catch up.
|
|
local lock_dir="${LOCK_FILE}.d"
|
|
if ! mkdir "$lock_dir" 2>/dev/null; then
|
|
# Is the lock stale? Check the pidfile inside. If process is dead, clear it.
|
|
if [ -f "$lock_dir/pid" ]; then
|
|
local lock_pid
|
|
lock_pid=$(cat "$lock_dir/pid" 2>/dev/null || echo "")
|
|
if [ -n "$lock_pid" ] && ! kill -0 "$lock_pid" 2>/dev/null; then
|
|
# Stale lock — clear and retry once.
|
|
rm -rf "$lock_dir" 2>/dev/null || true
|
|
if ! mkdir "$lock_dir" 2>/dev/null; then
|
|
exit 0
|
|
fi
|
|
else
|
|
# Lock is held by a live process.
|
|
exit 0
|
|
fi
|
|
else
|
|
# Lock dir without pidfile — treat as held; don't touch.
|
|
exit 0
|
|
fi
|
|
fi
|
|
echo "$$" > "$lock_dir/pid" 2>/dev/null || true
|
|
|
|
local mode
|
|
mode=$("$CONFIG_BIN" get artifacts_sync_mode 2>/dev/null || echo off)
|
|
|
|
local paths_file
|
|
paths_file=$(mktemp /tmp/brain-sync-paths.XXXXXX) || { rm -rf "$lock_dir" 2>/dev/null; write_status "error" "mktemp failed"; exit 1; }
|
|
# Single trap covers both: lock cleanup AND tempfile cleanup.
|
|
trap 'rm -f "$paths_file" 2>/dev/null; rm -rf "$lock_dir" 2>/dev/null || true' EXIT INT TERM
|
|
|
|
compute_paths_to_stage "$mode" > "$paths_file"
|
|
if [ ! -s "$paths_file" ]; then
|
|
# Nothing to stage. Clear any stale queue entries and exit.
|
|
: > "$QUEUE"
|
|
write_status "idle" "no allowlisted changes in queue"
|
|
exit 0
|
|
fi
|
|
|
|
# Stage with git add -f (forces past .gitignore=*) explicit paths only.
|
|
while IFS= read -r p; do
|
|
p="${p%$'\r'}" # Windows: compute_paths_to_stage's python print() emits CRLF;
|
|
# a trailing CR makes the pathspec match nothing (silent no-stage).
|
|
[ -z "$p" ] && continue
|
|
git -C "$GSTACK_HOME" add -f -- "$p" 2>/dev/null || true
|
|
done < "$paths_file"
|
|
|
|
# Secret-scan staged diff.
|
|
local scan_out
|
|
scan_out=$(git -C "$GSTACK_HOME" diff --cached 2>/dev/null | secret_scan_stdin || true)
|
|
if [ -n "$scan_out" ]; then
|
|
# Hit — unstage, preserve queue, write loud status.
|
|
git -C "$GSTACK_HOME" reset HEAD -- . >/dev/null 2>&1 || true
|
|
local hint
|
|
hint="secret pattern detected ($scan_out). Remediation: review the staged file, then run: gstack-brain-sync --skip-file <path> OR edit the content."
|
|
write_status "blocked" "$hint"
|
|
echo "BRAIN_SYNC: blocked: $scan_out" >&2
|
|
exit 0
|
|
fi
|
|
|
|
# Commit with template message.
|
|
local n ts
|
|
n=$(wc -l < "$paths_file" | tr -d ' ')
|
|
ts=$(date -u +%Y-%m-%dT%H:%M:%SZ)
|
|
local msg="sync: $n file(s) | $ts"
|
|
git -C "$GSTACK_HOME" -c user.email="gstack@localhost" -c user.name="gstack-brain-sync" \
|
|
commit -q -m "$msg" 2>/dev/null || {
|
|
# Nothing to commit (e.g. all files already committed).
|
|
: > "$QUEUE"
|
|
write_status "idle" "queue drained but no new changes to commit"
|
|
exit 0
|
|
}
|
|
|
|
# Push. On reject, fetch + merge (merge driver handles JSONL) + retry once.
|
|
local push_err
|
|
push_err=$(git -C "$GSTACK_HOME" push origin HEAD 2>&1 >/dev/null) || {
|
|
# Check if this is an auth error first — no point retrying.
|
|
if echo "$push_err" | grep -qiE "auth|permission|403|401|forbidden"; then
|
|
local hint
|
|
hint=$(remote_auth_hint)
|
|
write_status "push_failed" "push failed: auth error. fix: $hint"
|
|
echo "BRAIN_SYNC: push failed: auth. fix: $hint" >&2
|
|
# Queue cleared because the commit exists locally; next push will send it.
|
|
: > "$QUEUE"
|
|
exit 0
|
|
fi
|
|
|
|
# Try a fetch-and-merge + retry.
|
|
if git -C "$GSTACK_HOME" fetch origin 2>/dev/null; then
|
|
local branch
|
|
branch=$(git -C "$GSTACK_HOME" rev-parse --abbrev-ref HEAD 2>/dev/null || echo main)
|
|
if git -C "$GSTACK_HOME" merge --no-edit "origin/$branch" >/dev/null 2>&1; then
|
|
if git -C "$GSTACK_HOME" push origin HEAD 2>/dev/null; then
|
|
: > "$QUEUE"
|
|
date -u +%Y-%m-%dT%H:%M:%SZ > "$LAST_PUSH_FILE"
|
|
write_status "ok" "pushed $n file(s) after rebase"
|
|
exit 0
|
|
fi
|
|
fi
|
|
fi
|
|
write_status "push_failed" "push failed: $(printf '%s' "$push_err" | head -1)"
|
|
: > "$QUEUE"
|
|
exit 0
|
|
}
|
|
|
|
# Success: clear queue, update last-push.
|
|
: > "$QUEUE"
|
|
date -u +%Y-%m-%dT%H:%M:%SZ > "$LAST_PUSH_FILE"
|
|
write_status "ok" "pushed $n file(s)"
|
|
exit 0
|
|
}
|
|
|
|
subcmd_status() {
|
|
if [ -f "$STATUS_FILE" ]; then
|
|
cat "$STATUS_FILE"
|
|
else
|
|
echo '{"status":"unknown","message":"no status file yet"}'
|
|
fi
|
|
# Supplemental info (not in status file).
|
|
local queue_depth=0
|
|
[ -f "$QUEUE" ] && queue_depth=$(wc -l < "$QUEUE" | tr -d ' ')
|
|
local last_push="never"
|
|
[ -f "$LAST_PUSH_FILE" ] && last_push=$(cat "$LAST_PUSH_FILE" 2>/dev/null || echo never)
|
|
local mode
|
|
mode=$("$CONFIG_BIN" get artifacts_sync_mode 2>/dev/null || echo off)
|
|
printf '{"queue_depth":%s,"last_push":"%s","mode":"%s"}\n' "$queue_depth" "$last_push" "$mode"
|
|
}
|
|
|
|
subcmd_skip_file() {
|
|
local path="${1:-}"
|
|
if [ -z "$path" ]; then
|
|
echo "Usage: gstack-brain-sync --skip-file <path>" >&2
|
|
exit 1
|
|
fi
|
|
mkdir -p "$GSTACK_HOME"
|
|
# Avoid duplicate entries.
|
|
if [ -f "$SKIP_FILE" ] && grep -Fxq "$path" "$SKIP_FILE"; then
|
|
echo "already in skip list: $path"
|
|
exit 0
|
|
fi
|
|
echo "$path" >> "$SKIP_FILE"
|
|
echo "added to skip list: $path"
|
|
echo "(future writers will not enqueue this path; existing queue entries ignored on next --once)"
|
|
}
|
|
|
|
subcmd_drop_queue() {
|
|
local force="${1:-}"
|
|
if [ "$force" != "--yes" ]; then
|
|
echo "Refusing: --drop-queue discards pending syncs. Pass --yes to confirm." >&2
|
|
exit 1
|
|
fi
|
|
if [ ! -f "$QUEUE" ]; then
|
|
echo "queue already empty"
|
|
exit 0
|
|
fi
|
|
local n
|
|
n=$(wc -l < "$QUEUE" | tr -d ' ')
|
|
: > "$QUEUE"
|
|
echo "dropped $n queue entries"
|
|
}
|
|
|
|
subcmd_discover_new() {
|
|
if ! sync_active; then
|
|
exit 0
|
|
fi
|
|
# Walk allowlist globs; enqueue any file where mtime+size differs from cursor.
|
|
python3 - "$GSTACK_HOME" "$ALLOWLIST" "$DISCOVER_CURSOR" <<'PYEOF' 2>/dev/null || true
|
|
import sys, os, json, fnmatch
|
|
from datetime import datetime, timezone
|
|
|
|
gstack_home, allowlist_path, cursor_path = sys.argv[1:4]
|
|
queue_path = os.path.join(gstack_home, ".brain-queue.jsonl")
|
|
skip_path = os.path.join(gstack_home, ".brain-skip.txt")
|
|
|
|
def load_lines(path):
|
|
try:
|
|
with open(path) as f:
|
|
return [l.strip() for l in f if l.strip() and not l.lstrip().startswith("#")]
|
|
except FileNotFoundError:
|
|
return []
|
|
|
|
def load_cursor(path):
|
|
try:
|
|
with open(path) as f:
|
|
return json.load(f)
|
|
except (FileNotFoundError, json.JSONDecodeError):
|
|
return {}
|
|
|
|
def save_cursor(path, data):
|
|
try:
|
|
with open(path, "w") as f:
|
|
json.dump(data, f)
|
|
except OSError:
|
|
pass
|
|
|
|
allowlist = load_lines(allowlist_path)
|
|
# Normalize skip entries to the same POSIX form as `rel` below, so a
|
|
# backslash entry in .brain-skip.txt still matches a normalized path on Windows.
|
|
skip = {s.replace(os.sep, "/") for s in load_lines(skip_path)}
|
|
cursor = load_cursor(cursor_path)
|
|
new_cursor = dict(cursor)
|
|
to_enqueue = []
|
|
|
|
# Walk all files under gstack_home, match against allowlist.
|
|
for root, dirs, files in os.walk(gstack_home):
|
|
# Skip .git and .brain-* state files.
|
|
if ".git" in root.split(os.sep):
|
|
continue
|
|
for name in files:
|
|
full = os.path.join(root, name)
|
|
# Repo paths are POSIX-relative. os.path.relpath yields backslash
|
|
# separators on Windows, which never match the forward-slash allowlist
|
|
# globs (e.g. "projects/*/learnings.jsonl"), so discovery silently
|
|
# enqueued nothing under projects/ on Windows. Normalize to "/".
|
|
rel = os.path.relpath(full, gstack_home).replace(os.sep, "/")
|
|
if rel.startswith(".brain-"):
|
|
continue
|
|
if not any(fnmatch.fnmatchcase(rel, pat) for pat in allowlist):
|
|
continue
|
|
if rel in skip:
|
|
continue
|
|
try:
|
|
st = os.stat(full)
|
|
key = f"{int(st.st_mtime)}:{st.st_size}"
|
|
except OSError:
|
|
continue
|
|
if cursor.get(rel) != key:
|
|
to_enqueue.append((rel, key))
|
|
|
|
# Append to the queue directly. The previous implementation shelled out to
|
|
# gstack-brain-enqueue once per file, but Windows Python cannot exec a
|
|
# bash-shebang script (the spawn fails with a fork error), so discovery
|
|
# enqueued nothing on Windows even after the path-match fix above.
|
|
# Writing the queue line here is platform-agnostic; the drain step
|
|
# (compute_paths_to_stage) still re-applies the skip-list + privacy filters.
|
|
if to_enqueue:
|
|
ts = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
|
|
try:
|
|
# One atomic append per record (O_APPEND, each line < PIPE_BUF), matching
|
|
# gstack-brain-enqueue's concurrency contract so a writer-shim append
|
|
# running in parallel can't interleave mid-record. Buffered text writes
|
|
# don't guarantee that. Compact separators match the shim's JSON shape.
|
|
fd = os.open(queue_path, os.O_WRONLY | os.O_CREAT | os.O_APPEND, 0o644)
|
|
try:
|
|
for rel, key in to_enqueue:
|
|
rec = json.dumps({"file": rel, "ts": ts}, separators=(",", ":"))
|
|
os.write(fd, (rec + "\n").encode("utf-8"))
|
|
finally:
|
|
os.close(fd)
|
|
except OSError:
|
|
# Queue write failed (disk full, AV file lock). Leave the cursor
|
|
# unadvanced so these files are retried on the next discover instead of
|
|
# being silently recorded as synced (which loses the change until the
|
|
# file next changes).
|
|
to_enqueue = []
|
|
# Advance the cursor only for records actually written.
|
|
for rel, key in to_enqueue:
|
|
new_cursor[rel] = key
|
|
|
|
save_cursor(cursor_path, new_cursor)
|
|
PYEOF
|
|
}
|
|
|
|
# -------- dispatch --------
|
|
case "${1:-}" in
|
|
--once|"") subcmd_once ;;
|
|
--status) subcmd_status ;;
|
|
--skip-file) shift; subcmd_skip_file "${1:-}" ;;
|
|
--drop-queue) shift; subcmd_drop_queue "${1:-}" ;;
|
|
--discover-new) subcmd_discover_new ;;
|
|
--help|-h)
|
|
sed -n '2,18p' "$0" | sed 's/^# \{0,1\}//'
|
|
;;
|
|
*)
|
|
echo "Unknown subcommand: $1" >&2
|
|
echo "Run: gstack-brain-sync --help" >&2
|
|
exit 1
|
|
;;
|
|
esac
|