Skip to content

feat: add Cursor Agent support via --agent flag#595

Merged
pszymkowiak merged 1 commit intortk-ai:developfrom
moisei:feat/cursor-agent-support
Mar 18, 2026
Merged

feat: add Cursor Agent support via --agent flag#595
pszymkowiak merged 1 commit intortk-ai:developfrom
moisei:feat/cursor-agent-support

Conversation

@moisei
Copy link
Contributor

@moisei moisei commented Mar 14, 2026

Summary

Adds Cursor Agent support to RTK via a new --agent <name> flag on rtk init.

  • rtk init -g --agent cursor installs a preToolUse hook in ~/.cursor/hooks.json that rewrites shell commands through rtk rewrite, using Cursor's JSON format ({permission, updated_input})
  • Works with both Cursor editor and cursor-cli — they share ~/.cursor/hooks.json, so a single installation covers both
  • rtk init --show now reports Cursor hook and hooks.json status alongside existing Claude Code / OpenCode status
  • rtk init -g --uninstall also removes Cursor artifacts (hook script + hooks.json entry)
  • rtk discover adds a note when Cursor hooks are detected, directing users to rtk gain for Cursor session analytics (Cursor transcripts use a text-only format without structured tool_use/tool_result blocks, so discover cannot extract commands from them)

Design decisions

  • --agent is an extensible enum (claude, cursor), not a boolean flag — ready for future agents (Windsurf, Zed, etc.)
  • Additive behavior: --agent cursor installs Cursor hooks ON TOP of the default Claude Code installation. Without --agent, behavior is 100% unchanged.
  • --opencode stays separate for backward compatibility
  • Cursor hook uses preToolUse with matcher: "Shell" and returns updated_input to rewrite commands — functionally identical to Claude Code's PreToolUse but with Cursor's JSON schema

cursor-cli note

The preToolUse hook mechanism is shared between Cursor's editor agent and its CLI agent (cursor-cli). Both read hooks from ~/.cursor/hooks.json, so rtk init -g --agent cursor covers both without any additional setup.

Files changed

File Change
hooks/cursor-rtk-rewrite.sh New: Cursor-format hook script (thin delegator to rtk rewrite)
src/main.rs Add --agent <name> flag with AgentTarget enum
src/init.rs Cursor install/uninstall/show functions, hooks.json patching, unit tests
src/discover/provider.rs Doc comment update noting Cursor limitation
src/discover/report.rs Cursor note in discover output when hook detected

Test plan

  • cargo build — 0 errors
  • cargo test — 899 passed, 0 failed
  • rtk init --help shows --agent with claude and cursor values
  • rtk init -g --agent cursor --auto-patch installs hook + patches hooks.json
  • rtk init --show reports Cursor hook status
  • rtk init -g --uninstall removes Cursor artifacts
  • Cursor agent session with hook active rewrites git statusrtk git status
  • rtk gain --history shows tracked commands from Cursor session

@moisei moisei force-pushed the feat/cursor-agent-support branch from bd25afd to a8a73d4 Compare March 15, 2026 00:01
@moisei moisei changed the title feat: add Cursor IDE support via --agent flag feat: add Cursor Agent support via --agent flag Mar 15, 2026
@pszymkowiak
Copy link
Collaborator

Please retarget this PR to develop instead of master. We use develop as the integration branch — master is for releases only. You can change the base branch in the PR settings. Thanks!

@pszymkowiak pszymkowiak added the wrong-base PR targets master instead of develop label Mar 17, 2026
@moisei moisei changed the base branch from master to develop March 18, 2026 00:43
@pszymkowiak pszymkowiak force-pushed the feat/cursor-agent-support branch from a8a73d4 to 9c8a21b Compare March 18, 2026 15:19
@pszymkowiak
Copy link
Collaborator

