echoclaw-relay-agent 0.32.1 → 0.33.2

package/dist/{ConfigureHandler-3S5F4TTG.js → ConfigureHandler-DUGYEODY.js}

@@ -2,7 +2,7 @@ import {
   fetchAvailableModels,
   verifyModel,
   waitForGateway
-} from "./chunk-NHM6IWCC.js";
+} from "./chunk-FYTXP6H5.js";
 import {
   configureModel,
   detectProvider,
@@ -24,13 +24,20 @@ async function findOpenClaw() {
     return null;
   }
 }
-async function runOpenClaw(args, timeoutMs = 6e4) {
-  const openclawBin = await findOpenClaw();
-  if (!openclawBin) throw new Error("OpenClaw binary not found");
-  return execFileAsync(openclawBin, args, {
-    timeout: timeoutMs,
-    env: { ...process.env }
-  });
+async function runOpenClaw(args, timeoutMs = 6e4, ctx = "local") {
+  if (ctx === "local") {
+    const openclawBin = await findOpenClaw();
+    if (!openclawBin) throw new Error("OpenClaw binary not found. Is OpenClaw installed?");
+    return execFileAsync(openclawBin, args, {
+      timeout: timeoutMs,
+      env: { ...process.env }
+    });
+  }
+  return execFileAsync(
+    "docker",
+    ["exec", ctx.container, "openclaw", ...args],
+    { timeout: timeoutMs }
+  );
 }
 async function checkOpenClawInstalled() {
   try {
@@ -45,7 +52,10 @@ async function checkOpenClawInstalled() {
 async function checkNeedsApiKey() {
   return !await hasApiKeyConfigured();
 }
-async function handleConfigure(request, sendStatus) {
+async function handleConfigure(request, sendStatus, ctx = "local") {
+  if (ctx !== "local") {
+    console.log(`  [configure] VM mode \u2014 openclaw commands run via docker exec (container=${ctx.container})`);
+  }
   try {
     sendStatus({
       type: "agent_setup_status",
@@ -76,7 +86,7 @@ async function handleConfigure(request, sendStatus) {
       }).catch(() => {
       });
       try {
-        await runOpenClaw(["doctor", "--generate-gateway-token", "--non-interactive"], 3e4);
+        await runOpenClaw(["doctor", "--generate-gateway-token", "--non-interactive"], 3e4, ctx);
       } catch (err) {
         return {
           type: "agent_setup_status",
@@ -100,7 +110,7 @@ async function handleConfigure(request, sendStatus) {
     }).catch(() => {
     });
     try {
-      await runOpenClaw(["gateway", "install"], 3e4);
+      await runOpenClaw(["gateway", "install"], 3e4, ctx);
     } catch (installErr) {
       sendStatus({
         type: "agent_setup_status",
@@ -110,7 +120,7 @@ async function handleConfigure(request, sendStatus) {
       });
     }
     try {
-      await runOpenClaw(["gateway", "start"], 15e3);
+      await runOpenClaw(["gateway", "start"], 15e3, ctx);
     } catch (startErr) {
       sendStatus({
         type: "agent_setup_status",
@@ -129,7 +139,7 @@ async function handleConfigure(request, sendStatus) {
     const gatewayReady = await waitForGateway(configuredPort, gatewayToken, 3e4);
     if (!gatewayReady) {
       try {
-        await runOpenClaw(["gateway", "status", "--require-rpc"], 1e4);
+        await runOpenClaw(["gateway", "status", "--require-rpc"], 1e4, ctx);
       } catch {
         return {
           type: "agent_setup_status",
@@ -182,7 +192,8 @@ async function handleQueryModels() {
     const port = await getGatewayPort() ?? DEFAULT_GATEWAY_PORT;
     const models = await fetchAvailableModels(port, gatewayToken);
     const config = await (await import("./OpenClawConfig-S7RF66V3.js")).readOpenClawConfig();
-    const activeModel = config?.agents?.defaults?.model;
+    const rawModel = config?.agents?.defaults?.model;
+    const activeModel = typeof rawModel === "object" && rawModel !== null ? rawModel.primary ?? rawModel.id ?? String(rawModel) : rawModel;
     return { type: "query_models_result", models, activeModel };
   } catch (err) {
     console.log(`  [configure] handleQueryModels error: ${err.message}`);

package/dist/chat/ChatHandler.d.ts

@@ -78,6 +78,8 @@ export declare class ChatHandler {
     private _toolUpdateTimestamps;
     /** Buffered messages when _sendBack is null (relay disconnected but OpenClaw still active). */
     private _messageBuffer;
+    /** Reusable shim that routes messages through _send() when _sendBack is null. */
+    private readonly _bufferingShim;
     /**
      * Queued outbound chat.send payloads when gateway is disconnected.
      * Drained automatically on reconnect. Max MAX_PENDING_CHAT_QUEUE entries.