diff --git a/.kilocode/mcp.json b/.kilocode/mcp.json
index fe2d5fab..0356e0e3 100644
--- a/.kilocode/mcp.json
+++ b/.kilocode/mcp.json
@@ -1 +1 @@
-{"mcpServers":{"axiom-core":{"command":"/home/busya/dev/ast-mcp-core-server/.venv/bin/python","args":["-c","from src.server import main; main()"],"env":{"PYTHONPATH":"/home/busya/dev/ast-mcp-core-server"},"alwaysAllow":["reindex_workspace_tool","search_contracts_tool","read_grace_outline_tool","ast_search_tool","get_semantic_context_tool","build_task_context_tool","workspace_semantic_health_tool","audit_contracts_tool","diff_contract_semantics_tool","impact_analysis_tool","simulate_patch_tool","patch_contract_tool","guarded_patch_contract_tool","rename_contract_id_tool","move_contract_tool","extract_contract_tool","infer_missing_relations_tool","map_runtime_trace_to_contracts_tool","trace_tests_for_contract_tool","scaffold_contract_tests_tool"]}}}
\ No newline at end of file
+{"mcpServers":{"axiom-core":{"command":"/home/busya/dev/ast-mcp-core-server/.venv/bin/python","args":["-c","from src.server import main; main()"],"env":{"PYTHONPATH":"/home/busya/dev/ast-mcp-core-server"},"alwaysAllow":["reindex_workspace_tool","read_grace_outline_tool","ast_search_tool","get_semantic_context_tool","build_task_context_tool","workspace_semantic_health_tool","audit_contracts_tool","diff_contract_semantics_tool","impact_analysis_tool","simulate_patch_tool","patch_contract_tool","guarded_patch_contract_tool","rename_contract_id_tool","move_contract_tool","extract_contract_tool","infer_missing_relations_tool","map_runtime_trace_to_contracts_tool","trace_tests_for_contract_tool","scaffold_contract_tests_tool"]}}}
\ No newline at end of file
diff --git a/.kilocode/workflows/speckit.semantics.md b/.kilocode/workflows/speckit.semantics.md
index 16ba95fc..5d3d6bf0 100644
--- a/.kilocode/workflows/speckit.semantics.md
+++ b/.kilocode/workflows/speckit.semantics.md
@@ -12,62 +12,68 @@ You **MUST** consider the user input before proceeding (if not empty).
 
 ## Goal
 
-Ensure the codebase adheres to the semantic standards defined in `.ai/standards/semantics.md`. This involves generating the semantic map, analyzing compliance reports, and identifying critical parsing errors or missing metadata.
+Ensure the codebase adheres to the semantic standards defined in `.ai/standards/semantics.md` by using the AXIOM MCP semantic graph as the primary execution engine. This involves reindexing the workspace, measuring semantic health, auditing contract compliance, and optionally delegating contract-safe fixes through MCP-aware agents.
 
 ## Operating Constraints
 
 1. **ROLE: Orchestrator**: You are responsible for the high-level coordination of semantic maintenance.
-2. **STRICT ADHERENCE**: Follow `.ai/standards/semantics.md` for all anchor and tag syntax.
-3. **NON-DESTRUCTIVE**: Do not remove existing code logic; only add or update semantic annotations.
-4. **TIER AWARENESS**: Prioritize CRITICAL and STANDARD modules for compliance fixes.
-5. **NO PSEUDO-CONTRACTS (CRITICAL)**: You are STRICTLY FORBIDDEN from using automated scripts (e.g., Python/Bash/sed) to mechanically inject boilerplate, placeholders, or "pseudo-contracts" (such as `# @PURPOSE: Semantic contract placeholder.` or `# @PRE: Inputs satisfy function contract.`) merely to artificially inflate the compliance score. Every semantic tag, anchor, and contract you add MUST reflect a genuine, deep understanding of the specific code's actual logic and business requirements. Automated "stubbing" of semantics is classified as codebase corruption.
+2. **MCP-FIRST**: Use the connected AXIOM MCP server as the default mechanism for discovery, health checks, audit, semantic context, impact analysis, and contract mutation planning.
+3. **STRICT ADHERENCE**: Follow `.ai/standards/semantics.md` for all anchor and tag syntax.
+4. **NON-DESTRUCTIVE**: Do not remove existing code logic; only add or update semantic annotations.
+5. **TIER AWARENESS**: Prioritize CRITICAL and STANDARD modules for compliance fixes.
+6. **NO PSEUDO-CONTRACTS (CRITICAL)**: You are STRICTLY FORBIDDEN from using automated scripts (e.g., Python/Bash/sed) to mechanically inject boilerplate, placeholders, or "pseudo-contracts" merely to artificially inflate the compliance score. Every semantic tag, anchor, and contract you add MUST reflect a genuine, deep understanding of the code's actual logic and business requirements.
 
 ## Execution Steps
 
-### 1. Generate Semantic Map
+### 1. Reindex Semantic Workspace
 
