Merge branch 'next' of https://github.com/storybookjs/mcp into single-component-doc

Author: JReinhold

.changeset/sour-colts-retire.md

@@ -0,0 +1,5 @@
+---
+'@storybook/addon-mcp': patch
+---
+
+Handle GET responses in the MCP server

.github/actions/setup-node-and-install/action.yml

@@ -1,22 +1,20 @@
 name: 'Setup Node.js and Dependencies'
-description: 'Sets up Node.js, caches and installs dependencies'
+description: 'Sets up Node.js, caches, installs dependencies and turbo cache'
 
 runs:
   using: 'composite'
   steps:
-    - name: Setup Node.js
-      uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
-      with:
-        node-version-file: '.nvmrc'
-
     - name: Install pnpm
       uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
-    - name: Setup Node.js
+    - name: Use Node.js 24
       uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
       with:
-        node-version: 24
-        cache: 'pnpm'
+        cache: pnpm
+        node-version-file: '.nvmrc'
+
+    - name: Cache for Turbo
+      uses: rharkor/caching-for-turbo@2b4b5b14a8d16b8556a58993a8ac331d56d8906d # v2.3.2
 
     - name: Install dependencies
       shell: bash

.github/instructions/addon-mcp.instructions.md

@@ -149,17 +149,24 @@ Launches the MCP inspector for debugging the addon's MCP server using the config
 
 ### Testing
 
-The addon has comprehensive unit tests covering all utilities and tools:
+The addon has comprehensive unit tests covering all utilities and tools. Tests can be run at the package level or from the monorepo root:
 
 ```bash
+# From the package directory
 pnpm test          # Run tests in watch mode
 pnpm test run      # Run tests once
 pnpm test run --coverage  # Run tests with coverage report
+
+# From the monorepo root (runs tests across all packages)
+pnpm test          # Run all tests in watch mode
+pnpm test:run      # Run all tests once
+pnpm test:ci       # Run tests with coverage and CI reporters
 ```
 
 **Test Infrastructure:**
 
-- **Framework**: Vitest 3.2.4 with @vitest/coverage-v8
+- **Framework**: Vitest with @vitest/coverage-v8
+- **Configuration**: Root-level vitest.config.ts with per-package projects
 - **Fixtures**: JSON fixtures in `fixtures/` directory for story index data
 
 **Test Coverage Baseline:**
@@ -212,11 +219,11 @@ When adding new functionality:
 3. Mock external dependencies (fetch, logger, telemetry)
 4. Use fixtures for complex data structures
 5. Test both success and error paths
-6. Run `pnpm test run --coverage` to verify coverage
+6. Run `pnpm test run --coverage` (from package) or `pnpm test:ci` (from root) to verify coverage
 
 **CI Integration:**
 
-Tests run automatically on PRs and main branch pushes via `.github/workflows/check.yml` as the `test-addon-mcp` job.
+Tests run automatically on PRs and main branch pushes via `.github/workflows/check.yml` in the `test` job, which runs `pnpm turbo run test:ci` across all packages.
 
 ## Code Style and Conventions
 

.github/instructions/mcp.instructions.md

@@ -118,19 +118,23 @@ Formats code using prettier.
 To check formatting without applying changes:
 
 ```bash
-pnpm format --check
+pnpm format:check
 ```
 
 ### Testing
 
-```bash
-pnpm test run
-```
-
-Or with coverage enabled:
+Tests can be run at the package level or from the monorepo root:
 
 ```bash
-pnpm test run --coverage
+# From the package directory
+pnpm test          # Run tests in watch mode
+pnpm test run      # Run tests once
+pnpm test run --coverage  # Run tests with coverage
+
+# From the monorepo root (runs tests across all packages)
+pnpm test          # Run all tests in watch mode
+pnpm test:run      # Run all tests once
+pnpm test:ci       # Run tests with coverage and CI reporters
 ```
 
 **Important**: Vitest automatically clears all mocks between tests, so you should never need to call `vi.clearAllMocks()` in a `beforeEach` hook.

.github/workflows/check.yml

@@ -7,13 +7,15 @@ on:
       - main
       - next
 
-permissions:
-  id-token: write # used to upload artifacts to codecov
+env:
+  TURBO_ENV_MODE: loose
 
 jobs:
-  build-mcp:
-    name: Build @storybook/mcp
+  build:
+    name: Build
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write # used to upload artifacts to codecov
     steps:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -24,22 +26,7 @@ jobs:
         uses: ./.github/actions/setup-node-and-install
 
       - name: Build
-        run: pnpm build --env-mode=loose --filter @storybook/mcp
-
-  build-addon-mcp:
-    name: Build @storybook/addon-mcp
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          fetch-depth: 2 # see https://docs.codecov.com/docs/environment-specific-requirements#github-actions
-
-      - name: Setup Node.js and Install Dependencies
-        uses: ./.github/actions/setup-node-and-install
-
-      - name: Build
-        run: pnpm build --env-mode=loose --filter @storybook/addon-mcp
+        run: pnpm turbo run build
 
   build-storybook:
     name: Build internal Storybook
