@matelink/cli 2026.4.12 → 2026.4.13

package/bin/matecli.mjs

@@ -2709,9 +2709,34 @@ async function callGatewayRpcLocal({
     };
   }
 
-  // In bridge mode the CLI path is more reliable than the shared WebSocket client,
-  // especially while long-running streamed chats are also active.
-  return callGatewayRpcLocalViaCli({ gatewayBaseUrl, gatewayAuthToken, method, params });
+  // Prefer CLI first for broad compatibility, but fall back to the persistent
+  // WS client when the CLI gateway call hits transient websocket closures.
+  try {
+    return await callGatewayRpcLocalViaCli({
+      gatewayBaseUrl,
+      gatewayAuthToken,
+      method,
+      params,
+    });
+  } catch (error) {
+    if (!shouldFallbackGatewayRpcViaWs(error)) {
+      throw error;
+    }
+    const client = getOrCreateGatewayWsClient({ gatewayBaseUrl, gatewayAuthToken });
+    return client.call(method, params ?? {});
+  }
+}
+
+function shouldFallbackGatewayRpcViaWs(error) {
+  const message = String(error instanceof Error ? error.message : error).toLowerCase();
+  return (
+    message.includes("gateway closed") ||
+    message.includes("abnormal closure") ||
+    message.includes("(1006") ||
+    message.includes("no close reason") ||
+    message.includes("gateway ws error") ||
+    message.includes("gateway disconnected")
+  );
 }
 
 async function callGatewayRpcLocalViaCli({
@@ -2727,6 +2752,8 @@ async function callGatewayRpcLocalViaCli({
     method,
     "--url",
     wsUrl,
+    "--timeout",
+    String(GATEWAY_RPC_CLI_TIMEOUT_MS),
     "--params",
     JSON.stringify(params ?? {}),
     "--json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matelink/cli",
-  "version": "2026.4.12",
+  "version": "2026.4.13",
   "private": false,
   "description": "Relay-first CLI for pairing and bridging OpenClaw gateway traffic",
   "type": "module",