moflo 4.9.20 → 4.9.22

package/dist/src/cli/init/moflo-init.js

@@ -15,6 +15,8 @@ import { execSync } from 'child_process';
 import { locateMofloRootPath } from '../services/moflo-require.js';
 import { errorDetail } from '../shared/utils/error-detail.js';
 import { discoverGuidanceDirs, discoverSrcDirs, discoverTestDirs, detectExtensions, renderMofloYaml, } from './moflo-yaml-template.js';
+import { generateClaudeMd as generateMofloSection, MARKER_START, MARKER_END, LEGACY_MARKER_STARTS, LEGACY_MARKER_ENDS, } from './claudemd-generator.js';
+import { DEFAULT_INIT_OPTIONS } from './types.js';
 export { discoverTestDirs };
 // ============================================================================
 // Init
@@ -138,11 +140,10 @@ export async function initMoflo(options) {
     steps.push(syncScripts(projectRoot, force));
     // Step 6: .gitignore entries
     steps.push(updateGitignore(projectRoot));
-    // Step 7: .claude/guidance/moflo-bootstrap.md (subagent bootstrap protocol)
-    steps.push(syncBootstrapGuidance(projectRoot, force));
-    // Step 8: Sync ALL shipped guidance docs from moflo to project
+    // Step 7: Sync ALL shipped guidance docs from moflo to project (includes
+    // moflo-subagents.md — no separate rename to moflo-bootstrap.md, see #939)
     steps.push(...syncAllShippedGuidance(projectRoot, force));
-    // Step 9: Install global `flo` shim so bare `flo` command works without npx
+    // Step 8: Install global `flo` shim so bare `flo` command works without npx
     steps.push(installGlobalFloShim(projectRoot));
     return { steps };
 }
@@ -222,6 +223,16 @@ function generateHooks(root, force, answers) {
                     { "type": "command", "command": gateHook('check-dangerous-command'), "timeout": 2000 },
                     { "type": "command", "command": gateHook('check-before-pr'), "timeout": 2000 }
                 ]
+            },
+            {
+                // #931 — Advisory only; never blocks. TaskCreate REMINDER and the
+                // namespace hint moved here from UserPromptSubmit so they emit only
+                // when Claude is about to spawn an Agent — saves ~90 tokens × every
+                // prompt × every consumer. Routed via gate-hook.mjs so Claude Code's
+                // session_id is forwarded as HOOK_SESSION_ID, enabling per-actor
+                // single-shot emission (mirror of #879's record-memory-searched fix).
+                "matcher": "^Agent$",
+                "hooks": [{ "type": "command", "command": gateHook('check-before-agent'), "timeout": 2000 }]
             }
         ],
         "PostToolUse": [
@@ -252,12 +263,16 @@ function generateHooks(root, force, answers) {
                 "hooks": [{ "type": "command", "command": gateHook('record-skill-run'), "timeout": 2000 }]
             },
             {
+                // Anchored alternation — Claude Code anchors hook matchers (`^…$` semantics),
+                // so a bare `mcp__moflo__memory_` never matches any real MCP tool name and the
+                // hook silently no-ops (#929 regression). The explicit suffix list keeps the
+                // matcher narrow while catching every memory_* tool we ship.
                 // Use gateHook (not gate) so the wrapper forwards Claude Code's session_id as
                 // HOOK_SESSION_ID — record-memory-searched needs this to mark the per-actor map
                 // (memorySearchedBy[sid]) that check-before-read consults under #838's per-actor gating.
                 // Without it, the legacy boolean is set but the per-actor map stays empty, and the gate
                 // blocks every Read forever within the turn (issue #879).
-                "matcher": "mcp__moflo__memory_",
+                "matcher": "^mcp__moflo__memory_(search|retrieve|list|stats|store)$",
                 "hooks": [{ "type": "command", "command": gateHook('record-memory-searched'), "timeout": 3000 }]
             },
             {
@@ -272,11 +287,13 @@ function generateHooks(root, force, answers) {
                 ]
             },
             {
-                // prompt-reminder is REQUIRED to reset memorySearched/memorySearchedBy on each
-                // new prompt and reclassify memoryRequired. Without it, gate state leaks across
-                // prompts. Separate hook entry so a prompt-hook.mjs exception doesn't skip the reset.
+                // prompt-state-reset is REQUIRED to reset memorySearched/memorySearchedBy on
+                // each new prompt and reclassify memoryRequired. Without it, gate state leaks
+                // across prompts. Separate hook entry so a prompt-hook.mjs exception doesn't
+                // skip the reset. Idempotent state reset only — no emission, no
+                // interactionCount increment (#931 dedupe).
                 "hooks": [
-                    { "type": "command", "command": gateHook('prompt-reminder'), "timeout": 3000 }
+                    { "type": "command", "command": gateHook('prompt-state-reset'), "timeout": 3000 }
                 ]
             }
         ],
