refactor: Phase 2b — consolidate 28 modules into 14 packages

Complete the module consolidation planned in REFACTORING_PLAN.md:

Modules merged:
- work_orders/ + task_queue/ → swarm/ (subpackages)
- self_modify/ + self_tdd/ + upgrades/ → self_coding/ (subpackages)
- tools/ → creative/tools/
- chat_bridge/ + telegram_bot/ + shortcuts/ + voice/ → integrations/ (new)
- ws_manager/ + notifications/ + events/ + router/ → infrastructure/ (new)
- agents/ + agent_core/ + memory/ → timmy/ (subpackages)

Updated across codebase:
- 66 source files: import statements rewritten
- 13 test files: import + patch() target strings rewritten
- pyproject.toml: wheel includes (28→14), entry points updated
- CLAUDE.md: singleton paths, module map, entry points table
- AGENTS.md: file convention updates
- REFACTORING_PLAN.md: execution status, success metrics

Extras:
- Module-level CLAUDE.md added to 6 key packages (Phase 6.2)
- Zero test regressions: 1462 tests passing

https://claude.ai/code/session_01JNjWfHqusjT3aiN4vvYgUk

AGENTS.md

@@ -66,8 +66,8 @@ make docker-agent       # add a worker
 |---------|-----------|
 | New route | `src/dashboard/routes/<name>.py` + register in `app.py` |
 | New template | `src/dashboard/templates/<name>.html` extends `base.html` |
-| New subsystem | `src/<name>/` with `__init__.py` |
-| New test | `tests/test_<module>.py` |
+| New subsystem | Add to existing `src/<package>/` — see module map in CLAUDE.md |
+| New test | `tests/<module>/test_<feature>.py` (mirror source structure) |
 | Secrets | Via `config.settings` + startup warning if default |
 | DB files | Project root or `data/` — never in `src/` |
 

CLAUDE.md

@@ -20,8 +20,8 @@ url = settings.ollama_url   # never use os.environ.get() directly in app code
 
 ```python
 from dashboard.store import message_log
-from notifications.push import notifier
-from ws_manager.handler import ws_manager
+from infrastructure.notifications.push import notifier
+from infrastructure.ws_manager.handler import ws_manager
 from swarm.coordinator import coordinator
 ```
 
@@ -90,5 +90,26 @@ make test-cov           # With coverage (term-missing + XML)
 |---------|--------|---------|
 | `timmy` | `src/timmy/cli.py` | Chat, think, status |
 | `timmy-serve` | `src/timmy_serve/cli.py` | L402-gated API server (port 8402) |
-| `self-tdd` | `src/self_tdd/watchdog.py` | Continuous test watchdog |
-| `self-modify` | `src/self_modify/cli.py` | Self-modification CLI |
+| `self-tdd` | `src/self_coding/self_tdd/watchdog.py` | Continuous test watchdog |
+| `self-modify` | `src/self_coding/self_modify/cli.py` | Self-modification CLI |
+
+---
+
+## Module Map (14 packages)
+
+| Package | Purpose |
+|---------|---------|
+| `timmy/` | Core agent, personas, agent interface, semantic memory |
+| `dashboard/` | FastAPI web UI, routes, templates |
+| `swarm/` | Multi-agent coordinator, task queue, work orders |
+| `self_coding/` | Self-modification, test watchdog, upgrade queue |
+| `creative/` | Media generation, MCP tools |
+| `infrastructure/` | WebSocket, notifications, events, LLM router |
+| `integrations/` | Discord, Telegram, Siri Shortcuts, voice NLU |
+| `lightning/` | L402 payment gating (security-sensitive) |
+| `mcp/` | MCP tool registry and discovery |
+| `spark/` | Event capture and advisory engine |
+| `hands/` | 6 autonomous Hand agents |
+| `scripture/` | Biblical text integration |
+| `timmy_serve/` | L402-gated API server |
+| `config.py` | Pydantic settings (foundation for all modules) |

REFACTORING_PLAN.md

@@ -155,69 +155,26 @@ session-scoped context. Either gitignore it or move to `docs/handoff/`.
 **Goal:** Reduce 28 modules to ~12 by merging small, related modules into
 coherent packages. This directly reduces cognitive load and token consumption.
 
-### 2.1 Proposed module structure
+### 2.1 Module structure (implemented)
 
 ```
-src/
-  config.py                    # (keep as-is)
+src/                           # 14 packages (was 28)
+  config.py                    # Pydantic settings (foundation)
 
-  timmy/                       # Core agent — MERGE IN agents/, agent_core/, memory/
-    agent.py                   # Main Timmy agent
-    backends.py                # Ollama/AirLLM backends
-    cli.py                     # CLI entry point
-    orchestrator.py            # ← from agents/timmy.py
-    personas/                  # ← from agents/ (seer, helm, quill, echo, forge)
-    agent_core/                # ← from src/agent_core/ (becomes subpackage)
-    memory/                    # ← from src/memory/ (becomes subpackage)
-    prompts.py
-    ...
+  timmy/                       # Core agent + agents/ + agent_core/ + memory/
+  dashboard/                   # FastAPI web UI (22 route files)
+  swarm/                       # Coordinator + task_queue/ + work_orders/
+  self_coding/                 # Git safety + self_modify/ + self_tdd/ + upgrades/
+  creative/                    # Media generation + tools/
+  infrastructure/              # ws_manager/ + notifications/ + events/ + router/
+  integrations/                # chat_bridge/ + telegram_bot/ + shortcuts/ + voice/
 
-  dashboard/                   # Web UI — CONSOLIDATE routes
-    app.py
-    store.py
-    routes/                    # See §2.2 for route consolidation
-    templates/
-
-  swarm/                       # Multi-agent system — MERGE IN task_queue/, work_orders/
-    coordinator.py
-    tasks.py                   # ← existing + task_queue/ models
-    work_orders/               # ← from src/work_orders/ (becomes subpackage)
-    ...
-
-  integrations/                # NEW — MERGE chat_bridge/, telegram_bot/, shortcuts/
-    chat_bridge/               # Discord, unified chat
-    telegram.py                # ← from telegram_bot/
-    shortcuts.py               # ← from shortcuts/
-    voice/                     # ← from src/voice/
-
-  lightning/                   # (keep as-is — standalone, security-sensitive)
-
-  self_coding/                 # MERGE IN self_modify/, self_tdd/, upgrades/
-    codebase_indexer.py
-    git_safety.py
-    modification_journal.py
-    self_modify/               # ← from src/self_modify/ (becomes subpackage)
-    watchdog.py                # ← from src/self_tdd/
-    upgrades/                  # ← from src/upgrades/
-
-  mcp/                         # (keep as-is — used across multiple modules)
-
-  spark/                       # (keep as-is)
-
-  creative/                    # MERGE IN tools/
-    director.py
-    assembler.py
-    tools/                     # ← from src/tools/ (becomes subpackage)
-
-  hands/                       # (keep as-is)
-
-  scripture/                   # (keep as-is — domain-specific)
-
-  infrastructure/              # NEW — MERGE ws_manager/, notifications/, events/, router/
-    ws_manager.py              # ← from ws_manager/handler.py (157 lines)
-    notifications.py           # ← from notifications/push.py (153 lines)
-    events.py                  # ← from events/ (354 lines)
-    router/                    # ← from src/router/ (cascade LLM router)
+  lightning/                   # L402 payment gating (standalone, security-sensitive)
+  mcp/                         # MCP tool registry and discovery
+  spark/                       # Event capture and advisory
+  hands/                       # 6 autonomous Hand agents
+  scripture/                   # Biblical text integration
+  timmy_serve/                 # L402-gated API server
 ```
 
 ### 2.2 Dashboard route consolidation
