Agentic Setup: Continue prompt refactor and add two prompts

code/core/src/telemetry/get-monorepo-type.test.ts → code/core/src/shared/utils/get-monorepo-type.test.ts

@@ -5,7 +5,7 @@ import { describe, expect, it, vi } from 'vitest';
 
 import { getMonorepoType, monorepoConfigs } from './get-monorepo-type.ts';
 
-vi.mock('node:fs', async () => import('../../../__mocks__/fs.ts'));
+vi.mock('node:fs', async () => import('../../../../__mocks__/fs.ts'));
 
 vi.mock('storybook/internal/common', async (importOriginal) => {
   return {
@@ -23,7 +23,7 @@ const checkMonorepoType = ({ monorepoConfigFile, isYarnWorkspace = false }: any)
     mockFiles[join('root', monorepoConfigFile)] = '{}';
   }
 
-  vi.mocked<typeof import('../../../__mocks__/fs')>(fs as any).__setMockFiles(mockFiles);
+  vi.mocked<typeof import('../../../../__mocks__/fs.ts')>(fs as any).__setMockFiles(mockFiles);
 
   return getMonorepoType();
 };

code/core/src/telemetry/ai-setup-utils.ts

@@ -5,7 +5,7 @@ import { readFile } from 'node:fs/promises';
 
 import { findConfigFile } from 'storybook/internal/common';
 import { detectAgent } from './detect-agent.ts';
-import { isTelemetryModuleEnabled, telemetry } from './index.ts';
+import { telemetry } from './index.ts';
 import type { EventType } from './types.ts';
 import type { IndexEntry, StoryIndex } from 'storybook/internal/types';
 

code/core/src/telemetry/storybook-metadata.test.ts

@@ -18,7 +18,7 @@ import { type Settings, globalSettings } from '../cli/globalSettings.ts';
 import { detectAgent } from './detect-agent.ts';
 import { getApplicationFileCount } from '../telemetry/get-application-file-count.ts';
 import { analyzeEcosystemPackages } from '../telemetry/get-known-packages.ts';
-import { getMonorepoType } from '../telemetry/get-monorepo-type.ts';
+import { getMonorepoType } from '../shared/utils/get-monorepo-type.ts';
 import { getPackageManagerInfo } from '../telemetry/get-package-manager-info.ts';
 import { getPortableStoriesFileCount } from '../telemetry/get-portable-stories-usage.ts';
 import {
@@ -37,7 +37,7 @@ vi.mock('./detect-agent.ts', () => ({
   detectAgent: vi.fn().mockReturnValue(undefined),
 }));
 vi.mock(import('./package-json.ts'), { spy: true });
-vi.mock(import('./get-monorepo-type.ts'), { spy: true });
+vi.mock(import('../shared/utils/get-monorepo-type.ts'), { spy: true });
 vi.mock(import('./get-framework-info.ts'), { spy: true });
 vi.mock(import('./get-package-manager-info.ts'), { spy: true });
 vi.mock(import('./get-portable-stories-usage.ts'), { spy: true });

code/core/src/telemetry/storybook-metadata.ts

@@ -24,7 +24,7 @@ import { getChromaticVersionSpecifier } from './get-chromatic-version.ts';
 import { getFrameworkInfo } from './get-framework-info.ts';
 import { getHasRouterPackage } from './get-has-router-package.ts';
 import { analyzeEcosystemPackages } from './get-known-packages.ts';
-import { getMonorepoType } from './get-monorepo-type.ts';
+import { getMonorepoType } from '../shared/utils/get-monorepo-type.ts';
 import { getPackageManagerInfo } from './get-package-manager-info.ts';
 import { getPortableStoriesFileCount } from './get-portable-stories-usage.ts';
 import { getActualPackageVersion, getActualPackageVersions } from './package-json.ts';

code/core/src/telemetry/types.ts

@@ -4,7 +4,7 @@ import type { DetectResult } from 'package-manager-detector';
 
 import type { AgentInfo } from './detect-agent.ts';
 import type { KnownPackagesList } from './get-known-packages.ts';
-import type { MonorepoType } from './get-monorepo-type.ts';
+import type { MonorepoType } from '../shared/utils/get-monorepo-type.ts';
 
 export type EventType =
   | 'boot'

code/lib/cli-storybook/src/ai/index.ts

@@ -17,7 +17,7 @@ import { SupportedLanguage } from 'storybook/internal/types';
 import { ProjectTypeService } from '../../../create-storybook/src/services/ProjectTypeService.ts';
 
 import { getStorybookData } from '../automigrate/helpers/mainConfigFile.ts';
-import { generateMarkdownOutput } from './prompt.ts';
+import { getAiSetupMarkdownOutput } from './setup-prompts/index.ts';
 import type { ProjectInfo, AiSetupOptions } from './types.ts';
 
 export async function aiSetup(options: AiSetupOptions): Promise<void> {
@@ -84,7 +84,7 @@ export async function aiSetup(options: AiSetupOptions): Promise<void> {
     return;
   }
 
-  const result = await generateMarkdownOutput(projectInfo);
+  const result = await getAiSetupMarkdownOutput(projectInfo);
   const markdownOutput = result.markdown;
 
   await telemetry('ai-setup', {

code/lib/cli-storybook/src/ai/setup-prompts/index.ts

@@ -1,6 +1,8 @@
-import type { AiPrompt, ProjectInfo } from '../types.ts';
+import dedent from 'ts-dedent';
+import type { ProjectInfo } from '../types.ts';
 
 import * as optimizedTests from './optimized-tests.ts';
+import { getProjectOverview } from '../utils/project-overview.ts';
 
 /**
  * Main prompt used currently in `npx storybook ai setup` command. If you promote a new prompt to be default, move this to the FORMERLY_USED_PROMPTS object below.
@@ -11,10 +13,13 @@ const CURRENTLY_USED_PROMPT: Record<string, (projectInfo: ProjectInfo) => string
 
 /**
  * Names of variants registered behind `EVAL_SETUP_PROMPT`. Loaded on demand
- * from sibling files so the bundler can code-split them away from the
+ * from sibling files so the bundler can code|-split them away from the
  * default-only path that real users hit.
  */
 const FORMERLY_USED_PROMPTS: Record<string, () => Promise<(projectInfo: ProjectInfo) => string>> = {
+  monorepo: async () => (await import('./monorepo.ts')).instructions,
+  'optimized-tests': async () => (await import('./optimized-tests.ts')).instructions,
+  'relaxed-limits': async () => (await import('./relaxed-limits.ts')).instructions,
   setup: async () => (await import('./setup.ts')).instructions,
   'pattern-copy-play': async () => (await import('./pattern-copy-play.ts')).instructions,
 };
@@ -53,17 +58,23 @@ function resolvePromptName(): PromptName {
   return DEFAULT_PROMPT_NAME;
 }
 
-export async function getPrompts(projectInfo: ProjectInfo): Promise<{ prompts: AiPrompt[] }> {
+export async function getAiSetupPrompt(projectInfo: ProjectInfo): Promise<string> {
   const name = resolvePromptName();
   const builder = CURRENTLY_USED_PROMPT[name] ?? (await FORMERLY_USED_PROMPTS[name]());
 
+  return builder(projectInfo);
+}
+
+export async function getAiSetupMarkdownOutput(projectInfo: ProjectInfo): Promise<{
+  markdown: string;
+}> {
   return {
-    prompts: [
-      {
-        name,
-        description: 'Set up Storybook for success',
-        instructions: builder(projectInfo),
-      },
-    ],
+    markdown: dedent`
+    # Storybook Setup
+
+    ${getProjectOverview(projectInfo)}
+
+    ${await getAiSetupPrompt(projectInfo)}
+  `,
   };
 }