claudecode-omc 5.6.0 → 5.6.2

package/.local/skills/de-ai-writing/references/wikipedia-signs.md

@@ -0,0 +1,196 @@
+# Wikipedia "Signs of AI writing" — 本地工作清单
+
+本文件改写自 Wikipedia WikiProject AI Cleanup 维护的 *Signs of AI writing*：
+<https://en.wikipedia.org/wiki/Wikipedia:Signs_of_AI_writing>
+
+每次执行 de-ai-writing 都必须按 Group A → D 走一遍，**逐组打勾**判断哪些信号在响。
+不要把所有命中都改写，挑 3–5 条最强的下手。
+
+---
+
+## 使用方式
+
+1. 读完原文一遍，先不要急着改。
+2. 沿 A→D 顺序扫描，每组在心里打√/×，命中就抄一句原文片段做证据。
+3. 把命中数量收敛到 3–5 条最强信号，写进 `## AI味诊断`。
+4. 改写时只针对这些信号下手。
+5. 改完再用同一份清单回扫一次，确认没有把信号搬到新位置。
+
+> 本地清单是 Wikipedia 分类法的快照（截至本仓库更新时）。
+> 如果 Wikipedia 上游列出了新条目，应回写到这个文件，而不是在 SKILL.md 里堆。
+
+---
+
+## Group A — 内容层（Content）
+
+围绕“**说什么**”出问题：把对象说得过于重要、列罗辑而非分析、用模糊归因装作权威。
+
+### A1. Inflated significance（虚高重要性）
+- 信号：随手给对象贴“开创性 / 革命性 / 里程碑 / 标志着新时代 / 深远影响”。
+- 中文等价：极具开创性意义、具有划时代地位、深刻改变了……格局。
+- 改写动作：删形容词；用具体动作或后果代替（比如“把延迟从 600ms 降到 80ms”）。
+
+### A2. Notability listing（罗列“知名度”）
+- 信号：堆作品、奖项、合作方来证明对象“值得写”。
+- 中文等价：曾参与/合作/出席/受邀……（一长串）。
+- 改写动作：保留与论点相关的 1–2 项；把剩下的删掉，不要换成“等”。
+
+### A3. "-ing" superficial analysis（动名词式表面分析）
+- 信号：英文里 “highlighting…, showcasing…, reflecting…, underscoring…”。
+- 中文等价：……展示了……、……体现了……、……彰显了……、……折射出……。
+- 改写动作：把“展示/体现/折射”换成具体机制：是谁、做了什么、产生了什么后果。
+
+### A4. Promotional language（公关腔）
+- 信号：广告/营销页式赞美。
+- 中文等价：堪称行业标杆、用户口碑爆棚、完美解决、极致体验、强强联合。
+- 改写动作：换成限定（“在 X 场景下表现稳定”），允许说出短板。
+
+### A5. Vague attribution（模糊归因）
+- 信号：“some critics say / scholars argue / it is widely believed”。
+- 中文等价：业界普遍认为、有评论指出、不少专家表示、众所周知。
+- 改写动作：能指名就指名，不能就直接陈述判断 + 证据；删“众所周知”。
+
+### A6. Outline-style “challenges and future”（机械化的“挑战与展望”）
+- 信号：“面临的挑战 / 未来展望 / 启示与思考”这种 AI 收尾标配。
+- 改写动作：要么不写这一段；要么改成具体悬而未决的问题，不要做万金油总结。
+
+---
+
+## Group B — 语言层（Language）
+
+围绕“**怎么遣词**”出问题：高密度 AI 偏好词、为避免“是”而扭曲句法、对偶/三段式上瘾。
+
+### B1. AI vocabulary density（AI 偏好词高密度）
+英文高频：delve, tapestry, navigate, leverage, robust, seamless, holistic, foster, paramount, intricate, nuance, embark, journey, realm, landscape, ever-evolving, transformative。
+
+中文高频（必查）：
+- 赋能、抓手、闭环、生态、链路、底层逻辑、心智、范式
+- 极简、极致、深度、全面、系统化、结构化
+- 拥抱、洞察、解码、激发、点亮、照亮、释放
+- 旅程、画卷、版图、宇宙、生态位
+- 不仅……更……、既……又……、不止于……
+
+> 单独出现 1–2 个不算问题；密度上来或扎堆同段就要清。
+
+### B2. Copulative avoidance（回避“是”/“有”）
+- 信号：刻意不用最简单的连接动词，用各种花式替代。
+- 中文等价：过度使用“构成 / 呈现出 / 彰显出 / 演绎着 / 诠释为”代替“是”。
+- 改写动作：能用“是 / 不是 / 有 / 没有”就直接用。
+
+### B3. Negative parallelism（负向平行）
+- 信号：“not just X, but Y” 的反复使用。
+- 中文等价：不仅是……更是……、不只是……而是……、与其说是……不如说是……。
+- 改写动作：选一个角度直接说；不要为了对仗硬凑后半句。
+
+### B4. Rule of three（三段式上瘾）
+- 信号：三个并列形容词、三段式列举、ABC 三步法。
+- 中文等价：清晰、准确、有力；快速、稳定、可控；本质上是……、根本上是……、最终是……。
+- 改写动作：改成两项或四项；或把三项中重复的删掉。
+
+### B5. Elegant variation（雅致替换）
+- 信号：同一概念在一段内被换三种说法假装“不重复”。
+- 中文等价：一段里 “模型 / 系统 / 框架 / 方案” 互换指同一对象。
+- 改写动作：除非语义真不同，否则统一称呼；专业语境下重复术语 ≠ 啰嗦。
+
+---
+
+## Group C — 形式与版面（Style & Format）
+
+围绕“**怎么排版**”出问题：标点过度、加粗满天飞、模板化排版。
+
+### C1. Em-dash overuse（破折号上瘾）
+- 信号：每段都靠 `——` 制造“揭示感”。
+- 改写动作：保留 1 处真正必要的；其余改逗号、句号或拆句。
+
+### C2. Bold overuse（加粗滥用）
+- 信号：把整句、整段重要观点全加粗，导致“没有重点”。
+- 改写动作：一段最多 1 个加粗；非术语 / 非关键名词不加粗。
+
+### C3. Inline-header lists（行内伪标题）
+- 信号：列表每条以 `**关键词：**` 开头，全文像模板填空。
+- 改写动作：要么改成正常段落叙述；要么允许长度不一的自由项。
+
+### C4. Emoji bullets（emoji 项目符号）
+- 信号：✅⚡🚀✨ 当作小标题或列表点。
+- 改写动作：技术稿/讲道稿默认全删；公众号稿保留 ≤2 个有功能性的。
+
+### C5. Curly quotes / 全角混乱
+- 信号：英文里出现 Word 风格 “…” 智能引号、全角半角混排。
+- 改写动作：统一为目标语种的标准引号。中文用「」或“”，不要混。
+
+### C6. Title-case headings（英文标题滥用 Title Case）
+- 信号：英文小标题里每个词首字母大写。
+- 中文等价：所有小标题都做成名词短语 + 冒号开头的对仗结构。
+- 改写动作：允许小标题长度参差；不要强求节奏。
+
+---
+
+## Group D — 沟通姿态（Communication）
+
+围绕“**对读者讲话的姿态**”出问题：讨好、套话收尾、过度限定。
+
+### D1. Sycophancy（讨好）
+- 信号：“Great question!”、“你这个问题问得非常关键”。
+- 中文等价：你说得太对了、这个问题确实非常值得思考、感谢你提出这么好的问题。
+- 改写动作：直接进入回答；删讨好句。
+
+### D2. Canned closures（罐头收尾）
+- 信号：In conclusion, To sum up, In summary, Hope this helps。
+- 中文等价：综上所述、总而言之、希望这能帮到你、以上就是关于……的全部内容。
+- 改写动作：删；如果真需要收束，改成一个判断句或一个未解的问题。
+
+### D3. Knowledge-cutoff disclaimers（知识截止时间声明）
+- 信号：“截至我的最新知识 / 截至 20XX 年 X 月 / 据我所知最新情况”。
+- 改写动作：除非用户明确要求声明数据时效，否则删。
+
+### D4. Filler phrases（空填充）
+- 信号：“值得注意的是、需要指出的是、不可忽视的是、众所周知、毋庸置疑”。
+- 改写动作：删。要表达“注意”可以直接给那句结论。
+
+### D5. Over-qualification（过度限定）
+- 信号：一句话里堆 3+ 个软化词：“可能、也许、在某种程度上、相对而言、通常来说”。
+- 改写动作：保留 ≤1 个限定；不确定就改成承认范围（“在 X 条件下成立”）而不是“可能也许大概”。
+
+---
+
+## 快速回扫表（改完后用）
+
+按住下面这张表把改写稿再过一次，每条问“这条还在吗”：
+
+| Group | 信号 | 改完后是否还在 |
+|-------|------|----------------|
+| A1 | 虚高重要性形容词 | ☐ |
+| A2 | 知名度堆列 | ☐ |
+| A3 | -ing / 展示体现折射 | ☐ |
+| A4 | 公关腔 | ☐ |
+| A5 | 模糊归因 | ☐ |
+| A6 | 挑战/展望模板 | ☐ |
+| B1 | AI 偏好词扎堆 | ☐ |
+| B2 | 回避“是” | ☐ |
+| B3 | 负向平行 | ☐ |
+| B4 | 三段式 | ☐ |
+| B5 | 雅致替换 | ☐ |
+| C1 | 破折号过载 | ☐ |
+| C2 | 加粗满天飞 | ☐ |
+| C3 | 行内伪标题列表 | ☐ |
+| C4 | emoji 项目符号 | ☐ |
+| C5 | 引号 / 全角混乱 | ☐ |
+| C6 | Title-case / 对仗小标题 | ☐ |
+| D1 | 讨好开场 | ☐ |
+| D2 | 罐头收尾 | ☐ |
+| D3 | 知识截止声明 | ☐ |
+| D4 | 空填充 | ☐ |
+| D5 | 过度限定 | ☐ |
+
+如果回扫表里仍有 ≥3 项被标记，说明改写不彻底，需要再做一轮。
+
+---
+
+## 与中文清单的关系
+
+- 本文件是**判断层**：决定“哪些 AI 信号在响”。
+- `chinese-patterns.md` 是**改写层**：给出中文具体套话的替换写法。
+- `chinese-signals.md` 是**词频层**：高频 AI 词典，做扫描用。
+- `domain-playbooks.md` 是**领域护栏**：技术稿 / 讲道稿不能动哪些。
+
+调用顺序：本文件先用 → chinese-signals 做词频比对 → chinese-patterns 找替换 → domain-playbooks 复核保护项。

