@wrongstack/webui 0.3.3 → 0.3.7

package/dist/server/index.js

@@ -25,8 +25,7 @@ import {
   resolveContextWindowPolicy
 } from "@wrongstack/core";
 import { buildProviderFactoriesFromRegistry, makeProviderFromConfig } from "@wrongstack/providers";
-import { forgetTool, rememberTool } from "@wrongstack/tools";
-import { builtinToolsPack } from "@wrongstack/tools/pack";
+import { builtinToolsPack, forgetTool, rememberTool } from "@wrongstack/tools";
 import { WebSocket, WebSocketServer } from "ws";
 import { randomBytes } from "crypto";
 import { createDefaultContainer } from "@wrongstack/runtime";
@@ -82,6 +81,7 @@ async function startWebUI(opts = {}) {
   const boot = await bootConfig();
   const { config: baseConfig, vault, globalConfigPath, projectRoot, wpaths, logger } = boot;
   let config = baseConfig;
+  let configWriteLock = Promise.resolve();
   console.log("[WebUI] Config loaded:", config.provider, "/", config.model);
   const modelsRegistry = new DefaultModelsRegistry({
     cacheFile: wpaths.modelsCache,
@@ -290,6 +290,7 @@ async function startWebUI(opts = {}) {
   console.log(
     `[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({
@@ -361,6 +362,19 @@ async function startWebUI(opts = {}) {
         }
       });
     });
+    events.on("tool.confirm_needed", (e) => {
+      const id = e.toolUseId ?? `confirm_${Date.now()}`;
+      pendingConfirms.set(id, e.resolve);
+      broadcast({
+        type: "tool.confirm_needed",
+        payload: {
+          id,
+          toolName: e.tool?.name ?? "unknown",
+          input: e.input,
+          suggestedPattern: e.suggestedPattern
+        }
+      });
+    });
     events.on("error", (e) => {
       broadcast({
         type: "error",
@@ -402,6 +416,12 @@ async function startWebUI(opts = {}) {
     ws.on("close", () => {
       clients.delete(ws);
       console.log("[WebUI] Client disconnected, total:", clients.size);
+      if (pendingConfirms.size > 0) {
+        for (const [id, resolve] of pendingConfirms) {
+          resolve("no");
+          pendingConfirms.delete(id);
+        }
+      }
     });
     ws.on("error", (err) => {
       console.warn("[WebUI] Client socket error:", err.message);
@@ -476,6 +496,15 @@ async function startWebUI(opts = {}) {
         }
         break;
       }
+      case "tool.confirm_result": {
+        const { id, decision } = msg.payload;
+        const resolve = pendingConfirms.get(id);
+        if (resolve) {
+          pendingConfirms.delete(id);
+          resolve(decision);
+        }
+        break;
+      }
       case "abort":
         runLock?.abort();
         broadcast({ type: "error", payload: { phase: "abort", message: "User aborted" } });
@@ -709,11 +738,14 @@ async function startWebUI(opts = {}) {
           const newProv = providerRegistry.has(newProvider) ? providerRegistry.create({ ...providerCfg, type: newProvider }) : makeProviderFromConfig(newProvider, providerCfg);
           context.provider = newProv;
           try {
-            const raw = await fs2.readFile(globalConfigPath, "utf8");
-            const parsed = JSON.parse(raw);
-            parsed.provider = newProvider;
-            parsed.model = newModel;
-            await atomicWrite(globalConfigPath, JSON.stringify(parsed, null, 2));
+            configWriteLock = configWriteLock.then(async () => {
+              const raw = await fs2.readFile(globalConfigPath, "utf8");
+              const parsed = JSON.parse(raw);
+              parsed.provider = newProvider;
+              parsed.model = newModel;
+              await atomicWrite(globalConfigPath, JSON.stringify(parsed, null, 2));
+            });
+            await configWriteLock;
           } catch (err) {
             console.warn("[WebUI] Failed to save config:", err);
           }
@@ -760,11 +792,11 @@ async function startWebUI(opts = {}) {
         await handleProviderRemove(ws, providerId);
         break;
       }
-      case "providers.saved": {
+      case "providers.list": {
         try {
           const providers = await loadSavedProviders();
           send(ws, {
-            type: "providers.saved",
+            type: "providers.list",
             payload: {
               providers: Object.entries(providers).map(([id, cfg]) => ({
                 id,
@@ -780,7 +812,7 @@ async function startWebUI(opts = {}) {
             }
           });
         } catch {
-          send(ws, { type: "providers.saved", payload: { providers: [] } });
+          send(ws, { type: "providers.list", payload: { providers: [] } });
         }
         break;
       }
@@ -1156,15 +1188,18 @@ async function startWebUI(opts = {}) {
     }
   }
   async function saveProviders(providers) {
-    let parsed;
-    try {
-      const raw = await fs2.readFile(globalConfigPath, "utf8");
-      parsed = JSON.parse(raw);
-    } catch {
-      parsed = {};
-    }
-    parsed["providers"] = providers;
-    await atomicWrite(globalConfigPath, JSON.stringify(parsed, null, 2), { mode: 384 });
+    configWriteLock = configWriteLock.then(async () => {
+      let parsed;
+      try {
+        const raw = await fs2.readFile(globalConfigPath, "utf8");
+        parsed = JSON.parse(raw);
+      } catch {
+        parsed = {};
+      }
+      parsed["providers"] = providers;
+      await atomicWrite(globalConfigPath, JSON.stringify(parsed, null, 2), { mode: 384 });
+    });
+    await configWriteLock;
   }
   function normalizeKeys(cfg) {
     if (Array.isArray(cfg.apiKeys) && cfg.apiKeys.length > 0) {