菜单
Structured workflow for merging significantly diverged branches. Use when either branch has changed 100+ files, a dry-run merge produces 10+ conflicts, or the other branch refactored core interfaces your branch consumes.
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
Structured outward reasoning for analysis, planning, decisions, diagnosis, and design — a direct-trial-first gate, a decision-relevant value-of-information stop gate, and five firing moves (name the kind, frame the problem not the solution, surface the warrant, decide for reversibility, stress-test) that point to the full grammar of thinking for depth. The outward pair to oak-metacognition's inward reflection. Use when facing a gnarly problem, choice, or analysis; especially when investigation or options keep proliferating and you must decide whether to build and observe, keep analysing, stop, or escalate.
Structured outward reasoning for analysis, planning, decisions, diagnosis, and design — a direct-trial-first gate, a decision-relevant value-of-information stop gate, and five firing moves (name the kind, frame the problem not the solution, surface the warrant, decide for reversibility, stress-test) that point to the full grammar of thinking for depth. The outward pair to oak-metacognition's inward reflection. Use when facing a gnarly problem, choice, or analysis; especially when investigation or options keep proliferating and you must decide whether to build and observe, keep analysing, stop, or escalate.
Explore an unshaped concept, phenomenon, recurring incident class, or messy set of observations before solution options or the decision question are well formed. Use when framing options immediately would foreclose the real question; run four alternating metacognition and reason movements to produce a well-formed understanding with warranted, falsifiable proposals. Do not use it as a separate pre-decision pass once the options or decision question are already well formed; continue through the estate's formed-decision workflow instead.
Explore an unshaped concept, phenomenon, recurring incident class, or messy set of observations before solution options or the decision question are well formed. Use when framing options immediately would foreclose the real question; run four alternating metacognition and reason movements to produce a well-formed understanding with warranted, falsifiable proposals. Do not use it as a separate pre-decision pass once the options or decision question are already well formed; continue through the estate's formed-decision workflow instead.
Join a foreign Practice estate and exchange safely with zero prior knowledge of it — the runnable join ceremony for cross-estate work. Fires whenever a session's worktree repo and coordination home are different repos, or the session is about to write into, register presence in, or claim work in any sibling Practice estate's substrate; read-only estate looks are unceremonied, and a solo write into a QUIET sibling estate takes the lighter governance-only path. Enacts the inter-Practice collaboration protocol PDR.
Join a foreign Practice estate and exchange safely with zero prior knowledge of it — the runnable join ceremony for cross-estate work. Fires whenever a session's worktree repo and coordination home are different repos, or the session is about to write into, register presence in, or claim work in any sibling Practice estate's substrate; read-only estate looks are unceremonied, and a solo write into a QUIET sibling estate takes the lighter governance-only path. Enacts the inter-Practice collaboration protocol PDR.
| name | oak-complex-merge |
| description | Structured workflow for merging significantly diverged branches. Use when either branch has changed 100+ files, a dry-run merge produces 10+ conflicts, or the other branch refactored core interfaces your branch consumes. |
Read and follow .agent/skills/complex-merge/SKILL-CANONICAL.md.
