@memtensor/memos-local-openclaw-plugin 1.0.5 → 1.0.6-beta.10

package/dist/viewer/server.js

@@ -37,6 +37,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ViewerServer = void 0;
+exports.computeMigrationSuccess = computeMigrationSuccess;
+exports.createInitialMigrationState = createInitialMigrationState;
+exports.applyMigrationItemToState = applyMigrationItemToState;
 const node_http_1 = __importDefault(require("node:http"));
 const node_os_1 = __importDefault(require("node:os"));
 const node_crypto_1 = __importDefault(require("node:crypto"));
@@ -57,10 +60,53 @@ const hub_1 = require("../client/hub");
 const skill_sync_1 = require("../client/skill-sync");
 const html_1 = require("./html");
 const uuid_1 = require("uuid");
-function normalizeTimestamp(ts) {
-    if (ts < 1e12)
-        return ts * 1000;
-    return ts;
+function createInitialStepFailures() {
+    return { summarization: 0, dedup: 0, embedding: 0 };
+}
+function computeMigrationSuccess(state) {
+    const sf = state.stepFailures;
+    return state.errors === 0 && sf.summarization === 0 && sf.dedup === 0 && sf.embedding === 0;
+}
+function createInitialMigrationState() {
+    const stepFailures = createInitialStepFailures();
+    return {
+        phase: "",
+        stored: 0,
+        skipped: 0,
+        merged: 0,
+        errors: 0,
+        processed: 0,
+        total: 0,
+        lastItem: null,
+        done: false,
+        stopped: false,
+        stepFailures,
+        success: computeMigrationSuccess({ errors: 0, stepFailures }),
+    };
+}
+function applyMigrationItemToState(state, d) {
+    if (d.status === "stored")
+        state.stored++;
+    else if (d.status === "skipped" || d.status === "duplicate")
+        state.skipped++;
+    else if (d.status === "merged")
+        state.merged++;
+    else if (d.status === "error")
+        state.errors++;
+    if (Array.isArray(d.stepFailures)) {
+        for (const step of d.stepFailures) {
+            if (step === "summarization")
+                state.stepFailures.summarization++;
+            else if (step === "dedup")
+                state.stepFailures.dedup++;
+            else if (step === "embedding")
+                state.stepFailures.embedding++;
+        }
+    }
+    state.processed = d.index ?? state.processed + 1;
+    state.total = d.total ?? state.total;
+    state.lastItem = d;
+    state.success = computeMigrationSuccess(state);
 }
 class ViewerServer {
     server = null;
@@ -87,7 +133,7 @@ class ViewerServer {
     resetToken;
     migrationRunning = false;
     migrationAbort = false;
-    migrationState = { phase: "", stored: 0, skipped: 0, merged: 0, errors: 0, processed: 0, total: 0, lastItem: null, done: false, stopped: false };
+    migrationState = createInitialMigrationState();
     migrationSSEClients = [];
     ppRunning = false;
     ppAbort = false;
@@ -591,14 +637,15 @@ class ViewerServer {
         if (chunkIds.length > 0) {
             try {
                 const placeholders = chunkIds.map(() => "?").join(",");
-                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)) {
+                if (this.sharingRole === "hub") {
+                    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);
+                }
+                else {
+                    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)
                         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)
@@ -662,7 +709,7 @@ class ViewerServer {
         const db = this.store.db;
         const items = tasks.map((t) => {
             const meta = db.prepare("SELECT skill_status, owner FROM tasks WHERE id = ?").get(t.id);
-            const sharedTask = db.prepare("SELECT visibility FROM hub_tasks WHERE source_task_id = ? ORDER BY updated_at DESC LIMIT 1").get(t.id);
+            const hubTask = this.getHubTaskForLocal(t.id);
             return {
                 id: t.id,
                 sessionKey: t.sessionKey,
@@ -674,7 +721,7 @@ class ViewerServer {
                 chunkCount: this.store.countChunksByTask(t.id),
                 skillStatus: meta?.skill_status ?? null,
                 owner: meta?.owner ?? "agent:main",
-                sharingVisibility: sharedTask?.visibility ?? null,
+                sharingVisibility: hubTask?.visibility ?? null,
             };
         });
         this.jsonResponse(res, { tasks: items, total, limit, offset });
@@ -703,7 +750,7 @@ class ViewerServer {
         }));
         const db = this.store.db;
         const meta = db.prepare("SELECT skill_status, skill_reason FROM tasks WHERE id = ?").get(taskId);
-        const sharedTask = db.prepare("SELECT visibility, group_id FROM hub_tasks WHERE source_task_id = ? ORDER BY updated_at DESC LIMIT 1").get(taskId);
+        const hubTask = this.getHubTaskForLocal(taskId);
         this.jsonResponse(res, {
             id: task.id,
             sessionKey: task.sessionKey,
@@ -717,9 +764,9 @@ class ViewerServer {
             skillStatus: meta?.skill_status ?? null,
             skillReason: meta?.skill_reason ?? null,
             skillLinks,
-            sharingVisibility: sharedTask?.visibility ?? null,
-            sharingGroupId: sharedTask?.group_id ?? null,
-            hubTaskId: sharedTask ? true : false,
+            sharingVisibility: hubTask?.visibility ?? null,
+            sharingGroupId: hubTask?.group_id ?? null,
+            hubTaskId: hubTask ? true : false,
         });
     }
     serveStats(res, url) {
@@ -924,10 +971,9 @@ class ViewerServer {
         if (visibility) {
             skills = skills.filter(s => s.visibility === visibility);
         }
-        const db = this.store.db;
         const enriched = skills.map(s => {
-            const hub = db.prepare("SELECT visibility FROM hub_skills WHERE source_skill_id = ? ORDER BY updated_at DESC LIMIT 1").get(s.id);
-            return { ...s, sharingVisibility: hub?.visibility ?? null };
+            const hubSkill = this.getHubSkillForLocal(s.id);
+            return { ...s, sharingVisibility: hubSkill?.visibility ?? null };
         });
         this.jsonResponse(res, { skills: enriched });
     }
@@ -942,10 +988,9 @@ class ViewerServer {
         const versions = this.store.getSkillVersions(skillId);
         const relatedTasks = this.store.getTasksBySkill(skillId);
         const files = node_fs_1.default.existsSync(skill.dirPath) ? this.walkDir(skill.dirPath, skill.dirPath) : [];
-        const db = this.store.db;
-        const sharedSkill = db.prepare("SELECT visibility, group_id FROM hub_skills WHERE source_skill_id = ? ORDER BY updated_at DESC LIMIT 1").get(skillId);
+        const hubSkill = this.getHubSkillForLocal(skillId);
         this.jsonResponse(res, {
-            skill: { ...skill, sharingVisibility: sharedSkill?.visibility ?? null, sharingGroupId: sharedSkill?.group_id ?? null },
+            skill: { ...skill, sharingVisibility: hubSkill?.visibility ?? null, sharingGroupId: hubSkill?.group_id ?? null },
             versions: versions.map(v => ({
                 id: v.id,
                 version: v.version,
@@ -1081,7 +1126,7 @@ class ViewerServer {
                                 method: "POST",
                                 body: JSON.stringify({ visibility: "public", groupId: null, metadata: bundle.metadata, bundle: bundle.bundle }),
                             });
-                            if (hubClient.userId) {
+                            if (this.sharingRole === "hub" && hubClient.userId) {
                                 const existing = this.store.getHubSkillBySource(hubClient.userId, skillId);
                                 this.store.upsertHubSkill({
                                     id: response?.skillId ?? existing?.id ?? node_crypto_1.default.randomUUID(),
@@ -1092,6 +1137,15 @@ class ViewerServer {
                                     createdAt: existing?.createdAt ?? Date.now(), updatedAt: Date.now(),
                                 });
                             }
+                            else {
+                                const conn = this.store.getClientHubConnection();
+                                this.store.upsertTeamSharedSkill(skillId, {
+                                    hubSkillId: String(response?.skillId ?? ""),
+                                    visibility: "public",
+                                    groupId: null,
+                                    hubInstanceId: conn?.hubInstanceId ?? "",
+                                });
+                            }
                             hubSynced = true;
                             this.log.info(`Skill "${skill.name}" published to Hub`);
                         }
@@ -1100,8 +1154,10 @@ class ViewerServer {
                                 method: "POST",
                                 body: JSON.stringify({ sourceSkillId: skillId }),
                             });
-                            if (hubClient.userId)
+                            if (this.sharingRole === "hub" && hubClient.userId)
                                 this.store.deleteHubSkillBySource(hubClient.userId, skillId);
+                            else
+                                this.store.deleteTeamSharedSkill(skillId);
                             hubSynced = true;
                             this.log.info(`Skill "${skill.name}" unpublished from Hub`);
                         }
@@ -1399,7 +1455,8 @@ class ViewerServer {
                             });
                         }
                         else if (hubClient.userId) {
-                            this.store.upsertTeamSharedChunk(chunkId, { hubMemoryId: memoryId, visibility: "public", groupId: null });
+                            const conn = this.store.getClientHubConnection();
+                            this.store.upsertTeamSharedChunk(chunkId, { hubMemoryId: memoryId, visibility: "public", groupId: null, hubInstanceId: conn?.hubInstanceId ?? "" });
                         }
                         hubSynced = true;
                     }
@@ -1415,7 +1472,7 @@ class ViewerServer {
                             await (0, hub_1.hubRequestJson)(hubClient.hubUrl, hubClient.userToken, "/api/v1/hub/memories/unshare", {
                                 method: "POST", body: JSON.stringify({ sourceChunkId: chunkId }),
                             });
-                            if (hubClient.userId)
+                            if (this.sharingRole === "hub" && hubClient.userId)
                                 this.store.deleteHubMemoryBySource(hubClient.userId, chunkId);
                             this.store.deleteTeamSharedChunk(chunkId);
                             hubSynced = true;
@@ -1434,7 +1491,7 @@ class ViewerServer {
                             await (0, hub_1.hubRequestJson)(hubClient.hubUrl, hubClient.userToken, "/api/v1/hub/memories/unshare", {
                                 method: "POST", body: JSON.stringify({ sourceChunkId: chunkId }),
                             });
-                            if (hubClient.userId)
+                            if (this.sharingRole === "hub" && hubClient.userId)
                                 this.store.deleteHubMemoryBySource(hubClient.userId, chunkId);
                             this.store.deleteTeamSharedChunk(chunkId);
                             hubSynced = true;
@@ -1488,21 +1545,24 @@ class ViewerServer {
                                 chunks: chunks.map((c) => ({ id: c.id, hubTaskId: refreshedTask.id, sourceTaskId: refreshedTask.id, sourceChunkId: c.id, role: c.role, content: c.content, summary: c.summary, kind: c.kind, groupId: null, visibility: "public", createdAt: c.createdAt ?? Date.now() })),
                             }),
                         });
-                        if (hubClient.userId) {
+                        const hubTaskId = String(response?.taskId ?? "");
+                        if (this.sharingRole === "hub" && hubClient.userId) {
                             const existing = this.store.getHubTaskBySource(hubClient.userId, taskId);
                             this.store.upsertHubTask({
-                                id: response?.taskId ?? existing?.id ?? node_crypto_1.default.randomUUID(),
+                                id: hubTaskId || existing?.id || node_crypto_1.default.randomUUID(),
                                 sourceTaskId: taskId, sourceUserId: hubClient.userId, title: refreshedTask.title ?? "",
                                 summary: refreshedTask.summary ?? "", groupId: null, visibility: "public",
                                 createdAt: existing?.createdAt ?? Date.now(), updatedAt: Date.now(),
                             });
                         }
+                        const conn = this.store.getClientHubConnection();
+                        this.store.markTaskShared(taskId, hubTaskId, chunks.length, "public", null, conn?.hubInstanceId ?? "");
                         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("INSERT INTO local_shared_tasks (task_id, hub_task_id, original_owner, hub_instance_id, shared_at) VALUES (?, ?, ?, ?, ?) ON CONFLICT(task_id) DO UPDATE SET original_owner = excluded.original_owner, hub_instance_id = excluded.hub_instance_id, shared_at = excluded.shared_at").run(taskId, "", originalOwner, "", Date.now());
                         db.prepare("UPDATE tasks SET owner = 'public' WHERE id = ?").run(taskId);
                     }
                 }
@@ -1520,8 +1580,10 @@ class ViewerServer {
                         await (0, hub_1.hubRequestJson)(hubClient.hubUrl, hubClient.userToken, "/api/v1/hub/tasks/unshare", {
                             method: "POST", body: JSON.stringify({ sourceTaskId: taskId }),
                         });
-                        if (hubClient.userId)
+                        if (this.sharingRole === "hub" && hubClient.userId)
                             this.store.deleteHubTaskBySource(hubClient.userId, taskId);
+                        else
+                            this.store.downgradeTeamSharedTaskToLocal(taskId);
                         hubSynced = true;
                     }
                     catch (err) {
@@ -1535,8 +1597,10 @@ class ViewerServer {
                             await (0, hub_1.hubRequestJson)(hubClient.hubUrl, hubClient.userToken, "/api/v1/hub/tasks/unshare", {
                                 method: "POST", body: JSON.stringify({ sourceTaskId: taskId }),
                             });
-                            if (hubClient.userId)
+                            if (this.sharingRole === "hub" && hubClient.userId)
                                 this.store.deleteHubTaskBySource(hubClient.userId, taskId);
+                            else if (!isLocalShared)
+                                this.store.unmarkTaskShared(taskId);
                             hubSynced = true;
                         }
                         catch (err) {
@@ -1591,10 +1655,11 @@ class ViewerServer {
                             method: "POST",
                             body: JSON.stringify({ visibility: "public", groupId: null, metadata: bundle.metadata, bundle: bundle.bundle }),
                         });
-                        if (hubClient.userId) {
+                        const hubSkillId = String(response?.skillId ?? "");
+                        if (this.sharingRole === "hub" && hubClient.userId) {
                             const existing = this.store.getHubSkillBySource(hubClient.userId, skillId);
                             this.store.upsertHubSkill({
-                                id: response?.skillId ?? existing?.id ?? node_crypto_1.default.randomUUID(),
+                                id: hubSkillId || existing?.id || node_crypto_1.default.randomUUID(),
                                 sourceSkillId: skillId, sourceUserId: hubClient.userId,
                                 name: skill.name, description: skill.description, version: skill.version,
                                 groupId: null, visibility: "public",
@@ -1602,6 +1667,10 @@ class ViewerServer {
                                 createdAt: existing?.createdAt ?? Date.now(), updatedAt: Date.now(),
                             });
                         }
+                        else {
+                            const conn = this.store.getClientHubConnection();
+                            this.store.upsertTeamSharedSkill(skillId, { hubSkillId, visibility: "public", groupId: null, hubInstanceId: conn?.hubInstanceId ?? "" });
+                        }
                         hubSynced = true;
                     }
                     if (!isLocalShared)
@@ -1617,8 +1686,10 @@ class ViewerServer {
                         await (0, hub_1.hubRequestJson)(hubClient.hubUrl, hubClient.userToken, "/api/v1/hub/skills/unpublish", {
                             method: "POST", body: JSON.stringify({ sourceSkillId: skillId }),
                         });
-                        if (hubClient.userId)
+                        if (this.sharingRole === "hub" && hubClient.userId)
                             this.store.deleteHubSkillBySource(hubClient.userId, skillId);
+                        else
+                            this.store.deleteTeamSharedSkill(skillId);
                         hubSynced = true;
                     }
                     catch (err) {
@@ -1632,8 +1703,10 @@ class ViewerServer {
                             await (0, hub_1.hubRequestJson)(hubClient.hubUrl, hubClient.userToken, "/api/v1/hub/skills/unpublish", {
                                 method: "POST", body: JSON.stringify({ sourceSkillId: skillId }),
                             });
-                            if (hubClient.userId)
+                            if (this.sharingRole === "hub" && hubClient.userId)
                                 this.store.deleteHubSkillBySource(hubClient.userId, skillId);
+                            else
+                                this.store.deleteTeamSharedSkill(skillId);
                             hubSynced = true;
                         }
                         catch (err) {
@@ -1650,28 +1723,52 @@ class ViewerServer {
             }
         });
     }
+    get sharingRole() {
+        return this.ctx?.config?.sharing?.role;
+    }
+    isCurrentClientHubInstance(hubInstanceId) {
+        if (this.sharingRole !== "client")
+            return true;
+        const scopedHubInstanceId = String(hubInstanceId ?? "");
+        if (!scopedHubInstanceId)
+            return true;
+        const currentHubInstanceId = this.store.getClientHubConnection()?.hubInstanceId ?? "";
+        if (!currentHubInstanceId)
+            return true;
+        return scopedHubInstanceId === currentHubInstanceId;
+    }
     getHubMemoryForChunk(chunkId) {
-        const db = this.store.db;
-        const hub = db.prepare("SELECT * FROM hub_memories WHERE source_chunk_id = ? LIMIT 1").get(chunkId);
-        if (hub)
-            return hub;
+        if (this.sharingRole === "hub") {
+            const db = this.store.db;
+            return db.prepare("SELECT * FROM hub_memories WHERE source_chunk_id = ? LIMIT 1").get(chunkId);
+        }
         const ts = this.store.getTeamSharedChunk(chunkId);
-        if (ts) {
-            return {
-                source_chunk_id: chunkId,
-                visibility: ts.visibility,
-                group_id: ts.groupId,
-            };
+        if (ts && this.isCurrentClientHubInstance(ts.hubInstanceId)) {
+            return { source_chunk_id: chunkId, visibility: ts.visibility, group_id: ts.groupId };
         }
         return undefined;
     }
     getHubTaskForLocal(taskId) {
-        const db = this.store.db;
-        return db.prepare("SELECT * FROM hub_tasks WHERE source_task_id = ? LIMIT 1").get(taskId);
+        if (this.sharingRole === "hub") {
+            const db = this.store.db;
+            return db.prepare("SELECT * FROM hub_tasks WHERE source_task_id = ? LIMIT 1").get(taskId);
+        }
+        const shared = this.store.getLocalSharedTask(taskId);
+        if (shared && shared.hubTaskId && this.isCurrentClientHubInstance(shared.hubInstanceId)) {
+            return { source_task_id: taskId, visibility: shared.visibility, group_id: shared.groupId };
+        }
+        return undefined;
     }
     getHubSkillForLocal(skillId) {
-        const db = this.store.db;
-        return db.prepare("SELECT * FROM hub_skills WHERE source_skill_id = ? LIMIT 1").get(skillId);
+        if (this.sharingRole === "hub") {
+            const db = this.store.db;
+            return db.prepare("SELECT * FROM hub_skills WHERE source_skill_id = ? LIMIT 1").get(skillId);
+        }
+        const ts = this.store.getTeamSharedSkill(skillId);
+        if (ts && this.isCurrentClientHubInstance(ts.hubInstanceId)) {
+            return { source_skill_id: skillId, visibility: ts.visibility, group_id: ts.groupId };
+        }
+        return undefined;
     }
     handleDeleteSession(res, url) {
         const key = url.searchParams.get("key");
@@ -1973,18 +2070,24 @@ class ViewerServer {
     handleRetryJoin(req, res) {
         this.readBody(req, async (_body) => {
             if (!this.ctx)
-                return this.jsonResponse(res, { ok: false, error: "sharing_unavailable" });
+                return this.jsonResponse(res, { ok: false, error: "sharing_unavailable", errorCode: "sharing_unavailable" });
             const sharing = this.ctx.config.sharing;
             if (!sharing?.enabled || sharing.role !== "client") {
-                return this.jsonResponse(res, { ok: false, error: "not_in_client_mode" });
+                return this.jsonResponse(res, { ok: false, error: "not_in_client_mode", errorCode: "not_in_client_mode" });
             }
             const hubAddress = sharing.client?.hubAddress ?? "";
             const teamToken = sharing.client?.teamToken ?? "";
             if (!hubAddress || !teamToken) {
-                return this.jsonResponse(res, { ok: false, error: "missing_hub_address_or_team_token" });
+                return this.jsonResponse(res, { ok: false, error: "missing_hub_address_or_team_token", errorCode: "missing_config" });
+            }
+            const hubUrl = (0, hub_1.normalizeHubUrl)(hubAddress);
+            try {
+                await (0, hub_1.hubRequestJson)(hubUrl, "", "/api/v1/hub/info", { method: "GET" });
+            }
+            catch {
+                return this.jsonResponse(res, { ok: false, error: "hub_unreachable", errorCode: "hub_unreachable" });
             }
             try {
-                const hubUrl = (0, hub_1.normalizeHubUrl)(hubAddress);
                 const os = await Promise.resolve().then(() => __importStar(require("os")));
                 const nickname = sharing.client?.nickname;
                 const username = nickname || os.userInfo().username || "user";
@@ -1996,6 +2099,12 @@ class ViewerServer {
                     body: JSON.stringify({ teamToken, username, deviceName: hostname, reapply: true, identityKey: existingIdentityKey }),
                 });
                 const returnedIdentityKey = String(result.identityKey || existingIdentityKey || "");
+                let hubInstanceId = persisted?.hubInstanceId || "";
+                try {
+                    const info = await (0, hub_1.hubRequestJson)(hubUrl, "", "/api/v1/hub/info", { method: "GET" });
+                    hubInstanceId = String(info?.hubInstanceId ?? hubInstanceId);
+                }
+                catch { /* best-effort */ }
                 this.store.setClientHubConnection({
                     hubUrl,
                     userId: String(result.userId || ""),
@@ -2005,11 +2114,22 @@ class ViewerServer {
                     connectedAt: Date.now(),
                     identityKey: returnedIdentityKey,
                     lastKnownStatus: result.status || "",
+                    hubInstanceId,
                 });
+                if (result.status === "blocked") {
+                    return this.jsonResponse(res, { ok: false, error: "blocked", errorCode: "blocked" });
+                }
                 this.jsonResponse(res, { ok: true, status: result.status || "pending" });
             }
             catch (err) {
-                this.jsonResponse(res, { ok: false, error: String(err) });
+                const errStr = String(err);
+                if (errStr.includes("(409)") || errStr.includes("username_taken")) {
+                    return this.jsonResponse(res, { ok: false, error: "username_taken", errorCode: "username_taken" });
+                }
+                if (errStr.includes("(403)") || errStr.includes("invalid_team_token")) {
+                    return this.jsonResponse(res, { ok: false, error: "invalid_team_token", errorCode: "invalid_team_token" });
+                }
+                this.jsonResponse(res, { ok: false, error: errStr, errorCode: "unknown" });
             }
         });
     }
@@ -2227,9 +2347,10 @@ class ViewerServer {
                     }),
                 });
                 const hubUserId = hubClient.userId;
-                if (hubUserId) {
+                const hubTaskId = String(response?.taskId ?? task.id);
+                if (this.sharingRole === "hub" && hubUserId) {
                     this.store.upsertHubTask({
-                        id: task.id,
+                        id: hubTaskId,
                         sourceTaskId: task.id,
                         sourceUserId: hubUserId,
                         title: task.title,
@@ -2240,6 +2361,10 @@ class ViewerServer {
                         updatedAt: task.updatedAt ?? Date.now(),
                     });
                 }
+                else {
+                    const conn = this.store.getClientHubConnection();
+                    this.store.markTaskShared(task.id, hubTaskId, chunks.length, visibility, groupId, conn?.hubInstanceId ?? "");
+                }
                 this.jsonResponse(res, { ok: true, taskId, visibility, response });
             }
             catch (err) {
@@ -2263,8 +2388,12 @@ class ViewerServer {
                     body: JSON.stringify({ sourceTaskId: task.id }),
                 });
                 const hubUserId = hubClient.userId;
-                if (hubUserId)
+                if (this.sharingRole === "hub" && hubUserId)
                     this.store.deleteHubTaskBySource(hubUserId, task.id);
+                else if (task.owner === "public")
+                    this.store.downgradeTeamSharedTaskToLocal(task.id);
+                else
+                    this.store.unmarkTaskShared(task.id);
                 this.jsonResponse(res, { ok: true, taskId });
             }
             catch (err) {
@@ -2319,7 +2448,8 @@ class ViewerServer {
                     });
                 }
                 else if (hubClient.userId) {
-                    this.store.upsertTeamSharedChunk(chunk.id, { hubMemoryId: mid, visibility, groupId });
+                    const conn = this.store.getClientHubConnection();
+                    this.store.upsertTeamSharedChunk(chunk.id, { hubMemoryId: mid, visibility, groupId, hubInstanceId: conn?.hubInstanceId ?? "" });
                 }
                 this.jsonResponse(res, { ok: true, chunkId, visibility, response });
             }
@@ -2341,9 +2471,10 @@ class ViewerServer {
                     body: JSON.stringify({ sourceChunkId: chunkId }),
                 });
                 const hubUserId = hubClient.userId;
-                if (hubUserId)
+                if (this.sharingRole === "hub" && hubUserId)
                     this.store.deleteHubMemoryBySource(hubUserId, chunkId);
-                this.store.deleteTeamSharedChunk(chunkId);
+                else
+                    this.store.deleteTeamSharedChunk(chunkId);
                 this.jsonResponse(res, { ok: true, chunkId });
             }
             catch (err) {
@@ -2391,7 +2522,7 @@ class ViewerServer {
                     }),
                 });
                 const hubUserId = hubClient.userId;
