add plugin and cc versions to root span metadata

Author: realark

plugins/trace-claude-code/hooks/common.sh

@@ -890,6 +890,44 @@ get_os() {
     uname -s 2>/dev/null || echo "unknown"
 }
 
+# Version of this plugin, read from its plugin.json manifest. Cached after the
+# first lookup. Returns "unknown" if it can't be read.
+get_plugin_version() {
+    if [ -n "${_PLUGIN_VERSION:-}" ]; then
+        echo "$_PLUGIN_VERSION"
+        return
+    fi
+    local manifest="${SCRIPT_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}/../.claude-plugin/plugin.json"
+    local v=""
+    [ -f "$manifest" ] && v=$(jq -r '.version // empty' "$manifest" 2>/dev/null)
+    _PLUGIN_VERSION="${v:-unknown}"
+    echo "$_PLUGIN_VERSION"
+}
+
+# Version of the running Claude Code CLI. Prefers a version found in the
+# session transcript (authoritative for the run that produced it); falls back
+# to `claude --version`. Cached after the first lookup. Returns "unknown" if
+# neither source is available.
+#
+# Args: [transcript_path] - optional transcript to read `.version` from.
+get_claude_code_version() {
+    local transcript="${1:-}"
+    if [ -n "${_CC_VERSION:-}" ]; then
+        echo "$_CC_VERSION"
+        return
+    fi
+    local v=""
+    if [ -n "$transcript" ] && [ -f "$transcript" ]; then
+        v=$(jq -rc 'select(.version) | .version' "$transcript" 2>/dev/null | head -1)
+    fi
+    if [ -z "$v" ]; then
+        # e.g. "2.1.173 (Claude Code)" -> "2.1.173"
+        v=$(claude --version 2>/dev/null | awk '{print $1}')
+    fi
+    _CC_VERSION="${v:-unknown}"
+    echo "$_CC_VERSION"
+}
+
 ###
 # Emit spans for a Claude Code transcript file (typically a sub-agent's own
 # transcript), parented under a given span. This reproduces the same span

plugins/trace-claude-code/hooks/session_start.sh

@@ -76,6 +76,12 @@ HOSTNAME=$(get_hostname)
 USERNAME=$(get_username)
 OS=$(get_os)
 
+# Version info for observability: this plugin's version and the Claude Code
+# CLI version that produced the session.
+TRANSCRIPT_PATH=$(echo "$INPUT" | jq -r '.transcript_path // empty' 2>/dev/null)
+PLUGIN_VERSION=$(get_plugin_version)
+CLAUDE_CODE_VERSION=$(get_claude_code_version "$TRANSCRIPT_PATH")
+
 EVENT=$(jq -n \
     --arg id "$SPAN_ID" \
     --arg span_id "$SPAN_ID" \
@@ -87,6 +93,8 @@ EVENT=$(jq -n \
     --arg hostname "$HOSTNAME" \
     --arg username "$USERNAME" \
     --arg os "$OS" \
+    --arg plugin_version "$PLUGIN_VERSION" \
+    --arg claude_code_version "$CLAUDE_CODE_VERSION" \
     '{
         id: $id,
         span_id: $span_id,
@@ -99,7 +107,9 @@ EVENT=$(jq -n \
             hostname: $hostname,
             username: $username,
             os: $os,
-            source: "claude-code"
+            source: "claude-code",
+            plugin_version: $plugin_version,
+            claude_code_version: $claude_code_version
         },
         span_attributes: {
             name: ("Claude Code: " + $workspace),

plugins/trace-claude-code/hooks/user_prompt_submit.sh

@@ -49,6 +49,11 @@ if [ -z "$ROOT_SPAN_ID" ] || [ -z "$PROJECT_ID" ]; then
     USERNAME=$(get_username)
     OS=$(get_os)
 
+    # Version info for observability (mirrors session_start.sh).
+    TRANSCRIPT_PATH=$(echo "$INPUT" | jq -r '.transcript_path // empty' 2>/dev/null)
+    PLUGIN_VERSION=$(get_plugin_version)
+    CLAUDE_CODE_VERSION=$(get_claude_code_version "$TRANSCRIPT_PATH")
+
     EVENT=$(jq -n \
         --arg id "$ROOT_SPAN_ID" \
         --arg span_id "$ROOT_SPAN_ID" \
@@ -59,6 +64,8 @@ if [ -z "$ROOT_SPAN_ID" ] || [ -z "$PROJECT_ID" ]; then
         --arg hostname "$HOSTNAME" \
         --arg username "$USERNAME" \
         --arg os "$OS" \
+        --arg plugin_version "$PLUGIN_VERSION" \
+        --arg claude_code_version "$CLAUDE_CODE_VERSION" \
         '{
             id: $id,
             span_id: $span_id,
@@ -71,7 +78,9 @@ if [ -z "$ROOT_SPAN_ID" ] || [ -z "$PROJECT_ID" ]; then
                 hostname: $hostname,
                 username: $username,
                 os: $os,
-                source: "claude-code"
+                source: "claude-code",
+                plugin_version: $plugin_version,
+                claude_code_version: $claude_code_version
             },
             span_attributes: {
                 name: ("Claude Code: " + $workspace),

plugins/trace-claude-code/test/test_session_start.sh

@@ -80,6 +80,19 @@ t_session_start_metadata() {
     local session_id
     session_id=$(echo "$span" | jq -r '.metadata.session_id')
     assert_eq "$session_id" "sess-meta"
+
+    # Version attributes are present and non-empty. plugin_version comes from
+    # plugin.json; claude_code_version from the transcript or `claude --version`
+    # (falls back to "unknown" but must always be set).
+    local plugin_version cc_version
+    plugin_version=$(echo "$span" | jq -r '.metadata.plugin_version')
+    cc_version=$(echo "$span" | jq -r '.metadata.claude_code_version')
+    assert_ne "$plugin_version" "null" "plugin_version should be set"
+    assert_ne "$plugin_version" "" "plugin_version should be non-empty"
+    # plugin_version should match the manifest (e.g. a semver-ish string).
+    assert_match "$plugin_version" "^[0-9]+\.[0-9]+\.[0-9]+" "plugin_version looks like a version"
+    assert_ne "$cc_version" "null" "claude_code_version should be set"
+    assert_ne "$cc_version" "" "claude_code_version should be non-empty"
 }
 
 t_session_start_writes_state() {