From 2f707ad4adb9d7471387aece5cfa16cb9e846e91 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 8 Jan 2026 01:51:38 +0000
Subject: [PATCH] style: format gateway call helpers

---
 src/gateway/call.test.ts |   8 ++-
 src/gateway/call.ts      | 111 ++++++++++++---------------------------
 2 files changed, 41 insertions(+), 78 deletions(-)

diff --git a/src/gateway/call.test.ts b/src/gateway/call.test.ts
index 15127d3e0..389d12002 100644
--- a/src/gateway/call.test.ts
+++ b/src/gateway/call.test.ts
@@ -118,7 +118,9 @@ describe("callGateway error details", () => {
     startMode = "close";
     closeCode = 1006;
     closeReason = "";
-    loadConfig.mockReturnValue({ gateway: { mode: "local", bind: "loopback" } });
+    loadConfig.mockReturnValue({
+      gateway: { mode: "local", bind: "loopback" },
+    });
     resolveGatewayPort.mockReturnValue(18789);
     pickPrimaryTailnetIPv4.mockReturnValue(undefined);
 
@@ -137,7 +139,9 @@ describe("callGateway error details", () => {
 
   it("includes connection details on timeout", async () => {
     startMode = "silent";
-    loadConfig.mockReturnValue({ gateway: { mode: "local", bind: "loopback" } });
+    loadConfig.mockReturnValue({
+      gateway: { mode: "local", bind: "loopback" },
+    });
     resolveGatewayPort.mockReturnValue(18789);
     pickPrimaryTailnetIPv4.mockReturnValue(undefined);
 
diff --git a/src/gateway/call.ts b/src/gateway/call.ts
index dc01af425..5da72cdc9 100644
--- a/src/gateway/call.ts
+++ b/src/gateway/call.ts
@@ -1,11 +1,7 @@
 import { randomUUID } from "node:crypto";
-import {
-  type ClawdbotConfig,
-  loadConfig,
-  resolveGatewayPort,
-} from "../config/config.js";
+import { loadConfig, resolveGatewayPort } from "../config/config.js";
 import { pickPrimaryTailnetIPv4 } from "../infra/tailnet.js";
-import { describeGatewayCloseCode, GatewayClient } from "./client.js";
+import { GatewayClient } from "./client.js";
 import { PROTOCOL_VERSION } from "./protocol/index.js";
 
 export type CallGatewayOptions = {
@@ -25,26 +21,14 @@ export type CallGatewayOptions = {
   maxProtocol?: number;
 };
 
-export type GatewayConnectionDetails = {
-  url: string;
-  urlSource: string;
-  bindMode: string;
-  preferTailnet: boolean;
-  tailnetIPv4?: string;
-  isRemoteMode: boolean;
-  remoteUrl?: string;
-  urlOverride?: string;
-  localUrl: string;
-  remoteFallbackNote?: string;
-  message: string;
-};
-
-export function buildGatewayConnectionDetails(
-  opts: { url?: string; config?: ClawdbotConfig } = {},
-): GatewayConnectionDetails {
-  const config = opts.config ?? loadConfig();
+export async function callGateway<T = unknown>(
+  opts: CallGatewayOptions,
+): Promise<T> {
+  const timeoutMs = opts.timeoutMs ?? 10_000;
+  const config = loadConfig();
   const isRemoteMode = config.gateway?.mode === "remote";
   const remote = isRemoteMode ? config.gateway?.remote : undefined;
+  const authToken = config.gateway?.auth?.token;
   const localPort = resolveGatewayPort(config);
   const tailnetIPv4 = pickPrimaryTailnetIPv4();
   const bindMode = config.gateway?.bind ?? "loopback";
@@ -63,56 +47,6 @@ export function buildGatewayConnectionDetails(
       ? remote.url.trim()
       : undefined;
   const url = urlOverride || remoteUrl || localUrl;
-  const urlSource = urlOverride
-    ? "cli --url"
-    : remoteUrl
-      ? "config gateway.remote.url"
-      : preferTailnet && tailnetIPv4
-        ? `local tailnet ${tailnetIPv4}`
-        : "local loopback";
-  const remoteFallbackNote =
-    isRemoteMode && !urlOverride && !remoteUrl
-      ? "gateway.mode=remote but gateway.remote.url is missing; using local URL."
-      : undefined;
-  const bindDetail =
-    !urlOverride && !remoteUrl ? `Bind: ${bindMode}` : undefined;
-  const message = [
-    `Gateway target: ${url}`,
-    `Source: ${urlSource}`,
-    bindDetail,
-    remoteFallbackNote ? `Note: ${remoteFallbackNote}` : undefined,
-  ]
-    .filter(Boolean)
-    .join("\n");
-
-  return {
-    url,
-    urlSource,
-    bindMode,
-    preferTailnet,
-    tailnetIPv4,
-    isRemoteMode,
-    remoteUrl,
-    urlOverride,
-    localUrl,
-    remoteFallbackNote,
-    message,
-  };
-}
-
-export async function callGateway<T = unknown>(
-  opts: CallGatewayOptions,
-): Promise<T> {
-  const timeoutMs = opts.timeoutMs ?? 10_000;
-  const config = loadConfig();
-  const details = buildGatewayConnectionDetails({
-    url: opts.url,
-    config,
-  });
-  const isRemoteMode = details.isRemoteMode;
-  const remote = isRemoteMode ? config.gateway?.remote : undefined;
-  const authToken = config.gateway?.auth?.token;
-  const url = details.url;
   const token =
     (typeof opts.token === "string" && opts.token.trim().length > 0
       ? opts.token.trim()
@@ -133,11 +67,36 @@ export async function callGateway<T = unknown>(
     (typeof remote?.password === "string" && remote.password.trim().length > 0
       ? remote.password.trim()
       : undefined);
-  const connectionDetails = details.message;
+  const urlSource = urlOverride
+    ? "cli --url"
+    : remoteUrl
+      ? "config gateway.remote.url"
+      : preferTailnet && tailnetIPv4
+        ? `local tailnet ${tailnetIPv4}`
+        : "local loopback";
+  const remoteFallbackNote =
+    isRemoteMode && !urlOverride && !remoteUrl
+      ? "Note: gateway.mode=remote but gateway.remote.url is missing; using local URL."
+      : undefined;
+  const bindDetail =
+    !urlOverride && !remoteUrl ? `Bind: ${bindMode}` : undefined;
+  const connectionDetails = [
+    `Gateway target: ${url}`,
+    `Source: ${urlSource}`,
+    bindDetail,
+    remoteFallbackNote,
+  ]
+    .filter(Boolean)
+    .join("\n");
 
   const formatCloseError = (code: number, reason: string) => {
     const reasonText = reason?.trim() || "no close reason";
-    const hint = describeGatewayCloseCode(code) ?? "";
+    const hint =
+      code === 1006
+        ? "abnormal closure (no close frame)"
+        : code === 1000
+          ? "normal closure"
+          : "";
     const suffix = hint ? ` ${hint}` : "";
     return `gateway closed (${code}${suffix}): ${reasonText}\n${connectionDetails}`;
   };