-                if (hubUserId) {
+                if (this.sharingRole === "hub" && hubUserId) {
                     const existing = this.store.getHubSkillBySource(hubUserId, skillId);
                     this.store.upsertHubSkill({
                         id: response?.skillId ?? existing?.id ?? node_crypto_1.default.randomUUID(),
@@ -2408,6 +2539,15 @@ class ViewerServer {
                         updatedAt: Date.now(),
                     });
                 }
+                else {
+                    const conn = this.store.getClientHubConnection();
+                    this.store.upsertTeamSharedSkill(skillId, {
+                        hubSkillId: String(response?.skillId ?? ""),
+                        visibility,
+                        groupId,
+                        hubInstanceId: conn?.hubInstanceId ?? "",
+                    });
+                }
                 this.jsonResponse(res, { ok: true, skillId, visibility, response });
             }
             catch (err) {
@@ -2431,8 +2571,10 @@ class ViewerServer {
                     body: JSON.stringify({ sourceSkillId: skill.id }),
                 });
                 const hubUserId = hubClient.userId;
-                if (hubUserId)
+                if (this.sharingRole === "hub" && hubUserId)
                     this.store.deleteHubSkillBySource(hubUserId, skill.id);
+                else
+                    this.store.deleteTeamSharedSkill(skill.id);
                 this.jsonResponse(res, { ok: true, skillId });
             }
             catch (err) {
@@ -2939,18 +3081,20 @@ class ViewerServer {
                     const isClient = newEnabled && newRole === "client";
                     if (wasClient && !isClient) {
                         await this.withdrawOrLeaveHub();
+                        this.store.clearAllTeamSharingState();
                         this.store.clearClientHubConnection();
-                        this.log.info("Client hub connection cleared (sharing disabled or role changed)");
+                        this.log.info("Client hub connection and team sharing state cleared (sharing disabled or role changed)");
                     }
                     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.clearAllTeamSharingState();
                             const oldConn = this.store.getClientHubConnection();
                             if (oldConn) {
-                                this.store.setClientHubConnection({ ...oldConn, hubUrl: (0, hub_1.normalizeHubUrl)(newClientAddr), userToken: "", lastKnownStatus: "hub_changed" });
+                                this.store.setClientHubConnection({ ...oldConn, hubUrl: (0, hub_1.normalizeHubUrl)(newClientAddr), userToken: "", hubInstanceId: "", lastKnownStatus: "hub_changed" });
                             }
-                            this.log.info("Client hub connection token cleared (switched to different Hub), identity preserved");
+                            this.log.info("Client hub connection and team sharing state cleared (switched to different Hub)");
                         }
                     }
                     if (merged.role === "hub") {
@@ -2970,24 +3114,24 @@ class ViewerServer {
                 const nowClient = Boolean(finalSharing?.enabled) && finalSharing?.role === "client";
                 const previouslyClient = oldSharingEnabled && oldSharingRole === "client";
                 let joinStatus;
+                let joinError;
                 if (nowClient && !previouslyClient) {
                     try {
                         joinStatus = await this.autoJoinOnSave(finalSharing);
                     }
                     catch (e) {
-                        this.log.warn(`Auto-join on save failed: ${e}`);
+                        const msg = String(e instanceof Error ? e.message : e);
+                        this.log.warn(`Auto-join on save failed: ${msg}`);
+                        if (msg === "hub_unreachable" || msg === "username_taken" || msg === "invalid_team_token") {
+                            joinError = msg;
+                        }
                     }
                 }
-                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);
+                if (joinError) {
+                    this.jsonResponse(res, { ok: true, joinError, restart: false });
+                    return;
+                }
+                this.jsonResponseAndRestart(res, { ok: true, joinStatus, restart: true }, "config-save");
             }
             catch (e) {
                 this.log.warn(`handleSaveConfig error: ${e}`);
@@ -3003,17 +3147,42 @@ class ViewerServer {
         if (!hubAddress || !teamToken)
             return undefined;
         const hubUrl = (0, hub_1.normalizeHubUrl)(hubAddress);
+        try {
+            await (0, hub_1.hubRequestJson)(hubUrl, "", "/api/v1/hub/info", { method: "GET" });
+        }
+        catch {
+            throw new Error("hub_unreachable");
+        }
         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, identityKey: existingIdentityKey }),
