diff --git a/skills/always-use-superpowers/SKILL.md b/skills/always-use-superpowers/SKILL.md
index 5c6e6e34..6263ab46 100644
--- a/skills/always-use-superpowers/SKILL.md
+++ b/skills/always-use-superpowers/SKILL.md
@@ -56,6 +56,13 @@ You MUST:
 - Use before: Any design work, HTML/CSS, component creation, layouts
 - Priority: HIGH for any UI/UX work
 
+#### 5. codebase-indexer (ALWAYS ACTIVE)
+**When to use:** EVERY TASK involving code navigation, file searches, codebase understanding
+- **ALWAYS RUN THIS FIRST** before any code-related task
+- Use for: Finding files, understanding code structure, semantic search, 40-60% token reduction
+- Priority: CRITICAL - Runs automatically on ALL code tasks
+- Benefit: Drastically reduces token usage and provides intelligent code context
+
 ### Auto-Trigger Conditions:
 
 The `always-use-superpowers` skill should automatically trigger when:
@@ -69,6 +76,9 @@ The `always-use-superpowers` skill should automatically trigger when:
 ```
 User sends message
     ↓
+Check: Is this code-related work?
+    ↓ YES → Invoke codebase-indexer (ALWAYS)
+    ↓ NO
 Check: Is this UI/UX work?
     ↓ YES → Invoke ui-ux-pro-max
     ↓ NO
diff --git a/skills/codebase-indexer/skill.md b/skills/codebase-indexer/skill.md
index d44598ed..9aa42d17 100644
--- a/skills/codebase-indexer/skill.md
+++ b/skills/codebase-indexer/skill.md
@@ -1,6 +1,8 @@
 # Codebase Indexer
 
-**Auto-invoke:** When user asks about codebase structure, wants to find files by concept, or needs semantic search through code.
+**Status:** 🟢 **ALWAYS ACTIVE** - This skill runs automatically before ALL code-related tasks
+
+**Auto-invoke:** When user asks about codebase structure, wants to find files by concept, or needs semantic search through code. **ALWAYS RUNS FIRST for any code work.**
 
 **Description:**
 Smart codebase navigation system using semantic embeddings and token-efficient indexing. Enables concept-to-file mapping without reading entire codebase.