[#314] feat: wire template-override resolution into skills

.claude/skills/pair-capability-checkpoint/SKILL.md

@@ -7,7 +7,7 @@ author: Foomakers
 
 # /pair-capability-checkpoint — Resumable Progress State
 
-Write and resume a self-contained progress checkpoint so a fresh session (or a subagent) can continue a story exactly where the previous one stopped. Follows the [checkpoint template](../../../.pair/knowledge/guidelines/collaboration/templates/checkpoint-template.md) — five sections: story, branch, tasks done, key decisions, remaining todos.
+Write and resume a self-contained progress checkpoint so a fresh session (or a subagent) can continue a story exactly where the previous one stopped. Follows the [checkpoint template](../../../.pair/knowledge/guidelines/collaboration/templates/checkpoint-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)) — five sections: story, branch, tasks done, key decisions, remaining todos.
 
 ## Arguments
 

.claude/skills/pair-capability-design-manual-tests/SKILL.md

@@ -9,7 +9,7 @@ author: Foomakers
 
 Analyze a project's released artifacts, deployment targets, and user-facing surfaces to generate a complete manual test suite. Produces critical path files (`CP*.md`) and a suite `README.md` in the test suite directory.
 
-Each test case follows the [manual-test-case-template](../../../.pair/knowledge/guidelines/collaboration/templates/manual-test-case-template.md). Design principles: [manual-testing.md](../../../.pair/knowledge/guidelines/quality-assurance/manual-testing.md); organizational context: [manual-verification.md](../../../.pair/knowledge/guidelines/quality-assurance/manual-verification.md).
+Each test case follows the [manual-test-case-template](../../../.pair/knowledge/guidelines/collaboration/templates/manual-test-case-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)). Design principles: [manual-testing.md](../../../.pair/knowledge/guidelines/quality-assurance/manual-testing.md); organizational context: [manual-verification.md](../../../.pair/knowledge/guidelines/quality-assurance/manual-verification.md).
 
 ## Arguments
 

.claude/skills/pair-capability-execute-manual-tests/SKILL.md

@@ -7,7 +7,7 @@ author: Foomakers
 
 # /pair-capability-execute-manual-tests — Manual Test Suite Executor
 
-Execute a manual test suite against released or deployed artifacts (website, CLI packages, registries). Produces a structured report following the [manual-test-report-template](../../../.pair/knowledge/guidelines/collaboration/templates/manual-test-report-template.md).
+Execute a manual test suite against released or deployed artifacts (website, CLI packages, registries). Produces a structured report following the [manual-test-report-template](../../../.pair/knowledge/guidelines/collaboration/templates/manual-test-report-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)).
 
 Reads test case files from the project's manual test suite directory; each follows the [manual-test-case-template](../../../.pair/knowledge/guidelines/collaboration/templates/manual-test-case-template.md). Organizational context (who, when, which areas): [manual-verification.md](../../../.pair/knowledge/guidelines/quality-assurance/manual-verification.md); test case design principles: [manual-testing.md](../../../.pair/knowledge/guidelines/quality-assurance/manual-testing.md).
 

.claude/skills/pair-capability-grill/SKILL.md

@@ -92,7 +92,7 @@ Systematic AI↔human alignment on a specific story, covering all six aspects of
 
 1. **Act**: Compile recorded answers, explored facts (with source), and flagged assumptions:
    - `interview` → raw requirements blob (topic, findings per sub-question, open items, assumptions).
-   - `sync` → alignment synthesis mapped to the six [Sync Coverage Checklist](#sync-coverage-checklist) aspects, ready to drop into the matching [user-story-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/user-story-template.md) sections.
+   - `sync` → alignment synthesis mapped to the six [Sync Coverage Checklist](#sync-coverage-checklist) aspects, ready to drop into the matching [user-story-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/user-story-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)) sections.
 2. **Verify**: Synthesis accounts for every answered/explored/assumed item — nothing silently dropped.
 
 ### Step 6: Return — Never Write

.claude/skills/pair-capability-map-contexts/SKILL.md

@@ -115,7 +115,7 @@ For each approved context in scope:
 
 1. **Check**: Does this context already exist as a file?
 2. **Act**: If exists and no conflict was raised → leave untouched; pre-existing relationships without the 3-dimension assessment remain valid as-is (no forced migration — assessed the next time that relationship falls inside a `$scope`).
-3. **Act**: If new, or an approved delta applies → create/update the context file following [bounded-context-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/bounded-context-template.md):
+3. **Act**: If new, or an approved delta applies → create/update the context file following [bounded-context-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/bounded-context-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)):
    - Fill all template sections: Type, Subdomains Covered, Business Scope, Relationships (with the 3-dimension assessment per relationship), Integration Patterns, Data Ownership, Team Alignment, Ubiquitous Language, Quality Attributes, Encapsulated Knowledge, Change Vectors.
    - File path: `adoption/tech/boundedcontext/[kebab-case-name].md`
 4. **Verify**: File created/updated and parseable. Entries outside `$scope` are untouched.

.claude/skills/pair-capability-map-subdomains/SKILL.md

@@ -104,7 +104,7 @@ For each approved subdomain in scope:
 
 1. **Check**: Does this subdomain already exist as a file?
 2. **Act**: If exists and no conflict was raised → leave untouched; pre-existing entries without a `Volatility` field remain valid as-is (no forced migration — the field is added the next time this entry falls inside a `$scope`).
-3. **Act**: If new, or an approved delta applies → create/update the subdomain file following [subdomain-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/subdomain-template.md):
+3. **Act**: If new, or an approved delta applies → create/update the subdomain file following [subdomain-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/subdomain-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)):
    - Fill all template sections: Classification, Volatility, Business Purpose, Key Capabilities, Strategic Importance, Complexity Assessment, Data Ownership, Dependencies, Team Recommendations, Implementation Priority.
    - File path: `adoption/product/subdomain/[kebab-case-name].md`
 4. **Verify**: File created/updated and parseable. Entries outside `$scope` are untouched.

