@namch/agent-assistant 1.1.0 → 1.2.0

package/cli/install.js

@@ -8,6 +8,7 @@
  * - GitHub Copilot
  * - Antigravity (Gemini)
  * - Claude Code
+ * - Codex
  * 
  * Usage:
  *   npx agent-assistant install [tool]
@@ -59,8 +60,10 @@ const TOOLS = {
             agentAssistant: path.join(HOME, '.cursor', 'skills', 'agent-assistant'),
         },
         replacements: {
+            '~/.{TOOL}/skills/agent-assistant/': '~/.cursor/skills/agent-assistant/',
             '{TOOL}/agent-assistant/': 'cursor/skills/agent-assistant/',
             '{TOOL}': 'cursor',
+            '{HOME}': '~',
             '~/.agent/': '~/.cursor/skills/agent-assistant/'
         },
         assets: {
@@ -81,8 +84,11 @@ const TOOLS = {
             vsCodePrompts: getVSCodePromptsFolder(),
         },
         replacements: {
+            '~/.{TOOL}/skills/agent-assistant/': '~/.copilot/skills/agent-assistant/',
             '{TOOL}/agent-assistant/': 'copilot/skills/agent-assistant/',
-            '{TOOL}': 'copilot'
+            '{TOOL}': 'copilot',
+            '{HOME}': '~',
+            '~/.agent/': '~/.copilot/skills/agent-assistant/'
         },
         assets: {
             agentFile: path.join(ROOT, 'code-assistants', 'copilot-assistant', 'agent-assistant.agent.md'),
@@ -103,8 +109,10 @@ const TOOLS = {
             agentAssistant: path.join(HOME, '.gemini', 'antigravity', 'skills', 'agent-assistant'),
         },
         replacements: {
+            '~/.{TOOL}/skills/agent-assistant/': '~/.gemini/antigravity/skills/agent-assistant/',
             '{TOOL}/agent-assistant/': 'gemini/antigravity/skills/agent-assistant/',
             '{TOOL}': 'gemini/antigravity',
+            '{HOME}': '~',
             '~/.agent/': '~/.gemini/antigravity/skills/agent-assistant/'
         },
         assets: {
@@ -123,13 +131,39 @@ const TOOLS = {
             agentAssistant: path.join(HOME, '.claude', 'skills', 'agent-assistant'),
         },
         replacements: {
+            '~/.{TOOL}/skills/agent-assistant/': '~/.claude/skills/agent-assistant/',
             '{TOOL}/agent-assistant/': 'claude/skills/agent-assistant/',
             '{TOOL}': 'claude',
+            '{HOME}': '~',
             '~/.agent/': '~/.claude/skills/agent-assistant/'
         },
         assets: {
             claudeMd: path.join(ROOT, 'code-assistants', 'claude-assistant', 'CLAUDE.md'),
         }
+    },
+    codex: {
+        name: 'Codex',
+        description: 'OpenAI Codex CLI',
+        paths: {
+            home: path.join(HOME, '.codex'),
+            skills: path.join(HOME, '.codex', 'skills'),
+            commands: path.join(HOME, '.codex', 'commands'),
+            agents: path.join(HOME, '.codex', 'agents'),
+            agentAssistant: path.join(HOME, '.codex', 'skills', 'agent-assistant'),
+        },
+        replacements: {
+            '~/.{TOOL}/skills/agent-assistant/': '~/.codex/skills/agent-assistant/',
+            '{TOOL}/agent-assistant/': 'codex/skills/agent-assistant/',
+            '{TOOL}': 'codex',
+            '{HOME}': '~',
+            '~/.agent/': '~/.codex/skills/agent-assistant/'
+        },
+        assets: {
+            codexMd: path.join(ROOT, 'code-assistants', 'codex-assistant', 'CODEX.md'),
+            configToml: path.join(ROOT, 'code-assistants', 'codex-assistant', 'config.toml'),
+            agentTomlDir: path.join(ROOT, 'code-assistants', 'codex-assistant', 'agents'),
+            commandSkillsDir: path.join(ROOT, 'code-assistants', 'codex-assistant', 'skills'),
+        }
     }
 };
 
@@ -332,7 +366,7 @@ function copyWithReplace(src, dest, replacements = {}, trackProgress = true) {
         } else {
             try {
                 // Apply replacements for text files
-                const textExtensions = ['.md', '.txt', '.json', '.mdc', '.yaml', '.yml'];
+                const textExtensions = ['.md', '.txt', '.json', '.mdc', '.yaml', '.yml', '.toml'];
                 const ext = path.extname(entry.name).toLowerCase();
 
                 if (textExtensions.includes(ext)) {
@@ -900,11 +934,18 @@ function installClaude() {
     // --- 1. INSTALL GLOBAL CONFIG (~/.claude) ---
     ensureDir(tool.paths.home);
 
-    // 1.1 CLAUDE.md (Global Instructions)
+    // 1.1 Global Config Files (CLAUDE.md, AGENT.md)
     if (tool.assets.claudeMd && fs.existsSync(tool.assets.claudeMd)) {
         const destFile = path.join(tool.paths.home, 'CLAUDE.md');
         if (copyFileWithReplace(tool.assets.claudeMd, destFile, tool.replacements)) total++;
     }
+    
+    // Copy AGENT.md as well
+    const agentMdSrc = path.join(ROOT, 'AGENT.md');
+    if (fs.existsSync(agentMdSrc)) {
+        const agentMdDest = path.join(tool.paths.home, 'AGENT.md');
+        if (copyFileWithReplace(agentMdSrc, agentMdDest, tool.replacements)) total++;
+    }
 
     // 1.2 Commands (~/.claude/commands)
     ensureDir(tool.paths.commands);
@@ -958,6 +999,181 @@ function installClaude() {
     return total;
 }
 
+function mergeCodexConfig(templatePath, userConfigPath) {
+    // Read template
+    const template = fs.readFileSync(templatePath, 'utf8');
+
+    // Read existing user config or empty string
+    let userConfig = '';
+    if (fs.existsSync(userConfigPath)) {
+        userConfig = fs.readFileSync(userConfigPath, 'utf8');
+    }
+
+    // Our marker: lines between start and end markers
+    const markerStart = '# === AGENT-ASSISTANT START ===';
+    const markerEnd = '# === AGENT-ASSISTANT END ===';
+
+    // Remove old agent-assistant sections from user config
+    const startIdx = userConfig.indexOf(markerStart);
+    const endIdx = userConfig.indexOf(markerEnd);
+    if (startIdx !== -1 && endIdx !== -1) {
+        userConfig = userConfig.substring(0, startIdx).trimEnd() + '\n' +
+                    userConfig.substring(endIdx + markerEnd.length).trimStart();
+    }
+
+    // Update or add project_doc_fallback_filenames in user config
+    const docFallback = 'project_doc_fallback_filenames = ["AGENT.md", "CODEX.md", "AGENTS.md", ".agents.md"]';
+    if (userConfig.includes('project_doc_fallback_filenames')) {
+        userConfig = userConfig.replace(/project_doc_fallback_filenames\s*=\s*\[.*?\]/s, docFallback);
+    } else {
+        // Prepend before first section header or at end of top-level keys
+        const firstSection = userConfig.indexOf('\n[');
+        if (firstSection !== -1) {
+            userConfig = userConfig.substring(0, firstSection) + '\n' + docFallback + '\n' + userConfig.substring(firstSection);
+        } else {
+            userConfig = userConfig.trimEnd() + '\n' + docFallback + '\n';
+        }
+    }
+
+    // Build our managed block
+    let managedBlock = `\n${markerStart}\n`;
+    managedBlock += '# Managed by Agent Assistant — do not edit manually\n\n';
+
+    // Add [features] if not present
+    if (!userConfig.includes('[features]')) {
+        managedBlock += '[features]\nmulti_agent = true\n\n';
+    } else if (!userConfig.includes('multi_agent')) {
+        // Need to add multi_agent to existing [features]
+        userConfig = userConfig.replace('[features]', '[features]\nmulti_agent = true');
+    }
+
+    // Add agents config (always from template)
+    // Extract everything from [agents] onward in template
+    const agentsSectionMatch = template.match(/(\[agents\][\s\S]*)/);
+    if (agentsSectionMatch) {
+        managedBlock += agentsSectionMatch[1] + '\n';
+    }
+
+    managedBlock += `${markerEnd}\n`;
+
+    // Append managed block to user config
+    const finalConfig = userConfig.trimEnd() + '\n' + managedBlock;
+
+    // Write with fsync
+    const fd = fs.openSync(userConfigPath, 'w');
+    fs.writeSync(fd, finalConfig);
+    fs.fsyncSync(fd);
+    fs.closeSync(fd);
+
+    return true;
+}
+
+function installCodex() {
+    const tool = TOOLS.codex;
+    
+    // Reset and estimate progress
+    resetProgress();
+    progressState.total = estimateInstallFiles();
+    
+    console.log(`\n📦 Installing Agent Assistant for ${tool.name}...`);
+    console.log(`   Estimated files: ~${formatNumber(progressState.total)}\n`);
+
+    let total = 0;
+
+    // --- 1. INSTALL GLOBAL CONFIG (~/.codex) ---
+    ensureDir(tool.paths.home);
+
+    // 1.1 Global Config Files (AGENTS.md, CODEX.md, AGENT.md)
+    if (tool.assets.codexMd && fs.existsSync(tool.assets.codexMd)) {
+        const destFile = path.join(tool.paths.home, 'CODEX.md');
+        if (copyFileWithReplace(tool.assets.codexMd, destFile, tool.replacements)) total++;
+
+        // Codex discovers global instructions from ~/.codex/AGENTS.md.
+        const agentsDestFile = path.join(tool.paths.home, 'AGENTS.md');
+        if (copyFileWithReplace(tool.assets.codexMd, agentsDestFile, tool.replacements)) total++;
+    }
+    
+    // Copy AGENT.md as well
+    const agentMdSrc = path.join(ROOT, 'AGENT.md');
+    if (fs.existsSync(agentMdSrc)) {
+        const agentMdDest = path.join(tool.paths.home, 'AGENT.md');
+        if (copyFileWithReplace(agentMdSrc, agentMdDest, tool.replacements)) total++;
+    }
+
+    // 1.2 Codex-native TOML agent configs (~/.codex/agents/)
+    ensureDir(tool.paths.agents);
+    if (tool.assets.agentTomlDir && fs.existsSync(tool.assets.agentTomlDir)) {
+        total += copyWithReplace(tool.assets.agentTomlDir, tool.paths.agents, tool.replacements);
+        console.log(`   ✅ Installed ${fs.readdirSync(tool.assets.agentTomlDir).filter(f => f.endsWith('.toml')).length} Codex agent roles (TOML)`);
+    }
+
+    // 1.3 Merge config.toml (agents + features into user config)
+    if (tool.assets.configToml && fs.existsSync(tool.assets.configToml)) {
+        const userConfigPath = path.join(tool.paths.home, 'config.toml');
+        if (mergeCodexConfig(tool.assets.configToml, userConfigPath)) {
+            total++;
+            console.log(`   ✅ Merged agent config into ${userConfigPath}`);
+        }
+    }
+
+    // 1.4 Commands (~/.codex/commands — for backward compat)
+    ensureDir(tool.paths.commands);
+    total += copyWithReplace(path.join(ROOT, 'commands'), tool.paths.commands, tool.replacements);
+
+    // --- 2. INSTALL CORE FRAMEWORK (~/.codex/skills/agent-assistant) ---
+    if (fs.existsSync(tool.paths.agentAssistant)) {
+        fs.rmSync(tool.paths.agentAssistant, { recursive: true, force: true });
+    }
+    ensureDir(tool.paths.agentAssistant);
+
+    for (const dir of CORE_DIRS) {
+        const srcDir = path.join(ROOT, dir);
+        if (fs.existsSync(srcDir)) {
+            total += copyWithReplace(srcDir, path.join(tool.paths.agentAssistant, dir), tool.replacements);
+        }
+    }
+
+    // Copy backward compat workflows
+    const commandsSrc = path.join(ROOT, 'commands');
+    if (fs.existsSync(commandsSrc)) {
+        total += copyWithReplace(commandsSrc, path.join(tool.paths.agentAssistant, 'workflows'), tool.replacements);
+    }
+
+    // Copy root files
+    for (const file of ROOT_FILES) {
+        const srcFile = path.join(ROOT, file);
+        if (fs.existsSync(srcFile)) {
+            if (copyFileWithReplace(srcFile, path.join(tool.paths.agentAssistant, file), tool.replacements)) total++;
+        }
+    }
+
+    // --- 3. INSTALL SKILLS (~/.codex/skills) ---
+    total += copyWithReplace(path.join(ROOT, 'skills'), tool.paths.skills, tool.replacements);
+
+    // 3.1 Install Codex-specific command skills (from codex-assistant/skills/)
+    if (tool.assets.commandSkillsDir && fs.existsSync(tool.assets.commandSkillsDir)) {
+        total += copyWithReplace(tool.assets.commandSkillsDir, tool.paths.skills, tool.replacements);
+        const cmdSkillCount = fs.readdirSync(tool.assets.commandSkillsDir)
+            .filter(f => fs.statSync(path.join(tool.assets.commandSkillsDir, f)).isDirectory()).length;
+        console.log(`   ✅ Installed ${cmdSkillCount} command skills (Codex-native)`);
+    }
+
+    // Complete progress bar
+    completeProgress();
+    
+    // Print summary with verification
+    printSummary(tool.name, 'install');
+    
+    console.log(`\n   📁 Paths:`);
+    console.log(`      Home:      ${tool.paths.home}`);
+    console.log(`      Agents:    ${tool.paths.agents} (TOML configs)`);
+    console.log(`      Commands:  ${tool.paths.commands}`);
+    console.log(`      Skills:    ${tool.paths.skills}`);
+    console.log(`      Framework: ${tool.paths.agentAssistant}`);
+
+    return total;
+}
+
 // ============================================================================
 // Uninstall Functions
 // ============================================================================
@@ -1198,6 +1414,62 @@ function uninstallClaude() {
     return removed;
 }
 
+function uninstallCodex() {
+    const tool = TOOLS.codex;
+    
+    // Reset progress
+    resetProgress();
+    progressState.total = 6;
+    
+    console.log(`\n🗑️  Uninstalling Agent Assistant from ${tool.name}...`);
+    console.log(`   This will remove the framework while preserving user skills.\n`);
+
+    let removed = 0;
+
+    // 1. Remove Global Config
+    const codexMd = path.join(tool.paths.home, 'CODEX.md');
+    if (removeFile(codexMd)) {
+        removed++;
+    }
+
+    // Remove AGENTS.md (Codex primary instruction file)
+    const agentsMd = path.join(tool.paths.home, 'AGENTS.md');
+    if (removeFile(agentsMd)) {
+        removed++;
+    }
+
+    // Remove AGENT.md
+    const agentMd = path.join(tool.paths.home, 'AGENT.md');
+    if (removeFile(agentMd)) {
+        removed++;
+    }
+
+    // 2. Remove Commands
+    if (removeDir(tool.paths.commands)) {
+        removed++;
+    }
+
+    // 3. Remove Native Agents
+    if (removeDir(tool.paths.agents)) {
+        removed++;
+    }
+
+    // 4. Remove Core Framework
+    if (removeDir(tool.paths.agentAssistant)) {
+        removed++;
+    }
+
+    // Complete progress bar
+    completeProgress();
+    
+    // Print summary
+    printSummary(tool.name, 'uninstall');
+    
+    console.log(`\n   ℹ️  User skills preserved at: ${tool.paths.skills}`);
+
+    return removed;
+}
+
 // ============================================================================
 // CLI Interface
 // ============================================================================
@@ -1219,7 +1491,7 @@ function printUsage() {
 Usage: npx agent-assistant <command> [options]
 
 Commands:
-  install [tool]     Install for a specific tool (cursor, copilot, antigravity)
+  install [tool]     Install for a specific tool (cursor, copilot, antigravity, claude, codex)
   install --all      Install for all supported tools
   uninstall [tool]   Uninstall from a specific tool
   list               List supported tools and installation status
@@ -1270,6 +1542,14 @@ function listTools() {
                     details.push('CLAUDE.md');
                 }
             }
+            if (key === 'codex') {
+                if (fs.existsSync(path.join(tool.paths.home, 'AGENTS.md'))) {
+                    details.push('AGENTS.md');
+                }
+                if (fs.existsSync(path.join(tool.paths.home, 'CODEX.md'))) {
+                    details.push('CODEX.md');
+                }
+            }
             if (details.length > 0) {
                 console.log(`               ${' '.padEnd(25)} (${details.join(', ')})`);
             }
@@ -1290,10 +1570,11 @@ async function promptToolSelection() {
         console.log('  2. GitHub Copilot');
         console.log('  3. Antigravity (Gemini)');
         console.log('  4. Claude Code');
-        console.log('  5. All tools');
+        console.log('  5. Codex');
+        console.log('  6. All tools');
         console.log('  0. Cancel\n');
 
-        rl.question('Enter your choice (0-5): ', (answer) => {
+        rl.question('Enter your choice (0-6): ', (answer) => {
             rl.close();
             resolve(answer.trim());
         });
@@ -1317,16 +1598,20 @@ async function interactiveInstall() {
             installClaude();
             break;
         case '5':
+            installCodex();
+            break;
+        case '6':
             installCursor();
             installCopilot();
             installAntigravity();
             installClaude();
+            installCodex();
             break;
         case '0':
             console.log('\n❌ Installation cancelled.\n');
             break;
         default:
-            console.log('\n❌ Invalid choice. Please enter 0-5.\n');
+            console.log('\n❌ Invalid choice. Please enter 0-6.\n');
     }
 }
 
@@ -1358,6 +1643,7 @@ async function main() {
                 totalFiles += installCopilot();
                 totalFiles += installAntigravity();
                 totalFiles += installClaude();
+                totalFiles += installCodex();
                 
                 const duration = ((Date.now() - startTime) / 1000).toFixed(2);
                 console.log('\n' + '═'.repeat(60));
@@ -1373,11 +1659,13 @@ async function main() {
                 installAntigravity();
             } else if (target === 'claude' || target === 'claude-code') {
                 installClaude();
+            } else if (target === 'codex') {
+                installCodex();
             } else if (!target) {
                 await interactiveInstall();
             } else {
                 console.log(`❌ Unknown tool: ${target}`);
-                console.log('   Supported tools: cursor, copilot, antigravity, claude');
+                console.log('   Supported tools: cursor, copilot, antigravity, claude, codex');
             }
             break;
 
@@ -1388,6 +1676,7 @@ async function main() {
                 uninstallCopilot();
                 uninstallAntigravity();
                 uninstallClaude();
+                uninstallCodex();
                 
                 const duration = ((Date.now() - startTime) / 1000).toFixed(2);
                 console.log('\n' + '═'.repeat(60));
@@ -1402,8 +1691,10 @@ async function main() {
                 uninstallAntigravity();
             } else if (target === 'claude' || target === 'claude-code') {
                 uninstallClaude();
+            } else if (target === 'codex') {
+                uninstallCodex();
             } else {
-                console.log(`❌ Please specify a tool: cursor, copilot, antigravity, claude, or --all`);
+                console.log(`❌ Please specify a tool: cursor, copilot, antigravity, claude, codex, or --all`);
             }
             break;
 

package/cli/install.test.js.example

@@ -99,7 +99,7 @@ describe('CLI Installer', () => {
     describe('Input Validation', () => {
         test('should reject invalid tool names', () => {
             // Test that invalid tools are rejected
-            // const validTools = ['cursor', 'copilot', 'antigravity', 'gemini', 'claude', 'claude-code'];
+            // const validTools = ['cursor', 'copilot', 'antigravity', 'gemini', 'claude', 'claude-code', 'codex'];
             // const invalidTools = ['invalid', '../path', '', null];
             assert.ok(true, 'Test placeholder');
         });

package/code-assistants/antigravity-assistant/AntigravityGlobal.agent.md

@@ -1,11 +1,11 @@
 ```chatagent
 ---
-name: Antigravity Assistant
+name: Agent Assistant
 description: Central Orchestration Brain for Multi-Agent System. Delegates through Commands → Agents → Skills.
 tools: all
 priority: 1000
 compliance: STRICT
-commands: [cook, fix, plan, debug, test, review, docs, design, deploy, report]
+commands: [cook, fix, plan, debug, test, review, docs, design, deploy, report, brainstorm, ask, code]
 handoffs:
   - label: "🚀 Cook"
     prompt: "/cook:hard "
@@ -29,77 +29,124 @@ handoffs:
     prompt: "/report "
 ---
 
-# ⚡ AGENT ASSISTANT v2.0
+# ⚡ AGENT ASSISTANT — ORCHESTRATOR PROTOCOL
 
-> **LOAD**: `{HOME}/.gemini/antigravity/skills/agent-assistant/rules/CORE.md`
+> ⛔ **MANDATORY BOOT SEQUENCE** — EXECUTE BEFORE ANY OTHER ACTION
+> 
+> 1. **READ NOW**: `~/.gemini/antigravity/skills/agent-assistant/rules/CORE.md`
+> 2. **INTERNALIZE**: All 10 Laws, TIERED EXECUTION, PROHIBITIONS
+> 3. **ACTIVATE**: Orchestrator mode (delegate, NEVER implement)
+>
+> **FAILURE TO LOAD CORE.md = PROTOCOL VIOLATION**
 
-## 🆔 IDENTITY
+---
+
+## 🆔 IDENTITY — ABSOLUTE BINDING
 
 ```
-┌─────────────────────────────────────────────────────────────────┐
-│  YOU ARE THE ORCHESTRATOR                                       │
-│  ✅ DO: Delegate, coordinate, verify                            │
-│  ❌ NEVER: Write code, debug, test, design directly             │
-└─────────────────────────────────────────────────────────────────┘
+╔═══════════════════════════════════════════════════════════════════════════════╗
+║  YOU ARE THE ORCHESTRATOR — NOT AN IMPLEMENTER                                 ║
+║                                                                                ║
+║  ✅ YOU DO: Delegate, coordinate, verify, synthesize                          ║
+║  ❌ YOU NEVER: Write code, debug, test, design, or implement directly         ║
+║                                                                                ║
+║  🚨 EVERY TIME you're about to DO something → STOP → DELEGATE instead         ║
+╚═══════════════════════════════════════════════════════════════════════════════╝
 ```
 
-## 📂 PATHS
+**This is your ONLY role. There are NO exceptions.**
+
+---
+
+## 📂 PATHS (CRITICAL — Memorize These)
 
 ```
-COMMANDS = {HOME}/.gemini/antigravity/skills/agent-assistant/commands/
-AGENTS   = {HOME}/.gemini/antigravity/skills/agent-assistant/agents/
-SKILLS   = {HOME}/.gemini/antigravity/skills/
-RULES    = {HOME}/.gemini/antigravity/skills/agent-assistant/rules/
+COMMANDS = ~/.gemini/antigravity/skills/agent-assistant/commands/
+AGENTS   = ~/.gemini/antigravity/skills/agent-assistant/agents/
+SKILLS   = ~/.gemini/antigravity/skills/
+RULES    = ~/.gemini/antigravity/skills/agent-assistant/rules/
 REPORTS  = ./reports/
 ```
 
-## 🌐 LANGUAGE
+---
+
+## 🌐 LANGUAGE COMPLIANCE
 
-- Response → **Same as user's language**
-- Code/comments → **Always English**
-- Files in `./reports/`, `./documents/` → **Always English**
+| Context | Language |
+|---------|----------|
+| Response to user | **Same as user's language** |
+| Code & comments | **Always English** |
+| Files in `./reports/`, `./documents/` | **Always English** |
+
+---
 
 ## 🎯 COMMAND ROUTING
 
-| Input | Route |
-|-------|-------|
-| `/cook`, `/fix`, `/plan`, `/debug`, `/test`, `/review`, `/docs`, `/design`, `/deploy`, `/report` | `commands/{cmd}.md` → `commands/{cmd}/{variant}.md` |
+### Explicit Commands
+| Input | Action |
+|-------|--------|
+| `/cook`, `/cook:hard`, `/cook:fast` | Load `commands/cook.md` → route to variant |
+| `/fix`, `/fix:hard`, `/fix:fast` | Load `commands/fix.md` → route to variant |
+| `/plan`, `/debug`, `/test`, `/review` | Load `commands/{cmd}.md` |
+| `/docs`, `/design`, `/deploy`, `/report` | Load `commands/{cmd}.md` |
+
+### Natural Language Detection
+| User Says | Route To |
+|-----------|----------|
+| "implement", "build", "create" | `/cook` or `/code` |
+| "fix", "bug", "error" | `/fix` |
+| "plan", "strategy" | `/plan` |
+| "test", "write tests" | `/test` |
 
-**Natural language**: "implement" → `/code` | "fix/bug" → `/fix` | "plan" → `/plan`
+---
 
-## 🔀 TIERED EXECUTION
+## 🔀 TIERED EXECUTION — MANDATORY
 
-| Tier | When | Action |
-|------|------|--------|
+| Tier | Condition | Action |
+|------|-----------|--------|
 | **TIER 1** | Agent Tool exists | **MUST** use Agent Tool |
-| **TIER 2** | Tool missing/error | EMBODY (fallback only) |
+| **TIER 2** | Tool missing/error | EMBODY agent (fallback only) |
+
+### ❌ FORBIDDEN
+- Using TIER 2 when TIER 1 is available
+- Implementing without delegation
+
+---
 
 ## ⛔ PROHIBITIONS
 
-| ❌ Forbidden | ✅ Do Instead |
-|--------------|---------------|
+| ❌ NEVER | ✅ INSTEAD |
+|----------|-----------|
 | Write code | Delegate to `backend-engineer` or `frontend-engineer` |
 | Debug | Delegate to `debugger` |
 | Test | Delegate to `tester` |
 | Skip phases | Follow exact order |
 
-## ✅ SELF-CHECK
+---
+
+## ✅ SELF-CHECK — Before EVERY Response
 
 ```
-□ Am I DELEGATING (not executing)?
+□ Am I about to WRITE code? → STOP → Delegate
+□ Am I about to DEBUG? → STOP → Delegate to debugger  
 □ Am I following WORKFLOW ORDER?
 □ Am I responding in USER'S LANGUAGE?
 ```
 
+---
+
 ## 📚 LOAD ON DEMAND
 
-| Situation | Load from RULES/ |
-|-----------|------------------|
-| Running phases | `PHASES.md` |
-| Delegating | `AGENTS.md` |
-| Skill resolution | `SKILLS.md` |
-| Error occurred | `ERRORS.md` |
-| Quick lookup | `REFERENCE.md` |
+| Situation | Load |
+|-----------|------|
+| Running phases | `rules/PHASES.md` |
+| Delegating | `rules/AGENTS.md` |
+| Skill resolution | `rules/SKILLS.md` |
+| Error occurred | `rules/ERRORS.md` |
+
+---
+
+**🎻 You are the CONDUCTOR. Let SPECIALISTS play their parts.**
 
-**You are the CONDUCTOR. Let SPECIALISTS play their parts.**
+**📖 NOW: Read CORE.md before proceeding.**
 ```