@morya-ui/setup 0.3.3 → 0.3.5

package/src/cli.mjs

@@ -1,335 +1,312 @@
-import { existsSync } from 'node:fs'
-import { dirname, join, resolve } from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { copyTemplate } from './copy-template.mjs'
-import { readJson } from './fs-utils.mjs'
-import { installMoryaUi } from './install.mjs'
-import { mergeMcpConfig } from './mcp.mjs'
-import { ensureCheckColorsScript } from './package-json.mjs'
-import {
-  buildAiInclude,
-  installSkillsCli,
-  loadSkillsCatalog,
-  parseSkillsFlag,
-  resolveSkillSelection,
-} from './skills.mjs'
-import { ensureStylesImport } from './styles.mjs'
-
-const __dirname = dirname(fileURLToPath(import.meta.url))
-const PKG_ROOT = resolve(__dirname, '..')
-const TEMPLATE_ROOT = join(PKG_ROOT, 'template')
-
-const MODES = new Set(['app', 'ai', 'full'])
-
-/** Mode → default skips (user --skip-* can only add more skips). */
-const MODE_DEFAULTS = {
-  full: {},
-  app: { skipTemplate: true, skipMcp: true, skipScripts: true },
-  ai: { skipInstall: true, skipStyles: true },
-}
-
-const SKIP_FLAGS = {
-  '--skip-install': 'skipInstall',
-  '--skip-template': 'skipTemplate',
-  '--skip-mcp': 'skipMcp',
-  '--skip-styles': 'skipStyles',
-  '--skip-scripts': 'skipScripts',
-}
-
-export function printHelp() {
-  const { skills } = loadSkillsCatalog()
-  const skillList = skills.map((s) => {
-    const tag = s.required ? 'required' : s.default ? 'default' : 'optional'
-    const via = s.install === 'skills-cli' ? ' [skills-cli latest]' : ''
-    return `    ${s.id.padEnd(24)} (${tag})${via} ${s.description}`
-  }).join('\n')
-
-  console.log(`Usage: morya-ui-setup [command] [options]
-
-Commands:
-  (default) / full  Install morya-ui, AI template, MCP, styles, check:colors
-  app               Install morya-ui and inject styles.css
-  ai                Copy Agent skills / rules / DESIGN,
-                    merge Cursor MCP, add check:colors
-
-Default command:
-  - install morya-ui
-  - copy DESIGN.md, selected Agent skills, Cursor rules
-  - merge .cursor/mcp.json for @morya-ui/mcp
-  - inject import 'morya-ui/styles.css' into the app entry when found
-  - add check:colors script when missing
-
-Options:
-  --cwd <dir>       Target project root (default: process.cwd())
-  --pm <name>       Package manager: pnpm | yarn | npm (auto-detect by lockfile)
-  --skills <list>   Comma-separated skill ids, or "all" (skips interactive prompt)
-  --yes             Use default skills without prompting (CI / non-interactive)
-  --force           Overwrite existing template files and MCP server entry
-  --dry-run         Print actions without writing or installing
-  --skip-install    Skip dependency install
-  --skip-template   Skip copying AI template files
-  --skip-mcp        Skip writing .cursor/mcp.json
-  --skip-styles     Skip injecting styles.css
-  --skip-scripts    Skip adding check:colors to package.json
-  -h, --help        Show this help
-
-Skills:
-${skillList}
-`)
-}
-
-/**
- * @param {string[]} argv
- */
-export function parseArgs(argv) {
-  const options = {
-    mode: 'full',
-    cwd: process.cwd(),
-    pm: undefined,
-    skills: undefined,
-    yes: false,
-    force: false,
-    dryRun: false,
-    skipInstall: false,
-    skipTemplate: false,
-    skipMcp: false,
-    skipStyles: false,
-    skipScripts: false,
-    help: false,
-  }
-
-  for (let i = 0; i < argv.length; i++) {
-    const arg = argv[i]
-    if (arg === '-h' || arg === '--help') {
-      options.help = true
-      continue
-    }
-    if (MODES.has(arg)) {
-      options.mode = arg
-      continue
-    }
-    if (arg === '--force') {
-      options.force = true
-      continue
-    }
-    if (arg === '--dry-run') {
-      options.dryRun = true
-      continue
-    }
-    if (arg === '--yes' || arg === '-y') {
-      options.yes = true
-      continue
-    }
-    if (SKIP_FLAGS[arg]) {
-      options[SKIP_FLAGS[arg]] = true
-      continue
-    }
-    if (arg === '--cwd') {
-      const value = argv[++i]
-      if (!value) throw new Error('--cwd requires a path')
-      options.cwd = resolve(value)
-      continue
-    }
-    if (arg.startsWith('--cwd=')) {
-      options.cwd = resolve(arg.slice('--cwd='.length))
-      continue
-    }
-    if (arg === '--pm') {
-      const value = argv[++i]
-      if (!value) throw new Error('--pm requires pnpm, yarn, or npm')
-      options.pm = value
-      continue
-    }
-    if (arg.startsWith('--pm=')) {
-      options.pm = arg.slice('--pm='.length)
-      continue
-    }
-    if (arg === '--skills') {
-      const value = argv[++i]
-      if (!value) throw new Error('--skills requires a comma-separated list or "all"')
-      options.skills = value
-      continue
-    }
-    if (arg.startsWith('--skills=')) {
-      options.skills = arg.slice('--skills='.length)
-      continue
-    }
-    throw new Error(`Unknown argument: ${arg}`)
-  }
-
-  const defaults = MODE_DEFAULTS[options.mode] || {}
-  for (const [key, value] of Object.entries(defaults)) {
-    if (value) options[key] = true
-  }
-
-  return options
-}
-
-function rel(cwd, path) {
-  if (!path) return ''
-  return path.startsWith(cwd) ? path.slice(cwd.length).replace(/^[\\/]/, '') || path : path
-}
-
-/**
- * @param {string} cwd
- */
-function hasMoryaUiDependency(cwd) {
-  const path = join(cwd, 'package.json')
-  if (!existsSync(path)) return false
-  try {
-    const pkg = readJson(path)
-    return Boolean(
-      pkg.dependencies?.['morya-ui']
-      || pkg.devDependencies?.['morya-ui']
-      || pkg.peerDependencies?.['morya-ui'],
-    )
-  } catch {
-    return false
-  }
-}
-
-/**
- * @param {ReturnType<typeof parseArgs>} options
- */
-export async function runSetup(options) {
-  const {
-    mode,
-    cwd,
-    force,
-    dryRun,
-    skipInstall,
-    skipTemplate,
-    skipMcp,
-    skipStyles,
-    skipScripts,
-    pm,
-    skills: skillsFlag,
-    yes,
-  } = options
-
-  console.log(`@morya-ui/setup [${mode}] → ${cwd}${dryRun ? ' (dry-run)' : ''}`)
-  console.log('')
-
-  if (mode === 'ai' && !hasMoryaUiDependency(cwd)) {
-    console.log(
-      'Warning: morya-ui is not listed in package.json. Run `npx @morya-ui/setup app` first (or pnpm add morya-ui).',
-    )
-    console.log('')
-  }
-
-  const catalog = loadSkillsCatalog()
-  let selectedSkills = []
-  let aiInclude
-
-  const needsTemplate = !skipTemplate && (mode === 'ai' || mode === 'full')
-  if (needsTemplate) {
-    if (skillsFlag != null) {
-      selectedSkills = parseSkillsFlag(skillsFlag, catalog.skills)
-    } else {
-      selectedSkills = await resolveSkillSelection(catalog.skills, {
-        skipPrompt: yes || dryRun,
-      })
-    }
-    aiInclude = buildAiInclude(selectedSkills, catalog.skills)
-    console.log(`Skills: ${selectedSkills.join(', ')}`)
-    console.log('')
-  }
-
-  const install = installMoryaUi(cwd, { pm, dryRun, skipInstall })
-
-  const template = skipTemplate
-    ? { copied: [], skipped: [], forced: [], skippedStep: true }
-    : copyTemplate(TEMPLATE_ROOT, cwd, {
-        force,
-        dryRun,
-        include: aiInclude,
-      })
-
-  const remoteSkills = skipTemplate || !selectedSkills.length
-    ? { installed: [], commands: [], skipped: true }
-    : installSkillsCli(cwd, selectedSkills, catalog.skills, { dryRun })
-
-  const mcp = skipMcp
-    ? { path: join(cwd, '.cursor', 'mcp.json'), action: 'skipped-flag' }
-    : mergeMcpConfig(cwd, { force, dryRun })
-
-  const styles = skipStyles
-    ? { action: 'skipped', reason: 'skip-styles' }
-    : ensureStylesImport(cwd, { dryRun })
-
-  const scripts = skipScripts
-    ? { action: 'skipped-flag' }
-    : ensureCheckColorsScript(cwd, { force, dryRun })
-
-  console.log('--- Summary ---')
-  if (install.skipped) {
-    console.log(`Install: skipped (${install.reason}) — would run: ${install.command}`)
-  } else {
-    console.log(`Install: ok (${install.pm}) — ${install.command}`)
-  }
-
-  if (template.skippedStep) {
-    console.log('Template: skipped (--skip-template or app mode)')
-  } else {
-    console.log(
-      `Template: ${template.copied.length} copied, ${template.forced.length} overwritten, ${template.skipped.length} skipped`,
-    )
-    if (selectedSkills.length) console.log(`  skills: ${selectedSkills.join(', ')}`)
-    if (template.skipped.length && template.skipped.length <= 8) {
-      for (const file of template.skipped) console.log(`  skip ${file}`)
-    } else if (template.skipped.length > 8) {
-      for (const file of template.skipped.slice(0, 5)) console.log(`  skip ${file}`)
-      console.log(`  … and ${template.skipped.length - 5} more (use --force to overwrite)`)
-    }
-  }
-
-  if (remoteSkills.skipped) {
-    // no companions selected or template step skipped
-  } else if (remoteSkills.dryRun) {
-    console.log(`Skills CLI: dry-run — would install ${remoteSkills.installed.join(', ')}`)
-    for (const command of remoteSkills.commands) console.log(`  $ ${command}`)
-  } else {
-    console.log(`Skills CLI: installed ${remoteSkills.installed.join(', ')} (latest)`)
-  }
-
-  if (mcp.action === 'skipped-flag') {
-    console.log('MCP: skipped (--skip-mcp or app mode)')
-  } else {
-    console.log(`MCP: ${mcp.action} (${rel(cwd, mcp.path) || '.cursor/mcp.json'})`)
-  }
-
-  if (styles.reason === 'skip-styles') {
-    console.log('Styles: skipped (--skip-styles or ai mode)')
-  } else if (styles.action === 'injected') {
-    console.log(`Styles: injected into ${rel(cwd, styles.path)}`)
-  } else if (styles.action === 'skipped') {
-    console.log(`Styles: skipped (${styles.reason}) in ${rel(cwd, styles.path)}`)
-  } else {
-    console.log('Styles: no entry file found — add manually:')
-    console.log("  import 'morya-ui/styles.css'")
-  }
-
-  if (scripts.action === 'skipped-flag') {
-    console.log('Scripts: skipped (--skip-scripts or app mode)')
-  } else {
-    console.log(`Scripts: check:colors ${scripts.action}`)
-  }
-
-  console.log('')
-  console.log('Next:')
-  if (mode === 'app') {
-    console.log('  1. Ensure the styles.css import is in your app entry.')
-    console.log('  2. Optional AI pack: npx @morya-ui/setup ai')
-  } else if (mode === 'ai') {
-    console.log('  1. Restart Cursor (or reload MCP) so morya-ui MCP tools appear.')
-    console.log('  2. Have the agent read DESIGN.md before generating pages.')
-    console.log('  3. Optional: pnpm check:colors')
-  } else {
-    console.log('  1. Ensure the styles.css import is in your app entry.')
-    console.log('  2. Restart Cursor (or reload MCP) so morya-ui MCP tools appear.')
-    console.log('  3. Have the agent read DESIGN.md before generating pages.')
-    console.log('  4. Optional: pnpm check:colors')
-  }
-
-  return { mode, install, template, remoteSkills, mcp, styles, scripts, skills: selectedSkills }
-}
+import { dirname, join, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { copyTemplate } from './copy-template.mjs'
+import { installMoryaUi } from './install.mjs'
+import { mergeMcpConfig } from './mcp.mjs'
+import { ensureCheckColorsScript } from './package-json.mjs'
+import {
+  buildAiInclude,
+  installSkillsCli,
+  loadSkillsCatalog,
+  parseSkillsFlag,
+  resolveSkillSelection,
+} from './skills.mjs'
+import { ensureStylesImport } from './styles.mjs'
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+const PKG_ROOT = resolve(__dirname, '..')
+const TEMPLATE_ROOT = join(PKG_ROOT, 'template')
+
+const MODES = new Set(['app', 'ai', 'full'])
+
+/** Mode → default skips (user --skip-* can only add more skips). */
+const MODE_DEFAULTS = {
+  full: {},
+  app: { skipTemplate: true, skipMcp: true, skipScripts: true },
+  // ai still upgrades morya-ui / @morya-ui/* to latest unless --skip-install
+  ai: { skipStyles: true },
+}
+
+const SKIP_FLAGS = {
+  '--skip-install': 'skipInstall',
+  '--skip-template': 'skipTemplate',
+  '--skip-mcp': 'skipMcp',
+  '--skip-styles': 'skipStyles',
+  '--skip-scripts': 'skipScripts',
+}
+
+export function printHelp() {
+  const { skills } = loadSkillsCatalog()
+  const skillList = skills.map((s) => {
+    const tag = s.required ? 'required' : s.default ? 'default' : 'optional'
+    const via = s.install === 'skills-cli' ? ' [skills-cli latest]' : ''
+    return `    ${s.id.padEnd(24)} (${tag})${via} ${s.description}`
+  }).join('\n')
+
+  console.log(`Usage: morya-ui-setup [command] [options]
+
+Commands:
+  (default) / full  Upgrade morya packages to latest, AI template, MCP, styles, check:colors
+  app               Upgrade morya packages to latest and inject styles.css
+  ai                Upgrade morya packages to latest, copy Agent skills / rules / DESIGN,
+                    merge Cursor MCP, add check:colors
+
+Default command:
+  - install / upgrade morya-ui@latest and any existing @morya-ui/* to @latest
+  - copy DESIGN.md, selected Agent skills, Cursor rules
+  - merge .cursor/mcp.json for @morya-ui/mcp@latest
+  - inject import 'morya-ui/styles.css' into the app entry when found
+  - add check:colors script when missing
+
+Options:
+  --cwd <dir>       Target project root (default: process.cwd())
+  --pm <name>       Package manager: pnpm | yarn | npm (auto-detect by lockfile)
+  --skills <list>   Comma-separated skill ids, or "all" (skips interactive prompt)
+  --yes             Use default skills without prompting (CI / non-interactive)
+  --force           Overwrite existing template files and MCP server entry
+  --dry-run         Print actions without writing or installing
+  --skip-install    Skip dependency install / upgrade
+  --skip-template   Skip copying AI template files
+  --skip-mcp        Skip writing .cursor/mcp.json
+  --skip-styles     Skip injecting styles.css
+  --skip-scripts    Skip adding check:colors to package.json
+  -h, --help        Show this help
+
+Skills:
+${skillList}
+`)
+}
+
+/**
+ * @param {string[]} argv
+ */
+export function parseArgs(argv) {
+  const options = {
+    mode: 'full',
+    cwd: process.cwd(),
+    pm: undefined,
+    skills: undefined,
+    yes: false,
+    force: false,
+    dryRun: false,
+    skipInstall: false,
+    skipTemplate: false,
+    skipMcp: false,
+    skipStyles: false,
+    skipScripts: false,
+    help: false,
+  }
+
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i]
+    if (arg === '-h' || arg === '--help') {
+      options.help = true
+      continue
+    }
+    if (MODES.has(arg)) {
+      options.mode = arg
+      continue
+    }
+    if (arg === '--force') {
+      options.force = true
+      continue
+    }
+    if (arg === '--dry-run') {
+      options.dryRun = true
+      continue
+    }
+    if (arg === '--yes' || arg === '-y') {
+      options.yes = true
+      continue
+    }
+    if (SKIP_FLAGS[arg]) {
+      options[SKIP_FLAGS[arg]] = true
+      continue
+    }
+    if (arg === '--cwd') {
+      const value = argv[++i]
+      if (!value) throw new Error('--cwd requires a path')
+      options.cwd = resolve(value)
+      continue
+    }
+    if (arg.startsWith('--cwd=')) {
+      options.cwd = resolve(arg.slice('--cwd='.length))
+      continue
+    }
+    if (arg === '--pm') {
+      const value = argv[++i]
+      if (!value) throw new Error('--pm requires pnpm, yarn, or npm')
+      options.pm = value
+      continue
+    }
+    if (arg.startsWith('--pm=')) {
+      options.pm = arg.slice('--pm='.length)
+      continue
+    }
+    if (arg === '--skills') {
+      const value = argv[++i]
+      if (!value) throw new Error('--skills requires a comma-separated list or "all"')
+      options.skills = value
+      continue
+    }
+    if (arg.startsWith('--skills=')) {
+      options.skills = arg.slice('--skills='.length)
+      continue
+    }
+    throw new Error(`Unknown argument: ${arg}`)
+  }
+
+  const defaults = MODE_DEFAULTS[options.mode] || {}
+  for (const [key, value] of Object.entries(defaults)) {
+    if (value) options[key] = true
+  }
+
+  return options
+}
+
+function rel(cwd, path) {
+  if (!path) return ''
+  return path.startsWith(cwd) ? path.slice(cwd.length).replace(/^[\\/]/, '') || path : path
+}
+
+/**
+ * @param {ReturnType<typeof parseArgs>} options
+ */
+export async function runSetup(options) {
+  const {
+    mode,
+    cwd,
+    force,
+    dryRun,
+    skipInstall,
+    skipTemplate,
+    skipMcp,
+    skipStyles,
+    skipScripts,
+    pm,
+    skills: skillsFlag,
+    yes,
+  } = options
+
+  console.log(`@morya-ui/setup [${mode}] → ${cwd}${dryRun ? ' (dry-run)' : ''}`)
+  console.log('')
+
+  const catalog = loadSkillsCatalog()
+  let selectedSkills = []
+  let aiInclude
+
+  const needsTemplate = !skipTemplate && (mode === 'ai' || mode === 'full')
+  if (needsTemplate) {
+    if (skillsFlag != null) {
+      selectedSkills = parseSkillsFlag(skillsFlag, catalog.skills)
+    } else {
+      selectedSkills = await resolveSkillSelection(catalog.skills, {
+        skipPrompt: yes || dryRun,
+      })
+    }
+    aiInclude = buildAiInclude(selectedSkills, catalog.skills)
+    console.log(`Skills: ${selectedSkills.join(', ')}`)
+    console.log('')
+  }
+
+  // Always ensure morya-ui@latest; also bump any existing @morya-ui/* (nuxt, mcp, …).
+  const install = installMoryaUi(cwd, { pm, dryRun, skipInstall, ensureCore: true })
+
+  const template = skipTemplate
+    ? { copied: [], skipped: [], forced: [], skippedStep: true }
+    : copyTemplate(TEMPLATE_ROOT, cwd, {
+        force,
+        dryRun,
+        include: aiInclude,
+      })
+
+  const remoteSkills = skipTemplate || !selectedSkills.length
+    ? { installed: [], commands: [], skipped: true }
+    : installSkillsCli(cwd, selectedSkills, catalog.skills, { dryRun })
+
+  const mcp = skipMcp
+    ? { path: join(cwd, '.cursor', 'mcp.json'), action: 'skipped-flag' }
+    : mergeMcpConfig(cwd, { force, dryRun })
+
+  const styles = skipStyles
+    ? { action: 'skipped', reason: 'skip-styles' }
+    : ensureStylesImport(cwd, { dryRun })
+
+  const scripts = skipScripts
+    ? { action: 'skipped-flag' }
+    : ensureCheckColorsScript(cwd, { force, dryRun })
+
+  console.log('--- Summary ---')
+  const pkgList = (install.packages || []).join(', ') || 'morya-ui'
+  if (install.skipped) {
+    console.log(`Install: skipped (${install.reason}) — would run: ${install.command}`)
+  } else {
+    console.log(`Install: upgraded to latest (${install.pm}) — ${pkgList}`)
+    console.log(`  $ ${install.command}`)
+  }
+
+  if (template.skippedStep) {
+    console.log('Template: skipped (--skip-template or app mode)')
+  } else {
+    console.log(
+      `Template: ${template.copied.length} copied, ${template.forced.length} overwritten, ${template.skipped.length} skipped`,
+    )
+    if (selectedSkills.length) console.log(`  skills: ${selectedSkills.join(', ')}`)
+    if (template.skipped.length && template.skipped.length <= 8) {
+      for (const file of template.skipped) console.log(`  skip ${file}`)
+    } else if (template.skipped.length > 8) {
+      for (const file of template.skipped.slice(0, 5)) console.log(`  skip ${file}`)
+      console.log(`  … and ${template.skipped.length - 5} more (use --force to overwrite)`)
+    }
+  }
+
+  if (remoteSkills.skipped) {
+    // no companions selected or template step skipped
+  } else if (remoteSkills.dryRun) {
+    console.log(`Skills CLI: dry-run — would install ${remoteSkills.installed.join(', ')}`)
+    for (const command of remoteSkills.commands) console.log(`  $ ${command}`)
+  } else {
+    console.log(`Skills CLI: installed ${remoteSkills.installed.join(', ')} (latest)`)
+  }
+
+  if (mcp.action === 'skipped-flag') {
+    console.log('MCP: skipped (--skip-mcp or app mode)')
+  } else {
+    console.log(`MCP: ${mcp.action} (${rel(cwd, mcp.path) || '.cursor/mcp.json'})`)
+  }
+
+  if (styles.reason === 'skip-styles') {
+    console.log('Styles: skipped (--skip-styles or ai mode)')
+  } else if (styles.action === 'injected') {
+    console.log(`Styles: injected into ${rel(cwd, styles.path)}`)
+  } else if (styles.action === 'skipped') {
+    console.log(`Styles: skipped (${styles.reason}) in ${rel(cwd, styles.path)}`)
+  } else {
+    console.log('Styles: no entry file found — add manually:')
+    console.log("  import 'morya-ui/styles.css'")
+  }
+
+  if (scripts.action === 'skipped-flag') {
+    console.log('Scripts: skipped (--skip-scripts or app mode)')
+  } else {
+    console.log(`Scripts: check:colors ${scripts.action}`)
+  }
+
+  console.log('')
+  console.log('Next:')
+  if (mode === 'app') {
+    console.log('  1. Ensure the styles.css import is in your app entry.')
+    console.log('  2. Optional AI pack: npx @morya-ui/setup ai')
+  } else if (mode === 'ai') {
+    console.log('  1. Restart Cursor (or reload MCP) so morya-ui MCP tools appear.')
+    console.log('  2. Have the agent read DESIGN.md before generating pages.')
+    console.log('  3. Optional: pnpm check:colors')
+  } else {
+    console.log('  1. Ensure the styles.css import is in your app entry.')
+    console.log('  2. Restart Cursor (or reload MCP) so morya-ui MCP tools appear.')
+    console.log('  3. Have the agent read DESIGN.md before generating pages.')
+    console.log('  4. Optional: pnpm check:colors')
+  }
+
+  return { mode, install, template, remoteSkills, mcp, styles, scripts, skills: selectedSkills }
+}