Skip to content

Add 5 new client metrics event types: ToolCall, McpInvocation, NewMessage, SkillUsed, SubagentEvent #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
svarlamov wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add 5 new client metrics event types: ToolCall, McpInvocation, NewMessage, SkillUsed, SubagentEvent #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6080cf8
Add 5 new client metrics event types: ToolCall, McpInvocation, NewMes…
devin-ai-integration[bot] Feb 21, 2026
04c2f83
Fix clippy collapsible_if warnings
devin-ai-integration[bot] Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
604 changes: 601 additions & 3 deletions src/commands/checkpoint.rs
View file
Open in desktop

Large diffs are not rendered by default.

131 changes: 124 additions & 7 deletions src/commands/checkpoint_agent/agent_presets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ pub struct AgentCheckpointFlags {
pub hook_input: Option<String>,
}

#[derive(Clone, Debug, Default)]
pub struct HookMetadata {
pub hook_event_name: Option<String>,
pub tool_name: Option<String>,
}

#[derive(Clone, Debug)]
pub struct AgentRunResult {
pub agent_id: AgentId,
Expand All @@ -29,6 +35,7 @@ pub struct AgentRunResult {
pub edited_filepaths: Option<Vec<String>>,
pub will_edit_filepaths: Option<Vec<String>>,
pub dirty_files: Option<HashMap<String, String>>,
pub hook_metadata: Option<HookMetadata>,
}

pub trait AgentCheckpointPreset {
Expand Down Expand Up @@ -117,11 +124,33 @@ impl AgentCheckpointPreset for ClaudePreset {
.map(|path| vec![path.to_string()]);

// Store transcript_path in metadata
let agent_metadata =
let mut agent_metadata =
HashMap::from([("transcript_path".to_string(), transcript_path.to_string())]);

if let Some(subagent_id) = hook_data
.get("subagent_id")
.and_then(|v| v.as_str())
.or_else(|| hook_data.get("subagentId").and_then(|v| v.as_str()))
{
agent_metadata.insert("subagent_id".to_string(), subagent_id.to_string());
}

if let Some(subagent_model) = hook_data
.get("subagent_model")
.and_then(|v| v.as_str())
.or_else(|| hook_data.get("subagentModel").and_then(|v| v.as_str()))
{
agent_metadata.insert("subagent_model".to_string(), subagent_model.to_string());
}

// Check if this is a PreToolUse event (human checkpoint)
let hook_event_name = hook_data.get("hook_event_name").and_then(|v| v.as_str());
let tool_name = hook_data.get("tool_name").and_then(|v| v.as_str());

let hook_meta = Some(HookMetadata {
hook_event_name: hook_event_name.map(|s| s.to_string()),
tool_name: tool_name.map(|s| s.to_string()),
});

if hook_event_name == Some("PreToolUse") {
// Early return for human checkpoint
Expand All @@ -134,6 +163,7 @@ impl AgentCheckpointPreset for ClaudePreset {
edited_filepaths: None,
will_edit_filepaths: file_path_as_vec,
dirty_files: None,
hook_metadata: hook_meta,
});
}

Expand All @@ -147,6 +177,7 @@ impl AgentCheckpointPreset for ClaudePreset {
edited_filepaths: file_path_as_vec,
will_edit_filepaths: None,
dirty_files: None,
hook_metadata: hook_meta,
})
}
}
Expand Down Expand Up @@ -483,6 +514,17 @@ impl AgentCheckpointPreset for GeminiPreset {
// Check if this is a PreToolUse event (human checkpoint)
let hook_event_name = hook_data.get("hook_event_name").and_then(|v| v.as_str());

let hook_tool_name = hook_data
.get("tool_name")
.and_then(|v| v.as_str())
.or_else(|| hook_data.get("toolName").and_then(|v| v.as_str()))
.map(|s| s.to_string());

let hook_meta = Some(HookMetadata {
hook_event_name: hook_event_name.map(|s| s.to_string()),
tool_name: hook_tool_name,
});

if hook_event_name == Some("BeforeTool") {
// Early return for human checkpoint
return Ok(AgentRunResult {
Expand All @@ -494,6 +536,7 @@ impl AgentCheckpointPreset for GeminiPreset {
edited_filepaths: None,
will_edit_filepaths: file_path_as_vec,
dirty_files: None,
hook_metadata: hook_meta.clone(),
});
}

Expand All @@ -507,6 +550,7 @@ impl AgentCheckpointPreset for GeminiPreset {
edited_filepaths: file_path_as_vec,
will_edit_filepaths: None,
dirty_files: None,
hook_metadata: hook_meta,
})
}
}
Expand Down Expand Up @@ -691,6 +735,17 @@ impl AgentCheckpointPreset for ContinueCliPreset {
// Check if this is a PreToolUse event (human checkpoint)
let hook_event_name = hook_data.get("hook_event_name").and_then(|v| v.as_str());

let hook_tool_name = hook_data
.get("tool_name")
.and_then(|v| v.as_str())
.or_else(|| hook_data.get("toolName").and_then(|v| v.as_str()))
.map(|s| s.to_string());

let hook_meta = Some(HookMetadata {
hook_event_name: hook_event_name.map(|s| s.to_string()),
tool_name: hook_tool_name,
});

if hook_event_name == Some("PreToolUse") {
// Early return for human checkpoint
return Ok(AgentRunResult {
Expand All @@ -702,6 +757,7 @@ impl AgentCheckpointPreset for ContinueCliPreset {
edited_filepaths: None,
will_edit_filepaths: file_path_as_vec,
dirty_files: None,
hook_metadata: hook_meta.clone(),
});
}

Expand All @@ -715,6 +771,7 @@ impl AgentCheckpointPreset for ContinueCliPreset {
edited_filepaths: file_path_as_vec,
will_edit_filepaths: None,
dirty_files: None,
hook_metadata: hook_meta,
})
}
}
Expand Down Expand Up @@ -910,6 +967,7 @@ impl AgentCheckpointPreset for CodexPreset {
edited_filepaths: None,
will_edit_filepaths: None,
dirty_files: None,
hook_metadata: None,
})
}
}
Expand Down Expand Up @@ -1208,10 +1266,24 @@ impl AgentCheckpointPreset for CursorPreset {
.map(|s| s.to_string())
.unwrap_or_else(|| "unknown".to_string());

let hook_tool_name = hook_data
.get("tool_name")
.and_then(|v| v.as_str())
.or_else(|| hook_data.get("toolName").and_then(|v| v.as_str()))
.map(|s| s.to_string());

let hook_meta = Some(HookMetadata {
hook_event_name: Some(hook_event_name.clone()),
tool_name: hook_tool_name,
});

// Validate hook_event_name
if hook_event_name != "beforeSubmitPrompt" && hook_event_name != "afterFileEdit" {
if hook_event_name != "beforeSubmitPrompt"
&& hook_event_name != "afterFileEdit"
&& hook_event_name != "beforeMCPExecution"
{
return Err(GitAiError::PresetError(format!(
"Invalid hook_event_name: {}. Expected 'beforeSubmitPrompt' or 'afterFileEdit'",
"Invalid hook_event_name: {}. Expected 'beforeSubmitPrompt', 'afterFileEdit', or 'beforeMCPExecution'",
hook_event_name
)));
}
Expand Down Expand Up @@ -1260,6 +1332,7 @@ impl AgentCheckpointPreset for CursorPreset {
edited_filepaths: None,
will_edit_filepaths: None,
dirty_files: None,
hook_metadata: hook_meta.clone(),
});
}

