aboutsummaryrefslogtreecommitdiff
path: root/src/integration/registry.rs
diff options
context:
space:
mode:
authorEnrico Carlesso <enricocarlesso@gmail.com>2026-07-24 12:05:20 -0700
committerGitHub <noreply@github.com>2026-07-24 22:05:20 +0300
commite9b22084e03880f43d1f1daaf5d9f45c717b77c4 (patch)
tree343c3099fcb0b935f857b7eb00df1e4d9c83d609 /src/integration/registry.rs
parentb56baee9d60a002b5d8c0fe74d5032afad27ef30 (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/registry.rs')
-rw-r--r--src/integration/registry.rs35
1 files changed, 33 insertions, 2 deletions
diff --git a/src/integration/registry.rs b/src/integration/registry.rs
index bcd17220..10500df5 100644
--- a/src/integration/registry.rs
+++ b/src/integration/registry.rs
@@ -22,6 +22,7 @@ pub(crate) fn integration_target_label(
crate::api::schema::IntegrationTarget::Qodercli => "qodercli",
crate::api::schema::IntegrationTarget::Cursor => "cursor",
crate::api::schema::IntegrationTarget::Mastracode => "mastracode",
+ crate::api::schema::IntegrationTarget::Grok => "grok",
}
}
@@ -49,6 +50,7 @@ pub(crate) fn integration_target_command_names(
crate::api::schema::IntegrationTarget::Qodercli => qodercli_command_names(),
crate::api::schema::IntegrationTarget::Cursor => cursor_command_names(),
crate::api::schema::IntegrationTarget::Mastracode => &["mastracode"],
+ crate::api::schema::IntegrationTarget::Grok => &["grok"],
}
}
@@ -257,7 +259,7 @@ fn integration_specs() -> [(
crate::api::schema::IntegrationTarget,
io::Result<PathBuf>,
u32,
-); 14] {
+); 15] {
[
(
crate::api::schema::IntegrationTarget::Pi,
@@ -332,6 +334,11 @@ fn integration_specs() -> [(
mastracode_dir().map(|dir| dir.join("hooks").join(super::MASTRACODE_HOOK_INSTALL_NAME)),
super::MASTRACODE_INTEGRATION_VERSION,
),
+ (
+ crate::api::schema::IntegrationTarget::Grok,
+ grok_dir().map(|dir| dir.join("hooks").join(super::GROK_HOOK_INSTALL_NAME)),
+ super::GROK_INTEGRATION_VERSION,
+ ),
]
}
@@ -372,6 +379,19 @@ pub(crate) fn print_outdated_update_notice() -> bool {
true
}
+/// Whether the Herdr-owned Grok hook config exactly matches the installed
+/// integration. JSON formatting and object key order do not affect validity.
+fn grok_hook_config_is_valid(hook_path: &Path) -> bool {
+ let Some(hooks_dir) = hook_path.parent() else {
+ return false;
+ };
+ let config_path = hooks_dir.join(super::GROK_HOOK_CONFIG_INSTALL_NAME);
+ fs::read_to_string(config_path)
+ .ok()
+ .and_then(|content| serde_json::from_str::<serde_json::Value>(&content).ok())
+ .is_some_and(|config| config == super::targets::grok_hook_config(hook_path))
+}
+
pub(crate) fn integration_status_at(
target: crate::api::schema::IntegrationTarget,
path: PathBuf,
@@ -390,12 +410,23 @@ pub(crate) fn integration_status_at(
let installed_version = fs::read_to_string(&path)
.ok()
.and_then(|content| parse_integration_version(&content));
- let state = if installed_version.is_some_and(|version| version >= expected_version) {
+ let mut state = if installed_version.is_some_and(|version| version >= expected_version) {
super::IntegrationStatusKind::Current
} else {
super::IntegrationStatusKind::Outdated
};
+ // Grok only invokes the hook when the herdr-owned `hooks/herdr.json`
+ // registers it, so a current hook script with a missing or broken config
+ // is a nonfunctional install: report it as outdated so `herdr integration
+ // status` flags it and a reinstall rewrites both files.
+ if target == crate::api::schema::IntegrationTarget::Grok
+ && state == super::IntegrationStatusKind::Current
+ && !grok_hook_config_is_valid(&path)
+ {
+ state = super::IntegrationStatusKind::Outdated;
+ }
+
super::IntegrationStatus {
target,
path,