From 83d7c44500561c70e1068009ff14df6e04ebe8b3 Mon Sep 17 00:00:00 2001
From: mjr-openai <mjr@openai.com>
Date: Wed, 28 Jan 2026 18:30:48 -0500
Subject: [PATCH] update the ci pnpm workflow for shell-tool-mcp to use
 corepack for pnpm versioning (#10115)

This updates the CI workflows for shell-tool-mcp to use the pnpm version
from package.json and print it in the build for verification.

I have read the CLA Document and I hereby sign the CLA
---
 .github/workflows/shell-tool-mcp-ci.yml |  9 +++++++++
 .github/workflows/shell-tool-mcp.yml    | 19 +++++++++++++++++--
 package.json                            |  2 +-
 shell-tool-mcp/package.json             |  1 +
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/shell-tool-mcp-ci.yml b/.github/workflows/shell-tool-mcp-ci.yml
index 739cc6e409..bea88ad891 100644
--- a/.github/workflows/shell-tool-mcp-ci.yml
+++ b/.github/workflows/shell-tool-mcp-ci.yml
@@ -35,6 +35,15 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: "pnpm"
 
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Activate pnpm from package.json
+        run: corepack prepare --activate
+
+      - name: Verify pnpm version
+        run: pnpm --version
+
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
diff --git a/.github/workflows/shell-tool-mcp.yml b/.github/workflows/shell-tool-mcp.yml
index 88cdc28b3a..446af67918 100644
--- a/.github/workflows/shell-tool-mcp.yml
+++ b/.github/workflows/shell-tool-mcp.yml
@@ -351,6 +351,15 @@ jobs:
         with:
           node-version: ${{ env.NODE_VERSION }}
 
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Activate pnpm from package.json
+        run: corepack prepare --activate
+
+      - name: Verify pnpm version
+        run: pnpm --version
+
       - name: Install JavaScript dependencies
         run: pnpm install --frozen-lockfile
 
@@ -448,8 +457,14 @@ jobs:
           registry-url: https://registry.npmjs.org
           scope: "@openai"
 
-      - name: Update npm
-        run: npm install -g npm@latest
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Activate pnpm from package.json
+        run: corepack prepare --activate
+
+      - name: Verify pnpm version
+        run: pnpm --version
 
       - name: Download npm tarball
         uses: actions/download-artifact@v7
diff --git a/package.json b/package.json
index 9f1452a972..633a6f8331 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "engines": {
     "node": ">=22",
-    "pnpm": ">=9.0.0"
+    "pnpm": ">=10.28.0"
   },
   "packageManager": "pnpm@10.28.2+sha512.41872f037ad22f7348e3b1debbaf7e867cfd448f2726d9cf74c08f19507c31d2c8e7a11525b983febc2df640b5438dee6023ebb1f84ed43cc2d654d2bc326264"
 }
diff --git a/shell-tool-mcp/package.json b/shell-tool-mcp/package.json
index 24798b2f6e..c6dfcd7a55 100644
--- a/shell-tool-mcp/package.json
+++ b/shell-tool-mcp/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.0-dev",
   "description": "Codex MCP server for the shell tool with patched Bash and exec wrappers.",
   "license": "Apache-2.0",
+  "packageManager": "pnpm@10.28.2+sha512.41872f037ad22f7348e3b1debbaf7e867cfd448f2726d9cf74c08f19507c31d2c8e7a11525b983febc2df640b5438dee6023ebb1f84ed43cc2d654d2bc326264",
   "bin": {
     "codex-shell-tool-mcp": "bin/mcp-server.js"
   },