diff options
| author | Enrico Carlesso <enricocarlesso@gmail.com> | 2026-07-24 12:05:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-24 22:05:20 +0300 |
| commit | e9b22084e03880f43d1f1daaf5d9f45c717b77c4 (patch) | |
| tree | 343c3099fcb0b935f857b7eb00df1e4d9c83d609 /src/integration/env.rs | |
| parent | b56baee9d60a002b5d8c0fe74d5032afad27ef30 (diff) | |
feat: add grok cli integration for native session restore (#1807)
* 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 <id>`. 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 <ogulcancelik@gmail.com>
Diffstat (limited to 'src/integration/env.rs')
| -rw-r--r-- | src/integration/env.rs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/integration/env.rs b/src/integration/env.rs index 3cd1b604..2d0feeb0 100644 --- a/src/integration/env.rs +++ b/src/integration/env.rs @@ -17,6 +17,10 @@ pub(crate) const KIMI_CODE_HOME_ENV_VAR: &str = "KIMI_CODE_HOME"; pub(crate) const COPILOT_HOME_ENV_VAR: &str = "COPILOT_HOME"; pub(crate) const QODERCLI_CONFIG_DIR_ENV_VAR: &str = "QODER_CONFIG_DIR"; pub(crate) const CURSOR_CONFIG_DIR_ENV_VAR: &str = "CURSOR_CONFIG_DIR"; +pub(crate) const GROK_CONFIG_DIR_ENV_VAR: &str = "GROK_CONFIG_DIR"; +/// The grok CLI's own config-home override (documented alongside +/// `$GROK_HOME/config.toml` and `$GROK_HOME/auth.json`). +pub(crate) const GROK_HOME_ENV_VAR: &str = "GROK_HOME"; pub(crate) fn apply_pane_base_env(cmd: &mut CommandBuilder) { cmd.env(crate::api::SOCKET_PATH_ENV_VAR, crate::api::socket_path()); @@ -138,6 +142,18 @@ pub(crate) fn mastracode_dir() -> io::Result<PathBuf> { Ok(home_dir()?.join(".mastracode")) } +pub(crate) fn grok_dir() -> io::Result<PathBuf> { + // GROK_CONFIG_DIR is a herdr-level override only (primarily a test + // seam); the grok CLI does not honor it, so it stays first and explicit. + if let Some(value) = std::env::var_os(GROK_CONFIG_DIR_ENV_VAR).filter(|value| !value.is_empty()) + { + return expand_tilde_path(PathBuf::from(value)); + } + // The grok CLI honors GROK_HOME as its config home (config.toml, + // auth.json, hooks/); mirror it so hook installs land where grok looks. + config_dir_from_env_or_home(GROK_HOME_ENV_VAR, &[".grok"]) +} + pub(crate) fn home_dir() -> io::Result<PathBuf> { if let Some(home) = std::env::var_os("HOME").filter(|value| !value.is_empty()) { return Ok(PathBuf::from(home)); |
