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

package/src/viewer/server.ts

@@ -84,6 +84,12 @@ export class ViewerServer {
     { running: false, done: false, stopped: false, processed: 0, total: 0, tasksCreated: 0, skillsCreated: 0, errors: 0, skippedSessions: 0, totalSessions: 0 };
   private ppSSEClients: http.ServerResponse[] = [];
 
+  private notifSSEClients: http.ServerResponse[] = [];
+  private notifPollTimer?: ReturnType<typeof setInterval>;
+  private lastKnownNotifCount = 0;
+  private hubHeartbeatTimer?: ReturnType<typeof setInterval>;
+  private static readonly HUB_HEARTBEAT_INTERVAL_MS = 45_000;
+
   constructor(opts: ViewerServerOptions) {
     this.store = opts.store;
     this.embedder = opts.embedder;
@@ -103,15 +109,16 @@ export class ViewerServer {
       this.server.on("error", (err: NodeJS.ErrnoException) => {
         if (err.code === "EADDRINUSE") {
           this.log.warn(`Viewer port ${this.port} in use, trying ${this.port + 1}`);
-          this.server!.listen(this.port + 1, "127.0.0.1");
+          this.server!.listen(this.port + 1, "0.0.0.0");
         } else {
           reject(err);
         }
       });
-      this.server.listen(this.port, "127.0.0.1", () => {
+      this.server.listen(this.port, "0.0.0.0", () => {
         const addr = this.server!.address();
         const actualPort = typeof addr === "object" && addr ? addr.port : this.port;
         this.autoCleanupPolluted();
+        this.startHubHeartbeat();
         resolve(`http://127.0.0.1:${actualPort}`);
       });
     });
@@ -134,6 +141,10 @@ export class ViewerServer {
   }
 
   stop(): void {
+    this.stopHubHeartbeat();
+    this.stopNotifPoll();
+    for (const c of this.notifSSEClients) { try { c.end(); } catch {} }
+    this.notifSSEClients = [];
     this.server?.close();
     this.server = null;
   }
@@ -279,9 +290,12 @@ export class ViewerServer {
       else if (p === "/api/sharing/notifications" && req.method === "GET") this.serveSharingNotifications(res, url);
       else if (p === "/api/sharing/notifications/read" && req.method === "POST") this.handleSharingNotificationsRead(req, res);
       else if (p === "/api/sharing/notifications/clear" && req.method === "POST") this.handleSharingNotificationsClear(req, res);
+      else if (p === "/api/notifications/stream" && req.method === "GET") this.handleNotifSSE(req, res);
       else if (p === "/api/admin/shared-tasks" && req.method === "GET") this.serveAdminSharedTasks(res);
+      else if (p.match(/^\/api\/admin\/shared-tasks\/[^/]+\/detail$/) && req.method === "GET") this.serveHubTaskDetail(res, p);
       else if (p.match(/^\/api\/admin\/shared-tasks\/[^/]+$/) && req.method === "DELETE") this.handleAdminDeleteTask(res, p);
       else if (p === "/api/admin/shared-skills" && req.method === "GET") this.serveAdminSharedSkills(res);
+      else if (p.match(/^\/api\/admin\/shared-skills\/[^/]+\/detail$/) && req.method === "GET") this.serveHubSkillDetail(res, p);
       else if (p.match(/^\/api\/admin\/shared-skills\/[^/]+$/) && req.method === "DELETE") this.handleAdminDeleteSkill(res, p);
       else if (p === "/api/admin/shared-memories" && req.method === "GET") this.serveAdminSharedMemories(res);
       else if (p.match(/^\/api\/admin\/shared-memories\/[^/]+$/) && req.method === "DELETE") this.handleAdminDeleteMemory(res, p);
@@ -436,7 +450,13 @@ export class ViewerServer {
     const params: any[] = [];
     if (session) { conditions.push("session_key = ?"); params.push(session); }
     if (role) { conditions.push("role = ?"); params.push(role); }
-    if (owner) { conditions.push("owner = ?"); params.push(owner); }
+    if (owner && owner.startsWith("agent:")) {
+      const agentPrefix = owner + ":";
+      conditions.push("(owner = ? OR (owner = 'public' AND session_key LIKE ?))");
+      params.push(owner, agentPrefix + "%");
+    } else if (owner) {
+      conditions.push("owner = ?"); params.push(owner);
+    }
     if (dateFrom) { conditions.push("created_at >= ?"); params.push(new Date(dateFrom).getTime()); }
     if (dateTo) { conditions.push("created_at <= ?"); params.push(new Date(dateTo).getTime()); }
 
@@ -510,9 +530,10 @@ export class ViewerServer {
   private serveTasks(res: http.ServerResponse, url: URL): void {
     this.store.recordViewerEvent("tasks_list");
     const status = url.searchParams.get("status") ?? undefined;
+    const owner = url.searchParams.get("owner") ?? undefined;
     const limit = Math.min(100, Math.max(1, Number(url.searchParams.get("limit")) || 50));
     const offset = Math.max(0, Number(url.searchParams.get("offset")) || 0);
-    const { tasks, total } = this.store.listTasks({ status, limit, offset });
+    const { tasks, total } = this.store.listTasks({ status, limit, offset, owner });
 
     const db = (this.store as any).db;
     const items = tasks.map((t) => {
@@ -616,12 +637,20 @@ export class ViewerServer {
       }
       let embCount = 0;
       try { embCount = (db.prepare("SELECT COUNT(*) as count FROM embeddings").get() as any).count; } catch { /* table may not exist */ }
-      const sessionQuery = ownerFilter
-        ? "SELECT session_key, COUNT(*) as count, MIN(created_at) as earliest, MAX(created_at) as latest FROM chunks WHERE owner = ? GROUP BY session_key ORDER BY latest DESC"
-        : "SELECT session_key, COUNT(*) as count, MIN(created_at) as earliest, MAX(created_at) as latest FROM chunks GROUP BY session_key ORDER BY latest DESC";
-      const sessionList = (ownerFilter
-        ? db.prepare(sessionQuery).all(ownerFilter)
-        : db.prepare(sessionQuery).all()) as any[];
+      let sessionQuery: string;
+      let sessionParams: any[];
+      if (ownerFilter && ownerFilter.startsWith("agent:")) {
+        const agentPrefix = ownerFilter + ":";
+        sessionQuery = "SELECT session_key, COUNT(*) as count, MIN(created_at) as earliest, MAX(created_at) as latest FROM chunks WHERE (owner = ? OR (owner = 'public' AND session_key LIKE ?)) GROUP BY session_key ORDER BY latest DESC";
+        sessionParams = [ownerFilter, agentPrefix + "%"];
+      } else if (ownerFilter) {
+        sessionQuery = "SELECT session_key, COUNT(*) as count, MIN(created_at) as earliest, MAX(created_at) as latest FROM chunks WHERE owner = ? GROUP BY session_key ORDER BY latest DESC";
+        sessionParams = [ownerFilter];
+      } else {
+        sessionQuery = "SELECT session_key, COUNT(*) as count, MIN(created_at) as earliest, MAX(created_at) as latest FROM chunks GROUP BY session_key ORDER BY latest DESC";
+        sessionParams = [];
+      }
+      const sessionList = db.prepare(sessionQuery).all(...sessionParams) as any[];
 
       let skillCount = 0;
       try { skillCount = (db.prepare("SELECT COUNT(*) as count FROM skills").get() as any).count; } catch { /* table may not exist yet */ }
@@ -634,10 +663,16 @@ export class ViewerServer {
 
       let owners: string[] = [];
       try {
-        const ownerRows = db.prepare("SELECT DISTINCT owner FROM chunks WHERE owner IS NOT NULL ORDER BY owner").all() as any[];
+        const ownerRows = db.prepare("SELECT DISTINCT owner FROM chunks WHERE owner IS NOT NULL AND owner LIKE 'agent:%' ORDER BY owner").all() as any[];
         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,
@@ -646,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}`);
@@ -1470,7 +1506,8 @@ export class ViewerServer {
 
   private getOpenClawConfigPath(): string {
     const home = process.env.HOME || process.env.USERPROFILE || "";
-    return path.join(home, ".openclaw", "openclaw.json");
+    const ocHome = process.env.OPENCLAW_STATE_DIR || path.join(home, ".openclaw");
+    return path.join(ocHome, "openclaw.json");
   }
 
   private getPluginEntryConfig(raw: any): Record<string, unknown> {
@@ -1712,12 +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 username = os.userInfo().username || "user";
+        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,
@@ -1738,7 +1784,13 @@ export class ViewerServer {
     if (!this.ctx) return this.jsonResponse(res, { memories: [], error: "sharing_unavailable" });
     try {
       const limit = Number(url.searchParams.get("limit") || 40);
-      const data = await hubListMemories(this.store, this.ctx, { limit });
+      const hub = this.resolveHubConnection();
+      let data: any;
+      if (hub) {
+        data = await hubRequestJson(hub.hubUrl, hub.userToken, `/api/v1/hub/memories?limit=${limit}`);
+      } else {
+        data = await hubListMemories(this.store, this.ctx, { limit });
+      }
       this.jsonResponse(res, { memories: Array.isArray(data?.memories) ? data.memories : [] });
     } catch (err) {
       this.jsonResponse(res, { memories: [], error: String(err) });
@@ -1749,7 +1801,13 @@ export class ViewerServer {
     if (!this.ctx) return this.jsonResponse(res, { tasks: [], error: "sharing_unavailable" });
     try {
       const limit = Number(url.searchParams.get("limit") || 40);
-      const data = await hubListTasks(this.store, this.ctx, { limit });
+      const hub = this.resolveHubConnection();
+      let data: any;
+      if (hub) {
+        data = await hubRequestJson(hub.hubUrl, hub.userToken, `/api/v1/hub/tasks?limit=${limit}`);
+      } else {
+        data = await hubListTasks(this.store, this.ctx, { limit });
+      }
       this.jsonResponse(res, { tasks: Array.isArray(data?.tasks) ? data.tasks : [] });
     } catch (err) {
       this.jsonResponse(res, { tasks: [], error: String(err) });
@@ -1760,7 +1818,13 @@ export class ViewerServer {
     if (!this.ctx) return this.jsonResponse(res, { skills: [], error: "sharing_unavailable" });
     try {
       const limit = Number(url.searchParams.get("limit") || 40);
-      const data = await hubListSkills(this.store, this.ctx, { limit });
+      const hub = this.resolveHubConnection();
+      let data: any;
+      if (hub) {
+        data = await hubRequestJson(hub.hubUrl, hub.userToken, `/api/v1/hub/skills/list?limit=${limit}`);
+      } else {
+        data = await hubListSkills(this.store, this.ctx, { limit });
+      }
       this.jsonResponse(res, { skills: Array.isArray(data?.skills) ? data.skills : [] });
     } catch (err) {
       this.jsonResponse(res, { skills: [], error: String(err) });
@@ -1776,13 +1840,21 @@ export class ViewerServer {
         const query = String(parsed.query || "");
         const role = typeof parsed.role === "string" ? parsed.role : undefined;
         const maxResults = typeof parsed.maxResults === "number" ? parsed.maxResults : 10;
-        const scope = parsed.scope === "group" || parsed.scope === "all" ? parsed.scope : "local";
+        const scope = parsed.scope === "group" || parsed.scope === "all" || parsed.scope === "hub" ? (parsed.scope === "hub" ? "all" : parsed.scope) : "local";
         const local = this.searchLocalViewerMemories(query, { role, maxResults });
         if (scope === "local") {
           return this.jsonResponse(res, { local: { hits: local.hits, meta: local.meta }, hub: emptyHub });
         }
         try {
-          const hub = await hubSearchMemories(this.store, this.ctx, { query, maxResults, scope });
+          const conn = this.resolveHubConnection();
+          let hub: any;
+          if (conn) {
+            hub = await hubRequestJson(conn.hubUrl, conn.userToken, "/api/v1/hub/search", {
+              method: "POST", body: JSON.stringify({ query, maxResults, scope }),
+            });
+          } else {
+            hub = await hubSearchMemories(this.store, this.ctx!, { query, maxResults, scope });
+          }
           this.jsonResponse(res, { local: { hits: local.hits, meta: local.meta }, hub });
         } catch (err) {
           this.jsonResponse(res, { local: { hits: local.hits, meta: local.meta }, hub: emptyHub, error: String(err) });
@@ -2192,6 +2264,34 @@ export class ViewerServer {
     }
   }
 
+  private async serveHubTaskDetail(res: http.ServerResponse, p: string): Promise<void> {
+    const hub = this.resolveHubConnection();
+    if (!hub) return this.jsonResponse(res, { error: "not_configured" }, 500);
+    const m = p.match(/^\/api\/admin\/shared-tasks\/([^/]+)\/detail$/);
+    if (!m) return this.jsonResponse(res, { error: "bad_request" }, 400);
+    const taskId = decodeURIComponent(m[1]);
+    try {
+      const data = await hubRequestJson(hub.hubUrl, hub.userToken, `/api/v1/hub/shared-tasks/${encodeURIComponent(taskId)}/detail`, { method: "GET" }) as any;
+      this.jsonResponse(res, data);
+    } catch (err) {
+      this.jsonResponse(res, { error: String(err) }, 500);
+    }
+  }
+
+  private async serveHubSkillDetail(res: http.ServerResponse, p: string): Promise<void> {
+    const hub = this.resolveHubConnection();
+    if (!hub) return this.jsonResponse(res, { error: "not_configured" }, 500);
+    const m = p.match(/^\/api\/admin\/shared-skills\/([^/]+)\/detail$/);
+    if (!m) return this.jsonResponse(res, { error: "bad_request" }, 400);
+    const skillId = decodeURIComponent(m[1]);
+    try {
+      const data = await hubRequestJson(hub.hubUrl, hub.userToken, `/api/v1/hub/shared-skills/${encodeURIComponent(skillId)}/detail`, { method: "GET" }) as any;
+      this.jsonResponse(res, data);
+    } catch (err) {
+      this.jsonResponse(res, { error: String(err) }, 500);
+    }
+  }
+
   private async serveAdminSharedSkills(res: http.ServerResponse): Promise<void> {
     const hub = this.resolveHubConnection();
     if (!hub) return this.jsonResponse(res, { skills: [], error: "not_configured" });
@@ -2272,6 +2372,12 @@ export class ViewerServer {
         const body = JSON.parse(raw || "{}");
         await hubRequestJson(hub.hubUrl, hub.userToken, "/api/v1/hub/notifications/read", { method: "POST", body: JSON.stringify(body) });
         this.jsonResponse(res, { ok: true });
+        try {
+          const data = (await hubRequestJson(hub.hubUrl, hub.userToken, "/api/v1/hub/notifications?unread=1")) as any;
+          const count = data?.unreadCount ?? 0;
+          this.lastKnownNotifCount = count;
+          this.broadcastNotifSSE({ type: "update", unreadCount: count });
+        } catch { /* best effort */ }
       } catch (err) {
         this.jsonResponse(res, { ok: false, error: String(err) });
       }
@@ -2285,12 +2391,81 @@ export class ViewerServer {
       try {
         await hubRequestJson(hub.hubUrl, hub.userToken, "/api/v1/hub/notifications/clear", { method: "POST", body: "{}" });
         this.jsonResponse(res, { ok: true });
+        this.broadcastNotifSSE({ type: "cleared", unreadCount: 0 });
       } catch (err) {
         this.jsonResponse(res, { ok: false, error: String(err) });
       }
     });
   }
 
+  private handleNotifSSE(req: http.IncomingMessage, res: http.ServerResponse): void {
+    res.writeHead(200, {
+      "Content-Type": "text/event-stream",
+      "Cache-Control": "no-cache",
+      Connection: "keep-alive",
+      "Access-Control-Allow-Origin": "*",
+    });
+    res.write("data: {\"type\":\"connected\"}\n\n");
+    this.notifSSEClients.push(res);
+    if (!this.notifPollTimer) this.startNotifPoll();
+    req.on("close", () => {
+      this.notifSSEClients = this.notifSSEClients.filter((c) => c !== res);
+      if (this.notifSSEClients.length === 0) this.stopNotifPoll();
+    });
+  }
+
+  private broadcastNotifSSE(data: Record<string, unknown>): void {
+    const msg = `data: ${JSON.stringify(data)}\n\n`;
+    this.notifSSEClients = this.notifSSEClients.filter((c) => {
+      try { c.write(msg); return true; } catch { return false; }
+    });
+  }
+
+  private startNotifPoll(): void {
+    this.stopNotifPoll();
+    const tick = async () => {
+      const hub = this.resolveHubConnection();
+      if (!hub) return;
+      try {
+        const data = (await hubRequestJson(hub.hubUrl, hub.userToken, "/api/v1/hub/notifications?unread=1")) as any;
+        const count = data?.unreadCount ?? 0;
+        if (count !== this.lastKnownNotifCount) {
+          this.lastKnownNotifCount = count;
+          this.broadcastNotifSSE({ type: "update", unreadCount: count });
+        }
+      } catch { /* ignore */ }
+    };
+    tick();
+    this.notifPollTimer = setInterval(tick, 3000);
+  }
+
+  private stopNotifPoll(): void {
+    if (this.notifPollTimer) { clearInterval(this.notifPollTimer); this.notifPollTimer = undefined; }
+  }
+
+  private startHubHeartbeat(): void {
+    this.stopHubHeartbeat();
+    const sendHeartbeat = async () => {
+      try {
+        const hub = this.resolveHubConnection();
+        if (!hub) {
+          const persisted = this.store.getClientHubConnection();
+          if (persisted?.hubUrl && persisted?.userToken) {
+            await hubRequestJson(persisted.hubUrl, persisted.userToken, "/api/v1/hub/heartbeat", { method: "POST" });
+          }
+          return;
+        }
+        await hubRequestJson(hub.hubUrl, hub.userToken, "/api/v1/hub/heartbeat", { method: "POST" });
+      } catch { /* best-effort */ }
+    };
+    sendHeartbeat();
+    this.hubHeartbeatTimer = setInterval(sendHeartbeat, ViewerServer.HUB_HEARTBEAT_INTERVAL_MS);
+  }
+
+  private stopHubHeartbeat(): void {
+    if (this.hubHeartbeatTimer) { clearInterval(this.hubHeartbeatTimer); this.hubHeartbeatTimer = undefined; }
+  }
+
   private getLocalIPs(): string[] {
     const nets = os.networkInterfaces();
     const ips: string[] = [];
@@ -2343,7 +2518,7 @@ export class ViewerServer {
   }
 
   private handleSaveConfig(req: http.IncomingMessage, res: http.ServerResponse): void {
-    this.readBody(req, (body) => {
+    this.readBody(req, async (body) => {
       try {
         const newCfg = JSON.parse(body);
         const cfgPath = this.getOpenClawConfigPath();
@@ -2366,6 +2541,11 @@ export class ViewerServer {
         if (!entry.config) entry.config = {};
         const config = entry.config as Record<string, unknown>;
 
+        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;
         if (newCfg.skillEvolution) config.skillEvolution = newCfg.skillEvolution;
@@ -2393,6 +2573,38 @@ export class ViewerServer {
               } catch {}
             }
           }
+
+          const newRole = merged.role as string | undefined;
+          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") {
             merged.client = { hubAddress: "", userToken: "", teamToken: "" };
           } else if (merged.role === "client") {
@@ -2404,6 +2616,14 @@ export class ViewerServer {
         fs.mkdirSync(path.dirname(cfgPath), { recursive: true });
         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}`);
@@ -2413,6 +2633,87 @@ 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();
+      if (hub) {
+        await hubRequestJson(hub.hubUrl, hub.userToken, "/api/v1/hub/leave", { method: "POST" });
+        this.log.info("Notified Hub of voluntary leave");
+        return;
+      }
+      const persisted = this.store.getClientHubConnection();
+      if (persisted?.hubUrl && persisted?.userToken) {
+        await hubRequestJson(persisted.hubUrl, persisted.userToken, "/api/v1/hub/leave", { method: "POST" });
+        this.log.info("Notified Hub of voluntary leave (persisted connection)");
+      }
+    } catch (e) {
+      this.log.warn(`Failed to notify Hub of leave: ${e}`);
+    }
+  }
+
+  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" });
@@ -2866,7 +3167,7 @@ export class ViewerServer {
 
   private getOpenClawHome(): string {
     const home = process.env.HOME || process.env.USERPROFILE || "";
-    return path.join(home, ".openclaw");
+    return process.env.OPENCLAW_STATE_DIR || path.join(home, ".openclaw");
   }
 
   private handleCleanupPolluted(res: http.ServerResponse): void {