-        });
+        let result;
+        try {
+            result = await (0, hub_1.hubRequestJson)(hubUrl, "", "/api/v1/hub/join", {
+                method: "POST",
+                body: JSON.stringify({ teamToken, username, deviceName: hostname, identityKey: existingIdentityKey }),
+            });
+        }
+        catch (err) {
+            const errStr = String(err);
+            if (errStr.includes("(409)") || errStr.includes("username_taken")) {
+                throw new Error("username_taken");
+            }
+            if (errStr.includes("(403)") || errStr.includes("invalid_team_token")) {
+                throw new Error("invalid_team_token");
+            }
+            throw err;
+        }
         const returnedIdentityKey = String(result.identityKey || existingIdentityKey || "");
+        let hubInstanceId = persisted?.hubInstanceId || "";
+        try {
+            const info = await (0, hub_1.hubRequestJson)(hubUrl, "", "/api/v1/hub/info", { method: "GET" });
+            hubInstanceId = String(info?.hubInstanceId ?? hubInstanceId);
+        }
+        catch { /* best-effort */ }
         this.store.setClientHubConnection({
             hubUrl,
             userId: String(result.userId || ""),
@@ -3023,6 +3192,7 @@ class ViewerServer {
             connectedAt: Date.now(),
             identityKey: returnedIdentityKey,
             lastKnownStatus: result.status || "",
+            hubInstanceId,
         });
         this.log.info(`Auto-join on save: status=${result.status}, userId=${result.userId}`);
         if (result.userToken) {
@@ -3034,6 +3204,7 @@ class ViewerServer {
         this.readBody(_req, async () => {
             try {
                 await this.withdrawOrLeaveHub();
+                this.store.clearAllTeamSharingState();
                 this.store.clearClientHubConnection();
                 const configPath = this.getOpenClawConfigPath();
                 if (configPath && node_fs_1.default.existsSync(configPath)) {
@@ -3050,16 +3221,7 @@ class ViewerServer {
                         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);
+                this.jsonResponseAndRestart(res, { ok: true, restart: true }, "handleLeaveTeam");
             }
             catch (e) {
                 this.log.warn(`handleLeaveTeam error: ${e}`);
@@ -3233,17 +3395,45 @@ class ViewerServer {
                     }
                 }
                 catch { }
-                const url = hubUrl.replace(/\/+$/, "") + "/api/v1/hub/info";
+                const baseUrl = hubUrl.replace(/\/+$/, "");
+                const infoUrl = baseUrl + "/api/v1/hub/info";
                 const ctrl = new AbortController();
                 const timeout = setTimeout(() => ctrl.abort(), 8000);
                 try {
-                    const r = await fetch(url, { signal: ctrl.signal });
+                    const r = await fetch(infoUrl, { signal: ctrl.signal });
                     clearTimeout(timeout);
                     if (!r.ok) {
                         this.jsonResponse(res, { ok: false, error: `HTTP ${r.status}` });
                         return;
                     }
                     const info = await r.json();
+                    const { teamToken, nickname } = JSON.parse(body);
+                    if (teamToken) {
+                        const username = (typeof nickname === "string" && nickname.trim()) || node_os_1.default.userInfo().username || "user";
+                        const persisted = this.store.getClientHubConnection();
+                        const identityKey = persisted?.identityKey || "";
+                        try {
+                            const joinR = await fetch(baseUrl + "/api/v1/hub/join", {
+                                method: "POST",
+                                headers: { "content-type": "application/json" },
+                                body: JSON.stringify({ teamToken, username, identityKey, deviceName: node_os_1.default.hostname(), dryRun: true }),
+                            });
+                            const joinData = await joinR.json();
+                            if (!joinR.ok && joinData.error === "username_taken") {
+                                this.jsonResponse(res, { ok: false, error: "username_taken", teamName: info.teamName || "" });
+                                return;
+                            }
+                            if (!joinR.ok && joinData.error === "invalid_team_token") {
+                                this.jsonResponse(res, { ok: false, error: "invalid_team_token", teamName: info.teamName || "" });
+                                return;
+                            }
+                            if (joinR.ok && joinData.status === "blocked") {
+                                this.jsonResponse(res, { ok: false, error: "blocked", teamName: info.teamName || "" });
+                                return;
+                            }
+                        }
+                        catch { /* join check is best-effort; connection itself is OK */ }
+                    }
                     this.jsonResponse(res, { ok: true, teamName: info.teamName || "", apiVersion: info.apiVersion || "" });
                 }
                 catch (e) {
@@ -3330,26 +3520,35 @@ class ViewerServer {
         return null;
     }
     async handleUpdateCheck(res) {
+        const sendNoStore = (data, statusCode = 200) => {
+            res.writeHead(statusCode, {
+                "Content-Type": "application/json; charset=utf-8",
+                "Cache-Control": "no-store, no-cache, must-revalidate, max-age=0",
+                "Pragma": "no-cache",
+                "Expires": "0",
+            });
+            res.end(JSON.stringify(data));
+        };
         try {
             const pkgPath = this.findPluginPackageJson();
             if (!pkgPath) {
-                this.jsonResponse(res, { updateAvailable: false, error: "package.json not found" });
+                sendNoStore({ updateAvailable: false, error: "package.json not found" });
                 return;
             }
             const pkg = JSON.parse(node_fs_1.default.readFileSync(pkgPath, "utf-8"));
             const current = pkg.version;
             const name = pkg.name;
             if (!current || !name) {
-                this.jsonResponse(res, { updateAvailable: false, current });
+                sendNoStore({ updateAvailable: false, current });
                 return;
             }
             const { computeUpdateCheck } = await Promise.resolve().then(() => __importStar(require("../update-check")));
             const result = await computeUpdateCheck(name, current, fetch, 6_000);
             if (!result) {
-                this.jsonResponse(res, { updateAvailable: false, current, packageName: name });
+                sendNoStore({ updateAvailable: false, current, packageName: name });
                 return;
             }
-            this.jsonResponse(res, {
+            sendNoStore({
                 updateAvailable: result.updateAvailable,
                 current: result.current,
                 latest: result.latest,
@@ -3361,7 +3560,7 @@ class ViewerServer {
         }
         catch (e) {
             this.log.warn(`handleUpdateCheck error: ${e}`);
-            this.jsonResponse(res, { updateAvailable: false, error: String(e) });
+            sendNoStore({ updateAvailable: false, error: String(e) });
         }
     }
     handleUpdateInstall(req, res) {
@@ -3369,13 +3568,14 @@ class ViewerServer {
         req.on("data", (chunk) => { body += chunk.toString(); });
         req.on("end", () => {
             try {
-                const { packageSpec: rawSpec } = JSON.parse(body);
+                const { packageSpec: rawSpec, targetVersion: rawTargetVersion } = JSON.parse(body);
                 if (!rawSpec || typeof rawSpec !== "string") {
                     res.writeHead(400, { "Content-Type": "application/json" });
                     res.end(JSON.stringify({ ok: false, error: "Missing packageSpec" }));
                     return;
                 }
                 const packageSpec = rawSpec.trim().replace(/^(?:npx\s+)?openclaw\s+plugins\s+install\s+/i, "");
+                const targetVersion = typeof rawTargetVersion === "string" ? rawTargetVersion.trim() : "";
                 const allowed = /^@[\w-]+\/[\w.-]+(@[\w.-]+)?$/;
                 this.log.info(`update-install: received packageSpec="${packageSpec}" (len=${packageSpec.length})`);
                 if (!allowed.test(packageSpec)) {
@@ -3396,18 +3596,50 @@ class ViewerServer {
                 const shortName = pluginName?.replace(/^@[\w-]+\//, "") ?? "memos-local-openclaw-plugin";
                 const extDir = node_path_1.default.join(node_os_1.default.homedir(), ".openclaw", "extensions", shortName);
                 const tmpDir = node_path_1.default.join(node_os_1.default.tmpdir(), `openclaw-update-${Date.now()}`);
+                const backupDir = node_path_1.default.join(node_path_1.default.dirname(extDir), `${shortName}.backup-${Date.now()}`);
+                let backupReady = false;
+                const cleanupTmpDir = () => {
+                    try {
+                        node_fs_1.default.rmSync(tmpDir, { recursive: true, force: true });
+                    }
+                    catch { }
+                };
+                const rollbackInstall = () => {
+                    try {
+                        node_fs_1.default.rmSync(extDir, { recursive: true, force: true });
+                    }
+                    catch { }
+                    if (!backupReady)
+                        return;
+                    try {
+                        node_fs_1.default.renameSync(backupDir, extDir);
+                        backupReady = false;
+                        this.log.info(`update-install: restored previous version from ${backupDir}`);
+                    }
+                    catch (restoreErr) {
+                        this.log.warn(`update-install: failed to restore previous version: ${restoreErr?.message ?? restoreErr}`);
+                    }
+                };
+                const discardBackup = () => {
+                    if (!backupReady)
+                        return;
+                    try {
+                        node_fs_1.default.rmSync(backupDir, { recursive: true, force: true });
+                        backupReady = false;
+                    }
+                    catch (cleanupErr) {
+                        this.log.warn(`update-install: failed to remove backup dir ${backupDir}: ${cleanupErr?.message ?? cleanupErr}`);
+                    }
+                };
                 // Download via npm pack, extract, and replace extension dir.
                 // Does NOT touch openclaw.json → no config watcher SIGUSR1.
                 this.log.info(`update-install: downloading ${packageSpec} via npm pack...`);
                 node_fs_1.default.mkdirSync(tmpDir, { recursive: true });
-                (0, node_child_process_1.exec)(`npm pack ${packageSpec} --pack-destination ${tmpDir}`, { timeout: 60_000 }, (packErr, packOut) => {
+                (0, node_child_process_1.exec)(`npm pack ${packageSpec} --pack-destination ${tmpDir} --prefer-online`, { timeout: 60_000 }, (packErr, packOut) => {
                     if (packErr) {
                         this.log.warn(`update-install: npm pack failed: ${packErr.message}`);
                         this.jsonResponse(res, { ok: false, error: `Download failed: ${packErr.message}` });
-                        try {
-                            node_fs_1.default.rmSync(tmpDir, { recursive: true, force: true });
-                        }
-                        catch { }
+                        cleanupTmpDir();
                         return;
                     }
                     const tgzFile = packOut.trim().split("\n").pop();
@@ -3419,83 +3651,85 @@ class ViewerServer {
                         if (tarErr) {
                             this.log.warn(`update-install: tar extract failed: ${tarErr.message}`);
                             this.jsonResponse(res, { ok: false, error: `Extract failed: ${tarErr.message}` });
-                            try {
-                                node_fs_1.default.rmSync(tmpDir, { recursive: true, force: true });
-                            }
-                            catch { }
+                            cleanupTmpDir();
                             return;
                         }
                         // npm pack extracts to a "package" subdirectory
                         const srcDir = node_path_1.default.join(extractDir, "package");
                         if (!node_fs_1.default.existsSync(srcDir)) {
                             this.jsonResponse(res, { ok: false, error: "Extracted package has no 'package' dir" });
-                            try {
-                                node_fs_1.default.rmSync(tmpDir, { recursive: true, force: true });
-                            }
-                            catch { }
+                            cleanupTmpDir();
                             return;
                         }
                         // Replace extension directory
                         this.log.info(`update-install: replacing ${extDir}...`);
                         try {
-                            node_fs_1.default.rmSync(extDir, { recursive: true, force: true });
+                            node_fs_1.default.mkdirSync(node_path_1.default.dirname(extDir), { recursive: true });
+                            try {
+                                node_fs_1.default.rmSync(backupDir, { recursive: true, force: true });
+                            }
+                            catch { }
+                            if (node_fs_1.default.existsSync(extDir)) {
+                                node_fs_1.default.renameSync(extDir, backupDir);
+                                backupReady = true;
+                            }
+                            node_fs_1.default.renameSync(srcDir, extDir);
+                        }
+                        catch (replaceErr) {
+                            this.log.warn(`update-install: replace failed: ${replaceErr?.message ?? replaceErr}`);
+                            cleanupTmpDir();
+                            rollbackInstall();
+                            this.jsonResponse(res, { ok: false, error: `Replace failed: ${replaceErr?.message ?? replaceErr}` });
+                            return;
                         }
-                        catch { }
-                        node_fs_1.default.mkdirSync(node_path_1.default.dirname(extDir), { recursive: true });
-                        node_fs_1.default.renameSync(srcDir, extDir);
                         // Install dependencies
                         this.log.info(`update-install: installing dependencies...`);
-                        (0, node_child_process_1.exec)(`cd ${extDir} && npm install --omit=dev --ignore-scripts`, { timeout: 120_000 }, (npmErr, npmOut, npmStderr) => {
+                        const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
+                        (0, node_child_process_1.execFile)(npmCmd, ["install", "--omit=dev", "--ignore-scripts"], { cwd: extDir, timeout: 120_000 }, (npmErr, npmOut, npmStderr) => {
                             if (npmErr) {
-                                try {
-                                    node_fs_1.default.rmSync(tmpDir, { recursive: true, force: true });
-                                }
-                                catch { }
                                 this.log.warn(`update-install: npm install failed: ${npmErr.message}`);
+                                cleanupTmpDir();
+                                rollbackInstall();
                                 this.jsonResponse(res, { ok: false, error: `Dependency install failed: ${npmStderr || npmErr.message}` });
                                 return;
                             }
-                            // Rebuild native modules (do not swallow errors)
-                            (0, node_child_process_1.exec)(`cd ${extDir} && npm rebuild better-sqlite3`, { timeout: 60_000 }, (rebuildErr, rebuildOut, rebuildStderr) => {
+                            (0, node_child_process_1.execFile)(npmCmd, ["rebuild", "better-sqlite3"], { cwd: extDir, timeout: 60_000 }, (rebuildErr, rebuildOut, rebuildStderr) => {
                                 if (rebuildErr) {
                                     this.log.warn(`update-install: better-sqlite3 rebuild failed: ${rebuildErr.message}`);
                                     const stderr = String(rebuildStderr || "").trim();
                                     if (stderr)
                                         this.log.warn(`update-install: rebuild stderr: ${stderr.slice(0, 500)}`);
-                                    // Continue so postinstall.cjs can run (it will try rebuild again and show user guidance)
                                 }
-                                // Run postinstall.cjs: legacy cleanup, skill install, version marker, and optional sqlite re-check
                                 this.log.info(`update-install: running postinstall...`);
-                                (0, node_child_process_1.exec)(`cd ${extDir} && node scripts/postinstall.cjs`, { timeout: 180_000 }, (postErr, postOut, postStderr) => {
-                                    try {
-                                        node_fs_1.default.rmSync(tmpDir, { recursive: true, force: true });
-                                    }
-                                    catch { }
+                                (0, node_child_process_1.execFile)(process.execPath, ["scripts/postinstall.cjs"], { cwd: extDir, timeout: 180_000 }, (postErr, postOut, postStderr) => {
+                                    cleanupTmpDir();
                                     if (postErr) {
                                         this.log.warn(`update-install: postinstall failed: ${postErr.message}`);
                                         const postStderrStr = String(postStderr || "").trim();
                                         if (postStderrStr)
                                             this.log.warn(`update-install: postinstall stderr: ${postStderrStr.slice(0, 500)}`);
-                                        // Still report success; plugin is updated, user can run postinstall manually if needed
+                                        rollbackInstall();
+                                        this.jsonResponse(res, { ok: false, error: `Postinstall failed: ${postStderrStr || postErr.message}` });
+                                        return;
                                     }
-                                    // Read new version
                                     let newVersion = "unknown";
                                     try {
                                         const newPkg = JSON.parse(node_fs_1.default.readFileSync(node_path_1.default.join(extDir, "package.json"), "utf-8"));
                                         newVersion = newPkg.version ?? newVersion;
                                     }
                                     catch { }
+                                    if (targetVersion && newVersion !== targetVersion) {
+                                        this.log.warn(`update-install: version mismatch! expected=${targetVersion}, got=${newVersion} — rolling back`);
+                                        rollbackInstall();
+                                        this.jsonResponse(res, {
+                                            ok: false,
+                                            error: `Version mismatch: expected ${targetVersion} but downloaded ${newVersion}. npm cache may be stale — please try again.`,
+                                        });
+                                        return;
+                                    }
+                                    discardBackup();
                                     this.log.info(`update-install: success! Updated to ${newVersion}`);
-                                    this.jsonResponse(res, { ok: true, version: newVersion });
-                                    setTimeout(() => {
-                                        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);
+                                    this.jsonResponseAndRestart(res, { ok: true, version: newVersion }, "update-install");
                                 });
                             });
                         });
@@ -3833,7 +4067,7 @@ class ViewerServer {
         else if (this.migrationState.done) {
             const evtName = this.migrationState.stopped ? "stopped" : "done";
             res.write(`event: state\ndata: ${JSON.stringify(this.migrationState)}\n\n`);
-            res.write(`event: ${evtName}\ndata: ${JSON.stringify({ ok: true })}\n\n`);
+            res.write(`event: ${evtName}\ndata: ${JSON.stringify({ ok: this.migrationState.success, ...this.migrationState })}\n\n`);
             res.end();
         }
         else {
@@ -3872,22 +4106,11 @@ class ViewerServer {
             res.on("close", () => {
                 this.migrationSSEClients = this.migrationSSEClients.filter(c => c !== res);
             });
-            this.migrationAbort = false;
-            this.migrationState = { phase: "", stored: 0, skipped: 0, merged: 0, errors: 0, processed: 0, total: 0, lastItem: null, done: false, stopped: false };
+            this.migrationState = createInitialMigrationState();
             const send = (event, data) => {
                 if (event === "item") {
                     const d = data;
-                    if (d.status === "stored")
-                        this.migrationState.stored++;
-                    else if (d.status === "skipped" || d.status === "duplicate")
-                        this.migrationState.skipped++;
-                    else if (d.status === "merged")
-                        this.migrationState.merged++;
-                    else if (d.status === "error")
-                        this.migrationState.errors++;
-                    this.migrationState.processed = d.index ?? this.migrationState.processed + 1;
-                    this.migrationState.total = d.total ?? this.migrationState.total;
-                    this.migrationState.lastItem = d;
+                    applyMigrationItemToState(this.migrationState, d);
                 }
                 else if (event === "phase") {
                     this.migrationState.phase = data.phase;
@@ -3901,12 +4124,14 @@ class ViewerServer {
             this.runMigration(send, opts.sources, concurrency).finally(() => {
                 this.migrationRunning = false;
                 this.migrationState.done = true;
+                this.migrationState.success = computeMigrationSuccess(this.migrationState);
+                const donePayload = { ok: this.migrationState.success, ...this.migrationState };
                 if (this.migrationAbort) {
                     this.migrationState.stopped = true;
-                    this.broadcastSSE("stopped", { ok: true, ...this.migrationState });
+                    this.broadcastSSE("stopped", donePayload);
                 }
                 else {
-                    this.broadcastSSE("done", { ok: true });
+                    this.broadcastSSE("done", donePayload);
                 }
                 this.migrationAbort = false;
                 const clientsToClose = [...this.migrationSSEClients];
@@ -3992,12 +4217,25 @@ class ViewerServer {
                                 continue;
                             }
                             try {
-                                const summary = await summarizer.summarize(row.text);
+                                const stepFailures = [];
+                                let summary = "";
+                                try {
+                                    summary = await summarizer.summarize(row.text);
+                                }
+                                catch (err) {
+                                    stepFailures.push("summarization");
+                                    this.log.warn(`Migration summarization failed: ${err}`);
+                                }
+                                if (!summary) {
+                                    stepFailures.push("summarization");
+                                    summary = row.text.slice(0, 200);
+                                }
                                 let embedding = null;
                                 try {
                                     [embedding] = await this.embedder.embed([summary]);
                                 }
                                 catch (err) {
+                                    stepFailures.push("embedding");
                                     this.log.warn(`Migration embed failed: ${err}`);
                                 }
                                 let dedupStatus = "active";
@@ -4013,30 +4251,36 @@ class ViewerServer {
                                             return { index: idx + 1, summary: chunk?.summary ?? "", chunkId: s.chunkId };
                                         }).filter(c => c.summary);
                                         if (candidates.length > 0) {
-                                            const dedupResult = await summarizer.judgeDedup(summary, candidates);
-                                            if (dedupResult?.action === "DUPLICATE" && dedupResult.targetIndex) {
-                                                const targetId = candidates[dedupResult.targetIndex - 1]?.chunkId;
-                                                if (targetId) {
-                                                    dedupStatus = "duplicate";
-                                                    dedupTarget = targetId;
-                                                    dedupReason = dedupResult.reason;
+                                            try {
+                                                const dedupResult = await summarizer.judgeDedup(summary, candidates);
+                                                if (dedupResult?.action === "DUPLICATE" && dedupResult.targetIndex) {
+                                                    const targetId = candidates[dedupResult.targetIndex - 1]?.chunkId;
+                                                    if (targetId) {
+                                                        dedupStatus = "duplicate";
+                                                        dedupTarget = targetId;
+                                                        dedupReason = dedupResult.reason;
+                                                    }
                                                 }
-                                            }
-                                            else if (dedupResult?.action === "UPDATE" && dedupResult.targetIndex && dedupResult.mergedSummary) {
-                                                const targetId = candidates[dedupResult.targetIndex - 1]?.chunkId;
-                                                if (targetId) {
-                                                    this.store.updateChunkSummaryAndContent(targetId, dedupResult.mergedSummary, row.text);
-                                                    try {
-                                                        const [newEmb] = await this.embedder.embed([dedupResult.mergedSummary]);
-                                                        if (newEmb)
-                                                            this.store.upsertEmbedding(targetId, newEmb);
+                                                else if (dedupResult?.action === "UPDATE" && dedupResult.targetIndex && dedupResult.mergedSummary) {
+                                                    const targetId = candidates[dedupResult.targetIndex - 1]?.chunkId;
+                                                    if (targetId) {
+                                                        this.store.updateChunkSummaryAndContent(targetId, dedupResult.mergedSummary, row.text);
+                                                        try {
+                                                            const [newEmb] = await this.embedder.embed([dedupResult.mergedSummary]);
+                                                            if (newEmb)
+                                                                this.store.upsertEmbedding(targetId, newEmb);
+                                                        }
+                                                        catch { /* best-effort */ }
+                                                        dedupStatus = "merged";
+                                                        dedupTarget = targetId;
+                                                        dedupReason = dedupResult.reason;
                                                     }
-                                                    catch { /* best-effort */ }
-                                                    dedupStatus = "merged";
-                                                    dedupTarget = targetId;
-                                                    dedupReason = dedupResult.reason;
                                                 }
                                             }
+                                            catch (err) {
+                                                stepFailures.push("dedup");
+                                                this.log.warn(`Migration dedup judgment failed: ${err}`);
+                                            }
                                         }
                                     }
                                 }
@@ -4060,8 +4304,8 @@ class ViewerServer {
                                     mergeCount: 0,
                                     lastHitAt: null,
                                     mergeHistory: "[]",
-                                    createdAt: normalizeTimestamp(row.updated_at),
-                                    updatedAt: normalizeTimestamp(row.updated_at),
+                                    createdAt: Number(row.updated_at) < 1e12 ? Number(row.updated_at) * 1000 : Number(row.updated_at),
+                                    updatedAt: Number(row.updated_at) < 1e12 ? Number(row.updated_at) * 1000 : Number(row.updated_at),
                                 };
                                 this.store.insertChunk(chunk);
                                 if (embedding && dedupStatus === "active") {
@@ -4075,7 +4319,14 @@ class ViewerServer {
                                     preview: row.text.slice(0, 120),
                                     summary: summary.slice(0, 80),
                                     source: file,
+                                    stepFailures,
                                 });
+                                if (stepFailures.length > 0) {
+                                    this.log.warn(`[MIGRATION] sqlite item imported with step failures: ${stepFailures.join(",")}`);
+                                }
+                                else {
+                                    this.log.info("[MIGRATION] sqlite item imported successfully (all steps)");
+                                }
                             }
                             catch (err) {
                                 totalErrors++;
@@ -4216,12 +4467,25 @@ class ViewerServer {
                                 continue;
                             }
                             try {
-                                const summary = await summarizer.summarize(content);
+                                const stepFailures = [];
+                                let summary = "";
+                                try {
+                                    summary = await summarizer.summarize(content);
+                                }
+                                catch (err) {
+                                    stepFailures.push("summarization");
+                                    this.log.warn(`Migration summarization failed: ${err}`);
+                                }
+                                if (!summary) {
+                                    stepFailures.push("summarization");
+                                    summary = content.slice(0, 200);
+                                }
                                 let embedding = null;
                                 try {
                                     [embedding] = await this.embedder.embed([summary]);
                                 }
                                 catch (err) {
+                                    stepFailures.push("embedding");
                                     this.log.warn(`Migration embed failed: ${err}`);
                                 }
                                 let dedupStatus = "active";
@@ -4237,30 +4501,36 @@ class ViewerServer {
                                             return { index: i + 1, summary: chunk?.summary ?? "", chunkId: s.chunkId };
                                         }).filter(c => c.summary);
                                         if (candidates.length > 0) {
-                                            const dedupResult = await summarizer.judgeDedup(summary, candidates);
-                                            if (dedupResult?.action === "DUPLICATE" && dedupResult.targetIndex) {
-                                                const targetId = candidates[dedupResult.targetIndex - 1]?.chunkId;
-                                                if (targetId) {
-                                                    dedupStatus = "duplicate";
-                                                    dedupTarget = targetId;
-                                                    dedupReason = dedupResult.reason;
+                                            try {
+                                                const dedupResult = await summarizer.judgeDedup(summary, candidates);
+                                                if (dedupResult?.action === "DUPLICATE" && dedupResult.targetIndex) {
+                                                    const targetId = candidates[dedupResult.targetIndex - 1]?.chunkId;
+                                                    if (targetId) {
+                                                        dedupStatus = "duplicate";
+                                                        dedupTarget = targetId;
+                                                        dedupReason = dedupResult.reason;
+                                                    }
                                                 }
-                                            }
-                                            else if (dedupResult?.action === "UPDATE" && dedupResult.targetIndex && dedupResult.mergedSummary) {
-                                                const targetId = candidates[dedupResult.targetIndex - 1]?.chunkId;
-                                                if (targetId) {
-                                                    this.store.updateChunkSummaryAndContent(targetId, dedupResult.mergedSummary, content);
-                                                    try {
-                                                        const [newEmb] = await this.embedder.embed([dedupResult.mergedSummary]);
-                                                        if (newEmb)
-                                                            this.store.upsertEmbedding(targetId, newEmb);
+                                                else if (dedupResult?.action === "UPDATE" && dedupResult.targetIndex && dedupResult.mergedSummary) {
+                                                    const targetId = candidates[dedupResult.targetIndex - 1]?.chunkId;
+                                                    if (targetId) {
+                                                        this.store.updateChunkSummaryAndContent(targetId, dedupResult.mergedSummary, content);
+                                                        try {
+                                                            const [newEmb] = await this.embedder.embed([dedupResult.mergedSummary]);
+                                                            if (newEmb)
+                                                                this.store.upsertEmbedding(targetId, newEmb);
+                                                        }
+                                                        catch { /* best-effort */ }
+                                                        dedupStatus = "merged";
+                                                        dedupTarget = targetId;
+                                                        dedupReason = dedupResult.reason;
                                                     }
-                                                    catch { /* best-effort */ }
-                                                    dedupStatus = "merged";
-                                                    dedupTarget = targetId;
-                                                    dedupReason = dedupResult.reason;
                                                 }
                                             }
+                                            catch (err) {
+                                                stepFailures.push("dedup");
+                                                this.log.warn(`Migration dedup judgment failed: ${err}`);
+                                            }
                                         }
                                     }
                                 }
@@ -4277,7 +4547,13 @@ class ViewerServer {
                                 if (embedding && dedupStatus === "active")
                                     this.store.upsertEmbedding(chunkId, embedding);
                                 totalStored++;
-                                send("item", { index: idx, total: totalMsgs, status: dedupStatus === "active" ? "stored" : dedupStatus, preview: content.slice(0, 120), summary: summary.slice(0, 80), source: file, agent: agentId, role: msgRole });
+                                send("item", { index: idx, total: totalMsgs, status: dedupStatus === "active" ? "stored" : dedupStatus, preview: content.slice(0, 120), summary: summary.slice(0, 80), source: file, agent: agentId, role: msgRole, stepFailures });
+                                if (stepFailures.length > 0) {
+                                    this.log.warn(`[MIGRATION] session item imported with step failures: ${stepFailures.join(",")}`);
+                                }
+                                else {
+                                    this.log.info("[MIGRATION] session item imported successfully (all steps)");
+                                }
                             }
                             catch (err) {
                                 totalErrors++;
@@ -4320,7 +4596,14 @@ class ViewerServer {
             }
         }
         send("progress", { total: totalProcessed, processed: totalProcessed, phase: "done" });
-        send("summary", { totalProcessed, totalStored, totalSkipped, totalErrors });
+        send("summary", {
+            totalProcessed,
+            totalStored,
+            totalSkipped,
+            totalErrors,
+            success: computeMigrationSuccess(this.migrationState),
+            stepFailures: this.migrationState.stepFailures,
+        });
     }
     // ─── Post-processing: independent task/skill generation ───
     handlePostprocess(req, res) {
@@ -4579,6 +4862,20 @@ class ViewerServer {
         req.on("data", (chunk) => { body += chunk.toString(); });
         req.on("end", () => cb(body));
     }
+    jsonResponseAndRestart(res, data, source, delayMs = 1500, statusCode = 200) {
+        res.writeHead(statusCode, { "Content-Type": "application/json; charset=utf-8" });
+        res.end(JSON.stringify(data), () => {
+            setTimeout(() => {
+                this.log.info(`${source}: triggering gateway restart via SIGUSR1...`);
+                try {
+                    process.kill(process.pid, "SIGUSR1");
+                }
+                catch (sig) {
+                    this.log.warn(`SIGUSR1 failed: ${sig}`);
+                }
+            }, delayMs);
+        });
+    }
     jsonResponse(res, data, statusCode = 200) {
         res.writeHead(statusCode, { "Content-Type": "application/json; charset=utf-8" });
         res.end(JSON.stringify(data));