create-dwy 0.20.0 → 0.22.0

package/src/sync-all.js

@@ -8,11 +8,17 @@ 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,
   logAction,
+  readBaselineDoc,
   resolveSourceDir,
   scanExisting,
   scanHooks,
@@ -22,9 +28,12 @@ import {
 } from './sync.js'
 import {
   parseManagedRuleNames,
+  removeLegacyBaseline,
   scanExistingCodexHooks,
   scanExistingCodexSkills,
   syncCodex,
+  syncGlobalBaselineDoc,
+  syncProjectAgentsMd,
 } from './sync-codex.js'
 import { scanExistingCursorRules, syncCursor } from './sync-cursor.js'
 import { syncOpenCode } from './sync-opencode.js'
@@ -113,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') : ''
@@ -122,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'),
@@ -170,6 +180,9 @@ async function syncSkillsOnly({
   templateSkillNames,
   staleSkillNames,
   skillScope,
+  homeDir,
+  global,
+  duplicateNames,
 }) {
   const writeProject = skillScope.destinations.includes('project')
   if (!writeProject) return
@@ -181,37 +194,37 @@ 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'),
     )
   }
 }
 
-async function selectPlatforms(projectDir, global) {
+async function selectPlatforms(projectDir) {
   const initialValues = await buildPlatformDefaultsFromLocalState(projectDir)
 
-  if (global) console.log(chalk.gray('Cursor 全局规则通过应用设置管理，本次不提供文件同步。'))
   // 可搜索多选 + 底部说明区
   const result = await searchableMultiselect({
     message: '选择要同步的平台',
-    options: PLATFORM_OPTIONS.filter(option => !global || option.value !== 'cursor'),
-    initialValues: initialValues.filter(value => !global || value !== 'cursor'),
+    options: PLATFORM_OPTIONS,
+    initialValues,
     required: true,
     maxItems: 6,
     placeholder: SEARCH_PLACEHOLDER,
@@ -277,7 +290,7 @@ async function collectCurrentManagedNames(projectDir, global = false) {
   return {
     claude: {
       skills: await scanExisting(claudeDir, 'skills'),
-      rules: await scanExisting(claudeDir, 'rules'),
+      rules: unionSets(await scanExisting(claudeDir, 'rules'), parseManagedRuleNames(agentsMdContent)),
       hooks: await scanExisting(claudeDir, 'hooks'),
     },
     codex: {
@@ -378,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++
   }
@@ -416,18 +429,75 @@ 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,
   selected: selectedOverride,
   selectedPlatforms: selectedPlatformsOverride,
   staleRemovals: staleRemovalsOverride,
-  // 兼容已有脚本；主交互只选择整套配置的位置。
+  // 兼容已有脚本；主交互的位置只控制 Skills / Hooks。
   skillScope: skillScopeOverride,
   // all = 完整同步；skills = 只写 skill，测试/脚本可注入
   syncMode: syncModeOverride,
   // 全局配置根目录；测试必须注入临时用户目录。
   homeDir = os.homedir(),
+  codexHome = process.env.CODEX_HOME || path.join(homeDir, '.codex'),
   scope: scopeOverride,
   confirmed,
 } = {}) {
@@ -448,8 +518,12 @@ 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)
   const selected = selectedOverride || await interactiveSelect(scans, selectionDefaults, {
     skillsOnly: syncMode === SYNC_MODE_SKILLS,
@@ -462,10 +536,10 @@ export async function syncAll({
   if (syncMode === SYNC_MODE_ALL) selected.hooks = scans.hooks
 
   const scopeResult = scopeOverride || (selectedOverride || selectedPlatformsOverride ? 'project' : await searchableSelect({
-    message: '选择同步位置',
+    message: '选择同步位置（Skills / Hooks）',
     options: [
-      { value: 'project', label: '当前项目', description: '仅当前项目生效' },
-      { value: 'global', label: '全局', description: '所有项目生效' },
+      { value: 'project', label: '当前项目', description: 'Skills / Hooks 写入项目；基线固定全局，Rules 固定项目' },
+      { value: 'global', label: '全局', description: 'Skills / Hooks 写入用户目录；基线固定全局，Rules 固定项目' },
     ],
     initialValue: 'project',
   }))
@@ -473,27 +547,63 @@ export async function syncAll({
   if (!['project', 'global'].includes(scopeResult)) throw new Error('无效同步位置')
   const global = scopeResult === 'global'
   const targetRoot = global ? homeDir : projectDir
-  const targetState = global ? await loadSyncState(homeDir) : syncState
-  const selectedPlatforms = selectedPlatformsOverride || await selectPlatforms(targetRoot, global)
+  const targetState = global ? globalState : syncState
+  const selectedPlatforms = selectedPlatformsOverride || await selectPlatforms(projectDir)
   if (selectedPlatforms === null) { console.log(chalk.yellow('已取消同步。')); return }
-  if (selectedPlatforms.some(platform => !PLATFORM_SYNC_TYPES[platform] || (global && platform === 'cursor'))) {
+  if (selectedPlatforms.some(platform => !PLATFORM_SYNC_TYPES[platform])) {
     throw new Error('所选平台不支持此同步位置')
   }
-  const staleEntriesRaw = await collectStaleEntries(targetRoot, scans, targetState, selectedPlatforms, global)
+  const projectStaleEntries = await collectStaleEntries(projectDir, scans, syncState, selectedPlatforms)
+  const staleEntriesRaw = global
+    ? await collectStaleEntries(targetRoot, scans, targetState, selectedPlatforms, true)
+    : projectStaleEntries
+  for (const platform of selectedPlatforms) {
+    staleEntriesRaw[platform].rules = projectStaleEntries[platform].rules || []
+  }
   const staleEntries = syncMode === SYNC_MODE_SKILLS ? retainSkillStaleEntries(staleEntriesRaw) : staleEntriesRaw
   const approvedStaleRemovals = normalizeRemovalInput(staleRemovalsOverride || staleEntries)
   const skillScope = normalizeSkillScope(skillScopeOverride)
+  const baseline = syncMode === SYNC_MODE_ALL ? await readBaselineDoc(sourceDir) : ''
+  const cliPlatforms = selectedPlatforms.filter(platform => platform !== 'cursor')
+  const baselinePaths = {
+    claude: path.join(homeDir, '.claude', 'CLAUDE.md'),
+    codex: path.join(codexHome, 'AGENTS.md'),
+    opencode: path.join(homeDir, '.config', 'opencode', 'AGENTS.md'),
+  }
+  const legacyClaudeRules = new Set()
+  if (syncMode === SYNC_MODE_ALL && selectedPlatforms.includes('claude')) {
+    for (const [root, previousNames] of [
+      [projectDir, approvedStaleRemovals.claude?.rules || []],
+      ...(baseline.trim() ? [[homeDir, globalState.platforms.claude?.rules || []]] : []),
+    ]) {
+      for (const name of new Set([...scans.rules.map(rule => rule.name), ...previousNames])) {
+        if (path.basename(name) !== name || !name.endsWith('.md')) continue
+        const dest = path.join(root, '.claude', 'rules', name)
+        if (await fs.pathExists(dest)) legacyClaudeRules.add(dest)
+      }
+    }
+  }
   if ((!selectedOverride && confirmed !== true) || confirmed === false) {
     const currentManaged = await collectCurrentManagedNames(targetRoot, global)
+    const projectManaged = await collectCurrentManagedNames(projectDir)
+    for (const platform of selectedPlatforms) currentManaged[platform].rules = projectManaged[platform].rules
     const templateNames = getCurrentTemplateNames(scans)
     console.log(`\nSkills：${selected.skills.map(item => item.name).join('、') || '未选择'}`)
     console.log(`Rules：${selected.rules.map(item => item.name).join('、') || '未选择'}`)
-    console.log(`位置：${global ? '全局' : '当前项目'}；平台：${selectedPlatforms.map(platform => PLATFORM_LABELS[platform]).join('、')}`)
+    console.log(`Skills / Hooks 位置：${global ? '全局' : '当前项目'}；平台：${selectedPlatforms.map(platform => PLATFORM_LABELS[platform]).join('、')}`)
+    if (syncMode === SYNC_MODE_ALL) {
+      for (const platform of cliPlatforms) console.log(`全局基线 ${PLATFORM_LABELS[platform]} → ${baselinePaths[platform]}（替换基线并清除旧托管 Rules）`)
+      if (cliPlatforms.length) console.log(`项目 Rules → ${path.join(projectDir, 'AGENTS.md')}（保留手写内容，移除旧托管基线）`)
+      if (selectedPlatforms.includes('claude')) console.log('旧 Claude 基线入口仅清理 dwy 托管块或与当前模板完全一致的内容。')
+      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()
-        const previous = [...new Set([...templateNames[type], ...(targetState.platforms[platform]?.[type] || [])])]
+        const previousState = type === 'rules' ? syncState : targetState
+        const previous = [...new Set([...templateNames[type], ...(previousState.platforms[platform]?.[type] || [])])]
           .filter(name => existingNames.has(platform === 'cursor' && type === 'rules' ? buildCursorRuleName(name) : name))
         const names = new Set((selected[type] || []).map(item => item.name))
         const removed = previous.filter(name => !names.has(name))
@@ -508,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) {
@@ -523,18 +658,35 @@ 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')
   } else {
+    for (const platform of cliPlatforms) await syncGlobalBaselineDoc(baseline, baselinePaths[platform])
+    if (cliPlatforms.length) {
+      const preservedRuleNames = unionSets(...cliPlatforms.map(platform => getPreservedStaleNames(staleEntries, approvedStaleRemovals, platform, 'rules')))
+      const ruleNames = new Set(selected.rules.map(rule => rule.name))
+      await syncProjectAgentsMd(projectDir, scans.rules.filter(rule => ruleNames.has(rule.name)), { preservedRuleNames })
+    }
     if (selectedPlatforms.includes('claude')) {
+      await removeLegacyBaseline(baseline, path.join(homeDir, '.claude', 'AGENTS.md'))
+      for (const name of ['AGENTS.md', 'CLAUDE.md']) await removeLegacyBaseline(baseline, path.join(projectDir, '.claude', name))
+      for (const dest of legacyClaudeRules) {
+        await fs.remove(dest)
+        logAction(`legacy rule → ${dest}`, 'red', '×')
+      }
       syncedAnySupportedPlatform = true
       console.log(chalk.blue('\nSyncing Claude Code configuration...\n'))
       await syncClaude({
         sourceDir,
         projectDir: targetRoot,
         global,
-        selected,
+        selected: selectionFor('claude'),
+        homeDir,
+        sharedSkills,
         staleRemovals: approvedStaleRemovals.claude,
       })
     }
@@ -546,9 +698,10 @@ export async function syncAll({
         sourceDir,
         projectDir: targetRoot,
         global,
-        selected,
+        selected: selectionFor('codex'),
+        homeDir,
+        sharedSkills,
         staleRemovals: approvedStaleRemovals.codex,
-        preserveMissingRules: getPreservedStaleNames(staleEntries, approvedStaleRemovals, 'codex', 'rules'),
       })
     }
 
@@ -556,8 +709,7 @@ export async function syncAll({
       syncedAnySupportedPlatform = true
       await syncCursor({
         sourceDir,
-        projectDir: targetRoot,
-        global,
+        projectDir,
         selected,
         staleRemovals: approvedStaleRemovals.cursor,
       })
@@ -569,30 +721,29 @@ export async function syncAll({
         sourceDir,
         projectDir: targetRoot,
         global,
-        selected,
+        selected: selectionFor('opencode'),
+        homeDir,
+        sharedSkills,
         staleRemovals: approvedStaleRemovals.opencode,
-        preserveMissingRules: getPreservedStaleNames(staleEntries, approvedStaleRemovals, 'opencode', 'rules'),
       })
     }
 
 
   }
 
-  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,
@@ -600,12 +751,42 @@ export async function syncAll({
     }
   } else {
     for (const platform of selectedPlatforms) {
-      targetState.platforms[platform] = buildNextPlatformState(selected, staleEntries, approvedStaleRemovals, platform)
+      const next = buildNextPlatformState(global ? selected : selectionFor(platform), staleEntries, approvedStaleRemovals, platform)
+      if (global) {
+        syncState.platforms[platform] = {
+          ...(syncState.platforms[platform] || createEmptyPlatformState()),
+          rules: next.rules,
+        }
+        if (platform !== 'cursor') targetState.platforms[platform] = { ...next, rules: [] }
+      } else {
+        targetState.platforms[platform] = next
+      }
+      if (platform !== 'cursor') {
+        globalState.platforms[platform] = { ...globalState.platforms[platform], rules: [] }
+      }
+    }
+  }
+  if (syncMode === SYNC_MODE_ALL && cliPlatforms.length) {
+    const agentsPath = path.join(projectDir, 'AGENTS.md')
+    const content = await fs.pathExists(agentsPath) ? await fs.readFile(agentsPath, 'utf-8') : ''
+    const rules = [...parseManagedRuleNames(content)].sort((a, b) => a.localeCompare(b, 'zh'))
+    // 三个 CLI 共用同一规则块，已有记录必须一起更新，避免切换平台后恢复已取消的规则。
+    for (const platform of Object.keys(baselinePaths)) {
+      if (syncState.platforms[platform]) syncState.platforms[platform].rules = rules
     }
   }
   targetState.skillScope = skillScope
   targetState.syncMode = syncMode
-  await saveSyncState(targetRoot, targetState)
+  if (global) {
+    syncState.syncMode = syncMode
+    await saveSyncState(projectDir, syncState)
+    if (cliPlatforms.length) await saveSyncState(homeDir, targetState)
+  } else {
+    await saveSyncState(targetRoot, targetState)
+    if (syncMode === SYNC_MODE_ALL && cliPlatforms.length && baseline.trim()) {
+      await saveSyncState(homeDir, globalState)
+    }
+  }
 
   if (!syncedAnySupportedPlatform) {
     console.log(chalk.yellow('未选择已接入平台，本次未执行同步。'))

package/src/sync-codex.js

@@ -1,12 +1,11 @@
 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,
-  readBaselineDoc,
   scanSkills,
-  scanRules,
   scanHooks,
   resolveSourceDir,
   copyFilter,
@@ -112,13 +111,37 @@ function upsertBaselineBlock(content, baselineBody) {
   return base ? `${block}\n\n${base}` : `${block}\n`
 }
 
-export async function syncProjectAgentsMd(sourceDir, projectDir, selectedRules, {
+/** 更新 CLI 全局基线，仅替换 dwy 托管块，并清除旧版写入的项目 Rules 托管块。 */
+export async function syncGlobalBaselineDoc(baseline, dest) {
+  if (!baseline.trim()) return 0
+  const current = await fs.pathExists(dest) ? await fs.readFile(dest, 'utf-8') : ''
+  const previous = current.trim() === baseline.trim() ? '' : current
+  const next = upsertManagedBlock(upsertBaselineBlock(previous, baseline), '')
+  if (next === current) return 0
+  await fs.ensureDir(path.dirname(dest))
+  await fs.writeFile(dest, next)
+  logAction(`global baseline → ${dest}`)
+  return 1
+}
+
+/** 迁移旧入口中的基线；无托管标记时只移除与当前模板完全一致的文件。 */
+export async function removeLegacyBaseline(baseline, dest) {
+  if (!await fs.pathExists(dest)) return
+  if (!baseline.trim()) return
+  const current = await fs.readFile(dest, 'utf-8')
+  const next = current.trim() === baseline.trim() ? '' : upsertBaselineBlock(current, '')
+  if (next === current) return
+  if (next.trim()) await fs.writeFile(dest, next)
+  else await fs.remove(dest)
+  logAction(`legacy baseline → ${dest}`, 'red', '×')
+}
+
+/** 三种 CLI 共用项目根 AGENTS.md；只写所选 Rules，保留托管块之外的项目内容。 */
+export async function syncProjectAgentsMd(projectDir, selectedRules, {
   preservedRuleNames = new Set(),
-  targetPath = path.join(projectDir, 'AGENTS.md'),
 } = {}) {
-  const dest = targetPath
+  const dest = path.join(projectDir, 'AGENTS.md')
   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))
   const existingSections = parseManagedRuleSections(current)
   const sections = []
@@ -130,15 +153,11 @@ export async function syncProjectAgentsMd(sourceDir, projectDir, selectedRules,
   }
   const blockBody = sections.join('\n\n---\n\n')
 
-  const withBaseline = upsertBaselineBlock(current, baselineBody)
-  const next = upsertManagedBlock(withBaseline, blockBody)
+  const next = upsertManagedBlock(upsertBaselineBlock(current, ''), 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')
-  parts.push(blockBody.trim() ? `${selectedRules.length} rules` : 'rules removed')
-  logAction(`AGENTS.md — ${parts.join(', ')}`)
+  logAction(`AGENTS.md — ${blockBody.trim() ? `${selectedRules.length} rules` : 'rules removed'}`)
   return 1
 }
 
@@ -168,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 })
+    await linkSkill({ skill: s, dest, backupRoot: path.join(proj, '.dwy', 'skill-backups') })
     logAction(`.agents/skills/${s.name}`)
   }
   return skills.length
@@ -188,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++
   }
@@ -214,7 +237,7 @@ async function copyCodexHooks(hooks, proj) {
       continue
     }
     const dest = path.join(dir, h.name)
-    await fs.copy(h.sourcePath, dest, { overwrite: true, filter: copyFilter })
+    await fs.copy(h.sourcePath, dest, { overwrite: true, filter: copyFilter(h.sourcePath) })
     if (!await fs.pathExists(dest)) {
       logAction(`.codex/hooks/${h.name}`, 'yellow', '!')
       continue
@@ -327,8 +350,9 @@ export async function syncCodex({
   projectDir,
   global = false,
   selected,
+  homeDir,
+  sharedSkills,
   staleRemovals = {},
-  preserveMissingRules = new Set(),
 } = {}) {
   const sourceDir = sourceDirOverride || await resolveSourceDir()
   if (!await fs.pathExists(sourceDir)) {
@@ -341,22 +365,17 @@ export async function syncCodex({
 
   const scans = {
     skills: await scanSkills(sourceDir),
-    rules: await scanRules(sourceDir),
     hooks: await scanHooks(sourceDir),
   }
-  console.log(chalk.yellow(`Found ${scans.skills.length} skills, ${scans.rules.length} rules, ${scans.hooks.length} hooks\n`))
+  console.log(chalk.yellow(`Found ${scans.skills.length} skills, ${scans.hooks.length} hooks\n`))
 
-  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),
-    rules: parseManagedRuleNames(agentsMdContent),
     hooks: await scanExistingCodexHooks(proj),
   }
   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)),
     hooks: scans.hooks.filter(item => selectedNames('hooks').has(item.name)),
   }
   const selectedHookNames = new Set(syncedSelection.hooks.map(h => h.name))
@@ -366,11 +385,10 @@ export async function syncCodex({
   let syncedCount = 0
   let removedCount = 0
 
-  syncedCount += await copySkillsFlat(syncedSelection.skills, proj)
-  syncedCount += await syncProjectAgentsMd(sourceDir, proj, syncedSelection.rules, {
-    preservedRuleNames: preserveMissingRules,
-    targetPath: agentsMdPath,
-  })
+  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)
 
@@ -386,7 +404,6 @@ export async function syncCodex({
   removedCount += await removeUnselectedFlat(['.codex', 'hooks'], existing.hooks, selectedHookNames, hookTemplateNames, proj)
 
   console.log(chalk.blue(`\nDone! ${syncedCount} synced${removedCount > 0 ? `, ${removedCount} removed` : ''}.`))
-  console.log(chalk.gray(`  Rules  → ${agentsMdPath}`))
   console.log(chalk.gray(`  Skills → ${path.join(proj, '.agents', 'skills')}`))
   console.log(chalk.gray(`  Hooks  → ${path.join(proj, '.codex')}`))
 }