@botcord/daemon 0.2.60 → 0.2.62

package/src/openclaw-discovery.ts

@@ -346,6 +346,7 @@ export function mergeOpenclawGateways(
 
 function discoverFromConfigDir(root: string): DiscoveredOpenclawGateway[] {
   const dir = expandHome(root);
+  const rootIsQclaw = path.basename(dir) === ".qclaw";
   let names: string[];
   try {
     names = readdirSync(dir);
@@ -362,8 +363,9 @@ function discoverFromConfigDir(root: string): DiscoveredOpenclawGateway[] {
       const raw = readFileSync(file, "utf8");
       const parsed = name.endsWith(".json") ? parseJsonConfig(raw) : parseTomlConfig(raw);
       if (!parsed?.url) continue;
+      const namePrefix = rootIsQclaw || name.toLowerCase() === "qclaw.json" ? "qclaw" : "openclaw";
       const item: DiscoveredOpenclawGateway = {
-        name: nameFromUrl(parsed.url),
+        name: nameFromUrl(parsed.url, namePrefix),
         url: parsed.url,
         source: "config-file",
       };
@@ -487,25 +489,34 @@ function dedupeDiscovered(items: DiscoveredOpenclawGateway[]): DiscoveredOpencla
   for (const item of items) {
     const key = normalizeUrlKey(item.url);
     const prev = byUrl.get(key);
-    if (!prev || priority[item.source] > priority[prev.source] || hasMoreAuth(item, prev)) {
+    if (
+      !prev ||
+      priority[item.source] > priority[prev.source] ||
+      hasMoreAuth(item, prev) ||
+      prefersQclawName(item, prev)
+    ) {
       byUrl.set(key, item);
     }
   }
   return [...byUrl.values()];
 }
 
+function prefersQclawName(a: DiscoveredOpenclawGateway, b: DiscoveredOpenclawGateway): boolean {
+  return a.name.startsWith("qclaw-") && !b.name.startsWith("qclaw-");
+}
+
 function hasMoreAuth(a: DiscoveredOpenclawGateway, b: DiscoveredOpenclawGateway): boolean {
   const score = (x: DiscoveredOpenclawGateway): number => (x.token ? 2 : x.tokenFile ? 1 : 0);
   return score(a) > score(b);
 }
 
-function nameFromUrl(raw: string): string {
+function nameFromUrl(raw: string, prefix = "openclaw"): string {
   try {
     const u = new URL(raw);
     const base = `${u.hostname}-${u.port || (u.protocol === "wss:" ? "443" : "80")}`;
-    return `openclaw-${base.replace(/[^A-Za-z0-9_-]+/g, "-")}`;
+    return `${prefix}-${base.replace(/[^A-Za-z0-9_-]+/g, "-")}`;
   } catch {
-    return "openclaw-local";
+    return `${prefix}-local`;
   }
 }
 

package/src/provision.ts

@@ -48,6 +48,11 @@ import {
   buildManagedRoutes,
   prepareGatewayProfile,
 } from "./daemon-config-map.js";
+import {
+  discoverLocalOpenclawGateways,
+  mergeOpenclawGateways,
+  openclawDiscoveryConfigEnabled,
+} from "./openclaw-discovery.js";
 import {
   agentHomeDir,
   agentStateDir,
@@ -324,9 +329,10 @@ export function createProvisioner(opts: ProvisionerOptions): (
       case CONTROL_FRAME_TYPES.LIST_RUNTIMES: {
         // Async path so the openclaw-acp endpoints get probed inline; gateway
         // / WS errors are swallowed inside `collectRuntimeSnapshotAsync`.
-        let cfgForProbe: { openclawGateways?: any[] } | undefined;
+        let cfgForProbe: DaemonConfig | undefined;
         try {
           cfgForProbe = loadConfig();
+          cfgForProbe = await refreshDiscoveredOpenclawGateways(cfgForProbe);
         } catch {
           cfgForProbe = undefined;
         }
@@ -428,6 +434,31 @@ export function createProvisioner(opts: ProvisionerOptions): (
   };
 }
 
+async function refreshDiscoveredOpenclawGateways(cfg: DaemonConfig): Promise<DaemonConfig> {
+  if (!openclawDiscoveryConfigEnabled(cfg)) return cfg;
+  try {
+    const found = await discoverLocalOpenclawGateways({
+      searchPaths: cfg.openclawDiscovery?.searchPaths,
+      defaultPorts: cfg.openclawDiscovery?.defaultPorts,
+      timeoutMs: 500,
+    });
+    const merged = mergeOpenclawGateways(cfg, found);
+    if (!merged.changed) return cfg;
+    saveConfig(merged.cfg);
+    daemonLog.info("openclaw discovery: gateways merged", {
+      source: "list_runtimes",
+      added: merged.added.map((g) => ({ name: g.name, url: g.url })),
+    });
+    return merged.cfg;
+  } catch (err) {
+    daemonLog.warn("openclaw discovery failed; continuing", {
+      source: "list_runtimes",
+      error: err instanceof Error ? err.message : String(err),
+    });
+    return cfg;
+  }
+}
+
 interface WakeAgentParams {
   agent_id?: string;
   agentId?: string;