@mr.dj2u/cli 0.1.10 → 0.1.12

package/dist/project-memory.js

@@ -2,6 +2,7 @@ import { access, mkdir, readFile, unlink, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { DEFAULT_STYLIST_THEME, renderGlobalCssThemeBlock, renderThemeTokensFile, } from './stylist-theme.js';
+import { generateProjectRoadmap } from './roadmap.js';
 const SOFTWARE_MANSION_CORE_DEPENDENCIES = {
     'react-native-gesture-handler': '~2.30.0',
     'react-native-reanimated': '4.3.1',
@@ -24,6 +25,10 @@ const STYLIST_DEPENDENCIES = {
     '@react-native-async-storage/async-storage': '2.2.0',
     'reanimated-color-picker': '^4.2.0',
 };
+const STYLIST_DEV_DEPENDENCIES = {
+    '@types/node': '^25.9.1',
+    tailwindcss: '^4.2.4',
+};
 const EXPO_UI_DEPENDENCIES = {
     '@expo/ui': '~56.0.14',
 };
@@ -34,7 +39,7 @@ const UNIWIND_DEV_DEPENDENCIES = {
     tailwindcss: '^4.2.4',
 };
 const PACKAGE_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
-const MDS_CLI_VERSION = '0.1.10';
+const MDS_CLI_VERSION = '0.1.12';
 const MDS_NPX_COMMAND = 'npx mds';
 const DEFAULT_GUIDELINES_TEMPLATE_PATH = path.join(PACKAGE_ROOT, 'templates', 'project', 'guidelines.md');
 const STYLIST_SCREEN_TEMPLATE_PATH = path.join(PACKAGE_ROOT, 'templates', 'stylist-screen.template.tsx');
@@ -75,18 +80,39 @@ export async function scaffoldProjectMemory(projectPath, answers, options = {})
     await mkdir(projectDir, { recursive: true });
     const force = Boolean(options.force);
     const infoPath = path.join(projectDir, 'info.md');
+    const todoPath = path.join(projectDir, 'todo.md');
     const stylePath = path.join(projectDir, 'style.md');
     const existingInfo = await readOptionalText(infoPath);
     const existingStyle = await readOptionalText(stylePath);
     const guidelines = await resolveGuidelines(answers, options);
     const results = await Promise.all([
         writeProjectMemoryFile(infoPath, renderInfo(projectPath, answers, existingInfo), force, true),
-        writeIfAllowed(path.join(projectDir, 'todo.md'), renderTodo(answers), force),
+        writeIfAllowed(todoPath, renderTodo(answers), force),
         writeProjectMemoryFile(stylePath, renderStyle(answers, existingStyle), force, true),
         writeIfAllowed(path.join(projectDir, 'guidelines.md'), guidelines, force),
         writeIfAllowed(path.join(projectPath, 'AGENTS.md'), renderAgentInstructions(answers), force),
         writeIfAllowed(path.join(projectPath, 'CLAUDE.md'), renderClaudeMd(answers), force),
     ]);
+    const roadmapResult = await generateProjectRoadmap(projectPath, {
+        write: true,
+        preserveStatus: true,
+    });
+    const todoResultIndex = results.findIndex((result) => result.filePath === todoPath);
+    if (todoResultIndex >= 0) {
+        const todoResult = results[todoResultIndex];
+        if (todoResult) {
+            results[todoResultIndex] = {
+                filePath: todoResult.filePath,
+                wrote: todoResult.wrote || roadmapResult.wrote,
+            };
+        }
+    }
+    else {
+        results.push({
+            filePath: todoPath,
+            wrote: roadmapResult.wrote,
+        });
+    }
     if (shouldGenerateIntakeAgentHandoff(answers, existingInfo, existingStyle)) {
         results.push(await writeIfAllowed(path.join(projectDir, 'intake-agent.md'), renderIntakeAgentHandoff(answers), force));
     }
@@ -188,6 +214,7 @@ export async function scaffoldRichBoilerplate(projectPath, answers, force, optio
 }
 export function renderInfo(projectPath, answers, existingInfo) {
     const importedNotes = renderImportedNotes(existingInfo, INFO_HEADINGS);
+    const hasConcreteCoreFlows = !isGenericCoreFlowsText(answers.coreFlows);
     return [
         `# ${answers.appName} Project Info`,
         '',
@@ -209,11 +236,15 @@ export function renderInfo(projectPath, answers, existingInfo) {
         '',
         '## Core Features',
         '',
-        `Derived from the first planned flows: ${answers.coreFlows}`,
+        hasConcreteCoreFlows
+            ? `Derived from the first planned flows: ${answers.coreFlows}`
+            : '# TodoForContext(optional): List the first core features the MVP should deliver.',
         '',
         '## Core User Flows',
         '',
-        answers.coreFlows,
+        hasConcreteCoreFlows
+            ? answers.coreFlows
+            : '# TodoForContext(optional): Describe the first real end-to-end user flow the MVP should support.',
         '',
         '## Must-Include Screens Or Flows',
         '',
@@ -263,12 +294,6 @@ export function renderInfo(projectPath, answers, existingInfo) {
         '',
         '## Questions To Revisit',
         '',
-        ...(hasThinOnboardingAnswers(answers)
-            ? [
-                '- Replace generic onboarding defaults with app-specific decisions.',
-                '- Confirm the exact first user flow before production buildout starts.',
-            ]
-            : []),
         '',
         '## Resources',
         '',
@@ -299,7 +324,6 @@ export function renderInfo(projectPath, answers, existingInfo) {
         '',
         `- Advanced package setup: ${formatBoolean(answers.advancedPackageSetup)}`,
         `- Create Expo starter components: ${formatBoolean(answers.includeCreateExpoComponents)}`,
-        `- Latest Expo SDK preference: ${formatBoolean(answers.useLatestExpoSdk)}`,
         `- MDS guidelines template: yes`,
         `- Expo UI: ${formatBoolean(answers.usesExpoUi)}`,
         `- Expo UI Universal components: ${formatBoolean(answers.usesExpoUiUniversalComponents)}`,
@@ -311,7 +335,6 @@ export function renderInfo(projectPath, answers, existingInfo) {
     ].join('\n');
 }
 export function renderTodo(answers) {
-    const needsReview = hasThinOnboardingAnswers(answers);
     return [
         `# ${answers.appName} TODO`,
         '',
@@ -320,55 +343,31 @@ export function renderTodo(answers) {
         '- [ ] Browse exposition pages to understand included base packages.',
         "- [ ] Review styling in the 'Stylist' page.",
         '- [ ] Review `project/` files for accuracy and planning adjustments.',
-        '- [ ] Decide whether to keep or defer `eject-stylist`; mark the decision explicitly.',
+        '- [ ] Run or defer `eject-stylist`; mark this todo done after ejection or deciding to defer (if you want to keep the stylist around for tinkering).',
         '- [ ] Run `mds eject exposition` and keep only the generated sections you want to retain.',
-        '- [ ] Resolve every `# TodoForContext(optional):` marker by filling the section underneath or deleting the marker line to acknowledge no extra context is needed. (There may be none of these if the agent was thorough in onboarding, but if there are any, they should be resolved before development starts.)',
-        '',
-        '- [x] Confirm app purpose, audience, and primary flows in `project/info.md`.',
+        '- [ ] Resolve every `# TodoForContext(optional):` marker in `project/info.md` by filling the section underneath or deleting the marker line to acknowledge no extra context is needed.',
         '- [ ] Confirm visual direction in `project/style.md` after using the Stylist page.',
+        '- [ ] After the `project/info.md` markers are resolved, refresh the agent-derived roadmap from `project/info.md` and review it for accuracy.',
         '- [ ] Keep or prune included package examples after reviewing `/exposition`.',
         '- [ ] Remove exposition pages before production once their lessons are absorbed.',
-        ...(needsReview
-            ? [
-                '- [ ] Replace generic onboarding placeholders with real app decisions before full implementation.',
-            ]
-            : []),
         '',
         '## Phase 1: App Shell And First Flow',
         '',
-        `- [ ] Build the MVP first for ${answers.firstTargetPlatform}.`,
-        `- [ ] Establish app shell, navigation, layouts, and route groups in ${formatAppDirectory(answers.appDirectory)}.`,
-        `- [ ] Use ${formatPlatformLayoutMode(answers.platformLayoutMode)} unless project memory is updated.`,
-        `- [ ] Implement the first core flow from project info: ${answers.coreFlows}.`,
-        '- [ ] Keep route files thin and move real UI into feature screens.',
-        '- [ ] Apply Stylist synced theme tokens to production UI components and screens.',
+        `- [ ] Establish the app shell and first implementation-ready route in ${formatAppDirectory(answers.appDirectory)}.`,
+        '- [ ] Implement the first concrete product flow from `project/info.md` and the roadmap.',
         '',
         '## Phase 2: Data Layer',
         '',
-        `- [ ] Start with ${formatDataStart(answers.dataStart)}.`,
-        ...(answers.dataStart === 'local'
-            ? [
-                '- [ ] Use the local Expo SQLite demo as the first adapter.',
-                '- [ ] Replace the local adapter with Supabase when the product needs synced/authenticated data.',
-            ]
-            : [
-                '- [ ] Create separate Supabase projects for test/staging and production.',
-                '- [ ] Wire publishable client keys through environment files, never service-role keys.',
-            ]),
-        '- [ ] Verify data requirements against `project/info.md` before adding tables or auth.',
+        `- [ ] Implement the initial data layer using ${formatDataStart(answers.dataStart)}.`,
+        ...(answers.dataStart === 'supabase'
+            ? ['- [ ] Create separate Supabase projects for test/staging and production.']
+            : []),
         '',
         '## Phase 3: Complete Product Flows',
         '',
         '- [ ] Build the remaining core flows from `project/info.md` phase by phase.',
-        '- [ ] Add shared state only when state crosses screens or features.',
-        '- [ ] Verify each selected platform after the MVP flow works.',
-        ...answers.targetPlatforms.map((platform) => `- [ ] Verify ${platform} behavior.`),
-        ...(answers.usesExpoUi ? ['- [ ] Add Expo UI examples where they improve native feel.'] : []),
-        ...(answers.usesExpoUiUniversalComponents
-            ? ['- [ ] Review the Expo UI Universal examples before replacing generated exposition code.']
-            : []),
-        ...(answers.usesExpoNativeTabs
-            ? ['- [ ] Prototype Expo Native Tabs for mobile navigation.']
+        ...(answers.targetPlatforms.length > 1
+            ? ['- [ ] Adapt the working MVP flow for the remaining target platforms after the primary flow is stable.']
             : []),
         ...(answers.easUses.length > 0
             ? answers.easUses.map((item) => `- [ ] Configure EAS for ${item}.`)
@@ -376,11 +375,11 @@ export function renderTodo(answers) {
         '',
         '## Phase 4: Polish, Safeguards, And Release',
         '',
-        '- [ ] Prune unused Software Mansion examples and remove unneeded packages.',
         '- [ ] Run `mds doctor --ci` and address errors.',
         ...(answers.testToMainSafeguards
             ? [
                 '- [ ] Follow `project/release-flow.md` for test-to-main development.',
+                '- [ ] Complete the one-time GitHub repo setup from `project/release-flow.md` so `test` and `main` are protected correctly.',
                 '- [ ] Add GitHub branch protection so PR checks pass before merging into `test` or `main`.',
             ]
             : ['- [ ] Decide on release safeguards before production work begins.']),
@@ -390,7 +389,6 @@ export function renderTodo(answers) {
         ...(answers.deployedServer !== 'none'
             ? [`- [ ] Plan deployed server work: ${formatServerChoice(answers.deployedServer)}.`]
             : []),
-        '- [ ] Add monorepo support after the MVP is stable.',
         '',
     ].join('\n');
 }
@@ -454,7 +452,7 @@ function renderThemeProvider() {
     return [
         "import { createContext, useContext, useMemo, useState, type Dispatch, type ReactNode, type SetStateAction } from 'react';",
         '',
-        "import stylistThemeTokens, { type StylistColorPalette, type StylistColorScheme, type StylistThemeTokens } from './tokens';",
+        "import defaultThemeTokens, { type StylistColorPalette, type StylistColorScheme, type StylistThemeTokens } from './tokens';",
         '',
         'export type AppThemeValue = StylistThemeTokens & {',
         '  activeScheme: StylistColorScheme;',
@@ -462,14 +460,14 @@ function renderThemeProvider() {
         '};',
         '',
         'const AppThemeContext = createContext<AppThemeValue>({',
-        '  ...stylistThemeTokens,',
-        '  activeScheme: stylistThemeTokens.colorSystem.previewScheme,',
-        '  activeColors: stylistThemeTokens.colors[stylistThemeTokens.colorSystem.previewScheme],',
+        '  ...defaultThemeTokens,',
+        '  activeScheme: defaultThemeTokens.colorSystem.previewScheme,',
+        '  activeColors: defaultThemeTokens.colors[defaultThemeTokens.colorSystem.previewScheme],',
         '});',
         'const AppThemeSetterContext = createContext<Dispatch<SetStateAction<StylistThemeTokens>> | null>(null);',
         '',
         'export function AppThemeProvider({ children }: { children: ReactNode }) {',
-        '  const [theme, setTheme] = useState<StylistThemeTokens>(stylistThemeTokens);',
+        '  const [theme, setTheme] = useState<StylistThemeTokens>(defaultThemeTokens);',
         '  const value = useMemo<AppThemeValue>(() => {',
         '    const activeScheme = theme.colorSystem.previewScheme;',
         '    return {',
@@ -570,7 +568,6 @@ export function renderGuidelines(answers) {
                 '- Develop through feature branches into `test`, then promote validated work from `test` to `main`.',
             ]
             : []),
-        `- Latest Expo SDK preference captured during onboarding: ${formatBoolean(answers.useLatestExpoSdk)}.`,
         `- Expo UI Universal components preference captured during onboarding: ${formatBoolean(answers.usesExpoUiUniversalComponents)}.`,
         '- Treat monorepo scaffolding as future work until the single-app MVP is stable.',
         '',
@@ -595,7 +592,7 @@ export function renderAgentInstructions(answers) {
         '',
         'If the user says `mds continue` or `MDS Continue`, first run `mds continue` from the app root if available. Use the MDS Continue brief to propose the next plan and wait for approval before editing files. If the command is unavailable, manually inspect markers, Doctor status, git status, and `project/todo.md` in that order.',
         '',
-        'Before any intake, planning, scaffolding, or phase work, scan every `project/` file for the marker `# TodoForContext(optional):`. If any are present, stop and tell the user to fill the section underneath OR delete the marker line to acknowledge they do not want to add that context. Only proceed when zero markers remain.',
+        'Before any intake, planning, scaffolding, or phase work, scan `project/info.md` for the marker `# TodoForContext(optional):`. If any remain, stop and tell the user to fill the section underneath OR delete the marker line to acknowledge they do not want to add that context. Only proceed when zero `project/info.md` markers remain.',
         '',
         'Then build from `project/todo.md` in phase order. Do not make changes that conflict with project memory. If the files are unclear or generic, update the project memory first or ask the user.',
         '',
@@ -733,6 +730,7 @@ async function ensurePackageJson(projectPath, answers, manageUniwind) {
         'expo-doctor': packageJson.scripts?.['expo-doctor'] ?? 'npx expo-doctor',
         'post-create-check': packageJson.scripts?.['post-create-check'] ?? 'npx expo install --fix && npx expo-doctor',
         'ci:verify': packageJson.scripts?.['ci:verify'] ?? `${MDS_NPX_COMMAND} doctor --ci`,
+        test: packageJson.scripts?.test ?? 'npm run lint && npm run typecheck',
     };
     if (!manageUniwind) {
         packageJson.scripts['patch:nativewind-metro'] =
@@ -786,12 +784,10 @@ async function ensurePackageJson(projectPath, answers, manageUniwind) {
             ...packageJson.dependencies,
         };
     }
-    if (answers.targetPlatforms.includes('android')) {
-        packageJson.dependencies = {
-            ...ANDROID_NAVIGATION_BAR_DEPENDENCIES,
-            ...packageJson.dependencies,
-        };
-    }
+    packageJson.dependencies = {
+        ...ANDROID_NAVIGATION_BAR_DEPENDENCIES,
+        ...packageJson.dependencies,
+    };
     if (manageUniwind) {
         packageJson.dependencies = {
             ...UNIWIND_DEPENDENCIES,
@@ -807,6 +803,7 @@ async function ensurePackageJson(projectPath, answers, manageUniwind) {
         delete packageJson.devDependencies['prettier-plugin-tailwindcss'];
     }
     packageJson.devDependencies = {
+        ...STYLIST_DEV_DEPENDENCIES,
         ...packageJson.devDependencies,
         '@mr.dj2u/cli': packageJson.devDependencies?.['@mr.dj2u/cli'] ?? `^${MDS_CLI_VERSION}`,
     };
@@ -828,7 +825,6 @@ function applyGuidelinesTemplate(template, answers) {
         deploymentTarget: answers.deploymentTarget,
         advancedPackageSetup: formatBoolean(answers.advancedPackageSetup),
         includeCreateExpoComponents: formatBoolean(answers.includeCreateExpoComponents),
-        useLatestExpoSdk: formatBoolean(answers.useLatestExpoSdk),
         targetPlatforms: answers.targetPlatforms.map((item) => `- ${item}`).join('\n'),
         firstTargetPlatform: answers.firstTargetPlatform,
         appDirectory: formatAppDirectory(answers.appDirectory),
@@ -948,14 +944,20 @@ function hasThinOnboardingAnswers(answers) {
     const genericValues = new Set([
         'Expo app users',
         'Onboarding, primary app workflow, settings',
-        'Agent should derive the first core user flows from project/info.md during intake.',
         'Local state first; add backend only when needed',
         'Expo web/native deployment',
     ]);
     if (!answers.screens?.trim()) {
         return true;
     }
-    return [answers.audience, answers.coreFlows, answers.dataNeeds, answers.deploymentTarget].some((value) => genericValues.has(value.trim()));
+    return ([answers.audience, answers.dataNeeds, answers.deploymentTarget].some((value) => genericValues.has(value.trim())) || isGenericCoreFlowsText(answers.coreFlows));
+}
+function isGenericCoreFlowsText(value) {
+    const trimmed = value.trim();
+    return (trimmed.length === 0 ||
+        trimmed ===
+            'Let the agent derive the first real core user flows later from the fully clarified `project/info.md`.' ||
+        trimmed === 'Agent should derive the first core user flows from project/info.md during intake.');
 }
 async function ensureUniwindMetroConfig(projectPath) {
     const metroPath = path.join(projectPath, 'metro.config.js');
@@ -1033,20 +1035,35 @@ async function removeTailwindPrettierPluginConfig(filePath) {
 async function ensureGlobalCssImport(projectPath, appDirectory) {
     const layoutPath = path.join(getExpoRouterAppDir(projectPath, appDirectory), '_layout.tsx');
     const appPath = path.join(projectPath, 'App.tsx');
+    const globalCssPath = path.join(projectPath, 'global.css');
+    const hasGlobalCss = await pathExists(globalCssPath);
     const layout = await readOptionalText(layoutPath);
     if (layout) {
-        const importStatement = renderGlobalCssImport(layoutPath, projectPath);
-        const updated = layout.match(/^\s*import\s+['"][^'"]*global\.css['"];?\r?\n/m)
-            ? layout.replace(/^\s*import\s+['"][^'"]*global\.css['"];?\r?\n/m, `${importStatement}\n`)
-            : `${importStatement}\n${layout}`;
+        const globalCssImportPattern = /^\s*import\s+['"][^'"]*global\.css['"];?\r?\n/m;
+        const updated = hasGlobalCss
+            ? layout.match(globalCssImportPattern)
+                ? layout.replace(globalCssImportPattern, `${renderGlobalCssImport(layoutPath, projectPath)}\n`)
+                : `${renderGlobalCssImport(layoutPath, projectPath)}\n${layout}`
+            : layout.replace(globalCssImportPattern, '');
         if (updated !== layout) {
             await writeFile(layoutPath, updated, 'utf8');
         }
         return;
     }
     const app = await readOptionalText(appPath);
-    if (app && !app.includes('global.css')) {
-        await writeFile(appPath, `import './global.css';\n${app}`, 'utf8');
+    if (!app) {
+        return;
+    }
+    const globalCssImportPattern = /^\s*import\s+['"][^'"]*global\.css['"];?\r?\n/m;
+    if (hasGlobalCss) {
+        if (!app.match(globalCssImportPattern)) {
+            await writeFile(appPath, `import './global.css';\n${app}`, 'utf8');
+        }
+        return;
+    }
+    const updated = app.replace(globalCssImportPattern, '');
+    if (updated !== app) {
+        await writeFile(appPath, updated, 'utf8');
     }
 }
 function getExpoRouterAppDir(projectPath, appDirectory) {
@@ -1307,7 +1324,7 @@ function renderStylistSyncApiRoute() {
         "import { access, mkdir, readFile, unlink, writeFile } from 'node:fs/promises';",
         "import path from 'node:path';",
         '',
-        "import stylistThemeTokens from '../../theme/tokens';",
+        "import defaultThemeTokens from '../../theme/tokens';",
         '',
         'interface SyncResponse {',
         '  projectPath: string;',
@@ -1359,7 +1376,7 @@ function renderStylistSyncApiRoute() {
         '',
         '  const themeFromJson = await readThemeJson(themePath);',
         '  const themeFromStyle = await readThemeFromStyleMarkdown(stylePath);',
-        '  const resolvedTheme = themeFromStyle ?? themeFromJson ?? stylistThemeTokens;',
+        '  const resolvedTheme = themeFromStyle ?? themeFromJson ?? defaultThemeTokens;',
         "  const themeSource = themeFromStyle ? 'style.md' : themeFromJson ? 'theme.json' : 'default';",
         '  const mismatchDetected =',
         '    Boolean(themeFromJson) &&',
@@ -1883,7 +1900,7 @@ function renderRichRootLayout(projectPath, appDir, navigationShell, answers) {
         "import { GestureHandlerRootView } from 'react-native-gesture-handler';",
         "import { KeyboardProvider } from 'react-native-keyboard-controller';",
         "import { SafeAreaProvider } from 'react-native-safe-area-context';",
-        `import THEME_FONT_ASSETS from '${themeFontAssetsImport}';`,
+        `import themeFontAssets from '${themeFontAssetsImport}';`,
         `import { AppThemeProvider, useAppTheme } from '${themeProviderImport}';`,
         '',
         'function RouterThemeBridge({ children }: { children: ReactNode }) {',
@@ -1965,8 +1982,8 @@ function renderRichRootLayout(projectPath, appDir, navigationShell, answers) {
         '}',
         '',
         'export default function Layout() {',
-        '  const hasFontAssets = Object.keys(THEME_FONT_ASSETS).length > 0;',
-        '  const [fontsLoaded, fontsError] = useFonts(THEME_FONT_ASSETS);',
+        '  const hasFontAssets = Object.keys(themeFontAssets).length > 0;',
+        '  const [fontsLoaded, fontsError] = useFonts(themeFontAssets);',
         '',
         '  if (hasFontAssets && !fontsLoaded && !fontsError) {',
         '    return null;',
@@ -2063,8 +2080,10 @@ function renderReleaseFlow(answers) {
         '## GitHub Setup The User Still Needs To Do',
         '',
         '- Create `test` and `main` branches.',
+        '- Confirm GitHub Actions is enabled for the repo and that the generated workflow is allowed to run.',
         '- In GitHub branch protection, require pull requests and status checks for `test` and `main`.',
         '- Require the generated `MDS PR Checks` workflow before merge.',
+        '- If the agent has GitHub access with enough permissions, let it apply these repo settings for you; otherwise do this one-time setup in the GitHub UI.',
         '',
     ].join('\n');
 }
@@ -2190,6 +2209,7 @@ function renderGestureCard() {
 function renderKeyboardForm() {
     return [
         "import { Keyboard, Platform, ScrollView, StyleSheet, TextInput } from 'react-native';",
+        "import { KeyboardAwareScrollView, KeyboardToolbar } from 'react-native-keyboard-controller';",
         '',
         'export function KeyboardForm() {',
         '  if (Platform.OS === "web") {',
@@ -2200,14 +2220,6 @@ function renderKeyboardForm() {
         '      </ScrollView>',
         '    );',
         '  }',
-        '',
-        "  const keyboardController = require('react-native-keyboard-controller') as {",
-        '    KeyboardAwareScrollView: any;',
-        '    KeyboardToolbar: any;',
-        '  };',
-        '  const KeyboardAwareScrollView = keyboardController.KeyboardAwareScrollView;',
-        '  const KeyboardToolbar = keyboardController.KeyboardToolbar;',
-        '',
         '  return (',
         '    <>',
         '      <KeyboardAwareScrollView bottomOffset={72} contentContainerStyle={styles.form} style={styles.scroller}>',
@@ -3008,7 +3020,7 @@ function renderHomeScreen(answers, navigationShell) {
         "import { appSnapshot } from '../../data/mock-app';",
         "import { useAppTheme } from '../../theme/provider';",
         '',
-        'const expositionLinks: Array<{ href: Href; title: string; body: string }> = [',
+        'const expositionLinks: { href: Href; title: string; body: string }[] = [',
         ...expositionLinks,
         '];',
         '',
@@ -4303,9 +4315,9 @@ function renderStylistScreen(answers) {
         "import ColorPicker, { HueSlider, Panel1, Preview, Swatches } from 'reanimated-color-picker';",
         '',
         "import { AnimatedPressable, ExpositionNotice } from '../../components/exposition';",
-        "import stylistThemeTokens from '../../theme/tokens';",
+        "import defaultThemeTokens from '../../theme/tokens';",
         '',
-        'type StylistTheme = typeof stylistThemeTokens;',
+        'type StylistTheme = typeof defaultThemeTokens;',
         "type ColorKey = keyof StylistTheme['colors'];",
         '',
         'const colorKeys: ColorKey[] = [',
@@ -4317,11 +4329,11 @@ function renderStylistScreen(answers) {
         "  'warning',",
         '];',
         '',
-        "const spacingKeys: Array<keyof StylistTheme['layout']['spacing']> = ['xs', 'sm', 'md', 'lg', 'xl'];",
+        "const spacingKeys: (keyof StylistTheme['layout']['spacing'])[] = ['xs', 'sm', 'md', 'lg', 'xl'];",
         "const NATIVE_SAVE_COMMAND = 'npm run stylist:sync:android';",
         '',
         'export default function StylistScreen() {',
-        '  const [theme, setTheme] = useState<StylistTheme>(stylistThemeTokens);',
+        '  const [theme, setTheme] = useState<StylistTheme>(defaultThemeTokens);',
         "  const [selectedColor, setSelectedColor] = useState<ColorKey>('primary');",
         "  const [saveMessage, setSaveMessage] = useState('');",
         "  const [nativeDraft, setNativeDraft] = useState('');",