Merge branch 'main' into fix/preview-stories-monorepo-import-path-matching

Author: JReinhold

.changeset/all-pans-rest.md

@@ -0,0 +1,10 @@
+---
+'@storybook/addon-mcp': minor
+'@storybook/mcp': minor
+---
+
+Remove support for XML format.
+
+## Breaking Change
+
+The related option to configure XML vs markdown format now has no impact, the output is always formatted as markdown.

.changeset/legal-facts-refuse.md

@@ -0,0 +1,6 @@
+---
+'@storybook/addon-mcp': minor
+'@storybook/mcp': minor
+---
+
+Add multi-source composition with OAuth for private Storybooks

.github/copilot-instructions.md

@@ -35,8 +35,7 @@ The addon supports configuring which toolsets are enabled:
       toolsets: {
         dev: true,
         docs: true,
-      },
-      experimentalFormat: 'markdown'  // Output format: 'markdown' (default) or 'xml'
+      }
     }
   }
   ```
@@ -74,11 +73,8 @@ The `@storybook/mcp` package (in `packages/mcp`) is framework-agnostic:
   - `onSessionInitialize`: Called when an MCP session is initialized
   - `onListAllDocumentation`: Called when the list-all-documentation tool is invoked
   - `onGetDocumentation`: Called when the get-documentation tool is invoked
-- **Output Format**: The `format` property in context controls output format:
-  - `'markdown'` (default): Token-efficient markdown with adaptive formatting
-  - `'xml'`: Legacy XML format
-  - Format is configurable via addon options or directly in `StorybookContext`
-  - Formatters are implemented in `packages/mcp/src/utils/manifest-formatter/` with separate files for XML and markdown
+- **Output Format**: Responses are markdown-only (token-efficient markdown with adaptive formatting).
+  - Formatter implementations are in `packages/mcp/src/utils/manifest-formatter/`.
 
 ## Development Environment
 

.github/instructions/mcp.instructions.md

@@ -29,7 +29,7 @@ src/
     list-all-documentation.ts              # List all documentation tool
     get-documentation.ts      # Get component documentation tool
   utils/
-    format-manifest.ts                  # Format component manifest to XML
+    manifest-formatter/markdown.ts      # Format component/docs manifests to markdown
     parse-react-docgen.ts              # Parse react-docgen output
     get-manifest.ts                    # Fetch and validate manifest
     dedent.ts                          # Template string dedentation
@@ -107,19 +107,8 @@ Component manifests can include a `reactDocgen` property containing prop informa
    - Extracts prop names
    - Serializes TypeScript types into readable strings (handles unions, intersections, functions, objects, etc.)
    - Includes optional fields: `description`, `type`, `defaultValue`, `required`
-3. **Formatting**: The `formatComponentManifest()` function in `src/utils/format-manifest.ts` generates an XML representation of the component including a `<props>` section when `reactDocgen` is present
-4. **Output**: Each prop is formatted as:
-   ```xml
-   <prop>
-     <prop_name>propName</prop_name>
-     <prop_type>string | number</prop_type>
-     <prop_required>false</prop_required>
-     <prop_default>"default"</prop_default>
-     <prop_description>
-       Prop description text
-     </prop_description>
-   </prop>
-   ```
+3. **Formatting**: The markdown formatter in `src/utils/manifest-formatter/markdown.ts` generates markdown output for components, docs, and props (including a `## Props` section when `reactDocgen` is present)
+4. **Output**: Props are rendered in markdown as TypeScript-like declarations inside fenced code blocks, including optional description/default metadata when available.
 
 **Type serialization examples:**
 

.gitignore

@@ -12,3 +12,4 @@ test-report.junit.xml
 *storybook.log
 trials/
 orchestration-logs/
+CLAUDE.local.md

.vscode/mcp.json

@@ -0,0 +1,8 @@
+{
+	"servers": {
+		"Storybook MCP": {
+			"url": "http://localhost:6006/mcp",
+			"type": "http"
+		}
+	}
+}

apps/internal-storybook/.storybook-composition-auth/main.ts

@@ -0,0 +1,18 @@
+import { defineMain } from '@storybook/react-vite/node';
+import baseConfig from '../.storybook/main';
+
+/**
+ * Multi-source Storybook configuration with a private Chromatic ref.
+ * Used for manual testing of the OAuth composition auth flow.
+ */
+const config = defineMain({
+	...baseConfig,
+	refs: {
+		'test-private-sb': {
+			title: 'Test Private SB',
+			url: 'https://main--6985a38660050ca8a9e62053.chromatic.com',
+		},
+	},
+});
+
+export default config;

apps/internal-storybook/.storybook-composition-auth/preview.ts

@@ -0,0 +1 @@
+export { default } from '../.storybook/preview';

apps/internal-storybook/.storybook-composition/main.ts

@@ -0,0 +1,23 @@
+import { defineMain } from '@storybook/react-vite/node';
+import baseConfig from '../.storybook/main';
+
+/**
+ * Multi-source Storybook configuration with composition (refs).
+ * Used for E2E tests that verify multi-source/composition behavior.
+ */
+const config = defineMain({
+	...baseConfig,
+	// Composition with public Chromatic Storybook (storybook-ui next branch)
+	refs: {
+		'storybook-ui': {
+			title: 'Storybook UI',
+			url: 'https://next--635781f3500dd2c49e189caf.chromatic.com',
+		},
+		'no-manifest': {
+			title: 'No Manifest',
+			url: 'https://66b1e47012f95c6f90c8882e-eplpsjesci.chromatic.com',
+		},
+	},
+});
+
+export default config;

apps/internal-storybook/.storybook-composition/preview.ts

@@ -0,0 +1 @@
+export { default } from '../.storybook/preview';