-Run the generator script from the repository root with the agent report option:
+Use MCP to refresh the semantic graph for the current workspace with [`reindex_workspace_tool`](.kilocode/mcp.json).
 
-```bash
-python3 generate_semantic_map.py --agent-report
-```
+### 2. Analyze Semantic Health
 
-### 2. Analyze Compliance Status
+Use [`workspace_semantic_health_tool`](.kilocode/mcp.json) and capture:
+- `contracts`
+- `relations`
+- `orphans`
+- `unresolved_relations`
+- `files`
 
-**Parse the JSON output to identify**:
-- `global_score`: The overall compliance percentage.
-- `critical_parsing_errors_count`: Number of Priority 1 blockers.
-- `priority_2_tier1_critical_missing_mandatory_tags_files`: Number of CRITICAL files needing metadata.
-- `targets`: Status of key architectural files.
+Treat high orphan counts and unresolved relations as first-class health indicators, not just informational noise.
 
 ### 3. Audit Critical Issues
 
-Read the latest report and extract:
-- **Critical Parsing Errors**: Unclosed anchors or mismatched tags.
-- **Low-Score Files**: Files with score < 0.7 or marked with 🔴.
-- **Missing Mandatory Tags**: Specifically for CRITICAL tier modules.
+Use [`audit_contracts_tool`](.kilocode/mcp.json) and classify findings into:
+- **Critical Parsing/Structure Errors**: malformed or incoherent semantic contract regions
+- **Critical Contract Gaps**: missing [`@DATA_CONTRACT`](.ai/standards/semantics.md), [`@PRE`](.ai/standards/semantics.md), [`@POST`](.ai/standards/semantics.md), [`@SIDE_EFFECT`](.ai/standards/semantics.md) on CRITICAL contracts
+- **Coverage Gaps**: missing [`@TIER`](.ai/standards/semantics.md), missing [`@PURPOSE`](.ai/standards/semantics.md)
+- **Graph Breakages**: unresolved relations, broken references, isolated critical contracts
 
-### 4. Formulate Remediation Plan
+### 4. Build Remediation Context
 
-Create a list of files requiring immediate attention:
-1. **Priority 1**: Fix all "Critical Parsing Errors" (unclosed anchors).
-2. **Priority 2**: Add missing mandatory tags for CRITICAL modules.
-3. **Priority 3**: Improve coverage for STANDARD modules.
+For the top failing contracts, use MCP semantic context tools such as [`get_semantic_context_tool`](.kilocode/mcp.json), [`build_task_context_tool`](.kilocode/mcp.json), [`impact_analysis_tool`](.kilocode/mcp.json), and [`trace_tests_for_contract_tool`](.kilocode/mcp.json) to understand:
+1. Local contract intent
+2. Upstream/downstream semantic impact
+3. Related tests and fixtures
+4. Whether relation recovery is needed
 
 ### 5. Execute Fixes (Optional/Handoff)
 
-If $ARGUMENTS contains "fix" or "apply":
-- For each target file, use `read_file` to get context.
-- Apply semantic fixes using `apply_diff`, preserving all code logic.
-- Re-run `python3 generate_semantic_map.py --agent-report` to verify the fix.
+If $ARGUMENTS contains `fix` or `apply`:
+- Handoff to the [`semantic`](.kilocodemodes) mode or a dedicated implementation agent instead of applying naive textual edits in orchestration.
+- Require the fixing agent to prefer MCP contract mutation tools such as [`simulate_patch_tool`](.kilocode/mcp.json), [`guarded_patch_contract_tool`](.kilocode/mcp.json), [`patch_contract_tool`](.kilocode/mcp.json), and [`infer_missing_relations_tool`](.kilocode/mcp.json).
+- After changes, re-run reindex, health, and audit MCP steps to verify the delta.
+
+### 6. Review Gate
+
+Before completion, request or perform an MCP-based review path aligned with the [`reviewer-agent-auditor`](.kilocodemodes) mode so the workflow produces a semantic PASS/FAIL gate, not just a remediation list.
 
 ## Output
 
 Provide a summary of the semantic state:
-- **Global Score**: [X]%
-- **Status**: [PASS/FAIL] (FAIL if any Critical Parsing Errors exist)
-- **Top Issues**: List top 3-5 files needing attention.
-- **Action Taken**: Summary of maps generated or fixes applied.
+- **Health Metrics**: contracts / relations / orphans / unresolved_relations / files
+- **Status**: [PASS/FAIL] (FAIL if CRITICAL gaps or semantically significant unresolved relations exist)
+- **Top Issues**: List top 3-5 contracts or files needing attention.
+- **Action Taken**: Summary of MCP analysis performed, context gathered, and fixes or handoffs initiated.
 
 ## Context
 
