feat: send current timestamp for MCP live activity

Author: pbeslin-gg

ggshield/verticals/ai/agents/claude_code.py

@@ -243,6 +243,7 @@ def parse_mcp_activity(
             model="",
             cwd=payload.raw.get("cwd", ""),
             input=payload.raw.get("tool_input", {}),
+            timestamp=payload.timestamp,
         )
 
     def iter_history_events(

ggshield/verticals/ai/agents/codex.py

@@ -124,4 +124,5 @@ def parse_mcp_activity(
             model=payload.raw.get("model", ""),
             cwd=payload.raw.get("cwd", ""),
             input=payload.raw.get("tool_input", {}),
+            timestamp=payload.timestamp,
         )

ggshield/verticals/ai/agents/cursor.py

@@ -28,6 +28,7 @@
     Transport,
 )
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -324,6 +325,7 @@ def parse_mcp_activity(
             model=payload.raw.get("model", ""),
             cwd=payload.raw.get("workspace_roots", [""])[0],
             input=payload.raw.get("tool_input", {}),
+            timestamp=payload.timestamp,
         )
 
     def iter_history_events(

ggshield/verticals/ai/agents/vscode.py

@@ -91,6 +91,7 @@ def parse_mcp_activity(
             model="",
             cwd=payload.raw.get("cwd", ""),
             input=payload.raw.get("tool_input", {}),
+            timestamp=payload.timestamp,
         )
 
     def _lookup_server_name(

ggshield/verticals/ai/hooks.py

@@ -1,6 +1,7 @@
 import hashlib
 import json
 import re
+from datetime import datetime, timezone
 from typing import Any, Dict, List, Sequence, Set
 
 from notifypy import Notify
@@ -75,6 +76,8 @@ def parse_hook_input(raw_content: str) -> list[HookPayload]:
         but in some cases files mentioned in the prompt will be read but the
         PreToolUse event will not be called. So we need to handle this case ourselves.
     """
+    timestamp = datetime.now(timezone.utc)
+
     # Parse the content as JSON
     if not raw_content.strip():
         raise ValueError("Error: No input received on stdin")
@@ -103,7 +106,7 @@ def parse_hook_input(raw_content: str) -> list[HookPayload]:
         content = data.get("prompt", "")
         # Look for files mentioned in the prompt that could be read
         # without triggering a PRE_TOOL_USE event.
-        payloads.extend(_parse_user_prompt(content, event_type, agent))
+        payloads.extend(_parse_user_prompt(content, event_type, agent, timestamp))
 
     elif event_type == EventType.PRE_TOOL_USE:
         tool = _parse_tool(data)
@@ -115,7 +118,7 @@ def parse_hook_input(raw_content: str) -> list[HookPayload]:
             content = tool_input.get("command", "")
             identifier = content
             # Try to detect a command that could be used to read a file.
-            payloads.extend(_parse_command(content, event_type, agent))
+            payloads.extend(_parse_command(content, event_type, agent, timestamp))
         elif tool == Tool.READ:
             # We only need to deal with the identifier, the content will be read by the Scannable
             identifier = lookup(tool_input, ["file_path", "filePath", "path"], "")
@@ -139,6 +142,7 @@ def parse_hook_input(raw_content: str) -> list[HookPayload]:
             identifier=identifier,
             agent=agent,
             raw=data,
+            timestamp=timestamp,
         )
     )
 
@@ -166,7 +170,7 @@ def _detect_agent(data: Dict[str, Any]) -> Agent:
 
 
 def _parse_user_prompt(
-    content: str, event_type: EventType, agent: Agent
+    content: str, event_type: EventType, agent: Agent, timestamp: datetime
 ) -> List[HookPayload]:
     """Parse the user prompt for additional payloads that we may miss."""
     payloads = []
@@ -183,13 +187,14 @@ def _parse_user_prompt(
                 identifier=match,
                 agent=agent,
                 raw={},
+                timestamp=timestamp,
             )
         )
     return payloads
 
 
 def _parse_command(
-    content: str, event_type: EventType, agent: Agent
+    content: str, event_type: EventType, agent: Agent, timestamp: datetime
 ) -> List[HookPayload]:
     """Parse the command for additional payloads that we may miss."""
     # In Windows, some agents (at least Codex) use the Get-Content command to read a file.
@@ -207,6 +212,7 @@ def _parse_command(
                 identifier=identifier,
                 agent=agent,
                 raw={},
+                timestamp=timestamp,
             )
         )
     return payloads

ggshield/verticals/ai/models.py

@@ -1,7 +1,8 @@
 import json
 from abc import ABC, abstractmethod
 from collections.abc import Iterable, Iterator
-from dataclasses import dataclass
+from dataclasses import dataclass, field
+from datetime import datetime, timezone
 from enum import Enum, auto
 from pathlib import Path
 from typing import Any, Dict, List, Literal, Optional
@@ -67,6 +68,7 @@ class HookPayload:
     identifier: str
     agent: "Agent"
     raw: Dict[str, Any]
+    timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 
     @property
     def scannable(self) -> Scannable: