create-dwy 0.21.0 → 0.22.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # create-dwy
 
+## [0.22.0] - 2026-11-02
+
+### Minor Changes
+
+- Skills 改为用户目录 `.dwy/skills/<name>` 内的一份共享副本，项目和全局入口使用整个目录的软链接；同平台已有有效全局入口时清理项目重复入口。原真实目录先备份，自定义 Skills、Rules 和 Hooks 保留。
+- 新增 `dwy migrate`，在老项目根目录一键迁移已有托管 Skills，无需重新勾选；重复执行不重复备份，已移除的历史模板和已有整个 Skills 根目录链接保留并报告。
+- 新增 `dwy refresh`，使用当前 CLI 包内模板刷新所有已安装的共享副本；`dwy upgrade` 升级成功后自动调用新进程刷新，所有已迁移项目无需分别更新。
+- 共享副本刷新加入互斥及整批失败恢复；扫描和清理统一保护目录链接目标，防止自链和穿透根链接误删文件。全局默认选择覆盖自定义 `CODEX_HOME`。
+- CHANGELOG 规则明确要求每个版本条目包含版本号和日期，禁止 `Unreleased` 等占位标题，与是否发布无关；发布记录提取兼容带日期和方括号的版本标题。
+
+---
+
 ## 0.21.0
 
 ### Minor Changes

package/bin/index.js

@@ -3,7 +3,8 @@
 import { readFileSync } from 'fs'
 import { fileURLToPath } from 'url'
 import { dirname, resolve } from 'path'
-import { runDwy } from '../src/sync-all.js'
+import { runDwy, migrateSkills } from '../src/sync-all.js'
+import { refreshSharedSkills } from '../src/skill-store.js'
 import { selfUpgrade } from '../src/self-upgrade.js'
 import { buildHelpText } from '../src/cli-help.js'
 
