create-dwy 0.17.1 → 0.18.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # create-dwy
 
+## 0.18.1
+
+### Patch Changes
+
+- `dwy` 菜单只留两项：同步全局 skills、同步项目配置。升级只走 `dwy upgrade`。
+- 同步项目配置里分「按场景和技术栈」与「一个一个选」。按包后直接列出已预勾子条目，可取消。
+
+---
+
+## 0.18.0
+
+### Minor Changes
+
+- `dwy` / `dwy sync` 开头选动作：同步项目配置（按包或按条目），刷新全局外部 skill，或升级 dwy。删除 `dwy skills` / `dwy skills install` / `dwy scene`。
+- 新增 `dwy upgrade`：把全局 `create-dwy` 升到 npm `latest` 正式版（npm/pnpm/yarn/bun）。源码目录拒绝自升级。
+- 按包勾选写入 `.dwy/sync-state.json` 的 `selectionStyle` / `packs`。
+
+---
+
 ## 0.17.1
 
 ### Patch Changes

package/bin/index.js

@@ -3,9 +3,9 @@
 import { readFileSync } from 'fs'
 import { fileURLToPath } from 'url'
 import { dirname, resolve } from 'path'
-import { syncAll } from '../src/sync-all.js'
-import { installSkills } from '../src/skills-install.js'
-import { buildHelpText, buildSkillsHelpText } from '../src/cli-help.js'
+import { runDwy } from '../src/sync-all.js'
+import { selfUpgrade } from '../src/self-upgrade.js'
+import { buildHelpText } from '../src/cli-help.js'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
 const pkg = JSON.parse(readFileSync(resolve(__dirname, '..', 'package.json'), 'utf-8'))
@@ -20,27 +20,25 @@ function printHelp() {
   console.log(buildHelpText(pkg.version))
 }
 
