diff --git a/Makefile b/Makefile
index 4517aca..ec71452 100644
--- a/Makefile
+++ b/Makefile
@@ -705,5 +705,7 @@ agents-status:
# Install agent distribution CLI
agents-install-cli: $(VENV)/bin/activate
@echo "📦 Installing Kaizen Agentic CLI..."
+ @$(VENV_PIP) install --upgrade pip
@$(VENV_PIP) install -e .
- @echo "✅ CLI installed. Use 'kaizen-agentic --help' for usage."
\ No newline at end of file
+ @echo "✅ CLI installed. Use 'kaizen-agentic --help' for usage."
+ @echo "💡 Activate virtual environment with: source $(VENV)/bin/activate"
\ No newline at end of file
diff --git a/TODO.md b/TODO.md
index 524677a..83ac05e 100644
--- a/TODO.md
+++ b/TODO.md
@@ -107,6 +107,15 @@ This version focuses on production readiness and enhanced automation capabilitie
- Robust venv creation and activation
- Dependency installation with upgrade handling
- Status checking and validation
+* **CLI installation make target (agents-install-cli)** - DONE
+ - Target is working properly and requires virtual environment activation as documented
+ - Installation process functions correctly with proper venv setup
+* **YAML frontmatter errors in agent files** causing loading failures - DONE
+ - All 16 agents now properly loading without YAML parsing errors
+ - Frontmatter format standardized across all agent definitions
+* **Agent categorization issues** (agents showing as "Unknown" instead of proper categories) - DONE
+ - All 16 agents now properly categorized and displaying correct categories
+ - Category mapping and recognition system functioning correctly
### ✅ Completed: To Secure
* **Configuration file validation** - DONE
diff --git a/agents/agent-agent-optimization.md b/agents/agent-agent-optimization.md
index 595b51e..3077bd5 100644
--- a/agents/agent-agent-optimization.md
+++ b/agents/agent-agent-optimization.md
@@ -1,7 +1,8 @@
---
-name: agent-optimizer
+name: optimization
description: Meta-agent that analyzes and optimizes other Claude Code subagents based on their performance data, usage patterns, and effectiveness metrics. Use PROACTIVELY for agent ecosystem improvement.
model: inherit
+category: infrastructure
---
# Kaizen Optimizer - Agent Performance Meta-Optimizer
diff --git a/agents/agent-claude-documentation.md b/agents/agent-claude-documentation.md
index 3b05835..14062ba 100644
--- a/agents/agent-claude-documentation.md
+++ b/agents/agent-claude-documentation.md
@@ -1,6 +1,7 @@
---
-name: claude-expert
+name: claude-documentation
description: Specialized assistant for Claude and Claude Code documentation, features, and best practices
+category: documentation
---
## Instructions
diff --git a/agents/agent-code-refactoring.md b/agents/agent-code-refactoring.md
index 47cf305..641ba4c 100644
--- a/agents/agent-code-refactoring.md
+++ b/agents/agent-code-refactoring.md
@@ -1,7 +1,8 @@
---
-name: refactoring-assistant
+name: code-refactoring
description: Analyze code structure and quality, identify improvement opportunities, and provide actionable refactoring guidance. Use PROACTIVELY for code quality assessment and improvement.
model: inherit
+category: code-quality
---
# Refactoring Assistant - Code Structure and Quality Improvement Agent
diff --git a/agents/agent-datamodel-optimization.md b/agents/agent-datamodel-optimization.md
index 8381e2e..22fd0c5 100644
--- a/agents/agent-datamodel-optimization.md
+++ b/agents/agent-datamodel-optimization.md
@@ -1,7 +1,8 @@
---
-name: datamodel-optimizer
+name: datamodel-optimization
description: Specialized agent that systematically analyzes, optimizes, and enhances dataclasses, models, and data structures within a codebase. Provides comprehensive datamodel improvements including convenience methods, interface consistency, code reduction, and test alignment.
model: inherit
+category: code-quality
---
# Datamodel Optimization Specialist Agent
diff --git a/agents/agent-keepaChangelog.md b/agents/agent-keepaChangelog.md
index 2cf2145..f5e6bba 100644
--- a/agents/agent-keepaChangelog.md
+++ b/agents/agent-keepaChangelog.md
@@ -1,6 +1,7 @@
---
-name: changelog-keeper
+name: keepaChangelog
description: Specialized assistant for maintaining CHANGELOG.md files following Keep a Changelog format
+category: project-management
---
## Instructions
diff --git a/agents/agent-keepaContributingfile.md b/agents/agent-keepaContributingfile.md
index 9c10553..ba297d2 100644
--- a/agents/agent-keepaContributingfile.md
+++ b/agents/agent-keepaContributingfile.md
@@ -1,6 +1,7 @@
---
-name: contributing-keeper
+name: keepaContributingfile
description: Specialized assistant for maintaining CONTRIBUTING.md files following Keep a Contributing-File V0.0.1 format within the Kaizen Agentic framework
+category: documentation
---
## Instructions
diff --git a/agents/agent-keepaTodofile.md b/agents/agent-keepaTodofile.md
index bffc66f..3c63d2f 100644
--- a/agents/agent-keepaTodofile.md
+++ b/agents/agent-keepaTodofile.md
@@ -1,6 +1,7 @@
---
-name: todo-keeper
+name: keepaTodofile
description: Specialized assistant for maintaining TODO.md files following Keep a Todofile V0.0.1 format
+category: project-management
---
## Instructions
diff --git a/agents/agent-priority-evaluation.md b/agents/agent-priority-evaluation.md
index 4352892..3d327d7 100644
--- a/agents/agent-priority-evaluation.md
+++ b/agents/agent-priority-evaluation.md
@@ -1,6 +1,7 @@
---
-name: priority-assistant
-description: Specialized assistant to help evaluate and establish priorities for issues and tasks.
+name: priority-evaluation
+description: Specialized assistant to help evaluate and establish priorities for issues and tasks.
+category: project-management
---
## Instructions
diff --git a/agents/agent-project-management.md b/agents/agent-project-management.md
index 4c40d53..18143de 100644
--- a/agents/agent-project-management.md
+++ b/agents/agent-project-management.md
@@ -1,6 +1,7 @@
---
-name: project-assistant
+name: project-management
description: Specialized assistant for project status, progress tracking, and development planning
+category: project-management
---
## Instructions
diff --git a/agents/agent-requirements-engineering.md b/agents/agent-requirements-engineering.md
index 9a26b4a..ecfae0e 100644
--- a/agents/agent-requirements-engineering.md
+++ b/agents/agent-requirements-engineering.md
@@ -1,7 +1,8 @@
---
-name: requirements-engineering-agent
+name: requirements-engineering
description: Specialized agent designed to prevent interface compatibility issues and mock object mismatches by ensuring solid foundation planning before implementation. Based on lessons learned from Issue #59, provides practical toolkit commands and enhanced TDD8 workflow integration to catch interface problems before implementation.
model: inherit
+category: development-process
---
# Requirements Engineering and Incremental Development Planning Agent
diff --git a/agents/agent-setupRepository.md b/agents/agent-setupRepository.md
index 6e2f879..7b2d4d1 100644
--- a/agents/agent-setupRepository.md
+++ b/agents/agent-setupRepository.md
@@ -1,6 +1,7 @@
---
-name: setup-repository
+name: setupRepository
description: Specialized assistant for setting up new Python repositories following PythonVibes best practices
+category: infrastructure
---
## Instructions
diff --git a/agents/agent-tdd-workflow.md b/agents/agent-tdd-workflow.md
index 389f667..f3cce24 100644
--- a/agents/agent-tdd-workflow.md
+++ b/agents/agent-tdd-workflow.md
@@ -1,6 +1,7 @@
---
-name: tddai-assistant
+name: tdd-workflow
description: Expert guidance for the TDD8 workflow methodology, specializing in the comprehensive ISSUE-TEST-RED-GREEN-REFACTOR-DOCUMENT-REFINE-PUBLISH cycle with sophisticated sidequest management and proper test organization.
+category: development-process
---
# TDDAi Assistant Agent
diff --git a/agents/agent-test-maintenance.md b/agents/agent-test-maintenance.md
index fc93d3a..ea8f7e6 100644
--- a/agents/agent-test-maintenance.md
+++ b/agents/agent-test-maintenance.md
@@ -1,3 +1,9 @@
+---
+name: test-maintenance
+description: Specialized agent for analyzing and fixing failing tests in the project
+category: testing
+---
+
# Test-Fixing Agent
## Purpose
diff --git a/agents/agent-testing-efficiency.md b/agents/agent-testing-efficiency.md
index d7a91ea..d092c3e 100644
--- a/agents/agent-testing-efficiency.md
+++ b/agents/agent-testing-efficiency.md
@@ -1,7 +1,8 @@
---
-name: testing-efficiency-optimizer
+name: testing-efficiency
description: Specialized agent designed to optimize TDD8 workflow test execution, resolve pytest reliability issues, and enhance overall testing efficiency for red-green iterations. Focuses on smart test selection, parallel execution, and agent integration patterns.
model: inherit
+category: testing
---
# Testing Efficiency Optimizer Agent
diff --git a/agents/agent-tooling-optimization.md b/agents/agent-tooling-optimization.md
index 17aa010..5defb38 100644
--- a/agents/agent-tooling-optimization.md
+++ b/agents/agent-tooling-optimization.md
@@ -1,3 +1,9 @@
+---
+name: tooling-optimization
+description: Meta-agent that analyzes and optimizes repository tooling usage to improve development efficiency
+category: infrastructure
+---
+
# Tooling Optimizer Agent
## Purpose
diff --git a/agents/agent-wisdom-encouragement.md b/agents/agent-wisdom-encouragement.md
index 1d28171..c55c419 100644
--- a/agents/agent-wisdom-encouragement.md
+++ b/agents/agent-wisdom-encouragement.md
@@ -1,8 +1,9 @@
---
-name: fortune-wisdom-guide
-description: Use this agent when you need encouragement or guidance while working with complex implementation tasks, particularly when setting up agents or subagents becomes challenging. Examples: Context: User is struggling with a complex agent configuration setup. user: 'I'm having trouble getting these subagents to work together properly, this is more complicated than I expected' assistant: 'Let me consult the fortune-wisdom-guide agent for some encouraging perspective on this challenge' Since the user is expressing frustration with a challenging implementation task involving subagents, use the fortune-wisdom-guide agent to provide supportive wisdom. Context: User has just completed a difficult technical task and wants some reflective wisdom. user: 'Finally got that agent system working! That was tough but rewarding' assistant: 'I'll use the fortune-wisdom-guide agent to share some wisdom about your accomplishment' The user has overcome a challenge and would benefit from reflective wisdom about their achievement.
+name: wisdom-encouragement
+description: "Provides encouraging wisdom and guidance for complex implementation tasks and challenging technical work"
model: haiku
color: cyan
+category: documentation
---
You are the Fortune Wisdom Guide, a sage advisor who specializes in providing encouraging, insightful fortune cookie-style wisdom specifically tailored to developers and implementers facing technical challenges. Your primary focus is helping users navigate the complexities of agent systems, subagent configurations, and other challenging implementation tasks.