@moisei — Rebased your PR on latest develop (which now includes Gemini #573, Codex #377, Copilot #605, and OpenClaw #358).

Resolved merge conflicts in init.rs and main.rs:

  • Added cursor: bool to uninstall() signature (alongside gemini and codex)
  • Updated run() to accept install_cursor parameter
  • --agent cursor works alongside existing --gemini, --codex, --opencode flags
  • Fixed 2 unit tests to match new function signatures

Tested:

  • rtk init -g --agent cursor installs hook + hooks.json correctly
  • 970 tests passing (including Cursor tests)
  • Compiles cleanly

Ready to merge. Thanks for the clean implementation — the --agent enum approach is exactly the right pattern for extensibility!

Add `rtk init -g --agent cursor` to install RTK hooks for Cursor Agent.
Cursor's preToolUse hook supports command rewriting via updated_input,
functionally identical to Claude Code's PreToolUse. Works with both the
Cursor editor and cursor-cli (they share ~/.cursor/hooks.json).

Changes:
- New `--agent <name>` flag (claude|cursor) on `rtk init`, extensible
  for future agents. Default is claude (backward compatible).
- Cursor hook script (hooks/cursor-rtk-rewrite.sh) outputs Cursor's
  JSON format: {permission, updated_input} vs Claude's hookSpecificOutput.
- `rtk init --show` reports Cursor hook and hooks.json status.
- `rtk init -g --uninstall` removes Cursor artifacts.
- `rtk discover` notes that Cursor sessions are tracked via `rtk gain`
  (Cursor transcripts lack structured tool_use/tool_result blocks).
- Unit tests for Cursor hooks.json patching, detection, and removal.

Made-with: Cursor
Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>
@pszymkowiak pszymkowiak force-pushed the feat/cursor-agent-support branch from 9c8a21b to 0a5ec73 Compare March 18, 2026 15:22
@pszymkowiak pszymkowiak merged commit c3917e4 into rtk-ai:develop Mar 18, 2026
@moisei
Copy link
Contributor Author

moisei commented Mar 18, 2026

@pszymkowiak this is great.
what's the release process - how do I know which version contains this change?

@pszymkowiak
Copy link
Collaborator

we add feature to develop then there are tests on develop, then release

@fingon
Copy link

fingon commented Mar 19, 2026

Does @RTK.md really work for you guys? when I run codex --ask-for-approval never "Summarize the current instructions." I do not get RTK instructions there, unless I inline the RTK.md contents to AGENTS.md (at least for global file). (sometimes it says 'it should include RTK.md' but never content of it so it does not really include it. Funnily enough sometimes later it looks for RTK.md in current project directory, which does not work.)

There is open issue about it here: openai/codex#6038

(I tested this commit with develop branch and wondered why rtk gain showed no use)

pszymkowiak added a commit that referenced this pull request Mar 19, 2026
* fix: remove all decorative emojis from CLI output (#687)

* fix: remove decorative emojis from CLI output (#511)

Replace decorative emojis with plain text to reduce token waste.
Keep functional symbols (⚠️ ✓ ❌ ✅ ℹ️) that convey meaning in fewer tokens.

Signed-off-by: Patrick Szymkowiak <patrick@rtk.ai>
Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>

* fix: remove remaining decorative emojis from find_cmd and formatter

Missed in initial emoji cleanup pass: 📁 in find_cmd.rs and parser/formatter.rs

Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>

* fix: remove all decorative emojis from CLI output (#511)

Replace emojis with plain text tokens across all production files
for better LLM compatibility. Test fixtures and external tool
detection patterns (e.g. Black's "All done!") are preserved.

Signed-off-by: Patrick Szymkowiak <patrick@rtk-ai.app>
Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>

* fix: remove last decorative emoji from next_cmd.rs

Remove ⚡ from Next.js Build header, missed in previous passes.

Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>

* fix: remove remaining emojis from gh_cmd.rs and init.rs

Replace production emojis:
- gh_cmd.rs: 🟣→[merged], ⚪→[unknown]/[pending], ⭐→removed, 🔱→removed
- init.rs: ⚪→[--] for "not found" status indicators

Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>

* fix: remove all checkmark emojis from CLI output

Replace ✓ (U+2713) with plain text across 19 files:
- "ok ✓" → "ok" (git add/commit/push/pull)
- "✓ cargo test: ..." → "cargo test: ..." (all tool summaries)
- Preserved ✓ in input detection patterns and test fixtures

LLMs cannot interpret emoji semantics; plain text is clearer.

Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>

---------

Signed-off-by: Patrick Szymkowiak <patrick@rtk.ai>
Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>
Signed-off-by: Patrick Szymkowiak <patrick@rtk-ai.app>

* feat: OpenClaw plugin for transparent exec rewriting (#358)

* feat: add OpenClaw plugin for transparent exec rewriting

Adds an OpenClaw plugin that intercepts exec tool calls via the
before_tool_call hook and rewrites commands to their RTK equivalents.

This is the OpenClaw equivalent of hooks/rtk-rewrite.sh for Claude Code.

The plugin:
- Registers a before_tool_call hook on the exec tool
- Rewrites git, grep, find, ls, gh, docker, kubectl, and test commands
- Guards against rewriting piped/compound commands and heredocs
- Returns properly typed PluginHookBeforeToolCallResult
- Supports enabled/verbose config options

Measured savings: 48-87% token reduction on common commands.

Files:
- openclaw/index.ts — plugin source
- openclaw/openclaw.plugin.json — plugin manifest
- openclaw/README.md — installation and usage docs

* refactor: delegate OpenClaw plugin to rtk rewrite

Replace 60+ hardcoded regex rules with a single call to `rtk rewrite`,
matching the OpenCode plugin pattern (hooks/opencode-rtk.ts).

Benefits:
- Zero maintenance: new RTK filters work automatically
- Single source of truth: rewrite logic in Rust (src/discover/registry.rs)
- 122 → 73 lines, no rule duplication

Also: rebase on develop, fix homepage URL, bump version to 1.0.0.
Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>

* feat: add package.json for npm publishing

Enables `openclaw plugins install @rtk-ai/rtk-rewrite` for OpenClaw users.

Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>

---------

Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>
Co-authored-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>

* feat: add Gemini CLI support via rtk init --gemini (#573)

- Add `rtk hook gemini` command: native Rust hook processor for Gemini CLI
  BeforeTool hooks. Reads JSON from stdin, delegates to `rewrite_command()`
  (single source of truth), outputs Gemini-format JSON response.
- Add `--gemini` flag to `rtk init`: installs hook wrapper script, GEMINI.md,
  and patches ~/.gemini/settings.json with BeforeTool hook entry.
- Add `rtk init -g --gemini --uninstall`: clean removal of all Gemini artifacts.
- 6 unit tests covering hook format, rewrite delegation, and exclusions.

Replaces PR #174 which had too many conflicts after upstream restructuring.

Signed-off-by: Ousama Ben Younes <benyounes.ousama@gmail.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

* feat(init): add Codex CLI support via AGENTS.md + RTK.md workflow (#377)

* feat(init): add Codex CLI support via AGENTS.md + RTK.md workflow

Add --codex mode to rtk init for Codex CLI integration using AGENTS.md + RTK.md, while keeping the newer develop init/opencode flow intact. Includes Codex install/show/uninstall handling, ASCII status output, stricter flag validation, and expanded tests for Codex AGENTS lifecycle and patch-mode rejection.

Signed-off-by: Zacaria <havesomecode@gmail.com>

* docs: fix validation metadata

Signed-off-by: Zacaria <havesomecode@gmail.com>

---------

Signed-off-by: Zacaria <havesomecode@gmail.com>

* feat(copilot): add Copilot hook support (VS Code + CLI) (#605)

Add `rtk hook copilot` command that handles both VS Code Copilot Chat
(updatedInput rewrite) and GitHub Copilot CLI (deny-with-suggestion).

- Auto-detects format: snake_case (VS Code) vs camelCase (Copilot CLI)
- Delegates to `rtk rewrite` (single source of truth)
- 14 hook tests (format detection, rewrite gating, output shape)
- .github/hooks/rtk-rewrite.json for repo-scoped hook config
- .github/copilot-instructions.md for RTK awareness
- Test script: hooks/test-copilot-rtk-rewrite.sh

Rebased on develop (includes Gemini #573, Codex #377, OpenClaw #358).

Original work by @jeziellopes, cleaned up and rebased by maintainer.

Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>
Co-authored-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>

* feat: add Cursor Agent support via --agent flag (#595)

Add `rtk init -g --agent cursor` to install RTK hooks for Cursor Agent.
Cursor's preToolUse hook supports command rewriting via updated_input,
functionally identical to Claude Code's PreToolUse. Works with both the
Cursor editor and cursor-cli (they share ~/.cursor/hooks.json).

Changes:
- New `--agent <name>` flag (claude|cursor) on `rtk init`, extensible
  for future agents. Default is claude (backward compatible).
- Cursor hook script (hooks/cursor-rtk-rewrite.sh) outputs Cursor's
  JSON format: {permission, updated_input} vs Claude's hookSpecificOutput.
- `rtk init --show` reports Cursor hook and hooks.json status.
- `rtk init -g --uninstall` removes Cursor artifacts.
- `rtk discover` notes that Cursor sessions are tracked via `rtk gain`
  (Cursor transcripts lack structured tool_use/tool_result blocks).
- Unit tests for Cursor hooks.json patching, detection, and removal.

Made-with: Cursor

Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>
Co-authored-by: Moisei <1199723+moisei@users.noreply.github.com>

* feat: add Windsurf support via rtk init --agent windsurf (#695) (#697)

Install RTK rules in .windsurfrules (project-scoped) so Cascade
prefixes shell commands with rtk for token savings.

Windsurf hooks don't support command rewriting (only blocking),
so RTK uses the rules-based approach (like Codex with AGENTS.md).

Tested: Windsurf Cascade correctly uses rtk git status after install.

Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>

* feat: add Cline/Roo Code support via rtk init --agent cline (#701) (#702)

Install RTK rules in .clinerules (project-scoped) so Cline
prefixes shell commands with rtk for token savings.

Same rules-based approach as Windsurf and Codex.

Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>

* fix(skill/rtk-triage): increase PR/issue limit to 200 with pagination hint (#717)

* fix(skill/rtk-triage): increase PR/issue limit to 200 with pagination hint

Raise gh pr list limit from 60 to 200 to match gh's max per call.
Add inline comment explaining how to paginate for repos with >200 open PRs.
Update threshold warning from >60 to >200 PRs/issues.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Florian BRUNIAUX <florian@bruniaux.com>

* docs(architecture): update module count to 67 (hook_cmd added in #573)

hook_cmd.rs was added in feat: add Gemini CLI support (#573) but
ARCHITECTURE.md was not updated. Fixes pre-push validation failure.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Florian BRUNIAUX <florian@bruniaux.com>

---------

Signed-off-by: Florian BRUNIAUX <florian@bruniaux.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Signed-off-by: Patrick Szymkowiak <patrick@rtk.ai>
Signed-off-by: Patrick szymkowiak <patrick.szymkowiak@innovtech.eu>
Signed-off-by: Patrick Szymkowiak <patrick@rtk-ai.app>
Signed-off-by: Ousama Ben Younes <benyounes.ousama@gmail.com>
Signed-off-by: Zacaria <havesomecode@gmail.com>
Signed-off-by: Florian BRUNIAUX <florian@bruniaux.com>
Co-authored-by: Alex <a.neyman17@gmail.com>
Co-authored-by: Ben Younes <benyounes.ousama@gmail.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: Zacaria Chtatar <Zacaria@users.noreply.github.com>
Co-authored-by: Jeziel Lopes <jeziellcarvalho@gmail.com>
Co-authored-by: Moisei Rabinovich <moisei@users.noreply.github.com>
Co-authored-by: Moisei <1199723+moisei@users.noreply.github.com>
Co-authored-by: Florian BRUNIAUX <florian@bruniaux.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

wrong-base PR targets master instead of develop

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants