create-dwy 0.22.0 → 0.24.1

package/src/sync-codex.js

@@ -1,7 +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 { linkSkill, ensureSharedSkills, removeSkillEntry } from './skill-store.js'
 import {
   extractDescription,
   loadHookManifests,
@@ -111,19 +111,30 @@ function upsertBaselineBlock(content, baselineBody) {
   return base ? `${block}\n\n${base}` : `${block}\n`
 }
 
-/** 更新 CLI 全局基线，仅替换 dwy 托管块，并清除旧版写入的项目 Rules 托管块。 */
-export async function syncGlobalBaselineDoc(baseline, dest) {
-  if (!baseline.trim()) return 0
+/** 判断文件是否含有有效的 dwy 通用规范；个人文件不作为继承依据。 */
+export async function hasManagedBaseline(dest) {
+  if (!await fs.pathExists(dest)) return false
+  const match = (await fs.readFile(dest, 'utf8')).match(BASELINE_RE)
+  return Boolean(match && match[0].replace(/<!--[\s\S]*?-->/g, '').trim())
+}
+
+/** 独立更新通用规范，空内容移除基线块；保留 Rules 和个人内容。 */
+export async function syncBaselineDoc(baseline, dest) {
   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), '')
+  const previous = baseline.trim() && current.trim() === baseline.trim() ? '' : current
+  const next = upsertBaselineBlock(previous, baseline)
   if (next === current) return 0
-  await fs.ensureDir(path.dirname(dest))
-  await fs.writeFile(dest, next)
-  logAction(`global baseline → ${dest}`)
+  if (next.trim()) {
+    await fs.ensureDir(path.dirname(dest))
+    await fs.writeFile(dest, next)
+  } else await fs.remove(dest)
+  logAction(`baseline → ${dest}`)
   return 1
 }
 
