create-dwy 0.18.0 → 0.18.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # create-dwy
 
+## 0.18.2
+
+### Patch Changes
+
+- 技术栈包与场景包都会在包名下列出子条目；选包后统一进入预勾清单，可逐条取消。
+
+---
+
+## 0.18.1
+
+### Patch Changes
+
+- `dwy` 菜单只留两项：同步全局 skills、同步项目配置。升级只走 `dwy upgrade`。
+- 同步项目配置里分「按场景和技术栈」与「一个一个选」。按包后直接列出已预勾子条目，可取消。
+
+---
+
 ## 0.18.0
 
 ### Minor Changes

package/package.json

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

package/src/cli-help.js

@@ -14,7 +14,7 @@ export function buildHelpText(version) {
     `dwy ${version}`,
     '',
     'Usage:',
-    '  dwy            同步项目配置，或刷新全局外部 skill',
+    '  dwy            同步全局 skills，或同步项目配置',
     '  dwy sync       同上',
     '  dwy upgrade    把 dwy 升级到 npm 最新正式版',
     '  dwy --help     显示本说明',

package/src/searchable-select.js

@@ -121,14 +121,13 @@ function wrapHard(text, width) {
  * @param {number} contentWidth 可写字符宽
  * @returns {string[]}
  */
-function buildDescPanel(description, barPrefix, contentWidth) {
+function buildDescPanel(description, barPrefix, contentWidth, lineCount = DESC_PANEL_LINES) {
   const raw = (description && description.trim()) ? description.trim() : '（无说明）'
   const wrapped = wrapHard(raw, contentWidth)
-  // 固定 DESC_PANEL_LINES 行：超出截断末行加省略，不足补空
   const lines = []
-  for (let i = 0; i < DESC_PANEL_LINES; i++) {
+  for (let i = 0; i < lineCount; i++) {
     let part = wrapped[i] ?? ''
-    if (i === DESC_PANEL_LINES - 1 && wrapped.length > DESC_PANEL_LINES) {
+    if (i === lineCount - 1 && wrapped.length > lineCount) {
       const ellipsis = '…'
       part = (wrapped[i] ?? '').slice(0, Math.max(contentWidth - ellipsis.length, 0)) + ellipsis
     }
@@ -162,6 +161,7 @@ function resolveDescription(options, focusedValue) {
  * @param {unknown[]} [opts.initialValues]
  * @param {boolean} [opts.required]
  * @param {number} [opts.maxItems]
+ * @param {number} [opts.descLines] 底部说明区行数，包内子条目列表可加高
  * @param {string} [opts.placeholder]
  * @param {(search: string, opt: object) => boolean} [opts.filter]
  * @returns {Promise<unknown[] | symbol>}
@@ -233,6 +233,7 @@ export function searchableMultiselect(opts) {
         resolveDescription(this.filteredOptions, this.focusedValue),
         bar,
         contentWidth,
+        opts.descLines ?? DESC_PANEL_LINES,
       )
       const instructions = [
         `${styleText('dim', '↑/↓')} to navigate`,

package/src/sync-all.js

@@ -209,28 +209,24 @@ export async function buildPlatformDefaultsFromLocalState(projectDir) {
 }
 
 /**
- * dwy 入口第一问：同步配置还是强制刷新全局外部 skill。
+ * dwy 入口第一问：同步全局 skills，或同步项目配置。
+ * 自升级只走 `dwy upgrade`，不出现在这张菜单。
  *
- * @returns {Promise<'sync' | 'install-skills' | 'upgrade' | null>}
+ * @returns {Promise<'sync' | 'install-skills' | null>}
  */
 async function promptAction() {
   const result = await searchableSelect({
     message: '选择要做的事',
     options: [
-      {
-        value: ACTION_SYNC,
-        label: '同步项目 AI 配置',
-        description: '按包或按条目，把 skills / rules / hooks 写入当前项目',
-      },
       {
         value: ACTION_INSTALL_SKILLS,
-        label: '刷新全局外部 skill',
+        label: '同步全局 skills',
         description: '强制重装 ~/.dwy/skills（pm-skills / superpowers）',
       },
       {
-        value: ACTION_UPGRADE,
-        label: '升级 dwy 到最新正式版',
-        description: '等同 dwy upgrade，把全局 create-dwy 升到 npm latest',
+        value: ACTION_SYNC,
+        label: '同步项目配置',
+        description: '按场景和技术栈，或一条条勾选，写入当前项目',
       },
     ],
     initialValue: ACTION_SYNC,
@@ -276,16 +272,16 @@ async function promptSyncMode(initialValue) {
  */
 async function promptSelectionStyle(initialValue) {
   const result = await searchableSelect({
-    message: '选择勾选方式',
+    message: '项目配置怎么勾',
     options: [
       {
         value: SELECTION_STYLE_PACKS,
-        label: '按技术栈 / 场景包（推荐）',
-        description: '先选 Vue/Python 等栈，再选产品0到1/自媒体等场景包',
+        label: '按场景和技术栈（推荐）',
+        description: '先选栈和场景包，再展示已勾子条目，可取消',
       },
       {
         value: SELECTION_STYLE_ITEMS,
-        label: '按条目',
+        label: '一个一个选',
         description: '一条条勾选 Skills / Rules / Hooks',
       },
     ],
@@ -822,8 +818,8 @@ async function cleanupOpenCodePlatform(projectDir, scans) {
 }
 
 /**
- * `dwy` / `dwy sync` 入口。先选动作再分支：同步 / 刷新外部 skill / 自升级。
- * 测试注入 selected / action 时跳过动作菜单。
+ * `dwy` / `dwy sync` 入口。先选动作再分支：同步全局 skills / 同步项目配置。
+ * 自升级只走 `dwy upgrade`。测试注入 selected / action 时跳过动作菜单。
  *
  * @param {object} [opts]
  */

package/src/sync-packs.js

@@ -131,7 +131,7 @@ export function normalizePacks(raw) {
  * @param {object} pack
  * @param {'skills' | 'rules' | 'hooks'} type
  */
-function itemInPack(item, pack, type) {
+export function itemInPack(item, pack, type) {
   if (type === 'skills') {
     if ((pack.skillNames || []).includes(item.name)) return true
     return (pack.skillCategories || []).includes(item.category)
@@ -163,6 +163,37 @@ function uniqueByName(items) {
  * @param {{ skills: object[], rules: object[], commands?: object[], hooks: object[] }} scans
  * @param {{ stacks?: string[], scenes?: string[], skillsOnly?: boolean }} selection
  */
+/**
+ * 列出某包在当前扫描结果里的子条目，带 type，供界面展示「包下面有哪些」。
+ *
+ * @param {object} pack
+ * @param {{ skills?: object[], rules?: object[], hooks?: object[] }} scans
+ * @param {{ skillsOnly?: boolean }} [opts]
+ */
+export function listPackItems(pack, scans, { skillsOnly = false } = {}) {
+  const types = skillsOnly ? ['skills'] : ['skills', 'rules', 'hooks']
+  const items = []
+  for (const type of types) {
+    for (const item of scans[type] || []) {
+      if (itemInPack(item, pack, type)) items.push({ ...item, type })
+    }
+  }
+  return items
+}
+
+/**
+ * 条目属于已选包时，用包的中文名做分组前缀。
+ *
+ * @param {{ name: string, category?: string }} item
+ * @param {'skills' | 'rules' | 'hooks'} type
+ * @param {string[]} packIds
+ */
+export function packLabelForItem(item, type, packIds) {
+  const packs = [...STACK_PACKS, ...SCENE_PACKS]
+  const hit = packs.find(pack => packIds.includes(pack.id) && itemInPack(item, pack, type))
+  return hit?.label || item.category || '其他'
+}
+
 export function expandPackSelection(scans, { stacks = [], scenes = [], skillsOnly = false } = {}) {
   const packById = new Map([...STACK_PACKS, ...SCENE_PACKS].map(pack => [pack.id, pack]))
   const selectedPacks = [...stacks, ...scenes]

package/src/sync-scene.js

@@ -1,29 +1,99 @@
 /**
- * 按包勾选交互：技术栈包 → 场景包 → 确认/微调。
- * 由 dwy / dwy sync 在「按技术栈 / 场景包」模式下调用。
+ * 按包勾选交互：技术栈包 → 场景包（包下挂子条目）→ 预勾子条目可取消。
+ * 由 dwy / dwy sync 在「按场景和技术栈」模式下调用。
  */
 
 import { isCancel } from '@clack/prompts'
 import { SEARCH_PLACEHOLDER, searchableMultiselect, searchableSelect } from './searchable-select.js'
-import { SCENE_PACKS, STACK_PACKS, expandPackSelection, normalizePacks } from './sync-packs.js'
-import { promptSelection } from './sync.js'
+import {
+  SCENE_PACKS,
+  STACK_PACKS,
+  expandPackSelection,
+  listPackItems,
+  normalizePacks,
+  packLabelForItem,
+} from './sync-packs.js'
 import { chalk } from './utils.js'
 
 /**
- * 把包目录转成可搜索选项。
+ * 包名 + 其下子条目。子条目 disabled，只展示不参与勾选；勾的是整包。
  *
- * @param {Array<{ id: string, label: string, description: string }>} packs
+ * @param {object[]} packs
+ * @param {object} scans
+ * @param {{ skillsOnly?: boolean }} [opts]
+ */
+export function packOptionsWithChildren(packs, scans, { skillsOnly = false } = {}) {
+  const rows = []
+  for (const pack of packs) {
+    const items = listPackItems(pack, scans, { skillsOnly })
+    const names = items.map(item => item.name)
+    rows.push({
+      value: pack.id,
+      label: `${pack.label}（${items.length}）`,
+      description: names.length > 0 ? names.join('、') : pack.description,
+    })
+    for (const item of items) {
+      rows.push({
+        value: `hint:${pack.id}:${item.type}:${item.name}`,
+        label: `  ${item.name}`,
+        description: item.description || pack.label,
+        disabled: true,
+      })
+    }
+  }
+  return rows
+}
+
+/**
+ * 子条目在多选里的稳定 key。类型前缀避免 skill/rule 重名撞车。
+ *
+ * @param {'skills' | 'rules' | 'hooks'} type
+ * @param {string} name
+ */
+export function packItemKey(type, name) {
+  return `${type}:${name}`
+}
+
+/**
+ * 把包展开结果打成一条可搜索列表，按包名分组，便于对照取消。
+ *
+ * @param {{ skills: object[], rules: object[], hooks: object[] }} selected
+ * @param {string[]} packIds
  */
-function packOptions(packs) {
-  return packs.map(pack => ({
-    value: pack.id,
-    label: pack.label,
-    description: pack.description,
-  }))
+export function buildPackItemOptions(selected, packIds = []) {
+  const rows = []
+  for (const type of ['skills', 'rules', 'hooks']) {
+    for (const item of selected[type] || []) {
+      const packLabel = packLabelForItem(item, type, packIds)
+      rows.push({
+        value: packItemKey(type, item.name),
+        label: `${packLabel} / ${item.name}`,
+        description: item.description,
+      })
+    }
+  }
+  rows.sort((a, b) => a.label.localeCompare(b.label, 'zh'))
+  return rows
 }
 
 /**
- * 打印包展开条数。确认步默认用这些预选项，微调再加减。
+ * 按用户勾选的 key 从展开结果里筛子条目。未勾的丢掉。
+ *
+ * @param {{ skills: object[], rules: object[], hooks: object[] }} expanded
+ * @param {string[]} keys
+ */
+export function splitPackItemKeys(expanded, keys) {
+  const set = new Set(keys)
+  return {
+    skills: expanded.skills.filter(item => set.has(packItemKey('skills', item.name))),
+    rules: expanded.rules.filter(item => set.has(packItemKey('rules', item.name))),
+    hooks: expanded.hooks.filter(item => set.has(packItemKey('hooks', item.name))),
+    commands: [],
+  }
+}
+
+/**
+ * 打印包展开条数，随后立刻列出预勾子条目。
  *
  * @param {string[]} stacks
  * @param {string[]} scenes
@@ -39,7 +109,7 @@ function printPackSummary(stacks, scenes, selected) {
 }
 
 /**
- * 按包选择条目。
+ * 按包选择条目。选包时列出包下子条目；确认后默认全勾，用户可取消。
  * 返回 { skills, rules, commands, hooks, packs } 或 null（取消）。
  *
  * @param {object} scans
@@ -51,22 +121,21 @@ export async function interactiveSelectByPacks(scans, syncState, { skillsOnly =
   let stacks = previous.stacks.length > 0 ? previous.stacks : ['common']
   let scenes = previous.scenes
   let step = 'stacks'
-  /** 微调后的展开结果；返回改包时丢弃，重新 expand。 */
-  let selected = null
+  const packOpts = { skillsOnly }
 
   while (true) {
     if (step === 'stacks') {
       const result = await searchableMultiselect({
-        message: '选择技术栈（通用默认勾选）',
-        options: packOptions(STACK_PACKS),
+        message: '选择技术栈（通用默认勾选；包下列出子条目，下一步可逐条取消）',
+        options: packOptionsWithChildren(STACK_PACKS, scans, packOpts),
         initialValues: stacks,
         required: true,
-        maxItems: 12,
+        maxItems: 15,
         placeholder: SEARCH_PLACEHOLDER,
+        descLines: 8,
       })
       if (isCancel(result)) return null
-      stacks = result
-      selected = null
+      stacks = result.filter(id => !String(id).startsWith('hint:'))
 
       const nav = await searchableSelect({
         message: `已选 ${stacks.length} 个技术栈。下一步：`,
@@ -85,62 +154,40 @@ export async function interactiveSelectByPacks(scans, syncState, { skillsOnly =
 
     if (step === 'scenes') {
       const result = await searchableMultiselect({
-        message: '选择场景包（可全不选）',
-        options: packOptions(SCENE_PACKS),
+        message: '选择场景包（可全不选；包下列出子条目，下一步可逐条取消）',
+        options: packOptionsWithChildren(SCENE_PACKS, scans, packOpts),
         initialValues: scenes,
         required: false,
-        maxItems: 10,
+        maxItems: 15,
         placeholder: SEARCH_PLACEHOLDER,
+        descLines: 8,
       })
       if (isCancel(result)) return null
-      scenes = result
-      selected = null
-      step = 'confirm'
+      scenes = result.filter(id => !String(id).startsWith('hint:'))
+      step = 'items'
       continue
     }
 
-    selected = selected || expandPackSelection(scans, { stacks, scenes, skillsOnly })
-    printPackSummary(stacks, scenes, selected)
+    const expanded = expandPackSelection(scans, { stacks, scenes, skillsOnly })
+    printPackSummary(stacks, scenes, expanded)
+    const packIds = [...stacks, ...scenes]
+    const options = buildPackItemOptions(expanded, packIds)
+    if (options.length === 0) {
+      return { skills: [], rules: [], commands: [], hooks: [], packs: { stacks, scenes } }
+    }
 
-    const confirmOptions = [
-      { label: '确认提交（用上面勾好的）', value: 'confirm' },
-      { label: '微调 Skills（可加减）', value: 'skills' },
-      ...(!skillsOnly ? [
-        { label: '微调 Rules（可加减）', value: 'rules' },
-        { label: '微调 Hooks（可加减）', value: 'hooks' },
-      ] : []),
-      { label: '返回改技术栈', value: 'stacks' },
-      { label: '返回改场景包', value: 'scenes' },
-      { label: '取消同步', value: 'cancel' },
-    ]
-    const final = await searchableSelect({
-      message: '包已帮你勾好。确认提交，或微调加减条目：',
-      options: confirmOptions,
-      initialValue: 'confirm',
+    const keys = await searchableMultiselect({
+      message: '已按包预勾子条目，取消不需要的即可',
+      options,
+      initialValues: options.map(option => option.value),
+      required: false,
+      maxItems: 15,
       placeholder: SEARCH_PLACEHOLDER,
     })
-    if (isCancel(final) || final === 'cancel') return null
-    if (final === 'confirm') {
-      return {
-        ...selected,
-        commands: [],
-        packs: { stacks, scenes },
-      }
+    if (isCancel(keys)) return null
+    return {
+      ...splitPackItemKeys(expanded, keys),
+      packs: { stacks, scenes },
     }
-    if (final === 'stacks' || final === 'scenes') {
-      step = final
-      selected = null
-      continue
-    }
-
-    // 完整清单 + 包内项预勾：可减包内项，也可加包外项
-    const catalog = scans[final] || []
-    const tuned = await promptSelection(
-      catalog,
-      final === 'skills' ? 'Skills' : final === 'rules' ? 'Rules' : 'Hooks',
-      new Set(selected[final].map(item => item.name)),
-    )
-    if (tuned === null) return null
-    selected = { ...selected, [final]: tuned }
   }
 }