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

package/dist/viewer/server.js

@@ -72,6 +72,8 @@ class ViewerServer {
     authFile;
     auth;
     ctx;
+    cookieName;
+    defaultHubPort;
     static SESSION_TTL = 24 * 60 * 60 * 1000;
     static PLUGIN_VERSION = (() => {
         try {
@@ -105,16 +107,31 @@ class ViewerServer {
         this.ctx = opts.ctx;
         this.authFile = node_path_1.default.join(opts.dataDir, "viewer-auth.json");
         this.auth = { passwordHash: null, sessions: new Map() };
+        this.cookieName = `memos_token_${opts.port}`;
+        this.defaultHubPort = opts.defaultHubPort ?? 18800;
         this.resetToken = node_crypto_1.default.randomBytes(16).toString("hex");
         this.loadAuth();
     }
+    getHubPort() {
+        const configured = this.ctx?.config?.sharing?.hub?.port;
+        if (configured && configured !== 18800)
+            return configured;
+        return this.defaultHubPort;
+    }
     start() {
+        const MAX_PORT_RETRIES = 5;
         return new Promise((resolve, reject) => {
+            let retries = 0;
             this.server = node_http_1.default.createServer((req, res) => this.handleRequest(req, res));
             this.server.on("error", (err) => {
-                if (err.code === "EADDRINUSE") {
-                    this.log.warn(`Viewer port ${this.port} in use, trying ${this.port + 1}`);
-                    this.server.listen(this.port + 1, "0.0.0.0");
+                if (err.code === "EADDRINUSE" && retries < MAX_PORT_RETRIES) {
+                    retries++;
+                    const nextPort = this.port + retries;
+                    this.log.warn(`Viewer port ${this.port + retries - 1} in use, trying ${nextPort}`);
+                    this.server.listen(nextPort, "0.0.0.0");
+                }
+                else if (err.code === "EADDRINUSE") {
+                    reject(new Error(`Viewer failed to find open port after ${MAX_PORT_RETRIES} retries (tried ${this.port}–${this.port + MAX_PORT_RETRIES})`));
                 }
                 else {
                     reject(err);
@@ -193,7 +210,8 @@ class ViewerServer {
     }
     isValidSession(req) {
         const cookie = req.headers.cookie ?? "";
-        const match = cookie.match(/memos_token=([a-f0-9]+)/);
+        const re = new RegExp(`${this.cookieName}=([a-f0-9]+)`);
+        const match = cookie.match(re);
         if (!match)
             return false;
         const expiry = this.auth.sessions.get(match[1]);
@@ -313,6 +331,8 @@ class ViewerServer {
                 this.handleSharingChangeRole(req, res);
             else if (p === "/api/sharing/retry-join" && req.method === "POST")
                 this.handleRetryJoin(req, res);
+            else if (p === "/api/sharing/leave" && req.method === "POST")
+                this.handleLeaveTeam(req, res);
             else if (p === "/api/sharing/search/memories" && req.method === "POST")
                 this.handleSharingMemorySearch(req, res);
             else if (p === "/api/sharing/memories/list" && req.method === "GET")
@@ -353,6 +373,8 @@ class ViewerServer {
                 this.handleSharingNotificationsRead(req, res);
             else if (p === "/api/sharing/notifications/clear" && req.method === "POST")
                 this.handleSharingNotificationsClear(req, res);
+            else if (p === "/api/sharing/sync-hub-removal" && req.method === "POST")
+                this.handleSyncHubRemoval(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")
@@ -440,7 +462,7 @@ class ViewerServer {
                 const token = this.createSession();
                 res.writeHead(200, {
                     "Content-Type": "application/json",
-                    "Set-Cookie": `memos_token=${token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=86400`,
+                    "Set-Cookie": `${this.cookieName}=${token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=86400`,
                 });
                 res.end(JSON.stringify({ ok: true, message: "Password set successfully" }));
             }
@@ -462,7 +484,7 @@ class ViewerServer {
                 const token = this.createSession();
                 res.writeHead(200, {
                     "Content-Type": "application/json",
-                    "Set-Cookie": `memos_token=${token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=86400`,
+                    "Set-Cookie": `${this.cookieName}=${token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=86400`,
                 });
                 res.end(JSON.stringify({ ok: true }));
             }
@@ -474,12 +496,13 @@ class ViewerServer {
     }
     handleLogout(req, res) {
         const cookie = req.headers.cookie ?? "";
-        const match = cookie.match(/memos_token=([a-f0-9]+)/);
+        const re = new RegExp(`${this.cookieName}=([a-f0-9]+)`);
+        const match = cookie.match(re);
         if (match)
             this.auth.sessions.delete(match[1]);
         res.writeHead(200, {
             "Content-Type": "application/json",
-            "Set-Cookie": "memos_token=; Path=/; HttpOnly; Max-Age=0",
+            "Set-Cookie": `${this.cookieName}=; Path=/; HttpOnly; Max-Age=0`,
         });
         res.end(JSON.stringify({ ok: true }));
     }
@@ -505,7 +528,7 @@ class ViewerServer {
                 const sessionToken = this.createSession();
                 res.writeHead(200, {
                     "Content-Type": "application/json",
-                    "Set-Cookie": `memos_token=${sessionToken}; Path=/; HttpOnly; SameSite=Strict; Max-Age=86400`,
+                    "Set-Cookie": `${this.cookieName}=${sessionToken}; Path=/; HttpOnly; SameSite=Strict; Max-Age=86400`,
                 });
                 res.end(JSON.stringify({ ok: true, message: "Password reset successfully" }));
             }
@@ -543,9 +566,8 @@ class ViewerServer {
             params.push(role);
         }
         if (owner && owner.startsWith("agent:")) {
-            const agentPrefix = owner + ":";
-            conditions.push("(owner = ? OR (owner = 'public' AND session_key LIKE ?))");
-            params.push(owner, agentPrefix + "%");
+            conditions.push("(owner = ? OR owner = 'public')");
+            params.push(owner);
         }
         else if (owner) {
             conditions.push("owner = ?");
@@ -561,7 +583,7 @@ class ViewerServer {
         }
         const where = conditions.length > 0 ? " WHERE " + conditions.join(" AND ") : "";
         const totalRow = db.prepare("SELECT COUNT(*) as count FROM chunks" + where).get(...params);
-        const rawMemories = db.prepare("SELECT * FROM chunks" + where + ` ORDER BY created_at ${sortBy} LIMIT ? OFFSET ?`).all(...params, limit, offset);
+        const rawMemories = db.prepare("SELECT * FROM chunks" + where + ` ORDER BY CASE WHEN dedup_status IN ('duplicate','merged') THEN 1 ELSE 0 END ASC, created_at ${sortBy} LIMIT ? OFFSET ?`).all(...params, limit, offset);
         const findMergeSources = db.prepare("SELECT id, summary, role FROM chunks WHERE dedup_target = ? AND (dedup_status = 'merged' OR dedup_status = 'duplicate')");
         const chunkIds = rawMemories.map((m) => m.id);
         const sharingMap = new Map();
@@ -572,6 +594,12 @@ class ViewerServer {
                 const sharedRows = db.prepare(`SELECT source_chunk_id, visibility, group_id FROM hub_memories WHERE source_chunk_id IN (${placeholders})`).all(...chunkIds);
                 for (const r of sharedRows)
                     sharingMap.set(r.source_chunk_id, r);
+                const teamMetaRows = db.prepare(`SELECT chunk_id, visibility, group_id FROM team_shared_chunks WHERE chunk_id IN (${placeholders})`).all(...chunkIds);
+                for (const r of teamMetaRows) {
+                    if (!sharingMap.has(r.chunk_id)) {
+                        sharingMap.set(r.chunk_id, { visibility: r.visibility, group_id: r.group_id });
+                    }
+                }
                 const localRows = db.prepare(`SELECT chunk_id, original_owner, shared_at FROM local_shared_memories WHERE chunk_id IN (${placeholders})`).all(...chunkIds);
                 for (const r of localRows)
                     localShareMap.set(r.chunk_id, r);
@@ -728,9 +756,8 @@ class ViewerServer {
             let sessionQuery;
             let sessionParams;
             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 + "%"];
+                sessionQuery = "SELECT session_key, COUNT(*) as count, MIN(created_at) as earliest, MAX(created_at) as latest FROM chunks WHERE (owner = ? OR owner = 'public') GROUP BY session_key ORDER BY latest DESC";
+                sessionParams = [ownerFilter];
             }
             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";
@@ -1162,7 +1189,7 @@ class ViewerServer {
             }
         });
     }
-    handleSkillDelete(res, urlPath) {
+    async handleSkillDelete(res, urlPath) {
         const skillId = urlPath.replace("/api/skill/", "");
         const skill = this.store.getSkill(skillId);
         if (!skill) {
@@ -1170,7 +1197,18 @@ class ViewerServer {
             res.end(JSON.stringify({ error: "Skill not found" }));
             return;
         }
-        // Remove skill directory from disk
+        try {
+            const hub = this.resolveHubConnection();
+            if (hub) {
+                await (0, hub_1.hubRequestJson)(hub.hubUrl, hub.userToken, "/api/v1/hub/skills/unpublish", {
+                    method: "POST",
+                    body: JSON.stringify({ sourceSkillId: skillId }),
+                }).catch(() => { });
+            }
+            const db = this.store.db;
+            db.prepare("DELETE FROM hub_skills WHERE source_skill_id = ?").run(skillId);
+        }
+        catch (_) { }
         try {
             if (skill.dirPath && node_fs_1.default.existsSync(skill.dirPath)) {
                 node_fs_1.default.rmSync(skill.dirPath, { recursive: true, force: true });
@@ -1339,8 +1377,6 @@ class ViewerServer {
                 }
                 let hubSynced = false;
                 if (scope === "team") {
-                    if (!isLocalShared)
-                        this.store.markMemorySharedLocally(chunkId);
                     if (!isTeamShared) {
                         const hubClient = await this.resolveHubClientAware();
                         const refreshedChunk = db.prepare("SELECT * FROM chunks WHERE id = ?").get(chunkId);
@@ -1348,18 +1384,29 @@ class ViewerServer {
                             method: "POST",
                             body: JSON.stringify({ memory: { sourceChunkId: refreshedChunk.id, role: refreshedChunk.role, content: refreshedChunk.content, summary: refreshedChunk.summary, kind: refreshedChunk.kind, groupId: null, visibility: "public" } }),
                         });
-                        if (hubClient.userId) {
+                        if (!isLocalShared)
+                            this.store.markMemorySharedLocally(chunkId);
+                        const memoryId = String(response?.memoryId ?? "");
+                        const isHubRole = this.ctx?.config?.sharing?.role === "hub";
+                        if (hubClient.userId && isHubRole) {
                             const existing = this.store.getHubMemoryBySource(hubClient.userId, chunkId);
                             this.store.upsertHubMemory({
-                                id: response?.memoryId ?? existing?.id ?? node_crypto_1.default.randomUUID(),
+                                id: memoryId || existing?.id || node_crypto_1.default.randomUUID(),
                                 sourceChunkId: chunkId, sourceUserId: hubClient.userId,
                                 role: refreshedChunk.role, content: refreshedChunk.content, summary: refreshedChunk.summary ?? "",
                                 kind: refreshedChunk.kind, groupId: null, visibility: "public",
                                 createdAt: existing?.createdAt ?? Date.now(), updatedAt: Date.now(),
                             });
                         }
+                        else if (hubClient.userId) {
+                            this.store.upsertTeamSharedChunk(chunkId, { hubMemoryId: memoryId, visibility: "public", groupId: null });
+                        }
                         hubSynced = true;
                     }
+                    else {
+                        if (!isLocalShared)
+                            this.store.markMemorySharedLocally(chunkId);
+                    }
                 }
                 else if (scope === "local") {
                     if (isTeamShared) {
@@ -1370,6 +1417,7 @@ class ViewerServer {
                             });
                             if (hubClient.userId)
                                 this.store.deleteHubMemoryBySource(hubClient.userId, chunkId);
+                            this.store.deleteTeamSharedChunk(chunkId);
                             hubSynced = true;
                         }
                         catch (err) {
@@ -1388,6 +1436,7 @@ class ViewerServer {
                             });
                             if (hubClient.userId)
                                 this.store.deleteHubMemoryBySource(hubClient.userId, chunkId);
+                            this.store.deleteTeamSharedChunk(chunkId);
                             hubSynced = true;
                         }
                         catch (err) {
@@ -1427,14 +1476,6 @@ class ViewerServer {
                     return this.jsonResponse(res, { ok: true, scope, changed: false });
                 }
                 let hubSynced = false;
-                if (scope === "local" || scope === "team") {
-                    if (!isLocalShared) {
-                        const originalOwner = task.owner;
-                        const db = this.store.db;
-                        db.prepare("INSERT INTO local_shared_tasks (task_id, hub_task_id, original_owner, shared_at) VALUES (?, ?, ?, ?) ON CONFLICT(task_id) DO UPDATE SET original_owner = excluded.original_owner, shared_at = excluded.shared_at").run(taskId, "", originalOwner, Date.now());
-                        db.prepare("UPDATE tasks SET owner = 'public' WHERE id = ?").run(taskId);
-                    }
-                }
                 if (scope === "team") {
                     if (!isTeamShared) {
                         const chunks = this.store.getChunksByTask(taskId);
@@ -1458,6 +1499,20 @@ class ViewerServer {
                         }
                         hubSynced = true;
                     }
+                    if (!isLocalShared) {
+                        const originalOwner = task.owner;
+                        const db = this.store.db;
+                        db.prepare("INSERT INTO local_shared_tasks (task_id, hub_task_id, original_owner, shared_at) VALUES (?, ?, ?, ?) ON CONFLICT(task_id) DO UPDATE SET original_owner = excluded.original_owner, shared_at = excluded.shared_at").run(taskId, "", originalOwner, Date.now());
+                        db.prepare("UPDATE tasks SET owner = 'public' WHERE id = ?").run(taskId);
+                    }
+                }
+                if (scope === "local") {
+                    if (!isLocalShared) {
+                        const originalOwner = task.owner;
+                        const db = this.store.db;
+                        db.prepare("INSERT INTO local_shared_tasks (task_id, hub_task_id, original_owner, shared_at) VALUES (?, ?, ?, ?) ON CONFLICT(task_id) DO UPDATE SET original_owner = excluded.original_owner, shared_at = excluded.shared_at").run(taskId, "", originalOwner, Date.now());
+                        db.prepare("UPDATE tasks SET owner = 'public' WHERE id = ?").run(taskId);
+                    }
                 }
                 if (scope === "local" && isTeamShared) {
                     try {
@@ -1528,10 +1583,6 @@ class ViewerServer {
                     return this.jsonResponse(res, { ok: true, scope, changed: false });
                 }
                 let hubSynced = false;
-                if (scope === "local" || scope === "team") {
-                    if (!isLocalShared)
-                        this.store.setSkillVisibility(skillId, "public");
-                }
                 if (scope === "team") {
                     if (!isTeamShared) {
                         const bundle = (0, skill_sync_1.buildSkillBundleForHub)(this.store, skillId);
@@ -1553,6 +1604,12 @@ class ViewerServer {
                         }
                         hubSynced = true;
                     }
+                    if (!isLocalShared)
+                        this.store.setSkillVisibility(skillId, "public");
+                }
+                if (scope === "local") {
+                    if (!isLocalShared)
+                        this.store.setSkillVisibility(skillId, "public");
                 }
                 if (scope === "local" && isTeamShared) {
                     try {
@@ -1595,7 +1652,18 @@ class ViewerServer {
     }
     getHubMemoryForChunk(chunkId) {
         const db = this.store.db;
-        return db.prepare("SELECT * FROM hub_memories WHERE source_chunk_id = ? LIMIT 1").get(chunkId);
+        const hub = db.prepare("SELECT * FROM hub_memories WHERE source_chunk_id = ? LIMIT 1").get(chunkId);
+        if (hub)
+            return hub;
+        const ts = this.store.getTeamSharedChunk(chunkId);
+        if (ts) {
+            return {
+                source_chunk_id: chunkId,
+                visibility: ts.visibility,
+                group_id: ts.groupId,
+            };
+        }
+        return undefined;
     }
     getHubTaskForLocal(taskId) {
         const db = this.store.db;
@@ -1641,6 +1709,8 @@ class ViewerServer {
     // ─── Helpers ───
     // ─── Config API ───
     getOpenClawConfigPath() {
+        if (process.env.OPENCLAW_CONFIG_PATH)
+            return process.env.OPENCLAW_CONFIG_PATH;
         const home = process.env.HOME || process.env.USERPROFILE || "";
         const ocHome = process.env.OPENCLAW_STATE_DIR || node_path_1.default.join(home, ".openclaw");
         return node_path_1.default.join(ocHome, "openclaw.json");
@@ -1723,7 +1793,18 @@ class ViewerServer {
                 base.connection.apiVersion = info?.apiVersion ?? null;
             }
             catch { /* ignore */ }
-            this.jsonResponse(res, base);
+            const hubStats = { totalMembers: 0, onlineMembers: 0, pendingMembers: 0 };
+            try {
+                const activeUsers = this.store.listHubUsers("active");
+                const pendingUsers = this.store.listHubUsers("pending");
+                const now = Date.now();
+                const OFFLINE_THRESHOLD = 120_000;
+                hubStats.totalMembers = activeUsers.length;
+                hubStats.onlineMembers = activeUsers.filter(u => u.lastActiveAt && (now - u.lastActiveAt < OFFLINE_THRESHOLD)).length;
+                hubStats.pendingMembers = pendingUsers.length;
+            }
+            catch { /* best-effort */ }
+            this.jsonResponse(res, { ...base, hubStats });
             return;
         }
         const hasPendingConnection = Boolean(persisted?.hubUrl && persisted?.userId && !persisted?.userToken);
@@ -1740,6 +1821,9 @@ class ViewerServer {
             if (status.user?.status === "rejected") {
                 output.connection.rejected = true;
             }
+            if (status.user?.status === "removed") {
+                output.connection.removed = true;
+            }
             if (status.connected && status.hubUrl) {
                 try {
                     const info = await fetch(`${status.hubUrl}/api/v1/hub/info`).then((r) => (r.ok ? r.json() : null)).catch(() => null);
@@ -1873,7 +1957,16 @@ class ViewerServer {
                 this.jsonResponse(res, { ok: true, result });
             }
             catch (err) {
-                this.jsonResponse(res, { ok: false, error: String(err) });
+                const errStr = String(err);
+                if (errStr.includes("username_taken")) {
+                    this.jsonResponse(res, { ok: false, error: "username_taken" });
+                }
+                else if (errStr.includes("invalid_params")) {
+                    this.jsonResponse(res, { ok: false, error: "invalid_params" });
+                }
+                else {
+                    this.jsonResponse(res, { ok: false, error: errStr });
+                }
             }
         });
     }
@@ -1892,23 +1985,17 @@ class ViewerServer {
             }
             try {
                 const hubUrl = (0, hub_1.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 Promise.resolve().then(() => __importStar(require("os")));
                 const nickname = sharing.client?.nickname;
                 const username = nickname || os.userInfo().username || "user";
                 const hostname = os.hostname() || "unknown";
+                const persisted = this.store.getClientHubConnection();
+                const existingIdentityKey = persisted?.identityKey || "";
                 const result = await (0, hub_1.hubRequestJson)(hubUrl, "", "/api/v1/hub/join", {
                     method: "POST",
-                    body: JSON.stringify({ teamToken, username, deviceName: hostname, reapply: true }),
+                    body: JSON.stringify({ teamToken, username, deviceName: hostname, reapply: true, identityKey: existingIdentityKey }),
                 });
+                const returnedIdentityKey = String(result.identityKey || existingIdentityKey || "");
                 this.store.setClientHubConnection({
                     hubUrl,
                     userId: String(result.userId || ""),
@@ -1916,6 +2003,8 @@ class ViewerServer {
                     userToken: result.userToken || "",
                     role: "member",
                     connectedAt: Date.now(),
+                    identityKey: returnedIdentityKey,
+                    lastKnownStatus: result.status || "",
                 });
                 this.jsonResponse(res, { ok: true, status: result.status || "pending" });
             }
@@ -2211,14 +2300,14 @@ class ViewerServer {
                         },
                     }),
                 });
-                const hubUserId = hubClient.userId;
-                if (hubUserId) {
+                const mid = String(response?.memoryId ?? "");
+                if (hubClient.userId && this.ctx?.config?.sharing?.role === "hub") {
                     const now = Date.now();
-                    const existing = this.store.getHubMemoryBySource(hubUserId, chunk.id);
+                    const existing = this.store.getHubMemoryBySource(hubClient.userId, chunk.id);
                     this.store.upsertHubMemory({
-                        id: response?.memoryId ?? existing?.id ?? node_crypto_1.default.randomUUID(),
+                        id: mid || existing?.id || node_crypto_1.default.randomUUID(),
                         sourceChunkId: chunk.id,
-                        sourceUserId: hubUserId,
+                        sourceUserId: hubClient.userId,
                         role: chunk.role,
                         content: chunk.content,
                         summary: chunk.summary ?? "",
@@ -2229,6 +2318,9 @@ class ViewerServer {
                         updatedAt: now,
                     });
                 }
+                else if (hubClient.userId) {
+                    this.store.upsertTeamSharedChunk(chunk.id, { hubMemoryId: mid, visibility, groupId });
+                }
                 this.jsonResponse(res, { ok: true, chunkId, visibility, response });
             }
             catch (err) {
@@ -2251,6 +2343,7 @@ class ViewerServer {
                 const hubUserId = hubClient.userId;
                 if (hubUserId)
                     this.store.deleteHubMemoryBySource(hubUserId, chunkId);
+                this.store.deleteTeamSharedChunk(chunkId);
                 this.jsonResponse(res, { ok: true, chunkId });
             }
             catch (err) {
@@ -2353,7 +2446,7 @@ class ViewerServer {
         // Hub 模式：连接自己，用 bootstrap admin token
         const sharing = this.ctx.config.sharing;
         if (sharing?.role === "hub") {
-            const hubPort = sharing.hub?.port ?? 18800;
+            const hubPort = this.getHubPort();
             const hubUrl = `http://127.0.0.1:${hubPort}`;
             try {
                 const authPath = node_path_1.default.join(this.dataDir, "hub-auth.json");
@@ -2595,6 +2688,32 @@ class ViewerServer {
             }
         });
     }
+    /** Badge-only: clear Client team-share UI metadata when Hub admin removes that memory. Does NOT touch chunks, embeddings, or hub_memories (recall paths). */
+    handleSyncHubRemoval(req, res) {
+        this.readBody(req, (body) => {
+            try {
+                const parsed = JSON.parse(body || "{}");
+                const sourceChunkId = String(parsed.sourceChunkId || "");
+                const memoryIdFromNotif = parsed.memoryId != null && parsed.memoryId !== "" ? String(parsed.memoryId) : "";
+                if (!sourceChunkId)
+                    return this.jsonResponse(res, { ok: false, error: "missing_source_chunk_id" }, 400);
+                // Admin removal notifications stay in the feed; if the user re-shared, team_shared_chunks has a new hub_memory_id.
+                // Only clear the badge when this notification refers to the same Hub row we still track (or no id — legacy).
+                if (memoryIdFromNotif) {
+                    const current = this.store.getTeamSharedChunk(sourceChunkId);
+                    const curId = current?.hubMemoryId ? String(current.hubMemoryId) : "";
+                    if (curId && curId !== memoryIdFromNotif) {
+                        return this.jsonResponse(res, { ok: true, sourceChunkId, skipped: true, reason: "stale_notification_re_shared" });
+                    }
+                }
+                this.store.deleteTeamSharedChunk(sourceChunkId);
+                this.jsonResponse(res, { ok: true, sourceChunkId });
+            }
+            catch (e) {
+                this.jsonResponse(res, { ok: false, error: String(e) }, 500);
+            }
+        });
+    }
     handleNotifSSE(req, res) {
         res.writeHead(200, {
             "Content-Type": "text/event-stream",
@@ -2606,6 +2725,8 @@ class ViewerServer {
         this.notifSSEClients.push(res);
         if (!this.notifPollTimer)
             this.startNotifPoll();
+        else
+            this.notifPollImmediate();
         req.on("close", () => {
             this.notifSSEClients = this.notifSSEClients.filter((c) => c !== res);
             if (this.notifSSEClients.length === 0)
@@ -2649,6 +2770,20 @@ class ViewerServer {
             this.notifPollTimer = undefined;
         }
     }
+    notifPollImmediate() {
+        const hub = this.resolveHubConnection();
+        if (!hub)
+            return;
+        (0, hub_1.hubRequestJson)(hub.hubUrl, hub.userToken, "/api/v1/hub/notifications?unread=1")
+            .then((data) => {
+            const count = data?.unreadCount ?? 0;
+            if (count !== this.lastKnownNotifCount) {
+                this.lastKnownNotifCount = count;
+                this.broadcastNotifSSE({ type: "update", unreadCount: count });
+            }
+        })
+            .catch(() => { });
+    }
     startHubHeartbeat() {
         this.stopHubHeartbeat();
         const sendHeartbeat = async () => {
@@ -2773,12 +2908,14 @@ class ViewerServer {
                     if (merged.role === "client" && merged.client) {
                         const clientCfg = merged.client;
                         const addr = String(clientCfg.hubAddress || "");
-                        if (addr) {
+                        if (addr && oldSharingRole === "hub" && oldSharingEnabled) {
+                            const selfHubPort = oldSharing?.hub?.port ?? 18800;
                             const localIPs = this.getLocalIPs();
                             localIPs.push("127.0.0.1", "localhost", "0.0.0.0");
                             try {
                                 const u = new URL(addr.startsWith("http") ? addr : `http://${addr}`);
-                                if (localIPs.includes(u.hostname)) {
+                                const targetPort = u.port || (u.protocol === "https:" ? "443" : "80");
+                                if (localIPs.includes(u.hostname) && targetPort === String(selfHubPort)) {
                                     res.writeHead(400, { "Content-Type": "application/json" });
                                     res.end(JSON.stringify({ error: "cannot_join_self" }));
                                     return;
@@ -2801,24 +2938,26 @@ class ViewerServer {
                     const wasClient = oldSharingEnabled && oldSharingRole === "client";
                     const isClient = newEnabled && newRole === "client";
                     if (wasClient && !isClient) {
-                        this.notifyHubLeave();
+                        await this.withdrawOrLeaveHub();
                         this.store.clearClientHubConnection();
-                        this.log.info("Cleared client hub connection (sharing disabled or role changed)");
+                        this.log.info("Client hub connection cleared (sharing disabled or role changed)");
                     }
-                    // Detect switching to a different Hub while still in client mode
                     if (wasClient && isClient) {
                         const newClientAddr = String(merged.client?.hubAddress || "");
                         if (newClientAddr && oldClientHubAddress && (0, hub_1.normalizeHubUrl)(newClientAddr) !== (0, hub_1.normalizeHubUrl)(oldClientHubAddress)) {
                             this.notifyHubLeave();
-                            this.store.clearClientHubConnection();
-                            this.log.info("Cleared client hub connection (switched to different Hub)");
+                            const oldConn = this.store.getClientHubConnection();
+                            if (oldConn) {
+                                this.store.setClientHubConnection({ ...oldConn, hubUrl: (0, hub_1.normalizeHubUrl)(newClientAddr), userToken: "", lastKnownStatus: "hub_changed" });
+                            }
+                            this.log.info("Client hub connection token cleared (switched to different Hub), identity preserved");
                         }
                     }
                     if (merged.role === "hub") {
                         merged.client = { hubAddress: "", userToken: "", teamToken: "" };
                     }
                     else if (merged.role === "client") {
-                        merged.hub = { port: 18800, teamName: "", teamToken: "" };
+                        merged.hub = { teamName: "", teamToken: "" };
                     }
                     config.sharing = merged;
                 }
@@ -2826,12 +2965,29 @@ class ViewerServer {
                 node_fs_1.default.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
+                // When switching to client mode or re-enabling sharing as client, send join request
                 const finalSharing = config.sharing;
-                if (finalSharing?.role === "client" && oldSharingRole !== "client") {
-                    this.autoJoinOnSave(finalSharing).catch(e => this.log.warn(`Auto-join on save failed: ${e}`));
+                const nowClient = Boolean(finalSharing?.enabled) && finalSharing?.role === "client";
+                const previouslyClient = oldSharingEnabled && oldSharingRole === "client";
+                let joinStatus;
+                if (nowClient && !previouslyClient) {
+                    try {
+                        joinStatus = await this.autoJoinOnSave(finalSharing);
+                    }
+                    catch (e) {
+                        this.log.warn(`Auto-join on save failed: ${e}`);
+                    }
                 }
-                this.jsonResponse(res, { ok: true });
+                this.jsonResponse(res, { ok: true, joinStatus, restart: true });
+                setTimeout(() => {
+                    this.log.info("config-save: triggering gateway restart via SIGUSR1...");
+                    try {
+                        process.kill(process.pid, "SIGUSR1");
+                    }
+                    catch (sig) {
+                        this.log.warn(`SIGUSR1 failed: ${sig}`);
+                    }
+                }, 500);
             }
             catch (e) {
                 this.log.warn(`handleSaveConfig error: ${e}`);
@@ -2845,16 +3001,19 @@ class ViewerServer {
         const hubAddress = String(clientCfg?.hubAddress || "");
         const teamToken = String(clientCfg?.teamToken || "");
         if (!hubAddress || !teamToken)
-            return;
+            return undefined;
         const hubUrl = (0, hub_1.normalizeHubUrl)(hubAddress);
         const os = await Promise.resolve().then(() => __importStar(require("os")));
         const nickname = String(clientCfg?.nickname || "");
         const username = nickname || os.userInfo().username || "user";
         const hostname = os.hostname() || "unknown";
+        const persisted = this.store.getClientHubConnection();
+        const existingIdentityKey = persisted?.identityKey || "";
         const result = await (0, hub_1.hubRequestJson)(hubUrl, "", "/api/v1/hub/join", {
             method: "POST",
-            body: JSON.stringify({ teamToken, username, deviceName: hostname }),
+            body: JSON.stringify({ teamToken, username, deviceName: hostname, identityKey: existingIdentityKey }),
         });
+        const returnedIdentityKey = String(result.identityKey || existingIdentityKey || "");
         this.store.setClientHubConnection({
             hubUrl,
             userId: String(result.userId || ""),
@@ -2862,11 +3021,51 @@ class ViewerServer {
             userToken: result.userToken || "",
             role: "member",
             connectedAt: Date.now(),
+            identityKey: returnedIdentityKey,
+            lastKnownStatus: result.status || "",
         });
         this.log.info(`Auto-join on save: status=${result.status}, userId=${result.userId}`);
         if (result.userToken) {
             this.startHubHeartbeat();
         }
+        return result.status;
+    }
+    handleLeaveTeam(_req, res) {
+        this.readBody(_req, async () => {
+            try {
+                await this.withdrawOrLeaveHub();
+                this.store.clearClientHubConnection();
+                const configPath = this.getOpenClawConfigPath();
+                if (configPath && node_fs_1.default.existsSync(configPath)) {
+                    const raw = JSON.parse(node_fs_1.default.readFileSync(configPath, "utf8"));
+                    const pluginKey = Object.keys(raw.plugins?.entries ?? {}).find(k => k.includes("memos-local"));
+                    if (pluginKey) {
+                        const cfg = raw.plugins.entries[pluginKey].config ?? {};
+                        if (cfg.sharing) {
+                            cfg.sharing.enabled = false;
+                            cfg.sharing.client = { hubAddress: "", userToken: "", teamToken: "" };
+                        }
+                        raw.plugins.entries[pluginKey].config = cfg;
+                        node_fs_1.default.writeFileSync(configPath, JSON.stringify(raw, null, 2) + "\n");
+                        this.log.info("handleLeaveTeam: config updated, sharing disabled");
+                    }
+                }
+                this.jsonResponse(res, { ok: true, restart: true });
+                setTimeout(() => {
+                    this.log.info("handleLeaveTeam: triggering gateway restart via SIGUSR1...");
+                    try {
+                        process.kill(process.pid, "SIGUSR1");
+                    }
+                    catch (sig) {
+                        this.log.warn(`SIGUSR1 failed: ${sig}`);
+                    }
+                }, 500);
+            }
+            catch (e) {
+                this.log.warn(`handleLeaveTeam error: ${e}`);
+                this.jsonResponse(res, { ok: false, error: String(e) });
+            }
+        });
     }
     async notifyHubLeave() {
         try {
@@ -2886,12 +3085,46 @@ class ViewerServer {
             this.log.warn(`Failed to notify Hub of leave: ${e}`);
         }
     }
+    async withdrawOrLeaveHub() {
+        try {
+            const persisted = this.store.getClientHubConnection();
+            const sharing = this.ctx?.config?.sharing;
+            if (persisted?.userToken && persisted?.hubUrl) {
+                await (0, hub_1.hubRequestJson)(persisted.hubUrl, persisted.userToken, "/api/v1/hub/leave", { method: "POST" });
+                this.log.info("Notified Hub of voluntary leave (had token)");
+                return;
+            }
+            const hub = this.resolveHubConnection();
+            if (hub?.userToken) {
+                await (0, hub_1.hubRequestJson)(hub.hubUrl, hub.userToken, "/api/v1/hub/leave", { method: "POST" });
+                this.log.info("Notified Hub of voluntary leave (resolved connection)");
+                return;
+            }
+            const hubUrl = persisted?.hubUrl || (sharing?.client?.hubAddress ? (0, hub_1.normalizeHubUrl)(sharing.client.hubAddress) : null);
+            const userId = persisted?.userId;
+            const teamToken = sharing?.client?.teamToken;
+            if (hubUrl && userId && teamToken) {
+                const withdrawUrl = `${(0, hub_1.normalizeHubUrl)(hubUrl)}/api/v1/hub/withdraw-pending`;
+                await fetch(withdrawUrl, {
+                    method: "POST",
+                    headers: { "content-type": "application/json" },
+                    body: JSON.stringify({ teamToken, userId }),
+                });
+                this.log.info("Withdrew pending application from Hub");
+                return;
+            }
+            this.log.info("No hub connection to clean up (no token, no pending)");
+        }
+        catch (e) {
+            this.log.warn(`Failed to withdraw/leave Hub: ${e}`);
+        }
+    }
     async notifyHubShutdown() {
         try {
             const sharing = this.ctx?.config.sharing;
             if (!sharing || sharing.role !== "hub")
                 return;
-            const hubPort = sharing.hub?.port ?? 18800;
+            const hubPort = this.getHubPort();
             const authPath = node_path_1.default.join(this.dataDir, "hub-auth.json");
             let adminToken;
             try {
@@ -2956,10 +3189,10 @@ class ViewerServer {
                         }
                     }
                     else {
-                        const persisted = this.store.getClientHubConnection();
-                        if (persisted) {
+                        const persistedConn = this.store.getClientHubConnection();
+                        if (persistedConn) {
                             this.store.setClientHubConnection({
-                                ...persisted,
+                                ...persistedConn,
                                 username: result.username,
                                 userToken: result.userToken,
                             });
@@ -2986,12 +3219,17 @@ class ViewerServer {
                     return;
                 }
                 try {
-                    const localIPs = this.getLocalIPs();
-                    localIPs.push("127.0.0.1", "localhost", "0.0.0.0");
-                    const parsed = new URL(hubUrl.startsWith("http") ? hubUrl : `http://${hubUrl}`);
-                    if (localIPs.includes(parsed.hostname)) {
-                        this.jsonResponse(res, { ok: false, error: "cannot_join_self" });
-                        return;
+                    const sharing = this.ctx?.config?.sharing;
+                    if (sharing?.enabled && sharing.role === "hub") {
+                        const selfHubPort = this.getHubPort();
+                        const localIPs = this.getLocalIPs();
+                        localIPs.push("127.0.0.1", "localhost", "0.0.0.0");
+                        const parsed = new URL(hubUrl.startsWith("http") ? hubUrl : `http://${hubUrl}`);
+                        const targetPort = parsed.port || (parsed.protocol === "https:" ? "443" : "80");
+                        if (localIPs.includes(parsed.hostname) && targetPort === String(selfHubPort)) {
+                            this.jsonResponse(res, { ok: false, error: "cannot_join_self" });
+                            return;
+                        }
                     }
                 }
                 catch { }
@@ -3249,10 +3487,14 @@ class ViewerServer {
                                     catch { }
                                     this.log.info(`update-install: success! Updated to ${newVersion}`);
                                     this.jsonResponse(res, { ok: true, version: newVersion });
-                                    // Trigger Gateway restart after response is sent
                                     setTimeout(() => {
-                                        this.log.info(`update-install: triggering gateway restart...`);
-                                        process.kill(process.pid, "SIGUSR1");
+                                        this.log.info(`update-install: triggering gateway restart via SIGUSR1...`);
+                                        try {
+                                            process.kill(process.pid, "SIGUSR1");
+                                        }
+                                        catch (sig) {
+                                            this.log.warn(`SIGUSR1 failed: ${sig}`);
+                                        }
                                     }, 500);
                                 });
                             });
@@ -3428,7 +3670,7 @@ class ViewerServer {
         try {
             const ocHome = this.getOpenClawHome();
             const memoryDir = node_path_1.default.join(ocHome, "memory");
-            const sessionsDir = node_path_1.default.join(ocHome, "agents", "main", "sessions");
+            const agentsDir = node_path_1.default.join(ocHome, "agents");
             const sqliteFiles = [];
             if (node_fs_1.default.existsSync(memoryDir)) {
                 for (const f of node_fs_1.default.readdirSync(memoryDir)) {
@@ -3446,38 +3688,45 @@ class ViewerServer {
             }
             let sessionCount = 0;
             let messageCount = 0;
-            if (node_fs_1.default.existsSync(sessionsDir)) {
-                const jsonlFiles = node_fs_1.default.readdirSync(sessionsDir).filter(f => f.includes(".jsonl"));
-                sessionCount = jsonlFiles.length;
-                for (const f of jsonlFiles) {
-                    try {
-                        const content = node_fs_1.default.readFileSync(node_path_1.default.join(sessionsDir, f), "utf-8");
-                        const lines = content.split("\n").filter(l => l.trim());
-                        for (const line of lines) {
-                            try {
-                                const obj = JSON.parse(line);
-                                if (obj.type === "message") {
-                                    const role = obj.message?.role ?? obj.role;
-                                    if (role === "user" || role === "assistant") {
-                                        const mc = obj.message?.content ?? obj.content;
-                                        let txt = "";
-                                        if (typeof mc === "string")
-                                            txt = mc;
-                                        else if (Array.isArray(mc))
-                                            txt = mc.filter((p) => p.type === "text" && p.text).map((p) => p.text).join("\n");
-                                        else
-                                            txt = JSON.stringify(mc);
-                                        if (role === "user")
-                                            txt = (0, capture_1.stripInboundMetadata)(txt);
-                                        if (txt && txt.length >= 10)
-                                            messageCount++;
+            if (node_fs_1.default.existsSync(agentsDir)) {
+                for (const entry of node_fs_1.default.readdirSync(agentsDir, { withFileTypes: true })) {
+                    if (!entry.isDirectory())
+                        continue;
+                    const sessDir = node_path_1.default.join(agentsDir, entry.name, "sessions");
+                    if (!node_fs_1.default.existsSync(sessDir))
+                        continue;
+                    const jsonlFiles = node_fs_1.default.readdirSync(sessDir).filter(f => f.includes(".jsonl"));
+                    sessionCount += jsonlFiles.length;
+                    for (const f of jsonlFiles) {
+                        try {
+                            const content = node_fs_1.default.readFileSync(node_path_1.default.join(sessDir, f), "utf-8");
+                            const lines = content.split("\n").filter(l => l.trim());
+                            for (const line of lines) {
+                                try {
+                                    const obj = JSON.parse(line);
+                                    if (obj.type === "message") {
+                                        const role = obj.message?.role ?? obj.role;
+                                        if (role === "user" || role === "assistant") {
+                                            const mc = obj.message?.content ?? obj.content;
+                                            let txt = "";
+                                            if (typeof mc === "string")
+                                                txt = mc;
+                                            else if (Array.isArray(mc))
+                                                txt = mc.filter((p) => p.type === "text" && p.text).map((p) => p.text).join("\n");
+                                            else
+                                                txt = JSON.stringify(mc);
+                                            if (role === "user")
+                                                txt = (0, capture_1.stripInboundMetadata)(txt);
+                                            if (txt && txt.length >= 10)
+                                                messageCount++;
+                                        }
                                     }
                                 }
+                                catch { /* skip bad lines */ }
                             }
-                            catch { /* skip bad lines */ }
                         }
+                        catch { /* skip unreadable */ }
                     }
-                    catch { /* skip unreadable */ }
                 }
             }
             const cfgPath = this.getOpenClawConfigPath();