feat: add Antigravity (agy) co-existence support - #341
Conversation
3dcd22d to
fc64e0b
Compare
![claude[bot]](https://avatars.githubusercontent.com/in/1236702?s=60&v=4){kind=small}
| if ! echo "$mcp_list" | grep -q "github"; then | ||
| if [[ -n "${GITHUB_TOKEN:-}" ]]; then | ||
| echo "Installing agy GitHub MCP server..." | ||
| agy mcp add --header "Authorization: Bearer ${GITHUB_TOKEN}" github https://api.githubcopilot.com/mcp/ 2>/dev/null || true |
There was a problem hiding this comment.
[Important] The token value is interpolated into the header at install time, unlike install_claude_mcp_servers (bootstrap.sh:1169), which stores the literal ${GITHUB_TOKEN} placeholder in single quotes precisely so it gets expanded per request. The baked value is also a long-lived credential written in plaintext into the agy config file.
Fails when: the user rotates GITHUB_TOKEN in ~/.extra and re-runs ./bootstrap.sh -f → agy mcp list still contains github, so this block is skipped and agy keeps sending the revoked bearer token → every agy GitHub MCP call 401s, with no path back short of manually removing the server.
If agy supports env placeholders, single-quote the header as the Claude path does; if it does not, consider a remove-then-add on each run so rotation actually takes effect.
| "PreInvocation": [ | ||
| { | ||
| "type": "command", | ||
| "command": "~/.claude/hooks/zj-status.sh working; echo '{}'" |
There was a problem hiding this comment.
[Important] zj-status.sh starts with cat > /dev/null to consume the Claude hook JSON, and that read blocks if the caller neither writes to nor closes stdin. This PR adds the echo "" | pipes in tests/test-hooks.sh because of exactly that hazard (per the PR body: prevent hangs when run in tasks with open stdin). Nothing here guarantees agy pipes JSON and closes the pipe.
Fails when: agy runs the PreInvocation command with an inherited or open stdin (a terminal, or an idle pipe) → cat never sees EOF → the hook never exits and agy blocks before every invocation.
Cheap, unconditional fix: ~/.claude/hooks/zj-status.sh working < /dev/null; echo {} — same for Stop.
| { | ||
| "entries": [ | ||
| { | ||
| "path": "~/.claude/skills" |
There was a problem hiding this comment.
[Suggestion] Two unverified assumptions here and in hooks.json: that agy reads ~/.gemini/config/skills.json and ~/.gemini/config/hooks.json at those exact paths and schemas, and that it expands a leading ~ inside a JSON string value (many tools do not — $HOME or an absolute path is safer). The verification section lists only make targets, and the new bootstrap tests just grep for function names, so nothing in CI or the PR body shows agy actually picking up the skills or firing the hooks. Worth noting a live check in the PR body (skills listed in an agy session, zjstatus flipping to working) — otherwise the whole bridge can be silently inert.
| if ! echo "$mcp_list" | grep -q "obsidian"; then | ||
| echo "Installing agy Obsidian MCP server..." | ||
| if is_gateway_host; then | ||
| agy mcp add obsidian http://localhost:3010/mcp 2>/dev/null || true |
There was a problem hiding this comment.
[Suggestion] 2>/dev/null || true on the agy mcp add calls discards both stderr and the exit status, so a failed registration still prints only "Installing agy Obsidian MCP server..." and the run looks successful. install_claude_mcp_servers lets its claude mcp add calls surface errors. Consider dropping 2>/dev/null, or emitting a Warning: on failure, so broken agy CLI flag syntax is visible rather than silently skipped on every subsequent run.
| mkdir -p "$HOME/.gemini" | ||
| if [[ ! -L "$HOME/.gemini/GEMINI.md" || "$(readlink "$HOME/.gemini/GEMINI.md")" != "$HOME/.claude/CLAUDE.md" ]]; then | ||
| rm -f "$HOME/.gemini/GEMINI.md" | ||
| ln -s "$HOME/.claude/CLAUDE.md" "$HOME/.gemini/GEMINI.md" |
There was a problem hiding this comment.
[Suggestion] ~/.gemini/GEMINI.md points at ~/.claude/CLAUDE.md rather than into the repo, so the find ~ -type l -lname "$DOTFILES_DIR/home/*" sweep in uninstall.sh will not match it. After an uninstall removes ~/.claude/CLAUDE.md, this link is left behind dangling. Adding it to uninstall.sh (or handling it the way cleanup_legacy_configs handles stale links) would keep uninstall complete.
| cask "codex" | ||
|
|
||
| # Google Antigravity CLI | ||
| cask "antigravity-cli" |
There was a problem hiding this comment.
[Suggestion] Worth confirming the cask is actually named antigravity-cli (brew info --cask antigravity-cli). A nonexistent cask degrades gracefully — brew bundle failures are tolerated at bootstrap.sh:1030 — but it would print a warning on every -p run while never installing anything, and prompt_ai_install would still take the agy-installed branch only on machines where it was installed by other means. Also, the added trailing blank line leaves the file ending in two newlines.
| } | ||
|
|
||
| test_symlink_agy_configs_exists() { | ||
| grep -q 'symlink_agy_configs' "$BOOTSTRAP" |
There was a problem hiding this comment.
[Suggestion] These two tests assert only that the function names appear somewhere in bootstrap.sh; they would still pass if the bodies were empty or the calls were never wired into sync_dotfiles. symlink_agy_configs is pure filesystem work, so a behavioral test is cheap: point HOME at a temp dir containing .claude/CLAUDE.md, then assert (a) the link is created, (b) a re-run is a no-op, (c) an existing GEMINI.md with the wrong target gets replaced.
There was a problem hiding this comment.
Code Review — Round 1
Summary
Clean, well-scoped dual-agent bridge: the recursive symlink_dotfiles already handles home/.gemini/config/*.json, the new bootstrap functions mirror their Claude equivalents (including is_gateway_host gating), and the test-hooks.sh stdin fix is applied consistently across every remaining tmux-status.sh / zj-status.sh invocation. Two blocking findings, both in newly added wiring.
Findings
- [Important]
bootstrap.sh:1221— the agy GitHub MCP header interpolates the literalGITHUB_TOKENvalue at install time, where the Claude path (bootstrap.sh:1169) deliberately stores the placeholder for per-request expansion. - [Important]
home/.gemini/config/hooks.json:6— the hook command has no stdin guard, andzj-status.shblocks oncat > /dev/nulluntil EOF. - 5 Suggestions posted inline: agy config path/tilde validation, silenced
agy mcp adderrors, uninstall leaving~/.gemini/GEMINI.mddangling, cask name, grep-only bootstrap tests.
Previously Addressed (Filtered)
None — no prior automated review rounds on this PR.
Verdict
REQUEST_CHANGES — rotating GITHUB_TOKEN in ~/.extra leaves agy sending the revoked bearer token indefinitely, because agy mcp list still reports github so bootstrap skips re-registration; and if agy invokes hooks without closing stdin, zj-status.sh never exits and blocks every agy invocation. Both are one-line fixes.
Automated review by Claude Code
| ln -sf "/tmp/wrong-target" "$fake_home/.gemini/GEMINI.md" | ||
| HOME="$fake_home" symlink_agy_configs >/dev/null | ||
| [[ "$(readlink "$fake_home/.gemini/GEMINI.md")" == "$SCRIPT_DIR/../home/.claude/CLAUDE.md" ]] | ||
| rm -rf "$fake_home" |
There was a problem hiding this comment.
[Important] This test always passes. run_test invokes it as if eval "$cmd", and a command in an if condition disables set -e for the whole call tree — so the bare [[ ]] assertions on lines 320, 321, 326 and 331 do not abort the function when they fail. With no explicit return, the function exit status is that of its last command, rm -rf "$fake_home", which succeeds unconditionally.
This is the hazard the neighbouring tests already document and guard against — test_legacy_cleanup_keeps_live_iterm_profile (line 153) comments "run_test disables set -e" and uses the local ok=0; [[ ... ]] || ok=1; rm -rf "$home"; return $ok pattern for exactly this reason.
Fails when: symlink_agy_configs regresses so it never creates the link (e.g. home/.claude/CLAUDE.md is renamed, so the [[ -f "$target_claude_md" ]] guard goes false) → every assertion in this test fails, execution continues to rm -rf, the function returns 0 → make test-bootstrap prints a passing symlink_agy_configs behavior line and make check stays green while the feature is broken.
Suggested fix, matching the existing pattern: accumulate the assertions into a local ok=0 / || ok=1 variable, then rm -rf "$fake_home" and return $ok.
| } | ||
|
|
||
| _load_symlink_agy_configs() { | ||
| eval "$(sed -n '/^symlink_agy_configs() {/,/^}/p' "$BOOTSTRAP" \ |
There was a problem hiding this comment.
[Suggestion] Related to the finding below, and worth fixing in the same pass: this extractor has no guard for an empty sed result. _run_cleanup_legacy_configs (line 181) does [[ -n "$body" ]] || return 1, with a comment explaining it exists "so a reformatted header fails the negative test loudly instead of passing vacuously on nothing ran".
Here, if the symlink_agy_configs() header is ever reformatted so /^symlink_agy_configs() {/ stops matching, eval "" defines nothing and the later calls fail with command not found. Capturing the body into a variable and checking it is non-empty first would make the reason for that failure obvious rather than a confusing readlink mismatch.
| if ! echo "$mcp_list" | grep -q "github"; then | ||
| echo "Installing agy GitHub MCP server..." | ||
| # shellcheck disable=SC2016 | ||
| agy mcp add --header 'Authorization: Bearer ${GITHUB_TOKEN}' github https://api.githubcopilot.com/mcp/ |
There was a problem hiding this comment.
[Suggestion] Dropping 2>/dev/null || true surfaces errors as round 1 asked, but it also removed the failure tolerance. bootstrap.sh runs under set -euo pipefail (line 2) and sync_dotfiles is called unguarded (line 1408), so a non-zero agy mcp add now aborts the entire run — install_tmux_plugin_manager, init_submodules, the bat/btop/eza/yazi/zellij themes, install_launch_agents, cleanup_legacy_cron and cleanup_legacy_configs all sit after this and would never run, leaving a half-synced machine.
That exposure is real but not new in kind — install_claude_mcp_servers has the identical shape with bare claude mcp add, so this is convention-consistent, which is why it is a Suggestion rather than a blocker. The difference is confidence: claude mcp add syntax is in daily use, whereas nothing in this PR or CI exercises agy mcp add, and this form omits any transport flag where the Claude equivalent needs --transport http for a remote HTTP server. If agy defaults to stdio and rejects a bare URL, this line is the abort.
The middle ground round 1 was pointing at keeps both properties — append || echo " Warning: agy mcp add github failed" so the error is visible without taking down the rest of phase 2. Same for the two Obsidian calls on lines 1241 and 1248.
| { | ||
| "entries": [ | ||
| { | ||
| "path": "~/.claude/skills" |
There was a problem hiding this comment.
[Suggestion] Re-raising from round 1 since it still gates whether any of this works: nothing in the PR body, CI, or the new tests demonstrates that agy actually reads ~/.gemini/config/skills.json and ~/.gemini/config/hooks.json at these paths and schemas, or that it expands a leading ~ inside a JSON string value (many tools do not — $HOME or an absolute path is safer, though an absolute path is awkward to keep portable in a tracked file).
The verification section lists only make targets, all of which are static checks against the repo — none of them can observe agy. If any of the three assumptions is wrong the bridge is silently inert: no error, no skills, no status flip, and nothing here would catch it.
A line in the PR body recording a live check (skills listed in an agy session, zjstatus flipping to the working indicator on invocation) would close this out cheaply. The same applies to the antigravity-cli cask name, which is still unconfirmed from round 1.
There was a problem hiding this comment.
Code Review — Round 2
Summary
Round 1 blocking findings are properly fixed: the agy GitHub MCP header now stores the literal ${GITHUB_TOKEN} placeholder (bootstrap.sh:1228) matching the Claude path, and both hooks.json commands redirect < /dev/null so the cat > /dev/null in zj-status.sh cannot block. The GEMINI.md retarget to $dotfiles_dir/home/.claude/CLAUDE.md is a nice fix — it puts the link inside the uninstall.sh -lname "$DOTFILES_DIR/home/*" sweep, resolving the dangling-link concern at the root rather than patching it.
One blocking finding, in the behavioral test added this round. test_symlink_agy_configs_behavior (tests/test-bootstrap.sh:314) returns the exit status of its trailing rm -rf "$fake_home", so it passes unconditionally regardless of its four assertions. This repo already documents that exact hazard — test_legacy_cleanup_keeps_live_iterm_profile carries the comment "run_test disables set -e" and uses an ok variable to work around it — but the new test does not follow that pattern.
Findings
- [Important]
tests/test-bootstrap.sh:332— the new behavioral test can never fail. - 3 Suggestions posted inline: missing extraction guard in
_load_symlink_agy_configs,set -eabort risk from the now-unguardedagy mcp addcalls, and the still-unverified agy config paths.
Previously Addressed (Filtered)
No "Feedback Addressed" comments were posted, but round 1 findings were verified as fixed in the diff and are not re-raised: token interpolation, hook stdin, uninstall teardown, grep-only tests (now behavioral), Brewfile trailing newline. Two round 1 Suggestions remain open and are re-raised once: the unverified agy config paths/schemas, and the antigravity-cli cask name.
Verdict
REQUEST_CHANGES — the round 2 behavioral test for symlink_agy_configs returns the rm -rf exit status, so the "49/49 passed" figure in the PR body does not actually cover the function the test was added to cover. One-line fix: accumulate the assertions into a status variable and return it after the cleanup, as the neighbouring tests do.
Automated review by Claude Code
|
|
||
| test_symlink_agy_configs_behavior() { | ||
| _load_symlink_agy_configs || return 1 | ||
| local fake_home; fake_home=$(mktemp -d) |
There was a problem hiding this comment.
[Suggestion] Missing the empty-mktemp guard that both neighbouring temp-HOME tests carry. test_legacy_cleanup_reclaims_dangling_iterm_profile (line 142) and test_legacy_cleanup_keeps_live_iterm_profile (line 159) each do [[ -n "$home" ]] || return 1 with the comment "Unguarded, an empty $home makes the paths below absolute (/Library/...), aiming the sandbox at the system tree."
The same reasoning applies verbatim here: if mktemp -d fails, fake_home is empty, run_test has disabled set -e, and the function runs HOME="" symlink_agy_configs, which does mkdir -p "/.gemini" and ln -s ... "/.gemini/GEMINI.md" against the filesystem root. On a CI runner with a writable root that succeeds and leaves a stray link behind; the three readlink assertions then fail, so the test still reports failure, but it has already written outside the sandbox.
A one-line [[ -n "$fake_home" ]] || return 1 after line 319 matches the existing pattern and closes it.
| body=$(sed -n '/^symlink_agy_configs() {/,/^}/p' "$BOOTSTRAP" \ | ||
| | sed -e 's|^\([[:space:]]*\)dotfiles_dir="\$(cd .*|\1dotfiles_dir="${TEST_DOTFILES_DIR:-$SCRIPT_DIR/..}"|') | ||
| [[ -n "$body" ]] || return 1 | ||
| eval "$body" |
There was a problem hiding this comment.
[Suggestion] eval "$body" runs in the caller shell here, so the rewritten symlink_agy_configs (with dotfiles_dir replaced by the TEST_DOTFILES_DIR substitution) is defined globally for every test that runs after this one. _run_cleanup_legacy_configs (line 182) deliberately wraps its eval in a subshell with the comment "eval defines cleanup_legacy_configs globally regardless of nesting, and so do the stubs — scoping them here keeps them out of later tests."
Nothing downstream calls symlink_agy_configs today, so this is inert rather than broken — but it is the one place in the file that departs from a convention the file explains in a comment, and a future test that extracts the real function would silently get this doctored copy instead. Wrapping the eval plus the three call sites in a subshell (as _run_cleanup_legacy_configs does) would keep the two extractors symmetric.
| 8. Installs LaunchAgents (macOS) and cron jobs | ||
| 9. Clears stale symlinks for configs the repo no longer tracks (OpenClaw, spotify-player, iTerm2 dynamic profile) — see `cleanup_legacy_configs` | ||
| 5. Configures Claude Code `settings.local.json` with remote MCP URLs (skipped on gateway host) | ||
| 6. Configures Antigravity (`agy`) bridge configs (`skills.json`, `hooks.json`, `GEMINI.md`) and MCP servers |
There was a problem hiding this comment.
[Suggestion] Two small overstatements in the new docs.
Step 6 says bootstrap "Configures Antigravity (agy) bridge configs (skills.json, hooks.json, GEMINI.md)", but symlink_agy_configs (bootstrap.sh:1193) only handles GEMINI.md. skills.json and hooks.json reach ~/.gemini/config/ via the generic symlink_dotfiles sweep in step 2, exactly like every other file under home/ — which is worth saying explicitly, since it is why the "Adding new configs" recipe below applies to them unchanged and why uninstall.sh reclaims them.
Relatedly, line 106 says "AGENTS.md symlinked to CLAUDE.md in repository roots" (plural). Nothing provisions that per-repo; it is a single symlink committed to this repo root. "in this repo root" would avoid implying a bootstrap step that does not exist.
There was a problem hiding this comment.
Code Review — Round 3
Summary
The round 2 blocker is properly fixed. test_symlink_agy_configs_behavior (tests/test-bootstrap.sh:317) now uses the local ok=0 / || ok=1 / return $ok pattern the neighbouring test_legacy_cleanup_* tests document, so all four assertions are load-bearing, and _load_symlink_agy_configs gained the [[ -n "$body" ]] || return 1 extraction guard so a reformatted function header fails loudly instead of vacuously.
I re-verified the surrounding wiring rather than taking it on trust:
symlink_dotfiles(bootstrap.sh:198) walksfind "$dotfiles_dir/home" -type fwith exclusions only under.claude/, sohome/.gemini/config/{skills,hooks}.jsonare picked up and symlinked to~/.gemini/config/.- The
uninstall.shsweepfind ~ -maxdepth 4 -type l -lname "$DOTFILES_DIR/home/*"reaches~/.gemini/GEMINI.md(depth 2) and~/.gemini/config/*.json(depth 3), so the round 1 dangling-link concern is genuinely closed by the retarget, and thermdircalls are a correct no-op when agy state lives in~/.gemini. - Every
tmux-status.sh/zj-status.shinvocation intests/test-hooks.sh(lines 1194, 1205, 1216, 1227, 1239, 1251, 1277, 1286) now feeds stdin — the fix is complete, not partial. agy mcp add ... || echo " Warning: ..."restoresset -etolerance while keeping failures visible, which is the middle ground round 2 asked for.
Findings
No Critical or Important findings. Three Suggestions posted inline, all on test hygiene and docs:
tests/test-bootstrap.sh:319— the new test omits the[[ -n "$fake_home" ]]guard that the two neighbouring temp-HOMEtests carry with an explanatory comment.tests/test-bootstrap.sh:314—_load_symlink_agy_configsevals into the global shell, unlike_run_cleanup_legacy_configs, which subshells specifically to keep its rewritten definitions out of later tests.CLAUDE.md:57— step 6 and the new Key Components entry each claim slightly more thansymlink_agy_configsand the committedAGENTS.mdactually do.
Previously Addressed (Filtered)
Round 1 and round 2 findings verified fixed in the diff and not re-raised: token interpolation, hook stdin guard, uninstall teardown, grep-only tests, Brewfile.ai trailing newline, the always-passing behavioral test, and the missing extraction guard. The agy mcp add failure-tolerance Suggestion from round 2 is addressed. The antigravity-cli cask name is now confirmed in the PR body (1.1.22).
One Suggestion remains genuinely open and is not re-raised inline, having been posted in both prior rounds: nothing yet demonstrates that agy reads ~/.gemini/config/{skills,hooks}.json at those paths and schemas, or that it expands a leading ~ inside a JSON string value. The PR body Live Verification section now covers agy mcp add and the cask, but not the two bridge config files. If either assumption is wrong the bridge is silently inert. It is non-blocking, and repeating it a third time would be noise rather than signal.
Verdict
APPROVE — no blocking findings. The round 2 blocker is fixed and the fix follows the pattern this repo already documents; everything remaining is polish.
Automated review by Claude Code
| _load_symlink_agy_configs() { | ||
| local body | ||
| body=$(sed -n '/^symlink_agy_configs() {/,/^}/p' "$BOOTSTRAP" \ | ||
| | sed -e 's|^\([[:space:]]*\)dotfiles_dir="\$(cd .*|\1dotfiles_dir="${TEST_DOTFILES_DIR:-$SCRIPT_DIR/..}"|') |
There was a problem hiding this comment.
[Suggestion] Two small things about this rewrite, now that the subshell isolation is in place:
-
TEST_DOTFILES_DIRis never set by any caller in this file, so the default-value branch is a dead knob — theSCRIPT_DIR/..fallback is always what runs. Either drop the override in favour of assigningSCRIPT_DIR/..directly, or setTEST_DOTFILES_DIRfromtest_symlink_agy_configs_behaviorso it actually exercises a second root. -
The rewrite replaces the
pwd -Psubshell with a relative path, so the test asserts the link target isSCRIPT_DIR/../home/.claude/CLAUDE.mdwhile production writes apwd -P-normalized absolute path. That is inherent to substituting the whole line rather than just the value, but it does mean the assertion cannot catch a regression in how the target path is formed — only in its suffix. Feeding a resolved directory throughTEST_DOTFILES_DIR(per point 1) would let the assertion compare absolute paths and close that gap.
| # sync_dotfiles must invoke symlink_agy_configs and install_agy_mcp_servers | ||
| local sync_body | ||
| sync_body=$(sed -n '/^sync_dotfiles()/,/^}/p' "$BOOTSTRAP") | ||
| echo "$sync_body" | grep -v '^\s*#' | grep -q 'symlink_agy_configs' && \ |
There was a problem hiding this comment.
[Suggestion] \s is a GNU-grep extension, not POSIX BRE. Under BSD grep (macOS, the primary target per CLAUDE.md), the pattern ^\s*# matches a line starting with zero-or-more literal s characters followed by # — so tab-indented comments are not filtered and this grep -v is effectively inert there.
It happens not to matter today, because the comment above the calls in sync_dotfiles (# Configure Antigravity (AGY) bridge configs & MCP servers) does not contain either function name. But the filter will not do its job if that comment is ever reworded to name them, and the test would then pass on a sync_dotfiles where both calls had been commented out.
^[[:space:]]*# is portable and matches the bracket-expression style the rest of this file already uses.
| - Session name cached in `$TMPDIR/claude-statusline/` (pre-populated by session-start hook) | ||
|
|
||
| **Antigravity (`agy`) Co-existence** (`home/.gemini/`) - Dual-agent support alongside Claude Code: | ||
| - `AGENTS.md` symlinked to `CLAUDE.md` in repository roots for shared repo guidelines |
There was a problem hiding this comment.
[Suggestion] "in repository roots" (plural) reads as if bootstrap provisions an AGENTS.md symlink in every repo it touches. It does not — this is a single symlink committed at the root of this repo, and test_agents_md_symlink_exists asserts exactly that one file.
Something closer to "AGENTS.md committed at this repo root as a symlink to CLAUDE.md, so agy reads the same repo guidelines" would match what the diff actually does. Same nit as the step 6 wording you already tightened in this commit.
There was a problem hiding this comment.
Code Review — Round 4
Summary
This round (e47a593) is docs and test hygiene only, and it closes all three round 3 Suggestions cleanly:
test_symlink_agy_configs_behaviornow carries the empty-mktempguard that both neighbouring temp-HOME tests carry, so a failedmktemp -dcan no longer turn the trailingrm -rfloose on a path derived from an empty variable.- All three
symlink_agy_configsinvocations moved into subshells, so the sed-rewritten definition no longer leaks into the global test shell where a later test could pick up the mutated function — matching what_run_cleanup_legacy_configsalready does. The|| exit 1inside each subshell keeps the extraction guard load-bearing, and|| ok=1on each keeps the accumulate-and-return pattern intact, so all four assertions still gate the result. - CLAUDE.md step 6 now claims only
GEMINI.mdplus MCP servers (skills.jsonandhooks.jsonarrive via the genericsymlink_dotfileswalk, notsymlink_agy_configs), and the Key Components entry pointsGEMINI.mdathome/.claude/CLAUDE.mdin the repo — which is what the code links, and what makes the uninstall.sh-lnamesweep reclaim it.
I re-checked the bootstrap wiring rather than assuming it was untouched: symlink_agy_configs and install_agy_mcp_servers remain inside the INSTALL_AI block after configure_claude_local_settings; the agy mcp add ... || echo " Warning: ..." calls still keep set -e tolerant while surfacing failures; and the is_gateway_host branch still mirrors the Claude path.
Findings
No Critical or Important findings. Three Suggestions posted inline, all on test and doc precision:
tests/test-bootstrap.sh:312—TEST_DOTFILES_DIRis never set by any caller, and the line-level rewrite dropspwd -P, so the assertions pin an unnormalized path.tests/test-bootstrap.sh:305— the comment filter uses\s, a GNU-grep extension, so it is inert under BSD grep on macOS.CLAUDE.md:106— "in repository roots" reads as if bootstrap createsAGENTS.mdper repo; it is one committed symlink in this repo.
Previously Addressed (Filtered)
Rounds 1-3 findings verified fixed and not re-raised: the literal GITHUB_TOKEN placeholder, the hooks.json stdin guard, uninstall teardown and the dangling GEMINI.md, grep-only bootstrap tests replaced by a behavioral one, the always-passing rm -rf return status, the missing extraction guard, agy mcp add failure tolerance, the antigravity-cli cask name, the mktemp guard, the eval-into-global-shell leak, and the CLAUDE.md overstatements.
Still open and deliberately not re-raised for a fourth time: nothing yet demonstrates that agy reads ~/.gemini/config/skills.json and hooks.json at those paths and schemas, or that it expands a leading tilde and shell syntax inside a JSON command string. If either assumption is wrong the bridge is silently inert rather than broken. It stays non-blocking, and a fourth posting would be noise rather than signal.
Verdict
APPROVE - No blocking findings. Round 3 Suggestions are all addressed, and this round adds no new surface beyond docs and test isolation; everything remaining is polish.
Automated review by Claude Code
1 participant
Summary
Enables dual-agent co-existence between Claude Code and Google Antigravity (
agy), allowing either tool to be used seamlessly without duplicating configurations, rules, skills, or MCP services.Changes
AGENTS.md -> CLAUDE.mdin repository root so both agents read the exact same instructions.~/.gemini/GEMINI.md -> ~/.claude/CLAUDE.mdinbootstrap.sh, pointing directly into the dotfiles repo souninstall.shautomatically reclaims it.home/.gemini/config/skills.jsonpointing to~/.claude/skillsso all current and future skills are discovered by AGY automatically.home/.gemini/config/hooks.jsonmapping AGYPreInvocationandStophooks tozj-status.sh("working" / "waiting"), guarded with< /dev/nullso stdin never blocks.install_agy_mcp_serverstobootstrap.shto provisiongithub(with literal${GITHUB_TOKEN}placeholder) andobsidianMCP servers for AGY matching Claude's setup without riskingset -eaborts.cask "antigravity-cli"toBrewfile.ai..geminidirectories inuninstall.sh.tests/test-hooks.shfortmux-status.shandzj-status.shgraceful degradation tests to prevent hangs when run in tasks with open stdin.tests/test-bootstrap.shverifyingsymlink_agy_configslink creation, idempotency, and stale recovery with proper return status accumulation and extraction guards. UpdateCLAUDE.mdandREADME.md.Verification
Live Verification:
brew info --cask antigravity-cliverified formula:antigravity-cli (Google Antigravity CLI): 1.1.22agy mcp add --header 'Authorization: Bearer ${GITHUB_TOKEN}' github https://api.githubcopilot.com/mcp/verified writing literal${GITHUB_TOKEN}placeholder to~/.gemini/config/mcp_config.jsontest_symlink_agy_configs_behaviorverified behaviorally in sandbox (including intentional mutation test verifying failure detection)Quality Gates:
make lint(shellcheck on all.shfiles)make test(bash & zsh syntax checks)make test-hooks(129/129 passed)make test-bootstrap(53/53 passed)make check(all gates green)