diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a63902dfa6c..6493743dae6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 10.2.6
+
+- Addon-Vitest: Skip postinstall setup when configured - [#33712](https://github.com/storybookjs/storybook/pull/33712), thanks @valentinpalkovic!
+- Addon-Vitest: Support vite/vitest config with deferred export - [#33755](https://github.com/storybookjs/storybook/pull/33755), thanks @valentinpalkovic!
+- CLI: Support addon-vitest setup when --skip-install is passed - [#33718](https://github.com/storybookjs/storybook/pull/33718), thanks @valentinpalkovic!
+- Manager: Update logic to use base path instead of full pathname - [#33686](https://github.com/storybookjs/storybook/pull/33686), thanks @JSMike!
+
 ## 10.2.5
 
 - Angular: fix --loglevel options in docs and descriptions - [#33726](https://github.com/storybookjs/storybook/pull/33726), thanks @theRuslan!
diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md
index 5ed5d7dbdb9a..5d26eb530d5a 100644
--- a/CHANGELOG.prerelease.md
+++ b/CHANGELOG.prerelease.md
@@ -1,3 +1,11 @@
+## 10.3.0-alpha.5
+
+- CLI: Support addon-vitest setup when --skip-install is passed - [#33718](https://github.com/storybookjs/storybook/pull/33718), thanks @valentinpalkovic!
+- CSF: Fix cross-file story imports in csf-factories codemod  - [#33723](https://github.com/storybookjs/storybook/pull/33723), thanks @yatishgoel!
+- Core: Ignore empty files when indexing - [#33782](https://github.com/storybookjs/storybook/pull/33782), thanks @JReinhold!
+- Globals: Repair dynamicTitle: false for user-defined tools - [#33284](https://github.com/storybookjs/storybook/pull/33284), thanks @ia319!
+- Logger: Honor --loglevel for npmlog output - [#33776](https://github.com/storybookjs/storybook/pull/33776), thanks @LouisLau-art!
+
 ## 10.3.0-alpha.4
 
 - Addon-Vitest: Support vite/vitest config with deferred export - [#33755](https://github.com/storybookjs/storybook/pull/33755), thanks @valentinpalkovic!
diff --git a/code/.eslintignore b/code/.eslintignore
index 5efb1ab25edc..0ee7fd976934 100644
--- a/code/.eslintignore
+++ b/code/.eslintignore
@@ -19,4 +19,5 @@ ember-output
 !.storybook
 core/assets
 core/src/core-server/utils/__search-files-tests__
+core/src/core-server/utils/__mockdata__/src/Empty.stories.ts
 core/report
diff --git a/code/addons/a11y/src/postinstall.ts b/code/addons/a11y/src/postinstall.ts
index d8cd0bf18b04..6fff2274b5ef 100644
--- a/code/addons/a11y/src/postinstall.ts
+++ b/code/addons/a11y/src/postinstall.ts
@@ -1,9 +1,13 @@
-import { JsPackageManagerFactory } from 'storybook/internal/common';
+import { JsPackageManagerFactory, versions } from 'storybook/internal/common';
 
 import type { PostinstallOptions } from '../../../lib/cli-storybook/src/add';
 
 export default async function postinstall(options: PostinstallOptions) {
-  const args = ['storybook', 'automigrate', 'addon-a11y-addon-test'];
+  const args = [
+    options.skipInstall ? `storybook@${versions.storybook}` : `storybook`,
+    'automigrate',
+    'addon-a11y-addon-test',
+  ];
 
   args.push('--loglevel', 'silent');
   args.push('--skip-doctor');
@@ -25,5 +29,5 @@ export default async function postinstall(options: PostinstallOptions) {
     configDir: options.configDir,
   });
 
-  await jsPackageManager.runPackageCommand({ args });
+  await jsPackageManager.runPackageCommand({ args, useRemotePkg: !!options.skipInstall });
 }
diff --git a/code/addons/vitest/src/postinstall.ts b/code/addons/vitest/src/postinstall.ts
index 37abe7af4560..85a178ff3aa7 100644
--- a/code/addons/vitest/src/postinstall.ts
+++ b/code/addons/vitest/src/postinstall.ts
@@ -9,6 +9,7 @@ import {
   formatFileContent,
   getProjectRoot,
   getStorybookInfo,
+  versions,
 } from 'storybook/internal/common';
 import { CLI_COLORS } from 'storybook/internal/node-logger';
 import type { StorybookError } from 'storybook/internal/server-errors';
@@ -161,6 +162,7 @@ export default async function postInstall(options: PostinstallOptions) {
     if (!options.skipInstall) {
       await addonVitestService.installPlaywright({
         yes: options.yes,
+        useRemotePkg: !!options.skipInstall,
       });
     } else {
       logger.warn(dedent`
@@ -229,11 +231,11 @@ export default async function postInstall(options: PostinstallOptions) {
 
   const getTemplateName = () => {
     if (isVitest4OrNewer) {
-      return 'vitest.config.4.template.ts';
+      return 'vitest.config.4.template';
     } else if (isVitest3_2To4) {
-      return 'vitest.config.3.2.template.ts';
+      return 'vitest.config.3.2.template';
     }
-    return 'vitest.config.template.ts';
+    return 'vitest.config.template';
   };
 
   // If there's an existing workspace file, we update that file to include the Storybook Addon Vitest plugin.
@@ -249,7 +251,7 @@ export default async function postInstall(options: PostinstallOptions) {
       return;
     }
 
-    const workspaceTemplate = await loadTemplate('vitest.workspace.template.ts', {
+    const workspaceTemplate = await loadTemplate('vitest.workspace.template', {
       EXTENDS_WORKSPACE: viteConfigFile
         ? relative(dirname(vitestWorkspaceFile), viteConfigFile)
         : '',
@@ -358,7 +360,7 @@ export default async function postInstall(options: PostinstallOptions) {
   if (a11yAddon) {
     try {
       const command = [
-        'storybook',
+        options.skipInstall ? `storybook@${versions.storybook}` : `storybook`,
         'automigrate',
         'addon-a11y-addon-test',
         '--loglevel',
@@ -381,7 +383,12 @@ export default async function postInstall(options: PostinstallOptions) {
 
       await prompt.executeTask(
         // TODO: Remove stdio: 'ignore' once we have a way to log the output of the command properly
-        () => packageManager.runPackageCommand({ args: command, stdio: 'ignore' }),
+        () =>
+          packageManager.runPackageCommand({
+            args: command,
+            stdio: 'ignore',
+            useRemotePkg: !!options.skipInstall,
+          }),
         {
           intro: 'Setting up a11y addon for @storybook/addon-vitest',
           error: 'Failed to setup a11y addon for @storybook/addon-vitest',
diff --git a/code/addons/vitest/src/typings.d.ts b/code/addons/vitest/src/typings.d.ts
index 235b6170bdd9..2a7a0f8e7a27 100644
--- a/code/addons/vitest/src/typings.d.ts
+++ b/code/addons/vitest/src/typings.d.ts
@@ -8,3 +8,8 @@ interface ImportMetaEnv {
 interface ImportMeta {
   readonly env: ImportMetaEnv;
 }
+
+declare module '*?raw' {
+  const content: string;
+  export default content;
+}
diff --git a/code/addons/vitest/src/updateVitestFile.test.ts b/code/addons/vitest/src/updateVitestFile.test.ts
index 02e8b4446579..5bf73bfee6e0 100644
--- a/code/addons/vitest/src/updateVitestFile.test.ts
+++ b/code/addons/vitest/src/updateVitestFile.test.ts
@@ -22,7 +22,7 @@ vi.mock('../../../core/src/shared/utils/module', () => ({
 describe('updateConfigFile', () => {
   it('updates vite config file', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.template.ts', {
+      await loadTemplate('vitest.config.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -102,7 +102,7 @@ describe('updateConfigFile', () => {
 
   it('supports object notation without defineConfig', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.template.ts', {
+      await loadTemplate('vitest.config.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -182,7 +182,7 @@ describe('updateConfigFile', () => {
 
   it('does not support function notation', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.template.ts', {
+      await loadTemplate('vitest.config.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -214,7 +214,7 @@ describe('updateConfigFile', () => {
 
   it('adds projects property to test config', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.3.2.template.ts', {
+      await loadTemplate('vitest.config.3.2.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -293,7 +293,7 @@ describe('updateConfigFile', () => {
 
   it('updates config which is not exported immediately', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.3.2.template.ts', {
+      await loadTemplate('vitest.config.3.2.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -378,7 +378,7 @@ describe('updateConfigFile', () => {
 
   it('edits projects property of test config', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.3.2.template.ts', {
+      await loadTemplate('vitest.config.3.2.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -458,7 +458,7 @@ describe('updateConfigFile', () => {
 
   it('adds workspace property to test config', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.template.ts', {
+      await loadTemplate('vitest.config.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -537,7 +537,7 @@ describe('updateConfigFile', () => {
 
   it('adds test property to vite config', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.template.ts', {
+      await loadTemplate('vitest.config.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -612,7 +612,7 @@ describe('updateConfigFile', () => {
 
   it('supports mergeConfig with multiple defineConfig calls, finding the one with test', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.template.ts', {
+      await loadTemplate('vitest.config.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -698,7 +698,7 @@ describe('updateConfigFile', () => {
   });
   it('supports mergeConfig without defineConfig calls', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.template.ts', {
+      await loadTemplate('vitest.config.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -781,7 +781,7 @@ describe('updateConfigFile', () => {
 
   it('supports mergeConfig without config containing test property', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.template.ts', {
+      await loadTemplate('vitest.config.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -857,7 +857,7 @@ describe('updateConfigFile', () => {
 
   it('supports mergeConfig with defineConfig pattern using projects (Vitest 3.2+)', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.3.2.template.ts', {
+      await loadTemplate('vitest.config.3.2.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -941,7 +941,7 @@ describe('updateConfigFile', () => {
 
   it('appends storybook project to existing test.projects array (no double nesting)', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.3.2.template.ts', {
+      await loadTemplate('vitest.config.3.2.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -1030,7 +1030,7 @@ describe('updateConfigFile', () => {
 
   it('extracts coverage config and keeps it at top level when using workspace', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.template.ts', {
+      await loadTemplate('vitest.config.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -1129,7 +1129,7 @@ describe('updateConfigFile', () => {
 
   it('extracts coverage config and keeps it at top level when using projects', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.config.3.2.template.ts', {
+      await loadTemplate('vitest.config.3.2.template', {
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
         SETUP_FILE: '../.storybook/vitest.setup.ts',
@@ -1230,7 +1230,7 @@ describe('updateConfigFile', () => {
 describe('updateWorkspaceFile', () => {
   it('updates vitest workspace file using array syntax', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.workspace.template.ts', {
+      await loadTemplate('vitest.workspace.template', {
         EXTENDS_WORKSPACE: '',
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
@@ -1286,7 +1286,7 @@ describe('updateWorkspaceFile', () => {
 
   it('updates vitest workspace file using defineWorkspace syntax', async () => {
     const source = babel.babelParse(
-      await loadTemplate('vitest.workspace.template.ts', {
+      await loadTemplate('vitest.workspace.template', {
         EXTENDS_WORKSPACE: '',
         CONFIG_DIR: '.storybook',
         BROWSER_CONFIG: "{ provider: 'playwright' }",
@@ -1349,7 +1349,7 @@ describe('loadTemplate', () => {
     // Windows-style path with backslashes (need to escape them in JS strings)
     const windowsPath = '.\\apps\\frontend-storybook\\.storybook';
 
-    const result = await loadTemplate('vitest.config.template.ts', {
+    const result = await loadTemplate('vitest.config.template', {
       CONFIG_DIR: windowsPath,
       SETUP_FILE: '.\\apps\\frontend-storybook\\.storybook\\vitest.setup.ts',
     });
@@ -1363,7 +1363,7 @@ describe('loadTemplate', () => {
     // Unix-style path with forward slashes
     const unixPath = './apps/frontend-storybook/.storybook';
 
-    const result = await loadTemplate('vitest.config.template.ts', {
+    const result = await loadTemplate('vitest.config.template', {
       CONFIG_DIR: unixPath,
       SETUP_FILE: './apps/frontend-storybook/.storybook/vitest.setup.ts',
     });
diff --git a/code/addons/vitest/src/updateVitestFile.ts b/code/addons/vitest/src/updateVitestFile.ts
index 6f0a782f5aa1..ca9a01bffd9a 100644
--- a/code/addons/vitest/src/updateVitestFile.ts
+++ b/code/addons/vitest/src/updateVitestFile.ts
@@ -1,16 +1,30 @@
-import * as fs from 'node:fs/promises';
-
 import type { BabelFile, types as t } from 'storybook/internal/babel';
 
-import { join, normalize } from 'pathe';
+import { normalize } from 'pathe';
 
-import { resolvePackageDir } from '../../../core/src/shared/utils/module';
+/**
+ * Each template is imported separately to allow the build system to process the template as raw
+ * text. A mix of globs and the "?raw" string query is not supported in esbuild
+ */
+async function getTemplatePath(name: string) {
+  switch (name) {
+    case 'vitest.config.template':
+      return import('../templates/vitest.config.template?raw');
+    case 'vitest.config.4.template':
+      return import('../templates/vitest.config.4.template?raw');
+    case 'vitest.config.3.2.template':
+      return import('../templates/vitest.config.3.2.template?raw');
+    case 'vitest.workspace.template':
+      return import('../templates/vitest.workspace.template?raw');
+    default:
+      throw new Error(`Unknown template: ${name}`);
+  }
+}
 
 export const loadTemplate = async (name: string, replacements: Record<string, string>) => {
-  let template = await fs.readFile(
-    join(resolvePackageDir('@storybook/addon-vitest'), 'templates', name),
-    'utf8'
-  );
+  // Dynamically import the template file as plain text
+  const templateModule = await getTemplatePath(name);
+  let template = templateModule.default;
   // Normalize Windows paths (backslashes) to forward slashes for JavaScript string compatibility
   Object.entries(replacements).forEach(
     ([key, value]) => (template = template.replace(key, normalize(value)))
diff --git a/code/core/src/bin/core.ts b/code/core/src/bin/core.ts
index 280e1888efe2..c930896899e7 100644
--- a/code/core/src/bin/core.ts
+++ b/code/core/src/bin/core.ts
@@ -2,7 +2,7 @@ import { getEnvConfig, optionalEnvToBoolean, parseList } from 'storybook/interna
 import { logTracker, logger } from 'storybook/internal/node-logger';
 import { addToGlobalContext } from 'storybook/internal/telemetry';
 
-import { program } from 'commander';
+import { Option, program } from 'commander';
 import leven from 'leven';
 import picocolors from 'picocolors';
 
@@ -45,7 +45,11 @@ const command = (name: string) =>
     )
     .option('--debug', 'Get more logs in debug mode', false)
     .option('--enable-crash-reports', 'Enable sending crash reports to telemetry data')
-    .option('--loglevel <trace | debug | info | warn | error | silent>', 'Define log level', 'info')
+    .addOption(
+      new Option('--loglevel <level>', 'Define log level')
+        .choices(['trace', 'debug', 'info', 'warn', 'error', 'silent'])
+        .default('info')
+    )
     .option(
       '--logfile [path]',
       'Write all debug logs to the specified file at the end of the run. Defaults to debug-storybook.log when [path] is not provided'
@@ -53,9 +57,8 @@ const command = (name: string) =>
     .hook('preAction', async (self) => {
       try {
         const options = self.opts();
-        if (options.loglevel) {
-          logger.setLogLevel(options.loglevel);
-        }
+        const loglevel = options.debug ? 'debug' : options.loglevel;
+        logger.setLogLevel(loglevel);
 
         if (options.logfile) {
           logTracker.enableLogWriting();
diff --git a/code/core/src/cli/AddonVitestService.ts b/code/core/src/cli/AddonVitestService.ts
index a9771ca53438..d959c843c718 100644
--- a/code/core/src/cli/AddonVitestService.ts
+++ b/code/core/src/cli/AddonVitestService.ts
@@ -115,7 +115,11 @@ export class AddonVitestService {
    * @returns Array of error messages if installation fails
    */
   async installPlaywright(
-    options: { yes?: boolean } = {}
+    options: {
+      yes?: boolean;
+      /** Is set to true if Storybook didn't install the dependencies yet */
+      useRemotePkg?: boolean;
+    } = {}
   ): Promise<{ errors: string[]; result: 'installed' | 'skipped' | 'aborted' | 'failed' }> {
     const errors: string[] = [];
 
@@ -148,6 +152,7 @@ export class AddonVitestService {
           (signal) =>
             this.packageManager.runPackageCommand({
               args: playwrightCommand,
+              useRemotePkg: options.useRemotePkg,
               stdio: ['inherit', 'pipe', 'pipe'],
               signal,
             }),
diff --git a/code/core/src/common/js-package-manager/JsPackageManager.ts b/code/core/src/common/js-package-manager/JsPackageManager.ts
index 7221aa4c08d6..53be2316dbca 100644
--- a/code/core/src/common/js-package-manager/JsPackageManager.ts
+++ b/code/core/src/common/js-package-manager/JsPackageManager.ts
@@ -624,7 +624,7 @@ export abstract class JsPackageManager {
     stdio?: 'inherit' | 'pipe' | 'ignore'
   ): ResultPromise;
   public abstract runPackageCommand(
-    options: Omit<ExecuteCommandOptions, 'command'> & { args: string[] }
+    options: Omit<ExecuteCommandOptions, 'command'> & { args: string[]; useRemotePkg?: boolean }
   ): ResultPromise;
   public abstract findInstallations(pattern?: string[]): Promise<InstallationMetadata | undefined>;
   public abstract findInstallations(
diff --git a/code/core/src/common/js-package-manager/PNPMProxy.ts b/code/core/src/common/js-package-manager/PNPMProxy.ts
index 9d442f31e4d1..1a6bb6839124 100644
--- a/code/core/src/common/js-package-manager/PNPMProxy.ts
+++ b/code/core/src/common/js-package-manager/PNPMProxy.ts
@@ -79,11 +79,15 @@ export class PNPMProxy extends JsPackageManager {
 
   public runPackageCommand({
     args,
+    useRemotePkg = false,
     ...options
-  }: Omit<ExecuteCommandOptions, 'command'> & { args: string[] }): ResultPromise {
+  }: Omit<ExecuteCommandOptions, 'command'> & {
+    args: string[];
+    useRemotePkg?: boolean;
+  }): ResultPromise {
     return executeCommand({
       command: 'pnpm',
-      args: ['exec', ...args],
+      args: [useRemotePkg ? 'dlx' : 'exec', ...args],
       ...options,
     });
   }
diff --git a/code/core/src/components/components/Select/Select.stories.tsx b/code/core/src/components/components/Select/Select.stories.tsx
index 4861d26ae5d1..a6abd2ce3db1 100644
--- a/code/core/src/components/components/Select/Select.stories.tsx
+++ b/code/core/src/components/components/Select/Select.stories.tsx
@@ -1479,3 +1479,61 @@ export const ResetWithUndefinedOption = meta.story({
     });
   },
 });
+
+export const ShowSelectedOptionTitleTrue = meta.story({
+  name: 'Show Selected Option Title (prop=true)',
+  args: {
+    showSelectedOptionTitle: true,
+    defaultOptions: 'frog',
+  },
+  play: async ({ canvas, step }) => {
+    await step('Verify selected option title is shown', async () => {
+      const selectButton = await canvas.findByRole('button');
+      expect(selectButton).toHaveTextContent('Frog');
+    });
+  },
+});
+
+export const ShowSelectedOptionTitleFalse = meta.story({
+  name: 'Show Selected Option Title (prop=false)',
+  args: {
+    showSelectedOptionTitle: false,
+    defaultOptions: 'frog',
+  },
+  play: async ({ canvas, step }) => {
+    await step('Verify default title is shown instead of selected option', async () => {
+      const selectButton = await canvas.findByRole('button');
+      expect(selectButton).toHaveTextContent('Animal');
+    });
+  },
+});
+
+export const ShowSelectedOptionTitleFalseMulti = meta.story({
+  name: 'Show Selected Option Title (prop=false, multi)',
+  args: {
+    showSelectedOptionTitle: false,
+    multiSelect: true,
+    defaultOptions: ['frog', 'tadpole'],
+  },
+  play: async ({ canvas, step }) => {
+    await step('Verify default title is shown for multi-select', async () => {
+      const selectButton = await canvas.findByRole('button');
+      expect(selectButton).toHaveTextContent('Animal');
+    });
+  },
+});
+
+export const ShowSelectedOptionTitleTrueMulti = meta.story({
+  name: 'Show Selected Option Title (prop=true, multi)',
+  args: {
+    showSelectedOptionTitle: true,
+    multiSelect: true,
+    defaultOptions: ['frog'],
+  },
+  play: async ({ canvas, step }) => {
+    await step('Verify option count is shown for multi-select', async () => {
+      const selectButton = await canvas.findByRole('button');
+      expect(selectButton).toHaveTextContent('1');
+    });
+  },
+});
diff --git a/code/core/src/components/components/Select/Select.tsx b/code/core/src/components/components/Select/Select.tsx
index 0844cb7ed982..e50c192aedba 100644
--- a/code/core/src/components/components/Select/Select.tsx
+++ b/code/core/src/components/components/Select/Select.tsx
@@ -78,6 +78,13 @@ export interface SelectProps extends Omit<
   onSelect?: (option: Value) => void;
   onDeselect?: (option: Value) => void;
   onChange?: (selected: Value[]) => void;
+  /**
+   * Legacy option for ToolbarMenuSelect. Do not use in new code. Controls whether to show the
+   * selected option's title.
+   *
+   * @default true
+   */
+  showSelectedOptionTitle?: boolean;
 }
 
 function valueToId(parentId: string, { value }: InternalOption | ResetOption): string {
@@ -208,6 +215,7 @@ export const Select = forwardRef<HTMLButtonElement, SelectProps>(
       onChange,
       tooltip,
       ariaLabel,
+      showSelectedOptionTitle = true,
       ...props
     },
     ref
@@ -522,7 +530,7 @@ export const Select = forwardRef<HTMLButtonElement, SelectProps>(
           {!multiSelect && (
             <>
               {icon}
-              {selectedOptions[0]?.title ?? children}
+              {(showSelectedOptionTitle && selectedOptions[0]?.title) || children}
             </>
           )}
 
diff --git a/code/core/src/core-server/presets/common-preset.ts b/code/core/src/core-server/presets/common-preset.ts
index 36f40b823c94..cd9ab70adc9d 100644
--- a/code/core/src/core-server/presets/common-preset.ts
+++ b/code/core/src/core-server/presets/common-preset.ts
@@ -13,7 +13,7 @@ import {
   removeAddon as removeAddonBase,
 } from 'storybook/internal/common';
 import { StoryIndexGenerator } from 'storybook/internal/core-server';
-import { readCsf } from 'storybook/internal/csf-tools';
+import { loadCsf } from 'storybook/internal/csf-tools';
 import { logger } from 'storybook/internal/node-logger';
 import { telemetry } from 'storybook/internal/telemetry';
 import type {
@@ -215,7 +215,14 @@ export const features: PresetProperty<'features'> = async (existing) => ({
 
 export const csfIndexer: Indexer = {
   test: /(stories|story)\.(m?js|ts)x?$/,
-  createIndex: async (fileName, options) => (await readCsf(fileName, options)).parse().indexInputs,
+  createIndex: async (fileName, options) => {
+    const code = (await readFile(fileName, 'utf-8')).toString();
+    if (code.trim().length === 0) {
+      logger.debug(`The file ${fileName} is empty. Skipping indexing.`);
+      return [];
+    }
+    return loadCsf(code, { ...options, fileName }).parse().indexInputs;
+  },
 };
 
 export const experimental_indexers: PresetProperty<'experimental_indexers'> = (existingIndexers) =>
diff --git a/code/core/src/core-server/utils/StoryIndexGenerator.test.ts b/code/core/src/core-server/utils/StoryIndexGenerator.test.ts
index 857f06b12542..6692ea1881b4 100644
--- a/code/core/src/core-server/utils/StoryIndexGenerator.test.ts
+++ b/code/core/src/core-server/utils/StoryIndexGenerator.test.ts
@@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { normalizeStoriesEntry } from 'storybook/internal/common';
 import { toId } from 'storybook/internal/csf';
-import { getStorySortParameter, readCsf } from 'storybook/internal/csf-tools';
+import { getStorySortParameter, loadCsf } from 'storybook/internal/csf-tools';
 import { logger, once } from 'storybook/internal/node-logger';
 import type { NormalizedStoriesSpecifier, StoryIndexEntry } from 'storybook/internal/types';
 
@@ -34,13 +34,13 @@ vi.mock('storybook/internal/csf-tools', async (importOriginal) => {
   const csfTools = await importOriginal<typeof import('storybook/internal/csf-tools')>();
   return {
     ...csfTools,
-    readCsf: vi.fn(csfTools.readCsf),
+    loadCsf: vi.fn(csfTools.loadCsf),
     getStorySortParameter: vi.fn(csfTools.getStorySortParameter),
   };
 });
 
 const toIdMock = vi.mocked(toId);
-const readCsfMock = vi.mocked(readCsf);
+const loadCsfMock = vi.mocked(loadCsf);
 const getStorySortParameterMock = vi.mocked(getStorySortParameter);
 
 const options: StoryIndexGeneratorOptions = {
@@ -55,7 +55,7 @@ describe('StoryIndexGenerator', () => {
     vi.mocked(logger.warn).mockClear();
     vi.mocked(once.warn).mockClear();
     toIdMock.mockClear();
-    readCsfMock.mockClear();
+    loadCsfMock.mockClear();
     getStorySortParameterMock.mockClear();
     StoryIndexGenerator.clearFindMatchingFilesCache();
   });
@@ -221,6 +221,25 @@ describe('StoryIndexGenerator', () => {
         `);
       });
     });
+    describe('empty or whitespace-only files', () => {
+      it('ignores story files that only contain whitespace (e.g. just a newline)', async () => {
+        const specifier: NormalizedStoriesSpecifier = normalizeStoriesEntry(
+          './src/Empty.stories.ts',
+          options
+        );
+
+        const generator = new StoryIndexGenerator([specifier], options);
+        await generator.initialize();
+
+        const { storyIndex } = await generator.getIndexAndStats();
+        expect(storyIndex).toMatchInlineSnapshot(`
+          {
+            "entries": {},
+            "v": 5,
+          }
+        `);
+      });
+    });
     describe('non-recursive specifier', () => {
       it('extracts stories from the right files', async () => {
         const specifier: NormalizedStoriesSpecifier = normalizeStoriesEntry(
@@ -2135,16 +2154,16 @@ describe('StoryIndexGenerator', () => {
           options
         );
 
-        readCsfMock.mockClear();
-        expect(readCsfMock).toHaveBeenCalledTimes(0);
+        loadCsfMock.mockClear();
+        expect(loadCsfMock).toHaveBeenCalledTimes(0);
         const generator = new StoryIndexGenerator([specifier], options);
         await generator.initialize();
         await generator.getIndex();
-        expect(readCsfMock).toHaveBeenCalledTimes(12);
+        expect(loadCsfMock).toHaveBeenCalledTimes(12);
 
-        readCsfMock.mockClear();
+        loadCsfMock.mockClear();
         await generator.getIndex();
-        expect(readCsfMock).not.toHaveBeenCalled();
+        expect(loadCsfMock).not.toHaveBeenCalled();
       });
 
       it('does not extract docs files a second time', async () => {
@@ -2156,8 +2175,8 @@ describe('StoryIndexGenerator', () => {
           './src/docs2/*.mdx',
           options
         );
-        readCsfMock.mockClear();
-        expect(readCsfMock).toHaveBeenCalledTimes(0);
+        loadCsfMock.mockClear();
+        expect(loadCsfMock).toHaveBeenCalledTimes(0);
         const generator = new StoryIndexGenerator([storiesSpecifier, docsSpecifier], options);
         await generator.initialize();
         await generator.getIndex();
@@ -2194,17 +2213,17 @@ describe('StoryIndexGenerator', () => {
           options
         );
 
-        readCsfMock.mockClear();
+        loadCsfMock.mockClear();
         const generator = new StoryIndexGenerator([specifier], options);
         await generator.initialize();
         await generator.getIndex();
-        expect(readCsfMock).toHaveBeenCalledTimes(12);
+        expect(loadCsfMock).toHaveBeenCalledTimes(12);
 
         generator.invalidate('./src/B.stories.ts', false);
 
-        readCsfMock.mockClear();
+        loadCsfMock.mockClear();
         await generator.getIndex();
-        expect(readCsfMock).toHaveBeenCalledTimes(1);
+        expect(loadCsfMock).toHaveBeenCalledTimes(1);
       });
 
       it('calls extract docs file for just the one file', async () => {
@@ -2279,17 +2298,17 @@ describe('StoryIndexGenerator', () => {
           options
         );
 
-        readCsfMock.mockClear();
+        loadCsfMock.mockClear();
         const generator = new StoryIndexGenerator([specifier], options);
         await generator.initialize();
         await generator.getIndex();
-        expect(readCsfMock).toHaveBeenCalledTimes(12);
+        expect(loadCsfMock).toHaveBeenCalledTimes(12);
 
         generator.invalidate('./src/B.stories.ts', true);
 
-        readCsfMock.mockClear();
+        loadCsfMock.mockClear();
         await generator.getIndex();
-        expect(readCsfMock).not.toHaveBeenCalled();
+        expect(loadCsfMock).not.toHaveBeenCalled();
       });
 
       it('does call the sort function a second time', async () => {
@@ -2318,11 +2337,11 @@ describe('StoryIndexGenerator', () => {
           options
         );
 
-        readCsfMock.mockClear();
+        loadCsfMock.mockClear();
         const generator = new StoryIndexGenerator([specifier], options);
         await generator.initialize();
         await generator.getIndex();
-        expect(readCsfMock).toHaveBeenCalledTimes(12);
+        expect(loadCsfMock).toHaveBeenCalledTimes(12);
 
         generator.invalidate('./src/B.stories.ts', true);
 
diff --git a/code/core/src/core-server/utils/__mockdata__/src/Empty.stories.ts b/code/core/src/core-server/utils/__mockdata__/src/Empty.stories.ts
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/code/core/src/node-logger/index.test.ts b/code/core/src/node-logger/index.test.ts
index 397a13d4c794..047b3a77838f 100644
--- a/code/core/src/node-logger/index.test.ts
+++ b/code/core/src/node-logger/index.test.ts
@@ -48,6 +48,23 @@ describe('node-logger', () => {
     logger.warn(message);
     expect(loggerMock.warn).toHaveBeenCalledWith(message);
   });
+
+  it('should sync --loglevel with npmlog', () => {
+    logger.setLogLevel('debug');
+    expect(npmlog.level).toBe('verbose');
+    expect(loggerMock.setLogLevel).toHaveBeenCalledWith('debug');
+
+    logger.setLogLevel('trace');
+    expect(npmlog.level).toBe('silly');
+    expect(loggerMock.setLogLevel).toHaveBeenCalledWith('trace');
+  });
+
+  it('should keep setLevel and setLogLevel consistent', () => {
+    logger.setLevel('warn');
+    expect(npmlog.level).toBe('warn');
+    expect(loggerMock.setLogLevel).toHaveBeenCalledWith('warn');
+  });
+
   it('should have an error method', () => {
     const message = 'error message';
     logger.error(message);
diff --git a/code/core/src/node-logger/index.ts b/code/core/src/node-logger/index.ts
index ae2de0410ed1..e4db4c15bbf3 100644
--- a/code/core/src/node-logger/index.ts
+++ b/code/core/src/node-logger/index.ts
@@ -17,6 +17,22 @@ export type { LogLevel } from './logger/logger';
 // there are issues with the build: https://github.com/storybookjs/storybook/issues/14621
 npmLog.stream = process.stdout;
 
+const toNpmLogLevel = (level: newLogger.LogLevel): string => {
+  switch (level) {
+    case 'trace':
+      return 'silly';
+    case 'debug':
+      return 'verbose';
+    default:
+      return level;
+  }
+};
+
+const setLoggerLevel = (level: newLogger.LogLevel = 'info'): void => {
+  npmLog.level = toNpmLogLevel(level);
+  newLogger.setLogLevel(level);
+};
+
 function hex(hexColor: string) {
   // Ensure the hex color is 6 characters long and starts with '#'
   if (!/^#?[0-9A-Fa-f]{6}$/.test(hexColor)) {
@@ -57,10 +73,8 @@ export const logger = {
   warn: (message: string): void => newLogger.warn(message),
   trace: ({ message, time }: { message: string; time: [number, number] }): void =>
     newLogger.debug(`${message} (${colors.purple(prettyTime(time))})`),
-  setLevel: (level: newLogger.LogLevel = 'info'): void => {
-    npmLog.level = level;
-    newLogger.setLogLevel(level);
-  },
+  setLevel: setLoggerLevel,
+  setLogLevel: setLoggerLevel,
   error: (message: unknown): void => {
     let msg: string;
     if (message instanceof Error && message.stack) {
diff --git a/code/core/src/toolbar/components/ToolbarMenuSelect.tsx b/code/core/src/toolbar/components/ToolbarMenuSelect.tsx
index 757712a90120..52aee50efbe4 100644
--- a/code/core/src/toolbar/components/ToolbarMenuSelect.tsx
+++ b/code/core/src/toolbar/components/ToolbarMenuSelect.tsx
@@ -29,7 +29,14 @@ export const ToolbarMenuSelect: FC<ToolbarMenuProps> = ({
   id,
   name,
   description,
-  toolbar: { icon: _icon, items, title: _title, preventDynamicIcon, dynamicTitle, shortcuts },
+  toolbar: {
+    icon: _icon,
+    items,
+    title: _title,
+    preventDynamicIcon,
+    dynamicTitle = true,
+    shortcuts,
+  },
 }) => {
   const api = useStorybookApi();
   const [globals, updateGlobals, storyGlobals] = useGlobals();
@@ -132,6 +139,7 @@ export const ToolbarMenuSelect: FC<ToolbarMenuProps> = ({
       onReset={resetItem ? () => updateGlobals({ [id]: resetItem?.value }) : undefined}
       onSelect={(selected) => updateGlobals({ [id]: selected })}
       icon={icon && <Icons icon={icon} __suppressDeprecationWarning={true} />}
+      showSelectedOptionTitle={dynamicTitle}
     >
       {title}
     </Select>
diff --git a/code/lib/cli-storybook/src/automigrate/index.ts b/code/lib/cli-storybook/src/automigrate/index.ts
index c7a2a5b21a12..1b3820e9176b 100644
--- a/code/lib/cli-storybook/src/automigrate/index.ts
+++ b/code/lib/cli-storybook/src/automigrate/index.ts
@@ -1,4 +1,5 @@
 import { type JsPackageManager } from 'storybook/internal/common';
+import { versions } from 'storybook/internal/common';
 import { logTracker, logger, prompt } from 'storybook/internal/node-logger';
 import { AutomigrateError } from 'storybook/internal/server-errors';
 import type { StorybookConfigRaw } from 'storybook/internal/types';
@@ -56,10 +57,6 @@ export const doAutomigrate = async (options: AutofixOptionsFromCLI) => {
     packageManagerName: options.packageManager,
   });
 
-  if (!versionInstalled) {
-    throw new Error('Could not determine Storybook version');
-  }
-
   if (!mainConfigPath) {
     throw new Error('Could not determine main config path');
   }
@@ -67,7 +64,7 @@ export const doAutomigrate = async (options: AutofixOptionsFromCLI) => {
   const outcome = await automigrate({
     ...options,
     packageManager,
-    storybookVersion: versionInstalled,
+    storybookVersion: versionInstalled || versions.storybook,
     mainConfigPath,
     mainConfig,
     previewConfigPath,
diff --git a/code/lib/cli-storybook/src/codemod/helpers/story-to-csf-factory.test.ts b/code/lib/cli-storybook/src/codemod/helpers/story-to-csf-factory.test.ts
index a621f15f6d34..1855be5d9885 100644
--- a/code/lib/cli-storybook/src/codemod/helpers/story-to-csf-factory.test.ts
+++ b/code/lib/cli-storybook/src/codemod/helpers/story-to-csf-factory.test.ts
@@ -297,6 +297,62 @@ describe('stories codemod', () => {
       `);
     });
 
+    it('migrate cross-file story imports from `ImportedStories.Story.xyz` to `ImportedStories.Story.input.xyz`', async () => {
+      await expect(
+        transform(dedent`
+            import * as BaseStories from './Button.stories';
+            import { Primary as ImportedPrimary } from './Card.stories';
+
+            export default { title: 'Component' };
+
+            export const A = {
+              args: BaseStories.Primary.args,
+            };
+
+            export const B = {
+              ...BaseStories.Secondary,
+              args: {
+                ...BaseStories.Secondary.args,
+                label: 'Custom',
+              },
+            };
+
+            export const C = {
+              args: {
+                ...ImportedPrimary.args,
+              },
+            };
+          `)
+      ).resolves.toMatchInlineSnapshot(`
+        import preview from '#.storybook/preview';
+
+        import * as BaseStories from './Button.stories';
+        import { Primary as ImportedPrimary } from './Card.stories';
+
+        const meta = preview.meta({
+          title: 'Component',
+        });
+
+        export const A = meta.story({
+          args: BaseStories.Primary.input.args,
+        });
+
+        export const B = meta.story({
+          ...BaseStories.Secondary.input,
+          args: {
+            ...BaseStories.Secondary.input.args,
+            label: 'Custom',
+          },
+        });
+
+        export const C = meta.story({
+          args: {
+            ...ImportedPrimary.input.args,
+          },
+        });
+      `);
+    });
+
     it('does not migrate reused properties from disallowed list', async () => {
       await expect(
         transform(dedent`
diff --git a/code/lib/cli-storybook/src/codemod/helpers/story-to-csf-factory.ts b/code/lib/cli-storybook/src/codemod/helpers/story-to-csf-factory.ts
index 8e4a23c3d44a..d92681c1e353 100644
--- a/code/lib/cli-storybook/src/codemod/helpers/story-to-csf-factory.ts
+++ b/code/lib/cli-storybook/src/codemod/helpers/story-to-csf-factory.ts
@@ -79,7 +79,54 @@ export async function storyToCsfFactory(
 
   const sbConfigImportSpecifier = t.importDefaultSpecifier(t.identifier(sbConfigImportName));
 
+  /**
+   * Collect imports from other .stories files.
+   *
+   * When we see: import * as BaseStories from './Button.stories'; import { Primary } from
+   * './Card.stories';
+   *
+   * We store the local names ("BaseStories", "Primary") so we can later transform references like
+   * `BaseStories.Primary.args` → `BaseStories.Primary.input.args`
+   *
+   * Why? Because those imported stories will ALSO be transformed to CSF4, so their properties will
+   * be under `.input` instead of directly on the object.
+   *
+   * We track TWO types of imports:
+   *
+   * - Namespace imports (import * as X): X.Story.args → X.Story.input.args
+   * - Named imports (import { Story }): Story.args → Story.input.args
+   */
+  const namespaceStoryImports = new Set<string>(); // import * as X
+  const namedStoryImports = new Set<string>(); // import { X } or import X
+
   programNode.body.forEach((node) => {
+    if (t.isImportDeclaration(node)) {
+      const importPath = node.source.value;
+
+      // Check if this import is from a .stories file
+      // Matches: ./Button.stories, ../components/Card.stories.tsx, etc.
+      const isStoryFileImport = /\.stories(\.(ts|tsx|js|jsx|mjs|mts))?$/.test(importPath);
+
+      if (isStoryFileImport) {
+        // Collect all imported names from this story file
+        node.specifiers.forEach((specifier) => {
+          if (t.isImportNamespaceSpecifier(specifier)) {
+            // import * as BaseStories from './Button.stories'
+            // BaseStories.Primary is a story, so we need: BaseStories.Primary.input
+            namespaceStoryImports.add(specifier.local.name);
+          } else if (t.isImportSpecifier(specifier)) {
+            // import { Primary } from './Button.stories'
+            // Primary itself is a story, so we need: Primary.input
+            namedStoryImports.add(specifier.local.name);
+          } else if (t.isImportDefaultSpecifier(specifier)) {
+            // import ButtonStories from './Button.stories'
+            // This typically imports the meta, not stories, so we treat it like namespace
+            namespaceStoryImports.add(specifier.local.name);
+          }
+        });
+      }
+    }
+
     if (t.isImportDeclaration(node) && isValidPreviewPath(node.source.value)) {
       const defaultImportSpecifier = node.specifiers.find((specifier) =>
         t.isImportDefaultSpecifier(specifier)
@@ -97,6 +144,9 @@ export async function storyToCsfFactory(
 
   const hasMeta = !!csf._meta;
 
+  // Combined set for quick lookup
+  const storyFileImports = new Set([...namespaceStoryImports, ...namedStoryImports]);
+
   // @TODO: Support unconventional formats:
   // `export function Story() { };` and `export { Story };
   // These are not part of csf._storyExports but rather csf._storyStatements and are tricky to support.
@@ -180,7 +230,13 @@ export async function storyToCsfFactory(
   // For each story, replace any reference of story reuse e.g.
   // Story.args -> Story.input.args
   // meta.args -> meta.input.args
+  // BaseStories.Primary.args -> BaseStories.Primary.input.args (cross-file)
   traverse(csf._ast, {
+    /**
+     * Handle SAME-FILE story references.
+     *
+     * Examples: Primary.args → Primary.input.args meta.args → meta.input.args
+     */
     Identifier(nodePath) {
       const identifierName = nodePath.node.name;
       const binding = nodePath.scope.getBinding(identifierName);
@@ -227,8 +283,8 @@ export async function storyToCsfFactory(
             t.memberExpression(t.identifier(identifierName), t.identifier('input'))
           );
         } catch (err: any) {
-          // This is a tough one to support, we just skip for now.
-          // Relates to `Stories.Story.args` where Stories is coming from another file. We can't know whether it should be transformed or not.
+          // This error occurs for cross-file references like `Stories.Story.args`
+          // which are handled by the MemberExpression visitor below.
           if (err.message.includes(`instead got "MemberExpression"`)) {
             return;
           } else {
@@ -237,6 +293,136 @@ export async function storyToCsfFactory(
         }
       }
     },
+
+    /**
+     * Handle CROSS-FILE story references.
+     *
+     * When we import stories from another file: import * as BaseStories from './Button.stories';
+     *
+     * And use them like: BaseStories.Primary.args
+     *
+     * We need to transform to: BaseStories.Primary.input.args
+     *
+     * Why? Because the imported file will ALSO be transformed to CSF4, where story properties are
+     * accessed via `.input`.
+     */
+    MemberExpression(nodePath) {
+      const node = nodePath.node;
+
+      // We're looking for patterns like: BaseStories.Primary.args
+      // Which is: MemberExpression { object: MemberExpression { object: Identifier, property }, property }
+      //
+      // We want to find the inner MemberExpression (BaseStories.Primary)
+      // and check if its object (BaseStories) is from a story file import.
+
+      // Check if this is a nested member expression (e.g., BaseStories.Primary.args)
+      // We want to transform BaseStories.Primary → BaseStories.Primary.input
+      // So we look for MemberExpression where object is also a MemberExpression
+
+      const innerObject = node.object;
+
+      // Check if the object is a MemberExpression like BaseStories.Primary
+      if (t.isMemberExpression(innerObject)) {
+        const importName = innerObject.object; // BaseStories
+        const storyName = innerObject.property; // Primary
+        const accessedProperty = node.property; // args
+
+        // Verify: importName is an Identifier that's in our storyFileImports set
+        if (
+          t.isIdentifier(importName) &&
+          storyFileImports.has(importName.name) &&
+          t.isIdentifier(storyName)
+        ) {
+          // Skip if already transformed: BaseStories.Primary.input.args
+          // This check prevents infinite loops when the traverser revisits modified nodes
+          if (t.isIdentifier(storyName, { name: 'input' })) {
+            return;
+          }
+
+          // Only process if the accessed property is an Identifier
+          if (!t.isIdentifier(accessedProperty)) {
+            return;
+          }
+
+          // Skip if the current property being accessed is 'input'
+          // This means we're looking at something like: BaseStories.Primary.input
+          // which was already transformed in a previous iteration
+          if (accessedProperty.name === 'input') {
+            return;
+          }
+
+          // Skip if accessing a property in the disallow list
+          if (reuseDisallowList.includes(accessedProperty.name)) {
+            return;
+          }
+
+          // Transform: BaseStories.Primary.args → BaseStories.Primary.input.args
+          // We do this by replacing the inner object (BaseStories.Primary)
+          // with (BaseStories.Primary.input)
+          nodePath.node.object = t.memberExpression(innerObject, t.identifier('input'));
+
+          // Skip traversing into the newly created node to prevent infinite loops
+          nodePath.skip();
+        }
+      }
+
+      // Handle NAMED IMPORTS: import { Primary } from './Button.stories'
+      // Usage: Primary.args → Primary.input.args
+      //
+      // Pattern: MemberExpression { object: Identifier("Primary"), property: Identifier("args") }
+      // Where "Primary" is in our namedStoryImports set (NOT namespace imports)
+      if (t.isIdentifier(innerObject) && namedStoryImports.has(innerObject.name)) {
+        const accessedProperty = node.property;
+
+        // Only process if the property is an Identifier
+        if (!t.isIdentifier(accessedProperty)) {
+          return;
+        }
+
+        // Skip if this is already accessing .input
+        if (accessedProperty.name === 'input') {
+          return;
+        }
+
+        // Skip if accessing a property in the disallow list
+        if (reuseDisallowList.includes(accessedProperty.name)) {
+          return;
+        }
+
+        // Transform: Primary.args → Primary.input.args
+        nodePath.replaceWith(
+          t.memberExpression(
+            t.memberExpression(innerObject, t.identifier('input')),
+            accessedProperty
+          )
+        );
+        nodePath.skip();
+        return;
+      }
+
+      // Handle NAMESPACE IMPORTS spread: import * as BaseStories from './Button.stories'
+      // Usage: ...BaseStories.Secondary → ...BaseStories.Secondary.input
+      //
+      // Pattern: SpreadElement containing MemberExpression { object: Identifier("BaseStories"), property: Identifier("Secondary") }
+      if (t.isIdentifier(innerObject) && namespaceStoryImports.has(innerObject.name)) {
+        const storyName = node.property;
+
+        // Skip if this is already .input
+        if (t.isIdentifier(storyName, { name: 'input' })) {
+          return;
+        }
+
+        // Check if parent is a SpreadElement (...BaseStories.Secondary)
+        const parent = nodePath.parent;
+        if (t.isSpreadElement(parent)) {
+          // Transform: ...BaseStories.Secondary → ...BaseStories.Secondary.input
+          nodePath.replaceWith(t.memberExpression(node, t.identifier('input')));
+          nodePath.skip();
+        }
+        // Note: For non-spread namespace access like BaseStories.Primary.args,
+        // it's handled by the nested MemberExpression case above
+      }
+    },
   });
 
   // If no stories were transformed, bail early to avoid having a mixed CSF syntax and therefore a broken indexer.
diff --git a/code/lib/create-storybook/src/commands/AddonConfigurationCommand.test.ts b/code/lib/create-storybook/src/commands/AddonConfigurationCommand.test.ts
index f852a85fa2e7..2df6ed0ca21a 100644
--- a/code/lib/create-storybook/src/commands/AddonConfigurationCommand.test.ts
+++ b/code/lib/create-storybook/src/commands/AddonConfigurationCommand.test.ts
@@ -1,164 +1,346 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { type JsPackageManager } from 'storybook/internal/common';
+import type { AddonVitestService } from 'storybook/internal/cli';
+import { type JsPackageManager, PackageManagerName } from 'storybook/internal/common';
 import { logger, prompt } from 'storybook/internal/node-logger';
+import { ErrorCollector } from 'storybook/internal/telemetry';
 
-import { TelemetryService } from '../services/TelemetryService';
-import { VersionService } from '../services/VersionService';
-import { AddonConfigurationCommand } from './AddonConfigurationCommand';
+import addonA11yPostinstall from '../../../../addons/a11y/src/postinstall';
+import addonVitestPostinstall from '../../../../addons/vitest/src/postinstall';
+import type { TelemetryService } from '../services';
+import { AddonConfigurationCommand, executeAddonConfiguration } from './AddonConfigurationCommand';
 
-vi.mock('storybook/internal/cli', { spy: true });
 vi.mock('storybook/internal/node-logger', { spy: true });
-vi.mock('../../../cli-storybook/src/postinstallAddon', { spy: true });
-vi.mock('../services/TelemetryService', { spy: true });
-vi.mock('../services/VersionService', { spy: true });
+vi.mock('storybook/internal/telemetry', { spy: true });
+vi.mock('../../../../addons/a11y/src/postinstall', { spy: true });
+vi.mock('../../../../addons/vitest/src/postinstall', { spy: true });
+vi.mock('../../../cli-storybook/src/postinstallAddon', () => ({
+  postinstallAddon: vi.fn().mockResolvedValue(undefined),
+}));
 
 describe('AddonConfigurationCommand', () => {
   let command: AddonConfigurationCommand;
-  const mockPackageManager = {
-    type: 'npm',
-    getVersionedPackages: vi.fn(),
-    executeCommand: vi.fn().mockResolvedValue({ stdout: '', stderr: '', exitCode: 0 }),
-  } as Partial<JsPackageManager> as JsPackageManager;
-  let mockTask: {
-    success: ReturnType<typeof vi.fn>;
-    error: ReturnType<typeof vi.fn>;
-    message: ReturnType<typeof vi.fn>;
-    group: ReturnType<typeof vi.fn>;
-  };
-  let mockPostinstallAddon: ReturnType<typeof vi.fn>;
-  let mockAddonVitestService: ReturnType<typeof vi.fn>;
-
-  beforeEach(async () => {
-    const { postinstallAddon } = await import('../../../cli-storybook/src/postinstallAddon');
-    mockPostinstallAddon = vi.mocked(postinstallAddon);
-    mockPostinstallAddon.mockResolvedValue(undefined);
-
-    // Mock the AddonVitestService
-    const { AddonVitestService } = await import('storybook/internal/cli');
-    mockAddonVitestService = vi.mocked(AddonVitestService);
-    const mockInstance = {
-      installPlaywright: vi.fn().mockResolvedValue({ errors: [] }),
-    };
-    mockAddonVitestService.mockImplementation(() => mockInstance as any);
-
-    vi.mocked(VersionService).mockImplementation(() => ({}));
-
-    vi.mocked(TelemetryService).mockImplementation((disableTelemetry: boolean = false) => {
-      return {
-        disableTelemetry,
-        versionService: new VersionService(),
-      };
-    });
-
-    const mockAddonVitestServiceInstance = {
-      installPlaywright: vi.fn().mockResolvedValue({ errors: [] }),
-    };
-    const mockTelemetryServiceInstance = {
-      trackPlaywrightPromptDecision: vi.fn(),
-    };
+  let mockPackageManager: JsPackageManager;
+  let mockAddonVitestService: AddonVitestService;
+  let mockTelemetryService: TelemetryService;
+  let mockTaskLog: ReturnType<typeof prompt.taskLog>;
 
-    command = new AddonConfigurationCommand(
-      mockPackageManager,
-      {
-        yes: true,
-        disableTelemetry: true,
-      } as any,
-      mockAddonVitestServiceInstance as any,
-      mockTelemetryServiceInstance as any
-    );
+  beforeEach(() => {
+    mockPackageManager = {
+      type: 'npm',
+    } as Partial<JsPackageManager> as JsPackageManager;
 
-    mockTask = {
+    mockAddonVitestService = {
+      installPlaywright: vi.fn().mockResolvedValue({ errors: [], result: 'installed' }),
+    } as Partial<AddonVitestService> as AddonVitestService;
+
+    mockTelemetryService = {
+      trackPlaywrightPromptDecision: vi.fn().mockResolvedValue(undefined),
+    } as Partial<TelemetryService> as TelemetryService;
+
+    mockTaskLog = {
+      message: vi.fn(),
       success: vi.fn(),
       error: vi.fn(),
-      message: vi.fn(),
-      group: vi.fn(),
-    };
+    } as unknown as ReturnType<typeof prompt.taskLog>;
 
-    vi.mocked(prompt.taskLog).mockReturnValue(mockTask as any);
+    vi.mocked(prompt.taskLog).mockReturnValue(mockTaskLog);
+    vi.mocked(logger.warn).mockImplementation(() => {});
+    vi.mocked(logger.error).mockImplementation(() => {});
+    vi.mocked(logger.debug).mockImplementation(() => {});
     vi.mocked(logger.log).mockImplementation(() => {});
+    vi.mocked(ErrorCollector.addError).mockImplementation(() => {});
+    vi.mocked(addonA11yPostinstall).mockResolvedValue(undefined);
+    vi.mocked(addonVitestPostinstall).mockResolvedValue(undefined);
+
+    command = new AddonConfigurationCommand(
+      mockPackageManager,
+      { packageManager: PackageManagerName.NPM, yes: false, disableTelemetry: false },
+      mockAddonVitestService,
+      mockTelemetryService
+    );
 
     vi.clearAllMocks();
   });
 
   describe('execute', () => {
-    it('should skip configuration when no addons are provided', async () => {
-      const addons: string[] = [];
+    it('should return success when no configDir is provided', async () => {
+      const result = await command.execute({
+        addons: ['@storybook/addon-vitest'],
+        configDir: undefined,
+      });
+
+      expect(result).toEqual({ status: 'success' });
+      expect(prompt.taskLog).not.toHaveBeenCalled();
+    });
 
+    it('should return success when addons array is empty', async () => {
       const result = await command.execute({
-        dependencyInstallationResult: { status: 'success' },
-        addons,
+        addons: [],
         configDir: '.storybook',
       });
 
-      expect(result.status).toBe('success');
+      expect(result).toEqual({ status: 'success' });
       expect(prompt.taskLog).not.toHaveBeenCalled();
-      expect(mockPackageManager.getVersionedPackages).not.toHaveBeenCalled();
     });
 
-    it('should configure test addons when test feature is enabled', async () => {
-      const addons = ['@storybook/addon-a11y', '@storybook/addon-vitest'];
+    it('should configure vitest addon successfully', async () => {
+      vi.mocked(prompt.taskLog).mockReturnValue(mockTaskLog);
 
       const result = await command.execute({
-        dependencyInstallationResult: { status: 'success' },
-        addons,
+        addons: ['@storybook/addon-vitest'],
         configDir: '.storybook',
       });
 
-      expect(result.status).toBe('success');
-      expect(prompt.taskLog).toHaveBeenCalledWith({
-        id: 'configure-addons',
-        title: 'Configuring addons...',
+      expect(result).toEqual({ status: 'success' });
+      expect(addonVitestPostinstall).toHaveBeenCalledWith({
+        packageManager: 'npm',
+        configDir: '.storybook',
+        yes: false,
+        skipInstall: true,
+        skipDependencyManagement: true,
+        logger,
+        prompt,
       });
+      expect(mockAddonVitestService.installPlaywright).toHaveBeenCalledWith({
+        yes: false,
+        useRemotePkg: false,
+      });
+      expect(mockTelemetryService.trackPlaywrightPromptDecision).toHaveBeenCalledWith('installed');
+      expect(mockTaskLog.success).toHaveBeenCalledWith('Addons configured successfully');
     });
 
-    it('should handle configuration errors gracefully', async () => {
-      const addons = ['@storybook/addon-a11y', '@storybook/addon-vitest'];
-      const error = new Error('Configuration failed');
-
-      mockPostinstallAddon.mockRejectedValue(error);
+    it('should configure a11y addon successfully', async () => {
+      vi.mocked(prompt.taskLog).mockReturnValue(mockTaskLog);
 
       const result = await command.execute({
-        dependencyInstallationResult: { status: 'success' },
-        addons,
+        addons: ['@storybook/addon-a11y'],
         configDir: '.storybook',
       });
 
-      expect(result.status).toBe('failed');
-      expect(mockTask.error).toHaveBeenCalledWith(
-        expect.stringContaining('Failed to configure addons')
-      );
+      expect(result).toEqual({ status: 'success' });
+      expect(addonA11yPostinstall).toHaveBeenCalledWith({
+        packageManager: 'npm',
+        configDir: '.storybook',
+        yes: false,
+        skipInstall: true,
+        skipDependencyManagement: true,
+        logger,
+        prompt,
+      });
+      expect(mockTaskLog.success).toHaveBeenCalledWith('Addons configured successfully');
     });
 
-    it('should complete successfully with valid configuration', async () => {
-      const addons = ['@storybook/addon-a11y', '@storybook/addon-vitest'];
+    it('should configure generic addon via postinstallAddon', async () => {
+      const { postinstallAddon } = await import('../../../cli-storybook/src/postinstallAddon');
+      vi.mocked(prompt.taskLog).mockReturnValue(mockTaskLog);
 
       const result = await command.execute({
-        dependencyInstallationResult: { status: 'success' },
-        addons,
+        addons: ['@storybook/addon-docs'],
         configDir: '.storybook',
       });
 
-      expect(result.status).toBe('success');
-      expect(mockPostinstallAddon).toHaveBeenCalledTimes(2);
-      expect(mockPostinstallAddon).toHaveBeenCalledWith('@storybook/addon-a11y', {
+      expect(result).toEqual({ status: 'success' });
+      expect(postinstallAddon).toHaveBeenCalledWith('@storybook/addon-docs', {
         packageManager: 'npm',
         configDir: '.storybook',
-        yes: true,
+        yes: false,
         skipInstall: true,
         skipDependencyManagement: true,
-        logger: expect.any(Object),
-        prompt: expect.any(Object),
+        logger,
+        prompt,
       });
-      expect(mockPostinstallAddon).toHaveBeenCalledWith('@storybook/addon-vitest', {
-        packageManager: 'npm',
+      expect(mockTaskLog.success).toHaveBeenCalledWith('Addons configured successfully');
+    });
+
+    it('should configure multiple addons', async () => {
+      vi.mocked(prompt.taskLog).mockReturnValue(mockTaskLog);
+
+      const result = await command.execute({
+        addons: ['@storybook/addon-vitest', '@storybook/addon-a11y'],
+        configDir: '.storybook',
+      });
+
+      expect(result).toEqual({ status: 'success' });
+      expect(addonVitestPostinstall).toHaveBeenCalled();
+      expect(addonA11yPostinstall).toHaveBeenCalled();
+      expect(mockTaskLog.message).toHaveBeenCalledWith('Configuring @storybook/addon-vitest...');
+      expect(mockTaskLog.message).toHaveBeenCalledWith('Configuring @storybook/addon-a11y...');
+    });
+
+    it('should handle addon configuration failure gracefully', async () => {
+      const error = new Error('Configuration failed');
+      vi.mocked(addonVitestPostinstall).mockRejectedValue(error);
+      vi.mocked(prompt.taskLog).mockReturnValue(mockTaskLog);
+
+      const result = await command.execute({
+        addons: ['@storybook/addon-vitest'],
+        configDir: '.storybook',
+      });
+
+      expect(result).toEqual({ status: 'failed' });
+      expect(logger.debug).toHaveBeenCalledWith(error);
+      expect(ErrorCollector.addError).toHaveBeenCalledWith(error);
+      expect(mockTaskLog.error).toHaveBeenCalledWith('Failed to configure addons');
+    });
+
+    it('should handle partial addon failures', async () => {
+      const error = new Error('Vitest configuration failed');
+      vi.mocked(addonVitestPostinstall).mockRejectedValue(error);
+      vi.mocked(prompt.taskLog).mockReturnValue(mockTaskLog);
+
+      const result = await command.execute({
+        addons: ['@storybook/addon-vitest', '@storybook/addon-a11y'],
+        configDir: '.storybook',
+      });
+
+      expect(result).toEqual({ status: 'failed' });
+      expect(addonA11yPostinstall).toHaveBeenCalled();
+      expect(mockTaskLog.error).toHaveBeenCalledWith('Failed to configure addons');
+    });
+
+    it('should handle unexpected errors during execution', async () => {
+      const unexpectedError = new Error('Unexpected error');
+      vi.mocked(prompt.taskLog).mockImplementation(() => {
+        throw unexpectedError;
+      });
+
+      const result = await command.execute({
+        addons: ['@storybook/addon-vitest'],
         configDir: '.storybook',
+      });
+
+      expect(result).toEqual({ status: 'failed' });
+      expect(logger.error).toHaveBeenCalledWith('Unexpected error during addon configuration:');
+      expect(logger.error).toHaveBeenCalledWith(unexpectedError);
+    });
+
+    it('should not install Playwright when vitest addon is not configured', async () => {
+      vi.mocked(prompt.taskLog).mockReturnValue(mockTaskLog);
+
+      await command.execute({
+        addons: ['@storybook/addon-a11y'],
+        configDir: '.storybook',
+      });
+
+      expect(mockAddonVitestService.installPlaywright).not.toHaveBeenCalled();
+      expect(mockTelemetryService.trackPlaywrightPromptDecision).not.toHaveBeenCalled();
+    });
+
+    it('should track skipped Playwright installation', async () => {
+      vi.mocked(mockAddonVitestService.installPlaywright).mockResolvedValue({
+        errors: [],
+        result: 'skipped',
+      });
+      vi.mocked(prompt.taskLog).mockReturnValue(mockTaskLog);
+
+      await command.execute({
+        addons: ['@storybook/addon-vitest'],
+        configDir: '.storybook',
+      });
+
+      expect(mockTelemetryService.trackPlaywrightPromptDecision).toHaveBeenCalledWith('skipped');
+    });
+
+    it('should track aborted Playwright installation', async () => {
+      vi.mocked(mockAddonVitestService.installPlaywright).mockResolvedValue({
+        errors: [],
+        result: 'aborted',
+      });
+      vi.mocked(prompt.taskLog).mockReturnValue(mockTaskLog);
+
+      await command.execute({
+        addons: ['@storybook/addon-vitest'],
+        configDir: '.storybook',
+      });
+
+      expect(mockTelemetryService.trackPlaywrightPromptDecision).toHaveBeenCalledWith('aborted');
+    });
+
+    it('should track failed Playwright installation', async () => {
+      vi.mocked(mockAddonVitestService.installPlaywright).mockResolvedValue({
+        errors: ['Installation error'],
+        result: 'failed',
+      });
+      vi.mocked(prompt.taskLog).mockReturnValue(mockTaskLog);
+
+      await command.execute({
+        addons: ['@storybook/addon-vitest'],
+        configDir: '.storybook',
+      });
+
+      expect(mockTelemetryService.trackPlaywrightPromptDecision).toHaveBeenCalledWith('failed');
+    });
+
+    it('should pass yes option to addon postinstall functions', async () => {
+      const commandWithYes = new AddonConfigurationCommand(
+        mockPackageManager,
+        { packageManager: PackageManagerName.NPM, yes: true, disableTelemetry: false },
+        mockAddonVitestService,
+        mockTelemetryService
+      );
+      vi.mocked(prompt.taskLog).mockReturnValue(mockTaskLog);
+
+      await commandWithYes.execute({
+        addons: ['@storybook/addon-vitest'],
+        configDir: '.storybook',
+      });
+
+      expect(addonVitestPostinstall).toHaveBeenCalledWith(expect.objectContaining({ yes: true }));
+      expect(mockAddonVitestService.installPlaywright).toHaveBeenCalledWith({
         yes: true,
-        skipInstall: true,
-        skipDependencyManagement: true,
-        logger: expect.any(Object),
-        prompt: expect.any(Object),
+        useRemotePkg: false,
       });
     });
   });
 });
+
+describe('executeAddonConfiguration', () => {
+  let mockPackageManager: JsPackageManager;
+  let mockTaskLog: ReturnType<typeof prompt.taskLog>;
+
+  beforeEach(() => {
+    mockPackageManager = {
+      type: 'npm',
+    } as Partial<JsPackageManager> as JsPackageManager;
+
+    mockTaskLog = {
+      message: vi.fn(),
+      success: vi.fn(),
+      error: vi.fn(),
+    } as unknown as ReturnType<typeof prompt.taskLog>;
+
+    vi.mocked(prompt.taskLog).mockReturnValue(mockTaskLog);
+    vi.mocked(logger.warn).mockImplementation(() => {});
+    vi.mocked(logger.error).mockImplementation(() => {});
+    vi.mocked(logger.debug).mockImplementation(() => {});
+    vi.mocked(logger.log).mockImplementation(() => {});
+    vi.mocked(addonA11yPostinstall).mockResolvedValue(undefined);
+    vi.mocked(addonVitestPostinstall).mockResolvedValue(undefined);
+
+    vi.clearAllMocks();
+  });
+
+  it('should create command and execute with provided parameters', async () => {
+    const result = await executeAddonConfiguration({
+      packageManager: mockPackageManager,
+      options: { packageManager: PackageManagerName.NPM, yes: false, disableTelemetry: true },
+      addons: [],
+      configDir: '.storybook',
+    });
+
+    expect(result).toEqual({ status: 'success' });
+  });
+
+  it('should execute addon configuration through helper function', async () => {
+    const result = await executeAddonConfiguration({
+      packageManager: mockPackageManager,
+      options: { packageManager: PackageManagerName.NPM, yes: true, disableTelemetry: false },
+      addons: ['@storybook/addon-a11y'],
+      configDir: '.storybook',
+    });
+
+    expect(result).toEqual({ status: 'success' });
+    expect(addonA11yPostinstall).toHaveBeenCalled();
+  });
+});
diff --git a/code/lib/create-storybook/src/commands/AddonConfigurationCommand.ts b/code/lib/create-storybook/src/commands/AddonConfigurationCommand.ts
index 222710d0f186..017fdb166150 100644
--- a/code/lib/create-storybook/src/commands/AddonConfigurationCommand.ts
+++ b/code/lib/create-storybook/src/commands/AddonConfigurationCommand.ts
@@ -5,6 +5,8 @@ import { ErrorCollector } from 'storybook/internal/telemetry';
 
 import { dedent } from 'ts-dedent';
 
+import addonA11yPostinstall from '../../../../addons/a11y/src/postinstall';
+import addonVitestPostinstall from '../../../../addons/vitest/src/postinstall';
 import type { CommandOptions } from '../generators/types';
 import { TelemetryService } from '../services';
 
@@ -16,7 +18,6 @@ const ADDON_INSTALLATION_INSTRUCTIONS = {
 type ExecuteAddonConfigurationParams = {
   addons: string[];
   configDir?: string;
-  dependencyInstallationResult: { status: 'success' | 'failed' };
 };
 
 export type ExecuteAddonConfigurationResult = {
@@ -44,16 +45,7 @@ export class AddonConfigurationCommand {
   async execute({
     addons,
     configDir,
-    dependencyInstallationResult,
   }: ExecuteAddonConfigurationParams): Promise<ExecuteAddonConfigurationResult> {
-    const areDependenciesInstalled =
-      dependencyInstallationResult.status === 'success' && !this.commandOptions.skipInstall;
-
-    if (!areDependenciesInstalled && this.getAddonsWithInstructions(addons).length > 0) {
-      this.logManualAddonInstructions(addons);
-      return { status: 'failed' };
-    }
-
     if (!configDir || addons.length === 0) {
       return { status: 'success' };
     }
@@ -64,11 +56,19 @@ export class AddonConfigurationCommand {
       if (addonResults.has('@storybook/addon-vitest')) {
         const { result } = await this.addonVitestService.installPlaywright({
           yes: this.commandOptions.yes,
+          useRemotePkg: !!this.commandOptions.skipInstall,
         });
         // Map outcome to telemetry decision
         await this.telemetryService.trackPlaywrightPromptDecision(result);
       }
 
+      // some addons failed
+      if (hasFailures) {
+        this.logManualAddonInstructions(
+          addons.filter((addon) => addonResults.get(addon)?.result === 'failed')
+        );
+      }
+
       return { status: hasFailures ? 'failed' : 'success' };
     } catch (e) {
       logger.error('Unexpected error during addon configuration:');
@@ -123,7 +123,7 @@ export class AddonConfigurationCommand {
       try {
         task.message(`Configuring ${addon}...`);
 
-        await postinstallAddon(addon, {
+        const options = {
           packageManager: this.packageManager.type,
           configDir,
           yes: this.commandOptions.yes,
@@ -131,11 +131,20 @@ export class AddonConfigurationCommand {
           skipDependencyManagement: true,
           logger,
           prompt,
-        });
+        };
+
+        if (addon === '@storybook/addon-vitest') {
+          await addonVitestPostinstall(options);
+        } else if (addon === '@storybook/addon-a11y') {
+          await addonA11yPostinstall(options);
+        } else {
+          await postinstallAddon(addon, options);
+        }
 
         task.message(`${addon} configured\n`);
         addonResults.set(addon, null);
       } catch (e) {
+        logger.debug(e);
         ErrorCollector.addError(e);
         addonResults.set(addon, e);
       }
diff --git a/code/lib/create-storybook/src/initiate.ts b/code/lib/create-storybook/src/initiate.ts
index 4ef5ed2dd9e2..3b17297edeb1 100644
--- a/code/lib/create-storybook/src/initiate.ts
+++ b/code/lib/create-storybook/src/initiate.ts
@@ -98,7 +98,6 @@ export async function doInitiate(options: CommandOptions): Promise<
     packageManager,
     addons: extraAddons,
     configDir,
-    dependencyInstallationResult,
     options,
   });
 
diff --git a/code/package.json b/code/package.json
index 61819dbadfa0..34f6da49e68d 100644
--- a/code/package.json
+++ b/code/package.json
@@ -220,5 +220,6 @@
         "Dependency Upgrades"
       ]
     ]
-  }
+  },
+  "deferredNextVersion": "10.3.0-alpha.5"
 }
diff --git a/docs/_snippets/storybook-preview-configure-globaltypes.md b/docs/_snippets/storybook-preview-configure-globaltypes.md
index 651c5a63033a..4f976b95f75a 100644
--- a/docs/_snippets/storybook-preview-configure-globaltypes.md
+++ b/docs/_snippets/storybook-preview-configure-globaltypes.md
@@ -9,7 +9,7 @@ const preview = {
         icon: 'circlehollow',
         // Array of plain string values or MenuItem shape (see below)
         items: ['light', 'dark'],
-        // Change title based on selected value
+        // Change title based on selected value (recommended for consistency with the Storybook UI)
         dynamicTitle: true,
       },
     },
@@ -36,7 +36,7 @@ const preview: Preview = {
         icon: 'circlehollow',
         // Array of plain string values or MenuItem shape (see below)
         items: ['light', 'dark'],
-        // Change title based on selected value
+        // Change title based on selected value (recommended for consistency with the Storybook UI)
         dynamicTitle: true,
       },
     },
@@ -63,7 +63,7 @@ export default definePreview({
         icon: 'circlehollow',
         // Array of plain string values or MenuItem shape (see below)
         items: ['light', 'dark'],
-        // Change title based on selected value
+        // Change title based on selected value (recommended for consistency with the Storybook UI)
         dynamicTitle: true,
       },
     },
@@ -90,7 +90,7 @@ export default definePreview({
         icon: 'circlehollow',
         // Array of plain string values or MenuItem shape (see below)
         items: ['light', 'dark'],
-        // Change title based on selected value
+        // Change title based on selected value (recommended for consistency with the Storybook UI)
         dynamicTitle: true,
       },
     },
diff --git a/docs/versions/next.json b/docs/versions/next.json
index 370ef3231d50..85719cf980ba 100644
--- a/docs/versions/next.json
+++ b/docs/versions/next.json
@@ -1 +1 @@
-{"version":"10.3.0-alpha.4","info":{"plain":"- Addon-Vitest: Support vite/vitest config with deferred export - [#33755](https://github.com/storybookjs/storybook/pull/33755), thanks @valentinpalkovic!\n- Controls: Allow story argTypes to override control: false from meta - [#33729](https://github.com/storybookjs/storybook/pull/33729), thanks @jonathan-fulton!\n- Manager: Update logic to use base path instead of full pathname - [#33686](https://github.com/storybookjs/storybook/pull/33686), thanks @JSMike!\n- Manifests: Use correct story name - [#33709](https://github.com/storybookjs/storybook/pull/33709), thanks @JReinhold!\n- Toolbar: Remove extra toolbar divider when zoom controls not shown - [#33731](https://github.com/storybookjs/storybook/pull/33731), thanks @jonathan-fulton!"}}
\ No newline at end of file
+{"version":"10.3.0-alpha.5","info":{"plain":"- CLI: Support addon-vitest setup when --skip-install is passed - [#33718](https://github.com/storybookjs/storybook/pull/33718), thanks @valentinpalkovic!\n- CSF: Fix cross-file story imports in csf-factories codemod  - [#33723](https://github.com/storybookjs/storybook/pull/33723), thanks @yatishgoel!\n- Core: Ignore empty files when indexing - [#33782](https://github.com/storybookjs/storybook/pull/33782), thanks @JReinhold!\n- Globals: Repair dynamicTitle: false for user-defined tools - [#33284](https://github.com/storybookjs/storybook/pull/33284), thanks @ia319!\n- Logger: Honor --loglevel for npmlog output - [#33776](https://github.com/storybookjs/storybook/pull/33776), thanks @LouisLau-art!"}}
\ No newline at end of file
diff --git a/scripts/build/utils/generate-bundle.ts b/scripts/build/utils/generate-bundle.ts
index 5d9c30470fcb..a35397324568 100644
--- a/scripts/build/utils/generate-bundle.ts
+++ b/scripts/build/utils/generate-bundle.ts
@@ -7,6 +7,7 @@ import * as esbuild from 'esbuild';
 import { basename, join, relative } from 'pathe';
 import picocolors from 'picocolors';
 import { dedent } from 'ts-dedent';
+import {raw as rawPlugin} from 'esbuild-raw-plugin';
 
 import { globalsModuleInfoMap } from '../../../code/core/src/manager/globals/globals-module-info';
 import {
@@ -99,6 +100,7 @@ export async function generateBundle({
       'process.env.NODE_ENV': 'process.env.NODE_ENV',
     },
     plugins: [
+      rawPlugin(),
       {
         name: 'postbuild',
         setup(build) {
diff --git a/scripts/package.json b/scripts/package.json
index 79b3a1f2ca54..46065ad6d5ef 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -103,6 +103,7 @@
     "empathic": "^2.0.0",
     "es-toolkit": "^1.43.0",
     "esbuild": "^0.27.0",
+    "esbuild-raw-plugin": "^0.3.1",
     "eslint": "^8.57.1",
     "eslint-config-airbnb-typescript": "^18.0.0",
     "eslint-config-prettier": "^9.1.2",
diff --git a/yarn.lock b/yarn.lock
index c007770a0eb0..4cecb506d0ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8514,6 +8514,7 @@ __metadata:
     empathic: "npm:^2.0.0"
     es-toolkit: "npm:^1.43.0"
     esbuild: "npm:^0.27.0"
+    esbuild-raw-plugin: "npm:^0.3.1"
     eslint: "npm:^8.57.1"
     eslint-config-airbnb-typescript: "npm:^18.0.0"
     eslint-config-prettier: "npm:^9.1.2"
@@ -15930,6 +15931,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-raw-plugin@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "esbuild-raw-plugin@npm:0.3.1"
+  checksum: 10c0/25f8934cdddfc49bd1942a76d9d742e0abf50d85729ba506c1804475e318672143781039dc0614b47c7eb01aa1a797901245cc37fb1ce968974a038f8846b9d2
+  languageName: node
+  linkType: hard
+
 "esbuild-wasm@npm:0.25.4":
   version: 0.25.4
   resolution: "esbuild-wasm@npm:0.25.4"