@wrongstack/webui 0.264.0 → 0.267.0

package/dist/server/entry.js

@@ -1,8 +1,180 @@
 #!/usr/bin/env node
 // src/server/index.ts
-import { expectDefined as expectDefined2, GlobalMailbox as GlobalMailbox2, projectSlug, getSessionRegistry, AgentStatusTracker } from "@wrongstack/core";
+import { expectDefined as expectDefined2, GlobalMailbox as GlobalMailbox2, projectSlug, getSessionRegistry, AgentStatusTracker, FleetNotifier } from "@wrongstack/core";
+
+// src/server/handlers/worklist-handlers.ts
+function sendResult(ws, ctx, ok, message) {
+  ctx.send(ws, { type: ok ? "ok" : "error", message });
+}
+function handleTodosGet(ctx, ws) {
+  ctx.send(ws, { type: "todos.updated", payload: { todos: ctx.context.todos } });
+}
+function handleTodosClear(ctx, ws) {
+  ctx.replaceTodos?.([]);
+  ctx.broadcast({ type: "todos.cleared" });
+  sendResult(ws, ctx, true, "Todo board cleared.");
+}
+function handleTodosRemove(ctx, ws, payload) {
+  if (!payload || payload.id === void 0 && payload.index === void 0) {
+    sendResult(ws, ctx, false, "todos.remove requires id or index.");
+    return;
+  }
+  const next = payload.id !== void 0 ? ctx.context.todos.filter((t) => t.id !== payload.id) : ctx.context.todos.filter((_, i) => i !== payload.index);
+  ctx.replaceTodos?.(next);
+  ctx.broadcast({ type: "todos.updated", payload: { todos: next } });
+  sendResult(ws, ctx, true, "Todo item removed.");
+}
+function handleTodoUpdate(ctx, ws, payload) {
+  const todo = ctx.context.todos.find((t) => t.id === payload.id);
+  if (!todo) {
+    sendResult(ws, ctx, false, `No todo with id "${payload.id}".`);
+    return;
+  }
+  const next = ctx.context.todos.map(
+    (t) => t.id === payload.id ? { ...t, ...payload.status !== void 0 && { status: payload.status }, ...payload.activeForm !== void 0 && { activeForm: payload.activeForm } } : t
+  );
+  ctx.replaceTodos?.(next);
+  ctx.broadcast({ type: "todos.updated", payload: { todos: next } });
+  sendResult(ws, ctx, true, `Todo "${todo.content}" updated.`);
+}
+async function handleTasksGet(ctx, ws) {
+  const taskPath = ctx.context.meta["task.path"];
+  if (typeof taskPath === "string" && taskPath) {
+    try {
+      const { loadTasks } = await import("@wrongstack/core");
+      const file = await loadTasks(taskPath);
+      ctx.send(ws, { type: "tasks.updated", payload: { tasks: file?.tasks ?? [] } });
+    } catch {
+      ctx.send(ws, { type: "tasks.updated", payload: { tasks: [] } });
+    }
+  } else {
+    ctx.send(ws, {
+      type: "tasks.updated",
+      payload: { tasks: [], error: "Task storage not configured." }
+    });
+  }
+}
+async function handleTaskUpdate(ctx, ws, payload) {
+  const taskPath = ctx.context.meta["task.path"];
+  if (typeof taskPath !== "string" || !taskPath) {
+    sendResult(ws, ctx, false, "Task storage is not configured for this session.");
+    return;
+  }
+  try {
+    const { loadTasks, saveTasks } = await import("@wrongstack/core");
+    const file = await loadTasks(taskPath);
+    if (!file) {
+      sendResult(ws, ctx, false, "No task file found.");
+      return;
+    }
+    const idx = file.tasks.findIndex((t) => t.id === payload.id);
+    if (idx === -1) {
+      sendResult(ws, ctx, false, `Task "${payload.id}" not found.`);
+      return;
+    }
+    file.tasks[idx] = { ...file.tasks[idx], status: payload.status };
+    await saveTasks(taskPath, file);
+    ctx.broadcast({ type: "tasks.updated", payload: { tasks: file.tasks } });
+    sendResult(ws, ctx, true, `Task "${payload.id}" marked ${payload.status}.`);
+  } catch (err) {
+    sendResult(ws, ctx, false, String(err));
+  }
+}
+async function handlePlanGet(ctx, ws) {
+  const planPath = ctx.context.meta["plan.path"];
+  const sessionId = ctx.context.session?.id ?? "";
+  if (typeof planPath === "string" && planPath) {
+    try {
+      const { loadPlan } = await import("@wrongstack/core");
+      const plan = await loadPlan(planPath);
+      ctx.send(ws, {
+        type: "plan.updated",
+        payload: {
+          plan: plan ?? {
+            version: 1,
+            sessionId,
+            updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+            items: []
+          }
+        }
+      });
+    } catch {
+      ctx.send(ws, {
+        type: "plan.updated",
+        payload: {
+          plan: {
+            version: 1,
+            sessionId,
+            updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+            items: []
+          }
+        }
+      });
+    }
+  } else {
+    ctx.send(ws, {
+      type: "plan.updated",
+      payload: { plan: null, error: "Plan storage is not configured for this session." }
+    });
+  }
+}
+async function handlePlanTemplateUse(ctx, ws, template) {
+  const planPath = ctx.context.meta["plan.path"];
+  const sessionId = ctx.context.session?.id ?? "";
+  if (typeof planPath !== "string" || !planPath) {
+    sendResult(ws, ctx, false, "Plan storage is not configured for this session.");
+    return;
+  }
+  try {
+    const { getPlanTemplate, loadPlan, savePlan, emptyPlan, addPlanItem } = await import("@wrongstack/core");
+    const tpl = getPlanTemplate(template);
+    if (!tpl) {
+      sendResult(ws, ctx, false, `Unknown template "${template}".`);
+      return;
+    }
+    let plan = await loadPlan(planPath) ?? emptyPlan(sessionId);
+    for (const item of tpl.items) {
+      ({ plan } = addPlanItem(plan, item.title, item.details));
+    }
+    await savePlan(planPath, plan);
+    sendResult(ws, ctx, true, `Applied template "${tpl.name}" \u2014 ${tpl.items.length} items added.`);
+    ctx.broadcast({ type: "plan.updated", payload: { plan } });
+  } catch (err) {
+    sendResult(ws, ctx, false, String(err));
+  }
+}
+async function handlePlanItemUpdate(ctx, ws, payload) {
+  const planPath = ctx.context.meta["plan.path"];
+  const sessionId = ctx.context.session?.id ?? "";
+  if (typeof planPath !== "string" || !planPath) {
+    sendResult(ws, ctx, false, "Plan storage is not configured for this session.");
+    return;
+  }
+  try {
+    const { loadPlan, savePlan, mutatePlan, setPlanItemStatus } = await import("@wrongstack/core");
+    let changed = false;
+    const plan = await mutatePlan(planPath, sessionId, async (p) => {
+      const before = p.updatedAt;
+      const updated = setPlanItemStatus(p, payload.target, payload.status);
+      changed = updated.updatedAt !== before;
+      return updated;
+    });
+    if (!changed) {
+      sendResult(ws, ctx, false, `No plan item matched "${payload.target}".`);
+      return;
+    }
+    sendResult(ws, ctx, true, `Plan item status updated to "${payload.status}".`);
+    ctx.broadcast({ type: "plan.updated", payload: { plan } });
+  } catch (err) {
+    sendResult(ws, ctx, false, String(err));
+  }
+}
+
+// src/server/index.ts
 import { makeMailboxTool, makeMailSendTool, makeMailInboxTool, mailboxSessionTag } from "@wrongstack/core";
-import { toErrorMessage as toErrorMessage5 } from "@wrongstack/core/utils";
+import { toErrorMessage as toErrorMessage5, wstackGlobalRoot as wstackGlobalRoot2, projectHash, resolveWstackPaths } from "@wrongstack/core/utils";
+import { SkillInstaller } from "@wrongstack/core/skills";
+import JSZip2 from "jszip";
 import {
   BrainMonitor,
   DefaultBrainArbiter,
@@ -10,8 +182,8 @@ import {
   createAutonomyBrain,
   createTieredBrainArbiter
 } from "@wrongstack/core";
-import * as fs7 from "fs/promises";
-import * as path8 from "path";
+import * as fs9 from "fs/promises";
+import * as path9 from "path";
 
 // src/server/http-server.ts
 import * as fs from "fs/promises";
@@ -53,8 +225,8 @@ function extractTokenFromCookie(cookieHeader) {
   for (const part of raw.split(";")) {
     const eq = part.indexOf("=");
     if (eq < 0) continue;
-    const name = part.slice(0, eq).trim();
-    if (name === "ws_token") {
+    const name2 = part.slice(0, eq).trim();
+    if (name2 === "ws_token") {
       try {
         return decodeURIComponent(part.slice(eq + 1).trim());
       } catch {
@@ -130,6 +302,13 @@ function isInsideDist(candidate, distDir) {
   const resolved = path.resolve(candidate);
   return resolved === root || resolved.startsWith(root + path.sep);
 }
+function decodeSessionId(segment) {
+  try {
+    return decodeURIComponent(segment);
+  } catch {
+    return segment;
+  }
+}
 function createHttpServer(opts) {
   const port = opts.port ?? Number.parseInt(process.env["PORT"] ?? "3456", 10);
   const distDir = path.resolve(opts.distDir);
@@ -155,6 +334,22 @@ function createHttpServer(opts) {
         res.end("ok");
         return;
       }
+      if (url.pathname === "/api/fleet/ping" && req.method === "POST") {
+        const headerToken = req.headers["x-ws-token"];
+        const provided = Array.isArray(headerToken) ? headerToken[0] : headerToken;
+        if (requireApiToken && !tokenMatches(provided, opts.apiToken ?? "")) {
+          res.writeHead(401, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "Unauthorized" }));
+          return;
+        }
+        try {
+          opts.onFleetPing?.();
+        } catch {
+        }
+        res.writeHead(204);
+        res.end();
+        return;
+      }
       if (url.pathname === "/api/sessions" && req.method === "GET") {
         const headerToken = req.headers["x-ws-token"];
         const provided = Array.isArray(headerToken) ? headerToken[0] : headerToken;
@@ -175,7 +370,89 @@ function createHttpServer(opts) {
           res.end(JSON.stringify({ error: "Unauthorized" }));
           return;
         }
-        await handleApiSessionAgents(res, opts.globalRoot, agentsMatch[1]);
+        await handleApiSessionAgents(res, opts.globalRoot, decodeSessionId(agentsMatch[1]));
+        return;
+      }
+      const eventsMatch = url.pathname.match(/^\/api\/sessions\/([^/]+)\/events$/);
+      if (eventsMatch && req.method === "GET") {
+        const headerToken = req.headers["x-ws-token"];
+        const provided = Array.isArray(headerToken) ? headerToken[0] : headerToken;
+        if (requireApiToken && !tokenMatches(provided, opts.apiToken ?? "")) {
+          res.writeHead(401, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "Unauthorized" }));
+          return;
+        }
+        const rawLimit = Number.parseInt(url.searchParams.get("limit") ?? "200", 10);
+        const limit = Math.min(500, Math.max(1, Number.isFinite(rawLimit) ? rawLimit : 200));
+        await handleApiSessionEvents(res, opts.globalRoot, decodeSessionId(eventsMatch[1]), limit);
+        return;
+      }
+      const msgMatch = url.pathname.match(/^\/api\/sessions\/([^/]+)\/message$/);
+      if (msgMatch && req.method === "POST") {
+        const headerToken = req.headers["x-ws-token"];
+        const provided = Array.isArray(headerToken) ? headerToken[0] : headerToken;
+        if (requireApiToken && !tokenMatches(provided, opts.apiToken ?? "")) {
+          res.writeHead(401, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "Unauthorized" }));
+          return;
+        }
+        await handleApiSessionMessage(res, req, opts.globalRoot, decodeSessionId(msgMatch[1]));
+        return;
+      }
+      const mailboxMatch = url.pathname.match(/^\/api\/sessions\/([^/]+)\/mailbox$/);
+      if (mailboxMatch && req.method === "GET") {
+        const headerToken = req.headers["x-ws-token"];
+        const provided = Array.isArray(headerToken) ? headerToken[0] : headerToken;
+        if (requireApiToken && !tokenMatches(provided, opts.apiToken ?? "")) {
+          res.writeHead(401, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "Unauthorized" }));
+          return;
+        }
+        await handleApiSessionMailbox(res, opts.globalRoot, decodeSessionId(mailboxMatch[1]));
+        return;
+      }
+      const interruptMatch = url.pathname.match(/^\/api\/sessions\/([^/]+)\/interrupt$/);
+      if (interruptMatch && req.method === "POST") {
+        const headerToken = req.headers["x-ws-token"];
+        const provided = Array.isArray(headerToken) ? headerToken[0] : headerToken;
+        if (requireApiToken && !tokenMatches(provided, opts.apiToken ?? "")) {
+          res.writeHead(401, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "Unauthorized" }));
+          return;
+        }
+        await handleApiSessionInterrupt(
+          res,
+          req,
+          opts.globalRoot,
+          decodeSessionId(interruptMatch[1])
+        );
+        return;
+      }
+      if (url.pathname === "/api/fleet/broadcast" && req.method === "POST") {
+        const headerToken = req.headers["x-ws-token"];
+        const provided = Array.isArray(headerToken) ? headerToken[0] : headerToken;
+        if (requireApiToken && !tokenMatches(provided, opts.apiToken ?? "")) {
+          res.writeHead(401, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "Unauthorized" }));
+          return;
+        }
+        await handleApiFleetBroadcast(res, req, opts.globalRoot);
+        return;
+      }
+      if (url.pathname === "/debug/watcher-metrics" && req.method === "GET") {
+        if (opts.watcherMetrics) {
+          const avgDelay = opts.watcherMetrics.broadcastsSent > 0 ? opts.watcherMetrics.totalDebounceDelayMs / opts.watcherMetrics.broadcastsSent : 0;
+          const response = {
+            ...opts.watcherMetrics,
+            averageDebounceDelayMs: avgDelay,
+            timestamp: Date.now()
+          };
+          res.writeHead(200, { "Content-Type": "application/json" });
+          res.end(JSON.stringify(response));
+        } else {
+          res.writeHead(503, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "File watcher metrics not available" }));
+        }
         return;
       }
       let filePath;
@@ -307,6 +584,324 @@ async function handleApiSessionAgents(res, globalRoot, sessionId) {
     res.end(JSON.stringify({ error: String(err) }));
   }
 }
