create-dwy 0.23.0 → 0.25.0

package/src/sync-inheritance.js

@@ -0,0 +1,119 @@
+import fs from 'fs-extra'
+import path from 'node:path'
+import { buildClaudeHooksSettings, isManagedClaudeHookCommand, mergeClaudeHooks, loadHookManifests, scanHooks } from './sync.js'
+import { buildCodexHooksJson, hasManagedBaseline, isManagedCodexHookCommand, mergeCodexHooks } from './sync-codex.js'
+
+/** Hook 配置文件名由平台决定，Codex 根目录由调用方解析。 */
+export function hookConfigFile(platform, root) {
+  return path.join(root, platform === 'claude' ? 'settings.json' : 'hooks.json')
+}
+
+async function readHookConfig(platform, root) {
+  const file = hookConfigFile(platform, root)
+  if (!await fs.pathExists(file)) return {}
+  const config = await fs.readJson(file)
+  if (!config || typeof config !== 'object' || Array.isArray(config)
+    || (config.hooks !== undefined && (!config.hooks || typeof config.hooks !== 'object' || Array.isArray(config.hooks)))) {
+    throw new Error(`Hook 配置格式无效：${file}`)
+  }
+  for (const configs of Object.values(config.hooks || {})) {
+    if (!Array.isArray(configs) || configs.some(cfg => !cfg || typeof cfg !== 'object' || !Array.isArray(cfg.hooks)
+      || cfg.hooks.some(hook => !hook || typeof hook !== 'object'))) throw new Error(`Hook 配置格式无效：${file}`)
+  }
+  return config
+}
+
+/** 查找待移除名称的托管注册；不要求脚本仍在，便于清理坏配置。 */
+export async function hasManagedHookConfig(platform, root, names) {
+  const config = await readHookConfig(platform, root)
+  const matches = platform === 'claude' ? isManagedClaudeHookCommand : isManagedCodexHookCommand
+  return Object.values(config.hooks || {}).some(configs => configs.some(cfg => cfg.hooks.some(hook => matches(hook.command, names, root))))
+}
+
+/** 不隐式改变用户的全局禁用开关；启用前明确报告冲突。 */
+export async function assertHooksEnabled(platform, root) {
+  if ((await readHookConfig(platform, root)).disableAllHooks === true) throw new Error(`Hooks 被 disableAllHooks 禁用，无法启用：${hookConfigFile(platform, root)}`)
+}
+
+/** 只移除指定托管脚本和注册，不补装或更新其他 Hooks。 */
+export async function removeManagedHooks(platform, root, names, paths) {
+  const file = hookConfigFile(platform, root)
+  if (paths.includes(file)) {
+    const config = await readHookConfig(platform, root)
+    const merge = platform === 'claude' ? mergeClaudeHooks : mergeCodexHooks
+    const nextHooks = merge(config.hooks, undefined, names, root)
+    const next = { ...config }
+    if (nextHooks) next.hooks = nextHooks
+    else delete next.hooks
+    if (JSON.stringify(config) !== JSON.stringify(next)) {
+      if (Object.keys(next).length) await fs.writeJson(file, next, { spaces: 2 })
+      else await fs.remove(file)
+    }
+  }
+  for (const dest of paths) if (dest !== file) await fs.remove(dest)
+}
+
+/** 解析通用规范的原生全局入口；Cursor 没有文件入口。 */
+export function globalBaselinePath(platform, homeDir, codexHome) {
+  return { claude: path.join(homeDir, '.claude', 'CLAUDE.md'), codex: path.join(codexHome, 'AGENTS.md'),
+    opencode: path.join(homeDir, '.config', 'opencode', 'AGENTS.md') }[platform]
+}
+
+/** 返回所选 CLI 中实际提供 dwy 全局通用规范的平台。 */
+export async function baselineProviders(platforms, { homeDir, codexHome }) {
+  const providers = []
+  for (const platform of platforms) {
+    const dest = globalBaselinePath(platform, homeDir, codexHome)
+    if (dest && await hasManagedBaseline(dest)) providers.push(platform)
+  }
+  return providers
+}
+
+/** 全局 Hook 必须在对应事件及 matcher 下注册了完整执行命令，且脚本仍有效。 */
+export async function globalHookNames({ platform, sourceDir, homeDir, codexHome }) {
+  if (!['claude', 'codex'].includes(platform)) return new Set()
+  const root = platform === 'claude' ? path.join(homeDir, '.claude') : codexHome
+  const config = await readHookConfig(platform, root)
+  if (config.disableAllHooks === true) return new Set()
+  const manifests = await loadHookManifests(sourceDir)
+  const result = new Set()
+  for (const hook of await scanHooks(sourceDir)) {
+    const names = new Set([hook.name])
+    const generated = platform === 'claude' ? buildClaudeHooksSettings(manifests, names, true)
+      : buildCodexHooksJson(manifests, names, true, root)
+    const registrations = Object.entries(generated.hooks || {}).flatMap(([event, configs]) =>
+      configs.flatMap(cfg => cfg.hooks.map(command => ({ event, matcher: cfg.matcher, command: command.command }))))
+    if (registrations.length === 0) continue
+    const registered = registrations.every(expected => {
+      const configs = config.hooks?.[expected.event] || []
+      return configs.some(cfg => cfg.matcher === expected.matcher && Array.isArray(cfg.hooks)
+        && cfg.hooks.some(item => item.type === 'command' && item.command === expected.command))
+    })
+    if (!registered) continue
+    const stat = await fs.stat(path.join(root, 'hooks', hook.name)).catch(error => {
+      if (['ENOENT', 'ENOTDIR', 'ELOOP'].includes(error.code)) return null
+      throw error
+    })
+    if (stat?.isFile()) result.add(hook.name)
+  }
+  return result
+}
+
+/** 配置写入与清理不能穿透边界内的目录或文件链接；确认前及执行时均检查。 */
+export async function assertConfigPath(dest, root) {
+  const nearest = async start => {
+    let current = start
+    while (!await fs.lstat(current).catch(error => { if (error.code === 'ENOENT') return null; throw error })) current = path.dirname(current)
+    return current
+  }
+  const base = await nearest(root)
+  const expectedRoot = path.resolve(await fs.realpath(base), path.relative(base, root))
+  const entry = await nearest(dest)
+  const expected = path.resolve(expectedRoot, path.relative(root, entry))
+  let actual
+  try { actual = await fs.realpath(entry) } catch (error) {
+    if (!['ENOENT', 'ELOOP', 'ENOTDIR'].includes(error.code)) throw error
+    throw new Error(`配置入口为无效链接，保留原入口：${entry}`)
+  }
+  if (actual !== expected) throw new Error(`配置入口链接指向外部位置，保留原入口：${entry}`)
+}