package/README.md

@@ -13,6 +13,8 @@ omc-manage setup
 
 ## What Gets Installed
 
+Defaults (only the bundled sources, no extras):
+
 | Artifact | Count | Sources |
 |----------|-------|---------|
 | Skills | ~62 | oh-my-claudecode + superpowers |
@@ -22,6 +24,9 @@ omc-manage setup
 | Guidelines | 1 | local coding discipline prompt guidelines |
 
 All artifacts are installed to `~/.claude/` where Claude Code discovers them automatically.
+Adding a curated subset of [everything-claude-code](https://github.com/affaan-m/everything-claude-code)
+on top can take totals to ~94 skills / ~35 agents / ~26 commands — see
+[Distribution-Repo Sources](#distribution-repo-sources) below.
 
 The bundled guidelines install into `~/.claude/CLAUDE.md` and add lightweight
 coding discipline rules
@@ -33,14 +38,15 @@ completion with concrete evidence.
 
 | Command | Description |
 |---------|-------------|
-| `omc-manage setup [--force] [--dry-run] [--type <type>]` | Install merged artifacts |
-| `omc-manage doctor` | Health checks |
+| `omc-manage setup [--force] [--dry-run] [--type <type>] [--source <name>]` | Install merged artifacts |
+| `omc-manage doctor` | Health checks; reports each source's `kind`, `profile`, and `allowlist`, and flags `staged` distribution sources awaiting `plan apply` |
 | `omc-manage source list` | Show configured sources |
-| `omc-manage source sync` | Update upstream sources to latest |
-| `omc-manage source add <name> <url>` | Add a new source, including `guidelines` sources |
+| `omc-manage source sync [<name>]` | Update upstream sources to latest |
+| `omc-manage source add <name> <url> [--kind ...] [--artifacts ...] [--manifests ...] [--profiles ...]` | Add a new source, including `guidelines` and `distribution-repo` sources |
+| `omc-manage source remove <name>` | Remove a registered source |
 | `omc-manage source inspect <name>` | Inspect a source as a bundle/catalog instead of only as flat artifacts |
 | `omc-manage plan install <source> --profile <name>` | Build a profile-driven install plan for a source |
-| `omc-manage plan apply <source> --profile <name>` | Materialize a reviewed plan into source activation state |
+| `omc-manage plan apply <source> --profile <name> [--selection-file <path>]` | Materialize a reviewed plan into source activation state, optionally curating an item-level allowlist |
 | `omc-manage artifact list [--type <type>]` | List merged artifacts |
 | `omc-manage artifact conflicts [--type <type>]` | Show conflict report |
 | `omc-manage guidelines optimize [source...]` | Build maintainer-only guideline optimization artifacts |
@@ -48,13 +54,15 @@ completion with concrete evidence.
 
 ## Sources & Priority
 
-| Source | Priority | Description |
-|--------|----------|-------------|
-| local | 1 (highest) | Your custom artifacts in `~/.omc-manage/local/` |
-| oh-my-claudecode | 2 | Multi-agent orchestration framework |
-| superpowers | 3 | Engineering process guardrails (TDD, debugging, etc.) |
+| Source | Priority | Default? | Description |
+|--------|----------|----------|-------------|
+| local | 1 (highest) | yes | Your custom artifacts in `~/.omc-manage/local/` |
+| oh-my-claudecode | 2 | yes | Multi-agent orchestration framework |
+| superpowers | 3 | yes | Engineering process guardrails (TDD, debugging, etc.) |
+| ecc / your own | 4+ | opt-in | Distribution-style repos added via `source add --kind distribution-repo` |
 
-Local artifacts always win conflicts. Add your own skills:
+Local artifacts always win conflicts. Sources added via `source add` are
+appended at the next free priority. Add your own skills:
 
 ```bash
 mkdir -p ~/.omc-manage/local/skills/my-skill
@@ -73,10 +81,16 @@ omc-manage source sync karpathy
 omc-manage setup --type guidelines
 ```
 
-Add a distribution-style source such as `everything-claude-code` without
-blindly installing its full multi-harness surface:
+<a id="distribution-repo-sources"></a>
+### Distribution-Repo Sources
+
+Distribution repos (e.g. [everything-claude-code](https://github.com/affaan-m/everything-claude-code))
+publish multiple harness surfaces, manifests, and reference material alongside
+installable Claude artifacts. OMC absorbs them in four stages so you can pick
+exactly what reaches `~/.claude/`:
 
 ```bash
+# 1. Register — sync the full repo into project metadata, install nothing yet.
 omc-manage source add ecc https://github.com/affaan-m/everything-claude-code.git \
   --artifacts skills,agents,hooks,commands \
   --kind distribution-repo \
@@ -84,41 +98,59 @@ omc-manage source add ecc https://github.com/affaan-m/everything-claude-code.git
   --harnesses claude,codex,cursor,gemini,opencode \
   --manifests package.json,.claude-plugin/plugin.json,agent.yaml \
   --profiles claude-runtime,reference-only
+
+# 2. Sync — clones into .upstream/<source>/ and reads declared manifests.
 omc-manage source sync ecc
+
+# 3. Inspect — normalized catalog of runtime / harness / reference surfaces.
 omc-manage source inspect ecc
+
+# 4. Plan — preview what a profile would activate.
 omc-manage plan install ecc --profile claude-runtime
-omc-manage plan apply ecc --profile claude-runtime
 ```
 
-`source inspect` reads synced manifests and produces a normalized catalog of
-runtime, reference, tooling, and harness-specific surfaces. `plan install`
-turns that catalog into a profile-driven plan so OMC can absorb
-distribution-style repositories incrementally instead of treating every repo as
-flat artifact directories. `plan apply` is the next gate: it changes the
-source's activation state in OMC config and writes an audit record under source
-metadata, but it still works at source/profile granularity rather than item
-whitelisting.
+At this point nothing has been installed. `doctor` shows the source as
+`staged, run "omc-manage plan apply <name>"` so you don't lose track of it.
+
+To activate, choose one of:
+
+```bash
+# All runtime artifacts the profile selected (no item-level curation):
+omc-manage plan apply ecc --profile claude-runtime
+
+# Reference-only — keep the repo synced locally, install nothing:
+omc-manage plan apply ecc --profile reference-only
 
-For item-level curation, pass a selection file to `plan apply`:
+# Curated subset via selection file (recommended for large repos):
+omc-manage plan apply ecc \
+  --profile claude-runtime \
+  --selection-file /absolute/path/to/selection.json
+```
+
+A selection file is a per-artifact-type allowlist:
 
 ```json
 {
-  "skills": ["tdd-workflow", "verification-loop"],
-  "agents": ["planner", "architect"]
+  "skills": ["agent-eval", "santa-method", "prompt-optimizer"],
+  "agents": ["harness-optimizer", "opensource-sanitizer"],
+  "commands": ["prp-prd", "prp-plan", "harness-audit"]
 }
 ```
 
-Then apply it:
+When the synced source exposes an item directory, OMC validates the names
+against the catalog; for manifest-only surfaces it accepts the allowlist with a
+warning and the real filtering happens in `setup` against on-disk content. The
+allowlist becomes part of the source config in `~/.omc-manage/sources.json` and
+is enforced on every subsequent `omc-manage setup`.
+
+After `plan apply`, finalize with:
 
 ```bash
-omc-manage plan apply ecc \
-  --profile claude-runtime \
-  --selection-file /absolute/path/to/selection.json
+omc-manage setup --dry-run --source ecc   # confirm scope
+omc-manage setup --source ecc             # install only this source
+omc-manage doctor                         # verify allowlist counts
 ```
 
-When present, the selection file becomes a source-level `allowlist`. OMC will
-only merge those named items from that source for the selected artifact types.
-
 ## Maintainer Guideline Optimization
 
 OMC now treats runtime prompt guidance as a first-class `guidelines` artifact,
@@ -171,19 +203,16 @@ When the same artifact exists in multiple sources:
 3. **Local priority** — local always wins
 4. **Source priority** — lower priority number wins
 
-## Source Bundles
-
-OMC now distinguishes between two source kinds:
+## Source Kinds
 
-- `content-repo` — a repo already shaped like OMC artifact directories
-- `distribution-repo` — a repo that publishes multiple harness surfaces,
-  manifests, scripts, and reference material alongside installable Claude
-  runtime artifacts
+OMC distinguishes two source shapes:
 
-For distribution repos, OMC syncs declared manifest files into source metadata,
-builds a normalized catalog, and lets you plan by profile before deciding what
-to install. Distribution repos default to `installMode=planned`, so ordinary
-`setup` and `artifact list` flows do not absorb them automatically.
+- `content-repo` — already shaped like OMC artifact directories (`skills/`,
+  `agents/`, etc.); installed as-is.
+- `distribution-repo` — publishes multiple harness surfaces, manifests, and
+  reference material; defaults to `installMode=planned` so ordinary `setup`
+  and `artifact list` flows do not absorb it automatically. Activate it
+  through the [Distribution-Repo Sources](#distribution-repo-sources) flow.
 
 ## License
 

package/bundled/manifest.json

@@ -1,5 +1,5 @@
 {
-  "bundledAt": "2026-04-27T11:15:45Z",
+  "bundledAt": "2026-04-30T02:34:50Z",
   "sources": {
     "anthropic-skills": { "artifacts": 2 },
     "ecc": { "artifacts": 131 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudecode-omc",
-  "version": "5.6.0",
+  "version": "5.6.2",
   "description": "Claude Code harness — best-practice skills, agents, hooks, and configs from multiple sources",
   "bin": {
     "omc-manage": "bin/omc-manage.js"
@@ -15,6 +15,7 @@
     "README.md"
   ],
   "scripts": {
+    "test": "node --test",
     "setup": "node bin/omc-manage.js setup",
     "doctor": "node bin/omc-manage.js doctor",
     "guidelines:optimize": "node bin/omc-manage.js guidelines optimize",

package/src/cli/artifact.js

@@ -1,70 +1,10 @@
 /* eslint-disable no-console */
 const fs = require('fs');
 const fsp = require('fs/promises');
-const path = require('path');
-const { getProjectRoot, getSourceArtifactDir, getMergeConfigPath, getReportDir } = require('../config/paths');
-const { readConfig, filterItemsByAllowlist } = require('../config/sources');
+const { getProjectRoot, getMergeConfigPath } = require('../config/paths');
 const { ARTIFACT_TYPES, getArtifactTypeNames } = require('../config/artifact-types');
 const { detectConflicts, resolveConflicts, applyResolutions, generateReport } = require('../merge/base-merger');
-const { loadSkillsFromSource } = require('../merge/skill-merger');
-const { loadAgentsFromSource } = require('../merge/agent-merger');
-const { loadCommandsFromSource } = require('../merge/command-merger');
-const { loadHookFilesFromSource } = require('../merge/hook-merger');
-const { loadFilesFromSource } = require('../merge/file-merger');
-const { loadClaudeMd } = require('../merge/claude-md-merger');
-
-function loadSectionDocumentFromSource(sourceDir) {
-  const content = loadClaudeMd(sourceDir);
-  if (!content) return [];
-  return [{
-    name: 'CLAUDE.md',
-    path: sourceDir,
-    metadata: {
-      description: `${content.length} chars of prompt guidelines`,
-    },
-  }];
-}
-
-function getLoader(artifactType) {
-  switch (artifactType) {
-    case 'skills': return loadSkillsFromSource;
-    case 'agents': return loadAgentsFromSource;
-    case 'commands': return loadCommandsFromSource;
-    case 'hooks': return loadHookFilesFromSource;
-    case 'guidelines': return loadSectionDocumentFromSource;
-    case 'claude-md': return loadSectionDocumentFromSource;
-    case 'hud': return loadFilesFromSource;
-    default: return null;
-  }
-}
-
-function loadSourcesForType(artifactType, root) {
-  const config = readConfig();
-  const sources = [];
-  const ordered = Object.entries(config.sources)
-    .sort(([, a], [, b]) => a.priority - b.priority);
-
-  const loader = getLoader(artifactType);
-  if (!loader) return sources;
-
-  for (const [name, src] of ordered) {
-    if (src.role === 'reference') continue;
-    if (src.installMode && src.installMode !== 'auto') continue;
-    if (!(src.artifacts || []).includes(artifactType)) continue;
-    const dir = getSourceArtifactDir(name, artifactType, root);
-    if (!fs.existsSync(dir)) continue;
-    const items = filterItemsByAllowlist(src, artifactType, loader(dir, name));
-    if (items.length > 0) {
-      sources.push({ name, items });
-    }
-  }
-
-  if (sources.length === 0 && artifactType === 'claude-md') {
-    return loadSourcesForType('guidelines', root);
-  }
-
-  return sources;
-}
+const { loadSourcesForType } = require('../merge/artifact-source-loader');
 
 async function artifact(args, flags = {}) {
   const cmd = args[0] || 'list';

package/src/cli/setup.js

@@ -3,23 +3,17 @@ const fs = require('fs');
 const fsp = require('fs/promises');
 const path = require('path');
 const os = require('os');
-const { getProjectRoot, getSourceArtifactDir, getInstallTarget, getMergeConfigPath, getReportDir } = require('../config/paths');
+const { getProjectRoot, getScopedInstallTarget, getMergeConfigPath } = require('../config/paths');
 const { readConfig, filterItemsByAllowlist } = require('../config/sources');
 const { getArtifactTypeNames, ARTIFACT_TYPES } = require('../config/artifact-types');
-const { detectConflicts, resolveConflicts, applyResolutions, generateReport } = require('../merge/base-merger');
-const { loadSkillsFromSource } = require('../merge/skill-merger');
-const { loadAgentsFromSource } = require('../merge/agent-merger');
-const { loadCommandsFromSource } = require('../merge/command-merger');
-const { loadHookFilesFromSource, loadHooksConfig, mergeHooksConfigs, hasHookLib } = require('../merge/hook-merger');
+const { detectConflicts, resolveConflicts, applyResolutions } = require('../merge/base-merger');
+const { loadHooksConfig, mergeHooksConfigs, hasHookLib } = require('../merge/hook-merger');
 const { loadClaudeMd, mergeIntoExisting, assembleSections } = require('../merge/claude-md-merger');
 const { loadSettingsFragment, mergeSettingsFragments } = require('../merge/settings-merger');
-const { loadFilesFromSource } = require('../merge/file-merger');
-const { evaluateSkillQuality } = require('../utils/quality');
-const { copyDirRecursive } = require('./source');
+const { collectSourceDirsForType, getArtifactLoader } = require('../merge/artifact-source-loader');
 
 const OMC_VERSION_PATH = path.join(os.homedir(), '.claude', '.omc-version.json');
 const OMC_CONFIG_PATH = path.join(os.homedir(), '.claude', '.omc-config.json');
-const OMC_INSTALL_MANIFEST_PATH = path.join(os.homedir(), '.claude', '.omc-install-manifest.json');
 const LEGACY_HOOK_PATHS = [
   'hooks.json',
   'hooks-cursor.json',
@@ -125,6 +119,18 @@ function inferLegacyManagedPaths(artifactType, installTarget, desiredPaths, extr
   }
 }
 
+function normalizePreviousManagedPaths(artifactType, previousPaths) {
+  if (!Array.isArray(previousPaths)) return previousPaths;
+
+  if (artifactType !== 'agents' && artifactType !== 'commands') {
+    return previousPaths;
+  }
+
+  return previousPaths.map((relativePath) => (
+    path.extname(relativePath) ? relativePath : `${relativePath}.md`
+  ));
+}
+
 async function pruneManagedPaths(installTarget, previousPaths, desiredPaths, flags) {
   if (!fs.existsSync(installTarget) || !fs.statSync(installTarget).isDirectory()) {
     return 0;
@@ -192,43 +198,19 @@ async function copyDirectory(src, dest, options = {}) {
   return count;
 }
 
-function getLoader(artifactType) {
-  switch (artifactType) {
-    case 'skills': return loadSkillsFromSource;
-    case 'agents': return loadAgentsFromSource;
-    case 'commands': return loadCommandsFromSource;
-    case 'hooks': return loadHookFilesFromSource;
-    case 'hud': return loadFilesFromSource;
-    default: return null;
-  }
-}
-
-function collectSourcesForType(artifactType, orderedSources, root) {
-  const sourcesForType = [];
-
-  for (const [name, src] of orderedSources) {
-    // Skip reference-only sources (e.g. anthropic-skills) — they provide
-    // evaluation standards, not installable artifacts.
-    if (src.role === 'reference') continue;
-    if (src.installMode && src.installMode !== 'auto') continue;
-    const declaredArtifacts = src.artifacts || [];
-    if (!declaredArtifacts.includes(artifactType)) continue;
-
-    const dir = getSourceArtifactDir(name, artifactType, root);
-    if (fs.existsSync(dir)) {
-      sourcesForType.push({ name, dir, priority: src.priority, config: src });
-    }
-  }
-
-  if (sourcesForType.length === 0 && artifactType === 'claude-md') {
-    return collectSourcesForType('guidelines', orderedSources, root);
+function getManagedPathForItem(artifactType, item) {
+  if (artifactType === 'skills' || item.isDirectory) {
+    return item.name;
   }
 
-  return sourcesForType;
+  // Loaders keep logical names extensionless for conflict checks; manifests
+  // must track the real path written to disk.
+  const sourceExt = path.extname(item.path);
+  return sourceExt && !item.name.endsWith(sourceExt) ? `${item.name}${sourceExt}` : item.name;
 }
 
 async function installNameBasedArtifacts(artifactType, sources, mergeConfig, installTarget, flags) {
-  const loader = getLoader(artifactType);
+  const loader = getArtifactLoader(artifactType);
   if (!loader) return { count: 0, total: 0 };
 
   const loaded = [];
@@ -257,6 +239,8 @@ async function installNameBasedArtifacts(artifactType, sources, mergeConfig, ins
     }
   }
 
+  const managedPaths = merged.map(item => getManagedPathForItem(artifactType, item));
+
   if (flags.dryRun) {
     for (const item of merged.sort((a, b) => a.name.localeCompare(b.name))) {
       console.log(`    ${item.name} (${item.sourceName})`);
@@ -265,7 +249,7 @@ async function installNameBasedArtifacts(artifactType, sources, mergeConfig, ins
       count: 0,
       total: merged.length,
       conflicts: conflicts.length,
-      managedPaths: merged.map(item => item.name),
+      managedPaths,
       excludedNames: excludeList,
     };
   }
@@ -275,14 +259,10 @@ async function installNameBasedArtifacts(artifactType, sources, mergeConfig, ins
 
   for (const item of merged) {
     if (artifactType === 'skills' || item.isDirectory) {
-      const dest = path.join(installTarget, item.name);
+      const dest = path.join(installTarget, getManagedPathForItem(artifactType, item));
       fileCount += await copyDirectory(item.path, dest, flags);
     } else {
-      // Single file copy. Loaders strip `.md` from item.name for matching/allowlist purposes;
-      // re-attach the source extension on disk so Claude Code's `*.md` loader picks them up.
-      const sourceExt = path.extname(item.path);
-      const destName = sourceExt && !item.name.endsWith(sourceExt) ? `${item.name}${sourceExt}` : item.name;
-      const dest = path.join(installTarget, destName);
+      const dest = path.join(installTarget, getManagedPathForItem(artifactType, item));
       await fsp.mkdir(path.dirname(dest), { recursive: true });
       await fsp.copyFile(item.path, dest);
       fileCount += 1;
@@ -293,7 +273,7 @@ async function installNameBasedArtifacts(artifactType, sources, mergeConfig, ins
     count: fileCount,
     total: merged.length,
     conflicts: conflicts.length,
-    managedPaths: merged.map(item => item.name),
+    managedPaths,
     excludedNames: excludeList,
   };
 }
@@ -440,10 +420,6 @@ async function setup(args, flags = {}) {
     try { mergeConfig = JSON.parse(fs.readFileSync(mergeConfigPath, 'utf8')); } catch {}
   }
 
-  // Get ordered sources (by priority)
-  const orderedSources = Object.entries(config.sources)
-    .sort(([, a], [, b]) => a.priority - b.priority);
-
   const allTypes = getArtifactTypeNames().filter(type => type !== 'claude-md');
   const typesToInstall = typeFilter || allTypes;
   const previousManifest = await readJsonFile(manifestPath, { artifacts: {} });
@@ -463,11 +439,9 @@ async function setup(args, flags = {}) {
       continue;
     }
 
-    const sourcesForType = collectSourcesForType(artifactType, orderedSources, root);
+    const sourcesForType = collectSourceDirsForType(artifactType, root, config);
 
-    const installTarget = (artifactType === 'skills' && scope === 'project')
-      ? path.join(process.cwd(), '.claude', 'skills')
-      : typeConfig.installTarget;
+    const installTarget = getScopedInstallTarget(artifactType, scope, process.cwd());
 
     console.log(`[${step}/${totalSteps}] ${typeConfig.label} (${sourcesForType.length} sources)`);
 
@@ -501,7 +475,10 @@ async function setup(args, flags = {}) {
     }
 
     if (typeConfig.format !== 'single-file' && typeConfig.format !== 'json') {
-      const previousPaths = previousManifest.artifacts?.[artifactType]?.paths;
+      const previousPaths = normalizePreviousManagedPaths(
+        artifactType,
+        previousManifest.artifacts?.[artifactType]?.paths,
+      );
       const managedPaths = uniq(result.managedPaths || []);
       const bootstrapPaths = previousPaths || inferLegacyManagedPaths(
         artifactType,