openclaw-bridge 0.4.1 → 0.4.3

package/dist/cli.js

@@ -676,18 +676,26 @@ async function cmdUpgrade() {
     // 1. Try installing/upgrading as OpenClaw plugin
     console.log("Checking OpenClaw plugin installation...");
     try {
-        // First attempt: just try to install
-        const installResult = run("openclaw plugins install openclaw-bridge 2>&1", { silent: true });
-        if (installResult.includes("openclaw-bridge")) {
+        // Use execSync directly to capture both stdout and error output
+        let installOutput = "";
+        let installFailed = false;
+        try {
+            installOutput = execSync("openclaw plugins install openclaw-bridge 2>&1", {
+                encoding: "utf-8",
+                stdio: ["pipe", "pipe", "pipe"],
+            }).trim();
+        }
+        catch (execErr) {
+            installOutput = String(execErr?.stdout || "") + String(execErr?.stderr || "") + String(execErr?.message || "");
+            installFailed = true;
+        }
+        if (!installFailed && installOutput) {
             updatedPlugin = true;
             console.log("  Plugin installed/updated.");
         }
-    }
-    catch (installErr) {
-        const errMsg = String(installErr?.stdout || installErr?.message || installErr || "");
-        if (errMsg.includes("plugin already exists") || errMsg.includes("already exists")) {
+        else if (installOutput.includes("already exists")) {
             // Parse the existing path from error: "plugin already exists: /path/to/openclaw-bridge (delete it first)"
-            const pathMatch = errMsg.match(/already exists:\s*(.+?)\s*\(/);
+            const pathMatch = installOutput.match(/already exists:\s*(.+?)\s*\(/);
             const existingPath = pathMatch?.[1]?.trim();
             if (existingPath && existsSync(existingPath)) {
                 console.log(`  Old plugin found at ${existingPath}. Removing...`);
@@ -716,14 +724,18 @@ async function cmdUpgrade() {
                 console.log("  Plugin updated.");
             }
             catch {
-                console.log("  Plugin install failed after removing old version. Try manually:");
+                console.log("  Plugin install failed. Try manually:");
                 console.log("    openclaw plugins install openclaw-bridge");
             }
         }
         else {
-            console.log("  openclaw CLI not found or plugins command failed. Skipping plugin check.");
+            // Install failed for unknown reason — show the output for debugging
+            console.log(`  Plugin install failed: ${installOutput.slice(0, 200)}`);
         }
     }
+    catch {
+        console.log("  openclaw CLI not found. Skipping plugin check.");
+    }
     // 2. Check if installed as global npm package
     console.log("\nChecking global npm installation...");
     try {
@@ -758,8 +770,84 @@ async function cmdUpgrade() {
             console.log("\nUpgrade complete.");
         }
     }
+    // 4. Config health check — scan openclaw.json and fix missing settings
+    console.log("\nChecking bridge configuration...");
+    const configFixCount = checkAndFixBridgeConfig();
+    if (configFixCount === 0) {
+        console.log("  Config OK — all required settings present.");
+    }
+    else {
+        console.log(`  Fixed ${configFixCount} config issue(s). Restart your gateway to apply.`);
+    }
     console.log();
 }
+/** Scan openclaw.json for missing bridge config fields and auto-fix them */
+function checkAndFixBridgeConfig() {
+    // Find openclaw.json — check env var, then common locations
+    const candidates = [
+        process.env.OPENCLAW_CONFIG_PATH,
+        join(process.cwd(), "openclaw.json"),
+        join(homedir(), ".openclaw", "openclaw.json"),
+        IS_WINDOWS ? "C:\\openclaw-instances\\main\\openclaw.json" : "",
+    ].filter(Boolean);
+    let fixes = 0;
+    for (const configPath of candidates) {
+        if (!existsSync(configPath))
+            continue;
+        try {
+            const raw = readFileSync(configPath, "utf-8");
+            const config = JSON.parse(raw);
+            const bridgeConfig = config.plugins?.entries?.["openclaw-bridge"]?.config;
+            if (!bridgeConfig)
+                continue;
+            let changed = false;
+            // Fix 1: Auto-add messageRelay from fileRelay
+            if (!bridgeConfig.messageRelay && bridgeConfig.fileRelay?.baseUrl) {
+                const baseUrl = bridgeConfig.fileRelay.baseUrl;
+                const wsUrl = baseUrl.replace(/^http/, "ws") + "/ws";
+                bridgeConfig.messageRelay = {
+                    url: wsUrl,
+                    apiKey: bridgeConfig.fileRelay.apiKey || "",
+                };
+                console.log(`  [${configPath}] Added messageRelay.url = ${wsUrl}`);
+                changed = true;
+                fixes++;
+            }
+            // Fix 2: Ensure chatCompletions is enabled (needed for message relay)
+            if (!config.gateway?.http?.endpoints?.chatCompletions?.enabled) {
+                config.gateway = config.gateway || {};
+                config.gateway.http = config.gateway.http || {};
+                config.gateway.http.endpoints = config.gateway.http.endpoints || {};
+                config.gateway.http.endpoints.chatCompletions = { enabled: true };
+                console.log(`  [${configPath}] Enabled gateway.http.endpoints.chatCompletions`);
+                changed = true;
+                fixes++;
+            }
+            // Fix 3: Check required fields
+            const required = ["role", "agentId", "agentName"];
+            for (const field of required) {
+                if (!bridgeConfig[field]) {
+                    console.log(`  [${configPath}] WARNING: missing required field "${field}" in bridge config`);
+                }
+            }
+            // Fix 4: Check fileRelay and registry baseUrls aren't pointing to localhost in remote setup
+            if (bridgeConfig.registry?.baseUrl && bridgeConfig.fileRelay?.baseUrl) {
+                const regUrl = bridgeConfig.registry.baseUrl;
+                const relayUrl = bridgeConfig.fileRelay.baseUrl;
+                if (regUrl.includes("localhost") !== relayUrl.includes("localhost")) {
+                    console.log(`  [${configPath}] WARNING: registry and fileRelay point to different hosts (${regUrl} vs ${relayUrl})`);
+                }
+            }
+            if (changed) {
+                writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
+            }
+        }
+        catch (err) {
+            console.log(`  [${configPath}] Could not parse: ${err.message}`);
+        }
+    }
+    return fixes;
+}
 // ── Usage ─────────────────────────────────────────────────────────────────────
 function printUsage() {
     console.log(`

package/dist/index.js

@@ -219,6 +219,25 @@ ${nameMapping}
                         api.logger.info(`[bridge] Conflict rename: ${entry.agentId} → ${newAgentId}, ${entry.agentName} → ${newAgentName}`);
                         entry.agentId = newAgentId;
                         entry.agentName = newAgentName;
+                        // Persist the renamed agentId to openclaw.json so it survives restarts
+                        const configPath = process.env.OPENCLAW_CONFIG_PATH;
+                        if (configPath) {
+                            try {
+                                const raw = readFileSync(configPath, "utf-8");
+                                const cfg = JSON.parse(raw);
+                                const bridgeCfg = cfg.plugins?.entries?.["openclaw-bridge"]?.config;
+                                if (bridgeCfg) {
+                                    const oldId = bridgeCfg.agentId;
+                                    bridgeCfg.agentId = newAgentId;
+                                    bridgeCfg.agentName = newAgentName;
+                                    writeFileSync(configPath, JSON.stringify(cfg, null, 2), "utf-8");
+                                    api.logger.info(`[bridge] Permanently renamed in ${configPath}: ${oldId} → ${newAgentId}`);
+                                }
+                            }
+                            catch (err) {
+                                api.logger.warn(`[bridge] Failed to persist rename to config: ${err.message}`);
+                            }
+                        }
                     });
                     try {
                         await relayClient.connect();

package/dist/registry.js

@@ -42,8 +42,14 @@ export class BridgeRegistry {
                 body: JSON.stringify(entry),
             });
             if (!res.ok) {
-                // Re-register if heartbeat fails
                 await this.register(entry);
+                return;
+            }
+            // Check for registry-level agentId conflict
+            const body = await res.json();
+            if (body.error === "agentId_conflict") {
+                this.logger.warn(`openclaw-bridge: registry conflict — agentId "${entry.agentId}" belongs to machine "${body.existingMachine}", skipping heartbeat`);
+                // Don't re-register — the WebSocket conflict handler will rename us
             }
         }
         catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-bridge",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "author": "Bill Zhao (https://www.linkedin.com/in/billzhaodi/)",
   "description": "OpenClaw plugin for cross-gateway communication — agent discovery, file transfer, real-time messaging, session handoff, and local process management. Install as plugin: openclaw plugins install openclaw-bridge",
   "type": "module",