@@ -52,70 +39,44 @@ jobs:
         uses: ./.github/actions/setup-node-and-install
 
       - name: Build
-        run: pnpm build-storybook
+        run: pnpm turbo run build-storybook
 
-  test-mcp:
-    name: Test @storybook/mcp
+  test:
+    name: Test
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write # used to upload artifacts to codecov
     steps:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          fetch-depth: 2 # see https://docs.codecov.com/docs/environment-specific-requirements#github-actions
 
       - name: Setup Node.js and Install Dependencies
         uses: ./.github/actions/setup-node-and-install
 
       - name: Run tests with coverage
-        run: pnpm --filter @storybook/mcp test run --coverage --reporter=default --reporter=junit --outputFile=test-report.junit.xml
+        run: pnpm turbo run test:ci
 
-      - name: Upload test and coverage artifact
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
-        if: always()
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
         with:
-          name: test-mcp
-          path: |
-            packages/mcp/coverage/
-            packages/mcp/test-report.junit.xml
-
-  test-addon-mcp:
-    name: Test @storybook/addon-mcp
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-
-      - name: Setup Node.js and Install Dependencies
-        uses: ./.github/actions/setup-node-and-install
-
-      - name: Build @storybook/mcp (dependency)
-        run: pnpm build --filter @storybook/mcp
-
-      - name: Run tests with coverage
-        run: pnpm --filter @storybook/addon-mcp test run --coverage --reporter=default --reporter=junit --outputFile=test-report.junit.xml
+          use_oidc: true
+          fail_ci_if_error: true
+          files: |
+            coverage/lcov.info
 
-      - name: Upload test and coverage artifact
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+      - name: Upload test results to Codecov
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
         if: always()
         with:
-          name: test-addon-mcp
-          path: |
-            packages/addon-mcp/coverage/
-            packages/addon-mcp/test-report.junit.xml
-
-  typecheck-mcp:
-    name: Type check @storybook/mcp
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-
-      - name: Setup Node.js and Install Dependencies
-        uses: ./.github/actions/setup-node-and-install
-
-      - name: Run type checking
-        run: pnpm --filter @storybook/mcp typecheck
+          use_oidc: true
+          fail_ci_if_error: true
+          files: |
+            test-report.junit.xml
 
-  typecheck-addon-mcp:
-    name: Type check @storybook/addon-mcp
+  typecheck:
+    name: Type check
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -124,11 +85,8 @@ jobs:
       - name: Setup Node.js and Install Dependencies
         uses: ./.github/actions/setup-node-and-install
 
-      - name: Build @storybook/mcp (dependency)
-        run: pnpm build --filter @storybook/mcp
-
       - name: Run type checking
-        run: pnpm --filter @storybook/addon-mcp typecheck
+        run: pnpm turbo run typecheck
 
   publint:
     name: Publint
@@ -141,7 +99,7 @@ jobs:
         uses: ./.github/actions/setup-node-and-install
 
       - name: Run linting
-        run: pnpm publint
+        run: pnpm turbo run publint
 
   lint:
     name: Lint
@@ -154,7 +112,7 @@ jobs:
         uses: ./.github/actions/setup-node-and-install
 
       - name: Run linting
-        run: pnpm lint
+        run: pnpm turbo run lint:ci
 
   format-check:
     name: Check formatting
@@ -167,44 +125,4 @@ jobs:
         uses: ./.github/actions/setup-node-and-install
 
       - name: Check formatting
-        run: pnpm format --check
-
-  collect-coverage:
-    name: Collect coverage and test results
-    runs-on: ubuntu-latest
-    needs: [test-mcp, test-addon-mcp]
-    if: always()
-    steps:
-      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          fetch-depth: 2 # see https://docs.codecov.com/docs/environment-specific-requirements#github-actions
-
-      - name: Download @storybook/mcp coverage
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
-        with:
-          name: test-mcp
-          path: packages/mcp/
-
-      - name: Download @storybook/addon-mcp coverage
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
-        with:
-          name: test-addon-mcp
-          path: packages/addon-mcp/
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
-        with:
-          use_oidc: true
-          fail_ci_if_error: true
-          files: |
-            packages/mcp/coverage/lcov.info
-            packages/addon-mcp/coverage/lcov.info
-      - name: Upload test results to Codecov
-        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
-        with:
-          use_oidc: true
-          fail_ci_if_error: true
-          files: |
-            packages/mcp/test-report.junit.xml
-            packages/addon-mcp/test-report.junit.xml
+        run: pnpm turbo run format:check

.github/workflows/publish-preview.yml

@@ -7,6 +7,9 @@ on:
       - main
       - next
 
+env:
+  TURBO_ENV_MODE: loose
+
 jobs:
   release-preview:
     name: Publish preview releases

.github/workflows/release.yml

@@ -6,6 +6,9 @@ on:
       - main
       - next
 
+env:
+  TURBO_ENV_MODE: loose
+
 jobs:
   release:
     permissions:

.prettierignore

@@ -0,0 +1 @@
+pnpm-lock.yaml