.claude/skills/pair-capability-publish-pr/SKILL.md

@@ -67,7 +67,7 @@ Each phase follows the **check → skip → act → verify** pattern. Phases run
 
 ### Phase 3: Compose the PR Body (AC3)
 
-1. **Act**: Read the [pr-template](../../../.pair/knowledge/guidelines/collaboration/templates/pr-template.md). Fill the always-applicable sections from the handoff/story:
+1. **Act**: Read the [pr-template](../../../.pair/knowledge/guidelines/collaboration/templates/pr-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md); the same resolution applies to the commit and branch templates referenced above). Fill the always-applicable sections from the handoff/story:
    - **Title**: `[#<story-id>] <type>: <brief description>` (`<type>` from commit-format / story type).
    - **Summary** (What Changed + Why) from the story statement and the handoff's decisions.
    - **Story Context**: link the story issue and list AC coverage.

.claude/skills/pair-capability-record-decision/SKILL.md

@@ -88,7 +88,7 @@ A domain decision only becomes a DDR if it meets **all three** criteria. This is
 1. **Check**: Does [adoption/tech/adr/](../../../.pair/adoption/tech/adr) directory exist?
 2. **Act**: If not, create it.
 3. **Check**: Determine the next sequence number — scan existing `adr-NNN-*.md` files, take the highest `NNN`, increment by 1 (zero-padded to 3 digits). If none exist, start at `001`.
-4. **Act**: Create (or update) the ADR file at [adoption/tech/adr/](../../../.pair/adoption/tech/adr)`adr-NNN-<topic>.md` following the standalone [ADR template](../../../.pair/knowledge/guidelines/collaboration/templates/adr-template.md). Fill in all sections: Status, Date, Context, Options Considered, Decision, Consequences, and Adoption Impact.
+4. **Act**: Create (or update) the ADR file at [adoption/tech/adr/](../../../.pair/adoption/tech/adr)`adr-NNN-<topic>.md` following the standalone [ADR template](../../../.pair/knowledge/guidelines/collaboration/templates/adr-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md); the same applies to the ADL, DDR, and analysis-log templates below). Fill in all sections: Status, Date, Context, Options Considered, Decision, Consequences, and Adoption Impact.
 5. **Verify**: ADR file exists with complete content following the template structure, and sequential numbering is unbroken.
 
 #### If `non-architectural` → ADL:

.claude/skills/pair-capability-write-issue/SKILL.md

@@ -44,7 +44,7 @@ Create or update issues in the adopted PM tool. Template-driven: reads the type-
 
 ### Step 3: Load Template
 
-1. **Check**: Resolve template path based on `$type`:
+1. **Check**: Resolve the template path for `$type` **override-first** — see [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md) (adoption `.pair/adoption/tech/templates/<name>-template.md` wins over the KB default below):
    - `story` → [user-story-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/user-story-template.md)
    - `task` → [task-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/task-template.md)
    - `epic` → [epic-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/epic-template.md)

.claude/skills/pair-process-implement/SKILL.md

@@ -233,7 +233,7 @@ Follow the TDD discipline rules strictly, and the [Design Rules](../../../.pair/
    **This confirmation is required for EVERY task** — commit-per-task exists precisely to give the developer a checkpoint between tasks.
 
 4. **Verify**: Developer confirms. If changes needed → apply changes, re-run quality (Step 2.7), ask again.
-5. **Act**: Stage and commit following the [commit template](../../../.pair/knowledge/guidelines/collaboration/templates/commit-template.md):
+5. **Act**: Stage and commit following the [commit template](../../../.pair/knowledge/guidelines/collaboration/templates/commit-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)):
 
    ```text
    [#<story-id>] <type>: <task-description>

.claude/skills/pair-process-implement/post-review-merge.md

@@ -12,7 +12,7 @@ Disclosed from [SKILL.md](./SKILL.md) Phase 4 — only reached when `/pair-proce
 
 1. **Check**: Read [way-of-working.md](../../../.pair/adoption/tech/way-of-working.md) for merge strategy (squash, merge, rebase).
 2. **Act**: Draft the final commit message:
