moflo 4.9.20 → 4.9.22

package/bin/setup-project.mjs

@@ -11,78 +11,50 @@
  *   flo-setup --check    # Check if setup is current
  *
  * What it does:
- *   1. Copies .claude/guidance/shipped/moflo-subagents.md → project's .claude/guidance/moflo-bootstrap.md
+ *   1. Copies moflo/.claude/guidance/shipped/moflo-subagents.md → project's .claude/guidance/moflo-subagents.md
  *   2. Appends a subagent protocol section to CLAUDE.md (idempotent, with markers)
  *
+ * Historical note (#939): pre-fix builds renamed the destination to
+ * moflo-bootstrap.md, but the launcher's stage-3 also synced the original name
+ * — consumers ended up with two copies of the same content. The launcher now
+ * prunes any legacy moflo-bootstrap.md on first session-start after upgrade.
+ *
  * The project can layer its own guidance files on top for
  * project-specific rules (companyId, entity templates, etc.).
+ *
+ * The CLAUDE.md content is owned by `src/cli/init/claudemd-generator.ts` (compiled to
+ * `dist/src/cli/init/claudemd-generator.js`). This script is a thin wrapper so consumers
+ * always get byte-identical output regardless of which entry point they use
+ * (`flo init` vs `flo-setup`).
  */
 
-import { existsSync, readFileSync, writeFileSync, mkdirSync, copyFileSync } from 'node:fs';
+import { existsSync, readFileSync, writeFileSync, mkdirSync, copyFileSync, unlinkSync } from 'node:fs';
 import { dirname, resolve, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const mofloRoot = resolve(__dirname, '..');
+import { mofloInternalURL } from './lib/moflo-resolve.mjs';
+
+// Resolve moflo's installed package root via Node module resolution so the script
+// works identically from bin/ (canonical) or from .claude/scripts/ (synced copy).
+const mofloRoot = dirname(fileURLToPath(mofloInternalURL('package.json')));
+
+// Single source of truth: claudemd-generator.ts owns the section content.
+// Use the shared mofloInternalURL helper so the script works identically when
+// invoked from bin/ (canonical) or from .claude/scripts/ (synced copy).
+const {
+  generateClaudeMd,
+  MARKER_START,
+  MARKER_END,
+  LEGACY_MARKER_STARTS,
+  LEGACY_MARKER_ENDS,
+} = await import(mofloInternalURL('dist/src/cli/init/claudemd-generator.js'));
 
 const args = process.argv.slice(2);
 const updateOnly = args.includes('--update');
 const checkOnly = args.includes('--check');
 
-// Markers for idempotent CLAUDE.md updates — keep in sync with claudemd-generator.ts
-const MARKER_START = '<!-- MOFLO:INJECTED:START -->';
-const MARKER_END = '<!-- MOFLO:INJECTED:END -->';
-// Legacy markers to detect and replace
-const LEGACY_STARTS = ['<!-- MOFLO:SUBAGENT-PROTOCOL:START -->', '<!-- MOFLO:START -->'];
-const LEGACY_ENDS = ['<!-- MOFLO:SUBAGENT-PROTOCOL:END -->', '<!-- MOFLO:END -->'];
-
-// Minimal injection — just enough for Claude to work with moflo.
-// All detailed docs live in .claude/guidance/shipped/moflo-core-guidance.md.
-const CLAUDE_MD_SECTION = `${MARKER_START}
-## MoFlo — AI Agent Orchestration
-
-This project uses [MoFlo](https://github.com/eric-cielo/moflo) for AI-assisted development workflows.
-
-### 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\`.
-
-### Workflow 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\`
-${MARKER_END}`;
+// Canonical section content (owned by claudemd-generator.ts). Trim the trailing newline
+// that generateClaudeMd appends so the marker-replace logic below stays exact.
+const CLAUDE_MD_SECTION = generateClaudeMd({}).trimEnd();
 
 function log(msg) {
   console.log(`[flo-setup] ${msg}`);
@@ -115,16 +87,16 @@ function findProjectRoot() {
   return null;
 }
 
-function copyBootstrap(projectRoot) {
+function copySubagentsGuidance(projectRoot) {
   const shippedSource = join(mofloRoot, '.claude', 'guidance', 'shipped', 'moflo-subagents.md');
   const source = existsSync(shippedSource)
     ? shippedSource
     : join(mofloRoot, '.claude', 'guidance', 'moflo-subagents.md');
   const targetDir = join(projectRoot, '.claude', 'guidance');
-  const target = join(targetDir, 'moflo-bootstrap.md');
+  const target = join(targetDir, 'moflo-subagents.md');
 
   if (!existsSync(source)) {
-    log('❌ Source bootstrap not found in moflo package');
+    log('❌ Source subagents guidance not found in moflo package');
     return false;
   }
 
@@ -143,12 +115,12 @@ function copyBootstrap(projectRoot) {
     const existing = readFileSync(target, 'utf-8');
     const newContent = header + content;
     if (existing === newContent) {
-      log('✅ moflo-bootstrap.md is current');
+      log('✅ moflo-subagents.md is current');
       return true;
     }
-    log('📝 Updating moflo-bootstrap.md');
+    log('📝 Updating moflo-subagents.md');
   } else {
-    log('📝 Creating .claude/guidance/moflo-bootstrap.md');
+    log('📝 Creating .claude/guidance/moflo-subagents.md');
   }
 
   if (!checkOnly) {
@@ -157,6 +129,25 @@ function copyBootstrap(projectRoot) {
   return true;
 }
 
+// Best-effort cleanup of pre-#939 moflo-bootstrap.md left over from prior
+// installs. Only removes the file if it carries one of our auto-generated
+// headers — never deletes a homonymous user-authored file. Idempotent.
+function cleanupLegacyBootstrap(projectRoot) {
+  const legacy = join(projectRoot, '.claude', 'guidance', 'moflo-bootstrap.md');
+  if (!existsSync(legacy)) return;
+  try {
+    const head = readFileSync(legacy, 'utf-8').slice(0, 200);
+    const ours = head.includes('AUTO-GENERATED by moflo init') || head.includes('AUTO-GENERATED by flo-setup');
+    if (!ours) return;
+    if (!checkOnly) {
+      unlinkSync(legacy);
+      log('🧹 Removed legacy moflo-bootstrap.md (pre-#939 duplicate of moflo-subagents.md)');
+    } else {
+      log('⚠️  Legacy moflo-bootstrap.md present — will be removed on next non-check run');
+    }
+  } catch { /* non-fatal */ }
+}
+
 function updateClaudeMd(projectRoot) {
   const claudeMdPath = join(projectRoot, 'CLAUDE.md');
 
@@ -173,8 +164,8 @@ function updateClaudeMd(projectRoot) {
   const content = readFileSync(claudeMdPath, 'utf-8');
 
   // Check for current or legacy markers and replace
-  const allStarts = [MARKER_START, ...LEGACY_STARTS];
-  const allEnds = [MARKER_END, ...LEGACY_ENDS];
+  const allStarts = [MARKER_START, ...LEGACY_MARKER_STARTS];
+  const allEnds = [MARKER_END, ...LEGACY_MARKER_ENDS];
 
   for (let i = 0; i < allStarts.length; i++) {
     if (content.includes(allStarts[i])) {
@@ -235,8 +226,11 @@ function main() {
   log(`Project: ${projectRoot}`);
   console.log('');
 
-  // Step 1: Copy bootstrap file
-  const bootstrapOk = copyBootstrap(projectRoot);
+  // Step 1: Copy subagents guidance under its real name (#939 — was moflo-bootstrap.md)
+  const bootstrapOk = copySubagentsGuidance(projectRoot);
+
+  // Step 1b: Remove pre-#939 moflo-bootstrap.md if it still exists from an older install
+  cleanupLegacyBootstrap(projectRoot);
 
   // Step 2: Update CLAUDE.md (skip on --update, only refresh the file)
   const claudeOk = updateOnly ? true : updateClaudeMd(projectRoot);

package/bin/simplify-classify.cjs

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 /**
- * /simplify diff classifier — issue #908.
+ * /flo-simplify diff classifier.
  *
  * Decides which review tier the current diff warrants and returns a JSON
- * dispatch decision. The /simplify skill MUST call this first so routing is
+ * dispatch decision. The /flo-simplify skill MUST call this first so routing is
  * deterministic and unit-testable instead of a prose decision Claude makes
  * over and over per run.
  *
- * Rule (per user direction): default to single-agent Sonnet review. Only
- * escalate to a 3-agent fan-out when diff signals genuinely warrant it.
- * Opus is never selected — the existing skill already documents that.
+ * Rule: default to single-agent Sonnet review. Only escalate to a 3-agent
+ * fan-out when diff signals genuinely warrant it. Opus is never selected —
+ * the existing skill already documents that.
  *
  * Outputs JSON:
  *   {
@@ -21,7 +21,8 @@
  *   }
  *
  * Usage:
- *   node bin/simplify-classify.cjs [--base main]
+ *   node bin/simplify-classify.cjs                  # auto-detects default branch
+ *   node bin/simplify-classify.cjs --base develop   # explicit override
  *   node bin/simplify-classify.cjs --diff <unified-diff-on-stdin>
  *
  * The --diff stdin form exists so unit tests can drive the classifier
@@ -31,7 +32,7 @@
 
 const { execSync } = require('child_process');
 
-// Paths where new logic warrants the 3-agent fan-out (issue #908).
+// Paths where new logic warrants the 3-agent fan-out.
 // Mechanical edits inside these paths are still SMALL; only adding/removing
 // declarations triggers escalation.
 const SECURITY_PATHS = [
@@ -49,6 +50,25 @@ function safeExec(cmd) {
   catch { return ''; }
 }
 
+// Detect the consumer's default branch. Hardcoding 'main' silently miscalibrates
+// classification on repos that use 'master', 'develop', etc. — empty diff →
+// TRIVIAL → gate stamps clean without any real review.
+let _cachedDefaultBranch = null;
+function detectDefaultBranch() {
+  if (_cachedDefaultBranch !== null) return _cachedDefaultBranch;
+
+  // Preferred: origin/HEAD points to whatever the remote considers default.
+  const symbolic = safeExec('git symbolic-ref --short refs/remotes/origin/HEAD').trim();
+  if (symbolic.startsWith('origin/')) return (_cachedDefaultBranch = symbolic.slice('origin/'.length));
+
+  // Fallback: local init.defaultBranch (set by `git init -b <name>` or config).
+  const configured = safeExec('git config --get init.defaultBranch').trim();
+  if (configured) return (_cachedDefaultBranch = configured);
+
+  // Last resort: 'main' (most common modern default).
+  return (_cachedDefaultBranch = 'main');
+}
+
 function readDiffFromGit(base) {
   // Combined diff: committed-since-base + working-tree
   const committed = safeExec(`git diff ${base}...HEAD`);
@@ -186,14 +206,15 @@ function classifyDiff(diffText) {
   return decide(parseDiff(diffText));
 }
 
-function classifyFromGit(base = 'main') {
-  return classifyDiff(readDiffFromGit(base));
+function classifyFromGit(base) {
+  const resolved = base || detectDefaultBranch();
+  return classifyDiff(readDiffFromGit(resolved));
 }
 
 if (require.main === module) {
   const args = process.argv.slice(2);
   const baseIdx = args.indexOf('--base');
-  const base = baseIdx >= 0 ? args[baseIdx + 1] : 'main';
+  const base = baseIdx >= 0 ? args[baseIdx + 1] : detectDefaultBranch();
   const stdinDiff = args.includes('--diff') || args.includes('--stdin');
 
   let result;
@@ -211,4 +232,4 @@ if (require.main === module) {
   }
 }
 
-module.exports = { parseDiff, decide, classifyDiff, classifyFromGit };
+module.exports = { parseDiff, decide, classifyDiff, classifyFromGit, detectDefaultBranch };

package/dist/src/cli/appliance/rvfa-builder.js

@@ -20,7 +20,7 @@ const AES_TAG_LEN = 16;
 const AES_ALG = 'aes-256-gcm';
 // ── Catalog ──────────────────────────────────────────────────
 const RUFLO_COMMANDS = 'init agent swarm memory mcp task session config status start workflow hooks hive-mind daemon neural security performance providers plugins deployment embeddings claims migrate process doctor completions'.split(' ');
-const AGENT_TYPES = 'coder reviewer tester planner researcher security-architect security-auditor memory-specialist performance-engineer hierarchical-coordinator mesh-coordinator adaptive-coordinator collective-intelligence-coordinator swarm-memory-manager byzantine-coordinator raft-manager gossip-coordinator consensus-builder crdt-synchronizer quorum-manager security-manager perf-analyzer performance-benchmarker task-orchestrator memory-coordinator smart-agent github-modes pr-manager code-review-swarm issue-tracker release-manager workflow-automation project-board-sync repo-architect multi-repo-swarm sparc-coord sparc-coder specification pseudocode architecture refinement backend-dev mobile-dev ml-developer cicd-engineer api-docs system-architect code-analyzer base-template-generator tdd-london-swarm production-validator'.split(' ');
+const AGENT_TYPES = 'coder reviewer tester planner researcher security-auditor backend-dev frontend-dev database-dev cicd-engineer api-docs system-architect code-analyzer analyst base-template-generator test-long-runner'.split(' ');
 const HOOK_TYPES = 'pre-edit post-edit pre-command post-command pre-task post-task session-start session-end session-restore notify route explain pretrain build-agents transfer teammate-idle task-completed'.split(' ');
 const WORKER_TYPES = 'ultralearn optimize consolidate predict audit map preload deepdive document refactor benchmark testgaps'.split(' ');
 const OFFLINE_MODELS = [

package/dist/src/cli/commands/agent.js

@@ -68,13 +68,8 @@ const AGENT_TYPES = [
     { value: 'coordinator', label: 'Coordinator', hint: 'Multi-agent orchestration and spell management' },
     { value: 'analyst', label: 'Analyst', hint: 'Performance analysis and optimization' },
     { value: 'optimizer', label: 'Optimizer', hint: 'Performance optimization and bottleneck analysis' },
-    { value: 'security-architect', label: 'Security Architect', hint: 'Security architecture and threat modeling' },
     { value: 'security-auditor', label: 'Security Auditor', hint: 'CVE remediation and security testing' },
-    { value: 'memory-specialist', label: 'Memory Specialist', hint: 'AgentDB unification (150x-12,500x faster)' },
-    { value: 'swarm-specialist', label: 'Swarm Specialist', hint: 'Unified coordination engine' },
-    { value: 'performance-engineer', label: 'Performance Engineer', hint: '2.49x-7.47x optimization targets' },
-    { value: 'core-architect', label: 'Core Architect', hint: 'Domain-driven design restructure' },
-    { value: 'test-architect', label: 'Test Architect', hint: 'TDD London School methodology' }
+    { value: 'planner', label: 'Planner', hint: 'Task planning and breakdown' },
 ];
 // Agent spawn subcommand
 const spawnCommand = {
@@ -844,9 +839,8 @@ function getAgentCapabilities(type) {
         reviewer: ['code-review', 'security-audit', 'quality-check', 'documentation'],
         architect: ['system-design', 'pattern-analysis', 'scalability', 'documentation'],
         coordinator: ['task-orchestration', 'agent-management', 'spell-control'],
-        'security-architect': ['threat-modeling', 'security-patterns', 'compliance', 'audit'],
-        'memory-specialist': ['vector-search', 'agentdb', 'caching', 'optimization'],
-        'performance-engineer': ['benchmarking', 'profiling', 'optimization', 'monitoring']
+        'security-auditor': ['threat-modeling', 'security-patterns', 'compliance', 'audit', 'vulnerability-scan'],
+        planner: ['task-breakdown', 'sequencing', 'estimation'],
     };
     return capabilities[type] || ['general'];
 }

package/dist/src/cli/commands/doctor-checks-deep.js

@@ -425,6 +425,10 @@ const REQUIRED_GATE_CASES = [
     'check-before-pr',
     'check-dangerous-command',
     'prompt-reminder',
+    // #931 — Defensive safety-net for the second UserPromptSubmit hook. State
+    // reset only, no emission. doctor warns if a consumer's gate.cjs is too old
+    // to handle it.
+    'prompt-state-reset',
     'session-reset',
 ];
 // Import + re-export from the self-contained hook-wiring module (single source of truth).

package/dist/src/cli/commands/hooks.js

@@ -21,9 +21,7 @@ const HOOK_TYPES = [
 // Agent routing options
 const AGENT_TYPES = [
     'coder', 'researcher', 'tester', 'reviewer', 'architect',
-    'security-architect', 'security-auditor', 'memory-specialist',
-    'swarm-specialist', 'performance-engineer', 'core-architect',
-    'test-architect', 'coordinator', 'analyst', 'optimizer'
+    'security-auditor', 'coordinator', 'analyst', 'optimizer', 'planner',
 ];
 // Pre-edit subcommand
 const preEditCommand = {

package/dist/src/cli/commands/index.js

@@ -54,6 +54,8 @@ const commandLoaders = {
     issues: () => import('./issues.js'),
     // Auto-update System (ADR-025)
     update: () => import('./update.js'),
+    // Retired-files manifest helper (#948 — moflo dev only)
+    retire: () => import('./retire.js'),
     // Full integration diagnostics
     diagnose: () => import('./diagnose.js'),
     // Benchmark Suite (Pre-training, Neural, Memory)

package/dist/src/cli/commands/retire.js

@@ -0,0 +1,111 @@
+/**
+ * `flo retire <path>` — record a shipped file as retired (#948).
+ *
+ * Run this inside the moflo source repo whenever a retirement PR deletes a
+ * `.claude/agents/**` or `.claude/skills/**` file. It computes content
+ * hashes for the last few moflo-shipped versions of the file (from git
+ * history) and appends an entry to `retired-files.json`. The launcher then
+ * prunes the matching file from consumer projects on their next upgrade —
+ * but only when their on-disk content matches a known-shipped hash, so
+ * customized files stay put.
+ *
+ * Refuses to run outside moflo's own repo because the seed script and
+ * `retired-files.json` live at the moflo package root and don't ship to
+ * consumer projects.
+ *
+ * Created with motailz.com
+ */
+import { output } from '../output.js';
+import { spawnSync } from 'child_process';
+import { existsSync, readFileSync } from 'fs';
+import { resolve, dirname } from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+// dist/src/cli/commands/retire.js → repo root is up 5 dirs.
+// In dev (tsx) src/cli/commands/retire.ts → up 4 dirs. Walk to find package.json#name === 'moflo'.
+function findMofloRepoRoot(start) {
+    let dir = start;
+    const root = resolve(dir, '/');
+    while (dir !== root) {
+        const pkg = resolve(dir, 'package.json');
+        if (existsSync(pkg)) {
+            try {
+                const parsed = JSON.parse(readFileSync(pkg, 'utf-8'));
+                if (parsed?.name === 'moflo')
+                    return dir;
+            }
+            catch { /* keep walking */ }
+        }
+        dir = dirname(dir);
+    }
+    return null;
+}
+export const retireCommand = {
+    name: 'retire',
+    description: 'Record a retired shipped file in retired-files.json (moflo dev only) — usage: flo retire <path> [--retired-by #nnn]',
+    hidden: true,
+    options: [
+        {
+            name: 'retired-by',
+            description: 'GitHub PR/issue reference (e.g. #932)',
+            type: 'string',
+        },
+        {
+            name: 'retired-in',
+            description: 'moflo version that ships the retirement (defaults to current package.json version)',
+            type: 'string',
+        },
+        {
+            name: 'hashes',
+            description: 'Maximum number of historical content hashes to record (default 3)',
+            type: 'number',
+            default: 3,
+        },
+    ],
+    examples: [
+        { command: 'flo retire .claude/agents/v3/performance-engineer.md --retired-by #932', description: 'Record a retirement' },
+        { command: 'flo retire .claude/skills/skill-builder/SKILL.md --retired-by #945 --retired-in 4.9.21', description: 'Pin retiredIn' },
+    ],
+    action: async (ctx) => {
+        const repoRoot = findMofloRepoRoot(__filename) || findMofloRepoRoot(ctx.cwd);
+        if (!repoRoot) {
+            output.printError('flo retire must be run inside the moflo source repo');
+            output.printInfo('retired-files.json lives at the moflo package root and does not ship to consumer projects');
+            return { success: false, message: 'not in moflo repo', exitCode: 1 };
+        }
+        const path = ctx.args[0];
+        if (!path) {
+            output.printError('Missing required argument: <path>');
+            return { success: false, message: 'missing path', exitCode: 2 };
+        }
+        const scriptPath = resolve(repoRoot, 'scripts', 'build-retired-files.mjs');
+        if (!existsSync(scriptPath)) {
+            output.printError(`scripts/build-retired-files.mjs not found at ${scriptPath}`);
+            return { success: false, message: 'seed script missing', exitCode: 1 };
+        }
+        // Parser normalises kebab-case flag names to camelCase before storing
+        // (#787). Read as ctx.flags.<camelCase> — bracket-with-kebab is always
+        // undefined and ESLint blocks that pattern.
+        const args = ['--add', path];
+        if (ctx.flags.retiredBy)
+            args.push('--retired-by', String(ctx.flags.retiredBy));
+        if (ctx.flags.retiredIn)
+            args.push('--retired-in', String(ctx.flags.retiredIn));
+        if (ctx.flags.hashes)
+            args.push('--hashes', String(ctx.flags.hashes));
+        const result = spawnSync('node', [scriptPath, ...args], {
+            cwd: repoRoot,
+            stdio: 'inherit',
+        });
+        if (result.error) {
+            output.printError(`failed to invoke build-retired-files.mjs: ${result.error.message}`);
+            return { success: false, message: String(result.error), exitCode: 1 };
+        }
+        if (typeof result.status === 'number' && result.status !== 0) {
+            return { success: false, message: `exit ${result.status}`, exitCode: result.status };
+        }
+        return { success: true };
+    },
+};
+export default retireCommand;
+//# sourceMappingURL=retire.js.map

package/dist/src/cli/hooks/reasoningbank/index.js

@@ -33,15 +33,15 @@ const DEFAULT_CONFIG = {
     useMockEmbeddings: false,
 };
 /**
- * Agent mapping for routing
+ * Agent mapping for routing — keys must match agents shipped in .claude/agents/
+ * (or the canonical AgentType union).
  */
 const AGENT_PATTERNS = {
-    'security-architect': /security|auth|cve|vuln|encrypt|password|token/i,
-    'test-architect': /test|spec|mock|coverage|tdd|assert/i,
-    'performance-engineer': /perf|optim|fast|memory|cache|speed|slow/i,
-    'core-architect': /architect|design|ddd|domain|refactor|struct/i,
-    'swarm-specialist': /swarm|agent|coordinate|orchestrat|parallel/i,
-    'memory-specialist': /memory|agentdb|hnsw|vector|embedding/i,
+    'security-auditor': /security|auth|cve|vuln|encrypt|password|token/i,
+    'tester': /test|spec|mock|coverage|tdd|assert/i,
+    'architect': /architect|design|ddd|domain|refactor|struct|perf|optim|fast|memory|cache|speed|slow/i,
+    'coordinator': /swarm|agent|coordinate|orchestrat|parallel|hive/i,
+    'researcher': /memory|agentdb|hnsw|vector|embedding|recall|persist/i,
     'coder': /fix|bug|implement|create|add|build|error|code/i,
     'reviewer': /review|quality|lint|check|audit/i,
 };

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

@@ -3,60 +3,57 @@
  *
  * Generates ONLY the MoFlo section to inject into a project's CLAUDE.md.
  * This must be minimal — just enough for Claude to work with moflo.
- * All detailed docs live in .claude/guidance/shipped/moflo-core-guidance.md (copied at install).
+ * All detailed docs live in .claude/guidance/moflo-core-guidance.md on consumer projects (synced from .claude/guidance/shipped/ inside node_modules/moflo).
  *
  * Principle: we are guests in the user's CLAUDE.md. Keep it small.
  */
 const MARKER_START = '<!-- MOFLO:INJECTED:START -->';
 const MARKER_END = '<!-- MOFLO:INJECTED:END -->';
+// Legacy markers from earlier moflo versions — detected and replaced on re-injection.
+// Single source of truth so moflo-init.ts and bin/setup-project.mjs stay in sync.
+const LEGACY_MARKER_STARTS = [
+    '<!-- MOFLO:START -->',
+    '<!-- MOFLO:SUBAGENT-PROTOCOL:START -->',
+];
+const LEGACY_MARKER_ENDS = [
+    '<!-- MOFLO:END -->',
+    '<!-- MOFLO:SUBAGENT-PROTOCOL:END -->',
+];
 /**
  * The single moflo section injected into CLAUDE.md.
- * ~40 lines. Points to moflo-core-guidance.md for everything else.
+ * ~22 lines. Points to moflo-core-guidance.md for everything else.
  */
 function mofloSection() {
     return `${MARKER_START}
 ## 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
 
-MUST call \`mcp__moflo__memory_search\` BEFORE any Glob/Grep/Read/file exploration. Namespaces: \`guidance\`+\`patterns\`+\`learnings\` every prompt; \`code-map\` when navigating code; \`tests\` when looking for test inventory or coverage. When the user says "remember this": \`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\`
+Your first tool call MUST be \`mcp__moflo__memory_search\` — before any Glob/Grep/Read. Search \`guidance\`, \`patterns\`, and \`learnings\` every prompt; add \`code-map\` when navigating code, \`tests\` when looking for test inventory or coverage. When the user says "remember this", call \`mcp__moflo__memory_store\` with namespace \`learnings\`.
 
-### MCP Tools (preferred over CLI)
+### Auto-enforced gates
 
-| Tool | Purpose |
-|------|---------|
-| \`mcp__moflo__memory_search\` | Semantic search across indexed knowledge |
-| \`mcp__moflo__memory_store\` | Store patterns and decisions |
+- **TaskCreate-first**: Call \`TaskCreate\` before spawning the Agent tool
+- **Task Icons**: \`TaskCreate\` entries MUST use ICON+[Role] format — see \`.claude/guidance/moflo-task-icons.md\`
 
-### CLI Fallback
+### Tools
 
-\`\`\`bash
-flo-search "[query]" --namespace guidance   # Semantic search
-flo doctor --fix                             # Health check
-\`\`\`
+Prefer MCP (\`mcp__moflo__*\` — memory, swarm, agent, task, hooks, hive-mind, neural) over the CLI. CLI binaries: \`flo\` (main), \`flo-search\` (semantic search), \`flo doctor --fix\` (heal). Full catalog: \`.claude/guidance/moflo-core-guidance.md\`.
 
 ### After upgrading MoFlo
 
-After running \`npm install moflo@*\` (or \`npm install\` that touches moflo), check \`.moflo/restart-pending.json\`. If it exists, surface the \`message\` field to the user verbatim (Claude Code can't pick up new hooks/MCP tools/launcher mid-session — they're only loaded at session-start), then delete the file.
+After \`npm install\` touches moflo, check \`.moflo/restart-pending.json\` — if present, surface its \`message\` field to the user verbatim, then delete the file. (Claude Code only loads new hooks/MCP/launcher at session start.)
 
 ### Full Reference
 
-- **Subagents protocol:** \`.claude/guidance/shipped/moflo-subagents.md\`
-- **Task + swarm coordination:** \`.claude/guidance/shipped/moflo-claude-swarm-cohesion.md\`
-- **CLI, hooks, swarm, memory, moflo.yaml:** \`.claude/guidance/shipped/moflo-core-guidance.md\`
+- Universal agent rules (memory protocol, git/PR conventions, file org, build/test): \`.claude/guidance/moflo-agent-rules.md\`
+- Subagent spawn protocol: \`.claude/guidance/moflo-subagents.md\`
+- Task + swarm coordination: \`.claude/guidance/moflo-claude-swarm-cohesion.md\`
+- CLI, hooks, swarm, memory, moflo.yaml: \`.claude/guidance/moflo-core-guidance.md\`
 ${MARKER_END}`;
 }
 // --- Public API ---
-export { MARKER_START, MARKER_END };
+export { MARKER_START, MARKER_END, LEGACY_MARKER_STARTS, LEGACY_MARKER_ENDS };
 /**
  * Generate the MoFlo section to inject into CLAUDE.md.
  * Template parameter is accepted for backward compatibility but ignored —
@@ -73,12 +70,12 @@ export function generateMinimalClaudeMd(options) {
 }
 /** Available template names for CLI wizard (kept for backward compat, all produce same output) */
 export const CLAUDE_MD_TEMPLATES = [
-    { name: 'minimal', description: 'Recommended — memory search, spell gates, MCP tools (~40 lines injected)' },
-    { name: 'standard', description: 'Same as minimal (detailed docs in .claude/guidance/shipped/moflo-core-guidance.md)' },
-    { name: 'full', description: 'Same as minimal (detailed docs in .claude/guidance/shipped/moflo-core-guidance.md)' },
-    { name: 'security', description: 'Same as minimal (detailed docs in .claude/guidance/shipped/moflo-core-guidance.md)' },
-    { name: 'performance', description: 'Same as minimal (detailed docs in .claude/guidance/shipped/moflo-core-guidance.md)' },
-    { name: 'solo', description: 'Same as minimal (detailed docs in .claude/guidance/shipped/moflo-core-guidance.md)' },
+    { name: 'minimal', description: 'Recommended — memory search, gates, tools, upgrade hint (~22 lines injected)' },
+    { name: 'standard', description: 'Same as minimal (detailed docs in .claude/guidance/moflo-core-guidance.md)' },
+    { name: 'full', description: 'Same as minimal (detailed docs in .claude/guidance/moflo-core-guidance.md)' },
+    { name: 'security', description: 'Same as minimal (detailed docs in .claude/guidance/moflo-core-guidance.md)' },
+    { name: 'performance', description: 'Same as minimal (detailed docs in .claude/guidance/moflo-core-guidance.md)' },
+    { name: 'solo', description: 'Same as minimal (detailed docs in .claude/guidance/moflo-core-guidance.md)' },
 ];
 export default generateClaudeMd;
 //# sourceMappingURL=claudemd-generator.js.map