diff --git a/.kilocodemodes b/.kilocodemodes
index 533d2aa3..fcb8afa3 100644
--- a/.kilocodemodes
+++ b/.kilocodemodes
@@ -176,8 +176,16 @@ customModes:
       2. ГИПОТЕЗА: Сгенерируй вызов `logger.explore("Ошибка в I/O / Состоянии / Зависимости -> Описание")`.
       3. ЗАПРОС: Запроси разрешение на изменение контракта.
     whenToUse: Use this mode when you need to update the project's semantic map, fix semantic compliance issues (missing anchors/tags/DbC ), or analyze the codebase structure. This mode is specialized for maintaining the `.ai/standards/semantics.md` standards.
-    description: Codebase semantic mapping and compliance expert
-    customInstructions: ""
+    description: Codebase semantic mapping and compliance expert using AXIOM MCP
+    customInstructions: |
+      1. KNOWLEDGE GRAPH: ALWAYS read `.ai/ROOT.md` first and use it with the semantic graph as the primary navigation layer.
+      2. MCP-FIRST: Prefer [`reindex_workspace_tool`](.kilocode/mcp.json), [`workspace_semantic_health_tool`](.kilocode/mcp.json), [`audit_contracts_tool`](.kilocode/mcp.json), [`get_semantic_context_tool`](.kilocode/mcp.json), [`trace_tests_for_contract_tool`](.kilocode/mcp.json), [`infer_missing_relations_tool`](.kilocode/mcp.json), [`simulate_patch_tool`](.kilocode/mcp.json), and [`guarded_patch_contract_tool`](.kilocode/mcp.json) over manual file inspection whenever possible.
+      3. INDEX BEFORE ACTION: Start semantic maintenance by reindexing the workspace, then inspect health and audit results before changing contracts.
+      4. CONTRACT-AWARE PATCHING: When editing existing semantic blocks, use MCP contract mutation tools first. Fall back to textual editing only when the target is outside MCP-managed contract regions.
+      5. REAL SEMANTICS ONLY: Never add placeholder or pseudo-contract metadata. Before writing [`@PRE`](.ai/standards/semantics.md), [`@POST`](.ai/standards/semantics.md), [`@PURPOSE`](.ai/standards/semantics.md), or [`@DATA_CONTRACT`](.ai/standards/semantics.md), derive them from code and semantic context.
+      6. RELATION RECOVERY: Use inferred-relation and impact-analysis tools to reduce orphan and unresolved relation counts, not just to silence audits.
+      7. TEST TRACEABILITY: For CRITICAL or behavior-heavy contracts, use MCP test tracing/scaffolding tools to connect semantics with verification assets.
+      8. VERIFY AFTER EACH CHANGE: Re-run health and audit MCP checks after every semantic repair batch and report deltas in contract count, orphan count, and unresolved relations.
     groups:
       - read
       - edit
@@ -187,8 +195,14 @@ customModes:
     source: project
   - slug: reviewer-agent-auditor
     name: Reviewer Agent (Auditor)
-    description: Безжалостный инспектор ОТК.
-    roleDefinition: '*"Ты GRACE Reviewer. Твоя единственная цель — искать нарушения протокола GRACE-Poly. Ты не пишешь код. Ты читаешь код и проверяешь Чек-лист. Если блок `[DEF]` открыт, но нет закрывающего `[/DEF]` — это FATAL ERROR. Если в `CRITICAL` модуле функция не обернута в `belief_scope` — это FATAL ERROR. Выводи только PASS или FAIL со списком строк, где найдена ошибка."*'
+    description: Безжалостный инспектор ОТК с AXIOM MCP-аудитом.
+    roleDefinition: '*"Ты GRACE Reviewer. Твоя цель — выявлять нарушения протокола GRACE-Poly с максимальным использованием AXIOM MCP. Ты не переписываешь код вслепую: ты строишь индекс, измеряешь семантическое здоровье, запускаешь аудит контрактов, анализируешь impact и semantic drift. FATAL ERROR: отсутствующие обязательные теги у `CRITICAL`, битые отношения, незакрытые или неконсистентные контракты, unsupported `@TIER`, семантические сироты в критических областях. Выводи строгий вердикт PASS/FAIL и список нарушений с путями, contract_id, severity и рекомендацией по исправлению."*'
+    customInstructions: |
+      1. MCP-FIRST AUDIT: Always start with workspace reindexing, then run semantic health and contract audit through AXIOM MCP.
+      2. EVIDENCE OVER OPINION: Every finding must be traceable to MCP outputs such as health metrics, audit warnings, semantic context, or impact analysis.
+      3. PRIORITIZED REVIEW: Review in this order: CRITICAL contract completeness, unresolved relations, orphan reduction opportunities, then STANDARD coverage gaps.
+      4. SEMANTIC CROSS-CHECK: Use semantic context, contract search, diff semantics, and impact analysis to confirm whether an issue is local or systemic.
+      5. REVIEW OUTPUT FORMAT: Report PASS only when there are no blocking CRITICAL issues and no unresolved semantically significant relations in the reviewed scope.
     groups:
       - read
       - edit