-   - **If squash**: combine all commits into a single message following the [commit template](../../../.pair/knowledge/guidelines/collaboration/templates/commit-template.md).
+   - **If squash**: combine all commits into a single message following the [commit template](../../../.pair/knowledge/guidelines/collaboration/templates/commit-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)).
    - **If merge or rebase**: use the default merge/rebase message.
 3. **Act** (BLOCKING): Present the commit message to the developer for confirmation:
 

.claude/skills/pair-process-plan-epics/SKILL.md

@@ -103,7 +103,7 @@ Process epics sequentially (Epic 0 first if needed), per its Step 3 proposal:
 
    > Epic `[Title]` already exists (#ID). Skipping.
 
-3. **Act**: Draft the epic following [epic-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/epic-template.md):
+3. **Act**: Draft the epic following [epic-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/epic-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)):
    - Fill template sections: Epic Statement, Business Value, Solution Overview, Epic Breakdown, Technical Considerations.
    - Present to developer for validation.
 4. **Act**: Compose `/pair-capability-write-issue` per the confirmed proposal:

.claude/skills/pair-process-plan-initiatives/SKILL.md

@@ -90,7 +90,7 @@ Process initiatives by priority (P0 → P1 → P2). For each initiative:
 
    > Initiative `[Title]` already exists (#ID). Skipping.
 
-3. **Act**: Draft the initiative following the [initiative-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/initiative-template.md):
+3. **Act**: Draft the initiative following the [initiative-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/initiative-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)):
    - Fill template sections with PRD-derived content.
    - Include business rationale, scope, success metrics, risk assessment, timeline.
    - Present to developer for validation.

.claude/skills/pair-process-plan-stories/SKILL.md

@@ -94,7 +94,7 @@ For each approved story, per its Step 3 proposal:
 
    > Story `[Title]` already exists (#ID). Skipping.
 
-3. **Act**: Define story scope using the Initial Breakdown section of [user-story-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/user-story-template.md):
+3. **Act**: Define story scope using the Initial Breakdown section of [user-story-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/user-story-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)):
    - Story statement (As a / I want / So that).
    - Rough scope boundaries with expected uncertainty.
    - Initial sizing: XS(1), S(2), M(3), L(5), XL(8).

.claude/skills/pair-process-plan-tasks/SKILL.md

@@ -90,7 +90,7 @@ Transform a refined user story into specific, actionable implementation tasks. T
 
 For each task (skipping tasks that already exist in the story body):
 
-1. **Act**: Define the task following the [task-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/task-template.md):
+1. **Act**: Define the task following the [task-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/task-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)):
    - Task Information (ID, priority, hours, bounded context)
    - Summary and type
    - Description with implementation context

.claude/skills/pair-process-refine-story/SKILL.md

@@ -138,7 +138,7 @@ Transform a user story from rough breakdown (Draft) into a development-ready spe
 
 ### Step 5: Documentation and PM Tool Update
 
-1. **Act**: Assemble the complete refined story body using the [user-story-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/user-story-template.md) Refined template:
+1. **Act**: Assemble the complete refined story body using the [user-story-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/user-story-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)) Refined template:
    - **Functional sections first**: Story Statement → Epic Context → Classification (the Step 3b matrix) → Acceptance Criteria → Definition of Done → Story Sizing → Dependencies → Validation → Notes.
    - **Technical sections last**: Technical Analysis → (Task Breakdown added later by `/pair-process-plan-tasks`).
 2. **Act**: Compose `/pair-capability-write-issue` with:

.claude/skills/pair-process-review/SKILL.md

@@ -191,7 +191,7 @@ Run the procedure for the level determined in Step 3.1 — see [degradation-leve
 
 ### Step 5.1: Compile Review Report
 
-1. **Act**: Compile all findings into a review report following the [code-review-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/code-review-template.md):
+1. **Act**: Compile all findings into a review report following the [code-review-template.md](../../../.pair/knowledge/guidelines/collaboration/templates/code-review-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)):
    - **Review Information**: PR number, author, reviewer, date, story, review type
    - **Review Summary**: overall assessment, key changes, business value
    - **Code Review Checklist**: functionality, code quality, technical standards (from Phase 2)

.claude/skills/pair-process-review/merge-and-cascade.md

@@ -11,7 +11,7 @@ Disclosed from [SKILL.md](./SKILL.md) Phase 6 — only reached when the reviewer
 
 ### Step 6.2: Prepare Merge Commit
 
-1. **Act**: Draft the merge commit message following the [commit template](../../../.pair/knowledge/guidelines/collaboration/templates/commit-template.md):
+1. **Act**: Draft the merge commit message following the [commit template](../../../.pair/knowledge/guidelines/collaboration/templates/commit-template.md) (resolve override-first — [template resolution](../../../.pair/knowledge/skill-conventions/template-resolution.md)):
 
    ```text
    [#<story-id>] feat: <story description>