+/** 兼容旧调用方；全局基线更新同样保留其他托管块。 */
+export const syncGlobalBaselineDoc = syncBaselineDoc
+
 /** 迁移旧入口中的基线；无托管标记时只移除与当前模板完全一致的文件。 */
 export async function removeLegacyBaseline(baseline, dest) {
   if (!await fs.pathExists(dest)) return
@@ -153,7 +164,7 @@ export async function syncProjectAgentsMd(projectDir, selectedRules, {
   }
   const blockBody = sections.join('\n\n---\n\n')
 
-  const next = upsertManagedBlock(upsertBaselineBlock(current, ''), blockBody)
+  const next = upsertManagedBlock(current, blockBody)
   if (next === current) return 0
   await fs.ensureDir(path.dirname(dest))
   await fs.writeFile(dest, next)
@@ -220,16 +231,16 @@ async function removeUnselectedFlat(subdir, existingNames, selectedNames, templa
 
 // ---------- hooks → .codex/ ----------
 
-export async function scanExistingCodexHooks(proj) {
-  const dir = path.join(proj, '.codex', 'hooks')
+export async function scanExistingCodexHooks(proj, configDir = path.join(proj, '.codex')) {
+  const dir = path.join(configDir, 'hooks')
   if (!await fs.pathExists(dir)) return new Set()
   const entries = await fs.readdir(dir)
   return new Set(entries.filter(n => n !== '.gitkeep' && n !== '.DS_Store'))
 }
 
-async function copyCodexHooks(hooks, proj) {
+async function copyCodexHooks(hooks, configDir) {
   if (hooks.length === 0) return 0
-  const dir = path.join(proj, '.codex', 'hooks')
+  const dir = path.join(configDir, 'hooks')
   await fs.ensureDir(dir)
   for (const h of hooks) {
     if (!await fs.pathExists(h.sourcePath)) {
@@ -248,7 +259,13 @@ async function copyCodexHooks(hooks, proj) {
   return hooks.length
 }
 
-function buildCodexHooksJson(manifests, selectedHookNames, global) {
+function globalHookCommand(configDir, name) {
+  const script = path.join(configDir, 'hooks', name).replace(/\\/g, '/')
+  return `bash '${script.replace(/'/g, "'\\''")}'`
+}
+
+/** 生成 Codex Hook 注册，继承检测和写入共用相同命令格式。 */
+export function buildCodexHooksJson(manifests, selectedHookNames, global, configDir) {
   const hooksJson = { hooks: {} }
   const grouped = new Map()
 
@@ -263,7 +280,7 @@ function buildCodexHooksJson(manifests, selectedHookNames, global) {
     hooks.push({
       type: 'command',
       command: global
-        ? `bash "$HOME/.codex/hooks/${manifest.name}"`
+        ? globalHookCommand(configDir, manifest.name)
         : `bash "$(git rev-parse --show-toplevel)/.codex/hooks/${manifest.name}"`,
       ...(manifest.timeout ? { timeout: manifest.timeout } : {}),
     })
@@ -279,13 +296,19 @@ function buildCodexHooksJson(manifests, selectedHookNames, global) {
   return Object.keys(hooksJson.hooks).length > 0 ? hooksJson : {}
 }
 
-function isManagedCodexHookCommand(command, managedHookNames) {
+/** 只识别完整生成命令及已知历史格式，保留同名个人路径。 */
+export function isManagedCodexHookCommand(command, managedHookNames, configDir) {
   if (typeof command !== 'string') return false
-  const match = command.match(/\.codex\/hooks\/([^\s'"]+)/)
-  return !!(match && managedHookNames.has(match[1]))
+  return [...managedHookNames].some(name => [
+    globalHookCommand(configDir, name),
+    `bash "$(git rev-parse --show-toplevel)/.codex/hooks/${name}"`,
+    `bash "$HOME/.codex/hooks/${name}"`,
+    `bash ~/.codex/hooks/${name}`,
+  ].includes(command))
 }
 
-function mergeCodexHooks(existingHooks, generatedHooks, managedHookNames) {
+/** 只替换指定托管注册，保留其他命令及配置字段。 */
+export function mergeCodexHooks(existingHooks, generatedHooks, managedHookNames, configDir) {
   const merged = {}
   const sourceEvents = new Set([
     ...Object.keys(existingHooks || {}),
@@ -296,7 +319,7 @@ function mergeCodexHooks(existingHooks, generatedHooks, managedHookNames) {
     const kept = []
 
     for (const cfg of existingHooks?.[event] || []) {
-      const remainingHooks = (cfg.hooks || []).filter(hook => !isManagedCodexHookCommand(hook.command, managedHookNames))
+      const remainingHooks = (cfg.hooks || []).filter(hook => !isManagedCodexHookCommand(hook.command, managedHookNames, configDir))
       if (remainingHooks.length > 0) kept.push({ ...cfg, hooks: remainingHooks })
     }
 
@@ -307,20 +330,18 @@ function mergeCodexHooks(existingHooks, generatedHooks, managedHookNames) {
   return Object.keys(merged).length > 0 ? merged : undefined
 }
 
-async function syncCodexHooksJson(sourceDir, proj, selectedHookNames, global) {
-  const dest = path.join(proj, '.codex', 'hooks.json')
+async function syncCodexHooksJson(sourceDir, configDir, selectedHookNames, global, staleHookNames) {
+  const dest = path.join(configDir, 'hooks.json')
   const manifests = await loadHookManifests(sourceDir)
-  const generated = buildCodexHooksJson(manifests, selectedHookNames, global)
+  const generated = buildCodexHooksJson(manifests, selectedHookNames, global, configDir)
   const managedHookNames = new Set(
-    manifests
-      .filter(manifest => !manifest.platforms || manifest.platforms.includes('codex'))
-      .map(manifest => manifest.name),
+    [...manifests.map(manifest => manifest.name), ...staleHookNames],
   )
 
   let nextJson
   if (await fs.pathExists(dest)) {
     const existing = await fs.readJson(dest)
-    const nextHooks = mergeCodexHooks(existing.hooks, generated.hooks, managedHookNames)
+    const nextHooks = mergeCodexHooks(existing.hooks, generated.hooks, managedHookNames, configDir)
     if (!nextHooks) {
       if (!existing.hooks) return 0
       const { hooks, ...rest } = existing
@@ -344,14 +365,16 @@ async function syncCodexHooksJson(sourceDir, proj, selectedHookNames, global) {
   return 1
 }
 
-/** 同步 Codex 配置；global 模式将规则写入用户 .codex/AGENTS.md。 */
+/** 同步 Codex Skills 与 Hooks；全局 Hooks 遵循 codexHome。 */
 export async function syncCodex({
   sourceDir: sourceDirOverride,
   projectDir,
   global = false,
   selected,
   homeDir,
+  codexHome,
   sharedSkills,
+  syncTypes = ['skills', 'hooks'],
   staleRemovals = {},
 } = {}) {
   const sourceDir = sourceDirOverride || await resolveSourceDir()
@@ -360,6 +383,7 @@ export async function syncCodex({
   }
 
   const proj = projectDir || process.cwd()
+  const configDir = global && codexHome ? codexHome : path.join(proj, '.codex')
 
   console.log(chalk.blue('\nScanning available config for Codex...\n'))
 
@@ -371,7 +395,7 @@ export async function syncCodex({
 
   const existing = {
     skills: await scanExistingCodexSkills(proj),
-    hooks: await scanExistingCodexHooks(proj),
+    hooks: await scanExistingCodexHooks(proj, configDir),
   }
   const selectedNames = key => new Set((selected[key] || []).map(item => item.name))
   const syncedSelection = {
@@ -385,12 +409,16 @@ export async function syncCodex({
   let syncedCount = 0
   let removedCount = 0
 
-  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)
+  if (syncTypes.includes('skills')) {
+    const skills = sharedSkills
+      ? sharedSkills.filter(skill => selectedNames('skills').has(skill.name))
+      : await ensureSharedSkills({ skills: syncedSelection.skills, homeDir })
+    syncedCount += await copySkillsFlat(skills, proj)
+  }
+  if (syncTypes.includes('hooks')) {
+    syncedCount += await copyCodexHooks(syncedSelection.hooks, configDir)
+    syncedCount += await syncCodexHooksJson(sourceDir, configDir, selectedHookNames, global, staleRemovals.hooks || [])
+  }
 
   const skillTemplateNames = new Set([
     ...scans.skills.map(s => s.name),
@@ -400,10 +428,10 @@ export async function syncCodex({
     ...scans.hooks.map(h => h.name),
     ...(staleRemovals.hooks || new Set()),
   ])
-  removedCount += await removeUnselectedFlat(['.agents', 'skills'], existing.skills, new Set(syncedSelection.skills.map(s => s.name)), skillTemplateNames, proj)
-  removedCount += await removeUnselectedFlat(['.codex', 'hooks'], existing.hooks, selectedHookNames, hookTemplateNames, proj)
+  if (syncTypes.includes('skills')) removedCount += await removeUnselectedFlat(['.agents', 'skills'], existing.skills, new Set(syncedSelection.skills.map(s => s.name)), skillTemplateNames, proj)
+  if (syncTypes.includes('hooks')) removedCount += await removeUnselectedFlat([path.relative(proj, configDir), 'hooks'], existing.hooks, selectedHookNames, hookTemplateNames, proj)
 
   console.log(chalk.blue(`\nDone! ${syncedCount} synced${removedCount > 0 ? `, ${removedCount} removed` : ''}.`))
   console.log(chalk.gray(`  Skills → ${path.join(proj, '.agents', 'skills')}`))
-  console.log(chalk.gray(`  Hooks  → ${path.join(proj, '.codex')}`))
+  console.log(chalk.gray(`  Hooks  → ${configDir}`))
 }

package/src/sync-global-skills.js

@@ -7,7 +7,7 @@ import fs from 'fs-extra'
 import os from 'node:os'
 import path from 'path'
 import { logAction, scanExisting } from './sync.js'
-import { linkSkill, prepareSharedSkills, removeSkillEntry } from './skill-store.js'
+import { linkSkill, ensureSharedSkills, removeSkillEntry } from './skill-store.js'
 
 /** 项目目录：随所选平台落到 .claude/skills、.agents/skills 等 */
 export const SKILL_DEST_PROJECT = 'project'
@@ -123,7 +123,7 @@ export function listSkillDestOptions(homeDir = os.homedir()) {
  */
 export async function copySkillsToGlobalDirs({ skills, destIds, homeDir = os.homedir() }) {
   let count = 0
-  const sharedSkills = await prepareSharedSkills({ skills, homeDir })
+  const sharedSkills = await ensureSharedSkills({ skills, homeDir })
 
   for (const destId of destIds) {
     const destRoot = resolveGlobalSkillDir(destId, homeDir)
@@ -149,7 +149,7 @@ export async function copySkillsToGlobalDirs({ skills, destIds, homeDir = os.hom
  */
 export async function copySkillsToProjectPlatforms({ projectDir, platforms, skills, homeDir }) {
   let count = 0
-  const sharedSkills = await prepareSharedSkills({ skills, homeDir })
+  const sharedSkills = await ensureSharedSkills({ skills, homeDir })
 
   for (const platform of platforms) {
     const destRoot = resolveProjectSkillDir(projectDir, platform)
@@ -200,7 +200,7 @@ export async function scanGlobalSkills({ homeDir, codexHome }) {
   return names
 }
 
-/** 全局优先：已有全局副本迁为共享链接，项目重复真实目录备份后移除，返回去重名称。 */
+/** 全局优先：仅备份并移除项目重复入口，不改写全局提供者，返回去重名称。 */
 export async function deduplicateProjectSkills({ projectDir, platform, skills, homeDir, codexHome }) {
   const projectRoot = resolveProjectSkillDir(projectDir, platform)
   const duplicates = new Set()
@@ -208,7 +208,6 @@ export async function deduplicateProjectSkills({ projectDir, platform, skills, h
   for (const skill of skills) {
     const globalEntry = await findGlobalSkill({ name: skill.name, platform, homeDir, codexHome })
     if (!globalEntry) continue
-    await linkSkill({ skill, dest: globalEntry, backupRoot: path.join(homeDir, '.dwy', 'skill-backups') })
     const dest = path.join(projectRoot, skill.name)
     await removeSkillEntry({ dest, backupRoot: path.join(projectDir, '.dwy', 'skill-backups') })
     duplicates.add(skill.name)

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

@@ -1,7 +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 { linkSkill, ensureSharedSkills, removeSkillEntry } from './skill-store.js'
 import {
   logAction,
   resolveSourceDir,
@@ -77,7 +77,7 @@ export async function syncOpenCode({
 
   const skills = sharedSkills
     ? sharedSkills.filter(skill => selectedNames('skills').has(skill.name))
-    : await prepareSharedSkills({ skills: syncedSelection.skills, homeDir })
+    : await ensureSharedSkills({ skills: syncedSelection.skills, homeDir })
   syncedCount += await copyItemsTo(openCodeDir, 'skills', skills)
 
   removedCount += await removeUnselected(