diff --git a/.github/workflows/artifacts-summary.lock.yml b/.github/workflows/artifacts-summary.lock.yml
index 60796294597..55368145002 100644
--- a/.github/workflows/artifacts-summary.lock.yml
+++ b/.github/workflows/artifacts-summary.lock.yml
@@ -779,6 +779,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -790,6 +795,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "GitHub Actions Artifacts Usage Summary",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/ci-doctor.lock.yml b/.github/workflows/ci-doctor.lock.yml
index cadb414bdb7..d34211bb086 100644
--- a/.github/workflows/ci-doctor.lock.yml
+++ b/.github/workflows/ci-doctor.lock.yml
@@ -919,6 +919,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -930,6 +935,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "CI Failure Doctor",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/dev.lock.yml b/.github/workflows/dev.lock.yml
index eb5ab55d657..f64fb595633 100644
--- a/.github/workflows/dev.lock.yml
+++ b/.github/workflows/dev.lock.yml
@@ -808,6 +808,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -819,6 +824,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Dev",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/tidy.lock.yml b/.github/workflows/tidy.lock.yml
index b14cd38a41d..6444afadf6f 100644
--- a/.github/workflows/tidy.lock.yml
+++ b/.github/workflows/tidy.lock.yml
@@ -903,6 +903,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -914,6 +919,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Tidy",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-ai-inference-github-models.lock.yml b/pkg/cli/workflows/test-ai-inference-github-models.lock.yml
index 242bb204ba7..a5f58682873 100644
--- a/pkg/cli/workflows/test-ai-inference-github-models.lock.yml
+++ b/pkg/cli/workflows/test-ai-inference-github-models.lock.yml
@@ -178,6 +178,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -189,6 +194,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test AI Inference GitHub Models",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-all.lock.yml b/pkg/cli/workflows/test-all.lock.yml
index b196c63797a..7a9b5bd0e15 100644
--- a/pkg/cli/workflows/test-all.lock.yml
+++ b/pkg/cli/workflows/test-all.lock.yml
@@ -1334,6 +1334,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -1345,6 +1350,7 @@ jobs:
               engine_name: "Claude Code",
               model: "claude-3-5-sonnet-20241022",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Comprehensive Test Agentic Workflow - Poem Bot",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-add-issue-comment.lock.yml b/pkg/cli/workflows/test-claude-add-issue-comment.lock.yml
