npm - @rubytech/create-realagent - Versions diffs - 1.0.643 → 1.0.646 - Mend

@rubytech/create-realagent 1.0.643 → 1.0.646

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (58) hide show

package/payload/server/server.js CHANGED Viewed

@@ -67,13 +67,13 @@ var compose = (middleware, onError, onNotFound) => {
       if (handler) {
         try {
           res = await handler(context, () => dispatch(i + 1));
-        } catch (err2) {
-          if (err2 instanceof Error && onError) {
-            context.error = err2;
-            res = await onError(err2, context);
+        } catch (err) {
+          if (err instanceof Error && onError) {
+            context.error = err;
+            res = await onError(err, context);
             isError = true;
           } else {
-            throw err2;
+            throw err;
           }
         }
       } else {
@@ -1100,12 +1100,12 @@ var COMPOSED_HANDLER = "__COMPOSED_HANDLER";
 var notFoundHandler = (c) => {
   return c.text("404 Not Found", 404);
 };
-var errorHandler = (err2, c) => {
-  if ("getResponse" in err2) {
-    const res = err2.getResponse();
+var errorHandler = (err, c) => {
+  if ("getResponse" in err) {
+    const res = err.getResponse();
     return c.newResponse(res.body, res);
   }
-  console.error(err2);
+  console.error(err);
   return c.text("Internal Server Error", 500);
 };
 var Hono = class _Hono {
@@ -1356,11 +1356,11 @@ var Hono = class _Hono {
     this.router.add(method, path2, [handler, r]);
     this.routes.push(r);
   }
-  #handleError(err2, c) {
-    if (err2 instanceof Error) {
-      return this.errorHandler(err2, c);
+  #handleError(err, c) {
+    if (err instanceof Error) {
+      return this.errorHandler(err, c);
     }
-    throw err2;
+    throw err;
   }
   #dispatch(request, executionCtx, env, method) {
     if (method === "HEAD") {
@@ -1381,12 +1381,12 @@ var Hono = class _Hono {
         res = matchResult[0][0][0][0](c, async () => {
           c.res = await this.#notFoundHandler(c);
         });
-      } catch (err2) {
-        return this.#handleError(err2, c);
+      } catch (err) {
+        return this.#handleError(err, c);
       }
       return res instanceof Promise ? res.then(
         (resolved) => resolved || (c.finalized ? c.res : this.#notFoundHandler(c))
-      ).catch((err2) => this.#handleError(err2, c)) : res ?? this.#notFoundHandler(c);
+      ).catch((err) => this.#handleError(err, c)) : res ?? this.#notFoundHandler(c);
     }
     const composed = compose(matchResult[0], this.errorHandler, this.#notFoundHandler);
     return (async () => {
@@ -1398,8 +1398,8 @@ var Hono = class _Hono {
           );
         }
         return context.res;
-      } catch (err2) {
-        return this.#handleError(err2, c);
+      } catch (err) {
+        return this.#handleError(err, c);
       }
     })();
   }
@@ -2430,16 +2430,16 @@ var handleFetchError = (e) => new Response(null, {
   status: e instanceof Error && (e.name === "TimeoutError" || e.constructor.name === "TimeoutError") ? 504 : 500
 });
 var handleResponseError = (e, outgoing) => {
-  const err2 = e instanceof Error ? e : new Error("unknown error", { cause: e });
-  if (err2.code === "ERR_STREAM_PREMATURE_CLOSE") {
+  const err = e instanceof Error ? e : new Error("unknown error", { cause: e });
+  if (err.code === "ERR_STREAM_PREMATURE_CLOSE") {
     console.info("The user aborted a request.");
   } else {
     console.error(e);
     if (!outgoing.headersSent) {
       outgoing.writeHead(500, { "Content-Type": "text/plain" });
     }
-    outgoing.end(`Error: ${err2.message}`);
-    outgoing.destroy(err2);
+    outgoing.end(`Error: ${err.message}`);
+    outgoing.destroy(err);
   }
 };
 var flushHeaders = (outgoing) => {
@@ -2496,8 +2496,8 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
     if (options.errorHandler) {
       try {
         res = await res;
-      } catch (err2) {
-        const errRes = await options.errorHandler(err2);
+      } catch (err) {
+        const errRes = await options.errorHandler(err);
         if (!errRes) {
           return;
         }
@@ -2768,8 +2768,8 @@ var createStreamBody = (stream) => {
       stream.on("data", (chunk) => {
         controller.enqueue(chunk);
       });
-      stream.on("error", (err2) => {
-        controller.error(err2);
+      stream.on("error", (err) => {
+        controller.error(err);
       });
       stream.on("end", () => {
         controller.close();
@@ -2930,8 +2930,8 @@ var CLAUDE_CREDENTIALS_FILE = resolve(homedir(), ".claude", ".credentials.json")
 var VNC_LOG_FILE = resolve2(LOG_DIR, "vnc-boot.log");
 try {
   mkdirSync(LOG_DIR, { recursive: true });
-} catch (err2) {
-  console.error(`[vnc-log-fail] mkdir ${LOG_DIR} failed: ${err2.message}`);
+} catch (err) {
+  console.error(`[vnc-log-fail] mkdir ${LOG_DIR} failed: ${err.message}`);
 }
 function vncLog(phase, fields = {}) {
   const ts = (/* @__PURE__ */ new Date()).toISOString();
@@ -2941,8 +2941,8 @@ function vncLog(phase, fields = {}) {
 `;
   try {
     appendFileSync(VNC_LOG_FILE, line);
-  } catch (err2) {
-    console.error(`[vnc-log-fail] ${err2.message} \u2014 dropped: ${line.slice(0, 300).trim()}`);
+  } catch (err) {
+    console.error(`[vnc-log-fail] ${err.message} \u2014 dropped: ${line.slice(0, 300).trim()}`);
   }
 }
 var corrCounter = 0;
@@ -2983,8 +2983,8 @@ var SCRYPT_P = 1;
 var SCRYPT_KEYLEN = 64;
 function scryptAsync(password, salt) {
   return new Promise((resolve33, reject) => {
-    scrypt(password, salt, SCRYPT_KEYLEN, { N: SCRYPT_N, r: SCRYPT_R, p: SCRYPT_P }, (err2, key) => {
-      if (err2) reject(err2);
+    scrypt(password, salt, SCRYPT_KEYLEN, { N: SCRYPT_N, r: SCRYPT_R, p: SCRYPT_P }, (err, key) => {
+      if (err) reject(err);
       else resolve33(key);
     });
   });
@@ -3595,11 +3595,11 @@ function attachVncWsProxy(server, opts) {
         upstreamHost,
         upstreamPort
       });
-    } catch (err2) {
+    } catch (err) {
       vncLog("ws-upgrade", {
         decision: "rejected",
         reason: "handler-exception",
-        err: err2.message
+        err: err.message
       });
       clientSocket.destroy();
     }
@@ -3754,12 +3754,12 @@ function handleUpgrade(req, clientSocket, head, opts) {
     upstream.once("close", (hadError) => {
       finish("upstream", hadError ? "error" : "normal");
     });
-    clientSocket.once("error", (err2) => {
-      vncLog("proxy-error", { corrId, side: "client", err: err2.message });
+    clientSocket.once("error", (err) => {
+      vncLog("proxy-error", { corrId, side: "client", err: err.message });
       finish("client", "error");
     });
-    upstream.once("error", (err2) => {
-      vncLog("proxy-error", { corrId, side: "upstream", err: err2.message });
+    upstream.once("error", (err) => {
+      vncLog("proxy-error", { corrId, side: "upstream", err: err.message });
       finish("upstream", "error");
     });
   });
@@ -3774,12 +3774,12 @@ function handleUpgrade(req, clientSocket, head, opts) {
     writeStatusAndDestroy(clientSocket, 504, "Gateway Timeout");
     upstream.destroy();
   });
-  upstream.once("error", (err2) => {
+  upstream.once("error", (err) => {
     if (proxyOpened) return;
     vncLog("proxy-error", {
       corrId,
       side: "upstream-connect",
-      err: err2.message
+      err: err.message
     });
     writeStatusAndDestroy(clientSocket, 502, "Bad Gateway");
     upstream.destroy();
@@ -3840,23 +3840,32 @@ var HOP_BY_HOP2 = /* @__PURE__ */ new Set([
   "transfer-encoding",
   "upgrade"
 ]);
+var cachedUpstreamPort = null;
 function resolveUpstreamPort() {
-  const uri = process.env.NEO4J_URI ?? "bolt://localhost:7687";
+  if (cachedUpstreamPort !== null) return cachedUpstreamPort;
+  const uri = process.env.NEO4J_URI;
+  if (!uri) {
+    throw new Error(
+      "[ui/graph-proxy] NEO4J_URI unset \u2014 refusing to default to bolt://localhost:7687 (Task 580)"
+    );
+  }
   const m = uri.match(/:(\d+)$/);
   const boltPort = m ? parseInt(m[1], 10) : 7687;
-  return boltPort - 213;
+  cachedUpstreamPort = boltPort - 213;
+  console.error(`[ui/graph-proxy] resolved neo4j_uri=${uri} http_port=${cachedUpstreamPort}`);
+  return cachedUpstreamPort;
 }
 var UPSTREAM_HOST = "127.0.0.1";
-var UPSTREAM_PORT = resolveUpstreamPort();
 function attachGraphHttpRoutes(app2) {
   const handler = async (c) => {
     const raw2 = c.req.raw;
     const url = new URL(raw2.url);
+    const upstreamPort = resolveUpstreamPort();
     const pathAfterPrefix = url.pathname.slice(GRAPH_PREFIX.length) || "/";
-    const upstreamUrl = `http://${UPSTREAM_HOST}:${UPSTREAM_PORT}${pathAfterPrefix}${url.search}`;
+    const upstreamUrl = `http://${UPSTREAM_HOST}:${upstreamPort}${pathAfterPrefix}${url.search}`;
     const upstreamHeaders = new Headers(raw2.headers);
     for (const h of HOP_BY_HOP2) upstreamHeaders.delete(h);
-    upstreamHeaders.set("host", `${UPSTREAM_HOST}:${UPSTREAM_PORT}`);
+    upstreamHeaders.set("host", `${UPSTREAM_HOST}:${upstreamPort}`);
     try {
       const upstream = await fetch(upstreamUrl, {
         method: raw2.method,
@@ -3869,13 +3878,18 @@ function attachGraphHttpRoutes(app2) {
       });
       const resHeaders = new Headers(upstream.headers);
       for (const h of HOP_BY_HOP2) resHeaders.delete(h);
+      const loc = resHeaders.get("location");
+      if (loc) {
+        const rewritten = rewriteLocation(loc);
+        if (rewritten !== loc) resHeaders.set("location", rewritten);
+      }
       return new Response(upstream.body, {
         status: upstream.status,
         statusText: upstream.statusText,
         headers: resHeaders
       });
-    } catch (err2) {
-      const msg = err2 instanceof Error ? err2.message : String(err2);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
       console.error(`[graph-proxy] upstream fetch failed for ${upstreamUrl}: ${msg}`);
       return c.text(`Graph proxy upstream unreachable: ${msg}`, 502);
     }
@@ -3920,13 +3934,14 @@ function attachGraphWsProxy(server, opts) {
       }
       const rewrittenPath = pathname === GRAPH_PREFIX ? "/" : pathname.slice(GRAPH_PREFIX.length);
       const rewrittenUrl = qsIndex === -1 ? rewrittenPath : rewrittenPath + url.slice(qsIndex);
-      const upstream = createConnection2({ host: UPSTREAM_HOST, port: UPSTREAM_PORT });
+      const upstreamPort = resolveUpstreamPort();
+      const upstream = createConnection2({ host: UPSTREAM_HOST, port: upstreamPort });
       upstream.setTimeout(UPSTREAM_TIMEOUT_MS2);
       upstream.once("connect", () => {
         upstream.setTimeout(0);
         const lines = [];
         lines.push(`${req.method ?? "GET"} ${rewrittenUrl} HTTP/${req.httpVersion}`);
-        lines.push(`host: ${UPSTREAM_HOST}:${UPSTREAM_PORT}`);
+        lines.push(`host: ${UPSTREAM_HOST}:${upstreamPort}`);
         for (const [name, value] of Object.entries(req.headers)) {
           if (name === "host") continue;
           if (HOP_BY_HOP2.has(name)) continue;
@@ -3958,13 +3973,13 @@ function attachGraphWsProxy(server, opts) {
         writeStatusAndDestroy2(clientSocket, 504, "Gateway Timeout");
         upstream.destroy();
       });
-      upstream.once("error", (err2) => {
-        console.error(`[graph-proxy] ws upstream error: ${err2.message}`);
+      upstream.once("error", (err) => {
+        console.error(`[graph-proxy] ws upstream error: ${err.message}`);
         writeStatusAndDestroy2(clientSocket, 502, "Bad Gateway");
         upstream.destroy();
       });
-    } catch (err2) {
-      console.error(`[graph-proxy] upgrade handler exception: ${err2.message}`);
+    } catch (err) {
+      console.error(`[graph-proxy] upgrade handler exception: ${err.message}`);
       clientSocket.destroy();
     }
   });
@@ -3998,6 +4013,21 @@ function headerString2(value) {
   if (value == null) return void 0;
   return Array.isArray(value) ? value[0] : value;
 }
+function rewriteLocation(location) {
+  try {
+    const parsed = new URL(location);
+    if (parsed.hostname === UPSTREAM_HOST && parsed.port === String(resolveUpstreamPort())) {
+      const pathWithQuery = parsed.pathname + parsed.search + parsed.hash;
+      return pathWithQuery.startsWith(GRAPH_PREFIX) ? pathWithQuery : `${GRAPH_PREFIX}${pathWithQuery}`;
+    }
+    return location;
+  } catch {
+    if (location.startsWith("/") && !location.startsWith(`${GRAPH_PREFIX}/`) && location !== GRAPH_PREFIX) {
+      return `${GRAPH_PREFIX}${location}`;
+    }
+    return location;
+  }
+}
 function parseOriginHost2(origin) {
   if (!origin) return null;
   try {
@@ -4073,8 +4103,8 @@ function writeOAuthCredentials(tokens) {
     };
     writeFileSync2(CLAUDE_CREDENTIALS_FILE, JSON.stringify(fileData, null, 2), "utf-8");
     return newExpiresAt;
-  } catch (err2) {
-    console.error(`[claude-auth] credential write failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[claude-auth] credential write failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   }
 }
@@ -4123,8 +4153,8 @@ async function doRefresh() {
         client_id: CLIENT_ID
       })
     });
-  } catch (err2) {
-    console.error(`[auth-refresh] network error: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[auth-refresh] network error: ${err instanceof Error ? err.message : String(err)}`);
     return { status: "expired", expiresAt: creds.expiresAt };
   }
   if (res.status === 429) {
@@ -4222,13 +4252,13 @@ function resolveKeyFilePath() {
         );
       }
       configDirName2 = brand.configDir;
-    } catch (err2) {
-      if (err2 instanceof SyntaxError) {
+    } catch (err) {
+      if (err instanceof SyntaxError) {
         throw new Error(
-          `brand.json at ${brandPath3} is not valid JSON: ${err2.message}`
+          `brand.json at ${brandPath3} is not valid JSON: ${err.message}`
         );
       }
-      throw err2;
+      throw err;
     }
   }
   cachedKeyFilePath = resolve3(homedir2(), configDirName2, ".anthropic-api-key");
@@ -4242,8 +4272,8 @@ function readKey() {
   let keyFilePath2;
   try {
     keyFilePath2 = resolveKeyFilePath();
-  } catch (err2) {
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
     console.error(`[anthropic-key] path resolution failed: ${msg}`);
     return null;
   }
@@ -4261,14 +4291,14 @@ function readKey() {
       return null;
     }
     return raw2;
-  } catch (err2) {
-    const code = err2 instanceof Error && "code" in err2 ? err2.code : void 0;
+  } catch (err) {
+    const code = err instanceof Error && "code" in err ? err.code : void 0;
     if (code === "ENOENT") {
       console.error(
         `[anthropic-key] no key available (env var unset, file not found: ${keyFilePath2})`
       );
     } else {
-      const msg = err2 instanceof Error ? err2.message : String(err2);
+      const msg = err instanceof Error ? err.message : String(err);
       console.error(
         `[anthropic-key] failed to read key file ${keyFilePath2}: ${msg}`
       );
@@ -4337,9 +4367,9 @@ async function validateKey(key) {
       status: "error",
       message: `Could not verify API key. Anthropic returned ${res.status}. This may be a temporary outage \u2014 try again later.`
     };
-  } catch (err2) {
+  } catch (err) {
     const latency = Date.now() - start;
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+    const msg = err instanceof Error ? err.message : String(err);
     console.error(
       `[anthropic-key] validate: error (network failure, ${latency}ms): ${msg}`
     );
@@ -4462,8 +4492,8 @@ function discoverNativeDisplay() {
       display: sessionDisplay
     });
     return info;
-  } catch (err2) {
-    vncLog("native-display-discovery", { action: "fallback", reason: "error", err: err2.message });
+  } catch (err) {
+    vncLog("native-display-discovery", { action: "fallback", reason: "error", err: err.message });
     return fallback;
   }
 }
@@ -4506,13 +4536,13 @@ async function ensureVnc() {
   vncLog("ensure-vnc", { action: "restart", reason: "x-down" });
   try {
     execFileSync("bash", [VNC_SCRIPT, "start"], { timeout: 2e4 });
-  } catch (err2) {
-    vncLog("ensure-vnc", { action: "restart-failed", err: err2.message });
+  } catch (err) {
+    vncLog("ensure-vnc", { action: "restart-failed", err: err.message });
     return false;
   }
-  const ok2 = await waitForPort(5900, 12e3);
-  vncLog("ensure-vnc", { action: "restart-complete", x_port_5900: ok2 });
-  return ok2;
+  const ok = await waitForPort(5900, 12e3);
+  vncLog("ensure-vnc", { action: "restart-complete", x_port_5900: ok });
+  return ok;
 }
 async function ensureCdp(transport = "vnc") {
   const targetSentinel = transport === "native" ? "native" : ":99";
@@ -4563,8 +4593,8 @@ async function ensureCdp(transport = "vnc") {
   vncLog("ensure-cdp", { action: `restart-${vncCommand}`, reason: "cdp-dead", transport });
   try {
     execFileSync("bash", [VNC_SCRIPT, vncCommand], { timeout: 2e4 });
-  } catch (err2) {
-    vncLog("ensure-cdp", { action: "restart-chrome-failed", transport, err: err2.message });
+  } catch (err) {
+    vncLog("ensure-cdp", { action: "restart-chrome-failed", transport, err: err.message });
     return false;
   }
   const cdpOk = await waitForPort(9222, 12e3);
@@ -4679,9 +4709,15 @@ function readPassword() {
 }
 function getDriver() {
   if (!driver) {
-    const uri = process.env.NEO4J_URI ?? "bolt://localhost:7687";
+    const uri = process.env.NEO4J_URI;
+    if (!uri) {
+      throw new Error(
+        "[ui/neo4j-store] NEO4J_URI unset \u2014 refusing to default to bolt://localhost:7687 (Task 580)"
+      );
+    }
     const user = process.env.NEO4J_USER ?? "neo4j";
     const password = readPassword();
+    console.error(`[ui/neo4j-store] resolved neo4j_uri=${uri}`);
     driver = neo4j.driver(uri, neo4j.auth.basic(user, password), {
       maxConnectionPoolSize: 5
     });
@@ -4771,8 +4807,8 @@ async function ensureConversation(accountId, agentType, sessionKey, visitorId, a
       console.error(`[session] ${(/* @__PURE__ */ new Date()).toISOString()} conversation attributed: conversationId=${id.slice(0, 8)}\u2026 userId=${userId ?? "none"} ${agentType}/${accountId.slice(0, 8)}\u2026`);
     }
     return id ?? null;
-  } catch (err2) {
-    console.error(`[persist] ensureConversation failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] ensureConversation failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     await session.close();
@@ -4798,8 +4834,8 @@ async function findRecentConversation(visitorId, accountId, agentSlug, maxAgeHou
     if (!conversationId) return null;
     console.log(`[persist] found recent conversation ${conversationId.slice(0, 8)}\u2026 for visitor ${visitorId.slice(0, 8)}\u2026`);
     return { conversationId, sessionKey };
-  } catch (err2) {
-    console.error(`[persist] findRecentConversation failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] findRecentConversation failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     await session.close();
@@ -4821,8 +4857,8 @@ async function findGroupBySlug(groupSlug, accountId) {
       groupName: record.get("groupName"),
       agentSlug: record.get("agentSlug")
     };
-  } catch (err2) {
-    console.error(`[group] findGroupBySlug failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[group] findGroupBySlug failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     await session.close();
@@ -4844,8 +4880,8 @@ async function getGroupParticipants(conversationId) {
       joinedAt: String(r.get("joinedAt")),
       visitorId: r.get("visitorId")
     }));
-  } catch (err2) {
-    console.error(`[group] getGroupParticipants failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[group] getGroupParticipants failed: ${err instanceof Error ? err.message : String(err)}`);
     return [];
   } finally {
     await session.close();
@@ -4862,8 +4898,8 @@ async function checkGroupMembership(conversationId, visitorId) {
       { conversationId, visitorId }
     );
     return result.records[0]?.get("displayName") ?? null;
-  } catch (err2) {
-    console.error(`[group] checkGroupMembership failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[group] checkGroupMembership failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     await session.close();
@@ -4893,8 +4929,8 @@ async function bindVisitorToGroup(conversationId, visitorId, personEmail, person
       console.error(`[group] auth-denied id=${conversationId.slice(0, 8)}\u2026 visitor=${visitorId.slice(0, 8)}\u2026`);
     }
     return name ? { displayName: name } : null;
-  } catch (err2) {
-    console.error(`[group] bindVisitorToGroup failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[group] bindVisitorToGroup failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     await session.close();
@@ -4922,8 +4958,8 @@ async function getMessagesSince(conversationId, since, limit = 100) {
       senderVisitorId: r.get("senderVisitorId"),
       createdAt: String(r.get("createdAt"))
     }));
-  } catch (err2) {
-    console.error(`[group] getMessagesSince failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[group] getMessagesSince failed: ${err instanceof Error ? err.message : String(err)}`);
     return [];
   } finally {
     await session.close();
@@ -4944,8 +4980,8 @@ async function getGroupMessagesForContext(conversationId, limit = 50) {
       content: r.get("content"),
       senderName: r.get("senderName")
     }));
-  } catch (err2) {
-    console.error(`[group] getGroupMessagesForContext failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[group] getGroupMessagesForContext failed: ${err instanceof Error ? err.message : String(err)}`);
     return [];
   } finally {
     await session.close();
@@ -4972,8 +5008,8 @@ async function backfillNullUserIdConversations(userId) {
       console.log(`[session] ${(/* @__PURE__ */ new Date()).toISOString()} backfill: no orphaned admin conversations found`);
     }
     return typeof updated === "number" ? updated : 0;
-  } catch (err2) {
-    console.error(`[session] backfillNullUserIdConversations failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[session] backfillNullUserIdConversations failed: ${err instanceof Error ? err.message : String(err)}`);
     return 0;
   } finally {
     await session.close();
@@ -5003,8 +5039,8 @@ async function createNewAdminConversation(userId, accountId, sessionKey) {
     cacheConversationId(sessionKey, conversationId);
     console.log(`[session] ${(/* @__PURE__ */ new Date()).toISOString()} conversation created: conversationId=${conversationId.slice(0, 8)}\u2026 userId=${userId} accountId=${accountId.slice(0, 8)}\u2026`);
     return conversationId;
-  } catch (err2) {
-    console.error(`[session] createNewAdminConversation failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[session] createNewAdminConversation failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     await session.close();
@@ -5049,8 +5085,8 @@ async function fetchBranding(accountId) {
     if (faviconUrl) branding.faviconUrl = faviconUrl;
     console.error(`[branding] resolved for accountId=${accountId.slice(0, 8)}\u2026: primary=${branding.primaryColor ?? "\u2013"} logo=${branding.logoUrl ? "yes" : "no"}`);
     return branding;
-  } catch (err2) {
-    console.error(`[branding] fetchBranding failed for accountId=${accountId.slice(0, 8)}\u2026: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[branding] fetchBranding failed for accountId=${accountId.slice(0, 8)}\u2026: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     await session.close();
@@ -5104,8 +5140,8 @@ async function persistToolCall(record) {
       }
     );
     console.error(`[persist] tool-call persisted: name=${record.toolName} conversation=${record.conversationId.slice(0, 8)}\u2026${record.approvalState ? ` approval=${record.approvalState}` : ""}`);
-  } catch (err2) {
-    console.error(`[persist] tool-call write failed: name=${record.toolName} error=${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] tool-call write failed: name=${record.toolName} error=${err instanceof Error ? err.message : String(err)}`);
   } finally {
     await session.close();
   }
@@ -5116,8 +5152,8 @@ async function persistMessage(conversationId, role, content, accountId, tokens,
   let embedding = null;
   try {
     embedding = await embed(content);
-  } catch (err2) {
-    console.error(`[persist] Embedding failed, storing without: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] Embedding failed, storing without: ${err instanceof Error ? err.message : String(err)}`);
   }
   const session = getSession();
   try {
@@ -5157,8 +5193,8 @@ async function persistMessage(conversationId, role, content, accountId, tokens,
     );
     console.error(`[persist] ${(/* @__PURE__ */ new Date()).toISOString()} conversationId=${conversationId.slice(0, 8)}\u2026 role=${role} len=${content.length}${sender ? ` sender=${sender.displayName}` : ""}`);
     return messageId;
-  } catch (err2) {
-    console.error(`[persist] Neo4j write failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] Neo4j write failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     await session.close();
@@ -5180,8 +5216,8 @@ async function getRecentMessages(conversationId, limit = 50) {
       content: r.get("content"),
       createdAt: String(r.get("createdAt"))
     }));
-  } catch (err2) {
-    console.error(`[persist] getRecentMessages failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] getRecentMessages failed: ${err instanceof Error ? err.message : String(err)}`);
     return [];
   } finally {
     await session.close();
@@ -5196,8 +5232,8 @@ async function verifyConversationOwnership(conversationId, accountId) {
       { conversationId, accountId }
     );
     return result.records.length > 0;
-  } catch (err2) {
-    console.error(`[persist] verifyConversationOwnership failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] verifyConversationOwnership failed: ${err instanceof Error ? err.message : String(err)}`);
     return false;
   } finally {
     await session.close();
@@ -5213,8 +5249,8 @@ async function verifyAndGetConversationUpdatedAt(conversationId, accountId) {
     );
     const record = result.records[0];
     return record ? record.get("updatedAt") : null;
-  } catch (err2) {
-    console.error(`[persist] verifyAndGetConversationUpdatedAt failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] verifyAndGetConversationUpdatedAt failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     await session.close();
@@ -5245,8 +5281,8 @@ async function searchMessages(accountId, queryEmbedding, limit = 10) {
       createdAt: String(r.get("createdAt")),
       score: typeof r.get("score") === "number" ? r.get("score") : Number(r.get("score"))
     }));
-  } catch (err2) {
-    console.error(`[persist] searchMessages failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] searchMessages failed: ${err instanceof Error ? err.message : String(err)}`);
     return [];
   } finally {
     await session.close();
@@ -5269,8 +5305,8 @@ async function listAdminSessions(accountId, userId, limit = 20) {
       name: r.get("name"),
       updatedAt: String(r.get("updatedAt"))
     }));
-  } catch (err2) {
-    console.error(`[persist] listAdminSessions failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] listAdminSessions failed: ${err instanceof Error ? err.message : String(err)}`);
     return [];
   } finally {
     await session.close();
@@ -5290,8 +5326,8 @@ async function deleteConversation(conversationId) {
     const count = typeof deleted === "object" && deleted !== null ? Number(deleted) : Number(deleted ?? 0);
     console.error(`[persist] deleteConversation ${conversationId.slice(0, 8)}\u2026: ${count > 0 ? "deleted" : "not found"}`);
     return count > 0;
-  } catch (err2) {
-    console.error(`[persist] deleteConversation failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] deleteConversation failed: ${err instanceof Error ? err.message : String(err)}`);
     return false;
   } finally {
     await session.close();
@@ -5358,9 +5394,9 @@ ${userContent}`;
       console.error("[persist] autoLabel: haiku subprocess timed out");
       resolve33(null);
     }, SESSION_LABEL_TIMEOUT_MS);
-    proc.on("error", (err2) => {
+    proc.on("error", (err) => {
       clearTimeout(timer);
-      console.error(`[persist] autoLabel: subprocess error \u2014 ${err2.message}`);
+      console.error(`[persist] autoLabel: subprocess error \u2014 ${err.message}`);
       resolve33(null);
     });
     proc.on("close", (code) => {
@@ -5423,8 +5459,8 @@ async function autoLabelSession(conversationId, userMessage) {
     let embedding = null;
     try {
       embedding = await embed(fullLabel);
-    } catch (err2) {
-      console.error(`[persist] Conversation embedding failed, labelling without: ${err2 instanceof Error ? err2.message : String(err2)}`);
+    } catch (err) {
+      console.error(`[persist] Conversation embedding failed, labelling without: ${err instanceof Error ? err.message : String(err)}`);
     }
     const session = getSession();
     try {
@@ -5445,13 +5481,13 @@ async function autoLabelSession(conversationId, userMessage) {
         console.error(`[persist] Auto-labeled session ${conversationId.slice(0, 8)}\u2026: "${fullLabel}"${embedding ? " (embedded)" : ""}`);
         labelAccumulator.delete(conversationId);
       }
-    } catch (err2) {
-      console.error(`[persist] autoLabelSession failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+    } catch (err) {
+      console.error(`[persist] autoLabelSession failed: ${err instanceof Error ? err.message : String(err)}`);
     } finally {
       await session.close();
     }
-  } catch (err2) {
-    console.error(`[persist] autoLabel: unexpected error \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] autoLabel: unexpected error \u2014 ${err instanceof Error ? err.message : String(err)}`);
   } finally {
     const currentEntry = labelAccumulator.get(conversationId);
     if (currentEntry) currentEntry.pending = false;
@@ -5461,8 +5497,8 @@ async function renameConversation(conversationId, label) {
   let embedding = null;
   try {
     embedding = await embed(label);
-  } catch (err2) {
-    console.error(`[persist] manual-label: embedding failed, persisting without: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] manual-label: embedding failed, persisting without: ${err instanceof Error ? err.message : String(err)}`);
   }
   const session = getSession();
   try {
@@ -5501,8 +5537,8 @@ async function getUserTimezone(accountId, userId) {
     if (result.records.length === 0) return null;
     const tz = result.records[0].get("timezone");
     return tz && tz.trim().length > 0 ? tz : null;
-  } catch (err2) {
-    console.error(`[datetime] getUserTimezone failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[datetime] getUserTimezone failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     await session.close();
@@ -5598,8 +5634,8 @@ async function loadUserProfile(accountId, userId) {
       `[profile] loaded for userId=${userId} accountId=${accountId.slice(0, 8)}\u2026 preferences=${preferences.length} (decay: ${decayCount} updated)`
     );
     return summary;
-  } catch (err2) {
-    console.error(`[profile] loadUserProfile failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[profile] loadUserProfile failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     await session.close();
@@ -5684,9 +5720,9 @@ function readRecentToolFailures(accountId, conversationId) {
     } finally {
       closeSync(fd);
     }
-  } catch (err2) {
+  } catch (err) {
     console.error(
-      `[session-context] recent-tool-failures read failed: ${err2 instanceof Error ? err2.message : String(err2)}`
+      `[session-context] recent-tool-failures read failed: ${err instanceof Error ? err.message : String(err)}`
     );
     return [];
   }
@@ -5880,8 +5916,8 @@ ${failureLines.map((l) => `- ${l.trim()}`).join("\n")}`);
     return `<previous-context>
 ${sections.join("\n\n")}
 </previous-context>`;
-  } catch (err2) {
-    console.error(`[session-context] loadSessionContext failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[session-context] loadSessionContext failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     await session.close();
@@ -5923,9 +5959,9 @@ async function consumeStep7FlagUI(session, accountId) {
   );
   try {
     rmSync(flagPath);
-  } catch (err2) {
+  } catch (err) {
     console.error(
-      `[onboarding-flag-consumed] warn: failed to delete ${flagPath}: ${err2 instanceof Error ? err2.message : String(err2)}`
+      `[onboarding-flag-consumed] warn: failed to delete ${flagPath}: ${err instanceof Error ? err.message : String(err)}`
     );
   }
   return true;
@@ -5948,8 +5984,8 @@ async function loadOnboardingStep(accountId) {
       return raw2.toNumber();
     }
     return 0;
-  } catch (err2) {
-    console.error(`[onboarding-inject] loadOnboardingStep failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[onboarding-inject] loadOnboardingStep failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     await session.close();
@@ -6119,8 +6155,8 @@ async function writeReflectionPreferences(accountId, userId, conversationId, upd
     }
     console.error(`[profile-reflection] Wrote ${written}/${updates.length} preference updates for userId=${userId} accountId=${accountId.slice(0, 8)}\u2026`);
     return written;
-  } catch (err2) {
-    console.error(`[profile-reflection] writeReflectionPreferences failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[profile-reflection] writeReflectionPreferences failed: ${err instanceof Error ? err.message : String(err)}`);
     return written;
   } finally {
     await session.close();
@@ -6156,12 +6192,12 @@ async function searchKnowledgeFulltext(accountId, query, limit) {
         score
       };
     });
-  } catch (err2) {
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
     if (msg.includes("index") || msg.includes("fulltext") || msg.includes("not found")) {
       return [];
     }
-    throw err2;
+    throw err;
   } finally {
     await session.close();
   }
@@ -6300,12 +6336,12 @@ ${message.slice(0, CLASSIFIER_MSG_CAP)}`
       `${TAG} done duration_ms=${durationMs} input_tokens=${inputTokens} output_tokens=${outputTokens} commitments=${commitments.length} confidences=[${commitments.map((c) => c.confidence.toFixed(2)).join(",")}]`
     );
     return commitments;
-  } catch (err2) {
+  } catch (err) {
     const durationMs = Date.now() - startMs;
-    if (err2 instanceof Error && err2.name === "AbortError") {
+    if (err instanceof Error && err.name === "AbortError") {
       console.error(`${TAG} failed error=timeout duration_ms=${durationMs}`);
     } else {
-      const reason = err2 instanceof Error ? err2.message : String(err2);
+      const reason = err instanceof Error ? err.message : String(err);
       console.error(`${TAG} failed error=${reason} duration_ms=${durationMs}`);
     }
     return [];
@@ -6378,10 +6414,10 @@ async function probeDns(host, family) {
     if (timer) clearTimeout(timer);
     const ms = Date.now() - start;
     return `${label}=${result.address} ${label}_ms=${ms}`;
-  } catch (err2) {
+  } catch (err) {
     if (timer) clearTimeout(timer);
     const ms = Date.now() - start;
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+    const msg = err instanceof Error ? err.message : String(err);
     return `${label}=err ${label}_err=${quoteDiag(msg.slice(0, 60))} ${label}_ms=${ms}`;
   }
 }
@@ -6404,9 +6440,9 @@ async function probeTcp(host, port2) {
       clearTimeout(timer);
       finish(`tcp=ok tcp_ms=${Date.now() - start}`);
     });
-    sock.once("error", (err2) => {
+    sock.once("error", (err) => {
       clearTimeout(timer);
-      const msg = err2 instanceof Error ? err2.message : String(err2);
+      const msg = err instanceof Error ? err.message : String(err);
       finish(`tcp=err tcp_err=${quoteDiag(msg.slice(0, 60))} tcp_ms=${Date.now() - start}`);
     });
   });
@@ -6419,9 +6455,9 @@ async function probeHttp(url) {
     const res = await fetch(url, { method: "HEAD", redirect: "manual", signal: controller.signal });
     clearTimeout(timer);
     return `http_status=${res.status} http_ms=${Date.now() - start}`;
-  } catch (err2) {
+  } catch (err) {
     clearTimeout(timer);
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+    const msg = err instanceof Error ? err.message : String(err);
     return `http_status=err http_err=${quoteDiag(msg.slice(0, 60))} http_ms=${Date.now() - start}`;
   }
 }
@@ -6503,8 +6539,8 @@ function sigtermFlushStreamLogs(reason, source) {
 `;
     try {
       appendFileSync2(entry.path, line);
-    } catch (err2) {
-      const msg = err2 instanceof Error ? err2.message : String(err2);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
       console.error(`[server-sigterm-flush-err] path=${entry.path} reason=${msg}`);
     }
   }
@@ -6514,8 +6550,8 @@ function purgeOldLogs(logDir, prefix) {
   let entries;
   try {
     entries = readdirSync2(logDir);
-  } catch (err2) {
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
     console.error(`[log-purge-err] readdir dir=${logDir} prefix=${prefix} reason=${msg}`);
     return;
   }
@@ -6524,8 +6560,8 @@ function purgeOldLogs(logDir, prefix) {
     const filePath = resolve6(logDir, file);
     try {
       if (statSync3(filePath).mtimeMs < cutoff) unlinkSync2(filePath);
-    } catch (err2) {
-      const msg = err2 instanceof Error ? err2.message : String(err2);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
       console.error(`[log-purge-err] file=${file} reason=${msg}`);
     }
   }
@@ -6581,8 +6617,8 @@ function sampleProcState(pid) {
       let openFds2 = 0;
       try {
         openFds2 = readdirSync2(fdDir).length;
-      } catch (err2) {
-        const msg = err2 instanceof Error ? err2.message : String(err2);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
         return `proc_err=${JSON.stringify(msg.slice(0, 60))}`;
       }
       let established2 = 0;
@@ -6634,8 +6670,8 @@ function sampleProcState(pid) {
       }
     }
     return `open_fds=${openFds} socket_count=${sockets} tcp_established=${established} tcp_connecting=${connecting} rss_mb=unknown`;
-  } catch (err2) {
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
     return `proc_err=${JSON.stringify(msg.slice(0, 60))}`;
   }
 }
@@ -6728,8 +6764,8 @@ function resolveDefaultAgentSlug(accountDir) {
   let config;
   try {
     config = JSON.parse(readFileSync7(configPath2, "utf-8"));
-  } catch (err2) {
-    console.error("[agent-resolve] failed to read account.json:", err2);
+  } catch (err) {
+    console.error("[agent-resolve] failed to read account.json:", err);
     return null;
   }
   if (!config.defaultAgent) {
@@ -6928,8 +6964,8 @@ function autoDeliverPremiumPlugins(purchasedPlugins) {
       let bundleRaw;
       try {
         bundleRaw = readFileSync7(bundlePath, "utf-8");
-      } catch (err2) {
-        console.log(`${TAG18} ${pluginName}: cannot read BUNDLE.md \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`);
+      } catch (err) {
+        console.log(`${TAG18} ${pluginName}: cannot read BUNDLE.md \u2014 ${err instanceof Error ? err.message : String(err)}`);
         continue;
       }
       const fmMatch = bundleRaw.match(/^---\n([\s\S]*?)\n---/);
@@ -6971,8 +7007,8 @@ function autoDeliverPremiumPlugins(purchasedPlugins) {
         try {
           cpSync(source, target, { recursive: true });
           delivered++;
-        } catch (err2) {
-          console.log(`${TAG18} ${pluginName}/${sub}: copy failed \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`);
+        } catch (err) {
+          console.log(`${TAG18} ${pluginName}/${sub}: copy failed \u2014 ${err instanceof Error ? err.message : String(err)}`);
         }
       }
       console.log(`${TAG18} ${pluginName} (bundle): ${delivered} delivered, ${skipped} already present`);
@@ -6985,8 +7021,8 @@ function autoDeliverPremiumPlugins(purchasedPlugins) {
       try {
         cpSync(stagingDir, target, { recursive: true });
         console.log(`${TAG18} ${pluginName} (standalone): delivered`);
-      } catch (err2) {
-        console.log(`${TAG18} ${pluginName}: copy failed \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`);
+      } catch (err) {
+        console.log(`${TAG18} ${pluginName}: copy failed \u2014 ${err instanceof Error ? err.message : String(err)}`);
       }
     }
   }
@@ -7026,8 +7062,8 @@ function migratePluginRenames(accountDir, config) {
     writeFileSync5(configPath2, JSON.stringify(parsed, null, 2) + "\n");
     config.enabledPlugins = migrated;
     console.log(`${TAG18} account.json updated (${migrated.length} plugins)`);
-  } catch (err2) {
-    console.error(`${TAG18} failed to update account.json \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`${TAG18} failed to update account.json \u2014 ${err instanceof Error ? err.message : String(err)}`);
   }
   const pluginsDir = resolve6(PLATFORM_ROOT4, "plugins");
   for (const oldName of Object.keys(PLUGIN_RENAMES)) {
@@ -7036,8 +7072,8 @@ function migratePluginRenames(accountDir, config) {
       try {
         rmSync2(orphan, { recursive: true });
         console.log(`${TAG18} removed orphan: ${oldName}`);
-      } catch (err2) {
-        console.log(`${TAG18} orphan removal failed: ${oldName} \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`);
+      } catch (err) {
+        console.log(`${TAG18} orphan removal failed: ${oldName} \u2014 ${err instanceof Error ? err.message : String(err)}`);
       }
     }
   }
@@ -7073,8 +7109,8 @@ function autoDeliverBundleAgents(accountDir, purchasedPlugins) {
       const source = resolve6(bundleAgentsDir, filename);
       try {
         cpSync(source, target);
-      } catch (err2) {
-        console.log(`${TAG18} copy failed: ${filename} \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`);
+      } catch (err) {
+        console.log(`${TAG18} copy failed: ${filename} \u2014 ${err instanceof Error ? err.message : String(err)}`);
         continue;
       }
       try {
@@ -7104,8 +7140,8 @@ function autoDeliverBundleAgents(accountDir, purchasedPlugins) {
     try {
       writeFileSync5(agentsmdPath, agentsmd);
       console.log(`${TAG18} AGENTS.md updated (${delivered} agents added)`);
-    } catch (err2) {
-      console.error(`${TAG18} AGENTS.md update failed \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`);
+    } catch (err) {
+      console.error(`${TAG18} AGENTS.md update failed \u2014 ${err instanceof Error ? err.message : String(err)}`);
     }
   }
 }
@@ -7261,8 +7297,8 @@ function loadEmbeddedPlugins(agentType, selectedPlugins, enabledPlugins) {
       let raw2;
       try {
         raw2 = readFileSync7(pluginPath, "utf-8");
-      } catch (err2) {
-        console.warn(`[plugins] ${dir}: failed to read PLUGIN.md for ${agentType} embed: ${String(err2)}`);
+      } catch (err) {
+        console.warn(`[plugins] ${dir}: failed to read PLUGIN.md for ${agentType} embed: ${String(err)}`);
         continue;
       }
       const body = raw2.replace(/^---\n[\s\S]*?\n---\n*/, "").trim();
@@ -7355,7 +7391,7 @@ function fetchMcpToolsList(pluginDir) {
     proc.stderr.on("data", (chunk) => {
       stderrBuf += chunk.toString();
     });
-    proc.on("error", (err2) => settle([], `spawn error: ${err2.message}`));
+    proc.on("error", (err) => settle([], `spawn error: ${err.message}`));
     proc.on("close", (code) => {
       if (!settled) settle([], `process exited with code ${code}`);
     });
@@ -7862,12 +7898,33 @@ function readBrandHostname() {
   }
   return cachedBrandHostname;
 }
+function requireNeo4jUri() {
+  const uri = process.env.NEO4J_URI;
+  if (!uri) {
+    throw new Error(
+      "NEO4J_URI unset \u2014 refusing to default to bolt://localhost:7687. Set NEO4J_URI in the gateway's env (systemd EnvironmentFile or shell .env). (Task 580)"
+    );
+  }
+  const brand = readBrandHostname();
+  if (brand === "realagent" && /:7687([/?]|$)/.test(uri)) {
+    throw new Error(
+      `NEO4J_URI=${uri} points at :7687 on a realagent install \u2014 realagent owns :7688. This would silently write into Maxy's DB (Task 577 vector). (Task 580)`
+    );
+  }
+  return uri;
+}
 function getMcpServers(accountId, conversationId, userId, enabledPlugins) {
   if (!conversationId) {
     throw new Error(`getMcpServers: conversationId is required (accountId=${accountId.slice(0, 8)})`);
   }
   const { logDir: LOG_DIR2, streamLogPath: STREAM_LOG_PATH } = streamLogPathFor(accountId, conversationId);
-  const baseEnv = { ACCOUNT_ID: accountId, PLATFORM_ROOT: PLATFORM_ROOT4, LOG_DIR: LOG_DIR2, STREAM_LOG_PATH };
+  const baseEnv = {
+    ACCOUNT_ID: accountId,
+    PLATFORM_ROOT: PLATFORM_ROOT4,
+    LOG_DIR: LOG_DIR2,
+    STREAM_LOG_PATH,
+    NEO4J_URI: requireNeo4jUri()
+  };
   const servers = {
     "memory": {
       command: "node",
@@ -7938,7 +7995,6 @@ function getMcpServers(accountId, conversationId, userId, enabledPlugins) {
       env: {
         ...baseEnv,
         BRAND: readBrandHostname(),
-        NEO4J_URI: process.env.NEO4J_URI ?? "bolt://localhost:7687",
         NEO4J_USERNAME: process.env.NEO4J_USERNAME ?? process.env.NEO4J_USER ?? "neo4j",
         NEO4J_NAMESPACE: "maxy-graph",
         NEO4J_READ_ONLY: "true",
@@ -8306,7 +8362,7 @@ async function fetchMemoryContext(accountId, query, sessionKey, options) {
     proc.stderr.on("data", (chunk) => {
       stderrBuf += chunk.toString();
     });
-    proc.on("error", (err2) => settle(null, `spawn error: ${err2.message}`));
+    proc.on("error", (err) => settle(null, `spawn error: ${err.message}`));
     proc.on("close", (code) => {
       if (!settled) settle(null, `process exited with code ${code}`);
     });
@@ -8470,11 +8526,11 @@ ${truncatedResponse}` : "No response text was generated.",
     streamLog.write(`[${isoTs()}] [context-overflow-recovery] summary=fallback reason=haiku-empty
 `);
     return basicTemplate;
-  } catch (err2) {
-    const reason = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const reason = err instanceof Error ? err.message : String(err);
     streamLog.write(`[${isoTs()}] [context-overflow-recovery] summary=fallback reason=${reason}
 `);
-    if (!(err2 instanceof Error && (err2.name === "AbortError" || reason.includes("ECONNREFUSED") || reason.includes("ENOTFOUND")))) {
+    if (!(err instanceof Error && (err.name === "AbortError" || reason.includes("ECONNREFUSED") || reason.includes("ENOTFOUND")))) {
       console.error(`[context-overflow-recovery] Haiku summary failed: ${reason}`);
     }
     return basicTemplate;
@@ -8584,9 +8640,9 @@ Extract preference updates as JSON array.`
     console.error(`[profile-reflection] Extracted ${sanitized.length} preference updates via Haiku (${updates.length - sanitized.length} filtered)`);
     const convId = sessionStore.get(sessionKey)?.conversationId;
     return await writeReflectionPreferences(accountId, userId, convId, sanitized);
-  } catch (err2) {
-    const reason = err2 instanceof Error ? err2.message : String(err2);
-    if (err2 instanceof Error && err2.name === "AbortError") {
+  } catch (err) {
+    const reason = err instanceof Error ? err.message : String(err);
+    if (err instanceof Error && err.name === "AbortError") {
       console.error(`[profile-reflection] Haiku call timed out after ${REFLECTION_TIMEOUT_MS}ms`);
     } else {
       console.error(`[profile-reflection] Haiku call failed: ${reason}`);
@@ -8694,8 +8750,8 @@ async function* runCompactionTurn(accountDir, accountId, systemPrompt, resumeSes
 `);
   streamLog.write(`[${isoTs()}] [compaction-start] resumeSessionId=${resumeSessionId}
 `);
-  proc.on("error", (err2) => {
-    if (!streamLog.destroyed && !streamLog.writableEnded) streamLog.write(`[${isoTs()}] [compaction-spawn-error] ${err2.message}
+  proc.on("error", (err) => {
+    if (!streamLog.destroyed && !streamLog.writableEnded) streamLog.write(`[${isoTs()}] [compaction-spawn-error] ${err.message}
 `);
   });
   yield "Summarising session...";
@@ -8828,8 +8884,8 @@ async function* parseClaudeStream(proc, streamLog, adminModel, conversationId, a
               streamLog.write(`[${isoTs()}] [tool-wait-diag]${convIdTag} name=${info.name} tool_use_id=${toolUseId} elapsed=${elapsedSec}s ${diag}
 `);
             }
-          }).catch((err2) => {
-            const msg = err2 instanceof Error ? err2.message : String(err2);
+          }).catch((err) => {
+            const msg = err instanceof Error ? err.message : String(err);
             if (!streamLog.destroyed && !streamLog.writableEnded) {
               streamLog.write(`[${isoTs()}] [tool-wait-diag]${convIdTag} name=${info.name} tool_use_id=${toolUseId} elapsed=${elapsedSec}s diag_err=${JSON.stringify(msg.slice(0, 80))}
 `);
@@ -9131,9 +9187,9 @@ async function* parseClaudeStream(proc, streamLog, adminModel, conversationId, a
                       streamLog.write(`[${isoTs()}] [tool-failure-diag]${convIdTag} name=${name} ${diag}
 `);
                     }
-                  } catch (err2) {
+                  } catch (err) {
                     if (!streamLog.destroyed) {
-                      const msg2 = err2 instanceof Error ? err2.message : String(err2);
+                      const msg2 = err instanceof Error ? err.message : String(err);
                       streamLog.write(`[${isoTs()}] [tool-failure-diag]${convIdTag} name=${name} diag_err=${JSON.stringify(msg2.slice(0, 80))}
 `);
                     }
@@ -9625,8 +9681,8 @@ async function* invokeAdminAgent(message, systemPrompt, accountDir, accountId, a
 `);
     if (sessionKey) activeProcesses.delete(sessionKey);
   });
-  proc.on("error", (err2) => {
-    if (!streamLog.destroyed && !streamLog.writableEnded) streamLog.write(`[${isoTs()}] [spawn-error] ${err2.message}
+  proc.on("error", (err) => {
+    if (!streamLog.destroyed && !streamLog.writableEnded) streamLog.write(`[${isoTs()}] [spawn-error] ${err.message}
 `);
   });
   let currentAgentSessionId;
@@ -9700,8 +9756,8 @@ async function* invokeAdminAgent(message, systemPrompt, accountDir, accountId, a
         const reflectionUserId = getUserIdForSession(sessionKey);
         if (reflectionUserId) {
           const profileForReflection = await loadUserProfile(accountId, reflectionUserId);
-          reflectOnSessionProfile(accountId, reflectionUserId, sessionKey, profileForReflection).catch((err2) => {
-            console.error(`[profile-reflection] Unhandled error: ${err2 instanceof Error ? err2.message : String(err2)}`);
+          reflectOnSessionProfile(accountId, reflectionUserId, sessionKey, profileForReflection).catch((err) => {
+            console.error(`[profile-reflection] Unhandled error: ${err instanceof Error ? err.message : String(err)}`);
           });
         }
         clearAgentSessionId(sessionKey, "compaction-complete");
@@ -9730,8 +9786,8 @@ async function* invokeAdminAgent(message, systemPrompt, accountDir, accountId, a
                 (step.value.summary ? step.value.summary + "\n\n" : "") + "Recovered conversation context:\n" + contextPairs
               );
             }
-          } catch (err2) {
-            console.error(`[persist] Context re-seeding failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+          } catch (err) {
+            console.error(`[persist] Context re-seeding failed: ${err instanceof Error ? err.message : String(err)}`);
           }
         }
       }
@@ -9743,8 +9799,8 @@ async function* invokeAdminAgent(message, systemPrompt, accountDir, accountId, a
           yield { type: "status", message: step.value };
           step = await compactionIter.next();
         }
-      } catch (err2) {
-        const msg = err2 instanceof Error ? err2.message : String(err2);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
         streamLog.write(`[${isoTs()}] [session-reset] compaction failed: ${msg}
 `);
         yield { type: "status", message: "Compaction failed \u2014 resetting anyway." };
@@ -9865,8 +9921,8 @@ async function* invokeManagedAdminAgent(message, systemPrompt, accountDir, accou
   }
   const pendingTrimmed = consumePendingTrimmedMessages(sessionKey);
   if (pendingTrimmed && pendingTrimmed.length > 0) {
-    const ok2 = await compactTrimmedMessages(accountId, pendingTrimmed);
-    if (!ok2) {
+    const ok = await compactTrimmedMessages(accountId, pendingTrimmed);
+    if (!ok) {
       storePendingTrimmedMessages(sessionKey, pendingTrimmed);
     }
   }
@@ -9890,8 +9946,8 @@ async function* invokeManagedAdminAgent(message, systemPrompt, accountDir, accou
   const trimmed = trimHistory(sessionKey, historyBudget);
   if (trimmed.length > 0) {
     yield { type: "status", message: "Archiving older messages..." };
-    const ok2 = await compactTrimmedMessages(accountId, trimmed);
-    if (!ok2) {
+    const ok = await compactTrimmedMessages(accountId, trimmed);
+    if (!ok) {
       storePendingTrimmedMessages(sessionKey, trimmed);
     }
   }
@@ -9961,8 +10017,8 @@ async function* invokeManagedAdminAgent(message, systemPrompt, accountDir, accou
 `);
     if (sessionKey) activeProcesses.delete(sessionKey);
   });
-  proc.on("error", (err2) => {
-    if (!streamLog.destroyed && !streamLog.writableEnded) streamLog.write(`[${isoTs()}] [spawn-error] ${err2.message}
+  proc.on("error", (err) => {
+    if (!streamLog.destroyed && !streamLog.writableEnded) streamLog.write(`[${isoTs()}] [spawn-error] ${err.message}
 `);
   });
   let responseText = "";
@@ -10032,8 +10088,8 @@ async function* invokeManagedAdminAgent(message, systemPrompt, accountDir, accou
           yield { type: "status", message: step.value };
           step = await compactionIter.next();
         }
-      } catch (err2) {
-        const msg = err2 instanceof Error ? err2.message : String(err2);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
         streamLog.write(`[${isoTs()}] [session-reset] compaction failed: ${msg}
 `);
         yield { type: "status", message: "Compaction failed \u2014 resetting anyway." };
@@ -10188,8 +10244,8 @@ async function* invokePublicAgent(message, systemPrompt, accountId, accountDir,
   if (sessionKey) {
     const pendingTrimmed = consumePendingTrimmedMessages(sessionKey);
     if (pendingTrimmed && pendingTrimmed.length > 0) {
-      const ok2 = await compactTrimmedMessages(accountId, pendingTrimmed);
-      if (!ok2) {
+      const ok = await compactTrimmedMessages(accountId, pendingTrimmed);
+      if (!ok) {
         storePendingTrimmedMessages(sessionKey, pendingTrimmed);
       }
     }
@@ -10200,8 +10256,8 @@ async function* invokePublicAgent(message, systemPrompt, accountId, accountDir,
     const trimmed = trimHistory(sessionKey, historyBudget);
     if (trimmed.length > 0) {
       yield { type: "status", message: "Archiving older messages..." };
-      const ok2 = await compactTrimmedMessages(accountId, trimmed);
-      if (!ok2) {
+      const ok = await compactTrimmedMessages(accountId, trimmed);
+      if (!ok) {
         storePendingTrimmedMessages(sessionKey, trimmed);
       }
     }
@@ -10446,12 +10502,12 @@ async function* compactSession(sessionKey) {
     const history = getMessageHistory(sessionKey);
     if (history.length === 0) return { ok: true };
     yield "Saving to memory...";
-    const ok2 = await compactTrimmedMessages(account.accountId, history);
-    if (ok2) {
+    const ok = await compactTrimmedMessages(account.accountId, history);
+    if (ok) {
       if (session) session.messageHistory = [];
     }
     yield "Closing session...";
-    return { ok: ok2 };
+    return { ok };
   }
   const currentSessionId = getAgentSessionId(sessionKey);
   if (!currentSessionId) return { ok: false, reason: "no-session" };
@@ -10477,8 +10533,8 @@ ${EXPLANATORY_STYLE_INSTRUCTIONS}` : baseSystemPrompt;
   const compactUserId = getUserIdForSession(sessionKey);
   if (compactAgentType === "admin" && compactUserId) {
     const currentProfile = await loadUserProfile(account.accountId, compactUserId);
-    reflectOnSessionProfile(account.accountId, compactUserId, sessionKey, currentProfile).catch((err2) => {
-      console.error(`[profile-reflection] Unhandled error: ${err2 instanceof Error ? err2.message : String(err2)}`);
+    reflectOnSessionProfile(account.accountId, compactUserId, sessionKey, currentProfile).catch((err) => {
+      console.error(`[profile-reflection] Unhandled error: ${err instanceof Error ? err.message : String(err)}`);
     });
   }
   clearAgentSessionId(sessionKey, "session-compact-complete");
@@ -10569,8 +10625,8 @@ ${sessionContext}`;
       let skillContent = "";
       try {
         skillContent = readFileSync7(skillPath, "utf-8");
-      } catch (err2) {
-        console.error(`[onboarding-inject] accountId=${accountId.slice(0, 8)}\u2026 error=skill-read-failed path=${skillPath} reason=${err2 instanceof Error ? err2.message : String(err2)}`);
+      } catch (err) {
+        console.error(`[onboarding-inject] accountId=${accountId.slice(0, 8)}\u2026 error=skill-read-failed path=${skillPath} reason=${err instanceof Error ? err.message : String(err)}`);
       }
       const skillBytes = Buffer.byteLength(skillContent, "utf-8");
       if (skillContent.length > 0) {
@@ -10624,8 +10680,8 @@ ${manifest}`;
       baseSystemPrompt += `
 ${graphRef}`;
-    } catch (err2) {
-      console.error(`[graph-primitives] reference missing at ${graphRefPath} \u2014 admin session will have no Cypher cookbook: ${err2 instanceof Error ? err2.message : String(err2)}`);
+    } catch (err) {
+      console.error(`[graph-primitives] reference missing at ${graphRefPath} \u2014 admin session will have no Cypher cookbook: ${err instanceof Error ? err.message : String(err)}`);
     }
   }
   if (agentConfig?.budget) {
@@ -10709,8 +10765,8 @@ ${gwParts.join("\n")}`;
   if (sessionKey) {
     try {
       await ensureConversation(accountId, agentType, sessionKey, void 0, void 0, sessionUserId);
-    } catch (err2) {
-      console.error(`[persist] ensureConversation failed in invokeAgent: ${err2 instanceof Error ? err2.message : String(err2)}`);
+    } catch (err) {
+      console.error(`[persist] ensureConversation failed in invokeAgent: ${err instanceof Error ? err.message : String(err)}`);
     }
   }
   if (agentType !== "public") {
@@ -10724,8 +10780,8 @@ ${gwParts.join("\n")}`;
     const classifyStartMs = Date.now();
     const [adminClassification, commitments] = await Promise.all([
       needsTopicCheck ? classifyMemoryQuery(message, history) : Promise.resolve(QUERY_CLASSIFIER_FALLBACK),
-      classifyCommitments(message, history).catch((err2) => {
-        console.error(`[commitment-classifier] unexpected error: ${err2 instanceof Error ? err2.message : String(err2)}`);
+      classifyCommitments(message, history).catch((err) => {
+        console.error(`[commitment-classifier] unexpected error: ${err instanceof Error ? err.message : String(err)}`);
         return [];
       })
     ]);
@@ -10755,8 +10811,8 @@ ${block}`;
         }
         console.log(`[commitment-offer] sessionKey=${sk}\u2026 count=${commitments.filter((c) => c.confidence >= COMMITMENT_CONFIDENCE_THRESHOLD).length} summaries=${commitments.filter((c) => c.confidence >= COMMITMENT_CONFIDENCE_THRESHOLD).map((c) => JSON.stringify(c.what)).join(",")}`);
       }
-    } catch (err2) {
-      console.error(`[commitment-classifier] block error: ${err2 instanceof Error ? err2.message : String(err2)}`);
+    } catch (err) {
+      console.error(`[commitment-classifier] block error: ${err instanceof Error ? err.message : String(err)}`);
     }
   }
   if (agentType === "public") {
@@ -11229,8 +11285,8 @@ function loadRules(configDir2) {
   let parsed;
   try {
     parsed = JSON.parse(raw2);
-  } catch (err2) {
-    throw new Error(`rules file ${path2} is not valid JSON: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    throw new Error(`rules file ${path2} is not valid JSON: ${err instanceof Error ? err.message : String(err)}`);
   }
   return validateRulesFile(parsed, path2);
 }
@@ -11319,8 +11375,8 @@ function validateRule(input, label, seenIds) {
   if (pattern.length > 0) {
     try {
       new RegExp(pattern);
-    } catch (err2) {
-      throw new Error(`${label}: pattern is not a valid regex: ${err2 instanceof Error ? err2.message : String(err2)}`);
+    } catch (err) {
+      throw new Error(`${label}: pattern is not a valid regex: ${err instanceof Error ? err.message : String(err)}`);
     }
   }
   const thresholdCount = r.thresholdCount;
@@ -11351,8 +11407,8 @@ function validateRule(input, label, seenIds) {
     if (r.followupPattern.length > 0) {
       try {
         new RegExp(r.followupPattern);
-      } catch (err2) {
-        throw new Error(`${label}: followupPattern is not a valid regex: ${err2 instanceof Error ? err2.message : String(err2)}`);
+      } catch (err) {
+        throw new Error(`${label}: followupPattern is not a valid regex: ${err instanceof Error ? err.message : String(err)}`);
       }
     }
     rule.followupPattern = r.followupPattern;
@@ -11410,8 +11466,8 @@ function loadTailState(configDir2) {
       }
     }
     return clean;
-  } catch (err2) {
-    console.error(`[review] tail state corrupt at ${path2}, starting fresh: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[review] tail state corrupt at ${path2}, starting fresh: ${err instanceof Error ? err.message : String(err)}`);
     return {};
   }
 }
@@ -11587,8 +11643,8 @@ function reviewLog(configDir2, event) {
     ).toISOString()} [review] ${JSON.stringify(event)}
 `;
     appendFileSync3(path2, line, "utf-8");
-  } catch (err2) {
-    console.error(`[review] failed to write review log at ${path2}: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[review] failed to write review log at ${path2}: ${err instanceof Error ? err.message : String(err)}`);
   }
 }
 async function ensureReviewAlertIndex() {
@@ -11701,8 +11757,8 @@ function queueAlert(configDir2, accountId, match2) {
     mkdirSync7(dirname4(path2), { recursive: true });
     const line = JSON.stringify({ accountId, match: match2 }) + "\n";
     appendFileSync3(path2, line, "utf-8");
-  } catch (err2) {
-    console.error(`[review] failed to queue alert at ${path2}: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[review] failed to queue alert at ${path2}: ${err instanceof Error ? err.message : String(err)}`);
   }
 }
 async function drainPendingAlerts(configDir2) {
@@ -11754,13 +11810,13 @@ async function bootDetector() {
   let rulesFile;
   try {
     rulesFile = loadRules(configDir2);
-  } catch (err2) {
+  } catch (err) {
     reviewLog(configDir2, {
       event: "boot-failed",
       reason: "rules-invalid",
-      error: err2 instanceof Error ? err2.message : String(err2)
+      error: err instanceof Error ? err.message : String(err)
     });
-    console.error(`[review] boot: rules file invalid \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`);
+    console.error(`[review] boot: rules file invalid \u2014 ${err instanceof Error ? err.message : String(err)}`);
     return null;
   }
   if (addMissingDefaultRules(rulesFile)) {
@@ -11776,22 +11832,22 @@ async function bootDetector() {
   try {
     await ensureReviewAlertIndex();
     reviewLog(configDir2, { event: "neo4j-index-ensured" });
-  } catch (err2) {
+  } catch (err) {
     reviewLog(configDir2, {
       event: "neo4j-index-failed",
-      error: err2 instanceof Error ? err2.message : String(err2)
+      error: err instanceof Error ? err.message : String(err)
     });
-    console.error(`[review] boot: ensureReviewAlertIndex failed (continuing): ${err2 instanceof Error ? err2.message : String(err2)}`);
+    console.error(`[review] boot: ensureReviewAlertIndex failed (continuing): ${err instanceof Error ? err.message : String(err)}`);
   }
   try {
     await ensureReviewDigestSchedule(accountId);
     reviewLog(configDir2, { event: "digest-schedule-ensured" });
-  } catch (err2) {
+  } catch (err) {
     reviewLog(configDir2, {
       event: "digest-schedule-failed",
-      error: err2 instanceof Error ? err2.message : String(err2)
+      error: err instanceof Error ? err.message : String(err)
     });
-    console.error(`[review] boot: ensureReviewDigestSchedule failed (continuing): ${err2 instanceof Error ? err2.message : String(err2)}`);
+    console.error(`[review] boot: ensureReviewDigestSchedule failed (continuing): ${err instanceof Error ? err.message : String(err)}`);
   }
   const tailState = loadTailState(configDir2);
   const logDir = accountLogDir(accountDir);
@@ -12048,13 +12104,13 @@ async function runScanCycle(runtime) {
           rulesLoaded: runtime.rulesFile.rules.length,
           mtime: new Date(currentMtime).toISOString()
         });
-      } catch (err2) {
+      } catch (err) {
         reviewLog(runtime.configDir, {
           event: "rules-reload-failed",
-          error: err2 instanceof Error ? err2.message : String(err2)
+          error: err instanceof Error ? err.message : String(err)
         });
         runtime.snapshot.state = "degraded";
-        runtime.snapshot.lastError = err2 instanceof Error ? err2.message : String(err2);
+        runtime.snapshot.lastError = err instanceof Error ? err.message : String(err);
       }
     }
     const logDir = accountLogDir(runtime.accountDir);
@@ -12181,12 +12237,12 @@ async function runScanCycle(runtime) {
       try {
         await upsertReviewAlert(runtime.accountId, match2);
         reviewLog(runtime.configDir, { event: "alert-persisted", ruleId: match2.ruleId });
-      } catch (err2) {
+      } catch (err) {
         queueAlert(runtime.configDir, runtime.accountId, match2);
         reviewLog(runtime.configDir, {
           event: "alert-queued",
           ruleId: match2.ruleId,
-          error: err2 instanceof Error ? err2.message : String(err2)
+          error: err instanceof Error ? err.message : String(err)
         });
       }
     }
@@ -12199,18 +12255,18 @@ async function runScanCycle(runtime) {
           remaining: drain.remaining
         });
       }
-    } catch (err2) {
+    } catch (err) {
       reviewLog(runtime.configDir, {
         event: "queue-drain-failed",
-        error: err2 instanceof Error ? err2.message : String(err2)
+        error: err instanceof Error ? err.message : String(err)
       });
     }
     try {
       runtime.snapshot.activeAlerts = await countActiveReviewAlerts(runtime.accountId);
-    } catch (err2) {
+    } catch (err) {
       reviewLog(runtime.configDir, {
         event: "active-alerts-count-failed",
-        error: err2 instanceof Error ? err2.message : String(err2)
+        error: err instanceof Error ? err.message : String(err)
       });
     }
     saveTailState(runtime.configDir, runtime.tailState);
@@ -12229,12 +12285,12 @@ async function runScanCycle(runtime) {
       matches: matches.length,
       durationMs: cycleDuration
     });
-  } catch (err2) {
+  } catch (err) {
     runtime.snapshot.state = "degraded";
-    runtime.snapshot.lastError = err2 instanceof Error ? err2.message : String(err2);
+    runtime.snapshot.lastError = err instanceof Error ? err.message : String(err);
     reviewLog(runtime.configDir, {
       event: "cycle-failed",
-      error: err2 instanceof Error ? err2.message : String(err2)
+      error: err instanceof Error ? err.message : String(err)
     });
   }
 }
@@ -12277,16 +12333,16 @@ async function startReviewDetector() {
     activeRuntime = await bootDetector();
     if (!activeRuntime) return;
     stopFn = startScanLoop(activeRuntime);
-  } catch (err2) {
-    console.error(`[review] detector start failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[review] detector start failed: ${err instanceof Error ? err.message : String(err)}`);
   }
 }
 async function shutdownReviewDetector() {
   if (!stopFn) return;
   try {
     await stopFn();
-  } catch (err2) {
-    console.error(`[review] detector shutdown error: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[review] detector shutdown error: ${err instanceof Error ? err.message : String(err)}`);
   }
   stopFn = null;
   activeRuntime = null;
@@ -12391,8 +12447,8 @@ function reloadManagerConfig(accountDir) {
     const config = readConfig(accountDir);
     reloadConfig(config);
     console.error(`${TAG2} reloaded manager config`);
-  } catch (err2) {
-    console.error(`${TAG2} manager config reload failed: ${String(err2)}`);
+  } catch (err) {
+    console.error(`${TAG2} manager config reload failed: ${String(err)}`);
   }
 }
 var E164_PATTERN = /^\+\d{7,15}$/;
@@ -12453,8 +12509,8 @@ function persistAfterPairing(accountDir, accountId, selfPhone) {
     console.error(`${TAG2} persisted after pairing account=${accountId} phone=${selfPhone ?? "null"}`);
     reloadManagerConfig(accountDir);
     return { ok: true };
-  } catch (err2) {
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
     console.error(`${TAG2} persist failed account=${accountId}: ${msg}`);
     return { ok: false, error: msg };
   }
@@ -12489,8 +12545,8 @@ function addAdminPhone(accountDir, phone) {
     console.error(`${TAG2} added admin phone=${normalized}`);
     reloadManagerConfig(accountDir);
     return { ok: true, message: `Added ${normalized} as admin phone. Messages from this number will route to the admin agent.` };
-  } catch (err2) {
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
     console.error(`${TAG2} addAdminPhone failed: ${msg}`);
     return { ok: false, error: msg };
   }
@@ -12523,8 +12579,8 @@ function removeAdminPhone(accountDir, phone) {
     console.error(`${TAG2} removed admin phone=${normalized}`);
     reloadManagerConfig(accountDir);
     return { ok: true, message: `Removed ${normalized} from admin phones. Messages from this number will now route to the public agent.` };
-  } catch (err2) {
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
     console.error(`${TAG2} removeAdminPhone failed: ${msg}`);
     return { ok: false, error: msg };
   }
@@ -12575,8 +12631,8 @@ function setPublicAgent(accountDir, slug) {
     console.error(`${TAG2} publicAgent set to ${trimmed}`);
     reloadManagerConfig(accountDir);
     return { ok: true, message: `Public agent set to "${trimmed}". WhatsApp messages from non-admin phones will be handled by this agent.` };
-  } catch (err2) {
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
     console.error(`${TAG2} setPublicAgent failed: ${msg}`);
     return { ok: false, error: msg };
   }
@@ -12621,8 +12677,8 @@ function updateConfig(accountDir, fields) {
     console.error(`${TAG2} updated fields=[${fieldNames.join(",")}]`);
     reloadManagerConfig(accountDir);
     return { ok: true, message: `Updated WhatsApp config: ${fieldNames.join(", ")}.` };
-  } catch (err2) {
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
     console.error(`${TAG2} updateConfig failed: ${msg}`);
     return { ok: false, error: msg };
   }
@@ -12682,8 +12738,8 @@ async function authExists(authDir) {
     const raw2 = await fs.readFile(credsPath, "utf-8");
     JSON.parse(raw2);
     return true;
-  } catch (err2) {
-    console.warn(`${TAG3} credential validation failed path=${credsPath}: ${String(err2)}`);
+  } catch (err) {
+    console.warn(`${TAG3} credential validation failed path=${credsPath}: ${String(err)}`);
     return false;
   }
 }
@@ -12711,8 +12767,8 @@ function maybeRestoreCredsFromBackup(authDir) {
     JSON.parse(backupRaw);
     fsSync.copyFileSync(backupPath, credsPath);
     console.error(`${TAG3} restored corrupted creds.json from backup in ${authDir}`);
-  } catch (err2) {
-    console.warn(`${TAG3} credential restore failed authDir=${authDir}: ${String(err2)}`);
+  } catch (err) {
+    console.warn(`${TAG3} credential restore failed authDir=${authDir}: ${String(err)}`);
   }
 }
 function readSelfId(authDir) {
@@ -12728,8 +12784,8 @@ function readSelfId(authDir) {
       if (match2) e164 = match2[1];
     }
     return { e164, jid };
-  } catch (err2) {
-    console.warn(`${TAG3} readSelfId failed authDir=${authDir}: ${String(err2)}`);
+  } catch (err) {
+    console.warn(`${TAG3} readSelfId failed authDir=${authDir}: ${String(err)}`);
     return { e164: null, jid: null };
   }
 }
@@ -12790,8 +12846,8 @@ function serializeArg(arg) {
   if (typeof arg === "string") return arg;
   try {
     return inspect(arg, INSPECT_OPTS);
-  } catch (err2) {
-    return `[inspect-failed: ${String(err2)}]`;
+  } catch (err) {
+    return `[inspect-failed: ${String(err)}]`;
   }
 }
 function bindingsToPrefix(bindings) {
@@ -12861,12 +12917,12 @@ async function safeSaveCreds(authDir, saveCreds) {
       try {
         JSON.parse(raw2);
         fsSync2.copyFileSync(credsPath, backupPath);
-      } catch (err2) {
-        console.warn(`${TAG4} backup pre-copy failed (parse or write) authDir=${authDir}: ${String(err2)}`);
+      } catch (err) {
+        console.warn(`${TAG4} backup pre-copy failed (parse or write) authDir=${authDir}: ${String(err)}`);
       }
     }
-  } catch (err2) {
-    console.warn(`${TAG4} backup preparation failed authDir=${authDir}: ${String(err2)}`);
+  } catch (err) {
+    console.warn(`${TAG4} backup preparation failed authDir=${authDir}: ${String(err)}`);
   }
   try {
     await Promise.resolve(saveCreds());
@@ -12881,13 +12937,13 @@ async function safeSaveCreds(authDir, saveCreds) {
     } catch (statErr) {
       console.error(`${TAG4} creds NOT found on disk after save path=${credsPath}: ${String(statErr)}`);
     }
-  } catch (err2) {
-    console.error(`${TAG4} failed saving creds to ${authDir}: ${String(err2)}`);
+  } catch (err) {
+    console.error(`${TAG4} failed saving creds to ${authDir}: ${String(err)}`);
   }
 }
 function enqueueSaveCreds(authDir, saveCreds) {
-  credsSaveQueue = credsSaveQueue.then(() => safeSaveCreds(authDir, saveCreds)).catch((err2) => {
-    console.error(`${TAG4} creds save queue error: ${String(err2)}`);
+  credsSaveQueue = credsSaveQueue.then(() => safeSaveCreds(authDir, saveCreds)).catch((err) => {
+    console.error(`${TAG4} creds save queue error: ${String(err)}`);
   });
 }
 async function createWaSocket(opts) {
@@ -12946,13 +13002,13 @@ async function createWaSocket(opts) {
         console.error(`${TAG4} connected`);
       }
       onConnectionUpdate?.(update);
-    } catch (err2) {
-      console.error(`${TAG4} connection.update handler error: ${String(err2)}`);
+    } catch (err) {
+      console.error(`${TAG4} connection.update handler error: ${String(err)}`);
     }
   });
   if (sock.ws && typeof sock.ws.on === "function") {
-    sock.ws.on("error", (err2) => {
-      console.error(`${TAG4} WebSocket error: ${String(err2)}`);
+    sock.ws.on("error", (err) => {
+      console.error(`${TAG4} WebSocket error: ${String(err)}`);
     });
   }
   return sock;
@@ -12972,21 +13028,21 @@ async function waitForConnection(sock) {
     sock.ev.on("connection.update", handler);
   });
 }
-function getStatusCode(err2) {
-  return err2?.error?.output?.statusCode ?? err2?.output?.statusCode ?? err2?.status;
+function getStatusCode(err) {
+  return err?.error?.output?.statusCode ?? err?.output?.statusCode ?? err?.status;
 }
-function formatError(err2) {
-  if (err2 instanceof Error) return err2.message;
-  if (typeof err2 === "string") return err2;
-  if (!err2 || typeof err2 !== "object") return String(err2);
-  const boom = extractBoomDetails(err2) ?? extractBoomDetails(err2?.error) ?? extractBoomDetails(err2?.lastDisconnect?.error);
-  const status = boom?.statusCode ?? getStatusCode(err2);
-  const code = err2?.code;
+function formatError(err) {
+  if (err instanceof Error) return err.message;
+  if (typeof err === "string") return err;
+  if (!err || typeof err !== "object") return String(err);
+  const boom = extractBoomDetails(err) ?? extractBoomDetails(err?.error) ?? extractBoomDetails(err?.lastDisconnect?.error);
+  const status = boom?.statusCode ?? getStatusCode(err);
+  const code = err?.code;
   const codeText = typeof code === "string" || typeof code === "number" ? String(code) : void 0;
   const messageCandidates = [
     boom?.message,
-    typeof err2?.message === "string" ? err2.message : void 0,
-    typeof err2?.error?.message === "string" ? err2.error.message : void 0
+    typeof err?.message === "string" ? err.message : void 0,
+    typeof err?.error?.message === "string" ? err.error.message : void 0
   ].filter((v) => Boolean(v?.trim()));
   const message = messageCandidates[0];
   const pieces = [];
@@ -12994,11 +13050,11 @@ function formatError(err2) {
   if (boom?.error) pieces.push(boom.error);
   if (message) pieces.push(message);
   if (codeText) pieces.push(`code=${codeText}`);
-  return pieces.length > 0 ? pieces.join(" ") : String(err2);
+  return pieces.length > 0 ? pieces.join(" ") : String(err);
 }
-function extractBoomDetails(err2) {
-  if (!err2 || typeof err2 !== "object") return null;
-  const output = err2?.output;
+function extractBoomDetails(err) {
+  if (!err || typeof err !== "object") return null;
+  const output = err?.output;
   if (!output || typeof output !== "object") return null;
   const payload = output.payload;
   const statusCode = typeof output.statusCode === "number" ? output.statusCode : typeof payload?.statusCode === "number" ? payload.statusCode : void 0;
@@ -13022,9 +13078,9 @@ function computeReconnectNextState(input) {
   }
   return { action: "retry", nextAttempts, reason: "short-lived" };
 }
-function classifyDisconnect(err2) {
-  const statusCode = getStatusCode(err2);
-  const message = formatError(err2);
+function classifyDisconnect(err) {
+  const statusCode = getStatusCode(err);
+  const message = formatError(err);
   if (statusCode === DisconnectReason2.loggedOut) {
     return {
       kind: "loggedOut",
@@ -13066,14 +13122,14 @@ var INSPECT_OPTS2 = {
   compact: true,
   maxArrayLength: 50
 };
-function formatErr(err2) {
-  if (err2 instanceof Error) {
-    const base = `${err2.name}: ${err2.message}`;
-    const inspected = inspect2(err2, INSPECT_OPTS2);
+function formatErr(err) {
+  if (err instanceof Error) {
+    const base = `${err.name}: ${err.message}`;
+    const inspected = inspect2(err, INSPECT_OPTS2);
     return `${base}
 ${inspected}`;
   }
-  return inspect2(err2, INSPECT_OPTS2);
+  return inspect2(err, INSPECT_OPTS2);
 }
 function withTimeout(label, promise, timeoutMs) {
   return new Promise((resolve33, reject) => {
@@ -13085,9 +13141,9 @@ function withTimeout(label, promise, timeoutMs) {
         clearTimeout(timer);
         resolve33(value);
       },
-      (err2) => {
+      (err) => {
         clearTimeout(timer);
-        reject(err2);
+        reject(err);
       }
     );
   });
@@ -13128,8 +13184,8 @@ async function runInitQueries(sock, ctx) {
     console.error(
       `${TAG5} fetchBlocklist ok account=${ctx.accountId} count=${count}`
     );
-  } catch (err2) {
-    const formatted = formatErr(err2);
+  } catch (err) {
+    const formatted = formatErr(err);
     result.errors.blocklist = formatted;
     console.error(
       `${TAG5} fetchBlocklist FAILED account=${ctx.accountId}: ${formatted}`
@@ -13155,8 +13211,8 @@ async function runInitQueries(sock, ctx) {
     console.error(
       `${TAG5} fetchPrivacySettings ok account=${ctx.accountId} keys=${settings ? Object.keys(settings).join(",") : ""}`
     );
-  } catch (err2) {
-    const formatted = formatErr(err2);
+  } catch (err) {
+    const formatted = formatErr(err);
     result.errors.privacySettings = formatted;
     console.error(
       `${TAG5} fetchPrivacySettings FAILED account=${ctx.accountId}: ${formatted}`
@@ -13230,8 +13286,8 @@ async function resolveJidToE164(jid, lidMapping) {
             return phone;
           }
         }
-      } catch (err2) {
-        console.error(`[whatsapp:normalize] LID mapping failed jid=${jid}: ${String(err2)}`);
+      } catch (err) {
+        console.error(`[whatsapp:normalize] LID mapping failed jid=${jid}: ${String(err)}`);
       }
     }
     const lidMatch = jid.match(WHATSAPP_LID_RE);
@@ -13484,8 +13540,8 @@ function recordActivity(event) {
     console.error(
       `${TAG6} channel-activity: direction=${direction} account=${accountId} jid=${jid}` + (messageType ? ` type=${messageType}` : "")
     );
-  } catch (err2) {
-    console.error(`${TAG6} recording failed: ${String(err2)}`);
+  } catch (err) {
+    console.error(`${TAG6} recording failed: ${String(err)}`);
   }
 }
 function getChannelActivity(accountId) {
@@ -13524,9 +13580,9 @@ async function sendTextMessage(sock, to, text, opts) {
       recordActivity({ accountId: opts.accountId, direction: "outbound", jid, messageType: "text" });
     }
     return { success: true, messageId: messageId ?? void 0 };
-  } catch (err2) {
-    console.error(`${TAG7} send failed to=${to}: ${String(err2)}`);
-    return { success: false, error: String(err2) };
+  } catch (err) {
+    console.error(`${TAG7} send failed to=${to}: ${String(err)}`);
+    return { success: false, error: String(err) };
   }
 }
 async function sendReadReceipt(sock, chatJid, messageIds, participant) {
@@ -13586,9 +13642,9 @@ async function sendMediaMessage(sock, to, media, opts) {
       recordActivity({ accountId: opts.accountId, direction: "outbound", jid, messageType: media.type });
     }
     return { success: true, messageId: messageId ?? void 0 };
-  } catch (err2) {
-    console.error(`${TAG7} send media failed to=${to}: ${String(err2)}`);
-    return { success: false, error: String(err2) };
+  } catch (err) {
+    console.error(`${TAG7} send media failed to=${to}: ${String(err)}`);
+    return { success: false, error: String(err) };
   }
 }
@@ -13690,8 +13746,8 @@ async function downloadInboundMedia(msg, sock, opts) {
       mimetype: mimetype ?? "application/octet-stream",
       size: buffer.length
     };
-  } catch (err2) {
-    console.error(`${TAG8} media download failed type=${mimetype ?? "unknown"} error=${String(err2)}`);
+  } catch (err) {
+    console.error(`${TAG8} media download failed type=${mimetype ?? "unknown"} error=${String(err)}`);
     return void 0;
   }
 }
@@ -13733,8 +13789,8 @@ function createInboundDebouncer(opts) {
       if (result && typeof result.catch === "function") {
         result.catch(onError);
       }
-    } catch (err2) {
-      onError(err2);
+    } catch (err) {
+      onError(err);
     }
   }
   async function flush() {
@@ -13749,8 +13805,8 @@ function createInboundDebouncer(opts) {
         if (result && typeof result.catch === "function") {
           result.catch(onError);
         }
-      } catch (err2) {
-        onError(err2);
+      } catch (err) {
+        onError(err);
       }
       return;
     }
@@ -13761,8 +13817,8 @@ function createInboundDebouncer(opts) {
         if (result && typeof result.catch === "function") {
           result.catch(onError);
         }
-      } catch (err2) {
-        onError(err2);
+      } catch (err) {
+        onError(err);
       }
       return;
     }
@@ -13876,9 +13932,9 @@ async function isBusinessOpen(accountId) {
     } finally {
       await session.close();
     }
-  } catch (err2) {
+  } catch (err) {
     console.error(
-      `${TAG10} [${accountId}] business hours check failed, treating as open: ${err2 instanceof Error ? err2.message : String(err2)}`
+      `${TAG10} [${accountId}] business hours check failed, treating as open: ${err instanceof Error ? err.message : String(err)}`
     );
     return { open: true, reason: "hours check failed (treating as open)" };
   }
@@ -13956,8 +14012,8 @@ async function transcribe(audioPath, mimetype) {
       // overwrite without prompting
       wavPath
     ], { timeout: 3e4 });
-  } catch (err2) {
-    const reason = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const reason = err instanceof Error ? err.message : String(err);
     console.error(`${TAG11} failed: ffmpeg conversion error=${reason}`);
     return void 0;
   }
@@ -13986,9 +14042,9 @@ async function transcribe(audioPath, mimetype) {
       `${TAG11} done provider=whisper-local duration_ms=${durationMs} words=${words} lang=${language}`
     );
     return { text, language, durationMs };
-  } catch (err2) {
+  } catch (err) {
     const durationMs = Date.now() - startMs;
-    const reason = err2 instanceof Error ? err2.message : String(err2);
+    const reason = err instanceof Error ? err.message : String(err);
     console.error(`${TAG11} failed provider=whisper-local duration_ms=${durationMs} error=${reason}`);
     return void 0;
   } finally {
@@ -14043,8 +14099,8 @@ async function init(opts) {
       console.error(`${TAG12} skipping disabled account=${accountId}`);
       continue;
     }
-    startConnection(accountId).catch((err2) => {
-      console.error(`${TAG12} failed to auto-start account=${accountId}: ${formatError(err2)}`);
+    startConnection(accountId).catch((err) => {
+      console.error(`${TAG12} failed to auto-start account=${accountId}: ${formatError(err)}`);
     });
   }
 }
@@ -14088,8 +14144,8 @@ async function stopConnection(accountId) {
       conn.sock.ev.removeAllListeners("connection.update");
       conn.sock.ev.removeAllListeners("creds.update");
       conn.sock.ws?.close?.();
-    } catch (err2) {
-      console.warn(`${TAG12} socket cleanup error during stop account=${accountId}: ${String(err2)}`);
+    } catch (err) {
+      console.warn(`${TAG12} socket cleanup error during stop account=${accountId}: ${String(err)}`);
     }
   }
   connections.delete(accountId);
@@ -14135,8 +14191,8 @@ async function registerLoginSocket(accountId, sock, authDir) {
   try {
     await sock.sendPresenceUpdate("available");
     console.error(`${TAG12} presence set to available account=${accountId}`);
-  } catch (err2) {
-    console.error(`${TAG12} presence update failed account=${accountId}: ${String(err2)}`);
+  } catch (err) {
+    console.error(`${TAG12} presence update failed account=${accountId}: ${String(err)}`);
   }
   await runInitQueries(sock, {
     accountId,
@@ -14187,8 +14243,8 @@ function loadConfig(accountConfig) {
         whatsAppConfig = {};
       }
     }
-  } catch (err2) {
-    console.error(`${TAG12} config load error: ${String(err2)}`);
+  } catch (err) {
+    console.error(`${TAG12} config load error: ${String(err)}`);
     whatsAppConfig = {};
   }
 }
@@ -14219,8 +14275,8 @@ async function connectWithReconnect(conn) {
       try {
         await sock.sendPresenceUpdate("available");
         console.error(`${TAG12} presence set to available account=${conn.accountId}`);
-      } catch (err2) {
-        console.error(`${TAG12} presence update failed account=${conn.accountId}: ${String(err2)}`);
+      } catch (err) {
+        console.error(`${TAG12} presence update failed account=${conn.accountId}: ${String(err)}`);
       }
       await runInitQueries(sock, {
         accountId: conn.accountId,
@@ -14238,14 +14294,14 @@ async function connectWithReconnect(conn) {
       uptimeMs = Date.now() - connectedAt;
       conn.connected = false;
       conn.sock = null;
-    } catch (err2) {
+    } catch (err) {
       conn.connected = false;
       conn.sock = null;
-      cycleError = err2;
+      cycleError = err;
       if (connectedAt) {
         uptimeMs = Date.now() - connectedAt;
       }
-      const classification = classifyDisconnect(err2);
+      const classification = classifyDisconnect(err);
       conn.lastError = classification.message;
       console.error(`${TAG12} disconnect account=${conn.accountId}: ${classification.kind} \u2014 ${classification.message}`);
       if (!classification.shouldRetry) {
@@ -14318,8 +14374,8 @@ function watchForDisconnect(conn) {
       console.error(`${TAG12} socket disconnected for account=${conn.accountId}`);
       conn.connected = false;
       conn.sock = null;
-      connectWithReconnect(conn).catch((err2) => {
-        console.error(`${TAG12} reconnection failed for account=${conn.accountId}: ${formatError(err2)}`);
+      connectWithReconnect(conn).catch((err) => {
+        console.error(`${TAG12} reconnection failed for account=${conn.accountId}: ${formatError(err)}`);
       });
     }
   });
@@ -14346,9 +14402,9 @@ async function getGroupMeta(conn, jid) {
       `${TAG12} group metadata cached for ${jid}: "${meta.subject}", ${participants.length} participants, expires in ${GROUP_META_TTL}ms account=${conn.accountId}`
     );
     return entry;
-  } catch (err2) {
+  } catch (err) {
     console.error(
-      `${TAG12} group metadata fetch failed for ${jid}: ${err2 instanceof Error ? err2.message : String(err2)}, caching empty entry for ${GROUP_META_TTL}ms account=${conn.accountId}`
+      `${TAG12} group metadata fetch failed for ${jid}: ${err instanceof Error ? err.message : String(err)}, caching empty entry for ${GROUP_META_TTL}ms account=${conn.accountId}`
     );
     const emptyEntry = { expires: Date.now() + GROUP_META_TTL };
     conn.groupMetaCache.set(jid, emptyEntry);
@@ -14384,8 +14440,8 @@ function monitorInbound(conn) {
         mediaType: mediaEntry?.mediaType ?? last.mediaType
       });
     },
-    onError: (err2) => {
-      console.error(`${TAG12} debounce flush error account=${conn.accountId}: ${String(err2)}`);
+    onError: (err) => {
+      console.error(`${TAG12} debounce flush error account=${conn.accountId}: ${String(err)}`);
     }
   });
   sock.ev.on("messages.upsert", async (upsert) => {
@@ -14437,8 +14493,8 @@ function monitorInbound(conn) {
           continue;
         }
         await handleInboundMessage(conn, msg);
-      } catch (err2) {
-        console.error(`${TAG12} inbound handler error account=${conn.accountId}: ${String(err2)}`);
+      } catch (err) {
+        console.error(`${TAG12} inbound handler error account=${conn.accountId}: ${String(err)}`);
       }
     }
   });
@@ -14591,9 +14647,9 @@ async function handleInboundMessage(conn, msg) {
         try {
           await reply(afterHoursMessage);
           console.error(`${TAG12} [${conn.accountId}] after-hours auto-reply sent to ${remoteJid}`);
-        } catch (err2) {
+        } catch (err) {
           console.error(
-            `${TAG12} [${conn.accountId}] after-hours auto-reply failed: ${err2 instanceof Error ? err2.message : String(err2)}`
+            `${TAG12} [${conn.accountId}] after-hours auto-reply failed: ${err instanceof Error ? err.message : String(err)}`
           );
         }
       }
@@ -14650,8 +14706,8 @@ async function GET(req, remoteAddress) {
         pinConfigured = Array.isArray(users) && users.length > 0;
       }
     }
-  } catch (err2) {
-    console.error(`[health] users.json corrupt \u2014 reporting pin_configured=false: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[health] users.json corrupt \u2014 reporting pin_configured=false: ${err instanceof Error ? err.message : String(err)}`);
   }
   let authHealth;
   try {
@@ -14685,8 +14741,8 @@ async function GET(req, remoteAddress) {
       lastError: a.lastError ?? null,
       sessionStuckReason: a.sessionStuckReason ?? null
     }));
-  } catch (err2) {
-    console.error(`[health] failed to read WhatsApp status: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[health] failed to read WhatsApp status: ${err instanceof Error ? err.message : String(err)}`);
   }
   const whatsappAnyConnected = whatsappAccounts.some((a) => a.connected);
   const whatsappAnyStuck = whatsappAccounts.some((a) => Boolean(a.sessionStuckReason));
@@ -14737,8 +14793,8 @@ async function POST(req) {
   let body;
   try {
     body = await req.json();
-  } catch (err2) {
-    console.error("[session] failed to parse request body:", err2);
+  } catch (err) {
+    console.error("[session] failed to parse request body:", err);
     return Response.json({ error: "Invalid request" }, { status: 400 });
   }
   if (!body.session_id || typeof body.session_id !== "string") {
@@ -14990,8 +15046,8 @@ function writeBrandingCache(accountId, agentSlug, branding) {
     const cacheDir = resolve12(MAXY_DIR, "branding-cache", accountId);
     mkdirSync8(cacheDir, { recursive: true });
     writeFileSync10(resolve12(cacheDir, `${agentSlug}.json`), JSON.stringify(branding), "utf-8");
-  } catch (err2) {
-    console.error(`[branding] cache write failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[branding] cache write failed: ${err instanceof Error ? err.message : String(err)}`);
   }
 }
 function parseVisitorCookie(cookieHeader) {
@@ -15027,20 +15083,20 @@ var VISITOR_ERROR_MESSAGES = {
   claude_overloaded: "I'm not available right now. Please try again shortly.",
   agent_error: "I'm not available right now. Please try again later."
 };
-function classifyAgentError(err2) {
-  const msg = err2 instanceof Error ? err2.message : String(err2);
+function classifyAgentError(err) {
+  const msg = err instanceof Error ? err.message : String(err);
   if (/\b(401|authentication_error|OAuth token has expired)\b/i.test(msg)) return "auth_expired";
   if (/credit balance|billing|purchase credits/i.test(msg)) return "billing";
   if (/\b(500|api_error|internal server error)\b/i.test(msg)) return "claude_down";
   if (/\b(529|overloaded)\b/i.test(msg)) return "claude_overloaded";
   return "agent_error";
 }
-function friendlyAgentError(err2, agentType = "admin") {
-  const code = classifyAgentError(err2);
+function friendlyAgentError(err, agentType = "admin") {
+  const code = classifyAgentError(err);
   if (agentType === "public") return VISITOR_ERROR_MESSAGES[code];
   const base = ADMIN_ERROR_MESSAGES[code];
   if (code === "agent_error") {
-    const raw2 = err2 instanceof Error ? err2.message : String(err2);
+    const raw2 = err instanceof Error ? err.message : String(err);
     return `${base}
 ${raw2}`;
@@ -15200,8 +15256,8 @@ async function transcribeVoiceNote(file, source) {
     tempPath = join8(tempDir, `recording${ext}`);
     const buffer = Buffer.from(await file.arrayBuffer());
     await writeFile3(tempPath, buffer);
-  } catch (err2) {
-    const reason = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const reason = err instanceof Error ? err.message : String(err);
     console.error(`${TAG13} failed source=${source} error=temp-file-write: ${reason}`);
     return { ok: false, error: "Could not process voice note" };
   }
@@ -15224,9 +15280,9 @@ async function transcribeVoiceNote(file, source) {
       ok: true,
       result: { text: rawText, durationMs: elapsed, words }
     };
-  } catch (err2) {
+  } catch (err) {
     const elapsed = Date.now() - startMs;
-    const reason = err2 instanceof Error ? err2.message : String(err2);
+    const reason = err instanceof Error ? err.message : String(err);
     console.error(
       `${TAG13} failed source=${source} error=${reason} duration_ms=${elapsed}`
     );
@@ -15474,10 +15530,10 @@ async function processInbound(rawText, channel) {
       );
     }
     return result;
-  } catch (err2) {
+  } catch (err) {
     const latencyMs = Date.now() - startMs;
-    const reason = err2 instanceof Error ? err2.message : String(err2);
-    const errorType = err2 instanceof Error && err2.name === "AbortError" ? "timeout" : "api-error";
+    const reason = err instanceof Error ? err.message : String(err);
+    const errorType = err instanceof Error && err.name === "AbortError" ? "timeout" : "api-error";
     console.warn(
       `${TAG14} fallthrough channel=${channel} reason=${errorType}: ${reason} latency_ms=${latencyMs}`
     );
@@ -15562,9 +15618,9 @@ async function POST2(req) {
             `File "${file.name}" exceeds the 20 MB limit (${(file.size / 1024 / 1024).toFixed(1)} MB).`
           );
         }
-      } catch (err2) {
+      } catch (err) {
         return new Response(
-          JSON.stringify({ error: err2 instanceof Error ? err2.message : "Invalid file" }),
+          JSON.stringify({ error: err instanceof Error ? err.message : "Invalid file" }),
           { status: 422, headers: { "Content-Type": "application/json" } }
         );
       }
@@ -15703,22 +15759,22 @@ async function POST2(req) {
             controller.enqueue(encoder.encode("data: [DONE]\n\n"));
           }
         }
-      } catch (err2) {
-        const rawMessage = err2 instanceof Error ? err2.message : String(err2);
+      } catch (err) {
+        const rawMessage = err instanceof Error ? err.message : String(err);
         const ts = (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
-        const controllerClosed = err2 instanceof TypeError && /Controller is already closed/i.test(rawMessage);
+        const controllerClosed = err instanceof TypeError && /Controller is already closed/i.test(rawMessage);
         if (controllerClosed) {
           sseLog.write(`[${ts}] [${sk}] ${agentName}: DISCONNECT [client_disconnect] ${rawMessage}
 `);
         } else {
-          const category = classifyAgentError(err2);
+          const category = classifyAgentError(err);
           sseLog.write(`[${ts}] [${sk}] ${agentName}: ERROR [${category}] ${rawMessage}
 `);
           sseLog.write(`[${ts}] [${sk}] ${agentName}: ${JSON.stringify({ type: "done", subtype: "error", error: rawMessage, error_category: category })}
 `);
           try {
             controller.enqueue(
-              encoder.encode(`data: ${JSON.stringify({ error: friendlyAgentError(err2, local ? "admin" : "public") })}
+              encoder.encode(`data: ${JSON.stringify({ error: friendlyAgentError(err, local ? "admin" : "public") })}
 `)
             );
@@ -15766,9 +15822,15 @@ function readPassword2() {
 }
 function getDriver2() {
   if (!driver2) {
-    const uri = process.env.NEO4J_URI ?? "bolt://localhost:7687";
+    const uri = process.env.NEO4J_URI;
+    if (!uri) {
+      throw new Error(
+        "[ui/access-gate] NEO4J_URI unset \u2014 refusing to default to bolt://localhost:7687 (Task 580)"
+      );
+    }
     const user = process.env.NEO4J_USER ?? "neo4j";
     const password = readPassword2();
+    console.error(`[ui/access-gate] resolved neo4j_uri=${uri}`);
     driver2 = neo4j2.driver(uri, neo4j2.auth.basic(user, password), {
       maxConnectionPoolSize: 5
     });
@@ -16124,8 +16186,8 @@ async function POST3(req) {
         status: result.status
       }
     });
-  } catch (err2) {
-    console.error(`[access-gate] verify-token ip=${clientIp} agent=${agentSlug} error=${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[access-gate] verify-token ip=${clientIp} agent=${agentSlug} error=${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Internal server error" }, { status: 500 });
   }
 }
@@ -16218,8 +16280,8 @@ async function POST4(req) {
         status: grant.status
       }
     });
-  } catch (err2) {
-    console.error(`[access-gate] verify-otp ip=${clientIp} agent=${agentSlug} error=${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[access-gate] verify-otp ip=${clientIp} agent=${agentSlug} error=${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Internal server error" }, { status: 500 });
   }
 }
@@ -16262,8 +16324,8 @@ async function POST5(req) {
     completeGrantSetup(session_key);
     console.error(`[access-gate] create-credentials agent=${grant.grantContactValue ? "redacted" : "unknown"} result=success`);
     return Response.json({ session_key });
-  } catch (err2) {
-    console.error(`[access-gate] create-credentials error=${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[access-gate] create-credentials error=${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Internal server error" }, { status: 500 });
   }
 }
@@ -16348,8 +16410,8 @@ async function POST6(req) {
       session_key: sessionKey,
       agent_id: agentSlug
     });
-  } catch (err2) {
-    console.error(`[access-gate] login ip=${clientIp} agent=${agentSlug} error=${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[access-gate] login ip=${clientIp} agent=${agentSlug} error=${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Internal server error" }, { status: 500 });
   }
 }
@@ -16380,13 +16442,13 @@ function readBrevoApiKey() {
       throw new Error(`Brevo API key file is empty: ${BREVO_API_KEY_FILE}`);
     }
     return key;
-  } catch (err2) {
-    if (err2.code === "ENOENT") {
+  } catch (err) {
+    if (err.code === "ENOENT") {
       throw new Error(
         `Brevo API key not configured. Expected at ${BREVO_API_KEY_FILE}. Set up SMS via the admin agent: "set up SMS" \u2192 provide your Brevo API key.`
       );
     }
-    throw err2;
+    throw err;
   }
 }
 function hasBrevoApiKey() {
@@ -16396,10 +16458,10 @@ async function sendSms(recipient, content, opts) {
   let apiKey;
   try {
     apiKey = readBrevoApiKey();
-  } catch (err2) {
+  } catch (err) {
     return {
       success: false,
-      error: err2 instanceof Error ? err2.message : "Failed to read Brevo API key"
+      error: err instanceof Error ? err.message : "Failed to read Brevo API key"
     };
   }
   const finalContent = opts?.aiGenerated ? `${content} [AI-generated]` : content;
@@ -16443,13 +16505,13 @@ async function sendSms(recipient, content, opts) {
         error = `Brevo API error (HTTP ${statusCode})`;
     }
     return { success: false, error, statusCode };
-  } catch (err2) {
-    if (err2 instanceof DOMException && err2.name === "AbortError") {
+  } catch (err) {
+    if (err instanceof DOMException && err.name === "AbortError") {
       return { success: false, error: "Brevo API request timed out (10s)" };
     }
     return {
       success: false,
-      error: `SMS delivery failed: ${err2 instanceof Error ? err2.message : String(err2)}`
+      error: `SMS delivery failed: ${err instanceof Error ? err.message : String(err)}`
     };
   } finally {
     clearTimeout(timeout);
@@ -16520,8 +16582,8 @@ async function POST7(req) {
       console.error(`[access-gate] forgot-password ip=${clientIp} agent=${agentSlug} contact=${maskContact(contact)} result=token_generated`);
     }
     return Response.json(GENERIC_RESPONSE);
-  } catch (err2) {
-    console.error(`[access-gate] forgot-password ip=${clientIp} agent=${agentSlug} error=${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[access-gate] forgot-password ip=${clientIp} agent=${agentSlug} error=${err instanceof Error ? err.message : String(err)}`);
     return Response.json(GENERIC_RESPONSE);
   }
 }
@@ -16578,8 +16640,8 @@ async function POST8(req, remoteAddress) {
       messageId: smsResult.messageId,
       grantId: grant.grantId
     });
-  } catch (err2) {
-    console.error(`[access-gate] send-otp agent=${agentSlug} phone=${maskContact(phone)} error=${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[access-gate] send-otp agent=${agentSlug} phone=${maskContact(phone)} error=${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Internal server error" }, { status: 500 });
   }
 }
@@ -16665,9 +16727,9 @@ async function handleInbound(params) {
     if (agentType === "public" && responseText) {
       responseText += "\n\n\u2014 This message was generated by AI";
     }
-  } catch (err2) {
+  } catch (err) {
     console.error(
-      `${TAG15} agent-error: chatId=${chatId} senderId=${senderId} error=${err2 instanceof Error ? err2.message : String(err2)}`
+      `${TAG15} agent-error: chatId=${chatId} senderId=${senderId} error=${err instanceof Error ? err.message : String(err)}`
     );
     responseText = "I'm having trouble right now. Please try again in a moment.";
   }
@@ -16688,9 +16750,9 @@ async function handleInbound(params) {
         `${TAG15} send-error: chatId=${chatId} error=${data.description ?? "unknown"}`
       );
     }
-  } catch (err2) {
+  } catch (err) {
     console.error(
-      `${TAG15} send-error: chatId=${chatId} error=${err2 instanceof Error ? err2.message : String(err2)}`
+      `${TAG15} send-error: chatId=${chatId} error=${err instanceof Error ? err.message : String(err)}`
     );
   }
 }
@@ -16757,8 +16819,8 @@ async function POST9(req) {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ callback_query_id: callbackId })
-    }).catch((err2) => {
-      console.error(`${TAG15} callback-ack-error: ${err2 instanceof Error ? err2.message : String(err2)}`);
+    }).catch((err) => {
+      console.error(`${TAG15} callback-ack-error: ${err instanceof Error ? err.message : String(err)}`);
     });
   }
   handleInbound({
@@ -16769,9 +16831,9 @@ async function POST9(req) {
     botToken,
     accountId: account.accountId,
     agentType: accessResult.agentType
-  }).catch((err2) => {
+  }).catch((err) => {
     console.error(
-      `${TAG15} unhandled-error: chatId=${chatId} senderId=${senderId} error=${err2 instanceof Error ? err2.message : String(err2)}`
+      `${TAG15} unhandled-error: chatId=${chatId} senderId=${senderId} error=${err instanceof Error ? err.message : String(err)}`
     );
   });
   return Response.json({ ok: true });
@@ -16788,8 +16850,8 @@ var activeLogins = /* @__PURE__ */ new Map();
 function closeSocket(sock) {
   try {
     sock.ws?.close?.();
-  } catch (err2) {
-    console.warn(`${TAG16} socket close error during cleanup: ${String(err2)}`);
+  } catch (err) {
+    console.warn(`${TAG16} socket close error during cleanup: ${String(err)}`);
   }
 }
 function resetActiveLogin(accountId) {
@@ -16815,20 +16877,20 @@ async function loginConnectionLoop(accountId, login) {
         console.error(`${TAG16} loginConnectionLoop: connected account=${accountId} attempt=${attempt}`);
       }
       return;
-    } catch (err2) {
+    } catch (err) {
       const current = activeLogins.get(accountId);
       if (current?.id !== login.id) return;
-      const classification = classifyDisconnect(err2);
+      const classification = classifyDisconnect(err);
       if (!classification.shouldRetry || attempt >= LOGIN_MAX_RECONNECTS) {
         if (attempt >= LOGIN_MAX_RECONNECTS) {
           console.error(
             `${TAG16} login reconnect attempts exhausted (${attempt}/${LOGIN_MAX_RECONNECTS}) \u2014 surfacing error to agent`
           );
-          current.error = `Login failed after ${attempt} reconnect attempts: ${formatError(err2)}`;
+          current.error = `Login failed after ${attempt} reconnect attempts: ${formatError(err)}`;
         } else {
-          current.error = formatError(err2);
+          current.error = formatError(err);
         }
-        current.errorStatus = getStatusCode(err2);
+        current.errorStatus = getStatusCode(err);
         return;
       }
       attempt++;
@@ -16912,10 +16974,10 @@ async function startLogin(opts) {
         resolveQr?.(qr2);
       }
     });
-  } catch (err2) {
+  } catch (err) {
     clearTimeout(qrTimer);
     resetActiveLogin(accountId);
-    return { message: `Failed to start WhatsApp login: ${String(err2)}` };
+    return { message: `Failed to start WhatsApp login: ${String(err)}` };
   }
   const login = {
     accountId,
@@ -16927,20 +16989,20 @@ async function startLogin(opts) {
   };
   activeLogins.set(accountId, login);
   if (pendingQr && !login.qr) login.qr = pendingQr;
-  loginConnectionLoop(accountId, login).catch((err2) => {
-    console.error(`${TAG16} loginConnectionLoop unexpected error: ${String(err2)}`);
+  loginConnectionLoop(accountId, login).catch((err) => {
+    console.error(`${TAG16} loginConnectionLoop unexpected error: ${String(err)}`);
     const current = activeLogins.get(accountId);
     if (current?.id === login.id) {
-      current.error = `Unexpected login error: ${String(err2)}`;
+      current.error = `Unexpected login error: ${String(err)}`;
     }
   });
   let qr;
   try {
     qr = await qrPromise;
-  } catch (err2) {
+  } catch (err) {
     clearTimeout(qrTimer);
     resetActiveLogin(accountId);
-    return { message: `Failed to get QR: ${String(err2)}` };
+    return { message: `Failed to get QR: ${String(err)}` };
   }
   login.qrDataUrl = `qr:${qr}`;
   return {
@@ -17012,9 +17074,9 @@ async function POST10(req) {
     const result = await startLogin({ accountId, authDir, force });
     console.error(`[whatsapp:api] login/start result account=${accountId} hasQr=${!!result.qrRaw}${result.selfPhone ? ` phone=${result.selfPhone}` : ""}`);
     return Response.json(result);
-  } catch (err2) {
-    console.error(`[whatsapp:api] login/start error: ${String(err2)}`);
-    return Response.json({ error: String(err2) }, { status: 500 });
+  } catch (err) {
+    console.error(`[whatsapp:api] login/start error: ${String(err)}`);
+    return Response.json({ error: String(err) }, { status: 500 });
   }
 }
@@ -17054,9 +17116,9 @@ async function POST11(req) {
       selfPhone: result.selfPhone,
       configPersisted
     });
-  } catch (err2) {
-    console.error(`[whatsapp:api] login/wait error: ${String(err2)}`);
-    return Response.json({ error: String(err2) }, { status: 500 });
+  } catch (err) {
+    console.error(`[whatsapp:api] login/wait error: ${String(err)}`);
+    return Response.json({ error: String(err) }, { status: 500 });
   }
 }
@@ -17067,9 +17129,9 @@ async function GET2(_req) {
     const summary = status.map((a) => `${a.accountId}:${a.connected ? "up" : "down"}`).join(", ");
     console.error(`[whatsapp:api] status accounts=${status.length} [${summary}]`);
     return Response.json({ accounts: status });
-  } catch (err2) {
-    console.error(`[whatsapp:api] status error: ${String(err2)}`);
-    return Response.json({ error: String(err2) }, { status: 500 });
+  } catch (err) {
+    console.error(`[whatsapp:api] status error: ${String(err)}`);
+    return Response.json({ error: String(err) }, { status: 500 });
   }
 }
@@ -17080,9 +17142,9 @@ async function POST12(req) {
     const accountId = validateAccountId(body.accountId);
     await stopConnection(accountId);
     return Response.json({ disconnected: true, accountId });
-  } catch (err2) {
-    console.error(`[whatsapp:api] disconnect error: ${String(err2)}`);
-    return Response.json({ error: String(err2) }, { status: 500 });
+  } catch (err) {
+    console.error(`[whatsapp:api] disconnect error: ${String(err)}`);
+    return Response.json({ error: String(err) }, { status: 500 });
   }
 }
@@ -17093,9 +17155,9 @@ async function POST13(req) {
     const accountId = validateAccountId(body.accountId);
     await startConnection(accountId);
     return Response.json({ reconnecting: true, accountId });
-  } catch (err2) {
-    console.error(`[whatsapp:api] reconnect error: ${String(err2)}`);
-    return Response.json({ error: String(err2) }, { status: 500 });
+  } catch (err) {
+    console.error(`[whatsapp:api] reconnect error: ${String(err)}`);
+    return Response.json({ error: String(err) }, { status: 500 });
   }
 }
@@ -17117,9 +17179,9 @@ async function POST14(req) {
     }
     const result = await sendTextMessage(sock, to, text, { accountId });
     return Response.json(result);
-  } catch (err2) {
-    console.error(`[whatsapp:api] send error: ${String(err2)}`);
-    return Response.json({ error: String(err2) }, { status: 500 });
+  } catch (err) {
+    console.error(`[whatsapp:api] send error: ${String(err)}`);
+    return Response.json({ error: String(err) }, { status: 500 });
   }
 }
@@ -17286,8 +17348,8 @@ async function POST15(req) {
                 console.error(`[whatsapp:api] config action=list-public-agents error="failed to parse config.json for agent ${entry.name}" \u2014 skipping`);
               }
             }
-          } catch (err2) {
-            console.error(`[whatsapp:api] config action=list-public-agents error="failed to scan agents directory: ${String(err2)}"`);
+          } catch (err) {
+            console.error(`[whatsapp:api] config action=list-public-agents error="failed to scan agents directory: ${String(err)}"`);
           }
         }
         console.error(`[whatsapp:api] config action=list-public-agents count=${agents.length}`);
@@ -17314,9 +17376,9 @@ async function POST15(req) {
           }));
           console.error(`[whatsapp:api] config action=list-groups count=${groups.length} accountId=${groupAccountId}`);
           return Response.json({ ok: true, groups });
-        } catch (err2) {
-          console.error(`[whatsapp:api] config action=list-groups error="${String(err2)}" accountId=${groupAccountId}`);
-          return Response.json({ ok: false, error: `Failed to fetch groups: ${String(err2)}` });
+        } catch (err) {
+          console.error(`[whatsapp:api] config action=list-groups error="${String(err)}" accountId=${groupAccountId}`);
+          return Response.json({ ok: false, error: `Failed to fetch groups: ${String(err)}` });
         }
       }
       case "update-config": {
@@ -17339,9 +17401,9 @@ async function POST15(req) {
           { status: 400 }
         );
     }
-  } catch (err2) {
-    console.error(`[whatsapp:api] config error: ${String(err2)}`);
-    return Response.json({ ok: false, error: String(err2) }, { status: 500 });
+  } catch (err) {
+    console.error(`[whatsapp:api] config error: ${String(err)}`);
+    return Response.json({ ok: false, error: String(err) }, { status: 500 });
   }
 }
@@ -17375,14 +17437,14 @@ async function POST16(req) {
         console.error(`${TAG17} send-document REJECTED path=${sanitised} reason=outside_account_directory`);
         return Response.json({ error: "Access denied: file is outside the account directory" }, { status: 403 });
       }
-    } catch (err2) {
-      const code = err2.code;
+    } catch (err) {
+      const code = err.code;
       if (code === "ENOENT") {
         console.error(`${TAG17} send-document ENOENT path=${filePath}`);
         return Response.json({ error: `File not found: ${filePath}` }, { status: 404 });
       }
-      console.error(`${TAG17} send-document path error: ${String(err2)}`);
-      return Response.json({ error: String(err2) }, { status: 500 });
+      console.error(`${TAG17} send-document path error: ${String(err)}`);
+      return Response.json({ error: String(err) }, { status: 500 });
     }
     const fileStat = await stat3(resolvedPath);
     if (fileStat.size > MAX_FILE_SIZE_BYTES) {
@@ -17412,9 +17474,9 @@ async function POST16(req) {
       `${TAG17} send-document to=${to} size=${fileStat.size} mime=${mimetype} ok=${result.success}` + (result.messageId ? ` id=${result.messageId}` : "")
     );
     return Response.json(result);
-  } catch (err2) {
-    console.error(`${TAG17} send-document error: ${String(err2)}`);
-    return Response.json({ error: String(err2) }, { status: 500 });
+  } catch (err) {
+    console.error(`${TAG17} send-document error: ${String(err)}`);
+    return Response.json({ error: String(err) }, { status: 500 });
   }
 }
@@ -17429,9 +17491,9 @@ async function GET3(req) {
       `[whatsapp:api] activity accounts=${result.accounts.length} total=${total} recentEvents=${result.recentEvents.length}` + (accountId ? ` filter=${accountId}` : "")
     );
     return Response.json(result);
-  } catch (err2) {
-    console.error(`[whatsapp:api] activity error: ${String(err2)}`);
-    return Response.json({ error: String(err2) }, { status: 500 });
+  } catch (err) {
+    console.error(`[whatsapp:api] activity error: ${String(err)}`);
+    return Response.json({ error: String(err) }, { status: 500 });
   }
 }
@@ -17456,9 +17518,9 @@ async function GET4(req) {
       `[whatsapp:api] conversations account=${accountId} count=${conversations.length}`
     );
     return Response.json({ conversations });
-  } catch (err2) {
-    console.error(`[whatsapp:api] conversations error: ${String(err2)}`);
-    return Response.json({ error: String(err2) }, { status: 500 });
+  } catch (err) {
+    console.error(`[whatsapp:api] conversations error: ${String(err)}`);
+    return Response.json({ error: String(err) }, { status: 500 });
   }
 }
@@ -17479,9 +17541,9 @@ async function GET5(req) {
       `[whatsapp:api] messages account=${accountId} jid=${jid} limit=${effectiveLimit ?? "all"} returned=${messages.length}`
     );
     return Response.json({ messages });
-  } catch (err2) {
-    console.error(`[whatsapp:api] messages error: ${String(err2)}`);
-    return Response.json({ error: String(err2) }, { status: 500 });
+  } catch (err) {
+    console.error(`[whatsapp:api] messages error: ${String(err)}`);
+    return Response.json({ error: String(err) }, { status: 500 });
   }
 }
@@ -17526,9 +17588,9 @@ async function GET6(req) {
       `[whatsapp:api] group-info jid=${jid} subject="${meta.subject}" participants=${meta.participants.length} account=${accountId}`
     );
     return Response.json(result);
-  } catch (err2) {
-    console.error(`[whatsapp:api] group-info error="${String(err2)}" jid=${jid} account=${accountId}`);
-    return Response.json({ error: `Failed to fetch group info: ${String(err2)}` }, { status: 500 });
+  } catch (err) {
+    console.error(`[whatsapp:api] group-info error="${String(err)}" jid=${jid} account=${accountId}`);
+    return Response.json({ error: `Failed to fetch group info: ${String(err)}` }, { status: 500 });
   }
 }
@@ -17574,8 +17636,8 @@ async function GET7(req) {
       })),
       hasMore: messages.length >= POLL_LIMIT
     });
-  } catch (err2) {
-    console.error(`[group] poll failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[group] poll failed: ${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Failed to fetch messages" }, { status: 503 });
   }
 }
@@ -17601,8 +17663,8 @@ async function POST17(req) {
       sizeBytes: attachment.sizeBytes,
       mimeType: attachment.mimeType
     });
-  } catch (err2) {
-    const message = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
     console.error(`[admin:file-attach] error: ${message}`);
     return Response.json({ error: message }, { status: 500 });
   }
@@ -17712,8 +17774,8 @@ async function POST19(req) {
   let existingUsers = null;
   try {
     existingUsers = readUsersFile();
-  } catch (err2) {
-    console.error(`[set-pin] users.json corrupt: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[set-pin] users.json corrupt: ${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "User configuration is corrupt." }, { status: 400 });
   }
   if (existingUsers !== null && existingUsers.length > 0) {
@@ -17749,8 +17811,8 @@ async function POST19(req) {
         writeFileSync13(`${account.accountDir}/account.json`, JSON.stringify(config, null, 2) + "\n");
         console.log(`[set-pin] added userId=${userId.slice(0, 8)}\u2026 to account.json admins`);
       }
-    } catch (err2) {
-      console.error(`[set-pin] failed to update account.json admins: ${err2 instanceof Error ? err2.message : String(err2)}`);
+    } catch (err) {
+      console.error(`[set-pin] failed to update account.json admins: ${err instanceof Error ? err.message : String(err)}`);
     }
   }
   return Response.json({ ok: true });
@@ -17759,8 +17821,8 @@ async function DELETE(req) {
   let users = null;
   try {
     users = readUsersFile();
-  } catch (err2) {
-    console.error(`[set-pin] users.json corrupt on DELETE: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[set-pin] users.json corrupt on DELETE: ${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "User configuration is corrupt." }, { status: 400 });
   }
   if (users === null || users.length === 0) {
@@ -17809,8 +17871,8 @@ async function POST20() {
     try {
       const brand = JSON.parse(readFileSync18(brandPath3, "utf-8"));
       if (brand.productName) agentName = brand.productName;
-    } catch (err2) {
-      console.error(`[onboarding-skip] brand.json read failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+    } catch (err) {
+      console.error(`[onboarding-skip] brand.json read failed: ${err instanceof Error ? err.message : String(err)}`);
     }
   }
   const soulPath = resolve18(accountDir, "agents", "admin", "SOUL.md");
@@ -17819,8 +17881,8 @@ async function POST20() {
     writeFileSync14(soulPath, `You are ${agentName}, an AI operations manager.
 `);
     console.log(`[onboarding-skip] wrote SOUL.md: ${soulPath}`);
-  } catch (err2) {
-    console.error(`[onboarding-skip] SOUL.md write failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[onboarding-skip] SOUL.md write failed: ${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Failed to write default personality." }, { status: 500 });
   }
   const session = getSession();
@@ -17843,8 +17905,8 @@ async function POST20() {
       { accountId, now }
     );
     console.log(`[onboarding-skip] accountId=${accountId.slice(0, 8)}\u2026 currentStep=6 skipped=true`);
-  } catch (err2) {
-    console.error(`[onboarding-skip] Neo4j update failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[onboarding-skip] Neo4j update failed: ${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Failed to update onboarding state." }, { status: 500 });
   } finally {
     await session.close();
@@ -17878,8 +17940,8 @@ async function POST21(req) {
   let users = null;
   try {
     users = readUsersFile2();
-  } catch (err2) {
-    console.error(`[session] users.json corrupt: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[session] users.json corrupt: ${err instanceof Error ? err.message : String(err)}`);
     return Response.json(
       { error: "User configuration is corrupt. Re-run the seed script." },
       { status: 503 }
@@ -17936,8 +17998,8 @@ async function createAdminSession(accountId, thinkingView, userId, userName) {
   try {
     const step = await loadOnboardingStep(accountId);
     onboardingComplete = step === null || step >= 8;
-  } catch (err2) {
-    console.error(`[session] onboarding query failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[session] onboarding query failed: ${err instanceof Error ? err.message : String(err)}`);
   }
   let businessName;
   try {
@@ -18029,8 +18091,8 @@ function startScriptStreamTailer(opts) {
         });
         stream.on("error", rej);
       });
-    } catch (err2) {
-      if (onError) onError(err2 instanceof Error ? err2 : new Error(String(err2)));
+    } catch (err) {
+      if (onError) onError(err instanceof Error ? err : new Error(String(err)));
     } finally {
       pendingRead = false;
     }
@@ -18177,8 +18239,8 @@ async function POST22(req) {
             `File "${file.name}" exceeds the 20 MB limit (${(file.size / 1024 / 1024).toFixed(1)} MB).`
           );
         }
-      } catch (err2) {
-        return chatReject(422, err2 instanceof Error ? err2.message : "Invalid file", session_key);
+      } catch (err) {
+        return chatReject(422, err instanceof Error ? err.message : "Invalid file", session_key);
       }
     }
     const accountId = getAccountIdForSession(session_key);
@@ -18189,8 +18251,8 @@ async function POST22(req) {
       try {
         const stored = await storeAttachment(accountId, file);
         storedAttachments.push(stored);
-      } catch (err2) {
-        return chatReject(422, err2 instanceof Error ? err2.message : "File storage failed", session_key);
+      } catch (err) {
+        return chatReject(422, err instanceof Error ? err.message : "File storage failed", session_key);
       }
     }
   } else {
@@ -18311,8 +18373,8 @@ async function POST22(req) {
                 controllerOpen = false;
               }
             },
-            onError: (err2) => {
-              console.error(`[script-stream-tailer] ${streamLogPath}: ${err2.message}`);
+            onError: (err) => {
+              console.error(`[script-stream-tailer] ${streamLogPath}: ${err.message}`);
             }
           });
         }
@@ -18332,16 +18394,16 @@ async function POST22(req) {
 `));
         }
-      } catch (err2) {
-        const rawMessage = err2 instanceof Error ? err2.message : String(err2);
+      } catch (err) {
+        const rawMessage = err instanceof Error ? err.message : String(err);
         const ts = (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
-        const controllerClosed = err2 instanceof TypeError && /Controller is already closed/i.test(rawMessage);
+        const controllerClosed = err instanceof TypeError && /Controller is already closed/i.test(rawMessage);
         if (controllerClosed) {
           sseLog.write(`[${ts}] [${sk}] admin: DISCONNECT [client_disconnect] ${rawMessage}
 `);
         } else {
-          const category = classifyAgentError(err2);
-          const errEvent = JSON.stringify({ type: "text", content: friendlyAgentError(err2) });
+          const category = classifyAgentError(err);
+          const errEvent = JSON.stringify({ type: "text", content: friendlyAgentError(err) });
           const doneEvent = JSON.stringify({ type: "done", subtype: "error", error: rawMessage, error_category: category });
           sseLog.write(`[${ts}] [${sk}] admin: ERROR [${category}] ${rawMessage}
 `);
@@ -18452,8 +18514,8 @@ async function GET9(request) {
         const headers = { "Content-Type": "text/plain; charset=utf-8" };
         if (download) headers["Content-Disposition"] = `attachment; filename="${safe}"`;
         return new Response(content, { headers });
-      } catch (err2) {
-        const reason = err2 instanceof Error ? err2.message : String(err2);
+      } catch (err) {
+        const reason = err instanceof Error ? err.message : String(err);
         console.debug(`[admin/logs] miss dir=${dir} name=${safe} reason=${reason}`);
       }
     }
@@ -18494,8 +18556,8 @@ async function GET9(request) {
         const headers = { "Content-Type": "text/plain; charset=utf-8" };
         if (download) headers["Content-Disposition"] = `attachment; filename="${fileName}"`;
         return new Response(content, { headers });
-      } catch (err2) {
-        const reason = err2 instanceof Error ? err2.message : String(err2);
+      } catch (err) {
+        const reason = err instanceof Error ? err.message : String(err);
         console.debug(`[admin/logs] miss dir=${dir} name=${fileName} reason=${reason}`);
       }
     }
@@ -18509,8 +18571,8 @@ async function GET9(request) {
     let files;
     try {
       files = readdirSync5(dir).filter((f) => f.endsWith(".log"));
-    } catch (err2) {
-      const reason = err2 instanceof Error ? err2.message : String(err2);
+    } catch (err) {
+      const reason = err instanceof Error ? err.message : String(err);
       console.warn(`[admin/logs] readdir-fail dir=${dir} reason=${reason}`);
       continue;
     }
@@ -18520,8 +18582,8 @@ async function GET9(request) {
         const content = readFileSync20(resolve20(dir, name));
         const tail = content.length > TAIL_BYTES ? content.subarray(content.length - TAIL_BYTES).toString("utf-8") : content.toString("utf-8");
         logs[name] = tail.trim() || "(empty)";
-      } catch (err2) {
-        const reason = err2 instanceof Error ? err2.message : String(err2);
+      } catch (err) {
+        const reason = err instanceof Error ? err.message : String(err);
         console.debug(`[admin/logs] read-fail name=${name} reason=${reason}`);
         logs[name] = `(unreadable: ${reason})`;
       }
@@ -18631,8 +18693,8 @@ async function PATCH(req) {
     writeFileSync15(configPath2, JSON.stringify(config, null, 2) + "\n", "utf-8");
     console.error(`[account-update] contextMode=${contextMode}`);
     return Response.json({ ok: true, contextMode });
-  } catch (err2) {
-    console.error(`[account-update] failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[account-update] failed: ${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Failed to update account" }, { status: 500 });
   }
 }
@@ -18668,8 +18730,8 @@ async function GET12() {
         console.error(`[admin/agents] failed to parse config.json for agent "${entry.name}" \u2014 skipping`);
       }
     }
-  } catch (err2) {
-    console.error(`[admin/agents] failed to scan agents directory: ${err2}`);
+  } catch (err) {
+    console.error(`[admin/agents] failed to scan agents directory: ${err}`);
     return Response.json({ agents: [] });
   }
   return Response.json({ agents });
@@ -18698,8 +18760,8 @@ async function DELETE2(_req, { params }) {
     rmSync3(agentDir, { recursive: true, force: true });
     console.log(`[admin/agents] deleted agent "${slug}"`);
     return Response.json({ ok: true });
-  } catch (err2) {
-    console.error(`[admin/agents] failed to delete agent "${slug}": ${err2}`);
+  } catch (err) {
+    console.error(`[admin/agents] failed to delete agent "${slug}": ${err}`);
     return Response.json({ error: "Failed to delete agent" }, { status: 500 });
   }
 }
@@ -18767,8 +18829,8 @@ function rotateIfNeeded() {
     const stats = statSync9(CLIENT_ERRORS_LOG);
     if (stats.size < MAX_LOG_SIZE) return;
     renameSync4(CLIENT_ERRORS_LOG, CLIENT_ERRORS_LOG + ".1");
-  } catch (err2) {
-    console.error(`[client-error] log rotation failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[client-error] log rotation failed: ${err instanceof Error ? err.message : String(err)}`);
   }
 }
 async function POST24(req, remoteAddress) {
@@ -18834,8 +18896,8 @@ async function POST24(req, remoteAddress) {
       status: typeof body.status === "number" ? body.status : void 0
     };
     appendFileSync4(CLIENT_ERRORS_LOG, JSON.stringify(payload) + "\n", "utf-8");
-  } catch (err2) {
-    console.error(`[client-error] append failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[client-error] append failed: ${err instanceof Error ? err.message : String(err)}`);
   }
   errorTimestamps.push(Date.now());
   return Response.json({ ok: true });
@@ -18880,8 +18942,8 @@ async function fetchLatest() {
       return null;
     }
     return version;
-  } catch (err2) {
-    console.error(`[admin/version] npm registry fetch failed: ${err2}`);
+  } catch (err) {
+    console.error(`[admin/version] npm registry fetch failed: ${err}`);
     return null;
   }
 }
@@ -18966,15 +19028,15 @@ async function POST25(req) {
   const installerScope = `upgrade-${upgradeHostname}`;
   try {
     writeFileSync16(LOCK_FILE, String(Date.now()));
-  } catch (err2) {
-    console.error("[admin/version/upgrade] failed to write lock file:", err2);
+  } catch (err) {
+    console.error("[admin/version/upgrade] failed to write lock file:", err);
   }
   try {
     writeFileSync16(LOG_FILE, "");
-  } catch (err2) {
-    console.error("[admin/version/upgrade] failed to truncate upgrade log:", err2);
+  } catch (err) {
+    console.error("[admin/version/upgrade] failed to truncate upgrade log:", err);
     return Response.json(
-      { ok: false, error: err2 instanceof Error ? err2.message : "failed to prepare upgrade log" },
+      { ok: false, error: err instanceof Error ? err.message : "failed to prepare upgrade log" },
       { status: 500 }
     );
   }
@@ -18998,10 +19060,10 @@ async function POST25(req) {
     closeSync5(logFd);
     console.log(`[admin/version/upgrade] spawned upgrade process (pid ${child.pid} scope ${installerScope})`);
     return Response.json({ ok: true, started: true });
-  } catch (err2) {
-    console.error("[admin/version/upgrade] failed to spawn upgrade process:", err2);
+  } catch (err) {
+    console.error("[admin/version/upgrade] failed to spawn upgrade process:", err);
     return Response.json(
-      { ok: false, error: err2 instanceof Error ? err2.message : "failed to start upgrade" },
+      { ok: false, error: err instanceof Error ? err.message : "failed to start upgrade" },
       { status: 500 }
     );
   }
@@ -19089,8 +19151,8 @@ async function GET15(req) {
   try {
     const sessions = await listAdminSessions(accountId, userId, 20);
     return Response.json({ sessions });
-  } catch (err2) {
-    console.error(`[sessions-list] Failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[sessions-list] Failed: ${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Failed to fetch sessions" }, { status: 500 });
   }
 }
@@ -19148,8 +19210,8 @@ async function DELETE3(req, { params }) {
   try {
     await deleteConversation(conversationId);
     return Response.json({ ok: true });
-  } catch (err2) {
-    console.error(`[sessions-delete] Failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[sessions-delete] Failed: ${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Failed to delete session" }, { status: 500 });
   }
 }
@@ -19176,8 +19238,8 @@ async function GET16(req, { params }) {
   try {
     const messages = await getRecentMessages(conversationId, 50);
     return Response.json({ messages });
-  } catch (err2) {
-    console.error(`[sessions-messages] Failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[sessions-messages] Failed: ${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Failed to fetch messages" }, { status: 500 });
   }
 }
@@ -19212,8 +19274,8 @@ async function POST27(req, { params }) {
       seedSessionHistory(sessionKey, messages);
       estimatedTokens = messages.reduce((sum, m) => sum + Math.ceil(m.content.length / 4), 0);
     }
-  } catch (err2) {
-    console.error(`[session-resume] ${(/* @__PURE__ */ new Date()).toISOString()} getRecentMessages failed: conversationId=${conversationId.slice(0, 8)}\u2026 error=${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[session-resume] ${(/* @__PURE__ */ new Date()).toISOString()} getRecentMessages failed: conversationId=${conversationId.slice(0, 8)}\u2026 error=${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Failed to load conversation messages" }, { status: 500 });
   }
   const age = formatAge(updatedAt);
@@ -19273,8 +19335,8 @@ async function POST28(req, { params }) {
       console.error(`[admin] manual-label: haiku failed for ${conversationId} \u2014 null response`);
     }
     return Response.json({ label });
-  } catch (err2) {
-    console.error(`[admin] manual-label: haiku failed for ${conversationId} \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[admin] manual-label: haiku failed for ${conversationId} \u2014 ${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ label: null });
   }
 }
@@ -19311,8 +19373,8 @@ async function PUT(req, { params }) {
   try {
     await renameConversation(conversationId, label);
     return Response.json({ ok: true });
-  } catch (err2) {
-    console.error(`[persist] manual-label: failed to rename ${conversationId} \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[persist] manual-label: failed to rename ${conversationId} \u2014 ${err instanceof Error ? err.message : String(err)}`);
     return Response.json({ error: "Failed to rename session" }, { status: 500 });
   }
 }
@@ -19332,10 +19394,10 @@ async function POST29(req, remoteAddress) {
       return Response.json({ ok: false, error: "Chrome failed to start" }, { status: 502 });
     }
     return Response.json({ ok: true, transport });
-  } catch (err2) {
-    console.error("[admin/browser/launch] Failed to start browser:", err2);
+  } catch (err) {
+    console.error("[admin/browser/launch] Failed to start browser:", err);
     return Response.json(
-      { ok: false, error: err2 instanceof Error ? err2.message : "Unknown error" },
+      { ok: false, error: err instanceof Error ? err.message : "Unknown error" },
       { status: 500 }
     );
   }
@@ -19354,12 +19416,12 @@ async function cdpNavigateNewTab(url, opts = {}) {
       method: "PUT",
       signal: AbortSignal.timeout(timeoutMs)
     });
-  } catch (err2) {
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
     if (msg.includes("ECONNREFUSED") || msg.includes("fetch failed") || msg.includes("ENOTFOUND")) {
       return { result: "cdp-unreachable", detail: msg };
     }
-    if (err2 instanceof Error && err2.name === "TimeoutError") {
+    if (err instanceof Error && err.name === "TimeoutError") {
       return { result: "timeout", detail: msg };
     }
     return { result: "error", detail: msg };
@@ -19374,8 +19436,8 @@ async function cdpNavigateNewTab(url, opts = {}) {
   let target;
   try {
     target = await res.json();
-  } catch (err2) {
-    const msg = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
     return { result: "error", detail: `CDP /json/new response not JSON: ${msg}` };
   }
   return { result: "ok", targetId: target?.id };
@@ -19387,8 +19449,8 @@ async function POST30(req, remoteAddress) {
   let body;
   try {
     body = await req.json();
-  } catch (err2) {
-    const detail = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const detail = err instanceof Error ? err.message : String(err);
     console.error(`${TAG18} reject reason=body-not-json detail=${detail} browser=fallback navigateResult=error`);
     return Response.json(
       { ok: false, navigateResult: "error", browser: "fallback", detail: "Request body was not valid JSON" },
@@ -19482,8 +19544,8 @@ async function POST31(req) {
   let body;
   try {
     body = await req.json();
-  } catch (err2) {
-    const detail = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const detail = err instanceof Error ? err.message : String(err);
     console.error(`${TAG18} reject reason=body-not-json detail=${detail}`);
     return Response.json({ ok: false, detail: "Request body was not valid JSON" }, { status: 400 });
   }
@@ -19553,20 +19615,6 @@ function addAliasDomain(hostname2) {
 // app/api/admin/cloudflare/setup/route.ts
 var SCRIPT_TIMEOUT_MS = 10 * 60 * 1e3;
-function log(line) {
-  console.log(`[cloudflare-setup] ${line}`);
-}
-function logErr(line) {
-  console.error(`[cloudflare-setup] ${line}`);
-}
-function err(field, message, output) {
-  logErr(`phase=error field=${field} reason="${message.slice(0, 160).replace(/"/g, "'")}"`);
-  const body = { ok: false, field, message, output };
-  return Response.json(body, { status: 200 });
-}
-function ok(result) {
-  return Response.json(result, { status: 200 });
-}
 function loadBrandInfo() {
   const platformRoot3 = process.env.MAXY_PLATFORM_ROOT ?? resolve29(process.cwd(), "..");
   const brandPath3 = resolve29(platformRoot3, "config", "brand.json");
@@ -19622,10 +19670,14 @@ function validateBody(body) {
   }
   return null;
 }
-function runScript(scriptPath, args) {
+function runScript(scriptPath, args, streamLogPath, log) {
   return new Promise((resolveP) => {
     const child = childProcess.spawn(scriptPath, args, {
-      env: { ...process.env },
+      // STREAM_LOG_PATH (Task 581) enables setup-tunnel.sh's shared
+      // _stream-log.sh helpers to tee phase lines + subprocess output into
+      // the per-conversation stream log — same file the admin chat tailer
+      // already reads for live in-turn rendering of agent events.
+      env: { ...process.env, STREAM_LOG_PATH: streamLogPath },
       stdio: ["ignore", "pipe", "pipe"]
     });
     log(`phase=script-spawn pid=${child.pid ?? "unknown"} args="${args.join(" ")}"`);
@@ -19659,11 +19711,48 @@ ${e.message}`, timedOut: false });
 }
 async function POST32(req) {
   const started = Date.now();
+  let correlationId;
+  let sessionKeyTail;
+  let streamLogPath;
+  function tag() {
+    if (!correlationId) return "";
+    return ` conversationId=${correlationId} session_key=${sessionKeyTail ?? "unknown"}`;
+  }
+  function log(line) {
+    console.log(`[cloudflare-setup] ${line}${tag()}`);
+  }
+  function logErr(line) {
+    console.error(`[cloudflare-setup] ${line}${tag()}`);
+  }
+  function err(field, message, output) {
+    logErr(`phase=error field=${field} reason="${message.slice(0, 160).replace(/"/g, "'")}"`);
+    const body2 = {
+      ok: false,
+      field,
+      message,
+      output,
+      correlationId,
+      streamLogPath
+    };
+    return Response.json(body2, { status: 200 });
+  }
+  function ok(result2) {
+    return Response.json(result2, { status: 200 });
+  }
   const body = await parseBody2(req);
   if (!body) return err("request", "Invalid JSON body");
   if (!validateSession(body.session_key, "admin")) {
     return err("request", "Invalid or expired admin session");
   }
+  const accountId = getAccountIdForSession(body.session_key);
+  correlationId = getConversationIdForSession(body.session_key);
+  sessionKeyTail = body.session_key.slice(-8);
+  if (!accountId) {
+    return err("request", "No account bound to session \u2014 refresh chat.");
+  }
+  if (!correlationId) {
+    return err("request", "No active conversation for session \u2014 refresh chat.");
+  }
   const invalid = validateBody(body);
   if (invalid) return err(invalid.field, invalid.message);
   const adminFqdn = `${body.adminLabel}.${body.adminDomain}`;
@@ -19684,11 +19773,13 @@ async function POST32(req) {
   } catch (e) {
     return err("script", `Server misconfigured: ${e instanceof Error ? e.message : String(e)}`);
   }
+  streamLogPath = streamLogPathFor(accountId, correlationId).streamLogPath;
+  log(`phase=stream-log-resolved path=${streamLogPath}`);
   const scriptPath = resolve29(homedir4(), "setup-tunnel.sh");
   const args = [brand.hostname, String(port2), adminFqdn];
   if (publicFqdn) args.push(publicFqdn);
   if (apex) args.push(apex);
-  const result = await runScript(scriptPath, args);
+  const result = await runScript(scriptPath, args, streamLogPath, log);
   const combined = `${result.stdout}${result.stderr ? `
 ---
 ${result.stderr}` : ""}`;
@@ -19742,15 +19833,15 @@ async function POST33(req) {
     const body = await req.json();
     if (typeof body?.installed === "string") installed = body.installed;
     if (typeof body?.latest === "string") latest = body.latest;
-  } catch (err2) {
-    console.error(`[admin/version] alert-surfaced body parse failed: ${err2}`);
+  } catch (err) {
+    console.error(`[admin/version] alert-surfaced body parse failed: ${err}`);
   }
   console.log(`[admin/version] alert-surfaced installed=${installed} latest=${latest ?? "null"}`);
   return Response.json({ ok: true });
 }
 // app/api/admin/files/route.ts
-import { readdir as readdir2, stat as stat4 } from "fs/promises";
+import { readdir as readdir2, readFile as readFile4, stat as stat4 } from "fs/promises";
 import { join as join14 } from "path";
 // app/lib/data-path.ts
@@ -19764,18 +19855,18 @@ function resolveDataPath(raw2) {
   let dataRootReal;
   try {
     dataRootReal = realpathSync3(DATA_ROOT);
-  } catch (err2) {
+  } catch (err) {
     return {
       ok: false,
       status: 500,
-      error: `DATA_ROOT not accessible: ${err2 instanceof Error ? err2.message : String(err2)}`
+      error: `DATA_ROOT not accessible: ${err instanceof Error ? err.message : String(err)}`
     };
   }
   let resolvedReal;
   try {
     resolvedReal = realpathSync3(absolute);
-  } catch (err2) {
-    const code = err2.code;
+  } catch (err) {
+    const code = err.code;
     if (code === "ENOENT") {
       if (absolute !== dataRootReal && !absolute.startsWith(dataRootReal + sep)) {
         return { ok: false, status: 403, error: "Path escapes DATA_ROOT", resolved: absolute };
@@ -19785,7 +19876,7 @@ function resolveDataPath(raw2) {
     return {
       ok: false,
       status: 500,
-      error: err2 instanceof Error ? err2.message : String(err2)
+      error: err instanceof Error ? err.message : String(err)
     };
   }
   if (resolvedReal !== dataRootReal && !resolvedReal.startsWith(dataRootReal + sep)) {
@@ -19796,6 +19887,39 @@ function resolveDataPath(raw2) {
 }
 // app/api/admin/files/route.ts
+var UUID_RE2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+async function readMeta(absDir, baseName) {
+  try {
+    const raw2 = await readFile4(join14(absDir, `${baseName}.meta.json`), "utf8");
+    const parsed = JSON.parse(raw2);
+    if (typeof parsed?.filename === "string") {
+      return { filename: parsed.filename, mimeType: typeof parsed.mimeType === "string" ? parsed.mimeType : void 0 };
+    }
+  } catch {
+  }
+  return null;
+}
+async function enrich(absolute, entry) {
+  if (entry.kind === "directory" && UUID_RE2.test(entry.name)) {
+    const meta = await readMeta(join14(absolute, entry.name), entry.name);
+    if (meta?.filename) {
+      entry.displayName = meta.filename;
+      entry.mimeType = meta.mimeType;
+    }
+    return;
+  }
+  if (entry.kind === "file") {
+    const dot = entry.name.lastIndexOf(".");
+    const base = dot === -1 ? entry.name : entry.name.slice(0, dot);
+    if (UUID_RE2.test(base)) {
+      const meta = await readMeta(absolute, base);
+      if (meta?.filename) {
+        entry.displayName = meta.filename;
+        entry.mimeType = meta.mimeType;
+      }
+    }
+  }
+}
 async function GET17(req) {
   const url = new URL(req.url);
   const sessionKey = url.searchParams.get("session_key");
@@ -19828,6 +19952,9 @@ async function GET17(req) {
     const names = await readdir2(absolute);
     const entries = [];
     for (const name of names) {
+      if (UUID_RE2.test(name.replace(/\.meta\.json$/, "")) && name.endsWith(".meta.json")) {
+        continue;
+      }
       try {
         const entryPath = join14(absolute, name);
         const s = await stat4(entryPath);
@@ -19841,19 +19968,22 @@ async function GET17(req) {
         entries.push({ name, kind: "other", sizeBytes: null, modifiedAt: (/* @__PURE__ */ new Date(0)).toISOString() });
       }
     }
+    await Promise.all(entries.map((e) => enrich(absolute, e)));
     entries.sort((a, b) => {
       if (a.kind !== b.kind) return a.kind === "directory" ? -1 : 1;
-      return a.name.localeCompare(b.name);
+      const aKey = a.displayName ?? a.name;
+      const bKey = b.displayName ?? b.name;
+      return aKey.localeCompare(bKey);
     });
     console.error(`[data] file-list path="${relPath}" entries=${entries.length}`);
     return Response.json({ path: relPath, entries });
-  } catch (err2) {
-    const code = err2.code;
+  } catch (err) {
+    const code = err.code;
     if (code === "ENOENT") {
       console.error(`[data] file-list not-found path="${relPath}"`);
       return Response.json({ error: "Not found" }, { status: 404 });
     }
-    const message = err2 instanceof Error ? err2.message : String(err2);
+    const message = err instanceof Error ? err.message : String(err);
     console.error(`[data] file-list error path="${relPath}" err="${message}"`);
     return Response.json({ error: message }, { status: 500 });
   }
@@ -19912,13 +20042,13 @@ async function GET18(req) {
         "Cache-Control": "no-store"
       }
     });
-  } catch (err2) {
-    const code = err2.code;
+  } catch (err) {
+    const code = err.code;
     if (code === "ENOENT") {
       console.error(`[data] file-download not-found path="${relPath}"`);
       return Response.json({ error: "Not found" }, { status: 404 });
     }
-    const message = err2 instanceof Error ? err2.message : String(err2);
+    const message = err instanceof Error ? err.message : String(err);
     console.error(`[data] file-download error path="${relPath}" err="${message}"`);
     return Response.json({ error: message }, { status: 500 });
   }
@@ -19932,8 +20062,8 @@ async function POST34(req) {
   let formData;
   try {
     formData = await req.formData();
-  } catch (err2) {
-    const message = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
     return Response.json({ error: `Invalid multipart body: ${message}` }, { status: 400 });
   }
   const sessionKey = formData.get("session_key") ?? "";
@@ -19980,8 +20110,8 @@ async function POST34(req) {
     }
     const buffer = Buffer.from(await file.arrayBuffer());
     await writeFile4(destPath, buffer);
-  } catch (err2) {
-    const message = err2 instanceof Error ? err2.message : String(err2);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
     console.error(`[data] file-upload error filename="${safeName}" err="${message}"`);
     return Response.json({ error: message }, { status: 500 });
   }
@@ -20027,9 +20157,9 @@ async function GET19(req) {
     const elapsed = Date.now() - started;
     console.error(`[data] graph-search query="${q}" results=${results.length} ms=${elapsed}`);
     return Response.json({ results, elapsedMs: elapsed });
-  } catch (err2) {
+  } catch (err) {
     const elapsed = Date.now() - started;
-    const message = err2 instanceof Error ? err2.message : String(err2);
+    const message = err instanceof Error ? err.message : String(err);
     console.error(`[data] graph-search neo4j-unreachable query="${q}" ms=${elapsed} err="${message}"`);
     return Response.json({ error: `Graph search unavailable: ${message}` }, { status: 503 });
   }
@@ -20049,8 +20179,8 @@ if (BRAND_JSON_PATH && existsSync29(BRAND_JSON_PATH)) {
   try {
     const parsed = JSON.parse(readFileSync29(BRAND_JSON_PATH, "utf-8"));
     BRAND = { ...BRAND, ...parsed };
-  } catch (err2) {
-    console.error(`[brand] Failed to parse brand.json: ${err2.message}`);
+  } catch (err) {
+    console.error(`[brand] Failed to parse brand.json: ${err.message}`);
     process.exit(1);
   }
 }
@@ -20076,8 +20206,8 @@ function loadAliasDomains() {
       return null;
     }
     return new Set(parsed.filter((h) => typeof h === "string"));
-  } catch (err2) {
-    console.error(`[alias-domains] failed to read alias-domains.json: ${err2}`);
+  } catch (err) {
+    console.error(`[alias-domains] failed to read alias-domains.json: ${err}`);
     return null;
   }
 }
@@ -20257,8 +20387,8 @@ app.post("/__remote-auth/change-password", async (c) => {
     clearRateLimit(clientIp);
     console.error(`[remote-auth] password changed ip=${clientIp}`);
     return c.html(renderLoginPage({ ...resolveRemoteAuthOpts(), success: "Password changed successfully. Sign in with your new password.", redirect }), 200);
-  } catch (err2) {
-    console.error(`[remote-auth] change-password save failed: ${err2}`);
+  } catch (err) {
+    console.error(`[remote-auth] change-password save failed: ${err}`);
     return c.html(renderLoginPage({ ...resolveRemoteAuthOpts(), mode: "change", changeError: "Failed to save password", redirect }), 200);
   }
 });
@@ -20302,8 +20432,8 @@ app.post("/__remote-auth/set-initial-password", async (c) => {
     ) ?? "unknown";
     console.error(`[remote-auth] initial password set ip=${clientIp}`);
     return c.html(renderLoginPage({ ...resolveRemoteAuthOpts(), mode: "success" }), 200);
-  } catch (err2) {
-    console.error(`[remote-auth] initial password save failed: ${err2}`);
+  } catch (err) {
+    console.error(`[remote-auth] initial password save failed: ${err}`);
     return c.html(renderLoginPage({ ...resolveRemoteAuthOpts(), mode: "setup", setupError: "Failed to save password. Please try again." }), 200);
   }
 });
@@ -20335,8 +20465,8 @@ app.post("/api/remote-auth/set-password", async (c) => {
     await setRemotePassword(body.password);
     console.error("[remote-auth] password set");
     return Response.json({ ok: true });
-  } catch (err2) {
-    console.error(`[remote-auth] set-password failed: ${err2}`);
+  } catch (err) {
+    console.error(`[remote-auth] set-password failed: ${err}`);
     return Response.json({ error: "Failed to save password" }, { status: 500 });
   }
 });
@@ -20789,8 +20919,8 @@ try {
   }
   const summary = registered.map((r) => `${r.method} ${r.path}`).join(", ") || "(none)";
   console.log(`[route-shadow] static-paths-matching-slug-pattern count=${registered.length} routes=${summary}`);
-} catch (err2) {
-  console.error(`[route-shadow] introspection unavailable: ${err2 instanceof Error ? err2.message : String(err2)}`);
+} catch (err) {
+  console.error(`[route-shadow] introspection unavailable: ${err instanceof Error ? err.message : String(err)}`);
 }
 (async () => {
   try {
@@ -20800,15 +20930,15 @@ try {
       userId = users[0]?.userId ?? "";
     }
     await backfillNullUserIdConversations(userId);
-  } catch (err2) {
-    console.error(`[session] backfill startup failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[session] backfill startup failed: ${err instanceof Error ? err.message : String(err)}`);
   }
 })();
 (async () => {
   try {
     await startReviewDetector();
-  } catch (err2) {
-    console.error(`[review] startReviewDetector rejected: ${err2 instanceof Error ? err2.message : String(err2)}`);
+  } catch (err) {
+    console.error(`[review] startReviewDetector rejected: ${err instanceof Error ? err.message : String(err)}`);
   }
 })();
 var configDirForWhatsApp = basename8(MAXY_DIR) || ".maxy";
@@ -20914,8 +21044,8 @@ init({
         }
         await msg.reply(responseText);
       }
-    } catch (err2) {
-      console.error(`[whatsapp:route] agent invocation failed: ${String(err2)}`);
+    } catch (err) {
+      console.error(`[whatsapp:route] agent invocation failed: ${String(err)}`);
       try {
         if (!msg.isOwnerMirror) {
           await msg.reply("I'm having trouble right now. Please try again in a moment.");
@@ -20924,8 +21054,8 @@ init({
       }
     }
   }
-}).catch((err2) => {
-  console.error(`[whatsapp] init failed: ${String(err2)}`);
+}).catch((err) => {
+  console.error(`[whatsapp] init failed: ${String(err)}`);
 });
 var shuttingDown = false;
 process.on("SIGTERM", async () => {
@@ -20937,24 +21067,24 @@ process.on("SIGTERM", async () => {
   console.error("[server] SIGTERM received \u2014 starting graceful shutdown");
   try {
     sigtermFlushStreamLogs("systemd-stop", "server-index");
-  } catch (err2) {
-    console.error(`[server] sigterm flush error: ${String(err2)}`);
+  } catch (err) {
+    console.error(`[server] sigterm flush error: ${String(err)}`);
   }
   try {
     broadcastAdminShutdown("systemd-stop");
-  } catch (err2) {
-    console.error(`[server] sigterm broadcast error: ${String(err2)}`);
+  } catch (err) {
+    console.error(`[server] sigterm broadcast error: ${String(err)}`);
   }
   await new Promise((res) => setImmediate(res));
   try {
     await shutdown();
-  } catch (err2) {
-    console.error(`[server] shutdown error: ${String(err2)}`);
+  } catch (err) {
+    console.error(`[server] shutdown error: ${String(err)}`);
   }
   try {
     await shutdownReviewDetector();
-  } catch (err2) {
-    console.error(`[server] review detector shutdown error: ${String(err2)}`);
+  } catch (err) {
+    console.error(`[server] review detector shutdown error: ${String(err)}`);
   }
   console.error("[server] graceful shutdown complete \u2014 exiting");
   process.exit(0);