create-dwy 0.19.1 → 0.21.0

package/src/sync-codex.js

@@ -4,9 +4,7 @@ import { chalk } from './utils.js'
 import {
   extractDescription,
   loadHookManifests,
-  readBaselineDoc,
   scanSkills,
-  scanRules,
   scanHooks,
   resolveSourceDir,
   copyFilter,
@@ -112,12 +110,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(),
 } = {}) {
   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 = []
@@ -129,14 +152,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
 }
 
@@ -174,7 +194,7 @@ async function copySkillsFlat(skills, proj) {
   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 fs.copy(s.sourcePath, dest, { overwrite: true, filter: copyFilter(s.sourcePath) })
     logAction(`.agents/skills/${s.name}`)
   }
   return skills.length
@@ -212,7 +232,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
@@ -223,7 +243,7 @@ async function copyCodexHooks(hooks, proj) {
   return hooks.length
 }
 
-function buildCodexHooksJson(manifests, selectedHookNames) {
+function buildCodexHooksJson(manifests, selectedHookNames, global) {
   const hooksJson = { hooks: {} }
   const grouped = new Map()
 
@@ -237,7 +257,9 @@ function buildCodexHooksJson(manifests, selectedHookNames) {
     const hooks = grouped.get(key) || []
     hooks.push({
       type: 'command',
-      command: `bash \"$(git rev-parse --show-toplevel)\"/.codex/hooks/${manifest.name}`,
+      command: global
+        ? `bash "$HOME/.codex/hooks/${manifest.name}"`
+        : `bash "$(git rev-parse --show-toplevel)/.codex/hooks/${manifest.name}"`,
       ...(manifest.timeout ? { timeout: manifest.timeout } : {}),
     })
     grouped.set(key, hooks)
@@ -280,10 +302,10 @@ function mergeCodexHooks(existingHooks, generatedHooks, managedHookNames) {
   return Object.keys(merged).length > 0 ? merged : undefined
 }
 
-async function syncCodexHooksJson(sourceDir, proj, selectedHookNames) {
+async function syncCodexHooksJson(sourceDir, proj, selectedHookNames, global) {
   const dest = path.join(proj, '.codex', 'hooks.json')
   const manifests = await loadHookManifests(sourceDir)
-  const generated = buildCodexHooksJson(manifests, selectedHookNames)
+  const generated = buildCodexHooksJson(manifests, selectedHookNames, global)
   const managedHookNames = new Set(
     manifests
       .filter(manifest => !manifest.platforms || manifest.platforms.includes('codex'))
@@ -317,12 +339,13 @@ async function syncCodexHooksJson(sourceDir, proj, selectedHookNames) {
   return 1
 }
 
+/** 同步 Codex 配置；global 模式将规则写入用户 .codex/AGENTS.md。 */
 export async function syncCodex({
   sourceDir: sourceDirOverride,
   projectDir,
+  global = false,
   selected,
   staleRemovals = {},
-  preserveMissingRules = new Set(),
 } = {}) {
   const sourceDir = sourceDirOverride || await resolveSourceDir()
   if (!await fs.pathExists(sourceDir)) {
@@ -335,22 +358,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 = 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))
@@ -361,11 +379,8 @@ export async function syncCodex({
   let removedCount = 0
 
   syncedCount += await copySkillsFlat(syncedSelection.skills, proj)
-  syncedCount += await syncProjectAgentsMd(sourceDir, proj, syncedSelection.rules, {
-    preservedRuleNames: preserveMissingRules,
-  })
   syncedCount += await copyCodexHooks(syncedSelection.hooks, proj)
-  syncedCount += await syncCodexHooksJson(sourceDir, proj, selectedHookNames)
+  syncedCount += await syncCodexHooksJson(sourceDir, proj, selectedHookNames, global)
 
   const skillTemplateNames = new Set([
     ...scans.skills.map(s => s.name),
@@ -379,7 +394,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')}`))
 }

package/src/sync-cursor.js

@@ -4,7 +4,6 @@ import { chalk } from './utils.js'
 import {
   extractDescription,
   logAction,
-  readBaselineDoc,
   scanRules,
   resolveSourceDir,
 } from './sync.js'
@@ -79,28 +78,6 @@ async function syncCursorRules(selectedRules, projectDir) {
   return syncedCount
 }
 
-async function syncCursorBaselineRule(sourceDir, projectDir) {
-  const baseline = await readBaselineDoc(sourceDir)
-  if (!baseline) return 0
-
-  const rulesDir = path.join(projectDir, '.cursor', 'rules')
-  const destPath = path.join(rulesDir, BASELINE_RULE_NAME)
-  const content = [
-    '---',
-    `description: ${JSON.stringify('[dwy] Global baseline')}`,
-    'alwaysApply: true',
-    '---',
-    '',
-    baseline.trim(),
-    '',
-  ].join('\n')
-
-  await fs.ensureDir(rulesDir)
-  await fs.writeFile(destPath, content)
-  logAction(`.cursor/rules/${BASELINE_RULE_NAME}`)
-  return 1
-}
-
 async function removeUnselectedCursorRules(existingNames, selectedNames, managedNames, projectDir) {
   const rulesDir = path.join(projectDir, '.cursor', 'rules')
   let removedCount = 0
@@ -159,9 +136,7 @@ export async function syncCursor({
   let syncedCount = 0
   let removedCount = 0
 
-  syncedCount += await syncCursorBaselineRule(sourceDir, proj)
   syncedCount += await syncCursorRules(syncedSelection, proj)
-  nextRuleNames.add(BASELINE_RULE_NAME)
   removedCount += await removeUnselectedCursorRules(existingRules, nextRuleNames, managedRuleNames, proj)
 
   console.log(chalk.blue(`\nDone! ${syncedCount} synced${removedCount > 0 ? `, ${removedCount} removed` : ''}.`))

package/src/sync-global-skills.js

@@ -131,7 +131,7 @@ export async function copySkillsToGlobalDirs({ skills, destIds, homeDir = os.hom
     for (const skill of skills) {
       const dest = path.join(destRoot, skill.name)
       await fs.ensureDir(path.dirname(dest))
-      await fs.copy(skill.sourcePath, dest, { overwrite: true, filter: copyFilter })
+      await fs.copy(skill.sourcePath, dest, { overwrite: true, filter: copyFilter(skill.sourcePath) })
       logAction(`${DEST_LABELS[destId] || destId}/${skill.name}`)
       count++
     }
@@ -157,7 +157,7 @@ export async function copySkillsToProjectPlatforms({ projectDir, platforms, skil
     for (const skill of skills) {
       const dest = path.join(destRoot, skill.name)
       await fs.ensureDir(path.dirname(dest))
-      await fs.copy(skill.sourcePath, dest, { overwrite: true, filter: copyFilter })
+      await fs.copy(skill.sourcePath, dest, { overwrite: true, filter: copyFilter(skill.sourcePath) })
       logAction(`${path.relative(projectDir, destRoot)}/${skill.name}`)
       count++
     }

package/src/sync-opencode.js

@@ -5,12 +5,9 @@ import {
   copyFilter,
   logAction,
   resolveSourceDir,
-  scanCommands,
   scanExisting,
-  scanRules,
   scanSkills,
 } from './sync.js'
-import { syncProjectAgentsMd } from './sync-codex.js'
 
 async function copyItemsTo(baseDir, typeDir, items) {
   const targetDir = path.join(baseDir, typeDir)
@@ -19,7 +16,7 @@ async function copyItemsTo(baseDir, typeDir, items) {
   for (const item of items) {
     const dest = path.join(targetDir, item.name)
     await fs.ensureDir(path.dirname(dest))
-    await fs.copy(item.sourcePath, dest, { overwrite: true, filter: copyFilter })
+    await fs.copy(item.sourcePath, dest, { overwrite: true, filter: copyFilter(item.sourcePath) })
     logAction(`.opencode/${typeDir}/${item.name}`)
     count++
   }
@@ -27,8 +24,8 @@ async function copyItemsTo(baseDir, typeDir, items) {
   return count
 }
 
-async function removeUnselected(typeDir, existingNames, selectedNames, templateNames, projectDir) {
-  const targetDir = path.join(projectDir, '.opencode', typeDir)
+async function removeUnselected(typeDir, existingNames, selectedNames, templateNames, baseDir) {
+  const targetDir = path.join(baseDir, typeDir)
   let count = 0
 
   for (const name of existingNames) {
@@ -42,12 +39,13 @@ async function removeUnselected(typeDir, existingNames, selectedNames, templateN
   return count
 }
 
+/** 同步 OpenCode 技能；基线和项目 Rules 由总同步入口分别处理。 */
 export async function syncOpenCode({
   sourceDir: sourceDirOverride,
   projectDir,
+  global = false,
   selected,
   staleRemovals = {},
-  preserveMissingRules = new Set(),
 } = {}) {
   const sourceDir = sourceDirOverride || await resolveSourceDir()
   if (!await fs.pathExists(sourceDir)) {
@@ -55,39 +53,28 @@ export async function syncOpenCode({
   }
 
   const proj = projectDir || process.cwd()
-  const openCodeDir = path.join(proj, '.opencode')
+  const openCodeDir = global ? path.join(proj, '.config', 'opencode') : path.join(proj, '.opencode')
   await fs.ensureDir(openCodeDir)
 
   console.log(chalk.blue('\nSyncing OpenCode configuration...\n'))
 
   const scans = {
     skills: await scanSkills(sourceDir),
-    rules: await scanRules(sourceDir),
-    commands: await scanCommands(sourceDir),
   }
 
   const selectedNames = key => new Set((selected[key] || []).map(item => item.name))
   const syncedSelection = {
     skills: scans.skills.filter(item => selectedNames('skills').has(item.name)),
-    rules: scans.rules.filter(item => selectedNames('rules').has(item.name)),
-    commands: scans.commands.filter(item => selectedNames('commands').has(item.name)),
   }
 
   const existing = {
     skills: await scanExisting(openCodeDir, 'skills'),
-    commands: await scanExisting(openCodeDir, 'commands'),
   }
 
   let syncedCount = 0
   let removedCount = 0
 
-  const agentsPath = path.join(proj, 'AGENTS.md')
-  syncedCount += await syncProjectAgentsMd(sourceDir, proj, syncedSelection.rules, {
-    preservedRuleNames: preserveMissingRules,
-  })
-
   syncedCount += await copyItemsTo(openCodeDir, 'skills', syncedSelection.skills)
-  syncedCount += await copyItemsTo(openCodeDir, 'commands', syncedSelection.commands)
 
   removedCount += await removeUnselected(
     'skills',
@@ -97,22 +84,9 @@ export async function syncOpenCode({
       ...scans.skills.map(item => item.name),
       ...(staleRemovals.skills || new Set()),
     ]),
-    proj,
+    openCodeDir,
   )
-  removedCount += await removeUnselected(
-    'commands',
-    existing.commands,
-    new Set(syncedSelection.commands.map(item => item.name)),
-    new Set([
-      ...scans.commands.map(item => item.name),
-      ...(staleRemovals.commands || new Set()),
-    ]),
-    proj,
-  )
-
   console.log(chalk.blue(`\nDone! ${syncedCount} synced${removedCount > 0 ? `, ${removedCount} removed` : ''}.`))
-  console.log(chalk.gray(`  Rules    → ${agentsPath}`))
   console.log(chalk.gray(`  Skills   → ${path.join(openCodeDir, 'skills')}`))
-  console.log(chalk.gray(`  Commands → ${path.join(openCodeDir, 'commands')}`))
   console.log(chalk.gray('  Hooks    → 当前适配未支持'))
 }