create-dwy 0.19.0 → 0.20.0

package/src/sync-codex.js

@@ -114,8 +114,9 @@ function upsertBaselineBlock(content, baselineBody) {
 
 export async function syncProjectAgentsMd(sourceDir, projectDir, selectedRules, {
   preservedRuleNames = new Set(),
+  targetPath = path.join(projectDir, 'AGENTS.md'),
 } = {}) {
-  const dest = path.join(projectDir, 'AGENTS.md')
+  const dest = targetPath
   const current = await fs.pathExists(dest) ? await fs.readFile(dest, 'utf-8') : ''
   const baselineBody = await readBaselineDoc(sourceDir)
   const selectedRuleNames = new Set(selectedRules.map(rule => rule.name))
@@ -132,6 +133,7 @@ export async function syncProjectAgentsMd(sourceDir, projectDir, selectedRules,
   const withBaseline = upsertBaselineBlock(current, baselineBody)
   const next = upsertManagedBlock(withBaseline, blockBody)
   if (next === current) return 0
+  await fs.ensureDir(path.dirname(dest))
   await fs.writeFile(dest, next)
   const parts = []
   if (baselineBody.trim()) parts.push('baseline')
@@ -223,7 +225,7 @@ async function copyCodexHooks(hooks, proj) {
   return hooks.length
 }
 
-function buildCodexHooksJson(manifests, selectedHookNames) {
+function buildCodexHooksJson(manifests, selectedHookNames, global) {
   const hooksJson = { hooks: {} }
   const grouped = new Map()
 
@@ -237,7 +239,9 @@ function buildCodexHooksJson(manifests, selectedHookNames) {
     const hooks = grouped.get(key) || []
     hooks.push({
       type: 'command',
-      command: `bash \"$(git rev-parse --show-toplevel)\"/.codex/hooks/${manifest.name}`,
+      command: global
+        ? `bash "$HOME/.codex/hooks/${manifest.name}"`
+        : `bash "$(git rev-parse --show-toplevel)/.codex/hooks/${manifest.name}"`,
       ...(manifest.timeout ? { timeout: manifest.timeout } : {}),
     })
     grouped.set(key, hooks)
@@ -280,10 +284,10 @@ function mergeCodexHooks(existingHooks, generatedHooks, managedHookNames) {
   return Object.keys(merged).length > 0 ? merged : undefined
 }
 
-async function syncCodexHooksJson(sourceDir, proj, selectedHookNames) {
+async function syncCodexHooksJson(sourceDir, proj, selectedHookNames, global) {
   const dest = path.join(proj, '.codex', 'hooks.json')
   const manifests = await loadHookManifests(sourceDir)
-  const generated = buildCodexHooksJson(manifests, selectedHookNames)
+  const generated = buildCodexHooksJson(manifests, selectedHookNames, global)
   const managedHookNames = new Set(
     manifests
       .filter(manifest => !manifest.platforms || manifest.platforms.includes('codex'))
@@ -317,9 +321,11 @@ async function syncCodexHooksJson(sourceDir, proj, selectedHookNames) {
   return 1
 }
 
+/** 同步 Codex 配置；global 模式将规则写入用户 .codex/AGENTS.md。 */
 export async function syncCodex({
   sourceDir: sourceDirOverride,
   projectDir,
+  global = false,
   selected,
   staleRemovals = {},
   preserveMissingRules = new Set(),
@@ -340,7 +346,7 @@ export async function syncCodex({
   }
   console.log(chalk.yellow(`Found ${scans.skills.length} skills, ${scans.rules.length} rules, ${scans.hooks.length} hooks\n`))
 
-  const agentsMdPath = path.join(proj, 'AGENTS.md')
+  const agentsMdPath = global ? path.join(proj, '.codex', 'AGENTS.md') : path.join(proj, 'AGENTS.md')
   const agentsMdContent = await fs.pathExists(agentsMdPath) ? await fs.readFile(agentsMdPath, 'utf-8') : ''
   const existing = {
     skills: await scanExistingCodexSkills(proj),
@@ -363,9 +369,10 @@ export async function syncCodex({
   syncedCount += await copySkillsFlat(syncedSelection.skills, proj)
   syncedCount += await syncProjectAgentsMd(sourceDir, proj, syncedSelection.rules, {
     preservedRuleNames: preserveMissingRules,
+    targetPath: agentsMdPath,
   })
   syncedCount += await copyCodexHooks(syncedSelection.hooks, proj)
-  syncedCount += await syncCodexHooksJson(sourceDir, proj, selectedHookNames)
+  syncedCount += await syncCodexHooksJson(sourceDir, proj, selectedHookNames, global)
 
   const skillTemplateNames = new Set([
     ...scans.skills.map(s => s.name),

package/src/sync-opencode.js

@@ -5,7 +5,6 @@ import {
   copyFilter,
   logAction,
   resolveSourceDir,
-  scanCommands,
   scanExisting,
   scanRules,
   scanSkills,
@@ -27,8 +26,8 @@ async function copyItemsTo(baseDir, typeDir, items) {
   return count
 }
 
-async function removeUnselected(typeDir, existingNames, selectedNames, templateNames, projectDir) {
-  const targetDir = path.join(projectDir, '.opencode', typeDir)
+async function removeUnselected(typeDir, existingNames, selectedNames, templateNames, baseDir) {
+  const targetDir = path.join(baseDir, typeDir)
   let count = 0
 
   for (const name of existingNames) {
@@ -42,9 +41,11 @@ async function removeUnselected(typeDir, existingNames, selectedNames, templateN
   return count
 }
 
+/** 同步 OpenCode 规则和技能；global 模式使用用户 .config/opencode 目录。 */
 export async function syncOpenCode({
   sourceDir: sourceDirOverride,
   projectDir,
+  global = false,
   selected,
   staleRemovals = {},
   preserveMissingRules = new Set(),
@@ -55,7 +56,7 @@ export async function syncOpenCode({
   }
 
   const proj = projectDir || process.cwd()
-  const openCodeDir = path.join(proj, '.opencode')
+  const openCodeDir = global ? path.join(proj, '.config', 'opencode') : path.join(proj, '.opencode')
   await fs.ensureDir(openCodeDir)
 
   console.log(chalk.blue('\nSyncing OpenCode configuration...\n'))
@@ -63,31 +64,28 @@ export async function syncOpenCode({
   const scans = {
     skills: await scanSkills(sourceDir),
     rules: await scanRules(sourceDir),
-    commands: await scanCommands(sourceDir),
   }
 
   const selectedNames = key => new Set((selected[key] || []).map(item => item.name))
   const syncedSelection = {
     skills: scans.skills.filter(item => selectedNames('skills').has(item.name)),
     rules: scans.rules.filter(item => selectedNames('rules').has(item.name)),
-    commands: scans.commands.filter(item => selectedNames('commands').has(item.name)),
   }
 
   const existing = {
     skills: await scanExisting(openCodeDir, 'skills'),
-    commands: await scanExisting(openCodeDir, 'commands'),
   }
 
   let syncedCount = 0
   let removedCount = 0
 
-  const agentsPath = path.join(proj, 'AGENTS.md')
+  const agentsPath = path.join(global ? openCodeDir : proj, 'AGENTS.md')
   syncedCount += await syncProjectAgentsMd(sourceDir, proj, syncedSelection.rules, {
     preservedRuleNames: preserveMissingRules,
+    targetPath: agentsPath,
   })
 
   syncedCount += await copyItemsTo(openCodeDir, 'skills', syncedSelection.skills)
-  syncedCount += await copyItemsTo(openCodeDir, 'commands', syncedSelection.commands)
 
   removedCount += await removeUnselected(
     'skills',
@@ -97,22 +95,10 @@ export async function syncOpenCode({
       ...scans.skills.map(item => item.name),
       ...(staleRemovals.skills || new Set()),
     ]),
-    proj,
-  )
-  removedCount += await removeUnselected(
-    'commands',
-    existing.commands,
-    new Set(syncedSelection.commands.map(item => item.name)),
-    new Set([
-      ...scans.commands.map(item => item.name),
-      ...(staleRemovals.commands || new Set()),
-    ]),
-    proj,
+    openCodeDir,
   )
-
   console.log(chalk.blue(`\nDone! ${syncedCount} synced${removedCount > 0 ? `, ${removedCount} removed` : ''}.`))
   console.log(chalk.gray(`  Rules    → ${agentsPath}`))
   console.log(chalk.gray(`  Skills   → ${path.join(openCodeDir, 'skills')}`))
-  console.log(chalk.gray(`  Commands → ${path.join(openCodeDir, 'commands')}`))
   console.log(chalk.gray('  Hooks    → 当前适配未支持'))
 }

package/src/sync.js

@@ -1,18 +1,12 @@
 import fs from 'fs-extra'
 import path from 'path'
 import { isCancel } from '@clack/prompts'
-import {
-  SEARCH_PLACEHOLDER,
-  searchableMultiselect,
-  searchableSelect,
-} from './searchable-select.js'
+import { tabMultiselect } from './tab-multiselect.js'
 import { chalk, DEFAULT_TEMPLATE_REPO_URL, getDwyHomeDir, runGit } from './utils.js'
 
 const CATEGORIES = [
   { key: 'skills', label: 'Skills' },
   { key: 'rules', label: 'Rules' },
-  { key: 'commands', label: 'Commands' },
-  { key: 'hooks', label: 'Hooks' },
 ]
 
 const COPY_EXCLUDE_PATTERNS = [
@@ -147,27 +141,6 @@ export async function scanRules(sourceDir) {
   return rules.sort((a, b) => a.name.localeCompare(b.name))
 }
 
-export async function scanCommands(sourceDir) {
-  const commandsDir = path.join(sourceDir, 'commands')
-  if (!await fs.pathExists(commandsDir)) return []
-
-  const entries = await fs.readdir(commandsDir, { withFileTypes: true })
-  const commands = await Promise.all(entries
-    .filter(e => e.name !== '.gitkeep' && e.name !== '.DS_Store')
-    .map(async e => ({
-      name: e.name,
-      description: await readEntryDescription(
-        path.join(commandsDir, e.name),
-        e.isDirectory() ? '命令目录' : '命令文件',
-      ),
-      category: e.isDirectory() ? '目录命令' : '文件命令',
-      sourcePath: path.join(commandsDir, e.name),
-      type: 'command',
-    })))
-
-  return commands.sort((a, b) => a.name.localeCompare(b.name))
-}
-
 export async function scanHooks(sourceDir) {
   const hooksDir = path.join(sourceDir, 'hooks')
   if (!await fs.pathExists(hooksDir)) return []
@@ -214,123 +187,58 @@ export async function scanExisting(projectTargetDir, typePlural) {
 }
 
 /**
- * 将扫描项转为可搜索扁平 options。
- * label 带分类前缀便于筛选；完整 description 进底部公共说明区（不截断塞 hint）。
+ * 按模板实际分类生成 Tab，每条独立勾选，不做包展开或跨分类关联。
  *
  * @param {Array<{ name: string, category?: string, description?: string }>} items
- * @returns {Array<{ value: string, label: string, description?: string }>}
+ * @param {'skills' | 'rules'} type
  */
-function buildSearchableOptions(items) {
-  return items
-    .slice()
-    .sort((a, b) => {
-      const catCmp = (a.category || '其他').localeCompare(b.category || '其他', 'zh')
-      if (catCmp !== 0) return catCmp
-      return a.name.localeCompare(b.name, 'zh')
-    })
-    .map(item => {
-      const category = item.category || '其他'
-      return {
-        value: item.name,
-        label: `${category} / ${item.name}`,
-        // 完整描述给底部公共区；搜索也匹配 description
-        description: item.description || undefined,
-      }
+export function buildCategoryTabs(items, type) {
+  const groups = new Map()
+  for (const item of items) {
+    const category = item.category || '其他'
+    if (!groups.has(category)) groups.set(category, [])
+    groups.get(category).push({
+      value: item.name,
+      label: item.name,
+      description: item.description,
+      type,
     })
+  }
+  return [...groups.entries()]
+    .sort(([a], [b]) => a.localeCompare(b, 'zh'))
+    .map(([category, options]) => ({
+      id: category,
+      label: category,
+      options: options.sort((a, b) => a.label.localeCompare(b.label, 'zh')),
+    }))
 }
 
 /**
- * 可搜索多选一层。items 为空直接返回 []，不弹窗。
- * 取消返回 null，调用方必须中止整次同步。
- *
- * @param {Array<{ name: string, category?: string, description?: string }>} items
- * @param {string} label
- * @param {Iterable<string>} defaultNames
- */
-export async function promptSelection(items, label, defaultNames) {
-  if (items.length === 0) return []
-  // 可搜索多选 + 底部说明区（聚焦项描述不跟在行尾）
-  const selectedNames = await searchableMultiselect({
-    message: `选择 ${label}`,
-    options: buildSearchableOptions(items),
-    initialValues: [...defaultNames],
-    maxItems: 15,
-    required: false,
-    placeholder: SEARCH_PLACEHOLDER,
-  })
-  if (isCancel(selectedNames)) return null
-  const selectedSet = new Set(selectedNames)
-  return items.filter(item => selectedSet.has(item.name))
-}
-
-/**
- * 交互式选择：每步可回退到上一步，最后总览支持任意类别重选。
- * categories 可缩成仅 Skills，未出现的类别返回空数组（调用方不得据此删除已有项）。
- * 返回 { skills, rules, commands, hooks } 或 null（取消）。
+ * 顺序选择 Skills、Rules；Enter 进入下一类，不再提供回退或重选菜单。
+ * 完整同步默认启用全部模板 Hooks；仅 Skills 模式不得写入其他配置。
+ * 取消返回 null，调用方必须终止同步。
  *
  * @param {object} scans
- * @param {object} existing
- * @param {{ categories?: Array<{ key: string, label: string }> }} [opts]
+ * @param {{ skills: Iterable<string>, rules: Iterable<string> }} existing
+ * @param {{ skillsOnly?: boolean }} [opts]
  */
-export async function interactiveSelect(scans, existing, { categories = CATEGORIES } = {}) {
-  const sel = {
-    skills: [],
-    rules: [],
-    commands: [],
-    hooks: [],
-  }
-
-  // 第一轮：顺序遍历，每步给导航
-  let i = 0
-  while (i < categories.length) {
-    const { key, label } = categories[i]
-    const defaultNames = sel[key]?.length
-      ? new Set(sel[key].map(x => x.name))
-      : existing[key]
-    sel[key] = await promptSelection(scans[key], label, defaultNames)
-    if (sel[key] === null) return null
-
-    if (i === categories.length - 1) break
-
-    const nextLabel = categories[i + 1].label
-    const prevLabel = i > 0 ? categories[i - 1].label : null
-    // 导航步可搜索单选（选项少，交互与多选一致）
-    const nav = await searchableSelect({
-      message: `${label} 已选 ${sel[key].length} 项。下一步：`,
-      options: [
-        { label: `继续选 ${nextLabel}`, value: 'next' },
-        ...(prevLabel ? [{ label: `返回重选 ${prevLabel}`, value: 'back' }] : []),
-        { label: '取消同步', value: 'cancel' },
-      ],
-      initialValue: 'next',
-      placeholder: SEARCH_PLACEHOLDER,
-    })
-    if (isCancel(nav) || nav === 'cancel') return null
-    i = nav === 'back' ? i - 1 : i + 1
-  }
-
-  // 第二轮：总览 + 任意重选
-  while (true) {
-    console.log(chalk.gray('\n选择汇总：'))
-    for (const { key, label } of categories) {
-      console.log(chalk.gray(`  ${label.padEnd(10)} ${sel[key].length} 项`))
-    }
-    const final = await searchableSelect({
-      message: '确认提交还是重选？',
-      options: [
-        { label: '确认提交', value: 'confirm' },
-        ...categories.map(c => ({ label: `重选 ${c.label}`, value: c.key })),
-        { label: '取消同步', value: 'cancel' },
-      ],
-      initialValue: 'confirm',
-      placeholder: SEARCH_PLACEHOLDER,
+export async function interactiveSelect(scans, existing, { skillsOnly = false } = {}) {
+  const selected = { skills: [], rules: [], commands: [], hooks: skillsOnly ? [] : scans.hooks }
+  for (const { key, label } of skillsOnly ? CATEGORIES.slice(0, 1) : CATEGORIES) {
+    const tabs = buildCategoryTabs(scans[key], key)
+    const availableNames = new Set(scans[key].map(item => item.name))
+    const names = await tabMultiselect({
+      message: `选择 ${label}`,
+      tabs,
+      initialValues: [...existing[key]].filter(name => availableNames.has(name)),
+      required: false,
+      maxItems: 15,
     })
-    if (isCancel(final) || final === 'cancel') return null
-    if (final === 'confirm') return sel
-    const cat = categories.find(c => c.key === final)
-    sel[final] = await promptSelection(scans[final], cat.label, new Set(sel[final].map(x => x.name)))
-    if (sel[final] === null) return null
+    if (isCancel(names)) return null
+    const selectedNames = new Set(names)
+    selected[key] = scans[key].filter(item => selectedNames.has(item.name))
   }
+  return selected
 }
 
 export function logAction(label, color = 'green', prefix = '✓') {
@@ -431,7 +339,7 @@ async function removeUnselected(typePlural, existingNames, selectedNames, templa
   return count
 }
 
-function buildClaudeHooksSettings(manifests, selectedHookNames) {
+function buildClaudeHooksSettings(manifests, selectedHookNames, global) {
   const grouped = new Map()
 
   for (const manifest of manifests) {
@@ -444,7 +352,7 @@ function buildClaudeHooksSettings(manifests, selectedHookNames) {
     const hooks = grouped.get(key) || []
     hooks.push({
       type: 'command',
-      command: `bash $CLAUDE_PROJECT_DIR/.claude/hooks/${manifest.name}`,
+      command: `bash "${global ? '$HOME' : '$CLAUDE_PROJECT_DIR'}/.claude/hooks/${manifest.name}"`,
     })
     grouped.set(key, hooks)
   }
@@ -489,10 +397,10 @@ function mergeClaudeHooks(existingHooks, generatedHooks, managedHookNames) {
   return Object.keys(merged).length > 0 ? merged : undefined
 }
 
-async function syncSettings(sourceDir, targetDir, selectedHookNames) {
+async function syncSettings(sourceDir, targetDir, selectedHookNames, global) {
   const settingsDest = path.join(targetDir, 'settings.json')
   const manifests = await loadHookManifests(sourceDir)
-  const generatedSettings = buildClaudeHooksSettings(manifests, selectedHookNames)
+  const generatedSettings = buildClaudeHooksSettings(manifests, selectedHookNames, global)
   const managedHookNames = new Set(
     manifests
       .filter(manifest => !manifest.platforms || manifest.platforms.includes('claude'))
@@ -527,7 +435,7 @@ async function syncSettings(sourceDir, targetDir, selectedHookNames) {
   return 1
 }
 
-async function syncClaudeBaselineDoc(sourceDir, targetDir) {
+async function syncClaudeBaselineDoc(sourceDir, targetDir, global) {
   const baseline = await readBaselineDoc(sourceDir)
   if (!baseline) return 0
 
@@ -535,7 +443,15 @@ async function syncClaudeBaselineDoc(sourceDir, targetDir) {
   const current = await fs.pathExists(dest) ? await fs.readFile(dest, 'utf-8') : ''
   if (current === baseline) return 0
 
-  await fs.writeFile(dest, baseline)
+  const start = '<!-- DWY-BASELINE:START -->'
+  const end = '<!-- DWY-BASELINE:END -->'
+  const block = `${start}\n\n${baseline.trim()}\n\n${end}`
+  const next = global
+    ? (current === baseline ? `${block}\n` : /<!-- DWY-BASELINE:START[^>]*-->[\s\S]*?<!-- DWY-BASELINE:END -->/.test(current)
+      ? current.replace(/<!-- DWY-BASELINE:START[^>]*-->[\s\S]*?<!-- DWY-BASELINE:END -->/, block)
+      : `${block}\n\n${current}`)
+    : baseline
+  await fs.writeFile(dest, next)
   logAction('.claude/CLAUDE.md')
   return 1
 }
@@ -553,9 +469,11 @@ export async function resolveSourceDir() {
   return resolveTemplateDirFromRepo(repoDir)
 }
 
+/** 同步 Claude 配置；global 模式用传入的用户目录，并保留个人 CLAUDE.md 内容。 */
 export async function syncClaude({
   sourceDir: sourceDirOverride,
   projectDir,
+  global = false,
   selected,
   staleRemovals = {},
 } = {}) {
@@ -571,7 +489,6 @@ export async function syncClaude({
   const scans = {
     skills: await scanSkills(sourceDir),
     rules: await scanRules(sourceDir),
-    commands: await scanCommands(sourceDir),
     hooks: await scanHooks(sourceDir),
   }
   const availableHooks = []
@@ -588,12 +505,11 @@ export async function syncClaude({
     logAction(`hooks skipped: ${missing}`, 'yellow', '!')
   }
   scans.hooks = availableHooks
-  console.log(chalk.yellow(`Found ${scans.skills.length} skills, ${scans.rules.length} rules, ${scans.commands.length} commands, ${scans.hooks.length} hooks\n`))
+  console.log(chalk.yellow(`Found ${scans.skills.length} skills, ${scans.rules.length} rules, ${scans.hooks.length} hooks\n`))
 
   const existing = {
     skills: await scanExisting(projectTargetDir, 'skills'),
     rules: await scanExisting(projectTargetDir, 'rules'),
-    commands: await scanExisting(projectTargetDir, 'commands'),
     hooks: await scanExisting(projectTargetDir, 'hooks'),
   }
 
@@ -601,14 +517,12 @@ export async function syncClaude({
   const syncedSelection = {
     skills: scans.skills.filter(item => selectedNames('skills').has(item.name)),
     rules: scans.rules.filter(item => selectedNames('rules').has(item.name)),
-    commands: scans.commands.filter(item => selectedNames('commands').has(item.name)),
     hooks: scans.hooks.filter(item => selectedNames('hooks').has(item.name)),
   }
 
   const selectedHookNames = new Set(syncedSelection.hooks.map(h => h.name))
   const approvedStaleSkills = staleRemovals.skills || new Set()
   const approvedStaleRules = staleRemovals.rules || new Set()
-  const approvedStaleCommands = staleRemovals.commands || new Set()
   const approvedStaleHooks = staleRemovals.hooks || new Set()
 
   console.log(chalk.blue(`\nSyncing to ${projectTargetDir}...\n`))
@@ -617,20 +531,17 @@ export async function syncClaude({
   let syncedCount = 0
   let removedCount = 0
 
-  syncedCount += await syncClaudeBaselineDoc(sourceDir, projectTargetDir)
+  syncedCount += await syncClaudeBaselineDoc(sourceDir, projectTargetDir, global)
   syncedCount += await copyItems(syncedSelection.skills, projectTargetDir)
   syncedCount += await copyItems(syncedSelection.rules, projectTargetDir)
-  syncedCount += await copyItems(syncedSelection.commands, projectTargetDir)
-  syncedCount += await syncSettings(sourceDir, projectTargetDir, selectedHookNames)
+  syncedCount += await syncSettings(sourceDir, projectTargetDir, selectedHookNames, global)
   syncedCount += await copyHooks(syncedSelection.hooks, projectTargetDir)
 
   const skillTemplateNames = new Set([...scans.skills.map(s => s.name), ...approvedStaleSkills])
   const ruleTemplateNames = new Set([...scans.rules.map(r => r.name), ...approvedStaleRules])
-  const commandTemplateNames = new Set([...scans.commands.map(c => c.name), ...approvedStaleCommands])
   const hookTemplateNames = new Set([...scans.hooks.map(h => h.name), ...approvedStaleHooks])
   removedCount += await removeUnselected('skills', existing.skills, new Set(syncedSelection.skills.map(s => s.name)), skillTemplateNames, projectTargetDir)
   removedCount += await removeUnselected('rules', existing.rules, new Set(syncedSelection.rules.map(r => r.name)), ruleTemplateNames, projectTargetDir)
-  removedCount += await removeUnselected('commands', existing.commands, new Set(syncedSelection.commands.map(c => c.name)), commandTemplateNames, projectTargetDir)
   removedCount += await removeUnselected('hooks', existing.hooks, selectedHookNames, hookTemplateNames, projectTargetDir)
 
   console.log(chalk.blue(`\nDone! ${syncedCount} synced${removedCount > 0 ? `, ${removedCount} removed` : ''}.`))

package/src/tab-multiselect.js

@@ -4,10 +4,11 @@
  * 基于 @clack/core Prompt 自绘，不引入新 UI 库。
  */
 
-import { Prompt, getColumns, settings } from '@clack/core'
+import { Prompt, getColumns, settings, wrapTextWithPrefix } from '@clack/core'
 import { limitOptions } from '@clack/prompts'
 import { styleText } from 'node:util'
 import process from 'node:process'
+import { formatCheckboxRow } from './prompt-style.js'
 
 /** 是否支持 unicode 符号（与 clack / searchable-select 判定一致） */
 function isUnicodeSupported() {
@@ -35,44 +36,11 @@ const S_STEP_SUBMIT = unicodeOr('◇', 'o')
 const S_BAR = unicodeOr('│', '|')
 const S_BAR_END = unicodeOr('└', '—')
 const S_BAR_H = () => unicodeOr('─', '-')
-const S_CHECKBOX_SELECTED = unicodeOr('◼', '[+]')
-const S_CHECKBOX_INACTIVE = unicodeOr('◻', '[ ]')
 const S_TAB_MORE = unicodeOr('‹', '<')
 const S_TAB_MORE_RIGHT = unicodeOr('›', '>')
 
-/**
- * skill / rule / hook 的终端标记。
- * 不用 emoji：几何符号 + 固定宽度英文，无 unicode 时退回 S/R/H。
- */
-const ITEM_TYPE_META = {
-  skills: { icon: unicodeOr('◈', 'S'), word: 'skill', color: 'cyan', title: '技能' },
-  rules: { icon: unicodeOr('☰', 'R'), word: 'rule', color: 'yellow', title: '规则' },
-  hooks: { icon: unicodeOr('⤷', 'H'), word: 'hook', color: 'magenta', title: '钩子' },
-}
-
-/**
- * 取类型展示元数据。未知类型当 skill，避免列表画出空白标记。
- *
- * @param {string | undefined} type
- */
-export function itemTypeMeta(type) {
-  return ITEM_TYPE_META[type] || ITEM_TYPE_META.skills
-}
-
-/**
- * 行首类型前缀：图标 + 对齐后的 skill/rule/hook。
- *
- * @param {string | undefined} type
- */
-export function formatItemTypePrefix(type) {
-  const meta = itemTypeMeta(type)
-  return `${styleText(meta.color, meta.icon)} ${styleText(meta.color, meta.word.padEnd(5, ' '))}`
-}
-
 /** Tab 之间空格数。过密会糊成一行，过疏又浪费宽度。 */
 const TAB_GAP = 2
-/** 省略角标占位。‹/› 按 1 列计。 */
-const ELLIPSIS_W = 1
 /**
  * 技术栈 / 场景分组之间插入 `  |  ` 比普通间隙多出来的宽度。
  * 普通间隙 TAB_GAP=2；再加 `|` 和一侧间隙 → 3。
@@ -152,35 +120,31 @@ export function tabWindow(segments, activeIndex, maxWidth, groups) {
   const n = segments.length
   if (n === 0) return { start: 0, end: 0, showLeft: false, showRight: false }
   const idx = Math.min(Math.max(activeIndex, 0), n - 1)
-  const widths = segments.map(segment => segment.length)
-
-  const used = (start, end) => {
-    let w = 0
-    for (let i = start; i < end; i++) {
-      if (i > start) w += TAB_GAP
-      w += widths[i]
-    }
-    w += groupSepWidth(groups, start, end)
-    if (start > 0) w += ELLIPSIS_W + TAB_GAP
-    if (end < n) w += TAB_GAP + ELLIPSIS_W
-    return w
+  const fits = (start, end) => {
+    const gap = ' '.repeat(TAB_GAP)
+    let text = segments.slice(start, end).join(gap)
+    if (start > 0) text = `${S_TAB_MORE}${gap}${text}`
+    if (end < n) text += `${gap}${S_TAB_MORE_RIGHT}`
+    text += ' '.repeat(groupSepWidth(groups, start, end))
+    // 复用 clack 的终端宽度处理，中文分类不能按字符串 length 计算。
+    return !wrapTextWithPrefix({ columns: maxWidth }, text, '').includes('\n')
   }
 
   let start = idx
   let end = idx + 1
   // 当前段已经超宽：不再扩张，避免把邻 Tab 挤没
-  if (used(start, end) > maxWidth) {
+  if (!fits(start, end)) {
     return { start, end, showLeft: start > 0, showRight: end < n }
   }
 
   let grew = true
   while (grew) {
     grew = false
-    if (end < n && used(start, end + 1) <= maxWidth) {
+    if (end < n && fits(start, end + 1)) {
       end += 1
       grew = true
     }
-    if (start > 0 && used(start - 1, end) <= maxWidth) {
+    if (start > 0 && fits(start - 1, end)) {
       start -= 1
       grew = true
     }
@@ -331,7 +295,7 @@ function renderTabBar(segments, activeIndex, win, tabs, selectedValues) {
 
 /**
  * 打开顶部 Tab + 下方多选。
- * tabs 为空时不进交互，直接返回 []（调用方应先过滤空包）。
+ * tabs 为空时不进交互，直接返回 []（调用方应先过滤空分类）。
  *
  * @param {object} opts
  * @param {string} opts.message
@@ -381,13 +345,11 @@ export function tabMultiselect(opts) {
       const contentWidth = Math.max(cols - (withGuide ? 10 : 6), 20)
       const segments = tabBarSegments(this.tabs, selected)
       const groups = this.tabs.map(tab => tab.group)
-      const win = tabWindow(segments, this.tabIndex, contentWidth, groups)
+      const win = tabWindow(segments, this.tabIndex, contentWidth - 2, groups)
       const tabLine = renderTabBar(segments, this.tabIndex, win, this.tabs, selected)
 
       const focused = this.currentOptions[this.cursor]
-      const focusedType = itemTypeMeta(focused?.type)
-      const descRaw = (focused?.description || '').trim() || '（无说明）'
-      const desc = `${focusedType.title} · ${descRaw}`
+      const desc = (focused?.description || '').trim() || '（无说明）'
       const instructions = [
         `${styleText('dim', '←/→')} 切 Tab`,
         `${styleText('dim', '↑/↓')} 移动`,
@@ -418,16 +380,11 @@ export function tabMultiselect(opts) {
           maxItems: opts.maxItems ?? 12,
           output: opts.output,
           rowPadding: header.length + footer.length,
-          style: (opt, active) => {
-            const on = selected.includes(opt.value)
-            const label = opt.label ?? String(opt.value ?? '')
-            const box = on
-              ? styleText('green', S_CHECKBOX_SELECTED)
-              : styleText('dim', S_CHECKBOX_INACTIVE)
-            const prefix = formatItemTypePrefix(opt.type)
-            if (active) return `${box} ${prefix} ${label}`
-            return `${box} ${prefix} ${styleText('dim', label)}`
-          },
+          style: (opt, active) => formatCheckboxRow({
+            label: opt.label ?? String(opt.value ?? ''),
+            selected: selected.includes(opt.value),
+            active,
+          }),
         })
 
       return [