package/src/sync-opencode.js

@@ -48,7 +48,7 @@ export async function syncOpenCode({
   sharedSkills,
   staleRemovals = {},
 } = {}) {
-  const sourceDir = sourceDirOverride || await resolveSourceDir()
+  const sourceDir = sourceDirOverride || await resolveSourceDir({ homeDir })
   if (!await fs.pathExists(sourceDir)) {
     throw new Error('ai-tools templates not found in repo')
   }

package/src/sync-plan.js

@@ -1,18 +1,19 @@
 import fs from 'fs-extra'
 import path from 'node:path'
-import { ensureSharedSkills, linkSkill, removeSkillEntry } from './skill-store.js'
+import { ensureSharedSkills, prepareSharedSkills, linkSkill, removeSkillEntry } from './skill-store.js'
 import { findGlobalSkill, globalSkillRoots, resolveGlobalSkillDir, resolveProjectSkillDir } from './sync-global-skills.js'
 import { loadHookManifests, syncClaude } from './sync.js'
-import { removeLegacyBaseline, syncCodex, syncGlobalBaselineDoc, syncProjectAgentsMd } from './sync-codex.js'
+import { hasManagedBaseline, removeLegacyBaseline, syncBaselineDoc, syncCodex, syncProjectAgentsMd } from './sync-codex.js'
 import { syncCursor } from './sync-cursor.js'
 import { planMissingExternalSkills } from './skills-install.js'
+import { assertConfigPath, assertHooksEnabled, baselineProviders, globalBaselinePath, globalHookNames, hasManagedHookConfig, hookConfigFile, removeManagedHooks } from './sync-inheritance.js'
 
 /** 平台显示名，交互和变更清单共用。 */
 export const PLATFORM_LABELS = { claude: 'Claude Code', codex: 'Codex', opencode: 'OpenCode', cursor: 'Cursor' }
-/** 项目范围的平台能力；全局范围用通用规范替代项目 Rules，且不支持 Cursor。 */
+/** 平台能力；全局不提供 Rules，Cursor 仅提供项目 Rules。 */
 export const PLATFORM_SYNC_TYPES = {
-  claude: ['skills', 'rules', 'hooks'], codex: ['skills', 'rules', 'hooks'],
-  opencode: ['skills', 'rules'], cursor: ['rules'],
+  claude: ['skills', 'rules', 'hooks', 'baseline'], codex: ['skills', 'rules', 'hooks', 'baseline'],
+  opencode: ['skills', 'rules', 'baseline'], cursor: ['rules'],
 }
 
 /** 只提供所选范围和平台支持的内容；未勾选类型不进入清理或状态更新。 */
@@ -21,8 +22,9 @@ export function contentOptions(scope, platforms) {
   return [
     ...(supports('skills') ? [{ value: 'skills', label: 'Skills', description: '管理当前范围的启用入口；已有共享内容不刷新' }] : []),
     ...(scope === 'project' && supports('rules') ? [{ value: 'rules', label: '项目规则（Rules）', description: '只更新当前项目的托管规则' }] : []),
-    ...(scope === 'global' ? [{ value: 'baseline', label: '全局通用规范', description: '更新所选工具的原生全局指令入口，不修改项目规则' }] : []),
-    ...(supports('hooks') ? [{ value: 'hooks', label: 'Hooks（按平台自动同步）', description: '仅选择此类型后，自动同步所选平台支持的 Hooks' }] : []),
+    ...(supports('baseline') ? [{ value: 'baseline', label: 'AGENTS.md 通用规范', description: scope === 'global'
+      ? '管理原生全局指令入口；首次默认启用，可显式移除' : '管理项目基线块；已有全局规范时仅可清理重复项' }] : []),
+    ...(supports('hooks') ? [{ value: 'hooks', label: 'Hooks', description: '独立启用或移除整组；项目继承有效全局注册' }] : []),
   ]
 }
 
@@ -67,11 +69,13 @@ function ownedGlobalRoots(platform, homeDir, codexHome) {
 
 /**
  * 只读计算本次全部操作和下一份状态；run 回调只在确认后执行。
- * Skills 的入口与内容刷新分离；项目去重只删除项目入口，不改写全局提供者。
+ * 主交互可在确认后刷新所选共享内容；显式脚本默认仅补缺，项目去重不改写全局提供者。
  */
 export async function buildSyncPlan({
   scope, platforms, contentTypes, selected, scans, sourceDir, projectDir, homeDir, codexHome,
   projectState, globalState, staleRemovals = {}, staleEntries = {}, baseline,
+  contentActions = {},
+  refreshSkills = false,
   skillScope = { destinations: ['project'], globalSkills: [] },
 }) {
   const global = scope === 'global'
@@ -85,7 +89,10 @@ export async function buildSyncPlan({
   if (platforms.some(platform => !PLATFORM_SYNC_TYPES[platform] || (global && platform === 'cursor'))
     || contentTypes.some(type => !allowed.has(type))) throw new Error('所选范围或平台不支持此同步内容')
   const active = new Set(contentTypes)
-  if (active.has('baseline') && !baseline.trim()) throw new Error('没有可同步的全局通用规范')
+  for (const [type, action] of Object.entries(contentActions)) {
+    if (!['baseline', 'hooks'].includes(type) || !['sync', 'remove'].includes(action)) throw new Error('无效的内容操作')
+  }
+  if (active.has('baseline') && contentActions.baseline !== 'remove' && !baseline.trim()) throw new Error('没有可同步的通用规范')
   const operations = []
   const nextProject = structuredClone(projectState), nextGlobal = structuredClone(globalState)
   const targetState = global ? nextGlobal : nextProject
@@ -96,7 +103,18 @@ export async function buildSyncPlan({
   const addedGlobalPaths = new Set(), removedGlobalPaths = new Set()
   const localCleanup = new Set()
   let projectChanged = !global && contentTypes.length > 0
-  const add = (kind, label, paths, run) => operations.push({ kind, label, paths, run })
+  const add = (kind, label, paths, run) => {
+    // 无标记旧基线须在 Rules 追加前识别，否则原文会变成无法确认归属的混合内容。
+    const beforeRules = ['baseline', 'remove-baseline'].includes(kind) ? operations.findIndex(operation => operation.kind === 'rules') : -1
+    operations.splice(beforeRules < 0 ? operations.length : beforeRules, 0, { kind, label, paths, run })
+  }
+  const addConfig = async (kind, label, paths, boundary, run) => {
+    for (const dest of paths) await assertConfigPath(dest, boundary)
+    add(kind, label, paths, async () => {
+      for (const dest of paths) await assertConfigPath(dest, boundary)
+      await run()
+    })
+  }
   const platformState = platform => targetState.platforms[platform] ||= { skills: [], rules: [], hooks: [], commands: [] }
   const approved = (platform, type) => [...(staleRemovals[platform]?.[type] || [])].filter(safeName)
   const retained = (platform, type) => (staleEntries[platform]?.[type] || []).filter(name => safeName(name) && !approved(platform, type).includes(name))
@@ -179,9 +197,25 @@ export async function buildSyncPlan({
     }
     if (neededSkills.size) {
       const skills = [...neededSkills.values()]
-      operations.unshift({ kind: 'ensure-skills', label: '准备缺失的共享副本；已有内容不刷新',
+      const preserved = []
+      if (refreshSkills && !global) {
+        for (let i = 0; i < skills.length; i++) {
+          const skill = skills[i], shared = path.join(homeDir, '.dwy', 'skills', skill.name)
+          if (!await validSkill(shared)) continue
+          for (const platform of ['claude', 'codex', 'opencode']) {
+            if (!await findGlobalSkill({ name: skill.name, platform, homeDir, codexHome })) continue
+            // 补项目入口不能间接刷新其他 CLI 正在使用的全局共享副本。
+            skills[i] = { ...skill, sourcePath: shared }
+            preserved.push(skill.name)
+            break
+          }
+        }
+      }
+      const label = refreshSkills ? `更新所选共享 Skills（所有同名链接生效）${preserved.length ? `；保留全局共享内容：${preserved.join('、')}` : ''}`
+        : '准备缺失的共享副本；已有内容不刷新'
+      operations.unshift({ kind: 'ensure-skills', label,
         paths: [...skills.map(skill => path.join(homeDir, '.dwy', 'skills', skill.name)), path.join(homeDir, '.dwy', 'skill-store.json')],
-        run: () => ensureSharedSkills({ skills, homeDir }) })
+        run: () => (refreshSkills ? prepareSharedSkills : ensureSharedSkills)({ skills, homeDir }) })
     }
     if ([...neededSkills.values()].some(skill => skill.category === '产品0到1')) {
       const target = path.join(process.env.DWY_HOME || path.join(homeDir, '.dwy'), 'skills')
@@ -196,7 +230,7 @@ export async function buildSyncPlan({
     const rules = scans.rules.filter(rule => selectedNames.has(rule.name))
     const preserved = new Set(cliPlatforms.flatMap(platform => retained(platform, 'rules')))
     if (cliPlatforms.length) {
-      add('rules', '更新项目 Rules（保留手写内容）', [path.join(projectDir, 'AGENTS.md')],
+      await addConfig('rules', '更新项目 Rules（保留通用规范和手写内容）', [path.join(projectDir, 'AGENTS.md')], projectDir,
         () => syncProjectAgentsMd(projectDir, rules, { preservedRuleNames: preserved }))
       const names = [...new Set([...rules.map(rule => rule.name), ...preserved])].sort()
       for (const platform of ['claude', 'codex', 'opencode']) {
@@ -220,58 +254,111 @@ export async function buildSyncPlan({
         const dest = path.join(projectDir, '.claude', 'rules', name)
         if (safeName(name) && await existsEntry(dest)) add('legacy-rule', '清理旧项目规则入口', [dest], () => fs.remove(dest))
       }
-      for (const name of ['AGENTS.md', 'CLAUDE.md']) {
-        const dest = path.join(projectDir, '.claude', name)
-        if (await fs.pathExists(dest)) {
-          const text = await fs.readFile(dest, 'utf8')
-          if (text.trim() === baseline.trim() || /<!-- DWY-BASELINE:START[\s\S]*?DWY-BASELINE:END -->/.test(text)) {
-            add('legacy-baseline', '清理旧项目基线托管内容', [dest], () => removeLegacyBaseline(baseline, dest))
-          }
-        }
-      }
     }
   }
   if (active.has('baseline')) {
-    const paths = { claude: path.join(homeDir, '.claude', 'CLAUDE.md'), codex: path.join(codexHome, 'AGENTS.md'), opencode: path.join(homeDir, '.config', 'opencode', 'AGENTS.md') }
-    for (const platform of cliPlatforms) {
-      const dest = paths[platform]
-      add('baseline', `更新 ${PLATFORM_LABELS[platform]} 全局通用规范（保留手写内容）`, [dest], () => syncGlobalBaselineDoc(baseline, dest))
-      platformState(platform).rules = []
+    const remove = contentActions.baseline === 'remove'
+    const providers = global ? [] : await baselineProviders(cliPlatforms, { homeDir, codexHome })
+    const inherited = providers.length > 0
+    const markProject = enabled => {
+      for (const platform of ['claude', 'codex', 'opencode']) {
+        if ((!global && platforms.includes(platform)) || nextProject.platforms[platform]) {
+          nextProject.platforms[platform] ||= { skills: [], rules: [], hooks: [], commands: [] }
+          nextProject.platforms[platform].baseline = enabled
+          if (global) projectChanged = true
+        }
+      }
     }
-    if (platforms.includes('claude')) {
-      const dest = path.join(homeDir, '.claude', 'AGENTS.md')
-      if (await fs.pathExists(dest)) {
-        const text = await fs.readFile(dest, 'utf8')
-        if (text.trim() === baseline.trim() || /<!-- DWY-BASELINE:START[\s\S]*?DWY-BASELINE:END -->/.test(text)) {
-          add('legacy-baseline', '清理旧全局基线托管内容', [dest], () => removeLegacyBaseline(baseline, dest))
+    const cleanBaseline = async (dest, boundary, label) => {
+      if (!await fs.pathExists(dest)) return false
+      const text = await fs.readFile(dest, 'utf8')
+      if (!await hasManagedBaseline(dest) && (!baseline.trim() || text.trim() !== baseline.trim())) return false
+      await addConfig('remove-baseline', label, [dest], boundary, () => text.trim() === baseline.trim()
+        ? removeLegacyBaseline(baseline, dest) : syncBaselineDoc('', dest))
+      return true
+    }
+    if (global) {
+      for (const platform of cliPlatforms) {
+        const dest = globalBaselinePath(platform, homeDir, codexHome)
+        if (remove) await cleanBaseline(dest, platform === 'codex' ? codexHome : homeDir, `移除 ${PLATFORM_LABELS[platform]} 全局通用规范（保留 Rules 和手写内容）`)
+        else await addConfig('baseline', `启用/更新 ${PLATFORM_LABELS[platform]} 全局通用规范（保留其他内容）`, [dest], platform === 'codex' ? codexHome : homeDir, () => syncBaselineDoc(baseline, dest))
+        platformState(platform).baseline = !remove
+      }
+      if (platforms.includes('claude')) await cleanBaseline(path.join(homeDir, '.claude', 'AGENTS.md'), homeDir, '清理旧全局基线托管内容')
+    } else {
+      const dest = path.join(projectDir, 'AGENTS.md')
+      if (remove || inherited) {
+        await cleanBaseline(dest, projectDir, inherited ? '全局已启用，清理项目重复基线' : '移除项目通用规范（保留 Rules 和手写内容）')
+        const missing = cliPlatforms.filter(platform => !providers.includes(platform))
+        if (inherited) add('inherit', `通用规范使用全局：${providers.map(p => PLATFORM_LABELS[p]).join('、')}；项目禁止重复安装${missing.length ? `；${missing.map(p => PLATFORM_LABELS[p]).join('、')} 缺少全局规范，请另行选择全局范围补齐` : ''}`,
+          providers.map(p => globalBaselinePath(p, homeDir, codexHome)), async () => {})
+      } else await addConfig('baseline', '启用/更新项目 AGENTS.md 通用规范（保留 Rules 和手写内容）', [dest], projectDir, () => syncBaselineDoc(baseline, dest))
+      markProject(!remove && !inherited)
+    }
+    if ((!global || !remove) && !isHome) {
+      if (global && await cleanBaseline(path.join(projectDir, 'AGENTS.md'), projectDir, '全局优先，清理当前项目重复基线')) markProject(false)
+      if (platforms.includes('claude')) {
+        for (const name of ['AGENTS.md', 'CLAUDE.md']) {
+          await cleanBaseline(path.join(projectDir, '.claude', name), projectDir, '清理旧项目基线托管内容')
         }
       }
     }
   }
   if (active.has('hooks')) {
     const manifests = await loadHookManifests(sourceDir)
+    const remove = contentActions.hooks === 'remove'
+    const removeHooks = async (platform, root, boundary, names, label) => {
+      const paths = []
+      for (const name of names) {
+        const dest = path.join(root, 'hooks', name)
+        if (await existsEntry(dest)) paths.push(dest)
+      }
+      if (await hasManagedHookConfig(platform, root, names)) paths.push(hookConfigFile(platform, root))
+      if (!paths.length) return false
+      await addConfig('remove-hooks', label, paths, boundary, () => removeManagedHooks(platform, root, names, paths))
+      return true
+    }
     for (const platform of platforms.filter(p => PLATFORM_SYNC_TYPES[p].includes('hooks'))) {
-      const hooks = scans.hooks.filter(hook => manifests.some(manifest => manifest.name === hook.name && (!manifest.platforms || manifest.platforms.includes(platform))))
+      const available = scans.hooks.filter(hook => manifests.some(manifest => manifest.name === hook.name && (!manifest.platforms || manifest.platforms.includes(platform))))
+      const provided = !global && !remove ? await globalHookNames({ platform, sourceDir, homeDir, codexHome }) : new Set()
+      const hooks = remove ? [] : available.filter(hook => !provided.has(hook.name))
       const root = global && platform === 'codex' ? codexHome : path.join(targetRoot, platform === 'claude' ? '.claude' : '.codex')
-      const paths = hooks.map(hook => path.join(root, 'hooks', hook.name))
-      const selectedNames = new Set(hooks.map(hook => hook.name))
-      const managedNames = new Set([...scans.hooks.map(hook => hook.name), ...approved(platform, 'hooks')])
-      const removedNames = []
-      const hookDir = path.join(root, 'hooks')
-      if (await fs.pathExists(hookDir)) {
-        for (const name of await fs.readdir(hookDir)) {
-          if (managedNames.has(name) && !selectedNames.has(name)) {
-            paths.push(path.join(hookDir, name))
-            removedNames.push(name)
+      const boundary = global && platform === 'codex' ? codexHome : targetRoot
+      const historical = (targetState.platforms[platform]?.hooks || []).filter(safeName)
+      const allManaged = new Set([...scans.hooks.map(hook => hook.name), ...(remove ? historical : []), ...approved(platform, 'hooks')])
+      if (remove || hooks.length === 0) {
+        await removeHooks(platform, root, boundary, allManaged, `${remove ? '移除' : '全局已启用，清理重复'} ${PLATFORM_LABELS[platform]} ${global ? '全局' : '项目'} 托管 Hooks`)
+      } else {
+        await assertHooksEnabled(platform, root)
+        const paths = hooks.map(hook => path.join(root, 'hooks', hook.name))
+        const selectedNames = new Set(hooks.map(hook => hook.name))
+        const removedNames = []
+        const hookDir = path.join(root, 'hooks')
+        if (await fs.pathExists(hookDir)) {
+          for (const name of await fs.readdir(hookDir)) {
+            if (allManaged.has(name) && !selectedNames.has(name)) {
+              paths.push(path.join(hookDir, name))
+              removedNames.push(name)
+            }
           }
         }
+        paths.push(hookConfigFile(platform, root))
+        const sync = platform === 'claude' ? syncClaude : syncCodex
+        const cleanup = removedNames.length ? `；清理旧托管脚本：${removedNames.join('、')}` : ''
+        await addConfig('hooks', `同步 ${PLATFORM_LABELS[platform]} ${global ? '全局' : '项目'} Hooks${cleanup}`, paths, boundary,
+          () => sync({ sourceDir, projectDir: targetRoot, global, homeDir, codexHome, selected: { skills: [], hooks }, syncTypes: ['hooks'], staleRemovals: staleRemovals[platform] }))
+      }
+      if (provided.size) add('inherit', `${PLATFORM_LABELS[platform]} Hooks 使用全局：${[...provided].join('、')}；项目不重复安装`, [], async () => {})
+      platformState(platform).hooks = remove ? [] : [...new Set([...hooks.map(hook => hook.name), ...retained(platform, 'hooks')])].sort()
+      if (global && !remove && !isHome) {
+        const local = path.join(projectDir, platform === 'claude' ? '.claude' : '.codex')
+        const duplicates = new Set(available.map(hook => hook.name))
+        if (await removeHooks(platform, local, projectDir, duplicates, `全局优先，清理当前项目 ${PLATFORM_LABELS[platform]} 重复 Hooks`)
+          && nextProject.platforms[platform]) {
+          nextProject.platforms[platform].hooks = (nextProject.platforms[platform].hooks || []).filter(name => !duplicates.has(name))
+          projectChanged = true
+        }
       }
-      paths.push(path.join(root, platform === 'claude' ? 'settings.json' : 'hooks.json'))
-      const sync = platform === 'claude' ? syncClaude : syncCodex
-      const cleanup = removedNames.length ? `；清理旧托管脚本：${removedNames.join('、')}` : ''
-      add('hooks', `同步 ${PLATFORM_LABELS[platform]} ${global ? '全局' : '项目'} Hooks${cleanup}`, paths,
-        () => sync({ sourceDir, projectDir: targetRoot, global, homeDir, codexHome, selected: { skills: [], hooks }, syncTypes: ['hooks'], staleRemovals: staleRemovals[platform] }))
-      platformState(platform).hooks = [...new Set([...hooks.map(hook => hook.name), ...retained(platform, 'hooks')])].sort()
     }
   }
   return { operations, nextProject, nextGlobal, projectChanged, globalChanged: global && contentTypes.length > 0 }

package/src/sync.js

@@ -2,8 +2,9 @@ import fs from 'fs-extra'
 import path from 'path'
 import { isCancel } from '@clack/prompts'
 import { tabMultiselect } from './tab-multiselect.js'
-import { chalk, PACKAGE_ROOT } from './utils.js'
+import { chalk } from './utils.js'
 import { linkSkill, ensureSharedSkills, removeSkillEntry } from './skill-store.js'
+import { resolveTemplateSource } from './template-source.js'
 
 const CATEGORIES = [
   { key: 'skills', label: 'Skills' },
@@ -290,7 +291,8 @@ async function removeUnselected(typePlural, existingNames, selectedNames, templa
   return count
 }
 
-function buildClaudeHooksSettings(manifests, selectedHookNames, global) {
+/** 生成 Claude Hook 注册，继承检测和写入共用相同命令格式。 */
+export function buildClaudeHooksSettings(manifests, selectedHookNames, global) {
   const grouped = new Map()
 
   for (const manifest of manifests) {
@@ -320,13 +322,18 @@ function buildClaudeHooksSettings(manifests, selectedHookNames, global) {
   return settings
 }
 
-function isManagedClaudeHookCommand(command, managedHookNames) {
+/** 仅识别完整的 dwy 生成命令，避免误删提到同名路径的个人命令。 */
+export function isManagedClaudeHookCommand(command, managedHookNames) {
   if (typeof command !== 'string') return false
-  const match = command.match(/\.claude\/hooks\/([^\s'"]+)/)
-  return !!(match && managedHookNames.has(match[1]))
+  return [...managedHookNames].some(name => [
+    `bash "$HOME/.claude/hooks/${name}"`,
+    `bash "$CLAUDE_PROJECT_DIR/.claude/hooks/${name}"`,
+    `bash ~/.claude/hooks/${name}`,
+  ].includes(command))
 }
 
-function mergeClaudeHooks(existingHooks, generatedHooks, managedHookNames) {
+/** 替换指定托管 Hook 注册，保留其他命令及配置字段。 */
+export function mergeClaudeHooks(existingHooks, generatedHooks, managedHookNames) {
   const merged = {}
   const sourceEvents = new Set([
     ...Object.keys(existingHooks || {}),
@@ -348,14 +355,12 @@ function mergeClaudeHooks(existingHooks, generatedHooks, managedHookNames) {
   return Object.keys(merged).length > 0 ? merged : undefined
 }
 
-async function syncSettings(sourceDir, targetDir, selectedHookNames, global) {
+async function syncSettings(sourceDir, targetDir, selectedHookNames, global, staleHookNames) {
   const settingsDest = path.join(targetDir, 'settings.json')
   const manifests = await loadHookManifests(sourceDir)
   const generatedSettings = buildClaudeHooksSettings(manifests, selectedHookNames, global)
   const managedHookNames = new Set(
-    manifests
-      .filter(manifest => !manifest.platforms || manifest.platforms.includes('claude'))
-      .map(manifest => manifest.name),
+    [...manifests.map(manifest => manifest.name), ...staleHookNames],
   )
 
   let merged
@@ -386,17 +391,9 @@ async function syncSettings(sourceDir, targetDir, selectedHookNames, global) {
   return 1
 }
 
-/** 默认读取随包模板；仅开发者显式设置环境变量时改用外部目录，不要求仓库权限。 */
-export async function resolveSourceDir() {
-  const explicitSourceDir = process.env.DWY_TEMPLATE_SOURCE_DIR
-  if (explicitSourceDir) {
-    if (!await fs.pathExists(explicitSourceDir)) {
-      throw new Error(`DWY_TEMPLATE_SOURCE_DIR not found: ${explicitSourceDir}`)
-    }
-    return explicitSourceDir
-  }
-
-  return path.join(PACKAGE_ROOT, 'templates', 'ai-tools')
+/** 解析模板源并检查公开模板更新；调用方可注入 homeDir 隔离用户缓存。 */
+export async function resolveSourceDir(options) {
+  return resolveTemplateSource(options)
 }
 
 /** 同步 Claude Skills 与 Hooks；基线和项目 Rules 由总同步入口分别处理。 */
@@ -410,7 +407,7 @@ export async function syncClaude({
   syncTypes = ['skills', 'rules', 'hooks'],
   staleRemovals = {},
 } = {}) {
-  const sourceDir = sourceDirOverride || await resolveSourceDir()
+  const sourceDir = sourceDirOverride || await resolveSourceDir({ homeDir })
   if (!await fs.pathExists(sourceDir)) {
     throw new Error('ai-tools templates not found in repo')
   }
@@ -470,7 +467,7 @@ export async function syncClaude({
     syncedCount += await copyItems(skills, projectTargetDir)
   }
   if (syncTypes.includes('hooks')) {
-    syncedCount += await syncSettings(sourceDir, projectTargetDir, selectedHookNames, global)
+    syncedCount += await syncSettings(sourceDir, projectTargetDir, selectedHookNames, global, approvedStaleHooks)
     syncedCount += await copyHooks(syncedSelection.hooks, projectTargetDir)
   }