Gemini CLI Hook Support (PR #131 Part 3)#158
Open
ahundt wants to merge 5 commits intortk-ai:masterfrom
Open
Conversation
Rust binary replaces 204-line bash script as Claude Code PreToolUse hook. Adds rtk hook claude, rtk run -c, and Windows support via cfg!(windows). Closes rtk-ai#112 (chained commands missed). Based on updated master (70c3786) which includes: - Hook audit mode (rtk-ai#151) - Claude Code agents and skills (d8f4659) - tee raw output feature (rtk-ai#134) Migrated from feat/rust-hooks (571bd86) with conflict resolution for: - src/main.rs: Commands enum (preserved both hook audit + our hook commands) - src/init.rs: Hook registration (integrated both approaches) New files (src/cmd/ module): - mod.rs: Module declarations (10 modules, excluding safety/trash/gemini for PR 1) - hook.rs: Shared hook decision logic (21 tests, 3 safety tests removed for PR 2) - claude_hook.rs: Claude Code JSON protocol handler (18 tests) - lexer.rs: Quote-aware tokenizer (28 tests) - analysis.rs: Chain parsing and shellism detection (10 tests) - builtins.rs: cd/export/pwd/echo/true/false (8 tests) - exec.rs: Command executor with recursion guard (22 tests, safety dispatch removed for PR 2) - filters.rs: Output filter registry (5 tests) - predicates.rs: Context predicates (4 tests) - test_helpers.rs: Test utilities Modified files: - src/main.rs: Added Commands::Run, Commands::Hook, HookCommands enum, routing - src/init.rs: Changed patch_settings_json to use rtk hook claude binary command - hooks/rtk-rewrite.sh: Replaced 204-line bash script with 4-line shim (exec rtk hook claude) - Cargo.toml: Added which = 7 for PATH resolution - INSTALL.md: Added Windows installation section Windows support: - exec.rs:175-176: cfg!(windows) selects cmd /C vs sh -c for shell passthrough - predicates.rs:26: USERPROFILE fallback for Windows home directory - No bash, node, or bun dependency - rtk hook claude is a compiled Rust binary Tests: All 541 tests pass
This was referenced Feb 17, 2026
6 tasks
…commands Replaces stub check_for_hook_inner with full tokenize+native-path dispatch. Adds route_native_command() with replace_first_word/route_pnpm/route_npx helpers to route single parsed commands to optimized RTK subcommands. Chains (&&/||/;) and shellisms still use rtk run -c. No safety integration (PR rtk-ai#157 adds that). Mirrors ~/.claude/hooks/rtk-rewrite.sh routing table. Corrects shell script vitest double-run bug for pnpm vitest run flags.
a0ae712 to
c84955a
Compare
rtk has no `tail` subcommand — routing to "rtk tail" was silently broken (rtk would error "unrecognized subcommand"). Remove the Route entry so the command falls through to `rtk run -c '...'` correctly. Move the log-tailing test cases from test_routing_native_commands (which asserted the broken path) into test_routing_fallbacks_to_rtk_run where they correctly verify the rtk-run-c fallback behavior.
Port tests added during the ROUTES table integration that were missing from the v2 worktree: registry.rs: - 12 classify tests for Python/Go commands (pytest, go×4, ruff×2, pip×3, golangci-lint) that verify PATTERNS/RULES and ROUTES alignment - 11 lookup tests (test_lookup_*, test_no_duplicate_binaries_in_routes, test_lookup_is_o1_consistent) that verify O(1) HashMap routing hook.rs: - Extend test_routing_native_commands from 20 to 47 cases covering all ROUTES entries: docker, kubectl, curl, eslint, tsc, prettier, playwright, prisma, pytest, golangci-lint, ruff, pip, gh variants - Add test_routing_subcommand_filter_fallback (14 cases) verifying that Only[] subcommand filters correctly reject unmatched subcommands Total: 545 → 569 tests (+24)
Add rtk hook gemini for Gemini CLI BeforeTool hook handler. Different wire format from Claude: uses decision/reason fields, hook_event_name/tool_name guards, and run_shell_command matcher. Add rtk init --gemini for Gemini CLI integration with: - RTK.md deployment to ~/.gemini/ - GEMINI.md patching with @RTK.md reference - settings.json hook registration Multi-platform init: --claude (default) and --gemini flags. Both can coexist. Shared infrastructure: patch_settings_shared, patch_instruction_file, remove_hook_from_settings_file. Additive platform selection: rtk init with no flags sets up both Claude Code and Gemini CLI. --claude alone skips Gemini, --gemini alone skips Claude. Tests: 560 total (19 gemini_hook tests)
c84955a to
d2c2dca
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR 131 Part 3: Gemini CLI Hook Support
Branch:
feat/gemini-support-v2| Base:master(stacks on Part 1)Tests: 560 pass | Parallel to: Part 2 (zero file conflicts)
Split from: PR #131
New deps: None
PR: #158
Context
Addresses item 1 from FlorianBruniaux's split request:
FlorianBruniaux said "standalone" but code analysis shows
gemini_hook.rsimports 6 items fromhook.rs(types and functions). This PR depends on PR 1 for the shared hook infrastructure, but is parallel to PR 2 (data safety).Coordination with PR #141: FlorianBruniaux noted overlap with #141's JS-based hook. This PR achieves the same Windows support goal via compiled Rust binary -- no bash, node, or bun. Both PRs wanted cross-platform support; this approach has zero external runtime dependencies.
Merge Sequence
After PR 1 merges: retarget
feat/gemini-support-v2->master, then merge. Can merge before or after PR 2.Summary
Adds Gemini CLI support via
rtk hook geminiandrtk init --gemini. Shares 65% of hook logic with Claude Code -- only the JSON wire format differs.Impact: First multi-platform support. Future platforms (Cursor, Windsurf, etc.) only need a new protocol handler -- 35% code per platform, 65% shared.
rtk hook gemini-- BeforeTool handlerDifferent wire format from Claude:
hook_event_name(must be "BeforeTool") +tool_name(must be "run_shell_command")decision/reason/updated_input(notpermissionDecision/updatedInput)decision: "deny"works (unlike Claude bug #4669)rtk init --gemini-- SetupPatches
~/.gemini/settings.json, creates~/.gemini/GEMINI.mdwith@RTK.mdreference.Manual setup:
Multi-platform init logic
rtk initrtk init --claudertk init --geminirtk init --claude --geminiShared infrastructure extracted from
init.rs:patch_settings_shared()-- JSON patching for both Claude and Geminipatch_instruction_file()-- Adds @RTK.md reference to CLAUDE.md or GEMINI.mdremove_hook_from_settings_file()-- Uninstall hook entryChanges
6 files changed (+1037, -6)
New:
src/cmd/gemini_hook.rs(490 lines, 19 tests)Modified:
src/cmd/mod.rs(+gemini_hook),src/main.rs(+HookCommands::Gemini, +--gemini/--claude init flags),src/init.rs(+run_gemini(), +uninstall_gemini(), +patch_gemini_settings(), extracted shared functions),INSTALL.md(+Gemini setup),README.md(+Gemini integration section)Review Guide
Focus areas:
src/cmd/gemini_hook.rs-- Gemini protocol compliance, guard checkssrc/init.rs-- Multi-platform initialization, shared function extractionNot Included (Future)
Additional protocol handlers for other LLM CLIs (Cursor, Windsurf, Aider) will follow the same 35% code pattern established here.
Test Plan
cargo test-- 560 tests pass (gemini_hook: 19 new)echo '{"hook_event_name":"BeforeTool","tool_name":"run_shell_command","tool_input":{"command":"git status"}}' | cargo run -- hook gemini-- allow with rewriteecho '{"hook_event_name":"BeforeTool","tool_name":"write_file","tool_input":{"path":"test.txt"}}' | cargo run -- hook gemini-- NoOpinion (exit 0, no output)cargo run -- init --gemini --auto-patch-- settings patchedcargo run -- init-- both platforms configuredRelated PRs (Split from PR #131)
Merge order: Part 1 first → retarget Parts 2 & 3 to
master→ merge in any order