@runcore-sh/runcore 0.5.6 → 0.5.7

package/dist/server.js

@@ -10,6 +10,9 @@ import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { readFile, writeFile, mkdir } from "node:fs/promises";
 import { acquireLock, releaseLock } from "./runtime-lock.js";
+import { ToolRegistry } from "./llm/tools/registry.js";
+import { createToolHandlers } from "./llm/tools/handlers.js";
+import { streamWithTools } from "./llm/tools/loop.js";
 // Package root — works whether run from CWD or npx
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -146,7 +149,7 @@ import { brainShadowRoutes, initBrainShadow } from "./library/brain-shadow.js";
 import { createCalendarStore } from "./calendar/store.js";
 import { calendarRoutes } from "./calendar/routes.js";
 import { getGoogleCalendarAdapter } from "./calendar/google-adapter.js";
-import { saveVisualMemory, hydrateVisualMemories, isVisualMemory, searchVisualMemories } from "./memory/visual.js";
+import { saveVisualMemory, isVisualMemory, searchVisualMemories } from "./memory/visual.js";
 // --- LLM provider selection (via settings) ---
 function pickStreamFn() {
     const providerName = resolveProvider();
@@ -284,6 +287,42 @@ async function getOrCreateChatSession(sessionId, name) {
         }
     }
     catch { }
+    // Fetch whiteboard status for system prompt injection
+    let whiteboardContext = "";
+    try {
+        const { WhiteboardStore } = await import("./whiteboard/store.js");
+        const wbStore = new WhiteboardStore(BRAIN_DIR);
+        const summary = await wbStore.getSummary();
+        if (summary.total > 0) {
+            const parts = [`Whiteboard: ${summary.total} items (${summary.open} open, ${summary.done} done, ${summary.openQuestions} open questions)`];
+            // Open questions from human
+            const openQs = await wbStore.getOpenQuestions();
+            const humanQs = openQs.filter((q) => q.plantedBy === "human");
+            if (humanQs.length > 0) {
+                parts.push("Questions from human (answer these):");
+                for (const q of humanQs)
+                    parts.push(`  → "${q.question || q.title}" (id: ${q.id})`);
+            }
+            // Answered questions to act on
+            const allNodes = await wbStore.list();
+            const answered = allNodes.filter((n) => n.type === "question" && n.answer && n.status === "done");
+            if (answered.length > 0) {
+                parts.push("Answered questions (act on these — the answer IS the instruction):");
+                for (const a of answered)
+                    parts.push(`  Q: "${a.question || a.title}" → A: ${a.answer}`);
+            }
+            // Top weighted
+            if (summary.topWeighted.length > 0) {
+                parts.push("Top attention items:");
+                for (const n of summary.topWeighted) {
+                    const icon = n.type === "question" ? "?" : n.type === "decision" ? "!" : "-";
+                    parts.push(`  ${icon} [${n.weight}] ${n.title}`);
+                }
+            }
+            whiteboardContext = parts.join("\n");
+        }
+    }
+    catch { }
     const encryptionKey = sessionKeys.get(sessionId) ?? null;
     const ltm = new FileSystemLongTermMemory(MEMORY_DIR, encryptionKey ?? undefined);
     await ltm.init();
