From e9b22084e03880f43d1f1daaf5d9f45c717b77c4 Mon Sep 17 00:00:00 2001 From: Enrico Carlesso Date: Fri, 24 Jul 2026 12:05:20 -0700 Subject: feat: add grok cli integration for native session restore (#1807) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add grok cli integration for native session restore tl;dr: adds `herdr integration install grok` (session-identity tier: a SessionStart hook reports the grok session id for native restore; state stays screen-detected via the bundled manifest). Grok merges every ~/.grok/hooks/*.json, so install writes a self-contained hooks/herdr.json registering a SessionStart hook next to hooks/herdr-agent-state.sh, and never touches other hook files. The hook prefers $GROK_SESSION_ID (injected into every grok hook process) and reports through the socket API; herdr:grok is a reserved-native-state source so screen detection stays authoritative. Restore uses `grok --resume `. Additive JSON API change; no protocol bump; the schema artifact is regenerated. refs #1800 * fix: honor GROK_HOME and validate grok hook config in status Review follow-ups: grok_dir now resolves GROK_CONFIG_DIR (herdr test seam) before GROK_HOME (the grok CLI's own config-home override) before ~/.grok, so hook installs land where grok actually looks. Integration status now also validates the herdr-owned hooks/herdr.json next to the hook script — missing, corrupt, or no-longer-referencing configs report the install as outdated instead of masking a hook grok never invokes. refs #1800 * fix: validate the exact grok session hook command in status The config validator matched on a filename substring, so a SessionStart command like `echo herdr-agent-state.sh`, or one invoking the script without the `session` action, still reported the integration as current while grok never delivered a session id. Status now compares against the exact command the installer writes, via a shared builder, and the degradation tests cover both nonfunctional shapes. refs #1800 * fix: require a command-type grok session hook in status validation A config entry carrying the exact generated command under a non-command hook type (e.g. "http") is never executed by grok, so it must not report the integration as current. The validator now also requires type = "command", with a degradation test for the mismatched-type shape. refs #1800 * fix: validate the complete grok hook config refs #1800 --------- Co-authored-by: Ogulcan Celik --- src/integration/targets.rs | 84 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 78 insertions(+), 6 deletions(-) (limited to 'src/integration/targets.rs') diff --git a/src/integration/targets.rs b/src/integration/targets.rs index 488b7032..87000eae 100644 --- a/src/integration/targets.rs +++ b/src/integration/targets.rs @@ -13,7 +13,7 @@ use super::config_edit::{ remove_hook_commands, remove_kimi_config_block, remove_simple_command_hook, }; use super::env::{ - claude_dir, codex_dir, copilot_dir, cursor_dir, devin_dir, droid_dir, hermes_dir, + claude_dir, codex_dir, copilot_dir, cursor_dir, devin_dir, droid_dir, grok_dir, hermes_dir, hermes_plugin_dir, kilo_dir, kimi_dir, mastracode_dir, omp_extension_dir, opencode_dir, pi_extension_dir, qodercli_dir, }; @@ -24,10 +24,11 @@ use super::types::{ ClaudeInstallPaths, ClaudeUninstallResult, CodexInstallPaths, CodexUninstallResult, CopilotInstallPaths, CopilotUninstallResult, CursorInstallPaths, CursorUninstallResult, DevinInstallPaths, DevinUninstallResult, DroidInstallPaths, DroidUninstallResult, - HermesInstallPaths, HermesUninstallResult, KiloInstallPaths, KiloUninstallResult, - KimiInstallPaths, KimiUninstallResult, MastracodeInstallPaths, MastracodeUninstallResult, - OmpInstallPaths, OmpUninstallResult, OpenCodeInstallPaths, OpenCodeUninstallResult, - PiUninstallResult, QodercliInstallPaths, QodercliUninstallResult, + GrokInstallPaths, GrokUninstallResult, HermesInstallPaths, HermesUninstallResult, + KiloInstallPaths, KiloUninstallResult, KimiInstallPaths, KimiUninstallResult, + MastracodeInstallPaths, MastracodeUninstallResult, OmpInstallPaths, OmpUninstallResult, + OpenCodeInstallPaths, OpenCodeUninstallResult, PiUninstallResult, QodercliInstallPaths, + QodercliUninstallResult, }; use super::{ CLAUDE_HOOK_ASSET, CLAUDE_HOOK_INSTALL_NAME, CODEX_HOOK_ASSET, CODEX_HOOK_INSTALL_NAME, @@ -35,7 +36,8 @@ use super::{ COPILOT_REMOVED_LIFECYCLE_HOOK_EVENTS, CURSOR_HOOK_ASSET, CURSOR_HOOK_INSTALL_NAME, DEVIN_HOOK_ASSET, DEVIN_HOOK_EVENTS, DEVIN_HOOK_INSTALL_NAME, DEVIN_REMOVED_LIFECYCLE_HOOK_EVENTS, DROID_HOOK_ASSET, DROID_HOOK_EVENTS, - DROID_HOOK_INSTALL_NAME, DROID_REMOVED_LIFECYCLE_HOOK_EVENTS, HERMES_PLUGIN_INIT_ASSET, + DROID_HOOK_INSTALL_NAME, DROID_REMOVED_LIFECYCLE_HOOK_EVENTS, GROK_HOOK_ASSET, + GROK_HOOK_CONFIG_INSTALL_NAME, GROK_HOOK_INSTALL_NAME, HERMES_PLUGIN_INIT_ASSET, HERMES_PLUGIN_INIT_INSTALL_NAME, HERMES_PLUGIN_MANIFEST_ASSET, HERMES_PLUGIN_MANIFEST_INSTALL_NAME, KILO_PLUGIN_ASSET, KILO_PLUGIN_INSTALL_NAME, KIMI_HOOK_ASSET, KIMI_HOOK_INSTALL_NAME, MASTRACODE_HOOK_ASSET, MASTRACODE_HOOK_EVENTS, @@ -1200,3 +1202,73 @@ pub(crate) fn uninstall_mastracode() -> io::Result { updated_hooks, }) } + +/// The complete Herdr-owned Grok hook config. Installation and status share +/// this value so any config drift is reported as outdated. +pub(crate) fn grok_hook_config(hook_path: &Path) -> Value { + let quoted_hook_path = shell_single_quote(&hook_path.display().to_string()); + let session_command = format!("sh {quoted_hook_path} session"); + json!({ + "hooks": { + "SessionStart": [ + { + "hooks": [ + { + "type": "command", + "command": session_command, + "timeout": 10, + } + ] + } + ] + } + }) +} + +pub(crate) fn install_grok() -> io::Result { + let dir = grok_dir()?; + if !dir.is_dir() { + return Err(io::Error::other(format!( + "grok config directory not found at {}. install grok cli first", + dir.display() + ))); + } + + // Grok merges every `~/.grok/hooks/*.json`, so herdr owns a dedicated + // config file and never edits the user's other hooks. The hook script and + // its config live side by side under `hooks/`. + let hooks_dir = dir.join("hooks"); + fs::create_dir_all(&hooks_dir)?; + + let hook_path = hooks_dir.join(GROK_HOOK_INSTALL_NAME); + fs::write(&hook_path, GROK_HOOK_ASSET)?; + make_executable(&hook_path)?; + + let config_path = hooks_dir.join(GROK_HOOK_CONFIG_INSTALL_NAME); + fs::write( + &config_path, + serde_json::to_string_pretty(&grok_hook_config(&hook_path))?, + )?; + + Ok(GrokInstallPaths { + hook_path, + config_path, + }) +} + +pub(crate) fn uninstall_grok() -> io::Result { + let hooks_dir = grok_dir()?.join("hooks"); + let hook_path = hooks_dir.join(GROK_HOOK_INSTALL_NAME); + let config_path = hooks_dir.join(GROK_HOOK_CONFIG_INSTALL_NAME); + + // herdr owns both files outright, so removal is a straight delete. + let removed_config_file = remove_file_if_exists(&config_path)?; + let removed_hook_file = remove_file_if_exists(&hook_path)?; + + Ok(GrokUninstallResult { + hook_path, + config_path, + removed_hook_file, + removed_config_file, + }) +} -- cgit v1.2.3