Expand Down Expand Up @@ -1315,16 +1388,42 @@ impl AgentCheckpointPreset for CursorPreset {
model,
};

let mut agent_metadata = HashMap::new();

// Store cursor database path in metadata for refetching during post-commit.
// This is only needed when GIT_AI_CURSOR_GLOBAL_DB_PATH env var is set (i.e., in tests),
// because the env var isn't passed to git hook subprocesses.
let agent_metadata = if std::env::var("GIT_AI_CURSOR_GLOBAL_DB_PATH").is_ok() {
Some(HashMap::from([(
if std::env::var("GIT_AI_CURSOR_GLOBAL_DB_PATH").is_ok() {
agent_metadata.insert(
"__test_cursor_db_path".to_string(),
global_db.to_string_lossy().to_string(),
)]))
} else {
);
}

if hook_event_name == "beforeMCPExecution" {
if let Some(server_name) = hook_data
.get("mcp_server_name")
.and_then(|v| v.as_str())
.or_else(|| hook_data.get("server_name").and_then(|v| v.as_str()))
.or_else(|| hook_data.get("serverName").and_then(|v| v.as_str()))
{
agent_metadata.insert("mcp_server_name".to_string(), server_name.to_string());
}

if let Some(tool_name) = hook_data
.get("mcp_tool_name")
.and_then(|v| v.as_str())
.or_else(|| hook_data.get("tool_name").and_then(|v| v.as_str()))
.or_else(|| hook_data.get("toolName").and_then(|v| v.as_str()))
{
agent_metadata.insert("mcp_tool_name".to_string(), tool_name.to_string());
}
}

let agent_metadata = if agent_metadata.is_empty() {
None
} else {
Some(agent_metadata)
};

Ok(AgentRunResult {
Expand All @@ -1336,6 +1435,7 @@ impl AgentCheckpointPreset for CursorPreset {
edited_filepaths,
will_edit_filepaths: None,
dirty_files: None,
hook_metadata: hook_meta,
})
}
}
Expand Down Expand Up @@ -1733,6 +1833,10 @@ impl GithubCopilotPreset {
edited_filepaths: None,
will_edit_filepaths: Some(will_edit_filepaths),
dirty_files,
hook_metadata: Some(HookMetadata {
hook_event_name: Some(hook_event_name.to_string()),
tool_name: None,
}),
});
}