@@ -398,6 +437,7 @@ async function getOrCreateChatSession(sessionId, name) {
             ...(TIER_CAPS[activeTier].spawning ? [
                 `## Agent spawning (CRITICAL — follow exactly)`,
                 `When a task requires code editing, file operations, or shell commands, you MUST spawn a Claude Code agent.`,
+                `EXCEPTION: Your built-in tools (whiteboard_plant, whiteboard_status, memory_learn, memory_retrieve, files_search, etc.) are NOT agent tasks. Call them directly via function calling — NEVER spawn an agent to call a tool you already have.`,
                 `Do NOT describe what you would do — actually spawn the agent by including the block below.`,
                 `The block content MUST be valid JSON with "label" and "prompt" keys. No markdown, no backticks, no explanation inside the block.`,
                 ``,
@@ -424,9 +464,31 @@ async function getOrCreateChatSession(sessionId, name) {
                 `Agent failures are normal (auth issues, timeouts, environment mismatches). Never stop spawning agents because of past failures.`,
                 `IMPORTANT: Do NOT announce agent spawns in your visible response text. No "Agent spawned to...", no "I'll spawn an agent...", no "Let me run an agent...". The UI shows agent status automatically. Just include the [AGENT_REQUEST] block silently at the end. Your visible text should answer the user's question or continue the conversation naturally.`,
             ] : []), // end spawning gate
+            ``,
+            `## Tools`,
+            `You have function-calling tools available. Use them directly — they execute server-side and return results inline.`,
+            `Key tools: whiteboard_plant, whiteboard_status, memory_retrieve, memory_learn, files_search, read_brain_file.`,
+            `Call tools whenever you need to read or write to the brain, whiteboard, or memory. Do NOT describe what you would do — call the tool.`,
+            ``,
+            `## Whiteboard (shared collaboration surface)`,
+            `You and ${name} share a whiteboard — a tree of goals, tasks, questions, decisions, and notes at /whiteboard.`,
+            `Use the whiteboard_plant tool to plant nodes. Use whiteboard_status to check the board.`,
+            ``,
+            ...(whiteboardContext ? [
+                `### Current whiteboard state`,
+                whiteboardContext,
+                ``,
+            ] : []),
+            `### When to plant questions (IMPORTANT)`,
+            `Before spawning an agent for an ambiguous task, plant a question on the whiteboard using whiteboard_plant.`,
+            `If a task has multiple valid approaches and you're unsure which ${name} wants, plant a question and wait for their answer.`,
+            ``,
+            `### Answered questions`,
+            `If you see answered questions above, ACT ON THEM IMMEDIATELY. Do not ask "which one should I focus on?" or "what would you like me to do?" — the answer IS the instruction. Read it, do the work, report what you did. ${name} already told you what to do by answering — don't make them say it twice.`,
+            ``,
             // Inject instance-readable vault values (CORE_*/DASH_* prefixed only — never secrets)
             ...(() => {
-                const readable = (_vaultStore ? _vaultStore.getDashReadableVault() : []);
+                const readable = (_vaultStore ? _vaultStore.getInstanceReadableVault() : []);
                 if (readable.length === 0)
                     return [];
                 const lines = readable.map((r) => `- ${r.name}: ${r.value}`);
@@ -507,7 +569,7 @@ import { TIER_CAPS } from "./tier/types.js";
 let activeTier = "local";
 const app = new Hono();
 // Global error handler — structured JSON errors
-import { errorHandler, ApiError } from "./middleware/error-handler.js";
+import { errorHandler, ApiError, badRequest, unauthorized, forbidden, notFound } from "./middleware/error-handler.js";
 app.onError((err, c) => {
     // Use structured handler for ApiErrors; preserve original behavior for others
     if (err instanceof ApiError)
@@ -671,13 +733,13 @@ app.post("/api/pair", async (c) => {
     // Backward compat: accept "safeWord" from old clients
     const pw = password || safeWord;
     if (!code || !name || !pw) {
-        return c.json({ error: "Name and password required" }, 400);
+        return badRequest("Name and password required");
     }
     // Auto-token bypass: startup token already proved the user is local.
     const skipCodeCheck = code === "__auto_token__";
     const result = await pair({ code, name, password: pw, recoveryQuestion, recoveryAnswer, skipCodeCheck });
     if ("error" in result) {
-        return c.json({ error: result.error }, 400);
+        return badRequest(result.error);
     }
     sessionKeys.set(result.session.id, result.sessionKey);
     setEncryptionKey(result.sessionKey);
@@ -706,11 +768,11 @@ app.post("/api/auth", async (c) => {
     // Backward compat: accept "safeWord" from old clients
     const pw = password || safeWord;
     if (!pw) {
-        return c.json({ error: "Password required" }, 400);
+        return badRequest("Password required");
     }
     const result = await authenticate(pw);
     if ("error" in result) {
-        return c.json({ error: result.error }, 401);
+        return unauthorized(result.error);
     }
     sessionKeys.set(result.session.id, result.sessionKey);
     setEncryptionKey(result.sessionKey);
@@ -755,7 +817,7 @@ app.get("/api/auth/token", async (c) => {
 app.get("/api/recover", async (c) => {
     const question = await getRecoveryQuestion();
     if (!question) {
-        return c.json({ error: "Not paired yet" }, 400);
+        return badRequest("Not paired yet");
     }
     return c.json({ question });
 });
@@ -766,11 +828,11 @@ app.post("/api/recover", async (c) => {
     // Backward compat: accept "newSafeWord" from old clients
     const newPw = newPassword || newSafeWord;
     if (!answer || !newPw) {
-        return c.json({ error: "Answer and new password required" }, 400);
+        return badRequest("Answer and new password required");
     }
     const result = await recover(answer, newPw);
     if ("error" in result) {
-        return c.json({ error: result.error }, 401);
+        return unauthorized(result.error);
     }
     sessionKeys.set(result.session.id, result.sessionKey);
     setEncryptionKey(result.sessionKey);
@@ -808,7 +870,7 @@ async function savePairedDevices() {
 app.post("/api/mobile/voucher", async (c) => {
     const sessionId = c.req.query("sessionId") || c.req.header("x-session-id");
     if (!sessionId || !validateSession(sessionId)) {
-        return c.json({ error: "Unauthorized" }, 401);
+        return unauthorized("Unauthorized");
     }
     const { randomBytes: rng } = await import("node:crypto");
     const { createHash } = await import("node:crypto");
@@ -867,7 +929,7 @@ app.get("/api/mobile/info/:token", async (c) => {
     const token = c.req.param("token");
     const voucher = deviceVouchers.get(token);
     if (!voucher || voucher.consumed || voucher.expiresAt < Date.now()) {
-        return c.json({ error: "Invalid or expired voucher" }, 404);
+        return notFound("Invalid or expired voucher");
     }
     return c.json({
         instanceName: voucher.instanceName,
@@ -879,16 +941,16 @@ app.post("/api/mobile/redeem", async (c) => {
     const body = await c.req.json();
     const { token, password } = body;
     if (!token || !password) {
-        return c.json({ error: "Voucher token and password required" }, 400);
+        return badRequest("Voucher token and password required");
     }
     const voucher = deviceVouchers.get(token);
     if (!voucher || voucher.consumed || voucher.expiresAt < Date.now()) {
-        return c.json({ error: "Invalid or expired voucher" }, 404);
+        return notFound("Invalid or expired voucher");
     }
     // Validate safe word via existing auth
     const authResult = await authenticate(password);
     if ("error" in authResult) {
-        return c.json({ error: "Invalid safe word" }, 401);
+        return unauthorized("Invalid safe word");
     }
     // Consume voucher
     voucher.consumed = true;
@@ -919,7 +981,7 @@ app.post("/api/mobile/redeem", async (c) => {
 app.get("/api/mobile/devices", async (c) => {
     const sessionId = c.req.query("sessionId") || c.req.header("x-session-id");
     if (!sessionId || !validateSession(sessionId)) {
-        return c.json({ error: "Unauthorized" }, 401);
+        return unauthorized("Unauthorized");
     }
     return c.json({
         devices: [...pairedDevices.values()].map((d) => ({
@@ -933,7 +995,7 @@ app.get("/api/mobile/devices", async (c) => {
 app.delete("/api/mobile/devices/:label", async (c) => {
     const sessionId = c.req.query("sessionId") || c.req.header("x-session-id");
     if (!sessionId || !validateSession(sessionId)) {
-        return c.json({ error: "Unauthorized" }, 401);
+        return unauthorized("Unauthorized");
     }
     const label = c.req.param("label");
     for (const [token, d] of pairedDevices) {
@@ -943,7 +1005,7 @@ app.delete("/api/mobile/devices/:label", async (c) => {
             return c.json({ ok: true });
         }
     }
-    return c.json({ error: "Device not found" }, 404);
+    return notFound("Device not found");
 });
 // --- Relay polling (receive messages from paired phones) ---
 let relayPollInterval = null;
@@ -1156,28 +1218,28 @@ async function handleRelayPair(token, password, label, instanceHash) {
 app.get("/api/vault", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     return c.json({ keys: (_vaultStore ? _vaultStore.listVaultKeys() : []) });
 });
 // Add or update a vault key
 app.put("/api/vault/:name", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const key = sessionKeys.get(sessionId);
     if (!key)
-        return c.json({ error: "Session key not found" }, 401);
+        return unauthorized("Session key not found");
     const name = c.req.param("name");
     const body = await c.req.json();
     const { value, label } = body;
     if (!value)
-        return c.json({ error: "value required" }, 400);
+        return badRequest("value required");
     await _vaultStore.setVaultKey(name, value, key, label);
     return c.json({ ok: true });
 });
@@ -1185,13 +1247,13 @@ app.put("/api/vault/:name", async (c) => {
 app.delete("/api/vault/:name", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const key = sessionKeys.get(sessionId);
     if (!key)
-        return c.json({ error: "Session key not found" }, 401);
+        return unauthorized("Session key not found");
     const name = c.req.param("name");
     await _vaultStore.deleteVaultKey(name, key);
     return c.json({ ok: true });
@@ -1200,13 +1262,13 @@ app.delete("/api/vault/:name", async (c) => {
 app.post("/api/vault/export", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const body = await c.req.json();
     if (!body.passphrase || body.passphrase.length < 8) {
-        return c.json({ error: "Passphrase required (min 8 characters)" }, 400);
+        return badRequest("Passphrase required (min 8 characters)");
     }
     try {
         const result = await _vaultTransfer.exportVault(body.passphrase);
@@ -1220,16 +1282,16 @@ app.post("/api/vault/export", async (c) => {
 app.post("/api/vault/import", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const key = sessionKeys.get(sessionId);
     if (!key)
-        return c.json({ error: "Session key not found" }, 401);
+        return unauthorized("Session key not found");
     const body = await c.req.json();
     if (!body.filePath || !body.passphrase) {
-        return c.json({ error: "filePath and passphrase required" }, 400);
+        return badRequest("filePath and passphrase required");
     }
     const strategy = body.strategy ?? "skip";
     try {
@@ -1237,27 +1299,27 @@ app.post("/api/vault/import", async (c) => {
         return c.json({ ok: true, stats: result.stats });
     }
     catch (e) {
-        return c.json({ error: e.message }, 400);
+        return badRequest(e.message);
     }
 });
 // Verify a vault export file without importing
 app.post("/api/vault/verify-export", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const body = await c.req.json();
     if (!body.filePath || !body.passphrase) {
-        return c.json({ error: "filePath and passphrase required" }, 400);
+        return badRequest("filePath and passphrase required");
     }
     try {
         const result = await _vaultTransfer.verifyExport(body.filePath, body.passphrase);
         return c.json({ ok: true, message: result.message, stats: result.stats });
     }
     catch (e) {
-        return c.json({ error: e.message }, 400);
+        return badRequest(e.message);
     }
 });
 // --- Google OAuth2 routes ---
@@ -1325,16 +1387,16 @@ app.get("/api/google/status", async (c) => {
 app.post("/api/google/send-email", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleAuth?.isGoogleAuthenticated() ?? false)) {
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     }
     const body = await c.req.json();
     if (!body.to || !body.subject || !body.body) {
-        return c.json({ error: "to, subject, and body are required" }, 400);
+        return badRequest("to, subject, and body are required");
     }
     const result = await _googleGmailSend.sendEmail(body);
     if (!result.ok)
@@ -1347,12 +1409,12 @@ app.post("/api/google/send-email", async (c) => {
 app.get("/api/google/gmail/inbox-summary", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleGmail?.isGmailAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const hours = parseInt(c.req.query("hours") ?? "24", 10);
     const result = await _googleGmail.getInboxSummary(hours);
     if (!result.ok)
@@ -1363,12 +1425,12 @@ app.get("/api/google/gmail/inbox-summary", async (c) => {
 app.get("/api/google/gmail/categorize", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleGmail?.isGmailAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const hours = parseInt(c.req.query("hours") ?? "24", 10);
     const result = await _googleGmail.categorizeMessages(hours);
     if (!result.ok)
@@ -1379,12 +1441,12 @@ app.get("/api/google/gmail/categorize", async (c) => {
 app.get("/api/google/gmail/prioritize", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleGmail?.isGmailAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const hours = parseInt(c.req.query("hours") ?? "24", 10);
     const result = await _googleGmail.prioritizeInbox(hours);
     if (!result.ok)
@@ -1395,12 +1457,12 @@ app.get("/api/google/gmail/prioritize", async (c) => {
 app.post("/api/google/gmail/mark-read", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleGmail?.isGmailAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const body = await c.req.json();
     if (body.messageIds && body.messageIds.length > 0) {
         const result = await _googleGmail.batchMarkAsRead(body.messageIds);
@@ -1409,7 +1471,7 @@ app.post("/api/google/gmail/mark-read", async (c) => {
         return c.json(result);
     }
     if (!body.messageId)
-        return c.json({ error: "messageId or messageIds required" }, 400);
+        return badRequest("messageId or messageIds required");
     const result = await _googleGmail.markAsRead(body.messageId);
     if (!result.ok)
         return c.json({ error: result.message }, 500);
@@ -1419,12 +1481,12 @@ app.post("/api/google/gmail/mark-read", async (c) => {
 app.post("/api/google/gmail/mark-unread", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleGmail?.isGmailAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const body = await c.req.json();
     if (body.messageIds && body.messageIds.length > 0) {
         const result = await _googleGmail.batchMarkAsUnread(body.messageIds);
@@ -1433,7 +1495,7 @@ app.post("/api/google/gmail/mark-unread", async (c) => {
         return c.json(result);
     }
     if (!body.messageId)
-        return c.json({ error: "messageId or messageIds required" }, 400);
+        return badRequest("messageId or messageIds required");
     const result = await _googleGmail.markAsUnread(body.messageId);
     if (!result.ok)
         return c.json({ error: result.message }, 500);
@@ -1443,7 +1505,7 @@ app.post("/api/google/gmail/mark-unread", async (c) => {
 // Get today's schedule
 app.get("/api/google/calendar/today", async (c) => {
     if (!(_googleCalendar?.isCalendarAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const result = await _googleCalendar.getTodaySchedule();
     if (!result.ok)
         return c.json({ error: result.message }, 500);
@@ -1452,7 +1514,7 @@ app.get("/api/google/calendar/today", async (c) => {
 // Get upcoming events
 app.get("/api/google/calendar/upcoming", async (c) => {
     if (!(_googleCalendar?.isCalendarAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const hours = parseInt(c.req.query("hours") ?? "4", 10);
     const result = await _googleCalendar.getUpcomingEvents(hours);
     if (!result.ok)
@@ -1462,10 +1524,10 @@ app.get("/api/google/calendar/upcoming", async (c) => {
 // Get free/busy
 app.post("/api/google/calendar/freebusy", async (c) => {
     if (!(_googleCalendar?.isCalendarAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const body = await c.req.json();
     if (!body.start || !body.end)
-        return c.json({ error: "start and end are required" }, 400);
+        return badRequest("start and end are required");
     const result = await _googleCalendar.getFreeBusy(body.start, body.end);
     if (!result.ok)
         return c.json({ error: result.message }, 500);
@@ -1474,10 +1536,10 @@ app.post("/api/google/calendar/freebusy", async (c) => {
 // Create calendar event
 app.post("/api/google/calendar/events", async (c) => {
     if (!(_googleCalendar?.isCalendarAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const body = await c.req.json();
     if (!body.title || !body.start || !body.end) {
-        return c.json({ error: "title, start, and end are required" }, 400);
+        return badRequest("title, start, and end are required");
     }
     // Temporal validation: catch day-of-week mismatches before creating events (ts_temporal_mismatch_01)
     const temporalCheck = _googleTemporal.validateCalendarEntry(body.start, body.expectedDayOfWeek);
@@ -1503,7 +1565,7 @@ app.post("/api/google/calendar/events", async (c) => {
 // List events with flexible filtering
 app.get("/api/google/calendar/events", async (c) => {
     if (!(_googleCalendar?.isCalendarAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const result = await _googleCalendar.listEvents({
         timeMin: c.req.query("timeMin"),
         timeMax: c.req.query("timeMax"),
@@ -1518,7 +1580,7 @@ app.get("/api/google/calendar/events", async (c) => {
 // Update calendar event
 app.patch("/api/google/calendar/events/:eventId", async (c) => {
     if (!(_googleCalendar?.isCalendarAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const eventId = c.req.param("eventId");
     const body = await c.req.json();
     // Temporal validation on updated start date (ts_temporal_mismatch_01)
@@ -1541,7 +1603,7 @@ app.patch("/api/google/calendar/events/:eventId", async (c) => {
 // Delete calendar event
 app.delete("/api/google/calendar/events/:eventId", async (c) => {
     if (!(_googleCalendar?.isCalendarAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const eventId = c.req.param("eventId");
     const sendUpdates = c.req.query("sendUpdates");
     const result = await _googleCalendar.deleteEvent(eventId, { sendUpdates });
@@ -1553,10 +1615,10 @@ app.delete("/api/google/calendar/events/:eventId", async (c) => {
 // Search calendar events by text
 app.get("/api/google/calendar/search", async (c) => {
     if (!(_googleCalendar?.isCalendarAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const query = c.req.query("q");
     if (!query)
-        return c.json({ error: "q (search query) is required" }, 400);
+        return badRequest("q (search query) is required");
     const result = await _googleCalendar.searchEvents(query, {
         timeMin: c.req.query("timeMin"),
         timeMax: c.req.query("timeMax"),
@@ -1571,12 +1633,12 @@ app.get("/api/google/calendar/search", async (c) => {
 app.get("/api/google/tasks/lists", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleTasks?.isTasksAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const result = await _googleTasks.listTaskLists();
     if (!result.ok)
         return c.json({ error: result.message }, 500);
@@ -1586,15 +1648,15 @@ app.get("/api/google/tasks/lists", async (c) => {
 app.post("/api/google/tasks/lists", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleTasks?.isTasksAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const body = await c.req.json();
     if (!body.title)
-        return c.json({ error: "title is required" }, 400);
+        return badRequest("title is required");
     const result = await _googleTasks.createTaskList(body.title);
     if (!result.ok)
         return c.json({ error: result.message }, 500);
@@ -1605,16 +1667,16 @@ app.post("/api/google/tasks/lists", async (c) => {
 app.patch("/api/google/tasks/lists/:listId", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleTasks?.isTasksAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const listId = c.req.param("listId");
     const body = await c.req.json();
     if (!body.title)
-        return c.json({ error: "title is required" }, 400);
+        return badRequest("title is required");
     const result = await _googleTasks.updateTaskList(listId, body.title);
     if (!result.ok)
         return c.json({ error: result.message }, 500);
@@ -1624,12 +1686,12 @@ app.patch("/api/google/tasks/lists/:listId", async (c) => {
 app.delete("/api/google/tasks/lists/:listId", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleTasks?.isTasksAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const listId = c.req.param("listId");
     const result = await _googleTasks.deleteTaskList(listId);
     if (!result.ok)
@@ -1641,19 +1703,19 @@ app.delete("/api/google/tasks/lists/:listId", async (c) => {
 app.post("/api/google/tasks/recurring", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleTasks?.isTasksAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const body = await c.req.json();
     if (!body.title)
-        return c.json({ error: "title is required" }, 400);
+        return badRequest("title is required");
     if (body.dayOfWeek === undefined)
-        return c.json({ error: "dayOfWeek is required (0=Sun, 6=Sat)" }, 400);
+        return badRequest("dayOfWeek is required (0=Sun, 6=Sat)");
     if (body.hour === undefined)
-        return c.json({ error: "hour is required (0-23)" }, 400);
+        return badRequest("hour is required (0-23)");
     // Temporal validation: cross-check dayOfWeek number against expectedDayName (ts_temporal_mismatch_01)
     if (body.expectedDayName) {
         const dayNames = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"];
@@ -1679,12 +1741,12 @@ app.post("/api/google/tasks/recurring", async (c) => {
 app.get("/api/google/tasks/:listId", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleTasks?.isTasksAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const listId = c.req.param("listId");
     const showCompleted = c.req.query("showCompleted") === "true";
     const dueMin = c.req.query("dueMin");
@@ -1702,12 +1764,12 @@ app.get("/api/google/tasks/:listId", async (c) => {
 app.get("/api/google/tasks/:listId/:taskId", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleTasks?.isTasksAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const listId = c.req.param("listId");
     const taskId = c.req.param("taskId");
     const result = await _googleTasks.getTask(listId, taskId);
@@ -1719,16 +1781,16 @@ app.get("/api/google/tasks/:listId/:taskId", async (c) => {
 app.post("/api/google/tasks/:listId", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleTasks?.isTasksAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const listId = c.req.param("listId");
     const body = await c.req.json();
     if (!body.title)
-        return c.json({ error: "title is required" }, 400);
+        return badRequest("title is required");
     const result = await _googleTasks.createTask(listId, body);
     if (!result.ok)
         return c.json({ error: result.message }, 500);
@@ -1739,12 +1801,12 @@ app.post("/api/google/tasks/:listId", async (c) => {
 app.patch("/api/google/tasks/:listId/:taskId", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleTasks?.isTasksAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const listId = c.req.param("listId");
     const taskId = c.req.param("taskId");
     const body = await c.req.json();
@@ -1758,12 +1820,12 @@ app.patch("/api/google/tasks/:listId/:taskId", async (c) => {
 app.post("/api/google/tasks/:listId/:taskId/complete", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleTasks?.isTasksAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const listId = c.req.param("listId");
     const taskId = c.req.param("taskId");
     const result = await _googleTasks.completeTask(listId, taskId);
@@ -1776,12 +1838,12 @@ app.post("/api/google/tasks/:listId/:taskId/complete", async (c) => {
 app.post("/api/google/tasks/:listId/:taskId/uncomplete", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleTasks?.isTasksAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const listId = c.req.param("listId");
     const taskId = c.req.param("taskId");
     const result = await _googleTasks.uncompleteTask(listId, taskId);
@@ -1793,12 +1855,12 @@ app.post("/api/google/tasks/:listId/:taskId/uncomplete", async (c) => {
 app.delete("/api/google/tasks/:listId/:taskId", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_googleTasks?.isTasksAvailable() ?? false))
-        return c.json({ error: "Google not authenticated" }, 400);
+        return badRequest("Google not authenticated");
     const listId = c.req.param("listId");
     const taskId = c.req.param("taskId");
     const result = await _googleTasks.deleteTask(listId, taskId);
@@ -1812,10 +1874,10 @@ app.delete("/api/google/tasks/:listId/:taskId", async (c) => {
 app.get("/api/prompt", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     let prompt = "";
     try {
         prompt = await readBrainFile(PERSONALITY_PATH);
@@ -1828,10 +1890,10 @@ app.put("/api/prompt", async (c) => {
     const body = await c.req.json();
     const { sessionId, prompt } = body;
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     await mkdir(join(BRAIN_DIR, "identity"), { recursive: true });
     await writeBrainFile(PERSONALITY_PATH, prompt ?? "");
     return c.json({ ok: true });
@@ -1839,32 +1901,47 @@ app.put("/api/prompt", async (c) => {
 // --- Model discovery ---
 app.get("/api/models", async (c) => {
     const ollamaUrl = process.env.OLLAMA_URL ?? "http://localhost:11434";
+    const results = [];
+    // Fetch local Ollama models
     try {
         const res = await fetch(`${ollamaUrl}/api/tags`, { signal: AbortSignal.timeout(3000) });
-        if (!res.ok)
-            return c.json({ models: [], error: "Ollama not responding" });
-        const data = await res.json();
-        const models = (data.models ?? []).map((m) => ({
-            name: m.name,
-            size: m.size,
-            modified: m.modified_at,
-        }));
-        return c.json({ models });
+        if (res.ok) {
+            const data = await res.json();
+            for (const m of data.models ?? []) {
+                results.push({ name: m.name, size: m.size, modified: m.modified_at, source: "ollama" });
+            }
+        }
     }
-    catch {
-        return c.json({ models: [], error: "Ollama not reachable" });
+    catch { /* Ollama not reachable */ }
+    // Fetch OpenRouter models if API key is set
+    const orKey = process.env.OPENROUTER_API_KEY;
+    if (orKey) {
+        try {
+            const res = await fetch("https://openrouter.ai/api/v1/models", {
+                headers: { Authorization: `Bearer ${orKey}` },
+                signal: AbortSignal.timeout(5000),
+            });
+            if (res.ok) {
+                const data = await res.json();
+                for (const m of data.data ?? []) {
+                    results.push({ name: m.id, source: "openrouter" });
+                }
+            }
+        }
+        catch { /* OpenRouter not reachable */ }
     }
+    return c.json({ models: results });
 });
 // --- Sensitivity trainer ---
 app.post("/api/sensitive/flag", async (c) => {
     const body = await c.req.json().catch(() => null);
     if (!body?.value || typeof body.value !== "string") {
-        return c.json({ error: "value required" }, 400);
+        return badRequest("value required");
     }
     const category = (body.category || "FLAGGED").toUpperCase();
     const value = body.value.trim();
     if (value.length < 2) {
-        return c.json({ error: "value too short" }, 400);
+        return badRequest("value too short");
     }
     if (!activeSensitiveRegistry) {
         return c.json({ error: "registry not initialized" }, 503);
@@ -1984,7 +2061,7 @@ app.get("/api/voice-status", async (c) => {
 app.get("/api/tts", async (c) => {
     const text = c.req.query("text");
     if (!text)
-        return c.json({ error: "text query param required" }, 400);
+        return badRequest("text query param required");
     if (!(_ttsClient?.isTtsAvailable() ?? false))
         return c.json({ error: "TTS not available" }, 503);
     const wav = await _ttsClient.synthesize(text);
@@ -2003,7 +2080,7 @@ app.post("/api/stt", async (c) => {
         return c.json({ error: "STT not available" }, 503);
     const body = await c.req.arrayBuffer();
     if (!body || body.byteLength === 0)
-        return c.json({ error: "Audio body required" }, 400);
+        return badRequest("Audio body required");
     const text = await _sttClient.transcribe(Buffer.from(body));
     if (!text)
         return c.json({ error: "Transcription failed" }, 502);
@@ -2036,7 +2113,7 @@ app.get("/api/avatar/video/:hash", async (c) => {
     const hash = c.req.param("hash");
     // Sanitize: only allow alphanumeric + .mp4
     if (!/^[a-f0-9]+\.mp4$/.test(hash)) {
-        return c.json({ error: "Invalid hash" }, 400);
+        return badRequest("Invalid hash");
     }
     const filePath = join(UI_DIR, "avatar", "cache", hash);
     try {
@@ -2050,22 +2127,22 @@ app.get("/api/avatar/video/:hash", async (c) => {
         });
     }
     catch {
-        return c.json({ error: "Not found" }, 404);
+        return notFound();
     }
 });
 // Upload a new reference photo, re-prepare, clear cache
 app.post("/api/avatar/photo", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     if (!(_avatarSidecar?.isAvatarAvailable() ?? false))
         return c.json({ error: "Avatar not available" }, 503);
     const body = await c.req.arrayBuffer();
     if (!body || body.byteLength === 0)
-        return c.json({ error: "Photo body required" }, 400);
+        return badRequest("Photo body required");
     const avatarConfig = _settingsVoice ? _settingsVoice.getAvatarConfig() : { photoPath: "public/avatar/photo.png", port: 0, enabled: false };
     const photoPath = join(process.cwd(), avatarConfig.photoPath);
     await mkdir(join(UI_DIR, "avatar"), { recursive: true });
@@ -2084,7 +2161,7 @@ app.post("/api/extract", async (c) => {
         const formData = await c.req.formData();
         const file = formData.get("file");
         if (!file)
-            return c.json({ error: "No file provided" }, 400);
+            return badRequest("No file provided");
         const buffer = Buffer.from(await file.arrayBuffer());
         const name = file.name.toLowerCase();
         let text = "";
@@ -2116,16 +2193,16 @@ app.post("/api/extract", async (c) => {
 app.get("/api/history", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const cs = await getOrCreateChatSession(sessionId, session.name);
     // Always return main history (not active thread's)
     const historySource = cs.activeThreadId ? cs.mainHistory : cs.history;
     const messages = historySource
         .filter((m) => m.role === "user" || m.role === "assistant")
-        .map((m) => ({ role: m.role, content: m.content }));
+        .map((m) => ({ role: m.role, content: m.content, ...(m.toolsUsed ? { toolsUsed: m.toolsUsed } : {}), ...(m.agentsUsed ? { agentsUsed: m.agentsUsed } : {}) }));
     return c.json({ messages });
 });
 // Persist intro message so it appears in all tabs/devices
@@ -2133,10 +2210,10 @@ app.post("/api/history/intro", async (c) => {
     const body = await c.req.json();
     const { sessionId, message } = body;
     if (!sessionId || !message)
-        return c.json({ error: "sessionId and message required" }, 400);
+        return badRequest("sessionId and message required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid session" }, 401);
+        return unauthorized("Invalid session");
     const cs = await getOrCreateChatSession(sessionId, session.name);
     // Only add if history is empty (first run)
     if (cs.history.length === 0) {
@@ -2148,10 +2225,10 @@ app.post("/api/history/intro", async (c) => {
 app.get("/api/threads", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid session" }, 401);
+        return unauthorized("Invalid session");
     const threads = getThreadsForSession(sessionId);
     const list = [...threads.values()]
         .sort((a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime())
@@ -2162,10 +2239,10 @@ app.post("/api/threads", async (c) => {
     const body = await c.req.json();
     const sessionId = body.sessionId;
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid session" }, 401);
+        return unauthorized("Invalid session");
     const threads = getThreadsForSession(sessionId);
     const now = new Date().toISOString();
     const thread = {
@@ -2177,8 +2254,7 @@ app.post("/api/threads", async (c) => {
         updatedAt: now,
     };
     threads.set(thread.id, thread);
-    // New thread starts blank. Main chat keeps its history.
-    // If currently on a thread, save it back first.
+    // Save current thread's history before creating new one
     const cs = chatSessions.get(sessionId);
     if (cs && cs.activeThreadId) {
         const prevThread = threads.get(cs.activeThreadId);
@@ -2186,44 +2262,41 @@ app.post("/api/threads", async (c) => {
             prevThread.history = cs.history;
             prevThread.historySummary = cs.historySummary;
         }
-        cs.history = cs.mainHistory;
-        cs.historySummary = cs.mainHistorySummary;
-        cs.activeThreadId = null;
     }
     return c.json({ thread: { id: thread.id, title: thread.title, createdAt: thread.createdAt, updatedAt: thread.updatedAt } });
 });
 app.get("/api/threads/:id/history", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid session" }, 401);
+        return unauthorized("Invalid session");
     const threadId = c.req.param("id");
     const threads = getThreadsForSession(sessionId);
     const thread = threads.get(threadId);
     if (!thread)
-        return c.json({ error: "Thread not found" }, 404);
+        return notFound("Thread not found");
     // If this thread is currently active on cs, its live history is in cs.history
     const cs = chatSessions.get(sessionId);
     const historySource = (cs && cs.activeThreadId === threadId) ? cs.history : thread.history;
     const messages = historySource
         .filter((m) => m.role === "user" || m.role === "assistant")
-        .map((m) => ({ role: m.role, content: m.content }));
+        .map((m) => ({ role: m.role, content: m.content, ...(m.toolsUsed ? { toolsUsed: m.toolsUsed } : {}), ...(m.agentsUsed ? { agentsUsed: m.agentsUsed } : {}) }));
     return c.json({ messages });
 });
 app.patch("/api/threads/:id", async (c) => {
     const body = await c.req.json();
     const sessionId = body.sessionId;
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid session" }, 401);
+        return unauthorized("Invalid session");
     const threads = getThreadsForSession(sessionId);
     const thread = threads.get(c.req.param("id"));
     if (!thread)
-        return c.json({ error: "Thread not found" }, 404);
+        return notFound("Thread not found");
     if (body.title)
         thread.title = body.title;
     thread.updatedAt = new Date().toISOString();
@@ -2232,16 +2305,18 @@ app.patch("/api/threads/:id", async (c) => {
 app.delete("/api/threads/:id", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid session" }, 401);
+        return unauthorized("Invalid session");
     const threadId = c.req.param("id");
     const threads = getThreadsForSession(sessionId);
-    // If deleting the active thread, switch back to main first
+    // If deleting the active thread, clear it (frontend creates a new one)
     const cs = chatSessions.get(sessionId);
     if (cs && cs.activeThreadId === threadId) {
-        switchSessionThread(cs, null, sessionId);
+        cs.history = [];
+        cs.historySummary = "";
+        cs.activeThreadId = null;
     }
     threads.delete(threadId);
     return c.json({ ok: true });
@@ -2251,10 +2326,10 @@ app.delete("/api/threads/:id", async (c) => {
 app.get("/api/activity/stream", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const { onActivity } = await import("./activity/log.js");
     return streamSSE(c, async (stream) => {
         // Send heartbeat immediately
@@ -2279,10 +2354,10 @@ app.get("/api/activity/stream", async (c) => {
 app.get("/api/activity", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const since = parseInt(c.req.query("since") ?? "0", 10) || 0;
     return c.json({ activities: await getActivities(since) });
 });
@@ -2291,14 +2366,14 @@ app.post("/api/branch", async (c) => {
     const body = await c.req.json();
     const { sessionId, entryIds, question } = body;
     if (!sessionId || !entryIds?.length || !question) {
-        return c.json({ error: "sessionId, entryIds, and question required" }, 400);
+        return badRequest("sessionId, entryIds, and question required");
     }
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const selected = await getActivitiesByIds(entryIds);
     if (selected.length === 0) {
-        return c.json({ error: "No matching activity entries" }, 404);
+        return notFound("No matching activity entries");
     }
     // Generate a trace for this branch, backreffing the first selected entry
     const branchTraceId = generateTraceId();
@@ -2436,7 +2511,7 @@ app.post("/api/agents/tasks", async (c) => {
     const body = await c.req.json();
     const { label, prompt, cwd, origin, sessionId: sid, timeoutMs } = body;
     if (!prompt)
-        return c.json({ error: "prompt required" }, 400);
+        return badRequest("prompt required");
     try {
         const task = await submitTask({
             label: label || prompt.slice(0, 60),
@@ -2459,7 +2534,7 @@ app.get("/api/agents/tasks", async (c) => {
 app.get("/api/agents/tasks/:id", async (c) => {
     const task = await getTask(c.req.param("id"));
     if (!task)
-        return c.json({ error: "Not found" }, 404);
+        return notFound();
     return c.json(task);
 });
 app.get("/api/agents/tasks/:id/output", async (c) => {
@@ -2469,7 +2544,7 @@ app.get("/api/agents/tasks/:id/output", async (c) => {
 app.post("/api/agents/tasks/:id/cancel", async (c) => {
     const ok = await cancelTask(c.req.param("id"));
     if (!ok)
-        return c.json({ error: "Not found" }, 404);
+        return notFound();
     return c.json({ ok: true });
 });
 // --- File lock routes ---
@@ -2481,7 +2556,7 @@ app.post("/api/agents/locks/acquire", async (c) => {
     const body = await c.req.json();
     const { agentId, agentLabel, filePaths, timeoutMs } = body;
     if (!agentId || !filePaths || !Array.isArray(filePaths)) {
-        return c.json({ error: "agentId and filePaths[] required" }, 400);
+        return badRequest("agentId and filePaths[] required");
     }
     const result = await _agentLocks.acquireLocks(agentId, agentLabel || agentId, filePaths, timeoutMs);
     return c.json(result, result.acquired ? 200 : 409);
@@ -2490,7 +2565,7 @@ app.post("/api/agents/locks/release", async (c) => {
     const body = await c.req.json();
     const { agentId, filePath } = body;
     if (!agentId)
-        return c.json({ error: "agentId required" }, 400);
+        return badRequest("agentId required");
     if (filePath) {
         const ok = await _agentLocks.releaseFileLock(agentId, filePath);
         return c.json({ released: ok ? 1 : 0 });
@@ -2502,7 +2577,7 @@ app.post("/api/agents/locks/force-release", async (c) => {
     const body = await c.req.json();
     const { filePath } = body;
     if (!filePath)
-        return c.json({ error: "filePath required" }, 400);
+        return badRequest("filePath required");
     const ok = await _agentLocks.forceReleaseLock(filePath);
     return c.json({ released: ok });
 });
@@ -2510,7 +2585,7 @@ app.post("/api/agents/locks/check", async (c) => {
     const body = await c.req.json();
     const { filePaths } = body;
     if (!filePaths || !Array.isArray(filePaths)) {
-        return c.json({ error: "filePaths[] required" }, 400);
+        return badRequest("filePaths[] required");
     }
     const conflicts = await _agentLocks.checkLocks(filePaths);
     return c.json({ locked: conflicts.length > 0, conflicts });
@@ -2549,7 +2624,7 @@ app.get("/api/runtime/instances/:id", async (c) => {
         return c.json({ error: "Runtime not initialized" }, 503);
     const inst = rt.getInstance(c.req.param("id"));
     if (!inst)
-        return c.json({ error: "Not found" }, 404);
+        return notFound();
     return c.json(inst);
 });
 app.post("/api/runtime/spawn", async (c) => {
@@ -2559,7 +2634,7 @@ app.post("/api/runtime/spawn", async (c) => {
     const body = await c.req.json();
     const { taskId, label, prompt, cwd, origin, parentId, tags, config, resources } = body;
     if (!prompt)
-        return c.json({ error: "prompt required" }, 400);
+        return badRequest("prompt required");
     try {
         // Create the underlying AgentTask first
         const { createTask } = await import("./agents/store.js");
@@ -2640,7 +2715,7 @@ app.post("/api/runtime/instances/:id/message", async (c) => {
     const body = await c.req.json();
     const { to, type, payload } = body;
     if (!to || !type)
-        return c.json({ error: "to and type required" }, 400);
+        return badRequest("to and type required");
     const msg = rt.sendMessage(c.req.param("id"), to, type, payload);
     return c.json(msg);
 });
@@ -2733,7 +2808,7 @@ app.get("/api/workflows/:id", async (c) => {
         return c.json({ error: "Workflow engine not initialized" }, 503);
     const wf = engine.getOrchestrator().getWorkflow(c.req.param("id"));
     if (!wf)
-        return c.json({ error: "Workflow not found" }, 404);
+        return notFound("Workflow not found");
     // Serialize Map<string, WorkflowTask> to plain object
     const tasks = {};
     for (const [key, task] of wf.tasks) {
@@ -2750,7 +2825,7 @@ app.get("/api/workflows/:id/results", async (c) => {
         return c.json(result);
     }
     catch {
-        return c.json({ error: "Workflow not found" }, 404);
+        return notFound("Workflow not found");
     }
 });
 // --- Tracing routes ---
@@ -2762,16 +2837,16 @@ app.get("/api/traces", async (c) => {
 app.get("/api/traces/:traceId", async (c) => {
     const detail = tracer.getTraceDetail(c.req.param("traceId"));
     if (!detail)
-        return c.json({ error: "Trace not found" }, 404);
+        return notFound("Trace not found");
     return c.json(detail);
 });
 app.get("/api/traces/agent/:agentId", async (c) => {
     const traceId = tracer.getAgentTraceId(c.req.param("agentId"));
     if (!traceId)
-        return c.json({ error: "No trace for agent" }, 404);
+        return notFound("No trace for agent");
     const detail = tracer.getTraceDetail(traceId);
     if (!detail)
-        return c.json({ error: "Trace not found" }, 404);
+        return notFound("Trace not found");
     return c.json(detail);
 });
 // --- GitHub routes ---
@@ -2784,7 +2859,7 @@ app.post("/api/github/webhooks", async (c) => {
     const secret = process.env.GITHUB_WEBHOOK_SECRET;
     if (secret && signature) {
         if (!_githubWebhooks.verifyWebhookSignature(rawBody, signature, secret)) {
-            return c.json({ error: "Invalid signature" }, 401);
+            return unauthorized("Invalid signature");
         }
     }
     let payload;
@@ -2792,7 +2867,7 @@ app.post("/api/github/webhooks", async (c) => {
         payload = JSON.parse(rawBody);
     }
     catch {
-        return c.json({ error: "Invalid JSON" }, 400);
+        return badRequest("Invalid JSON");
     }
     const result = await _integrationsGithub.processWebhook(eventType, payload);
     return c.json(result);
@@ -2806,14 +2881,14 @@ app.get("/api/github/status", async (c) => {
 app.post("/api/github/pr/review", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const body = await c.req.json();
     const { prNumber, repo, postComment } = body;
     if (!prNumber)
-        return c.json({ error: "prNumber required" }, 400);
+        return badRequest("prNumber required");
     const result = postComment
         ? await _integrationsGithub.reviewAndCommentPR(prNumber, repo)
         : await _integrationsGithub.reviewPullRequest(prNumber, repo);
@@ -2825,14 +2900,14 @@ app.post("/api/github/pr/review", async (c) => {
 app.post("/api/github/issues/triage", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const body = await c.req.json();
     const { issueNumber, repo, apply } = body;
     if (!issueNumber)
-        return c.json({ error: "issueNumber required" }, 400);
+        return badRequest("issueNumber required");
     const result = apply
         ? await _integrationsGithub.triageAndLabelIssue(issueNumber, repo)
         : await _integrationsGithub.triageGitHubIssue(issueNumber, repo);
@@ -2844,10 +2919,10 @@ app.post("/api/github/issues/triage", async (c) => {
 app.post("/api/github/issues/triage/batch", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const body = await c.req.json();
     const { repo, apply } = body;
     const results = await _integrationsGithub.batchTriageIssues(repo, { apply });
@@ -2857,10 +2932,10 @@ app.post("/api/github/issues/triage/batch", async (c) => {
 app.post("/api/github/commits/analyze", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const body = await c.req.json();
     const { sha, repo, count, since } = body;
     if (sha) {
@@ -2958,16 +3033,16 @@ app.get("/api/slack/status", async (c) => {
 app.post("/api/slack/send", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const client = (_slackClient?.getClient() ?? null);
     if (!client)
         return c.json({ error: "Slack not available" }, 503);
     const body = await c.req.json();
     if (!body.channel || !body.text)
-        return c.json({ error: "channel and text required" }, 400);
+        return badRequest("channel and text required");
     const result = await client.sendMessage(body.channel, body.text, {
         thread_ts: body.thread_ts,
         blocks: body.blocks,
@@ -2981,16 +3056,16 @@ app.post("/api/slack/send", async (c) => {
 app.post("/api/slack/dm", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const client = (_slackClient?.getClient() ?? null);
     if (!client)
         return c.json({ error: "Slack not available" }, 503);
     const body = await c.req.json();
     if (!body.user || !body.text)
-        return c.json({ error: "user and text required" }, 400);
+        return badRequest("user and text required");
     const result = await client.sendDm(body.user, body.text, { blocks: body.blocks });
     if (!result.ok)
         return c.json({ error: result.error }, 500);
@@ -3001,10 +3076,10 @@ app.post("/api/slack/dm", async (c) => {
 app.get("/api/slack/channels", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const types = c.req.query("types") || undefined;
     const result = await _slackChannels.listChannels({ types });
     if (!result.ok)
@@ -3015,10 +3090,10 @@ app.get("/api/slack/channels", async (c) => {
 app.get("/api/slack/channels/:id", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const result = await _slackChannels.getChannelInfo(c.req.param("id"));
     if (!result.ok)
         return c.json({ error: result.message }, 502);
@@ -3028,10 +3103,10 @@ app.get("/api/slack/channels/:id", async (c) => {
 app.post("/api/slack/channels/:id/join", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const result = await _slackChannels.joinChannel(c.req.param("id"));
     if (!result.ok)
         return c.json({ error: result.message }, 502);
@@ -3041,10 +3116,10 @@ app.post("/api/slack/channels/:id/join", async (c) => {
 app.get("/api/slack/channels/:id/history", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const limit = c.req.query("limit") ? parseInt(c.req.query("limit"), 10) : undefined;
     const result = await _slackChannels.getChannelHistory(c.req.param("id"), { limit });
     if (!result.ok)
@@ -3055,10 +3130,10 @@ app.get("/api/slack/channels/:id/history", async (c) => {
 app.get("/api/slack/users/:id", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const client = (_slackClient?.getClient() ?? null);
     if (!client)
         return c.json({ error: "Slack not available" }, 503);
@@ -3071,7 +3146,7 @@ app.get("/api/slack/users/:id", async (c) => {
 // Routed through the generic webhook system with challenge response handling.
 app.post("/api/slack/events", async (c) => {
     if (!_webhooksMount)
-        return c.json({ error: "Webhooks require BYOK tier" }, 403);
+        return forbidden("Webhooks require BYOK tier");
     return _webhooksMount.createWebhookRoute({
         provider: "slack-events",
         transformResponse: (result, ctx) => {
@@ -3084,30 +3159,30 @@ app.post("/api/slack/events", async (c) => {
 // Slack slash commands: routed through the generic webhook system.
 app.post("/api/slack/commands", async (c) => {
     if (!_webhooksMount)
-        return c.json({ error: "Webhooks require BYOK tier" }, 403);
+        return forbidden("Webhooks require BYOK tier");
     return _webhooksMount.createWebhookRoute({ provider: "slack-commands" })(c);
 });
 // Slack interactions: routed through the generic webhook system.
 app.post("/api/slack/interactions", async (c) => {
     if (!_webhooksMount)
-        return c.json({ error: "Webhooks require BYOK tier" }, 403);
+        return forbidden("Webhooks require BYOK tier");
     return _webhooksMount.createWebhookRoute({ provider: "slack-interactions" })(c);
 });
 // --- Resend inbound email ---
 // Resend webhook: receive inbound emails via Svix-signed webhooks (direct path).
 app.post("/api/resend/webhooks", async (c) => {
     if (!_webhooksMount)
-        return c.json({ error: "Webhooks require BYOK tier" }, 403);
+        return forbidden("Webhooks require BYOK tier");
     return _webhooksMount.createWebhookRoute({ provider: "resend" })(c);
 });
 // Resend inbox: manually trigger inbox check (pulls from Worker KV).
 app.post("/api/resend/check-inbox", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const { forceCheckResendInbox } = await import("./resend/inbox.js");
     const count = await forceCheckResendInbox();
     return c.json({ ok: true, processed: count });
@@ -3168,7 +3243,7 @@ app.post("/api/relay/whatsapp", async (c) => {
     const relaySecret = process.env.RELAY_SECRET ?? "";
     const verification = _webhooksRelay.verifyRelaySignature(rawBody, headers, relaySecret);
     if (!verification.valid) {
-        return c.json({ error: verification.error ?? "Invalid relay signature" }, 401);
+        return unauthorized(verification.error ?? "Invalid relay signature");
     }
     const params = _webhooksTwilio.parseFormBody(rawBody);
     const payload = params;
@@ -3195,14 +3270,14 @@ app.post("/api/relay/resend", async (c) => {
     const relaySecret = process.env.RELAY_SECRET ?? "";
     const verification = _webhooksRelay.verifyRelaySignature(rawBody, headers, relaySecret);
     if (!verification.valid) {
-        return c.json({ error: verification.error ?? "Invalid relay signature" }, 401);
+        return unauthorized(verification.error ?? "Invalid relay signature");
     }
     let payload;
     try {
         payload = JSON.parse(rawBody);
     }
     catch {
-        return c.json({ error: "Invalid JSON" }, 400);
+        return badRequest("Invalid JSON");
     }
     if (payload.type !== "email.received" || !payload.body?.trim()) {
         return c.json({ ok: true, message: "No actionable content" });
@@ -3240,16 +3315,16 @@ app.post("/api/relay/resend", async (c) => {
 app.post("/api/whatsapp/send", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const client = (_channelsWhatsapp?.getClient() ?? null);
     if (!client)
         return c.json({ error: "WhatsApp not configured. Add TWILIO_ACCOUNT_SID, TWILIO_AUTH_TOKEN, TWILIO_PHONE_NUMBER to vault." }, 503);
     const body = await c.req.json();
     if (!body.to || !body.message)
-        return c.json({ error: "to and message required" }, 400);
+        return badRequest("to and message required");
     const result = await client.sendMessage(body.to, body.message);
     if (!result.ok)
         return c.json({ error: result.message }, 502);
@@ -3259,10 +3334,10 @@ app.post("/api/whatsapp/send", async (c) => {
 app.get("/api/whatsapp/contacts", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const client = (_channelsWhatsapp?.getClient() ?? null);
     if (!client)
         return c.json({ error: "WhatsApp not configured" }, 503);
@@ -3273,10 +3348,10 @@ app.get("/api/whatsapp/contacts", async (c) => {
 app.get("/api/whatsapp/history", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const client = (_channelsWhatsapp?.getClient() ?? null);
     if (!client)
         return c.json({ error: "WhatsApp not configured" }, 503);
@@ -3323,10 +3398,10 @@ app.get("/api/board/status", async (c) => {
 app.get("/api/board/teams", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const board = getBoardProvider();
     if (!board || !board.isAvailable())
         return c.json({ teams: [] });
@@ -3337,10 +3412,10 @@ app.get("/api/board/teams", async (c) => {
 app.get("/api/board/issues", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const board = getBoardProvider();
     if (!board || !board.isAvailable())
         return c.json({ issues: [] });
@@ -3353,17 +3428,17 @@ app.get("/api/board/issues", async (c) => {
 app.post("/api/board/issues", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const board = getBoardProvider();
     if (!board || !board.isAvailable())
         return c.json({ error: "No board provider configured" }, 503);
     const body = await c.req.json();
     const { title, description, teamId, priority } = body;
     if (!title)
-        return c.json({ error: "title required" }, 400);
+        return badRequest("title required");
     const issue = await board.createIssue(title, { description, teamId, priority });
     if (!issue)
         return c.json({ error: "Failed to create issue" }, 502);
@@ -3373,10 +3448,10 @@ app.post("/api/board/issues", async (c) => {
 app.patch("/api/board/issues/:id", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const board = getBoardProvider();
     if (!board || !board.isAvailable())
         return c.json({ error: "No board provider configured" }, 503);
@@ -3392,10 +3467,10 @@ app.patch("/api/board/issues/:id", async (c) => {
 app.post("/api/board/issues/:id/comments", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const board = getBoardProvider();
     if (!board || !board.isAvailable())
         return c.json({ error: "No board provider configured" }, 503);
@@ -3403,7 +3478,7 @@ app.post("/api/board/issues/:id/comments", async (c) => {
     const body = await c.req.json();
     const { body: commentBody } = body;
     if (!commentBody)
-        return c.json({ error: "body required" }, 400);
+        return badRequest("body required");
     const ok = await board.addComment(id, commentBody);
     return ok ? c.json({ ok: true }) : c.json({ error: "Failed to add comment" }, 502);
 });
@@ -3411,10 +3486,10 @@ app.post("/api/board/issues/:id/comments", async (c) => {
 app.get("/api/board/issues/:id/exchanges", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const board = getBoardProvider();
     const store = board?.getStore?.();
     if (!store)
@@ -3426,10 +3501,10 @@ app.get("/api/board/issues/:id/exchanges", async (c) => {
 app.post("/api/board/issues/:id/exchanges", async (c) => {
     const sessionId = c.req.query("sessionId");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const session = validateSession(sessionId);
     if (!session)
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     const board = getBoardProvider();
     const store = board?.getStore?.();
     if (!store)
@@ -3438,7 +3513,7 @@ app.post("/api/board/issues/:id/exchanges", async (c) => {
     const body = await c.req.json();
     const { author, body: exBody, source } = body;
     if (!author || !exBody)
-        return c.json({ error: "author and body required" }, 400);
+        return badRequest("author and body required");
     const exchange = await store.addExchange(id, {
         author,
         body: exBody,
@@ -3448,7 +3523,7 @@ app.post("/api/board/issues/:id/exchanges", async (c) => {
         logActivity({ source: "board", summary: `Exchange on issue ${id} from ${author}`, actionLabel: "PROMPTED", reason: "user added board exchange" });
         return c.json({ exchange });
     }
-    return c.json({ error: "Task not found or archived" }, 404);
+    return notFound("Task not found or archived");
 });
 // --- Weekly backlog review endpoints (DASH-59) ---
 // Get the last backlog review report.
@@ -3466,6 +3541,158 @@ app.post("/api/board/review/trigger", async (c) => {
     return c.json({ ok: true, report });
 });
 // ---------------------------------------------------------------------------
+// Gemini Search
+// ---------------------------------------------------------------------------
+app.post("/api/search/gemini", async (c) => {
+    const { query } = await c.req.json();
+    if (!query?.trim())
+        return c.json({ ok: false, message: "Query is required" }, 400);
+    const { geminiSearch, isGeminiAvailable } = await import("./search/gemini.js");
+    if (!isGeminiAvailable()) {
+        return c.json({ ok: false, message: "GEMINI_API_KEY not configured" }, 503);
+    }
+    const result = await geminiSearch(query.trim());
+    return c.json(result);
+});
+app.get("/api/search/gemini/status", async (c) => {
+    const { isGeminiAvailable } = await import("./search/gemini.js");
+    return c.json({ available: isGeminiAvailable() });
+});
+// ---------------------------------------------------------------------------
+// Whiteboard routes
+// ---------------------------------------------------------------------------
+import { WhiteboardStore } from "./whiteboard/store.js";
+let _whiteboardStore = null;
+function getWhiteboardStore() {
+    if (!_whiteboardStore)
+        _whiteboardStore = new WhiteboardStore(BRAIN_DIR);
+    return _whiteboardStore;
+}
+// Whiteboard is always accessible — it's the human-agent collaboration surface
+// List / tree / questions / weighted view
+app.get("/api/whiteboard", async (c) => {
+    const store = getWhiteboardStore();
+    const view = c.req.query("view") ?? "tree";
+    const root = c.req.query("root");
+    const status = c.req.query("status");
+    const type = c.req.query("type");
+    const tagsParam = c.req.query("tags");
+    const search = c.req.query("search");
+    if (view === "tree") {
+        const tree = await store.getTree(root ?? undefined);
+        return c.json({ nodes: tree });
+    }
+    if (view === "questions") {
+        const questions = await store.getOpenQuestions();
+        // Attach breadcrumb path to each question
+        const withPaths = await Promise.all(questions.map(async (q) => {
+            const ancestors = await store.getAncestors(q.id);
+            return { ...q, path: ancestors.map((a) => ({ id: a.id, title: a.title })) };
+        }));
+        return c.json({ questions: withPaths });
+    }
+    if (view === "weighted") {
+        const weighted = await store.getWeighted();
+        return c.json({ nodes: weighted });
+    }
+    // Flat view with filters
+    const tags = tagsParam ? tagsParam.split(",").map((t) => t.trim()) : undefined;
+    const nodes = await store.list({ type, status, tags, search });
+    return c.json({ nodes });
+});
+// Summary
+app.get("/api/whiteboard/summary", async (c) => {
+    const store = getWhiteboardStore();
+    const summary = await store.getSummary();
+    return c.json(summary);
+});
+// Recently answered questions (for agent goals loop)
+app.get("/api/whiteboard/answered", async (c) => {
+    const store = getWhiteboardStore();
+    const since = c.req.query("since");
+    if (!since)
+        return c.json({ error: "Missing ?since= parameter" }, 400);
+    const answered = await store.getAnsweredSince(since);
+    return c.json({ answered });
+});
+// Get single node
+app.get("/api/whiteboard/:id", async (c) => {
+    const store = getWhiteboardStore();
+    const node = await store.get(c.req.param("id"));
+    if (!node)
+        return c.json({ error: "Node not found" }, 404);
+    return c.json(node);
+});
+// Get ancestors (breadcrumb path)
+app.get("/api/whiteboard/:id/path", async (c) => {
+    const store = getWhiteboardStore();
+    const node = await store.get(c.req.param("id"));
+    if (!node)
+        return c.json({ error: "Node not found" }, 404);
+    const ancestors = await store.getAncestors(c.req.param("id"));
+    return c.json({ path: [...ancestors, node].map((n) => ({ id: n.id, title: n.title, type: n.type })) });
+});
+// Create node
+app.post("/api/whiteboard", async (c) => {
+    const body = await c.req.json();
+    if (!body.title?.trim())
+        return c.json({ error: "Title is required" }, 400);
+    if (!body.type)
+        return c.json({ error: "Type is required (goal, task, question, decision, note)" }, 400);
+    if (!body.plantedBy)
+        return c.json({ error: "plantedBy is required (agent, human)" }, 400);
+    const store = getWhiteboardStore();
+    // Validate parentId exists if provided
+    if (body.parentId) {
+        const parent = await store.get(body.parentId);
+        if (!parent)
+            return c.json({ error: `Parent node not found: ${body.parentId}` }, 400);
+    }
+    const node = await store.create({
+        title: body.title.trim(),
+        type: body.type,
+        parentId: body.parentId ?? null,
+        tags: body.tags ?? [],
+        plantedBy: body.plantedBy,
+        body: body.body,
+        question: body.question,
+        boardTaskId: body.boardTaskId,
+    });
+    return c.json(node, 201);
+});
+// Update node
+app.patch("/api/whiteboard/:id", async (c) => {
+    const body = await c.req.json();
+    const store = getWhiteboardStore();
+    const updated = await store.update(c.req.param("id"), body);
+    if (!updated)
+        return c.json({ error: "Node not found" }, 404);
+    return c.json(updated);
+});
+// Answer a question
+app.post("/api/whiteboard/:id/answer", async (c) => {
+    const { answer } = await c.req.json();
+    if (!answer?.trim())
+        return c.json({ error: "Answer is required" }, 400);
+    const store = getWhiteboardStore();
+    const node = await store.get(c.req.param("id"));
+    if (!node)
+        return c.json({ error: "Node not found" }, 404);
+    if (node.type !== "question")
+        return c.json({ error: "Only question nodes can be answered" }, 400);
+    const updated = await store.answerQuestion(c.req.param("id"), answer.trim());
+    return c.json(updated);
+});
+// Archive node
+app.delete("/api/whiteboard/:id", async (c) => {
+    const cascade = c.req.query("cascade") === "true";
+    const store = getWhiteboardStore();
+    const result = await store.archive(c.req.param("id"), cascade);
+    if (!result.ok)
+        return c.json({ error: result.message }, 404);
+    return c.json(result);
+});
+// ---------------------------------------------------------------------------
 // Skills routes
 // ---------------------------------------------------------------------------
 // List all registered skills (metadata only)
@@ -3487,7 +3714,7 @@ app.get("/api/skills/:name", async (c) => {
     const name = c.req.param("name");
     const skill = await _skillRegistry.get(name);
     if (!skill)
-        return c.json({ error: "Skill not found" }, 404);
+        return notFound("Skill not found");
     const content = await _skillRegistry.getContent(name);
     return c.json({
         ...skill,
@@ -3498,10 +3725,10 @@ app.get("/api/skills/:name", async (c) => {
 app.post("/api/skills/resolve", async (c) => {
     const { trigger } = await c.req.json();
     if (!trigger)
-        return c.json({ error: "trigger is required" }, 400);
+        return badRequest("trigger is required");
     const skill = await _skillRegistry.findByTrigger(trigger);
     if (!skill)
-        return c.json({ error: "No matching skill" }, 404);
+        return notFound("No matching skill");
     return c.json({
         id: skill.id,
         name: skill.name,
@@ -3514,9 +3741,19 @@ app.post("/api/skills/resolve", async (c) => {
 import { getPluginStatusSummary } from "./plugins/status.js";
 import { initPlugins, shutdownPlugins } from "./plugins/index.js";
 // --- File management routes ---
-import { fileRegistry, computeChecksum } from "./files/registry.js";
-import { validateUpload } from "./files/validate.js";
-import { slugify } from "./files/validate.js";
+import { FileStore, computeChecksum } from "./files/store.js";
+import { validateUpload, slugify } from "./files/validate.js";
+// Shared file store instance — initialized lazily on first use
+let _fileStore = null;
+function getFileStore() {
+    if (!_fileStore)
+        _fileStore = new FileStore(BRAIN_DIR);
+    return _fileStore;
+}
+/** Map FileEntry to API response shape (adds `filename` alias for backward compat). */
+function toFileResponse(entry) {
+    return { ...entry, filename: entry.name };
+}
 app.get("/api/plugins", (c) => {
     return c.json(getPluginStatusSummary());
 });
@@ -3524,10 +3761,11 @@ app.get("/api/plugins", (c) => {
 // Upload file — persist to brain/files/data/, register in JSONL
 app.post("/api/files/upload", async (c) => {
     try {
+        const store = getFileStore();
         const formData = await c.req.formData();
         const file = formData.get("file");
         if (!file)
-            return c.json({ error: "No file provided" }, 400);
+            return badRequest("No file provided");
         const source = formData.get("source") || "user-upload";
         const tagsRaw = formData.get("tags");
         const tags = tagsRaw ? tagsRaw.split(",").map(t => t.trim()).filter(Boolean) : [];
@@ -3540,17 +3778,17 @@ app.post("/api/files/upload", async (c) => {
         // Validate: extension allowlist, magic bytes, size, content scan
         const validation = await validateUpload(buffer, file.name, file.type, maxUploadBytes);
         if (!validation.valid) {
-            return c.json({ error: validation.rejected }, 400);
+            return badRequest(validation.rejected ?? "Upload rejected");
         }
         // Generate storage path: brain/files/data/YYYY-MM-DD/slug_id.ext
         const dateDir = new Date().toISOString().slice(0, 10);
         const slug = slugify(file.name.replace(/\.[^.]+$/, ""));
         const checksum = computeChecksum(buffer);
         // Check for duplicate by checksum
-        const existing = await fileRegistry.list({});
+        const existing = await store.list({});
         const dup = existing.find(r => r.checksum === checksum && r.status === "active");
         if (dup) {
-            return c.json({ file: dup, duplicate: true });
+            return c.json({ file: toFileResponse(dup), duplicate: true });
         }
         const storageDir = join(BRAIN_DIR, "files", "data", dateDir);
         await mkdir(storageDir, { recursive: true });
@@ -3571,20 +3809,29 @@ app.post("/api/files/upload", async (c) => {
             }
             catch { /* PDF extraction optional */ }
         }
-        // Register in file registry
-        const record = await fileRegistry.register({
-            filename: validation.sanitizedName,
+        // Register in file store
+        const record = await store.create({
+            name: validation.sanitizedName,
+            slug,
             storagePath,
             mimeType: validation.detectedMime || file.type,
             sizeBytes: buffer.length,
             checksum,
             tags,
-            source,
+            origin: source,
+            ownerId: null,
+            taskId: null,
+            parentId: null,
+            version: 1,
+            encrypted: false,
+            visibility: "private",
             status: "active",
+            category: "upload",
+            textPreview,
         });
         // Trigger volume replication (on-write event)
         volumeManager.handleEvent({ type: "write", fileId: record.id, volume: "primary" }).catch((err) => log.warn("Volume on-write event failed", { error: String(err) }));
-        return c.json({ file: record, duplicate: false });
+        return c.json({ file: toFileResponse(record), duplicate: false });
     }
     catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
@@ -3594,68 +3841,86 @@ app.post("/api/files/upload", async (c) => {
 });
 // Download / serve a stored file
 app.get("/api/files/:id/download", async (c) => {
-    const record = await fileRegistry.get(c.req.param("id"));
+    const record = await getFileStore().get(c.req.param("id"));
     if (!record)
-        return c.json({ error: "File not found" }, 404);
+        return notFound("File not found");
     const fullPath = join(BRAIN_DIR, record.storagePath);
     try {
         const data = await readFile(fullPath);
         return c.newResponse(data, 200, {
             "Content-Type": record.mimeType,
-            "Content-Disposition": `inline; filename="${record.filename}"`,
+            "Content-Disposition": `inline; filename="${record.name}"`,
             "Content-Length": String(data.length),
         });
     }
     catch {
-        return c.json({ error: "File data not found on disk" }, 404);
+        return notFound("File data not found on disk");
     }
 });
 // List virtual folders (must be before :id route)
 app.get("/api/files/folders", async (c) => {
-    const folders = await fileRegistry.getFolders();
-    return c.json({ folders });
+    const store = getFileStore();
+    const all = await store.list({ status: "active" });
+    const folders = new Set();
+    for (const f of all) {
+        for (const t of f.tags ?? []) {
+            if (t.startsWith("folder:"))
+                folders.add(t.slice(7));
+        }
+    }
+    return c.json({ folders: [...folders].sort() });
 });
 app.get("/api/files", async (c) => {
+    const store = getFileStore();
     const status = c.req.query("status");
     const source = c.req.query("source");
     const q = c.req.query("q");
-    if (q) {
-        const results = await fileRegistry.search(q);
-        return c.json({ files: results, total: results.length });
-    }
-    const results = await fileRegistry.list({ status, source });
-    return c.json({ files: results, total: results.length });
+    const filter = {};
+    if (status)
+        filter.status = status;
+    if (source)
+        filter.origin = source;
+    if (q)
+        filter.search = q;
+    const results = await store.list(filter);
+    const mapped = results.map(toFileResponse);
+    return c.json({ files: mapped, total: mapped.length });
 });
 app.get("/api/files/:id", async (c) => {
-    const record = await fileRegistry.get(c.req.param("id"));
+    const record = await getFileStore().get(c.req.param("id"));
     if (!record)
-        return c.json({ error: "File not found", code: "NOT_FOUND", status: 404 }, 404);
-    return c.json(record);
+        return notFound("File not found");
+    return c.json(toFileResponse(record));
 });
 app.post("/api/files/:id/archive", async (c) => {
-    const result = await fileRegistry.archive(c.req.param("id"));
-    if (!result)
-        return c.json({ error: "File not found", code: "NOT_FOUND", status: 404 }, 404);
+    const result = await getFileStore().archive(c.req.param("id"), "user");
+    if (!result.ok)
+        return notFound(result.message);
     return c.json(result);
 });
 // Update file tags / move to virtual folder
 app.put("/api/files/:id", async (c) => {
+    const store = getFileStore();
     const body = await c.req.json();
     const { tags, source, folder } = body;
     const id = c.req.param("id");
-    const record = await fileRegistry.get(id);
+    const record = await store.get(id);
     if (!record)
-        return c.json({ error: "File not found" }, 404);
+        return notFound("File not found");
     // Handle virtual folder: stored as tag "folder:Name"
     let updatedTags = tags ?? [...(record.tags ?? [])];
     if (folder !== undefined) {
-        // Remove existing folder tags, add new one
         updatedTags = updatedTags.filter(t => !t.startsWith("folder:"));
         if (folder)
             updatedTags.push("folder:" + folder);
     }
-    const result = await fileRegistry.update(id, { tags: updatedTags, ...(source ? { source } : {}) });
-    return c.json(result);
+    const patch = { tags: updatedTags };
+    if (source)
+        patch.origin = source;
+    const result = await store.update(id, patch);
+    if (!result)
+        return notFound("File not found");
+    return c.json(toFileResponse(result));
 });
 // --- Volume management routes ---
 app.get("/api/volumes", async (c) => {
@@ -3676,7 +3941,7 @@ app.post("/api/volumes/probe", async (c) => {
 app.post("/api/volumes/event", async (c) => {
     const event = await c.req.json();
     if (!event?.type)
-        return c.json({ error: "Missing event type" }, 400);
+        return badRequest("Missing event type");
     await volumeManager.handleEvent(event);
     return c.json({ ok: true });
 });
@@ -3736,7 +4001,7 @@ app.get("/api/alerts/history", (c) => {
 app.get("/api/alerts/:id", (c) => {
     const alert = alertManager.getAlert(c.req.param("id"));
     if (!alert)
-        return c.json({ error: "alert not found" }, 404);
+        return notFound("alert not found");
     return c.json(alert);
 });
 // Acknowledge a firing alert.
@@ -3745,14 +4010,14 @@ app.post("/api/alerts/:id/acknowledge", async (c) => {
     const by = body.by;
     const ok = alertManager.acknowledge(c.req.param("id"), by);
     if (!ok)
-        return c.json({ error: "alert not found or not in firing state" }, 404);
+        return notFound("alert not found or not in firing state");
     return c.json({ acknowledged: true });
 });
 // Manually resolve an alert.
 app.post("/api/alerts/:id/resolve", (c) => {
     const ok = alertManager.resolve(c.req.param("id"));
     if (!ok)
-        return c.json({ error: "alert not found" }, 404);
+        return notFound("alert not found");
     return c.json({ resolved: true });
 });
 // Trigger manual evaluation of alert thresholds.
@@ -3838,7 +4103,7 @@ app.post("/api/scheduling/blocks", async (c) => {
         return c.json({ error: "Scheduling not initialized" }, 503);
     const body = await c.req.json();
     if (!body.type || !body.title) {
-        return c.json({ error: "type and title required" }, 400);
+        return badRequest("type and title required");
     }
     const block = await store.create(body);
     return c.json(block, 201);
@@ -3852,7 +4117,7 @@ app.patch("/api/scheduling/blocks/:id", async (c) => {
     const body = await c.req.json();
     const updated = await store.update(id, body);
     if (!updated)
-        return c.json({ error: "Block not found" }, 404);
+        return notFound("Block not found");
     return c.json(updated);
 });
 // Get today's schedule.
@@ -3880,7 +4145,7 @@ app.post("/api/contacts/entities", async (c) => {
         return c.json({ error: "Contacts not initialized" }, 503);
     const body = await c.req.json();
     if (!body.type || !body.name) {
-        return c.json({ error: "type and name required" }, 400);
+        return badRequest("type and name required");
     }
     const entity = await store.createEntity(body);
     return c.json(entity, 201);
@@ -3894,7 +4159,7 @@ app.patch("/api/contacts/entities/:id", async (c) => {
     const body = await c.req.json();
     const updated = await store.updateEntity(id, body);
     if (!updated)
-        return c.json({ error: "Entity not found" }, 404);
+        return notFound("Entity not found");
     return c.json(updated);
 });
 // Get an entity's relationships (all edges where entity is from or to).
@@ -3913,7 +4178,7 @@ app.post("/api/contacts/edges", async (c) => {
         return c.json({ error: "Contacts not initialized" }, 503);
     const body = await c.req.json();
     if (!body.from || !body.to || !body.type) {
-        return c.json({ error: "from, to, and type required" }, 400);
+        return badRequest("from, to, and type required");
     }
     const edge = await store.createEdge(body);
     return c.json(edge, 201);
@@ -3947,7 +4212,7 @@ app.get("/api/credentials/:id", async (c) => {
         return c.json({ error: "Credentials not initialized" }, 503);
     const cred = await store.get(c.req.param("id"));
     if (!cred)
-        return c.json({ error: "Credential not found" }, 404);
+        return notFound("Credential not found");
     return c.json(cred);
 });
 // Create credential.
@@ -3957,7 +4222,7 @@ app.post("/api/credentials", async (c) => {
         return c.json({ error: "Credentials not initialized" }, 503);
     const body = await c.req.json();
     if (!body.name || !body.service || !body.type || !body.value) {
-        return c.json({ error: "name, service, type, and value required" }, 400);
+        return badRequest("name, service, type, and value required");
     }
     const cred = await store.create(body);
     // Hydrate immediately if envVar set
@@ -3975,7 +4240,7 @@ app.patch("/api/credentials/:id", async (c) => {
     const body = await c.req.json();
     const updated = await store.update(id, body);
     if (!updated)
-        return c.json({ error: "Credential not found" }, 404);
+        return notFound("Credential not found");
     // Re-hydrate if envVar changed
     if (updated.envVar && updated.value && updated.status === "active") {
         process.env[updated.envVar] = updated.value;
@@ -3990,7 +4255,7 @@ app.delete("/api/credentials/:id", async (c) => {
     const id = c.req.param("id");
     const archived = await store.archive(id);
     if (!archived)
-        return c.json({ error: "Credential not found" }, 404);
+        return notFound("Credential not found");
     // Remove from process.env
     if (archived.envVar) {
         delete process.env[archived.envVar];
@@ -4116,17 +4381,17 @@ app.put("/api/open-loops/:id/resolve", async (c) => {
     const body = await c.req.json().catch(() => ({}));
     const updated = await transitionLoop(id, "resonant", body.resolvedBy);
     if (!updated)
-        return c.json({ error: "Loop not found" }, 404);
+        return notFound("Loop not found");
     return c.json({ ok: true, loop: updated });
 });
 // Trigger fold-back for a session.
 app.post("/api/open-loops/foldback", async (c) => {
     const body = await c.req.json();
     if (!body.sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const cs = chatSessions.get(body.sessionId);
     if (!cs)
-        return c.json({ error: "Session not found" }, 404);
+        return notFound("Session not found");
     const result = await foldBack({
         history: cs.history,
         historySummary: cs.historySummary || undefined,
@@ -4162,7 +4427,7 @@ app.get("/api/metrics", async (c) => {
 app.get("/api/metrics/summary", async (c) => {
     const name = c.req.query("name");
     if (!name)
-        return c.json({ error: "name parameter required" }, 400);
+        return badRequest("name parameter required");
     const windowMs = parseInt(c.req.query("window") ?? "60000", 10);
     const summary = await metricsStore.summarize(name, { windowMs });
     return c.json({ summary });
@@ -4176,7 +4441,7 @@ app.get("/api/metrics/names", async (c) => {
 app.get("/api/metrics/series", async (c) => {
     const name = c.req.query("name");
     if (!name)
-        return c.json({ error: "name parameter required" }, 400);
+        return badRequest("name parameter required");
     const now = Date.now();
     const since = c.req.query("since") ?? new Date(now - 60 * 60 * 1000).toISOString();
     const until = c.req.query("until") ?? new Date(now).toISOString();
@@ -4257,7 +4522,7 @@ app.get("/api/metrics/firewall/compare", async (c) => {
     const afterSince = c.req.query("after_since");
     const afterUntil = c.req.query("after_until");
     if (!beforeSince || !beforeUntil || !afterSince) {
-        return c.json({ error: "Required: before_since, before_until, after_since" }, 400);
+        return badRequest("Required: before_since, before_until, after_since");
     }
     const report = await generateComparisonReport(metricsStore, { since: beforeSince, until: beforeUntil }, { since: afterSince, until: afterUntil ?? new Date().toISOString() });
     return c.text(report);
@@ -4322,6 +4587,10 @@ app.get("/board", requireSurface("pages"), async (c) => {
     const html = await serveHtmlTemplate(join(UI_DIR, "board.html"));
     return c.html(html);
 });
+app.get("/whiteboard", async (c) => {
+    const html = await serveHtmlTemplate(join(UI_DIR, "whiteboard.html"));
+    return c.html(html);
+});
 app.get("/library", requireSurface("pages"), async (c) => {
     const html = await serveHtmlTemplate(join(UI_DIR, "library.html"));
     return c.html(html);
@@ -4356,7 +4625,7 @@ app.get("/api/roadmap", async (c) => {
 app.get("/api/roadmap/recent", async (c) => {
     const hours = parseInt(c.req.query("hours") || "24", 10);
     if (isNaN(hours) || hours < 1 || hours > 168) {
-        return c.json({ error: "hours must be between 1 and 168" }, 400);
+        return badRequest("hours must be between 1 and 168");
     }
     try {
         const { gitAvailable } = await import("./utils/git.js");
@@ -4425,12 +4694,12 @@ app.get("/life", async (c) => {
 app.get("/api/browse", async (c) => {
     const url = c.req.query("url");
     if (!url)
-        return c.json({ error: "url parameter required" }, 400);
+        return badRequest("url parameter required");
     try {
         new URL(url);
     }
     catch {
-        return c.json({ error: "Invalid URL" }, 400);
+        return badRequest("Invalid URL");
     }
     const result = await _browse.browseUrl(url);
     if (!result) {
@@ -4442,7 +4711,7 @@ app.get("/api/browse", async (c) => {
 app.post("/api/share", async (c) => {
     const { email, note } = await c.req.json();
     if (!email || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
-        return c.json({ error: "Valid email address required" }, 400);
+        return badRequest("Valid email address required");
     }
     const resendKey = process.env.RESEND_API_KEY;
     if (!resendKey) {
@@ -4604,7 +4873,7 @@ app.post("/api/ops/sidecars/:name/restart", async (c) => {
             ok = await _avatarSidecar?.startAvatarSidecar() ?? false;
             break;
         default:
-            return c.json({ error: `Unknown sidecar: ${name}` }, 400);
+            return badRequest(`Unknown sidecar: ${name}`);
     }
     logActivity({ source: "system", summary: `Restarted sidecar: ${name} (${ok ? "up" : "failed"})` });
     return c.json({ name, available: ok });
@@ -4693,7 +4962,7 @@ app.patch("/api/ops/queue/:id", async (c) => {
     const body = await c.req.json();
     const updated = await store.update(id, body);
     if (!updated)
-        return c.json({ error: "Task not found" }, 404);
+        return notFound("Task not found");
     return c.json(updated);
 });
 // --- Project endpoints ---
@@ -4713,7 +4982,7 @@ app.post("/api/ops/projects", async (c) => {
     const body = await c.req.json();
     const { name, prefix, description } = body;
     if (!name || !prefix)
-        return c.json({ error: "name and prefix required" }, 400);
+        return badRequest("name and prefix required");
     try {
         const project = await projectStore.create({ name, prefix, description });
         return c.json(project, 201);
@@ -4731,7 +5000,7 @@ app.patch("/api/ops/projects/:id", async (c) => {
     const body = await c.req.json();
     const updated = await projectStore.update(id, body);
     if (!updated)
-        return c.json({ error: "Project not found" }, 404);
+        return notFound("Project not found");
     return c.json(updated);
 });
 app.delete("/api/ops/projects/:id", async (c) => {
@@ -4751,7 +5020,7 @@ app.delete("/api/ops/projects/:id", async (c) => {
     }
     const ok = await projectStore.delete(id);
     if (!ok)
-        return c.json({ error: "Project not found" }, 404);
+        return notFound("Project not found");
     return c.json({ ok: true });
 });
 // --- Posture API (UI surface assembly) ---
@@ -4817,7 +5086,7 @@ app.post("/api/nerve/subscribe", async (c) => {
     const body = await c.req.json();
     const { subscription, label } = body;
     if (!subscription?.endpoint || !subscription?.keys) {
-        return c.json({ error: "Invalid subscription" }, 400);
+        return badRequest("Invalid subscription");
     }
     const id = await addSubscription(subscription, label);
     return c.json({ id });
@@ -4876,7 +5145,7 @@ app.post("/api/nerve/accept-update", async (c) => {
 app.get("/api/chat/poll", async (c) => {
     const sessionId = c.req.query("sessionId") || c.req.header("x-session-id");
     if (!sessionId)
-        return c.json({ error: "sessionId required" }, 400);
+        return badRequest("sessionId required");
     const since = parseInt(c.req.query("since") || "0", 10);
     const cs = chatSessions.get(sessionId) || (chatSessions.size > 0 ? chatSessions.values().next().value : null);
     if (!cs)
@@ -4889,6 +5158,8 @@ app.get("/api/chat/poll", async (c) => {
         role: m.role,
         content: typeof m.content === "string" ? m.content : JSON.stringify(m.content),
         source: m.source || "pc",
+        ...(m.toolsUsed ? { toolsUsed: m.toolsUsed } : {}),
+        ...(m.agentsUsed ? { agentsUsed: m.agentsUsed } : {}),
     }));
     return c.json({ messages: newMsgs, total });
 });
@@ -4897,11 +5168,11 @@ app.post("/api/chat", async (c) => {
     const body = await c.req.json();
     const { sessionId, message, images } = body;
     if (!sessionId || !message) {
-        return c.json({ error: "sessionId and message required" }, 400);
+        return badRequest("sessionId and message required");
     }
     const session = validateSession(sessionId);
     if (!session) {
-        return c.json({ error: "Invalid or expired session" }, 401);
+        return unauthorized("Invalid or expired session");
     }
     const cs = await getOrCreateChatSession(sessionId, session.name);
     // Route to thread history if threadId is provided
@@ -5231,14 +5502,16 @@ app.post("/api/chat", async (c) => {
             visualEntries = await searchVisualMemories(chatMessage, maxImages);
         }
         if (visualEntries.length > 0) {
-            const hydrated = await hydrateVisualMemories(visualEntries, maxImages);
-            if (hydrated.length > 0) {
-                const blocks = [];
-                for (const h of hydrated) {
-                    blocks.push({ type: "text", text: `[Visual memory from ${h.entry.createdAt}]: ${h.description}` });
-                    blocks.push({ type: "image_url", image_url: { url: h.dataUri } });
-                }
-                ctx.messages.splice(1, 0, { role: "user", content: blocks });
+            // Inject text descriptions only — the model already analyzed images on upload.
+            // Sending raw base64 every turn wastes tokens and slows responses.
+            const descriptions = visualEntries
+                .map((e) => {
+                const desc = e.meta?.description ?? e.content;
+                return `[Visual memory from ${e.createdAt}]: ${desc}`;
+            })
+                .slice(0, maxImages);
+            if (descriptions.length > 0) {
+                ctx.messages.splice(1, 0, { role: "user", content: descriptions.join("\n") });
             }
         }
     }
@@ -5693,6 +5966,10 @@ app.post("/api/chat", async (c) => {
                 resolve();
             };
             reqSignal?.addEventListener("abort", onAbort, { once: true });
+            // Track tool usage for history persistence
+            const toolsUsedInTurn = [];
+            // Track spawned agents for history persistence
+            const agentsSpawnedInTurn = [];
             // Token buffer for split-placeholder rehydration
             let tokenBuf2 = "";
             const streamStartMs2 = performance.now();
@@ -5706,10 +5983,28 @@ app.post("/api/chat", async (c) => {
                 tokenBuf2 = "";
                 stream.writeSSE({ data: JSON.stringify({ token: rehydrated }) }).catch(() => { });
             };
-            stream_fn({
+            // Initialize tool registry for this session (kept for when tool layer is re-enabled)
+            const toolHandlerCtx = {
+                brainDir: BRAIN_DIR,
+                encryptionKey: sessionKeys.get(sessionId) ?? undefined,
+                getBrain: () => cs.brain,
+            };
+            const chatToolRegistry = new ToolRegistry();
+            chatToolRegistry.registerAll(createToolHandlers(toolHandlerCtx));
+            streamWithTools({
+                streamFn: stream_fn,
                 messages: redactedMessages,
                 model: activeChatModel,
                 signal: reqSignal,
+                registry: chatToolRegistry,
+                tier: activeTier,
+                onToolCall: (call) => {
+                    stream.writeSSE({ data: JSON.stringify({ toolCall: { id: call.id, name: call.name, arguments: call.arguments } }) }).catch(() => { });
+                },
+                onToolResult: (name, result, isError) => {
+                    toolsUsedInTurn.push({ name, isError });
+                    stream.writeSSE({ data: JSON.stringify({ toolResult: { name, result: result.slice(0, 500), isError } }) }).catch(() => { });
+                },
                 onToken: (token) => {
                     tokenBuf2 += token;
                     // Hold if buffer ends with partial placeholder
@@ -5719,232 +6014,251 @@ app.post("/api/chat", async (c) => {
                     flushBuf2();
                 },
                 onDone: async () => {
-                    flushBuf2(); // flush remainder
-                    reqSignal?.removeEventListener("abort", onAbort);
-                    logLlmCall({
-                        ts: new Date().toISOString(), mode: "stream",
-                        provider: activeProvider, model: streamModel2,
-                        durationMs: Math.round(performance.now() - streamStartMs2),
-                        outputTokens: Math.ceil(fullResponse.length / 4), ok: true,
-                    });
-                    // Process action blocks BEFORE sending done — ensures SSE events reach client before stream closes.
-                    // ALWAYS strip [AGENT_REQUEST] blocks from response, even if they can't be parsed.
-                    // Capture raw block content first for logging/parsing.
-                    const rawAgentBlocks = [...fullResponse.matchAll(/\[AGENT_REQUEST\]\s*([\s\S]*?)\s*\[\/AGENT_REQUEST\]/g)];
-                    if (rawAgentBlocks.length > 0) {
-                        fullResponse = fullResponse.replace(/\s*\[AGENT_REQUEST\][\s\S]*?\[\/AGENT_REQUEST\]\s*/g, "").trim();
-                        agentLog.info(` Found ${rawAgentBlocks.length} AGENT_REQUEST block(s)`);
-                        let spawnCount = 0;
-                        for (const block of rawAgentBlocks) {
-                            const rawContent = block[1].trim();
-                            agentLog.info(` Block content: ${rawContent.slice(0, 300)}`);
-                            // Try to extract JSON from the block — may be wrapped in backticks, code fences, or prose
-                            let jsonStr = rawContent;
-                            // Strip code fence wrappers: ```json ... ``` or ``` ... ```
-                            jsonStr = jsonStr.replace(/^`{3,}(?:json)?\s*/i, "").replace(/\s*`{3,}$/i, "");
-                            // Strip inline backticks
-                            jsonStr = jsonStr.replace(/^`+|`+$/g, "");
-                            // Try to find a JSON object in the content
-                            const jsonMatch = jsonStr.match(/\{[\s\S]*\}/);
-                            if (!jsonMatch) {
-                                agentLog.error(` No JSON object found in block. Raw content: ${rawContent.slice(0, 300)}`);
-                                logActivity({ source: "agent", summary: `AGENT_REQUEST has no JSON`, detail: rawContent.slice(0, 300) });
-                                continue;
-                            }
-                            try {
-                                const req = JSON.parse(jsonMatch[0]);
-                                if (req.prompt) {
-                                    let finalPrompt = req.prompt;
-                                    const label = req.label || finalPrompt.slice(0, 60);
-                                    // Guard: detect vague prompts and prepend grounding instructions
-                                    const hasFilePath = /(?:src\/|brain\/|public\/|\.ts|\.js|\.md|\.json|\.yaml|\.yml)/.test(finalPrompt);
-                                    const isVague = /\b(?:comprehensive|robust|production-ready|enterprise|scalable|world-class)\b/i.test(finalPrompt)
-                                        && !hasFilePath;
-                                    const isWishList = (finalPrompt.match(/^\d+\.\s/gm) || []).length >= 5 && !hasFilePath;
-                                    if (isVague || isWishList) {
-                                        agentLog.warn(` Vague prompt detected, adding grounding preamble: ${label}`);
-                                        finalPrompt = [
-                                            `IMPORTANT: The original request below is vague. Do NOT try to build everything listed.`,
-                                            `Instead: 1) Read the existing codebase (start with src/ and package.json) to understand what exists.`,
-                                            `2) Pick ONE small, concrete piece you can actually implement that connects to existing code.`,
-                                            `3) Build that one thing well, with tests if a test framework exists.`,
-                                            `4) If nothing concrete can be built without more requirements, just create a brief spec document at brain/knowledge/notes/ describing what decisions are needed and exit.`,
-                                            ``,
-                                            `Original request:`,
-                                            finalPrompt,
-                                        ].join("\n");
-                                    }
-                                    spawnCount++;
-                                    agentLog.info(` Spawning: ${label}${(isVague || isWishList) ? " (grounded)" : ""}`);
-                                    // Await task submission so we can send the real task ID to the client
-                                    try {
-                                        const task = await submitTask({
-                                            label,
-                                            prompt: finalPrompt,
-                                            origin: "ai",
-                                            sessionId,
-                                            boardTaskId: req.taskId,
-                                        });
-                                        stream.writeSSE({ data: JSON.stringify({ agentSpawned: { label, taskId: task.id } }) }).catch(() => { });
-                                        logActivity({ source: "agent", summary: `AI-triggered agent: ${task.label}`, detail: `Task ${task.id}, PID ${task.pid}`, actionLabel: "PROMPTED", reason: "user chat triggered agent" });
+                    try {
+                        flushBuf2(); // flush remainder
+                        reqSignal?.removeEventListener("abort", onAbort);
+                        logLlmCall({
+                            ts: new Date().toISOString(), mode: "stream",
+                            provider: activeProvider, model: streamModel2,
+                            durationMs: Math.round(performance.now() - streamStartMs2),
+                            outputTokens: Math.ceil(fullResponse.length / 4), ok: true,
+                        });
+                        // Process action blocks BEFORE sending done — ensures SSE events reach client before stream closes.
+                        // ALWAYS strip [AGENT_REQUEST] blocks from response, even if they can't be parsed.
+                        // Capture raw block content first for logging/parsing.
+                        const rawAgentBlocks = [...fullResponse.matchAll(/\[AGENT_REQUEST\]\s*([\s\S]*?)\s*\[\/AGENT_REQUEST\]/g)];
+                        if (rawAgentBlocks.length > 0) {
+                            fullResponse = fullResponse.replace(/\s*\[AGENT_REQUEST\][\s\S]*?\[\/AGENT_REQUEST\]\s*/g, "").trim();
+                            agentLog.info(` Found ${rawAgentBlocks.length} AGENT_REQUEST block(s)`);
+                            let spawnCount = 0;
+                            for (const block of rawAgentBlocks) {
+                                const rawContent = block[1].trim();
+                                agentLog.info(` Block content: ${rawContent.slice(0, 300)}`);
+                                // Try to extract JSON from the block — may be wrapped in backticks, code fences, or prose
+                                let jsonStr = rawContent;
+                                // Strip code fence wrappers: ```json ... ``` or ``` ... ```
+                                jsonStr = jsonStr.replace(/^`{3,}(?:json)?\s*/i, "").replace(/\s*`{3,}$/i, "");
+                                // Strip inline backticks
+                                jsonStr = jsonStr.replace(/^`+|`+$/g, "");
+                                // Try to find a JSON object in the content
+                                const jsonMatch = jsonStr.match(/\{[\s\S]*\}/);
+                                if (!jsonMatch) {
+                                    agentLog.error(` No JSON object found in block. Raw content: ${rawContent.slice(0, 300)}`);
+                                    logActivity({ source: "agent", summary: `AGENT_REQUEST has no JSON`, detail: rawContent.slice(0, 300) });
+                                    continue;
+                                }
+                                try {
+                                    const req = JSON.parse(jsonMatch[0]);
+                                    if (req.prompt) {
+                                        let finalPrompt = req.prompt;
+                                        const label = req.label || finalPrompt.slice(0, 60);
+                                        // Guard: detect vague prompts and prepend grounding instructions
+                                        const hasFilePath = /(?:src\/|brain\/|public\/|\.ts|\.js|\.md|\.json|\.yaml|\.yml)/.test(finalPrompt);
+                                        const isVague = /\b(?:comprehensive|robust|production-ready|enterprise|scalable|world-class)\b/i.test(finalPrompt)
+                                            && !hasFilePath;
+                                        const isWishList = (finalPrompt.match(/^\d+\.\s/gm) || []).length >= 5 && !hasFilePath;
+                                        if (isVague || isWishList) {
+                                            agentLog.warn(` Vague prompt detected, adding grounding preamble: ${label}`);
+                                            finalPrompt = [
+                                                `IMPORTANT: The original request below is vague. Do NOT try to build everything listed.`,
+                                                `Instead: 1) Read the existing codebase (start with src/ and package.json) to understand what exists.`,
+                                                `2) Pick ONE small, concrete piece you can actually implement that connects to existing code.`,
+                                                `3) Build that one thing well, with tests if a test framework exists.`,
+                                                `4) If nothing concrete can be built without more requirements, just create a brief spec document at brain/knowledge/notes/ describing what decisions are needed and exit.`,
+                                                ``,
+                                                `Original request:`,
+                                                finalPrompt,
+                                            ].join("\n");
+                                        }
+                                        spawnCount++;
+                                        agentLog.info(` Spawning: ${label}${(isVague || isWishList) ? " (grounded)" : ""}`);
+                                        // Await task submission so we can send the real task ID to the client
+                                        try {
+                                            const task = await submitTask({
+                                                label,
+                                                prompt: finalPrompt,
+                                                origin: "ai",
+                                                sessionId,
+                                                boardTaskId: req.taskId,
+                                            });
+                                            stream.writeSSE({ data: JSON.stringify({ agentSpawned: { label, taskId: task.id } }) }).catch(() => { });
+                                            agentsSpawnedInTurn.push({ label, taskId: task.id });
+                                            logActivity({ source: "agent", summary: `AI-triggered agent: ${task.label}`, detail: `Task ${task.id}, PID ${task.pid}`, actionLabel: "PROMPTED", reason: "user chat triggered agent" });
+                                        }
+                                        catch (err) {
+                                            agentLog.error(`Spawn failed for "${label}": ${err.message}`);
+                                            logActivity({ source: "agent", summary: `AI agent spawn failed: ${err.message}`, actionLabel: "PROMPTED", reason: "user chat triggered agent spawn failed" });
+                                            stream.writeSSE({ data: JSON.stringify({ agentError: { label, error: err.message } }) }).catch(() => { });
+                                        }
                                     }
-                                    catch (err) {
-                                        agentLog.error(`Spawn failed for "${label}": ${err.message}`);
-                                        logActivity({ source: "agent", summary: `AI agent spawn failed: ${err.message}`, actionLabel: "PROMPTED", reason: "user chat triggered agent spawn failed" });
-                                        stream.writeSSE({ data: JSON.stringify({ agentError: { label, error: err.message } }) }).catch(() => { });
+                                    else {
+                                        agentLog.warn(`Parsed JSON but missing "prompt" field: ${jsonMatch[0].slice(0, 200)}`);
                                     }
                                 }
-                                else {
-                                    agentLog.warn(`Parsed JSON but missing "prompt" field: ${jsonMatch[0].slice(0, 200)}`);
+                                catch (err) {
+                                    const snippet = jsonMatch[0].slice(0, 300).replace(/\n/g, " ");
+                                    agentLog.error(` JSON parse failed: ${snippet}`);
+                                    logActivity({ source: "agent", summary: `AGENT_REQUEST parse error`, detail: snippet });
                                 }
                             }
-                            catch (err) {
-                                const snippet = jsonMatch[0].slice(0, 300).replace(/\n/g, " ");
-                                agentLog.error(` JSON parse failed: ${snippet}`);
-                                logActivity({ source: "agent", summary: `AGENT_REQUEST parse error`, detail: snippet });
+                            if (spawnCount === 0) {
+                                agentLog.warn(` ${rawAgentBlocks.length} block(s) found but 0 spawned — check server logs for block content`);
                             }
                         }
-                        if (spawnCount === 0) {
-                            agentLog.warn(` ${rawAgentBlocks.length} block(s) found but 0 spawned — check server logs for block content`);
-                        }
-                    }
-                    // Check if AI requested board VIEW (read-only card rendering)
-                    // Parsed here (not by registry) because BOARD_VIEW uses a different tag than BOARD_ACTION,
-                    // but execution is routed through the board capability's "view" action.
-                    const boardViewRe = /\[BOARD_VIEW\]\s*(\{[\s\S]*?\})\s*(?:\[\/BOARD_VIEW\])?/g;
-                    const boardViewBlocks = [...fullResponse.matchAll(boardViewRe)];
-                    const boardViewPromises = [];
-                    const boardViewResults = [];
-                    if (boardViewBlocks.length > 0) {
-                        // Strip blocks from visible response
-                        fullResponse = fullResponse.replace(/\s*\[BOARD_VIEW\][\s\S]*?\[\/BOARD_VIEW\]\s*/g, "").trim();
-                        fullResponse = fullResponse.replace(/\s*\[BOARD_VIEW\]\s*\{[\s\S]*?\}\s*/g, "").trim();
-                        for (const block of boardViewBlocks) {
-                            try {
-                                const req = JSON.parse(block[1]);
-                                boardViewPromises.push((async () => {
-                                    try {
-                                        const result = await boardCapability.execute({ action: "view", ...req }, { origin: "chat" });
-                                        const issues = result.data;
-                                        const viewLabel = req.stateType || req.filter || "board";
-                                        if (result.ok && issues && issues.length > 0) {
-                                            boardViewResults.push({ query: viewLabel, issues });
-                                            stream.writeSSE({
-                                                data: JSON.stringify({ boardItems: { issues: issuesToCardPayload(issues) } }),
-                                            }).catch(() => { });
+                        // Check if AI requested board VIEW (read-only card rendering)
+                        // Parsed here (not by registry) because BOARD_VIEW uses a different tag than BOARD_ACTION,
+                        // but execution is routed through the board capability's "view" action.
+                        const boardViewRe = /\[BOARD_VIEW\]\s*(\{[\s\S]*?\})\s*(?:\[\/BOARD_VIEW\])?/g;
+                        const boardViewBlocks = [...fullResponse.matchAll(boardViewRe)];
+                        const boardViewPromises = [];
+                        const boardViewResults = [];
+                        if (boardViewBlocks.length > 0) {
+                            // Strip blocks from visible response
+                            fullResponse = fullResponse.replace(/\s*\[BOARD_VIEW\][\s\S]*?\[\/BOARD_VIEW\]\s*/g, "").trim();
+                            fullResponse = fullResponse.replace(/\s*\[BOARD_VIEW\]\s*\{[\s\S]*?\}\s*/g, "").trim();
+                            for (const block of boardViewBlocks) {
+                                try {
+                                    const req = JSON.parse(block[1]);
+                                    boardViewPromises.push((async () => {
+                                        try {
+                                            const result = await boardCapability.execute({ action: "view", ...req }, { origin: "chat" });
+                                            const issues = result.data;
+                                            const viewLabel = req.stateType || req.filter || "board";
+                                            if (result.ok && issues && issues.length > 0) {
+                                                boardViewResults.push({ query: viewLabel, issues });
+                                                stream.writeSSE({
+                                                    data: JSON.stringify({ boardItems: { issues: issuesToCardPayload(issues) } }),
+                                                }).catch(() => { });
+                                            }
+                                            else if (result.ok) {
+                                                boardViewResults.push({ query: viewLabel, issues: [] });
+                                                // Empty result — send a system message so the agent/user know
+                                                stream.writeSSE({
+                                                    data: JSON.stringify({ boardItems: { issues: [], empty: true } }),
+                                                }).catch(() => { });
+                                            }
                                         }
-                                        else if (result.ok) {
-                                            boardViewResults.push({ query: viewLabel, issues: [] });
-                                            // Empty result — send a system message so the agent/user know
-                                            stream.writeSSE({
-                                                data: JSON.stringify({ boardItems: { issues: [], empty: true } }),
-                                            }).catch(() => { });
+                                        catch {
+                                            log.warn("BOARD_VIEW fetch error");
                                         }
-                                    }
-                                    catch {
-                                        log.warn("BOARD_VIEW fetch error");
-                                    }
-                                })());
-                            }
-                            catch {
-                                log.warn("BOARD_VIEW parse error");
+                                    })());
+                                }
+                                catch {
+                                    log.warn("BOARD_VIEW parse error");
+                                }
                             }
                         }
-                    }
-                    // Process capability action blocks (board, calendar, email, docs) via registry
-                    {
-                        const capReg = getCapabilityRegistry();
-                        if (capReg) {
-                            const blocks = capReg.parseActionBlocks(fullResponse);
-                            if (blocks.length > 0) {
-                                fullResponse = capReg.stripActionBlocks(fullResponse);
-                                // Fire-and-forget: execute action blocks
-                                (async () => {
-                                    for (const block of blocks) {
-                                        if (!block.payload)
-                                            continue;
-                                        const def = capReg.get(block.capabilityId);
-                                        if (!def || def.pattern !== "action")
-                                            continue;
-                                        try {
-                                            await def.execute(block.payload, { origin: "chat" });
+                        // Process capability action blocks (board, calendar, email, docs) via registry
+                        {
+                            const capReg = getCapabilityRegistry();
+                            if (capReg) {
+                                const blocks = capReg.parseActionBlocks(fullResponse);
+                                if (blocks.length > 0) {
+                                    fullResponse = capReg.stripActionBlocks(fullResponse);
+                                    // Fire-and-forget: execute action blocks
+                                    (async () => {
+                                        for (const block of blocks) {
+                                            if (!block.payload)
+                                                continue;
+                                            const def = capReg.get(block.capabilityId);
+                                            if (!def || def.pattern !== "action")
+                                                continue;
+                                            try {
+                                                await def.execute(block.payload, { origin: "chat" });
+                                            }
+                                            catch { }
                                         }
-                                        catch { }
-                                    }
-                                })();
+                                    })();
+                                }
                             }
                         }
-                    }
-                    // Save assistant response to history (with AGENT_REQUEST + BOARD_ACTION + action blocks stripped)
-                    cs.history.push({ role: "assistant", content: fullResponse });
-                    persistSession();
-                    // Fire-and-forget: extract learnable facts from conversation
-                    cs.turnCount++;
-                    const recentMessages = cs.history.slice(-4);
-                    extractAndLearn({
-                        brain: cs.brain,
-                        recentMessages,
-                        userMessage: message,
-                        provider: resolveProvider(),
-                        model: resolveUtilityModel(),
-                        lastExtractionTurn: cs.lastExtractionTurn,
-                        currentTurn: cs.turnCount,
-                    }).then((result) => {
-                        if (result.extracted > 0) {
-                            logActivity({ source: "learn", summary: `Extracted ${result.extracted} fact(s)`, actionLabel: "PROMPTED", reason: "user conversation triggered learning" });
-                            cs.lastExtractionTurn = cs.turnCount;
+                        // Save assistant response to history (with AGENT_REQUEST + BOARD_ACTION + action blocks stripped)
+                        const historyEntry = { role: "assistant", content: fullResponse };
+                        if (toolsUsedInTurn.length > 0)
+                            historyEntry.toolsUsed = toolsUsedInTurn;
+                        if (agentsSpawnedInTurn.length > 0) {
+                            historyEntry.agentsUsed = agentsSpawnedInTurn.map((a) => ({
+                                label: a.label,
+                                status: "completed", // placeholder — frontend polls for real status
+                                taskId: a.taskId,
+                            }));
                         }
-                        if (result.error) {
-                            logActivity({ source: "learn", summary: `Extraction error: ${result.error}` });
-                        }
-                    }).catch(() => { });
-                    // Fire-and-forget: generate avatar video (TTS → MuseTalk → MP4)
-                    if ((_avatarSidecar?.isAvatarAvailable() ?? false) && (_ttsClient?.isTtsAvailable() ?? false) && fullResponse) {
-                        const trimmedText = fullResponse.slice(0, 2000);
-                        _ttsClient.synthesize(trimmedText).then(async (wavBuffer) => {
-                            if (!wavBuffer)
-                                return;
-                            const cached = await _avatarClient.getCachedVideo(wavBuffer);
-                            if (cached) {
-                                pushPendingVideo(cached);
-                                return;
+                        cs.history.push(historyEntry);
+                        persistSession();
+                        // Fire-and-forget: extract learnable facts from conversation
+                        cs.turnCount++;
+                        const recentMessages = cs.history.slice(-4);
+                        extractAndLearn({
+                            brain: cs.brain,
+                            recentMessages,
+                            userMessage: message,
+                            provider: resolveProvider(),
+                            model: resolveUtilityModel(),
+                            lastExtractionTurn: cs.lastExtractionTurn,
+                            currentTurn: cs.turnCount,
+                        }).then((result) => {
+                            if (result.extracted > 0) {
+                                logActivity({ source: "learn", summary: `Extracted ${result.extracted} fact(s)`, actionLabel: "PROMPTED", reason: "user conversation triggered learning" });
+                                cs.lastExtractionTurn = cs.turnCount;
                             }
-                            const mp4 = await _avatarClient.generateVideo(wavBuffer);
-                            if (!mp4)
-                                return;
-                            const filename = await _avatarClient.cacheVideo(mp4, wavBuffer);
-                            pushPendingVideo(filename);
-                            logActivity({ source: "avatar", summary: "Generated avatar video", actionLabel: "PROMPTED", reason: "user conversation triggered avatar" });
-                        }).catch((err) => {
-                            const msg = err instanceof Error ? err.message : String(err);
-                            logActivity({ source: "avatar", summary: `Avatar generation failed: ${msg}` });
-                        });
-                    }
-                    // Wait for board view fetches so boardItems SSE events reach the client
-                    // BEFORE resolve() closes the stream. Previously resolve() fired immediately,
-                    // racing with the async boardViewPromises — cards never reached the client.
-                    if (boardViewPromises.length > 0) {
-                        Promise.all(boardViewPromises).finally(() => {
-                            // Store board view results in history so next turn has context
-                            if (boardViewResults.length > 0) {
-                                const lines = boardViewResults.map((r) => {
-                                    if (r.issues.length === 0) {
-                                        return `Displayed 0 ${r.query} items to user.`;
-                                    }
-                                    const itemLines = r.issues.map((i) => `- ${i.identifier}: ${i.title} [${i.state || "unknown"}]`);
-                                    return `Displayed ${r.issues.length} ${r.query} item(s) to user:\n${itemLines.join("\n")}`;
-                                });
-                                cs.history.push({
-                                    role: "system",
-                                    content: `[BOARD_VIEW_RESULT]\n${lines.join("\n")}`,
-                                });
-                                persistSession();
+                            if (result.error) {
+                                logActivity({ source: "learn", summary: `Extraction error: ${result.error}` });
                             }
+                        }).catch(() => { });
+                        // Fire-and-forget: generate avatar video (TTS → MuseTalk → MP4)
+                        if ((_avatarSidecar?.isAvatarAvailable() ?? false) && (_ttsClient?.isTtsAvailable() ?? false) && fullResponse) {
+                            const trimmedText = fullResponse.slice(0, 2000);
+                            _ttsClient.synthesize(trimmedText).then(async (wavBuffer) => {
+                                if (!wavBuffer)
+                                    return;
+                                const cached = await _avatarClient.getCachedVideo(wavBuffer);
+                                if (cached) {
+                                    pushPendingVideo(cached);
+                                    return;
+                                }
+                                const mp4 = await _avatarClient.generateVideo(wavBuffer);
+                                if (!mp4)
+                                    return;
+                                const filename = await _avatarClient.cacheVideo(mp4, wavBuffer);
+                                pushPendingVideo(filename);
+                                logActivity({ source: "avatar", summary: "Generated avatar video", actionLabel: "PROMPTED", reason: "user conversation triggered avatar" });
+                            }).catch((err) => {
+                                const msg = err instanceof Error ? err.message : String(err);
+                                logActivity({ source: "avatar", summary: `Avatar generation failed: ${msg}` });
+                            });
+                        }
+                        // Wait for board view fetches so boardItems SSE events reach the client
+                        // BEFORE resolve() closes the stream. Previously resolve() fired immediately,
+                        // racing with the async boardViewPromises — cards never reached the client.
+                        if (boardViewPromises.length > 0) {
+                            Promise.all(boardViewPromises).finally(() => {
+                                // Store board view results in history so next turn has context
+                                if (boardViewResults.length > 0) {
+                                    const lines = boardViewResults.map((r) => {
+                                        if (r.issues.length === 0) {
+                                            return `Displayed 0 ${r.query} items to user.`;
+                                        }
+                                        const itemLines = r.issues.map((i) => `- ${i.identifier}: ${i.title} [${i.state || "unknown"}]`);
+                                        return `Displayed ${r.issues.length} ${r.query} item(s) to user:\n${itemLines.join("\n")}`;
+                                    });
+                                    cs.history.push({
+                                        role: "system",
+                                        content: `[BOARD_VIEW_RESULT]\n${lines.join("\n")}`,
+                                    });
+                                    persistSession();
+                                }
+                                stream.writeSSE({ data: JSON.stringify({ done: true }) }).catch(() => { });
+                                resolve();
+                            });
+                        }
+                        else {
                             stream.writeSSE({ data: JSON.stringify({ done: true }) }).catch(() => { });
                             resolve();
-                        });
+                        }
                     }
-                    else {
+                    catch (doneErr) {
+                        log.error("onDone handler crashed", { error: doneErr?.message ?? String(doneErr), stack: doneErr?.stack?.slice(0, 300) });
+                        stream.writeSSE({ data: JSON.stringify({ error: "Internal error processing response", errorDetail: doneErr?.message }) }).catch(() => { });
                         stream.writeSSE({ data: JSON.stringify({ done: true }) }).catch(() => { });
                         resolve();
                     }
@@ -5983,7 +6297,7 @@ app.post("/api/chat", async (c) => {
                     }
                     resolve(); // Still resolve so stream closes
                 },
-            });
+            }).catch(reject);
         });
     });
 });
@@ -5991,7 +6305,7 @@ app.post("/api/chat", async (c) => {
 app.post("/api/freeze", async (c) => {
     const body = await c.req.json().catch(() => null);
     if (!body?.signal)
-        return c.json({ error: "Missing freeze signal" }, 400);
+        return badRequest("Missing freeze signal");
     const { freeze, isFrozen } = await import("./tier/freeze.js");
     if (isFrozen())
         return c.json({ error: "Already frozen" }, 409);
@@ -6011,7 +6325,7 @@ app.get("/api/freeze/status", async (c) => {
 app.post("/api/import/folder", async (c) => {
     const body = await c.req.json();
     if (!body.paths || !Array.isArray(body.paths) || body.paths.length === 0) {
-        return c.json({ error: "paths[] required" }, 400);
+        return badRequest("paths[] required");
     }
     const { resolve } = await import("node:path");
     const { importToBrain } = await import("./files/import.js");
@@ -6064,7 +6378,7 @@ app.post("/api/import/files", async (c) => {
     const formData = await c.req.formData();
     const files = formData.getAll("files");
     if (files.length === 0)
-        return c.json({ error: "No files provided" }, 400);
+        return badRequest("No files provided");
     const { mkdir: mkdirFs, writeFile: writeFs } = await import("node:fs/promises");
     const { join: joinPath } = await import("node:path");
     const ingestDir = joinPath(process.cwd(), "ingest");