@memtensor/memos-local-openclaw-plugin 1.0.4-beta.8 → 1.0.4-beta.9

package/src/viewer/server.ts

@@ -667,6 +667,12 @@ export class ViewerServer {
         owners = ownerRows.map((o: any) => o.owner);
       } catch { /* column may not exist yet */ }
 
+      let currentAgentOwner = "agent:main";
+      try {
+        const latest = db.prepare("SELECT owner FROM chunks WHERE owner IS NOT NULL AND owner LIKE 'agent:%' ORDER BY created_at DESC LIMIT 1").get() as any;
+        if (latest?.owner) currentAgentOwner = latest.owner;
+      } catch { /* best-effort */ }
+
       this.jsonResponse(res, {
         totalMemories: total.count, totalSessions: sessions.count, totalEmbeddings: embCount,
         totalSkills: skillCount,
@@ -675,6 +681,7 @@ export class ViewerServer {
         timeRange: { earliest: timeRange.earliest, latest: timeRange.latest },
         sessions: sessionList,
         owners,
+        currentAgentOwner,
       });
     } catch (e) {
       this.log.warn(`stats error: ${e}`);
@@ -1742,13 +1749,21 @@ export class ViewerServer {
       }
       try {
         const hubUrl = normalizeHubUrl(hubAddress);
+        const localIPs = this.getLocalIPs();
+        localIPs.push("127.0.0.1", "localhost", "0.0.0.0");
+        try {
+          const u = new URL(hubUrl);
+          if (localIPs.includes(u.hostname)) {
+            return this.jsonResponse(res, { ok: false, error: "cannot_join_self" });
+          }
+        } catch {}
         const os = await import("os");
         const nickname = sharing.client?.nickname;
         const username = nickname || os.userInfo().username || "user";
         const hostname = os.hostname() || "unknown";
         const result = await hubRequestJson(hubUrl, "", "/api/v1/hub/join", {
           method: "POST",
-          body: JSON.stringify({ teamToken, username, deviceName: hostname }),
+          body: JSON.stringify({ teamToken, username, deviceName: hostname, reapply: true }),
         }) as any;
         this.store.setClientHubConnection({
           hubUrl,
@@ -2526,7 +2541,10 @@ export class ViewerServer {
         if (!entry.config) entry.config = {};
         const config = entry.config as Record<string, unknown>;
 
-        const oldSharingRole = (config.sharing as Record<string, unknown>)?.role as string | undefined;
+        const oldSharing = config.sharing as Record<string, unknown> | undefined;
+        const oldSharingRole = oldSharing?.role as string | undefined;
+        const oldSharingEnabled = Boolean(oldSharing?.enabled);
+        const oldClientHubAddress = String((oldSharing?.client as Record<string, unknown>)?.hubAddress || "");
 
         if (newCfg.embedding) config.embedding = newCfg.embedding;
         if (newCfg.summarizer) config.summarizer = newCfg.summarizer;
@@ -2556,10 +2574,35 @@ export class ViewerServer {
             }
           }
 
-          // When switching away from client mode, notify Hub that we're leaving
           const newRole = merged.role as string | undefined;
-          if (oldSharingRole === "client" && newRole !== "client") {
+          const newEnabled = Boolean(merged.enabled);
+
+          // Detect disabling sharing or switching away from hub mode
+          const wasHub = oldSharingEnabled && oldSharingRole === "hub";
+          const isHub = newEnabled && newRole === "hub";
+          if (wasHub && !isHub) {
+            await this.notifyHubShutdown();
+            this.stopHubHeartbeat();
+            this.log.info("Hub shutting down: notified connected clients");
+          }
+
+          // Detect disabling sharing or switching away from client mode
+          const wasClient = oldSharingEnabled && oldSharingRole === "client";
+          const isClient = newEnabled && newRole === "client";
+          if (wasClient && !isClient) {
             this.notifyHubLeave();
+            this.store.clearClientHubConnection();
+            this.log.info("Cleared client hub connection (sharing disabled or role changed)");
+          }
+
+          // Detect switching to a different Hub while still in client mode
+          if (wasClient && isClient) {
+            const newClientAddr = String((merged.client as Record<string, unknown>)?.hubAddress || "");
+            if (newClientAddr && oldClientHubAddress && normalizeHubUrl(newClientAddr) !== normalizeHubUrl(oldClientHubAddress)) {
+              this.notifyHubLeave();
+              this.store.clearClientHubConnection();
+              this.log.info("Cleared client hub connection (switched to different Hub)");
+            }
           }
 
           if (merged.role === "hub") {
@@ -2574,6 +2617,13 @@ export class ViewerServer {
         fs.writeFileSync(cfgPath, JSON.stringify(raw, null, 2), "utf-8");
         this.log.info("Plugin config updated via Viewer");
         this.stopHubHeartbeat();
+
+        // When switching to client mode, immediately send join request
+        const finalSharing = config.sharing as Record<string, unknown> | undefined;
+        if (finalSharing?.role === "client" && oldSharingRole !== "client") {
+          this.autoJoinOnSave(finalSharing).catch(e => this.log.warn(`Auto-join on save failed: ${e}`));
+        }
+
         this.jsonResponse(res, { ok: true });
       } catch (e) {
         this.log.warn(`handleSaveConfig error: ${e}`);
@@ -2583,6 +2633,34 @@ export class ViewerServer {
     });
   }
 
+  private async autoJoinOnSave(sharing: Record<string, unknown>): Promise<void> {
+    const clientCfg = sharing.client as Record<string, unknown> | undefined;
+    const hubAddress = String(clientCfg?.hubAddress || "");
+    const teamToken = String(clientCfg?.teamToken || "");
+    if (!hubAddress || !teamToken) return;
+    const hubUrl = normalizeHubUrl(hubAddress);
+    const os = await import("os");
+    const nickname = String(clientCfg?.nickname || "");
+    const username = nickname || os.userInfo().username || "user";
+    const hostname = os.hostname() || "unknown";
+    const result = await hubRequestJson(hubUrl, "", "/api/v1/hub/join", {
+      method: "POST",
+      body: JSON.stringify({ teamToken, username, deviceName: hostname }),
+    }) as any;
+    this.store.setClientHubConnection({
+      hubUrl,
+      userId: String(result.userId || ""),
+      username,
+      userToken: result.userToken || "",
+      role: "member",
+      connectedAt: Date.now(),
+    });
+    this.log.info(`Auto-join on save: status=${result.status}, userId=${result.userId}`);
+    if (result.userToken) {
+      this.startHubHeartbeat();
+    }
+  }
+
   private async notifyHubLeave(): Promise<void> {
     try {
       const hub = this.resolveHubConnection();
@@ -2601,6 +2679,41 @@ export class ViewerServer {
     }
   }
 
+  private async notifyHubShutdown(): Promise<void> {
+    try {
+      const sharing = this.ctx?.config.sharing;
+      if (!sharing || sharing.role !== "hub") return;
+      const hubPort = sharing.hub?.port ?? 18800;
+      const authPath = path.join(this.dataDir, "hub-auth.json");
+      let adminToken: string | undefined;
+      try {
+        const authData = JSON.parse(fs.readFileSync(authPath, "utf8"));
+        adminToken = authData?.bootstrapAdminToken;
+      } catch { return; }
+      if (!adminToken) return;
+
+      const users = this.store.listHubUsers("active");
+      const { v4: uuidv4 } = require("uuid");
+      for (const u of users) {
+        try {
+          this.store.insertHubNotification({
+            id: uuidv4(),
+            userId: u.id,
+            type: "hub_shutdown",
+            resource: "hub",
+            title: "Hub is shutting down",
+            message: "The Hub server is shutting down. You may be disconnected.",
+          });
+        } catch (e) {
+          this.log.warn(`Failed to insert shutdown notification for user ${u.id}: ${e}`);
+        }
+      }
+      this.log.info(`Hub shutdown: notified ${users.length} approved user(s)`);
+    } catch (e) {
+      this.log.warn(`notifyHubShutdown error: ${e}`);
+    }
+  }
+
   private handleUpdateUsername(req: http.IncomingMessage, res: http.ServerResponse): void {
     this.readBody(req, async (body) => {
       if (!this.ctx) return this.jsonResponse(res, { error: "sharing_unavailable" });