moflo 4.8.87-rc.3 → 4.8.87

package/.claude/agents/v3/aidefence-guardian.md

@@ -17,8 +17,6 @@ singleton: true
 
 # Dependencies
 requires:
-  packages:
-    - "@moflo/aidefence"
   agents:
     - security-architect  # For escalation
 
@@ -56,7 +54,7 @@ hooks:
 
 # AIDefence Guardian Agent
 
-You are the **AIDefence Guardian**, a specialized security agent that monitors all agent communications for AI manipulation attempts. You use the `@moflo/aidefence` library for real-time threat detection with <10ms latency.
+You are the **AIDefence Guardian**, a specialized security agent that monitors all agent communications for AI manipulation attempts. You use the `moflo's bundled AIDefence facade` library for real-time threat detection with <10ms latency.
 
 ## Core Responsibilities
 
@@ -87,7 +85,7 @@ You are the **AIDefence Guardian**, a specialized security agent that monitors a
 ### Scanning Agent Input
 
 ```typescript
-import { createAIDefence } from '@moflo/aidefence';
+import { createAIDefence } from 'moflo's bundled AIDefence facade';
 
 const guardian = createAIDefence({ enableLearning: true });
 
@@ -124,7 +122,7 @@ async function guardInput(agentId: string, input: string) {
 ### Multi-Agent Security Consensus
 
 ```typescript