@@ -24,14 +25,16 @@ if (wantsHelp(argv)) {
   printHelp()
 } else if (argv.includes('--version') || argv.includes('-V')) {
   console.log(pkg.version)
-} else if (argv[0] === 'upgrade') {
+} else if (['upgrade', 'refresh', 'migrate'].includes(argv[0])) {
   if (argv.length > 1) {
     console.error(`未知命令: dwy ${argv.join(' ')}`)
     printHelp()
     process.exitCode = 1
   } else {
     try {
-      await selfUpgrade()
+      if (argv[0] === 'upgrade') await selfUpgrade()
+      if (argv[0] === 'refresh') await refreshSharedSkills()
+      if (argv[0] === 'migrate') await migrateSkills()
     } catch (error) {
       console.error(error.message)
       process.exitCode = 1

package/package.json

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

package/src/cli-help.js

@@ -16,7 +16,9 @@ export function buildHelpText(version) {
     '用法：',
     '  dwy            全局更新通用基线，项目注入所选 Rules；Skills / Hooks 可选位置',
     '  dwy sync       同上',
-    '  dwy upgrade    把 dwy 升级到 npm 最新正式版',
+    '  dwy upgrade    升级到 npm 最新正式版，并刷新共享 Skills',
+    '  dwy refresh    用当前 CLI 模板刷新已安装的共享 Skills',
+    '  dwy migrate    一键迁移老项目已有的托管 Skills，原目录先备份',
     '  dwy --help     显示本说明',
     '  dwy --version  显示版本',
     '',
@@ -37,6 +39,8 @@ export function buildHelpText(version) {
     '  同步全局 Skills / Hooks：在项目目录执行 dwy，在位置步骤选择「全局」。',
     '  更新或调整配置：再次执行 dwy sync，检查勾选项，再确认同步。',
     '  更新 CLI：dwy upgrade（全局安装时可用；更新后执行 dwy --version 查看版本）。',
+    '  迁移老项目：cd your-project 后执行 dwy migrate，无需重新勾选。',
+    '  手动升级包后：执行一次 dwy refresh，所有已迁移的链接同时生效。',
     '  首次安装：npm install -g create-dwy@latest',
     '',
     '平台支持：',
@@ -47,7 +51,10 @@ export function buildHelpText(version) {
     '',
     '同步仅处理所选平台；基线固定全局、Rules 固定项目，位置选择只影响 Skills / Hooks。',
     '取消已勾选的托管项会在确认后删除，保留手写内容。',
-    '更新 CLI 只升级工具；本地配置需再执行 dwy sync 更新。',
+    'Skills 副本集中在 ~/.dwy/skills；项目和全局使用目录链接，同平台全局入口优先。',
+    '旧真实目录备份到同步根的 .dwy/skill-backups；个人 Skills、Rules、Hooks 不参与 migrate。',
+    '旧项目首次需执行 dwy migrate；迁移后无需逐项目刷新 Skills。',
+    'Rules / Hooks 的模板更新仍需执行 dwy sync；已有会话缓存的 Skill 可能需要重新加载。',
     '',
   ].join('\n')
 }

package/src/self-upgrade.js

@@ -141,6 +141,7 @@ export async function selfUpgrade({
   const latest = await fetchLatest()
   const cmp = compareVersions(current, latest)
   if (cmp === 0) {
+    await runCommand('dwy', ['refresh'])
     console.log(chalk.green(`已是最新正式版 ${current}`))
     return { status: 'up-to-date', current, latest, installer }
   }
@@ -153,6 +154,12 @@ export async function selfUpgrade({
   console.log(chalk.blue(`升级 ${PACKAGE_NAME} ${current} → ${latest}`))
   console.log(chalk.gray(`  ${cmd} ${args.join(' ')}`))
   await runCommand(cmd, args)
+  try {
+    // 必须启动新安装的 CLI；pnpm 升级后旧进程的模块路径仍可能指向旧版本。
+    await runCommand('dwy', ['refresh'])
+  } catch (error) {
+    throw new Error(`CLI 已安装新版本，但共享 Skills 刷新失败：${error.message}`, { cause: error })
+  }
   console.log(chalk.green(`已升级到 ${latest}`))
   return { status: 'upgraded', current, latest, installer }
 }

package/src/skill-store.js

@@ -0,0 +1,182 @@
+import fs from 'fs-extra'
+import os from 'node:os'
+import path from 'node:path'
+import { randomUUID } from 'node:crypto'
+import { copyFilter, resolveSourceDir, scanSkills } from './sync.js'
+import { chalk } from './utils.js'
+
+function validateName(name) {
+  if (!/^[\p{L}\p{N}_-]+$/u.test(name)) throw new Error(`无效 Skill 名称：${name}`)
+}
+
+async function readInstalledNames(homeDir) {
+  const file = path.join(homeDir, '.dwy', 'skill-store.json')
+  if (!await fs.pathExists(file)) return []
+  const names = await fs.readJson(file)
+  if (!Array.isArray(names) || names.some(name => typeof name !== 'string')) {
+    throw new Error(`共享 Skills 清单格式无效：${file}`)
+  }
+  names.forEach(validateName)
+  return names
+}
+
+/**
+ * 将包内 Skills 准备到稳定用户目录，返回指向共享副本的条目。
+ * 同一用户的刷新互斥；完整副本准备失败时不替换旧内容。外部 Skills 缓存不纳入本模块清单。
+ */
+export async function prepareSharedSkills({ skills, homeDir = os.homedir() }) {
+  if (skills.length === 0) return []
+  for (const skill of skills) {
+    validateName(skill.name)
+    if (!(await fs.stat(path.join(skill.sourcePath, 'SKILL.md'))).isFile()) {
+      throw new Error(`Skill 缺少有效 SKILL.md：${skill.sourcePath}`)
+    }
+  }
+  const root = path.join(homeDir, '.dwy')
+  const store = path.join(root, 'skills')
+  await fs.ensureDir(store)
+  const lockPath = path.join(root, 'skill-store.lock')
+  let lock
+  try {
+    lock = await fs.open(lockPath, 'wx')
+  } catch (error) {
+    if (error.code === 'EEXIST') throw new Error(`另一个进程正在刷新 Skills；若前次异常退出，请移除 ${lockPath} 后重试`)
+    throw error
+  }
+  let staging
+  let preserveStaging = false
+  try {
+    staging = await fs.mkdtemp(path.join(root, '.skills-'))
+    const installed = new Set(await readInstalledNames(homeDir))
+    const prepared = []
+    const replacements = []
+    for (const skill of skills) {
+      const dest = path.join(store, skill.name)
+      const next = path.join(staging, skill.name)
+      if (path.resolve(skill.sourcePath) !== path.resolve(dest)) {
+        await fs.copy(skill.sourcePath, next, { dereference: true, filter: copyFilter(skill.sourcePath) })
+        replacements.push({ dest, next, old: path.join(staging, `${skill.name}.old`), saved: false, replaced: false })
+      }
+      installed.add(skill.name)
+      prepared.push({ ...skill, sourcePath: dest })
+    }
+    const manifest = path.join(staging, 'skill-store.json')
+    await fs.writeJson(manifest, [...installed].sort(), { spaces: 2 })
+    try {
+      for (const entry of replacements) {
+        const existing = await fs.lstat(entry.dest).catch(error => {
+          if (error.code === 'ENOENT') return null
+          throw error
+        })
+        if (existing) {
+          await fs.rename(entry.dest, entry.old)
+          entry.saved = true
+        }
+        await fs.rename(entry.next, entry.dest)
+        entry.replaced = true
+      }
+      await fs.rename(manifest, path.join(root, 'skill-store.json'))
+    } catch (error) {
+      const errors = [error]
+      for (const entry of [...replacements].reverse()) {
+        try {
+          if (entry.replaced) await fs.remove(entry.dest)
+          if (entry.saved) await fs.rename(entry.old, entry.dest)
+        } catch (restoreError) {
+          errors.push(restoreError)
+        }
+      }
+      if (errors.length > 1) {
+        preserveStaging = true
+        throw new AggregateError(errors, `刷新失败且自动恢复未完成，旧副本保留在 ${staging}`)
+      }
+      throw error
+    }
+    return prepared
+  } finally {
+    try {
+      if (staging && !preserveStaging) await fs.remove(staging)
+    } finally {
+      await fs.close(lock)
+      await fs.remove(lockPath)
+    }
+  }
+}
+
+async function entryParent(dest, backupRoot) {
+  const parent = await fs.realpath(path.dirname(dest))
+  const boundary = path.resolve(backupRoot, '..', '..')
+  const realBoundary = await fs.realpath(boundary)
+  const expected = path.join(realBoundary, path.relative(boundary, path.dirname(dest)))
+  if (parent !== expected) throw new Error(`Skills 根目录链接指向外部位置，保留原入口，不修改目标：${path.dirname(dest)}`)
+  return parent
+}
+
+/**
+ * 清理托管入口：真实目录移到备份根，软链接仅移除入口，不遍历其目标。
+ * 返回真实目录的备份路径；入口不存在或原为链接时返回 null。
+ */
+export async function removeSkillEntry({ dest, backupRoot }) {
+  const stat = await fs.lstat(dest).catch(error => {
+    if (error.code === 'ENOENT') return null
+    throw error
+  })
+  if (!stat) return null
+  await entryParent(dest, backupRoot)
+  if (stat.isSymbolicLink()) {
+    await fs.unlink(dest)
+    return null
+  }
+  await fs.ensureDir(backupRoot)
+  const backup = path.join(backupRoot, `${path.basename(dest)}-${randomUUID()}`)
+  await fs.rename(dest, backup)
+  console.log(chalk.gray(`已备份 ${dest} → ${backup}`))
+  return backup
+}
+
+/** 将整个 Skill 目录链接到共享副本；原真实目录先备份，链接失败时恢复原入口。 */
+export async function linkSkill({ skill, dest, backupRoot }) {
+  if (!(await fs.stat(path.join(skill.sourcePath, 'SKILL.md'))).isFile()) {
+    throw new Error(`Skill 缺少有效 SKILL.md：${skill.sourcePath}`)
+  }
+  await fs.ensureDir(path.dirname(dest))
+  const actualParent = await fs.realpath(path.dirname(dest))
+  // 整个全局 skills 根可能已链接到共享目录；此时入口就是源目录，不能把它再改为自链。
+  if (path.join(actualParent, path.basename(dest)) === await fs.realpath(skill.sourcePath)) return null
+  await entryParent(dest, backupRoot)
+  const stat = await fs.lstat(dest).catch(error => {
+    if (error.code === 'ENOENT') return null
+    throw error
+  })
+  const previousLink = stat?.isSymbolicLink() ? await fs.readlink(dest) : null
+  if (previousLink && path.resolve(path.dirname(dest), previousLink) === path.resolve(skill.sourcePath)) return null
+  const temporary = path.join(path.dirname(dest), `.${path.basename(dest)}.link-${randomUUID()}`)
+  await fs.symlink(path.resolve(skill.sourcePath), temporary, process.platform === 'win32' ? 'junction' : 'dir')
+  let backup
+  try {
+    backup = await removeSkillEntry({ dest, backupRoot })
+    try {
+      await fs.rename(temporary, dest)
+    } catch (error) {
+      if (backup) await fs.rename(backup, dest)
+      else if (previousLink) await fs.symlink(previousLink, dest, process.platform === 'win32' ? 'junction' : 'dir')
+      throw error
+    }
+    return backup
+  } finally {
+    await fs.remove(temporary)
+  }
+}
+
+/** 使用当前 CLI 包内模板刷新已有共享副本；新包移除的条目保留，避免其他项目坏链。 */
+export async function refreshSharedSkills({ sourceDir, homeDir = os.homedir() } = {}) {
+  const names = await readInstalledNames(homeDir)
+  const scans = await scanSkills(sourceDir || await resolveSourceDir())
+  const available = new Map(scans.map(skill => [skill.name, skill]))
+  const updated = names.filter(name => available.has(name))
+  const retained = names.filter(name => !available.has(name))
+  await prepareSharedSkills({ skills: updated.map(name => available.get(name)), homeDir })
+  for (const name of retained) console.log(chalk.yellow(`当前 CLI 已移除 ${name}，保留共享旧副本以免其他项目链接失效。`))
+  console.log(chalk.green(`已刷新 ${updated.length} 个共享 Skills，保留 ${retained.length} 个旧副本。`))
+  return { updated, retained }
+}

package/src/sync-all.js

@@ -8,7 +8,12 @@ import {
   copySkillsToProjectPlatforms,
   normalizeSkillScope,
   resolveProjectSkillDir,
+  resolveGlobalSkillDir,
+  deduplicateProjectSkills,
+  findGlobalSkill,
+  scanGlobalSkills,
 } from './sync-global-skills.js'
+import { prepareSharedSkills, removeSkillEntry } from './skill-store.js'
 import { chalk } from './utils.js'
 import {
   interactiveSelect,
@@ -117,7 +122,7 @@ export function buildSelectionDefaultsFromSyncState(existing, syncState) {
   return hasSetItems(stateDefaults) ? stateDefaults : existing
 }
 
-async function scanCombinedExisting(projectDir) {
+async function scanCombinedExisting(projectDir, global = false) {
   const claudeDir = path.join(projectDir, '.claude')
   const agentsMdPath = path.join(projectDir, 'AGENTS.md')
   const agentsMdContent = await fs.pathExists(agentsMdPath) ? await fs.readFile(agentsMdPath, 'utf-8') : ''
@@ -126,6 +131,7 @@ async function scanCombinedExisting(projectDir) {
     skills: unionSets(
       await scanExisting(claudeDir, 'skills'),
       await scanExistingCodexSkills(projectDir),
+      await scanExisting(path.join(projectDir, ...(global ? ['.config', 'opencode'] : ['.opencode'])), 'skills'),
     ),
     rules: unionSets(
       await scanExisting(claudeDir, 'rules'),
@@ -174,6 +180,9 @@ async function syncSkillsOnly({
   templateSkillNames,
   staleSkillNames,
   skillScope,
+  homeDir,
+  global,
+  duplicateNames,
 }) {
   const writeProject = skillScope.destinations.includes('project')
   if (!writeProject) return
@@ -185,24 +194,25 @@ async function syncSkillsOnly({
   }
 
   console.log(chalk.blue('\nSyncing skills only (rules / commands / hooks untouched)...\n'))
-  await copySkillsToProjectPlatforms({
-    projectDir,
-    platforms: skillPlatforms,
-    skills,
-  })
-
-  const selectedNames = new Set(skills.map(item => item.name))
-  const toRemove = new Set(
-    [...templateSkillNames, ...staleSkillNames].filter(name => !selectedNames.has(name)),
-  )
   for (const platform of skillPlatforms) {
-    const destRoot = resolveProjectSkillDir(projectDir, platform)
+    const platformSkills = skills.filter(skill => !duplicateNames[platform]?.has(skill.name))
+    if (global) {
+      await copySkillsToGlobalDirs({ skills: platformSkills, destIds: [platform === 'codex' ? 'agents' : platform], homeDir })
+    } else {
+      await copySkillsToProjectPlatforms({ projectDir, platforms: [platform], skills: platformSkills, homeDir })
+    }
+    const selectedNames = new Set(platformSkills.map(item => item.name))
+    const toRemove = new Set([...templateSkillNames, ...staleSkillNames].filter(name => !selectedNames.has(name)))
+    const destRoot = global
+      ? resolveGlobalSkillDir(platform === 'codex' ? 'agents' : platform, homeDir)
+      : resolveProjectSkillDir(projectDir, platform)
     const existingNames = await scanExisting(path.dirname(destRoot), 'skills')
     await removeManagedItems(
       destRoot,
       existingNames,
       toRemove,
       path.relative(projectDir, destRoot),
+      path.join(global ? homeDir : projectDir, '.dwy', 'skill-backups'),
     )
   }
 }
@@ -381,12 +391,12 @@ function buildNextPlatformState(selected, staleEntries, approvedRemovals, platfo
   return state
 }
 
-async function removeManagedItems(targetDir, existingNames, managedNames, labelPrefix) {
+async function removeManagedItems(targetDir, existingNames, managedNames, labelPrefix, backupRoot) {
   let removedCount = 0
 
   for (const name of existingNames) {
     if (!managedNames.has(name)) continue
-    await fs.remove(path.join(targetDir, name))
+    await removeSkillEntry({ dest: path.join(targetDir, name), backupRoot })
     logAction(`${labelPrefix}/${name}`, 'red', '×')
     removedCount++
   }
@@ -419,6 +429,62 @@ export async function runDwy(opts = {}) {
   await syncAll(opts)
 }
 
+/**
+ * 一键迁移当前项目已有的 CLI Skills，不进入选择流程、不补装其他平台、不修改 Rules / Hooks。
+ * 仅当前模板或历史同步记录中的名称视为托管；已移除的历史模板和整个根目录链接保留并报告。
+ */
+export async function migrateSkills({
+  sourceDir,
+  projectDir = process.cwd(),
+  homeDir = os.homedir(),
+  codexHome = process.env.CODEX_HOME || path.join(homeDir, '.codex'),
+} = {}) {
+  const scans = await scanSkills(sourceDir || await resolveSourceDir())
+  const available = new Map(scans.map(skill => [skill.name, skill]))
+  const state = await loadSyncState(projectDir)
+  const existingByPlatform = {}
+  const neededNames = new Set()
+  const retained = []
+  const realProject = await fs.realpath(projectDir)
+  for (const platform of ['claude', 'codex', 'opencode']) {
+    const root = resolveProjectSkillDir(projectDir, platform)
+    if (!await fs.pathExists(root)) continue
+    if (await fs.realpath(root) !== path.join(realProject, path.relative(projectDir, root))) {
+      console.log(chalk.yellow(`${root} 已通过根目录链接共享内容，保留原链接，不迁移其目标。`))
+      continue
+    }
+    const existing = await scanExisting(path.dirname(root), 'skills')
+    const historical = new Set(state.platforms[platform]?.skills || [])
+    const managed = [...existing].filter(name => available.has(name) || historical.has(name))
+    if (managed.length === 0) continue
+    existingByPlatform[platform] = managed
+    for (const name of managed) {
+      if (available.has(name)) neededNames.add(name)
+      else {
+        retained.push({ platform, name })
+        console.log(chalk.yellow(`${platform}/${name} 已不在当前模板中，保留原目录。`))
+      }
+    }
+  }
+  const shared = await prepareSharedSkills({ skills: [...neededNames].map(name => available.get(name)), homeDir })
+  let linked = 0
+  let globalCount = 0
+  for (const [platform, names] of Object.entries(existingByPlatform)) {
+    const skills = shared.filter(skill => names.includes(skill.name))
+    const duplicates = await deduplicateProjectSkills({ projectDir, platform, skills, homeDir, codexHome })
+    const local = skills.filter(skill => !duplicates.has(skill.name))
+    linked += await copySkillsToProjectPlatforms({ projectDir, platforms: [platform], skills: local, homeDir })
+    globalCount += duplicates.size
+    state.platforms[platform] = {
+      ...(state.platforms[platform] || createEmptyPlatformState()),
+      skills: names.filter(name => !duplicates.has(name)).sort(),
+    }
+  }
+  if (Object.keys(existingByPlatform).length) await saveSyncState(projectDir, state)
+  console.log(chalk.green(`迁移完成：${linked} 个项目链接，${globalCount} 个使用全局入口，${retained.length} 个历史条目保留。`))
+  return { linked, global: globalCount, retained }
+}
+
 export async function syncAll({
   sourceDir: sourceDirOverride,
   projectDir: projectDirOverride,
@@ -452,7 +518,10 @@ export async function syncAll({
   const syncState = await loadSyncState(projectDir)
   const globalState = await loadSyncState(homeDir)
   const projectDefaults = buildSelectionDefaultsFromSyncState(existing, syncState)
-  const globalDefaults = buildSelectionDefaultsFromSyncState({ skills: new Set(), rules: new Set(), hooks: new Set() }, globalState)
+  const globalExisting = await scanCombinedExisting(homeDir, true)
+  globalExisting.skills = await scanGlobalSkills({ homeDir, codexHome })
+  const globalDefaults = buildSelectionDefaultsFromSyncState(globalExisting, globalState)
+  globalDefaults.skills = unionSets(globalDefaults.skills, globalExisting.skills)
   const selectionDefaults = Object.fromEntries(['skills', 'rules', 'hooks'].map(type => [type, unionSets(projectDefaults[type], globalDefaults[type])]))
   selectionDefaults.rules = projectDefaults.rules
   const syncMode = normalizeSyncMode(syncModeOverride)
@@ -529,6 +598,7 @@ export async function syncAll({
       for (const dest of legacyClaudeRules) console.log(`删除旧 Claude Rules → ${dest}`)
     }
     console.log('Hooks 按支持的平台自动启用。')
+    console.log('Skills 将迁为用户共享副本的目录链接；原真实目录先备份，同平台全局入口优先。')
     for (const platform of selectedPlatforms) {
       for (const type of PLATFORM_SYNC_TYPES[platform]) {
         const existingNames = currentManaged[platform]?.[type] || new Set()
@@ -548,7 +618,32 @@ export async function syncAll({
   if (!selectedOverride && selected.skills.some(item => item.category === '产品0到1')) await ensureSkillsInstalled()
 
   const selectedSkillNames = new Set((selected.skills || []).map(item => item.name))
-  const skillsToWrite = scans.skills.filter(item => selectedSkillNames.has(item.name))
+  const globalSkillNameSet = new Set(skillScope.globalSkills)
+  const neededNames = new Set(skillScope.destinations.some(id => id !== 'project') ? globalSkillNameSet : [])
+  if (selectedPlatforms.some(platform => resolveProjectSkillDir(projectDir, platform))) {
+    for (const name of selectedSkillNames) neededNames.add(name)
+  }
+  for (const platform of selectedPlatforms) {
+    for (const skill of scans.skills) {
+      if (await findGlobalSkill({ name: skill.name, platform, homeDir, codexHome })) neededNames.add(skill.name)
+    }
+  }
+  const sharedSkills = await prepareSharedSkills({ skills: scans.skills.filter(item => neededNames.has(item.name)), homeDir })
+  const skillsToWrite = sharedSkills.filter(item => selectedSkillNames.has(item.name))
+  const globalSkills = sharedSkills.filter(item => globalSkillNameSet.has(item.name))
+  if (globalSkills.length > 0 && skillScope.destinations.some(id => id !== 'project')) {
+    await copySkillsToGlobalDirs({ skills: globalSkills, destIds: skillScope.destinations, homeDir })
+  }
+  const duplicateNames = {}
+  if (!global) {
+    for (const platform of selectedPlatforms) {
+      duplicateNames[platform] = await deduplicateProjectSkills({ projectDir, platform, skills: sharedSkills, homeDir, codexHome })
+    }
+  }
+  const selectionFor = platform => ({
+    ...selected,
+    skills: selected.skills.filter(skill => !duplicateNames[platform]?.has(skill.name)),
+  })
   let syncedAnySupportedPlatform = false
 
   if (syncMode === SYNC_MODE_SKILLS) {
@@ -563,6 +658,9 @@ export async function syncAll({
       templateSkillNames: new Set(scans.skills.map(item => item.name)),
       staleSkillNames,
       skillScope,
+      homeDir,
+      global,
+      duplicateNames,
     })
     syncedAnySupportedPlatform = selectedPlatforms.some(platform => resolveProjectSkillDir(projectDir, platform))
       || skillScope.destinations.some(id => id !== 'project')
@@ -586,7 +684,9 @@ export async function syncAll({
         sourceDir,
         projectDir: targetRoot,
         global,
-        selected,
+        selected: selectionFor('claude'),
+        homeDir,
+        sharedSkills,
         staleRemovals: approvedStaleRemovals.claude,
       })
     }
@@ -598,7 +698,9 @@ export async function syncAll({
         sourceDir,
         projectDir: targetRoot,
         global,
-        selected,
+        selected: selectionFor('codex'),
+        homeDir,
+        sharedSkills,
         staleRemovals: approvedStaleRemovals.codex,
       })
     }
@@ -619,7 +721,9 @@ export async function syncAll({
         sourceDir,
         projectDir: targetRoot,
         global,
-        selected,
+        selected: selectionFor('opencode'),
+        homeDir,
+        sharedSkills,
         staleRemovals: approvedStaleRemovals.opencode,
       })
     }
@@ -627,21 +731,19 @@ export async function syncAll({
 
   }
 
-  const globalSkillNameSet = new Set(skillScope.globalSkills)
-  const globalSkills = scans.skills.filter(item => globalSkillNameSet.has(item.name))
-  if (globalSkills.length > 0 && skillScope.destinations.some(id => id !== 'project')) {
-    console.log(chalk.blue('\nSyncing selected skills to global directories...\n'))
-    await copySkillsToGlobalDirs({
-      skills: globalSkills,
-      destIds: skillScope.destinations,
-      homeDir,
-    })
+  if (global) {
+    for (const platform of selectedPlatforms) {
+      duplicateNames[platform] = await deduplicateProjectSkills({ projectDir, platform, skills: sharedSkills, homeDir, codexHome })
+      if (syncState.platforms[platform]) {
+        syncState.platforms[platform].skills = syncState.platforms[platform].skills.filter(name => !duplicateNames[platform].has(name))
+      }
+    }
   }
 
   if (syncMode === SYNC_MODE_SKILLS) {
     for (const platform of selectedPlatforms) {
-      const previous = syncState.platforms[platform] || createEmptyPlatformState()
-      const skillsOnlySelected = { skills: selected.skills || [], rules: [], commands: [], hooks: [] }
+      const previous = targetState.platforms[platform] || createEmptyPlatformState()
+      const skillsOnlySelected = { skills: (global ? selected : selectionFor(platform)).skills, rules: [], commands: [], hooks: [] }
       targetState.platforms[platform] = {
         ...previous,
         skills: buildNextPlatformState(skillsOnlySelected, staleEntries, approvedStaleRemovals, platform).skills,
@@ -649,7 +751,7 @@ export async function syncAll({
     }
   } else {
     for (const platform of selectedPlatforms) {
-      const next = buildNextPlatformState(selected, staleEntries, approvedStaleRemovals, platform)
+      const next = buildNextPlatformState(global ? selected : selectionFor(platform), staleEntries, approvedStaleRemovals, platform)
       if (global) {
         syncState.platforms[platform] = {
           ...(syncState.platforms[platform] || createEmptyPlatformState()),
@@ -675,7 +777,7 @@ export async function syncAll({
   }
   targetState.skillScope = skillScope
   targetState.syncMode = syncMode
-  if (syncMode === SYNC_MODE_ALL && global) {
+  if (global) {
     syncState.syncMode = syncMode
     await saveSyncState(projectDir, syncState)
     if (cliPlatforms.length) await saveSyncState(homeDir, targetState)

package/src/sync-codex.js

@@ -1,6 +1,7 @@
 import fs from 'fs-extra'
 import path from 'path'
 import { chalk } from './utils.js'
+import { linkSkill, prepareSharedSkills, removeSkillEntry } from './skill-store.js'
 import {
   extractDescription,
   loadHookManifests,
@@ -186,15 +187,14 @@ export async function scanExistingCodexSkills(proj) {
   const dir = path.join(proj, '.agents', 'skills')
   if (!await fs.pathExists(dir)) return new Set()
   const entries = await fs.readdir(dir, { withFileTypes: true })
-  return new Set(entries.filter(e => e.isDirectory()).map(e => e.name))
+  return new Set(entries.filter(e => e.isDirectory() || e.isSymbolicLink()).map(e => e.name))
 }
 
 async function copySkillsFlat(skills, proj) {
   const root = path.join(proj, '.agents', 'skills')
   for (const s of skills) {
     const dest = path.join(root, s.name)
-    await fs.ensureDir(path.dirname(dest))
-    await fs.copy(s.sourcePath, dest, { overwrite: true, filter: copyFilter(s.sourcePath) })
+    await linkSkill({ skill: s, dest, backupRoot: path.join(proj, '.dwy', 'skill-backups') })
     logAction(`.agents/skills/${s.name}`)
   }
   return skills.length
@@ -206,7 +206,12 @@ async function removeUnselectedFlat(subdir, existingNames, selectedNames, templa
     if (selectedNames.has(name)) continue
     // 项目独有(模板未提供过)的条目永不删除,保留用户自定义
     if (!templateNames.has(name)) continue
-    await fs.remove(path.join(proj, ...subdir, name))
+    const dest = path.join(proj, ...subdir, name)
+    if (subdir[1] === 'skills') {
+      await removeSkillEntry({ dest, backupRoot: path.join(proj, '.dwy', 'skill-backups') })
+    } else {
+      await fs.remove(dest)
+    }
     logAction(`${subdir.join('/')}/${name}`, 'red', '×')
     count++
   }
@@ -345,6 +350,8 @@ export async function syncCodex({
   projectDir,
   global = false,
   selected,
+  homeDir,
+  sharedSkills,
   staleRemovals = {},
 } = {}) {
   const sourceDir = sourceDirOverride || await resolveSourceDir()
@@ -378,7 +385,10 @@ export async function syncCodex({
   let syncedCount = 0
   let removedCount = 0
 
-  syncedCount += await copySkillsFlat(syncedSelection.skills, proj)
+  const skills = sharedSkills
+    ? sharedSkills.filter(skill => selectedNames('skills').has(skill.name))
+    : await prepareSharedSkills({ skills: syncedSelection.skills, homeDir })
+  syncedCount += await copySkillsFlat(skills, proj)
   syncedCount += await copyCodexHooks(syncedSelection.hooks, proj)
   syncedCount += await syncCodexHooksJson(sourceDir, proj, selectedHookNames, global)