+function blocksToText(content) {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    return content.filter(
+      (b) => !!b && typeof b === "object" && b.type === "text" && typeof b.text === "string"
+    ).map((b) => b.text).join("\n");
+  }
+  return "";
+}
+function clip(s, n = 600) {
+  return s.length > n ? `${s.slice(0, n)}\u2026` : s;
+}
+function asString(v) {
+  if (typeof v === "string") return v;
+  try {
+    return JSON.stringify(v);
+  } catch {
+    return String(v);
+  }
+}
+function mapWatchEntry(ev) {
+  const ts = typeof ev["ts"] === "string" ? ev["ts"] : "";
+  switch (ev["type"]) {
+    case "user_input":
+      return { ts, role: "user", text: clip(blocksToText(ev["content"])) };
+    case "llm_response": {
+      const text = blocksToText(ev["content"]);
+      return text.trim() ? { ts, role: "assistant", text: clip(text) } : null;
+    }
+    case "tool_use":
+    case "tool_call_start": {
+      const input = ev["input"] ?? ev["args"];
+      const preview = input !== void 0 && input !== null ? clip(asString(input), 160) : "";
+      return { ts, role: "tool", tool: String(ev["name"] ?? "tool"), text: preview };
+    }
+    case "tool_result": {
+      if (ev["isError"]) return { ts, role: "error", text: clip(asString(ev["content"])) };
+      const out = asString(ev["content"]).trim();
+      return out ? { ts, role: "tool", tool: "\u21B3 result", text: clip(out, 240) } : null;
+    }
+    case "error":
+    case "provider_error":
+      return { ts, role: "error", text: clip(String(ev["message"] ?? "error")) };
+    case "agent_spawned":
+      return { ts, role: "system", text: `spawned ${String(ev["role"] ?? "agent")}` };
+    case "task_completed":
+      return { ts, role: "system", text: `task done: ${String(ev["title"] ?? "")}` };
+    case "task_failed":
+      return { ts, role: "system", text: `task failed: ${String(ev["title"] ?? "")}` };
+    default:
+      return null;
+  }
+}
+async function handleApiSessionEvents(res, globalRoot, sessionId, limit) {
+  if (!globalRoot) {
+    res.writeHead(500, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: "SessionRegistry not available" }));
+    return;
+  }
+  try {
+    const { SessionRegistry, resolveWstackPaths: resolveWstackPaths2, DefaultSessionStore: DefaultSessionStore3, DefaultSessionReader: DefaultSessionReader2 } = await import("@wrongstack/core");
+    const registry = new SessionRegistry(globalRoot);
+    const entry = await registry.get(sessionId);
+    if (!entry) {
+      res.writeHead(404, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ error: "Session not found" }));
+      return;
+    }
+    const paths = resolveWstackPaths2({ projectRoot: entry.projectRoot, globalRoot });
+    const store = new DefaultSessionStore3({ dir: paths.projectSessions });
+    const reader = new DefaultSessionReader2({ store });
+    const all = [];
+    for await (const ev of reader.replay(sessionId)) {
+      const mapped = mapWatchEntry(ev);
+      if (mapped) all.push(mapped);
+    }
+    const tail = all.slice(-limit);
+    res.writeHead(200, { "Content-Type": "application/json" });
+    res.end(
+      JSON.stringify({
+        sessionId,
+        status: entry.status,
+        clientType: entry.clientType,
+        projectName: entry.projectName,
+        total: all.length,
+        entries: tail
+      })
+    );
+  } catch (err) {
+    res.writeHead(500, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: String(err) }));
+  }
+}
+function readJsonBody(req) {
+  return new Promise((resolve5, reject) => {
+    let data = "";
+    req.on("data", (chunk) => {
+      data += chunk;
+      if (data.length > 64e3) {
+        reject(new Error("Request body too large"));
+        req.destroy();
+      }
+    });
+    req.on("end", () => {
+      try {
+        resolve5(data ? JSON.parse(data) : {});
+      } catch (err) {
+        reject(err instanceof Error ? err : new Error(String(err)));
+      }
+    });
+    req.on("error", reject);
+  });
+}
+async function handleApiSessionMessage(res, req, globalRoot, sessionId) {
+  if (!globalRoot) {
+    res.writeHead(500, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: "SessionRegistry not available" }));
+    return;
+  }
+  let body;
+  try {
+    body = await readJsonBody(req);
+  } catch {
+    res.writeHead(400, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: "Invalid request body" }));
+    return;
+  }
+  const text = typeof body["text"] === "string" ? body["text"].trim() : "";
+  if (!text) {
+    res.writeHead(400, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: "text is required" }));
+    return;
+  }
+  const from = typeof body["from"] === "string" && body["from"].trim() ? body["from"].trim() : "human@webui";
+  const ALLOWED = /* @__PURE__ */ new Set(["steer", "ask", "assign", "note", "btw"]);
+  const rawType = typeof body["type"] === "string" ? body["type"] : "steer";
+  const type = ALLOWED.has(rawType) ? rawType : "steer";
+  const rawPriority = typeof body["priority"] === "string" ? body["priority"] : "";
+  const priority = ["low", "normal", "high"].includes(rawPriority) ? rawPriority : "high";
+  const subject = typeof body["subject"] === "string" && body["subject"].trim() ? body["subject"].trim() : "Message from Fleet HQ";
+  try {
+    const { SessionRegistry, resolveWstackPaths: resolveWstackPaths2, GlobalMailbox: GlobalMailbox3, mailboxSessionTag: mailboxSessionTag2 } = await import("@wrongstack/core");
+    const registry = new SessionRegistry(globalRoot);
+    const entry = await registry.get(sessionId);
+    if (!entry) {
+      res.writeHead(404, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ error: "Session not found" }));
+      return;
+    }
+    const paths = resolveWstackPaths2({ projectRoot: entry.projectRoot, globalRoot });
+    const mailbox = new GlobalMailbox3(paths.projectDir);
+    const to = `leader@${mailboxSessionTag2(sessionId)}`;
+    const sent = await mailbox.send({ from, to, type, subject, body: text, priority });
+    res.writeHead(200, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ ok: true, id: sent.id, to, type, delivered: entry.status }));
+  } catch (err) {
+    res.writeHead(500, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: String(err) }));
+  }
+}
+async function handleApiSessionMailbox(res, globalRoot, sessionId) {
+  if (!globalRoot) {
+    res.writeHead(500, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: "SessionRegistry not available" }));
+    return;
+  }
+  try {
+    const { SessionRegistry, resolveWstackPaths: resolveWstackPaths2, GlobalMailbox: GlobalMailbox3, mailboxSessionTag: mailboxSessionTag2 } = await import("@wrongstack/core");
+    const registry = new SessionRegistry(globalRoot);
+    const entry = await registry.get(sessionId);
+    if (!entry) {
+      res.writeHead(404, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ error: "Session not found" }));
+      return;
+    }
+    const paths = resolveWstackPaths2({ projectRoot: entry.projectRoot, globalRoot });
+    const mailbox = new GlobalMailbox3(paths.projectDir);
+    const leaderAddr = `leader@${mailboxSessionTag2(sessionId)}`;
+    const [inbound, outbound] = await Promise.all([
+      mailbox.query({ to: leaderAddr, limit: 50 }),
+      mailbox.query({ from: leaderAddr, limit: 50 })
+    ]);
+    const seen = /* @__PURE__ */ new Set();
+    const thread = [...inbound, ...outbound].filter((m) => {
+      if (seen.has(m.id)) return false;
+      seen.add(m.id);
+      return true;
+    }).sort((a, b) => Date.parse(a.timestamp) - Date.parse(b.timestamp)).map((m) => ({
+      id: m.id,
+      from: m.from,
+      to: m.to,
+      type: m.type,
+      subject: m.subject,
+      body: m.body,
+      priority: m.priority,
+      // Whether the leader has read it, and when.
+      readByLeader: m.readBy?.[leaderAddr] ?? null,
+      readByCount: Object.keys(m.readBy ?? {}).length,
+      completed: m.completed,
+      outcome: m.outcome ?? null,
+      timestamp: m.timestamp,
+      replyTo: m.replyTo ?? null,
+      fromLeader: m.from === leaderAddr
+    }));
+    res.writeHead(200, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ sessionId, leader: leaderAddr, status: entry.status, thread }));
+  } catch (err) {
+    res.writeHead(500, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: String(err) }));
+  }
+}
+async function handleApiSessionInterrupt(res, req, globalRoot, sessionId) {
+  if (!globalRoot) {
+    res.writeHead(500, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: "SessionRegistry not available" }));
+    return;
+  }
+  let body = {};
+  try {
+    body = await readJsonBody(req);
+  } catch {
+  }
+  const reason = typeof body["reason"] === "string" && body["reason"].trim() ? body["reason"].trim() : "Operator requested stop from Fleet HQ";
+  const from = typeof body["from"] === "string" && body["from"].trim() ? body["from"].trim() : "human@webui";
+  try {
+    const { SessionRegistry, resolveWstackPaths: resolveWstackPaths2, GlobalMailbox: GlobalMailbox3, mailboxSessionTag: mailboxSessionTag2 } = await import("@wrongstack/core");
+    const registry = new SessionRegistry(globalRoot);
+    const entry = await registry.get(sessionId);
+    if (!entry) {
+      res.writeHead(404, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ error: "Session not found" }));
+      return;
+    }
+    const paths = resolveWstackPaths2({ projectRoot: entry.projectRoot, globalRoot });
+    const mailbox = new GlobalMailbox3(paths.projectDir);
+    const to = `leader@${mailboxSessionTag2(sessionId)}`;
+    const sent = await mailbox.send({
+      from,
+      to,
+      type: "control",
+      subject: "interrupt",
+      body: reason,
+      priority: "high"
+    });
+    res.writeHead(200, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ ok: true, id: sent.id, to, delivered: entry.status }));
+  } catch (err) {
+    res.writeHead(500, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: String(err) }));
+  }
+}
+async function handleApiFleetBroadcast(res, req, globalRoot) {
+  if (!globalRoot) {
+    res.writeHead(500, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: "SessionRegistry not available" }));
+    return;
+  }
+  let body;
+  try {
+    body = await readJsonBody(req);
+  } catch {
+    res.writeHead(400, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: "Invalid request body" }));
+    return;
+  }
+  const text = typeof body["text"] === "string" ? body["text"].trim() : "";
+  if (!text) {
+    res.writeHead(400, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: "text is required" }));
+    return;
+  }
+  const from = typeof body["from"] === "string" && body["from"].trim() ? body["from"].trim() : "human@webui";
+  try {
+    const { SessionRegistry, resolveWstackPaths: resolveWstackPaths2, GlobalMailbox: GlobalMailbox3, mailboxSessionTag: mailboxSessionTag2 } = await import("@wrongstack/core");
+    const registry = new SessionRegistry(globalRoot);
+    const all = await registry.list();
+    const mySlug = all.find((s) => s.pid === process.pid)?.projectSlug;
+    const targets = all.filter((s) => s.status !== "stale").filter((s) => mySlug ? s.projectSlug === mySlug : true);
+    if (targets.length === 0) {
+      res.writeHead(200, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ ok: true, delivered: 0 }));
+      return;
+    }
+    const mbByDir = /* @__PURE__ */ new Map();
+    const mailboxFor = (projectRoot) => {
+      const dir = resolveWstackPaths2({ projectRoot, globalRoot }).projectDir;
+      let mb = mbByDir.get(dir);
+      if (!mb) {
+        mb = new GlobalMailbox3(dir);
+        mbByDir.set(dir, mb);
+      }
+      return mb;
+    };
+    let delivered = 0;
+    await Promise.all(
+      targets.map(async (s) => {
+        try {
+          const mb = mailboxFor(s.projectRoot);
+          await mb.send({
+            from,
+            to: `leader@${mailboxSessionTag2(s.sessionId)}`,
+            type: "steer",
+            subject: "Broadcast from Fleet HQ",
+            body: text,
+            priority: "high"
+          });
+          delivered++;
+        } catch {
+        }
+      })
+    );
+    res.writeHead(200, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ ok: true, delivered, targets: targets.length }));
+  } catch (err) {
+    res.writeHead(500, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: String(err) }));
+  }
+}
 
 // src/server/file-handlers.ts
 import * as fs2 from "fs/promises";
@@ -336,8 +931,8 @@ var KEEP_DOTFILES = /* @__PURE__ */ new Set([
   ".eslintrc",
   ".prettierrc"
 ]);
-function isHiddenEntry(name) {
-  return name.startsWith(".") && !KEEP_DOTFILES.has(name);
+function isHiddenEntry(name2) {
+  return name2.startsWith(".") && !KEEP_DOTFILES.has(name2);
 }
 function rankFiles(paths, query, limit) {
   const q = query.toLowerCase();
@@ -380,7 +975,7 @@ function broadcast(clients, msg) {
     }
   }
 }
