neural-loom 0.2.69 → 0.3.0

package/src/lib/agents/AgentRunner.ts

@@ -1,5 +1,11 @@
 import fs from "fs";
 import path from "path";
+import { getConfigDir } from "../config";
+import { SessionPersister } from "./SessionPersister";
+import { estimateCost } from "./pricing";
+
+/** Maximum number of log chunks retained per session (older chunks are dropped). */
+export const MAX_LOG_LINES = 5000;
 
 export interface RunnerStatus {
   id: string;
@@ -40,6 +46,8 @@ export abstract class AgentRunner {
   lastSyncedWorkspaceFolders?: string[];
   tokenUsage: { input: number; output: number; cost: number } = { input: 0, output: 0, cost: 0 };
   agentState: 'idle' | 'thinking' | 'complete' | 'needs-input' = 'idle';
+  /** Model name, when known, used for fallback cost estimation. */
+  protected model?: string;
   protected hasAnalyzedInitialState = false;
   private stateTimer: NodeJS.Timeout | null = null;
   private idleTimer: NodeJS.Timeout | null = null;
@@ -64,10 +72,9 @@ export abstract class AgentRunner {
 
     if (diffInput > 0 || diffOutput > 0 || diffCost > 0) {
       try {
-        const configDir = path.join(process.cwd(), ".ai", "neural-loom");
-        if (!fs.existsSync(configDir)) {
-          fs.mkdirSync(configDir, { recursive: true });
-        }
+        // Use the canonical config dir (honours ORIGINAL_CWD and the read-only
+        // fallback) rather than process.cwd(), which is the package root under npx.
+        const configDir = getConfigDir();
         const historyFile = path.join(configDir, "token-history.json");
         let history: TokenTransaction[] = [];
         if (fs.existsSync(historyFile)) {
@@ -139,7 +146,7 @@ export abstract class AgentRunner {
 
     // Fallback cost estimation if input/output is updated but cost is 0/unmatched
     if (this.tokenUsage.cost === 0 && (this.tokenUsage.input > 0 || this.tokenUsage.output > 0)) {
-      this.tokenUsage.cost = (this.tokenUsage.input * 0.000003) + (this.tokenUsage.output * 0.000015);
+      this.tokenUsage.cost = estimateCost(this.tokenUsage.input, this.tokenUsage.output, this.model);
     }
     this.logTokenUsageUpdate();
   }
@@ -171,6 +178,11 @@ export abstract class AgentRunner {
     // No-op by default, overridden by PTY runners
   }
 
+  /** OS process id of the underlying PTY, when one exists. Overridden by PTY runners. */
+  getPid(): number | undefined {
+    return undefined;
+  }
+
   protected listeners: ((data: string) => void)[] = [];
 
   public onOutput(callback: (data: string) => void): void {
@@ -186,6 +198,30 @@ export abstract class AgentRunner {
     this.listeners.forEach(cb => cb(data));
   }
 
+  /** Whether appendLog parses token usage / persists the session. Subclasses
+   * (e.g. the ephemeral workspace shell) may disable these. */
+  protected parseTokensOnLog = true;
+  protected persistOnLog = true;
+
+  /**
+   * Append a chunk to the session log, enforce the retention cap, emit it to
+   * subscribers and (per the flags above) parse token usage / persist the
+   * session. Shared by all PTY-backed runners.
+   */
+  protected appendLog(line: string): void {
+    this.logs.push(line);
+    if (this.logs.length > MAX_LOG_LINES) {
+      this.logs.shift();
+    }
+    if (this.parseTokensOnLog) {
+      this.parseTokenUsage(line);
+    }
+    this.emitOutput(line);
+    if (this.persistOnLog) {
+      SessionPersister.saveSession(this);
+    }
+  }
+
   /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
   protected async writeToPty(ptyProcess: any, text: string): Promise<void> {
     if (!ptyProcess) return;

package/src/lib/agents/AiderRunner.ts

@@ -1,32 +1,13 @@
 import fs from "fs";
 import path from "path";
-import { exec } from "child_process";
+import { exec, execFile } from "child_process";
+import { promisify } from "util";
 import { getConfigDir } from "../config";
 import type { IPty } from "node-pty";
 import { AgentRunner } from "./AgentRunner";
-import { SessionPersister } from "./SessionPersister";
+import { isWindows, findGitBash, loadNodePty } from "./runtime";
 
-function isWindows(): boolean {
-  return typeof process !== "undefined" && process.platform === "win32";
-}
-
-function findGitBash(): string | null {
-  if (!isWindows()) {
-    return "bash";
-  }
-  const pf = process.env.PROGRAMFILES || "C:\\Program Files";
-  const pf86 = process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)";
-  const local = process.env.LOCALAPPDATA || "";
-
-  const candidates: string[] = [
-    process.env.WINGMAN_BASH_PATH,
-    path.join(pf, "Git", "bin", "bash.exe"),
-    path.join(pf86, "Git", "bin", "bash.exe"),
-    local ? path.join(local, "Programs", "Git", "bin", "bash.exe") : "",
-  ].filter((p): p is string => typeof p === "string" && p !== "");
-
-  return candidates.find(p => fs.existsSync(p)) || null;
-}
+const execFilePromise = promisify(execFile);
 
 function getFilesForAider(dir: string): string {
   const maxFiles = 150;
@@ -87,16 +68,6 @@ export class AiderRunner extends AgentRunner {
     this.createdAt = new Date().toISOString();
   }
 
-  private appendLog(line: string) {
-    this.logs.push(line);
-    if (this.logs.length > 5000) {
-      this.logs.shift();
-    }
-    this.parseTokenUsage(line);
-    this.emitOutput(line);
-    SessionPersister.saveSession(this);
-  }
-
   async start(resume?: boolean): Promise<void> {
     if (this.status === 'running') return;
 
@@ -115,9 +86,7 @@ export class AiderRunner extends AgentRunner {
     const shellArgs = useCmd ? ["/c"] : ["-c"];
 
     try {
-      if (!this.ptyModule) {
-        this.ptyModule = eval("require")("node-pty");
-      }
+      this.ptyModule = loadNodePty();
 
       // Load Aider configuration
       let aiderConfig = {
@@ -137,6 +106,8 @@ export class AiderRunner extends AgentRunner {
           console.error("Failed to parse Aider configuration:", err);
         }
       }
+      // Record the model so fallback cost estimates use the right rate.
+      this.model = aiderConfig.model;
 
       // Setup process environment with injected keys
       const customEnv = {
@@ -282,6 +253,15 @@ export class AiderRunner extends AgentRunner {
       }
       this.ptyProcess = null;
     }
+    // For containerised Aider, ensure the container is torn down (the PTY hangup
+    // alone may not trigger the run's --rm cleanup).
+    if (this.type === "aider-docker") {
+      try {
+        await execFilePromise("docker", ["stop", `neural-loom-session-${this.id}`]);
+      } catch {
+        // Container already gone or docker unavailable.
+      }
+    }
     this.appendLog("\r\n\x1b[1;31m[System] Aider session terminated.\x1b[0m\r\n");
   }
 
@@ -304,5 +284,9 @@ export class AiderRunner extends AgentRunner {
       }
     }
   }
+
+  override getPid(): number | undefined {
+    return this.ptyProcess?.pid;
+  }
 }
 

package/src/lib/agents/ClaudeRunner.ts

@@ -1,33 +1,8 @@
 import fs from "fs";
-import path from "path";
-import os from "os";
 import { execSync } from "child_process";
-import { getConfigDir } from "../config";
 import type { IPty } from "node-pty";
 import { AgentRunner } from "./AgentRunner";
-import { SessionPersister } from "./SessionPersister";
-
-function isWindows(): boolean {
-  return typeof process !== "undefined" && process.platform === "win32";
-}
-
-function findGitBash(): string | null {
-  if (!isWindows()) {
-    return "bash";
-  }
-  const pf = process.env.PROGRAMFILES || "C:\\Program Files";
-  const pf86 = process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)";
-  const local = process.env.LOCALAPPDATA || "";
-
-  const candidates: string[] = [
-    process.env.WINGMAN_BASH_PATH,
-    path.join(pf, "Git", "bin", "bash.exe"),
-    path.join(pf86, "Git", "bin", "bash.exe"),
-    local ? path.join(local, "Programs", "Git", "bin", "bash.exe") : "",
-  ].filter((p): p is string => typeof p === "string" && p !== "");
-
-  return candidates.find(p => fs.existsSync(p)) || null;
-}
+import { isWindows, findGitBash, loadNodePty, loadClaudeExtraFlags, windowsPathOverride } from "./runtime";
 
 export class ClaudeRunner extends AgentRunner {
   id: string;
@@ -47,16 +22,6 @@ export class ClaudeRunner extends AgentRunner {
     this.createdAt = new Date().toISOString();
   }
 
-  private appendLog(line: string) {
-    this.logs.push(line);
-    if (this.logs.length > 5000) {
-      this.logs.shift();
-    }
-    this.parseTokenUsage(line);
-    this.emitOutput(line);
-    SessionPersister.saveSession(this);
-  }
-
   async start(resume?: boolean): Promise<void> {
     if (this.status === 'running') return;
 
@@ -71,10 +36,7 @@ export class ClaudeRunner extends AgentRunner {
     const shellArgs = useCmd ? ["/c"] : ["-c"];
 
     try {
-      // Dynamic import to prevent bundler SSR/Turbopack errors on server start
-      if (!this.ptyModule) {
-        this.ptyModule = eval("require")("node-pty");
-      }
+      this.ptyModule = loadNodePty();
 
       this.status = 'running';
       this.appendLog("\x1b[1;35m==================================================\x1b[0m\r\n");
@@ -85,23 +47,7 @@ export class ClaudeRunner extends AgentRunner {
         ? this.workspaceRoot 
         : process.env.ORIGINAL_CWD || process.cwd();
 
-      // Load Claude configuration to check for extraFlags (like --resume)
-      let extraFlags = "";
-      if (resume) {
-        extraFlags = "--resume";
-      } else {
-        const claudeConfigPath = path.join(getConfigDir(), "claude.json");
-        if (fs.existsSync(claudeConfigPath)) {
-          try {
-            const config = JSON.parse(fs.readFileSync(claudeConfigPath, "utf8"));
-            if (config.extraFlags) {
-              extraFlags = config.extraFlags;
-            }
-          } catch (err) {
-            console.error("Failed to parse Claude configuration:", err);
-          }
-        }
-      }
+      const extraFlags = loadClaudeExtraFlags(resume);
 
       // Setup process environment with injected keys
       const customEnv = {
@@ -111,11 +57,7 @@ export class ClaudeRunner extends AgentRunner {
       } as NodeJS.ProcessEnv;
 
       if (isWindows()) {
-        const vsNode = "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Microsoft\\VisualStudio\\NodeJs";
-        const localNpm = path.join(os.homedir(), "AppData", "Local", "npm");
-        const existingPath = process.env.Path || process.env.PATH || "";
-        const winPath = [vsNode, localNpm, existingPath].filter(Boolean).join(";");
-
+        const winPath = windowsPathOverride();
         for (const key of Object.keys(customEnv)) {
           if (key.toLowerCase() === "path") {
             delete customEnv[key];
@@ -198,5 +140,9 @@ export class ClaudeRunner extends AgentRunner {
       }
     }
   }
+
+  override getPid(): number | undefined {
+    return this.ptyProcess?.pid;
+  }
 }
 

package/src/lib/agents/DockerRunner.ts

@@ -1,31 +1,12 @@
 import fs from "fs";
 import path from "path";
-import { getConfigDir } from "../config";
+import { promisify } from "util";
+import { execFile } from "child_process";
 import type { IPty } from "node-pty";
 import { AgentRunner } from "./AgentRunner";
-import { SessionPersister } from "./SessionPersister";
+import { findGitBash, loadNodePty, loadClaudeExtraFlags } from "./runtime";
 
-function isWindows(): boolean {
-  return typeof process !== "undefined" && process.platform === "win32";
-}
-
-function findGitBash(): string | null {
-  if (!isWindows()) {
-    return "bash";
-  }
-  const pf = process.env.PROGRAMFILES || "C:\\Program Files";
-  const pf86 = process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)";
-  const local = process.env.LOCALAPPDATA || "";
-
-  const candidates: string[] = [
-    process.env.WINGMAN_BASH_PATH,
-    path.join(pf, "Git", "bin", "bash.exe"),
-    path.join(pf86, "Git", "bin", "bash.exe"),
-    local ? path.join(local, "Programs", "Git", "bin", "bash.exe") : "",
-  ].filter((p): p is string => typeof p === "string" && p !== "");
-
-  return candidates.find(p => fs.existsSync(p)) || null;
-}
+const execFilePromise = promisify(execFile);
 
 export class DockerRunner extends AgentRunner {
   id: string;
@@ -45,16 +26,6 @@ export class DockerRunner extends AgentRunner {
     this.createdAt = new Date().toISOString();
   }
 
-  private appendLog(line: string) {
-    this.logs.push(line);
-    if (this.logs.length > 5000) {
-      this.logs.shift();
-    }
-    this.parseTokenUsage(line);
-    this.emitOutput(line);
-    SessionPersister.saveSession(this);
-  }
-
   async start(resume?: boolean): Promise<void> {
     if (this.status === 'running') return;
 
@@ -72,11 +43,9 @@ export class DockerRunner extends AgentRunner {
     }
 
     try {
-      if (!this.ptyModule) {
-        this.ptyModule = eval("require")("node-pty");
-      }
+      this.ptyModule = loadNodePty();
 
-      const targetCwd = (this.workspaceRoot && fs.existsSync(this.workspaceRoot)) 
+      const targetCwd = (this.workspaceRoot && fs.existsSync(this.workspaceRoot))
         ? this.workspaceRoot 
         : process.env.ORIGINAL_CWD || process.cwd();
 
@@ -121,23 +90,7 @@ export class DockerRunner extends AgentRunner {
       }
       const mountsStr = mounts.join(" ");
 
-      // Load Claude configuration to check for extraFlags (like --resume)
-      let extraFlags = "";
-      if (resume) {
-        extraFlags = "--resume";
-      } else {
-        const claudeConfigPath = path.join(getConfigDir(), "claude.json");
-        if (fs.existsSync(claudeConfigPath)) {
-          try {
-            const config = JSON.parse(fs.readFileSync(claudeConfigPath, "utf8"));
-            if (config.extraFlags) {
-              extraFlags = config.extraFlags;
-            }
-          } catch (err) {
-            console.error("Failed to parse Claude configuration:", err);
-          }
-        }
-      }
+      const extraFlags = loadClaudeExtraFlags(resume);
 
       const dockerCmd = `docker run -it --name neural-loom-session-${this.id} --rm ${mountsStr} -w /workspace node:20-alpine npx -y @anthropic-ai/claude-code ${extraFlags}`.trim();
 
@@ -180,6 +133,13 @@ export class DockerRunner extends AgentRunner {
       }
       this.ptyProcess = null;
     }
+    // Killing the PTY doesn't guarantee the `docker run` child receives a clean
+    // hangup, so explicitly stop the container (this also triggers its --rm cleanup).
+    try {
+      await execFilePromise("docker", ["stop", `neural-loom-session-${this.id}`]);
+    } catch {
+      // Container already gone or docker unavailable — nothing to clean up.
+    }
     this.appendLog("\r\n\x1b[1;31m[System] Docker container stopped and unmounted.\x1b[0m\r\n");
   }
 
@@ -202,5 +162,9 @@ export class DockerRunner extends AgentRunner {
       }
     }
   }
+
+  override getPid(): number | undefined {
+    return this.ptyProcess?.pid;
+  }
 }
 

package/src/lib/agents/MockRunner.ts

@@ -28,7 +28,9 @@ export class MockRunner extends AgentRunner {
     this.createdAt = new Date().toISOString();
   }
 
-  private appendLog(line: string) {
+  // Mock output is line-oriented, so it appends its own CRLF and overrides the
+  // base PTY-stream appendLog.
+  protected override appendLog(line: string) {
     this.logs.push(line);
     this.parseTokenUsage(line);
     this.emitOutput(line + "\r\n");

package/src/lib/agents/SSHRunner.ts

@@ -3,29 +3,7 @@ import path from "path";
 import { getConfigDir } from "../config";
 import type { IPty } from "node-pty";
 import { AgentRunner } from "./AgentRunner";
-import { SessionPersister } from "./SessionPersister";
-
-function isWindows(): boolean {
-  return typeof process !== "undefined" && process.platform === "win32";
-}
-
-function findGitBash(): string | null {
-  if (!isWindows()) {
-    return "bash";
-  }
-  const pf = process.env.PROGRAMFILES || "C:\\Program Files";
-  const pf86 = process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)";
-  const local = process.env.LOCALAPPDATA || "";
-
-  const candidates: string[] = [
-    process.env.WINGMAN_BASH_PATH,
-    path.join(pf, "Git", "bin", "bash.exe"),
-    path.join(pf86, "Git", "bin", "bash.exe"),
-    local ? path.join(local, "Programs", "Git", "bin", "bash.exe") : "",
-  ].filter((p): p is string => typeof p === "string" && p !== "");
-
-  return candidates.find(p => fs.existsSync(p)) || null;
-}
+import { findGitBash, loadNodePty, loadClaudeExtraFlags } from "./runtime";
 
 interface SSHConfig {
   host: string;
@@ -52,16 +30,6 @@ export class SSHRunner extends AgentRunner {
     this.createdAt = new Date().toISOString();
   }
 
-  private appendLog(line: string) {
-    this.logs.push(line);
-    if (this.logs.length > 5000) {
-      this.logs.shift();
-    }
-    this.parseTokenUsage(line);
-    this.emitOutput(line);
-    SessionPersister.saveSession(this);
-  }
-
   async start(resume?: boolean): Promise<void> {
     if (this.status === 'running') return;
 
@@ -110,32 +78,14 @@ export class SSHRunner extends AgentRunner {
         return;
       }
 
-      if (!this.ptyModule) {
-        this.ptyModule = eval("require")("node-pty");
-      }
+      this.ptyModule = loadNodePty();
 
       this.appendLog(`[System] Connecting to ${config.username}@${config.host}...\r\n`);
 
       const portOpt = config.port ? `-p ${config.port}` : "";
       const keyOpt = config.privateKeyPath ? `-i "${config.privateKeyPath}"` : "";
-      
-      // Load Claude configuration to check for extraFlags (like --resume)
-      let extraFlags = "";
-      if (resume) {
-        extraFlags = "--resume";
-      } else {
-        const claudeConfigPath = path.join(getConfigDir(), "claude.json");
-        if (fs.existsSync(claudeConfigPath)) {
-          try {
-            const config = JSON.parse(fs.readFileSync(claudeConfigPath, "utf8"));
-            if (config.extraFlags) {
-              extraFlags = config.extraFlags;
-            }
-          } catch (err) {
-            console.error("Failed to parse Claude configuration:", err);
-          }
-        }
-      }
+
+      const extraFlags = loadClaudeExtraFlags(resume);
 
       const sshCmd = `ssh -t ${keyOpt} ${portOpt} ${config.username}@${config.host} "claude ${extraFlags}"`;
 
@@ -200,5 +150,9 @@ export class SSHRunner extends AgentRunner {
       }
     }
   }
+
+  override getPid(): number | undefined {
+    return this.ptyProcess?.pid;
+  }
 }
 

package/src/lib/agents/SessionPersister.ts

@@ -75,10 +75,20 @@ export class SessionPersister {
     try {
       const dir = this.getSessionsDir();
       const filePath = path.join(dir, `${id}.json`);
-      fs.writeFile(filePath, JSON.stringify(data, null, 2), "utf8", (err) => {
+      // Write to a temp file then rename, so a crash mid-write can't leave a
+      // truncated/corrupt session file (rename is atomic on the same filesystem).
+      const tmpPath = `${filePath}.tmp-${process.pid}-${Date.now()}`;
+      fs.writeFile(tmpPath, JSON.stringify(data, null, 2), "utf8", (err) => {
         if (err) {
           console.error(`[SessionPersister] Failed to save session ${id} asynchronously:`, err);
+          return;
         }
+        fs.rename(tmpPath, filePath, (renameErr) => {
+          if (renameErr) {
+            console.error(`[SessionPersister] Failed to finalize session ${id}:`, renameErr);
+            fs.unlink(tmpPath, () => {});
+          }
+        });
       });
     } catch (err) {
       console.error(`[SessionPersister] Failed to save session ${id}:`, err);

package/src/lib/agents/ShellRunner.ts

@@ -1,40 +1,7 @@
 import fs from "fs";
-import path from "path";
 import type { IPty } from "node-pty";
 import { AgentRunner } from "./AgentRunner";
-
-function isWindows(): boolean {
-  return typeof process !== "undefined" && process.platform === "win32";
-}
-
-function findGitBash(): string | null {
-  if (!isWindows()) {
-    return "bash";
-  }
-  const pf = process.env.PROGRAMFILES || "C:\\Program Files";
-  const pf86 = process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)";
-  const local = process.env.LOCALAPPDATA || "";
-
-  const candidates: string[] = [
-    process.env.WINGMAN_BASH_PATH,
-    path.join(pf, "Git", "bin", "bash.exe"),
-    path.join(pf86, "Git", "bin", "bash.exe"),
-    local ? path.join(local, "Programs", "Git", "bin", "bash.exe") : "",
-  ].filter((p): p is string => typeof p === "string" && p !== "");
-
-  const found = candidates.find(p => fs.existsSync(p));
-  if (found) return found;
-
-  // Fallback to PowerShell or Cmd on Windows
-  const windir = process.env.windir || "C:\\Windows";
-  const powershell = path.join(windir, "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
-  if (fs.existsSync(powershell)) return powershell;
-
-  const cmd = path.join(windir, "System32", "cmd.exe");
-  if (fs.existsSync(cmd)) return cmd;
-
-  return null;
-}
+import { isWindows, findInteractiveShell, loadNodePty } from "./runtime";
 
 export class ShellRunner extends AgentRunner {
   id: string;
@@ -53,20 +20,15 @@ export class ShellRunner extends AgentRunner {
     this.name = name || "Workspace Shell";
     this.workspaceRoot = workspaceRoot;
     this.createdAt = new Date().toISOString();
-  }
-
-  private appendLog(line: string) {
-    this.logs.push(line);
-    if (this.logs.length > 5000) {
-      this.logs.shift();
-    }
-    this.emitOutput(line);
+    // The workspace shell is ephemeral: don't parse tokens or persist its logs.
+    this.parseTokensOnLog = false;
+    this.persistOnLog = false;
   }
 
   async start(resume?: boolean): Promise<void> {
     if (this.status === 'running') return;
 
-    const shellPath = findGitBash();
+    const shellPath = findInteractiveShell();
     if (!shellPath) {
       this.status = 'stopped';
       this.appendLog("[System Error] Shell executable (Git Bash/PowerShell) not found.\r\n");
@@ -74,9 +36,7 @@ export class ShellRunner extends AgentRunner {
     }
 
     try {
-      if (!this.ptyModule) {
-        this.ptyModule = eval("require")("node-pty");
-      }
+      this.ptyModule = loadNodePty();
 
       this.status = 'running';
       this.appendLog("\x1b[1;36m[System] Launching workspace terminal interactive shell...\x1b[0m\r\n");
@@ -149,5 +109,9 @@ export class ShellRunner extends AgentRunner {
       }
     }
   }
+
+  override getPid(): number | undefined {
+    return this.ptyProcess?.pid;
+  }
 }
 

package/src/lib/agents/WebSocketServer.ts

@@ -1,5 +1,6 @@
 import { WebSocketServer, WebSocket } from "ws";
 import { AgentRunner } from "./AgentRunner";
+import { getBindHost, isRequestAllowed } from "../security";
 
 declare global {
   var wss: WebSocketServer | undefined;
@@ -20,12 +21,26 @@ export function initWebSocketServer(port = 9601, getSession?: (id: string) => Ag
 
   let currentPort = port;
   const maxPort = port + 10;
+  const bindHost = getBindHost();
 
   function tryBind() {
-    console.log(`[WebSocketServer] Launching NeuralLoom WebSocket Gateway on port ${currentPort}...`);
+    console.log(`[WebSocketServer] Launching NeuralLoom WebSocket Gateway on ${bindHost}:${currentPort}...`);
 
     try {
-      const wss = new WebSocketServer({ port: currentPort });
+      const wss = new WebSocketServer({
+        port: currentPort,
+        host: bindHost,
+        // Reject cross-origin / non-loopback handshakes (mirrors the HTTP middleware).
+        verifyClient: (info: { origin?: string; req: { headers: Record<string, string | string[] | undefined> } }) => {
+          const hostHeader = (info.req.headers.host as string) || null;
+          const originHeader = info.origin || (info.req.headers.origin as string) || null;
+          const allowed = isRequestAllowed(hostHeader, originHeader);
+          if (!allowed) {
+            console.warn(`[WebSocketServer] Rejected gateway connection (origin=${originHeader ?? "none"}, host=${hostHeader ?? "none"}).`);
+          }
+          return allowed;
+        },
+      });
 
       wss.on("error", (err: unknown) => {
         const socketErr = err as { code?: string };