index bc37db7b59b..87530fa021b 100644
--- a/pkg/cli/workflows/test-claude-add-issue-comment.lock.yml
+++ b/pkg/cli/workflows/test-claude-add-issue-comment.lock.yml
@@ -173,6 +173,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -184,6 +189,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude Add Issue Comment",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-add-issue-labels.lock.yml b/pkg/cli/workflows/test-claude-add-issue-labels.lock.yml
index 1a0c46045f1..de2863627f4 100644
--- a/pkg/cli/workflows/test-claude-add-issue-labels.lock.yml
+++ b/pkg/cli/workflows/test-claude-add-issue-labels.lock.yml
@@ -173,6 +173,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -184,6 +189,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude Add Issue Labels",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-cache-memory.lock.yml b/pkg/cli/workflows/test-claude-cache-memory.lock.yml
index 223046d6b77..da6083313e0 100644
--- a/pkg/cli/workflows/test-claude-cache-memory.lock.yml
+++ b/pkg/cli/workflows/test-claude-cache-memory.lock.yml
@@ -258,6 +258,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -269,6 +274,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude with Cache Memory File Share",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-command.lock.yml b/pkg/cli/workflows/test-claude-command.lock.yml
index 34396099777..e35110deec1 100644
--- a/pkg/cli/workflows/test-claude-command.lock.yml
+++ b/pkg/cli/workflows/test-claude-command.lock.yml
@@ -175,6 +175,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -186,6 +191,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude Command",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-create-issue.lock.yml b/pkg/cli/workflows/test-claude-create-issue.lock.yml
index e82b69a3ba0..4d1dab07980 100644
--- a/pkg/cli/workflows/test-claude-create-issue.lock.yml
+++ b/pkg/cli/workflows/test-claude-create-issue.lock.yml
@@ -173,6 +173,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -184,6 +189,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude Create Issue",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-create-pull-request-review-comment.lock.yml b/pkg/cli/workflows/test-claude-create-pull-request-review-comment.lock.yml
index be4b6cb860f..898ea81e921 100644
--- a/pkg/cli/workflows/test-claude-create-pull-request-review-comment.lock.yml
+++ b/pkg/cli/workflows/test-claude-create-pull-request-review-comment.lock.yml
@@ -173,6 +173,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -184,6 +189,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude Create Pull Request Review Comment",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-create-pull-request.lock.yml b/pkg/cli/workflows/test-claude-create-pull-request.lock.yml
index 91803b1b6f7..815efa9ed93 100644
--- a/pkg/cli/workflows/test-claude-create-pull-request.lock.yml
+++ b/pkg/cli/workflows/test-claude-create-pull-request.lock.yml
@@ -180,6 +180,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -191,6 +196,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude Create Pull Request",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-create-repository-security-advisory.lock.yml b/pkg/cli/workflows/test-claude-create-repository-security-advisory.lock.yml
index c4df902e596..f8d3428a2e1 100644
--- a/pkg/cli/workflows/test-claude-create-repository-security-advisory.lock.yml
+++ b/pkg/cli/workflows/test-claude-create-repository-security-advisory.lock.yml
@@ -176,6 +176,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -187,6 +192,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude Create Repository Security Advisory",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-markitdown-mcp.lock.yml b/pkg/cli/workflows/test-claude-markitdown-mcp.lock.yml
index f77afb1904b..fb84e974636 100644
--- a/pkg/cli/workflows/test-claude-markitdown-mcp.lock.yml
+++ b/pkg/cli/workflows/test-claude-markitdown-mcp.lock.yml
@@ -186,6 +186,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -197,6 +202,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude Markitdown MCP",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-max-patch-size.lock.yml b/pkg/cli/workflows/test-claude-max-patch-size.lock.yml
index 15edca9ceca..e27698f7b92 100644
--- a/pkg/cli/workflows/test-claude-max-patch-size.lock.yml
+++ b/pkg/cli/workflows/test-claude-max-patch-size.lock.yml
@@ -837,6 +837,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -848,6 +853,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude Patch Size Validation",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-mcp.lock.yml b/pkg/cli/workflows/test-claude-mcp.lock.yml
index 7780be2afd7..4e4ceecd27c 100644
--- a/pkg/cli/workflows/test-claude-mcp.lock.yml
+++ b/pkg/cli/workflows/test-claude-mcp.lock.yml
@@ -178,6 +178,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -189,6 +194,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude MCP",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-mcps-custom.lock.yml b/pkg/cli/workflows/test-claude-mcps-custom.lock.yml
index 0d2169dc634..bae4f5a26d7 100644
--- a/pkg/cli/workflows/test-claude-mcps-custom.lock.yml
+++ b/pkg/cli/workflows/test-claude-mcps-custom.lock.yml
@@ -287,6 +287,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -298,6 +303,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Workflow",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-missing-tool.lock.yml b/pkg/cli/workflows/test-claude-missing-tool.lock.yml
index 1276b151107..9b5c57a482b 100644
--- a/pkg/cli/workflows/test-claude-missing-tool.lock.yml
+++ b/pkg/cli/workflows/test-claude-missing-tool.lock.yml
@@ -902,6 +902,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -913,6 +918,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude with Missing Tool Safe Output and Cache Memory",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-patch-size-exceeded.lock.yml b/pkg/cli/workflows/test-claude-patch-size-exceeded.lock.yml
index dc9fa41a745..ea653619cd9 100644
--- a/pkg/cli/workflows/test-claude-patch-size-exceeded.lock.yml
+++ b/pkg/cli/workflows/test-claude-patch-size-exceeded.lock.yml
@@ -839,6 +839,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -850,6 +855,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude Patch Size Limit Exceeded",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-playwright-accessibility-contrast.lock.yml b/pkg/cli/workflows/test-claude-playwright-accessibility-contrast.lock.yml
index dc74b4b246d..38f157113dd 100644
--- a/pkg/cli/workflows/test-claude-playwright-accessibility-contrast.lock.yml
+++ b/pkg/cli/workflows/test-claude-playwright-accessibility-contrast.lock.yml
@@ -845,6 +845,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -856,6 +861,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Playwright Accessibility Contrast",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-playwright-screenshots.lock.yml b/pkg/cli/workflows/test-claude-playwright-screenshots.lock.yml
index d4bb647a091..197eeeaec0c 100644
--- a/pkg/cli/workflows/test-claude-playwright-screenshots.lock.yml
+++ b/pkg/cli/workflows/test-claude-playwright-screenshots.lock.yml
@@ -976,6 +976,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -987,6 +992,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "dev",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-push-to-pull-request-branch.lock.yml b/pkg/cli/workflows/test-claude-push-to-pull-request-branch.lock.yml
index 91347e9cdb0..a63c0b1ce15 100644
--- a/pkg/cli/workflows/test-claude-push-to-pull-request-branch.lock.yml
+++ b/pkg/cli/workflows/test-claude-push-to-pull-request-branch.lock.yml
@@ -180,6 +180,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -191,6 +196,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude Push to PR Branch",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-safe-jobs.lock.yml b/pkg/cli/workflows/test-claude-safe-jobs.lock.yml
index 9493b9ba51a..15b6dc95e60 100644
--- a/pkg/cli/workflows/test-claude-safe-jobs.lock.yml
+++ b/pkg/cli/workflows/test-claude-safe-jobs.lock.yml
@@ -1051,6 +1051,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -1062,6 +1067,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude Safe Jobs",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-claude-update-issue.lock.yml b/pkg/cli/workflows/test-claude-update-issue.lock.yml
index 9ec31264999..a73d8d83e1a 100644
--- a/pkg/cli/workflows/test-claude-update-issue.lock.yml
+++ b/pkg/cli/workflows/test-claude-update-issue.lock.yml
@@ -176,6 +176,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -187,6 +192,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Claude Update Issue",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-codex-add-issue-comment.lock.yml b/pkg/cli/workflows/test-codex-add-issue-comment.lock.yml
index 11b8e436434..cf7084ce7bb 100644
--- a/pkg/cli/workflows/test-codex-add-issue-comment.lock.yml
+++ b/pkg/cli/workflows/test-codex-add-issue-comment.lock.yml
@@ -68,6 +68,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(codex --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -79,6 +84,7 @@ jobs:
               engine_name: "Codex",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Codex Add Issue Comment",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-codex-add-issue-labels.lock.yml b/pkg/cli/workflows/test-codex-add-issue-labels.lock.yml
index 99c5f9ae267..37c6976a7c0 100644
--- a/pkg/cli/workflows/test-codex-add-issue-labels.lock.yml
+++ b/pkg/cli/workflows/test-codex-add-issue-labels.lock.yml
@@ -68,6 +68,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(codex --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -79,6 +84,7 @@ jobs:
               engine_name: "Codex",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Codex Add Issue Labels",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-codex-command.lock.yml b/pkg/cli/workflows/test-codex-command.lock.yml
index a60630423dd..e0dd6a49e11 100644
--- a/pkg/cli/workflows/test-codex-command.lock.yml
+++ b/pkg/cli/workflows/test-codex-command.lock.yml
@@ -70,6 +70,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(codex --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -81,6 +86,7 @@ jobs:
               engine_name: "Codex",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Codex Command",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-codex-custom-env.lock.yml b/pkg/cli/workflows/test-codex-custom-env.lock.yml
index 6f4dcebd8f0..c0ca7a23a1d 100644
--- a/pkg/cli/workflows/test-codex-custom-env.lock.yml
+++ b/pkg/cli/workflows/test-codex-custom-env.lock.yml
@@ -70,6 +70,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(codex --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -81,6 +86,7 @@ jobs:
               engine_name: "Codex",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Codex Custom Environment Variable",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-add-issue-comment.lock.yml b/pkg/cli/workflows/test-copilot-add-issue-comment.lock.yml
index a73f6f995cc..ee19ce71869 100644
--- a/pkg/cli/workflows/test-copilot-add-issue-comment.lock.yml
+++ b/pkg/cli/workflows/test-copilot-add-issue-comment.lock.yml
@@ -65,6 +65,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -76,6 +81,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot Add Issue Comment",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-add-issue-labels.lock.yml b/pkg/cli/workflows/test-copilot-add-issue-labels.lock.yml
index de680c2b3b5..ed1a03ecad5 100644
--- a/pkg/cli/workflows/test-copilot-add-issue-labels.lock.yml
+++ b/pkg/cli/workflows/test-copilot-add-issue-labels.lock.yml
@@ -65,6 +65,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -76,6 +81,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot Add Issue Labels",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-cache-memory.lock.yml b/pkg/cli/workflows/test-copilot-cache-memory.lock.yml
index 0de2bd95cf8..c2809fe726b 100644
--- a/pkg/cli/workflows/test-copilot-cache-memory.lock.yml
+++ b/pkg/cli/workflows/test-copilot-cache-memory.lock.yml
@@ -150,6 +150,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -161,6 +166,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot with Cache Memory File Share",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-command.lock.yml b/pkg/cli/workflows/test-copilot-command.lock.yml
index d61a65bc000..166415e5819 100644
--- a/pkg/cli/workflows/test-copilot-command.lock.yml
+++ b/pkg/cli/workflows/test-copilot-command.lock.yml
@@ -67,6 +67,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -78,6 +83,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot Command",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-create-issue.lock.yml b/pkg/cli/workflows/test-copilot-create-issue.lock.yml
index 3a45939d0d8..93fcd0c443d 100644
--- a/pkg/cli/workflows/test-copilot-create-issue.lock.yml
+++ b/pkg/cli/workflows/test-copilot-create-issue.lock.yml
@@ -65,6 +65,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -76,6 +81,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot Create Issue",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-create-pull-request-review-comment.lock.yml b/pkg/cli/workflows/test-copilot-create-pull-request-review-comment.lock.yml
index d53c7ed6520..0295d02b633 100644
--- a/pkg/cli/workflows/test-copilot-create-pull-request-review-comment.lock.yml
+++ b/pkg/cli/workflows/test-copilot-create-pull-request-review-comment.lock.yml
@@ -65,6 +65,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -76,6 +81,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot Create Pull Request Review Comment",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-create-pull-request.lock.yml b/pkg/cli/workflows/test-copilot-create-pull-request.lock.yml
index 002ef9dd7b0..474c534337b 100644
--- a/pkg/cli/workflows/test-copilot-create-pull-request.lock.yml
+++ b/pkg/cli/workflows/test-copilot-create-pull-request.lock.yml
@@ -72,6 +72,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -83,6 +88,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot Create Pull Request",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-create-repository-security-advisory.lock.yml b/pkg/cli/workflows/test-copilot-create-repository-security-advisory.lock.yml
index 9146d598b32..0f82c6934a2 100644
--- a/pkg/cli/workflows/test-copilot-create-repository-security-advisory.lock.yml
+++ b/pkg/cli/workflows/test-copilot-create-repository-security-advisory.lock.yml
@@ -68,6 +68,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -79,6 +84,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot Create Repository Security Advisory",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-markitdown-mcp.lock.yml b/pkg/cli/workflows/test-copilot-markitdown-mcp.lock.yml
index 01a26240646..11a58efa635 100644
--- a/pkg/cli/workflows/test-copilot-markitdown-mcp.lock.yml
+++ b/pkg/cli/workflows/test-copilot-markitdown-mcp.lock.yml
@@ -82,6 +82,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -93,6 +98,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot Markitdown MCP",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-max-patch-size.lock.yml b/pkg/cli/workflows/test-copilot-max-patch-size.lock.yml
index d65f1e982b2..f030665eeec 100644
--- a/pkg/cli/workflows/test-copilot-max-patch-size.lock.yml
+++ b/pkg/cli/workflows/test-copilot-max-patch-size.lock.yml
@@ -728,6 +728,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -739,6 +744,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot Patch Size Validation",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-mcp.lock.yml b/pkg/cli/workflows/test-copilot-mcp.lock.yml
index 77d59262b47..1a61ed62c01 100644
--- a/pkg/cli/workflows/test-copilot-mcp.lock.yml
+++ b/pkg/cli/workflows/test-copilot-mcp.lock.yml
@@ -70,6 +70,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -81,6 +86,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot MCP",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-mcps-custom.lock.yml b/pkg/cli/workflows/test-copilot-mcps-custom.lock.yml
index 06f446d97ce..f5ccce51ecf 100644
--- a/pkg/cli/workflows/test-copilot-mcps-custom.lock.yml
+++ b/pkg/cli/workflows/test-copilot-mcps-custom.lock.yml
@@ -200,6 +200,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -211,6 +216,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Workflow",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-missing-tool.lock.yml b/pkg/cli/workflows/test-copilot-missing-tool.lock.yml
index 8f397777e05..c02ef75c597 100644
--- a/pkg/cli/workflows/test-copilot-missing-tool.lock.yml
+++ b/pkg/cli/workflows/test-copilot-missing-tool.lock.yml
@@ -793,6 +793,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -804,6 +809,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot with Missing Tool Safe Output and Cache Memory",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-patch-size-exceeded.lock.yml b/pkg/cli/workflows/test-copilot-patch-size-exceeded.lock.yml
index 54005eb8d9b..fc6211daa5a 100644
--- a/pkg/cli/workflows/test-copilot-patch-size-exceeded.lock.yml
+++ b/pkg/cli/workflows/test-copilot-patch-size-exceeded.lock.yml
@@ -730,6 +730,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -741,6 +746,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot Patch Size Limit Exceeded",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-playwright-screenshots.lock.yml b/pkg/cli/workflows/test-copilot-playwright-screenshots.lock.yml
index 6c5896758e8..f6c4772c77f 100644
--- a/pkg/cli/workflows/test-copilot-playwright-screenshots.lock.yml
+++ b/pkg/cli/workflows/test-copilot-playwright-screenshots.lock.yml
@@ -863,6 +863,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -874,6 +879,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "dev",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-push-to-pull-request-branch.lock.yml b/pkg/cli/workflows/test-copilot-push-to-pull-request-branch.lock.yml
index 30452b3a7cc..ecb06afe3b6 100644
--- a/pkg/cli/workflows/test-copilot-push-to-pull-request-branch.lock.yml
+++ b/pkg/cli/workflows/test-copilot-push-to-pull-request-branch.lock.yml
@@ -72,6 +72,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -83,6 +88,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot Push to PR Branch",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-safe-jobs.lock.yml b/pkg/cli/workflows/test-copilot-safe-jobs.lock.yml
index 0d285660c5f..b832f19c6a1 100644
--- a/pkg/cli/workflows/test-copilot-safe-jobs.lock.yml
+++ b/pkg/cli/workflows/test-copilot-safe-jobs.lock.yml
@@ -942,6 +942,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -953,6 +958,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot Safe Jobs",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-copilot-update-issue.lock.yml b/pkg/cli/workflows/test-copilot-update-issue.lock.yml
index d7c9f99c198..3022370a640 100644
--- a/pkg/cli/workflows/test-copilot-update-issue.lock.yml
+++ b/pkg/cli/workflows/test-copilot-update-issue.lock.yml
@@ -68,6 +68,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(copilot --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -79,6 +84,7 @@ jobs:
               engine_name: "GitHub Copilot CLI",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Copilot Update Issue",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/pkg/cli/workflows/test-long.lock.yml b/pkg/cli/workflows/test-long.lock.yml
index b6c3eaa9818..0bc194fe008 100644
--- a/pkg/cli/workflows/test-long.lock.yml
+++ b/pkg/cli/workflows/test-long.lock.yml
@@ -557,6 +557,11 @@ jobs:
           echo '``````markdown' >> $GITHUB_STEP_SUMMARY
           cat $GITHUB_AW_PROMPT >> $GITHUB_STEP_SUMMARY
           echo '``````' >> $GITHUB_STEP_SUMMARY
+      - name: Capture agent version
+        run: |
+          VERSION_OUTPUT=$(claude --version 2>&1 || echo "unknown")
+          echo "AGENT_VERSION=$VERSION_OUTPUT" >> $GITHUB_ENV
+          echo "Agent version: $VERSION_OUTPUT"
       - name: Generate agentic run info
         uses: actions/github-script@v8
         with:
@@ -568,6 +573,7 @@ jobs:
               engine_name: "Claude Code",
               model: "",
               version: "",
+              agent_version: process.env.AGENT_VERSION || "",
               workflow_name: "Test Long",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/pkg/workflow/agentic_engine.go b/pkg/workflow/agentic_engine.go
index cc90430ac00..30629a14496 100644
--- a/pkg/workflow/agentic_engine.go
+++ b/pkg/workflow/agentic_engine.go
@@ -56,6 +56,10 @@ type CodingAgentEngine interface {
 
 	// GetErrorPatterns returns regex patterns for extracting error messages from logs
 	GetErrorPatterns() []ErrorPattern
+
+	// GetVersionCommand returns the command to get the version of the agent (e.g., "copilot --version")
+	// Returns empty string if the engine does not support version reporting
+	GetVersionCommand() string
 }
 
 // ErrorPattern represents a regex pattern for extracting error information from logs
@@ -121,6 +125,11 @@ func (e *BaseEngine) GetErrorPatterns() []ErrorPattern {
 	return []ErrorPattern{}
 }
 
+// GetVersionCommand returns empty string by default (engines can override)
+func (e *BaseEngine) GetVersionCommand() string {
+	return ""
+}
+
 // EngineRegistry manages available agentic engines
 type EngineRegistry struct {
 	engines map[string]CodingAgentEngine
diff --git a/pkg/workflow/agentic_engine_test.go b/pkg/workflow/agentic_engine_test.go
index b754a8196a6..2b0ad6522f2 100644
--- a/pkg/workflow/agentic_engine_test.go
+++ b/pkg/workflow/agentic_engine_test.go
@@ -120,3 +120,47 @@ func TestEngineRegistryCustomEngine(t *testing.T) {
 		t.Errorf("Expected 5 supported engines after adding test-custom, got %d", len(supportedEngines))
 	}
 }
+
+func TestGetVersionCommand(t *testing.T) {
+	registry := NewEngineRegistry()
+
+	// Test Claude engine version command
+	claudeEngine, err := registry.GetEngine("claude")
+	if err != nil {
+		t.Fatalf("Failed to get claude engine: %v", err)
+	}
+	claudeVersionCmd := claudeEngine.GetVersionCommand()
+	if claudeVersionCmd != "claude --version" {
+		t.Errorf("Expected 'claude --version', got '%s'", claudeVersionCmd)
+	}
+
+	// Test Copilot engine version command
+	copilotEngine, err := registry.GetEngine("copilot")
+	if err != nil {
+		t.Fatalf("Failed to get copilot engine: %v", err)
+	}
+	copilotVersionCmd := copilotEngine.GetVersionCommand()
+	if copilotVersionCmd != "copilot --version" {
+		t.Errorf("Expected 'copilot --version', got '%s'", copilotVersionCmd)
+	}
+
+	// Test Codex engine version command
+	codexEngine, err := registry.GetEngine("codex")
+	if err != nil {
+		t.Fatalf("Failed to get codex engine: %v", err)
+	}
+	codexVersionCmd := codexEngine.GetVersionCommand()
+	if codexVersionCmd != "codex --version" {
+		t.Errorf("Expected 'codex --version', got '%s'", codexVersionCmd)
+	}
+
+	// Test Custom engine version command (should return empty string)
+	customEngine, err := registry.GetEngine("custom")
+	if err != nil {
+		t.Fatalf("Failed to get custom engine: %v", err)
+	}
+	customVersionCmd := customEngine.GetVersionCommand()
+	if customVersionCmd != "" {
+		t.Errorf("Expected empty string for custom engine, got '%s'", customVersionCmd)
+	}
+}
diff --git a/pkg/workflow/claude_engine.go b/pkg/workflow/claude_engine.go
index 3b1293480be..cfb0904d2c4 100644
--- a/pkg/workflow/claude_engine.go
+++ b/pkg/workflow/claude_engine.go
@@ -60,6 +60,11 @@ func (e *ClaudeEngine) GetDeclaredOutputFiles() []string {
 	return []string{}
 }
 
+// GetVersionCommand returns the command to get Claude's version
+func (e *ClaudeEngine) GetVersionCommand() string {
+	return "claude --version"
+}
+
 // GetExecutionSteps returns the GitHub Actions steps for executing Claude
 func (e *ClaudeEngine) GetExecutionSteps(workflowData *WorkflowData, logFile string) []GitHubActionStep {
 	var steps []GitHubActionStep
diff --git a/pkg/workflow/codex_engine.go b/pkg/workflow/codex_engine.go
index 32ad1fda9f1..3cf0417110b 100644
--- a/pkg/workflow/codex_engine.go
+++ b/pkg/workflow/codex_engine.go
@@ -74,6 +74,11 @@ func (e *CodexEngine) GetInstallationSteps(workflowData *WorkflowData) []GitHubA
 	}
 }
 
+// GetVersionCommand returns the command to get Codex's version
+func (e *CodexEngine) GetVersionCommand() string {
+	return "codex --version"
+}
+
 // GetExecutionSteps returns the GitHub Actions steps for executing Codex
 func (e *CodexEngine) GetExecutionSteps(workflowData *WorkflowData, logFile string) []GitHubActionStep {
 	var steps []GitHubActionStep
diff --git a/pkg/workflow/compiler.go b/pkg/workflow/compiler.go
index 5cd0fbc9697..1948a63806e 100644
--- a/pkg/workflow/compiler.go
+++ b/pkg/workflow/compiler.go
@@ -1659,6 +1659,9 @@ func (c *Compiler) generateMainJobSteps(yaml *strings.Builder, data *WorkflowDat
 	logFile := "agent-stdio"
 	logFileFull := "/tmp/agent-stdio.log"
 
+	// Capture agent version if engine supports it
+	c.generateAgentVersionCapture(yaml, engine)
+
 	// Generate aw_info.json with agentic run metadata
 	c.generateCreateAwInfo(yaml, data, engine)
 
@@ -2156,6 +2159,23 @@ func (c *Compiler) generateEngineExecutionSteps(yaml *strings.Builder, data *Wor
 	}
 }
 
+// generateAgentVersionCapture generates a step that captures the agent version if the engine supports it
+func (c *Compiler) generateAgentVersionCapture(yaml *strings.Builder, engine CodingAgentEngine) {
+	versionCmd := engine.GetVersionCommand()
+	if versionCmd == "" {
+		// Engine doesn't support version reporting, set empty env var
+		yaml.WriteString("      - name: Set agent version (not available)\n")
+		yaml.WriteString("        run: echo \"AGENT_VERSION=\" >> $GITHUB_ENV\n")
+		return
+	}
+
+	yaml.WriteString("      - name: Capture agent version\n")
+	yaml.WriteString("        run: |\n")
+	fmt.Fprintf(yaml, "          VERSION_OUTPUT=$(%s 2>&1 || echo \"unknown\")\n", versionCmd)
+	yaml.WriteString("          echo \"AGENT_VERSION=$VERSION_OUTPUT\" >> $GITHUB_ENV\n")
+	yaml.WriteString("          echo \"Agent version: $VERSION_OUTPUT\"\n")
+}
+
 // generateCreateAwInfo generates a step that creates aw_info.json with agentic run metadata
 func (c *Compiler) generateCreateAwInfo(yaml *strings.Builder, data *WorkflowData, engine CodingAgentEngine) {
 	yaml.WriteString("      - name: Generate agentic run info\n")
@@ -2192,6 +2212,9 @@ func (c *Compiler) generateCreateAwInfo(yaml *strings.Builder, data *WorkflowDat
 	}
 	fmt.Fprintf(yaml, "              version: \"%s\",\n", version)
 
+	// Agent version captured from running version command
+	yaml.WriteString("              agent_version: process.env.AGENT_VERSION || \"\",\n")
+
 	// Workflow information
 	fmt.Fprintf(yaml, "              workflow_name: \"%s\",\n", data.Name)
 	fmt.Fprintf(yaml, "              experimental: %t,\n", engine.IsExperimental())
diff --git a/pkg/workflow/compiler_generation_test.go b/pkg/workflow/compiler_generation_test.go
index 4da78d2dbbc..bb4323ffe13 100644
--- a/pkg/workflow/compiler_generation_test.go
+++ b/pkg/workflow/compiler_generation_test.go
@@ -216,3 +216,73 @@ func TestConvertStepToYAML(t *testing.T) {
 		})
 	}
 }
+
+func TestGenerateAgentVersionCapture(t *testing.T) {
+	tests := []struct {
+		name           string
+		engineID       string
+		expectedCmd    string
+		expectEmptyVar bool
+	}{
+		{
+			name:           "Claude engine",
+			engineID:       "claude",
+			expectedCmd:    "claude --version",
+			expectEmptyVar: false,
+		},
+		{
+			name:           "Copilot engine",
+			engineID:       "copilot",
+			expectedCmd:    "copilot --version",
+			expectEmptyVar: false,
+		},
+		{
+			name:           "Codex engine",
+			engineID:       "codex",
+			expectedCmd:    "codex --version",
+			expectEmptyVar: false,
+		},
+		{
+			name:           "Custom engine (no version command)",
+			engineID:       "custom",
+			expectedCmd:    "",
+			expectEmptyVar: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			compiler := NewCompiler(false, "", "test-version")
+			registry := GetGlobalEngineRegistry()
+			engine, err := registry.GetEngine(tt.engineID)
+			if err != nil {
+				t.Fatalf("Failed to get %s engine: %v", tt.engineID, err)
+			}
+
+			var yaml strings.Builder
+			compiler.generateAgentVersionCapture(&yaml, engine)
+			output := yaml.String()
+
+			if tt.expectEmptyVar {
+				// Should set empty AGENT_VERSION
+				if !strings.Contains(output, "AGENT_VERSION=") {
+					t.Errorf("Expected output to set AGENT_VERSION for custom engine")
+				}
+				if !strings.Contains(output, "not available") {
+					t.Errorf("Expected output to mention 'not available' for custom engine")
+				}
+			} else {
+				// Should capture version from command
+				if !strings.Contains(output, "Capture agent version") {
+					t.Errorf("Expected output to contain 'Capture agent version'")
+				}
+				if !strings.Contains(output, tt.expectedCmd) {
+					t.Errorf("Expected output to contain command '%s', got:\n%s", tt.expectedCmd, output)
+				}
+				if !strings.Contains(output, "AGENT_VERSION=") {
+					t.Errorf("Expected output to set AGENT_VERSION environment variable")
+				}
+			}
+		})
+	}
+}
diff --git a/pkg/workflow/copilot_engine.go b/pkg/workflow/copilot_engine.go
index 07ada210ce0..656926d8506 100644
--- a/pkg/workflow/copilot_engine.go
+++ b/pkg/workflow/copilot_engine.go
@@ -61,6 +61,11 @@ func (e *CopilotEngine) GetDeclaredOutputFiles() []string {
 	return []string{logsFolder}
 }
 
+// GetVersionCommand returns the command to get Copilot CLI's version
+func (e *CopilotEngine) GetVersionCommand() string {
+	return "copilot --version"
+}
+
 // GetExecutionSteps returns the GitHub Actions steps for executing GitHub Copilot CLI
 func (e *CopilotEngine) GetExecutionSteps(workflowData *WorkflowData, logFile string) []GitHubActionStep {
 	var steps []GitHubActionStep