@morya-ui/setup 0.2.6 → 0.2.7

package/README.md

@@ -4,10 +4,12 @@ One-shot setup for consumer Vue projects using [`morya-ui`](https://www.npmjs.co
 
 Docs (zh/en):
 
-- [AI setup](https://morya-space.github.io/morya-ui/docs/ai-setup) — one-shot CLI
+- [One-shot setup](https://morya-space.github.io/morya-ui/docs/setup) — CLI commands and options
+- [AI setup](https://morya-space.github.io/morya-ui/docs/ai-setup) — Agent workflow
 - [Agent Skill](https://morya-space.github.io/morya-ui/docs/agent-skill) — `morya-ui-pages` behavior
+- [Quick start](https://morya-space.github.io/morya-ui/docs/quick-start) — install and first component
 
-Installs the UI library, copies Agent skill / Cursor rules / design docs from `ai-design-config`, merges Cursor MCP for [`@morya-ui/mcp`](https://www.npmjs.com/package/@morya-ui/mcp), injects `import 'morya-ui/styles.css'`, and writes `src/styles/morya-app-shell.css` with its entry import.
+Installs the UI library, copies Agent skill / Cursor rules / design docs from `design-kit`, merges Cursor MCP for [`@morya-ui/mcp`](https://www.npmjs.com/package/@morya-ui/mcp), injects `import 'morya-ui/styles.css'`, and writes `src/styles/morya-app-shell.css` with its entry import.
 
 ## Usage
 
@@ -17,6 +19,16 @@ In your app project root:
 npx @morya-ui/setup
 ```
 
+Other common commands:
+
+```bash
+# AI config + MCP only (library already installed)
+npx @morya-ui/setup ai
+
+# Library + styles only
+npx @morya-ui/setup app
+```
+
 ### Options
 
 | Flag | Meaning |
@@ -32,6 +44,12 @@ npx @morya-ui/setup
 | `--skip-scripts` | Do not add `check:colors` to `package.json` |
 | `-h`, `--help` | Show help |
 
+Example: MCP only:
+
+```bash
+npx @morya-ui/setup ai --skip-template --skip-scripts
+```
+
 ### Conflict policy
 
 - Template files and `.cursor/rules/*`: **skip** if the destination exists (unless `--force`).
@@ -41,7 +59,7 @@ npx @morya-ui/setup
 
 ### What gets copied
 
-From the package `template/` (synced from repo `ai-design-config/`):
+From the package `template/` (synced from repo `design-kit/`):
 
 - `DESIGN.md`
 - `.agents/skills/morya-ui-pages/`
@@ -50,7 +68,8 @@ From the package `template/` (synced from repo `ai-design-config/`):
 - `design-tokens/`
 - `scripts/check-raw-colors.mjs`
 - `src/examples/`
-- `src/styles/morya-app-shell.css`
+
+`morya-app-shell.css` is written by the CLI (not copied from the template tree).
 
 ### MCP (Cursor)
 
@@ -85,7 +104,7 @@ The CLI does **not** call `app.use(MoryaUI)` or edit `App.vue`.
 ## Local development (this monorepo)
 
 ```bash
-pnpm setup:sync-template   # refresh packages/setup/template from ai-design-config
+pnpm setup:sync-template   # refresh packages/setup/template from design-kit
 pnpm setup:build
 node packages/setup/bin/morya-ui-setup.js --cwd /path/to/app --dry-run
 ```

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morya-ui/setup",
   "type": "module",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "One-shot setup for morya-ui: install the library, Cursor MCP, Agent skills, and design config.",
   "license": "MIT",
   "homepage": "https://github.com/morya-space/morya-ui/tree/main/packages/setup#readme",

package/src/cli.mjs

@@ -1,6 +1,8 @@
+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'
@@ -10,6 +12,26 @@ 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'])
+
+/** AI pack paths under template/ (excludes runtime src/styles — owned by app mode). */
+const AI_TEMPLATE_INCLUDE = [
+  'DESIGN.md',
+  '.agents/skills/morya-ui-pages',
+  '.cursor/rules',
+  'docs',
+  'design-tokens',
+  'scripts/check-raw-colors.mjs',
+  'src/examples',
+]
+
+/** 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',
@@ -19,14 +41,20 @@ const SKIP_FLAGS = {
 }
 
 export function printHelp() {
-  console.log(`Usage: morya-ui-setup [options]
+  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 / app-shell CSS
+  ai                Copy Agent skill / rules / DESIGN / docs / tokens / examples,
+                    merge Cursor MCP, add check:colors
 
-One-shot setup for morya-ui in a consumer Vue project:
+Default command:
   - install morya-ui
   - copy DESIGN.md, Agent skill, Cursor rules, docs, tokens, examples
   - merge .cursor/mcp.json for @morya-ui/mcp
   - inject import 'morya-ui/styles.css' into the app entry when found
-  - write src/styles/morya-app-shell.css (html/body/#app height chain) and inject its import
+  - write src/styles/morya-app-shell.css and inject its import
   - add check:colors script when missing
 
 Options:
@@ -48,6 +76,7 @@ Options:
  */
 export function parseArgs(argv) {
   const options = {
+    mode: 'full',
     cwd: process.cwd(),
     pm: undefined,
     force: false,
@@ -66,6 +95,10 @@ export function parseArgs(argv) {
       options.help = true
       continue
     }
+    if (MODES.has(arg)) {
+      options.mode = arg
+      continue
+    }
     if (arg === '--force') {
       options.force = true
       continue
@@ -101,6 +134,11 @@ export function parseArgs(argv) {
     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
 }
 
@@ -109,11 +147,30 @@ function rel(cwd, path) {
   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,
@@ -125,14 +182,25 @@ export async function runSetup(options) {
     pm,
   } = options
 
-  console.log(`@morya-ui/setup → ${cwd}${dryRun ? ' (dry-run)' : ''}`)
+  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 install = installMoryaUi(cwd, { pm, dryRun, skipInstall })
 
   const template = skipTemplate
     ? { copied: [], skipped: [], forced: [], skippedStep: true }
-    : copyTemplate(TEMPLATE_ROOT, cwd, { force, dryRun })
+    : copyTemplate(TEMPLATE_ROOT, cwd, {
+        force,
+        dryRun,
+        include: mode === 'ai' || mode === 'full' ? AI_TEMPLATE_INCLUDE : undefined,
+      })
 
   const mcp = skipMcp
     ? { path: join(cwd, '.cursor', 'mcp.json'), action: 'skipped-flag' }
@@ -158,7 +226,7 @@ export async function runSetup(options) {
   }
 
   if (template.skippedStep) {
-    console.log('Template: skipped (--skip-template)')
+    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`,
@@ -172,13 +240,13 @@ export async function runSetup(options) {
   }
 
   if (mcp.action === 'skipped-flag') {
-    console.log('MCP: skipped (--skip-mcp)')
+    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)')
+    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') {
@@ -189,7 +257,7 @@ export async function runSetup(options) {
   }
 
   if (shell.reason === 'skip-styles') {
-    console.log('Shell CSS: skipped (--skip-styles)')
+    console.log('Shell CSS: skipped (--skip-styles or ai mode)')
   } else {
     console.log(
       `Shell CSS: file ${shell.fileAction}`
@@ -200,17 +268,26 @@ export async function runSetup(options) {
   }
 
   if (scripts.action === 'skipped-flag') {
-    console.log('Scripts: skipped (--skip-scripts)')
+    console.log('Scripts: skipped (--skip-scripts or app mode)')
   } else {
     console.log(`Scripts: check:colors ${scripts.action}`)
   }
 
   console.log('')
   console.log('Next:')
-  console.log('  1. Ensure styles.css + morya-app-shell.css imports are 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')
+  if (mode === 'app') {
+    console.log('  1. Ensure styles.css + morya-app-shell.css imports are 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 styles.css + morya-app-shell.css imports are 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 { install, template, mcp, styles, shell, scripts }
+  return { mode, install, template, mcp, styles, shell, scripts }
 }

package/src/copy-template.mjs

@@ -20,11 +20,27 @@ function listFiles(dir) {
   return out
 }
 
+/**
+ * @param {string} rel
+ * @param {string[] | undefined} include
+ */
+function matchesInclude(rel, include) {
+  if (!include || include.length === 0) return true
+  const norm = rel.replace(/\\/g, '/')
+  return include.some((prefix) => {
+    const p = prefix.replace(/\\/g, '/')
+    return norm === p || norm.startsWith(`${p}/`)
+  })
+}
+
 /**
  * Copy template tree into target cwd.
+ * @param {string} templateRoot
+ * @param {string} cwd
+ * @param {{ force?: boolean, dryRun?: boolean, include?: string[] }} [options]
  * @returns {{ copied: string[], skipped: string[], forced: string[] }}
  */
-export function copyTemplate(templateRoot, cwd, { force = false, dryRun = false } = {}) {
+export function copyTemplate(templateRoot, cwd, { force = false, dryRun = false, include } = {}) {
   const copied = []
   const skipped = []
   const forced = []
@@ -35,7 +51,7 @@ export function copyTemplate(templateRoot, cwd, { force = false, dryRun = false
     )
   }
 
-  const files = listFiles(templateRoot)
+  const files = listFiles(templateRoot).filter((rel) => matchesInclude(rel, include))
   for (const rel of files) {
     const from = join(templateRoot, rel)
     const to = join(cwd, rel)

package/src/fs-utils.mjs

@@ -2,7 +2,8 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { dirname } from 'node:path'
 
 export function readJson(path) {
-  return JSON.parse(readFileSync(path, 'utf8'))
+  const text = readFileSync(path, 'utf8').replace(/^\uFEFF/, '')
+  return JSON.parse(text)
 }
 
 export function writeJson(path, value, { dryRun = false } = {}) {

package/template/DESIGN.md

@@ -1,6 +1,6 @@
 # Morya UI 设计系统（AI 第一信源）
 
-> 基于 `morya-ui` v0.1.x。生成或审查业务页面时，**必须先遵守本文**，再查阅 `docs/components.md` 与 `docs/golden-pages/`。
+> 基于 `morya-ui` v0.2.6。生成或审查业务页面时，**必须先遵守本文**，再查阅 `docs/components.md` 与 `docs/golden-pages/`。
 
 ## 1. 设计原则
 
@@ -108,7 +108,7 @@ import 'morya-ui/styles.css'
 
 ## 8. 禁止项
 
-- 禁止引入第二套 UI 库（Element Plus、Naive UI 等）混用同一页面。
+- 禁止引入第二套 UI 库混用同一页面。
 - 禁止在业务 CSS 中写死主题色；暗色模式必须能随 `[data-theme="dark"]` 生效。
 - 禁止用 `<div onclick>` 代替 `<button>` / `MButton`。
 - 禁止 Select 与 Dropdown 混用：选项选择用 `MSelect` / `MTreeSelect`；动作菜单用 `MDropdown`。

package/template/design-tokens/tokens.json

@@ -2,7 +2,7 @@
   "$schema": "https://design-tokens.github.io/community-group/format/",
   "meta": {
     "name": "morya-ui",
-    "version": "0.1.1",
+    "version": "0.2.6",
     "source": "morya-ui/src/theme/styles.css",
     "prefix": "m"
   },

package/template/docs/feedback-message-vs-toast.md

@@ -88,13 +88,13 @@ message.error('操作失败')
 | 删除确认用 Message/Toast | `MConfirmDialog` |
 | 所有反馈都用 Toast | 默认改 Message，仅 detail 场景保留 Toast |
 
-## 与 Naive / Element Plus 的对应
+## 概念对照
 
-| Morya UI | 近似概念 |
+| API | 用途 |
 | --- | --- |
-| `message` | Naive `message` / Element `ElMessage` |
-| `toast` | Naive `notification` / Element `ElNotification` |
-| `<MMessage>` | 页面内 `el-alert` / 表单顶部错误条 |
+| `message` | 轻量、短暂的操作反馈（默认首选） |
+| `toast` | 带摘要 + 详情、或需停留更久的通知 |
+| `<MMessage>` | 页面内常驻提示条（如表单顶部错误） |
 
 ## 相关文档