Expand Down Expand Up @@ -1806,6 +1910,10 @@ impl GithubCopilotPreset {
edited_filepaths: edited_filepaths.or(detected_edited_filepaths),
will_edit_filepaths: None,
dirty_files,
hook_metadata: Some(HookMetadata {
hook_event_name: Some(hook_event_name.to_string()),
tool_name: None,
}),
})
}

Expand Down Expand Up @@ -1969,6 +2077,7 @@ impl GithubCopilotPreset {
edited_filepaths: None,
will_edit_filepaths: Some(extracted_paths),
dirty_files,
hook_metadata: None,
});
}

Expand Down Expand Up @@ -2005,6 +2114,10 @@ impl GithubCopilotPreset {
edited_filepaths: Some(extracted_paths),
will_edit_filepaths: None,
dirty_files,
hook_metadata: Some(HookMetadata {
hook_event_name: Some(hook_event_name.to_string()),
tool_name: Some(tool_name.to_string()),
}),
})
}

Expand Down Expand Up @@ -2611,6 +2724,7 @@ impl AgentCheckpointPreset for DroidPreset {
edited_filepaths: None,
will_edit_filepaths: file_path_as_vec,
dirty_files: None,
hook_metadata: None,
});
}

Expand All @@ -2624,6 +2738,7 @@ impl AgentCheckpointPreset for DroidPreset {
edited_filepaths: file_path_as_vec,
will_edit_filepaths: None,
dirty_files: None,
hook_metadata: None,
})
}
}
Expand Down Expand Up @@ -3381,6 +3496,7 @@ impl AgentCheckpointPreset for AiTabPreset {
edited_filepaths: None,
will_edit_filepaths,
dirty_files,
hook_metadata: None,
});
}

Expand All @@ -3393,6 +3509,7 @@ impl AgentCheckpointPreset for AiTabPreset {
edited_filepaths,
will_edit_filepaths: None,
dirty_files,
hook_metadata: None,
})
}
}
2 changes: 2 additions & 0 deletions src/commands/checkpoint_agent/agent_v1_preset.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ impl AgentCheckpointPreset for AgentV1Preset {
repo_working_dir: Some(repo_working_dir),
edited_filepaths: None,
dirty_files,
hook_metadata: None,
}),
AgentV1Input::AiAgent {
edited_filepaths,
Expand All @@ -93,6 +94,7 @@ impl AgentCheckpointPreset for AgentV1Preset {
edited_filepaths,
will_edit_filepaths: None,
dirty_files,
hook_metadata: None,
}),
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/commands/checkpoint_agent/opencode_preset.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ impl AgentCheckpointPreset for OpenCodePreset {
edited_filepaths: None,
will_edit_filepaths: file_path_as_vec,
dirty_files: None,
hook_metadata: None,
});
}

Expand All @@ -234,6 +235,7 @@ impl AgentCheckpointPreset for OpenCodePreset {
edited_filepaths: file_path_as_vec,
will_edit_filepaths: None,
dirty_files: None,
hook_metadata: None,
})
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/commands/git_ai_handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ fn handle_checkpoint(args: &[String]) {
edited_filepaths,
will_edit_filepaths: None,
dirty_files: None,
hook_metadata: None,
});
}
_ => {}
Expand Down Expand Up @@ -768,6 +769,7 @@ fn handle_checkpoint(args: &[String]) {
edited_filepaths: None,
repo_working_dir: Some(effective_working_dir),
dirty_files: None,
hook_metadata: None,
});
}

Expand Down
1 change: 1 addition & 0 deletions src/git/test_utils/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ impl TmpRepo {
edited_filepaths: None,
will_edit_filepaths: None,
dirty_files: None,
hook_metadata: None,
};

checkpoint(
Expand Down
Loading
Loading