@matelink/cli 2026.4.18 → 2026.4.19

package/bin/matecli.mjs

@@ -3152,13 +3152,11 @@ function createGatewayWsClient({ gatewayBaseUrl, gatewayAuthToken }) {
           connectTimer = null;
         }
         const role = "operator";
-        const scopes = [
-          "operator.admin",
-          "operator.read",
-          "operator.write",
-          "operator.approvals",
-          "operator.pairing",
-        ];
+        // The bridge WS client only performs read-side gateway RPCs such as
+        // config.get, sessions.list, skills.status, and chat.history. Asking
+        // for broader scopes causes local token-mode gateways to reject the
+        // connection with a scope-upgrade/pairing-required error.
+        const scopes = ["operator.read"];
         const clientId = "openclaw-macos";
         const clientMode = "ui";
         const signedAtMs = Date.now();
@@ -3287,6 +3285,11 @@ async function callGatewayRpcLocal({
     return callWorkspaceRpcLocal({ method, params });
   }
 
+  if (method === "config.get" || method === "sessions.list") {
+    const client = getOrCreateGatewayWsClient({ gatewayBaseUrl, gatewayAuthToken });
+    return client.call(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 {
@@ -3313,7 +3316,10 @@ function shouldFallbackGatewayRpcViaWs(error) {
     message.includes("(1006") ||
     message.includes("no close reason") ||
     message.includes("gateway ws error") ||
-    message.includes("gateway disconnected")
+    message.includes("gateway disconnected") ||
+    message.includes("spawn openclaw enoent") ||
+    message.includes("enoent") ||
+    message.includes("gateway call timed out")
   );
 }
 
@@ -3354,7 +3360,7 @@ async function callGatewayRpcLocalViaCli({
     }
   }, GATEWAY_RPC_CLI_TIMEOUT_MS);
 
-  const [stdoutChunks, stderrChunks] = await Promise.all([
+  const [stdoutChunks, stderrChunks, spawnError] = await Promise.all([
     new Promise((resolve) => {
       const chunks = [];
       child.stdout?.on("data", (chunk) => chunks.push(Buffer.from(chunk)));
@@ -3367,10 +3373,18 @@ async function callGatewayRpcLocalViaCli({
       child.stderr?.on("end", () => resolve(chunks));
       child.stderr?.on("error", () => resolve(chunks));
     }),
+    new Promise((resolve) => {
+      child.once("error", (error) => resolve(error));
+      child.once("spawn", () => resolve(null));
+    }),
     new Promise((resolve) => child.on("close", resolve)),
   ]);
   clearTimeout(timeout);
 
+  if (spawnError instanceof Error) {
+    throw spawnError;
+  }
+
   const stdoutText = Buffer.concat(stdoutChunks).toString("utf8");
   const stderrText = Buffer.concat(stderrChunks).toString("utf8");
   if (timedOut) {
@@ -3595,6 +3609,11 @@ async function proxyGatewayRequestLocal({
   const reader = response.body.getReader();
   const decoder = new TextDecoder();
 
+  // Fire-and-forget chunk publishing: don't await each POST so the reader
+  // is never blocked by network round-trips.  We keep an ordered queue of
+  // in-flight promises and drain it before sending the final "end" event.
+  const inflightChunks = [];
+
   while (true) {
     const { done, value } = await reader.read();
     if (done) {
@@ -3604,7 +3623,7 @@ async function proxyGatewayRequestLocal({
     if (!text) {
       continue;
     }
-    await publishRelayGatewayEvent({
+    const p = publishRelayGatewayEvent({
       relayUrl,
       gatewayId,
       gatewayToken,
@@ -3613,12 +3632,15 @@ async function proxyGatewayRequestLocal({
         event: "chunk",
         data: text,
       },
+    }).catch((err) => {
+      console.error(`[relay chunk publish error] ${err?.message || err}`);
     });
+    inflightChunks.push(p);
   }
 
   const tail = decoder.decode();
   if (tail) {
-    await publishRelayGatewayEvent({
+    const p = publishRelayGatewayEvent({
       relayUrl,
       gatewayId,
       gatewayToken,
@@ -3627,9 +3649,15 @@ async function proxyGatewayRequestLocal({
         event: "chunk",
         data: tail,
       },
+    }).catch((err) => {
+      console.error(`[relay tail publish error] ${err?.message || err}`);
     });
+    inflightChunks.push(p);
   }
 
+  // Wait for all chunk publishes to complete before sending "end".
+  await Promise.all(inflightChunks);
+
   await publishRelayGatewayEvent({
     relayUrl,
     gatewayId,

package/package.json

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