@@ -381,24 +398,16 @@ function generateSkill(root, force) {
 // ============================================================================
 // Step 4: CLAUDE.md MoFlo section
 // ============================================================================
-// Markers for idempotent CLAUDE.md injection — keep in sync with claudemd-generator.ts
-const MOFLO_MARKER = '<!-- MOFLO:INJECTED:START -->';
-const MOFLO_MARKER_END = '<!-- MOFLO:INJECTED:END -->';
-// Also detect legacy markers so we can replace them
-const LEGACY_MARKERS = ['<!-- MOFLO:START -->', '<!-- MOFLO:SUBAGENT-PROTOCOL:START -->'];
-const LEGACY_MARKERS_END = ['<!-- MOFLO:END -->', '<!-- MOFLO:SUBAGENT-PROTOCOL:END -->'];
-function generateClaudeMd(root, force) {
+function generateClaudeMd(root, _force) {
     const claudeMdPath = path.join(root, 'CLAUDE.md');
     let existing = '';
     if (fs.existsSync(claudeMdPath)) {
         existing = fs.readFileSync(claudeMdPath, 'utf-8');
-        // Check for current or legacy markers
-        const allStartMarkers = [MOFLO_MARKER, ...LEGACY_MARKERS];
-        const allEndMarkers = [MOFLO_MARKER_END, ...LEGACY_MARKERS_END];
+        // Strip current or legacy MoFlo block so we can re-inject the latest content.
+        const allStartMarkers = [MARKER_START, ...LEGACY_MARKER_STARTS];
+        const allEndMarkers = [MARKER_END, ...LEGACY_MARKER_ENDS];
         for (let i = 0; i < allStartMarkers.length; i++) {
             if (existing.includes(allStartMarkers[i])) {
-                // Always strip the existing section so we can re-inject the latest version.
-                // This ensures CLAUDE.md stays current when moflo updates its injected content.
                 const startIdx = existing.indexOf(allStartMarkers[i]);
                 const endIdx = existing.indexOf(allEndMarkers[i]);
                 if (endIdx > startIdx) {
@@ -407,60 +416,14 @@ function generateClaudeMd(root, force) {
             }
         }
     }
-    // Minimal injection — just enough for Claude to work with moflo.
-    // All detailed docs live in .claude/guidance/shipped/moflo-core-guidance.md.
-    const mofloSection = `
-${MOFLO_MARKER}
-## MoFlo — AI Agent Orchestration
-
-This project uses [MoFlo](https://github.com/eric-cielo/moflo) for AI-assisted development spells.
-
-### FIRST ACTION ON EVERY PROMPT: Search Memory
-
-Your first tool call for every new user prompt MUST be a memory search. Do this BEFORE Glob, Grep, Read, or any file exploration.
-
-\`\`\`
-mcp__moflo__memory_search — query: "<task description>", namespace: "guidance" or "patterns" or "learnings" or "code-map" or "tests"
-\`\`\`
-
-Search \`guidance\`, \`patterns\`, and \`learnings\` namespaces on every prompt. Search \`code-map\` when navigating the codebase, \`tests\` when looking for test inventory or coverage.
-When the user asks you to remember something: \`mcp__moflo__memory_store\` with namespace \`learnings\`.
-
-### Spell Gates (enforced automatically)
-
-- **Memory-first**: Must search memory before Glob/Grep/Read
-- **TaskCreate-first**: Must call TaskCreate before spawning Agent tool
-- **Task Icons**: \`TaskCreate\` MUST use ICON+[Role] format — see \`.claude/guidance/moflo-task-icons.md\`
-
-### MCP Tools (preferred over CLI)
-
-| Tool | Purpose |
-|------|---------|
-| \`mcp__moflo__memory_search\` | Semantic search across indexed knowledge |
-| \`mcp__moflo__memory_store\` | Store patterns and decisions |
-| \`mcp__moflo__hooks_route\` | Route task to optimal agent type |
-| \`mcp__moflo__hooks_pre-task\` | Record task start |
-| \`mcp__moflo__hooks_post-task\` | Record task completion for learning |
-
-### CLI Fallback
-
-\`\`\`bash
-flo-search "[query]" --namespace guidance   # Semantic search
-flo doctor --fix                             # Health check
-\`\`\`
-
-### Full Reference
-
-For CLI commands, hooks, agents, swarm config, memory commands, and moflo.yaml options, see:
-\`.claude/guidance/shipped/moflo-core-guidance.md\`
-${MOFLO_MARKER_END}
-`;
-    const finalContent = existing.trimEnd() + '\n' + mofloSection;
+    // Single source of truth: claudemd-generator.ts owns the section content.
+    const canonical = generateMofloSection(DEFAULT_INIT_OPTIONS);
+    const finalContent = existing.trimEnd() + '\n\n' + canonical;
     fs.writeFileSync(claudeMdPath, finalContent, 'utf-8');
     return {
         name: 'CLAUDE.md',
         status: existing ? 'updated' : 'created',
-        detail: 'MoFlo section injected (~35 lines)',
+        detail: 'MoFlo section injected (~22 lines)',
     };
 }
 // ============================================================================
@@ -561,48 +524,10 @@ function updateGitignore(root) {
     return { name: '.gitignore', status: 'updated', detail: `Added: ${toAdd.join(', ')}` };
 }
 // ============================================================================
-// Step 7: .claude/guidance/moflo-bootstrap.md
-// Copies the agent bootstrap guidance to the project so subagents can read it
-// from disk without requiring memory search.
-// ============================================================================
-function syncBootstrapGuidance(root, force) {
-    const guidanceDir = path.join(root, '.claude', 'guidance');
-    const targetFile = path.join(guidanceDir, 'moflo-bootstrap.md');
-    const candidates = [
-        path.join(root, 'node_modules', 'moflo', '.claude', 'guidance', 'shipped', 'moflo-subagents.md'),
-        // Anchor on moflo's own package root (covers dev + installed; #782).
-        ...mofloRootJoin('.claude', 'guidance', 'shipped', 'moflo-subagents.md'),
-    ];
-    const sourceFile = candidates.find(f => { try {
-        return fs.existsSync(f);
-    }
-    catch {
-        return false;
-    } });
-    if (!sourceFile) {
-        return { name: 'guidance/moflo-bootstrap.md', status: 'skipped', detail: 'Source bootstrap not found' };
-    }
-    // Check if target exists and is up to date
-    if (fs.existsSync(targetFile) && !force) {
-        if (!isStale(sourceFile, targetFile)) {
-            return { name: 'guidance/moflo-bootstrap.md', status: 'skipped', detail: 'Already up to date' };
-        }
-    }
-    // Read source and prepend header
-    const content = fs.readFileSync(sourceFile, 'utf-8');
-    const header = `<!-- AUTO-GENERATED by moflo init. Do not edit — changes will be overwritten on next init. -->\n<!-- Source: moflo/.claude/guidance/shipped/moflo-subagents.md -->\n<!-- To customize, create your own project-specific guidance in .claude/guidance/. -->\n\n`;
-    fs.mkdirSync(guidanceDir, { recursive: true });
-    fs.writeFileSync(targetFile, header + content, 'utf-8');
-    return {
-        name: 'guidance/moflo-bootstrap.md',
-        status: fs.existsSync(targetFile) ? 'updated' : 'created',
-        detail: 'Subagent bootstrap protocol'
-    };
-}
-// ============================================================================
-// Step 8: Sync ALL shipped guidance docs
+// Step 7: Sync ALL shipped guidance docs
 // Discovers all .md files in moflo/.claude/guidance/shipped/ and copies them
-// to project .claude/guidance/. Skips moflo-subagents.md (handled by Step 7).
+// to project .claude/guidance/ (including moflo-subagents.md — see #939, prior
+// versions renamed it to moflo-bootstrap.md, creating a structural duplicate).
 // ============================================================================
 function syncAllShippedGuidance(root, force) {
     const guidanceDir = path.join(root, '.claude', 'guidance');
@@ -621,8 +546,10 @@ function syncAllShippedGuidance(root, force) {
     if (!shippedDir) {
         return [{ name: 'guidance/shipped/*', status: 'skipped', detail: 'Shipped guidance directory not found' }];
     }
-    // Discover all .md files, skip moflo-subagents.md (synced separately as moflo-bootstrap.md)
-    const files = fs.readdirSync(shippedDir).filter(f => f.endsWith('.md') && f !== 'moflo-subagents.md');
+    // Discover all shipped .md files dynamically — including moflo-subagents.md
+    // (#939: prior versions renamed it to moflo-bootstrap.md as a separate step,
+    // which left two copies of the same content on consumer disk).
+    const files = fs.readdirSync(shippedDir).filter(f => f.endsWith('.md'));
     if (files.length === 0) {
         return [{ name: 'guidance/shipped/*', status: 'skipped', detail: 'No shipped guidance files found' }];
     }

package/dist/src/cli/init/settings-generator.js

@@ -236,6 +236,18 @@ function generateHooksConfig(config) {
                     { type: 'command', command: gateHookCmd('check-before-pr'), timeout: 2000 },
                 ],
             },
+            // #931 — TaskCreate REMINDER + namespace hint moved here from
+            // UserPromptSubmit. They only matter when Claude is about to spawn an
+            // Agent; emitting per-prompt cost ~90 tokens × every prompt × every
+            // consumer. Advisory only — never blocks. Routed through gate-hook.mjs
+            // so Claude Code's session_id is forwarded as HOOK_SESSION_ID — the
+            // namespace hint emission tracks per-actor (mirror of #879's fix for
+            // record-memory-searched), so subagents that spawn their own agents
+            // still get the hint on their first check.
+            {
+                matcher: '^Agent$',
+                hooks: [{ type: 'command', command: gateHookCmd('check-before-agent'), timeout: 2000 }],
+            },
         ];
     }
     // PostToolUse — record outcomes for learning
@@ -270,13 +282,16 @@ function generateHooksConfig(config) {
                 hooks: [{ type: 'command', command: gateHookCmd('record-skill-run'), timeout: 2000 }],
             },
             {
-                // Simplified matcher — anchored regex with parens doesn't match MCP tool names reliably.
-                // Use gateHookCmd (not gateCmd) so the wrapper forwards Claude Code's session_id as
-                // HOOK_SESSION_ID — record-memory-searched needs this to mark the per-actor map
-                // (memorySearchedBy[sid]) that check-before-read consults under #838's per-actor gating.
-                // Without it, the legacy boolean is set but the per-actor map stays empty, and the gate
-                // blocks every Read forever within the turn (issue #879).
-                matcher: 'mcp__moflo__memory_',
+                // Anchored alternation — Claude Code anchors hook matchers (`^…$` semantics),
+                // so a bare `mcp__moflo__memory_` never matches any real MCP tool name and the
+                // hook silently no-ops (#929 regression). Listing the explicit suffixes keeps
+                // the matcher narrow while still catching every memory_* tool we ship.
+                // Use gateHookCmd (not gateCmd) so the wrapper forwards Claude Code's session_id
+                // as HOOK_SESSION_ID — record-memory-searched needs this to mark the per-actor
+                // map (memorySearchedBy[sid]) that check-before-read consults under #838's
+                // per-actor gating. Without it, the legacy boolean is set but the per-actor map
+                // stays empty, and the gate blocks every Read forever within the turn (#879).
+                matcher: '^mcp__moflo__memory_(search|retrieve|list|stats|store)$',
                 hooks: [{ type: 'command', command: gateHookCmd('record-memory-searched'), timeout: 3000 }],
             },
             {
@@ -287,14 +302,29 @@ function generateHooksConfig(config) {
                 matcher: '^mcp__moflo__memory_store$',
                 hooks: [{ type: 'command', command: gateCmd('record-learnings-stored'), timeout: 2000 }],
             },
+            {
+                // #952 — when /fl is invoked with -s/--swarm, the gate blocks Agent
+                // spawns until mcp__moflo__swarm_init runs. Record the call here so
+                // the hard block in check-before-agent passes for legitimate /fl runs.
+                matcher: '^mcp__moflo__swarm_init$',
+                hooks: [{ type: 'command', command: gateCmd('record-swarm-init'), timeout: 2000 }],
+            },
+            {
+                // #952 — symmetric record for /fl -h/--hive runs.
+                matcher: '^mcp__moflo__hive-mind_init$',
+                hooks: [{ type: 'command', command: gateCmd('record-hive-init'), timeout: 2000 }],
+            },
         ];
     }
-    // UserPromptSubmit — gate reminders + intelligent task routing.
-    // The prompt-reminder hook is REQUIRED — it resets memorySearched / memorySearchedBy
-    // and reclassifies memoryRequired from the new prompt. Without it, gate state leaks
-    // across prompts: a previous turn's "satisfied" state survives, OR a previous turn's
-    // "armed" state never clears. Two separate hook entries (not chained) so an exception
-    // in prompt-hook.mjs doesn't skip the reset.
+    // UserPromptSubmit — per-prompt state reset + Context warnings.
+    // Two separate hook entries (not chained) so an exception in prompt-hook.mjs
+    // doesn't skip the reset. The first hook runs prompt-hook.mjs which invokes
+    // gate.cjs `prompt-reminder` (full reset + interactionCount + Context
+    // warnings). The second hook runs `prompt-state-reset` — a defensive
+    // safety-net that re-applies the idempotent state reset (memorySearched,
+    // memorySearchedBy, memoryRequired, lastNamespaceHint) without
+    // double-incrementing interactionCount or duplicating any user-visible
+    // emission (#931).
     if (config.userPromptSubmit) {
         hooks.UserPromptSubmit = [
             {
@@ -304,7 +334,7 @@ function generateHooksConfig(config) {
             },
             {
                 hooks: [
-                    { type: 'command', command: gateHookCmd('prompt-reminder'), timeout: 3000 },
+                    { type: 'command', command: gateHookCmd('prompt-state-reset'), timeout: 3000 },
                 ],
             },
         ];

package/dist/src/cli/mcp-tools/agent-tools.js

@@ -27,33 +27,16 @@ const CANONICAL_AGENT_TYPES = [
 ];
 const ALLOWED_AGENT_TYPES = new Set([
     ...CANONICAL_AGENT_TYPES,
-    // Shipped Claude Code agent definitions (.claude/agents/**)
-    'adaptive-coordinator', 'adr-architect', 'aidefence-guardian',
+    // Claude Code built-ins
+    'claude-code-guide', 'general-purpose',
+    // Shipped Claude Code agent definitions (.claude/agents/**) — both the
+    // canonical `name:` slug and the file basename are accepted.
     'analyze-code-quality', 'api-docs', 'arch-system-design',
-    'backend-dev', 'base-template-generator', 'benchmark-suite',
-    'byzantine-coordinator', 'cicd-engineer', 'claims-authorizer',
-    'claude-code-guide', 'code-analyzer', 'code-goal-planner',
-    'code-review-swarm', 'collective-intelligence-coordinator',
-    'crdt-synchronizer', 'data-ml-model', 'ddd-domain-expert',
-    'dev-backend-api', 'docs-api-openapi', 'general-purpose',
-    'github-modes', 'goal-planner', 'gossip-coordinator',
-    'hierarchical-coordinator', 'injection-analyst', 'issue-tracker',
-    'load-balancer', 'memory-specialist', 'mesh-coordinator',
-    'ml-developer', 'mobile-dev', 'multi-repo-swarm',
-    'ops-cicd-github', 'performance-benchmarker', 'performance-engineer',
-    'performance-monitor', 'pii-detector', 'planner',
-    'pr-manager', 'production-validator', 'project-board-sync',
-    'pseudocode', 'quorum-manager', 'queen-coordinator',
-    'raft-manager', 'reasoningbank-learner', 'refinement',
-    'release-manager', 'release-swarm', 'repo-architect',
-    'resource-allocator', 'safla-neural', 'scout-explorer',
-    'security-architect', 'security-architect-aidefence',
-    'security-auditor', 'security-manager', 'sona-learning-optimizer',
-    'sparc-orchestrator', 'spec-mobile-react-native', 'specification',
-    'swarm-issue', 'swarm-memory-manager', 'swarm-pr',
-    'sync-coordinator', 'system-architect', 'tdd-london-swarm',
-    'test-long-runner', 'topology-optimizer', 'v3-integration-architect',
-    'workflow-automation', 'worker-specialist',
+    'backend-dev', 'base-template-generator', 'cicd-engineer',
+    'code-analyzer', 'database-dev', 'dev-backend-api',
+    'dev-database', 'dev-frontend', 'docs-api-openapi',
+    'frontend-dev', 'ops-cicd-github', 'planner',
+    'security-auditor', 'system-architect', 'test-long-runner',
 ]);
 const AGENT_TYPE_SLUG_RE = /^[a-z][a-z0-9-]*$/;
 export function toNonNegativeInt(value, fallback) {
@@ -78,7 +61,6 @@ export function validateAgentType(value) {
 const AGENT_TYPE_MODEL_DEFAULTS = {
     // Complex agents → opus
     'architect': 'opus',
-    'security-architect': 'opus',
     'system-architect': 'opus',
     'core-architect': 'opus',
     // Medium complexity → sonnet

package/dist/src/cli/mcp-tools/hooks-tools.js

@@ -211,7 +211,7 @@ function learnedPatternsFromOutcomes() {
 const TASK_PATTERNS = {
     'security-task': {
         keywords: ['authentication', 'security', 'auth', 'password', 'encryption', 'vulnerability', 'cve', 'audit'],
-        agents: ['security-architect', 'security-auditor', 'reviewer'],
+        agents: ['security-auditor', 'reviewer'],
     },
     'testing-task': {
         keywords: ['test', 'testing', 'spec', 'coverage', 'unit test', 'integration test', 'e2e'],
@@ -223,7 +223,7 @@ const TASK_PATTERNS = {
     },
     'performance-task': {
         keywords: ['performance', 'optimize', 'speed', 'memory', 'benchmark', 'profiling', 'bottleneck'],
-        agents: ['performance-engineer', 'coder', 'tester'],
+        agents: ['reviewer', 'coder', 'tester'],
     },
     'refactor-task': {
         keywords: ['refactor', 'restructure', 'clean', 'organize', 'modular', 'decouple'],
@@ -239,23 +239,25 @@ const TASK_PATTERNS = {
     },
     'database-task': {
         keywords: ['database', 'sql', 'query', 'schema', 'migration', 'orm'],
-        agents: ['architect', 'coder', 'tester'],
+        agents: ['database-dev', 'coder', 'tester'],
     },
     'frontend-task': {
-        keywords: ['frontend', 'ui', 'component', 'react', 'css', 'style', 'layout'],
-        agents: ['coder', 'reviewer', 'tester'],
+        keywords: ['frontend', 'ui', 'component', 'react', 'vue', 'svelte', 'css', 'tailwind', 'style', 'layout', 'accessibility'],
+        agents: ['frontend-dev', 'reviewer', 'tester'],
     },
     'devops-task': {
         keywords: ['deploy', 'ci', 'cd', 'pipeline', 'docker', 'kubernetes', 'infrastructure'],
-        agents: ['devops', 'coder', 'tester'],
+        agents: ['cicd-engineer', 'coder', 'tester'],
     },
+    // (github-task intent removed — github work routes to generic coder/reviewer
+    // with the gh CLI; specialized github-* agents were retired in #932)
     'swarm-task': {
         keywords: ['swarm', 'agent', 'coordinator', 'hive', 'mesh', 'topology'],
-        agents: ['swarm-specialist', 'coordinator', 'architect'],
+        agents: ['coordinator', 'architect'],
     },
     'memory-task': {
         keywords: ['memory', 'cache', 'store', 'vector', 'embedding', 'persistence'],
-        agents: ['memory-specialist', 'architect', 'coder'],
+        agents: ['researcher', 'architect', 'coder'],
     },
 };
 /**
@@ -436,30 +438,30 @@ const AGENT_PATTERNS = {
     '.yaml': ['coder', 'devops'],
     '.yml': ['coder', 'devops'],
     '.sh': ['devops', 'coder'],
-    '.py': ['coder', 'ml-developer', 'researcher'],
+    '.py': ['coder', 'researcher'],
     '.sql': ['coder', 'architect'],
     '.css': ['coder', 'designer'],
     '.scss': ['coder', 'designer'],
 };
 // Keyword patterns for fallback routing (when semantic routing doesn't match)
 const KEYWORD_PATTERNS = {
-    'authentication': { agents: ['security-architect', 'coder', 'tester'], confidence: 0.9 },
-    'auth': { agents: ['security-architect', 'coder', 'tester'], confidence: 0.85 },
+    'authentication': { agents: ['security-auditor', 'coder', 'tester'], confidence: 0.9 },
+    'auth': { agents: ['security-auditor', 'coder', 'tester'], confidence: 0.85 },
     'api': { agents: ['architect', 'coder', 'tester'], confidence: 0.85 },
     'test': { agents: ['tester', 'reviewer'], confidence: 0.95 },
     'refactor': { agents: ['architect', 'coder', 'reviewer'], confidence: 0.9 },
-    'performance': { agents: ['performance-engineer', 'coder', 'tester'], confidence: 0.88 },
-    'security': { agents: ['security-architect', 'security-auditor', 'reviewer'], confidence: 0.92 },
-    'database': { agents: ['architect', 'coder', 'tester'], confidence: 0.85 },
-    'frontend': { agents: ['coder', 'designer', 'tester'], confidence: 0.82 },
-    'backend': { agents: ['architect', 'coder', 'tester'], confidence: 0.85 },
+    'performance': { agents: ['reviewer', 'coder', 'tester'], confidence: 0.88 },
+    'security': { agents: ['security-auditor', 'reviewer'], confidence: 0.92 },
+    'database': { agents: ['database-dev', 'coder', 'tester'], confidence: 0.9 },
+    'frontend': { agents: ['frontend-dev', 'reviewer', 'tester'], confidence: 0.9 },
+    'backend': { agents: ['backend-dev', 'architect', 'coder', 'tester'], confidence: 0.9 },
     'bug': { agents: ['coder', 'tester', 'reviewer'], confidence: 0.88 },
     'fix': { agents: ['coder', 'tester', 'reviewer'], confidence: 0.85 },
     'feature': { agents: ['architect', 'coder', 'tester'], confidence: 0.8 },
-    'swarm': { agents: ['swarm-specialist', 'coordinator', 'architect'], confidence: 0.9 },
-    'memory': { agents: ['memory-specialist', 'architect', 'coder'], confidence: 0.88 },
-    'deploy': { agents: ['devops', 'coder', 'tester'], confidence: 0.85 },
-    'ci/cd': { agents: ['devops', 'coder'], confidence: 0.9 },
+    'swarm': { agents: ['coordinator', 'architect'], confidence: 0.9 },
+    'memory': { agents: ['researcher', 'architect', 'coder'], confidence: 0.88 },
+    'deploy': { agents: ['cicd-engineer', 'coder', 'tester'], confidence: 0.85 },
+    'ci/cd': { agents: ['cicd-engineer', 'coder'], confidence: 0.9 },
 };
 function getFileExtension(filePath) {
     const match = filePath.match(/\.[a-zA-Z0-9]+$/);
@@ -1675,7 +1677,7 @@ export const hooksBuildAgents = {
             { type: 'coder', configFile: join(outputDir, `coder.${format}`), capabilities: ['code-generation', 'refactoring', 'debugging'], optimizations: ['flash-attention', 'token-reduction'] },
             { type: 'architect', configFile: join(outputDir, `architect.${format}`), capabilities: ['system-design', 'api-design', 'documentation'], optimizations: ['context-caching', 'memory-persistence'] },
             { type: 'tester', configFile: join(outputDir, `tester.${format}`), capabilities: ['unit-testing', 'integration-testing', 'coverage'], optimizations: ['parallel-execution'] },
-            { type: 'security-architect', configFile: join(outputDir, `security-architect.${format}`), capabilities: ['threat-modeling', 'vulnerability-analysis', 'security-review'], optimizations: ['pattern-matching'] },
+            { type: 'security-auditor', configFile: join(outputDir, `security-auditor.${format}`), capabilities: ['threat-modeling', 'vulnerability-analysis', 'security-review'], optimizations: ['pattern-matching'] },
             { type: 'reviewer', configFile: join(outputDir, `reviewer.${format}`), capabilities: ['code-review', 'quality-analysis', 'best-practices'], optimizations: ['incremental-analysis'] },
         ];
         const filteredAgents = focus === 'all' ? agents :

package/dist/src/cli/memory/controllers/semantic-router.js

@@ -27,43 +27,49 @@ const DEFAULT_INTENTS = [
         name: 'memory',
         category: 'storage',
         keywords: ['memory', 'store', 'retrieve', 'search', 'embedding', 'vector', 'recall', 'persist'],
-        agents: ['memory-specialist', 'swarm-memory-manager'],
+        agents: ['researcher', 'coder'],
+    },
+    {
+        name: 'frontend',
+        category: 'development',
+        keywords: ['frontend', 'ui', 'component', 'react', 'vue', 'svelte', 'css', 'tailwind', 'style', 'layout', 'accessibility', 'responsive'],
+        agents: ['frontend-dev', 'reviewer'],
+    },
+    {
+        name: 'database',
+        category: 'development',
+        keywords: ['database', 'sql', 'query', 'schema', 'migration', 'orm', 'index', 'postgres', 'mysql', 'sqlite', 'transaction'],
+        agents: ['database-dev', 'reviewer'],
     },
     {
         name: 'spell',
         category: 'workflow',
         keywords: ['spell', 'workflow', 'orchestrate', 'cast', 'pipeline', 'step'],
-        agents: ['planner', 'sparc-orchestrator'],
+        agents: ['planner'],
     },
     {
         name: 'hooks',
         category: 'automation',
         keywords: ['hook', 'pre-task', 'post-task', 'event', 'trigger', 'automation'],
-        agents: ['cicd-engineer', 'workflow-automation'],
+        agents: ['cicd-engineer', 'coder'],
     },
     {
         name: 'security',
         category: 'security',
         keywords: ['security', 'vulnerability', 'cve', 'audit', 'threat', 'permission', 'auth'],
-        agents: ['security-auditor', 'security-architect'],
-    },
-    {
-        name: 'neural',
-        category: 'ml',
-        keywords: ['neural', 'train', 'model', 'learning', 'reinforcement', 'sona', 'reasoningbank'],
-        agents: ['ml-developer', 'safla-neural'],
+        agents: ['security-auditor', 'reviewer'],
     },
     {
         name: 'test',
         category: 'quality',
         keywords: ['test', 'vitest', 'unit', 'integration', 'tdd', 'coverage', 'assertion'],
-        agents: ['tester', 'tdd-london-swarm'],
+        agents: ['tester'],
     },
     {
         name: 'github',
         category: 'integration',
         keywords: ['github', 'pr', 'pull request', 'issue', 'release', 'commit', 'branch'],
-        agents: ['pr-manager', 'github-modes', 'release-manager'],
+        agents: ['coder', 'reviewer'],
     },
 ];
 export class SemanticRouter {

package/dist/src/cli/memory/sona-optimizer.js

@@ -38,8 +38,8 @@ const AGENT_TYPES = [
     'optimizer',
     'debugger',
     'documenter',
-    'security-architect',
-    'performance-engineer',
+    'security-auditor',
+    'planner',
 ];
 /**
  * Task keywords for pattern extraction
@@ -77,13 +77,13 @@ const KEYWORD_CATEGORIES = {
         'document', 'docs', 'readme', 'comment', 'explain', 'guide',
         'tutorial', 'api-docs', 'specification', 'jsdoc',
     ],
-    'security-architect': [
+    'security-auditor': [
         'security', 'auth', 'authentication', 'authorization', 'encrypt',
         'vulnerability', 'cve', 'secure', 'permission', 'role',
     ],
-    'performance-engineer': [
-        'profiling', 'bottleneck', 'latency', 'throughput', 'cache',
-        'scale', 'load', 'stress', 'concurrent', 'parallel',
+    planner: [
+        'plan', 'breakdown', 'sequencing', 'estimate', 'milestone', 'roadmap',
+        'task', 'dependency', 'goal',
     ],
 };
 // ============================================================================

package/dist/src/cli/neural/domain/services/learning-service.js

@@ -118,9 +118,9 @@ export class LearningDomainService {
             review: 'reviewer',
             plan: 'planner',
             research: 'researcher',
-            security: 'security-architect',
-            performance: 'performance-engineer',
-            memory: 'memory-specialist',
+            security: 'security-auditor',
+            performance: 'reviewer',
+            memory: 'researcher',
         };
         for (const [keyword, role] of Object.entries(keywordMap)) {
             if (taskLower.includes(keyword)) {

package/dist/src/cli/services/agent-router.js

@@ -19,9 +19,7 @@ export const AGENT_CAPABILITIES = {
     'backend-dev': ['api', 'database', 'server', 'authentication'],
     'frontend-dev': ['ui', 'react', 'css', 'components'],
     devops: ['ci-cd', 'docker', 'deployment', 'infrastructure'],
-    'security-architect': ['security-design', 'threat-modeling', 'auth-flow'],
-    'security-auditor': ['vulnerability-scan', 'dependency-audit', 'compliance'],
-    'memory-specialist': ['memory-management', 'caching', 'persistence'],
+    'security-auditor': ['security-design', 'threat-modeling', 'auth-flow', 'vulnerability-scan', 'dependency-audit', 'compliance'],
     coordinator: ['task-distribution', 'orchestration', 'scheduling'],
     analyst: ['data-analysis', 'metrics', 'reporting', 'monitoring'],
     optimizer: ['performance', 'profiling', 'optimization', 'benchmarking'],
@@ -41,8 +39,7 @@ const TASK_PATTERNS = [
     { regex: /ui|frontend|component|react|css|style/i, agentType: 'frontend-dev' },
     { regex: /deploy|docker|ci|cd|pipeline|infrastructure/i, agentType: 'devops' },
     // Specialized patterns
-    { regex: /security|auth|permission|rbac|oauth/i, agentType: 'security-architect' },
-    { regex: /vulnerability|cve|dependency.*update|npm audit/i, agentType: 'security-auditor' },
+    { regex: /security|auth|permission|rbac|oauth|vulnerability|cve|dependency.*update|npm audit/i, agentType: 'security-auditor' },
     { regex: /performance|optimize|profile|benchmark|speed/i, agentType: 'optimizer' },
     { regex: /analyz|metric|report|monitor|dashboard/i, agentType: 'analyst' },
 ];