Merge origin/main into pr-510: resolve conflicts in cli-publish.yml, package.json, sessionDiscovery.ts

- cli-publish.yml: keep env-var injection approach (EVENT_NAME/GIT_REF) from PR
- package.json: keep 'AI fluency insights' description from PR; icon field from main
- sessionDiscovery.ts: use main's inline pathExists style (simpler)

CliBridge.cs and CliBridgeTests.cs auto-merged cleanly; GetAllDataAsync and
its test are now present from main, fixing the GetAllDataAsync_ReturnsTask CI failure.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: rajbos

.github/workflows/codeql.yml

@@ -50,7 +50,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
+        uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -60,7 +60,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
+        uses: github/codeql-action/autobuild@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -73,6 +73,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
+        uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: VS Code Extension - Release
+name: Extensions - Release
 
 on:
   push:
@@ -16,6 +16,11 @@ on:
         required: false
         default: true
         type: boolean
+      vs_only:
+        description: 'Build and publish only the Visual Studio extension (uses existing tag/release, skips VS Code steps)'
+        required: false
+        default: false
+        type: boolean
 
 permissions:
   contents: read
@@ -126,6 +131,7 @@ jobs:
         echo "---"
 
     - name: Update CHANGELOG.md for VSIX packaging
+      if: inputs.vs_only != true
       run: |
         VERSION="${{ steps.extract_version.outputs.tag_version }}"
         node -e "
@@ -145,7 +151,7 @@ jobs:
         " "$VERSION"
 
     - name: Create changelog branch and commit
-      if: steps.trigger_type.outputs.is_manual == 'true'
+      if: steps.trigger_type.outputs.is_manual == 'true' && inputs.vs_only != true
       id: changelog_branch
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -159,10 +165,8 @@ jobs:
 
         # Check if branch already exists on remote
         if git ls-remote --exit-code --heads origin "refs/heads/$BRANCH" >/dev/null 2>&1; then
-          MSG="❌ Branch $BRANCH already exists on remote! Delete it or bump the version before re-running."
-          echo "$MSG"
-          echo "$MSG" > /tmp/changelog_error.txt
-          exit 1
+          echo "ℹ️ Branch $BRANCH already exists on remote — skipping changelog commit"
+          exit 0
         fi
 
         if git diff --quiet vscode-extension/CHANGELOG.md; then
@@ -177,7 +181,7 @@ jobs:
         echo "✅ Pushed vscode-extension/CHANGELOG.md update to $BRANCH"
 
     - name: Create tag for manual trigger
-      if: steps.trigger_type.outputs.is_manual == 'true' && inputs.create_tag == true
+      if: steps.trigger_type.outputs.is_manual == 'true' && inputs.create_tag == true && inputs.vs_only != true
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
@@ -186,9 +190,8 @@ jobs:
         
         # Check if tag already exists on remote using exit code
         if git ls-remote --exit-code --tags origin "refs/tags/$VERSION" >/dev/null 2>&1; then
-          echo "❌ Tag $VERSION already exists on remote!"
-          echo "Please update the version in package.json or delete the existing tag."
-          exit 1
+          echo "ℹ️ Tag $VERSION already exists on remote — skipping tag creation"
+          exit 0
         fi
         
         # Create and push the tag
@@ -212,38 +215,47 @@ jobs:
         exit 1
         
     - name: Install dependencies
+      if: inputs.vs_only != true
       working-directory: vscode-extension
       run: npm ci
 
     - name: Run linting
+      if: inputs.vs_only != true
       working-directory: vscode-extension
       run: npm run lint
 
     - name: Run type checking
+      if: inputs.vs_only != true
       working-directory: vscode-extension
       run: npm run check-types
 
     - name: Compile extension
+      if: inputs.vs_only != true
       working-directory: vscode-extension
       run: npm run compile
 
     - name: Build production package
+      if: inputs.vs_only != true
       working-directory: vscode-extension
       run: npm run package
 
     - name: Compile tests
