@wrongstack/webui-server 0.299.0 → 0.301.0

package/dist/index.js

@@ -48,6 +48,7 @@ var BOOLEAN_PREF_KEYS = /* @__PURE__ */ new Set([
   "chime",
   "confirmExit",
   "nextPrediction",
+  "nextStepsTool",
   "titleAnimation",
   "enhanceEnabled",
   "featureMcp",
@@ -73,6 +74,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
@@ -167,6 +172,7 @@ var ENUM_PREF_KEYS = {
   fsAccess: /* @__PURE__ */ new Set(["unrestricted", "project"]),
   // Chimera autoFix + auto-review cascade threshold
   chimeraAutoFix: /* @__PURE__ */ new Set(["off", "ask", "auto"]),
+  autoReviewModelSelection: /* @__PURE__ */ new Set(["round-robin", "random"]),
   autoReviewCascadeOn: /* @__PURE__ */ new Set(["off", "critical", "high"]),
   fleetChatVerbosity: /* @__PURE__ */ new Set(["off", "full"]),
   showAgentSwarmPanel: /* @__PURE__ */ new Set(["bottom", "sidebar", "off"])
@@ -397,6 +403,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 };
@@ -4267,6 +4318,9 @@ async function handleConversationRoute(ws, msg, handlers) {
     case "user_message":
       await handlers.userMessage(ws, msg);
       return true;
+    case "topic.advice":
+      await handlers.topicAdvice(ws, msg);
+      return true;
     case "abort":
       await handlers.abort(ws, msg);
       return true;
@@ -4282,6 +4336,7 @@ async function handleConversationRoute(ws, msg, handlers) {
 }
 
 // src/server/conversation-operations.ts
+import { startFreshTopicContext, TopicShiftAdvisor } from "@wrongstack/core/execution";
 import {
   buildUserContentBlocks,
   IncomingImageError,
@@ -4298,6 +4353,7 @@ function requestedSessionId(msg) {
   return payload && typeof payload === "object" && typeof payload.sessionId === "string" ? payload.sessionId : void 0;
 }
 function createConversationOperations(ctx) {
+  const topicShiftAdvisor = new TopicShiftAdvisor();
   const sessionPayload2 = (payload) => {
     const provided = payload["sessionId"];
     const sessionId = typeof provided === "string" && provided.length > 0 ? provided : ctx.getSessionId();
@@ -4318,6 +4374,38 @@ function createConversationOperations(ctx) {
     return false;
   };
   return {
+    topicAdvice: async (ws, msg) => {
+      if (!ensureCurrentSession(ws, msg, "topic.advice")) return;
+      const payload = msg.payload ?? {};
+      if (typeof payload.requestId !== "string" || typeof payload.prompt !== "string") {
+        ctx.send(ws, {
+          type: "topic.advice_result",
+          payload: sessionPayload2({
+            requestId: typeof payload.requestId === "string" ? payload.requestId : "",
+            suggestNewContext: false,
+            confidence: 0,
+            reason: "Invalid topic advice request.",
+            source: "local"
+          })
+        });
+        return;
+      }
+      const agent = ctx.getAgent();
+      const configuredMax = agent.ctx.meta["effectiveMaxContext"];
+      const maxContext = typeof configuredMax === "number" ? configuredMax : agent.ctx.provider.capabilities.maxContext;
+      const advice = await topicShiftAdvisor.advise({
+        prompt: payload.prompt,
+        messages: agent.ctx.messages,
+        provider: agent.ctx.provider,
+        model: agent.ctx.model,
+        contextTokens: agent.ctx.lastRequestTokens,
+        maxContext
+      });
+      ctx.send(ws, {
+        type: "topic.advice_result",
+        payload: sessionPayload2({ requestId: payload.requestId, ...advice })
+      });
+    },
     userMessage: async (ws, msg) => {
       if (!ensureCurrentSession(ws, msg, "user_message")) return;
       const payload = msg.payload ?? {};
@@ -4335,6 +4423,7 @@ function createConversationOperations(ctx) {
       const originSessionId = ctx.getSessionId();
       try {
         const agent = ctx.getAgent();
+        if (payload.freshContext === true) await startFreshTopicContext(agent.ctx);
         const content = typeof payload.content === "string" ? payload.content : "";
         let input = content;
         const imageBlocks = parseIncomingImages(payload.images, payload.imageBase64);
@@ -4417,13 +4506,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
@@ -4491,40 +4577,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);
 }
@@ -4533,7 +4586,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);
@@ -4564,6 +4617,12 @@ function isMessageRole(value) {
 function isPlainJsonObject(value) {
   return isRecord3(value);
 }
+function splitsSurrogatePair(text2, offset) {
+  if (offset <= 0 || offset >= text2.length) return false;
+  const previous = text2.charCodeAt(offset - 1);
+  const next = text2.charCodeAt(offset);
+  return previous >= 55296 && previous <= 56319 && next >= 56320 && next <= 57343;
+}
 function validateCacheControl(value, path35, errors) {
   if (value === void 0) return void 0;
   if (!isRecord3(value) || value["type"] !== "ephemeral") {
@@ -4774,19 +4833,13 @@ function validateBlock(value, path35, errors) {
         );
         return void 0;
       }
-      const urlError = imageUrlRejectionReason(url);
-      if (urlError !== void 0) {
-        error(errors, `${path35}/source/url`, "UNSAFE_IMAGE_URL", urlError);
-        return void 0;
-      }
-      return {
-        type: "image",
-        source: {
-          type: "url",
-          ...typeof mediaType === "string" ? { media_type: mediaType } : {},
-          url
-        }
-      };
+      error(
+        errors,
+        `${path35}/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"];
@@ -4943,6 +4996,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}`,
@@ -4970,6 +5031,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) => ({
@@ -4999,11 +5075,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 path35 = `/removals/${removalIndex}`;
+    if (!isRecord3(raw) || !Number.isInteger(raw["messageIndex"])) {
+      error(errors, path35, "INVALID_REMOVAL", "Removal must include an integer messageIndex.");
+      continue;
+    }
+    const messageIndex = raw["messageIndex"];
+    const original = originalMessages[messageIndex];
+    if (!original) {
+      error(errors, `${path35}/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, path35, "INVALID_RANGE", "Range removal requires integer start/end with 0 <= start < end.");
+      continue;
+    }
+    let text2;
+    if (blockIndex === void 0 && typeof original.content === "string") text2 = original.content;
+    if (Number.isInteger(blockIndex) && Array.isArray(original.content)) {
+      const block = original.content[blockIndex];
+      if (block?.type === "text") text2 = block.text;
+    }
+    if (text2 === void 0 || end > text2.length) {
+      error(errors, path35, "INVALID_RANGE_TARGET", "Range must target existing string or text-block content.");
+      continue;
+    }
+    if (splitsSurrogatePair(text2, start) || splitsSurrogatePair(text2, end)) {
+      error(
+        errors,
+        path35,
+        "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 text2;
+    if (first.blockIndex === void 0 && typeof message.content === "string") {
+      text2 = message.content;
+    } else if (first.blockIndex !== void 0 && Array.isArray(message.content)) {
+      const block = message.content[first.blockIndex];
+      if (block?.type === "text") text2 = block.text;
+    }
+    if (text2 === 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(text2.slice(cursor, range.start));
+      cursor = range.end;
+    }
+    pieces.push(text2.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);
@@ -5055,7 +5285,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,
@@ -5305,7 +5551,40 @@ import {
   getKanbanServerConnection,
   isKanbanServerAvailable
 } from "@wrongstack/kanban";
-import * as net2 from "node:net";
+import * as net from "node:net";
+
+// src/server/privileged-actions.ts
+import { randomUUID as randomUUID2 } from "node:crypto";
+import {
+  isTrustDecisionAllowed
+} from "@wrongstack/core/security";
+async function authorizeWebUIAction(boundary, action, logger) {
+  const request = {
+    version: 1,
+    requestId: randomUUID2(),
+    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/connections-health-route.ts
 import { readGovernanceDaemonOperatorStatus } from "@wrongstack/runtime/governance-bootstrap";
 import { isSageProjectServerAvailable, SageProjectServerConnection } from "@wrongstack/sage";
 import {
@@ -5711,6 +5990,42 @@ async function handleConnectionsServiceAction(ws, message, context) {
     return true;
   }
   const action = rawAction;
+  if (!context.trustBoundary) {
+    context.send(ws, {
+      type: "connections.service_action_result",
+      payload: {
+        serviceId,
+        action,
+        success: false,
+        message: "Service control is unavailable: no policy authority is configured."
+      }
+    });
+    return true;
+  }
+  const projectRootForAuth = context.getProjectRoot();
+  const authorization = await authorizeWebUIAction(
+    context.trustBoundary,
+    {
+      capability: `connections.service.${action}`,
+      subject: { kind: "process", id: `${serviceId}@${projectRootForAuth}` },
+      risk: "elevated",
+      cwd: projectRootForAuth,
+      metadata: { transport: "websocket", serviceId, action }
+    },
+    context.logger
+  );
+  if (!authorization.allowed) {
+    context.send(ws, {
+      type: "connections.service_action_result",
+      payload: {
+        serviceId,
+        action,
+        success: false,
+        message: authorization.reason ?? "Refused by policy."
+      }
+    });
+    return true;
+  }
   if (serviceId === "webui") {
     context.send(ws, {
       type: "connections.service_action_result",
@@ -6149,7 +6464,7 @@ var RESTART_POLL_INTERVAL_MS = 250;
 var RESTART_DEADLINE_MS = 3e3;
 function isEndpointAlive(endpoint) {
   return new Promise((resolve16) => {
-    const sock = net2.createConnection(endpoint);
+    const sock = net.createConnection(endpoint);
     const timer = setTimeout(() => {
       sock.destroy();
       resolve16(false);
@@ -6891,12 +7206,12 @@ Run npx tsc --noEmit to verify the fix. Output the fixed file paths.`;
         ...maybeVerify,
         onPhaseComplete: (phase) => {
           this.logger.info(`[Goal] Phase completed: ${phase.name}`);
-          void this.store.save(graph);
+          this.persistDetached(graph);
           this.broadcastState();
         },
         onPhaseFail: (phase, error2) => {
           this.logger.error(`[Goal] Phase failed: ${phase.name} \u2014 ${error2.message}`);
-          void this.store.save(graph);
+          this.persistDetached(graph);
           this.broadcastState();
         }
       },
@@ -6913,7 +7228,7 @@ Run npx tsc --noEmit to verify the fix. Output the fixed file paths.`;
     this.broadcastState();
     void this.orchestrator.start().then(() => {
       this.orchestrator?.stop();
-      void this.store.save(graph);
+      this.persistDetached(graph);
       this.stopBroadcast();
       const failed = graph.failedPhaseIds.length > 0;
       this.broadcast(
@@ -7111,9 +7426,27 @@ ${result_.finalText.slice(0, 2e3)}`
       this.logger.warn(`[Goal] Chimera review failed for "${task.title}": ${toErrorMessage2(err)}`);
     }
   }
+  /**
+   * Fire-and-forget persist.
+   *
+   * Every detached `store.save()` used to be a bare `void`, so a rejection
+   * became an unhandled rejection and — under Node 22's default
+   * `--unhandled-rejections=throw` — killed the process mid-run. On Windows an
+   * AV scanner or indexer holding the `.wrongstack/phases/<id>.json` rename
+   * target for a few hundred ms is enough (EPERM from `atomicWrite`), and in
+   * `--webui` mode that takes the CLI session down with it. `handleStop` at
+   * `:549` already had the `.catch`; these call sites did not.
+   */
+  persistDetached(graph) {
+    void this.store.save(graph).catch((err) => {
+      this.logger.warn(
+        `[Goal] Failed to persist phase graph: ${err instanceof Error ? err.message : String(err)}`
+      );
+    });
+  }
   /** Persist + broadcast after an interactive board mutation. */
   afterBoardMutation() {
-    if (this.graph) void this.store.save(this.graph);
+    if (this.graph) this.persistDetached(this.graph);
     this.broadcastState();
   }
   async handleTaskStatusChange(taskId, status) {
@@ -8105,12 +8438,21 @@ async function handleApiSessionEvents(res, globalRoot, sessionId, limit) {
     const paths = resolveWstackPaths7({ projectRoot: entry.projectRoot, globalRoot });
     const store = new DefaultSessionStore4({ dir: paths.projectSessions });
     const reader = new DefaultSessionReader2({ store });
-    const rawEntries = [];
+    const RING = Math.max(limit * 4, 2e3);
+    const ring = [];
+    let totalRaw = 0;
+    let dropped = false;
     for await (const ev of reader.replay(sessionId)) {
       const mapped = mapWatchEntry(ev);
-      if (mapped) rawEntries.push(mapped);
+      if (!mapped) continue;
+      totalRaw += 1;
+      ring.push(mapped);
+      if (ring.length > RING) {
+        ring.shift();
+        dropped = true;
+      }
     }
-    const all = correlateToolEvents(rawEntries);
+    const all = correlateToolEvents(ring);
     const tail2 = all.slice(-limit);
     res.writeHead(200, { "Content-Type": "application/json" });
     res.end(
@@ -8119,7 +8461,12 @@ async function handleApiSessionEvents(res, globalRoot, sessionId, limit) {
         status: entry.status,
         clientType: entry.clientType,
         projectName: entry.projectName,
-        total: all.length,
+        // Exact when the whole session fit in the ring (the previous
+        // behaviour). Past that, correlation never ran over the dropped
+        // prefix, so report the raw event count — an upper bound — and say so
+        // rather than silently understating the session's size.
+        total: dropped ? totalRaw : all.length,
+        ...dropped ? { truncated: true } : {},
         entries: tail2
       })
     );
@@ -8809,7 +9156,7 @@ async function touchProjectInManifest(options, globalConfigPath) {
 }
 
 // src/server/techstack-handlers.ts
-import { randomUUID as randomUUID2 } from "node:crypto";
+import { randomUUID as randomUUID3 } from "node:crypto";
 var DEEP_DIVE_TIMEOUT_MS = 6e4;
 function sendJson3(res, status, data) {
   res.writeHead(status, { "Content-Type": "application/json" });
@@ -8850,7 +9197,7 @@ function requireJobDeps(res, deps2) {
 }
 function startJob(res, deps2, kind) {
   if (!requireJobDeps(res, deps2)) return;
-  const jobId = randomUUID2();
+  const jobId = randomUUID3();
   const controller = new AbortController();
   deps2.runningJobs?.set(jobId, controller);
   deps2.emit?.({ type: "techstack.job.started", payload: { jobId, kind } });
@@ -9082,19 +9429,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;
@@ -9136,7 +9486,8 @@ function verifyClient(input) {
     expectedToken,
     requireToken,
     allowedHostnames,
-    allowBrowserUrlToken
+    allowBrowserUrlToken,
+    allowCrossPortLoopbackCookie
   } = input;
   const urlTokenOk = tokenMatches(extractToken(url ?? ""), expectedToken);
   const cookieTokenOk = tokenMatches(extractTokenFromCookie(cookieHeader), expectedToken);
@@ -9151,7 +9502,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 {
@@ -9186,11 +9540,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) {
@@ -9198,8 +9563,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;
@@ -9254,7 +9627,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) {
@@ -9289,17 +9663,17 @@ function createHttpServer(opts) {
         res.end(JSON.stringify({ error: "forbidden: untrusted request origin" }));
         return;
       }
-      const providedAccessToken = requestToken(req, url);
+      const providedAccessToken = requestToken(req, url, { allowQuery: true });
       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;
@@ -9313,7 +9687,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) {
@@ -10150,6 +10524,27 @@ import {
   getServerKanbanStore
 } from "@wrongstack/kanban";
 import { recordKanbanVerificationEvidence } from "@wrongstack/tools";
+
+// src/server/kanban-broadcast.ts
+function kanbanBoardMessage(board) {
+  return { type: "kanban.get", payload: { success: true, data: { board } } };
+}
+function kanbanListMessage(boards) {
+  return { type: "kanban.list", payload: { success: true, data: boards } };
+}
+function kanbanDeletedMessage(boardId) {
+  return { type: "kanban.delete", payload: { success: true, data: { removed: true, boardId } } };
+}
+async function publishKanbanBoard(broadcast2, board, listBoards6) {
+  broadcast2(kanbanBoardMessage(board));
+  if (!listBoards6) return;
+  try {
+    broadcast2(kanbanListMessage(await listBoards6()));
+  } catch {
+  }
+}
+
+// src/server/kanban-dispatch.ts
 function parseResolvedDispatchRoute(summary) {
   const tags = summary.match(/Spawned subagent\s+\S+\s+\((.*?)\)\s+for task/i)?.[1];
   if (!tags) return {};
@@ -10280,10 +10675,7 @@ async function handleKanbanTaskDispatch(ws, payload, ctx) {
           payload: { success: true, data: { boardId: board.id, task: completedTask } }
         });
         if (completedBoard) {
-          ctx.broadcast?.({
-            type: "kanban.get",
-            payload: { success: true, data: { board: completedBoard } }
-          });
+          ctx.broadcast?.(kanbanBoardMessage(completedBoard));
         }
         ctx.broadcast?.({
           type: "kanban.list",
@@ -10307,7 +10699,7 @@ async function handleKanbanTaskDispatch(ws, payload, ctx) {
       payload: { success: true, data: { boardId: board.id, task: runningTask } }
     });
     if (started?.board) {
-      ctx.broadcast?.({ type: "kanban.get", payload: { success: true, data: { board: started.board } } });
+      ctx.broadcast?.(kanbanBoardMessage(started.board));
     }
     reply(ws, "kanban.task.dispatch", true, { boardId: board.id, task: runningTask, summary });
   } catch (error2) {
@@ -10550,14 +10942,11 @@ async function handleDecompositionResolution(ws, type, payload, ctx) {
       type: "kanban.decomposition.applied",
       payload: { success: true, data: { board: resolved.board } }
     });
-    ctx.broadcast?.({
-      type: "kanban.get",
-      payload: { success: true, data: { board: resolved.board } }
-    });
-    ctx.broadcast?.({
-      type: "kanban.list",
-      payload: { success: true, data: await listBoards(ctx.projectRoot) }
-    });
+    await publishKanbanBoard(
+      (message) => ctx.broadcast?.(message),
+      resolved.board,
+      () => listBoards(ctx.projectRoot)
+    );
   } else {
     ctx.broadcast?.({
       type: "kanban.decomposition.resolved",
@@ -10590,10 +10979,7 @@ async function handleTaskVerification(ws, type, payload, ctx) {
       payload: { success: true, data: { boardId, task: freshTask } }
     });
     if (persisted) {
-      ctx.broadcast?.({
-        type: "kanban.get",
-        payload: { success: true, data: { board: persisted } }
-      });
+      ctx.broadcast?.(kanbanBoardMessage(persisted));
     }
   } catch (err) {
     ctx.broadcast?.({
@@ -11516,10 +11902,7 @@ function subscribeKanbanDaemonEvents(projectRoot, broadcastMessage) {
   let connectionCount = 0;
   const broadcastDeleted = (boardId) => {
     knownRevisions.delete(boardId);
-    broadcastMessage({
-      type: "kanban.delete",
-      payload: { success: true, data: { removed: true, boardId } }
-    });
+    broadcastMessage(kanbanDeletedMessage(boardId));
   };
   const broadcastBoard = async (boardId) => {
     const board = await store.getBoard(boardId);
@@ -11528,10 +11911,7 @@ function subscribeKanbanDaemonEvents(projectRoot, broadcastMessage) {
       return;
     }
     knownRevisions.set(boardId, board.updatedAt);
-    broadcastMessage({
-      type: "kanban.get",
-      payload: { success: true, data: { board } }
-    });
+    broadcastMessage(kanbanBoardMessage(board));
   };
   const reconcileAfterConnect = async () => {
     const summaries = await store.listBoards();
@@ -11550,20 +11930,36 @@ function subscribeKanbanDaemonEvents(projectRoot, broadcastMessage) {
       }
     }
   };
-  return bridgeKanbanSupervisor(
+  const COALESCE_MS = 300;
+  const pendingBroadcasts = /* @__PURE__ */ new Map();
+  const scheduleBroadcast = (boardId) => {
+    if (pendingBroadcasts.has(boardId)) return;
+    const timer = setTimeout(() => {
+      pendingBroadcasts.delete(boardId);
+      void broadcastBoard(boardId).catch(() => {
+      });
+    }, COALESCE_MS);
+    timer.unref?.();
+    pendingBroadcasts.set(boardId, timer);
+  };
+  const unsubscribe = bridgeKanbanSupervisor(
     projectRoot,
     async (event) => {
+      const family = event.event?.split(".")[0];
+      if (family !== "board" && family !== "task" && family !== "column") return;
       const evData = event.data;
       const boardId = evData?.boardId;
       if (!boardId) return;
-      try {
-        if (event.event === "board.deleted") {
-          broadcastDeleted(boardId);
-          return;
+      if (event.event === "board.deleted") {
+        const timer = pendingBroadcasts.get(boardId);
+        if (timer) {
+          clearTimeout(timer);
+          pendingBroadcasts.delete(boardId);
         }
-        await broadcastBoard(boardId);
-      } catch {
+        broadcastDeleted(boardId);
+        return;
       }
+      scheduleBroadcast(boardId);
     },
     {
       autoReconnect: true,
@@ -11571,6 +11967,11 @@ function subscribeKanbanDaemonEvents(projectRoot, broadcastMessage) {
       onConnected: reconcileAfterConnect
     }
   );
+  return () => {
+    for (const timer of pendingBroadcasts.values()) clearTimeout(timer);
+    pendingBroadcasts.clear();
+    unsubscribe();
+  };
 }
 
 // src/server/kanban-board-watcher.ts
@@ -11592,7 +11993,13 @@ function createShutdown(res) {
     } catch (e) {
       log(`[WebUI] Error closing session: ${e instanceof Error ? e.message : String(e)}`);
     }
-    for (const ws of res.clients()) ws.close();
+    for (const ws of res.clients()) {
+      try {
+        ws.close();
+        ws.terminate?.();
+      } catch {
+      }
+    }
     for (const server of res.servers) server?.close();
     if (res.onShutdown) {
       try {
@@ -12029,6 +12436,22 @@ import {
   restartMcp,
   updateMcp
 } from "@wrongstack/mcp";
+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":
@@ -12103,7 +12526,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");
@@ -12114,6 +12537,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) } });
@@ -12131,7 +12555,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");
@@ -12142,6 +12566,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) } });
@@ -13285,7 +13710,7 @@ function openBrowser(url, platform = process.platform) {
 }
 
 // src/server/port-utils.ts
-import * as net3 from "node:net";
+import * as net2 from "node:net";
 import { ToolValidationError as ToolValidationError4 } from "@wrongstack/core/types";
 var SURFACE_DEFAULT_PORTS = {
   webui: { http: 3456 },
@@ -13299,7 +13724,7 @@ function getSurfaceDefaultPorts(surface) {
 }
 function isPortFree(host, port) {
   return new Promise((resolve16) => {
-    const srv = net3.createServer();
+    const srv = net2.createServer();
     srv.once("error", () => resolve16(false));
     srv.once("listening", () => {
       srv.close(() => resolve16(true));
@@ -13560,7 +13985,8 @@ function registerWebuiInstance(p, deps2 = {}) {
         host: p.host,
         port: p.httpPort,
         publicUrl: p.publicUrl
-      })
+      }),
+      ...p.authToken ? { authToken: p.authToken } : {}
     },
     p.registryBaseDir
   ).catch(() => {
@@ -13594,10 +14020,31 @@ ${extraBlock}`
     if (p.open) launch(openUrl);
   });
 }
+var DEFAULT_CHILD_CLEANUP_TIMEOUT_MS = 1e4;
+async function runBounded(work, timeoutMs, label, debug) {
+  let timer;
+  try {
+    await Promise.race([
+      Promise.resolve().then(() => work()).catch((err) => {
+        debug(`[webui-server] ${label} failed: ${err}`);
+      }),
+      new Promise((resolve16) => {
+        timer = setTimeout(() => {
+          debug(`[webui-server] ${label} timed out after ${timeoutMs}ms`);
+          resolve16();
+        }, timeoutMs);
+        timer.unref?.();
+      })
+    ]);
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
 function createWebuiShutdown(res) {
   const log = res.log ?? ((m) => console.log(m));
   const debug = res.debug ?? ((m) => console.debug(m));
   const unregister = res.unregisterFn ?? unregisterInstance;
+  const childTimeout = Math.max(1, res.childCleanupTimeoutMs ?? DEFAULT_CHILD_CLEANUP_TIMEOUT_MS);
   let started = false;
   return () => {
     if (started) return;
@@ -13605,17 +14052,30 @@ function createWebuiShutdown(res) {
     log("[WebUI] Shutting down...");
     res.abortInFlight();
     res.unsubscribeEvents();
-    res.disposeResources?.();
-    res.closeClients();
-    const unregistered = unregister(res.pid, res.registryBaseDir).catch(
-      (err) => debug(`[webui-server] unregister failed: ${err}`)
-    );
-    res.closeHttpServer();
-    res.wss.close(() => {
-      void unregistered.then(() => {
-        log("[WebUI] Server stopped");
-        res.onStopped();
+    void (async () => {
+      if (res.stopOwnedChildren) {
+        await runBounded(res.stopOwnedChildren, childTimeout, "stopOwnedChildren", debug);
+      }
+      if (res.disposeResources) {
+        await runBounded(res.disposeResources, Math.min(childTimeout, 5e3), "disposeResources", debug);
+      }
+      res.closeClients();
+      res.closeHttpServer();
+      const unregistered = unregister(res.pid, res.registryBaseDir).catch(
+        (err) => debug(`[webui-server] unregister failed: ${err}`)
+      );
+      await new Promise((resolve16) => {
+        res.wss.close(() => resolve16());
       });
+      await unregistered;
+      log("[WebUI] Server stopped");
+      res.onStopped();
+    })().catch((err) => {
+      debug(`[webui-server] shutdown sequence failed: ${err}`);
+      try {
+        res.onStopped();
+      } catch {
+      }
     });
   };
 }
@@ -14096,12 +14556,9 @@ function createKanbanRunMirror(deps2) {
   }
   async function publish(board) {
     if (board) {
-      broadcast2({ type: "kanban.get", payload: { success: true, data: { board } } });
+      broadcast2(kanbanBoardMessage(board));
     }
-    broadcast2({
-      type: "kanban.list",
-      payload: { success: true, data: await listBoards3(projectRoot) }
-    });
+    broadcast2(kanbanListMessage(await listBoards3(projectRoot)));
   }
   async function projectSdd(runId, snapshot) {
     const k = mapKey("sdd", runId);
@@ -14504,14 +14961,11 @@ function createKanbanSupervisor(deps2) {
     publish(snapshot);
     const changedBoard = recovered?.board ?? gateSwept ?? reconciled?.board;
     if (changedBoard) {
-      deps2.broadcast({
-        type: "kanban.get",
-        payload: { success: true, data: { board: changedBoard } }
-      });
-      deps2.broadcast({
-        type: "kanban.list",
-        payload: { success: true, data: await listBoards4(deps2.projectRoot) }
-      });
+      await publishKanbanBoard(
+        deps2.broadcast,
+        changedBoard,
+        () => listBoards4(deps2.projectRoot)
+      );
     }
     if (config.mode === "agentic" && anomalyCount > 0) {
       await maybeRunAgent(board, config, health, snapshot);
@@ -14723,6 +15177,8 @@ function buildAuditPrompt(board, health) {
 
 // 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 ?? {};
@@ -14738,6 +15194,7 @@ function seedContextMeta(config, context) {
   meta["enhanceDelayMs"] = autonomyCfg["enhanceDelayMs"] ?? 6e4;
   meta["enhanceLanguage"] = autonomyCfg["enhanceLanguage"] ?? "original";
   meta["nextPrediction"] = config.nextPrediction ?? false;
+  meta["nextStepsTool"] = config.tools?.nextsteps?.enabled === true;
   meta["fallbackModels"] = config.fallbackModels ?? [];
   meta["fallbackBridge"] = config.fallbackBridge ?? "";
   meta["fallbackProfiles"] = config.fallbackProfiles ?? {};
@@ -14799,6 +15256,21 @@ function seedContextMeta(config, context) {
   meta["tgDelegate"] = tgExt?.["notifyOnDelegate"] !== false;
   const tgMs = tgExt?.["longToolThresholdMs"];
   meta["tgLongToolMs"] = typeof tgMs === "number" ? tgMs : 3e4;
+  {
+    const pluginsEnabled = {};
+    const record2 = (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") record2(name2);
+    }
+    for (const [name2, options] of Object.entries(config.extensions ?? {})) {
+      if (typeof options?.["enabled"] === "boolean") record2(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"] ?? "";
@@ -14811,6 +15283,7 @@ function seedContextMeta(config, context) {
   meta["autoReviewProvider"] = autoReviewExt?.["provider"] ?? "";
   meta["autoReviewModel"] = autoReviewExt?.["model"] ?? "";
   meta["autoReviewFallbackProfile"] = autoReviewExt?.["fallbackProfile"] ?? "";
+  meta["autoReviewModelSelection"] = autoReviewExt?.["modelSelection"] === "random" ? "random" : "round-robin";
   meta["autoReviewFallbackModels"] = Array.isArray(autoReviewExt?.["fallbackModels"]) ? autoReviewExt?.["fallbackModels"] : [];
   meta["autoReviewDebounceMs"] = typeof autoReviewExt?.["debounceMs"] === "number" && autoReviewExt["debounceMs"] >= 0 ? autoReviewExt["debounceMs"] : 15e3;
   meta["autoReviewMaxFilesPerBatch"] = typeof autoReviewExt?.["maxFilesPerBatch"] === "number" && autoReviewExt["maxFilesPerBatch"] >= 1 ? autoReviewExt["maxFilesPerBatch"] : 15;
@@ -14836,8 +15309,9 @@ function seedContextMeta(config, context) {
 // src/server/pref-helpers.ts
 import * as fs13 from "node:fs/promises";
 import * as path18 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",
@@ -14847,6 +15321,7 @@ var PREF_KEYS = [
   "chime",
   "confirmExit",
   "nextPrediction",
+  "nextStepsTool",
   "enhanceEnabled",
   "enhanceDelayMs",
   "enhanceLanguage",
@@ -14910,6 +15385,7 @@ var PREF_KEYS = [
   "autoReviewProvider",
   "autoReviewModel",
   "autoReviewFallbackProfile",
+  "autoReviewModelSelection",
   "autoReviewFallbackModels",
   "autoReviewDebounceMs",
   "autoReviewMaxFilesPerBatch",
@@ -14918,6 +15394,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).
@@ -14972,6 +15450,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
@@ -15119,6 +15599,11 @@ async function persistPrefsToConfig(deps2, holder, payload) {
         toolsCfg.maxIterations = payload["maxIterations"];
         decrypted.tools = toolsCfg;
       }
+      if (typeof payload["nextStepsTool"] === "boolean") {
+        const toolsCfg = decrypted.tools ?? {};
+        toolsCfg.nextsteps = { enabled: payload["nextStepsTool"] };
+        decrypted.tools = toolsCfg;
+      }
       const hqTouched = typeof payload["hqEnabled"] === "boolean" || typeof payload["hqUrl"] === "string" || typeof payload["hqToken"] === "string" || typeof payload["hqRawContent"] === "boolean";
       if (hqTouched) {
         const hqCfg = decrypted.hq ?? {};
@@ -15182,15 +15667,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) {
@@ -15212,7 +15711,7 @@ async function persistPrefsToConfig(deps2, holder, payload) {
         ext["wstack-chimera"] = chimera;
         decrypted.extensions = ext;
       }
-      const autoReviewTouched = typeof payload["autoReviewEnabled"] === "boolean" || typeof payload["autoReviewProvider"] === "string" || typeof payload["autoReviewModel"] === "string" || typeof payload["autoReviewFallbackProfile"] === "string" || Array.isArray(payload["autoReviewFallbackModels"]) || typeof payload["autoReviewDebounceMs"] === "number" || typeof payload["autoReviewMaxFilesPerBatch"] === "number" || typeof payload["autoReviewMaxConcurrentReviews"] === "number" || typeof payload["autoReviewCascadeOn"] === "string";
+      const autoReviewTouched = typeof payload["autoReviewEnabled"] === "boolean" || typeof payload["autoReviewProvider"] === "string" || typeof payload["autoReviewModel"] === "string" || typeof payload["autoReviewFallbackProfile"] === "string" || typeof payload["autoReviewModelSelection"] === "string" || Array.isArray(payload["autoReviewFallbackModels"]) || typeof payload["autoReviewDebounceMs"] === "number" || typeof payload["autoReviewMaxFilesPerBatch"] === "number" || typeof payload["autoReviewMaxConcurrentReviews"] === "number" || typeof payload["autoReviewCascadeOn"] === "string";
       if (autoReviewTouched) {
         const ext = decrypted.extensions ?? {};
         const ar = ext["wstack-auto-review"] ?? {};
@@ -15229,6 +15728,9 @@ async function persistPrefsToConfig(deps2, holder, payload) {
             ar["fallbackProfile"] = payload["autoReviewFallbackProfile"];
           }
         }
+        if (payload["autoReviewModelSelection"] === "round-robin" || payload["autoReviewModelSelection"] === "random") {
+          ar["modelSelection"] = payload["autoReviewModelSelection"];
+        }
         if (typeof payload["autoReviewDebounceMs"] === "number" && payload["autoReviewDebounceMs"] >= 0) {
           ar["debounceMs"] = payload["autoReviewDebounceMs"];
         }
@@ -15299,39 +15801,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 randomUUID4 } from "node:crypto";
-import {
-  isTrustDecisionAllowed
-} from "@wrongstack/core/security";
-async function authorizeWebUIAction(boundary, action, logger) {
-  const request = {
-    version: 1,
-    requestId: randomUUID4(),
-    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();
@@ -15630,6 +16099,7 @@ function createProjectHandlers(ctx) {
         ctx.context.session = next;
         ctx.context.state.replaceMessages([]);
         ctx.context.state.replaceTodos([]);
+        ctx.context.clearMemoryEvidence?.();
         ctx.context.readFiles.clear();
         ctx.context.fileMtimes.clear();
         ctx.tokenCounter.reset();
@@ -15674,7 +16144,7 @@ function createProjectHandlers(ctx) {
 }
 
 // src/server/provider-handlers.ts
-import { resolveProviderModelList } from "@wrongstack/core/models";
+import { hasProviderCredential, resolveProviderModelList } from "@wrongstack/core/models";
 import { DefaultSecretScrubber as DefaultSecretScrubber2 } from "@wrongstack/core/security";
 import { toErrorMessage as toErrorMessage6 } from "@wrongstack/core/utils";
 import {
@@ -15981,7 +16451,7 @@ function createProviderOperations(deps2) {
     }
     try {
       const providers = await deps2.modelsRegistry.listProviders();
-      const savedIds = new Set(Object.keys(await loadConfigProviders()));
+      const savedProviders = await loadConfigProviders();
       sendMessage(ws, {
         type: "provider.catalog",
         payload: {
@@ -15992,7 +16462,7 @@ function createProviderOperations(deps2) {
             apiBase: provider.apiBase,
             envVars: provider.envVars,
             modelCount: provider.models.length,
-            hasApiKey: savedIds.has(provider.id) || provider.envVars.some((name2) => !!process.env[name2])
+            hasApiKey: hasProviderCredential(provider, { providers: savedProviders })
           }))
         }
       });
@@ -16155,8 +16625,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) {
@@ -16537,9 +17009,11 @@ var CLIENT_CONVERSATION_MESSAGE_TYPES = [
   "ping",
   "user_message",
   "tool.confirm_result",
+  "topic.advice",
   "completion.request",
   "model.switch",
   "model.refine",
+  "model.fallback_choice",
   "autonomy.switch",
   "context.clear",
   "context.compact",
@@ -16811,6 +17285,7 @@ var SERVER_CONVERSATION_MESSAGE_TYPES = [
   "provider.active_blocked",
   "provider.error",
   "provider.fallback",
+  "provider.fallback_pending",
   "provider.response",
   "provider.retry",
   "provider.status_changed",
@@ -16837,6 +17312,7 @@ var SERVER_CONVERSATION_MESSAGE_TYPES = [
   "tool.loop_detected",
   "tool.progress",
   "tool.started",
+  "topic.advice_result",
   "tools.list",
   "trust.persisted"
 ];
@@ -16852,6 +17328,7 @@ var SERVER_COLLABORATION_MESSAGE_TYPES = [
   "collab.state",
   "mailbox.action_result",
   "mailbox.agent_registered",
+  "mailbox.agent_deregistered",
   "mailbox.agents",
   "mailbox.cleared",
   "mailbox.compacted",
@@ -17231,6 +17708,13 @@ function projectToolMessage(message) {
   }
   return null;
 }
+function optionalFinite(value) {
+  if (typeof value !== "number" || !Number.isFinite(value)) return void 0;
+  return value;
+}
+function optionalString2(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
 function projectFleetMessage(message) {
   const payload = record(message.payload);
   if (!payload) return null;
@@ -17239,7 +17723,15 @@ function projectFleetMessage(message) {
       return {
         kind: "concurrency",
         active: finite(payload["fleetConcurrency"]),
-        maximum: finite(payload["fleetConcurrencyMax"])
+        maximum: finite(payload["fleetConcurrencyMax"]),
+        maxSpawns: optionalFinite(payload["maxSpawns"]),
+        usedSpawns: optionalFinite(payload["usedSpawns"]),
+        remainingSpawns: optionalFinite(payload["remainingSpawns"]),
+        maxSpawnsSource: optionalString2(payload["maxSpawnsSource"]),
+        maxConcurrentSource: optionalString2(payload["maxConcurrentSource"]),
+        effectiveSource: optionalString2(payload["effectiveSource"]),
+        checkpointMaxSpawns: optionalFinite(payload["checkpointMaxSpawns"]),
+        ceilingMismatch: payload["ceilingMismatch"] === true ? true : void 0
       };
     case "client.status_update":
       return { kind: "client-status", status: payload };
@@ -17330,6 +17822,8 @@ var SURFACE_PROTOCOL_CAPABILITIES = [
   "chronicle.metrics",
   "chronicle.status",
   "connections.health",
+  /** Bounded topic-shift advice plus same-session provider-context boundaries. */
+  "context.topic-boundary",
   /** Interview resume/discard + lastAgentText/lastRunId continuity. */
   "sdd.interview.continuity",
   /** Launch multi-agent runs from a graph id or resolved spec id. */
@@ -17734,6 +18228,7 @@ function createSessionHandlers(ctx) {
     await ctx.onBeforeSessionTodosReplaced?.(next.id, sessionsDirectory());
     ctx.context.state.replaceTodos(todos);
     resetContextAccounting();
+    ctx.context.clearMemoryEvidence?.();
     ctx.context.readFiles.clear();
     ctx.context.fileMtimes.clear();
     ctx.context.state.setMeta?.(
@@ -17781,6 +18276,7 @@ function createSessionHandlers(ctx) {
         ctx.context.state.replaceMessages([]);
         ctx.context.state.replaceTodos([]);
         resetContextAccounting();
+        ctx.context.clearMemoryEvidence?.();
         ctx.context.readFiles.clear();
         ctx.context.fileMtimes.clear();
         ctx.tokenCounter.reset?.();
@@ -17795,6 +18291,7 @@ function createSessionHandlers(ctx) {
       ctx.context.state.replaceMessages([]);
       ctx.context.state.replaceTodos([]);
       resetContextAccounting();
+      ctx.context.clearMemoryEvidence?.();
       ctx.context.readFiles.clear();
       ctx.context.fileMtimes.clear();
       ctx.tokenCounter.reset?.();
@@ -17895,6 +18392,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
       });
@@ -17911,6 +18409,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
       });
@@ -18892,6 +19391,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;
@@ -19056,13 +19568,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;
     }
@@ -19070,7 +19586,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;
     }
@@ -19078,7 +19595,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;
     }
@@ -19090,11 +19608,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,
@@ -19102,20 +19620,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;
     }
@@ -19147,7 +19667,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;
     }
@@ -19157,7 +19678,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")
@@ -19177,7 +19698,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;
     }
@@ -19186,7 +19708,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);
@@ -19225,7 +19747,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,
@@ -19242,7 +19765,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;
@@ -19553,6 +20077,7 @@ function createEmbeddedMessageRouter(deps2) {
   };
   const guardedTypes = /* @__PURE__ */ new Set([
     "user_message",
+    "topic.advice",
     "abort",
     "tool.confirm_result",
     "session.new",
@@ -19600,8 +20125,10 @@ function createEmbeddedMessageRouter(deps2) {
   };
   const mcp = {
     list: (ws, msg) => handleMcpList(ws, msg, opts.profileConfigPath, opts.mcpRegistry),
-    add: (ws, msg) => handleMcpAdd(ws, msg, opts.profileConfigPath, opts.mcpRegistry),
-    update: (ws, msg) => handleMcpUpdate(ws, msg, opts.profileConfigPath, opts.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, opts.profileConfigPath, opts.mcpRegistry, deps2.trustBoundary),
+    update: (ws, msg) => handleMcpUpdate(ws, msg, opts.profileConfigPath, opts.mcpRegistry, deps2.trustBoundary),
     remove: (ws, msg) => handleMcpRemove(ws, msg, opts.profileConfigPath, opts.mcpRegistry),
     enable: (ws, msg) => handleMcpEnable(ws, msg, opts.profileConfigPath, opts.mcpRegistry),
     disable: (ws, msg) => handleMcpDisable(ws, msg, opts.profileConfigPath, opts.mcpRegistry),
@@ -19688,6 +20215,15 @@ function createEmbeddedMessageRouter(deps2) {
     searchProviderModels: (ws, query, limit) => providerOperations.handleProviderModelsSearch(ws, query, limit),
     switchModel: (ws, msg) => modelOperations.switchModel(ws, msg.payload),
     refineModel: (ws, msg) => modelOperations.refineModel(ws, msg.payload),
+    fallbackChoice: async (ws, msg) => {
+      const result = emitFallbackChoice(deps2.sessionCtx.opts.events, msg);
+      if (!result.ok) {
+        send2(ws, {
+          type: "error",
+          payload: { phase: "invalid_request", message: result.message }
+        });
+      }
+    },
     adoptDefaultProviderIfUnset: providerOperations.adoptDefaultProviderIfUnset,
     providerHandlers: providerOperations,
     statusTracker: deps2.statusTracker
@@ -19869,6 +20405,8 @@ function createEmbeddedMessageRouter(deps2) {
     ))
       return;
     if (await handleConnectionsServiceAction(ws, message, {
+      trustBoundary: deps2.trustBoundary,
+      logger: deps2.logger,
       getProjectRoot: projectRoot,
       getIndexDir: () => typeof opts.agent.ctx.meta["codebaseIndexDir"] === "string" ? opts.agent.ctx.meta["codebaseIndexDir"] : void 0,
       send: send2,
@@ -19981,17 +20519,12 @@ function createProviderStore(deps2) {
       cfg.activeKey = active.label;
     }
   }
-  function maskedKey2(key) {
-    if (!key) return "\u2014";
-    if (key.length <= 8) return "\u2022".repeat(key.length);
-    return `${key.slice(0, 4)}\u2026${key.slice(-4)}`;
-  }
   return {
     load: loadSavedProviders2,
     save: saveProviders2,
     normalizeKeys: normalizeKeys2,
     writeKeysBack: writeKeysBack2,
-    maskedKey: maskedKey2
+    maskedKey
   };
 }
 
@@ -20860,7 +21393,7 @@ function registerSetupEventsClientStatusWriter(deps2) {
   const on = (event, listener) => events.on(event, listener);
   return on("client.status", async (e) => {
     broadcast2(clients, { type: "client.status_update", payload: e });
-    if (wpaths?.projectStatus) {
+    if (wpaths?.projectStatus && e.projectHash !== "unknown") {
       try {
         const statusFile = wpaths.projectStatus(e.projectHash);
         const dir = path24.dirname(statusFile);
@@ -21035,7 +21568,10 @@ function registerSetupEventsProviderHandlers({
         sessionId: e.sessionId,
         providerId: e.providerId,
         modelId: e.modelId,
-        maxContext: e.maxContext
+        maxContext: e.maxContext,
+        ...e.previousMaxContext !== void 0 ? { previousMaxContext: e.previousMaxContext } : {},
+        ...e.source !== void 0 ? { source: e.source } : {},
+        ...e.decreased !== void 0 ? { decreased: e.decreased } : {}
       })
     });
   });
@@ -21732,7 +22268,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
       })
     });
   });
@@ -21817,6 +22368,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 }) });
@@ -22121,7 +22681,15 @@ var SpecsWebSocketHandler = class {
     this.clients.add(client);
     ws.on("close", () => this.clients.delete(client));
     ws.on("error", () => this.clients.delete(client));
-    void this.sendList(client);
+    void this.sendList(client).catch((err) => {
+      console.warn(
+        JSON.stringify({
+          level: "warn",
+          event: "specs.initial_send_failed",
+          message: err instanceof Error ? err.message : String(err)
+        })
+      );
+    });
   }
   dispose() {
     this.clients.clear();
@@ -22335,15 +22903,17 @@ import {
 
 // src/server/discover-mailbox-bridge.ts
 import { spawn as spawn4 } from "node:child_process";
-import { createRequire } from "node:module";
 import { existsSync as existsSync2 } from "node:fs";
+import { createRequire } from "node:module";
 import { dirname as dirname10, join as join13 } from "node:path";
-import { resolveProjectDir as resolveProjectDir3 } from "@wrongstack/core/coordination";
+import {
+  readLiveLock,
+  resolveProjectDir as resolveProjectDir3
+} from "@wrongstack/core/coordination";
 import { wstackGlobalRoot as wstackGlobalRoot3 } from "@wrongstack/core/utils";
-import { readLiveLock } from "@wrongstack/core/coordination";
 var MAILBOX_BRIDGE_BOOT_TIMEOUT_MS = 5e3;
 async function discoverMailboxBridgeForWebui(params) {
-  const mode = params.config?.features?.mailboxBridge ?? "auto";
+  const mode = params.config?.features?.mailboxBridge ?? "off";
   if (mode === "off") return;
   const projectDir = resolveProjectDir3(params.projectRoot, wstackGlobalRoot3());
   let result = await readLiveLock(projectDir);
@@ -22605,6 +23175,13 @@ var TerminalWebSocketHandler = class {
       this.send(ws, { type: "terminal.exit", payload: { id: payload.id, exitCode: -1 } });
       return;
     }
+    if (this.sessions.get(ws) !== map) {
+      this.logger.info?.(
+        `terminal.create raced a disconnect (id=${payload.id}) \u2014 killing the orphan`
+      );
+      this.killPty(pty, "terminal create after disconnect");
+      return;
+    }
     map.set(payload.id, pty);
     this.logger.info?.(`terminal.create spawned (id=${payload.id}, pid=${pty.pid ?? "?"}) in ${cwd}`);
     pty.onData((data) => {
@@ -24030,6 +24607,15 @@ function createMessageDispatcher(opts) {
       msg
     ))
       return;
+    if (await handleConnectionsServiceAction(ws, msg, {
+      trustBoundary: deps2.trustBoundary,
+      logger: deps2.logger,
+      getProjectRoot: state.getProjectRoot,
+      getIndexDir: () => typeof deps2.context.meta["codebaseIndexDir"] === "string" ? deps2.context.meta["codebaseIndexDir"] : void 0,
+      send,
+      backend: "standalone"
+    }))
+      return;
     if (await handleCodebaseIndexServerControl(ws, msg, {
       trustBoundary: deps2.trustBoundary,
       logger: deps2.logger,
@@ -24101,29 +24687,10 @@ import { attachSessionKanbanMirror, hydrateSessionKanban } from "@wrongstack/too
 // src/server/model-auto-discovery.ts
 import * as fs21 from "node:fs/promises";
 import * as path29 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 fs21.readFile(file, "utf8"));
@@ -24134,14 +24701,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 = path29.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,
@@ -24507,15 +25073,6 @@ async function createPreContextServices(input) {
       logger.warn(`models.dev refresh failed (${toErrorMessage12(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: ${toErrorMessage12(err)}`);
-  }
   try {
     await discoverAndMergeWebuiProviders({
       config,
@@ -24526,6 +25083,15 @@ async function createPreContextServices(input) {
   } catch (err) {
     logger.debug(`provider auto-discovery skipped: ${toErrorMessage12(err)}`);
   }
+  try {
+    await installCatalogModelOutputLimits({
+      registry: modelsRegistry,
+      getConfig: () => config,
+      log: (message) => logger.debug(message)
+    });
+  } catch (err) {
+    logger.debug(`model output-limit index skipped: ${toErrorMessage12(err)}`);
+  }
   const events = opts.services?.events ?? new EventBus();
   events.setLogger(logger);
   const container = createDefaultContainer({ config, wpaths, logger, modelsRegistry, events });
@@ -24556,6 +25122,7 @@ async function createPreContextServices(input) {
       registry: toolRegistry,
       tier: normalizeTokenSavingTier(config.features.tokenSavingMode),
       memory: { enabled: config.features.memory, store: memoryStore },
+      nextSteps: { enabled: config.tools?.nextsteps?.enabled === true },
       coordinationTools: [
         makeMailboxTool({ projectDir: wpaths.projectDir, events }),
         makeMailSendTool({ projectDir: wpaths.projectDir, events }),
@@ -24912,7 +25479,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(),
@@ -25090,8 +25666,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),
@@ -25263,7 +25841,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({
@@ -25729,7 +26310,8 @@ async function startWebUI(opts = {}) {
     watcherMetricsRef
   );
   httpServer.listen(httpPort, wsHost, () => {
-    console.log(`[WebUI] HTTP server running on http://${wsHost}:${httpPort}`);
+    const tokenQuery = accessToken ? `/?token=${encodeURIComponent(accessToken)}` : "";
+    console.log(`[WebUI] HTTP server running on http://${wsHost}:${httpPort}${tokenQuery}`);
     const extraUrls = formatExternalAccessUrls({
       bindHost: wsHost,
       port: httpPort,
@@ -25751,8 +26333,11 @@ async function startWebUI(opts = {}) {
       (req, socket, head2) => httpServer.emit("upgrade", req, socket, head2)
     );
     companionServer.on("error", (err) => {
-      if (err.code !== "EAFNOSUPPORT" && err.code !== "EADDRNOTAVAIL" && err.code !== "EADDRINUSE") {
-        throw err;
+      const expected = err.code === "EAFNOSUPPORT" || err.code === "EADDRNOTAVAIL" || err.code === "EADDRINUSE";
+      if (!expected) {
+        console.warn(
+          `[WebUI] companion listener on ${companionLabel} failed (${err.code ?? "unknown"}): ${err.message}. The primary address is unaffected.`
+        );
       }
     });
     companionServer.listen(httpPort, companion, () => {
@@ -25994,24 +26579,23 @@ async function startWebUI(opts = {}) {
     clients,
     pendingConfirms,
     onSecurityRejection: (ev) => {
-      try {
-        void mailbox.send({
-          from: context.agentId,
-          to: "*",
-          type: "note",
-          audience: "leaders",
-          subject: `Security rejection: ${ev.issueCode}`,
-          body: `Decoder tripwire ${ev.issueCode}: ${ev.issueMessage}
+      void mailbox.send({
+        from: context.agentId,
+        to: "*",
+        type: "note",
+        audience: "leaders",
+        subject: `Security rejection: ${ev.issueCode}`,
+        body: `Decoder tripwire ${ev.issueCode}: ${ev.issueMessage}
 
 connectionId: ${ev.connectionId ?? "?"}
 sessionId: ${ev.sessionId ?? "?"}
 agentId: ${ev.agentId ?? "?"}
 projectRoot: ${ev.projectRoot ?? "?"}`,
-          priority: "high",
-          senderSessionId: session.id
-        });
-      } catch {
-      }
+        priority: "high",
+        senderSessionId: session.id
+      }).catch((err) => {
+        console.warn(`[WebUI] security-rejection mailbox note failed: ${String(err)}`);
+      });
     },
     goalHandler,
     specsHandler,
@@ -26096,6 +26680,7 @@ export {
   SddWizardWebSocketHandler,
   SpecsWebSocketHandler,
   TerminalWebSocketHandler,
+  WEBUI_WS_MAX_BUFFERED_BYTES,
   WorktreeWebSocketHandler,
   addProvider,
   announceWebuiReady,
@@ -26350,6 +26935,7 @@ export {
   seedContextMeta,
   send,
   sendResult2 as sendResult,
+  sendSerialized,
   setActiveKey,
   setupEvents,
   setupWebUICodebaseIndexing,