diff --git a/.cursor/worktrees.json b/.cursor/worktrees.json
new file mode 100644
index 00000000..ded97ab6
--- /dev/null
+++ b/.cursor/worktrees.json
@@ -0,0 +1,5 @@
+{
+  "setup-worktree": [
+    "yarn install"
+  ]
+}
diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
index 0e268709..bcf776c8 100644
--- a/.github/actions/release/action.yml
+++ b/.github/actions/release/action.yml
@@ -39,6 +39,26 @@ runs:
         upload-url: ${{ steps.create_release.outputs.upload_url }}
         release-tag: ${{ env.LATEST_TAG }}
         
+    - name: Set up Node.js for npm publish
+      uses: actions/setup-node@v4
+      with:
+        registry-url: "https://registry.npmjs.org"
+        scope: "@devcycle"
+
+    - name: Update npm for OIDC support
+      shell: bash
+      run: npm install -g npm@11.6.2
+
+    - name: Verify npm version for OIDC
+      shell: bash
+      run: |
+        npm_version=$(npm --version)
+        echo "npm version: $npm_version"
+        if [ "$(printf '%s\n' "11.6.2" "$npm_version" | sort -V | head -n1)" != "11.6.2" ]; then
+          echo "Error: npm version $npm_version is below 11.6.2 required for OIDC trusted publishing"
+          exit 1
+        fi
+
     - name: Publish to NPM
       shell: bash
       run: npm publish --access public
diff --git a/server.json b/server.json
index 528ecd13..be8fefdf 100644
--- a/server.json
+++ b/server.json
@@ -1,21 +1,21 @@
 {
-  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-10-17/server.schema.json",
-  "name": "com.devcycle/mcp",
-  "description": "DevCycle MCP server for feature flag management",
-  "version": "6.1.3",
-  "repository": {
-    "url": "https://github.com/DevCycleHQ/cli",
-    "source": "github"
-  },
-  "websiteUrl": "https://docs.devcycle.com/cli-mcp/mcp-getting-started",
-  "remotes": [
-    {
-      "type": "streamable-http",
-      "url": "https://mcp.devcycle.com/mcp"
+    "$schema": "https://static.modelcontextprotocol.io/schemas/2025-10-17/server.schema.json",
+    "name": "com.devcycle/mcp",
+    "description": "DevCycle MCP server for feature flag management",
+    "version": "6.1.3",
+    "repository": {
+        "url": "https://github.com/DevCycleHQ/cli",
+        "source": "github"
     },
-    {
-      "type": "sse",
-      "url": "https://mcp.devcycle.com/sse"
-    }
-  ]
+    "websiteUrl": "https://docs.devcycle.com/cli-mcp/mcp-getting-started",
+    "remotes": [
+        {
+            "type": "streamable-http",
+            "url": "https://mcp.devcycle.com/mcp"
+        },
+        {
+            "type": "sse",
+            "url": "https://mcp.devcycle.com/sse"
+        }
+    ]
 }