+      if: inputs.vs_only != true
       working-directory: vscode-extension
       run: npm run compile-tests
 
     - name: Run tests
+      if: inputs.vs_only != true
       working-directory: vscode-extension
       run: xvfb-run -s "-screen 0 1024x768x24" npm test
 
     - name: Create VSIX package
+      if: inputs.vs_only != true
       working-directory: vscode-extension
       run: npx vsce package
 
     - name: Get VSIX filename
+      if: inputs.vs_only != true
       id: vsix_filename
       working-directory: vscode-extension
       run: |
@@ -252,13 +264,15 @@ jobs:
         echo "VSIX file: $VSIX_FILE"
 
     - name: Upload VSIX as workflow artifact
+      if: inputs.vs_only != true
       uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
       with:
         name: vsix-package
         path: vscode-extension/${{ steps.vsix_filename.outputs.vsix_file }}
         retention-days: 90
 
     - name: Create Release
+      if: inputs.vs_only != true
       id: create_release
       shell: bash
       env:
@@ -268,17 +282,31 @@ jobs:
         set -o pipefail
         echo "Creating release for tag: ${{ steps.tag_name.outputs.tag_name }}"
         
-        # Create release with auto-generated notes and upload VSIX file
-        gh release create "${{ steps.tag_name.outputs.tag_name }}" \
-          --title "VS Code Extension v${{ steps.extract_version.outputs.tag_version }}" \
-          --notes-file /tmp/release_notes.md \
-          vscode-extension/${{ steps.vsix_filename.outputs.vsix_file }} 2>&1 | tee /tmp/release_output.txt
+        # Create release (skip if it already exists — e.g. re-running after a downstream job failure)
+        TAG="${{ steps.tag_name.outputs.tag_name }}"
+        if gh release view "$TAG" --repo "${{ github.repository }}" >/dev/null 2>&1; then
+          echo "ℹ️ Release $TAG already exists — uploading VSIX with --clobber"
+          gh release upload "$TAG" \
+            vscode-extension/${{ steps.vsix_filename.outputs.vsix_file }} --clobber 2>&1 | tee /tmp/release_output.txt
+        else
+          gh release create "$TAG" \
+            --title "VS Code Extension v${{ steps.extract_version.outputs.tag_version }}" \
+            --notes-file /tmp/release_notes.md \
+            vscode-extension/${{ steps.vsix_filename.outputs.vsix_file }} 2>&1 | tee /tmp/release_output.txt
+        fi
 
     - name: Release Summary
       if: always()
       shell: bash
       run: |