-import { calculateSecurityConsensus } from '@moflo/aidefence';
+import { calculateSecurityConsensus } from 'moflo's bundled AIDefence facade';
 
 // Gather assessments from multiple security agents
 const assessments = [
@@ -171,7 +169,7 @@ Add to `.claude/settings.json`:
   "hooks": {
     "pre-agent-input": {
       "command": "node -e \"
-        const { createAIDefence } = require('@moflo/aidefence');
+        const { createAIDefence } = require('moflo's bundled AIDefence facade');
         const guardian = createAIDefence({ enableLearning: true });
         const input = process.env.AGENT_INPUT;
         const result = guardian.detect(input);

package/.claude/agents/v3/injection-analyst.md

@@ -12,10 +12,6 @@ capabilities:
   - mitigation_recommendation
 priority: high
 
-requires:
-  packages:
-    - "@moflo/aidefence"
-
 hooks:
   pre: |
     echo "🔬 Injection Analyst initializing deep analysis..."
@@ -43,7 +39,7 @@ You are the **Injection Analyst**, a specialized agent that performs deep analys
 ### Analysis Workflow
 
 ```typescript
-import { createAIDefence, checkThreats } from '@moflo/aidefence';
+import { createAIDefence, checkThreats } from 'moflo's bundled AIDefence facade';
 
 const analyst = createAIDefence({ enableLearning: true });
 

package/.claude/agents/v3/pii-detector.md

@@ -11,10 +11,6 @@ capabilities:
   - compliance_checking
 priority: high
 
-requires:
-  packages:
-    - "@moflo/aidefence"
-
 hooks:
   pre: |
     echo "🔐 PII Detector scanning for sensitive data..."
@@ -50,7 +46,7 @@ You are a specialized **PII Detector** agent focused on identifying sensitive pe
 ## Usage
 
 ```typescript
-import { createAIDefence } from '@moflo/aidefence';
+import { createAIDefence } from 'moflo's bundled AIDefence facade';
 
 const detector = createAIDefence();
 

package/.claude/guidance/shipped/moflo-core-guidance.md

@@ -76,7 +76,7 @@ On version change, `session-start-launcher.mjs` copies helper scripts from the i
 |--------|--------|-------|
 | `bin/` | `.claude/scripts/` | `hooks.mjs`, `session-start-launcher.mjs`, `index-guidance.mjs`, `build-embeddings.mjs`, `generate-code-map.mjs`, `semantic-search.mjs` |
 | `bin/` | `.claude/helpers/` | `gate.cjs`, `gate-hook.mjs`, `prompt-hook.mjs`, `hook-handler.cjs` |
-| `src/modules/cli/.claude/helpers/` | `.claude/helpers/` | `auto-memory-hook.mjs`, `statusline.cjs`, `subagent-start.cjs`, `pre-commit`, `post-commit` |
+| `src/cli/.claude/helpers/` | `.claude/helpers/` | `auto-memory-hook.mjs`, `statusline.cjs`, `subagent-start.cjs`, `pre-commit`, `post-commit` |
 
 When adding a new helper script: generate it once, save it to `bin/`, and add it to the appropriate list in `session-start-launcher.mjs`.
 
@@ -118,7 +118,7 @@ MCP tools are the preferred way for Claude to interact with moflo. `flo init` cr
   "mcpServers": {
     "moflo": {
       "command": "node",
-      "args": ["node_modules/moflo/src/modules/cli/bin/cli.js", "mcp", "start"]
+      "args": ["node_modules/moflo/bin/cli.js", "mcp", "start"]
     }
   }
 }
@@ -476,7 +476,7 @@ Configure `.mcp.json` in the project root:
   "mcpServers": {
     "moflo": {
       "command": "node",
-      "args": ["node_modules/moflo/src/modules/cli/bin/cli.js", "mcp", "start"]
+      "args": ["node_modules/moflo/bin/cli.js", "mcp", "start"]
     }
   }
 }

package/.claude/guidance/shipped/moflo-epic-processing.md

@@ -57,6 +57,6 @@ The strategy is resolved with this precedence (highest first):
 
 ## See Also
 
-- `src/modules/cli/src/commands/epic.ts` — Epic command implementation
-- `src/modules/cli/src/config/moflo-config.ts` — `MofloConfig.epic` interface and defaults
+- `src/cli/commands/epic.ts` — Epic command implementation
+- `src/cli/config/moflo-config.ts` — `MofloConfig.epic` interface and defaults
 - `.claude/skills/fl/SKILL.md` — `/flo` skill epic handling section

package/.claude/guidance/shipped/moflo-memory-strategy.md

@@ -120,7 +120,7 @@ ASCII boxes, excessive emoji, rhetorical questions, and motivational text all wa
 
 **Legacy-compatible model names:** Entries embedded by earlier moflo versions may be tagged `Xenova/all-MiniLM-L6-v2` or `onnx`. These share the same vector space as `fast-all-MiniLM-L6-v2`, so search treats them as compatible (`semantic-search.mjs` `COMPATIBLE_MODELS`).
 
-**No hash fallback.** Epic #527 removed every hash-embedding path. If the `fastembed` model cannot load, memory operations fail loudly rather than silently degrading to FNV-1a pseudo-vectors. See [ADR-EMB-001](../../../src/modules/embeddings/docs/adrs/ADR-EMB-001-neural-embeddings-mandatory.md).
+**No hash fallback.** Epic #527 removed every hash-embedding path. If the `fastembed` model cannot load, memory operations fail loudly rather than silently degrading to FNV-1a pseudo-vectors. See [ADR-EMB-001](../../../docs/adr/ADR-EMB-001-neural-embeddings-mandatory.md).
 
 ### The Embedding Alignment Problem
 

package/.claude/guidance/shipped/moflo-spell-engine-architecture.md

@@ -6,7 +6,7 @@
 
 ## Epic #100: Generalized Spell Engine
 
-**Ships as part of moflo** — not a separate project. Heavy deps (Playwright, isolated-vm) are optional peer dependencies, same pattern as `@moflo/embeddings` requiring `sql.js`.
+**Ships as part of moflo** — not a separate project. Heavy deps (Playwright, isolated-vm) are optional peer dependencies, same pattern as cli's embeddings module requiring `sql.js`.
 
 ### Command Pattern for Steps
 

package/.claude/guidance/shipped/moflo-spell-sandboxing.md

@@ -220,7 +220,7 @@ sandbox:
   tier: auto       # auto | denylist-only | full
 ```
 
-Semantics (from `resolveEffectiveSandbox()` in `src/modules/spells/src/core/platform-sandbox.ts`):
+Semantics (from `resolveEffectiveSandbox()` in `src/cli/spells/core/platform-sandbox.ts`):
 
 | `enabled` | `tier` | Tool available | OS sandbox runs? | Notes |
 |-----------|--------|----------------|------------------|-------|
@@ -264,7 +264,7 @@ Typical error messages from inside a bash step:
 
 **Tell-tale clue:** the error mentions `Temporary failure in name resolution` (a glibc-specific wording). That means the step is running inside a Linux sandbox (`bwrap` on Linux / WSL), **not** your outer shell — Git Bash or PowerShell won't produce that exact message.
 
-**Root cause:** `src/modules/spells/src/core/bwrap-sandbox.ts` isolates the network by default:
+**Root cause:** `src/cli/spells/core/bwrap-sandbox.ts` isolates the network by default:
 
 ```ts
 if (!hasNet && !needsToolHomeAccess(options.permissionLevel)) {
@@ -304,6 +304,6 @@ Or declare the `net` capability explicitly if the step doesn't need the full `el
 - `.claude/guidance/shipped/moflo-spell-connectors.md` — Optional resource adapters (not the enforcement layer)
 - `.claude/guidance/shipped/moflo-spell-engine-architecture.md` — Engine architecture and messaging
 - `.claude/guidance/shipped/moflo-core-guidance.md` — Full CLI/MCP reference
-- `src/modules/spells/src/core/permission-resolver.ts` — Capability → permission level derivation
-- `src/modules/spells/src/core/permission-disclosure.ts` — Risk classification and reporting
-- `src/modules/spells/src/core/permission-acceptance.ts` — Acceptance storage and gate
+- `src/cli/spells/core/permission-resolver.ts` — Capability → permission level derivation
+- `src/cli/spells/core/permission-disclosure.ts` — Risk classification and reporting
+- `src/cli/spells/core/permission-acceptance.ts` — Acceptance storage and gate

package/.claude/helpers/auto-memory-hook.mjs

@@ -9,7 +9,7 @@
  *   node auto-memory-hook.mjs status   # Show bridge status
  */
 
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
+import { existsSync, mkdirSync, writeFileSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 
@@ -27,24 +27,30 @@ const dim = (msg) => console.log(`  ${DIM}${msg}${RESET}`);
 if (!existsSync(DATA_DIR)) mkdirSync(DATA_DIR, { recursive: true });
 
 async function loadMemoryPackage() {
-  // Strategy 1: Use createRequire for CJS-style resolution (handles nested node_modules
-  // when installed as a transitive dependency via npx ruflo / npx claude-flow)
+  // Memory was inlined into moflo's cli package by the workspace-collapse epic
+  // (#586 / story #598) — the bare `@moflo/memory` specifier no longer resolves.
+  // After the final cli collapse (#602) the compiled module ships at
+  // <moflo-pkg-root>/dist/src/cli/memory/index.js.
+  const MEMORY_REL = join('dist', 'src', 'cli', 'memory', 'index.js');
+  const { pathToFileURL } = await import('url');
+
+  // Strategy 1: Resolve moflo's package.json directly from the consumer
+  // project — its dirname IS the package root, no walk needed.
   try {
     const { createRequire } = await import('module');
     const require = createRequire(join(PROJECT_ROOT, 'package.json'));
-    return require('@moflo/memory');
+    const pkgRoot = dirname(require.resolve('moflo/package.json'));
+    const candidate = join(pkgRoot, MEMORY_REL);
+    if (existsSync(candidate)) return await import(pathToFileURL(candidate).href);
   } catch { /* fall through */ }
 
-  // Strategy 2: ESM import (works when @moflo/memory is a direct dependency)
-  try { return await import('@moflo/memory'); } catch { /* fall through */ }
-
-  // Strategy 3: Walk up from PROJECT_ROOT looking for the package in any node_modules
+  // Strategy 2: Walk up from PROJECT_ROOT looking for moflo in any node_modules.
   let searchDir = PROJECT_ROOT;
   const { parse } = await import('path');
   while (searchDir !== parse(searchDir).root) {
-    const candidate = join(searchDir, 'node_modules', '@claude-flow', 'memory', 'dist', 'index.js');
+    const candidate = join(searchDir, 'node_modules', 'moflo', MEMORY_REL);
     if (existsSync(candidate)) {
-      try { const { pathToFileURL } = await import('url'); return await import(pathToFileURL(candidate).href); } catch { /* fall through */ }
+      try { return await import(pathToFileURL(candidate).href); } catch { /* fall through */ }
     }
     searchDir = dirname(searchDir);
   }

package/.claude/skills/connector-builder/SKILL.md

@@ -9,7 +9,7 @@ Scaffold production-ready step commands (`StepCommand`) and, when truly needed,
 
 ## Prerequisites
 
-- MoFlo project with `@moflo/spells` package
+- MoFlo project with `cli/spells` package
 - TypeScript 5+
 - Vitest for testing
 
@@ -64,7 +64,7 @@ For each action, ask:
 
 ### Step 2: Generate Connector Source
 
-Create the file at `src/modules/spells/src/connectors/<name>.ts`.
+Create the file at `src/cli/spells/connectors/<name>.ts`.
 
 Follow this template, using `github-cli.ts` as the reference implementation:
 
@@ -176,7 +176,7 @@ Create at `tests/packages/spells/connectors/<name>.test.ts`:
 ```typescript
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { <name>Connector, validate<Name>Action } from
-  '../../../../src/modules/spells/src/connectors/<name>.js';
+  '../../../../src/cli/spells/connectors/<name>.js';
 
 describe('<name>Connector', () => {
   describe('metadata', () => {
@@ -241,7 +241,7 @@ describe('<name>Connector', () => {
 
 ### Step 4: Register the Connector
 
-Add to `src/modules/spells/src/connectors/index.ts`:
+Add to `src/cli/spells/connectors/index.ts`:
 
 ```typescript
 import { <name>Connector } from './<name>.js';
@@ -337,7 +337,7 @@ Step command "deploy" capabilities:
 
 ### Step 2: Generate Step Command Source
 
-Create at `src/modules/spells/src/commands/<type>-command.ts`.
+Create at `src/cli/spells/commands/<type>-command.ts`.
 
 Follow this template, using `bash-command.ts` as the reference implementation:
 
@@ -459,7 +459,7 @@ export const <type>Command: StepCommand<<Type>StepConfig> = {
 };
 ```
 
-Alternatively, use the `createStepCommand()` factory from `src/modules/spells/src/commands/create-step-command.ts` for compile-time type safety.
+Alternatively, use the `createStepCommand()` factory from `src/cli/spells/commands/create-step-command.ts` for compile-time type safety.
 
 #### Preflight `reason` strings — write for humans
 
@@ -480,9 +480,9 @@ Create at `tests/packages/spells/commands/<type>-command.test.ts`:
 ```typescript
 import { describe, it, expect, vi } from 'vitest';
 import { <type>Command } from
-  '../../../../src/modules/spells/src/commands/<type>-command.js';
+  '../../../../src/cli/spells/commands/<type>-command.js';
 import type { CastingContext } from
-  '../../../../src/modules/spells/src/types/step-command.types.js';
+  '../../../../src/cli/spells/types/step-command.types.js';
 
 const mockContext: CastingContext = {
   variables: {},
@@ -546,7 +546,7 @@ describe('<type>Command', () => {
 
 ### Step 4: Register the Step Command
 
-Add to `src/modules/spells/src/commands/index.ts`:
+Add to `src/cli/spells/commands/index.ts`:
 
 ```typescript
 import { <type>Command } from './<type>-command.js';
@@ -584,15 +584,15 @@ steps:
 
 ### Type Definitions
 
-- **Connector interface:** `src/modules/spells/src/types/spell-connector.types.ts` — `SpellConnector`, `ConnectorAction`, `ConnectorOutput`, `ConnectorCapability`
-- **Step command interface:** `src/modules/spells/src/types/step-command.types.ts` — `StepCommand`, `StepConfig`, `StepOutput`, `CastingContext`, `JSONSchema`
-- **Step factory:** `src/modules/spells/src/commands/create-step-command.ts` — `createStepCommand()`
+- **Connector interface:** `src/cli/spells/types/spell-connector.types.ts` — `SpellConnector`, `ConnectorAction`, `ConnectorOutput`, `ConnectorCapability`
+- **Step command interface:** `src/cli/spells/types/step-command.types.ts` — `StepCommand`, `StepConfig`, `StepOutput`, `CastingContext`, `JSONSchema`
+- **Step factory:** `src/cli/spells/commands/create-step-command.ts` — `createStepCommand()`
 
 ### Existing Components
 
-**Shipped connectors** (`src/modules/spells/src/connectors/`): `http` (http-tool.ts), `github-cli` (github-cli.ts), `playwright` (playwright.ts)
+**Shipped connectors** (`src/cli/spells/connectors/`): `http` (http-tool.ts), `github-cli` (github-cli.ts), `playwright` (playwright.ts)
 
-**Built-in step commands** (`src/modules/spells/src/commands/`): `agent` (agent-command.ts), `bash` (bash-command.ts), `condition` (condition-command.ts), `prompt` (prompt-command.ts), `memory` (memory-command.ts), `wait` (wait-command.ts), `loop` (loop-command.ts), `browser` (browser-command.ts), `github` (github-command.ts)
+**Built-in step commands** (`src/cli/spells/commands/`): `agent` (agent-command.ts), `bash` (bash-command.ts), `condition` (condition-command.ts), `prompt` (prompt-command.ts), `memory` (memory-command.ts), `wait` (wait-command.ts), `loop` (loop-command.ts), `browser` (browser-command.ts), `github` (github-command.ts)
 
 ### Related Skills
 

package/.claude/skills/fl/epic.md

@@ -8,10 +8,10 @@ following the strategy steps below. This keeps the full context (memory, guidanc
 available throughout story processing.
 
 Epic detection criteria are listed in `SKILL.md` under **Usage > Epic Handling**.
-Detection uses `isEpicIssue()` from `src/modules/cli/src/epic/detection.ts`.
+Detection uses `isEpicIssue()` from `src/cli/epic/detection.ts`.
 
 **Inline processing steps when `/flo <issue>` detects an epic:**
-1. Extract stories using detection from `src/modules/cli/src/epic/detection.ts`
+1. Extract stories using detection from `src/cli/epic/detection.ts`
 2. Determine strategy from `moflo.yaml` config (`epic.default_strategy`), defaulting to `single-branch`
 3. For **single-branch**: create shared `epic/<number>-<slug>` branch, process each story via `/flo --epic-branch <branch> <issue>`, then create one consolidated PR
 4. For **auto-merge**: process each story via `/flo <issue>`, merge its PR, then proceed to next

package/.claude/skills/fl/spell-engine.md

@@ -2,7 +2,7 @@
 
 When `-wf` is used, the /flo skill switches to the generalized spell engine
 instead of the hardcoded coding process. This uses the `Grimoire` from
-`@moflo/spells` to resolve and run YAML/JSON spell definitions.
+`cli/spells` to resolve and run YAML/JSON spell definitions.
 
 ## Scan Directories (in priority order)
 

package/.claude/skills/memory-patterns/SKILL.md

@@ -125,7 +125,7 @@ This is the same fan-out the `/flo` spell does — cheap (HNSW, parallel) and re
 ## Persistence & Indexing
 
 - File: `.swarm/memory.db` at project root (sql.js).
-- Embeddings: built by `@moflo/embeddings`; indexed with HNSW from `@moflo/memory`.
+- Embeddings: built by cli's embeddings module; indexed with HNSW from `@moflo/memory`.
 - Cold-start cost: ~5 seconds to initialize HNSW. Tests should share a single instance (`beforeAll`, not `beforeEach`).
 - Namespace isolation: each namespace is a logical partition, but the HNSW index spans the table. Query time scales with `limit` and `threshold`, not total row count.
 

package/.claude/skills/publish/SKILL.md

@@ -42,7 +42,7 @@ Follow docs/BUILD.md exactly. Every step must succeed before proceeding to the n
 npm run build
 ```
 
-This syncs the version to `src/modules/cli/src/version.ts` and `src/modules/cli/package.json` via the `version` lifecycle script, then compiles all TypeScript.
+This syncs the version to `src/cli/version.ts` and `src/cli/package.json` via the `version` lifecycle script, then compiles all TypeScript.
 
 **Must exit 0.** If it fails, stop and fix the build error.
 
@@ -67,7 +67,7 @@ All checks must pass (warnings are acceptable on Windows for sandbox tier). If d
 Commit the version bump files:
 
 ```bash
-git add package.json package-lock.json src/modules/cli/package.json src/modules/cli/src/version.ts
+git add package.json package-lock.json src/cli/package.json src/cli/version.ts
 git commit -m "chore: bump version to <new-version>"
 git push origin main
 ```

package/.claude/skills/spell-builder/SKILL.md

@@ -13,7 +13,7 @@ Create production-ready spell definitions (YAML/JSON) that compose step commands
 
 ## Prerequisites
 
-- MoFlo project with `@moflo/spells` package
+- MoFlo project with `cli/spells` package
 - Familiarity with YAML syntax
 
 ## What This Skill Does
@@ -354,9 +354,9 @@ Write the updated YAML back to the original file (or a new path if requested).
 
 **To find what steps are available:** Use `Glob` on `.claude/skills/spell-builder/steps/*/README.md` and read the H1 heading of each file. Each README is self-contained — it has everything needed to use that step type.
 
-**Runtime source:** `src/modules/spells/src/commands/` — each step is a TypeScript file registered in `index.ts`.
+**Runtime source:** `src/cli/spells/commands/` — each step is a TypeScript file registered in `index.ts`.
 
-**Adding a new step:** Create a directory under `steps/<name>/` with a `README.md`. Follow `.claude/guidance/internal/guidance-rules.md` and use existing step READMEs as templates. The step command source goes in `src/modules/spells/src/commands/` and is registered in `index.ts`. No changes to this SKILL.md needed.
+**Adding a new step:** Create a directory under `steps/<name>/` with a `README.md`. Follow `.claude/guidance/internal/guidance-rules.md` and use existing step READMEs as templates. The step command source goes in `src/cli/spells/commands/` and is registered in `index.ts`. No changes to this SKILL.md needed.
 
 ### Connectors
 
@@ -369,9 +369,9 @@ Write the updated YAML back to the original file (or a new path if requested).
 
 **To find what connectors are available:** Use `Glob` on `.claude/skills/spell-builder/connectors/*/README.md`.
 
-**Runtime source:** `src/modules/spells/src/connectors/` — each connector is a TypeScript file registered in `index.ts`.
+**Runtime source:** `src/cli/spells/connectors/` — each connector is a TypeScript file registered in `index.ts`.
 
-**Adding a new connector:** Create a directory under `connectors/<name>/` with a `README.md`. Follow `.claude/guidance/internal/guidance-rules.md` and use existing connector READMEs as templates. The connector source goes in `src/modules/spells/src/connectors/` and is registered in `index.ts`. No changes to this SKILL.md needed.
+**Adding a new connector:** Create a directory under `connectors/<name>/` with a `README.md`. Follow `.claude/guidance/internal/guidance-rules.md` and use existing connector READMEs as templates. The connector source goes in `src/cli/spells/connectors/` and is registered in `index.ts`. No changes to this SKILL.md needed.
 
 **When to create a new connector vs composing existing ones:** See [architecture.md](architecture.md) for the decision tree.
 
@@ -405,16 +405,16 @@ Check against all engine validation rules:
 
 ### Type Definitions
 
-- **Spell definition:** `src/modules/spells/src/types/spell-definition.types.ts` — `SpellDefinition`, `StepDefinition`, `ArgumentDefinition`, `ArgumentType`
-- **Step command interface:** `src/modules/spells/src/types/step-command.types.ts` — `StepCommand`, `StepConfig`, `StepOutput`, `CastingContext`, `MofloLevel`, `CapabilityType`
-- **Connector interface:** `src/modules/spells/src/types/spell-connector.types.ts` — `SpellConnector`, `ConnectorAction`, `ConnectorOutput`, `ConnectorAccessor`
+- **Spell definition:** `src/cli/spells/types/spell-definition.types.ts` — `SpellDefinition`, `StepDefinition`, `ArgumentDefinition`, `ArgumentType`
+- **Step command interface:** `src/cli/spells/types/step-command.types.ts` — `StepCommand`, `StepConfig`, `StepOutput`, `CastingContext`, `MofloLevel`, `CapabilityType`
+- **Connector interface:** `src/cli/spells/types/spell-connector.types.ts` — `SpellConnector`, `ConnectorAction`, `ConnectorOutput`, `ConnectorAccessor`
 
 ### Engine Components
 
-- **Schema validator:** `src/modules/spells/src/schema/validator.ts` — `validateSpellDefinition()`
-- **YAML/JSON parser:** `src/modules/spells/src/schema/parser.ts` — `parseSpell()`
-- **Grimoire (registry):** `src/modules/spells/src/registry/spell-registry.ts` — `Grimoire`
-- **Definition loader:** `src/modules/spells/src/loaders/definition-loader.ts` — two-tier loading (shipped + user)
+- **Schema validator:** `src/cli/spells/schema/validator.ts` — `validateSpellDefinition()`
+- **YAML/JSON parser:** `src/cli/spells/schema/parser.ts` — `parseSpell()`
+- **Grimoire (registry):** `src/cli/spells/registry/spell-registry.ts` — `Grimoire`
+- **Definition loader:** `src/cli/spells/loaders/definition-loader.ts` — two-tier loading (shipped + user)
 
 ### MCP Tools
 

package/.claude/skills/spell-builder/architecture.md

@@ -167,13 +167,13 @@ These files ship with moflo and are consumed by Claude to understand available s
 
 | What | Where |
 |------|-------|
-| Step commands | `src/modules/spells/src/commands/` |
-| Connectors | `src/modules/spells/src/connectors/` |
-| Type definitions | `src/modules/spells/src/types/` |
+| Step commands | `src/cli/spells/commands/` |
+| Connectors | `src/cli/spells/connectors/` |
+| Type definitions | `src/cli/spells/types/` |
 | Shipped spells | `spells/shipped/` |
 | User spells | `spells/` or `.claude/spells/` |
-| Step command registry | `src/modules/spells/src/core/step-command-registry.ts` |
-| Connector registry | `src/modules/spells/src/core/connector-registry.ts` |
+| Step command registry | `src/cli/spells/core/step-command-registry.ts` |
+| Connector registry | `src/cli/spells/core/connector-registry.ts` |
 
 ---
 
@@ -182,5 +182,5 @@ These files ship with moflo and are consumed by Claude to understand available s
 - `steps/<name>/README.md` — self-contained reference per step command (scan with `Glob`)
 - `connectors/<name>/README.md` — self-contained reference per connector (scan with `Glob`)
 - `SKILL.md` — spell builder main skill file
-- `src/modules/spells/src/types/spell-connector.types.ts` — connector interface
-- `src/modules/spells/src/types/step-command.types.ts` — step command interface
+- `src/cli/spells/types/spell-connector.types.ts` — connector interface
+- `src/cli/spells/types/step-command.types.ts` — step command interface

package/.claude/skills/spell-builder/connectors/github-cli/README.md

@@ -48,4 +48,4 @@ Requires `gh` CLI installed and authenticated (`gh auth login`).
 
 ## Source
 
-`src/modules/spells/src/connectors/github-cli.ts`
+`src/cli/spells/connectors/github-cli.ts`

package/.claude/skills/spell-builder/connectors/http/README.md

@@ -40,4 +40,4 @@ const response = await context.tools.execute('http', 'request', {
 
 ## Source
 
-`src/modules/spells/src/connectors/http-tool.ts`
+`src/cli/spells/connectors/http-tool.ts`

package/.claude/skills/spell-builder/connectors/local-outlook/README.md

@@ -56,4 +56,4 @@ Requires `playwright` as a peer dependency.
 
 ## Source
 
-`src/modules/spells/src/connectors/local-outlook.ts`
+`src/cli/spells/connectors/local-outlook.ts`

package/.claude/skills/spell-builder/connectors/playwright/README.md

@@ -52,4 +52,4 @@ Requires `playwright` as a peer dependency.
 
 ## Source
 
-`src/modules/spells/src/connectors/playwright.ts`
+`src/cli/spells/connectors/playwright.ts`

package/.claude/skills/spell-builder/steps/agent/README.md

@@ -34,4 +34,4 @@
 
 ## Source
 
-`src/modules/spells/src/commands/agent-command.ts`
+`src/cli/spells/commands/agent-command.ts`

package/.claude/skills/spell-builder/steps/bash/README.md

@@ -33,4 +33,4 @@
 
 ## Source
 
-`src/modules/spells/src/commands/bash-command.ts`
+`src/cli/spells/commands/bash-command.ts`

package/.claude/skills/spell-builder/steps/browser/README.md

@@ -60,4 +60,4 @@ Delegates to the `playwright` connector. See `connectors/playwright/README.md`.
 
 ## Source
 
-`src/modules/spells/src/commands/browser-command.ts`
+`src/cli/spells/commands/browser-command.ts`

package/.claude/skills/spell-builder/steps/condition/README.md

@@ -35,4 +35,4 @@ Infinite loop protection is built in: max iterations = total steps x 10.
 
 ## Source
 
-`src/modules/spells/src/commands/condition-command.ts`
+`src/cli/spells/commands/condition-command.ts`

package/.claude/skills/spell-builder/steps/github/README.md

@@ -49,4 +49,4 @@ Delegates to the `github-cli` connector. See `connectors/github-cli/README.md`.
 
 ## Source
 
-`src/modules/spells/src/commands/github-command.ts`
+`src/cli/spells/commands/github-command.ts`

package/.claude/skills/spell-builder/steps/loop/README.md

@@ -41,4 +41,4 @@ Nested steps are defined on the step itself via the `steps` field, not inside `c
 
 ## Source
 
-`src/modules/spells/src/commands/loop-command.ts`
+`src/cli/spells/commands/loop-command.ts`

package/.claude/skills/spell-builder/steps/memory/README.md

@@ -53,4 +53,4 @@
 
 ## Source
 
-`src/modules/spells/src/commands/memory-command.ts`
+`src/cli/spells/commands/memory-command.ts`

package/.claude/skills/spell-builder/steps/outlook/README.md

@@ -88,4 +88,4 @@ Delegates to the `local-outlook` connector. See `connectors/local-outlook/README
 
 ## Source
 
-`src/modules/spells/src/commands/outlook-command.ts`
+`src/cli/spells/commands/outlook-command.ts`

package/.claude/skills/spell-builder/steps/parallel/README.md

@@ -42,4 +42,4 @@ Nested steps are defined on the step itself via the `steps` field, not inside `c
 
 ## Source
 
-`src/modules/spells/src/commands/parallel-command.ts`
+`src/cli/spells/commands/parallel-command.ts`

package/.claude/skills/spell-builder/steps/prompt/README.md

@@ -30,4 +30,4 @@
 
 ## Source
 
-`src/modules/spells/src/commands/prompt-command.ts`
+`src/cli/spells/commands/prompt-command.ts`

package/.claude/skills/spell-builder/steps/wait/README.md

@@ -25,4 +25,4 @@
 
 ## Source
 
-`src/modules/spells/src/commands/wait-command.ts`
+`src/cli/spells/commands/wait-command.ts`

package/README.md

@@ -37,7 +37,7 @@ MoFlo makes deliberate choices so you don't have to:
   - **MicroLoRA** — rank-2 LoRA weight adaptations at ~1µs per adapt via pure TypeScript MicroLoRA in `@moflo/neural`
   - **EWC++** (Elastic Weight Consolidation) — prevents catastrophic forgetting across sessions
   - **HNSW Vector Search** — fast nearest-neighbor search via HNSW indexing with sql.js (WASM SQLite)
-  - **Semantic Routing** — maps tasks to agents via learned routing in `@moflo/hooks`
+  - **Semantic Routing** — maps tasks to agents via learned routing in `cli/src/hooks` (ReasoningBank)
   - **Trajectory Persistence** — outcomes stored in `routing-outcomes.json`, survive across sessions
   - All pure TypeScript/WASM-based, no GPU, no API keys, no external services.
 - **Memory-first** — Claude must search what it already knows before exploring files. Enforced by hooks, not just instructions.

package/bin/build-embeddings.mjs

@@ -8,7 +8,7 @@
  *
  * Model: `fast-all-MiniLM-L6-v2` via the `fastembed` npm package (384 dims,
  * L2-normalised). Matches the shape and vector space of entries embedded by
- * `@moflo/embeddings`'s `FastembedEmbeddingService`.
+ * cli's `FastembedEmbeddingService`.
  *
  * Usage:
  *   node node_modules/moflo/bin/build-embeddings.mjs          # embed rows with no embedding
@@ -18,8 +18,9 @@
 
 import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
 import { resolve, dirname } from 'path';
-import { mofloResolveURL } from './lib/moflo-resolve.mjs';
+import { mofloResolveURL, mofloInternalURL } from './lib/moflo-resolve.mjs';
 const initSqlJs = (await import(mofloResolveURL('sql.js'))).default;
+const FASTEMBED_INLINE = 'dist/src/cli/embeddings/fastembed-inline/index.js';
 
 function findProjectRoot() {
   let dir = process.cwd();
@@ -66,7 +67,7 @@ async function loadModel() {
   if (fastembedModel) return fastembedModel;
 
   log('Loading fastembed model (fast-all-MiniLM-L6-v2)...');
-  const mod = await import(mofloResolveURL('fastembed'));
+  const mod = await import(mofloInternalURL(FASTEMBED_INLINE));
   const { FlagEmbedding, EmbeddingModel } = mod;
 
   fastembedModel = await FlagEmbedding.init({