started manual refactor

src/personal_mcp/catalog/__init__.py

@@ -1,21 +1,19 @@
-from personal_mcp.catalog.server import (
-    build_prompt_detail_payload,
-    build_prompts_index_payload,
-    build_skill_detail_payload,
-    build_skills_index_payload,
-    get_pattern_by_id_payload,
-    get_prompt_by_id_payload,
-    search_patterns_payload,
-    search_prompts_payload,
-)
+from personal_mcp.catalog.server import build_prompt_detail_payload
+from personal_mcp.catalog.server import build_prompts_index_payload
+from personal_mcp.catalog.server import build_skill_detail_payload
+from personal_mcp.catalog.server import build_skills_index_payload
+from personal_mcp.catalog.server import get_pattern_by_id_payload
+from personal_mcp.catalog.server import get_prompt_by_id_payload
+from personal_mcp.catalog.server import search_patterns_payload
+from personal_mcp.catalog.server import search_prompts_payload
 
 __all__ = [
-    "build_skill_detail_payload",
     "build_prompt_detail_payload",
     "build_prompts_index_payload",
+    "build_skill_detail_payload",
     "build_skills_index_payload",
-    "get_prompt_by_id_payload",
     "get_pattern_by_id_payload",
-    "search_prompts_payload",
+    "get_prompt_by_id_payload",
     "search_patterns_payload",
+    "search_prompts_payload",
 ]

src/personal_mcp/catalog/server.py

@@ -2,7 +2,9 @@ from __future__ import annotations
 
 from typing import Any
 
-from personal_mcp.skills.document_loader import DocsRegistry, PromptRecord, SkillRecord
+from personal_mcp.skills.document_loader import DocsRegistry
+from personal_mcp.skills.document_loader import PromptRecord
+from personal_mcp.skills.document_loader import SkillRecord
 
 DEFAULT_LIMIT = 20
 MAX_LIMIT = 100
@@ -79,10 +81,7 @@ def _skill_matches(
     if tag and tag not in skill.tags:
         return False
 
-    if capability and capability not in skill.capabilities:
-        return False
-
-    return True
+    return not (capability and capability not in skill.capabilities)
 
 
 def _prompt_matches(
@@ -107,10 +106,7 @@ def _prompt_matches(
             if any(term not in haystack for term in terms):
                 return False
 
-    if tag and tag not in prompt.tags:
-        return False
-
-    return True
+    return not (tag and tag not in prompt.tags)
 
 
 def build_skills_index_payload(