diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
index bec88aa51..333286f73 100644
--- a/.github/workflows/checks.yaml
+++ b/.github/workflows/checks.yaml
@@ -22,7 +22,7 @@ jobs:
         with:
           node-version-file: .tool-versions
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Check formatting
@@ -37,7 +37,7 @@ jobs:
         with:
           node-version-file: .tool-versions
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Lint
@@ -52,7 +52,7 @@ jobs:
         with:
           node-version-file: .tool-versions
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Check typings
@@ -67,7 +67,7 @@ jobs:
         with:
           node-version-file: .tool-versions
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Check dead code
@@ -95,7 +95,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Build
@@ -119,7 +119,7 @@ jobs:
           node-version: 20
           registry-url: "https://registry.npmjs.org"
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Build
@@ -155,7 +155,7 @@ jobs:
         with:
           node-version-file: .tool-versions
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Run hermetic e2e tests
@@ -176,7 +176,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: "https://registry.npmjs.org"
-      - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+      - uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
         name: Install pnpm
       - name: Get published braintrust version for cache key
         id: published-version
@@ -265,7 +265,7 @@ jobs:
         with:
           node-version-file: .tool-versions
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Download build artifacts
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
@@ -341,7 +341,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Build braintrust
@@ -367,7 +367,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Build braintrust
@@ -418,7 +418,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Setup Node.js
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
diff --git a/.github/workflows/e2e-canary.yaml b/.github/workflows/e2e-canary.yaml
index 12a287004..4dd86759e 100644
--- a/.github/workflows/e2e-canary.yaml
+++ b/.github/workflows/e2e-canary.yaml
@@ -25,7 +25,7 @@ jobs:
         with:
           node-version-file: .tool-versions
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Run canary e2e tests
diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml
index 7b7b88ef3..08068ce3b 100644
--- a/.github/workflows/integration-tests.yaml
+++ b/.github/workflows/integration-tests.yaml
@@ -39,7 +39,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           registry-url: "https://registry.npmjs.org"
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Build
@@ -72,7 +72,7 @@ jobs:
         with:
           node-version-file: .tool-versions
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Prepare e2e run context directory
@@ -121,7 +121,7 @@ jobs:
         with:
           node-version-file: .tool-versions
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Run canary e2e tests
diff --git a/.github/workflows/prepare-js-release.yaml b/.github/workflows/prepare-js-release.yaml
index d074c96d1..8157c58bb 100644
--- a/.github/workflows/prepare-js-release.yaml
+++ b/.github/workflows/prepare-js-release.yaml
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
         with:
           fetch-depth: 0
-      - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+      - uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: .tool-versions
diff --git a/.github/workflows/publish-js-sdk.yaml b/.github/workflows/publish-js-sdk.yaml
index 36ce68b7f..51a974b26 100644
--- a/.github/workflows/publish-js-sdk.yaml
+++ b/.github/workflows/publish-js-sdk.yaml
@@ -38,7 +38,7 @@ jobs:
         with:
           fetch-depth: 0
           ref: ${{ inputs.ref }}
-      - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+      - uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: .tool-versions
@@ -145,7 +145,7 @@ jobs:
         with:
           fetch-depth: 0
           ref: ${{ inputs.ref }}
-      - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+      - uses: pnpm/action-setup@26f6d4f2c533a43e6b5da0b4a5dd983f98f7b49a # v6.0.4
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: .tool-versions