-function printSkillsHelp() {
-  console.log(buildSkillsHelpText())
-}
-
-if (argv[0] === 'skills') {
-  const rest = argv.slice(1)
-  if (rest.length === 0 || wantsHelp(rest) || rest[0] === 'help') {
-    printSkillsHelp()
-  } else if (rest[0] === 'install') {
-    await installSkills()
-  } else {
-    console.error(`未知命令: dwy skills ${rest.join(' ')}`)
-    printSkillsHelp()
-    process.exitCode = 1
-  }
-} else if (wantsHelp(argv)) {
+if (wantsHelp(argv)) {
   printHelp()
 } else if (argv.includes('--version') || argv.includes('-V')) {
   console.log(pkg.version)
+} else if (argv[0] === 'upgrade') {
+  if (argv.length > 1) {
+    console.error(`未知命令: dwy ${argv.join(' ')}`)
+    printHelp()
+    process.exitCode = 1
+  } else {
+    try {
+      await selfUpgrade()
+    } catch (error) {
+      console.error(error.message)
+      process.exitCode = 1
+    }
+  }
 } else if (argv.length === 0 || argv[0] === 'sync') {
-  await syncAll()
+  await runDwy()
 } else {
   console.error(`未知命令: ${argv.join(' ')}`)
   printHelp()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-dwy",
-  "version": "0.17.1",
+  "version": "0.18.1",
   "description": "项目脚手架与多平台 AI 配置同步工具",
   "type": "module",
   "bin": {

package/src/cli-help.js

@@ -14,31 +14,11 @@ export function buildHelpText(version) {
     `dwy ${version}`,
     '',
     'Usage:',
-    '  dwy                  交互同步：选范围（完整/仅 Skills）、平台、skill 落点',
-    '  dwy sync             同上',
-    '  dwy skills install   强制刷新全局外部 skill 到 ~/.dwy/skills',
-    '  dwy skills --help    显示 skills 子命令',
-    '  dwy --help           显示本说明',
-    '  dwy -h               显示本说明',
-    '  dwy --version        显示当前版本',
-    '  dwy -V               显示当前版本',
-    '',
-    'Skills:',
-    '  dwy skills install   按清单安装/覆盖更新 pm-skills、superpowers（一台机一份）',
-    '',
-  ].join('\n')
-}
-
-/**
- * skills 子命令帮助：`dwy skills` / `dwy skills --help`。
- */
-export function buildSkillsHelpText() {
-  return [
-    'dwy skills',
-    '',
-    'Usage:',
-    '  dwy skills install   强制刷新全局外部 skill 到 ~/.dwy/skills',
-    '  dwy skills --help    显示本说明',
+    '  dwy            同步全局 skills，或同步项目配置',
+    '  dwy sync       同上',
+    '  dwy upgrade    把 dwy 升级到 npm 最新正式版',
+    '  dwy --help     显示本说明',
+    '  dwy --version  显示版本',
     '',
   ].join('\n')
 }

package/src/self-upgrade.js

@@ -0,0 +1,158 @@
+/**
+ * dwy 自升级：把全局安装的 create-dwy 升到 npm dist-tag latest（正式版）。
+ * 不引入第三方更新器，安装命令走用户本机 npm/pnpm/yarn/bun。
+ * 源码目录 / 非全局安装拒绝执行，避免把仓库工作树覆盖成 npm 包。
+ */
+
+import { spawn } from 'node:child_process'
+import { readFileSync } from 'node:fs'
+import path from 'node:path'
+import { PACKAGE_ROOT, chalk } from './utils.js'
+
+/** npm 包名，bin 是 dwy */
+export const PACKAGE_NAME = 'create-dwy'
+
+const DEFAULT_REGISTRY = 'https://registry.npmjs.org/'
+
+/**
+ * 比较 a、b 两个三段版本号。a>b 返回 1，相等 0，a<b -1。
+ * 只处理正式版 MAJOR.MINOR.PATCH，不解析 beta。
+ *
+ * @param {string} a
+ * @param {string} b
+ */
+export function compareVersions(a, b) {
+  const parse = (v) => v.split('.').map(part => Number.parseInt(part, 10) || 0)
+  const left = parse(a)
+  const right = parse(b)
+  for (let i = 0; i < 3; i++) {
+    if (left[i] > right[i]) return 1
+    if (left[i] < right[i]) return -1
+  }
+  return 0
+}
+
+/**
+ * 根据包安装路径判断全局包管理器。
+ * pnpm/yarn/bun 路径里也常有 node_modules/create-dwy，必须先匹配专用目录。
+ *
+ * @param {string} pkgRoot
+ * @returns {'npm' | 'pnpm' | 'yarn' | 'bun' | 'unknown'}
+ */
+export function detectInstaller(pkgRoot) {
+  const normalized = pkgRoot.replace(/\\/g, '/')
+  if (normalized.includes('/pnpm/global/') || normalized.includes('/.local/share/pnpm/')) return 'pnpm'
+  if (normalized.includes('/yarn/global/') || normalized.includes('/.yarn/')) return 'yarn'
+  if (normalized.includes('/.bun/install/')) return 'bun'
+  if (normalized.endsWith('/node_modules/create-dwy')) return 'npm'
+  return 'unknown'
+}
+
+/**
+ * 构造升级命令。一律钉 @latest，不用 @next/@beta。
+ *
+ * @param {'npm' | 'pnpm' | 'yarn' | 'bun' | 'unknown'} installer
+ * @returns {[string, string[]] | null}
+ */
+export function buildUpgradeCommand(installer) {
+  const spec = `${PACKAGE_NAME}@latest`
+  if (installer === 'pnpm') return ['pnpm', ['add', '-g', spec]]
+  if (installer === 'yarn') return ['yarn', ['global', 'add', spec]]
+  if (installer === 'bun') return ['bun', ['add', '-g', spec]]
+  if (installer === 'npm') return ['npm', ['install', '-g', spec]]
+  return null
+}
+
+/**
+ * 读当前包版本。测试可注入 currentVersion，避免读盘。
+ *
+ * @param {string} [pkgRoot]
+ */
+function readCurrentVersion(pkgRoot = PACKAGE_ROOT) {
+  const pkg = JSON.parse(readFileSync(path.join(pkgRoot, 'package.json'), 'utf-8'))
+  return pkg.version
+}
+
+/**
+ * 查 npm registry 的 latest。用官方 JSON，不跟浮动 tag 以外的通道。
+ *
+ * @param {typeof fetch} [fetchFn]
+ */
+export async function fetchLatestVersion(fetchFn = globalThis.fetch) {
+  const registry = (process.env.npm_config_registry || DEFAULT_REGISTRY).replace(/\/?$/, '/')
+  const url = `${registry}${PACKAGE_NAME}/latest`
+  const response = await fetchFn(url, { headers: { Accept: 'application/json', 'User-Agent': 'create-dwy' } })
+  if (!response.ok) {
+    throw new Error(`查询最新版本失败：${url} HTTP ${response.status}`)
+  }
+  const body = await response.json()
+  const version = body?.version
+  if (!version || typeof version !== 'string') {
+    throw new Error(`npm latest 未返回 version：${url}`)
+  }
+  return version
+}
+
+/**
+ * 跑包管理器命令，stdio 继承方便用户看安装进度。
+ * Windows 要 shell，才能找到 npm.cmd。
+ *
+ * @param {string} cmd
+ * @param {string[]} args
+ */
+function runSpawn(cmd, args) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(cmd, args, {
+      stdio: 'inherit',
+      shell: process.platform === 'win32',
+    })
+    child.on('error', reject)
+    child.on('exit', (code) => {
+      if (code === 0) resolve()
+      else reject(new Error(`${cmd} ${args.join(' ')} 退出码 ${code}`))
+    })
+  })
+}
+
+/**
+ * 执行自升级。返回结构化结果供测试断言；失败抛错。
+ *
+ * @param {object} [opts]
+ * @param {string} [opts.currentVersion]
+ * @param {string} [opts.pkgRoot]
+ * @param {() => Promise<string>} [opts.fetchLatest]
+ * @param {(cmd: string, args: string[]) => Promise<void>} [opts.runCommand]
+ */
+export async function selfUpgrade({
+  currentVersion,
+  pkgRoot = PACKAGE_ROOT,
+  fetchLatest = fetchLatestVersion,
+  runCommand = runSpawn,
+} = {}) {
+  const current = currentVersion || readCurrentVersion(pkgRoot)
+  const installer = detectInstaller(pkgRoot)
+  const command = buildUpgradeCommand(installer)
+  if (!command) {
+    throw new Error(
+      `当前不是全局安装的 ${PACKAGE_NAME}（路径 ${pkgRoot}），无法自升级。请先 npm i -g ${PACKAGE_NAME}，或在源码仓 git pull。`,
+    )
+  }
+
+  const latest = await fetchLatest()
+  const cmp = compareVersions(current, latest)
+  if (cmp === 0) {
+    console.log(chalk.green(`已是最新正式版 ${current}`))
+    return { status: 'up-to-date', current, latest, installer }
+  }
+  if (cmp > 0) {
+    console.log(chalk.yellow(`当前 ${current} 新于 npm latest ${latest}，不降级`))
+    return { status: 'newer-local', current, latest, installer }
+  }
+
+  const [cmd, args] = command
+  console.log(chalk.blue(`升级 ${PACKAGE_NAME} ${current} → ${latest}`))
+  console.log(chalk.gray(`  ${cmd} ${args.join(' ')}`))
+  await runCommand(cmd, args)
+  console.log(chalk.green(`已升级到 ${latest}`))
+  return { status: 'upgraded', current, latest, installer }
+}