@@ -476,18 +433,17 @@ patterns (card layouts, form groups, table rows).
 
 ## Success Metrics
 
-After refactoring:
-- Root `.md` files: 10 → 3
-- Root markdown size: 87KB → ~20KB
-- `src/` modules: 28 → ~12-15
-- Dashboard route files: 27 → ~12-15
-- Test files: organized in subdirectories matching source
-- Empty skeleton test files: 61 → 0 (either implemented or deleted)
-- Real test functions: 471 → 500+ (fill gaps in coverage)
-- `pytest -m unit` runs in <10 seconds
-- Wheel build includes all modules that are actually imported
-- AI assistant context consumption drops ~40%
-- Conftest autouse fixtures scoped to relevant test directories
+| Metric | Original | Target | Current |
+|--------|----------|--------|---------|
+| Root `.md` files | 10 | 3 | 5 |
+| Root markdown size | 87KB | ~20KB | ~28KB |
+| `src/` modules | 28 | ~12-15 | **14** |
+| Dashboard routes | 27 | ~12-15 | 22 |
+| Test organization | flat | mirrored | **mirrored** |
+| Tests passing | 471 | 500+ | **1462** |
+| Wheel modules | 17/28 | all | **all** |
+| Module-level docs | 0 | all key modules | **6** |
+| AI context reduction | — | ~40% | **~50%** (fewer modules to scan) |
 
 ---
 
@@ -505,15 +461,21 @@ After refactoring:
 - [x] **Phase 2a: Route consolidation** — 27 → 22 route files (merged voice,
   swarm internal/ws, self-modify; deleted mobile_test)
 
+- [x] **Phase 2b: Full module consolidation** — 28 → 14 modules. All merges
+  completed in a single pass with automated import rewriting (66 source files +
+  13 test files updated). Modules consolidated:
+  - `work_orders/` + `task_queue/` → `swarm/`
+  - `self_modify/` + `self_tdd/` + `upgrades/` → `self_coding/`
+  - `tools/` → `creative/tools/`
+  - `chat_bridge/` + `telegram_bot/` + `shortcuts/` + `voice/` → `integrations/` (new)
+  - `ws_manager/` + `notifications/` + `events/` + `router/` → `infrastructure/` (new)
+  - `agents/` + `agent_core/` + `memory/` → `timmy/`
+  - pyproject.toml entry points and wheel includes updated
+  - Module-level CLAUDE.md files added (Phase 6.2)
+  - Zero test regressions: 1462 tests passing
+- [x] **Phase 6.2: Module-level CLAUDE.md** — added to swarm/, self_coding/,
+  infrastructure/, integrations/, creative/, lightning/
+
 ### Remaining
 
-- [ ] **Phase 2b: Full module consolidation** (28 → ~12 modules) — requires
-  updating hundreds of import statements. Should be done incrementally across
-  focused PRs, one module merge at a time. Candidates by import footprint:
-  - `work_orders/` → `swarm/work_orders/` (1 importer)
-  - `upgrades/` → `self_coding/upgrades/` (1 importer)
-  - `shortcuts/` → `integrations/shortcuts/` (1 importer)
-  - `events/` → `swarm/events/` (4 importers)
-  - `task_queue/` → `swarm/task_queue/` (3 importers)
-  - Larger merges: agents/ + agent_core/ + memory/ → timmy/ (many importers)
 - [ ] **Phase 5: Package extraction** — only if team grows or dep profiles diverge

pyproject.toml

