@wrongstack/webui 0.66.13 → 0.68.0

package/dist/server/index.js

@@ -1624,6 +1624,68 @@ function computeUsageCost(usage, rates) {
   return (usage.input * rates.input + usage.output * rates.output + (usage.cacheRead ?? 0) * rates.cacheRead) / 1e6;
 }
 
+// src/server/provider-config-io.ts
+import * as fs3 from "fs/promises";
+import * as path3 from "path";
+import { atomicWrite as atomicWrite2 } from "@wrongstack/core";
+import { decryptConfigSecrets, encryptConfigSecrets } from "@wrongstack/core/security";
+import { DefaultSecretVault } from "@wrongstack/core";
+async function loadSavedProviders(configPath, vault) {
+  let raw;
+  try {
+    raw = await fs3.readFile(configPath, "utf8");
+  } catch {
+    return {};
+  }
+  let parsed = {};
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return {};
+  }
+  if (!parsed.providers) return {};
+  return decryptConfigSecrets(parsed.providers, vault);
+}
+async function saveProviders(configPath, vault, providers) {
+  let raw;
+  let fileExists = true;
+  try {
+    raw = await fs3.readFile(configPath, "utf8");
+  } catch (err) {
+    if (err.code !== "ENOENT") {
+      throw new Error(
+        `Refusing to mutate ${configPath}: ${err.message}`,
+        { cause: err }
+      );
+    }
+    fileExists = false;
+    raw = "{}";
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (err) {
+    if (fileExists) {
+      throw new Error(
+        `Refusing to overwrite corrupt config at ${configPath} (${err.message}). Fix or move the file aside before retrying.`,
+        { cause: err }
+      );
+    }
+    parsed = {};
+  }
+  parsed.providers = providers;
+  const encrypted = encryptConfigSecrets(parsed, vault);
+  await atomicWrite2(configPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
+}
+function createProviderConfigIO(configPath) {
+  const keyFile = path3.join(path3.dirname(configPath), ".key");
+  const vault = new DefaultSecretVault({ keyFile });
+  return {
+    load: () => loadSavedProviders(configPath, vault),
+    save: (providers) => saveProviders(configPath, vault, providers)
+  };
+}
+
 // src/server/provider-keys.ts
 function normalizeKeys(cfg) {
   if (Array.isArray(cfg.apiKeys) && cfg.apiKeys.length > 0) {
@@ -1719,68 +1781,6 @@ function removeProvider(providers, providerId) {
   return { ok: true, message: `Provider "${providerId}" removed` };
 }
 
-// src/server/provider-config-io.ts
-import * as fs3 from "fs/promises";
-import * as path3 from "path";
-import { atomicWrite as atomicWrite2 } from "@wrongstack/core";
-import { decryptConfigSecrets, encryptConfigSecrets } from "@wrongstack/core/security";
-import { DefaultSecretVault } from "@wrongstack/core";
-async function loadSavedProviders(configPath, vault) {
-  let raw;
-  try {
-    raw = await fs3.readFile(configPath, "utf8");
-  } catch {
-    return {};
-  }
-  let parsed = {};
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    return {};
-  }
-  if (!parsed.providers) return {};
-  return decryptConfigSecrets(parsed.providers, vault);
-}
-async function saveProviders(configPath, vault, providers) {
-  let raw;
-  let fileExists = true;
-  try {
-    raw = await fs3.readFile(configPath, "utf8");
-  } catch (err) {
-    if (err.code !== "ENOENT") {
-      throw new Error(
-        `Refusing to mutate ${configPath}: ${err.message}`,
-        { cause: err }
-      );
-    }
-    fileExists = false;
-    raw = "{}";
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch (err) {
-    if (fileExists) {
-      throw new Error(
-        `Refusing to overwrite corrupt config at ${configPath} (${err.message}). Fix or move the file aside before retrying.`,
-        { cause: err }
-      );
-    }
-    parsed = {};
-  }
-  parsed.providers = providers;
-  const encrypted = encryptConfigSecrets(parsed, vault);
-  await atomicWrite2(configPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
-}
-function createProviderConfigIO(configPath) {
-  const keyFile = path3.join(path3.dirname(configPath), ".key");
-  const vault = new DefaultSecretVault({ keyFile });
-  return {
-    load: () => loadSavedProviders(configPath, vault),
-    save: (providers) => saveProviders(configPath, vault, providers)
-  };
-}
-
 // src/server/ws-utils.ts
 import { randomBytes } from "crypto";
 import { WebSocket } from "ws";
@@ -1810,6 +1810,130 @@ function generateAuthToken() {
   return randomBytes(16).toString("hex");
 }
 
+// src/server/provider-handlers.ts
+function createProviderHandlers(deps) {
+  const { globalConfigPath, vault } = deps;
+  let configWriteLock = deps.getConfigWriteLock();
+  async function loadConfigProviders() {
+    return loadSavedProviders(globalConfigPath, vault);
+  }
+  async function saveConfigProviders(providers) {
+    const next = configWriteLock.then(() => saveProviders(globalConfigPath, vault, providers));
+    configWriteLock = next;
+    deps.setConfigWriteLock(next);
+    await next;
+  }
+  async function handleKeyUpsert(ws, providerId, label, apiKey) {
+    try {
+      const providers = await loadConfigProviders();
+      const result = upsertKey(providers, providerId, label, apiKey, (/* @__PURE__ */ new Date()).toISOString());
+      if (result.ok) await saveConfigProviders(providers);
+      sendResult(ws, result.ok, result.message);
+    } catch (err) {
+      sendResult(ws, false, errMessage(err));
+    }
+  }
+  async function handleKeyDelete(ws, providerId, label) {
+    try {
+      const providers = await loadConfigProviders();
+      const result = deleteKey(providers, providerId, label);
+      if (result.ok) await saveConfigProviders(providers);
+      sendResult(ws, result.ok, result.message);
+    } catch (err) {
+      sendResult(ws, false, errMessage(err));
+    }
+  }
+  async function handleKeySetActive(ws, providerId, label) {
+    try {
+      const providers = await loadConfigProviders();
+      const result = setActiveKey(providers, providerId, label);
+      if (result.ok) await saveConfigProviders(providers);
+      sendResult(ws, result.ok, result.message);
+    } catch (err) {
+      sendResult(ws, false, errMessage(err));
+    }
+  }
+  async function handleProviderAdd(ws, payload) {
+    try {
+      const providers = await loadConfigProviders();
+      const result = addProvider(providers, payload, (/* @__PURE__ */ new Date()).toISOString());
+      if (result.ok) await saveConfigProviders(providers);
+      sendResult(ws, result.ok, result.message);
+    } catch (err) {
+      sendResult(ws, false, errMessage(err));
+    }
+  }
+  async function handleProviderRemove(ws, providerId) {
+    try {
+      const providers = await loadConfigProviders();
+      const result = removeProvider(providers, providerId);
+      if (result.ok) await saveConfigProviders(providers);
+      sendResult(ws, result.ok, result.message);
+    } catch (err) {
+      sendResult(ws, false, errMessage(err));
+    }
+  }
+  return { handleKeyUpsert, handleKeyDelete, handleKeySetActive, handleProviderAdd, handleProviderRemove, loadConfigProviders };
+}
+
+// src/server/setup-events.ts
+function setupEvents(deps) {
+  const { events, broadcast: broadcast2, clients, config, context, pendingConfirms } = deps;
+  events.on("iteration.started", (e) => {
+    broadcast2(clients, {
+      type: "iteration.started",
+      payload: { index: e.index, maxIterations: config.tools?.maxIterations ?? 100 }
+    });
+  });
+  events.on("provider.text_delta", (e) => {
+    broadcast2(clients, { type: "provider.text_delta", payload: { text: e.text, messageId: "current" } });
+  });
+  events.on("provider.thinking_delta", (e) => {
+    broadcast2(clients, { type: "provider.thinking_delta", payload: { text: e.text } });
+  });
+  events.on("tool.started", (e) => {
+    broadcast2(clients, {
+      type: "tool.started",
+      payload: { id: e.id, name: e.name, input: e.input, messageId: `tool_${e.id}` }
+    });
+  });
+  events.on("tool.progress", (e) => {
+    broadcast2(clients, {
+      type: "tool.progress",
+      payload: { id: e.id, name: e.name, eventType: e.event.type, text: e.event.text }
+    });
+  });
+  events.on("tool.executed", (e) => {
+    broadcast2(clients, {
+      type: "tool.executed",
+      payload: { id: e.id, name: e.name, durationMs: e.durationMs, ok: e.ok, input: e.input, output: e.output }
+    });
+    broadcast2(clients, { type: "todos.updated", payload: { todos: [...context.todos] } });
+  });
+  events.on("provider.response", (e) => {
+    broadcast2(clients, { type: "provider.response", payload: { usage: e.usage, stopReason: e.stopReason, messageId: "current" } });
+  });
+  events.on("context.repaired", (e) => {
+    broadcast2(clients, { type: "context.repaired", payload: { removedToolUses: e.removedToolUses, removedToolResults: e.removedToolResults, removedMessages: e.removedMessages } });
+  });
+  events.on("tool.confirm_needed", (e) => {
+    const id = e.toolUseId ?? `confirm_${Date.now()}`;
+    pendingConfirms.set(id, e.resolve);
+    broadcast2(clients, { type: "tool.confirm_needed", payload: { id, toolName: e.tool?.name ?? "unknown", input: e.input, suggestedPattern: e.suggestedPattern } });
+  });
+  events.on("error", (e) => {
+    broadcast2(clients, { type: "error", payload: { phase: e.phase, message: e.err instanceof Error ? e.err.message : String(e.err) } });
+  });
+  const forwardSubagent = (kind, payload) => broadcast2(clients, { type: "subagent.event", payload: { kind, ...payload } });
+  events.on("subagent.spawned", (e) => forwardSubagent("spawned", { subagentId: e.subagentId, taskId: e.taskId, name: e.name, provider: e.provider, model: e.model, description: e.description }));
+  events.on("subagent.task_started", (e) => forwardSubagent("task_started", { subagentId: e.subagentId, taskId: e.taskId, description: e.description }));
+  events.on("subagent.tool_executed", (e) => forwardSubagent("tool_executed", { subagentId: e.subagentId, toolName: e.name, durationMs: e.durationMs, ok: e.ok }));
+  events.on("subagent.iteration_summary", (e) => forwardSubagent("iteration_summary", { subagentId: e.subagentId, iteration: e.iteration, toolCalls: e.toolCalls, costUsd: e.costUsd, currentTool: e.currentTool }));
+  events.on("subagent.budget_extended", (e) => forwardSubagent("budget_extended", { subagentId: e.subagentId, totalExtensions: e.totalExtensions }));
+  events.on("subagent.ctx_pct", (e) => forwardSubagent("ctx_pct", { subagentId: e.subagentId, load: e.load, tokens: e.tokens, maxContext: e.maxContext }));
+  events.on("subagent.task_completed", (e) => forwardSubagent("task_completed", { subagentId: e.subagentId, status: e.status, iterations: e.iterations, toolCalls: e.toolCalls, error: e.error ? { kind: e.error.kind, message: e.error.message } : void 0 }));
+}
+
 // src/server/token-estimator.ts
 function estimateTokens(s) {
   return Math.ceil(s.length / 4);
@@ -2190,165 +2314,6 @@ async function startWebUI(opts = {}) {
     `[WebUI] WebSocket server running on ws://${wsHost}:${wsPort}` + (wssSecondary ? ` (and ws://[::1]:${wsPort})` : "")
   );
   const pendingConfirms = /* @__PURE__ */ new Map();
-  function setupEvents() {
-    events.on("iteration.started", (e) => {
-      broadcast(clients, {
-        type: "iteration.started",
-        payload: { index: e.index, maxIterations: config.tools?.maxIterations ?? 100 }
-      });
-    });
-    events.on("provider.text_delta", (e) => {
-      broadcast(clients, { type: "provider.text_delta", payload: { text: e.text, messageId: "current" } });
-    });
-    events.on("provider.thinking_delta", (e) => {
-      broadcast(clients, { type: "provider.thinking_delta", payload: { text: e.text } });
-    });
-    events.on("tool.started", (e) => {
-      broadcast(clients, {
-        type: "tool.started",
-        payload: { id: e.id, name: e.name, input: e.input, messageId: `tool_${e.id}` }
-      });
-    });
-    events.on("tool.progress", (e) => {
-      broadcast(clients, {
-        type: "tool.progress",
-        payload: {
-          id: e.id,
-          name: e.name,
-          eventType: e.event.type,
-          text: e.event.text
-        }
-      });
-    });
-    events.on("tool.executed", (e) => {
-      broadcast(clients, {
-        type: "tool.executed",
-        payload: {
-          // Forward the tool_use id so frontend can correlate with the
-          // matching tool.started bubble — without this, parallel tool calls
-          // all stay stuck on "Running…" because the frontend can't tell
-          // which bubble this result belongs to.
-          id: e.id,
-          name: e.name,
-          durationMs: e.durationMs,
-          ok: e.ok,
-          input: e.input,
-          output: e.output
-        }
-      });
-      broadcast(clients, {
-        type: "todos.updated",
-        payload: { todos: [...context.todos] }
-      });
-    });
-    events.on("provider.response", (e) => {
-      broadcast(clients, {
-        type: "provider.response",
-        payload: {
-          usage: e.usage,
-          stopReason: e.stopReason,
-          messageId: "current"
-        }
-      });
-    });
-    events.on("context.repaired", (e) => {
-      broadcast(clients, {
-        type: "context.repaired",
-        payload: {
-          removedToolUses: e.removedToolUses,
-          removedToolResults: e.removedToolResults,
-          removedMessages: e.removedMessages
-        }
-      });
-    });
-    events.on("tool.confirm_needed", (e) => {
-      const id = e.toolUseId ?? `confirm_${Date.now()}`;
-      pendingConfirms.set(id, e.resolve);
-      broadcast(clients, {
-        type: "tool.confirm_needed",
-        payload: {
-          id,
-          toolName: e.tool?.name ?? "unknown",
-          input: e.input,
-          suggestedPattern: e.suggestedPattern
-        }
-      });
-    });
-    events.on("error", (e) => {
-      broadcast(clients, {
-        type: "error",
-        payload: {
-          phase: e.phase,
-          message: e.err instanceof Error ? e.err.message : String(e.err)
-        }
-      });
-    });
-    const forwardSubagent = (kind, payload) => broadcast(clients, { type: "subagent.event", payload: { kind, ...payload } });
-    events.on(
-      "subagent.spawned",
-      (e) => forwardSubagent("spawned", {
-        subagentId: e.subagentId,
-        taskId: e.taskId,
-        name: e.name,
-        provider: e.provider,
-        model: e.model,
-        description: e.description
-      })
-    );
-    events.on(
-      "subagent.task_started",
-      (e) => forwardSubagent("task_started", {
-        subagentId: e.subagentId,
-        taskId: e.taskId,
-        description: e.description
-      })
-    );
-    events.on(
-      "subagent.tool_executed",
-      (e) => forwardSubagent("tool_executed", {
-        subagentId: e.subagentId,
-        toolName: e.name,
-        durationMs: e.durationMs,
-        ok: e.ok
-      })
-    );
-    events.on(
-      "subagent.iteration_summary",
-      (e) => forwardSubagent("iteration_summary", {
-        subagentId: e.subagentId,
-        iteration: e.iteration,
-        toolCalls: e.toolCalls,
-        costUsd: e.costUsd,
-        currentTool: e.currentTool
-      })
-    );
-    events.on(
-      "subagent.budget_extended",
-      (e) => forwardSubagent("budget_extended", {
-        subagentId: e.subagentId,
-        totalExtensions: e.totalExtensions
-      })
-    );
-    events.on(
-      "subagent.ctx_pct",
-      (e) => forwardSubagent("ctx_pct", {
-        subagentId: e.subagentId,
-        load: e.load,
-        tokens: e.tokens,
-        maxContext: e.maxContext
-      })
-    );
-    events.on(
-      "subagent.task_completed",
-      (e) => forwardSubagent("task_completed", {
-        subagentId: e.subagentId,
-        status: e.status,
-        iterations: e.iterations,
-        toolCalls: e.toolCalls,
-        error: e.error ? { kind: e.error.kind, message: e.error.message } : void 0
-      })
-    );
-  }
   const handleConnection = (ws) => {
     const client = { ws, sessionId: session.id, connectedAt: Date.now() };
     clients.set(ws, client);
@@ -2406,7 +2371,7 @@ async function startWebUI(opts = {}) {
     if (eventsArmed) return;
     eventsArmed = true;
     console.log(`[WebUI] Backend ready (${label})`);
-    setupEvents();
+    setupEvents({ events, broadcast, clients, config, context, pendingConfirms });
   };
   wssPrimary.on("listening", () => armOnce(`${wsHost}:${wsPort}`));
   wssPrimary.on("connection", handleConnection);
@@ -2643,7 +2608,7 @@ async function startWebUI(opts = {}) {
         break;
       }
       case "providers.saved": {
-        const saved = await loadConfigProviders();
+        const saved = await providerHandlers.loadConfigProviders();
         send(ws, {
           type: "providers.saved",
           payload: {
@@ -2732,27 +2697,27 @@ async function startWebUI(opts = {}) {
       case "key.add":
       case "key.update": {
         const { providerId, label, apiKey } = msg.payload;
-        await handleKeyUpsert(ws, providerId, label, apiKey);
+        await providerHandlers.handleKeyUpsert(ws, providerId, label, apiKey);
         break;
       }
       case "key.delete": {
         const { providerId, label } = msg.payload;
-        await handleKeyDelete(ws, providerId, label);
+        await providerHandlers.handleKeyDelete(ws, providerId, label);
         break;
       }
       case "key.set_active": {
         const { providerId, label } = msg.payload;
-        await handleKeySetActive(ws, providerId, label);
+        await providerHandlers.handleKeySetActive(ws, providerId, label);
         break;
       }
       case "provider.add": {
         const p = msg.payload;
-        await handleProviderAdd(ws, p);
+        await providerHandlers.handleProviderAdd(ws, p);
         break;
       }
       case "provider.remove": {
         const { providerId } = msg.payload;
-        await handleProviderRemove(ws, providerId);
+        await providerHandlers.handleProviderRemove(ws, providerId);
         break;
       }
       case "sessions.list": {
@@ -3137,65 +3102,14 @@ async function startWebUI(opts = {}) {
         }
     }
   }
-  async function loadConfigProviders() {
-    return loadSavedProviders(globalConfigPath, vault);
-  }
-  async function saveConfigProviders(providers) {
-    configWriteLock = configWriteLock.then(
-      () => saveProviders(globalConfigPath, vault, providers)
-    );
-    await configWriteLock;
-  }
-  async function handleKeyUpsert(ws, providerId, label, apiKey) {
-    try {
-      const providers = await loadConfigProviders();
-      const result = upsertKey(providers, providerId, label, apiKey, (/* @__PURE__ */ new Date()).toISOString());
-      if (result.ok) await saveConfigProviders(providers);
-      sendResult(ws, result.ok, result.message);
-    } catch (err) {
-      sendResult(ws, false, errMessage(err));
+  const providerHandlers = createProviderHandlers({
+    globalConfigPath,
+    vault,
+    getConfigWriteLock: () => configWriteLock,
+    setConfigWriteLock: (p) => {
+      configWriteLock = p;
     }
-  }
-  async function handleKeyDelete(ws, providerId, label) {
-    try {
-      const providers = await loadConfigProviders();
-      const result = deleteKey(providers, providerId, label);
-      if (result.ok) await saveConfigProviders(providers);
-      sendResult(ws, result.ok, result.message);
-    } catch (err) {
-      sendResult(ws, false, errMessage(err));
-    }
-  }
-  async function handleKeySetActive(ws, providerId, label) {
-    try {
-      const providers = await loadConfigProviders();
-      const result = setActiveKey(providers, providerId, label);
-      if (result.ok) await saveConfigProviders(providers);
-      sendResult(ws, result.ok, result.message);
-    } catch (err) {
-      sendResult(ws, false, errMessage(err));
-    }
-  }
-  async function handleProviderAdd(ws, payload) {
-    try {
-      const providers = await loadConfigProviders();
-      const result = addProvider(providers, payload, (/* @__PURE__ */ new Date()).toISOString());
-      if (result.ok) await saveConfigProviders(providers);
-      sendResult(ws, result.ok, result.message);
-    } catch (err) {
-      sendResult(ws, false, errMessage(err));
-    }
-  }
-  async function handleProviderRemove(ws, providerId) {
-    try {
-      const providers = await loadConfigProviders();
-      const result = removeProvider(providers, providerId);
-      if (result.ok) await saveConfigProviders(providers);
-      sendResult(ws, result.ok, result.message);
-    } catch (err) {
-      sendResult(ws, false, errMessage(err));
-    }
-  }
+  });
   const httpServer = createHttpServer({
     host: wsHost,
     distDir: path4.resolve(import.meta.dirname, "../../dist"),