@morya-ui/setup 0.3.4 → 0.3.6

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Morya UI contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,103 +1,119 @@
-# @morya-ui/setup
-
-One-shot setup for consumer Vue projects using [`morya-ui`](https://www.npmjs.com/package/morya-ui).
-
-Docs (zh/en):
-
-- [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 first-party Agent skills / Cursor rules / design docs from `design-kit`, installs optional companion skills at **latest** via the [skills CLI](https://skills.sh/), merges Cursor MCP for [`@morya-ui/mcp`](https://www.npmjs.com/package/@morya-ui/mcp), and injects `import 'morya-ui/styles.css'`.
-
-## Usage
-
-In your app project root:
-
-```bash
-npx @morya-ui/setup
-```
-
-On a TTY, `full` / `ai` will prompt for optional Agent skills (required `morya-ui-pages` is always included).
-
-Other common commands:
-
-```bash
-# AI config + MCP only (library already installed)
-npx @morya-ui/setup ai
-
-# Library + styles only
-npx @morya-ui/setup app
-
-# Non-interactive skill selection
-npx @morya-ui/setup ai --yes
-npx @morya-ui/setup ai --skills=morya-ui-pages,frontend-design,impeccable
-npx @morya-ui/setup ai --skills=all
-```
-
-### Options
-
-| Flag | Meaning |
-| --- | --- |
-| `--cwd <dir>` | Target project root (default: current directory) |
-| `--pm pnpm\|yarn\|npm` | Package manager (default: detect from lockfile, else `pnpm`) |
-| `--skills <list>` | Comma-separated skill ids, or `all` (skips the prompt) |
-| `--yes` / `-y` | Use default skills without prompting |
-| `--force` | Overwrite existing template files and the `morya-ui` MCP entry |
-| `--dry-run` | Print actions without writing or installing |
-| `--skip-install` | Do not install `morya-ui` |
-| `--skip-template` | Do not copy AI skill / rules / docs (also skips companion skill install) |
-| `--skip-mcp` | Do not write `.cursor/mcp.json` |
-| `--skip-styles` | Do not inject `styles.css` |
-| `--skip-scripts` | Do not add `check:colors` to `package.json` |
-| `-h`, `--help` | Show help |
-
-### Skills
-
-| Id | Default | Install | Role |
-| --- | --- | --- | --- |
-| `morya-ui-pages` | required | template (from this package) | Page generation with `M*` + golden layouts |
-| `frontend-design` | optional | skills CLI → `anthropics/skills` (latest) | Express / brand visual taste |
-| `fixing-accessibility` | optional | skills CLI → `ibelick/ui-skills` (latest) | A11y audit and targeted fixes |
-| `impeccable` | optional | skills CLI → `pbakaus/impeccable` (latest) | Named polish / audit / redesign passes |
-
-Catalog: [`catalog/skills.json`](./catalog/skills.json).
-
-### Conflict policy
-
-- Template files and `.cursor/rules/*`: **skip** if the destination exists (unless `--force`).
-- Companion skills (`skills-cli`): always reinstall/update to **latest** when selected.
-- `.cursor/mcp.json`: merge other servers; skip existing `morya-ui` entry unless `--force`.
-- `package.json` `check:colors`: add only if missing (unless `--force`).
-- Styles: inject only when an entry file is found and the import is not already present.
-
-### What gets copied / installed
-
-From the package `template/` (synced from repo `design-kit/`):
-
-- `DESIGN.md` — core design contract (principles, tokens, bans)
-- `.agents/skills/morya-ui-pages/` — first-party page skill
-- `.cursor/rules/`
-- `scripts/check-raw-colors.mjs`
-
-Via `npx skills add …` when optional companions are selected:
-
-- `.agents/skills/frontend-design/`, `fixing-accessibility/`, and/or `impeccable/` (latest upstream)
-
-### MCP (Cursor)
-
-Writes / merges:
-
-```json
-{
-  "mcpServers": {
-    "morya-ui": {
-      "command": "npx",
-      "args": ["-y", "@morya-ui/mcp"]
-    }
-  }
-}
-```
-
-Restart Cursor (or reload MCP) after install.
+# @morya-ui/setup
+
+One-shot setup for consumer Vue projects using [`morya-ui`](https://www.npmjs.com/package/morya-ui).
+
+Docs (zh/en):
+
+- [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 / upgrades the UI library and any existing `@morya-ui/*` packages to **latest**, copies first-party Agent skills / Cursor rules / design docs from `design-kit`, installs optional companion skills at **latest** via the [skills CLI](https://skills.sh/), merges MCP for [`@morya-ui/mcp`](https://www.npmjs.com/package/@morya-ui/mcp) across Cursor / VS Code / Zed (plus portable `.mcp.json`), and injects `import 'morya-ui/styles.css'`.
+
+## Usage
+
+In your app project root:
+
+```bash
+npx @morya-ui/setup
+```
+
+On a TTY, `full` / `ai` will prompt for optional Agent skills (required `morya-ui-pages` is always included).
+
+Other common commands:
+
+```bash
+# Upgrade deps + AI config + MCP (skips styles injection)
+npx @morya-ui/setup ai
+
+# Upgrade deps + styles only
+npx @morya-ui/setup app
+
+# Non-interactive skill selection
+npx @morya-ui/setup ai --yes
+npx @morya-ui/setup ai --skills=morya-ui-pages,frontend-design,impeccable
+npx @morya-ui/setup ai --skills=all
+
+# Only Cursor + VS Code MCP targets (still writes .mcp.json)
+npx @morya-ui/setup ai --editors=cursor,vscode
+
+# Refresh AI template / MCP without touching dependencies
+npx @morya-ui/setup ai --skip-install
+```
+
+### Options
+
+| Flag | Meaning |
+| --- | --- |
+| `--cwd <dir>` | Target project root (default: current directory) |
+| `--pm pnpm\|yarn\|npm` | Package manager (default: detect from lockfile, else `pnpm`) |
+| `--skills <list>` | Comma-separated skill ids, or `all` (skips the prompt) |
+| `--editors <list>` | MCP targets: `cursor`, `vscode`, `zed`, or `all` (default: all three). Always also writes root `.mcp.json` |
+| `--yes` / `-y` | Use default skills without prompting |
+| `--force` | Overwrite existing template files and the `morya-ui` MCP entry |
+| `--dry-run` | Print actions without writing or installing |
+| `--skip-install` | Do not install / upgrade `morya-ui` or `@morya-ui/*` |
+| `--skip-template` | Do not copy AI skill / rules / docs (also skips companion skill install) |
+| `--skip-mcp` | Do not write editor MCP configs or `.mcp.json` |
+| `--skip-styles` | Do not inject `styles.css` |
+| `--skip-scripts` | Do not add `check:colors` to `package.json` |
+| `-h`, `--help` | Show help |
+
+### Skills
+
+| Id | Default | Install | Role |
+| --- | --- | --- | --- |
+| `morya-ui-pages` | required | template (from this package) | Page generation with `M*` + snippets / decisions (composition-first) |
+| `frontend-design` | optional | skills CLI → `anthropics/skills` (latest) | Express / brand visual taste |
+| `fixing-accessibility` | optional | skills CLI → `ibelick/ui-skills` (latest) | A11y audit and targeted fixes |
+| `impeccable` | optional | skills CLI → `pbakaus/impeccable` (latest) | Named polish / audit / redesign passes |
+
+Catalog: [`catalog/skills.json`](./catalog/skills.json).
+
+### Conflict policy
+
+- Dependencies: always install / upgrade `morya-ui@latest` and any existing `@morya-ui/*` (e.g. `@morya-ui/nuxt`) to `@latest` unless `--skip-install`.
+- Template files and `.cursor/rules/*`: **skip** if the destination exists (unless `--force`).
+- Companion skills (`skills-cli`): always reinstall/update to **latest** when selected.
+- MCP configs: merge other servers / settings; skip existing `morya-ui` entry unless `--force`. New or forced entries use `npx -y @morya-ui/mcp@latest`.
+- `package.json` `check:colors`: add only if missing (unless `--force`).
+- Styles: inject only when an entry file is found and the import is not already present.
+
+### What gets copied / installed
+
+From the package `template/` (synced from repo `design-kit/`):
+
+- `DESIGN.md` — core design contract (principles, tokens, bans)
+- `AGENTS.md` — portable always-on agent checklist (editor-neutral)
+- `.agents/skills/morya-ui-pages/` — first-party page skill
+- `.cursor/rules/` — Cursor-specific always-apply rules
+- `scripts/check-raw-colors.mjs`
+
+Via `npx skills add …` when optional companions are selected:
+
+- `.agents/skills/frontend-design/`, `fixing-accessibility/`, and/or `impeccable/` (latest upstream)
+
+### MCP (multi-editor)
+
+| Editor | Path | JSON key |
+| --- | --- | --- |
+| Cursor | `.cursor/mcp.json` | `mcpServers.morya-ui` |
+| VS Code | `.vscode/mcp.json` | `servers.morya-ui` |
+| Zed | `.zed/settings.json` | `context_servers.morya-ui` |
+| Portable | `.mcp.json` | `mcpServers.morya-ui` |
+
+Shared server payload:
+
+```json
+{
+  "command": "npx",
+  "args": ["-y", "@morya-ui/mcp@latest"]
+}
+```
+
+VS Code entries also set `"type": "stdio"`. Root `.mcp.json` is always written when MCP is not skipped (useful for Agent Host / cross-tool discovery).
+
+Claude Code / Windsurf / other clients: configure manually with the same `command` / `args` (see [Agent MCP](https://morya-space.github.io/morya-ui/docs/mcp)).
+
+Reload MCP in your editor after install.

package/bin/morya-ui-setup.js

@@ -1,14 +1,14 @@
-#!/usr/bin/env node
-import { parseArgs, printHelp, runSetup } from '../src/cli.mjs'
-
-try {
-  const options = parseArgs(process.argv.slice(2))
-  if (options.help) {
-    printHelp()
-    process.exit(0)
-  }
-  await runSetup(options)
-} catch (error) {
-  console.error(error instanceof Error ? error.message : error)
-  process.exit(1)
-}
+#!/usr/bin/env node
+import { parseArgs, printHelp, runSetup } from '../src/cli.mjs'
+
+try {
+  const options = parseArgs(process.argv.slice(2))
+  if (options.help) {
+    printHelp()
+    process.exit(0)
+  }
+  await runSetup(options)
+} catch (error) {
+  console.error(error instanceof Error ? error.message : error)
+  process.exit(1)
+}

package/catalog/skills.json

@@ -1,46 +1,46 @@
-{
-  "skills": [
-    {
-      "id": "morya-ui-pages",
-      "name": "Morya UI Pages",
-      "description": "Build admin and product pages with M* components, golden layouts, and tokens.",
-      "required": true,
-      "default": true,
-      "install": "template",
-      "path": ".agents/skills/morya-ui-pages"
-    },
-    {
-      "id": "frontend-design",
-      "name": "Frontend Design",
-      "description": "Distinctive visual direction for Express / brand surfaces; use after morya-ui-pages contract (taste only; still remediate with M*).",
-      "required": false,
-      "default": false,
-      "install": "skills-cli",
-      "source": "anthropics/skills",
-      "skill": "frontend-design",
-      "path": ".agents/skills/frontend-design"
-    },
-    {
-      "id": "fixing-accessibility",
-      "name": "Fixing Accessibility",
-      "description": "Audit and fix names, keyboard, focus, forms, and WCAG basics.",
-      "required": false,
-      "default": false,
-      "install": "skills-cli",
-      "source": "ibelick/ui-skills",
-      "skill": "fixing-accessibility",
-      "path": ".agents/skills/fixing-accessibility"
-    },
-    {
-      "id": "impeccable",
-      "name": "Impeccable",
-      "description": "Named polish / audit / bolder / quieter passes; pair with morya-ui-pages Operate/Persuade modes (latest from pbakaus/impeccable).",
-      "required": false,
-      "default": false,
-      "install": "skills-cli",
-      "source": "pbakaus/impeccable",
-      "skill": "impeccable",
-      "path": ".agents/skills/impeccable"
-    }
-  ]
-}
+{
+  "skills": [
+    {
+      "id": "morya-ui-pages",
+      "name": "Morya UI Pages",
+      "description": "Build admin and product pages with M* components, golden layouts, and tokens.",
+      "required": true,
+      "default": true,
+      "install": "template",
+      "path": ".agents/skills/morya-ui-pages"
+    },
+    {
+      "id": "frontend-design",
+      "name": "Frontend Design",
+      "description": "Distinctive visual direction for Express / brand surfaces; use after morya-ui-pages contract (taste only; still remediate with M*).",
+      "required": false,
+      "default": false,
+      "install": "skills-cli",
+      "source": "anthropics/skills",
+      "skill": "frontend-design",
+      "path": ".agents/skills/frontend-design"
+    },
+    {
+      "id": "fixing-accessibility",
+      "name": "Fixing Accessibility",
+      "description": "Audit and fix names, keyboard, focus, forms, and WCAG basics.",
+      "required": false,
+      "default": false,
+      "install": "skills-cli",
+      "source": "ibelick/ui-skills",
+      "skill": "fixing-accessibility",
+      "path": ".agents/skills/fixing-accessibility"
+    },
+    {
+      "id": "impeccable",
+      "name": "Impeccable",
+      "description": "Named polish / audit / bolder / quieter passes; pair with morya-ui-pages Operate/Persuade modes (latest from pbakaus/impeccable).",
+      "required": false,
+      "default": false,
+      "install": "skills-cli",
+      "source": "pbakaus/impeccable",
+      "skill": "impeccable",
+      "path": ".agents/skills/impeccable"
+    }
+  ]
+}

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@morya-ui/setup",
   "type": "module",
-  "version": "0.3.4",
-  "packageManager": "pnpm@10.12.4",
-  "description": "One-shot setup for morya-ui: install the library, Cursor MCP, Agent skills, and design config.",
+  "version": "0.3.6",
+  "description": "One-shot setup for morya-ui: install the library, multi-editor MCP, Agent skills, and design config.",
   "license": "MIT",
   "homepage": "https://github.com/morya-space/morya-ui/tree/main/packages/setup#readme",
   "repository": {
@@ -33,6 +32,6 @@
   "scripts": {
     "sync-template": "node ./scripts/sync-template.mjs",
     "build": "pnpm run sync-template",
-    "prepublishOnly": "pnpm run build"
+    "test": "node --test src/__tests__/**/*.test.mjs"
   }
-}
+}

package/src/__tests__/mcp.test.mjs

@@ -0,0 +1,141 @@
+import assert from 'node:assert/strict'
+import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, it } from 'node:test'
+import {
+  DEFAULT_EDITORS,
+  SERVER_CONFIG,
+  VSCODE_SERVER_CONFIG,
+  mergeMcpConfig,
+  parseEditorsFlag,
+} from '../mcp.mjs'
+
+/** @type {string[]} */
+const temps = []
+
+function makeCwd() {
+  const cwd = mkdtempSync(join(tmpdir(), 'morya-setup-mcp-'))
+  temps.push(cwd)
+  return cwd
+}
+
+afterEach(() => {
+  while (temps.length) {
+    rmSync(temps.pop(), { recursive: true, force: true })
+  }
+})
+
+function readJson(path) {
+  return JSON.parse(readFileSync(path, 'utf8'))
+}
+
+describe('parseEditorsFlag', () => {
+  it('defaults to all known editors', () => {
+    assert.deepEqual(parseEditorsFlag(), [...DEFAULT_EDITORS])
+    assert.deepEqual(parseEditorsFlag('all'), [...DEFAULT_EDITORS])
+  })
+
+  it('parses and dedupes a subset', () => {
+    assert.deepEqual(parseEditorsFlag('zed,cursor,zed'), ['zed', 'cursor'])
+  })
+
+  it('rejects unknown editors', () => {
+    assert.throws(() => parseEditorsFlag('cursor,windsurf'), /Unknown editor/)
+  })
+})
+
+describe('mergeMcpConfig', () => {
+  it('creates cursor, vscode, zed, and portable configs', () => {
+    const cwd = makeCwd()
+    const { results } = mergeMcpConfig(cwd)
+
+    assert.equal(results.length, 4)
+    assert.deepEqual(
+      results.map((r) => r.editor),
+      ['cursor', 'vscode', 'zed', 'portable'],
+    )
+    assert.ok(results.every((r) => r.action === 'created'))
+
+    assert.deepEqual(readJson(join(cwd, '.cursor', 'mcp.json')), {
+      mcpServers: { 'morya-ui': SERVER_CONFIG },
+    })
+    assert.deepEqual(readJson(join(cwd, '.vscode', 'mcp.json')), {
+      servers: { 'morya-ui': VSCODE_SERVER_CONFIG },
+    })
+    assert.deepEqual(readJson(join(cwd, '.zed', 'settings.json')), {
+      context_servers: { 'morya-ui': SERVER_CONFIG },
+    })
+    assert.deepEqual(readJson(join(cwd, '.mcp.json')), {
+      mcpServers: { 'morya-ui': SERVER_CONFIG },
+    })
+  })
+
+  it('skips existing morya-ui entries unless force', () => {
+    const cwd = makeCwd()
+    mkdirSync(join(cwd, '.cursor'), { recursive: true })
+    writeFileSync(
+      join(cwd, '.cursor', 'mcp.json'),
+      JSON.stringify({
+        mcpServers: {
+          other: { command: 'echo' },
+          'morya-ui': { command: 'old' },
+        },
+      }),
+      'utf8',
+    )
+
+    const skipped = mergeMcpConfig(cwd, { editors: ['cursor'] })
+    const cursorSkip = skipped.results.find((r) => r.editor === 'cursor')
+    assert.equal(cursorSkip.action, 'skipped')
+    assert.equal(readJson(join(cwd, '.cursor', 'mcp.json')).mcpServers['morya-ui'].command, 'old')
+    assert.ok(readJson(join(cwd, '.cursor', 'mcp.json')).mcpServers.other)
+
+    const forced = mergeMcpConfig(cwd, { editors: ['cursor'], force: true })
+    const cursorForce = forced.results.find((r) => r.editor === 'cursor')
+    assert.equal(cursorForce.action, 'forced')
+    const data = readJson(join(cwd, '.cursor', 'mcp.json'))
+    assert.deepEqual(data.mcpServers['morya-ui'], SERVER_CONFIG)
+    assert.ok(data.mcpServers.other)
+  })
+
+  it('merges Zed settings without wiping unrelated keys', () => {
+    const cwd = makeCwd()
+    mkdirSync(join(cwd, '.zed'), { recursive: true })
+    writeFileSync(
+      join(cwd, '.zed', 'settings.json'),
+      JSON.stringify({
+        theme: 'One Dark',
+        context_servers: {
+          other: { command: 'keep-me' },
+        },
+      }),
+      'utf8',
+    )
+
+    const { results } = mergeMcpConfig(cwd, { editors: ['zed'] })
+    assert.equal(results.find((r) => r.editor === 'zed').action, 'merged')
+
+    const zed = readJson(join(cwd, '.zed', 'settings.json'))
+    assert.equal(zed.theme, 'One Dark')
+    assert.deepEqual(zed.context_servers.other, { command: 'keep-me' })
+    assert.deepEqual(zed.context_servers['morya-ui'], SERVER_CONFIG)
+  })
+
+  it('respects editors subset and still writes portable', () => {
+    const cwd = makeCwd()
+    const { results } = mergeMcpConfig(cwd, { editors: ['vscode'] })
+    assert.deepEqual(
+      results.map((r) => r.editor),
+      ['vscode', 'portable'],
+    )
+  })
+
+  it('dry-run does not write files', () => {
+    const cwd = makeCwd()
+    const { results } = mergeMcpConfig(cwd, { dryRun: true })
+    assert.ok(results.every((r) => r.action === 'created' && r.dryRun))
+    assert.throws(() => readFileSync(join(cwd, '.cursor', 'mcp.json')), /ENOENT/)
+    assert.throws(() => readFileSync(join(cwd, '.mcp.json')), /ENOENT/)
+  })
+})