mirror of
https://github.com/garrytan/gstack.git
synced 2026-10-31 14:06:50 +01:00
+7







![capy-ai[bot]](/assets/img/avatar_default.png)
3e8b34d892
* docs(designs): add fix wave 2026-10-15 plan (revision 3, approved) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(cso): invoke docker as argv0 docker so OrbStack's multicall binary dispatches executable() returns the canonical path, and OrbStack installs docker as a symlink to docker-tools, which dispatches on argv[0] and exits 127 with 'unsupported argv0 "docker-tools"'. Every Docker call failed, so doctor reported local-docker-isolation and every scanner missing and setup could not preload the qualified images. runProcess takes an argv0 option; docker.ts routes every Docker call through runDocker, which passes 'docker'. The native watchdog's execve calls pass "docker" as argv[0] too, so its container cleanup works on the same installs. The executed file is still the verified canonical path. Fixes #3187 * test(cso): cover Docker and watchdog invocation through a multicall binary A compiled fake that refuses any argv[0] but docker stands in for OrbStack's docker-tools. Both behavior tests fail on the previous code. Refs #3187 * fix(cso): bound the argv0 test's socket helper and probe images through OrbStack's multicall docker (#3187) Follow-up to #3188 by Bryan Stone (@aegixx): - the python3 spawnSync that binds the fake daemon socket gets a 30 s timeout; without it test/spawnsync-timeout-tripwire.test.ts fails. - reviewer test: dockerExactImagePresent, a production probe, admits an image when the endpoint's canonical executable is a multicall binary that refuses any argv0 other than "docker". It fails on47d639a(returns false) and passes with #3188. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(autoplan): own the conversation after a Claude Code 2.1.300 compaction Claude Code 2.1.300 keeps a compaction's last records in place and lists them in compactMetadata.preservedMessages. The segment's tail, which is also the boundary's logicalParentUuid, is written after the boundary under the compact summary, so the parent links form a cycle that the owned causal order never reaches. Every record after the compaction was dropped, and the publication guard denied each later phase entry with close_incomplete. Such a boundary now continues from the last preserved record that is a node of the file and not its own descendant. Boundaries without that metadata, with a foreign preserved uuid, or with nothing kept in place still supply no ownership. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(autoplan): report a compaction-explained unreachable component as unrecognized_shape (#3194) Follow-up to #3196 by vilano93. After the ownership walk, an owned node the walk never reached was silently dropped, and the phase guard answered the next phase entry with close_incomplete, which the user cannot satisfy. When the unreachable node's ancestry ends in a cycle through a compact boundary's logical parent, ownedCausalOrder now returns unrecognized_shape:compaction_unreachable, the guard's existing unverified disposition (allow with a visible warning and a guard-log row). Orphans whose ancestor is missing (not flushed yet) and other roots keep today's behaviour, so the fail-open surface does not widen beyond compaction. Each node is walked once. Gate-integrity edit: a close_incomplete denial becomes an unverified allow for that shape only. Negative controls kept: the existing guard, hook, guard-reasons and captured-fixture tests still deny (356 pass), and a new case with the boundary not yet flushed still denies close_incomplete. Intentional pin changes in #3196's own test file: the three "fails closed" cases (tail-only segment, missing preserved metadata, foreign preserved uuid) and the "without compactMetadata" case now expect unrecognized_shape:compaction_unreachable instead of close_incomplete or a silently cut transcript. Reviewer tests: three compactions in one session stay owned and pass the next phase entry; a 50k-record history with three compactions is decided in ~300 ms (budget 1000 ms), so descends needs no memo. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * feat(lib): one echo sanitizer for external strings, with a Bash twin lib/sanitize-echo.ts and bin/gstack-sanitize-echo.sh flatten CR/LF/TAB to spaces, remove every other ASCII control byte (ESC included) and DEL, collapse runs of spaces, and cap the result at 200 bytes of valid UTF-8 with no leading or trailing space. Every external string gstack echoes into a message, a log line or a key=value state file goes through it (fix wave 2026-10-15, plan rev 3 DX F8). test/sanitize-echo.test.ts runs both twins on one table under bash, bash --posix and zsh, including a "\nstages=" injection, ESC sequences and UTF-8 characters cut by the cap. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(bun-version): judge the Bun floor under zsh and hold on an unreadable version (#3195) Reported by mochafreddo. _gstack_bun_below word-split $_gb_core, which zsh does not do: `[ -ne ]` errored and every error path read as "not below", so /gstack-upgrade Step 4 accepted Bun 1.3.2 in a zsh tool shell. - _gstack_bun_below copies the release's parsed fields into quoted positional parameters and compares with $((10#...)); no new _gb_* globals. It returns 2 when either side cannot be parsed. - gstack_bun_status prints malformed for an unparseable version or floor (never ok); gstack_bun_incoming_hold holds on it with bun-version-unreadable: ... (BUN_VERSION_UNREADABLE), the bun path and its output passed through gstack_sanitize_echo. setup's own malformed warning is unchanged. - /gstack-upgrade Step 4 runs the check through `bash -c` and stops on BUN_VERSION_UNREADABLE with a reinstall fix (never "bun upgrade"). - New result code BUN_VERSION_UNREADABLE with its troubleshooting entry; bin/gstack-doctor-components.sh regenerated from the table. test/bun-version-shells.test.ts: one version table (1.3.2, 1.3.3-canary.1, 1.3.3, 1.3.14, 1.4.2, 1.10.0, 01.04.02, 2.0.0, garbage) drives bash, bash --posix, zsh and the TypeScript twin's below(); `zsh -c '. bin/gstack-bun-version.sh; gstack_bun_status 1.3.2'` printed ok on47d639aand prints too-old now. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * style(cso): format #3188's runDocker call so format:cso:check passes (#3187) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(cso): keep scanner JSON reports parseable after redaction (#3185) Reported in #3185. The scanner path splices redactions into raw JSON, and redactFindingSpans replaced a bare 10+ digit number ("max_memory_bytes":1145427776, an epoch) with an unquoted marker, so JSON.parse failed and every non-trivial Semgrep run was INVALID_OUTPUT. - lib/redact-engine.ts: redactJsonFindingSpans, a string- and escape-aware lexical tokenizer over one or more top-level values (NDJSON included). A span inside a number replaces that whole token (-, fraction, exponent) with the quoted marker, number by number; a span inside a string keeps the in-string marker, widened to whole escapes; a span touching several tokens, whitespace, a literal or a structural character returns null (withhold). Non-JSON text gets the plain splice. redactFindingSpans is unchanged for every other caller. - The scan operation's declared format rides the real capture path: scanner-executor (scan stdout, or the report file read for outputPath plans) -> DockerGroup.execCapture -> runProcess -> spliceRedaction, which redacts the concatenated stdout once and maps each interleaved run onto it. Version probes and stderr stay plain; marker-only withholding and the cross-stream views check are kept, and the output is a fixpoint of that check. Behavior change: a redacted number in a scanner report is now the string "<REDACTED-...>" instead of an unquoted marker; non-JSON streams keep the unquoted form (test/cso-eval.test.ts unchanged). Intentional pin change: test/cso-scanner-release.test.ts pinned the report read as capture(['/bin/cat', plan.outputPath]); it now pins capture(['/bin/cat', plan.outputPath], plan.format), so the read also carries the declared JSON format (stricter, not weaker). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(browse): recover when the last tab is closed outside the CLI Closing the last tab outside browse (for example, closing the headed Chromium window) left the daemon wedged: the page 'close' handler removed the tab and set activeTabId to 0, and executeCommand called getActiveSession() first, so every later command (goto, status, even stop) failed with "No active page" until the daemon PID was killed by hand. closeTab() already opens a blank tab when the last tab closes; the external close path never did. Add BrowserManager.ensureActiveTab(), which reselects a remaining tab or opens one blank tab (concurrent callers share one recovery), and call it before resolving the active session in executeCommand. Fixes #3167 * fix(browse): status and stop answer after an external close; recovery says what it did (#3167) Follow-up to #3179 by aftabkh4n, which reopens a tab on demand. - BrowserManager.ensureCommandTab runs before every command: status, stop and restart never open a tab, so a daemon whose browser or context is gone can still report and be stopped; any other command gets an active tab. A failed recovery is BROWSE_TAB_UNRECOVERABLE carrying the restart command (cause passed through sanitizeEcho), and a command that ran on a newly opened tab prints a one-line warning first. - server.ts reads the session inside the read and write branches instead of before dispatch (2223 lines, cap 2224) and exposes browserManager and handleCommandInternal on __testInternals__ for the dispatch test. - meta-commands.ts: handleMetaCommand no longer reads the active session before its switch (only snapshot and resume used it), and status prints getCurrentUrl() so it works with zero tabs. This file is outside the lane's listed ownership; no other lane or #3190 touches browse/. - New result code BROWSE_TAB_UNRECOVERABLE and troubleshooting entries for it and for the old "No active page" wedge. Reviewer test browse/test/tab-external-close-dispatch.test.ts drives the real dispatch in a child process: status, text, goto and stop after an external close, and the closed-context case. On47d639a(with only the test seam added) all five fail with "No active page". Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(troubleshooting): /cso INVALID_OUTPUT on Semgrep reports and OrbStack's argv0 refusal (#3185, #3187) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(session-update): name the reinstall fix when an unreadable Bun holds the auto-update (#3195) Item 11 makes every caller of gstack_bun_incoming_hold treat a Bun version it cannot read as a hold (bun-version-unreadable, BUN_VERSION_UNREADABLE). The session-start banner only knew bun-too-old, so the new reason fell through to "git pull did not finish ... gstack is not updating" with a pull-and-setup fix that does not help. - bin/gstack-session-update: a bun-version-unreadable banner case with the reinstall fix and the troubleshooting anchor; the comment that said a malformed version passes is corrected. Intentional pin change: test/session-update-stages.test.ts "supported or unparseable Bun (bun-dev (local build)) proceeds: setup decides" is split. 1.3.14 still proceeds; bun-dev (local build) now holds with BUN_VERSION_UNREADABLE, leaves the checkout and setup untouched, and the banner names the reinstall fix. The fixture installs bin/gstack-sanitize-echo.sh beside the floor helper, as a real install of this release does. The new case fails on47d639a. Ownership exception granted by the coordinator for Lane A (bin/gstack-session-update is Lane B's file; PR 1b stacks on 1a). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(session-update): recover a conflicting autostash by its unmerged files The auto-updater fast-forwards with `merge --ff-only --autostash`. When the carried-over local edits conflict with the incoming revision, git 2.56 still exits 0 from that merge, pops the edits with conflict markers into the live checkout, and keeps the stash entry. The recovery only ran on a non-zero exit with "autostash" in stderr, so on git 2.56 it never ran: the updater logged UPDATED and ran setup over a half-merged tree, in the directory Claude Code runs hooks from. When it did run, it had two more problems: - `git checkout -- .` refuses unmerged paths ("error: path 'f' is unmerged", exit 1), so it left the markers in place anyway. - `git stash drop` dropped stash@{0}, whatever that was. refs/stash is shared with every worktree of the repository, and when refs/stash.lock is held git cannot store the autostash at all, so the top entry can be someone else's. Now the merge is judged by `git ls-files -u`, whatever its exit code. On unmerged files after the fast-forward, autostash_recover finds the autostash commit by the id git prints ("cannot store <id>" first, then "Created autostash: <id>", with the merge run under LC_ALL=C and core.abbrev=40). A moved refs/stash is only the fallback. When that id is not a stash entry, it is anchored under refs/gstack-autostash/<UTC>. The tree is reset to the fast-forwarded revision, which the hook check already passed, and the stash is kept. The log line is AUTOSTASH_CONFLICT_RECOVERED tree_reset=1 kept_stash=<id> kept_ref=<ref>. The update then continues, so the regenerable patches are re-rendered and setup runs as for any other move. If the commit cannot be found, nothing is reset: the markers stay for a person, the run logs PULL_FAILED, and setup does not run. Files that are already unmerged before the update, from someone's own merge, rebase or stash pop, now hold the update with PULL_FAILED "unmerged files ...". Without that check, the recovery would take them for its own and reset them away. core.abbrev=40, not "no": "no" is accepted from git 2.31.0 (its release notes), and `merge --autostash` exists from 2.27.0, so "no" would fail every update on git 2.27-2.30. Files: - bin/gstack-session-update: autostash_recover, the unmerged-files check before the merge, the C-locale merge with its stdout kept for the id, and removal of the old grep-and-drop block. - test/session-update-autostash.test.ts: 7 cases in a new describe block. A conflicting pop leaves no markers, keeps the edits and still runs setup. A user's own stash entry survives. A held refs/stash.lock gets the edits anchored. With a git whose merge prints nothing, a moved refs/stash still finds the edits; with the lock held as well, nothing is reset. Pre-existing unmerged files hold the checkout. A non-conflicting edit rides over the update (control). Tests, on upstream15ebd85cd: - 5 of the 7 new cases fail against the previous session-update; the unmerged-files guard and the control pass on both. - Two mutants are each caught by one new case: dropping the refs/stash fallback, and resetting when the edits cannot be found. - session-update-autostash, session-update-stages, session-update-hook-hold and team-mode pass 63/0 with `--timeout 60000`. At bun's 5 s default under heavy load (one reading: load average 169), the three shared files timed out 8 tests on this branch and 17 with the previous script. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(session-update): trust only git's autostash id; owe setup on a stop An independent review of the autostash recovery (Codex gpt-6-astra, high effort, verdict BLOCK high=1 med=2) found three defects on its rare paths. All three are fixed here, each with a case that failed first. - [high] The refs/stash fallback could erase local edits. When git's messages were unavailable, recovery took any change to refs/stash as its own autostash. refs/stash is shared with every worktree: if a sibling pushed a stash while refs/stash.lock kept git from storing this one, recovery took the sibling's entry and reset the checkout, erasing edits nothing held. Now only git's own printed id counts. A missing id resets nothing: the markers stay, the run logs PULL_FAILED. Recovery needs git's messages, so when the temp file for them cannot be created the update is held before the merge (HELD temp-file-unavailable), not merged blind. - [med] A stop after the checkout moved lost the setup it owed. The failure recorded only the pull reason. Once the person resolved the conflict, the next check saw an unchanged HEAD and no pending stage, logged UP_TO_DATE, and never set up the new revision. Now a failure after HEAD moved records `setup` as a pending stage, retried at once. The unmerged-files check holds it until the conflict is resolved, and the pull reason is the stage's reason, so the session-start line says what to resolve. - [med] An unreadable index read as "no conflicts". Both `git ls-files -u` checks discarded the exit status, so a failed read after a conflicting pop (which git exits 0 for) let setup run over the markers. Now a failed read stops the update with PULL_FAILED "cannot read the index", before the merge or after it. Files: - bin/gstack-session-update: autostash_recover drops the refs/stash fallback (and STASH_BEFORE). The temp-file hold. The ls-files exit status checked at both points. The pending setup stage on a failure after HEAD moved. - test/session-update-autostash.test.ts: a shim(fx, name, tool, body) helper; the fallback case now expects a refusal; the refusal case runs on through resolution to setup; three new cases (unreadable index before and after the merge, no temp file for git's messages). Tests, on upstream15ebd85cd: - The 5 changed or new cases failed on the previous commit, each on its defect: refs/stash trusted and recovered; UP_TO_DATE with no setup after resolution; UPDATED over an unreadable index, before and after the merge; a blind merge with no temp file. - Against upstream's own session-update, 8 of the block's 10 cases fail. - session-update-autostash, session-update-stages, session-update-hook-hold and team-mode pass 66/0 with `--timeout 90000`. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(session-update): reap heartbeat and its sleeper on exit The lock heartbeat subshell left its sleep 300 child orphaned when the updater exited, so heartbeats accumulated across sessions. Track and reap the heartbeat job (with a job-table fallback for signals between fork and $!), give the subshell its own exit trap that kills and waits its sleeper, and map HUP/INT/TERM to exits so the EXIT trap always runs. Adds a fixture-driven regression test. * test(session-update): repin the lock trap and heartbeat to #3191's cleanup shape Intentional pin change: test/session-update-autostash.test.ts 'reclaim is TOCTOU-safe' and 'EXIT trap is ownership-checked' pinned the one-line EXIT trap and the 'while :; do sleep 300; ...' loop that #3191 (Jess Sullivan) replaces with cleanup_session_update and a 'sleep 300 & wait' heartbeat. The pins still assert the ownership-checked rm -rf, the EXIT trap, MYPID, and that the heartbeat is killed. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(session-update): move installs only through gstack-ff-update; extract hooks without tar (#3184) Item 2 (#3189, #3191 adopted in the previous commits) and item 3 of the fix-wave plan. bin/gstack-ff-update <dir> <rev> is now the only code that moves an install's tree. Inside an install-scoped lock (absolute git common dir, the updater's TTL and mv-aside reap, a heartbeat reaped on exit) it captures the working tree and the staged state through private indexes, carries edits that merge cleanly (as an autostash pop would), lets the regenerable SKILL.md/sections footprint take the target when it conflicts, and shelves any other conflicting edit, staged change or unmerged file into refs/gstack/rescue/<oid> (first parent the pre-update HEAD, second the staged state; compare-and-create; gstack rescue identity). The move is a two-way read-tree on the private index, so a late edit or an untracked file in the way refuses with autostash-unrecoverable and changes nothing. It sources nothing so the held-install recovery can fetch it from the new revision. gstack-session-update calls it instead of merge --autostash, holds a checkout with unmerged files (unmerged-files:), and names shelved edits at session start at most once a day with inspect, export-the-delta and delete commands. The incoming revision is extracted for the hook check through a private index and checkout-index with core.symlinks=false, never tar (MSYS tar cannot create connect-chrome before its target), and the held reason carries the failing command's flattened, control-free stderr. Held lines print before the stage line, one case per reason with its anchor, every path shell-quoted, no setup fix while unmerged files exist. docs/troubleshooting.md gains the held-install recovery forms (Git Bash, PowerShell 5.1, trial and go-back) and entries for each new line. design: kept_ref is refs/gstack/rescue/<oid>, refs/stash is never touched, the quiet-merge cases become a pre-existing-ref refusal and its recovery, pre-existing unmerged files are a HELD unmerged-files, and the git shim pins the real binary through git --exec-path. Intentional pin changes in existing tests: - test/session-update-stages.test.ts: printed paths are shell-quoted; the bun-too-old fix runs gstack-ff-update instead of git pull. - test/session-update-hook-hold.test.ts: the order pin looks for 'bash "$FF_UPDATE"' instead of 'merge --ff-only'; the hook-check-unavailable fix no longer recommends git pull --autostash; installedUpdater copies gstack-ff-update beside the updater. Reported by wengweiling (#3184). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(gstack-upgrade): Step 4 fast-forwards through gstack-ff-update (#3189) Item 2 of the fix-wave plan, kept in its own commit so PR 1b can be rebased onto PR 1a (which edits only Step 4's Bun floor-check line). Step 4's `git pull --ff-only --autostash` had the same hole the auto-updater had: a conflicting autostash exits 0 and leaves conflict markers in the install, and the skill printed FF_OK. It now runs bin/gstack-ff-update . origin/main after the fetch and the floor check: exit 0 runs setup (a rescued line is relayed with its inspect, export and delete commands), exit 4 (not a fast-forward) is the only way into the gated reset fallback, and any other refusal stops with nothing changed. The footprint discard moves to the reset fallback, ahead of its stash, where the warning text already promised it. Intentional pin changes: - test/upgrade-template-pins.test.ts: the ff-before-reset pin looks for 'bash bin/gstack-ff-update . origin/main'. - test/gstack-upgrade-fresh-shell.test.ts: the C9 fence marker is 'bash bin/gstack-ff-update'; the gstack-like fixture ships the bin. - test/upgrade-setup-recovery.test.ts: the git-path fixtures ship gstack-ff-update (a stub where git itself is a stub). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(setup.ps1): run under Windows PowerShell 5.1's legacy argument passing (#3130) Item 4 of the fix-wave plan. Windows PowerShell 5.1 strips the double quotes inside native arguments, so the bash -c script setup.ps1 handed Git Bash arrived broken ("unexpected EOF while looking for matching"). The script now holds no double quote: `set -f; IFS=; mapfile -d '' -t argv < $1; rm -f -- $1; exec ./setup ${argv[@]}` (empty IFS and no globbing keep $1 and each argv entry whole). That form drops an empty argument, so setup.ps1 refuses one before anything runs (SETUP_PS1_EMPTY_ARGUMENT, with its troubleshooting entry). test/setup-ps1.test.ts runs the adversarial arguments under legacy passing (pwsh with $PSNativeCommandArgumentPassing = 'Legacy', and powershell.exe itself on Windows) with a space in TMPDIR, plus the empty-argument refusal. Intentional pin change: the pinned bash -c line in "passes arguments NUL-separated through a private file to a constant bash script" now names the quote-free script and asserts it holds no double quote. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(setup): register hooks at the $HOME path when CLAUDE_CONFIG_DIR links back to it A per-session CLAUDE_CONFIG_DIR whose skills symlink to ~/.claude/skills passed the split-brain guard, so its temporary path was written into the global settings.json and the hooks broke once the session directory was removed. Fall back to $HOME/.claude/skills/gstack whenever both spellings resolve to the same tree. Fixes #3180 * fix(setup): one sourced helper picks the hook root for setup and gstack-memorable (#3180) bin/gstack-memorable carried a verbatim copy of setup's old canonical-root block, so `gstack-memorable enable` under a per-session CLAUDE_CONFIG_DIR still baked the session path into settings.json after #3181 fixed setup. The choice now lives in bin/gstack-claude-root.sh (gstack_canonical_claude_root), sourced by both. Intentional test changes: - test/setup-hook-canonical-paths.test.ts: #3181's source-slicing block test is rewritten to source the helper (with a spawnSync timeout, which the sliced version lacked and the tripwire flags); the "honors CLAUDE_CONFIG_DIR" pin moves from setup to the helper, and a new pin requires both callers to source it. Adds a no-$HOME-install case. - test/setup-hook-syntax-gate.test.ts: the hook-section slice starts at the new assignment and the harness sources the helper. - test/setup-claude-code-migration.test.ts, test/team-mode.test.ts: the partial-checkout fixtures copy the new helper setup sources. Reviewer test: gstack-memorable enable under a per-session config dir that links back to ~/.claude registers the $HOME path (fails on main). Builds on #3181 by NetrioGit. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(setup): remove 1.31-era unprefixed Cursor skill folders (#3133) A 1.31 setup run from a checkout under ~/.cursor/skills linked unprefixed <skill>/ folders there, each holding a SKILL.md symlink into the checkout. Current setup links gstack-<skill>/ folders, and the retired-skill prune only looks at gstack-* names, so the old folders stayed: Cursor loaded autoplan, review and the rest twice, or kept dangling links once the checkout moved. Run the Claude flat-name cleanup on ~/.cursor/skills as well. Cursor installs only gstack-* names, so no prefix gate is needed, and the helper removes only entries proven to link into gstack (#2119), so user-owned folders stay. It runs after linking, so a run that fails before the new links exist keeps the old folders. Reported by @andrewkjankowski in #3084. Fixes #3133 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(setup): name the skills dir in the flat-name cleanup line (#3133) `./setup --host cursor` now runs the flat-name cleanup on ~/.cursor/skills as well as ~/.claude/skills, so the "cleaned up old entries" line says which directory the folders were removed from. Reviewer test for #3152 (szsunyuan): a real dir whose SKILL.md links into gstack loses only that link and keeps the user's file; SKILL.md links into a sibling repo named gstack-fork, a relative link, and a dangling link outside any gstack checkout are all kept; the printed line names the removed folders and the Cursor skills dir. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(setup): install Chromium with `bun x`, and name exit 127 for what it is (#3131) A Bun installed with winget ships no `bunx`, so setup's `bunx playwright install chromium` exited 127 and was reported as "offline, proxy, or blocked download?". setup now runs `bun_cmd x playwright install chromium` through its existing bun resolver ($BUN_CMD), and bin/gstack-browser-ensure runs the bun it found on PATH with `x`. Exit 127 gets its own text naming the resolved bun, Bun from bun.sh, and the skip commands for Git Bash and PowerShell; other codes keep the network hint. New troubleshooting entry: #chromium-install-exit-127. Intentional test changes: - test/setup-playwright-best-effort.test.ts: the installer stub is now a `bun_cmd()` stub (was `bunx()`), its mark renamed bun-x-called and now records the args; the block under test calls bun_cmd. New winget-shaped cases (bun on PATH, no bunx anywhere) run setup's real bun_cmd. - test/gstack-browser-ensure.test.ts: the fixture is winget-shaped (the `bun` stub handles `x`, no `bunx` on PATH); the exit-7 pin now reads `<stub>/bun x playwright install chromium exited 7 (...)`. --help in gstack-browser-ensure prints the comment header only (3,24p). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ci(windows): prove setup.ps1 on PowerShell 5.1 and the held-install recovery natively (#3130, #3184) windows-setup job: - setup.ps1 joins the path filter (with bin/gstack-ff-update, bin/gstack-claude-root.sh, bin/gstack-browser-ensure, docs/troubleshooting.md and test/setup-ps1.test.ts). - powershell.exe must be Windows PowerShell 5; test/setup-ps1.test.ts runs with a space in TEMP and must report exactly 4 pass, 0 fail, 1 skip (the Linux-only missing-prerequisite case). - A copy of the built checkout under a path with a space installs through `powershell.exe -File setup.ps1 --host codex`. held-install-journey job (new, parallel): - origin's main is this PR's tree on top of the v1.91.101.0 tree (47d639abf); fix-branch adds one file. - A prefix-mode v1.91.101.0 install at the runner's ~/.claude path in three states (clean, dirty-conflicting, already-unmerged), with auto_upgrade=true and the throttle cleared: the old updater must log `HELD hook-check-unavailable`; the PowerShell recovery form, read verbatim from docs/troubleshooting.md and run under powershell.exe, must reach main with every local edit (only those) in one rescue ref. The dirty state runs it with its .\setup.ps1; the others replace that step with a marker. - The trial and go-back forms move the install to fix-branch (detached) and back to main. - Only then a later release whose symlink sorts before its target is pushed, and the new updater must log UPDATED and reach it. - Both jobs assert the exact list of cases that ran. The journey steps ran locally on Linux with pwsh in Legacy argument mode as powershell.exe, a git exec-path whose ../../../bin/bash.exe is bash, and a failing tar standing in for MSYS tar (all 9 cases passed); the windows-latest run itself happens on the PR. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(ff-update): a killed step-4 run fails the status check instead of the type check Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ci(windows): the held-install job runs without the bun cache step The cache key line is a secret-scanner false positive on added lines (env.kv); the fixture's own setup installs its packages either way. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(fixtures): register #3191's heartbeat fixture as free test/free-fixtures.test.ts failed on the frozen-branch Ubicloud run: test/fixtures/session-update-heartbeat.sh (adopted with #3191) was in no paid touchfile and not in FREE_FIXTURES. Its only consumer is test/session-update-heartbeat.test.ts. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(session-update): leave the bun-version-unreadable banner case to item 11 (PR 1a) PR 1a owns the bun-version-unreadable hold (BUN_VERSION_UNREADABLE), its banner case and its troubleshooting entry; this branch is rebased onto 1a. Drops the case, the docs entry and the banner test this branch had added. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(setup.ps1): resolve Git Bash in the shared order, with GSTACK_BASH as an alias and a BASH_UNAVAILABLE refusal Follows lib/script-invocation.ts (Lane C, PR 2): GSTACK_GIT_BASH is the override and GSTACK_BASH its deprecated alias at the same precedence; when both are set and differ GSTACK_GIT_BASH wins and one warning prints. An override that does not exist is refused, never skipped. Without one: the install git --exec-path belongs to (behind a scoop shim, or a portable Git), the folders around git.exe, %LOCALAPPDATA%\Programs\Git, %ProgramFiles%\Git, and last a bash on PATH whose uname -s reports MSYS; WSL's bash (System32, WindowsApps) is rejected. A miss lists every candidate with its rejection, then the PowerShell user-variable and ~/.claude/settings.json env recipes (BASH_UNAVAILABLE, #bash-unavailable). test/setup-ps1.test.ts gains a 14-row pwsh-on-Linux table with every location injected (override, alias, both set, missing override and alias, scoop shim, per-user, portable and machine-wide Git, MSYS PATH bash, WSL and non-MSYS rejections, missing); 11 rows fail on main. The rows mirror Lane C's table in test/script-invocation.test.ts; they are not wired to it, since that branch is not available here. The Windows job's expected skip count for this file moves from 1 to 15 (the table is Linux-only). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(setup.ps1): give the empty-argument refusal its result code (SETUP_PS1_EMPTY_ARGUMENT) Adds the row to lib/result-codes.ts (anchor #setup-ps1-empty-argument, which setup.ps1 already prints). bin/gstack-doctor-components.sh is regenerated from the table (generated; resolved by regeneration at merge). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ci(windows): silence SC2016 on the PowerShell version probe (the $ is PowerShell's, not bash's) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ci(windows-setup): give tar a POSIX path for the spaced checkout MSYS tar reads `D:\a\_temp/...` as host:path (rsh syntax) and fails with 'Cannot open: No such file or directory' before setup.ps1 runs. The copy target now goes through cygpath -u; setup.ps1 still gets the Windows form. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ci(windows-setup): dereference symlinks when copying the spaced checkout MSYS tar cannot extract connect-chrome, a symlink that precedes its target (the #3184 failure mode), so the copy died before setup.ps1 ran. tar -h stores the target instead. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(windows): one Git Bash resolver for gstack's shebang bins (#3197) Windows has no shebangs, and gstack had three conflicting bash lookups: the hooks fell back to a bare PATH `bash` (often WSL's launcher), the gbrain sync checked three fixed paths, and setup.ps1 walked up from git.exe. lib/script-invocation.ts is now the only TypeScript resolver: GSTACK_GIT_BASH (GSTACK_BASH as a deprecated alias, same precedence, warning when they differ, a missing value refused), bash next to `git --exec-path` (scoop, per-user, portable Git), the known install paths, then a PATH bash only when `uname -s` reports MSYS/MINGW. WSL launchers are rejected unprobed. A miss is BASH_UNAVAILABLE, listing every candidate with its rejection reason. Bun-shebang bins run under Bun (process.execPath, or the PATH bun inside a compiled binary). Hooks' runBin resolves through a state-root cache keyed by git.exe path and mtime, written by temp file plus rename, so the hot path spawns nothing extra; the override is never cached. wtreeFingerprint({cwd, timeoutMs}) returns {tree} | {error, kind} with GIT_OPTIONAL_LOCKS=0 and 40-64 hex ids; the consumers move next. Intentional pin change: test/gbrain-spawn-windows-shell.test.ts expects forward-slashed bash paths (WIN_BASH and the GSTACK_BASH override), the form the shared resolver returns because Bun's spawnSync on Windows returns ENOENT for a backslash exe path containing spaces. The copied-tree adapters in test/timeline-stop-hook-slug.test.ts and test/plan-tune-cathedral.test.ts list the two modules spawn-bin.ts now imports; the new fixture is registered in test/helpers/free-fixtures-data.ts. bin/gstack-doctor-components.sh is regenerated for the new result-code row. Reported by @exGeni. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(windows): fingerprint and gstack bins through the shared invocation (#3197) bin/gstack-wtree was spawned by path in lib/regen.ts, lib/gate-diff/git.ts, lib/restamp.ts and bin/gstack-evidence; gstack-slug in restamp, gate-diff and evidence; gstack-redact in the pregate secrets check; and a bare `bash -c` in regen, the lane selection manifest and gstack-evidence run. On Windows each one failed to launch. All now go through lib/script-invocation.ts, and each fingerprint consumer keeps its fail direction while saying why: - gstack-regen check: incomplete, `cannot fingerprint the working tree (gstack-wtree exited 1: <helper's own repair>)` instead of `(gstack-wtree failed)`; write keeps the registry label as its run id. - gstack-gate-diff: `+nowtree` candidate, with the cause. - gstack-restamp: RESTAMP_CONFLICT carrying the launch or exit detail (Windows printed `()` before). - gstack-evidence: records without wtree (grades STALE) and warns once; SHA-256 repositories now get a 64-hex fingerprint. lib/regen.ts keeps a string-returning wtreeFingerprint(repoRoot) wrapper for lib/pregate/context.ts and lib/pregate/index.ts (files #3190 changes); item 10b migrates them. test/script-invocation-tripwire.test.ts fails on a new by-path or bare-bash spawn under lib/, hosts/ or a Bun bin; five sites outside this change are listed with their owners and may only shrink. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(pregate): keep framework route paths from a selection manifest (#3176) laneFileSet parsed manifest output with `[\w.-]+` path segments, so `app/(shop)/[id]/page.test.ts` came back as `page.test.ts`. The selected test then matched no platform lane, its remote receipt obligation vanished and it fell back to a local run. manifestTestPaths keeps route segments whole (`(group)`, `[id]`, `[...slug]`, `[[lang]]`, `@slot`, `$param`, `+page`), reads every path-shaped token on a line (JSON arrays, quoted, `path:line`, parenthesized), and decides what is a test file with the import graph's own isTestFile, so a test-file rule change there (bats, #3177) reaches manifests without a second regex. A manifest that cannot start is "unknown" (widens), like a non-zero exit. This is the manifest-parser half of #3176 by @vocodestudios; the import-graph half (tsconfig aliases, Next.js route mapping) ships in a separate PR. test/pregate-manifest-paths.test.ts drives the CLI with a bracketed route test in the fixture's Windows-only lane and asserts its requires-remote obligation; it failed on main (requires_remote was []). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ci(windows): windows-pregate-e2e drives the #3197 paths natively A windows-latest job (Bun 1.4.2) builds a fixture repository and runs gstack-restamp --dry-run, gstack-regen check and write, gstack-evidence run and gstack-gate-diff from their TypeScript entry points, asserting a real tree fingerprint each time; times a question-log hook cold and warm and checks it cached its Git Bash resolution; and checks that a missing GSTACK_GIT_BASH refuses with BASH_UNAVAILABLE and lists the candidate. The journey runs twice: under the runner's Git for Windows and under a pinned PortableGit 2.56.0.2 (SHA-256 verified), found only through `git --exec-path`. gstack-pregate run joins it with item 10b. The workflow is registered in scripts/test-pr-profile.ts FREE_ONLY_PR_FILES (no paid case reads it), recorded as a non-behavioral HARNESS_VERSION decision in scripts/harness-version.json. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(setup.ps1): resolve Git Bash by the shared fixture table (#3197) test/setup-ps1.test.ts now drives setup.ps1 through every row of test/fixtures/windows-bash-resolution.json, the table that pins lib/script-invocation.ts, instead of a hand-mirrored copy. Two rows failed and are fixed here: - an override and alias that differ only in slash direction no longer print the differ warning; - the root git --exec-path names is also searched for usr\bin\bash.exe (Git for Windows on arm64). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(windows): isolate the no-bash case and launch pregate as the product does (#3197, #3176) windows-free-tests run 38813751242 failed two tests this layer added. Both were fixture defects on a real Windows host, not product defects: - gbrain-spawn-windows-shell "returns null when Windows has no bash" stubbed only `exists`. The resolver's PATH step asks the real Bun.which and found the runner's MSYS bash, which is correct. The case now also stubs `which` and `gitExecPath`, so it really means "no bash anywhere". - pregate-manifest-paths spawned the extensionless bin/gstack-pregate directly. CreateProcess cannot exec a shebang, so nothing ran and stdout was "". It now launches through lib/script-invocation's runScriptSync, gstack's own Windows invocation, so the case runs the manifest lane end to end on Windows instead of being excluded. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ci(windows): the missing-bash step survives the refusal it expects (#3197) GitHub runs `shell: bash` as `bash -eo pipefail`, and the step's own `set -uo pipefail` does not turn -e off. So when gstack-restamp refused, as the step expects, `OUT=$(...)` aborted the script before `CODE=$?` and before any output was printed: exit 1 after 0.5 s with nothing in the log (PR #3209, job 116729693492). The capture is now `OUT=$(...) && CODE=0 || CODE=$?`. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(pregate): the manifest-lane case expects the host's own remote lanes (#3176) Once 8b2f297cc made the case run on Windows, windows-free-tests run 38824886195 (shard 4) showed the expectation itself was Linux-only. pregate owes a lane remotely when its runner platform is not the host's (lib/pregate/workflows.ts). On a Windows host the fixture's Windows lane runs locally, and the Ubuntu `free-tests.yml/unit` lane is the remote obligation; that is the record Windows produced. The case now derives the owed lanes from the host the same way. On Windows it also requires `ran: node --test 'app/(shop)/[id]/page.test.js'`: there the route reaches the local run only through the manifest's whole path. With a cut manifest path (page.test.js) the local set is empty, checked through buildContext({ platform: 'win32' }) + selectLanes. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ci(windows-setup): expect 31 skipped setup.ps1 cases now that the shared table drives it Layer 2 drives setup.ps1 through the 16 shared rows of test/fixtures/windows-bash-resolution.json; like the 14 existing resolution rows they run under pwsh on Linux and skip on Windows. The case list is still asserted exactly (4 pass, 0 fail, 31 skip). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(ship-measure): give the CLI tests a private HOME (#3162) Every bun run test left ~/.gstack/projects/ship-measure-cli-*/evals and sweep-cli-fake-*/evals in the developer's real home, and the free-suite runner flagged them ("real home changed ... Give the writer a private HOME/GSTACK_HOME"). ship-measure's diagnostic-dir check calls getProjectEvalDir(), which builds the eval dir from os.homedir(), and these two CLI tests passed the real HOME while overriding only the state root. Both now set HOME and USERPROFILE to the test's own state dir. The sweep test also runs on the Windows lane, where os.homedir() reads USERPROFILE. test/ship-measure.test.ts:79 already gives its config test a private HOME the same way. getProjectEvalDir() itself is unchanged: whether eval history should follow GSTACK_HOME is left open in #3162. Fixes #3162 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(ship-measure): prove the sweep CLI never writes under the parent HOME (#3162) Reviewer test for #3163 (adopted from y$un_, forrest.sun527): points the parent HOME at a sentinel with a stub global gstack-slug and asserts no .gstack dir appears there. Fails on47d639a(the sentinel gets .gstack/projects/leaked-slug/evals); passes with #3163. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(redact): isolate fixture git from inherited hooks Fixture git was spawned with the parent environment, so a developer's core.hooksPath ran on the local push and rejected it (#2967). The helper blanks the global and system files and drops GIT_CONFIG_COUNT and GIT_CONFIG_PARAMETERS. A hooksPath set in the fixture repo still runs. * test(redact): blank GIT_CONFIG_GLOBAL with /dev/null on every platform (#2967) Follow-up to #3156 (adopted from Lockyer228): Git for Windows rejects GIT_CONFIG_GLOBAL=NUL (the repo convention is EMPTY_GLOBAL_GIT_CONFIG = '/dev/null' in lib/cso/process.ts), so both fixture helpers use /dev/null everywhere. Reviewer test: a hooksPath in the default global files under HOME/.gitconfig and XDG_CONFIG_HOME/git/config cannot reject the fixture push; it fails with the inherited environment (the47d639abehavior) and passes with the isolated env. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: gstack-config compares whole root paths and prints a runnable recovery command - report_root_disagreement compared word-split values, so two variables naming the same directory with a space were reported as disagreeing. Compare each complete value instead. - The privacy-key recovery hint single-quoted the root and left the script path bare; an apostrophe or space made it unrunnable. Quote with printf %q. - On Bash 3.2 (macOS /bin/bash) a failed `.` under set -e exits before the `||` fallback, so a missing gstack-state-root.sh exited 1 silently and test/state-root-resolver-failure.test.ts failed there. Check readability first. - The merge fixture now lives under a path with a space and an apostrophe, executes the printed command, and asserts same-directory variables agree. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(config): pin the %q-quoted recovery command and run it from a spaced install path Follow-up to #3186 (adopted from davidfragnoli-lang). Intentional pin change: the fix line's GSTACK_STATE_ROOT='<legacy>' pin becomes the exact bash printf %q form of the legacy root (the PR loosened it to a prefix check; this restores an exact pin) and the original test name is kept. Reviewer test: copy bin/ to a path containing a space and an apostrophe; the printed fix: command runs cleanly and flips the merged value. Fails on47d639a(unquoted $_SELF), passes with #3186. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(gstack-gbrain-sync): fail when a star gitignore already ignores the pin ensureGbrainSourceGitignored appends .gbrain-source even when git check-ignore already excludes that path. The extra line dirties a tracked ignore-everything gitignore. * fix(gstack-gbrain-sync): skip the pin line when git already ignores it ensureGbrainSourceGitignored asked only for a literal .gbrain-source line. An ignore-everything star already excludes the pin, and the extra line left the tracked gitignore dirty. * fix(gbrain-sync): only a tracked .gitignore can stand in for the pin line Follow-up to #3178 (adopted from KuroChen). The skip now requires `git -c core.excludesFile= check-ignore -v` to name a tracked .gitignore (not global excludes, not .git/info/exclude, not a negation), so a pin ignored only on this machine still gets the shared line teammates need (#1384). Tests: the two git init spawns get timeouts (they failed the spawnSync tripwire), fixtures isolate HOME/XDG_CONFIG_HOME, and the PR's star-gitignore fixture stages its .gitignore (intentional fixture change: the contract is a tracked file). Reviewer tests: global excludes only, info/exclude only, an untracked star .gitignore, and a re-include each still append; all three fail on the PR head. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(skill-end): log the completion event before the final drain (#3198) gstack-skill-end drained and pushed before it appended its own completed timeline event, and gstack-timeline-log backgrounded its enqueue, so a full-tier end boundary returned with its latest event unpushed. The completion log now runs before the drain and the logger waits for its enqueue (one config read and a spool write; it exits early when sync is off or the session is unattended). Every consent, secret-scan and queue-lock gate is unchanged; the stale "local-only, never sent anywhere" comment is replaced. Patch and regression test from Kkkkkuro (#3198): 2 pass / 5 fail on47d639a, 8/8 with the fix. Reviewer test: with artifacts_sync_mode off the completion is written locally with no queue entry and no push. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(pregate): map Next.js route paths and tsconfig path aliases to their tests QUOTED excluded ( ) [ ] +, so a test naming app/(app)/page.tsx in a string never matched. resolveRef never read tsconfig compilerOptions.paths, so an import through @/ resolved to nothing. Both were PREGATE_NO_LANE false negatives in a Next.js App Router repo whose tests did name the files. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(pregate): TypeScript alias precedence, relative extends and a no-lane explanation Follow-up to #3176 (adopted from vocodestudios). Path aliases now follow TypeScript's choice: an exact pattern, else the wildcard with the longest prefix, targets tried in order. When the chosen pattern resolves nothing, every plausible reading (other matching patterns, baseUrl, the repo root) gains the edge, so uncertainty selects more tests, never fewer. Relative extends chains are followed up to MAX_TSCONFIG_EXTENDS (4) hops, with baseUrl and paths resolved against the config that declares them. Trailing commas are dropped by the JSONC tokenizer (never inside a string) instead of a whole-text regex. A touched file with no lane now gets explain lines naming the import specifiers in test files that resolved to no repo file, any extends hop that was not followed (with the limit), and the hint to declare the file under dependencies or report the resolver gap. The lines ride testsFor's provenance, which lanes already pushes to --explain. Reviewer tests: overlapping aliases in both key orders, exact vs wildcard, target fallback, the union case, a two-hop extends chain, a string containing ',]', and the depth-limit explanation. Five fail on the PR head; all 12 pass. The manifest-parser half of #3176's follow-up (lane-selection.ts) ships in PR 2. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(browse): reap PTY children on agent shutdown * fix(browse): reap a terminal-agent PTY's whole process group at shutdown (#3147) Follow-up to #3148 (adopted from Y4NN777). The PTY child leads its own session and process group; its identity (pgid, sid, leader start time) is recorded at spawn and stays checkable after the leader exits. Disposal schedules a group reap after PTY_SHUTDOWN_GRACE_MS that, unlike the direct-child SIGKILL fallback, is not cancelled when the leader exits, and shutdown reaps every pending group before exiting, so descendants that ignore SIGHUP no longer outlive the agent. Only proven members are signalled: same pgid and sid, started no earlier than the leader, and nothing at all when the leader's PID is held by a process with another start time. Linux only (/proc); other platforms keep the direct-child behavior. During the shutdown grace the server answers 503 and no new PTY is spawned. Test changes to the PR's own test (intentional): the agent is spawned with process.execPath and the PTY child traps INT TERM HUP, so the case proves the SIGKILL fallback instead of passing on the kernel hangup. Reviewer tests: a HUP-immune grandchild is dead within the grace plus 1 s; an early-exiting leader's surviving descendant is reaped; a session that completed before shutdown still has its group reaped; unit cases for a foreign group and a reused leader PID. All four integration cases fail on 47d639a; three fail on the PR head. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * build(deps): bump the github-actions group with 5 updates Bumps the github-actions group with 5 updates: | Package | From | To | | --- | --- | --- | | [actions/upload-artifact](https://github.com/actions/upload-artifact) | `7.0.1` | `7.0.2` | | [actions/download-artifact](https://github.com/actions/download-artifact) | `8.0.1` | `8.0.2` | | [actions/setup-node](https://github.com/actions/setup-node) | `7.0.0` | `7.1.0` | | [ossf/scorecard-action](https://github.com/ossf/scorecard-action) | `2.4.4` | `2.5.0` | | [github/codeql-action/upload-sarif](https://github.com/github/codeql-action) | `4.38.2` | `4.38.3` | Updates `actions/upload-artifact` from 7.0.1 to 7.0.2 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/043fb46d1a93c77aae656e7c1c64a875d1fc6a0a...cf430e030ddbb5b0abf93d22962f4752f3646cd9) Updates `actions/download-artifact` from 8.0.1 to 8.0.2 - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c...9000827ccba6bdab643e8b6fd33ac0654aef8333) Updates `actions/setup-node` from 7.0.0 to 7.1.0 - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/820762786026740c76f36085b0efc47a31fe5020...949feb2413d6458794dcd2491c4babbbce0c15c1) Updates `ossf/scorecard-action` from 2.4.4 to 2.5.0 - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/2d1146689b8cda280b9bc96326124645441f03bc...fa7117db83c52d787ae5a89f350999701505d78e) Updates `github/codeql-action/upload-sarif` from 4.38.2 to 4.38.3 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2...24c54180a607b1449ed407dd24f251e4e9147c8d) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: 7.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: actions/download-artifact dependency-version: 8.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: actions/setup-node dependency-version: 7.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: ossf/scorecard-action dependency-version: 2.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: github/codeql-action/upload-sarif dependency-version: 4.38.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(model-policy): track the upload-artifact v7.0.2 pin from #3175 Intentional pin change: test/model-policy-workflow.test.ts asserted actions/upload-artifact@043fb46d…; dependabot #3175 moves the workflow to cf430e03… (v7.0.2, verified against the upstream tag). The pin tracks the workflow. #3175's free-tests.yml hunk is left out of this PR (free-tests.yml is a #3190 file; it is re-bumped in PR 5). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(model-policy): its upload-artifact pin matches the eval workflows' pin Reviewer test for dependabot #3175: the model-policy workflow's single upload-artifact pin equals the pin evals.yml, evals-periodic.yml and windows-free-tests.yml use, so a group bump that misses one workflow (or the hard-coded pin above) is caught here. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * build(deps): hold Playwright minor/major bumps behind the windowsHide patch (#2923) Dependabot #2923 bumped playwright to ^1.64.0 and dropped the patchedDependencies entry keyed to playwright-core@1.62.1, which keeps windowsHide on Windows (#2160, #1989). The bun ecosystem now ignores only semver-minor and semver-major updates for playwright and playwright-core; patch updates still flow. The 1.64 migration (re-key the patch, the Dia/cookie qualification pins, the arm64 artifact name) is filed with owner Garry, revisit 2026-11-15. Test fails on47d639a(no ignore rule). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(readme): drop the stale skill lists users pasted into CLAUDE.md (#3169) README's install prompt and troubleshooting block each carried a skill list for CLAUDE.md; both were stale (18 shipped skills missing) and they disagreed. Claude Code lists installed skills itself, so both now keep only the /browse rule, and the troubleshooting entry says to delete an old pasted list. New free test: any comma-separated skill list in README.md or CLAUDE.md must name exactly the shipped skills (with a negative control for the detector). Fails on 47d639a; passes now. Reported by the #3169 issue author. The matching doctor warning for pasted lists ships in PR 5. Intentional pin change: test/test-value-bar.test.ts no longer expects the README skill list to name /test-audit twice; it now expects that list to be gone (0 occurrences), the registration this commit removes on purpose. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * chore(osv): image-size has a fix; html-to-docx's ^1.0.0 pin blocks it (#2753) The image-size ledger said no fixed release exists. OSV lists 2.0.3 as fixed for GHSA-5p2g-fcmc-qvqq and GHSA-w3rx-r6r6-pgpr (checked against api.osv.dev), but html-to-docx@1.8.0 pins image-size ^1.0.0 and there is no fixed 1.x, so the fix is a cross-major override. Both entries now say so and name the upgrade trigger; the 2026-11-30 expiry is kept. New test checks the wording and that bun.lock still shows the stated pin (it fails on47d639a). Correction first raised on #2753 by sonukapoor. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * feat(ios-qa): forward GSTACK_IOS_LAUNCH_ENV to devicectl launches (#1796) Reimplements only the launch-environment half of #1796 (credit Bmathews721; the session-cache half is superseded by #3132's design and had state-root and symlink-write problems). devicectl.ts parses GSTACK_IOS_LAUNCH_ENV as a JSON object of string to string; launchEnvArgs() returns the --environment-variables argv (empty when unset or {}) and launchApp passes it before the bundle id. Invalid JSON, a non-object, a non-string value, a bad name or a key in the debug bridge's reserved GSTACK_ namespace refuses before any launch with the new result code IOS_LAUNCH_ENV_INVALID (the detail names keys and types, never values). launchEnvArgs is exported for the forced-relaunch path in tunnel-bootstrap.ts. Adds the result-code row (bin/gstack-doctor-components.sh regenerated by gen:skill-docs), a troubleshooting entry under its exact text, the pregate-no-lane entry's explain note, and the how-to section with an example. New test fails on47d639a(module load: no parseLaunchEnv). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(deps): declare sharp and clear two transitive advisories sharp is imported in four files, including browse/src/screenshot-size-guard.ts, and test/dependency-security.test.ts asserts a >=0.35.4 floor on it and loads it. It was declared in no dependency field, reaching the tree only through @huggingface/transformers with the overrides pin forcing the version. Declare it at ^0.35.4, matching the floor that test already asserts. Upgrade @huggingface/transformers to ^4.3.0, which clears sprintf-js@1.1.3 and aligns the sharp override with what the parent declares: 4.2.0 declared sharp ^0.34.5 while the override pins 0.35.5, which is outside that range, and 4.3.0 declares ^0.35.4. Upgrade @anthropic-ai/claude-agent-sdk to 0.2.141, which clears @anthropic-ai/sdk@0.81.0. The existing overrides entry for sharp is left in place. * test(deps): sharp is declared and its override satisfies every asking range Reviewer test for #3145 (adopted from sonukapoor): sharp must be a declared dependency, and the pinned overrides.sharp must satisfy both that declaration and every lockfile package that depends on sharp (@huggingface/transformers included). Fails on47d639a(sharp not declared; transformers 4.2.0 asked for ^0.34.5 against a 0.35.5 pin). Classifier smoke on the changed tree (transformers 4.3.0, onnxruntime-node 1.30.0, sharp 0.35.5, claude-agent-sdk 0.2.141): the real sidecar entry bundled for Node with a private state root, and the classifier in-process under Bun, each downloaded the TestSavantAI model fresh, reported testsavant: ok, and returned scores identical to 47d639a's tree on five inputs, including a >512-token input that exercises the truncation override. dependency-security, deps-smoke, overlay-sdk-cancel-eof, security-classifier and screenshot-size-guard pass; typecheck:test reports no new diagnostics. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(gbrain-sync): the no-bash skip names GSTACK_GIT_BASH and how to set it (#3197) The brain-sync stage's Windows skip line told users to set GSTACK_BASH. After the fix wave the canonical override is GSTACK_GIT_BASH, with GSTACK_BASH as a deprecated alias (plan correction 9). The summary is now the exported NO_BASH_SUMMARY: it names GSTACK_GIT_BASH first and GSTACK_BASH as the old name, and gives the two recipes that reach Claude Code (a PowerShell user environment variable plus a Claude Code restart, or the "env" block of ~/.claude/settings.json). Minimal on purpose: once PR 2 lands, this switches to lib/script-invocation.ts noBashMessage(). Until then lib/gbrain-exec.ts still reads only GSTACK_BASH, so this line is accurate only with PR 2 merged first. New test test/gbrain-sync-no-bash-message.test.ts fails on the previous commit (NO_BASH_SUMMARY not exported) and passes now. Handoff from Lane C (PR 2). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(ios-qa): the forced relaunch carries GSTACK_IOS_LAUNCH_ENV too (#1796) bootstrapTunnel's relaunchApp (an app whose boot token an earlier daemon consumed is relaunched once with --terminate-existing) built its own devicectl argv and dropped GSTACK_IOS_LAUNCH_ENV, so an env-gated debug bridge vanished after the one relaunch the howto says carries it. It now uses launchEnvArgs(); an invalid value refuses the relaunch with launch_failed and the IOS_LAUNCH_ENV_INVALID detail before anything is terminated. Two new tests in ios-qa/daemon/test/devicectl-launch-env.test.ts drive bootstrapTunnel through a consumed-token device: both fail on the previous commit (relaunch argv lacks --environment-variables; the invalid value still terminates and relaunches) and pass now. ios-qa daemon: 167 pass. tunnel-bootstrap.ts was assigned to Lane D by the coordinator for this fix. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ci(version-gate): check the version queue only on PRs into main Stacked layer PRs carry no VERSION stamp by design (the release layer stamps once), so the queue check failed on any layer touching package.json. The queue and its collision rule only describe main; a PR into main is still checked exactly as before. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(browse): scope the SIGTERM PTY-reap case to POSIX signals (#3147) windows-free-tests run 38813751242 (shard 6) failed "SIGTERM reaps every active PTY child before terminal-agent exits" with "timed out waiting for pty-child.pid", serially and on retry. Diagnosis: invalid test expectation on Windows, not an agent defect the test can observe. The contract under test is the agent's graceful shutdown, its process.on('SIGTERM'/'SIGINT') cleanup in terminal-agent.ts. On Windows, Bun's subprocess.kill('SIGTERM') is libuv's TerminateProcess, so that handler never runs there; and the PTY fixture is an extension-less `#!/bin/bash` script, which CreateProcess cannot launch, so the child never starts (the timeout is at the pid file, after the port, token, grant and WebSocket all succeeded). The file's other integration cases were already Linux-scoped; this one now skips only on win32 and still runs on Linux and macOS. The pure ownership unit tests in the file keep running on Windows. Open, not covered by any test: whether a ConPTY child outlives a hard-terminated agent on Windows. Testing it needs a Windows-launchable terminal fixture, which BROWSE_TERMINAL_BINARY (one executable, fixed argv) cannot express without a product change. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(plan-review): bound the native outside voice without TaskOutput (#3182) Claude Code 2.1.277 removed TaskOutput, so the plan-review native fallback's preflight always failed and users without the Codex CLI never got a second voice. The fallback now uses primitives the host still enforces: a background `sleep 300` Bash timer (its exit re-invokes the parent; the 2.1.300 sleep block applies only to foreground commands), a background Plan dispatch whose completion arrives as a <task-notification>, and TaskStop for whichever task loses. Only a matching completed notification that beats the timer counts; interim ("is waiting on its own background work"), turn-limit, foreground and late results get no credit. The "[Subagent hand-back]" header (2.1.277) is treated as framing. The unavailable line now names its cause and fix, ends with OUTSIDE_VOICE_UNAVAILABLE (new result code + troubleshooting entry), and the review-log row carries unavailable_reason. The bounded-wait prose was tightened so plan-ceo-review and plan-eng-review stay under their existing size ceilings (no ratchet raise for this item). Intentional pin change: test/run-in-background-guidance.test.ts hasBoundedOutsideVoiceWait and the dispatch-contract cases now pin the timer/notification/TaskStop contract instead of TaskOutput's envelope. bin/gstack-doctor-components.sh is regenerated from lib/result-codes.ts. Reported by HuellintonMota in #3182. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * feat(bin): gstack-ceo-plan-find locates the CEO plan for a branch (#280) /plan-ceo-review saves its scope decisions under the state root's ceo-plans/, but no plan review can find them: only /design-html reads that directory, newest file first. This helper is the CEO-plan sibling of gstack-design-doc-find, so /plan-eng-review can call one command instead of a glob in prose. It prints the newest top-level plan whose "Branch:" header names the branch, compared the way gstack-slug writes BRANCH (feat/x matches feat-x), else the newest plan, else nothing. Subdirectories are not read. A usage error exits 2. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(plan-eng-review): read the CEO plan in the Design Doc Check (#280) /plan-eng-review never looked in ceo-plans/, so an eng review after /plan-ceo-review ran without the scope that review accepted, deferred or skipped. capy-ai closed #414 asking for this focused fix, and TODOS.md scopes it as a gstack-ceo-plan-find sibling of gstack-design-doc-find. The Design Doc Check now prints "CEO plan found: <path>" or "No CEO plan found" after the design doc line, and the prose says what to read the plan for. The data-not-instructions rule names the CEO plan too, since another agent may have written it. Only plan-eng-review changes: the shared {{DESIGN_DOC_DISCOVERY}} block and the branch-scoped review log are untouched. Reported by @chancheuklap in #280. main left plan-eng-review 4 bytes under its parity cap, so the +325 bytes raise maxSizeRatio to the measured 1.2196, noted the way earlier growth was. Fixes #280 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(plan-eng-review): disclose a CEO plan borrowed from another branch (#280) Review changes on top of #3159 (szsunyuan / y$un_): - gstack-ceo-plan-find keeps stdout a bare path or empty; when it falls back to another branch's plan it prints one stderr line, "CEO plan found (from branch <b>, not <current>): <path>", with control characters stripped from the plan header ("unknown" when it has none). - The Design Doc Check tells an interactive reviewer to ask before using such a plan, and a spawned session to use it and quote the disclosure. - The Design Doc Check prose is tightened so plan-eng-review fits the owner-approved 1.2196 ceiling (measured 151,950 / 124,597 = 1.2195). Reviewer tests: test/ceo-plan-find-cross-branch.test.ts (5 of 7 fail on the Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> #3159 head). The design-doc finder's matching disclosure stays deferred. * fix(test): credit abutting section chunks whose edge bytes repeat (#3182) detectSectionReads trims the longest suffix/prefix overlap between consecutive Bash outputs. Two chunks that abut exactly (tail -c +N after a chunk ending at N-1) can share an edge byte by chance; the trim then drops a real byte and a fully printed section reads as incomplete. #3182's review-sections edit moved plan-ceo-review's 66,999-byte boundary onto "cur|rent", which turned the existing byte-range test red. The detector now also checks the plain concatenation; a gap still refuses. Detector/fixture defect, not a product change. New regression case in test/section-capture-native-tools.test.ts fails without the fix. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(changelog): fix wave 2026-10-15 release notes Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * v1.91.104.0 fix: the 2026-10-15 issue wave Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(qa): probe each documented input rule, not only its boundary values The paid gate's qa-functional-cli-report run (38829994639) probed zero and an unsafe integer but never a non-digit amount, so it missed the planted parseInt defect ("Amounts contain only ASCII digits") and reported no defect. The functional contract map's invalid-input row now asks for one probe per documented input rule (allowed characters, format, sign, range, arity). test/qa-functional-prompt.test.ts replays a captured CI Read of system-functional.md; its completed-method variant now feeds the current section bytes, so the validator check keeps its omitted/pending negative controls without pinning the old wording. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * v1.91.106.0: restamp the fix wave above v1.91.105.0 Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(release): keep the wave's dependency bumps through the main merge Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> Co-authored-by: Bryan Stone <aegixx@gmail.com> Co-authored-by: vilano93 <244097767+vilano93@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: aftabkh4n <akobkz@gmail.com> Co-authored-by: Benjamin D. Smith <benjamin.smith@binarysword.com> Co-authored-by: Jess Sullivan <jess@sulliwood.org> Co-authored-by: NetrioGit <5wngh@naver.com> Co-authored-by: y$un_ <forrest.sun527@gmail.com> Co-authored-by: Lockyer <135391289+Lockyer228@users.noreply.github.com> Co-authored-by: davidfragnoli-lang <249433777+davidfragnoli-lang@users.noreply.github.com> Co-authored-by: KuroChen <kurochen_macmini@KuroChendeMac-mini.local> Co-authored-by: AV <vo.quanganh@gmail.com> Co-authored-by: Y4NN777 <171065166+Y4NN777@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sonu Kapoor <sonukapoor@gmail.com>
2297 lines
98 KiB
TypeScript
2297 lines
98 KiB
TypeScript
#!/usr/bin/env bun
|
|
/**
|
|
* gstack-gbrain-sync — V1 unified sync verb.
|
|
*
|
|
* Orchestrates three storage tiers per plan §"Storage tiering":
|
|
*
|
|
* 1. Code (current repo) → `gbrain sources add` (idempotent via
|
|
* lib/gbrain-sources.ts) + `gbrain sync
|
|
* --strategy code` (incremental) or
|
|
* `gbrain reindex-code --yes` (--full).
|
|
* NEVER `gbrain import` (markdown only).
|
|
* 2. Transcripts + curated memory → gstack-memory-ingest (typed put_page)
|
|
* 3. Curated artifacts to git → gstack-brain-sync (existing pipeline)
|
|
*
|
|
* Modes:
|
|
* --incremental (default) — mtime fast-path; runs all 3 stages with cache hits
|
|
* --full — first-run; full walk + reindex; honest budget per ED2
|
|
* --dry-run — preview what would sync; no writes anywhere (incl. state file)
|
|
*
|
|
* Concurrency safety per /plan-eng-review D1:
|
|
* - Lock file at ~/.gstack/.sync-gbrain.lock (PID + start ts).
|
|
* - Stale-lock takeover after 5 min (process death).
|
|
* - State file written via tmp+rename for atomicity.
|
|
* - Lock released in finally; SIGINT/SIGTERM trapped for cleanup.
|
|
*
|
|
* --watch (V1.5 P0 TODO): file-watcher daemon. NOTE: gbrain v0.25.1 already
|
|
* ships `gbrain sync --watch [--interval N]` and `gbrain sync --install-cron`;
|
|
* when revisited, /sync-gbrain --watch wires through to the gbrain CLI rather
|
|
* than building a gstack-side daemon.
|
|
*/
|
|
|
|
import { existsSync, statSync, mkdirSync, writeFileSync, readFileSync, unlinkSync, renameSync, realpathSync, readdirSync, appendFileSync } from "fs";
|
|
import { join, dirname, basename, isAbsolute } from "path";
|
|
import { execSync, spawnSync } from "child_process";
|
|
import { homedir, hostname } from "os";
|
|
import { createHash } from "crypto";
|
|
|
|
import "../lib/conductor-env-shim";
|
|
import { detectEngineTier, withErrorContext, canonicalizeRemote } from "../lib/gstack-memory-helpers";
|
|
import {
|
|
constrainSourceId,
|
|
ensureSourceRegistered,
|
|
sourcePageCount,
|
|
parseSourcesList,
|
|
readCycleStatus,
|
|
decidePrune,
|
|
trackUnavailableSources,
|
|
type CodeSourceRecord,
|
|
type CycleStatus,
|
|
type UnavailableSource,
|
|
} from "../lib/gbrain-sources";
|
|
import { detectAutopilot, decideSourceRemove, decideCodeSync } from "../lib/gbrain-guards";
|
|
import { writeReceipt } from "../lib/egress-receipt";
|
|
import { dbUnreachableReason, localEngineStatus, localEngineStatusDetail, type LocalEngineStatus } from "../lib/gbrain-local-status";
|
|
import { buildGbrainEnv, spawnGbrain, spawnGbrainAsync, execGbrainJson, NEEDS_SHELL_ON_WINDOWS, bashScriptInvocation } from "../lib/gbrain-exec";
|
|
import { repoPolicyTier as sharedRepoPolicyTier } from "../lib/gbrain-repo-policy-client";
|
|
import { checkOwnedStagingDir } from "../lib/staging-guard";
|
|
import { resolveStateRoot } from "../lib/state-root";
|
|
import type { TranscriptConsent } from "./gstack-memory-ingest";
|
|
import {
|
|
describeTranscriptPolicy,
|
|
isScoped,
|
|
readTranscriptConsent,
|
|
reposHash,
|
|
type TranscriptPolicy,
|
|
} from "../lib/transcript-consent";
|
|
|
|
// ── Types ──────────────────────────────────────────────────────────────────
|
|
|
|
type Mode = "incremental" | "full" | "dry-run";
|
|
|
|
export interface CliArgs {
|
|
mode: Mode;
|
|
quiet: boolean;
|
|
noCode: boolean;
|
|
noMemory: boolean;
|
|
noBrainSync: boolean;
|
|
codeOnly: boolean;
|
|
/** Force the source-scoped dream cycle (builds this source's call graph). Always runs. */
|
|
dream: boolean;
|
|
/** Opt out of the dream cycle that `--full` would otherwise auto-run. */
|
|
noDream: boolean;
|
|
/** #1734: opt-in to sync a URL-managed source whose code walk may auto-reclone. */
|
|
allowReclone: boolean;
|
|
/** #2922: `--sources <list|all>` for the memory stage; wins over GSTACK_MEMORY_INGEST_SOURCES. */
|
|
memorySources?: string;
|
|
/** A6: remove gstack code sources whose worktree is provably gone (with --dry-run: report only). */
|
|
pruneGone?: boolean;
|
|
}
|
|
|
|
interface CodeStageDetail {
|
|
source_id?: string;
|
|
source_path?: string;
|
|
page_count?: number | null;
|
|
last_imported?: string;
|
|
status?:
|
|
| "ok"
|
|
| "skipped"
|
|
| "failed"
|
|
| "refused-autopilot"
|
|
| "refused-reclone"
|
|
| "refused-egress-receipt"
|
|
| "skipped-policy-read-only"
|
|
| "refused-policy-deny"
|
|
| "refused-policy-unreadable";
|
|
}
|
|
|
|
interface StageResult {
|
|
name: string;
|
|
ran: boolean;
|
|
ok: boolean;
|
|
duration_ms: number;
|
|
summary: string;
|
|
/**
|
|
* Stage ran and did not error, but the outcome is a degraded no-op the user
|
|
* should know about (e.g. dream completed but the schema pack can't extract
|
|
* code symbols, so the call graph stays empty). Rendered as WARN, counts as
|
|
* ok for the exit code — it's not a failure, just not the happy path.
|
|
*/
|
|
warn?: boolean;
|
|
/** Stage-specific structured detail. Code stage carries source_id + page_count. */
|
|
detail?: CodeStageDetail;
|
|
/** Memory stage: the type selection its ingest staged (resume must match it). */
|
|
memory_sources?: string[];
|
|
/** Memory stage: transcript consent read at sync start (resume must match it). */
|
|
transcript_consent?: TranscriptConsentRecord;
|
|
}
|
|
|
|
interface TranscriptConsentRecord {
|
|
/** Normalized transcript_ingest_mode: recent | all | new | off | not-set | legacy | unrecognized | repos-unreadable. */
|
|
mode: string;
|
|
window: "recent" | "all" | "new" | null;
|
|
/** Why transcripts were not ingested; absent when they were. */
|
|
skip_reason?: string;
|
|
/** The new@ cutoff in force; a changed cutoff restages. */
|
|
cutoff?: string;
|
|
/** Hash of the transcript_repos allowlist in force; a scope change restages. */
|
|
repos_hash?: string;
|
|
}
|
|
|
|
// ── Constants ──────────────────────────────────────────────────────────────
|
|
|
|
const HOME = homedir();
|
|
const GSTACK_HOME = resolveStateRoot();
|
|
const STATE_PATH = join(GSTACK_HOME, ".gbrain-sync-state.json");
|
|
const LOCK_PATH = join(GSTACK_HOME, ".sync-gbrain.lock");
|
|
const STALE_LOCK_MS = 5 * 60 * 1000;
|
|
|
|
// Dream (call-graph build) is brain-global and runs LOCK-FREE after the sync
|
|
// lock releases, so it can't use the sync lock to dedupe across worktrees. A
|
|
// dedicated short-TTL marker prevents two worktrees from launching duplicate
|
|
// ~35-min global jobs. TTL matches the dream timeout default so a crashed run
|
|
// can't wedge the marker longer than one cycle.
|
|
const DEFAULT_DREAM_TIMEOUT_MS = 45 * 60 * 1000; // 45min — dream is the slow stage
|
|
const DREAM_MARKER_STALE_MS = DEFAULT_DREAM_TIMEOUT_MS;
|
|
|
|
/**
|
|
* Marker path computed fresh per call (not a module const) so tests can mutate
|
|
* GSTACK_HOME at runtime — same pattern as cacheFilePath() in
|
|
* lib/gbrain-local-status.ts. Avoids the ESM static-import hoist trap where a
|
|
* module-load-time const captures the real ~/.gstack before a test can redirect.
|
|
*/
|
|
export function dreamMarkerPath(): string {
|
|
return join(resolveStateRoot(), ".dream-in-progress");
|
|
}
|
|
|
|
// Default 35-minute timeout for code-walk + memory-ingest stages. Override via
|
|
// GSTACK_SYNC_CODE_TIMEOUT_MS / GSTACK_SYNC_MEMORY_TIMEOUT_MS. Bounds-checked
|
|
// in resolveStageTimeoutMs below so wildly-low values don't make resume
|
|
// useless and wildly-high values don't mask config typos. See #1611.
|
|
const DEFAULT_STAGE_TIMEOUT_MS = 35 * 60 * 1000; // 2_100_000ms = 35min
|
|
const MIN_STAGE_TIMEOUT_MS = 60_000; // 1 minute floor
|
|
const MAX_STAGE_TIMEOUT_MS = 86_400_000; // 24 hour ceiling
|
|
|
|
/**
|
|
* Memory types that bin/gstack-memory-ingest.ts accepts via --sources.
|
|
* Keep in sync with ALL_TYPES there (#2922).
|
|
*/
|
|
export const MEMORY_INGEST_TYPES = [
|
|
"transcript",
|
|
"eureka",
|
|
"learning",
|
|
"timeline",
|
|
"ceo-plan",
|
|
"design-doc",
|
|
"retro",
|
|
"builder-profile-entry",
|
|
] as const;
|
|
|
|
/**
|
|
* Memory types whose files a registered federated gstack source already
|
|
* imports: the markdown paths gstack-artifacts-init allowlists
|
|
* (projects/*\/ceo-plans/*.md, projects/*\/*-design-*.md) under gbrain's
|
|
* markdown strategy, which skips .jsonl. Ingesting them again duplicates
|
|
* every curated page (#2922).
|
|
*/
|
|
export const FEDERATED_CURATED_TYPES = ["ceo-plan", "design-doc"] as const;
|
|
|
|
/**
|
|
* Parse a --sources / GSTACK_MEMORY_INGEST_SOURCES value into a validated
|
|
* type subset (#2922). Returns null when the value is unset or empty, or is
|
|
* `all` (walk every type). Unknown tokens are dropped with a stderr warning;
|
|
* when nothing valid remains, returns null with a warning rather than
|
|
* failing the whole memory stage.
|
|
*/
|
|
export function resolveMemoryIngestSources(
|
|
envValue: string | undefined,
|
|
envName: string,
|
|
): string[] | null {
|
|
if (envValue === undefined || envValue.trim() === "" || envValue.trim() === "all") return null;
|
|
const valid: string[] = [];
|
|
const dropped: string[] = [];
|
|
for (const token of envValue.split(",")) {
|
|
const t = token.trim();
|
|
if (t === "") continue;
|
|
if ((MEMORY_INGEST_TYPES as readonly string[]).includes(t)) {
|
|
if (!valid.includes(t)) valid.push(t);
|
|
} else {
|
|
dropped.push(t);
|
|
}
|
|
}
|
|
if (dropped.length > 0) {
|
|
console.warn(
|
|
`[sync] ${envName}: ignoring unknown memory type(s): ${dropped.join(", ")} (valid: ${MEMORY_INGEST_TYPES.join(", ")})`,
|
|
);
|
|
}
|
|
if (valid.length === 0) {
|
|
console.warn(
|
|
`[sync] ${envName}="${envValue}" names no valid memory types; running a full memory walk`,
|
|
);
|
|
return null;
|
|
}
|
|
return valid;
|
|
}
|
|
|
|
/**
|
|
* The federated source registered for the gstack artifacts worktree (or the
|
|
* state root itself), if any. Its pages already cover FEDERATED_CURATED_TYPES.
|
|
*/
|
|
export function federatedCuratedSourceId(env?: NodeJS.ProcessEnv): string | null {
|
|
const rows = parseSourcesList(execGbrainJson(["sources", "list", "--json"], { baseEnv: env, timeout: 10_000 }));
|
|
const row = rows.find((r) => (r as { federated?: boolean }).federated === true && isArtifactsSourceRow(r, env));
|
|
return row?.id ?? null;
|
|
}
|
|
|
|
/** A source this installation maintains for its curated artifacts (the worktree or the state root). */
|
|
function isArtifactsSourceRow(r: { local_path?: string }, env?: NodeJS.ProcessEnv): boolean {
|
|
const realOrSelf = (p: string): string => {
|
|
try {
|
|
return realpathSync(p);
|
|
} catch {
|
|
return p;
|
|
}
|
|
};
|
|
const home = (env ?? process.env).HOME || HOME;
|
|
const owned = new Set([
|
|
realOrSelf((env ?? process.env).GSTACK_BRAIN_WORKTREE || join(home, ".gstack-brain-worktree")),
|
|
realOrSelf(GSTACK_HOME),
|
|
]);
|
|
return !!r.local_path && owned.has(realOrSelf(r.local_path));
|
|
}
|
|
|
|
/**
|
|
* A5 (#2670): after a successful artifacts push, report what gbrain actually
|
|
* holds. A git push is not indexing; a maintained artifacts source with zero
|
|
* pages is the one provably broken state and fails the stage.
|
|
*/
|
|
export function brainSyncIndexVerdict(env: NodeJS.ProcessEnv = process.env): { ok: boolean; summary: string } {
|
|
const raw = execGbrainJson(["sources", "list", "--json"], { baseEnv: env, timeout: 10_000 });
|
|
if (raw === null) {
|
|
return { ok: true, summary: "curated artifacts pushed to git; gbrain page count unavailable (gbrain sources list failed)" };
|
|
}
|
|
const explicit = env.GSTACK_BRAIN_SOURCE_ID;
|
|
const row = parseSourcesList(raw).find((r) => (explicit ? r.id === explicit : isArtifactsSourceRow(r, env)));
|
|
if (!row?.id) {
|
|
return { ok: true, summary: "curated artifacts pushed to git (no gbrain artifacts source on this machine, so indexing is not checked here)" };
|
|
}
|
|
if (typeof row.page_count !== "number") {
|
|
return { ok: true, summary: `curated artifacts pushed to git; gbrain source ${row.id} did not report a page count` };
|
|
}
|
|
if (row.page_count === 0) {
|
|
return {
|
|
ok: false,
|
|
summary:
|
|
`curated artifacts pushed to git, but gbrain source ${row.id} has 0 indexed pages. ` +
|
|
`Fix: gbrain sync --source ${row.id}, then re-run /sync-gbrain`,
|
|
};
|
|
}
|
|
return { ok: true, summary: `curated artifacts pushed; gbrain source ${row.id} has ${row.page_count} pages` };
|
|
}
|
|
|
|
export interface MemorySourceSelection {
|
|
/** null = no --sources flag (walk every type). */
|
|
sources: string[] | null;
|
|
why: string;
|
|
}
|
|
|
|
/**
|
|
* Explicit --sources wins, then GSTACK_MEMORY_INGEST_SOURCES. With neither,
|
|
* skip the curated types a registered federated gstack source already owns,
|
|
* so a default sync stops duplicating them. `probe` false (dry-run) never
|
|
* spawns gbrain.
|
|
*/
|
|
export function selectMemorySources(
|
|
flag: string | undefined,
|
|
env: NodeJS.ProcessEnv,
|
|
probe: boolean,
|
|
): MemorySourceSelection {
|
|
if (flag !== undefined) return { sources: resolveMemoryIngestSources(flag, "--sources"), why: "--sources" };
|
|
const fromEnv = env.GSTACK_MEMORY_INGEST_SOURCES;
|
|
if (fromEnv !== undefined && fromEnv.trim() !== "") {
|
|
return { sources: resolveMemoryIngestSources(fromEnv, "GSTACK_MEMORY_INGEST_SOURCES"), why: "GSTACK_MEMORY_INGEST_SOURCES" };
|
|
}
|
|
if (!probe) {
|
|
return { sources: null, why: "default: curated types are skipped at run time when a federated gstack source is registered" };
|
|
}
|
|
const federated = federatedCuratedSourceId(env);
|
|
if (!federated) return { sources: null, why: "default: no federated gstack source registered" };
|
|
return {
|
|
sources: MEMORY_INGEST_TYPES.filter((t) => !(FEDERATED_CURATED_TYPES as readonly string[]).includes(t)),
|
|
why: `default: ${FEDERATED_CURATED_TYPES.join(",")} already indexed by federated source ${federated}`,
|
|
};
|
|
}
|
|
|
|
export interface ConsentedSelection {
|
|
/** Value for the ingest's --sources flag; null = let the ingest walk its default. */
|
|
sources: string[] | null;
|
|
/** Types this run stages (recorded for resume). */
|
|
selected: string[];
|
|
/** Transcripts are ingested only because an explicit list names them. */
|
|
override: boolean;
|
|
why: string;
|
|
}
|
|
|
|
/**
|
|
* Apply transcript consent to a memory source selection. Without consent
|
|
* (anything but `recent` or `all`), transcript is removed and the remaining
|
|
* types are passed as an explicit list, so a config change made while the
|
|
* sync runs cannot add transcripts to this run. Only an explicit --sources or
|
|
* GSTACK_MEMORY_INGEST_SOURCES list that names transcript overrides that;
|
|
* `all`, empty and invalid-only values resolve to null and do not.
|
|
*/
|
|
export function applyTranscriptConsent(selection: MemorySourceSelection, consent: TranscriptConsent): ConsentedSelection {
|
|
const explicit = selection.why === "--sources" || selection.why === "GSTACK_MEMORY_INGEST_SOURCES";
|
|
const override = !consent.affirmative && explicit && !!selection.sources?.includes("transcript");
|
|
if (consent.affirmative || override) {
|
|
return { sources: selection.sources, selected: selection.sources ?? [...MEMORY_INGEST_TYPES], override, why: selection.why };
|
|
}
|
|
const selected = (selection.sources ?? [...MEMORY_INGEST_TYPES]).filter((t) => t !== "transcript");
|
|
return { sources: selected, selected, override: false, why: `${selection.why}; no transcript consent (${consent.reason})` };
|
|
}
|
|
|
|
export const TRANSCRIPT_CHOICE_HINT =
|
|
"To choose: run /sync-gbrain, or gstack-config set transcript_ingest_mode recent|all|off. Details: setup-gbrain/memory.md#transcripts";
|
|
|
|
/**
|
|
* The stderr notice for a run that does not ingest transcripts by consent.
|
|
* Returns null when nothing should print: consent given, or a stored `off`
|
|
* under --quiet.
|
|
*/
|
|
export function transcriptConsentNotice(consent: TranscriptConsent, quiet: boolean, override: string | null = null): string | null {
|
|
if (consent.affirmative) return null;
|
|
const value = consent.value ?? "not set";
|
|
if (override) {
|
|
const scope = isScoped(consent) ? " The new@ cutoff and transcript_repos allowlist still apply." : "";
|
|
return `gbrain-sync: transcripts ingested because ${override} names transcript (transcript_ingest_mode=${value}).${scope} ${TRANSCRIPT_CHOICE_HINT}`;
|
|
}
|
|
if (consent.reason === "off") return quiet ? null : "gbrain-sync: transcripts off (your choice)";
|
|
if (consent.reason === "repos-unreadable") {
|
|
return `gbrain-sync: transcripts skipped (transcript_ingest_mode=${value}): its +repos marker needs a transcript_repos allowlist, which is missing or empty. Other memory still syncs. ${TRANSCRIPT_CHOICE_HINT}`;
|
|
}
|
|
return `gbrain-sync: transcripts skipped (transcript_ingest_mode=${value}). Other memory still syncs. ${TRANSCRIPT_CHOICE_HINT}`;
|
|
}
|
|
|
|
/** The consent in words for a consenting run (window or cutoff, repos, config roots). */
|
|
export function transcriptConsentSummary(consent: TranscriptPolicy, quiet: boolean): string | null {
|
|
if (!consent.affirmative || quiet) return null;
|
|
return `gbrain-sync: transcripts: ${describeTranscriptPolicy(consent)}`;
|
|
}
|
|
|
|
/** The consent record a memory stage stores; resume requires every field to match. */
|
|
export function transcriptConsentRecord(consent: TranscriptConsent, override: boolean): TranscriptConsentRecord {
|
|
const record: TranscriptConsentRecord = { mode: consent.reason, window: consent.window };
|
|
if (!consent.affirmative && !override) record.skip_reason = consent.reason;
|
|
if (consent.cutoff !== undefined) record.cutoff = consent.cutoff;
|
|
if (consent.repos !== undefined) record.repos_hash = reposHash(consent.repos);
|
|
return record;
|
|
}
|
|
|
|
/**
|
|
* Parse a stage-timeout env value with bounds validation. Returns the bounded
|
|
* value or the default with a stderr warning if the env was malformed or
|
|
* out-of-range. Exported for the regression test.
|
|
*/
|
|
export function resolveStageTimeoutMs(
|
|
envValue: string | undefined,
|
|
envName: string,
|
|
defaultMs: number = DEFAULT_STAGE_TIMEOUT_MS,
|
|
): number {
|
|
if (envValue === undefined || envValue === "") return defaultMs;
|
|
const n = Number.parseInt(envValue, 10);
|
|
if (!Number.isFinite(n) || Number.isNaN(n) || n <= 0) {
|
|
console.warn(
|
|
`[sync] ${envName}="${envValue}" is not a positive integer; falling back to ${defaultMs}ms`,
|
|
);
|
|
return defaultMs;
|
|
}
|
|
if (n < MIN_STAGE_TIMEOUT_MS) {
|
|
console.warn(
|
|
`[sync] ${envName}=${n} is below the ${MIN_STAGE_TIMEOUT_MS}ms (1min) floor; falling back to ${defaultMs}ms`,
|
|
);
|
|
return defaultMs;
|
|
}
|
|
if (n > MAX_STAGE_TIMEOUT_MS) {
|
|
console.warn(
|
|
`[sync] ${envName}=${n} is above the ${MAX_STAGE_TIMEOUT_MS}ms (24h) ceiling; falling back to ${defaultMs}ms`,
|
|
);
|
|
return defaultMs;
|
|
}
|
|
return n;
|
|
}
|
|
|
|
/**
|
|
* gbrain writes ~/.gbrain/import-checkpoint.json on every import run. If a
|
|
* previous /sync-gbrain hit the timeout (SIGTERM = exit 143), the checkpoint
|
|
* + its staging dir survive on disk. Detect both and let gbrain resume from
|
|
* processedIndex+1 on the next run. If the staging dir is missing/empty/
|
|
* unreadable, fall through to a fresh restage with a one-line warning so the
|
|
* user sees we noticed. See #1611 + plan D1/C1.
|
|
*/
|
|
interface GbrainCheckpoint {
|
|
dir?: string;
|
|
totalFiles?: number;
|
|
processedIndex?: number;
|
|
completedFiles?: number;
|
|
timestamp?: string;
|
|
}
|
|
|
|
export function readGbrainCheckpoint(): GbrainCheckpoint | null {
|
|
// Read HOME from env so tests can redirect via process.env.HOME = ...
|
|
// (Node/Bun's os.homedir() caches at process start and ignores later
|
|
// mutations.)
|
|
const home = process.env.HOME || homedir();
|
|
const cpPath = join(home, ".gbrain", "import-checkpoint.json");
|
|
if (!existsSync(cpPath)) return null;
|
|
try {
|
|
const raw = readFileSync(cpPath, "utf-8");
|
|
const parsed = JSON.parse(raw);
|
|
if (!parsed || typeof parsed !== "object") return null;
|
|
return parsed as GbrainCheckpoint;
|
|
} catch {
|
|
// Corrupt JSON — treat as no checkpoint and fall through to fresh restage.
|
|
return null;
|
|
}
|
|
}
|
|
|
|
export type ResumeVerdict =
|
|
| { kind: "no-checkpoint" }
|
|
| { kind: "resume"; stagingDir: string; processedIndex: number; totalFiles: number }
|
|
| { kind: "stale-staging-missing"; stagingDir: string; reason?: string };
|
|
|
|
/**
|
|
* Decide whether the next memory-ingest run should resume from gbrain's
|
|
* checkpoint or restage from scratch.
|
|
* - no checkpoint → run a fresh ingest pass
|
|
* - checkpoint + staging ok → resume (gbrain picks up at processedIndex+1)
|
|
* - checkpoint + staging gone → warn, fall through to fresh restage
|
|
*/
|
|
export function decideResume(gstackHome: string = GSTACK_HOME): ResumeVerdict {
|
|
const cp = readGbrainCheckpoint();
|
|
if (!cp || !cp.dir) return { kind: "no-checkpoint" };
|
|
const stagingDir = cp.dir;
|
|
// #1802: only resume into a path we can PROVE is a gstack-minted staging dir.
|
|
// A poisoned checkpoint (dir = repo root, written when an autopilot import was
|
|
// SIGTERM'd while CWD was the repo) would otherwise be adopted as the staging
|
|
// dir and later recursively deleted by cleanupStagingDir(). Fail-closed: any
|
|
// unprovable path restages from scratch (cost: one re-stage; never data loss).
|
|
// Pure decision: return the verdict (with reason) and let the caller log,
|
|
// so we don't double-log the same event from here and the call site.
|
|
const verdict = checkOwnedStagingDir(stagingDir, gstackHome);
|
|
if (!verdict.ok) {
|
|
return { kind: "stale-staging-missing", stagingDir, reason: verdict.reason };
|
|
}
|
|
return {
|
|
kind: "resume",
|
|
stagingDir,
|
|
processedIndex: cp.processedIndex ?? 0,
|
|
totalFiles: cp.totalFiles ?? 0,
|
|
};
|
|
}
|
|
|
|
// ── CLI ────────────────────────────────────────────────────────────────────
|
|
|
|
function printUsage(): void {
|
|
console.error(`Usage: gstack-gbrain-sync [--incremental|--full|--dry-run] [options]
|
|
|
|
Modes:
|
|
--incremental Default. mtime fast-path; ~50ms steady-state.
|
|
--full First-run; full walk + reindex. Honest ~25-35 min for big Macs (ED2).
|
|
--dry-run Preview what would sync; no writes anywhere.
|
|
|
|
Options:
|
|
--quiet Suppress per-stage output.
|
|
--no-code Skip the cwd code-import stage.
|
|
--no-memory Skip the gstack-memory-ingest stage (transcripts + artifacts).
|
|
--no-brain-sync Skip the gstack-brain-sync git pipeline stage.
|
|
--code-only Only run the code-import stage (alias for --no-memory --no-brain-sync).
|
|
--dream Force the source-scoped dream cycle that builds this
|
|
source's call graph (gbrain code-callers/code-callees).
|
|
Runs lock-free AFTER the sync stages. ~minutes. Default
|
|
timeout 45min, override GSTACK_SYNC_DREAM_TIMEOUT_MS.
|
|
--no-dream Opt out of the dream cycle that --full would auto-run.
|
|
--prune-gone-worktrees Remove gstack code sources whose worktree is provably
|
|
gone: missing on 2 consecutive syncs, created on this
|
|
host (its id recomputes from host + path), and no
|
|
longer listed by its repository. Prints the plan first;
|
|
add --dry-run to only print it. Never automatic.
|
|
--allow-reclone Permit the code walk for URL-managed sources (remote_url set)
|
|
even though gbrain may auto-reclone the working tree (#1734).
|
|
--sources <list> Memory types to ingest (comma-separated, or \`all\`):
|
|
${MEMORY_INGEST_TYPES.join(",")}.
|
|
Env: GSTACK_MEMORY_INGEST_SOURCES. Default: every type
|
|
except ${FEDERATED_CURATED_TYPES.join(",")} when a federated
|
|
gstack source already indexes them, and except
|
|
transcript unless transcript_ingest_mode is recent
|
|
(last 90 days), all (all history; --full passes
|
|
--all-history) or new@<UTC> (sessions started after
|
|
it). Without that consent each run prints a notice,
|
|
even with --quiet. A list naming transcript overrides
|
|
the mode for that run, but a new@ cutoff and the
|
|
transcript_repos allowlist still apply. See
|
|
setup-gbrain/memory.md#transcripts.
|
|
--help This text.
|
|
|
|
Stages run in order: code → memory ingest → curated git push, then (lock-free)
|
|
the optional dream call-graph build. --full auto-runs dream ONLY when the call
|
|
graph was never built; --dream always forces it. Each stage failure is
|
|
non-fatal; subsequent stages still run.
|
|
`);
|
|
}
|
|
|
|
function parseArgs(): CliArgs {
|
|
const args = process.argv.slice(2);
|
|
let mode: Mode = "incremental";
|
|
let quiet = false;
|
|
let noCode = false;
|
|
let noMemory = false;
|
|
let noBrainSync = false;
|
|
let codeOnly = false;
|
|
let dream = false;
|
|
let noDream = false;
|
|
let allowReclone = false;
|
|
let memorySources: string | undefined;
|
|
let pruneGone = false;
|
|
|
|
for (let i = 0; i < args.length; i++) {
|
|
const a = args[i];
|
|
switch (a) {
|
|
case "--incremental": mode = "incremental"; break;
|
|
case "--full": mode = "full"; break;
|
|
case "--dry-run": mode = "dry-run"; break;
|
|
case "--quiet": quiet = true; break;
|
|
case "--no-code": noCode = true; break;
|
|
case "--no-memory": noMemory = true; break;
|
|
case "--no-brain-sync": noBrainSync = true; break;
|
|
case "--allow-reclone": allowReclone = true; break;
|
|
case "--sources":
|
|
memorySources = args[++i];
|
|
if (memorySources === undefined || memorySources.trim() === "") {
|
|
console.error("--sources requires a comma-separated list of memory types, or `all`");
|
|
process.exit(1);
|
|
}
|
|
break;
|
|
case "--code-only":
|
|
codeOnly = true;
|
|
noMemory = true;
|
|
noBrainSync = true;
|
|
break;
|
|
// --dream forces the cycle; --full only chains it at the call site (so
|
|
// --no-dream can override) — do NOT set dream from --full here.
|
|
case "--dream": dream = true; break;
|
|
case "--no-dream": noDream = true; break;
|
|
case "--prune-gone-worktrees": pruneGone = true; break;
|
|
case "--help":
|
|
case "-h":
|
|
printUsage();
|
|
process.exit(0);
|
|
default:
|
|
console.error(`Unknown argument: ${a}`);
|
|
printUsage();
|
|
process.exit(1);
|
|
}
|
|
}
|
|
|
|
return { mode, quiet, noCode, noMemory, noBrainSync, codeOnly, dream, noDream, allowReclone, memorySources, pruneGone };
|
|
}
|
|
|
|
// ── Helpers ────────────────────────────────────────────────────────────────
|
|
|
|
function repoRoot(): string | null {
|
|
try {
|
|
const out = execSync("git rev-parse --show-toplevel", { encoding: "utf-8", timeout: 2000 });
|
|
return out.trim();
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
function originUrl(): string | null {
|
|
try {
|
|
const out = execSync("git config --get remote.origin.url", { encoding: "utf-8", timeout: 2000 });
|
|
return out.trim();
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Derive a host- and worktree-aware source id for the cwd code corpus.
|
|
*
|
|
* Pattern: `gstack-code-<slug>-<hostpathhash8>` where slug comes from origin
|
|
* (org/repo) and hostpathhash8 is the first 8 hex chars of
|
|
* sha1(`${hostname}::${absolute repo path}`). Folding hostname into the hash
|
|
* keeps Conductor worktrees of the same repo as distinct sources on one host
|
|
* AND keeps two machines that share an absolute layout (e.g. chezmoi-managed
|
|
* home dirs against a federated brain) from colliding on each other.
|
|
*
|
|
* Falls back to the repo basename when there is no origin (local repo).
|
|
*
|
|
* `GSTACK_HOSTNAME` env override is honored for deterministic tests; in
|
|
* production paths it is unset and `os.hostname()` is used.
|
|
*
|
|
* gbrain enforces source ids to be 1-32 lowercase alnum chars with
|
|
* optional interior hyphens. `constrainSourceId` handles the 32-char cap
|
|
* with a hashed-tail fallback when the combined slug exceeds budget.
|
|
*/
|
|
export function deriveCodeSourceId(repoPath: string, remote: string = canonicalizeRemote(originUrl())): string {
|
|
const host = process.env.GSTACK_HOSTNAME || hostname();
|
|
const hostPathHash = createHash("sha1").update(`${host}::${repoPath}`).digest("hex").slice(0, 8);
|
|
if (remote) {
|
|
const segs = remote.split("/").filter(Boolean);
|
|
const slugSource = segs.slice(-2).join("-");
|
|
const fullId = constrainSourceId("gstack-code", `${slugSource}-${hostPathHash}`);
|
|
// If the org+repo+hostpathhash fits cleanly (suffix preserved), use it.
|
|
if (fullId.endsWith(`-${hostPathHash}`)) return fullId;
|
|
// Otherwise drop the org prefix and retry with just repo+hostpathhash so
|
|
// the repo name stays readable. If that still doesn't fit,
|
|
// constrainSourceId falls back to a deterministic hash-only form.
|
|
const repoOnly = segs[segs.length - 1] || "repo";
|
|
return constrainSourceId("gstack-code", `${repoOnly}-${hostPathHash}`);
|
|
}
|
|
const base = repoPath.split("/").pop() || "repo";
|
|
return constrainSourceId("gstack-code", `${base}-${hostPathHash}`);
|
|
}
|
|
|
|
/**
|
|
* Reuse an explicit repo pin when it names a registered source for this exact
|
|
* checkout. The path check prevents a stale or copied dotfile from redirecting
|
|
* a code sync into another repo's source.
|
|
*/
|
|
function readPinnedSourceId(repoPath: string): string | null {
|
|
const pinPath = join(repoPath, ".gbrain-source");
|
|
if (!existsSync(pinPath)) return null;
|
|
|
|
try {
|
|
const sourceId = readFileSync(pinPath, "utf-8").trim();
|
|
return /^[a-z0-9](?:[a-z0-9-]{0,30}[a-z0-9])?$/.test(sourceId) ? sourceId : null;
|
|
} catch {
|
|
// A pin is advisory. A permission race or a directory at this path must
|
|
// not turn a sync preview into an unexpected crash.
|
|
return null;
|
|
}
|
|
}
|
|
|
|
export function existingPinnedSourceId(repoPath: string, env?: NodeJS.ProcessEnv): string | null {
|
|
const sourceId = readPinnedSourceId(repoPath);
|
|
if (!sourceId) return null;
|
|
|
|
const registeredPath = sourceLocalPath(sourceId, env);
|
|
if (!registeredPath) return null;
|
|
try {
|
|
return realpathSync(registeredPath) === realpathSync(repoPath) ? sourceId : null;
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
function resolveCodeSourceId(repoPath: string, env?: NodeJS.ProcessEnv): string {
|
|
return existingPinnedSourceId(repoPath, env) ?? deriveCodeSourceId(repoPath);
|
|
}
|
|
|
|
/**
|
|
* Pre-pathhash source id, kept for orphan detection only.
|
|
*
|
|
* Earlier /sync-gbrain versions registered `gstack-code-<slug>` (no pathhash
|
|
* suffix). On a multi-worktree repo, those collapsed onto a single source id
|
|
* with last-sync-wins semantics. The new path-keyed id leaves the legacy
|
|
* source orphaned in the brain — federated cross-source search would return
|
|
* stale duplicate hits. We remove the legacy id once, on the first new-format
|
|
* sync from any worktree of this repo, so users don't accumulate orphans.
|
|
*/
|
|
function deriveLegacyCodeSourceId(repoPath: string): string {
|
|
const remote = canonicalizeRemote(originUrl());
|
|
if (remote) {
|
|
const segs = remote.split("/").filter(Boolean);
|
|
const slugSource = segs.slice(-2).join("-");
|
|
return constrainSourceId("gstack-code", slugSource);
|
|
}
|
|
const base = repoPath.split("/").pop() || "repo";
|
|
return constrainSourceId("gstack-code", base);
|
|
}
|
|
|
|
/**
|
|
* Pre-#1468 path-only-hash source id, kept for hostname-fold migration only.
|
|
*
|
|
* Before the hostname fold, `deriveCodeSourceId` hashed only the absolute
|
|
* repo path: `gstack-code-<slug>-<sha1(path).slice(0,8)>`. After #1468 the
|
|
* hash key is `${hostname}::${path}`, so every existing user's brain has a
|
|
* legacy id that no longer matches what `deriveCodeSourceId` produces. We
|
|
* detect this form once, attempt rename-in-place if the gbrain CLI supports
|
|
* `sources rename`, and otherwise clean up after the new source successfully
|
|
* syncs. Distinct from `deriveLegacyCodeSourceId` (pre-pathhash v1.x form);
|
|
* both probes run.
|
|
*/
|
|
export function derivePathOnlyHashLegacyId(repoPath: string): string {
|
|
const pathHash = createHash("sha1").update(repoPath).digest("hex").slice(0, 8);
|
|
const remote = canonicalizeRemote(originUrl());
|
|
if (remote) {
|
|
const segs = remote.split("/").filter(Boolean);
|
|
const slugSource = segs.slice(-2).join("-");
|
|
return constrainSourceId("gstack-code", `${slugSource}-${pathHash}`);
|
|
}
|
|
const base = repoPath.split("/").pop() || "repo";
|
|
return constrainSourceId("gstack-code", `${base}-${pathHash}`);
|
|
}
|
|
|
|
/**
|
|
* Feature-check whether the installed gbrain CLI ships `sources rename <old> <new>`.
|
|
*
|
|
* Per the v1.40.0.0 design review: probing `gbrain sources rename --help` and
|
|
* matching for the exact argument shape catches the case where gbrain's
|
|
* `sources` parent help mentions a `rename` subcommand but the CLI doesn't
|
|
* accept the `<old> <new>` form (or vice versa). Cached for the lifetime
|
|
* of the process. As of gbrain 0.35.0.0 this command does not exist, so the
|
|
* function returns false and the migration path falls back to register-new
|
|
* + sync-OK + remove-old.
|
|
*/
|
|
let _gbrainSupportsRenameCache: boolean | null = null;
|
|
export function _resetGbrainSupportsRenameCache(): void {
|
|
_gbrainSupportsRenameCache = null;
|
|
}
|
|
function gbrainSupportsSourcesRename(env?: NodeJS.ProcessEnv): boolean {
|
|
if (_gbrainSupportsRenameCache !== null) return _gbrainSupportsRenameCache;
|
|
try {
|
|
const r = spawnGbrain(["sources", "rename", "--help"], {
|
|
timeout: 5_000,
|
|
baseEnv: env,
|
|
});
|
|
const out = `${r.stdout || ""}\n${r.stderr || ""}`;
|
|
// Match the exact argument shape: `rename <old> <new>` (with literal
|
|
// angle brackets in usage strings) or `rename OLD NEW`.
|
|
const exact = /sources\s+rename\s+<old>\s+<new>/i.test(out)
|
|
|| /sources\s+rename\s+OLD\s+NEW/.test(out)
|
|
|| /sources\s+rename\s+<oldId>\s+<newId>/i.test(out);
|
|
_gbrainSupportsRenameCache = exact && r.status === 0;
|
|
} catch {
|
|
_gbrainSupportsRenameCache = false;
|
|
}
|
|
return _gbrainSupportsRenameCache;
|
|
}
|
|
|
|
/**
|
|
* Look up a source's `local_path` from `gbrain sources list --json`.
|
|
* Returns null when the source is absent or the listing fails.
|
|
*
|
|
* `env` is the environment passed to the spawned `gbrain` process; defaults
|
|
* to `process.env`. Tests inject a PATH that points at a gbrain shim so the
|
|
* helper can be exercised without a real gbrain CLI.
|
|
*
|
|
* Shape note: `gbrain sources list --json` returns `{sources: [...]}` (v0.20+);
|
|
* older versions returned a flat array. Accept both for forward/backward compat
|
|
* (mirrors `probeSource`/`sourcePageCount` in lib/gbrain-sources.ts).
|
|
*/
|
|
export function sourceLocalPath(sourceId: string, env?: NodeJS.ProcessEnv): string | null {
|
|
const raw = execGbrainJson<unknown>(
|
|
["sources", "list", "--json"],
|
|
{ baseEnv: env },
|
|
);
|
|
if (!raw) return null;
|
|
const found = parseSourcesList(raw).find((s) => s.id === sourceId);
|
|
return found?.local_path ?? null;
|
|
}
|
|
|
|
/** Result of `planHostnameFoldMigration` — informs `runCodeImport` of next steps. */
|
|
export type HostnameFoldMigration =
|
|
| { kind: "none"; reason: "ids-match" | "no-legacy-source" }
|
|
| { kind: "skipped-path-drift"; oldId: string; oldPath: string; currentPath: string }
|
|
| { kind: "renamed"; oldId: string; newId: string }
|
|
| { kind: "pending-cleanup"; oldId: string };
|
|
|
|
/**
|
|
* Decide how to migrate from the pre-#1468 path-only-hash source id to the
|
|
* new hostname-fold id.
|
|
*
|
|
* Order:
|
|
* 1. If old == new → no-op.
|
|
* 2. Look up old source's local_path. Absent → no legacy source to migrate.
|
|
* 3. local_path != currentRoot → user moved the repo or two machines share a
|
|
* hash slot. Skip migration; let the user clean up manually. We will NOT
|
|
* rename or remove anything; the new source is registered alongside.
|
|
* 4. Otherwise: feature-check `gbrain sources rename`. If supported and the
|
|
* rename call exits 0 → renamed, pages preserved.
|
|
* 5. Else: pending-cleanup. Caller registers + syncs new source first; only
|
|
* after sync succeeds with a non-zero page count does it remove the old.
|
|
* This avoids a data-loss window where the old source is gone before the
|
|
* new one is verifiably populated.
|
|
*/
|
|
export function planHostnameFoldMigration(
|
|
currentRoot: string,
|
|
newSourceId: string,
|
|
legacyPathHashId: string,
|
|
env?: NodeJS.ProcessEnv,
|
|
): HostnameFoldMigration {
|
|
if (legacyPathHashId === newSourceId) {
|
|
return { kind: "none", reason: "ids-match" };
|
|
}
|
|
const oldPath = sourceLocalPath(legacyPathHashId, env);
|
|
if (oldPath === null) {
|
|
return { kind: "none", reason: "no-legacy-source" };
|
|
}
|
|
if (oldPath !== currentRoot) {
|
|
return {
|
|
kind: "skipped-path-drift",
|
|
oldId: legacyPathHashId,
|
|
oldPath,
|
|
currentPath: currentRoot,
|
|
};
|
|
}
|
|
if (gbrainSupportsSourcesRename(env)) {
|
|
const r = spawnGbrain(["sources", "rename", legacyPathHashId, newSourceId], { baseEnv: env });
|
|
if (r.status === 0) {
|
|
return { kind: "renamed", oldId: legacyPathHashId, newId: newSourceId };
|
|
}
|
|
// Rename failed at runtime — fall through to cleanup path.
|
|
}
|
|
return { kind: "pending-cleanup", oldId: legacyPathHashId };
|
|
}
|
|
|
|
export interface GuardedRemoveResult {
|
|
removed: boolean;
|
|
/** True when a guard refused the remove (autopilot active or unsafe source). */
|
|
skipped: boolean;
|
|
reason: string;
|
|
}
|
|
|
|
/**
|
|
* #1734: run `gbrain sources remove <id> --confirm-destructive` only behind the
|
|
* data-loss guards. Checked immediately before the destructive op (E8: as late
|
|
* as possible) so the autopilot window is as small as we can make it without a
|
|
* gbrain-side lease. Refuses when autopilot is active or when the source is
|
|
* user-managed and gbrain can't keep its storage. Pure side-effect helper; the
|
|
* caller decides whether a skip is fatal (it never is today — removes are
|
|
* best-effort cleanup).
|
|
*/
|
|
export function safeSourcesRemove(sourceId: string, env?: NodeJS.ProcessEnv): GuardedRemoveResult {
|
|
const ap = detectAutopilot(env);
|
|
if (ap.active) {
|
|
return {
|
|
removed: false,
|
|
skipped: true,
|
|
reason: `autopilot active (${ap.signal}); refusing destructive remove of ${sourceId}. ` +
|
|
`Stop autopilot, then re-run /sync-gbrain.`,
|
|
};
|
|
}
|
|
const decision = decideSourceRemove(sourceId, env);
|
|
if (!decision.allow) {
|
|
return { removed: false, skipped: true, reason: decision.reason };
|
|
}
|
|
const r = spawnGbrain(
|
|
["sources", "remove", sourceId, "--confirm-destructive", ...decision.extraArgs],
|
|
{ baseEnv: env },
|
|
);
|
|
return { removed: r.status === 0, skipped: false, reason: decision.reason };
|
|
}
|
|
|
|
/**
|
|
* Remove an orphaned source. Called only after new-source sync verifies pages
|
|
* exist, so the old source is provably redundant before deletion. Routed through
|
|
* safeSourcesRemove for the #1734 guards.
|
|
*/
|
|
export function removeOrphanedSource(oldId: string, env?: NodeJS.ProcessEnv): boolean {
|
|
return safeSourcesRemove(oldId, env).removed;
|
|
}
|
|
|
|
// ── Lock file (D1) ─────────────────────────────────────────────────────────
|
|
|
|
interface LockInfo {
|
|
pid: number;
|
|
started_at: string;
|
|
}
|
|
|
|
function acquireLock(): boolean {
|
|
mkdirSync(GSTACK_HOME, { recursive: true });
|
|
if (existsSync(LOCK_PATH)) {
|
|
// Check if stale.
|
|
try {
|
|
const stat = statSync(LOCK_PATH);
|
|
const ageMs = Date.now() - stat.mtimeMs;
|
|
if (ageMs > STALE_LOCK_MS) {
|
|
// Stale; take over.
|
|
unlinkSync(LOCK_PATH);
|
|
} else {
|
|
return false;
|
|
}
|
|
} catch {
|
|
// Cannot stat; bail conservatively.
|
|
return false;
|
|
}
|
|
}
|
|
const info: LockInfo = { pid: process.pid, started_at: new Date().toISOString() };
|
|
try {
|
|
writeFileSync(LOCK_PATH, JSON.stringify(info), { encoding: "utf-8", flag: "wx" });
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
function releaseLock(): void {
|
|
try {
|
|
if (!existsSync(LOCK_PATH)) return;
|
|
const raw = readFileSync(LOCK_PATH, "utf-8");
|
|
const info = JSON.parse(raw) as LockInfo;
|
|
if (info.pid === process.pid) {
|
|
unlinkSync(LOCK_PATH);
|
|
}
|
|
} catch {
|
|
// Best-effort cleanup.
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Acquire the dream marker (`~/.gstack/.dream-in-progress`). Returns false when
|
|
* a FRESH marker already exists (another worktree is mid-dream) — the caller
|
|
* then SKIPs rather than launching a duplicate ~35-min global job. A stale
|
|
* marker (older than DREAM_MARKER_STALE_MS, i.e. a crashed run) is taken over.
|
|
* Mirrors acquireLock but with the dream TTL and its own path.
|
|
*/
|
|
export function acquireDreamMarker(): boolean {
|
|
const path = dreamMarkerPath();
|
|
mkdirSync(dirname(path), { recursive: true });
|
|
if (existsSync(path)) {
|
|
try {
|
|
const stat = statSync(path);
|
|
if (Date.now() - stat.mtimeMs > DREAM_MARKER_STALE_MS) {
|
|
unlinkSync(path);
|
|
} else {
|
|
return false;
|
|
}
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
const info: LockInfo = { pid: process.pid, started_at: new Date().toISOString() };
|
|
try {
|
|
writeFileSync(path, JSON.stringify(info), { encoding: "utf-8", flag: "wx" });
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
export function releaseDreamMarker(): void {
|
|
try {
|
|
const path = dreamMarkerPath();
|
|
if (!existsSync(path)) return;
|
|
const info = JSON.parse(readFileSync(path, "utf-8")) as LockInfo;
|
|
if (info.pid === process.pid) unlinkSync(path);
|
|
} catch {
|
|
// Best-effort cleanup.
|
|
}
|
|
}
|
|
|
|
/** Read the pid recorded in a fresh dream marker, for the "already running" message. */
|
|
function dreamMarkerPid(): number | null {
|
|
try {
|
|
const info = JSON.parse(readFileSync(dreamMarkerPath(), "utf-8")) as LockInfo;
|
|
return typeof info.pid === "number" ? info.pid : null;
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
// ── Stage runners ──────────────────────────────────────────────────────────
|
|
|
|
/**
|
|
* Build a SKIP result for the code/memory stage when the local engine is
|
|
* not in 'ok' state (per plan D12). Surface the status verbatim so the
|
|
* verdict block tells the user exactly what's wrong without re-probing.
|
|
*
|
|
* Reasons mapped to user-actionable summaries:
|
|
* no-cli → "gbrain CLI not on PATH; install via /setup-gbrain"
|
|
* missing-config → "no local engine; run /setup-gbrain to add local PGLite"
|
|
* broken-config → "config file at ~/.gbrain/config.json is malformed; see /setup-gbrain Step 1.5"
|
|
* broken-db → "config points at unreachable DB; see /setup-gbrain Step 1.5"
|
|
* engine-locked → PGLite is busy; stop its holder or sync outside the live session
|
|
* timeout → kept for Record totality; stages PROCEED on timeout (#1964)
|
|
* via the gate's warnProbeTimeout path, never this skip.
|
|
* thin-client → remote-HTTP MCP brain, no local engine by design (#2051);
|
|
* local sync stages skip (gbrain refuses sources/sync there),
|
|
* but suppression gates treat the brain as USABLE.
|
|
*/
|
|
function skipStageForLocalStatus(
|
|
stage: "code" | "memory" | "dream",
|
|
status: LocalEngineStatus,
|
|
t0: number,
|
|
): StageResult {
|
|
const reasons: Record<Exclude<LocalEngineStatus, "ok">, string> = {
|
|
"no-cli": "gbrain CLI not on PATH; install via /setup-gbrain",
|
|
"missing-config":
|
|
"no local engine; run /setup-gbrain to add local PGLite for code search",
|
|
"broken-config":
|
|
"config at ~/.gbrain/config.json is malformed; see /setup-gbrain Step 1.5",
|
|
"broken-db":
|
|
"config points at unreachable DB; see /setup-gbrain Step 1.5",
|
|
"engine-locked":
|
|
"PGLite is busy (often held by gbrain serve); stop the holding process or run /sync-gbrain outside the live Claude session, then retry",
|
|
"timeout":
|
|
"engine probe timed out; raise GSTACK_GBRAIN_PROBE_TIMEOUT_MS if your pooler is slow",
|
|
"db-unreachable": localEngineStatusDetail() ?? dbUnreachableReason("network error", ""),
|
|
"thin-client":
|
|
"thin client (remote-HTTP MCP brain, no local engine by design, #2051); " +
|
|
"code indexing runs on the brain server, memory syncs via the remote " +
|
|
"brain's artifacts pull — nothing to do locally",
|
|
};
|
|
const reason = reasons[status as Exclude<LocalEngineStatus, "ok">];
|
|
return {
|
|
name: stage,
|
|
ran: false,
|
|
ok: true, // SKIP (per D12) — not a stage failure, just an unsatisfied prerequisite
|
|
duration_ms: Date.now() - t0,
|
|
summary: `skipped — local engine ${status} — ${reason}`,
|
|
};
|
|
}
|
|
|
|
/**
|
|
* "timeout" means the probe hit its deadline with no recognized error — the
|
|
* engine is most likely healthy but slow (#1964: cold pooler connections
|
|
* measured at 6.9-10.7s). Stages proceed; a genuinely-dead engine surfaces
|
|
* its REAL error at the first actual operation instead of a false
|
|
* "config malformed" skip.
|
|
*/
|
|
function warnProbeTimeout(stage: "code" | "memory" | "dream"): void {
|
|
process.stderr.write(
|
|
`[gstack-gbrain-sync] ${stage}: engine probe timed out — proceeding anyway; ` +
|
|
`raise GSTACK_GBRAIN_PROBE_TIMEOUT_MS if your pooler is slow\n`,
|
|
);
|
|
}
|
|
|
|
|
|
/**
|
|
* Per-repo trust tier from ~/.gstack/gbrain-repo-policy.json, read through
|
|
* the bin/gstack-gbrain-repo-policy CLI (which owns URL normalization and
|
|
* schema migration — do not reimplement either here).
|
|
*
|
|
* The tier was previously enforced only in /sync-gbrain skill prose, so a
|
|
* direct or cron invocation of this script ingested repo code regardless of
|
|
* a `deny`/`read-only` setting — and the egress receipt below cited this
|
|
* chokepoint as consent before it existed (#2140 sync path). This check
|
|
* closes both gaps.
|
|
*
|
|
* Fail-open ONLY when no policy store exists (nothing was ever set — same
|
|
* behavior as before for every non-policy user, and skips the subprocess).
|
|
* Fail-closed ("error") when a store exists but can't be read: a policy the
|
|
* user set must not be silently bypassed by a broken store or missing jq.
|
|
*
|
|
* Reads through the shared lib/gbrain-repo-policy-client.ts (same client as
|
|
* the code-intelligence consent veto — the two gates can never drift, and
|
|
* win32 gets the invoke-via-bash path). A spawn failure is still fail-closed
|
|
* but says so, instead of the misleading "store could not be read".
|
|
*/
|
|
export function repoPolicyTier(url: string | null): "read-write" | "read-only" | "deny" | "unset" | "error" {
|
|
const res = sharedRepoPolicyTier(url, process.env);
|
|
if (res.error === "spawn-failed") {
|
|
process.stderr.write(
|
|
"[gstack-gbrain-sync] the repo-policy helper could not be spawned (bash missing from PATH?) — " +
|
|
"refusing ingest rather than bypassing a possibly-set policy\n",
|
|
);
|
|
return "error";
|
|
}
|
|
if (res.error) return "error";
|
|
return res.tier === "none" ? "unset" : res.tier;
|
|
}
|
|
|
|
// Bounded tail of a gbrain child's stderr: enough for the failure summary's
|
|
// last line without buffering a long code walk's output (spawnSync's 1 MiB
|
|
// maxBuffer turned a chatty walk into ENOBUFS).
|
|
const GBRAIN_STDERR_TAIL_BYTES = 8 * 1024;
|
|
// gstack's minimum gbrain (bin/gstack-gbrain-install MIN_GBRAIN_VERSION);
|
|
// `sync --no-pull` exists in every release since 0.2.0.
|
|
const MIN_GBRAIN_FOR_NO_PULL = "0.20.0";
|
|
|
|
export interface GbrainStreamResult {
|
|
status: number | null;
|
|
timedOut: boolean;
|
|
stderrTail: string;
|
|
}
|
|
|
|
/** Run gbrain, live-forwarding stderr unless quiet, keeping a bounded tail. */
|
|
export function runGbrainStreaming(
|
|
gbrainArgs: string[],
|
|
opts: { quiet: boolean; timeoutMs: number; env?: NodeJS.ProcessEnv },
|
|
): Promise<GbrainStreamResult> {
|
|
return new Promise((resolve) => {
|
|
const child = spawnGbrainAsync(gbrainArgs, {
|
|
stdio: ["ignore", opts.quiet ? "ignore" : "inherit", "pipe"],
|
|
baseEnv: opts.env,
|
|
});
|
|
let tail = "";
|
|
let timedOut = false;
|
|
let settled = false;
|
|
const finish = (status: number | null) => {
|
|
if (settled) return;
|
|
settled = true;
|
|
clearTimeout(timer);
|
|
resolve({ status: timedOut ? null : status, timedOut, stderrTail: tail });
|
|
};
|
|
const timer = setTimeout(() => {
|
|
timedOut = true;
|
|
child.kill("SIGTERM");
|
|
}, opts.timeoutMs);
|
|
child.stderr?.on("data", (chunk: Buffer) => {
|
|
if (!opts.quiet) process.stderr.write(chunk);
|
|
tail = (tail + chunk.toString("utf-8")).slice(-GBRAIN_STDERR_TAIL_BYTES);
|
|
});
|
|
child.on("error", (err) => {
|
|
tail = `${tail}\n${err.message}`.slice(-GBRAIN_STDERR_TAIL_BYTES);
|
|
finish(null);
|
|
});
|
|
child.on("close", (status) => finish(status));
|
|
});
|
|
}
|
|
|
|
export function gbrainFailureSummary(gbrainArgs: string[], run: GbrainStreamResult): string {
|
|
if (gbrainArgs.includes("--no-pull") && /unknown (?:flag|option|argument)[^\n]*--no-pull/i.test(run.stderrTail)) {
|
|
return `gbrain rejected --no-pull; upgrade gbrain to >= ${MIN_GBRAIN_FOR_NO_PULL} (gstack never lets gbrain pull your checkout)`;
|
|
}
|
|
const lastLine = run.stderrTail.split("\n").map((l) => l.trim()).filter(Boolean).pop()?.slice(0, 300);
|
|
const outcome = run.timedOut ? "timed out" : `exited ${run.status}`;
|
|
return `gbrain ${gbrainArgs.join(" ")} ${outcome}${lastLine ? `: ${lastLine}` : ""}`;
|
|
}
|
|
|
|
async function runCodeImport(args: CliArgs): Promise<StageResult> {
|
|
const t0 = Date.now();
|
|
const root = repoRoot();
|
|
if (!root) {
|
|
return { name: "code", ran: false, ok: true, duration_ms: 0, summary: "skipped (not in git repo)" };
|
|
}
|
|
|
|
// A preview must not spawn gbrain. Trust a syntactically-valid local pin
|
|
// there; a real run confirms its registered path before using it.
|
|
const gbrainEnv = args.mode === "dry-run" ? undefined : buildGbrainEnv({ announce: !args.quiet });
|
|
const pinnedSourceId = args.mode === "dry-run"
|
|
? readPinnedSourceId(root)
|
|
: existingPinnedSourceId(root, gbrainEnv);
|
|
const sourceId = pinnedSourceId ?? deriveCodeSourceId(root);
|
|
|
|
// Per-repo trust tier — checked BEFORE the dry-run branch so previews report
|
|
// the refusal honestly instead of claiming they would sync.
|
|
const policyUrl = originUrl();
|
|
const tier = repoPolicyTier(policyUrl);
|
|
if (tier === "read-only") {
|
|
// Honoring an explicit user setting (search allowed, page writes never) is
|
|
// a clean skip, not a stage failure — code ingest writes pages.
|
|
return {
|
|
name: "code",
|
|
ran: false,
|
|
ok: true,
|
|
duration_ms: Date.now() - t0,
|
|
summary: `skipped — repo policy is read-only for ${policyUrl} (code ingest writes pages). Change with: gstack-gbrain-repo-policy set ${policyUrl} read-write`,
|
|
detail: { source_id: sourceId, source_path: root, status: "skipped-policy-read-only" },
|
|
};
|
|
}
|
|
if (tier === "deny" || tier === "error") {
|
|
const why = tier === "deny"
|
|
? `repo policy is deny for ${policyUrl} — no gbrain ingest for this repo. Change with: gstack-gbrain-repo-policy set ${policyUrl} read-write`
|
|
: "repo policy store exists but could not be read (gstack-gbrain-repo-policy get failed) — refusing ingest rather than bypassing a set policy";
|
|
return {
|
|
name: "code",
|
|
ran: true,
|
|
ok: false,
|
|
duration_ms: Date.now() - t0,
|
|
summary: `refused: ${why}`,
|
|
detail: { source_id: sourceId, source_path: root, status: tier === "deny" ? "refused-policy-deny" : "refused-policy-unreadable" },
|
|
};
|
|
}
|
|
|
|
// dry-run preview always shows the would-do steps, regardless of local
|
|
// engine state. Useful for "what would /sync-gbrain do" without probing
|
|
// the engine.
|
|
if (args.mode === "dry-run") {
|
|
return {
|
|
name: "code",
|
|
ran: false,
|
|
ok: true,
|
|
duration_ms: 0,
|
|
summary: pinnedSourceId
|
|
? `would: gbrain sync --strategy code --source ${sourceId} --no-pull; gbrain sources attach ${sourceId}`
|
|
: `would: gbrain sources add ${sourceId} --path ${root} --federated; gbrain sync --strategy code --source ${sourceId} --no-pull; gbrain sources attach ${sourceId}`,
|
|
detail: { source_id: sourceId, source_path: root, status: "skipped" },
|
|
};
|
|
}
|
|
|
|
// Split-engine pre-flight (per plan D12): when local engine is not ok, SKIP
|
|
// code stage cleanly. Brain-sync stage still runs because it doesn't depend
|
|
// on local engine. The /sync-gbrain Step 1.5 pre-flight surfaces the user
|
|
// remediation message; this skip just keeps the orchestrator from crashing
|
|
// when the local DB is dead. Skipped on --dry-run (above) since dry-run
|
|
// never actually probes anything.
|
|
const localStatus = localEngineStatus({ noCache: false });
|
|
if (localStatus === "timeout") {
|
|
warnProbeTimeout("code"); // #1964: slow-but-healthy — proceed
|
|
} else if (localStatus !== "ok") {
|
|
return skipStageForLocalStatus("code", localStatus, t0);
|
|
}
|
|
|
|
// Step 0a: Best-effort cleanup of pre-pathhash legacy source (v1.x form).
|
|
// Earlier /sync-gbrain versions registered `gstack-code-<slug>` (no path
|
|
// suffix). On a multi-worktree repo, those collapsed onto a single id
|
|
// with last-sync-wins. Federated search would return stale duplicate
|
|
// hits forever if we left the orphan in place. Remove the legacy id once
|
|
// here so users don't accumulate orphans.
|
|
// Failure is non-fatal — we still register the new id below.
|
|
// gbrainEnv seeds DATABASE_URL from gbrain's config so this stage works
|
|
// inside Next.js / Prisma / Rails projects with their own .env.local
|
|
// (codex review #7 — bug fix is wider than #1508 as filed).
|
|
const legacyId = deriveLegacyCodeSourceId(root);
|
|
let legacyRemoved = false;
|
|
if (!pinnedSourceId && legacyId !== sourceId) {
|
|
// #1734: route through the data-loss guards (autopilot + source-safety).
|
|
const rm = safeSourcesRemove(legacyId, gbrainEnv);
|
|
if (rm.skipped && !args.quiet) {
|
|
console.error(`[sync:code] legacy-source cleanup skipped: ${rm.reason}`);
|
|
}
|
|
if (rm.removed) legacyRemoved = true;
|
|
}
|
|
|
|
// Step 0b: Hostname-fold migration (#1414).
|
|
// Before #1468 the source id hashed only the absolute repo path. After the
|
|
// hostname fold, every existing user has a legacy id that no longer matches
|
|
// what deriveCodeSourceId produces. Try rename-in-place first (preserves
|
|
// pages); fall back to register-new → sync-OK → remove-old. Path-drift
|
|
// (user moved the repo, etc.) skips migration with a warning.
|
|
const pathOnlyHashLegacyId = derivePathOnlyHashLegacyId(root);
|
|
const migration = pinnedSourceId
|
|
? { kind: "none", reason: "no-legacy-source" } as const
|
|
: planHostnameFoldMigration(root, sourceId, pathOnlyHashLegacyId, gbrainEnv);
|
|
if (migration.kind === "skipped-path-drift" && !args.quiet) {
|
|
console.error(
|
|
`[sync:code] hostname-fold migration skipped: legacy source ${migration.oldId} `
|
|
+ `points at ${migration.oldPath}, current repo is ${migration.currentPath}. `
|
|
+ `Clean up manually with: gbrain sources remove ${migration.oldId} --confirm-destructive`,
|
|
);
|
|
} else if (migration.kind === "renamed" && !args.quiet) {
|
|
console.error(`[sync:code] hostname-fold migration: renamed ${migration.oldId} → ${migration.newId} (pages preserved)`);
|
|
}
|
|
|
|
// Step 1: Ensure generated sources are registered. A confirmed explicit pin
|
|
// belongs to the user: its realpath was checked above, so never remove/add it
|
|
// merely because the registered spelling differs (e.g. a symlinked checkout).
|
|
let registered = false;
|
|
if (!pinnedSourceId) {
|
|
try {
|
|
const result = await ensureSourceRegistered(sourceId, root, { federated: true, env: gbrainEnv });
|
|
registered = result.changed;
|
|
} catch (err) {
|
|
return {
|
|
name: "code",
|
|
ran: true,
|
|
ok: false,
|
|
duration_ms: Date.now() - t0,
|
|
summary: `source registration failed: ${(err as Error).message}`,
|
|
detail: { source_id: sourceId, source_path: root, status: "failed" },
|
|
};
|
|
}
|
|
}
|
|
|
|
// Step 2: Always run the page-creating file walk first, then (for --full)
|
|
// a full re-embed.
|
|
//
|
|
// `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. The page-creating walk is `sync --strategy
|
|
// code`, so --full must run it FIRST, then reindex-code, to honor the
|
|
// documented "full walk + reindex" contract for both fresh and populated
|
|
// sources.
|
|
const codeTimeoutMs = resolveStageTimeoutMs(
|
|
process.env.GSTACK_SYNC_CODE_TIMEOUT_MS,
|
|
"GSTACK_SYNC_CODE_TIMEOUT_MS",
|
|
);
|
|
|
|
// #1734 guards, checked immediately before the destructive walk (E8):
|
|
// - autopilot active → refuse (the race that wiped a working tree).
|
|
// - URL-managed source → the walk can auto-reclone (rm-rf); require
|
|
// --allow-reclone. Both surface a visible reason and fail the stage so the
|
|
// verdict shows ERR rather than silently skipping protection.
|
|
const apBeforeWalk = detectAutopilot(gbrainEnv);
|
|
if (apBeforeWalk.active) {
|
|
return {
|
|
name: "code", ran: true, ok: false, duration_ms: Date.now() - t0,
|
|
summary: `refused: gbrain autopilot active (${apBeforeWalk.signal}). Stop autopilot, then re-run /sync-gbrain.`,
|
|
detail: { source_id: sourceId, source_path: root, status: "refused-autopilot" },
|
|
};
|
|
}
|
|
const reclone = decideCodeSync(sourceId, gbrainEnv, args.allowReclone);
|
|
if (!reclone.allow) {
|
|
return {
|
|
name: "code", ran: true, ok: false, duration_ms: Date.now() - t0,
|
|
summary: `refused: ${reclone.reason}`,
|
|
detail: { source_id: sourceId, source_path: root, status: "refused-reclone" },
|
|
};
|
|
}
|
|
|
|
// Egress receipt BEFORE the code walk (fail-closed): the walk ships repo
|
|
// content to the user's gbrain DB, which may be a remote Postgres. The
|
|
// gbrain subprocess owns the wire bytes, so the receipt is content-free
|
|
// (destination + payload class only; sha256 null).
|
|
try {
|
|
writeReceipt({
|
|
sink: "gbrain-sync",
|
|
host: "gbrain-db (user-configured DATABASE_URL)",
|
|
payloadClass: `repo-code-index source=${sourceId} (sent by gbrain subprocess)`,
|
|
bytes: 0,
|
|
sha256: null,
|
|
consent: "gbrain setup consent + per-repo policy chokepoint (repoPolicyTier)",
|
|
});
|
|
} catch (err) {
|
|
return {
|
|
name: "code", ran: true, ok: false, duration_ms: Date.now() - t0,
|
|
summary: `EGRESS_RECEIPT_FAILED: ${(err as Error).message} — code sync refused`,
|
|
detail: { source_id: sourceId, source_path: root, status: "refused-egress-receipt" },
|
|
};
|
|
}
|
|
|
|
// `--full` must do a FULL walk, not a delta one.
|
|
//
|
|
// A bare `sync --strategy code` is incremental: it only revisits files that
|
|
// changed since the source's checkpoint. So a file missed at the ORIGINAL
|
|
// import is never revisited and stays invisible indefinitely — and the
|
|
// reindex-code pass below cannot rescue it, because it re-chunks pages that
|
|
// already exist and never walks the filesystem (the same property the comment
|
|
// above already relies on).
|
|
//
|
|
// The failure is silent: no error, no warning, and the verdict block still
|
|
// reports OK while `gbrain search` and `gbrain code-def` answer out of a
|
|
// partial index. It presents as "gbrain is weak at code questions" rather
|
|
// than "the index is incomplete", which is what makes it hard to spot.
|
|
//
|
|
// --yes because this is spawned non-interactively; a full walk otherwise
|
|
// prompts to confirm the import cost.
|
|
//
|
|
// --no-pull always (#2985): gstack indexes the user's working checkout and
|
|
// never wants gbrain to pull or rebase it, and managed gbrain (>= 0.51)
|
|
// refuses `sync` without it. Every supported gbrain accepts the flag.
|
|
const walkArgs = ["sync", "--strategy", "code", "--source", sourceId, "--no-pull"];
|
|
if (args.mode === "full") walkArgs.push("--full", "--yes");
|
|
const walkResult = await runGbrainStreaming(walkArgs, { quiet: args.quiet, timeoutMs: codeTimeoutMs, env: gbrainEnv });
|
|
|
|
if (walkResult.status !== 0) {
|
|
return {
|
|
name: "code",
|
|
ran: true,
|
|
ok: false,
|
|
duration_ms: Date.now() - t0,
|
|
summary: gbrainFailureSummary(walkArgs, walkResult),
|
|
detail: { source_id: sourceId, source_path: root, status: "failed" },
|
|
};
|
|
}
|
|
|
|
if (args.mode === "full") {
|
|
const reindexArgs = ["reindex-code", "--source", sourceId, "--yes"];
|
|
const reindexResult = await runGbrainStreaming(reindexArgs, { quiet: args.quiet, timeoutMs: codeTimeoutMs, env: gbrainEnv });
|
|
|
|
if (reindexResult.status !== 0) {
|
|
return {
|
|
name: "code",
|
|
ran: true,
|
|
ok: false,
|
|
duration_ms: Date.now() - t0,
|
|
summary: gbrainFailureSummary(reindexArgs, reindexResult),
|
|
detail: { source_id: sourceId, source_path: root, status: "failed" },
|
|
};
|
|
}
|
|
}
|
|
|
|
// Step 3: Pin this worktree's CWD to the source via .gbrain-source. Subsequent
|
|
// gbrain code-def / code-refs / code-callers calls from anywhere under <root>
|
|
// route to this source by default — no --source flag needed.
|
|
//
|
|
// If attach fails the whole flow has a silent correctness problem: sync
|
|
// succeeded but unqualified `gbrain code-def` from this worktree will hit
|
|
// the wrong/default source. Treat it as a stage failure (ok=false) so the
|
|
// verdict block surfaces ERR and the user knows to retry rather than
|
|
// trusting stale results.
|
|
const attach = spawnGbrain(["sources", "attach", sourceId], {
|
|
timeout: 10_000,
|
|
cwd: root,
|
|
baseEnv: gbrainEnv,
|
|
});
|
|
const pageCount = sourcePageCount(sourceId, gbrainEnv);
|
|
|
|
// Step 4: Deferred hostname-fold cleanup.
|
|
// Only remove the pre-#1468 path-only-hash source NOW that the new source
|
|
// has registered + synced + has pages. Removing before sync would create a
|
|
// data-loss window if sync failed; removing without a page-count check would
|
|
// wipe pages when sync silently no-op'd. This is the codex-review-flagged
|
|
// safety: register → sync → verify → THEN delete.
|
|
let hostnameLegacyRemoved = false;
|
|
if (migration.kind === "pending-cleanup" && pageCount !== null && pageCount > 0) {
|
|
hostnameLegacyRemoved = removeOrphanedSource(migration.oldId, gbrainEnv);
|
|
if (hostnameLegacyRemoved && !args.quiet) {
|
|
console.error(`[sync:code] hostname-fold migration: removed legacy ${migration.oldId} after new source sync verified (page_count=${pageCount})`);
|
|
}
|
|
}
|
|
|
|
const legacyParts: string[] = [];
|
|
if (legacyRemoved) legacyParts.push(`removed legacy ${legacyId}`);
|
|
if (migration.kind === "renamed") legacyParts.push(`renamed ${migration.oldId}→${migration.newId}`);
|
|
if (hostnameLegacyRemoved) legacyParts.push(`removed pre-hostname-fold ${migration.kind === "pending-cleanup" ? migration.oldId : ""}`);
|
|
const legacyNote = legacyParts.length > 0 ? `, ${legacyParts.join(", ")}` : "";
|
|
const baseSummary = `${registered ? "registered + " : ""}synced ${sourceId} (page_count=${pageCount ?? "unknown"}${legacyNote})`;
|
|
|
|
if (attach.status !== 0) {
|
|
const reason = (attach.stderr || attach.stdout || "").trim().split("\n").pop() || `exit ${attach.status}`;
|
|
return {
|
|
name: "code",
|
|
ran: true,
|
|
ok: false,
|
|
duration_ms: Date.now() - t0,
|
|
summary: `${baseSummary}; attach FAILED (${reason}) — code-def queries from this worktree will hit the default source until /sync-gbrain succeeds`,
|
|
detail: {
|
|
source_id: sourceId,
|
|
source_path: root,
|
|
page_count: pageCount,
|
|
last_imported: new Date().toISOString(),
|
|
status: "failed",
|
|
},
|
|
};
|
|
}
|
|
|
|
// v1.29.0.0 changelog promised the per-worktree pin would be ignored in the
|
|
// consuming repo, but the change actually only added .gbrain-source to
|
|
// gstack's own .gitignore. Without the consumer-side entry, the pin gets
|
|
// committed and breaks the per-worktree promise: Conductor sibling worktrees
|
|
// step on each other's pin every time anyone commits (#1384).
|
|
ensureGbrainSourceGitignored(root);
|
|
|
|
return {
|
|
name: "code",
|
|
ran: true,
|
|
ok: true,
|
|
duration_ms: Date.now() - t0,
|
|
summary: baseSummary,
|
|
detail: {
|
|
source_id: sourceId,
|
|
source_path: root,
|
|
page_count: pageCount,
|
|
last_imported: new Date().toISOString(),
|
|
status: "ok",
|
|
},
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Ensure `.gbrain-source` is ignored in the consumer repo.
|
|
*
|
|
* Idempotent. A trimmed `.gbrain-source` line is enough, and so is a
|
|
* pattern in a tracked `.gitignore` that already ignores the pin (an
|
|
* ignore-everything `*` covers it); appending a second line would dirty that
|
|
* tracked file. Global excludes and `.git/info/exclude` do not count: they
|
|
* are invisible to teammates' clones, which would then commit the pin
|
|
* (#1384). Wraps writes in try/catch so a read-only checkout or weird
|
|
* perms logs a warning and lets the rest of the sync continue.
|
|
*/
|
|
function trackedGitignoreIgnoresGbrainSource(root: string): boolean {
|
|
const check = spawnSync("git", ["-C", root, "-c", "core.excludesFile=", "check-ignore", "-v", "-z", "--stdin"], {
|
|
input: ".gbrain-source\0",
|
|
encoding: "utf-8",
|
|
timeout: 5_000,
|
|
});
|
|
if (check.status !== 0) return false;
|
|
const [source = "", , pattern = ""] = check.stdout.split("\0");
|
|
if (pattern.startsWith("!") || basename(source) !== ".gitignore" || isAbsolute(source)) return false;
|
|
const tracked = spawnSync("git", ["-C", root, "ls-files", "--error-unmatch", "--", `:(top,literal)${source}`], {
|
|
stdio: "ignore",
|
|
timeout: 5_000,
|
|
});
|
|
return tracked.status === 0;
|
|
}
|
|
|
|
export function ensureGbrainSourceGitignored(root: string): void {
|
|
const gitignorePath = join(root, ".gitignore");
|
|
try {
|
|
let existing = "";
|
|
try {
|
|
existing = readFileSync(gitignorePath, "utf-8");
|
|
} catch {
|
|
// No .gitignore yet — we'll create it.
|
|
}
|
|
const alreadyIgnored = existing
|
|
.split("\n")
|
|
.some((line) => line.trim() === ".gbrain-source");
|
|
if (alreadyIgnored || trackedGitignoreIgnoresGbrainSource(root)) {
|
|
return;
|
|
}
|
|
const sep = existing.length > 0 && !existing.endsWith("\n") ? "\n" : "";
|
|
writeFileSync(gitignorePath, existing + sep + ".gbrain-source\n");
|
|
} catch (err) {
|
|
const msg = err instanceof Error ? err.message : String(err);
|
|
console.warn(
|
|
`[sync:code] could not add .gbrain-source to ${gitignorePath}: ${msg}`,
|
|
);
|
|
}
|
|
}
|
|
|
|
function printTranscriptNotice(args: CliArgs, consent: TranscriptPolicy, selection: ConsentedSelection, why: string): void {
|
|
const notice = transcriptConsentNotice(consent, args.quiet, selection.override ? why : null) ?? transcriptConsentSummary(consent, args.quiet);
|
|
if (notice) console.error(notice);
|
|
}
|
|
|
|
function runMemoryIngest(args: CliArgs, previous: SyncState, consent: TranscriptPolicy): StageResult {
|
|
const t0 = Date.now();
|
|
|
|
if (args.mode === "dry-run") {
|
|
const raw = selectMemorySources(args.memorySources, process.env, false);
|
|
const preview = applyTranscriptConsent(raw, consent);
|
|
printTranscriptNotice(args, consent, preview, raw.why);
|
|
const flag = preview.sources ? ` --sources ${preview.sources.join(",")}` : "";
|
|
return { name: "memory", ran: false, ok: true, duration_ms: 0, summary: `would: gstack-memory-ingest --probe${flag} (${preview.why})` };
|
|
}
|
|
|
|
// Split-engine pre-flight (per plan D12). gstack-memory-ingest shells out
|
|
// to `gbrain import` which targets the LOCAL engine. When that engine is
|
|
// not ok, SKIP cleanly so brain-sync (the only stage that doesn't depend
|
|
// on local engine) still runs.
|
|
const localStatus = localEngineStatus({ noCache: false });
|
|
if (localStatus === "timeout") {
|
|
warnProbeTimeout("memory"); // #1964: slow-but-healthy — proceed
|
|
} else if (localStatus !== "ok") {
|
|
return skipStageForLocalStatus("memory", localStatus, t0);
|
|
}
|
|
|
|
// Resume detection (#1611 / plan D1 + C1). If a previous run hit the
|
|
// timeout and gbrain left ~/.gbrain/import-checkpoint.json plus its staging
|
|
// dir on disk, signal the grandchild via env so it skips the prepare phase
|
|
// and lets `gbrain import` resume from processedIndex+1 against the same
|
|
// staging dir. If the staging dir is gone (disk pressure cleanup, OS
|
|
// reboot, user manual cleanup), warn and fall through to a fresh restage.
|
|
const childEnv = buildGbrainEnv({ announce: false });
|
|
const raw = selectMemorySources(args.memorySources, childEnv, true);
|
|
const selection = applyTranscriptConsent(raw, consent);
|
|
const selected = selection.selected;
|
|
const consentRecord = transcriptConsentRecord(consent, selection.override);
|
|
printTranscriptNotice(args, consent, selection, raw.why);
|
|
let resume = decideResume();
|
|
if (resume.kind === "resume") {
|
|
// The staging dir holds whatever the checkpointed run selected under its
|
|
// transcript consent; resuming it under a different selection or consent
|
|
// would import pages the user excluded. Runs recorded before #2922 walked
|
|
// every type; runs recorded before the consent record walked the 90-day
|
|
// transcript window.
|
|
const prevStage = previous.last_stages?.find((st) => st.name === "memory");
|
|
const staged = prevStage?.memory_sources ?? [...MEMORY_INGEST_TYPES];
|
|
const prevConsent: TranscriptConsentRecord = prevStage?.transcript_consent ?? { mode: "recent", window: "recent" };
|
|
if ([...staged].sort().join(",") !== [...selected].sort().join(",")) {
|
|
console.error(
|
|
`[sync:memory] memory source selection changed since the checkpointed run (${staged.join(",")} → ${selected.join(",")}); restaging from scratch.`,
|
|
);
|
|
resume = { kind: "no-checkpoint" };
|
|
}
|
|
if (
|
|
prevConsent.mode !== consentRecord.mode ||
|
|
prevConsent.window !== consentRecord.window ||
|
|
prevConsent.cutoff !== consentRecord.cutoff ||
|
|
prevConsent.repos_hash !== consentRecord.repos_hash
|
|
) {
|
|
console.error(
|
|
`gbrain-sync: transcript consent changed since the interrupted import (${prevConsent.mode} → ${consentRecord.mode}); restaging memory from scratch once.`,
|
|
);
|
|
resume = { kind: "no-checkpoint" };
|
|
}
|
|
}
|
|
if (resume.kind === "resume") {
|
|
console.error(
|
|
`[sync:memory] resuming from gbrain checkpoint (${resume.processedIndex}/${resume.totalFiles} files staged at ${resume.stagingDir})`,
|
|
);
|
|
childEnv.GSTACK_INGEST_RESUME_DIR = resume.stagingDir;
|
|
} else if (resume.kind === "stale-staging-missing") {
|
|
// The reason distinguishes "actually gone" (disk cleanup / reboot) from
|
|
// "refused as unowned" (#1802 poison: the path may still exist on disk).
|
|
// Logging "gone" for a refused poison path misdirects incident diagnosis.
|
|
const why = resume.reason
|
|
? `staging dir not usable: ${resume.reason}`
|
|
: `staging dir ${resume.stagingDir} gone`;
|
|
console.error(
|
|
`[sync:memory] previous checkpoint stale (${why}), restaging from scratch. ` +
|
|
`Remove ~/.gbrain/import-checkpoint.json to silence.`,
|
|
);
|
|
}
|
|
|
|
const ingestPath = join(import.meta.dir, "gstack-memory-ingest.ts");
|
|
const ingestArgs = ["run", ingestPath];
|
|
if (args.mode === "full") ingestArgs.push("--bulk");
|
|
else ingestArgs.push("--incremental");
|
|
if (args.mode === "full" && consent.affirmative && consent.window !== "recent") ingestArgs.push("--all-history");
|
|
if (args.quiet) ingestArgs.push("--quiet");
|
|
if (selection.sources) ingestArgs.push("--sources", selection.sources.join(","));
|
|
if (!args.quiet) console.error(`[sync:memory] sources: ${selected.join(",")} (${selection.why})`);
|
|
|
|
// Thread the seeded env into the bun grandchild (codex review #7 — the
|
|
// .env.local footgun affects gstack-memory-ingest.ts too, not just the
|
|
// direct gbrain spawns in this file). The grandchild calls gbrain import
|
|
// internally and must see the DATABASE_URL from gbrain's own config.
|
|
const memoryTimeoutMs = resolveStageTimeoutMs(
|
|
process.env.GSTACK_SYNC_MEMORY_TIMEOUT_MS,
|
|
"GSTACK_SYNC_MEMORY_TIMEOUT_MS",
|
|
);
|
|
const result = spawnSync(process.execPath, ingestArgs, {
|
|
encoding: "utf-8",
|
|
timeout: memoryTimeoutMs,
|
|
env: childEnv,
|
|
});
|
|
|
|
// D6: parse [memory-ingest] lines from the child's stderr. ERR-prefixed
|
|
// lines indicate a system-level failure (gbrain crashed or CLI missing)
|
|
// and the child exits non-zero. Per-file failures are summarized in the
|
|
// last non-ERR [memory-ingest] line but do NOT make the verdict ERR.
|
|
const stderrLines = (result.stderr || "").split("\n");
|
|
const memLines = stderrLines.filter((l) => l.includes("[memory-ingest]"));
|
|
const errLine = memLines.find((l) => l.includes("[memory-ingest] ERR"));
|
|
const lastMemLine = memLines.slice(-1)[0];
|
|
const rawSummary = errLine || lastMemLine || "ingest pass complete";
|
|
// Strip the "[memory-ingest] " prefix and any leading "ERR: " for cleaner
|
|
// verdict output. The orchestrator's own formatStage will prefix with OK/ERR.
|
|
const summary = rawSummary
|
|
.replace(/^.*\[memory-ingest\]\s*/, "")
|
|
.replace(/^ERR:\s*/, "");
|
|
|
|
const ok = result.status === 0;
|
|
return {
|
|
name: "memory",
|
|
ran: true,
|
|
ok,
|
|
duration_ms: Date.now() - t0,
|
|
summary: ok
|
|
? summary
|
|
: `${summary}${result.status === null ? " (killed by signal / timeout)" : ` (exit ${result.status})`}`,
|
|
memory_sources: selected,
|
|
transcript_consent: consentRecord,
|
|
};
|
|
}
|
|
|
|
export const NO_BASH_SUMMARY =
|
|
"skipped (no bash found; set GSTACK_GIT_BASH (old name: GSTACK_BASH) to your Git bash.exe. PowerShell: [Environment]::SetEnvironmentVariable('GSTACK_GIT_BASH', 'C:\\Program Files\\Git\\bin\\bash.exe', 'User'), then restart Claude Code; or add it to the \"env\" block of ~/.claude/settings.json)";
|
|
|
|
function runBrainSyncPush(args: CliArgs): StageResult {
|
|
const t0 = Date.now();
|
|
|
|
if (args.mode === "dry-run") {
|
|
return { name: "brain-sync", ran: false, ok: true, duration_ms: 0, summary: "would: gstack-brain-sync --discover-new --once" };
|
|
}
|
|
|
|
const brainSyncPath = join(import.meta.dir, "gstack-brain-sync");
|
|
if (!existsSync(brainSyncPath)) {
|
|
return { name: "brain-sync", ran: false, ok: true, duration_ms: 0, summary: "skipped (gstack-brain-sync not installed)" };
|
|
}
|
|
|
|
// gstack-brain-sync is a bash shebang script, so it needs an INTERPRETER, not
|
|
// a shell. #1731 gave it `shell: NEEDS_SHELL_ON_WINDOWS`, which is right for
|
|
// the gbrain.cmd shim and useless here: cmd.exe resolves .cmd/.bat via PATHEXT
|
|
// and rejects an extension-less shebang script outright ("is not recognized as
|
|
// an internal or external command"), so this stage failed on EVERY Windows run
|
|
// while looking like a single red line in an otherwise green report. See
|
|
// bashScriptInvocation.
|
|
const discover = bashScriptInvocation(brainSyncPath, ["--discover-new"]);
|
|
const once = bashScriptInvocation(brainSyncPath, ["--once"]);
|
|
if (!discover || !once) {
|
|
return {
|
|
name: "brain-sync",
|
|
ran: false,
|
|
ok: true,
|
|
duration_ms: Date.now() - t0,
|
|
summary: NO_BASH_SUMMARY,
|
|
};
|
|
}
|
|
|
|
const stdio: "ignore"[] | ("ignore" | "inherit")[] = args.quiet
|
|
? ["ignore", "ignore", "ignore"]
|
|
: ["ignore", "inherit", "inherit"];
|
|
|
|
spawnSync(discover.cmd, discover.argv, { stdio, timeout: 60 * 1000, shell: discover.shell });
|
|
const result = spawnSync(once.cmd, once.argv, { stdio, timeout: 60 * 1000, shell: once.shell });
|
|
|
|
if (result.status !== 0) {
|
|
return { name: "brain-sync", ran: true, ok: false, duration_ms: Date.now() - t0, summary: `gstack-brain-sync exited ${result.status}` };
|
|
}
|
|
return { name: "brain-sync", ran: true, duration_ms: Date.now() - t0, ...brainSyncIndexVerdict() };
|
|
}
|
|
|
|
/**
|
|
* Decide whether the dream (call-graph build) cycle should run. PURE so the
|
|
* gate matrix is unit-testable without spawning a real ~35-min dream.
|
|
*
|
|
* - explicit --dream → always run (force), regardless of cycle state / --no-code.
|
|
* - --full → run ONLY when the call graph was never built (cycle === "never"),
|
|
* and only when not opted out via --no-dream / --no-code. "completed" skips
|
|
* (edges already built); "unknown" skips (a flaky doctor must not trigger a
|
|
* surprise 35-min cycle — see gbrain-doctor-overstrict).
|
|
* - everything else → skip.
|
|
*
|
|
* `cycle` is only consulted on the --full auto path; pass null when forcing.
|
|
*/
|
|
export function shouldRunDream(args: CliArgs, cycle: CycleStatus | null): boolean {
|
|
if (args.dream) return true;
|
|
if (args.mode === "full" && !args.noDream && !args.noCode) {
|
|
return cycle === "never";
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Run `gbrain dream` — the brain-global maintenance cycle whose
|
|
* resolve_symbol_edges phase builds the call graph. Runs LOCK-FREE (called
|
|
* after the sync lock releases) so it never freezes sibling worktrees; the
|
|
* `.dream-in-progress` marker dedupes concurrent dreams instead.
|
|
*
|
|
* Returns a StageResult (never throws). SKIP (ran:false, ok:true) for: dry-run
|
|
* preview, local engine not ok, or a fresh marker present. ERR (ran:true,
|
|
* ok:false) for: non-zero/timeout exit, or a spawn-setup failure (missing
|
|
* binary / malformed env) — a broken install must be visible, not disguised as
|
|
* optional maintenance.
|
|
*/
|
|
/**
|
|
* A7: detected, not assumed. gbrain validates --phase values while parsing,
|
|
* before --help prints, so a gbrain without the phase exits non-zero and one
|
|
* without --phase prints help that never mentions it.
|
|
*/
|
|
export function gbrainSupportsSymbolEdgePhase(env: NodeJS.ProcessEnv = process.env): boolean {
|
|
const r = spawnGbrain(["dream", "--phase", "resolve_symbol_edges", "--help"], { baseEnv: env, timeout: 15_000 });
|
|
return r.status === 0 && /--phase\b/.test(`${r.stdout || ""}${r.stderr || ""}`);
|
|
}
|
|
|
|
export async function runDream(args: CliArgs): Promise<StageResult> {
|
|
const t0 = Date.now();
|
|
|
|
if (args.mode === "dry-run") {
|
|
const root = repoRoot();
|
|
const sourceId = root ? readPinnedSourceId(root) ?? deriveCodeSourceId(root) : null;
|
|
return {
|
|
name: "dream",
|
|
ran: false,
|
|
ok: true,
|
|
duration_ms: 0,
|
|
summary: sourceId
|
|
? `would: gbrain dream --source ${sourceId} --phase resolve_symbol_edges (build this source's call graph; skipped if gbrain cannot scope the phase)`
|
|
: "would: gbrain dream --phase resolve_symbol_edges (call-graph build; skipped if gbrain cannot scope the phase)",
|
|
};
|
|
}
|
|
|
|
const gbrainEnv = buildGbrainEnv({ announce: !args.quiet });
|
|
const localStatus = localEngineStatus({ noCache: false });
|
|
if (localStatus === "timeout") {
|
|
warnProbeTimeout("dream"); // #1964: slow-but-healthy — proceed
|
|
} else if (localStatus !== "ok") {
|
|
return skipStageForLocalStatus("dream", localStatus, t0);
|
|
}
|
|
|
|
// Dedupe concurrent dreams across worktrees (lock-free path).
|
|
if (!acquireDreamMarker()) {
|
|
const pid = dreamMarkerPid();
|
|
return {
|
|
name: "dream",
|
|
ran: false,
|
|
ok: true,
|
|
duration_ms: Date.now() - t0,
|
|
summary: `dream already running${pid !== null ? ` (pid ${pid})` : ""} — skipped`,
|
|
};
|
|
}
|
|
|
|
try {
|
|
const dreamTimeoutMs = resolveStageTimeoutMs(
|
|
process.env.GSTACK_SYNC_DREAM_TIMEOUT_MS,
|
|
"GSTACK_SYNC_DREAM_TIMEOUT_MS",
|
|
DEFAULT_DREAM_TIMEOUT_MS,
|
|
);
|
|
|
|
// Scope the cycle to THIS worktree's code source: `gbrain dream --source <id>`.
|
|
// Verified empirically (not just from `gbrain --help`): plain `gbrain dream`
|
|
// cycles the brain's default source and never runs the source-scoped `extract`
|
|
// phase for our code source, so the call graph for the pinned source stays
|
|
// empty. `gbrain dream --source <id>` runs the per-source cycle (the form
|
|
// `gbrain doctor` recommends for stale sources) and is what actually populates
|
|
// code-callers/code-callees for this worktree. Falls back to plain `dream`
|
|
// only when we can't derive the source id (not in a git repo).
|
|
const root = repoRoot();
|
|
const sourceId = root ? resolveCodeSourceId(root, gbrainEnv) : null;
|
|
// A7 (#2783): the call graph needs only the resolve_symbol_edges phase. A
|
|
// full `gbrain dream` runs every maintenance phase, LLM ones included
|
|
// (~35 min). Scope it when the installed gbrain can; never fall back to
|
|
// the full cycle on its own.
|
|
if (!gbrainSupportsSymbolEdgePhase()) {
|
|
return {
|
|
name: "dream",
|
|
ran: false,
|
|
ok: true,
|
|
duration_ms: Date.now() - t0,
|
|
summary:
|
|
"skipped — the installed gbrain cannot run only the resolve_symbol_edges phase, and the full dream cycle " +
|
|
`costs about 35 minutes (LLM phases). Upgrade with gstack-gbrain-install, or run it yourself: gbrain dream${sourceId ? ` --source ${sourceId}` : ""}`,
|
|
};
|
|
}
|
|
const dreamArgs = sourceId
|
|
? ["dream", "--source", sourceId, "--phase", "resolve_symbol_edges"]
|
|
: ["dream", "--phase", "resolve_symbol_edges"];
|
|
|
|
// spawnGbrain seeds DATABASE_URL from gbrain's config via buildGbrainEnv.
|
|
//
|
|
// We CAPTURE output (pipe) rather than inherit because `gbrain dream` exits 0
|
|
// even when it SKIPS the cycle — when another cycle already holds gbrain's own
|
|
// DB lock (e.g. a running `gbrain autopilot`), it prints "Skipped: another
|
|
// cycle is already running. (locked)" and exits 0. Trusting the exit code
|
|
// alone would falsely report "call graph built". Trade-off: no live streaming
|
|
// for a long cycle; we echo the captured output afterward instead.
|
|
if (!args.quiet) {
|
|
process.stderr.write("[dream] running gbrain cycle (call-graph build; this can take a few minutes)...\n");
|
|
}
|
|
let result: ReturnType<typeof spawnGbrain>;
|
|
try {
|
|
result = spawnGbrain(dreamArgs, {
|
|
stdio: ["ignore", "pipe", "pipe"],
|
|
timeout: dreamTimeoutMs,
|
|
baseEnv: process.env,
|
|
announce: !args.quiet,
|
|
});
|
|
} catch (err) {
|
|
// Spawn-setup failure (missing binary, bad env): ERR, not a benign skip.
|
|
return {
|
|
name: "dream",
|
|
ran: true,
|
|
ok: false,
|
|
duration_ms: Date.now() - t0,
|
|
summary: `gbrain dream failed to start: ${(err as Error).message}`,
|
|
};
|
|
}
|
|
|
|
if (result.error) {
|
|
const e = result.error as NodeJS.ErrnoException;
|
|
const why = e.code === "ENOENT" ? "gbrain not on PATH" : e.message;
|
|
return {
|
|
name: "dream",
|
|
ran: true,
|
|
ok: false,
|
|
duration_ms: Date.now() - t0,
|
|
summary: `gbrain dream failed to start: ${why}`,
|
|
};
|
|
}
|
|
|
|
const out = `${result.stdout || ""}${result.stderr || ""}`;
|
|
if (!args.quiet && out.trim()) {
|
|
process.stderr.write(out.endsWith("\n") ? out : `${out}\n`);
|
|
}
|
|
|
|
if (result.status !== 0) {
|
|
return {
|
|
name: "dream",
|
|
ran: true,
|
|
ok: false,
|
|
duration_ms: Date.now() - t0,
|
|
summary: `gbrain dream exited ${result.status === null ? "null (killed by signal / timeout)" : result.status}`,
|
|
};
|
|
}
|
|
|
|
// Exit 0 but the cycle was SKIPPED because gbrain's own lock is held by
|
|
// another cycle (typically `gbrain autopilot`). Report SKIP, not "built" —
|
|
// the graph builds on that other cycle, not this invocation.
|
|
if (/already running|\block(?:ed)?\b|Skipped:/i.test(out)) {
|
|
return {
|
|
name: "dream",
|
|
ran: false,
|
|
ok: true,
|
|
duration_ms: Date.now() - t0,
|
|
summary: "skipped — a gbrain cycle is already running (e.g. autopilot); the call graph builds on that cycle",
|
|
};
|
|
}
|
|
|
|
// Exit 0 and the cycle actually ran. Parse the cycle's OWN output to report
|
|
// the truth, not a flat "built": `gbrain dream` exits 0 even when the call
|
|
// graph could not be built, and a misleading "built" turns a multi-minute
|
|
// no-op into a silent dead end. gbrain only surfaces these conditions in the
|
|
// cycle log (there is no pre-flight pack-capability query as of 0.41.x), so
|
|
// string-matching the log is the available signal; an unrecognized log
|
|
// degrades to the generic success summary below.
|
|
const dreamWarn = classifyDreamOutcome(out);
|
|
if (dreamWarn) {
|
|
return {
|
|
name: "dream",
|
|
ran: true,
|
|
ok: true,
|
|
warn: true,
|
|
duration_ms: Date.now() - t0,
|
|
summary: dreamWarn,
|
|
};
|
|
}
|
|
|
|
const edges = parseResolvedEdges(out);
|
|
return {
|
|
name: "dream",
|
|
ran: true,
|
|
ok: true,
|
|
duration_ms: Date.now() - t0,
|
|
summary:
|
|
edges !== null
|
|
? `call graph built (${edges} edge${edges === 1 ? "" : "s"} resolved)`
|
|
: "call graph built (resolve_symbol_edges complete)",
|
|
};
|
|
} finally {
|
|
releaseDreamMarker();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Parse `<n>` from a `resolve_symbol_edges ... resolved <n>` cycle-log line.
|
|
* Returns null when the line is absent (older gbrain / different pack). The
|
|
* `[^\n]*?` is newline-bounded so it matches the `✓ resolve_symbol_edges ...`
|
|
* summary line, not the bracketed `[cycle.resolve_symbol_edges] start` markers.
|
|
*/
|
|
export function parseResolvedEdges(out: string): number | null {
|
|
const m = out.match(/resolve_symbol_edges\b[^\n]*?\bresolved\s+(\d+)/i);
|
|
return m ? parseInt(m[1], 10) : null;
|
|
}
|
|
|
|
/**
|
|
* Inspect a completed (exit-0) `gbrain dream` log and return a WARN summary when
|
|
* the cycle ran but could not actually build the call graph. Returns null on the
|
|
* happy path (caller emits the normal "call graph built" summary). Order matters:
|
|
* the pack-capability gap is the most actionable, so it wins over a 0-edge count
|
|
* (both appear together when the pack lacks the code-symbol phase).
|
|
*/
|
|
export function classifyDreamOutcome(out: string): string | null {
|
|
// The active schema pack doesn't declare the code-symbol extraction phase, so
|
|
// no symbols are extracted and resolve_symbol_edges has nothing to match.
|
|
// #2341: anchor the match to a GRAPH phase. The bare phrase false-positived
|
|
// on every base-pack brain — gbrain's only emitters of "active pack does not
|
|
// declare this phase" are the CONTENT phases (extract_atoms,
|
|
// synthesize_concepts), which base packs legitimately skip while
|
|
// resolve_symbol_edges still runs and builds the graph. Matching the bare
|
|
// phrase sent users pack-churning ("switch schema packs") for nothing and
|
|
// masked real graph bugs behind a wrong diagnosis.
|
|
if (/(resolve_symbol_edges|extract_code_symbols)[^\n]*does not declare/i.test(out)) {
|
|
return (
|
|
"dream ran, but this source's schema pack does not extract code symbols, " +
|
|
"so the call graph stays empty. Switch this source to a code-aware schema " +
|
|
"pack (`gbrain schema use <pack>`) to enable code-callers/code-callees."
|
|
);
|
|
}
|
|
// The embed phase failed for a missing key; symbols can't index without it.
|
|
if (/embed phase failed/i.test(out) || /requires\s+\S*_API_KEY/i.test(out)) {
|
|
return (
|
|
"dream ran, but the embed phase failed (missing embedding API key), so " +
|
|
"symbols won't index. Ensure the embedding provider's key is set for the " +
|
|
"gbrain process, then re-run /sync-gbrain --dream."
|
|
);
|
|
}
|
|
// Cycle ran and embedded fine, but matched zero call-graph edges.
|
|
if (parseResolvedEdges(out) === 0) {
|
|
return "dream ran but resolved 0 call-graph edges (no code symbols matched for this source yet).";
|
|
}
|
|
return null;
|
|
}
|
|
|
|
// ── State file ─────────────────────────────────────────────────────────────
|
|
|
|
interface SyncState {
|
|
schema_version: 1;
|
|
last_writer: string;
|
|
last_sync?: string;
|
|
last_full_sync?: string;
|
|
last_stages?: StageResult[];
|
|
/** A6: gstack code sources whose path was missing, with consecutive-miss counts. */
|
|
unavailable_sources?: Record<string, UnavailableSource>;
|
|
/** A6: what this machine knew about each code source it synced (ownership proof). */
|
|
code_sources?: Record<string, CodeSourceRecord>;
|
|
}
|
|
|
|
function loadSyncState(): SyncState {
|
|
if (!existsSync(STATE_PATH)) {
|
|
return { schema_version: 1, last_writer: "gstack-gbrain-sync" };
|
|
}
|
|
try {
|
|
const raw = JSON.parse(readFileSync(STATE_PATH, "utf-8")) as SyncState;
|
|
if (raw.schema_version === 1) return raw;
|
|
} catch {
|
|
// fall through
|
|
}
|
|
return { schema_version: 1, last_writer: "gstack-gbrain-sync" };
|
|
}
|
|
|
|
/**
|
|
* Atomic state file write per /plan-eng-review D1: write tmp file then rename.
|
|
* rename(2) is atomic on POSIX filesystems.
|
|
*/
|
|
function saveSyncState(state: SyncState): void {
|
|
try {
|
|
mkdirSync(dirname(STATE_PATH), { recursive: true });
|
|
const tmp = `${STATE_PATH}.tmp.${process.pid}`;
|
|
writeFileSync(tmp, JSON.stringify(state, null, 2), "utf-8");
|
|
renameSync(tmp, STATE_PATH);
|
|
} catch {
|
|
// non-fatal
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Persist the dream stage result with read-modify-write semantics.
|
|
*
|
|
* Dream runs AFTER the sync lock releases, so a sibling worktree may have
|
|
* written newer state in the meantime. Overwriting the whole file with our
|
|
* pre-dream snapshot + dream result would clobber that sibling's sync. Instead
|
|
* re-read the CURRENT state, replace only the `dream` entry in last_stages, and
|
|
* atomic-rename. (Atomic rename alone isn't race-safe; the re-read + targeted
|
|
* merge is what prevents the clobber.)
|
|
*/
|
|
function mergeDreamIntoState(dream: StageResult): void {
|
|
const fresh = loadSyncState();
|
|
const others = (fresh.last_stages || []).filter((s) => s.name !== "dream");
|
|
fresh.last_stages = [...others, dream];
|
|
fresh.last_sync = new Date().toISOString();
|
|
saveSyncState(fresh);
|
|
}
|
|
|
|
// ── Output ─────────────────────────────────────────────────────────────────
|
|
|
|
export function formatStage(s: StageResult): string {
|
|
const status = !s.ran ? "SKIP" : !s.ok ? "ERR" : s.warn ? "WARN" : "OK";
|
|
const dur = s.duration_ms > 0 ? ` (${(s.duration_ms / 1000).toFixed(1)}s)` : "";
|
|
return ` ${status.padEnd(5)} ${s.name.padEnd(12)} ${s.summary}${dur}`;
|
|
}
|
|
|
|
// ── Main ───────────────────────────────────────────────────────────────────
|
|
|
|
// ── Gone worktree sources (A6, #2688) ──────────────────────────────────────
|
|
|
|
function gitCommonDir(root: string): string | null {
|
|
const r = spawnSync("git", ["-C", root, "rev-parse", "--path-format=absolute", "--git-common-dir"], { encoding: "utf-8", timeout: 5000 });
|
|
return r.status === 0 && r.stdout.trim() ? r.stdout.trim() : null;
|
|
}
|
|
|
|
function currentCodeSourceRecord(): CodeSourceRecord | null {
|
|
const root = repoRoot();
|
|
return root ? { path: root, remote: canonicalizeRemote(originUrl()), git_common_dir: gitCommonDir(root) } : null;
|
|
}
|
|
|
|
/** Remember which repository a synced code source belongs to (the prune ownership proof). */
|
|
function recordCodeSource(state: SyncState, stages: StageResult[]): void {
|
|
const code = stages.find((s) => s.name === "code" && s.ran && s.ok);
|
|
const id = code?.detail?.source_id;
|
|
const record = currentCodeSourceRecord();
|
|
if (!id || !record || code?.detail?.source_path !== record.path) return;
|
|
(state.code_sources ??= {})[id] = record;
|
|
}
|
|
|
|
/**
|
|
* Count consecutive syncs that find a gstack code source's path missing, and
|
|
* say so once per source. gstack never removes such a source on its own.
|
|
*/
|
|
function trackGoneSources(state: SyncState, quiet: boolean): void {
|
|
const raw = execGbrainJson(["sources", "list", "--json"], { timeout: 10_000 });
|
|
if (raw === null) return;
|
|
const { next, newlyUnavailable } = trackUnavailableSources(parseSourcesList(raw), state.unavailable_sources ?? {}, existsSync, new Date().toISOString());
|
|
state.unavailable_sources = next;
|
|
for (const id of newlyUnavailable) {
|
|
console.error(
|
|
`[gbrain-sync] gbrain source ${id}: path unavailable (${next[id].path}); gstack skips it. ` +
|
|
`If that worktree was deleted, review removal with: gstack-gbrain-sync --prune-gone-worktrees --dry-run`,
|
|
);
|
|
}
|
|
if (!quiet && newlyUnavailable.length === 0 && Object.keys(next).length > 0) {
|
|
console.error(`[gbrain-sync] ${Object.keys(next).length} gbrain source(s) still have an unavailable path (see --prune-gone-worktrees --dry-run)`);
|
|
}
|
|
}
|
|
|
|
function readableDir(p: string): boolean {
|
|
try {
|
|
readdirSync(p);
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
function worktreeListed(gitDir: string, path: string): boolean | null {
|
|
const r = spawnSync("git", [`--git-dir=${gitDir}`, "worktree", "list", "--porcelain"], { encoding: "utf-8", timeout: 10_000 });
|
|
if (r.status !== 0) return null;
|
|
return r.stdout.split("\n").some((line) => line === `worktree ${path}`);
|
|
}
|
|
|
|
/**
|
|
* `--prune-gone-worktrees`: remove gstack code sources whose worktree is
|
|
* provably gone (lib/gbrain-sources.ts decidePrune). Prints the plan first;
|
|
* with --dry-run that is all it does. Each removal re-checks the path right
|
|
* before removing and is logged to ~/.gstack/.gbrain-prune.log.
|
|
*/
|
|
function pruneGoneWorktrees(dryRun: boolean): number {
|
|
const raw = execGbrainJson(["sources", "list", "--json"], { timeout: 10_000 });
|
|
if (raw === null) {
|
|
console.error("[prune] gbrain sources list failed; nothing removed. Fix: run /setup-gbrain, then retry.");
|
|
return 1;
|
|
}
|
|
if (!dryRun && !acquireLock()) {
|
|
console.error(`[prune] another /sync-gbrain is running (lock at ${LOCK_PATH}); nothing removed.`);
|
|
return 2;
|
|
}
|
|
try {
|
|
const state = loadSyncState();
|
|
const ctx = {
|
|
unavailable: state.unavailable_sources ?? {},
|
|
records: state.code_sources ?? {},
|
|
current: currentCodeSourceRecord(),
|
|
deriveId: deriveCodeSourceId,
|
|
exists: existsSync,
|
|
readableDir,
|
|
worktreeListed,
|
|
};
|
|
const rows = parseSourcesList(raw).filter((r) => r.id?.startsWith("gstack-code-") && r.local_path && !existsSync(r.local_path));
|
|
if (rows.length === 0) {
|
|
console.log("[prune] no gstack code source has a missing path; nothing to do.");
|
|
return 0;
|
|
}
|
|
const plan = rows.map((r) => ({ id: r.id!, path: r.local_path!, ...decidePrune(r.id!, r.local_path!, ctx) }));
|
|
for (const p of plan) console.log(`[prune]${dryRun ? " (dry run)" : ""} ${p.remove ? "would remove" : "keep"} ${p.id} (${p.path}): ${p.reason}`);
|
|
if (dryRun) return 0;
|
|
let failed = 0;
|
|
for (const p of plan.filter((x) => x.remove)) {
|
|
if (existsSync(p.path)) {
|
|
console.log(`[prune] keep ${p.id}: ${p.path} exists again`);
|
|
continue;
|
|
}
|
|
const r = safeSourcesRemove(p.id);
|
|
const line = `${new Date().toISOString()} ${r.removed ? "removed" : "not removed"} ${p.id} ${p.path}: ${r.removed ? p.reason : r.reason}`;
|
|
console.log(`[prune] ${line}`);
|
|
try {
|
|
appendFileSync(join(GSTACK_HOME, ".gbrain-prune.log"), line + "\n");
|
|
} catch {}
|
|
if (r.removed) {
|
|
delete state.unavailable_sources?.[p.id];
|
|
delete state.code_sources?.[p.id];
|
|
} else failed++;
|
|
}
|
|
saveSyncState(state);
|
|
return failed > 0 ? 1 : 0;
|
|
} finally {
|
|
if (!dryRun) releaseLock();
|
|
}
|
|
}
|
|
|
|
async function main(): Promise<void> {
|
|
const args = parseArgs();
|
|
if (args.pruneGone) process.exit(pruneGoneWorktrees(args.mode === "dry-run"));
|
|
// Read once at sync start: a config change made while the sync runs never
|
|
// adds transcripts to this run.
|
|
const consent = args.noMemory ? null : readTranscriptConsent();
|
|
|
|
if (!args.quiet) {
|
|
const engine = detectEngineTier();
|
|
console.error(`[gbrain-sync] mode=${args.mode} engine=${engine.engine}`);
|
|
}
|
|
|
|
// Acquire lock (skip on dry-run since dry-run never writes).
|
|
const needsLock = args.mode !== "dry-run";
|
|
let haveLock = false;
|
|
if (needsLock) {
|
|
haveLock = acquireLock();
|
|
if (!haveLock) {
|
|
console.error(
|
|
`[gbrain-sync] another /sync-gbrain is running (lock at ${LOCK_PATH}). ` +
|
|
`If that process died, the lock auto-clears after 5 min, or remove it manually.`
|
|
);
|
|
process.exit(2);
|
|
}
|
|
}
|
|
|
|
const cleanup = () => {
|
|
if (haveLock) releaseLock();
|
|
};
|
|
process.on("SIGINT", () => { cleanup(); process.exit(130); });
|
|
process.on("SIGTERM", () => { cleanup(); process.exit(143); });
|
|
|
|
let exitCode = 0;
|
|
const stages: StageResult[] = [];
|
|
try {
|
|
const state = loadSyncState();
|
|
|
|
if (!args.noCode) {
|
|
stages.push(await withErrorContext("sync:code", () => runCodeImport(args), "gstack-gbrain-sync"));
|
|
}
|
|
if (!args.noMemory) {
|
|
stages.push(await withErrorContext("sync:memory", () => runMemoryIngest(args, state, consent!), "gstack-gbrain-sync"));
|
|
}
|
|
if (!args.noBrainSync) {
|
|
stages.push(await withErrorContext("sync:brain-sync", () => runBrainSyncPush(args), "gstack-gbrain-sync"));
|
|
}
|
|
|
|
if (args.mode !== "dry-run") {
|
|
state.last_sync = new Date().toISOString();
|
|
if (args.mode === "full") state.last_full_sync = state.last_sync;
|
|
state.last_stages = stages;
|
|
recordCodeSource(state, stages);
|
|
trackGoneSources(state, args.quiet);
|
|
saveSyncState(state);
|
|
}
|
|
|
|
const anyError = stages.some((s) => s.ran && !s.ok);
|
|
exitCode = anyError ? 1 : 0;
|
|
} finally {
|
|
// Release the sync lock BEFORE the dream cycle. Dream is a source-scoped
|
|
// cycle that can run several minutes; holding the machine-wide lock that
|
|
// long would freeze every other worktree's /sync-gbrain. Dream is guarded
|
|
// by its own marker.
|
|
cleanup();
|
|
}
|
|
|
|
// ── Dream (call-graph build) — LOCK-FREE, after the sync lock releases ─────
|
|
let dreamStage: StageResult | null = null;
|
|
if (args.mode === "dry-run") {
|
|
// Preview only; never probes doctor or spawns. `--dry-run` and `--full` are
|
|
// mutually exclusive modes (last one wins in parseArgs), so the only dream
|
|
// preview that applies to a dry-run is the explicit --dream force.
|
|
if (args.dream) {
|
|
dreamStage = await runDream(args);
|
|
}
|
|
} else {
|
|
// Resolve cycle state only on the --full auto path (perf: the steady-state
|
|
// incremental sync never pays a doctor subprocess). Explicit --dream forces.
|
|
let cycle: CycleStatus | null = null;
|
|
let cycleWhy = "not in a git repo";
|
|
if (!args.dream && args.mode === "full" && !args.noDream && !args.noCode) {
|
|
const root = repoRoot();
|
|
const gbrainEnv = buildGbrainEnv({ announce: !args.quiet });
|
|
const read = root ? readCycleStatus(resolveCodeSourceId(root, gbrainEnv), gbrainEnv) : { status: "unknown" as const };
|
|
cycle = read.status;
|
|
cycleWhy = read.why ?? "gbrain doctor did not say whether this source cycled";
|
|
}
|
|
if (shouldRunDream(args, cycle)) {
|
|
dreamStage = await runDream(args);
|
|
mergeDreamIntoState(dreamStage);
|
|
if (dreamStage.ran && !dreamStage.ok) exitCode = 1;
|
|
} else if (cycle === "unknown") {
|
|
// --full wanted to auto-build but doctor couldn't confirm the graph state.
|
|
// Surface a WARN-style SKIP so the user knows to run --dream if needed,
|
|
// rather than silently doing nothing (a flaky doctor must not trigger a
|
|
// surprise 35-min run — gbrain-doctor-overstrict).
|
|
dreamStage = {
|
|
name: "dream",
|
|
ran: false,
|
|
ok: true,
|
|
duration_ms: 0,
|
|
summary: `call-graph state unknown (${cycleWhy}) — run /sync-gbrain --dream if code-callers returns 0`,
|
|
};
|
|
}
|
|
}
|
|
|
|
if (!args.quiet || args.mode === "dry-run") {
|
|
const allStages = dreamStage ? [...stages, dreamStage] : stages;
|
|
console.log(`\ngstack-gbrain-sync (${args.mode}):`);
|
|
for (const s of allStages) console.log(formatStage(s));
|
|
const okCount = allStages.filter((s) => s.ok).length;
|
|
const errCount = allStages.filter((s) => !s.ok && s.ran).length;
|
|
console.log(`\n ${okCount} ok, ${errCount} error, ${allStages.length - okCount - errCount} skipped`);
|
|
const gone = Object.keys(loadSyncState().unavailable_sources ?? {}).length;
|
|
if (gone > 0) {
|
|
console.log(` ${gone} gbrain source(s) have an unavailable path; review with: gstack-gbrain-sync --prune-gone-worktrees --dry-run`);
|
|
}
|
|
}
|
|
|
|
process.exit(exitCode);
|
|
}
|
|
|
|
if (import.meta.main) {
|
|
main().catch((err) => {
|
|
console.error(`gstack-gbrain-sync fatal: ${err instanceof Error ? err.message : String(err)}`);
|
|
releaseLock();
|
|
process.exit(1);
|
|
});
|
|
}
|