-        if [ "${{ steps.create_release.outcome }}" == "success" ]; then
+        if [ "${{ steps.create_release.outcome }}" == "skipped" ]; then
+          {
+            echo "# ⏭️ VS Code Release Skipped (vs_only mode)"
+            echo ""
+            echo "Version: ${{ steps.extract_version.outputs.tag_version }}"
+            echo "The Visual Studio extension job will build and upload to the existing release."
+          } >> "$GITHUB_STEP_SUMMARY"
+        elif [ "${{ steps.create_release.outcome }}" == "success" ]; then
           {
             echo "# ✅ Release Created Successfully"
             echo ""
@@ -311,7 +339,7 @@ jobs:
   publish:
     needs: release
     name: Publish VS Code Extension
-    if: github.event_name == 'workflow_dispatch' && inputs.publish_marketplace
+    if: github.event_name == 'workflow_dispatch' && inputs.publish_marketplace && inputs.vs_only != true
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -536,6 +564,44 @@ jobs:
 
     # ── (Optional) Publish to VS Marketplace ──────────────────────────────
 
+    - name: Check Visual Studio Marketplace version
+      if: github.event_name == 'workflow_dispatch' && inputs.publish_marketplace == true
+      id: vs_version_check
+      shell: pwsh
+      run: |
+        # Read local version from the vsixmanifest
+        $manifestPath = "visualstudio-extension/src/CopilotTokenTracker/source.extension.vsixmanifest"
+        [xml]$manifest = Get-Content $manifestPath
+        $localVersion = $manifest.PackageManifest.Metadata.Identity.Version
+        $extensionId  = $manifest.PackageManifest.Metadata.Identity.Id  # AIEngineeringFluency.VS.RobBos
+        Write-Host "Local version : $localVersion"
+        Write-Host "Extension Id  : $extensionId"
+
+        $body = @{
+            filters = @(@{ criteria = @(@{ filterType = 7; value = "RobBos.$extensionId" }) })
+            flags   = 512
+        } | ConvertTo-Json -Depth 10
+
+        try {
+          $r = Invoke-RestMethod -Method Post `
+            -Uri "https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery?api-version=3.0-preview.1" `
+            -Headers @{ "Content-Type" = "application/json"; "Accept" = "application/json;api-version=3.0-preview.1" } `
+            -Body $body
+          $marketplaceVersion = $r.results[0].extensions[0].versions[0].version
+          if (-not $marketplaceVersion) {
+            Write-Host "⚠️  Extension not found on VS Marketplace — proceeding with first publish."
+            exit 0
+          }
+          Write-Host "Marketplace version: $marketplaceVersion"
+          if ($localVersion -eq $marketplaceVersion) {
+            Write-Error "❌ Version $localVersion is already published on the Visual Studio Marketplace. Bump the version before publishing."
+            exit 1
+          }
+          Write-Host "✅ Version check passed: $localVersion is newer than marketplace $marketplaceVersion"
+        } catch {
+          Write-Warning "⚠️  Could not query VS Marketplace — proceeding with publish. Error: $_"
+        }
+
     - name: Publish to Visual Studio Marketplace
       if: github.event_name == 'workflow_dispatch' && inputs.publish_marketplace == true
       shell: pwsh

.github/workflows/scorecards.yml

@@ -76,6 +76,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
+        uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         with:
           sarif_file: results.sarif

.github/workflows/visualstudio-build.yml

@@ -369,7 +369,7 @@ jobs:
           egress-policy: audit
 
       - name: Download VSIX artifact
-        uses: actions/download-artifact@cbed621e49e4c01b044d60f6c80ea4ed6328b281 # v4.2.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4.2.0
         with:
           name: copilot-token-tracker-vs-${{ github.sha }}
           path: dist

README.md

@@ -1,5 +1,7 @@
 # GitHub Copilot Token Tracker
 
+![AI Engineering Fluency](assets/AI%20Engineering%20Fluency%20-%20Transparent.png)
+
 Track your GitHub Copilot token usage and AI Fluency across VS Code, Visual Studio, and the command line. All data is read from local session logs — nothing leaves your machine unless you opt in to cloud sync.
 
 [![Build](https://github.com/rajbos/github-copilot-token-usage/actions/workflows/build.yml/badge.svg)](https://github.com/rajbos/github-copilot-token-usage/actions/workflows/build.yml)
@@ -11,6 +13,7 @@ Track your GitHub Copilot token usage and AI Fluency across VS Code, Visual Stud
 - GitHub Copilot CLI
 - OpenCode + GitHub Copilot
 - Crush + GitHub Copilot
+- Claude Code (Anthropic)
 - Visual Studio + GitHub Copilot
 
 ---

assets/AI Engineering Fluency - Black.png

@@ -6,6 +6,13 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 ## [Unreleased]
 
+## [0.0.5] - 2026-03-28
+
+### ✨ Features & Improvements
+- Added Claude Code session file support as a usage analysis data source
+- Added formatting options (number formatting) to stats output
+- Fixed CLI output references
+
 ## [0.0.4] - 2026-03-26
 
 ### ✨ Features & Improvements

assets/AI Engineering Fluency - Transparent.png

@@ -1,5 +1,7 @@
 # Copilot Token Tracker CLI
 
+![AI Engineering Fluency](../assets/AI%20Engineering%20Fluency%20-%20Transparent.png)
+
 > For user-facing documentation and command examples, see [docs/cli/README.md](../docs/cli/README.md).
 
 ## Development