refactor: share agent and provider extraction strategies

crates/cli/src/adapters/claude_code.rs

@@ -4,7 +4,9 @@
 use axum::http::HeaderMap;
 use serde_json::{Value, json};
 
-use crate::adapters::{AdapterOutcome, ClassificationRules, classify};
+use crate::adapters::{
+    AdapterOutcome, CLAUDE_CODE_PAYLOAD_EXTRACTOR, ClassificationRules, classify,
+};
 use crate::model::{AgentKind, NormalizedEvent};
 
 /// Normalizes Claude Code hook payloads and returns the hook response Claude expects.
@@ -18,6 +20,7 @@ pub(crate) fn adapt(payload: Value, headers: &HeaderMap) -> AdapterOutcome {
     let events = classify(
         &payload,
         headers,
+        &CLAUDE_CODE_PAYLOAD_EXTRACTOR,
         &ClassificationRules {
             kind: AgentKind::ClaudeCode,
             agent_start: &["SessionStart", "sessionStart", "session_start"],

crates/cli/src/adapters/codex.rs

@@ -4,7 +4,7 @@
 use axum::http::HeaderMap;
 use serde_json::{Value, json};
 
-use crate::adapters::{AdapterOutcome, ClassificationRules, classify};
+use crate::adapters::{AdapterOutcome, CODEX_PAYLOAD_EXTRACTOR, ClassificationRules, classify};
 use crate::model::AgentKind;
 
 /// Normalizes Codex hook payloads while leaving Codex hook control flow untouched.
@@ -16,6 +16,7 @@ pub(crate) fn adapt(payload: Value, headers: &HeaderMap) -> AdapterOutcome {
     let events = classify(
         &payload,
         headers,
+        &CODEX_PAYLOAD_EXTRACTOR,
         &ClassificationRules {
             kind: AgentKind::Codex,
             agent_start: &["sessionStart", "session_start", "agentStarted"],

crates/cli/src/adapters/cursor.rs

@@ -4,7 +4,7 @@
 use axum::http::HeaderMap;
 use serde_json::{Value, json};
 
-use crate::adapters::{AdapterOutcome, ClassificationRules, classify};
+use crate::adapters::{AdapterOutcome, CURSOR_PAYLOAD_EXTRACTOR, ClassificationRules, classify};
 use crate::model::{AgentKind, NormalizedEvent};
 
 /// Normalizes Cursor hook payloads and returns Cursor-compatible continuation decisions.
@@ -16,6 +16,7 @@ pub(crate) fn adapt(payload: Value, headers: &HeaderMap) -> AdapterOutcome {
     let events = classify(
         &payload,
         headers,
+        &CURSOR_PAYLOAD_EXTRACTOR,
         &ClassificationRules {
             kind: AgentKind::Cursor,
             agent_start: &["sessionStart", "session_start"],

crates/cli/src/adapters/hermes.rs

@@ -5,9 +5,10 @@ use axum::http::HeaderMap;
 use serde_json::{Map, Value, json};
 
 use crate::adapters::{
-    AdapterOutcome, ClassificationRules, classify, common_session_event, event_name, metadata,
-    normalize_name, session_id, value_at,
+    AdapterOutcome, ClassificationRules, HERMES_PAYLOAD_EXTRACTOR, classify, common_session_event,
+    event_name, metadata, normalize_name, session_id,
 };
+use crate::json_path::value_at;
 use crate::model::{AgentKind, LlmEvent, NormalizedEvent};
 
 /// Normalizes Hermes shell hook payloads without emitting control directives.
@@ -16,7 +17,7 @@ use crate::model::{AgentKind, LlmEvent, NormalizedEvent};
 /// responses minimal and relies on the forwarder fail-open/fail-closed setting to decide whether
 /// hook delivery problems affect the invoking agent.
 pub(crate) fn adapt(payload: Value, headers: &HeaderMap) -> AdapterOutcome {
-    let event_name = event_name(&payload);
+    let event_name = event_name(&payload, &HERMES_PAYLOAD_EXTRACTOR);
     let normalized = normalize_name(&event_name);
     if normalized == "preapirequest" {
         return AdapterOutcome {
@@ -64,6 +65,7 @@ pub(crate) fn adapt(payload: Value, headers: &HeaderMap) -> AdapterOutcome {
                 &payload,
                 headers,
                 AgentKind::Hermes,
+                &HERMES_PAYLOAD_EXTRACTOR,
             ))],
             response: json!({}),
         };
@@ -72,6 +74,7 @@ pub(crate) fn adapt(payload: Value, headers: &HeaderMap) -> AdapterOutcome {
     let events = classify(
         &payload,
         headers,
+        &HERMES_PAYLOAD_EXTRACTOR,
         &ClassificationRules {
             kind: AgentKind::Hermes,
             agent_start: &["on_session_start", "sessionStart"],
@@ -89,15 +92,21 @@ pub(crate) fn adapt(payload: Value, headers: &HeaderMap) -> AdapterOutcome {
 }
 
 fn hermes_llm_event(payload: &Value, headers: &HeaderMap, event_name: &str) -> LlmEvent {
-    let session_id = session_id(payload, headers);
+    let session_id = session_id(payload, headers, &HERMES_PAYLOAD_EXTRACTOR);
     let api_call_id = hermes_api_call_id(payload, &session_id);
     let provider = hermes_string_at(payload, "provider")
         .or_else(|| hermes_string_at(payload, "api_mode"))
         .unwrap_or_else(|| "hermes_api_request".to_string());
     let model_name =
         hermes_string_at(payload, "response_model").or_else(|| hermes_string_at(payload, "model"));
     let payload_exact = hermes_payload_exact(payload, event_name);
-    let mut event_metadata = metadata(payload, headers, AgentKind::Hermes, event_name);
+    let mut event_metadata = metadata(
+        payload,
+        headers,
+        AgentKind::Hermes,
+        event_name,
+        &HERMES_PAYLOAD_EXTRACTOR,
+    );
     if let Value::Object(ref mut object) = event_metadata {
         object.insert("api_call_id".into(), json!(api_call_id.clone()));
         object.insert("provider_payload_exact".into(), json!(payload_exact));