-function sendResult(ws, success, message) {
+function sendResult2(ws, success, message) {
   send(ws, { type: "key.operation_result", payload: { success, message } });
 }
 function errMessage(err) {
@@ -529,25 +1124,240 @@ async function handleMemoryRemember(ws, msg, memoryStore) {
   const { text, scope } = msg.payload;
   try {
     await memoryStore.remember(text, scope ?? "project-memory");
-    sendResult(ws, true, "Saved to memory");
+    sendResult2(ws, true, "Saved to memory");
   } catch (err) {
-    sendResult(ws, false, errMessage(err));
+    sendResult2(ws, false, errMessage(err));
   }
 }
 async function handleMemoryForget(ws, msg, memoryStore) {
   const { text, scope } = msg.payload;
   try {
     const removed = await memoryStore.forget(text, scope ?? "project-memory");
-    sendResult(
+    sendResult2(
       ws,
       removed > 0,
       removed > 0 ? `Removed ${removed} entr${removed === 1 ? "y" : "ies"}` : "No matching entries"
     );
   } catch (err) {
-    sendResult(ws, false, errMessage(err));
+    sendResult2(ws, false, errMessage(err));
   }
 }
 
+// src/server/mcp-handlers.ts
+import { allServers } from "@wrongstack/core";
+import {
+  addMcp,
+  disableMcp,
+  discoverMcp,
+  enableMcp,
+  listMcp,
+  removeMcp,
+  restartMcp,
+  updateMcp
+} from "@wrongstack/mcp";
+function mapStatus(raw) {
+  switch (raw) {
+    case "connected":
+      return "connected";
+    case "connecting":
+    case "reconnecting":
+      return "connecting";
+    case "failed":
+      return "error";
+    case "dormant":
+      return "sleeping";
+    default:
+      return "stopped";
+  }
+}
+function toView(info) {
+  const view = {
+    name: info.name,
+    transport: info.transport,
+    // A dormant lazy server is "asleep", not stopped — preserve that even when
+    // it's enabled in config.
+    status: info.status === "dormant" ? "sleeping" : info.enabled === false ? "stopped" : mapStatus(info.status),
+    enabled: info.enabled,
+    tools: info.tools
+  };
+  if (info.description !== void 0) view.description = info.description;
+  if (info.lazy !== void 0) view.lazy = info.lazy;
+  return view;
+}
+function deps(ws, globalConfigPath, registry) {
+  if (!registry || !globalConfigPath) {
+    send(ws, {
+      type: "mcp.operation_result",
+      payload: { success: false, message: "MCP registry is not available in this session." }
+    });
+    return null;
+  }
+  return { configPath: globalConfigPath, registry, presets: allServers() };
+}
+function name(msg) {
+  return msg.payload?.name ?? "";
+}
+async function handleMcpList(ws, _msg, globalConfigPath, mcpRegistry) {
+  if (!mcpRegistry || !globalConfigPath) {
+    send(ws, { type: "mcp.list", payload: { servers: [] } });
+    return;
+  }
+  const servers = await listMcp({
+    configPath: globalConfigPath,
+    registry: mcpRegistry,
+    presets: allServers()
+  });
+  send(ws, { type: "mcp.list", payload: { servers: servers.map(toView) } });
+}
+async function handleMcpAdd(ws, msg, globalConfigPath, mcpRegistry) {
+  const d = deps(ws, globalConfigPath, mcpRegistry);
+  if (!d) return;
+  const result = await addMcp(msg.payload, d);
+  if (result.ok && result.server) {
+    send(ws, { type: "mcp.server.added", payload: { server: toView(result.server) } });
+    if (result.registryError) {
+      send(ws, {
+        type: "mcp.server.error",
+        payload: { name: result.server.name, error: result.registryError }
+      });
+    } else if (result.server.enabled) {
+      send(ws, { type: "mcp.server.connected", payload: { name: result.server.name } });
+    }
+  }
+  send(ws, {
+    type: "mcp.operation_result",
+    payload: { success: result.ok, message: result.message }
+  });
+}
+async function handleMcpUpdate(ws, msg, globalConfigPath, mcpRegistry) {
+  const d = deps(ws, globalConfigPath, mcpRegistry);
+  if (!d) return;
+  const result = await updateMcp(msg.payload, d);
+  if (result.ok && result.server) {
+    send(ws, { type: "mcp.server.updated", payload: { server: toView(result.server) } });
+  }
+  send(ws, {
+    type: "mcp.operation_result",
+    payload: { success: result.ok, message: result.message }
+  });
+}
+async function handleMcpRemove(ws, msg, globalConfigPath, mcpRegistry) {
+  const d = deps(ws, globalConfigPath, mcpRegistry);
+  if (!d) return;
+  const result = await removeMcp(name(msg), d);
+  if (result.ok) {
+    send(ws, { type: "mcp.server.removed", payload: { name: name(msg) } });
+  }
+  send(ws, {
+    type: "mcp.operation_result",
+    payload: { success: result.ok, message: result.message }
+  });
+}
+async function handleMcpEnable(ws, msg, globalConfigPath, mcpRegistry) {
+  const d = deps(ws, globalConfigPath, mcpRegistry);
+  if (!d) return;
+  const result = await enableMcp(name(msg), d);
+  if (result.ok && result.server) {
+    send(ws, { type: "mcp.server.updated", payload: { server: toView(result.server) } });
+    if (result.registryError) {
+      send(ws, {
+        type: "mcp.server.error",
+        payload: { name: name(msg), error: result.registryError }
+      });
+    } else {
+      send(ws, { type: "mcp.server.connected", payload: { name: name(msg) } });
+    }
+  }
+  send(ws, {
+    type: "mcp.operation_result",
+    payload: { success: result.ok, message: result.message }
+  });
+}
+async function handleMcpDisable(ws, msg, globalConfigPath, mcpRegistry) {
+  const d = deps(ws, globalConfigPath, mcpRegistry);
+  if (!d) return;
+  const result = await disableMcp(name(msg), d);
+  if (result.ok) {
+    send(ws, { type: "mcp.server.sleeping", payload: { name: name(msg) } });
+    if (result.server) {
+      send(ws, { type: "mcp.server.updated", payload: { server: toView(result.server) } });
+    }
+  }
+  send(ws, {
+    type: "mcp.operation_result",
+    payload: { success: result.ok, message: result.message }
+  });
+}
+async function handleMcpSleep(ws, msg, globalConfigPath, mcpRegistry) {
+  const d = deps(ws, globalConfigPath, mcpRegistry);
+  if (!d) return;
+  try {
+    await d.registry.stop(name(msg));
+    send(ws, { type: "mcp.server.sleeping", payload: { name: name(msg) } });
+    send(ws, {
+      type: "mcp.operation_result",
+      payload: { success: true, message: `Server "${name(msg)}" stopped` }
+    });
+  } catch (err) {
+    const error = err instanceof Error ? err.message : String(err);
+    send(ws, { type: "mcp.server.error", payload: { name: name(msg), error } });
+    send(ws, {
+      type: "mcp.operation_result",
+      payload: { success: false, message: `Failed to stop "${name(msg)}": ${error}` }
+    });
+  }
+}
+async function handleMcpWake(ws, msg, globalConfigPath, mcpRegistry) {
+  const d = deps(ws, globalConfigPath, mcpRegistry);
+  if (!d) return;
+  send(ws, { type: "mcp.server.waking", payload: { name: name(msg) } });
+  const result = await restartMcp(name(msg), d);
+  if (result.ok && !result.registryError) {
+    send(ws, { type: "mcp.server.connected", payload: { name: name(msg) } });
+  } else if (result.registryError) {
+    send(ws, {
+      type: "mcp.server.error",
+      payload: { name: name(msg), error: result.registryError }
+    });
+  }
+  send(ws, {
+    type: "mcp.operation_result",
+    payload: { success: result.ok, message: result.message }
+  });
+}
+async function handleMcpRestart(ws, msg, globalConfigPath, mcpRegistry) {
+  const d = deps(ws, globalConfigPath, mcpRegistry);
+  if (!d) return;
+  const result = await restartMcp(name(msg), d);
+  if (result.ok && !result.registryError) {
+    send(ws, { type: "mcp.server.connected", payload: { name: name(msg) } });
+  } else if (result.registryError) {
+    send(ws, {
+      type: "mcp.server.error",
+      payload: { name: name(msg), error: result.registryError }
+    });
+  }
+  send(ws, {
+    type: "mcp.operation_result",
+    payload: { success: result.ok, message: result.message }
+  });
+}
+async function handleMcpDiscover(ws, msg, globalConfigPath, mcpRegistry) {
+  const d = deps(ws, globalConfigPath, mcpRegistry);
+  if (!d) return;
+  const result = await discoverMcp(name(msg), d);
+  if (result.ok) {
+    send(ws, {
+      type: "mcp.server.discovered",
+      payload: { name: name(msg), tools: result.tools ?? [] }
+    });
+  }
+  send(ws, {
+    type: "mcp.operation_result",
+    payload: { success: result.ok, message: result.message }
+  });
+}
+
 // src/server/index.ts
 import {
   Agent,
@@ -581,12 +1391,14 @@ import {
   repairToolUseAdjacency,
   resolveContextWindowPolicy,
   enhanceUserPrompt,
-  recentTextTurns
+  recentTextTurns,
+  resolveProviderModelList
 } from "@wrongstack/core";
 import { ToolExecutor } from "@wrongstack/core/execution";
 import { decryptConfigSecrets as decryptConfigSecrets2, encryptConfigSecrets as encryptConfigSecrets2 } from "@wrongstack/core/security";
 import { buildProviderFactoriesFromRegistry, makeProviderFromConfig } from "@wrongstack/providers";
 import { builtinToolsPack, forgetTool, rememberTool, searchMemoryTool, relatedMemoryTool } from "@wrongstack/tools";
+import { MCPRegistry } from "@wrongstack/mcp";
 import { WebSocketServer } from "ws";
 
 // ../runtime/src/container.ts
@@ -1833,9 +2645,9 @@ var WorktreeWebSocketHandler = class {
 
 // src/server/mailbox-handlers.ts
 import { GlobalMailbox, resolveProjectDir } from "@wrongstack/core";
-async function handleMailboxMessages(ws, deps, payload) {
+async function handleMailboxMessages(ws, deps2, payload) {
   try {
-    const dir = resolveProjectDir(deps.projectRoot, deps.globalRoot);
+    const dir = resolveProjectDir(deps2.projectRoot, deps2.globalRoot);
     const mb = new GlobalMailbox(dir);
     const messages = await mb.query({
       limit: payload?.limit ?? 30,
@@ -1869,9 +2681,9 @@ async function handleMailboxMessages(ws, deps, payload) {
     send(ws, { type: "mailbox.messages", payload: { messages: [], error: errMessage(err) } });
   }
 }
-async function handleMailboxAgents(ws, deps, payload) {
+async function handleMailboxAgents(ws, deps2, payload) {
   try {
-    const dir = resolveProjectDir(deps.projectRoot, deps.globalRoot);
+    const dir = resolveProjectDir(deps2.projectRoot, deps2.globalRoot);
     const mb = new GlobalMailbox(dir);
     const agents = payload?.onlineOnly ? await mb.getOnlineAgents() : await mb.getAgentStatuses();
     send(ws, {
@@ -1898,9 +2710,9 @@ async function handleMailboxAgents(ws, deps, payload) {
     send(ws, { type: "mailbox.agents", payload: { agents: [], error: errMessage(err) } });
   }
 }
-async function handleMailboxClear(ws, deps) {
+async function handleMailboxClear(ws, deps2) {
   try {
-    const dir = resolveProjectDir(deps.projectRoot, deps.globalRoot);
+    const dir = resolveProjectDir(deps2.projectRoot, deps2.globalRoot);
     const mb = new GlobalMailbox(dir);
     await mb.clearAll();
     send(ws, { type: "mailbox.cleared", payload: {} });
@@ -1908,9 +2720,9 @@ async function handleMailboxClear(ws, deps) {
     send(ws, { type: "mailbox.cleared", payload: { error: errMessage(err) } });
   }
 }
-async function handleMailboxPurge(ws, deps, opts) {
+async function handleMailboxPurge(ws, deps2, opts) {
   try {
-    const dir = resolveProjectDir(deps.projectRoot, deps.globalRoot);
+    const dir = resolveProjectDir(deps2.projectRoot, deps2.globalRoot);
     const mb = new GlobalMailbox(dir);
     const result = await mb.purgeStale(opts);
     send(ws, { type: "mailbox.purged", payload: result });
@@ -2201,7 +3013,7 @@ function writeKeysBack(cfg, keys) {
   }
   cfg.apiKeys = keys;
   const active = keys.find((k) => k.label === cfg.activeKey) ?? expectDefined(keys[0]);
-  cfg.apiKey = active.apiKey;
+  delete cfg.apiKey;
   if (!cfg.activeKey || !keys.some((k) => k.label === cfg.activeKey)) {
     cfg.activeKey = active.label;
   }
@@ -2300,9 +3112,9 @@ function projectSavedProviders(providers) {
   });
 }
 var probeScrubber = new DefaultSecretScrubber2();
-function createProviderHandlers(deps) {
-  const { globalConfigPath, vault, broadcast: broadcast2, clients } = deps;
-  let configWriteLock = deps.getConfigWriteLock();
+function createProviderHandlers(deps2) {
+  const { globalConfigPath, vault, broadcast: broadcast2, clients } = deps2;
+  let configWriteLock = deps2.getConfigWriteLock();
   async function loadConfigProviders() {
     return loadSavedProviders(globalConfigPath, vault);
   }
@@ -2317,7 +3129,7 @@ function createProviderHandlers(deps) {
       }));
     });
     configWriteLock = next;
-    deps.setConfigWriteLock(next);
+    deps2.setConfigWriteLock(next);
     await next;
   }
   async function handleKeyUpsert(ws, providerId, label, apiKey) {
@@ -2325,9 +3137,9 @@ function createProviderHandlers(deps) {
       const providers = await loadConfigProviders();
       const result = upsertKey(providers, providerId, label, apiKey, (/* @__PURE__ */ new Date()).toISOString());
       if (result.ok) await saveConfigProviders(providers);
-      sendResult(ws, result.ok, result.message);
+      sendResult2(ws, result.ok, result.message);
     } catch (err) {
-      sendResult(ws, false, errMessage(err));
+      sendResult2(ws, false, errMessage(err));
     }
   }
   async function handleKeyDelete(ws, providerId, label) {
@@ -2335,9 +3147,9 @@ function createProviderHandlers(deps) {
       const providers = await loadConfigProviders();
       const result = deleteKey(providers, providerId, label);
       if (result.ok) await saveConfigProviders(providers);
-      sendResult(ws, result.ok, result.message);
+      sendResult2(ws, result.ok, result.message);
     } catch (err) {
-      sendResult(ws, false, errMessage(err));
+      sendResult2(ws, false, errMessage(err));
     }
   }
   async function handleKeySetActive(ws, providerId, label) {
@@ -2345,9 +3157,9 @@ function createProviderHandlers(deps) {
       const providers = await loadConfigProviders();
       const result = setActiveKey(providers, providerId, label);
       if (result.ok) await saveConfigProviders(providers);
-      sendResult(ws, result.ok, result.message);
+      sendResult2(ws, result.ok, result.message);
     } catch (err) {
-      sendResult(ws, false, errMessage(err));
+      sendResult2(ws, false, errMessage(err));
     }
   }
   async function handleProviderAdd(ws, payload) {
@@ -2355,13 +3167,13 @@ function createProviderHandlers(deps) {
       const providers = await loadConfigProviders();
       const result = addProvider(providers, payload, (/* @__PURE__ */ new Date()).toISOString());
       if (result.ok) await saveConfigProviders(providers);
-      sendResult(ws, result.ok, result.message);
+      sendResult2(ws, result.ok, result.message);
       if (result.ok) {
         console.log(`[WebUI] Provider "${payload.id}" added via provider.add`);
         broadcastSaved(providers);
       }
     } catch (err) {
-      sendResult(ws, false, errMessage(err));
+      sendResult2(ws, false, errMessage(err));
     }
   }
   async function handleProviderRemove(ws, providerId) {
@@ -2369,9 +3181,9 @@ function createProviderHandlers(deps) {
       const providers = await loadConfigProviders();
       const result = removeProvider(providers, providerId);
       if (result.ok) await saveConfigProviders(providers);
-      sendResult(ws, result.ok, result.message);
+      sendResult2(ws, result.ok, result.message);
     } catch (err) {
-      sendResult(ws, false, errMessage(err));
+      sendResult2(ws, false, errMessage(err));
     }
   }
   function broadcastSaved(providers) {
@@ -2385,15 +3197,15 @@ function createProviderHandlers(deps) {
       const providers = await loadConfigProviders();
       const cfg = providers[providerId];
       if (!cfg) {
-        sendResult(ws, false, `Unknown provider "${providerId}"`);
+        sendResult2(ws, false, `Unknown provider "${providerId}"`);
         return;
       }
       delete cfg.models;
       await saveConfigProviders(providers);
-      sendResult(ws, true, `Cleared model allowlist for ${providerId}`);
+      sendResult2(ws, true, `Cleared model allowlist for ${providerId}`);
       broadcastSaved(providers);
     } catch (err) {
-      sendResult(ws, false, errMessage(err));
+      sendResult2(ws, false, errMessage(err));
     }
   }
   async function handleProviderUndoClear(ws, providerId, previousModels) {
@@ -2401,15 +3213,15 @@ function createProviderHandlers(deps) {
       const providers = await loadConfigProviders();
       const cfg = providers[providerId];
       if (!cfg) {
-        sendResult(ws, false, `Unknown provider "${providerId}"`);
+        sendResult2(ws, false, `Unknown provider "${providerId}"`);
         return;
       }
       cfg.models = [...previousModels];
       await saveConfigProviders(providers);
-      sendResult(ws, true, `Restored ${previousModels.length} model(s) for ${providerId}`);
+      sendResult2(ws, true, `Restored ${previousModels.length} model(s) for ${providerId}`);
       broadcastSaved(providers);
     } catch (err) {
-      sendResult(ws, false, errMessage(err));
+      sendResult2(ws, false, errMessage(err));
     }
   }
   async function handleProviderUpdate(ws, payload) {
@@ -2417,7 +3229,7 @@ function createProviderHandlers(deps) {
       const providers = await loadConfigProviders();
       const cfg = providers[payload.id];
       if (!cfg) {
-        sendResult(ws, false, `Unknown provider "${payload.id}"`);
+        sendResult2(ws, false, `Unknown provider "${payload.id}"`);
         return;
       }
       if (payload.family !== void 0) cfg.family = payload.family;
@@ -2425,10 +3237,10 @@ function createProviderHandlers(deps) {
       if (payload.envVars !== void 0) cfg.envVars = payload.envVars;
       if (payload.models !== void 0) cfg.models = payload.models;
       await saveConfigProviders(providers);
-      sendResult(ws, true, `Updated ${payload.id}`);
+      sendResult2(ws, true, `Updated ${payload.id}`);
       broadcastSaved(providers);
     } catch (err) {
-      sendResult(ws, false, errMessage(err));
+      sendResult2(ws, false, errMessage(err));
     }
   }
   async function handleProviderProbe(ws, providerId, timeoutMs) {
@@ -2473,9 +3285,12 @@ function createProviderHandlers(deps) {
 }
 
 // src/server/setup-events.ts
+import * as fs5 from "fs/promises";
+import { watch as fsWatch } from "fs";
 import * as path5 from "path";
-function setupEvents(deps) {
-  const { events, broadcast: broadcast2, clients, config, context, pendingConfirms, globalConfigPath, sessionBridge } = deps;
+function setupEvents(deps2) {
+  const { events, broadcast: broadcast2, clients, config, context, pendingConfirms, globalConfigPath, sessionBridge, wpaths, watcherMetrics, onFleetBroadcaster } = deps2;
+  const disposers = [];
   events.on("iteration.started", (e) => {
     const maxIt = typeof context.meta["maxIterations"] === "number" ? context.meta["maxIterations"] : config.tools?.maxIterations ?? 100;
     broadcast2(clients, {
@@ -2506,7 +3321,11 @@ function setupEvents(deps) {
   events.on("tool.progress", (e) => {
     broadcast2(clients, {
       type: "tool.progress",
-      payload: { id: e.id, name: e.name, eventType: e.event.type, text: e.event.text }
+      // Nested `event` shape — the client handler reads `payload.event?.text`
+      // and early-returns on a falsy text, so a flat { eventType, text } payload
+      // makes live tool progress (bash streaming, partial_output, warnings)
+      // never render. Must match WSToolProgress and the CLI server.
+      payload: { id: e.id, name: e.name, event: { type: e.event.type, text: e.event.text, data: e.event.data } }
     });
     sessionBridge?.append({
       type: "tool_progress",
@@ -2672,20 +3491,165 @@ function setupEvents(deps) {
   events.onPattern("brain.*", (eventName, payload) => {
     broadcast2(clients, { type: "brain.event", payload: { event: eventName, ...payload } });
   });
+  events.on("client.status", async (e) => {
+    broadcast2(clients, { type: "client.status_update", payload: e });
+    if (wpaths?.projectStatus) {
+      try {
+        const statusFile = wpaths.projectStatus(e.projectHash);
+        const dir = path5.dirname(statusFile);
+        await fs5.mkdir(dir, { recursive: true });
+        await fs5.writeFile(statusFile, JSON.stringify(e, null, 2), "utf-8");
+      } catch (err) {
+        console.error("[setup-events] Failed to write status.json:", err);
+      }
+    }
+  });
+  if (wpaths?.projectStatus && wpaths.configDir) {
+    const projectsDir = path5.join(wpaths.configDir, "projects");
+    const knownProjectHashes = /* @__PURE__ */ new Set();
+    const debounceTimers = /* @__PURE__ */ new Map();
+    const DEBOUNCE_MS = 150;
+    const pendingStatuses = /* @__PURE__ */ new Map();
+    if (watcherMetrics) {
+      watcherMetrics.fileChangesDetected = 0;
+      watcherMetrics.filesProcessed = 0;
+      watcherMetrics.broadcastsSent = 0;
+      watcherMetrics.debounceResets = 0;
+      watcherMetrics.totalDebounceDelayMs = 0;
+      watcherMetrics.activeProjects = 0;
+      watcherMetrics.averageDebounceDelayMs = 0;
+      watcherMetrics.watcherActive = true;
+    }
+    const getAverageDebounceDelay = () => {
+      if (!watcherMetrics || watcherMetrics.broadcastsSent === 0) return 0;
+      return watcherMetrics.totalDebounceDelayMs / watcherMetrics.broadcastsSent;
+    };
+    const logWatcherMetrics = () => {
+      if (!watcherMetrics) return;
+      watcherMetrics.averageDebounceDelayMs = getAverageDebounceDelay();
+      console.log(
+        `[setup-events] File watcher stats: ${watcherMetrics.broadcastsSent} broadcasts, ${watcherMetrics.fileChangesDetected} file changes, ${watcherMetrics.debounceResets} debounce resets, avg delay: ${watcherMetrics.averageDebounceDelayMs.toFixed(1)}ms, ${watcherMetrics.activeProjects} active projects`
+      );
+    };
+    const metricsInterval = setInterval(logWatcherMetrics, 6e4);
+    const broadcastStatus = (projectHash2, statusData, actualDelayMs) => {
+      broadcast2(clients, { type: "client.status_update", payload: statusData });
+      if (watcherMetrics) {
+        watcherMetrics.broadcastsSent++;
+        watcherMetrics.totalDebounceDelayMs += actualDelayMs;
+        watcherMetrics.averageDebounceDelayMs = getAverageDebounceDelay();
+      }
+    };
+    const scheduleBroadcast = (projectHash2, statusData) => {
+      const now = Date.now();
+      const existing = pendingStatuses.get(projectHash2);
+      if (existing && watcherMetrics) {
+        watcherMetrics.debounceResets++;
+      }
+      pendingStatuses.set(projectHash2, {
+        data: statusData,
+        firstWriteAt: existing ? existing.firstWriteAt : now
+      });
+      const existingTimer = debounceTimers.get(projectHash2);
+      if (existingTimer) {
+        clearTimeout(existingTimer);
+      }
+      const timer = setTimeout(() => {
+        debounceTimers.delete(projectHash2);
+        const pending = pendingStatuses.get(projectHash2);
+        if (pending) {
+          const actualDelay = Date.now() - pending.firstWriteAt;
+          broadcastStatus(projectHash2, pending.data, actualDelay);
+          pendingStatuses.delete(projectHash2);
+        }
+      }, DEBOUNCE_MS);
+      debounceTimers.set(projectHash2, timer);
+    };
+    let watcher;
+    const startWatcher = async () => {
+      try {
+        await fs5.mkdir(projectsDir, { recursive: true });
+        watcher = fsWatch(projectsDir, { persistent: true, recursive: true }, async (eventType, filename) => {
+          if (eventType === "change") {
+            if (filename == null) return;
+            if (watcherMetrics) watcherMetrics.fileChangesDetected++;
+            const targetFile = path5.join(projectsDir, String(filename));
+            if (targetFile.endsWith("status.json")) {
+              const projectHash2 = path5.basename(path5.dirname(targetFile));
+              if (knownProjectHashes.size > 0 && !knownProjectHashes.has(projectHash2)) {
+                return;
+              }
+              if (watcherMetrics) watcherMetrics.filesProcessed++;
+              try {
+                const content = await fs5.readFile(targetFile, "utf-8");
+                const statusData = JSON.parse(content);
+                if (statusData.projectHash) {
+                  const hash = String(statusData.projectHash);
+                  if (!knownProjectHashes.has(hash)) {
+                    knownProjectHashes.add(hash);
+                    if (watcherMetrics) watcherMetrics.activeProjects = knownProjectHashes.size;
+                  }
+                }
+                scheduleBroadcast(projectHash2, statusData);
+              } catch {
+              }
+            }
+          }
+        });
+        console.log(`[setup-events] Watching ${projectsDir} for status.json changes (hash-filtered, debounced)`);
+      } catch (err) {
+        console.error("[setup-events] Failed to start status file watcher:", err);
+      }
+    };
+    events.on("client.status", (e) => {
+      if (e.projectHash) {
+        const hash = String(e.projectHash);
+        if (!knownProjectHashes.has(hash)) {
+          knownProjectHashes.add(hash);
+          if (watcherMetrics) watcherMetrics.activeProjects = knownProjectHashes.size;
+        }
+      }
+    });
+    startWatcher();
+    disposers.push(() => {
+      clearInterval(metricsInterval);
+      logWatcherMetrics();
+      if (watcherMetrics) watcherMetrics.watcherActive = false;
+      for (const [projectHash2, pending] of pendingStatuses) {
+        const timer = debounceTimers.get(projectHash2);
+        if (timer) {
+          clearTimeout(timer);
+          broadcastStatus(projectHash2, pending.data, 0);
+        }
+      }
+      for (const timer of debounceTimers.values()) {
+        clearTimeout(timer);
+      }
+      debounceTimers.clear();
+      pendingStatuses.clear();
+      if (watcher) {
+        watcher.close();
+        console.log("[setup-events] Closed status file watcher");
+      }
+    });
+  }
   const globalRoot = globalConfigPath ? path5.dirname(globalConfigPath) : void 0;
   if (globalRoot) {
-    const statusInterval = setInterval(async () => {
+    const broadcastSessions = async () => {
       try {
         const { SessionRegistry } = await import("@wrongstack/core");
         const registry = new SessionRegistry(globalRoot);
         const sessions = await registry.list();
-        const live = sessions.filter((s) => s.status !== "stale").map((s) => ({
+        const mySlug = sessions.find((s) => s.pid === process.pid)?.projectSlug;
+        const live = sessions.filter((s) => s.status !== "stale").filter((s) => mySlug ? s.projectSlug === mySlug : true).map((s) => ({
           sessionId: s.sessionId,
           projectName: s.projectName,
           projectSlug: s.projectSlug,
           projectRoot: s.projectRoot,
           workingDir: s.workingDir,
           gitBranch: s.gitBranch,
+          // Surface (tui/webui/cli) so Fleet HQ can label each live client node.
+          clientType: s.clientType,
           status: s.status,
           pid: s.pid,
           startedAt: s.startedAt,
@@ -2697,20 +3661,52 @@ function setupEvents(deps) {
             currentTool: a.currentTool,
             iterations: a.iterations,
             toolCalls: a.toolCalls,
+            costUsd: a.costUsd,
+            tokensIn: a.tokensIn,
+            tokensOut: a.tokensOut,
+            ctxPct: a.ctxPct,
+            model: a.model,
+            partialText: a.partialText,
             lastActivityAt: a.lastActivityAt
           }))
         }));
         broadcast2(clients, { type: "sessions.status_update", payload: { sessions: live } });
       } catch {
       }
-    }, 5e3);
+    };
+    onFleetBroadcaster?.(broadcastSessions);
+    const statusInterval = setInterval(() => void broadcastSessions(), 5e3);
     if (statusInterval.unref) statusInterval.unref();
+    disposers.push(() => clearInterval(statusInterval));
+    let regDebounce;
+    try {
+      const regWatcher = fsWatch(globalRoot, { persistent: false }, (_event, filename) => {
+        const name2 = filename ? String(filename) : "";
+        if (!name2.startsWith("session-registry.json") || name2.endsWith(".lock")) return;
+        if (regDebounce) clearTimeout(regDebounce);
+        regDebounce = setTimeout(() => void broadcastSessions(), 150);
+      });
+      disposers.push(() => {
+        if (regDebounce) clearTimeout(regDebounce);
+        regWatcher.close();
+      });
+    } catch {
+    }
+    void broadcastSessions();
   }
+  return () => {
+    for (const dispose of disposers) {
+      try {
+        dispose();
+      } catch {
+      }
+    }
+  };
 }
 
 // src/server/custom-context-modes.ts
 import { listContextWindowModes, atomicWrite as atomicWrite4 } from "@wrongstack/core";
-import * as fs5 from "fs/promises";
+import * as fs6 from "fs/promises";
 import * as path6 from "path";
 var STORE_FILENAME = "custom-context-modes.json";
 function storePath(wrongstackDir) {
@@ -2722,7 +3718,7 @@ function createCustomModeStore(wrongstackDir) {
   const load2 = async () => {
     modes.clear();
     try {
-      const raw = await fs5.readFile(storePath(wrongstackDir), "utf8");
+      const raw = await fs6.readFile(storePath(wrongstackDir), "utf8");
       const parsed = JSON.parse(raw);
       if (Array.isArray(parsed.modes)) {
         for (const m of parsed.modes) {
@@ -2902,14 +3898,14 @@ function createEternalSubscription(subscribe, broadcast2, clientsRef) {
 }
 
 // src/server/shell-open.ts
-import * as fs6 from "fs/promises";
+import * as fs7 from "fs/promises";
 import * as path7 from "path";
 import { spawn as spawn2 } from "child_process";
 var METACHAR_REGEX = /[&|<>^"'`\n\r]/;
 async function handleShellOpen(req, logger) {
   try {
     const resolved = path7.resolve(req.path);
-    await fs6.access(resolved);
+    await fs7.access(resolved);
     if (METACHAR_REGEX.test(resolved)) {
       return { success: false, message: "Path contains unsupported characters." };
     }
@@ -2946,15 +3942,190 @@ async function handleShellOpen(req, logger) {
           )
         );
       }
-    } else {
-      return { success: false, message: `Unknown shell.open target: ${String(req.target)}` };
+    } else {
+      return { success: false, message: `Unknown shell.open target: ${String(req.target)}` };
+    }
+    return { success: true, message: `Opened ${req.target} at ${resolved}` };
+  } catch (err) {
+    return { success: false, message: err instanceof Error ? err.message : String(err) };
+  }
+}
+
+// src/server/git-handlers.ts
+async function handleGitInfo(ws, projectRoot) {
+  const cwd = projectRoot || void 0;
+  try {
+    const { execFile: ef } = await import("child_process");
+    const git = (args) => new Promise((resolve5) => {
+      ef("git", args, { cwd, timeout: 3e3 }, (err, stdout) => {
+        resolve5(err ? "" : stdout.trim());
+      });
+    });
+    const [branchRaw, diffRaw, statusRaw, upstreamRaw] = await Promise.all([
+      git(["branch", "--show-current"]),
+      git(["diff", "--stat"]),
+      git(["status", "--porcelain"]),
+      git(["rev-list", "--left-right", "--count", "@{upstream}...HEAD"])
+    ]);
+    const branch = branchRaw || "(detached)";
+    const addMatch = /(\d+)\s+insertion/i.exec(diffRaw);
+    const delMatch = /(\d+)\s+deletion/i.exec(diffRaw);
+    const added = addMatch ? Number(addMatch[1]) : 0;
+    const deleted = delMatch ? Number(delMatch[1]) : 0;
+    const untracked = statusRaw.split("\n").filter((l) => l.startsWith("??")).length;
+    const [behindRaw, aheadRaw] = (upstreamRaw || "0	0").split("	");
+    const behind = Number(behindRaw) || 0;
+    const ahead = Number(aheadRaw) || 0;
+    send(ws, { type: "git.info", payload: { branch, added, deleted, untracked, ahead, behind } });
+  } catch {
+    send(ws, { type: "git.info", payload: { branch: "", added: 0, deleted: 0, untracked: 0, ahead: 0, behind: 0 } });
+  }
+}
+function makeGit(cwd) {
+  return async (args) => {
+    const { execFile: ef } = await import("child_process");
+    return new Promise((resolve5) => {
+      ef(
+        "git",
+        args,
+        { cwd, timeout: 5e3, maxBuffer: 1024 * 1024 * 16 },
+        (err, stdout) => resolve5(err ? "" : stdout)
+      );
+    });
+  };
+}
+async function handleGitChanges(ws, projectRoot) {
+  const cwd = projectRoot || void 0;
+  try {
+    const git = makeGit(cwd);
+    const [statusRaw, unstagedNumstat, stagedNumstat] = await Promise.all([
+      git(["status", "--porcelain", "-z"]),
+      git(["diff", "--numstat", "-z"]),
+      git(["diff", "--cached", "--numstat", "-z"])
+    ]);
+    const counts = /* @__PURE__ */ new Map();
+    const parseNumstat = (raw) => {
+      const parts = raw.split("\0");
+      for (let i = 0; i < parts.length; i++) {
+        const entry = parts[i];
+        if (!entry) continue;
+        const m = /^(\d+|-)\t(\d+|-)\t(.*)$/.exec(entry);
+        if (!m) continue;
+        const added = m[1] === "-" ? 0 : Number(m[1]);
+        const deleted = m[2] === "-" ? 0 : Number(m[2]);
+        let path10 = m[3] ?? "";
+        if (path10 === "") {
+          i += 1;
+          path10 = parts[i + 1] ?? parts[i] ?? "";
+          i += 1;
+        }
+        if (!path10) continue;
+        const prev = counts.get(path10) ?? { added: 0, deleted: 0 };
+        counts.set(path10, { added: prev.added + added, deleted: prev.deleted + deleted });
+      }
+    };
+    parseNumstat(unstagedNumstat);
+    parseNumstat(stagedNumstat);
+    const records = statusRaw.split("\0").filter((r) => r.length > 0);
+    const files = [];
+    for (let i = 0; i < records.length; i++) {
+      const rec = records[i];
+      if (!rec || rec.length < 3) continue;
+      const x = rec[0] ?? " ";
+      const y = rec[1] ?? " ";
+      const path10 = rec.slice(3);
+      const isRename = x === "R" || x === "C" || y === "R" || y === "C";
+      if (isRename) i += 1;
+      let status;
+      if (x === "?" && y === "?") status = "?";
+      else if (x === "U" || y === "U" || x === "A" && y === "A" || x === "D" && y === "D") status = "U";
+      else if (x === "R" || y === "R") status = "R";
+      else if (x === "C" || y === "C") status = "C";
+      else if (x === "A" || y === "A") status = "A";
+      else if (x === "D" || y === "D") status = "D";
+      else status = "M";
+      const staged = x !== " " && x !== "?";
+      let added = counts.get(path10)?.added ?? 0;
+      let deleted = counts.get(path10)?.deleted ?? 0;
+      if (status === "?") {
+        added = await countUntrackedLines(cwd, path10);
+        deleted = 0;
+      }
+      files.push({ path: path10, status, added, deleted, staged });
     }
-    return { success: true, message: `Opened ${req.target} at ${resolved}` };
+    send(ws, { type: "git.changes", payload: { files } });
   } catch (err) {
-    return { success: false, message: err instanceof Error ? err.message : String(err) };
+    send(ws, {
+      type: "git.changes",
+      payload: { files: [], error: err instanceof Error ? err.message : String(err) }
+    });
+  }
+}
+async function countUntrackedLines(cwd, relPath) {
+  try {
+    const { readFile: readFile8 } = await import("fs/promises");
+    const { join: join8 } = await import("path");
+    const abs = cwd ? join8(cwd, relPath) : relPath;
+    const buf = await readFile8(abs);
+    if (buf.includes(0)) return 0;
+    if (buf.length === 0) return 0;
+    let lines = 0;
+    for (let i = 0; i < buf.length; i++) if (buf[i] === 10) lines++;
+    if (buf[buf.length - 1] !== 10) lines++;
+    return lines;
+  } catch {
+    return 0;
+  }
+}
+var MAX_DIFF_BYTES = 2 * 1024 * 1024;
+async function handleGitDiff(ws, projectRoot, path10) {
+  const cwd = projectRoot || void 0;
+  const reply = (extra) => send(ws, { type: "git.diff", payload: { path: path10, ...extra } });
+  if (!path10 || path10.includes("\0") || path10.includes("..")) {
+    reply({ oldText: "", newText: "", error: "invalid path" });
+    return;
+  }
+  try {
+    const git = makeGit(cwd);
+    const { readFile: readFile8 } = await import("fs/promises");
+    const { join: join8 } = await import("path");
+    const oldText = await git(["show", `HEAD:${path10}`]);
+    let newText = "";
+    try {
+      const abs = cwd ? join8(cwd, path10) : path10;
+      const buf = await readFile8(abs);
+      if (buf.includes(0)) {
+        reply({ oldText: "", newText: "", binary: true });
+        return;
+      }
+      if (buf.length > MAX_DIFF_BYTES) {
+        reply({ oldText: "", newText: "", tooLarge: true });
+        return;
+      }
+      newText = buf.toString("utf8");
+    } catch {
+      newText = "";
+    }
+    if ((oldText.length || 0) > MAX_DIFF_BYTES) {
+      reply({ oldText: "", newText: "", tooLarge: true });
+      return;
+    }
+    if (oldText.includes("\0")) {
+      reply({ oldText: "", newText: "", binary: true });
+      return;
+    }
+    reply({ oldText, newText });
+  } catch (err) {
+    reply({ oldText: "", newText: "", error: err instanceof Error ? err.message : String(err) });
   }
 }
 
+// src/server/skills-handlers.ts
+import { promises as fs8 } from "fs";
+import path8 from "path";
+import JSZip from "jszip";
+import { wstackGlobalRoot } from "@wrongstack/core/utils";
+
 // src/server/index.ts
 async function startWebUI(opts = {}) {
   const requestedWsPort = opts.wsPort ?? 3457;
@@ -3042,6 +4213,21 @@ async function startWebUI(opts = {}) {
   toolRegistry.register(makeMailSendTool({ projectDir: wpaths.projectDir, events }));
   toolRegistry.register(makeMailInboxTool({ projectDir: wpaths.projectDir, events }));
   console.log("[WebUI] Tool registry loaded:", toolRegistry.list().length, "tools");
+  const mcpRegistry = new MCPRegistry({
+    toolRegistry,
+    events,
+    log: logger,
+    // Lazy-connect (per-server `lazy`) manifest cache + default idle auto-sleep.
+    cacheDir: wpaths.cacheDir
+  });
+  if (config.features.mcp && config.mcpServers) {
+    for (const [name2, cfg] of Object.entries(config.mcpServers)) {
+      if (cfg.enabled === false) continue;
+      void mcpRegistry.start({ ...cfg, name: name2 }).catch((err) => {
+        logger.warn(`MCP server "${name2}" failed to start at boot`, err);
+      });
+    }
+  }
   let sessionStore = opts.services?.session ?? new DefaultSessionStore2({ dir: wpaths.projectSessions });
   if (!opts.services?.session) {
     sessionStore.prune(DEFAULT_SESSION_PRUNE_DAYS).then((count) => {
@@ -3069,15 +4255,22 @@ async function startWebUI(opts = {}) {
       sessionId: session.id,
       projectSlug: wpaths.projectSlug,
       projectRoot,
-      projectName: path8.basename(projectRoot),
+      projectName: path9.basename(projectRoot),
       workingDir,
+      clientType: "webui",
       pid: process.pid,
       startedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
-    statusTracker = new AgentStatusTracker({ events, registry });
+    const fleetNotifier = new FleetNotifier({
+      baseDir: wpaths.globalRoot,
+      projectRoot,
+      selfPid: process.pid
+    });
+    statusTracker = new AgentStatusTracker({ events, registry, onUpdate: () => fleetNotifier.notify() });
     statusTracker.start();
     const stopTracking = async () => {
       try {
+        fleetNotifier.dispose();
         await registry.markClosing();
         statusTracker?.stop();
       } catch {
@@ -3117,6 +4310,13 @@ async function startWebUI(opts = {}) {
     supportsReasoning: resolvedModel.capabilities.reasoning
   } : void 0;
   const skillLoader = config.features.skills ? new DefaultSkillLoader2({ paths: wpaths }) : void 0;
+  const skillInstaller = config.features.skills ? new SkillInstaller({
+    manifestPath: path9.join(wstackGlobalRoot2(), "installed-skills.json"),
+    projectSkillsDir: path9.join(projectRoot, ".wrongstack", "skills"),
+    globalSkillsDir: path9.join(wstackGlobalRoot2(), "skills"),
+    projectHash: projectHash(projectRoot),
+    skillLoader
+  }) : void 0;
   const systemPromptBuilder = new DefaultSystemPromptBuilder2({
     memoryStore,
     skillLoader,
@@ -3186,7 +4386,7 @@ async function startWebUI(opts = {}) {
       }
     } else {
       throw new Error(
-        "No provider configured. Run `wrongstack init` first, or configure via the WebUI."
+        "No provider configured. Run `wrongstack auth` to set up, or configure via the WebUI."
       );
     }
   }
@@ -3274,7 +4474,7 @@ async function startWebUI(opts = {}) {
     const write = async () => {
       let raw;
       try {
-        raw = await fs7.readFile(globalConfigPath, "utf8");
+        raw = await fs9.readFile(globalConfigPath, "utf8");
       } catch {
         raw = "{}";
       }
@@ -3583,7 +4783,7 @@ async function startWebUI(opts = {}) {
       inputCost,
       outputCost,
       cacheReadCost,
-      projectName: path8.basename(projectRoot) || projectRoot,
+      projectName: path9.basename(projectRoot) || projectRoot,
       projectRoot,
       cwd: workingDir,
       mode: modeId,
@@ -3637,10 +4837,11 @@ async function startWebUI(opts = {}) {
   const RATE_LIMIT_MESSAGES = Number.parseInt(process.env["WEBUI_RATE_LIMIT"] ?? "0", 10);
   const RATE_LIMIT_WINDOW_MS = 6e4;
   const rateLimits = /* @__PURE__ */ new Map();
-  function checkRateLimit(ws, client) {
+  let connSeq = 0;
+  function checkRateLimit(_ws, client) {
     if (RATE_LIMIT_MESSAGES <= 0) return true;
     const now = Date.now();
-    const key = client.sessionId ?? String(ws);
+    const key = client.connId;
     const limit = rateLimits.get(key);
     if (!limit || now > limit.resetAt) {
       rateLimits.set(key, { count: 1, resetAt: now + RATE_LIMIT_WINDOW_MS });
@@ -3656,7 +4857,12 @@ async function startWebUI(opts = {}) {
   );
   const pendingConfirms = /* @__PURE__ */ new Map();
   const handleConnection = (ws) => {
-    const client = { ws, sessionId: session.id, connectedAt: Date.now() };
+    const client = {
+      ws,
+      sessionId: session.id,
+      connectedAt: Date.now(),
+      connId: `c${++connSeq}`
+    };
     clients.set(ws, client);
     void sessionStartPayload().then((payload) => {
       send(ws, { type: "session.start", payload });
@@ -3686,7 +4892,7 @@ async function startWebUI(opts = {}) {
         const rawObj = JSON.parse(data.toString());
         if (typeof rawObj === "object" && rawObj !== null) {
           const obj = rawObj;
-          if ("__proto__" in obj || "constructor" in obj || "prototype" in obj) {
+          if (Object.hasOwn(obj, "__proto__") || Object.hasOwn(obj, "constructor") || Object.hasOwn(obj, "prototype")) {
             send(ws, {
               type: "error",
               payload: { phase: "parse", message: "Invalid message object" }
@@ -3707,8 +4913,9 @@ async function startWebUI(opts = {}) {
       }
     });
     ws.on("close", () => {
+      const closing = clients.get(ws);
       clients.delete(ws);
-      rateLimits.delete(String(ws));
+      if (closing) rateLimits.delete(closing.connId);
       if (pendingConfirms.size > 0) {
         for (const [id, resolve5] of pendingConfirms) {
           resolve5("no");
@@ -3734,11 +4941,27 @@ async function startWebUI(opts = {}) {
     { sampling: sessionLogging.sampling }
   );
   let eventsArmed = false;
+  let disposeEvents = null;
+  let fleetBroadcast = null;
   const armOnce = (label) => {
     if (eventsArmed) return;
     eventsArmed = true;
     console.log(`[WebUI] Backend ready (${label})`);
-    setupEvents({ events, broadcast, clients, config, context, pendingConfirms, globalConfigPath, sessionBridge });
+    disposeEvents = setupEvents({
+      events,
+      broadcast,
+      clients,
+      config,
+      context,
+      pendingConfirms,
+      globalConfigPath,
+      sessionBridge,
+      wpaths,
+      watcherMetrics,
+      onFleetBroadcaster: (fn) => {
+        fleetBroadcast = fn;
+      }
+    });
   };
   wssPrimary.on("listening", () => armOnce(`${wsHost}:${wsPort}`));
   wssPrimary.on("connection", handleConnection);
@@ -3775,33 +4998,33 @@ async function startWebUI(opts = {}) {
     });
   }
   async function touchProjectEntry(root, workDir) {
-    const resolved = path8.resolve(root);
+    const resolved = path9.resolve(root);
     const manifest = await loadManifest(globalConfigPath);
     const now = (/* @__PURE__ */ new Date()).toISOString();
-    const existing = manifest.projects.find((p) => path8.resolve(p.root) === resolved);
+    const existing = manifest.projects.find((p) => path9.resolve(p.root) === resolved);
     if (existing) {
       existing.lastSeen = now;
-      if (workDir) existing.lastWorkingDir = path8.resolve(workDir);
+      if (workDir) existing.lastWorkingDir = path9.resolve(workDir);
     } else {
       manifest.projects.push({
-        name: path8.basename(resolved),
+        name: path9.basename(resolved),
         root: resolved,
         slug: generateProjectSlug(resolved),
         createdAt: now,
         lastSeen: now,
-        lastWorkingDir: workDir ? path8.resolve(workDir) : void 0
+        lastWorkingDir: workDir ? path9.resolve(workDir) : void 0
       });
     }
     await saveManifest(manifest, globalConfigPath);
     await ensureProjectDataDir(generateProjectSlug(resolved), globalConfigPath);
   }
   function projectsJsonPath(globalConfigPath2) {
-    const base = path8.dirname(globalConfigPath2);
-    return path8.join(base, "projects.json");
+    const base = path9.dirname(globalConfigPath2);
+    return path9.join(base, "projects.json");
   }
   async function loadManifest(globalConfigPath2) {
     try {
-      const raw = await fs7.readFile(projectsJsonPath(globalConfigPath2), "utf8");
+      const raw = await fs9.readFile(projectsJsonPath(globalConfigPath2), "utf8");
       const parsed = JSON.parse(raw);
       return { projects: parsed.projects ?? [] };
     } catch {
@@ -3810,16 +5033,16 @@ async function startWebUI(opts = {}) {
   }
   async function saveManifest(manifest, globalConfigPath2) {
     const file = projectsJsonPath(globalConfigPath2);
-    await fs7.mkdir(path8.dirname(file), { recursive: true });
-    await fs7.writeFile(file, JSON.stringify(manifest, null, 2), "utf8");
+    await fs9.mkdir(path9.dirname(file), { recursive: true });
+    await fs9.writeFile(file, JSON.stringify(manifest, null, 2), "utf8");
   }
   function generateProjectSlug(rootPath) {
     return projectSlug(rootPath);
   }
   async function ensureProjectDataDir(slug, globalConfigPath2) {
-    const base = path8.dirname(globalConfigPath2);
-    const dir = path8.join(base, "projects", slug);
-    await fs7.mkdir(dir, { recursive: true });
+    const base = path9.dirname(globalConfigPath2);
+    const dir = path9.join(base, "projects", slug);
+    await fs9.mkdir(dir, { recursive: true });
     return dir;
   }
   async function handleMessage(ws, _client, msg) {
@@ -3929,7 +5152,7 @@ async function startWebUI(opts = {}) {
         context.readFiles.clear();
         context.fileMtimes.clear();
         tokenCounter.reset();
-        sendResult(ws, true, "Context cleared");
+        sendResult2(ws, true, "Context cleared");
         broadcast(clients, {
           type: "session.start",
           payload: { ...await sessionStartPayload(), reset: true }
@@ -3966,13 +5189,13 @@ async function startWebUI(opts = {}) {
               repaired: report.repaired
             }
           });
-          sendResult(
+          sendResult2(
             ws,
             true,
             `Compacted: ${report.before} \u2192 ${report.after} tokens (saved ~${Math.max(0, report.before - report.after)})`
           );
         } catch (err) {
-          sendResult(ws, false, errMessage(err));
+          sendResult2(ws, false, errMessage(err));
         }
         break;
       }
@@ -3991,7 +5214,7 @@ async function startWebUI(opts = {}) {
         };
         broadcast(clients, { type: "context.repaired", payload });
         const removed = payload.removedToolUses.length + payload.removedToolResults.length + payload.removedMessages;
-        sendResult(
+        sendResult2(
           ws,
           true,
           removed > 0 ? `Context repaired: removed ${removed} orphan protocol item(s)` : "Context repair found no orphan protocol blocks"
@@ -4025,14 +5248,14 @@ async function startWebUI(opts = {}) {
           );
           const custom = customModes.find((m) => m.id === id);
           if (!custom) {
-            sendResult(ws, false, `Unknown context mode "${id}"`);
+            sendResult2(ws, false, `Unknown context mode "${id}"`);
             break;
           }
           policy = custom;
         }
         context.meta["contextWindowMode"] = policy.id;
         context.meta["contextWindowPolicy"] = policy;
-        sendResult(ws, true, `Context mode switched to ${policy.id}`);
+        sendResult2(ws, true, `Context mode switched to ${policy.id}`);
         broadcast(clients, {
           type: "context.mode.changed",
           payload: { id: policy.id, name: policy.name, policy }
@@ -4052,7 +5275,7 @@ async function startWebUI(opts = {}) {
           aggressiveOn: "soft",
           targetLoad: 0.65
         });
-        sendResult(ws, result.ok, result.error ?? `Mode "${payload.id}" created`);
+        sendResult2(ws, result.ok, result.error ?? `Mode "${payload.id}" created`);
         break;
       }
       case "context.mode.update": {
@@ -4068,7 +5291,7 @@ async function startWebUI(opts = {}) {
           preserveK: payload.preserveK,
           eliseThreshold: payload.eliseThreshold
         });
-        sendResult(ws, result.ok, result.error ?? `Mode "${payload.id}" updated`);
+        sendResult2(ws, result.ok, result.error ?? `Mode "${payload.id}" updated`);
         break;
       }
       case "context.mode.delete": {
@@ -4078,7 +5301,7 @@ async function startWebUI(opts = {}) {
           context.meta["contextWindowPolicy"] = resolveContextWindowPolicy({}, DEFAULT_CONTEXT_WINDOW_MODE_ID);
         }
         const result = customModeStore.remove(id);
-        sendResult(ws, result.ok, result.error ?? `Mode "${id}" deleted`);
+        sendResult2(ws, result.ok, result.error ?? `Mode "${id}" deleted`);
         break;
       }
       case "providers.list": {
@@ -4125,27 +5348,17 @@ async function startWebUI(opts = {}) {
       }
       case "provider.models": {
         const providerId = msg.payload.providerId;
-        const provider2 = await modelsRegistry.getProvider(providerId);
-        if (provider2) {
-          send(ws, {
-            type: "provider.models",
-            payload: {
-              provider: providerId,
-              models: provider2.models.map((m) => ({
-                id: m.id,
-                name: m.name,
-                releaseDate: m.release_date,
-                contextWindow: m.limit?.context,
-                inputCost: m.cost?.input,
-                outputCost: m.cost?.output,
-                capabilities: [
-                  ...m.tool_call ? ["tools"] : [],
-                  ...m.reasoning ? ["reasoning"] : []
-                ]
-              }))
-            }
-          });
-        }
+        const saved = await providerHandlers.loadConfigProviders();
+        const cfg = saved[providerId];
+        const catalogId = cfg?.type && cfg.type !== providerId ? cfg.type : providerId;
+        const provider2 = await modelsRegistry.getProvider(catalogId);
+        send(ws, {
+          type: "provider.models",
+          payload: {
+            provider: providerId,
+            models: resolveProviderModelList(cfg?.models, provider2)
+          }
+        });
         break;
       }
       case "model.switch": {
@@ -4159,14 +5372,15 @@ async function startWebUI(opts = {}) {
           context.provider = newProv;
           updateAutoCompactionMaxContext?.(newProv);
           try {
-            configWriteLock = configWriteLock.then(async () => {
-              const raw = await fs7.readFile(globalConfigPath, "utf8");
+            const next = configWriteLock.then(async () => {
+              const raw = await fs9.readFile(globalConfigPath, "utf8");
               const parsed = JSON.parse(raw);
               parsed.provider = newProvider;
               parsed.model = newModel;
               await atomicWrite5(globalConfigPath, JSON.stringify(parsed, null, 2));
             });
-            await configWriteLock;
+            configWriteLock = next.then(() => void 0, () => void 0);
+            await next;
           } catch (err) {
             console.warn(JSON.stringify({
               level: "warn",
@@ -4319,13 +5533,13 @@ async function startWebUI(opts = {}) {
         const { id } = msg.payload;
         try {
           if (id === session.id) {
-            sendResult(ws, false, "Cannot delete the active session");
+            sendResult2(ws, false, "Cannot delete the active session");
             break;
           }
           await sessionStore.delete(id);
-          sendResult(ws, true, `Session ${id} deleted`);
+          sendResult2(ws, true, `Session ${id} deleted`);
         } catch (err) {
-          sendResult(ws, false, errMessage(err));
+          sendResult2(ws, false, errMessage(err));
         }
         break;
       }
@@ -4333,7 +5547,7 @@ async function startWebUI(opts = {}) {
         const { id } = msg.payload;
         try {
           if (id === session.id) {
-            sendResult(ws, false, "Session is already active");
+            sendResult2(ws, false, "Session is already active");
             break;
           }
           const resumed = await sessionStore.resume(id);
@@ -4363,14 +5577,14 @@ async function startWebUI(opts = {}) {
               replayUsage: resumed.data.usage
             }
           });
-          sendResult(ws, true, `Resumed session ${id}`);
+          sendResult2(ws, true, `Resumed session ${id}`);
         } catch (err) {
-          sendResult(ws, false, errMessage(err));
+          sendResult2(ws, false, errMessage(err));
         }
         break;
       }
       case "session.save": {
-        sendResult(ws, true, `Session ${session.id} is auto-saved`);
+        sendResult2(ws, true, `Session ${session.id} is auto-saved`);
         break;
       }
       case "tools.list": {
@@ -4393,6 +5607,28 @@ async function startWebUI(opts = {}) {
         return handleMemoryRemember(ws, msg, memoryStore);
       case "memory.forget":
         return handleMemoryForget(ws, msg, memoryStore);
+      // ── MCP operations — delegated to shared handlers (mcp-handlers.ts),
+      // backed by the live MCPRegistry constructed above. ──
+      case "mcp.list":
+        return handleMcpList(ws, msg, globalConfigPath, mcpRegistry);
+      case "mcp.add":
+        return handleMcpAdd(ws, msg, globalConfigPath, mcpRegistry);
+      case "mcp.remove":
+        return handleMcpRemove(ws, msg, globalConfigPath, mcpRegistry);
+      case "mcp.update":
+        return handleMcpUpdate(ws, msg, globalConfigPath, mcpRegistry);
+      case "mcp.wake":
+        return handleMcpWake(ws, msg, globalConfigPath, mcpRegistry);
+      case "mcp.sleep":
+        return handleMcpSleep(ws, msg, globalConfigPath, mcpRegistry);
+      case "mcp.discover":
+        return handleMcpDiscover(ws, msg, globalConfigPath, mcpRegistry);
+      case "mcp.enable":
+        return handleMcpEnable(ws, msg, globalConfigPath, mcpRegistry);
+      case "mcp.disable":
+        return handleMcpDisable(ws, msg, globalConfigPath, mcpRegistry);
+      case "mcp.restart":
+        return handleMcpRestart(ws, msg, globalConfigPath, mcpRegistry);
       case "skills.list": {
         if (!skillLoader) {
           send(ws, { type: "skills.list", payload: { skills: [], enabled: false } });
@@ -4402,6 +5638,18 @@ async function startWebUI(opts = {}) {
           const manifests = await skillLoader.list();
           const entries = await skillLoader.listEntries();
           const byName = new Map(entries.map((e) => [e.name, e]));
+          const sourceUrlsByName = /* @__PURE__ */ new Map();
+          const refsByName = /* @__PURE__ */ new Map();
+          if (skillInstaller) {
+            try {
+              const installed = await skillInstaller.listInstalled();
+              for (const entry of installed) {
+                sourceUrlsByName.set(entry.name, entry.source);
+                refsByName.set(entry.name, entry.ref);
+              }
+            } catch {
+            }
+          }
           send(ws, {
             type: "skills.list",
             payload: {
@@ -4411,6 +5659,8 @@ async function startWebUI(opts = {}) {
                 description: m.description,
                 version: m.version ?? "",
                 source: m.source,
+                sourceUrl: sourceUrlsByName.get(m.name) ?? "",
+                ref: refsByName.get(m.name) ?? "",
                 path: m.path,
                 trigger: byName.get(m.name)?.trigger ?? "",
                 scope: byName.get(m.name)?.scope ?? []
@@ -4429,6 +5679,261 @@ async function startWebUI(opts = {}) {
         }
         break;
       }
+      case "skills.content": {
+        if (!skillLoader) {
+          send(ws, { type: "skills.content", payload: { name: "", body: "", path: "", source: "", relatedFiles: [], references: [], error: "Skills not enabled" } });
+          break;
+        }
+        const contentPayload = msg.payload;
+        if (!contentPayload?.name) {
+          send(ws, { type: "skills.content", payload: { name: "", body: "", path: "", source: "", relatedFiles: [], references: [], error: "Skill name is required" } });
+          break;
+        }
+        try {
+          const { name: name2, source } = contentPayload;
+          const entries = await skillLoader.listEntries();
+          const entry = entries.find((e) => e.name.toLowerCase() === name2.toLowerCase());
+          if (!entry) {
+            send(ws, { type: "skills.content", payload: { name: name2, body: "", path: "", source, relatedFiles: [], references: [], error: `Skill "${name2}" not found` } });
+            break;
+          }
+          const body = await skillLoader.readBody(name2);
+          const skillDir = path9.dirname(entry.path);
+          let relatedFiles = [];
+          try {
+            const files = await fs9.readdir(skillDir);
+            relatedFiles = files.filter((f) => f !== path9.basename(entry.path)).map((f) => path9.join(skillDir, f));
+          } catch {
+          }
+          const refs = [];
+          for (const e of entries) {
+            if (e.name.toLowerCase() === name2.toLowerCase()) continue;
+            try {
+              const content = await skillLoader.readBody(e.name);
+              if (content.toLowerCase().includes(name2.toLowerCase())) {
+                refs.push(e.name);
+              }
+            } catch {
+            }
+          }
+          send(ws, { type: "skills.content", payload: { name: name2, body, path: entry.path, source, relatedFiles, references: refs } });
+        } catch (err) {
+          send(ws, { type: "skills.content", payload: { name: contentPayload.name, body: "", path: "", source: contentPayload.source, relatedFiles: [], references: [], error: errMessage(err) } });
+        }
+        break;
+      }
+      case "skills.install": {
+        if (!skillInstaller) {
+          send(ws, { type: "skills.installed", payload: { success: false, error: "Skills not enabled" } });
+          break;
+        }
+        const installPayload = msg.payload;
+        if (!installPayload?.ref?.trim()) {
+          send(ws, { type: "skills.installed", payload: { success: false, error: "Skill reference is required (e.g. owner/repo or https://github.com/owner/repo)" } });
+          break;
+        }
+        try {
+          const results = await skillInstaller.install(installPayload.ref.trim(), { global: installPayload.global });
+          send(ws, {
+            type: "skills.installed",
+            payload: {
+              success: true,
+              results,
+              error: null
+            }
+          });
+        } catch (err) {
+          send(ws, {
+            type: "skills.installed",
+            payload: {
+              success: false,
+              error: errMessage(err)
+            }
+          });
+        }
+        break;
+      }
+      case "skills.uninstall": {
+        if (!skillInstaller) {
+          send(ws, { type: "skills.uninstalled", payload: { success: false, error: "Skills not enabled" } });
+          break;
+        }
+        const uninstallPayload = msg.payload;
+        if (!uninstallPayload?.name?.trim()) {
+          send(ws, { type: "skills.uninstalled", payload: { success: false, error: "Skill name is required" } });
+          break;
+        }
+        try {
+          await skillInstaller.uninstall(uninstallPayload.name.trim(), { global: uninstallPayload.global });
+          send(ws, { type: "skills.uninstalled", payload: { success: true, error: null } });
+        } catch (err) {
+          send(ws, { type: "skills.uninstalled", payload: { success: false, error: errMessage(err) } });
+        }
+        break;
+      }
+      case "skills.update": {
+        if (!skillInstaller) {
+          send(ws, { type: "skills.updated", payload: { success: false, error: "Skills not enabled" } });
+          break;
+        }
+        const updatePayload = msg.payload;
+        try {
+          const result = await skillInstaller.update(updatePayload?.name, { global: updatePayload?.global });
+          send(ws, {
+            type: "skills.updated",
+            payload: {
+              success: true,
+              error: null,
+              updated: result.updated,
+              unchanged: result.unchanged,
+              errors: result.errors
+            }
+          });
+        } catch (err) {
+          send(ws, { type: "skills.updated", payload: { success: false, error: errMessage(err) } });
+        }
+        break;
+      }
+      case "skills.create": {
+        const createPayload = msg.payload;
+        if (!createPayload?.name?.trim()) {
+          send(ws, { type: "skills.created", payload: { success: false, error: "Skill name is required" } });
+          break;
+        }
+        if (!/^[a-z0-9]+(-[a-z0-9]+)*$/.test(createPayload.name.trim())) {
+          send(ws, { type: "skills.created", payload: { success: false, error: "Skill name must be kebab-case (e.g. my-new-skill)" } });
+          break;
+        }
+        if (!createPayload?.description?.trim()) {
+          send(ws, { type: "skills.created", payload: { success: false, error: "Description/trigger is required" } });
+          break;
+        }
+        try {
+          const targetDir = createPayload.scope === "global" ? path9.join(wstackGlobalRoot2(), "skills", createPayload.name.trim()) : path9.join(projectRoot, ".wrongstack", "skills", createPayload.name.trim());
+          try {
+            await fs9.access(targetDir);
+            send(ws, { type: "skills.created", payload: { success: false, error: `Skill "${createPayload.name}" already exists` } });
+            break;
+          } catch {
+          }
+          await fs9.mkdir(targetDir, { recursive: true });
+          const lines = createPayload.description.trim().split("\n");
+          const firstLine = lines[0].trim();
+          const bodyLines = lines.slice(1).map((l) => l.trim()).filter(Boolean);
+          const descriptionText = firstLine + (bodyLines.length > 0 ? `
+${bodyLines.join("\n")}` : "");
+          const trigger = bodyLines.find((l) => l.toLowerCase().startsWith("triggers:")) ?? "";
+          const skillContent = [
+            "---",
+            `name: ${createPayload.name.trim()}`,
+            "description: |",
+            `  ${descriptionText.replace(/\n/g, "\n  ")}`,
+            `version: 1.0.0`,
+            "---",
+            "",
+            `# ${createPayload.name.trim().split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ")}`,
+            "",
+            "## Overview",
+            "",
+            firstLine,
+            "",
+            ...bodyLines.length > 0 ? bodyLines.filter((l) => !l.toLowerCase().startsWith("triggers:")) : [],
+            "",
+            "## Rules",
+            "- TODO: add your first rule",
+            "",
+            "## Patterns",
+            "### Do",
+            "```ts",
+            "// TODO: add a good example",
+            "```",
+            "",
+            "### Don't",
+            "```ts",
+            "// TODO: add a bad example",
+            "```",
+            "",
+            "## Workflow",
+            "1. TODO: describe step one",
+            "2. TODO: describe step two",
+            "",
+            trigger ? `
+${trigger}
+` : "",
+            "## Skills in scope",
+            "- `bug-hunter` \u2014 for systematic bug detection patterns",
+            "- `output-standards` \u2014 for standardized `<next_steps>` formatting"
+          ].join("\n");
+          await fs9.writeFile(path9.join(targetDir, "SKILL.md"), skillContent, "utf-8");
+          send(ws, {
+            type: "skills.created",
+            payload: {
+              success: true,
+              error: null,
+              skill: { name: createPayload.name.trim(), path: path9.join(targetDir, "SKILL.md"), scope: createPayload.scope }
+            }
+          });
+        } catch (err) {
+          send(ws, { type: "skills.created", payload: { success: false, error: errMessage(err) } });
+        }
+        break;
+      }
+      case "skills.edit": {
+        if (!skillLoader) {
+          send(ws, { type: "skills.edited", payload: { success: false, error: "Skills not enabled" } });
+          break;
+        }
+        const editPayload = msg.payload;
+        if (!editPayload?.name?.trim()) {
+          send(ws, { type: "skills.edited", payload: { success: false, error: "Skill name is required" } });
+          break;
+        }
+        if (!editPayload?.body) {
+          send(ws, { type: "skills.edited", payload: { success: false, error: "Skill body is required" } });
+          break;
+        }
+        try {
+          const entries = await skillLoader.listEntries();
+          const entry = entries.find((e) => e.name.toLowerCase() === editPayload.name.toLowerCase());
+          if (!entry) {
+            send(ws, { type: "skills.edited", payload: { success: false, error: `Skill "${editPayload.name}" not found` } });
+            break;
+          }
+          if (entry.scope.includes("bundled")) {
+            send(ws, { type: "skills.edited", payload: { success: false, error: "Bundled skills cannot be edited" } });
+            break;
+          }
+          await fs9.writeFile(entry.path, editPayload.body, "utf-8");
+          send(ws, { type: "skills.edited", payload: { success: true, error: null } });
+        } catch (err) {
+          send(ws, { type: "skills.edited", payload: { success: false, error: errMessage(err) } });
+        }
+        break;
+      }
+      case "skills.export": {
+        if (!skillLoader) {
+          send(ws, { type: "skills.exported", payload: { zipBase64: "", skillCount: 0, error: "Skills not enabled" } });
+          break;
+        }
+        try {
+          const entries = await skillLoader.listEntries();
+          const zip = new JSZip2();
+          for (const entry of entries) {
+            try {
+              const body = await skillLoader.readBody(entry.name);
+              const safeName = entry.name.replace(/\//g, "_");
+              zip.file(`${safeName}/SKILL.md`, body);
+            } catch {
+            }
+          }
+          const zipBuffer = await zip.generateAsync({ type: "nodebuffer", compression: "DEFLATE" });
+          const zipBase64 = zipBuffer.toString("base64");
+          send(ws, { type: "skills.exported", payload: { zipBase64, skillCount: entries.length, error: void 0 } });
+        } catch (err) {
+          send(ws, { type: "skills.exported", payload: { zipBase64: "", skillCount: 0, error: errMessage(err) } });
+        }
+        break;
+      }
       case "diag.get": {
         const usage = tokenCounter.total();
         send(ws, {
@@ -4456,194 +5961,84 @@ async function startWebUI(opts = {}) {
         break;
       }
       case "todos.get": {
-        send(ws, {
-          type: "todos.updated",
-          payload: { todos: [...context.todos] }
-        });
+        const ctx = {
+          context: { todos: context.todos, meta: context.meta, session: context.session ? { id: context.session.id } : null, state: context.state },
+          send: (w, m) => send(w, m),
+          broadcast: (m) => broadcast(clients, m)
+        };
+        handleTodosGet(ctx, ws);
         break;
       }
       case "todos.clear": {
-        context.state.replaceTodos([]);
-        sendResult(ws, true, "Todos cleared");
-        broadcast(clients, { type: "todos.updated", payload: { todos: [] } });
+        const ctx = {
+          context: { todos: context.todos, meta: context.meta, session: context.session ? { id: context.session.id } : null, state: context.state },
+          send: (w, m) => send(w, m),
+          broadcast: (m) => broadcast(clients, m)
+        };
+        handleTodosClear(ctx, ws);
         break;
       }
       case "todos.remove": {
-        const payload = msg.payload;
-        if (!payload) {
-          sendResult(ws, false, "Missing id or index");
-          break;
-        }
-        const { id, index } = payload;
-        let targetIdx = -1;
-        if (typeof id === "string") {
-          targetIdx = context.todos.findIndex((t) => t.id === id);
-        } else if (typeof index === "number" && index > 0) {
-          targetIdx = index - 1;
-        }
-        if (targetIdx < 0 || !context.todos[targetIdx]) {
-          sendResult(ws, false, "Todo not found");
-          break;
-        }
-        const removed = expectDefined2(context.todos[targetIdx]);
-        const next = [...context.todos.slice(0, targetIdx), ...context.todos.slice(targetIdx + 1)];
-        context.state.replaceTodos(next);
-        sendResult(ws, true, `Removed: ${removed.content}`);
-        broadcast(clients, { type: "todos.updated", payload: { todos: next } });
+        const ctx = {
+          context: { todos: context.todos, meta: context.meta, session: context.session ? { id: context.session.id } : null, state: context.state },
+          send: (w, m) => send(w, m),
+          broadcast: (m) => broadcast(clients, m)
+        };
+        handleTodosRemove(ctx, ws, msg.payload);
         break;
       }
       case "tasks.get": {
-        const taskPath = context.meta["task.path"];
-        if (typeof taskPath === "string" && taskPath) {
-          try {
-            const { loadTasks } = await import("@wrongstack/core");
-            const file = await loadTasks(taskPath);
-            send(ws, {
-              type: "tasks.updated",
-              payload: { tasks: file?.tasks ?? [] }
-            });
-          } catch {
-            send(ws, { type: "tasks.updated", payload: { tasks: [] } });
-          }
-        } else {
-          send(ws, { type: "tasks.updated", payload: { tasks: [], error: "Task storage not configured." } });
-        }
+        const ctx = {
+          context: { todos: context.todos, meta: context.meta, session: context.session ? { id: context.session.id } : null, state: context.state },
+          send: (w, m) => send(w, m),
+          broadcast: (m) => broadcast(clients, m)
+        };
+        await handleTasksGet(ctx, ws);
         break;
       }
       case "plan.get": {
-        const planPath = context.meta["plan.path"];
-        if (typeof planPath === "string" && planPath) {
-          try {
-            const { loadPlan } = await import("@wrongstack/core");
-            const plan = await loadPlan(planPath);
-            send(ws, {
-              type: "plan.updated",
-              payload: {
-                plan: plan ?? {
-                  version: 1,
-                  sessionId: session.id,
-                  updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-                  items: []
-                }
-              }
-            });
-          } catch {
-            send(ws, {
-              type: "plan.updated",
-              payload: {
-                plan: {
-                  version: 1,
-                  sessionId: session.id,
-                  updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-                  items: []
-                }
-              }
-            });
-          }
-        } else {
-          send(ws, {
-            type: "plan.updated",
-            payload: { plan: null, error: "Plan storage is not configured for this session." }
-          });
-        }
+        const ctx = {
+          context: { todos: context.todos, meta: context.meta, session: context.session ? { id: context.session.id } : null, state: context.state },
+          send: (w, m) => send(w, m),
+          broadcast: (m) => broadcast(clients, m)
+        };
+        await handlePlanGet(ctx, ws);
         break;
       }
       case "plan.template_use": {
-        const { template } = msg.payload;
-        const planPath = context.meta["plan.path"];
-        if (typeof planPath !== "string" || !planPath) {
-          sendResult(ws, false, "Plan storage is not configured for this session.");
-          break;
-        }
-        try {
-          const { getPlanTemplate, loadPlan, savePlan, emptyPlan, addPlanItem } = await import("@wrongstack/core");
-          const tpl = getPlanTemplate(template);
-          if (!tpl) {
-            sendResult(ws, false, `Unknown template "${template}".`);
-            break;
-          }
-          let plan = await loadPlan(planPath) ?? emptyPlan(session.id);
-          for (const item of tpl.items) {
-            ({ plan } = addPlanItem(plan, item.title, item.details));
-          }
-          await savePlan(planPath, plan);
-          sendResult(ws, true, `Applied template "${tpl.name}" \u2014 ${tpl.items.length} items added.`);
-          broadcast(clients, {
-            type: "plan.updated",
-            payload: { plan }
-          });
-        } catch (err) {
-          sendResult(ws, false, errMessage(err));
-        }
+        const ctx = {
+          context: { todos: context.todos, meta: context.meta, session: context.session ? { id: context.session.id } : null, state: context.state },
+          send: (w, m) => send(w, m),
+          broadcast: (m) => broadcast(clients, m)
+        };
+        await handlePlanTemplateUse(ctx, ws, msg.payload.template);
         break;
       }
       case "todo.update": {
-        const payload = msg.payload;
-        const idx = context.todos.findIndex((t) => t.id === payload.id);
-        if (idx === -1) {
-          sendResult(ws, false, "Todo not found");
-          break;
-        }
-        const next = [...context.todos];
-        const existing = expectDefined2(next[idx]);
-        next[idx] = {
-          ...existing,
-          status: payload.status ?? existing.status,
-          activeForm: payload.activeForm !== void 0 ? payload.activeForm : existing.activeForm
+        const ctx = {
+          context: { todos: context.todos, meta: context.meta, session: context.session ? { id: context.session.id } : null, state: context.state },
+          send: (w, m) => send(w, m),
+          broadcast: (m) => broadcast(clients, m)
         };
-        context.state.replaceTodos(next);
-        sendResult(ws, true, `Todo "${existing.content}" updated`);
-        broadcast(clients, { type: "todos.updated", payload: { todos: next } });
+        handleTodoUpdate(ctx, ws, msg.payload);
         break;
       }
       case "task.update": {
-        const payload = msg.payload;
-        const taskPath = context.meta["task.path"];
-        if (typeof taskPath !== "string" || !taskPath) {
-          sendResult(ws, false, "Task storage not configured.");
-          break;
-        }
-        try {
-          const { mutateTasks } = await import("@wrongstack/core");
-          const file = await mutateTasks(taskPath, session.id, async (f) => {
-            const task = f.tasks.find((t) => t.id === payload.id);
-            if (!task) return f;
-            task.status = payload.status;
-            task.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-            return f;
-          });
-          sendResult(ws, true, `Task status updated to "${payload.status}".`);
-          broadcast(clients, { type: "tasks.updated", payload: { tasks: file.tasks } });
-        } catch (err) {
-          sendResult(ws, false, errMessage(err));
-        }
+        const ctx = {
+          context: { todos: context.todos, meta: context.meta, session: context.session ? { id: context.session.id } : null, state: context.state },
+          send: (w, m) => send(w, m),
+          broadcast: (m) => broadcast(clients, m)
+        };
+        await handleTaskUpdate(ctx, ws, msg.payload);
         break;
       }
       case "plan.item.update": {
-        const payload = msg.payload;
-        const planPath = context.meta["plan.path"];
-        if (typeof planPath !== "string" || !planPath) {
-          sendResult(ws, false, "Plan storage is not configured for this session.");
-          break;
-        }
-        try {
-          const { mutatePlan, setPlanItemStatus } = await import("@wrongstack/core");
-          let changed = false;
-          const plan = await mutatePlan(planPath, session.id, async (p) => {
-            const before = p.updatedAt;
-            const updated = setPlanItemStatus(p, payload.target, payload.status);
-            changed = updated.updatedAt !== before;
-            return updated;
-          });
-          if (!changed) {
-            sendResult(ws, false, `No plan item matched "${payload.target}".`);
-            break;
-          }
-          sendResult(ws, true, `Plan item status updated to "${payload.status}".`);
-          broadcast(clients, { type: "plan.updated", payload: { plan } });
-        } catch (err) {
-          sendResult(ws, false, errMessage(err));
-        }
+        const ctx = {
+          context: { todos: context.todos, meta: context.meta, session: context.session ? { id: context.session.id } : null, state: context.state },
+          send: (w, m) => send(w, m),
+          broadcast: (m) => broadcast(clients, m)
+        };
+        await handlePlanItemUpdate(ctx, ws, msg.payload);
         break;
       }
       // ── File operations — delegated to shared handlers (file-handlers.ts) ──
@@ -4713,13 +6108,13 @@ async function startWebUI(opts = {}) {
             provider: config.provider,
             model: config.model
           });
-          sendResult(ws, true, `Switched to mode "${id}"`);
+          sendResult2(ws, true, `Switched to mode "${id}"`);
           broadcast(clients, {
             type: "session.start",
             payload: { ...await sessionStartPayload() }
           });
         } catch (err) {
-          sendResult(ws, false, errMessage(err));
+          sendResult2(ws, false, errMessage(err));
         }
         break;
       }
@@ -4773,13 +6168,13 @@ async function startWebUI(opts = {}) {
           const { getProcessRegistry } = await import("@wrongstack/tools");
           const proc = getProcessRegistry().get(pid);
           if (proc?.protected) {
-            sendResult(ws, false, `Cannot kill protected process (PID ${pid})`);
+            sendResult2(ws, false, `Cannot kill protected process (PID ${pid})`);
             break;
           }
           getProcessRegistry().kill(pid);
-          sendResult(ws, true, `Killed PID ${pid}`);
+          sendResult2(ws, true, `Killed PID ${pid}`);
         } catch (err) {
-          sendResult(ws, false, errMessage(err));
+          sendResult2(ws, false, errMessage(err));
         }
         break;
       }
@@ -4787,47 +6182,33 @@ async function startWebUI(opts = {}) {
         try {
           const { getProcessRegistry } = await import("@wrongstack/tools");
           getProcessRegistry().killAll();
-          sendResult(ws, true, "All processes killed");
+          sendResult2(ws, true, "All processes killed");
         } catch (err) {
-          sendResult(ws, false, errMessage(err));
+          sendResult2(ws, false, errMessage(err));
         }
         break;
       }
       case "git.info": {
-        const cwd = projectRoot;
-        const execFile = (cmd, args) => new Promise((resolve5) => {
-          import("child_process").then(({ execFile: ef }) => {
-            ef(cmd, args, { cwd, timeout: 3e3 }, (err, stdout) => {
-              resolve5(err ? "" : stdout.trim());
-            });
-          });
-        });
-        const [branchRaw, diffRaw, statusRaw, upstreamRaw] = await Promise.all([
-          execFile("git", ["branch", "--show-current"]),
-          execFile("git", ["diff", "--stat"]),
-          execFile("git", ["status", "--porcelain"]),
-          execFile("git", ["rev-list", "--left-right", "--count", "@{upstream}...HEAD"])
-        ]);
-        const branch = branchRaw || "(detached)";
-        const diffMatch = /\+\s*(\d+)\s*deletion/i.exec(diffRaw);
-        const addMatch = /(\d+)\s*insertion/i.exec(diffRaw) ?? /(\d+)\s*addition/i.exec(diffRaw);
-        const delMatch = /\+\s*(\d+)\s*deletion/i.exec(diffRaw);
-        const added = addMatch ? Number(addMatch[1]) : 0;
-        const deleted = delMatch ? Number(delMatch[1]) : 0;
-        const untracked = statusRaw.split("\n").filter((l) => l.startsWith("??")).length;
-        const [aheadRaw, behindRaw] = (upstreamRaw || "0	0").split("	");
-        const ahead = Number(aheadRaw) || 0;
-        const behind = Number(behindRaw) || 0;
-        send(ws, {
-          type: "git.info",
-          payload: { branch, added, deleted, untracked, ahead, behind }
-        });
+        await handleGitInfo(ws, projectRoot);
+        break;
+      }
+      case "git.changes": {
+        await handleGitChanges(ws, projectRoot);
+        break;
+      }
+      case "git.diff": {
+        await handleGitDiff(ws, projectRoot, String(msg.payload?.path ?? ""));
+        break;
+      }
+      case "webui.shutdown": {
+        console.log("[WebUI] Shutdown requested from client");
+        process.kill(process.pid, "SIGINT");
         break;
       }
       case "goal.get": {
         try {
-          const goalPath = path8.join(projectRoot, ".wrongstack", "goal.json");
-          const raw = await fs7.readFile(goalPath, "utf8");
+          const goalPath = resolveWstackPaths({ projectRoot }).projectGoal;
+          const raw = await fs9.readFile(goalPath, "utf8");
           const goal = JSON.parse(raw);
           broadcast(clients, { type: "goal.updated", payload: goal });
         } catch {
@@ -4838,7 +6219,7 @@ async function startWebUI(opts = {}) {
       case "autonomy.switch": {
         const { mode } = msg.payload;
         context.meta["autonomy"] = mode;
-        sendResult(ws, true, `Autonomy mode set to "${mode}"`);
+        sendResult2(ws, true, `Autonomy mode set to "${mode}"`);
         broadcast(clients, { type: "prefs.updated", payload: { autonomy: mode } });
         void persistPrefsToConfig({ autonomy: mode });
         break;
@@ -4887,7 +6268,7 @@ async function startWebUI(opts = {}) {
         try {
           const { DefaultSessionRewinder } = await import("@wrongstack/core");
           const rewinder = new DefaultSessionRewinder(
-            path8.join(projectRoot, ".wrongstack", "sessions"),
+            path9.join(projectRoot, ".wrongstack", "sessions"),
             projectRoot
           );
           const checkpoints = await rewinder.listCheckpoints(session.id);
@@ -4908,18 +6289,18 @@ async function startWebUI(opts = {}) {
         try {
           const { DefaultSessionRewinder } = await import("@wrongstack/core");
           const rewinder = new DefaultSessionRewinder(
-            path8.join(projectRoot, ".wrongstack", "sessions"),
+            path9.join(projectRoot, ".wrongstack", "sessions"),
             projectRoot
           );
           await rewinder.rewindToCheckpoint(session.id, checkpointIndex);
           await context.session.truncateToCheckpoint(checkpointIndex);
-          sendResult(ws, true, `Rewound to checkpoint ${checkpointIndex}`);
+          sendResult2(ws, true, `Rewound to checkpoint ${checkpointIndex}`);
           broadcast(clients, {
             type: "session.start",
             payload: { ...await sessionStartPayload(), reset: true }
           });
         } catch (err) {
-          sendResult(ws, false, errMessage(err));
+          sendResult2(ws, false, errMessage(err));
         }
         break;
       }
@@ -4942,9 +6323,9 @@ async function startWebUI(opts = {}) {
       case "projects.add": {
         const { root: addRoot, name: displayName } = msg.payload;
         try {
-          const resolved = path8.resolve(addRoot);
-          await fs7.access(resolved);
-          const stat2 = await fs7.stat(resolved);
+          const resolved = path9.resolve(addRoot);
+          await fs9.access(resolved);
+          const stat2 = await fs9.stat(resolved);
           if (!stat2.isDirectory()) throw new Error(`Not a directory: ${resolved}`);
           const manifest = await loadManifest(globalConfigPath);
           const existing = manifest.projects.find((p) => p.root === resolved);
@@ -4960,26 +6341,26 @@ async function startWebUI(opts = {}) {
             });
             break;
           }
-          const name = displayName?.trim() || path8.basename(resolved);
+          const name2 = displayName?.trim() || path9.basename(resolved);
           const slug = generateProjectSlug(resolved);
           await ensureProjectDataDir(slug, globalConfigPath);
           const now = (/* @__PURE__ */ new Date()).toISOString();
-          manifest.projects.push({ name, root: resolved, slug, lastSeen: now, createdAt: now });
+          manifest.projects.push({ name: name2, root: resolved, slug, lastSeen: now, createdAt: now });
           await saveManifest(manifest, globalConfigPath);
           send(ws, {
             type: "projects.added",
             payload: {
-              name,
+              name: name2,
               root: resolved,
               slug,
-              message: `Registered project "${name}"`
+              message: `Registered project "${name2}"`
             }
           });
         } catch (err) {
           send(ws, {
             type: "projects.added",
             payload: {
-              name: path8.basename(addRoot),
+              name: path9.basename(addRoot),
               root: addRoot,
               slug: "",
               message: errMessage(err)
@@ -4991,17 +6372,17 @@ async function startWebUI(opts = {}) {
       case "projects.select": {
         const { root: selRoot, name: selName } = msg.payload;
         try {
-          const resolved = path8.resolve(selRoot);
+          const resolved = path9.resolve(selRoot);
           try {
-            await fs7.access(resolved);
-            const stat2 = await fs7.stat(resolved);
+            await fs9.access(resolved);
+            const stat2 = await fs9.stat(resolved);
             if (!stat2.isDirectory()) throw new Error(`Not a directory: ${resolved}`);
           } catch (err) {
             send(ws, {
               type: "projects.selected",
               payload: {
                 root: selRoot,
-                name: selName || path8.basename(selRoot),
+                name: selName || path9.basename(selRoot),
                 message: `Cannot switch: ${errMessage(err)}`
               }
             });
@@ -5013,10 +6394,10 @@ async function startWebUI(opts = {}) {
             entry.lastSeen = (/* @__PURE__ */ new Date()).toISOString();
             entry.lastWorkingDir = resolved;
           } else {
-            const name = selName?.trim() || path8.basename(resolved);
+            const name2 = selName?.trim() || path9.basename(resolved);
             const slug = generateProjectSlug(resolved);
             manifest.projects.push({
-              name,
+              name: name2,
               root: resolved,
               slug,
               lastSeen: (/* @__PURE__ */ new Date()).toISOString(),
@@ -5054,13 +6435,13 @@ async function startWebUI(opts = {}) {
             });
           } catch {
           }
-          const newSessionsDir = path8.join(
-            path8.dirname(globalConfigPath),
+          const newSessionsDir = path9.join(
+            path9.dirname(globalConfigPath),
             "projects",
             switchSlug,
             "sessions"
           );
-          await fs7.mkdir(newSessionsDir, { recursive: true });
+          await fs9.mkdir(newSessionsDir, { recursive: true });
           const newSessionStore = new DefaultSessionStore2({ dir: newSessionsDir });
           const oldSessionId = session.id;
           try {
@@ -5092,8 +6473,9 @@ async function startWebUI(opts = {}) {
               sessionId: session.id,
               projectSlug: switchSlug,
               projectRoot,
-              projectName: path8.basename(projectRoot),
+              projectName: path9.basename(projectRoot),
               workingDir,
+              clientType: "webui",
               pid: process.pid,
               startedAt: (/* @__PURE__ */ new Date()).toISOString()
             });
@@ -5103,8 +6485,8 @@ async function startWebUI(opts = {}) {
             type: "projects.selected",
             payload: {
               root: resolved,
-              name: selName || path8.basename(resolved),
-              message: `Switched to ${selName || path8.basename(resolved)}`
+              name: selName || path9.basename(resolved),
+              message: `Switched to ${selName || path9.basename(resolved)}`
             }
           });
           broadcast(clients, {
@@ -5127,7 +6509,7 @@ async function startWebUI(opts = {}) {
             type: "projects.selected",
             payload: {
               root: selRoot,
-              name: selName || path8.basename(selRoot),
+              name: selName || path9.basename(selRoot),
               message: errMessage(err)
             }
           });
@@ -5138,17 +6520,17 @@ async function startWebUI(opts = {}) {
       case "working_dir.set": {
         const { path: newPath } = msg.payload;
         try {
-          const resolved = path8.resolve(projectRoot, newPath);
-          if (!resolved.startsWith(projectRoot + path8.sep) && resolved !== projectRoot) {
-            sendResult(ws, false, `Path must stay inside the project root: ${projectRoot}`);
+          const resolved = path9.resolve(projectRoot, newPath);
+          if (!resolved.startsWith(projectRoot + path9.sep) && resolved !== projectRoot) {
+            sendResult2(ws, false, `Path must stay inside the project root: ${projectRoot}`);
             break;
           }
           try {
-            await fs7.access(resolved);
-            const stat2 = await fs7.stat(resolved);
+            await fs9.access(resolved);
+            const stat2 = await fs9.stat(resolved);
             if (!stat2.isDirectory()) throw new Error("Not a directory");
           } catch {
-            sendResult(ws, false, `Directory not found or not accessible: ${resolved}`);
+            sendResult2(ws, false, `Directory not found or not accessible: ${resolved}`);
             break;
           }
           workingDir = resolved;
@@ -5157,9 +6539,9 @@ async function startWebUI(opts = {}) {
             type: "working_dir.changed",
             payload: { cwd: resolved, projectRoot }
           });
-          sendResult(ws, true, `Working directory set to ${resolved}`);
+          sendResult2(ws, true, `Working directory set to ${resolved}`);
         } catch (err) {
-          sendResult(ws, false, errMessage(err));
+          sendResult2(ws, false, errMessage(err));
         }
         break;
       }
@@ -5169,31 +6551,31 @@ async function startWebUI(opts = {}) {
           msg.payload,
           logger
         );
-        sendResult(ws, result.success, result.message);
+        sendResult2(ws, result.success, result.message);
         break;
       }
       // ── Mailbox operations — project-level inter-agent messaging ────
       case "mailbox.messages":
         return handleMailboxMessages(
           ws,
-          { projectRoot, globalRoot: path8.dirname(globalConfigPath) },
+          { projectRoot, globalRoot: path9.dirname(globalConfigPath) },
           msg.payload
         );
       case "mailbox.agents":
         return handleMailboxAgents(
           ws,
-          { projectRoot, globalRoot: path8.dirname(globalConfigPath) },
+          { projectRoot, globalRoot: path9.dirname(globalConfigPath) },
           msg.payload
         );
       case "mailbox.clear":
         return handleMailboxClear(
           ws,
-          { projectRoot, globalRoot: path8.dirname(globalConfigPath) }
+          { projectRoot, globalRoot: path9.dirname(globalConfigPath) }
         );
       case "mailbox.purge":
         return handleMailboxPurge(
           ws,
-          { projectRoot, globalRoot: path8.dirname(globalConfigPath) },
+          { projectRoot, globalRoot: path9.dirname(globalConfigPath) },
           msg.payload
         );
       // ── Brain — status, autonomy ceiling, direct decision support ───
@@ -5207,7 +6589,7 @@ async function startWebUI(opts = {}) {
         const level = msg.payload?.level ?? "";
         const valid = ["off", "low", "medium", "high", "all"];
         if (!valid.includes(level)) {
-          sendResult(ws, false, `Unknown risk level "${level}". Use: ${valid.join(", ")}.`);
+          sendResult2(ws, false, `Unknown risk level "${level}". Use: ${valid.join(", ")}.`);
           break;
         }
         brainSettings.maxAutoRisk = level;
@@ -5220,7 +6602,7 @@ async function startWebUI(opts = {}) {
       case "brain.ask": {
         const question = msg.payload?.question?.trim();
         if (!question) {
-          sendResult(ws, false, "Usage: /brain ask <question>");
+          sendResult2(ws, false, "Usage: /brain ask <question>");
           break;
         }
         try {
@@ -5233,7 +6615,7 @@ async function startWebUI(opts = {}) {
           });
           send(ws, { type: "brain.answer", payload: { question, decision } });
         } catch (err) {
-          sendResult(ws, false, `Brain consultation failed: ${errMessage(err)}`);
+          sendResult2(ws, false, `Brain consultation failed: ${errMessage(err)}`);
         }
         break;
       }
@@ -5260,14 +6642,28 @@ async function startWebUI(opts = {}) {
     broadcast,
     clients
   });
+  const watcherMetrics = {
+    fileChangesDetected: 0,
+    filesProcessed: 0,
+    broadcastsSent: 0,
+    debounceResets: 0,
+    totalDebounceDelayMs: 0,
+    activeProjects: 0,
+    averageDebounceDelayMs: 0,
+    watcherActive: false
+  };
   const httpServer = createHttpServer({
     host: wsHost,
-    distDir: path8.resolve(import.meta.dirname, "../../dist"),
+    distDir: path9.resolve(import.meta.dirname, "../../dist"),
     wsPort,
     globalRoot: wpaths.globalRoot,
-    apiToken: wsToken
+    apiToken: wsToken,
+    watcherMetrics,
+    onFleetPing: () => {
+      void fleetBroadcast?.();
+    }
   });
-  const registryBaseDir = path8.dirname(globalConfigPath);
+  const registryBaseDir = path9.dirname(globalConfigPath);
   httpServer.listen(httpPort, wsHost, () => {
     const openUrl = `http://${wsHost}:${httpPort}`;
     console.log(`[WebUI] HTTP server running on ${openUrl}`);
@@ -5279,7 +6675,7 @@ async function startWebUI(opts = {}) {
         wsPort,
         host: wsHost,
         projectRoot,
-        projectName: path8.basename(projectRoot) || projectRoot,
+        projectName: path9.basename(projectRoot) || projectRoot,
         startedAt: (/* @__PURE__ */ new Date()).toISOString(),
         url: `http://${wsHost}:${httpPort}`
       },
@@ -5306,6 +6702,11 @@ async function startWebUI(opts = {}) {
     // reality. Crash exits are healed by the next register()/list() prune pass.
     onShutdown: () => {
       brainMonitor.stop();
+      void mcpRegistry.stopAll().catch(() => void 0);
+      if (disposeEvents) {
+        disposeEvents();
+        disposeEvents = null;
+      }
       if (eternalSubscription) {
         eternalSubscription.dispose();
         eternalSubscription = null;