package/src/sync-all.js

@@ -33,7 +33,10 @@ import {
 } from './sync-codex.js'
 import { scanExistingCursorRules, syncCursor } from './sync-cursor.js'
 import { syncOpenCode } from './sync-opencode.js'
-import { ensureSkillsInstalled } from './skills-install.js'
+import { ensureSkillsInstalled, installSkills } from './skills-install.js'
+import { selfUpgrade } from './self-upgrade.js'
+import { normalizePacks } from './sync-packs.js'
+import { interactiveSelectByPacks } from './sync-scene.js'
 
 const PLATFORM_OPTIONS = [
   { value: 'claude', label: 'Claude Code', description: '支持 rules / skills / commands / hooks' },
@@ -69,6 +72,19 @@ export const SYNC_MODE_ALL = 'all'
 export const SYNC_MODE_SKILLS = 'skills'
 export const DEFAULT_SYNC_MODE = SYNC_MODE_ALL
 
+/** 按条目勾选 Skills / Rules / Hooks */
+export const SELECTION_STYLE_ITEMS = 'items'
+/** 按技术栈包 + 场景包勾选 */
+export const SELECTION_STYLE_PACKS = 'packs'
+export const DEFAULT_SELECTION_STYLE = SELECTION_STYLE_PACKS
+
+/** 同步项目配置（skills / rules / hooks） */
+export const ACTION_SYNC = 'sync'
+/** 强制刷新 ~/.dwy/skills 外部 skill */
+export const ACTION_INSTALL_SKILLS = 'install-skills'
+/** 把全局 create-dwy 升到 npm latest */
+export const ACTION_UPGRADE = 'upgrade'
+
 const SKILL_ONLY_CATEGORIES = [{ key: 'skills', label: 'Skills' }]
 
 /**
@@ -81,6 +97,28 @@ export function normalizeSyncMode(raw) {
   return raw === SYNC_MODE_SKILLS ? SYNC_MODE_SKILLS : DEFAULT_SYNC_MODE
 }
 
+/**
+ * 规范化勾选方式。未知值回退按包，避免新用户落到 80+ 条逐项勾选。
+ *
+ * @param {unknown} raw
+ * @returns {'items' | 'packs'}
+ */
+export function normalizeSelectionStyle(raw) {
+  return raw === SELECTION_STYLE_ITEMS ? SELECTION_STYLE_ITEMS : DEFAULT_SELECTION_STYLE
+}
+
+/**
+ * 规范化入口动作。未知值回退同步，避免误进强制重装。
+ *
+ * @param {unknown} raw
+ * @returns {'sync' | 'install-skills' | 'upgrade'}
+ */
+export function normalizeAction(raw) {
+  if (raw === ACTION_INSTALL_SKILLS) return ACTION_INSTALL_SKILLS
+  if (raw === ACTION_UPGRADE) return ACTION_UPGRADE
+  return ACTION_SYNC
+}
+
 function unionSets(...sets) {
   return new Set(sets.flatMap(set => [...set]))
 }
@@ -170,6 +208,34 @@ export async function buildPlatformDefaultsFromLocalState(projectDir) {
   return defaults.length > 0 ? defaults : ['claude', 'codex']
 }
 
+/**
+ * dwy 入口第一问：同步全局 skills，或同步项目配置。
+ * 自升级只走 `dwy upgrade`，不出现在这张菜单。
+ *
+ * @returns {Promise<'sync' | 'install-skills' | null>}
+ */
+async function promptAction() {
+  const result = await searchableSelect({
+    message: '选择要做的事',
+    options: [
+      {
+        value: ACTION_INSTALL_SKILLS,
+        label: '同步全局 skills',
+        description: '强制重装 ~/.dwy/skills（pm-skills / superpowers）',
+      },
+      {
+        value: ACTION_SYNC,
+        label: '同步项目配置',
+        description: '按场景和技术栈，或一条条勾选，写入当前项目',
+      },
+    ],
+    initialValue: ACTION_SYNC,
+    placeholder: SEARCH_PLACEHOLDER,
+  })
+  if (isCancel(result)) return null
+  return normalizeAction(result)
+}
+
 /**
  * 开头选同步范围。仅 Skills 时后面不再问 rules / commands / hooks。
  *
@@ -198,6 +264,34 @@ async function promptSyncMode(initialValue) {
   return normalizeSyncMode(result)
 }
 
+/**
+ * 选勾选方式。按包是默认推荐；按条目保留原来的逐项勾选。
+ *
+ * @param {'items' | 'packs'} initialValue
+ * @returns {Promise<'items' | 'packs' | null>}
+ */
+async function promptSelectionStyle(initialValue) {
+  const result = await searchableSelect({
+    message: '项目配置怎么勾',
+    options: [
+      {
+        value: SELECTION_STYLE_PACKS,
+        label: '按场景和技术栈（推荐）',
+        description: '先选栈和场景包，再展示已勾子条目，可取消',
+      },
+      {
+        value: SELECTION_STYLE_ITEMS,
+        label: '一个一个选',
+        description: '一条条勾选 Skills / Rules / Hooks',
+      },
+    ],
+    initialValue,
+    placeholder: SEARCH_PLACEHOLDER,
+  })
+  if (isCancel(result)) return null
+  return normalizeSelectionStyle(result)
+}
+
 /**
  * 仅 Skills 模式：只写项目/全局 skill，并清理未选中的模板 skill。
  * 禁止调用完整平台 sync，否则空 rules/commands 会删掉项目已有项。
@@ -351,6 +445,8 @@ async function loadSyncState(projectDir) {
       platforms: {},
       skillScope: normalizeSkillScope(undefined),
       syncMode: DEFAULT_SYNC_MODE,
+      selectionStyle: DEFAULT_SELECTION_STYLE,
+      packs: normalizePacks(undefined),
     }
   }
 
@@ -360,6 +456,8 @@ async function loadSyncState(projectDir) {
     platforms: state.platforms || {},
     skillScope: normalizeSkillScope(state.skillScope),
     syncMode: normalizeSyncMode(state.syncMode),
+    selectionStyle: normalizeSelectionStyle(state.selectionStyle),
+    packs: normalizePacks(state.packs),
   }
 }
 
@@ -719,6 +817,37 @@ async function cleanupOpenCodePlatform(projectDir, scans) {
   return removedCount
 }
 
+/**
+ * `dwy` / `dwy sync` 入口。先选动作再分支：同步全局 skills / 同步项目配置。
+ * 自升级只走 `dwy upgrade`。测试注入 selected / action 时跳过动作菜单。
+ *
+ * @param {object} [opts]
+ */
+export async function runDwy(opts = {}) {
+  const skipMenu = !!(opts.selected || opts.selectedPlatforms || opts.action)
+  const action = opts.action != null
+    ? normalizeAction(opts.action)
+    : (skipMenu ? ACTION_SYNC : await promptAction())
+  if (action === null) {
+    console.log(chalk.yellow('\n已取消。'))
+    return
+  }
+  if (action === ACTION_INSTALL_SKILLS) {
+    await installSkills()
+    return
+  }
+  if (action === ACTION_UPGRADE) {
+    try {
+      await selfUpgrade()
+    } catch (error) {
+      console.error(error.message)
+      process.exitCode = 1
+    }
+    return
+  }
+  await syncAll(opts)
+}
+
 export async function syncAll({
   sourceDir: sourceDirOverride,
   projectDir: projectDirOverride,
@@ -731,6 +860,8 @@ export async function syncAll({
   syncMode: syncModeOverride,
   // 全局 skill 写入的 home，测试注入假目录，禁止默认写真实 $HOME
   homeDir,
+  // 测试注入勾选方式；交互模式在同步范围之后再问
+  selectionStyle: selectionStyleOverride,
 } = {}) {
   const sourceDir = sourceDirOverride || await resolveSourceDir()
   if (!await fs.pathExists(sourceDir)) {
@@ -741,7 +872,7 @@ export async function syncAll({
 
   // 开头无条件自检全局外部 skill：未装 / 清单变更（cli 加了 skill 或改了 tag）则自动更新，
   // 已装且清单一致则零开销跳过。失败不阻塞 sync（离线/网络故障，下次再来）。
-  // 这样用户跑一次 `dwy` 就把 skill 更新到位，无需另记 `dwy skills install`。
+  // 这样用户跑一次同步就把 skill 更新到位；强制重装走入口「刷新全局外部 skill」。
   console.log(chalk.gray('检查全局外部 skill 更新...'))
   await ensureSkillsInstalled()
 
@@ -791,9 +922,23 @@ export async function syncAll({
     return
   }
 
-  const selected = selectedOverride || await interactiveSelect(scans, selectionDefaults, {
-    categories: syncMode === SYNC_MODE_SKILLS ? SKILL_ONLY_CATEGORIES : undefined,
-  })
+  const selectionStyle = selectionStyleOverride
+    ? normalizeSelectionStyle(selectionStyleOverride)
+    : (skipInteractive
+      ? normalizeSelectionStyle(syncState.selectionStyle)
+      : await promptSelectionStyle(normalizeSelectionStyle(syncState.selectionStyle)))
+  if (selectionStyle === null) {
+    console.log(chalk.yellow('\n已取消同步。'))
+    return
+  }
+
+  const selected = selectedOverride || (
+    selectionStyle === SELECTION_STYLE_PACKS
+      ? await interactiveSelectByPacks(scans, syncState, { skillsOnly: syncMode === SYNC_MODE_SKILLS })
+      : await interactiveSelect(scans, selectionDefaults, {
+        categories: syncMode === SYNC_MODE_SKILLS ? SKILL_ONLY_CATEGORIES : undefined,
+      })
+  )
   if (selected === null) {
     console.log(chalk.yellow('\n已取消同步。'))
     return
@@ -943,6 +1088,11 @@ export async function syncAll({
   }
   syncState.skillScope = skillScope
   syncState.syncMode = syncMode
+  syncState.selectionStyle = selectionStyle
+  // 按条目同步不覆盖上次按包选择，方便下次再走按包
+  if (selectionStyle === SELECTION_STYLE_PACKS) {
+    syncState.packs = normalizePacks(selected.packs)
+  }
   await saveSyncState(projectDir, syncState)
 
   if (!syncedAnySupportedPlatform) {