From 882da7cdfcfd161ec1ca97acb8d8beeb48359243 Mon Sep 17 00:00:00 2001
From: AIOSAI <aipass.system@gmail.com>
Date: Wed, 24 Jun 2026 14:24:28 -0700
Subject: [PATCH] =?UTF-8?q?refactor(skills):=20relocate=20skill=20library?=
 =?UTF-8?q?=20to=20src/aipass/skills/lib/=20=E2=80=94=20rename=20catalog/,?=
 =?UTF-8?q?=20move=20telegram=20in,=20archive=20orphan=20fixtures,=20retir?=
 =?UTF-8?q?e=20.aipass/skills/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unifies all 6 first-party skills under lib/ (built-in tier). Fixes telegram not
being cross-branch discoverable (was in cwd-relative .aipass/skills/). Built-in
discovery path catalog->lib; telegram conftest parents[6]->[5]; .service
ExecStart, seedgo bypass + test paths updated. Packaging/imports/gitignore
unaffected (stays under src/aipass). 252/252 tests green, cross-branch discovery
verified. DPLAN-0218.
---
 CHANGELOG.md                                  | 18 +++++++++++
 .../skills/.aipass/aipass_local_prompt.md     |  6 ++--
 .../.aipass/skills/another_test/SKILL.md      | 27 -----------------
 .../.aipass/skills/another_test/handler.py    | 30 -------------------
 .../skills/.aipass/skills/full_test/SKILL.md  | 27 -----------------
 .../.aipass/skills/full_test/apps/__init__.py |  7 -----
 .../full_test/apps/handlers/__init__.py       | 13 --------
 .../skills/full_test/apps/modules/__init__.py | 13 --------
 .../.aipass/skills/full_test/handler.py       | 24 ---------------
 .../skills/.aipass/skills/test_skill/SKILL.md | 27 -----------------
 src/aipass/skills/.seedgo/bypass.json         |  4 +--
 src/aipass/skills/README.md                   |  6 ++--
 .../skills/apps/handlers/discovery_handler.py |  6 ++--
 src/aipass/skills/apps/handlers/template.py   |  2 +-
 src/aipass/skills/apps/skills.py              |  2 +-
 src/aipass/skills/{catalog => lib}/.gitkeep   |  0
 .../{catalog => lib}/branch_health/SKILL.md   |  0
 .../{catalog => lib}/branch_health/handler.py |  4 +--
 .../{catalog => lib}/drone_commands/SKILL.md  |  0
 .../drone_commands/apps/__init__.py           |  2 +-
 .../drone_commands/apps/handlers/__init__.py  |  2 +-
 .../drone_commands/apps/handlers/executor.py  |  2 +-
 .../drone_commands/apps/handlers/parser.py    |  2 +-
 .../drone_commands/apps/modules/__init__.py   |  2 +-
 .../apps/modules/command_runner.py            |  2 +-
 .../drone_commands/handler.py                 |  2 +-
 .../skills/{catalog => lib}/github/SKILL.md   |  0
 .../{catalog => lib}/inbox_check/SKILL.md     |  0
 .../{catalog => lib}/inbox_check/handler.py   |  4 +--
 .../{catalog => lib}/system_status/SKILL.md   |  0
 .../{catalog => lib}/system_status/handler.py |  2 +-
 .../{.aipass/skills => lib}/telegram/SKILL.md |  0
 .../skills => lib}/telegram/apps/__init__.py  |  2 +-
 .../telegram/apps/handlers/__init__.py        |  0
 .../telegram/apps/handlers/base_bot.py        |  0
 .../telegram/apps/handlers/bot_factory.py     |  2 +-
 .../telegram/apps/handlers/bot_operations.py  |  0
 .../telegram/apps/handlers/bot_registry.py    |  0
 .../apps/handlers/botfather_client.py         |  0
 .../telegram/apps/handlers/branch_plugin.py   |  0
 .../telegram/apps/handlers/config.py          |  0
 .../telegram/apps/handlers/file_handler.py    |  0
 .../telegram/apps/handlers/log_streamer.py    |  0
 .../telegram/apps/handlers/notifier.py        |  0
 .../telegram/apps/handlers/response_router.py |  0
 .../apps/handlers/telegram_standards.py       |  0
 .../telegram/apps/handlers/tmux_manager.py    |  0
 .../telegram/apps/modules/__init__.py         |  2 +-
 .../skills => lib}/telegram/handler.py        |  0
 .../telegram/telegram-bot@.service            |  2 +-
 .../skills => lib}/telegram/telethon_auth.py  |  0
 .../skills => lib}/telegram/tests/__init__.py |  0
 .../skills => lib}/telegram/tests/conftest.py |  2 +-
 .../telegram/tests/test_bot_registry.py       |  0
 .../telegram/tests/test_botfather_client.py   |  0
 .../telegram/tests/test_handler_routing.py    |  0
 .../telegram/tests/test_log_streamer.py       |  0
 .../telegram/tests/test_multi_bot.py          |  0
 .../telegram/tests/test_multibot_config.py    |  0
 .../tests/test_multibot_integration.py        |  0
 .../telegram/tests/test_response_router.py    |  0
 .../skills/templates/full/apps/__init__.py    |  2 +-
 .../templates/full/apps/handlers/__init__.py  |  2 +-
 .../templates/full/apps/modules/__init__.py   |  2 +-
 src/aipass/skills/tests/test_discovery.py     |  6 ++--
 src/aipass/skills/tests/test_lifecycle.py     |  2 +-
 66 files changed, 55 insertions(+), 205 deletions(-)
 delete mode 100644 src/aipass/skills/.aipass/skills/another_test/SKILL.md
 delete mode 100644 src/aipass/skills/.aipass/skills/another_test/handler.py
 delete mode 100644 src/aipass/skills/.aipass/skills/full_test/SKILL.md
 delete mode 100644 src/aipass/skills/.aipass/skills/full_test/apps/__init__.py
 delete mode 100644 src/aipass/skills/.aipass/skills/full_test/apps/handlers/__init__.py
 delete mode 100644 src/aipass/skills/.aipass/skills/full_test/apps/modules/__init__.py
 delete mode 100644 src/aipass/skills/.aipass/skills/full_test/handler.py
 delete mode 100644 src/aipass/skills/.aipass/skills/test_skill/SKILL.md
 rename src/aipass/skills/{catalog => lib}/.gitkeep (100%)
 rename src/aipass/skills/{catalog => lib}/branch_health/SKILL.md (100%)
 rename src/aipass/skills/{catalog => lib}/branch_health/handler.py (98%)
 rename src/aipass/skills/{catalog => lib}/drone_commands/SKILL.md (100%)
 rename src/aipass/skills/{catalog => lib}/drone_commands/apps/__init__.py (87%)
 rename src/aipass/skills/{catalog => lib}/drone_commands/apps/handlers/__init__.py (86%)
 rename src/aipass/skills/{catalog => lib}/drone_commands/apps/handlers/executor.py (98%)
 rename src/aipass/skills/{catalog => lib}/drone_commands/apps/handlers/parser.py (98%)
 rename src/aipass/skills/{catalog => lib}/drone_commands/apps/modules/__init__.py (86%)
 rename src/aipass/skills/{catalog => lib}/drone_commands/apps/modules/command_runner.py (98%)
 rename src/aipass/skills/{catalog => lib}/drone_commands/handler.py (98%)
 rename src/aipass/skills/{catalog => lib}/github/SKILL.md (100%)
 rename src/aipass/skills/{catalog => lib}/inbox_check/SKILL.md (100%)
 rename src/aipass/skills/{catalog => lib}/inbox_check/handler.py (98%)
 rename src/aipass/skills/{catalog => lib}/system_status/SKILL.md (100%)
 rename src/aipass/skills/{catalog => lib}/system_status/handler.py (99%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/SKILL.md (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/__init__.py (82%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/__init__.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/base_bot.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/bot_factory.py (99%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/bot_operations.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/bot_registry.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/botfather_client.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/branch_plugin.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/config.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/file_handler.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/log_streamer.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/notifier.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/response_router.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/telegram_standards.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/handlers/tmux_manager.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/apps/modules/__init__.py (87%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/handler.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/telegram-bot@.service (93%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/telethon_auth.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/tests/__init__.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/tests/conftest.py (98%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/tests/test_bot_registry.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/tests/test_botfather_client.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/tests/test_handler_routing.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/tests/test_log_streamer.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/tests/test_multi_bot.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/tests/test_multibot_config.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/tests/test_multibot_integration.py (100%)
 rename src/aipass/skills/{.aipass/skills => lib}/telegram/tests/test_response_router.py (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5170f6df..3ae7dbf5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,24 @@ PyPI version — not the changelog header.
 
 ## [2026-06-24]
 
+### Changed
+
+- **Skill library relocated to `src/aipass/skills/lib/`** — first-party skills
+  were split across `catalog/` (built-in, cross-branch) and `.aipass/skills/`
+  (the branch-prompt dir, cwd-relative). Renamed `catalog/`→`lib/`, moved the
+  telegram skill in, archived three orphan test-fixture skills, and retired
+  `.aipass/skills/` from the branch. This unifies all 6 first-party skills under
+  one built-in tier and **fixes the telegram skill not being discoverable from
+  other branches** (it sat in a cwd-relative path). The public discovery
+  convention (`.aipass/skills/` + `~/.aipass/skills/`) is unchanged. One
+  functional line changed (`discovery_handler` built-in path); telegram's test
+  `conftest` path-depth, the systemd `.service` ExecStart, and seedgo bypass +
+  test paths were updated to match. Packaging, imports, and gitignore are
+  unaffected (everything stays under `src/aipass/`). 252/252 skills tests green;
+  cross-branch discovery verified from another branch. Moving telegram into the
+  gate's scope newly surfaced 9 pre-existing `unused_function` flags in its
+  handlers — triage tracked separately. (DPLAN-0218)
+
 ### Fixed
 
 - **seedgo CLI help checkers green-lit non-compliant `--help` output** — the
diff --git a/src/aipass/skills/.aipass/aipass_local_prompt.md b/src/aipass/skills/.aipass/aipass_local_prompt.md
index a00be480..02b476ec 100644
--- a/src/aipass/skills/.aipass/aipass_local_prompt.md
+++ b/src/aipass/skills/.aipass/aipass_local_prompt.md
@@ -1,5 +1,5 @@
 # SKILLS — Branch Context
-<!-- File: src/skills/.aipass/aipass_local_prompt.md — Injected on every prompt when in skills directory. -->
+<!-- File: src/aipass/skills/.aipass/aipass_local_prompt.md — Injected on every prompt when in skills directory. -->
 
 Capability framework for AI agents. Discoverable, validatable, executable skill units across three tiers: markdown-only, with handler, full 3-layer.
 
@@ -34,7 +34,7 @@ apps/
 │   ├── validator.py          # Requirement checking (pip, bins, config)
 │   └── template.py           # Template resolution and copying
 ├── plugins/               # Extension point (empty)
-catalog/                   # Built-in skills: drone_commands, github, system_status
+lib/                       # Built-in skills: branch_health, drone_commands, github, inbox_check, system_status, telegram
 templates/                 # Skill creation templates (markdown_only, with_handler, full)
 ```
 
@@ -42,7 +42,7 @@ templates/                 # Skill creation templates (markdown_only, with_handl
 
 1. `.aipass/skills/` — Project-local skills
 2. `~/.aipass/skills/` — Global user skills
-3. `src/skills/catalog/` — Built-in skills
+3. `src/aipass/skills/lib/` — Built-in skills
 
 ## Three Skill Tiers
 
diff --git a/src/aipass/skills/.aipass/skills/another_test/SKILL.md b/src/aipass/skills/.aipass/skills/another_test/SKILL.md
deleted file mode 100644
index bc7f5601..00000000
--- a/src/aipass/skills/.aipass/skills/another_test/SKILL.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: another_test
-description: TODO — describe what this skill does
-version: 1.0.0
-tags: []
-requires:
-  pip: []
-  bins: []
-  config: []
-has_handler: true
----
-
-# another_test
-
-## What This Does
-TODO
-
-## When to Use
-TODO
-
-## Steps
-1. TODO
-
-## Example
-```
-TODO
-```
diff --git a/src/aipass/skills/.aipass/skills/another_test/handler.py b/src/aipass/skills/.aipass/skills/another_test/handler.py
deleted file mode 100644
index aa687a64..00000000
--- a/src/aipass/skills/.aipass/skills/another_test/handler.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
-another_test skill handler
-
-Called by: drone @skills run another_test <action> [args]
-"""
-
-
-def run(action, args=None, config=None):
-    """Execute a skill action.
-
-    Args:
-        action: What to do
-        args: Dict of action arguments
-        config: Dict of resolved config values
-
-    Returns:
-        {"success": bool, "output": str, "error": str|None}
-    """
-    args = args or {}
-    config = config or {}
-
-    if action == "example":
-        return {"success": True, "output": "It works!", "error": None}
-
-    return {"success": False, "output": "", "error": f"Unknown action: {action}"}
-
-
-def get_actions():
-    """List available actions for this skill."""
-    return ["example"]
diff --git a/src/aipass/skills/.aipass/skills/full_test/SKILL.md b/src/aipass/skills/.aipass/skills/full_test/SKILL.md
deleted file mode 100644
index 14ccde01..00000000
--- a/src/aipass/skills/.aipass/skills/full_test/SKILL.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: full_test
-description: TODO — describe what this skill does
-version: 1.0.0
-tags: []
-requires:
-  pip: []
-  bins: []
-  config: []
-has_handler: true
----
-
-# full_test
-
-## What This Does
-TODO
-
-## When to Use
-TODO
-
-## Steps
-1. TODO
-
-## Example
-```
-TODO
-```
diff --git a/src/aipass/skills/.aipass/skills/full_test/apps/__init__.py b/src/aipass/skills/.aipass/skills/full_test/apps/__init__.py
deleted file mode 100644
index 254aa8dd..00000000
--- a/src/aipass/skills/.aipass/skills/full_test/apps/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# ===================AIPASS====================
-# META DATA HEADER
-# Name: __init__.py - full_test apps package
-# Date: 2026-03-07
-# Version: 1.0.0
-# Category: skills/catalog/full_test/apps
-# =============================================
diff --git a/src/aipass/skills/.aipass/skills/full_test/apps/handlers/__init__.py b/src/aipass/skills/.aipass/skills/full_test/apps/handlers/__init__.py
deleted file mode 100644
index d8469cca..00000000
--- a/src/aipass/skills/.aipass/skills/full_test/apps/handlers/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ===================AIPASS====================
-# META DATA HEADER
-# Name: __init__.py - full_test handlers package
-# Date: 2026-03-07
-# Version: 1.0.0
-# Category: skills/catalog/full_test/apps/handlers
-#
-# CHANGELOG (Max 5 entries):
-#   - v1.0.0 (2026-03-07): Initial scaffold
-#
-# CODE STANDARDS:
-#   - Handlers layer: returns dicts, NEVER prints
-# =============================================
diff --git a/src/aipass/skills/.aipass/skills/full_test/apps/modules/__init__.py b/src/aipass/skills/.aipass/skills/full_test/apps/modules/__init__.py
deleted file mode 100644
index f1d4d7f5..00000000
--- a/src/aipass/skills/.aipass/skills/full_test/apps/modules/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ===================AIPASS====================
-# META DATA HEADER
-# Name: __init__.py - full_test modules package
-# Date: 2026-03-07
-# Version: 1.0.0
-# Category: skills/catalog/full_test/apps/modules
-#
-# CHANGELOG (Max 5 entries):
-#   - v1.0.0 (2026-03-07): Initial scaffold
-#
-# CODE STANDARDS:
-#   - Modules layer: orchestration (can print)
-# =============================================
diff --git a/src/aipass/skills/.aipass/skills/full_test/handler.py b/src/aipass/skills/.aipass/skills/full_test/handler.py
deleted file mode 100644
index d213f2ba..00000000
--- a/src/aipass/skills/.aipass/skills/full_test/handler.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""
-full_test — Full 3-layer skill handler.
-
-Scaffolded by: drone @skills create full_test --full
-"""
-
-
-def run(action: str, args: list, config: dict) -> dict:
-    """
-    Execute the skill.
-
-    Args:
-        action: The action to perform
-        args: Command arguments
-        config: Skill configuration from SKILL.md
-
-    Returns:
-        dict with keys: success (bool), output (str), error (str|None)
-    """
-    return {
-        "success": True,
-        "output": f"full_test executed action: {action}",
-        "error": None,
-    }
diff --git a/src/aipass/skills/.aipass/skills/test_skill/SKILL.md b/src/aipass/skills/.aipass/skills/test_skill/SKILL.md
deleted file mode 100644
index a9e3aa22..00000000
--- a/src/aipass/skills/.aipass/skills/test_skill/SKILL.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: test_skill
-description: TODO — describe what this skill does
-version: 1.0.0
-tags: []
-requires:
-  pip: []
-  bins: []
-  config: []
-has_handler: false
----
-
-# test_skill
-
-## What This Does
-TODO
-
-## When to Use
-TODO
-
-## Steps
-1. TODO
-
-## Example
-```
-TODO
-```
diff --git a/src/aipass/skills/.seedgo/bypass.json b/src/aipass/skills/.seedgo/bypass.json
index 184e9e23..f9c93108 100644
--- a/src/aipass/skills/.seedgo/bypass.json
+++ b/src/aipass/skills/.seedgo/bypass.json
@@ -6,12 +6,12 @@
   },
   "bypass": [
     {
-      "file": ".aipass/skills/telegram/tests/test_response_router.py",
+      "file": "lib/telegram/tests/test_response_router.py",
       "standard": "architecture",
       "reason": "Test file — lives in tests/ by convention, not in the 3-layer app structure. Test files are exempt from layer architecture standard."
     },
     {
-      "file": ".aipass/skills/telegram/tests/test_response_router.py",
+      "file": "lib/telegram/tests/test_response_router.py",
       "standard": "encapsulation",
       "reason": "Test file — imports handler module directly for unit testing. Tests need direct access to monkeypatch module-level attributes and verify handler behavior."
     },
diff --git a/src/aipass/skills/README.md b/src/aipass/skills/README.md
index 94f0afe6..97ed0ca4 100644
--- a/src/aipass/skills/README.md
+++ b/src/aipass/skills/README.md
@@ -104,7 +104,7 @@ Skills are discovered in this order (first match wins for same name):
 
 1. **Project**: `.aipass/skills/` in the current working directory
 2. **Global**: `~/.aipass/skills/` in the user's home directory
-3. **Built-in**: `src/skills/catalog/` in the AIPass codebase
+3. **Built-in**: `src/aipass/skills/lib/` in the AIPass codebase
 
 ## Commands / Usage
 
@@ -124,7 +124,7 @@ drone @skills --help                       # Show help
 ## Directory Structure
 
 ```
-src/skills/
+src/aipass/skills/
   apps/
     skills.py              # Entry point (handle_command)
     modules/
@@ -140,7 +140,7 @@ src/skills/
       validator.py         # Check requirements
       template.py          # Skill templates
     plugins/               # Plugin extensions
-  catalog/                 # Built-in skills (branch_health, drone_commands, github, inbox_check, system_status)
+  lib/                     # Built-in skills (branch_health, drone_commands, github, inbox_check, system_status, telegram)
   templates/               # Skill creation templates
   skills_json/             # JSON tracking directory
   dropbox/                 # External storage sync
diff --git a/src/aipass/skills/apps/handlers/discovery_handler.py b/src/aipass/skills/apps/handlers/discovery_handler.py
index 86644465..8f49474e 100644
--- a/src/aipass/skills/apps/handlers/discovery_handler.py
+++ b/src/aipass/skills/apps/handlers/discovery_handler.py
@@ -39,7 +39,7 @@ def get_search_paths():
     Search order (first match wins for same name):
         1. Current project: .aipass/skills/
         2. Global user: ~/.aipass/skills/
-        3. Built-in: src/skills/catalog/
+        3. Built-in: src/aipass/skills/lib/
 
     Returns:
         list[tuple[Path, str]]: List of (path, source_label) tuples.
@@ -54,8 +54,8 @@ def get_search_paths():
     global_path = Path.home() / ".aipass" / "skills"
     paths.append((global_path, "global"))
 
-    # 3. Built-in catalog
-    builtin_path = Path(__file__).resolve().parent.parent.parent / "catalog"
+    # 3. Built-in lib
+    builtin_path = Path(__file__).resolve().parent.parent.parent / "lib"
     paths.append((builtin_path, "builtin"))
 
     return paths
diff --git a/src/aipass/skills/apps/handlers/template.py b/src/aipass/skills/apps/handlers/template.py
index 9ded5643..989c2e25 100644
--- a/src/aipass/skills/apps/handlers/template.py
+++ b/src/aipass/skills/apps/handlers/template.py
@@ -13,7 +13,7 @@ from aipass.prax import logger
 from aipass.skills.apps.handlers.json import json_handler
 
 
-# Template directory lives at src/skills/templates/
+# Template directory lives at src/aipass/skills/templates/
 TEMPLATES_DIR = Path(__file__).resolve().parent.parent.parent / "templates"
 
 VALID_TYPES = ("markdown_only", "with_handler", "full")
diff --git a/src/aipass/skills/apps/skills.py b/src/aipass/skills/apps/skills.py
index a774988f..d8e75b78 100644
--- a/src/aipass/skills/apps/skills.py
+++ b/src/aipass/skills/apps/skills.py
@@ -123,7 +123,7 @@ def print_help():
     console.print("Search paths (first match wins):")
     console.print("  1. .aipass/skills/           Project-local skills")
     console.print("  2. ~/.aipass/skills/         Global user skills")
-    console.print("  3. src/skills/catalog/       Built-in skills")
+    console.print("  3. src/aipass/skills/lib/     Built-in skills")
 
 
 def _cmd_list():
diff --git a/src/aipass/skills/catalog/.gitkeep b/src/aipass/skills/lib/.gitkeep
similarity index 100%
rename from src/aipass/skills/catalog/.gitkeep
rename to src/aipass/skills/lib/.gitkeep
diff --git a/src/aipass/skills/catalog/branch_health/SKILL.md b/src/aipass/skills/lib/branch_health/SKILL.md
similarity index 100%
rename from src/aipass/skills/catalog/branch_health/SKILL.md
rename to src/aipass/skills/lib/branch_health/SKILL.md
diff --git a/src/aipass/skills/catalog/branch_health/handler.py b/src/aipass/skills/lib/branch_health/handler.py
similarity index 98%
rename from src/aipass/skills/catalog/branch_health/handler.py
rename to src/aipass/skills/lib/branch_health/handler.py
index c9d74b8d..cb6665fd 100644
--- a/src/aipass/skills/catalog/branch_health/handler.py
+++ b/src/aipass/skills/lib/branch_health/handler.py
@@ -3,7 +3,7 @@
 # Name: handler.py - Branch Health skill handler
 # Date: 2026-03-29
 # Version: 1.0.0
-# Category: skills/catalog/branch_health
+# Category: skills/lib/branch_health
 # =============================================
 
 """
@@ -58,7 +58,7 @@ def get_actions():
 
 def _src_root():
     """Return the src/ directory by navigating up from this handler."""
-    # handler.py -> branch_health/ -> catalog/ -> skills/ -> aipass/ -> src/
+    # handler.py -> branch_health/ -> lib/ -> skills/ -> aipass/ -> src/
     return Path(__file__).resolve().parents[4]
 
 
diff --git a/src/aipass/skills/catalog/drone_commands/SKILL.md b/src/aipass/skills/lib/drone_commands/SKILL.md
similarity index 100%
rename from src/aipass/skills/catalog/drone_commands/SKILL.md
rename to src/aipass/skills/lib/drone_commands/SKILL.md
diff --git a/src/aipass/skills/catalog/drone_commands/apps/__init__.py b/src/aipass/skills/lib/drone_commands/apps/__init__.py
similarity index 87%
rename from src/aipass/skills/catalog/drone_commands/apps/__init__.py
rename to src/aipass/skills/lib/drone_commands/apps/__init__.py
index 1db46e55..faa1eed7 100644
--- a/src/aipass/skills/catalog/drone_commands/apps/__init__.py
+++ b/src/aipass/skills/lib/drone_commands/apps/__init__.py
@@ -3,7 +3,7 @@
 # Name: __init__.py - drone_commands apps package
 # Date: 2026-03-07
 # Version: 1.0.0
-# Category: skills/catalog/drone_commands/apps
+# Category: skills/lib/drone_commands/apps
 #
 # CHANGELOG (Max 5 entries):
 #   - v1.0.0 (2026-03-07): Initial implementation
diff --git a/src/aipass/skills/catalog/drone_commands/apps/handlers/__init__.py b/src/aipass/skills/lib/drone_commands/apps/handlers/__init__.py
similarity index 86%
rename from src/aipass/skills/catalog/drone_commands/apps/handlers/__init__.py
rename to src/aipass/skills/lib/drone_commands/apps/handlers/__init__.py
index a38b5733..b9161bf0 100644
--- a/src/aipass/skills/catalog/drone_commands/apps/handlers/__init__.py
+++ b/src/aipass/skills/lib/drone_commands/apps/handlers/__init__.py
@@ -3,7 +3,7 @@
 # Name: __init__.py - drone_commands handlers package
 # Date: 2026-03-07
 # Version: 1.0.0
-# Category: skills/catalog/drone_commands/apps/handlers
+# Category: skills/lib/drone_commands/apps/handlers
 #
 # CHANGELOG (Max 5 entries):
 #   - v1.0.0 (2026-03-07): Initial implementation
diff --git a/src/aipass/skills/catalog/drone_commands/apps/handlers/executor.py b/src/aipass/skills/lib/drone_commands/apps/handlers/executor.py
similarity index 98%
rename from src/aipass/skills/catalog/drone_commands/apps/handlers/executor.py
rename to src/aipass/skills/lib/drone_commands/apps/handlers/executor.py
index a25910ff..d2b12738 100644
--- a/src/aipass/skills/catalog/drone_commands/apps/handlers/executor.py
+++ b/src/aipass/skills/lib/drone_commands/apps/handlers/executor.py
@@ -3,7 +3,7 @@
 # Name: executor.py - Runs drone commands via subprocess
 # Date: 2026-03-07
 # Version: 1.0.0
-# Category: skills/catalog/drone_commands/apps/handlers
+# Category: skills/lib/drone_commands/apps/handlers
 #
 # CHANGELOG (Max 5 entries):
 #   - v1.0.0 (2026-03-07): Initial implementation
diff --git a/src/aipass/skills/catalog/drone_commands/apps/handlers/parser.py b/src/aipass/skills/lib/drone_commands/apps/handlers/parser.py
similarity index 98%
rename from src/aipass/skills/catalog/drone_commands/apps/handlers/parser.py
rename to src/aipass/skills/lib/drone_commands/apps/handlers/parser.py
index 74737a98..b79748aa 100644
--- a/src/aipass/skills/catalog/drone_commands/apps/handlers/parser.py
+++ b/src/aipass/skills/lib/drone_commands/apps/handlers/parser.py
@@ -3,7 +3,7 @@
 # Name: parser.py - Parses drone command output
 # Date: 2026-03-07
 # Version: 1.0.0
-# Category: skills/catalog/drone_commands/apps/handlers
+# Category: skills/lib/drone_commands/apps/handlers
 #
 # CHANGELOG (Max 5 entries):
 #   - v1.0.0 (2026-03-07): Initial implementation
diff --git a/src/aipass/skills/catalog/drone_commands/apps/modules/__init__.py b/src/aipass/skills/lib/drone_commands/apps/modules/__init__.py
similarity index 86%
rename from src/aipass/skills/catalog/drone_commands/apps/modules/__init__.py
rename to src/aipass/skills/lib/drone_commands/apps/modules/__init__.py
index 310625a8..cb856a82 100644
--- a/src/aipass/skills/catalog/drone_commands/apps/modules/__init__.py
+++ b/src/aipass/skills/lib/drone_commands/apps/modules/__init__.py
@@ -3,7 +3,7 @@
 # Name: __init__.py - drone_commands modules package
 # Date: 2026-03-07
 # Version: 1.0.0
-# Category: skills/catalog/drone_commands/apps/modules
+# Category: skills/lib/drone_commands/apps/modules
 #
 # CHANGELOG (Max 5 entries):
 #   - v1.0.0 (2026-03-07): Initial implementation
diff --git a/src/aipass/skills/catalog/drone_commands/apps/modules/command_runner.py b/src/aipass/skills/lib/drone_commands/apps/modules/command_runner.py
similarity index 98%
rename from src/aipass/skills/catalog/drone_commands/apps/modules/command_runner.py
rename to src/aipass/skills/lib/drone_commands/apps/modules/command_runner.py
index ba34f1dd..a52ab77e 100644
--- a/src/aipass/skills/catalog/drone_commands/apps/modules/command_runner.py
+++ b/src/aipass/skills/lib/drone_commands/apps/modules/command_runner.py
@@ -3,7 +3,7 @@
 # Name: command_runner.py - Orchestrates drone command execution
 # Date: 2026-03-07
 # Version: 1.0.0
-# Category: skills/catalog/drone_commands/apps/modules
+# Category: skills/lib/drone_commands/apps/modules
 #
 # CHANGELOG (Max 5 entries):
 #   - v1.0.0 (2026-03-07): Initial implementation
diff --git a/src/aipass/skills/catalog/drone_commands/handler.py b/src/aipass/skills/lib/drone_commands/handler.py
similarity index 98%
rename from src/aipass/skills/catalog/drone_commands/handler.py
rename to src/aipass/skills/lib/drone_commands/handler.py
index 88f679e4..dd303535 100644
--- a/src/aipass/skills/catalog/drone_commands/handler.py
+++ b/src/aipass/skills/lib/drone_commands/handler.py
@@ -3,7 +3,7 @@
 # Name: handler.py - Drone Commands skill handler
 # Date: 2026-03-07
 # Version: 1.0.0
-# Category: skills/catalog/drone_commands
+# Category: skills/lib/drone_commands
 #
 # CHANGELOG (Max 5 entries):
 #   - v1.0.0 (2026-03-07): Initial implementation
diff --git a/src/aipass/skills/catalog/github/SKILL.md b/src/aipass/skills/lib/github/SKILL.md
similarity index 100%
rename from src/aipass/skills/catalog/github/SKILL.md
rename to src/aipass/skills/lib/github/SKILL.md
diff --git a/src/aipass/skills/catalog/inbox_check/SKILL.md b/src/aipass/skills/lib/inbox_check/SKILL.md
similarity index 100%
rename from src/aipass/skills/catalog/inbox_check/SKILL.md
rename to src/aipass/skills/lib/inbox_check/SKILL.md
diff --git a/src/aipass/skills/catalog/inbox_check/handler.py b/src/aipass/skills/lib/inbox_check/handler.py
similarity index 98%
rename from src/aipass/skills/catalog/inbox_check/handler.py
rename to src/aipass/skills/lib/inbox_check/handler.py
index c5d23ff3..ed2a3935 100644
--- a/src/aipass/skills/catalog/inbox_check/handler.py
+++ b/src/aipass/skills/lib/inbox_check/handler.py
@@ -3,7 +3,7 @@
 # Name: handler.py - Inbox Check skill handler
 # Date: 2026-03-29
 # Version: 1.0.0
-# Category: skills/catalog/inbox_check
+# Category: skills/lib/inbox_check
 # =============================================
 
 """
@@ -57,7 +57,7 @@ def get_actions():
 
 def _src_root():
     """Return the src/ directory by navigating up from this handler."""
-    # handler.py -> inbox_check/ -> catalog/ -> skills/ -> aipass/ -> src/
+    # handler.py -> inbox_check/ -> lib/ -> skills/ -> aipass/ -> src/
     return Path(__file__).resolve().parents[4]
 
 
diff --git a/src/aipass/skills/catalog/system_status/SKILL.md b/src/aipass/skills/lib/system_status/SKILL.md
similarity index 100%
rename from src/aipass/skills/catalog/system_status/SKILL.md
rename to src/aipass/skills/lib/system_status/SKILL.md
diff --git a/src/aipass/skills/catalog/system_status/handler.py b/src/aipass/skills/lib/system_status/handler.py
similarity index 99%
rename from src/aipass/skills/catalog/system_status/handler.py
rename to src/aipass/skills/lib/system_status/handler.py
index 072ab15e..e2e5cc54 100644
--- a/src/aipass/skills/catalog/system_status/handler.py
+++ b/src/aipass/skills/lib/system_status/handler.py
@@ -3,7 +3,7 @@
 # Name: handler.py - System Status skill handler
 # Date: 2026-03-07
 # Version: 1.0.0
-# Category: skills/catalog/system_status
+# Category: skills/lib/system_status
 # =============================================
 
 """
diff --git a/src/aipass/skills/.aipass/skills/telegram/SKILL.md b/src/aipass/skills/lib/telegram/SKILL.md
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/SKILL.md
rename to src/aipass/skills/lib/telegram/SKILL.md
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/__init__.py b/src/aipass/skills/lib/telegram/apps/__init__.py
similarity index 82%
rename from src/aipass/skills/.aipass/skills/telegram/apps/__init__.py
rename to src/aipass/skills/lib/telegram/apps/__init__.py
index 54987023..259abe5d 100644
--- a/src/aipass/skills/.aipass/skills/telegram/apps/__init__.py
+++ b/src/aipass/skills/lib/telegram/apps/__init__.py
@@ -3,5 +3,5 @@
 # Name: __init__.py - telegram apps package
 # Date: 2026-03-07
 # Version: 1.0.0
-# Category: skills/catalog/telegram/apps
+# Category: skills/lib/telegram/apps
 # =============================================
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/__init__.py b/src/aipass/skills/lib/telegram/apps/handlers/__init__.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/__init__.py
rename to src/aipass/skills/lib/telegram/apps/handlers/__init__.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/base_bot.py b/src/aipass/skills/lib/telegram/apps/handlers/base_bot.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/base_bot.py
rename to src/aipass/skills/lib/telegram/apps/handlers/base_bot.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/bot_factory.py b/src/aipass/skills/lib/telegram/apps/handlers/bot_factory.py
similarity index 99%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/bot_factory.py
rename to src/aipass/skills/lib/telegram/apps/handlers/bot_factory.py
index 4001b14a..c1c9a0f0 100644
--- a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/bot_factory.py
+++ b/src/aipass/skills/lib/telegram/apps/handlers/bot_factory.py
@@ -3,7 +3,7 @@
 # Name: bot_factory.py - Bot creation and deletion factory
 # Date: 2026-06-15
 # Version: 1.0.0
-# Category: skills/catalog/telegram/apps/handlers
+# Category: skills/lib/telegram/apps/handlers
 #
 # CHANGELOG (Max 5 entries):
 #   - v1.0.0 (2026-06-15): Ported from Dev-Pass — rewired registry, logger, config, base_bot path
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/bot_operations.py b/src/aipass/skills/lib/telegram/apps/handlers/bot_operations.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/bot_operations.py
rename to src/aipass/skills/lib/telegram/apps/handlers/bot_operations.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/bot_registry.py b/src/aipass/skills/lib/telegram/apps/handlers/bot_registry.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/bot_registry.py
rename to src/aipass/skills/lib/telegram/apps/handlers/bot_registry.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/botfather_client.py b/src/aipass/skills/lib/telegram/apps/handlers/botfather_client.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/botfather_client.py
rename to src/aipass/skills/lib/telegram/apps/handlers/botfather_client.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/branch_plugin.py b/src/aipass/skills/lib/telegram/apps/handlers/branch_plugin.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/branch_plugin.py
rename to src/aipass/skills/lib/telegram/apps/handlers/branch_plugin.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/config.py b/src/aipass/skills/lib/telegram/apps/handlers/config.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/config.py
rename to src/aipass/skills/lib/telegram/apps/handlers/config.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/file_handler.py b/src/aipass/skills/lib/telegram/apps/handlers/file_handler.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/file_handler.py
rename to src/aipass/skills/lib/telegram/apps/handlers/file_handler.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/log_streamer.py b/src/aipass/skills/lib/telegram/apps/handlers/log_streamer.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/log_streamer.py
rename to src/aipass/skills/lib/telegram/apps/handlers/log_streamer.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/notifier.py b/src/aipass/skills/lib/telegram/apps/handlers/notifier.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/notifier.py
rename to src/aipass/skills/lib/telegram/apps/handlers/notifier.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/response_router.py b/src/aipass/skills/lib/telegram/apps/handlers/response_router.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/response_router.py
rename to src/aipass/skills/lib/telegram/apps/handlers/response_router.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/telegram_standards.py b/src/aipass/skills/lib/telegram/apps/handlers/telegram_standards.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/telegram_standards.py
rename to src/aipass/skills/lib/telegram/apps/handlers/telegram_standards.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/handlers/tmux_manager.py b/src/aipass/skills/lib/telegram/apps/handlers/tmux_manager.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/apps/handlers/tmux_manager.py
rename to src/aipass/skills/lib/telegram/apps/handlers/tmux_manager.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/apps/modules/__init__.py b/src/aipass/skills/lib/telegram/apps/modules/__init__.py
similarity index 87%
rename from src/aipass/skills/.aipass/skills/telegram/apps/modules/__init__.py
rename to src/aipass/skills/lib/telegram/apps/modules/__init__.py
index 8c07b893..ab029ba0 100644
--- a/src/aipass/skills/.aipass/skills/telegram/apps/modules/__init__.py
+++ b/src/aipass/skills/lib/telegram/apps/modules/__init__.py
@@ -3,7 +3,7 @@
 # Name: __init__.py - telegram modules package
 # Date: 2026-03-07
 # Version: 1.0.0
-# Category: skills/catalog/telegram/apps/modules
+# Category: skills/lib/telegram/apps/modules
 #
 # CHANGELOG (Max 5 entries):
 #   - v1.0.0 (2026-03-07): Initial scaffold
diff --git a/src/aipass/skills/.aipass/skills/telegram/handler.py b/src/aipass/skills/lib/telegram/handler.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/handler.py
rename to src/aipass/skills/lib/telegram/handler.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/telegram-bot@.service b/src/aipass/skills/lib/telegram/telegram-bot@.service
similarity index 93%
rename from src/aipass/skills/.aipass/skills/telegram/telegram-bot@.service
rename to src/aipass/skills/lib/telegram/telegram-bot@.service
index a81f5213..685a6a75 100644
--- a/src/aipass/skills/.aipass/skills/telegram/telegram-bot@.service
+++ b/src/aipass/skills/lib/telegram/telegram-bot@.service
@@ -19,7 +19,7 @@ Wants=network-online.target
 
 [Service]
 Type=simple
-ExecStart=%h/.venv/bin/python3 %h/Projects/AIPass/src/aipass/skills/.aipass/skills/telegram/apps/handlers/base_bot.py --bot-id %i
+ExecStart=%h/.venv/bin/python3 %h/Projects/AIPass/src/aipass/skills/lib/telegram/apps/handlers/base_bot.py --bot-id %i
 WorkingDirectory=%h/Projects/AIPass
 Environment=AIPASS_BOT_ID=%i
 Environment=AIPASS_SESSION_TYPE=telegram
diff --git a/src/aipass/skills/.aipass/skills/telegram/telethon_auth.py b/src/aipass/skills/lib/telegram/telethon_auth.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/telethon_auth.py
rename to src/aipass/skills/lib/telegram/telethon_auth.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/tests/__init__.py b/src/aipass/skills/lib/telegram/tests/__init__.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/tests/__init__.py
rename to src/aipass/skills/lib/telegram/tests/__init__.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/tests/conftest.py b/src/aipass/skills/lib/telegram/tests/conftest.py
similarity index 98%
rename from src/aipass/skills/.aipass/skills/telegram/tests/conftest.py
rename to src/aipass/skills/lib/telegram/tests/conftest.py
index 7da8e307..1e2ea9fd 100644
--- a/src/aipass/skills/.aipass/skills/telegram/tests/conftest.py
+++ b/src/aipass/skills/lib/telegram/tests/conftest.py
@@ -28,7 +28,7 @@ if "AIPASS_TEST_LOG_DIR" not in os.environ:
 import pytest
 
 # Add src/ to path so aipass.* is importable
-_src_root = Path(__file__).resolve().parents[6]  # noqa: E402
+_src_root = Path(__file__).resolve().parents[5]  # noqa: E402
 if str(_src_root) not in sys.path:
     sys.path.insert(0, str(_src_root))
 
diff --git a/src/aipass/skills/.aipass/skills/telegram/tests/test_bot_registry.py b/src/aipass/skills/lib/telegram/tests/test_bot_registry.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/tests/test_bot_registry.py
rename to src/aipass/skills/lib/telegram/tests/test_bot_registry.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/tests/test_botfather_client.py b/src/aipass/skills/lib/telegram/tests/test_botfather_client.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/tests/test_botfather_client.py
rename to src/aipass/skills/lib/telegram/tests/test_botfather_client.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/tests/test_handler_routing.py b/src/aipass/skills/lib/telegram/tests/test_handler_routing.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/tests/test_handler_routing.py
rename to src/aipass/skills/lib/telegram/tests/test_handler_routing.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/tests/test_log_streamer.py b/src/aipass/skills/lib/telegram/tests/test_log_streamer.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/tests/test_log_streamer.py
rename to src/aipass/skills/lib/telegram/tests/test_log_streamer.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/tests/test_multi_bot.py b/src/aipass/skills/lib/telegram/tests/test_multi_bot.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/tests/test_multi_bot.py
rename to src/aipass/skills/lib/telegram/tests/test_multi_bot.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/tests/test_multibot_config.py b/src/aipass/skills/lib/telegram/tests/test_multibot_config.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/tests/test_multibot_config.py
rename to src/aipass/skills/lib/telegram/tests/test_multibot_config.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/tests/test_multibot_integration.py b/src/aipass/skills/lib/telegram/tests/test_multibot_integration.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/tests/test_multibot_integration.py
rename to src/aipass/skills/lib/telegram/tests/test_multibot_integration.py
diff --git a/src/aipass/skills/.aipass/skills/telegram/tests/test_response_router.py b/src/aipass/skills/lib/telegram/tests/test_response_router.py
similarity index 100%
rename from src/aipass/skills/.aipass/skills/telegram/tests/test_response_router.py
rename to src/aipass/skills/lib/telegram/tests/test_response_router.py
diff --git a/src/aipass/skills/templates/full/apps/__init__.py b/src/aipass/skills/templates/full/apps/__init__.py
index 39ea0f03..a46acb3a 100644
--- a/src/aipass/skills/templates/full/apps/__init__.py
+++ b/src/aipass/skills/templates/full/apps/__init__.py
@@ -3,5 +3,5 @@
 # Name: __init__.py - {{SKILL_NAME}} apps package
 # Date: 2026-03-07
 # Version: 1.0.0
-# Category: skills/catalog/{{SKILL_NAME}}/apps
+# Category: skills/{{SKILL_NAME}}/apps
 # =============================================
diff --git a/src/aipass/skills/templates/full/apps/handlers/__init__.py b/src/aipass/skills/templates/full/apps/handlers/__init__.py
index 00bdc3c8..4da904bc 100644
--- a/src/aipass/skills/templates/full/apps/handlers/__init__.py
+++ b/src/aipass/skills/templates/full/apps/handlers/__init__.py
@@ -3,7 +3,7 @@
 # Name: __init__.py - {{SKILL_NAME}} handlers package
 # Date: 2026-03-07
 # Version: 1.0.0
-# Category: skills/catalog/{{SKILL_NAME}}/apps/handlers
+# Category: skills/{{SKILL_NAME}}/apps/handlers
 #
 # CHANGELOG (Max 5 entries):
 #   - v1.0.0 (2026-03-07): Initial scaffold
diff --git a/src/aipass/skills/templates/full/apps/modules/__init__.py b/src/aipass/skills/templates/full/apps/modules/__init__.py
index 37ce0633..9363b004 100644
--- a/src/aipass/skills/templates/full/apps/modules/__init__.py
+++ b/src/aipass/skills/templates/full/apps/modules/__init__.py
@@ -3,7 +3,7 @@
 # Name: __init__.py - {{SKILL_NAME}} modules package
 # Date: 2026-03-07
 # Version: 1.0.0
-# Category: skills/catalog/{{SKILL_NAME}}/apps/modules
+# Category: skills/{{SKILL_NAME}}/apps/modules
 #
 # CHANGELOG (Max 5 entries):
 #   - v1.0.0 (2026-03-07): Initial scaffold
diff --git a/src/aipass/skills/tests/test_discovery.py b/src/aipass/skills/tests/test_discovery.py
index 91acf4af..1f357224 100644
--- a/src/aipass/skills/tests/test_discovery.py
+++ b/src/aipass/skills/tests/test_discovery.py
@@ -142,7 +142,7 @@ class TestParseSimpleValue:
 
 class TestDiscoverSkillsInPath:
     def test_finds_catalog_skills(self):
-        catalog_path = Path(__file__).resolve().parent.parent / "catalog"
+        catalog_path = Path(__file__).resolve().parent.parent / "lib"
         skills = discover_skills_in_path(catalog_path, "builtin")
         names = {s["name"] for s in skills}
         assert "github" in names
@@ -159,7 +159,7 @@ class TestDiscoverSkillsInPath:
             assert skills == []
 
     def test_skill_dict_structure(self):
-        catalog_path = Path(__file__).resolve().parent.parent / "catalog"
+        catalog_path = Path(__file__).resolve().parent.parent / "lib"
         skills = discover_skills_in_path(catalog_path, "builtin")
         for skill in skills:
             assert "name" in skill
@@ -170,7 +170,7 @@ class TestDiscoverSkillsInPath:
             assert "tags" in skill
 
     def test_has_handler_flag(self):
-        catalog_path = Path(__file__).resolve().parent.parent / "catalog"
+        catalog_path = Path(__file__).resolve().parent.parent / "lib"
         skills = discover_skills_in_path(catalog_path, "builtin")
         skill_map = {s["name"]: s for s in skills}
         assert skill_map["github"]["has_handler"] is False
diff --git a/src/aipass/skills/tests/test_lifecycle.py b/src/aipass/skills/tests/test_lifecycle.py
index 7c85cfe9..423ed212 100644
--- a/src/aipass/skills/tests/test_lifecycle.py
+++ b/src/aipass/skills/tests/test_lifecycle.py
@@ -106,7 +106,7 @@ class TestCatalogSkillsLifecycle:
 
     def test_github_skill_full_cycle(self):
         """GitHub (Tier 1): discover -> load -> run returns instructions."""
-        catalog = Path(__file__).resolve().parent.parent / "catalog"
+        catalog = Path(__file__).resolve().parent.parent / "lib"
         skills = discover_skills_in_path(catalog, "builtin")
         github = [s for s in skills if s["name"] == "github"]
         assert len(github) == 1