@wrongstack/webui-server 0.299.0 → 0.300.0

package/dist/server/entry.js

@@ -77,6 +77,10 @@ var BOOLEAN_PREF_KEYS = /* @__PURE__ */ new Set([
   // Display-only toggles (purely visual, persisted in localStorage via Zustand).
   "groupToolCalls",
   "showThinkingLogs",
+  // v15: auto-collapse of the chat input under the history (opt-in display
+  // toggle, default off). Whitelisted so the key survives `prefs.update`
+  // round-trips without tripping the "unknown preference key" rejection.
+  "autoCollapseInput",
   // v11 Display parity: inverse fsAccess flag.
   "allowOutsideProjectRoot",
   // v13 Display parity (TUI SettingsPicker fields 42 & 43): the read tool
@@ -401,6 +405,51 @@ function validateModelSwitchPayload(payload) {
     }
   };
 }
+function validateModelFallbackChoicePayload(payload) {
+  if (!isRecord2(payload)) {
+    return {
+      ok: false,
+      message: "model.fallback_choice payload must be an object"
+    };
+  }
+  const requestId = payload["requestId"];
+  if (typeof requestId !== "string" || requestId.trim().length === 0) {
+    return {
+      ok: false,
+      message: "model.fallback_choice payload.requestId must be a non-empty string"
+    };
+  }
+  const providerId = payload["providerId"];
+  const model = payload["model"];
+  const autoSwitch = payload["autoSwitch"];
+  if (providerId !== void 0 && typeof providerId !== "string") {
+    return {
+      ok: false,
+      message: "model.fallback_choice payload.providerId must be a string when provided"
+    };
+  }
+  if (model !== void 0 && typeof model !== "string") {
+    return {
+      ok: false,
+      message: "model.fallback_choice payload.model must be a string when provided"
+    };
+  }
+  if (autoSwitch !== void 0 && typeof autoSwitch !== "boolean") {
+    return {
+      ok: false,
+      message: "model.fallback_choice payload.autoSwitch must be a boolean when provided"
+    };
+  }
+  return {
+    ok: true,
+    value: {
+      requestId: requestId.trim(),
+      ...typeof providerId === "string" ? { providerId } : {},
+      ...typeof model === "string" ? { model } : {},
+      ...typeof autoSwitch === "boolean" ? { autoSwitch } : {}
+    }
+  };
+}
 var AUTONOMY_VALUES2 = /* @__PURE__ */ new Set(["off", "suggest", "auto", "eternal", "eternal-parallel"]);
 function validateMailboxMessagesPayload(payload) {
   if (payload === void 0) return { ok: true, value: void 0 };
@@ -4331,13 +4380,10 @@ function createConversationOperations(ctx) {
 
 // src/server/context-editor.ts
 import { createHash } from "node:crypto";
-import net from "node:net";
 import {
   ALLOWED_IMAGE_MEDIA_TYPES,
   base64DecodedBytes,
   isAllowedImageMediaType,
-  isPrivateIPv4,
-  isPrivateIPv6,
   isValidImageBase64,
   MAX_INCOMING_IMAGE_BYTES,
   repairToolUseAdjacency
@@ -4405,40 +4451,7 @@ var REVISION_PREFIX = "wrongstack-context-editor-v1\0";
 var MAX_MESSAGE_COUNT_GROWTH = 10;
 var MAX_PAYLOAD_BYTES = 16 * 1024 * 1024;
 var MAX_STRING_LENGTH = 8 * 1024 * 1024;
-var MAX_IMAGE_URL_LENGTH = 2048;
-function imageUrlRejectionReason(url) {
-  if (url.length > MAX_IMAGE_URL_LENGTH) {
-    return `image.source.url exceeds ${MAX_IMAGE_URL_LENGTH} characters.`;
-  }
-  let parsed;
-  try {
-    parsed = new URL(url);
-  } catch {
-    return "image.source.url must be an absolute URL.";
-  }
-  if (parsed.protocol !== "https:") {
-    return `image.source.url must use https (got "${parsed.protocol}").`;
-  }
-  if (parsed.username !== "" || parsed.password !== "") {
-    return "image.source.url must not embed credentials.";
-  }
-  const host = parsed.hostname.startsWith("[") && parsed.hostname.endsWith("]") ? parsed.hostname.slice(1, -1) : parsed.hostname;
-  const bareHost = host.endsWith(".") ? host.slice(0, -1) : host;
-  if (bareHost === "") {
-    return "image.source.url must include a hostname.";
-  }
-  if (bareHost === "localhost" || bareHost.endsWith(".localhost")) {
-    return "image.source.url must not target localhost.";
-  }
-  const family = net.isIP(bareHost);
-  if (family === 4 && isPrivateIPv4(bareHost)) {
-    return `image.source.url must not target a private or loopback address ("${bareHost}").`;
-  }
-  if (family === 6 && isPrivateIPv6(bareHost)) {
-    return `image.source.url must not target a private or loopback address ("${bareHost}").`;
-  }
-  return void 0;
-}
+var MAX_REMOVAL_COUNT = 4096;
 function isRecord3(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -4447,7 +4460,7 @@ function canonicalize(value) {
   if (isRecord3(value)) {
     const sorted = {};
     for (const key of Object.keys(value).sort()) {
-      if (key === "_estTokens") continue;
+      if (key === "_estTokens" || key === "_toolErrorInfo") continue;
       const item = value[key];
       if (item === void 0) continue;
       sorted[key] = canonicalize(item);
@@ -4478,6 +4491,12 @@ function isMessageRole(value) {
 function isPlainJsonObject(value) {
   return isRecord3(value);
 }
+function splitsSurrogatePair(text, offset) {
+  if (offset <= 0 || offset >= text.length) return false;
+  const previous = text.charCodeAt(offset - 1);
+  const next = text.charCodeAt(offset);
+  return previous >= 55296 && previous <= 56319 && next >= 56320 && next <= 57343;
+}
 function validateCacheControl(value, path30, errors) {
   if (value === void 0) return void 0;
   if (!isRecord3(value) || value["type"] !== "ephemeral") {
@@ -4688,19 +4707,13 @@ function validateBlock(value, path30, errors) {
         );
         return void 0;
       }
-      const urlError = imageUrlRejectionReason(url);
-      if (urlError !== void 0) {
-        error(errors, `${path30}/source/url`, "UNSAFE_IMAGE_URL", urlError);
-        return void 0;
-      }
-      return {
-        type: "image",
-        source: {
-          type: "url",
-          ...typeof mediaType === "string" ? { media_type: mediaType } : {},
-          url
-        }
-      };
+      error(
+        errors,
+        `${path30}/source/url`,
+        "UNSAFE_IMAGE_URL",
+        "URL image sources are not allowed in context editor proposals; use an ingested base64 image."
+      );
+      return void 0;
     }
     case "thinking": {
       const thinking = value["thinking"];
@@ -4857,6 +4870,14 @@ function warningsForMessage(message, index) {
         message: "This block contains provider replay metadata and should only be removed with the whole turn if no longer needed."
       });
     }
+    if (block.type === "image" && block.source.type === "url") {
+      warnings.push({
+        path: `/messages/${index}/content/${blockIndex}/source/url`,
+        code: "UNSAFE_IMAGE_URL",
+        severity: "danger",
+        message: "URL image sources cannot be retained in context editor proposals; remove the whole message before applying other edits."
+      });
+    }
     if (block.type === "tool_result" && block.content.length > 2e4) {
       warnings.push({
         path: `/messages/${index}/content/${blockIndex}`,
@@ -4884,6 +4905,21 @@ function metricFor(ctx, messages, tools) {
     fullRequestTokens: breakdown.total
   };
 }
+function isToolResultMessage(message) {
+  return Boolean(
+    message?.role === "user" && Array.isArray(message.content) && message.content.length > 0 && message.content.every((block) => block.type === "tool_result")
+  );
+}
+function pairedAssistantIndices(messages, userIndex) {
+  if (messages[userIndex]?.role !== "user" || isToolResultMessage(messages[userIndex])) return [];
+  const paired = [];
+  for (let index = userIndex + 1; index < messages.length; index += 1) {
+    const message = messages[index];
+    if (message?.role === "user" && !isToolResultMessage(message)) break;
+    if (message?.role === "assistant") paired.push(index);
+  }
+  return paired;
+}
 function buildContextEditorSnapshot(ctx, tools) {
   const messages = ctx.messages.map(
     (message) => ({
@@ -4913,11 +4949,165 @@ function buildContextEditorSnapshot(ctx, tools) {
       tokens: messageTokens(message.content),
       preview: breakdown.messages.breakdown[index]?.preview ?? "",
       blockCount: Array.isArray(message.content) ? message.content.length : null,
-      warnings: warningsForMessage(message, index)
+      warnings: warningsForMessage(message, index),
+      pairedAssistantIndices: pairedAssistantIndices(ctx.messages, index)
     })),
     diagnostics: toolDiagnostics(ctx.messages)
   };
 }
+function validateRemovalPlan(value, originalMessages, proposedMessages) {
+  const errors = [];
+  if (value === void 0) {
+    error(
+      errors,
+      "/removals",
+      "REMOVAL_PLAN_REQUIRED",
+      "A removal plan is required for every context editor proposal."
+    );
+    return { errors };
+  }
+  if (!Array.isArray(value)) {
+    error(errors, "/removals", "INVALID_REMOVALS", "removals must be an array.");
+    return { errors };
+  }
+  if (value.length > MAX_REMOVAL_COUNT) {
+    error(
+      errors,
+      "/removals",
+      "TOO_MANY_REMOVALS",
+      `removals must contain at most ${MAX_REMOVAL_COUNT} entries.`
+    );
+    return { errors };
+  }
+  const wholeMessages = /* @__PURE__ */ new Set();
+  const touchedUsers = /* @__PURE__ */ new Set();
+  const ranges = [];
+  for (const [removalIndex, raw] of value.entries()) {
+    const path30 = `/removals/${removalIndex}`;
+    if (!isRecord3(raw) || !Number.isInteger(raw["messageIndex"])) {
+      error(errors, path30, "INVALID_REMOVAL", "Removal must include an integer messageIndex.");
+      continue;
+    }
+    const messageIndex = raw["messageIndex"];
+    const original = originalMessages[messageIndex];
+    if (!original) {
+      error(errors, `${path30}/messageIndex`, "INVALID_MESSAGE_INDEX", "Removal messageIndex is out of range.");
+      continue;
+    }
+    const start = raw["start"];
+    const end = raw["end"];
+    const blockIndex = raw["blockIndex"];
+    if (start === void 0 && end === void 0 && blockIndex === void 0) {
+      wholeMessages.add(messageIndex);
+      if (original.role === "user") touchedUsers.add(messageIndex);
+      continue;
+    }
+    if (!Number.isInteger(start) || !Number.isInteger(end) || start < 0 || end <= start) {
+      error(errors, path30, "INVALID_RANGE", "Range removal requires integer start/end with 0 <= start < end.");
+      continue;
+    }
+    let text;
+    if (blockIndex === void 0 && typeof original.content === "string") text = original.content;
+    if (Number.isInteger(blockIndex) && Array.isArray(original.content)) {
+      const block = original.content[blockIndex];
+      if (block?.type === "text") text = block.text;
+    }
+    if (text === void 0 || end > text.length) {
+      error(errors, path30, "INVALID_RANGE_TARGET", "Range must target existing string or text-block content.");
+      continue;
+    }
+    if (splitsSurrogatePair(text, start) || splitsSurrogatePair(text, end)) {
+      error(
+        errors,
+        path30,
+        "INVALID_UNICODE_RANGE",
+        "Range boundaries must not split a Unicode surrogate pair."
+      );
+      continue;
+    }
+    ranges.push({
+      messageIndex,
+      ...blockIndex === void 0 ? {} : { blockIndex },
+      start,
+      end
+    });
+    if (original.role === "user") touchedUsers.add(messageIndex);
+  }
+  const rangesByTarget = /* @__PURE__ */ new Map();
+  for (const range of ranges) {
+    const key = `${range.messageIndex}:${range.blockIndex ?? "string"}`;
+    const targetRanges = rangesByTarget.get(key) ?? [];
+    targetRanges.push(range);
+    rangesByTarget.set(key, targetRanges);
+  }
+  for (const targetRanges of rangesByTarget.values()) {
+    targetRanges.sort((left, right) => (left.start ?? 0) - (right.start ?? 0));
+    for (let index = 1; index < targetRanges.length; index += 1) {
+      const previous = targetRanges[index - 1];
+      const current2 = targetRanges[index];
+      if (previous?.end !== void 0 && current2?.start !== void 0 && current2.start < previous.end) {
+        error(
+          errors,
+          "/removals",
+          "OVERLAPPING_RANGES",
+          "Removal ranges targeting the same text must not overlap."
+        );
+        break;
+      }
+    }
+  }
+  for (const userIndex of touchedUsers) {
+    for (const assistantIndex of pairedAssistantIndices(originalMessages, userIndex)) {
+      if (wholeMessages.has(assistantIndex)) continue;
+      error(
+        errors,
+        "/removals",
+        "MISSING_ASSISTANT_PAIR",
+        `Editing user message ${userIndex} must also remove assistant message ${assistantIndex}.`
+      );
+    }
+  }
+  const expectedMessages = structuredClone(originalMessages);
+  for (const targetRanges of rangesByTarget.values()) {
+    const first = targetRanges[0];
+    if (!first) continue;
+    const message = expectedMessages[first.messageIndex];
+    if (!message) continue;
+    let text;
+    if (first.blockIndex === void 0 && typeof message.content === "string") {
+      text = message.content;
+    } else if (first.blockIndex !== void 0 && Array.isArray(message.content)) {
+      const block = message.content[first.blockIndex];
+      if (block?.type === "text") text = block.text;
+    }
+    if (text === void 0) continue;
+    const pieces = [];
+    let cursor = 0;
+    for (const range of targetRanges) {
+      if (range.start === void 0 || range.end === void 0) continue;
+      pieces.push(text.slice(cursor, range.start));
+      cursor = range.end;
+    }
+    pieces.push(text.slice(cursor));
+    const nextText = pieces.join("");
+    if (first.blockIndex === void 0 && typeof message.content === "string") {
+      message.content = nextText;
+    } else if (first.blockIndex !== void 0 && Array.isArray(message.content)) {
+      const block = message.content[first.blockIndex];
+      if (block?.type === "text") block.text = nextText;
+    }
+  }
+  const expectedProposal = expectedMessages.filter((_, index) => !wholeMessages.has(index));
+  if (JSON.stringify(canonicalize(expectedProposal)) !== JSON.stringify(canonicalize(proposedMessages))) {
+    error(
+      errors,
+      "/messages",
+      "REMOVAL_PLAN_MISMATCH",
+      "Submitted messages do not exactly match the declared removal plan."
+    );
+  }
+  return errors.length > 0 ? { errors } : { errors, messages: expectedProposal };
+}
 function validateContextEditorProposal(input) {
   const currentRevision = contextEditorRevision(input.ctx.messages);
   const before = metricFor(input.ctx, input.ctx.messages, input.tools);
@@ -4969,7 +5159,23 @@ function validateContextEditorProposal(input) {
       repair: emptyRepair
     };
   }
-  const repaired = repairToolUseAdjacency(parsed.messages);
+  const removalPlan = validateRemovalPlan(
+    input.removals,
+    input.ctx.messages,
+    parsed.messages
+  );
+  if (removalPlan.errors.length > 0 || !removalPlan.messages) {
+    return {
+      ok: false,
+      baseRevision: input.baseRevision,
+      currentRevision,
+      before,
+      validationErrors: removalPlan.errors,
+      warnings: [],
+      repair: emptyRepair
+    };
+  }
+  const repaired = repairToolUseAdjacency(removalPlan.messages);
   const repair = {
     changed: repaired.report.changed,
     removedToolUses: repaired.report.removedToolUses,
@@ -8485,19 +8691,22 @@ function extractToken(url) {
 function extractTokenFromCookie(cookieHeader) {
   if (!cookieHeader) return void 0;
   const raw = Array.isArray(cookieHeader) ? cookieHeader.join("; ") : cookieHeader;
+  let plain;
   for (const part of raw.split(";")) {
     const eq = part.indexOf("=");
     if (eq < 0) continue;
     const name2 = part.slice(0, eq).trim();
-    if (name2 === "ws_token") {
-      try {
-        return decodeURIComponent(part.slice(eq + 1).trim());
-      } catch {
-        return part.slice(eq + 1).trim();
-      }
+    if (name2 !== "ws_token" && name2 !== "__Host-ws_token") continue;
+    let value;
+    try {
+      value = decodeURIComponent(part.slice(eq + 1).trim());
+    } catch {
+      value = part.slice(eq + 1).trim();
     }
+    if (name2 === "__Host-ws_token") return value;
+    plain ??= value;
   }
-  return void 0;
+  return plain;
 }
 function hostHeaderOk(input) {
   if (!isLoopbackBind(input.wsHost)) return true;
@@ -8539,7 +8748,8 @@ function verifyClient(input) {
     expectedToken,
     requireToken,
     allowedHostnames,
-    allowBrowserUrlToken
+    allowBrowserUrlToken,
+    allowCrossPortLoopbackCookie
   } = input;
   const urlTokenOk = tokenMatches(extractToken(url ?? ""), expectedToken);
   const cookieTokenOk = tokenMatches(extractTokenFromCookie(cookieHeader), expectedToken);
@@ -8554,7 +8764,10 @@ function verifyClient(input) {
     const { hostname: originHostname } = new URL(origin);
     if (isLoopbackHostname(originHostname)) {
       if (requireToken || !isLoopbackBind(wsHost)) return cookieTokenOk;
-      return cookieTokenOk || isTrustedLoopbackOrigin(origin, hostHeader);
+      if (!isTrustedLoopbackOrigin(origin, hostHeader)) {
+        return Boolean(allowCrossPortLoopbackCookie) && cookieTokenOk;
+      }
+      return true;
     }
     return cookieTokenOk || Boolean(allowBrowserUrlToken) && urlTokenOk && allowedHostname(originHostname, allowedHostnames);
   } catch {
@@ -8589,11 +8802,22 @@ ${out}`;
 function firstHeader(value) {
   return Array.isArray(value) ? value[0] : value;
 }
-function wsTokenCookie(token) {
-  return `ws_token=${encodeURIComponent(token)}; HttpOnly; SameSite=Strict; Path=/; Max-Age=3600`;
+var WS_TOKEN_COOKIE = "ws_token";
+var WS_TOKEN_COOKIE_SECURE = "__Host-ws_token";
+function wsTokenCookie(token, secure) {
+  const name2 = secure ? WS_TOKEN_COOKIE_SECURE : WS_TOKEN_COOKIE;
+  const parts = [
+    `${name2}=${encodeURIComponent(token)}`,
+    "HttpOnly",
+    "SameSite=Strict",
+    "Path=/",
+    "Max-Age=3600"
+  ];
+  if (secure) parts.push("Secure");
+  return parts.join("; ");
 }
-function setAuthCookieHeaders(res, token) {
-  res.setHeader("Set-Cookie", wsTokenCookie(token));
+function setAuthCookieHeaders(res, token, secure) {
+  res.setHeader("Set-Cookie", wsTokenCookie(token, secure));
   res.setHeader("Cache-Control", "no-store");
 }
 function setStaticSecurityHeaders(res) {
@@ -8601,8 +8825,16 @@ function setStaticSecurityHeaders(res) {
   res.setHeader("X-Frame-Options", "DENY");
   res.setHeader("Referrer-Policy", "strict-origin-when-cross-origin");
 }
-function requestToken(req, url) {
-  return url.searchParams.get("token") ?? firstHeader(req.headers["x-ws-token"]) ?? extractTokenFromCookie(req.headers.cookie);
+function requestToken(req, url, opts = {}) {
+  const queryToken = url.searchParams.get("token") ?? void 0;
+  if (queryToken !== void 0 && (opts.allowQuery === true || isLoopbackPeer(req))) {
+    return queryToken;
+  }
+  return firstHeader(req.headers["x-ws-token"]) ?? extractTokenFromCookie(req.headers.cookie);
+}
+function isLoopbackPeer(req) {
+  const address = req.socket.remoteAddress?.replace(/^::ffff:/i, "");
+  return address !== void 0 && isLoopbackHostname(address);
 }
 function formatCspHostname(hostname) {
   return hostname.includes(":") && !hostname.startsWith("[") ? `[${hostname}]` : hostname;
@@ -8657,7 +8889,8 @@ function strictDecodeParam(segment, res) {
 function createHttpServer(opts) {
   const port = opts.port ?? Number.parseInt(process.env["PORT"] ?? "3456", 10);
   const distDir = path13.resolve(opts.distDir);
-  const requireAccessToken = Boolean(opts.requireToken) || !isLoopbackBind(opts.host);
+  const requireAccessToken = true;
+  const secureCookies = opts.secureCookies ?? (opts.publicWsUrl?.trim().toLowerCase().startsWith("wss:") ?? false);
   const trustedHostnames = (() => {
     const names = [...opts.allowedHostnames ?? []];
     if (opts.publicWsUrl) {
@@ -8696,13 +8929,13 @@ function createHttpServer(opts) {
       const accessTokenOk = Boolean(opts.apiToken) && tokenMatches(providedAccessToken, opts.apiToken ?? "");
       const shouldSetAuthCookie = Boolean(opts.apiToken) && tokenMatches(url.searchParams.get("token") ?? void 0, opts.apiToken ?? "");
       if (url.pathname === "/ws-auth" && req.method === "GET" && (opts.enableWsCookie ?? true)) {
-        const provided = requestToken(req, url);
+        const provided = requestToken(req, url, { allowQuery: true });
         if (!provided || !opts.apiToken || !tokenMatches(provided, opts.apiToken)) {
           res.writeHead(401, { "Content-Type": "text/plain" });
           res.end("Unauthorized");
           return;
         }
-        setAuthCookieHeaders(res, opts.apiToken);
+        setAuthCookieHeaders(res, opts.apiToken, secureCookies);
         res.writeHead(200, { "Content-Type": "text/plain" });
         res.end("ok");
         return;
@@ -8716,7 +8949,7 @@ function createHttpServer(opts) {
         return;
       }
       if (shouldSetAuthCookie && opts.apiToken) {
-        setAuthCookieHeaders(res, opts.apiToken);
+        setAuthCookieHeaders(res, opts.apiToken, secureCookies);
       }
       if (url.pathname === "/api/fleet/ping" && req.method === "POST") {
         if (requireAccessToken && !accessTokenOk) {
@@ -11359,6 +11592,55 @@ import {
   restartMcp,
   updateMcp
 } from "@wrongstack/mcp";
+
+// src/server/privileged-actions.ts
+import { randomUUID as randomUUID3 } from "node:crypto";
+import {
+  isTrustDecisionAllowed
+} from "@wrongstack/core/security";
+async function authorizeWebUIAction(boundary, action, logger) {
+  const request = {
+    version: 1,
+    requestId: randomUUID3(),
+    actor: {
+      kind: "remote-client",
+      ...action.sessionId ? { sessionId: action.sessionId } : {}
+    },
+    surface: "webui",
+    capability: action.capability,
+    subject: action.subject,
+    risk: action.risk,
+    scope: {
+      ...action.cwd ? { cwd: action.cwd } : {},
+      ...action.sessionId ? { sessionId: action.sessionId } : {}
+    },
+    authContext: { method: "session" },
+    ...action.metadata ? { metadata: action.metadata } : {}
+  };
+  const decision = await boundary.evaluate(request);
+  logger?.debug?.(
+    `[trust-boundary] ${request.capability} ${decision.kind} request=${request.requestId}`
+  );
+  return { allowed: isTrustDecisionAllowed(decision), reason: decision.reason, request };
+}
+
+// src/server/mcp-handlers.ts
+async function authorizeMcpMutation(ws, operation, serverName, trustBoundary) {
+  if (!trustBoundary) return true;
+  const authorization = await authorizeWebUIAction(trustBoundary, {
+    capability: "mcp.server.configure",
+    subject: { kind: "process", id: serverName },
+    risk: "elevated",
+    metadata: { transport: "websocket", operation }
+  });
+  if (!authorization.allowed) {
+    send(ws, {
+      type: "mcp.operation_result",
+      payload: { success: false, message: `${operation} denied: ${authorization.reason}` }
+    });
+  }
+  return authorization.allowed;
+}
 function mapStatus(raw) {
   switch (raw) {
     case "connected":
@@ -11433,7 +11715,7 @@ async function handleMcpList(ws, _msg, globalConfigPath, mcpRegistry) {
     payload: { servers: servers.map((server) => toView(server, health.get(server.name))) }
   });
 }
-async function handleMcpAdd(ws, msg, globalConfigPath, mcpRegistry) {
+async function handleMcpAdd(ws, msg, globalConfigPath, mcpRegistry, trustBoundary) {
   const d = deps(ws, globalConfigPath, mcpRegistry);
   if (!d) return;
   const validated = validateMcpServerPayload(msg.payload, "mcp.add");
@@ -11444,6 +11726,7 @@ async function handleMcpAdd(ws, msg, globalConfigPath, mcpRegistry) {
     });
     return;
   }
+  if (!await authorizeMcpMutation(ws, "mcp.add", name(msg), trustBoundary)) return;
   const result = await addMcp(validated.value, d);
   if (result.ok && result.server) {
     send(ws, { type: "mcp.server.added", payload: { server: toView(result.server) } });
@@ -11461,7 +11744,7 @@ async function handleMcpAdd(ws, msg, globalConfigPath, mcpRegistry) {
     payload: { success: result.ok, message: result.message }
   });
 }
-async function handleMcpUpdate(ws, msg, globalConfigPath, mcpRegistry) {
+async function handleMcpUpdate(ws, msg, globalConfigPath, mcpRegistry, trustBoundary) {
   const d = deps(ws, globalConfigPath, mcpRegistry);
   if (!d) return;
   const validated = validateMcpServerPayload(msg.payload, "mcp.update");
@@ -11472,6 +11755,7 @@ async function handleMcpUpdate(ws, msg, globalConfigPath, mcpRegistry) {
     });
     return;
   }
+  if (!await authorizeMcpMutation(ws, "mcp.update", name(msg), trustBoundary)) return;
   const result = await updateMcp(validated.value, d);
   if (result.ok && result.server) {
     send(ws, { type: "mcp.server.updated", payload: { server: toView(result.server) } });
@@ -12572,11 +12856,11 @@ function createModelOperations(context) {
 }
 
 // src/server/port-utils.ts
-import * as net2 from "node:net";
+import * as net from "node:net";
 import { ToolValidationError as ToolValidationError4 } from "@wrongstack/core/types";
 function isPortFree(host, port) {
   return new Promise((resolve15) => {
-    const srv = net2.createServer();
+    const srv = net.createServer();
     srv.once("error", () => resolve15(false));
     srv.once("listening", () => {
       srv.close(() => resolve15(true));
@@ -12821,6 +13105,8 @@ async function handleBrainAsk(ctx, ws, question) {
 
 // src/server/context-meta.ts
 import { FallbackProfileManager } from "@wrongstack/core/agent";
+import { resolvePluginEnablement } from "@wrongstack/core/plugin";
+import { FORBIDDEN_PROTO_KEYS as FORBIDDEN_PROTO_KEYS2 } from "@wrongstack/core/utils";
 function seedContextMeta(config, context) {
   const meta = context.meta;
   const autonomyCfg = config.autonomy ?? {};
@@ -12897,6 +13183,21 @@ function seedContextMeta(config, context) {
   meta["tgDelegate"] = tgExt?.["notifyOnDelegate"] !== false;
   const tgMs = tgExt?.["longToolThresholdMs"];
   meta["tgLongToolMs"] = typeof tgMs === "number" ? tgMs : 3e4;
+  {
+    const pluginsEnabled = {};
+    const record = (name2) => {
+      if (FORBIDDEN_PROTO_KEYS2.has(name2) || name2 in pluginsEnabled) return;
+      pluginsEnabled[name2] = resolvePluginEnablement({ name: name2, config }).enabled;
+    };
+    for (const entry of config.plugins ?? []) {
+      const name2 = typeof entry === "string" ? entry : entry?.name;
+      if (typeof name2 === "string") record(name2);
+    }
+    for (const [name2, options] of Object.entries(config.extensions ?? {})) {
+      if (typeof options?.["enabled"] === "boolean") record(name2);
+    }
+    if (Object.keys(pluginsEnabled).length > 0) meta["pluginsEnabled"] = pluginsEnabled;
+  }
   const chimeraExt = config.extensions?.["wstack-chimera"];
   meta["chimeraEnabled"] = chimeraExt?.["enabled"] === true;
   meta["chimeraProvider"] = chimeraExt?.["provider"] ?? "";
@@ -12934,8 +13235,9 @@ function seedContextMeta(config, context) {
 // src/server/pref-helpers.ts
 import * as fs13 from "node:fs/promises";
 import * as path15 from "node:path";
+import { pluginEntryMatchesName } from "@wrongstack/core/plugin";
 import { decryptConfigSecrets as decryptConfigSecrets2, encryptConfigSecrets } from "@wrongstack/core/security";
-import { atomicWrite as atomicWrite6, backupConfigFile, FORBIDDEN_PROTO_KEYS as FORBIDDEN_PROTO_KEYS2 } from "@wrongstack/core/utils";
+import { atomicWrite as atomicWrite6, backupConfigFile, FORBIDDEN_PROTO_KEYS as FORBIDDEN_PROTO_KEYS3 } from "@wrongstack/core/utils";
 var PREF_KEYS = [
   "autonomy",
   "autonomyDelayMs",
@@ -13016,6 +13318,8 @@ var PREF_KEYS = [
   // Display-only toggles (purely visual WebUI prefs, not persisted to config).
   "groupToolCalls",
   "showThinkingLogs",
+  // v15: chat-input auto-collapse (opt-in display toggle, default off).
+  "autoCollapseInput",
   // Per-plugin enable/disable map (parity with the embedded server).
   "pluginsEnabled",
   // Fleet chat verbosity: off | full (migrated from streamFleet boolean).
@@ -13070,6 +13374,8 @@ async function updateGlobalConfig(deps2, holder, mutate, errorLabel) {
 var DISPLAY_ONLY_KEYS = /* @__PURE__ */ new Set([
   "groupToolCalls",
   "showThinkingLogs",
+  // v15: chat-input auto-collapse (opt-in display toggle, default off).
+  "autoCollapseInput",
   "autoReviewFallbackModels",
   // v11 Display parity: agent-swarm panel + inverse fsAccess flag.
   // The TUI settings picker mirrors these so the browser can keep the
@@ -13280,15 +13586,29 @@ async function persistPrefsToConfig(deps2, holder, payload) {
         decrypted.debugStream = payload["debugStream"];
       if (typeof payload["pluginsEnabled"] === "object" && payload["pluginsEnabled"] !== null) {
         const ext = decrypted.extensions ?? {};
+        const toggled = [];
         for (const [pluginName, enabled] of Object.entries(
           payload["pluginsEnabled"]
         )) {
-          if (FORBIDDEN_PROTO_KEYS2.has(pluginName)) continue;
+          if (FORBIDDEN_PROTO_KEYS3.has(pluginName)) continue;
+          if (typeof enabled !== "boolean") continue;
           const pExt = ext[pluginName] ?? {};
           pExt["enabled"] = enabled;
           ext[pluginName] = pExt;
+          toggled.push([pluginName, enabled]);
         }
         decrypted.extensions = ext;
+        if (Array.isArray(decrypted.plugins) && toggled.length > 0) {
+          decrypted.plugins = decrypted.plugins.map((entry) => {
+            const entryName = typeof entry === "string" ? entry : entry?.name;
+            if (typeof entryName !== "string") return entry;
+            const hit = toggled.find(([name2]) => pluginEntryMatchesName(entryName, name2));
+            if (!hit) return entry;
+            const [, enabled] = hit;
+            if (typeof entry === "string") return enabled ? entry : { name: entry, enabled: false };
+            return { ...entry, enabled };
+          });
+        }
       }
       const chimeraTouched = typeof payload["chimeraEnabled"] === "boolean" || typeof payload["chimeraProvider"] === "string" || typeof payload["chimeraModel"] === "string" || typeof payload["chimeraMaxFiles"] === "number" || typeof payload["chimeraAutoFix"] === "string";
       if (chimeraTouched) {
@@ -13397,39 +13717,6 @@ async function handlePrefsRoute(ws, msg, handlers) {
 // src/server/process-handlers.ts
 import { createCompatibilityTrustBoundary } from "@wrongstack/core/security";
 import { getProcessRegistry as getProcessRegistry2 } from "@wrongstack/tools";
-
-// src/server/privileged-actions.ts
-import { randomUUID as randomUUID3 } from "node:crypto";
-import {
-  isTrustDecisionAllowed
-} from "@wrongstack/core/security";
-async function authorizeWebUIAction(boundary, action, logger) {
-  const request = {
-    version: 1,
-    requestId: randomUUID3(),
-    actor: {
-      kind: "remote-client",
-      ...action.sessionId ? { sessionId: action.sessionId } : {}
-    },
-    surface: "webui",
-    capability: action.capability,
-    subject: action.subject,
-    risk: action.risk,
-    scope: {
-      ...action.cwd ? { cwd: action.cwd } : {},
-      ...action.sessionId ? { sessionId: action.sessionId } : {}
-    },
-    authContext: { method: "session" },
-    ...action.metadata ? { metadata: action.metadata } : {}
-  };
-  const decision = await boundary.evaluate(request);
-  logger?.debug?.(
-    `[trust-boundary] ${request.capability} ${decision.kind} request=${request.requestId}`
-  );
-  return { allowed: isTrustDecisionAllowed(decision), reason: decision.reason, request };
-}
-
-// src/server/process-handlers.ts
 function handleProcessList(ws) {
   try {
     const procs = getProcessRegistry2().list();
@@ -14245,8 +14532,10 @@ function createProviderOperations(deps2) {
       if (result.ok) {
         deps2.log?.(`[WebUI] Provider "${payload.id}" added via provider.add`);
       }
+      return result.ok;
     } catch (err) {
       sendOperationResult(ws, false, errMessage(err));
+      return false;
     }
   }
   async function handleProviderRemove(ws, providerId) {
@@ -14567,6 +14856,7 @@ var CLIENT_CONVERSATION_MESSAGE_TYPES = [
   "completion.request",
   "model.switch",
   "model.refine",
+  "model.fallback_choice",
   "autonomy.switch",
   "context.clear",
   "context.compact",
@@ -14838,6 +15128,7 @@ var SERVER_CONVERSATION_MESSAGE_TYPES = [
   "provider.active_blocked",
   "provider.error",
   "provider.fallback",
+  "provider.fallback_pending",
   "provider.response",
   "provider.retry",
   "provider.status_changed",
@@ -14879,6 +15170,7 @@ var SERVER_COLLABORATION_MESSAGE_TYPES = [
   "collab.state",
   "mailbox.action_result",
   "mailbox.agent_registered",
+  "mailbox.agent_deregistered",
   "mailbox.agents",
   "mailbox.cleared",
   "mailbox.compacted",
@@ -15746,6 +16038,7 @@ function createSessionHandlers(ctx) {
         tools: ctx.listTools?.() ?? ctx.toolRegistry?.list(),
         baseRevision: typeof payload["baseRevision"] === "string" ? payload["baseRevision"] : "",
         messages: payload["messages"],
+        removals: payload["removals"],
         allowRepair: payload["allowRepair"] === true,
         runActive: ctx.isRunActive?.() === true
       });
@@ -15762,6 +16055,7 @@ function createSessionHandlers(ctx) {
         tools: ctx.listTools?.() ?? ctx.toolRegistry?.list(),
         baseRevision: typeof payload["baseRevision"] === "string" ? payload["baseRevision"] : "",
         messages: payload["messages"],
+        removals: payload["removals"],
         allowRepair: payload["allowRepair"] === true,
         runActive: ctx.isRunActive?.() === true
       });
@@ -16581,6 +16875,19 @@ async function handleCodebaseIndexServerControl(ws, message, deps2) {
   return true;
 }
 
+// src/server/fallback-choice.ts
+function emitFallbackChoice(events, msg) {
+  const parsed = validateModelFallbackChoicePayload(msg.payload);
+  if (!parsed.ok) return parsed;
+  events?.emit("provider.fallback_choice", {
+    requestId: parsed.value.requestId,
+    ...parsed.value.providerId ? { providerId: parsed.value.providerId } : {},
+    ...parsed.value.model ? { model: parsed.value.model } : {},
+    ...parsed.value.autoSwitch ? { autoSwitch: true } : {}
+  });
+  return { ok: true };
+}
+
 // src/server/agent-roster-routes.ts
 async function handleAgentRosterRoute(ws, msg, handlers) {
   if (!msg.type.startsWith("agent-roster.")) return false;
@@ -16745,13 +17052,17 @@ async function handleProviderRoute(ws, msg, routes) {
     case "model.refine":
       await routes.refineModel(ws, msg);
       return true;
+    case "model.fallback_choice":
+      await routes.fallbackChoice(ws, msg);
+      return true;
     case "key.add":
     case "key.update": {
       const payload = asPayloadRecord(msg);
       const providerId = payload ? requiredString(payload, "providerId") : null;
       const label = payload ? requiredString(payload, "label") : null;
       const apiKey = payload ? requiredString(payload, "apiKey") : null;
-      if (!providerId || !label || !apiKey) return invalidPayload(ws, msg.type);
+      if (!providerId || !SAFE_CONFIG_KEY.test(providerId) || !label || !apiKey)
+        return invalidPayload(ws, msg.type);
       await routes.providerHandlers.handleKeyUpsert(ws, providerId, label, apiKey);
       return true;
     }
@@ -16759,7 +17070,8 @@ async function handleProviderRoute(ws, msg, routes) {
       const payload = asPayloadRecord(msg);
       const providerId = payload ? requiredString(payload, "providerId") : null;
       const label = payload ? requiredString(payload, "label") : null;
-      if (!providerId || !label) return invalidPayload(ws, msg.type);
+      if (!providerId || !SAFE_CONFIG_KEY.test(providerId) || !label)
+        return invalidPayload(ws, msg.type);
       await routes.providerHandlers.handleKeyDelete(ws, providerId, label);
       return true;
     }
@@ -16767,7 +17079,8 @@ async function handleProviderRoute(ws, msg, routes) {
       const payload = asPayloadRecord(msg);
       const providerId = payload ? requiredString(payload, "providerId") : null;
       const label = payload ? requiredString(payload, "label") : null;
-      if (!providerId || !label) return invalidPayload(ws, msg.type);
+      if (!providerId || !SAFE_CONFIG_KEY.test(providerId) || !label)
+        return invalidPayload(ws, msg.type);
       await routes.providerHandlers.handleKeySetActive(ws, providerId, label);
       return true;
     }
@@ -16779,11 +17092,11 @@ async function handleProviderRoute(ws, msg, routes) {
       const apiKey = payload?.["apiKey"];
       const models = payload ? optionalStringArray(payload, "models") : null;
       const customModels = payload ? optionalCustomModels(payload) : null;
-      if (!id || !family) return invalidPayload(ws, msg.type);
+      if (!id || !SAFE_CONFIG_KEY.test(id) || !family) return invalidPayload(ws, msg.type);
       if (baseUrl !== void 0 && typeof baseUrl !== "string") return invalidPayload(ws, msg.type);
       if (apiKey !== void 0 && typeof apiKey !== "string") return invalidPayload(ws, msg.type);
       if (models === null || customModels === null) return invalidPayload(ws, msg.type);
-      await routes.providerHandlers.handleProviderAdd(ws, {
+      const added = await routes.providerHandlers.handleProviderAdd(ws, {
         id,
         family,
         baseUrl,
@@ -16791,20 +17104,22 @@ async function handleProviderRoute(ws, msg, routes) {
         models,
         customModels
       });
-      await routes.adoptDefaultProviderIfUnset(id);
+      if (added) {
+        void routes.adoptDefaultProviderIfUnset(id).catch(() => void 0);
+      }
       return true;
     }
     case "provider.remove": {
       const payload = asPayloadRecord(msg);
       const providerId = payload ? requiredString(payload, "providerId") : null;
-      if (!providerId) return invalidPayload(ws, msg.type);
+      if (!providerId || !SAFE_CONFIG_KEY.test(providerId)) return invalidPayload(ws, msg.type);
       await routes.providerHandlers.handleProviderRemove(ws, providerId);
       return true;
     }
     case "provider.clear_models": {
       const payload = asPayloadRecord(msg);
       const providerId = payload ? requiredString(payload, "providerId") : null;
-      if (!providerId) return invalidPayload(ws, msg.type);
+      if (!providerId || !SAFE_CONFIG_KEY.test(providerId)) return invalidPayload(ws, msg.type);
       await routes.providerHandlers.handleProviderClearModels(ws, providerId);
       return true;
     }
@@ -16836,7 +17151,8 @@ async function handleProviderRoute(ws, msg, routes) {
       const payload = asPayloadRecord(msg);
       const providerId = payload ? requiredString(payload, "providerId") : null;
       const previousModels = payload ? optionalStringArray(payload, "previousModels") : null;
-      if (!providerId || !previousModels) return invalidPayload(ws, msg.type);
+      if (!providerId || !SAFE_CONFIG_KEY.test(providerId) || !previousModels)
+        return invalidPayload(ws, msg.type);
       await routes.providerHandlers.handleProviderUndoClear(ws, providerId, previousModels);
       return true;
     }
@@ -16846,7 +17162,7 @@ async function handleProviderRoute(ws, msg, routes) {
       const envVars = payload ? optionalStringArray(payload, "envVars") : null;
       const models = payload ? optionalStringArray(payload, "models") : null;
       const customModels = payload ? optionalCustomModels(payload) : null;
-      if (!payload || !id || envVars === null || models === null || customModels === null)
+      if (!payload || !id || !SAFE_CONFIG_KEY.test(id) || envVars === null || models === null || customModels === null)
         return invalidPayload(ws, msg.type);
       for (const key of ["family", "baseUrl"]) {
         if (payload[key] !== void 0 && typeof payload[key] !== "string")
@@ -16866,7 +17182,8 @@ async function handleProviderRoute(ws, msg, routes) {
       const payload = asPayloadRecord(msg);
       const providerId = payload ? requiredString(payload, "providerId") : null;
       const timeoutMs = payload ? optionalNumber(payload, "timeoutMs") : null;
-      if (!providerId || timeoutMs === null) return invalidPayload(ws, msg.type);
+      if (!providerId || !SAFE_CONFIG_KEY.test(providerId) || timeoutMs === null)
+        return invalidPayload(ws, msg.type);
       await routes.providerHandlers.handleProviderProbe(ws, providerId, timeoutMs);
       return true;
     }
@@ -16875,7 +17192,7 @@ async function handleProviderRoute(ws, msg, routes) {
       const kind = oauthKind(payload);
       const providerId = payload?.["providerId"];
       if (!kind) return invalidPayload(ws, msg.type);
-      if (providerId !== void 0 && typeof providerId !== "string") {
+      if (providerId !== void 0 && (typeof providerId !== "string" || !SAFE_CONFIG_KEY.test(providerId))) {
         return invalidPayload(ws, msg.type);
       }
       await routes.providerHandlers.handleOAuthStart(ws, kind, providerId);
@@ -16914,7 +17231,8 @@ async function handleProviderRoute(ws, msg, routes) {
       const payload = asPayloadRecord(msg);
       const providerId = payload ? requiredString(payload, "providerId") : null;
       const model = payload ? requiredString(payload, "model") : null;
-      if (!providerId || !model) return invalidPayload(ws, msg.type);
+      if (!providerId || !SAFE_CONFIG_KEY.test(providerId) || !model)
+        return invalidPayload(ws, msg.type);
       const released = routes.statusTracker.retryNow(providerId, model);
       sendResult2(
         ws,
@@ -16931,7 +17249,8 @@ async function handleProviderRoute(ws, msg, routes) {
       const payload = asPayloadRecord(msg);
       const providerId = payload ? requiredString(payload, "providerId") : null;
       const model = payload ? requiredString(payload, "model") : null;
-      if (!providerId || !model) return invalidPayload(ws, msg.type);
+      if (!providerId || !SAFE_CONFIG_KEY.test(providerId) || !model)
+        return invalidPayload(ws, msg.type);
       routes.statusTracker.clear(providerId, model);
       sendResult2(ws, true, `Cleared tracking for ${providerId}/${model}.`);
       return true;
@@ -18961,7 +19280,22 @@ function setupEvents(deps2) {
         from: e.from,
         to: e.to,
         status: e.status,
-        providerSwitched: e.providerSwitched
+        providerSwitched: e.providerSwitched,
+        ...e.requestId ? { requestId: e.requestId } : {}
+      })
+    });
+  });
+  on("provider.fallback_pending", (e) => {
+    broadcast2(clients, {
+      type: "provider.fallback_pending",
+      payload: sessionPayload2({
+        sessionId: e.sessionId,
+        from: e.from,
+        status: e.status,
+        candidates: e.candidates,
+        autoSwitchSeconds: e.autoSwitchSeconds,
+        requestId: e.requestId,
+        timestamp: e.timestamp
       })
     });
   });
@@ -19046,6 +19380,15 @@ function setupEvents(deps2) {
         type: "mailbox.agent_registered",
         payload
       });
+    }),
+    // Deregistration (subagent retirement) must reach the browser too —
+    // otherwise dead agents linger in the client roster until an unrelated
+    // refresh. Emitted by sqlite-mailbox.deregisterAgent with { agentId }.
+    events.onPattern("mailbox.agent_deregistered", (_e, payload) => {
+      broadcast2(clients, {
+        type: "mailbox.agent_deregistered",
+        payload
+      });
     })
   );
   const forwardSubagent = (kind, payload) => broadcast2(clients, { type: "subagent.event", payload: sessionPayload2({ kind, ...payload }) });
@@ -21330,29 +21673,10 @@ import { attachSessionKanbanMirror, hydrateSessionKanban } from "@wrongstack/too
 // src/server/model-auto-discovery.ts
 import * as fs19 from "node:fs/promises";
 import * as path24 from "node:path";
-import { COMPATIBLE_PRESETS, discoverOpenAICompatibleModels } from "@wrongstack/providers";
+import { discoverOpenAICompatibleModels, resolveDiscoveryTargets } from "@wrongstack/providers";
 function isOverlayRegistry(value) {
   return !!value && typeof value === "object" && typeof value.mergeOverlay === "function";
 }
-function resolveKey(cfg) {
-  if (Array.isArray(cfg.apiKeys) && cfg.apiKeys.length > 0) {
-    const active = cfg.activeKey ? cfg.apiKeys.find((key) => key.label === cfg.activeKey) : void 0;
-    return (active ?? cfg.apiKeys[0])?.apiKey;
-  }
-  return cfg.apiKey && cfg.apiKey.length > 0 ? cfg.apiKey : void 0;
-}
-function eligibleProviders(config) {
-  const out = [];
-  for (const [id, cfg] of Object.entries(config.providers ?? {})) {
-    const preset = COMPATIBLE_PRESETS[id];
-    const enabled = cfg.autoDiscoverModels ?? preset?.autoDiscover ?? false;
-    if (!enabled) continue;
-    const baseUrl = cfg.baseUrl ?? preset?.defaultBaseUrl;
-    if (!baseUrl) continue;
-    out.push({ id, cfg, baseUrl, apiKey: resolveKey(cfg) });
-  }
-  return out;
-}
 async function readCache(file) {
   try {
     return JSON.parse(await fs19.readFile(file, "utf8"));
@@ -21363,14 +21687,13 @@ async function readCache(file) {
 async function discoverAndMergeWebuiProviders(opts) {
   const registry = opts.registry;
   if (!isOverlayRegistry(registry)) return;
-  const targets = eligibleProviders(opts.config);
+  const targets = resolveDiscoveryTargets(opts.config);
   if (targets.length === 0) return;
   const cacheFile = path24.join(opts.cacheDir, "discovered-models-cache.json");
   const cache2 = await readCache(cacheFile);
   let cacheDirty = false;
   await Promise.all(
-    targets.map(async ({ id, cfg, baseUrl, apiKey }) => {
-      const cacheKey = `${id}\0${baseUrl}`;
+    targets.map(async ({ id, cfg, baseUrl, apiKey, cacheKey }) => {
       const provider = await discoverOpenAICompatibleModels(id, {
         baseUrl,
         apiKey,
@@ -21736,15 +22059,6 @@ async function createPreContextServices(input) {
       logger.warn(`models.dev refresh failed (${toErrorMessage11(err)}); using cached catalog`);
     }
   }
-  try {
-    await installCatalogModelOutputLimits({
-      registry: modelsRegistry,
-      getConfig: () => config,
-      log: (message) => logger.debug(message)
-    });
-  } catch (err) {
-    logger.debug(`model output-limit index skipped: ${toErrorMessage11(err)}`);
-  }
   try {
     await discoverAndMergeWebuiProviders({
       config,
@@ -21755,6 +22069,15 @@ async function createPreContextServices(input) {
   } catch (err) {
     logger.debug(`provider auto-discovery skipped: ${toErrorMessage11(err)}`);
   }
+  try {
+    await installCatalogModelOutputLimits({
+      registry: modelsRegistry,
+      getConfig: () => config,
+      log: (message) => logger.debug(message)
+    });
+  } catch (err) {
+    logger.debug(`model output-limit index skipped: ${toErrorMessage11(err)}`);
+  }
   const events = opts.services?.events ?? new EventBus();
   events.setLogger(logger);
   const container = createDefaultContainer({ config, wpaths, logger, modelsRegistry, events });
@@ -22141,7 +22464,16 @@ function buildRoutes(state, deps2, cb) {
     refineModel: (ws, msg) => modelOperations.refineModel(
       ws,
       msg.payload
-    )
+    ),
+    fallbackChoice: async (ws, msg) => {
+      const result = emitFallbackChoice(deps2.events, msg);
+      if (!result.ok) {
+        send(ws, {
+          type: "error",
+          payload: { phase: "invalid_request", message: result.message }
+        });
+      }
+    }
   };
   const sessionRoutes = createSessionHandlers({
     config: state.getConfig(),
@@ -22319,8 +22651,10 @@ function buildRoutes(state, deps2, cb) {
   });
   const mcpRoutes = {
     list: (ws, msg) => handleMcpList(ws, msg, deps2.profileConfigPath, deps2.mcpRegistry),
-    add: (ws, msg) => handleMcpAdd(ws, msg, deps2.profileConfigPath, deps2.mcpRegistry),
-    update: (ws, msg) => handleMcpUpdate(ws, msg, deps2.profileConfigPath, deps2.mcpRegistry),
+    // add/update are the spawn-capable pair — they take a `command`/`args`
+    // from the wire and start it. They go past the trust boundary (M1).
+    add: (ws, msg) => handleMcpAdd(ws, msg, deps2.profileConfigPath, deps2.mcpRegistry, deps2.trustBoundary),
+    update: (ws, msg) => handleMcpUpdate(ws, msg, deps2.profileConfigPath, deps2.mcpRegistry, deps2.trustBoundary),
     remove: (ws, msg) => handleMcpRemove(ws, msg, deps2.profileConfigPath, deps2.mcpRegistry),
     enable: (ws, msg) => handleMcpEnable(ws, msg, deps2.profileConfigPath, deps2.mcpRegistry),
     disable: (ws, msg) => handleMcpDisable(ws, msg, deps2.profileConfigPath, deps2.mcpRegistry),
@@ -22492,7 +22826,10 @@ function createWsServers(httpServer, ports, accessToken) {
     expectedToken: wsToken,
     requireToken: ports.requireToken,
     allowedHostnames: publicHostnames,
-    allowBrowserUrlToken: Boolean(ports.publicWsUrl)
+    allowBrowserUrlToken: Boolean(ports.publicWsUrl),
+    // WS-003 opt-out for the Vite dev loop only (app and WS server cannot
+    // share a port). Off unless explicitly requested — see ws-auth.ts.
+    allowCrossPortLoopbackCookie: process.env["WRONGSTACK_WEBUI_DEV_CROSS_PORT_WS"] === "1"
   });
   const WS_MAX_PAYLOAD = 20 * 1024 * 1024;
   const wssPrimary = new WebSocketServer({