@@ -75,41 +75,26 @@ creative = [
 [project.scripts]
 timmy = "timmy.cli:main"
 timmy-serve = "timmy_serve.cli:main"
-self-tdd = "self_tdd.watchdog:main"
-self-modify = "self_modify.cli:main"
+self-tdd = "self_coding.self_tdd.watchdog:main"
+self-modify = "self_coding.self_modify.cli:main"
 
 [tool.hatch.build.targets.wheel]
 sources = {"src" = ""}
 include = [
     "src/config.py",
-    "src/agent_core",
-    "src/agents",
-    "src/chat_bridge",
     "src/creative",
     "src/dashboard",
-    "src/events",
     "src/hands",
+    "src/infrastructure",
+    "src/integrations",
     "src/lightning",
     "src/mcp",
-    "src/memory",
-    "src/notifications",
-    "src/router",
     "src/scripture",
     "src/self_coding",
-    "src/self_modify",
-    "src/self_tdd",
-    "src/shortcuts",
     "src/spark",
     "src/swarm",
-    "src/task_queue",
-    "src/telegram_bot",
     "src/timmy",
     "src/timmy_serve",
-    "src/tools",
-    "src/upgrades",
-    "src/voice",
-    "src/work_orders",
-    "src/ws_manager",
 ]
 
 [tool.pytest.ini_options]

src/agents/__init__.py

@@ -1,21 +0,0 @@
-"""Agents package — Timmy and sub-agents.
-"""
-
-from agents.timmy import TimmyOrchestrator, create_timmy_swarm
-from agents.base import BaseAgent
-from agents.seer import SeerAgent
-from agents.forge import ForgeAgent
-from agents.quill import QuillAgent
-from agents.echo import EchoAgent
-from agents.helm import HelmAgent
-
-__all__ = [
-    "BaseAgent",
-    "TimmyOrchestrator",
-    "create_timmy_swarm",
-    "SeerAgent",
-    "ForgeAgent",
-    "QuillAgent",
-    "EchoAgent",
-    "HelmAgent",
-]

src/chat_bridge/__init__.py

@@ -1,10 +0,0 @@
-"""Chat Bridge — vendor-agnostic chat platform abstraction.
-
-Provides a clean interface for integrating any chat platform
-(Discord, Telegram, Slack, etc.) with Timmy's agent core.
-
-Usage:
-    from chat_bridge.base import ChatPlatform
-    from chat_bridge.registry import platform_registry
-    from chat_bridge.vendors.discord import DiscordVendor
-"""

src/creative/CLAUDE.md

@@ -0,0 +1,18 @@
+# creative/ — Module Guide
+
+GPU-accelerated media generation. Heavy dependencies (PyTorch, diffusers).
+
+## Structure
+- `director.py` — Orchestrates multi-step creative pipelines
+- `assembler.py` — Video assembly and stitching
+- `tools/` — MCP-compliant tool implementations
+  - `image_tools.py` — FLUX.2 image generation
+  - `music_tools.py` — ACE-Step music generation
+  - `video_tools.py` — Wan 2.1 video generation
+  - `git_tools.py`, `file_ops.py`, `code_exec.py` — Utility tools
+  - `self_edit.py` — Self-modification MCP tool (protected file)
+
+## Testing
+```bash
+pytest tests/creative/ -q
+```

src/creative/director.py

@@ -132,7 +132,7 @@ def run_storyboard(project_id: str) -> dict:
 
     project.status = "storyboard"
 
-    from tools.image_tools import generate_storyboard
+    from creative.tools.image_tools import generate_storyboard
 
     scene_descriptions = [s["description"] for s in project.scenes]
     result = generate_storyboard(scene_descriptions)
@@ -159,7 +159,7 @@ def run_music(
 
     project.status = "music"
 
-    from tools.music_tools import generate_song
+    from creative.tools.music_tools import generate_song
 
     # Default duration: ~15s per scene, minimum 60s
     target_duration = duration or max(60, len(project.scenes) * 15)
@@ -192,7 +192,7 @@ def run_video_generation(project_id: str) -> dict:
 
     project.status = "video"
 
-    from tools.video_tools import generate_video_clip, image_to_video
+    from creative.tools.video_tools import generate_video_clip, image_to_video
 
     clips = []
     for i, scene in enumerate(project.scenes):

src/creative/tools/self_edit.py

@@ -13,7 +13,7 @@ This is the core self-modification orchestrator that:
 10. Generates reflections
 
 Usage:
-    from tools.self_edit import self_edit_tool
+    from creative.tools.self_edit import self_edit_tool
     from mcp.registry import tool_registry
     
     # Register with MCP
@@ -818,7 +818,7 @@ def register_self_edit_tool(registry: Any, llm_adapter: Optional[object] = None)
         category="self_coding",
         requires_confirmation=True,  # Safety: require user approval
         tags=["self-modification", "code-generation"],
-        source_module="tools.self_edit",
+        source_module="creative.tools.self_edit",
     )
     
     logger.info("Self-edit tool registered with MCP")

src/dashboard/app.py

@@ -34,7 +34,7 @@ from dashboard.routes.scripture import router as scripture_router
 from dashboard.routes.self_coding import router as self_coding_router
 from dashboard.routes.self_coding import self_modify_router
 from dashboard.routes.hands import router as hands_router
-from router.api import router as cascade_router
+from infrastructure.router.api import router as cascade_router
 
 logging.basicConfig(
     level=logging.INFO,
@@ -57,7 +57,7 @@ async def _briefing_scheduler() -> None:
     exists (< 30 min old).
     """
     from timmy.briefing import engine as briefing_engine
-    from notifications.push import notify_briefing_ready
+    from infrastructure.notifications.push import notify_briefing_ready
 
     await asyncio.sleep(2)  # Let server finish starting before first run
 
@@ -135,9 +135,9 @@ async def lifespan(app: FastAPI):
         logger.info("Spark Intelligence active — event capture enabled")
 
     # Auto-start chat integrations (skip silently if unconfigured)
-    from telegram_bot.bot import telegram_bot
-    from chat_bridge.vendors.discord import discord_bot
-    from chat_bridge.registry import platform_registry
+    from integrations.telegram_bot.bot import telegram_bot
+    from integrations.chat_bridge.vendors.discord import discord_bot
+    from integrations.chat_bridge.registry import platform_registry
     platform_registry.register(discord_bot)
 
     if settings.telegram_token:
@@ -208,5 +208,5 @@ async def index(request: Request):
 @app.get("/shortcuts/setup")
 async def shortcuts_setup():
     """Siri Shortcuts setup guide."""
-    from shortcuts.siri import get_setup_guide
+    from integrations.shortcuts.siri import get_setup_guide
     return get_setup_guide()

src/dashboard/routes/agents.py

@@ -125,7 +125,7 @@ def _extract_task_from_message(message: str) -> dict | None:
 def _build_queue_context() -> str:
     """Build a concise task queue summary for context injection."""
     try:
-        from task_queue.models import get_counts_by_status, list_tasks, TaskStatus
+        from swarm.task_queue.models import get_counts_by_status, list_tasks, TaskStatus
         counts = get_counts_by_status()
         pending = counts.get("pending_approval", 0)
         running = counts.get("running", 0)
@@ -215,7 +215,7 @@ async def chat_timmy(request: Request, message: str = Form(...)):
     task_info = _extract_task_from_message(message)
     if task_info:
         try:
-            from task_queue.models import create_task
+            from swarm.task_queue.models import create_task
             task = create_task(
                 title=task_info["title"],
                 description=task_info["description"],

src/dashboard/routes/creative.py

@@ -68,7 +68,7 @@ async def creative_projects_api():
 async def creative_genres_api():
     """Return supported music genres."""
     try:
-        from tools.music_tools import GENRES
+        from creative.tools.music_tools import GENRES
         return {"genres": GENRES}
     except ImportError:
         return {"genres": []}
@@ -78,7 +78,7 @@ async def creative_genres_api():
 async def creative_video_styles_api():
     """Return supported video styles and resolutions."""
     try:
-        from tools.video_tools import VIDEO_STYLES, RESOLUTION_PRESETS
+        from creative.tools.video_tools import VIDEO_STYLES, RESOLUTION_PRESETS
         return {
             "styles": VIDEO_STYLES,
             "resolutions": list(RESOLUTION_PRESETS.keys()),

src/dashboard/routes/discord.py

@@ -25,7 +25,7 @@ async def setup_discord(payload: TokenPayload):
     Send POST with JSON body: {"token": "<your-bot-token>"}
     Get the token from https://discord.com/developers/applications
     """
-    from chat_bridge.vendors.discord import discord_bot
+    from integrations.chat_bridge.vendors.discord import discord_bot
 
     token = payload.token.strip()
     if not token:
@@ -51,7 +51,7 @@ async def setup_discord(payload: TokenPayload):
 @router.get("/status")
 async def discord_status():
     """Return current Discord bot status."""
-    from chat_bridge.vendors.discord import discord_bot
+    from integrations.chat_bridge.vendors.discord import discord_bot
 
     return discord_bot.status().to_dict()
 
@@ -70,8 +70,8 @@ async def join_from_image(
     The bot validates the invite and returns the OAuth2 URL for the
     server admin to authorize the bot.
     """
-    from chat_bridge.invite_parser import invite_parser
-    from chat_bridge.vendors.discord import discord_bot
+    from integrations.chat_bridge.invite_parser import invite_parser
+    from integrations.chat_bridge.vendors.discord import discord_bot
 
     invite_info = None
 
@@ -129,7 +129,7 @@ async def join_from_image(
 @router.get("/oauth-url")
 async def discord_oauth_url():
     """Get the bot's OAuth2 authorization URL for adding to servers."""
-    from chat_bridge.vendors.discord import discord_bot
+    from integrations.chat_bridge.vendors.discord import discord_bot
 
     url = discord_bot.get_oauth2_url()
     if url:

src/dashboard/routes/memory.py

@@ -7,7 +7,7 @@ from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.templating import Jinja2Templates
 
-from memory.vector_store import (
+from timmy.memory.vector_store import (
     store_memory,
     search_memories,
     get_memory_stats,

src/dashboard/routes/self_coding.py

@@ -209,7 +209,7 @@ async def api_execute(request: ExecuteRequest):
     This is the API endpoint for manual task execution.
     In production, this should require authentication and confirmation.
     """
-    from tools.self_edit import SelfEditTool
+    from creative.tools.self_edit import SelfEditTool
     
     tool = SelfEditTool()
     result = await tool.execute(request.task_description)
@@ -332,7 +332,7 @@ async def execute_task(
 ):
     """HTMX endpoint to execute a task."""
     from dashboard.app import templates
-    from tools.self_edit import SelfEditTool
+    from creative.tools.self_edit import SelfEditTool
     
     tool = SelfEditTool()
     result = await tool.execute(task_description)
@@ -388,7 +388,7 @@ async def run_self_modify(
     if not settings.self_modify_enabled:
         raise HTTPException(403, "Self-modification is disabled")
 
-    from self_modify.loop import SelfModifyLoop, ModifyRequest
+    from self_coding.self_modify.loop import SelfModifyLoop, ModifyRequest
 
     files = [f.strip() for f in target_files.split(",") if f.strip()]
     request = ModifyRequest(

src/dashboard/routes/swarm.py

@@ -20,7 +20,7 @@ from swarm import learner as swarm_learner
 from swarm import registry
 from swarm.coordinator import coordinator
 from swarm.tasks import TaskStatus, update_task
-from ws_manager.handler import ws_manager
+from infrastructure.ws_manager.handler import ws_manager
 
 logger = logging.getLogger(__name__)
 

src/dashboard/routes/tasks.py

@@ -24,7 +24,7 @@ from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.templating import Jinja2Templates
 
-from task_queue.models import (
+from swarm.task_queue.models import (
     QueueTask,
     TaskPriority,
     TaskStatus,
@@ -49,7 +49,7 @@ def _broadcast_task_event(event_type: str, task: QueueTask):
     """Best-effort broadcast a task event to connected WebSocket clients."""
     try:
         import asyncio
-        from ws_manager.handler import ws_manager
+        from infrastructure.ws_manager.handler import ws_manager
 
         payload = {
             "type": "task_event",
@@ -461,7 +461,7 @@ def _task_to_dict(task: QueueTask) -> dict:
 
 def _notify_task_created(task: QueueTask):
     try:
-        from notifications.push import notifier
+        from infrastructure.notifications.push import notifier
         notifier.notify(
             title="New Task",
             message=f"{task.created_by} created: {task.title}",

src/dashboard/routes/telegram.py

@@ -17,7 +17,7 @@ async def setup_telegram(payload: TokenPayload):
     Send a POST with JSON body: {"token": "<your-bot-token>"}
     Get the token from @BotFather on Telegram.
     """
-    from telegram_bot.bot import telegram_bot
+    from integrations.telegram_bot.bot import telegram_bot
 
     token = payload.token.strip()
     if not token:
@@ -43,7 +43,7 @@ async def setup_telegram(payload: TokenPayload):
 @router.get("/status")
 async def telegram_status():
     """Return the current state of the Telegram bot."""
-    from telegram_bot.bot import telegram_bot
+    from integrations.telegram_bot.bot import telegram_bot
 
     return {
         "running": telegram_bot.is_running,

src/dashboard/routes/upgrades.py

@@ -6,8 +6,8 @@ from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.templating import Jinja2Templates
 
-from upgrades.models import list_upgrades, get_upgrade, UpgradeStatus, get_pending_count
-from upgrades.queue import UpgradeQueue
+from self_coding.upgrades.models import list_upgrades, get_upgrade, UpgradeStatus, get_pending_count
+from self_coding.upgrades.queue import UpgradeQueue
 
 router = APIRouter(prefix="/self-modify", tags=["upgrades"])
 templates = Jinja2Templates(directory=str(Path(__file__).parent.parent / "templates"))

src/dashboard/routes/voice.py

@@ -8,7 +8,7 @@ import logging
 
 from fastapi import APIRouter, Form
 
-from voice.nlu import detect_intent, extract_command
+from integrations.voice.nlu import detect_intent, extract_command
 from timmy.agent import create_timmy
 
 logger = logging.getLogger(__name__)
@@ -104,7 +104,7 @@ async def process_voice_input(
                 )
             else:
                 import asyncio
-                from self_modify.loop import SelfModifyLoop, ModifyRequest
+                from self_coding.self_modify.loop import SelfModifyLoop, ModifyRequest
 
                 target_files = []
                 if "target_file" in intent.entities:

src/dashboard/routes/work_orders.py

@@ -8,7 +8,7 @@ from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.templating import Jinja2Templates
 
-from work_orders.models import (
+from swarm.work_orders.models import (
     WorkOrder,
     WorkOrderCategory,
     WorkOrderPriority,
@@ -20,7 +20,7 @@ from work_orders.models import (
     list_work_orders,
     update_work_order_status,
 )
-from work_orders.risk import compute_risk_score, should_auto_execute
+from swarm.work_orders.risk import compute_risk_score, should_auto_execute
 
 logger = logging.getLogger(__name__)
 
@@ -68,7 +68,7 @@ async def submit_work_order(
 
     # Notify
     try:
-        from notifications.push import notifier
+        from infrastructure.notifications.push import notifier
         notifier.notify(
             title="New Work Order",
             message=f"{wo.submitter} submitted: {wo.title}",
@@ -116,7 +116,7 @@ async def submit_work_order_json(request: Request):
     )
 
     try:
-        from notifications.push import notifier
+        from infrastructure.notifications.push import notifier
         notifier.notify(
             title="New Work Order",
             message=f"{wo.submitter} submitted: {wo.title}",
@@ -315,7 +315,7 @@ async def execute_order(wo_id: str):
     update_work_order_status(wo_id, WorkOrderStatus.IN_PROGRESS)
 
     try:
-        from work_orders.executor import work_order_executor
+        from swarm.work_orders.executor import work_order_executor
         success, result = work_order_executor.execute(wo)
         if success:
             update_work_order_status(wo_id, WorkOrderStatus.COMPLETED, result=result)

src/data/self_modify_reports/20260226_215611_add_docstring.md

@@ -0,0 +1,19 @@
+# Self-Modify Report: 20260226_215611
+
+**Instruction:** Add docstring
+**Target files:** src/foo.py
+**Dry run:** True
+**Backend:** ollama
+**Branch:** N/A
+**Result:** SUCCESS
+**Error:** none
+**Commit:** none
+**Attempts:** 1
+**Autonomous cycles:** 0
+
+## Attempt 1 -- dry_run
+
+### LLM Response
+```
+llm raw
+```

src/data/self_modify_reports/20260226_215611_break_it.md

@@ -0,0 +1,31 @@
+# Self-Modify Report: 20260226_215611
+
+**Instruction:** Break it
+**Target files:** src/foo.py
+**Dry run:** False
+**Backend:** ollama
+**Branch:** N/A
+**Result:** FAILED
+**Error:** Tests failed after 1 attempt(s).
+**Commit:** none
+**Attempts:** 1
+**Autonomous cycles:** 0
+
+## Attempt 1 -- complete
+
+### LLM Response
+```
+llm raw
+```
+
+### Edits Written
+#### src/foo.py
+```python
+x = 1
+
+```
+
+### Test Result: FAILED
+```
+1 failed
+```

src/data/self_modify_reports/20260226_215611_do_something_vague.md

@@ -0,0 +1,12 @@
+# Self-Modify Report: 20260226_215611
+
+**Instruction:** do something vague
+**Target files:** (auto-detected)
+**Dry run:** False
+**Backend:** ollama
+**Branch:** N/A
+**Result:** FAILED
+**Error:** No target files identified. Specify target_files or use more specific language.
+**Commit:** none
+**Attempts:** 0
+**Autonomous cycles:** 0

src/data/self_modify_reports/20260226_215611_fix_foo.md

@@ -0,0 +1,31 @@
+# Self-Modify Report: 20260226_215611
+
+**Instruction:** Fix foo
+**Target files:** src/foo.py
+**Dry run:** False
+**Backend:** ollama
+**Branch:** N/A
+**Result:** FAILED
+**Error:** Tests failed after 1 attempt(s).
+**Commit:** none
+**Attempts:** 1
+**Autonomous cycles:** 0
+
+## Attempt 1 -- complete
+
+### LLM Response
+```
+llm raw
+```
+
+### Edits Written
+#### src/foo.py
+```python
+x = 2
+
+```
+
+### Test Result: FAILED
+```
+FAILED
+```

src/data/self_modify_reports/20260226_215611_fix_foo_important_correction_from_previ.md

@@ -0,0 +1,34 @@
+# Self-Modify Report: 20260226_215611
+
+**Instruction:** Fix foo
+
+IMPORTANT CORRECTION from previous failure:
+Fix: do X instead of Y
+**Target files:** src/foo.py
+**Dry run:** False
+**Backend:** ollama
+**Branch:** N/A
+**Result:** SUCCESS
+**Error:** none
+**Commit:** abc123
+**Attempts:** 1
+**Autonomous cycles:** 0
+
+## Attempt 1 -- complete
+
+### LLM Response
+```
+llm raw
+```
+
+### Edits Written
+#### src/foo.py
+```python
+x = 2
+
+```
+
+### Test Result: PASSED
+```
+PASSED
+```

src/data/self_modify_reports/20260226_220014_add_docstring.md

@@ -0,0 +1,19 @@
+# Self-Modify Report: 20260226_220014
+
+**Instruction:** Add docstring
+**Target files:** src/foo.py
+**Dry run:** True
+**Backend:** ollama
+**Branch:** N/A
+**Result:** SUCCESS
+**Error:** none
+**Commit:** none
+**Attempts:** 1
+**Autonomous cycles:** 0
+
+## Attempt 1 -- dry_run
+
+### LLM Response
+```
+llm raw
+```

src/data/self_modify_reports/20260226_220014_break_it.md

@@ -0,0 +1,31 @@
+# Self-Modify Report: 20260226_220014
+
+**Instruction:** Break it
+**Target files:** src/foo.py
+**Dry run:** False
+**Backend:** ollama
+**Branch:** N/A
+**Result:** FAILED
+**Error:** Tests failed after 1 attempt(s).
+**Commit:** none
+**Attempts:** 1
+**Autonomous cycles:** 0
+
+## Attempt 1 -- complete
+
+### LLM Response
+```
+llm raw
+```
+
+### Edits Written
+#### src/foo.py
+```python
+x = 1
+
+```
+
+### Test Result: FAILED
+```
+1 failed
+```

src/data/self_modify_reports/20260226_220014_do_something_vague.md

@@ -0,0 +1,12 @@
+# Self-Modify Report: 20260226_220014
+
+**Instruction:** do something vague
+**Target files:** (auto-detected)
+**Dry run:** False
+**Backend:** ollama
+**Branch:** N/A
+**Result:** FAILED
+**Error:** No target files identified. Specify target_files or use more specific language.
+**Commit:** none
+**Attempts:** 0
+**Autonomous cycles:** 0

src/data/self_modify_reports/20260226_220014_fix_foo.md

@@ -0,0 +1,48 @@
+# Self-Modify Report: 20260226_220014
+
+**Instruction:** Fix foo
+**Target files:** src/foo.py
+**Dry run:** False
+**Backend:** ollama
+**Branch:** N/A
+**Result:** SUCCESS
+**Error:** none
+**Commit:** abc123
+**Attempts:** 2
+**Autonomous cycles:** 0
+
+## Attempt 1 -- syntax_validation
+
+**Error:** src/foo.py: line 1: '(' was never closed
+
+### LLM Response
+```
+bad llm
+```
+
+### Edits Written
+#### src/foo.py
+```python
+def foo(
+
+```
+
+## Attempt 2 -- complete
+
+### LLM Response
+```
+good llm
+```
+
+### Edits Written
+#### src/foo.py
+```python
+def foo():
+    pass
+
+```
+
+### Test Result: PASSED
+```
+passed
+```

src/data/self_modify_reports/20260226_220015_fix_foo.md

@@ -0,0 +1,31 @@
+# Self-Modify Report: 20260226_220015
+
+**Instruction:** Fix foo
+**Target files:** src/foo.py
+**Dry run:** False
+**Backend:** ollama
+**Branch:** N/A
+**Result:** FAILED
+**Error:** Tests failed after 1 attempt(s).
+**Commit:** none
+**Attempts:** 1
+**Autonomous cycles:** 0
+
+## Attempt 1 -- complete
+
+### LLM Response
+```
+llm raw
+```
+
+### Edits Written
+#### src/foo.py
+```python
+x = 2
+
+```
+
+### Test Result: FAILED
+```
+FAILED
+```

src/data/self_modify_reports/20260226_220015_fix_foo_important_correction_from_previ.md

@@ -0,0 +1,34 @@
+# Self-Modify Report: 20260226_220015
+
+**Instruction:** Fix foo
+
+IMPORTANT CORRECTION from previous failure:
+Fix: do X instead of Y
+**Target files:** src/foo.py
+**Dry run:** False
+**Backend:** ollama
+**Branch:** N/A
+**Result:** SUCCESS
+**Error:** none
+**Commit:** abc123
+**Attempts:** 1
+**Autonomous cycles:** 0
+
+## Attempt 1 -- complete
+
+### LLM Response
+```
+llm raw
+```
+
+### Edits Written
+#### src/foo.py
+```python
+x = 2
+
+```
+
+### Test Result: PASSED
+```
+PASSED
+```

src/data/self_modify_reports/20260226_220410_add_docstring.md

@@ -0,0 +1,19 @@
+# Self-Modify Report: 20260226_220410
+
+**Instruction:** Add docstring
+**Target files:** src/foo.py
+**Dry run:** True
+**Backend:** ollama
+**Branch:** N/A
+**Result:** SUCCESS
+**Error:** none
+**Commit:** none
+**Attempts:** 1
+**Autonomous cycles:** 0
+
+## Attempt 1 -- dry_run
+
+### LLM Response
+```
+llm raw
+```

src/data/self_modify_reports/20260226_220410_break_it.md

@@ -0,0 +1,31 @@
+# Self-Modify Report: 20260226_220410
+
+**Instruction:** Break it
+**Target files:** src/foo.py
+**Dry run:** False
+**Backend:** ollama
+**Branch:** N/A
+**Result:** FAILED
+**Error:** Tests failed after 1 attempt(s).
+**Commit:** none
+**Attempts:** 1
+**Autonomous cycles:** 0
+
+## Attempt 1 -- complete
+
+### LLM Response
+```
+llm raw
+```
+
+### Edits Written
+#### src/foo.py
+```python
+x = 1
+
+```
+
+### Test Result: FAILED
+```
+1 failed
+```

src/data/self_modify_reports/20260226_220410_do_something_vague.md

@@ -0,0 +1,12 @@
+# Self-Modify Report: 20260226_220410
+
+**Instruction:** do something vague
+**Target files:** (auto-detected)
+**Dry run:** False
+**Backend:** ollama
+**Branch:** N/A
+**Result:** FAILED
+**Error:** No target files identified. Specify target_files or use more specific language.
+**Commit:** none
+**Attempts:** 0
+**Autonomous cycles:** 0

src/data/self_modify_reports/20260226_220410_fix_foo.md

@@ -0,0 +1,31 @@
+# Self-Modify Report: 20260226_220410
+
+**Instruction:** Fix foo
+**Target files:** src/foo.py
+**Dry run:** False
+**Backend:** ollama
+**Branch:** N/A
+**Result:** FAILED
+**Error:** Tests failed after 1 attempt(s).
+**Commit:** none
+**Attempts:** 1
+**Autonomous cycles:** 0
+
+## Attempt 1 -- complete
+
+### LLM Response
+```
+llm raw
+```
+
+### Edits Written
+#### src/foo.py
+```python
+x = 2
+
+```
+
+### Test Result: FAILED
+```
+FAILED
+```

src/data/self_modify_reports/20260226_220410_fix_foo_important_correction_from_previ.md

@@ -0,0 +1,34 @@
+# Self-Modify Report: 20260226_220410
+
+**Instruction:** Fix foo
+
+IMPORTANT CORRECTION from previous failure:
+Fix: do X instead of Y
+**Target files:** src/foo.py
+**Dry run:** False
+**Backend:** ollama
+**Branch:** N/A
+**Result:** SUCCESS
+**Error:** none
+**Commit:** abc123
+**Attempts:** 1
+**Autonomous cycles:** 0
+
+## Attempt 1 -- complete
+
+### LLM Response
+```
+llm raw
+```
+
+### Edits Written
+#### src/foo.py
+```python
+x = 2
+
+```
+
+### Test Result: PASSED
+```
+PASSED
+```

src/infrastructure/CLAUDE.md

@@ -0,0 +1,22 @@
+# infrastructure/ — Module Guide
+
+Cross-cutting services used by many modules.
+
+## Structure
+- `ws_manager/` — WebSocket connection manager (singleton: `ws_manager`)
+- `notifications/` — Push notification store (singleton: `notifier`)
+- `events/` — Domain event bus and broadcaster
+- `router/` — Cascade LLM router with circuit-breaker failover
+
+## Key singletons
+```python
+from infrastructure.ws_manager.handler import ws_manager
+from infrastructure.notifications.push import notifier
+from infrastructure.events.bus import event_bus
+from infrastructure.router import get_router
+```
+
+## Testing
+```bash
+pytest tests/infrastructure/ tests/integrations/test_websocket*.py tests/integrations/test_notifications.py -q
+```

src/infrastructure/__init__.py

@@ -0,0 +1 @@
+"""Infrastructure — Cross-cutting services (WebSocket, notifications, events, router)."""

src/infrastructure/events/broadcaster.py

@@ -18,7 +18,7 @@ class EventBroadcaster:
     """Broadcasts events to WebSocket clients.
     
     Usage:
-        from events.broadcaster import event_broadcaster
+        from infrastructure.events.broadcaster import event_broadcaster
         event_broadcaster.broadcast(event)
     """
     
@@ -29,7 +29,7 @@ class EventBroadcaster:
         """Lazy import to avoid circular deps."""
         if self._ws_manager is None:
             try:
-                from ws_manager.handler import ws_manager
+                from infrastructure.ws_manager.handler import ws_manager
                 self._ws_manager = ws_manager
             except Exception as exc:
                 logger.debug("WebSocket manager not available: %s", exc)

src/integrations/CLAUDE.md

@@ -0,0 +1,14 @@
+# integrations/ — Module Guide
+
+External platform bridges. All are optional dependencies.
+
+## Structure
+- `chat_bridge/` — Vendor-agnostic chat platform abstraction (Discord impl)
+- `telegram_bot/` — Telegram bot bridge
+- `shortcuts/` — iOS Siri Shortcuts API metadata
+- `voice/` — Local NLU intent detection (regex-based, no cloud)
+
+## Testing
+```bash
+pytest tests/integrations/ -q
+```

src/integrations/__init__.py

@@ -0,0 +1 @@
+"""Integrations — External platform bridges (Discord, Telegram, Siri, Voice)."""

src/integrations/chat_bridge/__init__.py

@@ -0,0 +1,10 @@
+"""Chat Bridge — vendor-agnostic chat platform abstraction.
+
+Provides a clean interface for integrating any chat platform
+(Discord, Telegram, Slack, etc.) with Timmy's agent core.
+
+Usage:
+    from integrations.chat_bridge.base import ChatPlatform
+    from integrations.chat_bridge.registry import platform_registry
+    from integrations.chat_bridge.vendors.discord import DiscordVendor
+"""

src/integrations/chat_bridge/invite_parser.py

@@ -11,7 +11,7 @@ Supports Discord invite patterns:
     - discordapp.com/invite/<code>
 
 Usage:
-    from chat_bridge.invite_parser import invite_parser
+    from integrations.chat_bridge.invite_parser import invite_parser
 
     # From image bytes (screenshot or QR photo)
     result = await invite_parser.parse_image(image_bytes)
@@ -25,7 +25,7 @@ import logging
 import re
 from typing import Optional
 
-from chat_bridge.base import InviteInfo
+from integrations.chat_bridge.base import InviteInfo
 
 logger = logging.getLogger(__name__)
 

src/integrations/chat_bridge/registry.py

@@ -5,7 +5,7 @@ all chat platform integrations. Dashboard routes and the agent core
 interact with platforms through this registry.
 
 Usage:
-    from chat_bridge.registry import platform_registry
+    from integrations.chat_bridge.registry import platform_registry
 
     platform_registry.register(discord_vendor)
     discord = platform_registry.get("discord")
@@ -15,7 +15,7 @@ Usage:
 import logging
 from typing import Optional
 
-from chat_bridge.base import ChatPlatform, PlatformStatus
+from integrations.chat_bridge.base import ChatPlatform, PlatformStatus
 
 logger = logging.getLogger(__name__)
 

src/integrations/chat_bridge/vendors/discord.py

@@ -19,7 +19,7 @@ import logging
 from pathlib import Path
 from typing import Optional
 
-from chat_bridge.base import (
+from integrations.chat_bridge.base import (
     ChatMessage,
     ChatPlatform,
     ChatThread,

src/lightning/CLAUDE.md

@@ -0,0 +1,9 @@
+# lightning/ — Module Guide
+
+**Security-sensitive.** Bitcoin Lightning payment gating (L402).
+Never hard-code secrets. Use `from config import settings` for all credentials.
+
+## Testing
+```bash
+pytest tests/lightning/ -q
+```

src/mcp/discovery.py

@@ -72,10 +72,10 @@ class ToolDiscovery:
         discovery = ToolDiscovery()
         
         # Discover from a module
-        tools = discovery.discover_module("tools.git")
-        
+        tools = discovery.discover_module("creative.tools.git")
+
         # Auto-register with registry
-        discovery.auto_register("tools")
+        discovery.auto_register("creative.tools")
         
         # Discover from all installed packages
         tools = discovery.discover_all_packages()
@@ -89,7 +89,7 @@ class ToolDiscovery:
         """Discover all MCP tools in a module.
         
         Args:
-            module_name: Dotted path to module (e.g., "tools.git")
+            module_name: Dotted path to module (e.g., "creative.tools.git")
         
         Returns:
             List of discovered tools

src/self_coding/CLAUDE.md

@@ -0,0 +1,23 @@
+# self_coding/ — Module Guide
+
+Self-modification infrastructure with safety constraints.
+
+## Structure
+- `git_safety.py` — Atomic git operations with rollback
+- `codebase_indexer.py` — Live mental model of the codebase
+- `modification_journal.py` — Persistent log of modification attempts
+- `reflection.py` — Generate lessons learned
+- `self_modify/` — Runtime self-modification loop (LLM-driven)
+- `self_tdd/` — Continuous test watchdog
+- `upgrades/` — Self-upgrade approval queue
+
+## Entry points
+```toml
+self-tdd = "self_coding.self_tdd.watchdog:main"
+self-modify = "self_coding.self_modify.cli:main"
+```
+
+## Testing
+```bash
+pytest tests/self_coding/ -q
+```

src/self_coding/self_modify/cli.py

@@ -45,7 +45,7 @@ def run(
     if not branch:
         os.environ["SELF_MODIFY_SKIP_BRANCH"] = "1"
 
-    from self_modify.loop import SelfModifyLoop, ModifyRequest
+    from self_coding.self_modify.loop import SelfModifyLoop, ModifyRequest
 
     target_files = list(file) if file else []
     effective_backend = backend or os.environ.get("SELF_MODIFY_BACKEND", "auto")

src/self_coding/self_modify/loop.py

@@ -480,7 +480,7 @@ Keep your response under 500 words. Focus on actionable fix instructions."""
 
     def _create_branch(self) -> str:
         """Create and switch to a working branch."""
-        from tools.git_tools import git_branch
+        from creative.tools.git_tools import git_branch
 
         branch_name = f"timmy/self-modify-{int(time.time())}"
         git_branch(self._repo_path, create=branch_name, switch=branch_name)
@@ -489,7 +489,7 @@ Keep your response under 500 words. Focus on actionable fix instructions."""
 
     def _git_commit(self, message: str, files: list[str]) -> Optional[str]:
         """Stage files and commit."""
-        from tools.git_tools import git_add, git_commit
+        from creative.tools.git_tools import git_add, git_commit
 
         try:
             git_add(self._repo_path, paths=files)

src/self_coding/upgrades/queue.py

@@ -5,7 +5,7 @@ import subprocess
 from pathlib import Path
 from typing import Optional
 
-from upgrades.models import (
+from self_coding.upgrades.models import (
     Upgrade,
     UpgradeStatus,
     create_upgrade,

src/swarm/CLAUDE.md

@@ -0,0 +1,21 @@
+# swarm/ — Module Guide
+
+Security-sensitive module. Changes to `coordinator.py` require review.
+
+## Structure
+- `coordinator.py` — Auction-based task assignment (singleton: `coordinator`)
+- `tasks.py`, `bidder.py`, `comms.py` — Core swarm primitives
+- `work_orders/` — External work order submission and execution
+- `task_queue/` — Human-in-the-loop approval queue
+- `event_log.py` — Structured event logging
+- `personas.py`, `persona_node.py` — Agent persona management
+
+## Key singletons
+```python
+from swarm.coordinator import coordinator
+```
+
+## Testing
+```bash
+pytest tests/swarm/ -q
+```

src/swarm/coordinator.py

@@ -422,7 +422,7 @@ class SwarmCoordinator:
     async def _broadcast_agent_joined(self, agent_id: str, name: str) -> None:
         """Broadcast agent joined event via WebSocket."""
         try:
-            from ws_manager.handler import ws_manager
+            from infrastructure.ws_manager.handler import ws_manager
             await ws_manager.broadcast_agent_joined(agent_id, name)
         except Exception as exc:
             logger.debug("WebSocket broadcast failed (agent_joined): %s", exc)
@@ -430,7 +430,7 @@ class SwarmCoordinator:
     async def _broadcast_bid(self, task_id: str, agent_id: str, bid_sats: int) -> None:
         """Broadcast bid submitted event via WebSocket."""
         try:
-            from ws_manager.handler import ws_manager
+            from infrastructure.ws_manager.handler import ws_manager
             await ws_manager.broadcast_bid_submitted(task_id, agent_id, bid_sats)
         except Exception as exc:
             logger.debug("WebSocket broadcast failed (bid): %s", exc)
@@ -438,7 +438,7 @@ class SwarmCoordinator:
     async def _broadcast_task_posted(self, task_id: str, description: str) -> None:
         """Broadcast task posted event via WebSocket."""
         try:
-            from ws_manager.handler import ws_manager
+            from infrastructure.ws_manager.handler import ws_manager
             await ws_manager.broadcast_task_posted(task_id, description)
         except Exception as exc:
             logger.debug("WebSocket broadcast failed (task_posted): %s", exc)
@@ -446,7 +446,7 @@ class SwarmCoordinator:
     async def _broadcast_task_assigned(self, task_id: str, agent_id: str) -> None:
         """Broadcast task assigned event via WebSocket."""
         try:
-            from ws_manager.handler import ws_manager
+            from infrastructure.ws_manager.handler import ws_manager
             await ws_manager.broadcast_task_assigned(task_id, agent_id)
         except Exception as exc:
             logger.debug("WebSocket broadcast failed (task_assigned): %s", exc)
@@ -456,7 +456,7 @@ class SwarmCoordinator:
     ) -> None:
         """Broadcast task completed event via WebSocket."""
         try:
-            from ws_manager.handler import ws_manager
+            from infrastructure.ws_manager.handler import ws_manager
             await ws_manager.broadcast_task_completed(task_id, agent_id, result)
         except Exception as exc:
             logger.debug("WebSocket broadcast failed (task_completed): %s", exc)

src/swarm/event_log.py

@@ -143,7 +143,7 @@ def log_event(
     
     # Broadcast to WebSocket clients for real-time activity feed
     try:
-        from events.broadcaster import event_broadcaster
+        from infrastructure.events.broadcaster import event_broadcaster
         event_broadcaster.broadcast_sync(entry)
     except Exception:
         # Don't fail if broadcaster unavailable

src/swarm/tool_executor.py

@@ -302,7 +302,7 @@ class DirectToolExecutor(ToolExecutor):
                 if not cfg.self_modify_enabled:
                     return self.execute_task(task_description)
 
-                from self_modify.loop import SelfModifyLoop, ModifyRequest
+                from self_coding.self_modify.loop import SelfModifyLoop, ModifyRequest
 
                 loop = SelfModifyLoop()
                 result = loop.run(ModifyRequest(instruction=task_description))

src/swarm/work_orders/executor.py

@@ -2,7 +2,7 @@
 
 import logging
 
-from work_orders.models import WorkOrder, WorkOrderCategory
+from swarm.work_orders.models import WorkOrder, WorkOrderCategory
 
 logger = logging.getLogger(__name__)
 

src/swarm/work_orders/risk.py

@@ -1,6 +1,6 @@
 """Risk scoring and auto-execution threshold logic for work orders."""
 
-from work_orders.models import WorkOrder, WorkOrderCategory, WorkOrderPriority
+from swarm.work_orders.models import WorkOrder, WorkOrderCategory, WorkOrderPriority
 
 
 PRIORITY_WEIGHTS = {

src/timmy/agent_core/ollama_adapter.py

@@ -5,8 +5,8 @@ to the substrate-agnostic TimAgent interface. It's the bridge
 between the old codebase and the new embodiment-ready architecture.
 
 Usage:
-    from agent_core import AgentIdentity, Perception
-    from agent_core.ollama_adapter import OllamaAgent
+    from timmy.agent_core import AgentIdentity, Perception
+    from timmy.agent_core.ollama_adapter import OllamaAgent
     
     identity = AgentIdentity.generate("Timmy")
     agent = OllamaAgent(identity)
@@ -19,7 +19,7 @@ Usage:
 
 from typing import Any, Optional
 
-from agent_core.interface import (
+from timmy.agent_core.interface import (
     AgentCapability,
     AgentIdentity,
     Perception,

src/timmy/agents/__init__.py

@@ -0,0 +1,21 @@
+"""Agents package — Timmy and sub-agents.
+"""
+
+from timmy.agents.timmy import TimmyOrchestrator, create_timmy_swarm
+from timmy.agents.base import BaseAgent
+from timmy.agents.seer import SeerAgent
+from timmy.agents.forge import ForgeAgent
+from timmy.agents.quill import QuillAgent
+from timmy.agents.echo import EchoAgent
+from timmy.agents.helm import HelmAgent
+
+__all__ = [
+    "BaseAgent",
+    "TimmyOrchestrator",
+    "create_timmy_swarm",
+    "SeerAgent",
+    "ForgeAgent",
+    "QuillAgent",
+    "EchoAgent",
+    "HelmAgent",
+]

src/timmy/agents/base.py

@@ -15,7 +15,7 @@ from agno.agent import Agent
 from agno.models.ollama import Ollama
 
 from config import settings
-from events.bus import EventBus, Event
+from infrastructure.events.bus import EventBus, Event
 from mcp.registry import tool_registry
 
 logger = logging.getLogger(__name__)

src/timmy/agents/echo.py

@@ -9,7 +9,7 @@ Capabilities:
 
 from typing import Any
 
-from agents.base import BaseAgent
+from timmy.agents.base import BaseAgent
 
 
 ECHO_SYSTEM_PROMPT = """You are Echo, a memory and context management specialist.

src/timmy/agents/forge.py

@@ -9,7 +9,7 @@ Capabilities:
 
 from typing import Any
 
-from agents.base import BaseAgent
+from timmy.agents.base import BaseAgent
 
 
 FORGE_SYSTEM_PROMPT = """You are Forge, a code generation and tool building specialist.