@memtensor/memos-local-openclaw-plugin 1.0.4-beta.10 → 1.0.4-beta.11

package/index.ts

@@ -19,6 +19,7 @@ import { IngestWorker } from "./src/ingest/worker";
 import { RecallEngine } from "./src/recall/engine";
 import { captureMessages, stripInboundMetadata } from "./src/capture";
 import { DEFAULTS } from "./src/types";
+import type { SearchHit } from "./src/types";
 import { ViewerServer } from "./src/viewer/server";
 import { HubServer } from "./src/hub/server";
 import { hubGetMemoryDetail, hubRequestJson, hubSearchMemories, hubSearchSkills, resolveHubClient } from "./src/client/hub";
@@ -318,6 +319,21 @@ const memosLocalPlugin = {
                 candidates: det.candidates,
                 filtered: det.hits ?? det.filtered ?? [],
               });
+            } else if (det && det.local && det.hub) {
+              const localHits = det.local?.hits ?? [];
+              const hubHits = (det.hub?.hits ?? []).map((h: any) => ({
+                score: h.score ?? 0,
+                role: h.source?.role ?? h.role ?? "assistant",
+                summary: h.summary ?? "",
+                original_excerpt: h.excerpt ?? h.summary ?? "",
+                origin: "hub-remote",
+                ownerName: h.ownerName ?? "",
+                groupName: h.groupName ?? "",
+              }));
+              outputText = JSON.stringify({
+                candidates: [...localHits, ...hubHits],
+                filtered: [...localHits, ...hubHits],
+              });
             } else {
               outputText = result?.content?.[0]?.text ?? JSON.stringify(result ?? "");
             }
@@ -464,6 +480,7 @@ const memosLocalPlugin = {
             score: h.score,
             summary: h.summary,
             original_excerpt: (h.original_excerpt ?? "").slice(0, 200),
+            origin: h.origin || "local",
           }));
 
           if (result.hits.length === 0 && searchScope === "local") {
@@ -518,29 +535,79 @@ const memosLocalPlugin = {
               role: h.source.role,
               score: h.score,
               summary: h.summary,
+              origin: h.origin || "local",
             };
           });
 
           if (searchScope !== "local") {
             const hub = await hubSearchMemories(store, ctx, { query, maxResults: searchLimit, scope: searchScope as any, hubAddress, userToken }).catch(() => ({ hits: [], meta: { totalCandidates: 0, searchedGroups: [], includedPublic: searchScope === "all" } }));
+
+            let filteredHubHits = hub.hits;
+            if (hub.hits.length > 0) {
+              const hubCandidates = hub.hits.map((h, i) => ({
+                index: filteredHits.length + i + 1,
+                role: (h.source?.role || "assistant") as string,
+                content: (h.summary || h.excerpt || "").slice(0, 300),
+                time: h.source?.ts ? new Date(h.source.ts).toISOString().slice(0, 16) : "",
+              }));
+              const localCandidatesForMerge = filteredHits.map((h, i) => ({
+                index: i + 1,
+                role: h.source.role,
+                content: (h.original_excerpt ?? "").slice(0, 300),
+                time: h.source.ts ? new Date(h.source.ts).toISOString().slice(0, 16) : "",
+              }));
+              const mergedCandidates = [...localCandidatesForMerge, ...hubCandidates];
+              const mergedFilter = await summarizer.filterRelevant(query, mergedCandidates);
+              if (mergedFilter !== null && mergedFilter.relevant.length > 0) {
+                const relevantSet = new Set(mergedFilter.relevant);
+                const hubStartIdx = filteredHits.length + 1;
+                filteredHits = filteredHits.filter((_, i) => relevantSet.has(i + 1));
+                filteredHubHits = hub.hits.filter((_, i) => relevantSet.has(hubStartIdx + i));
+                ctx.log.debug(`memory_search LLM filter (merged): local ${localCandidatesForMerge.length}→${filteredHits.length}, hub ${hub.hits.length}→${filteredHubHits.length}`);
+              }
+            }
+
+            const originLabel = (h: SearchHit) => {
+              if (h.origin === "hub-memory") return " [团队缓存]";
+              if (h.origin === "local-shared") return " [本机共享]";
+              return "";
+            };
             const localText = filteredHits.length > 0
               ? filteredHits.map((h, i) => {
                   const excerpt = h.original_excerpt.length > 220 ? h.original_excerpt.slice(0, 217) + "..." : h.original_excerpt;
-                  return `${i + 1}. [${h.source.role}] ${excerpt}`;
+                  return `${i + 1}. [${h.source.role}]${originLabel(h)} ${excerpt}`;
                 }).join("\n")
               : "(none)";
-            const hubText = hub.hits.length > 0
-              ? hub.hits.map((h, i) => `${i + 1}. [${h.ownerName}] ${h.summary}${h.groupName ? ` (${h.groupName})` : ""}`).join("\n")
+            const hubText = filteredHubHits.length > 0
+              ? filteredHubHits.map((h, i) => `${i + 1}. [${h.ownerName}] [团队] ${h.summary}${h.groupName ? ` (${h.groupName})` : ""}`).join("\n")
               : "(none)";
 
+            const localDetailsFiltered = filteredHits.map((h) => {
+              let effectiveTaskId = h.taskId;
+              if (effectiveTaskId) {
+                const t = store.getTask(effectiveTaskId);
+                if (t && t.status === "skipped") effectiveTaskId = null;
+              }
+              return {
+                ref: h.ref,
+                chunkId: h.ref.chunkId,
+                taskId: effectiveTaskId,
+                skillId: h.skillId,
+                role: h.source.role,
+                score: h.score,
+                summary: h.summary,
+                origin: h.origin,
+              };
+            });
+
             return {
               content: [{
                 type: "text",
                 text: `Local results:\n${localText}\n\nHub results:\n${hubText}`,
               }],
               details: {
-                local: { hits: localDetailsHits, meta: result.meta },
-                hub,
+                local: { hits: localDetailsFiltered, meta: result.meta },
+                hub: { ...hub, hits: filteredHubHits },
               },
             };
           }
@@ -552,9 +619,15 @@ const memosLocalPlugin = {
             };
           }
 
+          const originTag = (o?: string) => {
+            if (o === "local-shared") return " [本机共享]";
+            if (o === "hub-memory") return " [团队缓存]";
+            if (o === "hub-remote") return " [团队]";
+            return "";
+          };
           const lines = filteredHits.map((h, i) => {
             const excerpt = h.original_excerpt;
-            const parts = [`${i + 1}. [${h.source.role}]`];
+            const parts = [`${i + 1}. [${h.source.role}]${originTag(h.origin)}`];
             if (excerpt) parts.push(`   ${excerpt}`);
             parts.push(`   chunkId="${h.ref.chunkId}"`);
             if (h.taskId) {
@@ -609,6 +682,7 @@ const memosLocalPlugin = {
                   score: h.score,
                   summary: h.summary,
                   original_excerpt: (h.original_excerpt ?? "").slice(0, 200),
+                  origin: h.origin || "local",
                 };
               }),
               meta: result.meta,
@@ -1058,10 +1132,31 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
             };
           }
 
+          const manifest = skillInstaller.getCompanionManifest(resolvedSkillId);
+          let footer = "\n\n---\n";
+
+          if (manifest && manifest.hasCompanionFiles) {
+            const fileSummary = manifest.files
+              .filter(f => f.type !== "eval")
+              .map(f => `\`${f.relativePath}\``)
+              .join(", ");
+            footer += `**Companion files available:** ${fileSummary}\n`;
+            footer += `→ call \`skill_files(skillId="${resolvedSkillId}")\` to list all files\n`;
+            footer += `→ call \`skill_file_get(skillId="${resolvedSkillId}", path="...")\` to read a specific file\n`;
+            if (manifest.installMode === "install_recommended") {
+              footer += `→ **Recommended:** call \`skill_install(skillId="${resolvedSkillId}")\` for persistent workspace access (many/large files)\n`;
+            }
+            if (manifest.installed && manifest.installedPath) {
+              footer += `> Already installed at: ${manifest.installedPath}/\n`;
+            }
+          } else {
+            footer += `To install this skill for persistent use: call skill_install(skillId="${resolvedSkillId}")`;
+          }
+
           return {
             content: [{
               type: "text",
-              text: `## Skill: ${skill.name} (v${skill.version})\n\n${sv.content}\n\n---\nTo install this skill for persistent use: call skill_install(skillId="${resolvedSkillId}")`,
+              text: `## Skill: ${skill.name} (v${skill.version})\n\n${sv.content}${footer}`,
             }],
             details: {
               skillId: skill.id,
@@ -1069,6 +1164,8 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
               version: skill.version,
               status: skill.status,
               installed: skill.installed,
+              companionFiles: manifest?.hasCompanionFiles ?? false,
+              installMode: manifest?.installMode ?? "inline",
             },
           };
         }),
@@ -1104,6 +1201,112 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
       { name: "skill_install" },
     );
 
+    // ─── Tool: skill_files ───
+
+    api.registerTool(
+      {
+        name: "skill_files",
+        label: "List Skill Companion Files",
+        description:
+          "List companion files (scripts, references, evals) for a skill. " +
+          "Use this after skill_get to see what additional files are available. " +
+          "Returns file names, sizes, and whether the skill recommends installation.",
+        parameters: Type.Object({
+          skillId: Type.String({ description: "The skill_id to inspect" }),
+        }),
+        execute: trackTool("skill_files", async (_toolCallId: any, params: any) => {
+          const { skillId } = params as { skillId: string };
+          ctx.log.debug(`skill_files called for skill=${skillId}`);
+
+          const manifest = skillInstaller.getCompanionManifest(skillId);
+          if (!manifest) {
+            return {
+              content: [{ type: "text", text: `Skill not found: ${skillId}` }],
+              details: { error: "not_found" },
+            };
+          }
+
+          if (!manifest.hasCompanionFiles) {
+            return {
+              content: [{ type: "text", text: "This skill has no companion files (scripts, references). The SKILL.md from skill_get contains everything." }],
+              details: manifest,
+            };
+          }
+
+          const lines: string[] = [`## Companion Files (${manifest.files.length} files, ${Math.round(manifest.totalSize / 1024)}KB total)\n`];
+          if (manifest.scriptsCount > 0) {
+            lines.push(`### Scripts (${manifest.scriptsCount})`);
+            for (const f of manifest.files.filter(f => f.type === "script")) {
+              lines.push(`- \`${f.relativePath}\` (${f.size} bytes) → call \`skill_file_get(skillId="${skillId}", path="${f.relativePath}")\``);
+            }
+          }
+          if (manifest.referencesCount > 0) {
+            lines.push(`\n### References (${manifest.referencesCount})`);
+            for (const f of manifest.files.filter(f => f.type === "reference")) {
+              lines.push(`- \`${f.relativePath}\` (${f.size} bytes) → call \`skill_file_get(skillId="${skillId}", path="${f.relativePath}")\``);
+            }
+          }
+          if (manifest.evalsCount > 0) {
+            lines.push(`\n### Evals (${manifest.evalsCount})`);
+            for (const f of manifest.files.filter(f => f.type === "eval")) {
+              lines.push(`- \`${f.relativePath}\` (${f.size} bytes)`);
+            }
+          }
+
+          if (manifest.installMode === "install_recommended") {
+            lines.push(`\n> **Recommendation:** This skill has many/large companion files. Consider \`skill_install(skillId="${skillId}")\` for persistent workspace access.`);
+          }
+          if (manifest.installed && manifest.installedPath) {
+            lines.push(`\n> **Installed at:** ${manifest.installedPath}/`);
+          }
+
+          return {
+            content: [{ type: "text", text: lines.join("\n") }],
+            details: manifest,
+          };
+        }),
+      },
+      { name: "skill_files" },
+    );
+
+    // ─── Tool: skill_file_get ───
+
+    api.registerTool(
+      {
+        name: "skill_file_get",
+        label: "Get Skill Companion File",
+        description:
+          "Read the content of a specific companion file (script, reference) from a skill. " +
+          "Use after skill_files to retrieve a script or reference document. " +
+          "Pass the relative path like 'scripts/deploy.sh' or 'references/api-notes.md'.",
+        parameters: Type.Object({
+          skillId: Type.String({ description: "The skill_id" }),
+          path: Type.String({ description: "Relative path within the skill, e.g. 'scripts/deploy.sh'" }),
+        }),
+        execute: trackTool("skill_file_get", async (_toolCallId: any, params: any) => {
+          const { skillId, path: filePath } = params as { skillId: string; path: string };
+          ctx.log.debug(`skill_file_get called for skill=${skillId} path=${filePath}`);
+
+          const result = skillInstaller.readCompanionFile(skillId, filePath);
+          if ("error" in result) {
+            return {
+              content: [{ type: "text", text: `Error: ${result.error}` }],
+              details: result,
+            };
+          }
+
+          const ext = filePath.split(".").pop() || "";
+          const lang = { sh: "bash", py: "python", ts: "typescript", js: "javascript", json: "json", md: "markdown", yml: "yaml", yaml: "yaml" }[ext] || "";
+
+          return {
+            content: [{ type: "text", text: `## ${filePath}\n\n\`\`\`${lang}\n${result.content}\n\`\`\`` }],
+            details: { path: filePath, size: result.size },
+          };
+        }),
+      },
+      { name: "skill_file_get" },
+    );
+
     // ─── Tool: memory_viewer ───
 
     const viewerPort = (pluginCfg as any).viewerPort ?? 18799;
@@ -1614,10 +1817,40 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
 
         const result = await engine.search({ query, maxResults: 10, minScore: 0.45, ownerFilter: recallOwnerFilter });
         if (result.hits.length === 0) {
-          ctx.log.debug("auto-recall: no candidates found");
+          ctx.log.debug("auto-recall: no memory candidates found");
           const dur = performance.now() - recallT0;
           store.recordToolCall("memory_search", dur, true);
           store.recordApiLog("memory_search", { type: "auto_recall", query }, JSON.stringify({ candidates: [], filtered: [] }), dur, true);
+
+          // Even without memory hits, try skill recall
+          const skillAutoRecallEarly = ctx.config.skillEvolution?.autoRecallSkills ?? DEFAULTS.skillAutoRecall;
+          if (skillAutoRecallEarly) {
+            try {
+              const skillLimit = ctx.config.skillEvolution?.autoRecallSkillLimit ?? DEFAULTS.skillAutoRecallLimit;
+              const skillHits = await engine.searchSkills(query, "mix" as any, getCurrentOwner());
+              const topSkills = skillHits.slice(0, skillLimit);
+              if (topSkills.length > 0) {
+                const skillLines = topSkills.map((sc, i) => {
+                  const manifest = skillInstaller.getCompanionManifest(sc.skillId);
+                  let badge = "";
+                  if (manifest?.installed) badge = " [installed]";
+                  else if (manifest?.installMode === "install_recommended") badge = " [has scripts, install recommended]";
+                  else if (manifest?.hasCompanionFiles) badge = " [has companion files]";
+                  return `${i + 1}. **${sc.name}**${badge} — ${sc.description.slice(0, 200)}\n   → call \`skill_get(skillId="${sc.skillId}")\` for the full guide`;
+                });
+                const skillContext = "## Relevant skills from past experience\n\n" +
+                  "No direct memory matches were found, but these skills from past tasks may help:\n\n" +
+                  skillLines.join("\n\n") +
+                  "\n\nYou SHOULD call `skill_get` to retrieve the full guide before attempting the task.";
+                ctx.log.info(`auto-recall-skill (no-memory path): injecting ${topSkills.length} skill(s)`);
+                try { store.recordApiLog("skill_search", { type: "auto_recall_skill", query }, JSON.stringify(topSkills), dur, true); } catch { /* best-effort */ }
+                return { prependContext: skillContext };
+              }
+            } catch (err) {
+              ctx.log.debug(`auto-recall-skill (no-memory path): failed: ${err}`);
+            }
+          }
+
           if (query.length > 50) {
             const noRecallHint =
               "## Memory system — ACTION REQUIRED\n\n" +
@@ -1650,7 +1883,7 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
             const dur = performance.now() - recallT0;
             store.recordToolCall("memory_search", dur, true);
             store.recordApiLog("memory_search", { type: "auto_recall", query }, JSON.stringify({
-              candidates: result.hits.map(h => ({ score: h.score, role: h.source.role, summary: h.summary, content: h.original_excerpt })),
+              candidates: result.hits.map(h => ({ score: h.score, role: h.source.role, summary: h.summary, content: h.original_excerpt, origin: h.origin || "local" })),
               filtered: []
             }), dur, true);
             if (query.length > 50) {
@@ -1671,7 +1904,8 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
 
         const lines = filteredHits.map((h, i) => {
           const excerpt = h.original_excerpt;
-          const parts: string[] = [`${i + 1}. [${h.source.role}]`];
+          const oTag = h.origin === "local-shared" ? " [本机共享]" : h.origin === "hub-memory" ? " [团队缓存]" : "";
+          const parts: string[] = [`${i + 1}. [${h.source.role}]${oTag}`];
           if (excerpt) parts.push(`   ${excerpt}`);
           parts.push(`   chunkId="${h.ref.chunkId}"`);
           if (h.taskId) {
@@ -1706,17 +1940,86 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
           lines.join("\n\n"),
         ];
         if (tipsText) contextParts.push(tipsText);
+
+        // ─── Skill auto-recall ───
+        const skillAutoRecall = ctx.config.skillEvolution?.autoRecallSkills ?? DEFAULTS.skillAutoRecall;
+        const skillLimit = ctx.config.skillEvolution?.autoRecallSkillLimit ?? DEFAULTS.skillAutoRecallLimit;
+        let skillSection = "";
+
+        if (skillAutoRecall) {
+          try {
+            const skillCandidateMap = new Map<string, { name: string; description: string; skillId: string; source: string }>();
+
+            // Source 1: direct skill search based on user query
+            try {
+              const directSkillHits = await engine.searchSkills(query, "mix" as any, getCurrentOwner());
+              for (const sh of directSkillHits.slice(0, skillLimit + 2)) {
+                if (!skillCandidateMap.has(sh.skillId)) {
+                  skillCandidateMap.set(sh.skillId, { name: sh.name, description: sh.description, skillId: sh.skillId, source: "query" });
+                }
+              }
+            } catch (err) {
+              ctx.log.debug(`auto-recall-skill: direct search failed: ${err}`);
+            }
+
+            // Source 2: skills linked to tasks from memory hits
+            const taskIds = new Set<string>();
+            for (const h of filteredHits) {
+              if (h.taskId) {
+                const t = store.getTask(h.taskId);
+                if (t && t.status !== "skipped") taskIds.add(h.taskId);
+              }
+            }
+            for (const tid of taskIds) {
+              const linked = store.getSkillsByTask(tid);
+              for (const rs of linked) {
+                if (!skillCandidateMap.has(rs.skill.id)) {
+                  skillCandidateMap.set(rs.skill.id, { name: rs.skill.name, description: rs.skill.description, skillId: rs.skill.id, source: `task:${tid}` });
+                }
+              }
+            }
+
+            const skillCandidates = [...skillCandidateMap.values()].slice(0, skillLimit);
+
+            if (skillCandidates.length > 0) {
+              const skillLines = skillCandidates.map((sc, i) => {
+                const manifest = skillInstaller.getCompanionManifest(sc.skillId);
+                let badge = "";
+                if (manifest?.installed) badge = " [installed]";
+                else if (manifest?.installMode === "install_recommended") badge = " [has scripts, install recommended]";
+                else if (manifest?.hasCompanionFiles) badge = " [has companion files]";
+                const action = `call \`skill_get(skillId="${sc.skillId}")\``;
+                return `${i + 1}. **${sc.name}**${badge} — ${sc.description.slice(0, 200)}\n   → ${action}`;
+              });
+              skillSection = "\n\n## Relevant skills from past experience\n\n" +
+                "The following skills were distilled from similar previous tasks. " +
+                "You SHOULD call `skill_get` to retrieve the full guide before attempting the task.\n\n" +
+                skillLines.join("\n\n");
+
+              ctx.log.info(`auto-recall-skill: injecting ${skillCandidates.length} skill(s): ${skillCandidates.map(s => s.name).join(", ")}`);
+              try {
+                store.recordApiLog("skill_search", { type: "auto_recall_skill", query }, JSON.stringify(skillCandidates), performance.now() - recallT0, true);
+              } catch { /* best-effort */ }
+            } else {
+              ctx.log.debug("auto-recall-skill: no matching skills found");
+            }
+          } catch (err) {
+            ctx.log.debug(`auto-recall-skill: failed: ${err}`);
+          }
+        }
+
+        if (skillSection) contextParts.push(skillSection);
         const context = contextParts.join("\n");
 
         const recallDur = performance.now() - recallT0;
         store.recordToolCall("memory_search", recallDur, true);
         store.recordApiLog("memory_search", { type: "auto_recall", query }, JSON.stringify({
-          candidates: result.hits.map(h => ({ score: h.score, role: h.source.role, summary: h.summary, content: h.original_excerpt })),
-          filtered: filteredHits.map(h => ({ score: h.score, role: h.source.role, summary: h.summary, content: h.original_excerpt }))
+          candidates: result.hits.map(h => ({ score: h.score, role: h.source.role, summary: h.summary, content: h.original_excerpt, origin: h.origin || "local" })),
+          filtered: filteredHits.map(h => ({ score: h.score, role: h.source.role, summary: h.summary, content: h.original_excerpt, origin: h.origin || "local" }))
         }), recallDur, true);
         telemetry.trackAutoRecall(filteredHits.length, recallDur);
 
-        ctx.log.info(`auto-recall: returning prependContext (${context.length} chars), sufficient=${sufficient}`);
+        ctx.log.info(`auto-recall: returning prependContext (${context.length} chars), sufficient=${sufficient}, skills=${skillSection ? "yes" : "no"}`);
 
         if (!sufficient) {
           const searchHint =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memtensor/memos-local-openclaw-plugin",
-  "version": "1.0.4-beta.10",
+  "version": "1.0.4-beta.11",
   "description": "MemOS Local memory plugin for OpenClaw — full-write, hybrid-recall, progressive retrieval",
   "type": "module",
   "main": "index.ts",

package/src/client/connector.ts

@@ -10,6 +10,7 @@ export interface HubSessionInfo {
   userToken: string;
   role: UserRole;
   connectedAt: number;
+  identityKey?: string;
 }
 
 export interface HubStatusInfo {
@@ -54,6 +55,8 @@ export async function connectToHub(store: SqliteStore, config: MemosLocalConfig,
             userToken: result.userToken,
             role: "member",
             connectedAt: Date.now(),
+            identityKey: persisted.identityKey || "",
+            lastKnownStatus: "active",
           });
           return store.getClientHubConnection()!;
         }
@@ -63,6 +66,12 @@ export async function connectToHub(store: SqliteStore, config: MemosLocalConfig,
         if (result.status === "rejected") {
           throw new Error("Join request was rejected by the Hub admin.");
         }
+        if (result.status === "blocked") {
+          throw new Error("Your account has been blocked by the Hub admin.");
+        }
+        if (result.status === "left" || result.status === "removed") {
+          log.info(`User status is "${result.status}", will try to rejoin.`);
+        }
       } catch (err) {
         if (err instanceof PendingApprovalError) throw err;
         log.warn(`registration-status check failed, falling back to autoJoinHub: ${err}`);
@@ -78,6 +87,7 @@ export async function connectToHub(store: SqliteStore, config: MemosLocalConfig,
 
   const hubUrl = normalizeHubUrl(hubAddress);
   const me = await hubRequestJson(hubUrl, userToken, "/api/v1/hub/me", { method: "GET" }) as any;
+  const persisted = store.getClientHubConnection();
   store.setClientHubConnection({
     hubUrl,
     userId: String(me.id),
@@ -85,6 +95,8 @@ export async function connectToHub(store: SqliteStore, config: MemosLocalConfig,
     userToken,
     role: String(me.role ?? "member") as UserRole,
     connectedAt: Date.now(),
+    identityKey: persisted?.identityKey || String(me.identityKey ?? ""),
+    lastKnownStatus: "active",
   });
   return store.getClientHubConnection()!;
 }
@@ -95,9 +107,13 @@ export async function getHubStatus(store: SqliteStore, config: MemosLocalConfig)
   const hubAddress = conn?.hubUrl || (configHubAddress ? normalizeHubUrl(configHubAddress) : "");
   const userToken = conn?.userToken || config.sharing?.client?.userToken || "";
 
-  // If DB has a connection to a different Hub than config, the DB data is stale
   if (conn && configHubAddress && conn.hubUrl && normalizeHubUrl(configHubAddress) !== conn.hubUrl) {
-    store.clearClientHubConnection();
+    store.setClientHubConnection({
+      ...conn,
+      hubUrl: normalizeHubUrl(configHubAddress),
+      userToken: "",
+      lastKnownStatus: "hub_changed",
+    });
     return { connected: false, user: null };
   }
 
@@ -129,6 +145,8 @@ export async function getHubStatus(store: SqliteStore, config: MemosLocalConfig)
             userToken: result.userToken,
             role: "member",
             connectedAt: Date.now(),
+            identityKey: conn.identityKey || "",
+            lastKnownStatus: "active",
           });
           const me = await hubRequestJson(normalizeHubUrl(hubAddress), result.userToken, "/api/v1/hub/me", { method: "GET" }) as any;
           return {
@@ -169,12 +187,10 @@ export async function getHubStatus(store: SqliteStore, config: MemosLocalConfig)
     const latestRole = String(me.role ?? "member") as UserRole;
     if (conn && (conn.username !== latestUsername || conn.role !== latestRole)) {
       store.setClientHubConnection({
-        hubUrl: conn.hubUrl,
-        userId: conn.userId,
+        ...conn,
         username: latestUsername,
-        userToken: conn.userToken,
         role: latestRole,
-        connectedAt: conn.connectedAt,
+        lastKnownStatus: "active",
       });
     }
     return {
@@ -190,7 +206,11 @@ export async function getHubStatus(store: SqliteStore, config: MemosLocalConfig)
   } catch (err: any) {
     const is401 = typeof err?.message === "string" && err.message.includes("(401)");
     if (is401 && conn) {
-      store.clearClientHubConnection();
+      store.setClientHubConnection({
+        ...conn,
+        userToken: "",
+        lastKnownStatus: "removed",
+      });
       return {
         connected: false,
         hubUrl: normalizeHubUrl(hubAddress),
@@ -232,12 +252,17 @@ export async function autoJoinHub(
     }
   }
 
+  const persisted = store.getClientHubConnection();
+  const existingIdentityKey = persisted?.identityKey || "";
+
   log.info(`Joining Hub at ${hubUrl} as "${username}"...`);
   const result = await hubRequestJson(hubUrl, "", "/api/v1/hub/join", {
     method: "POST",
-    body: JSON.stringify({ teamToken, username, deviceName: hostname, clientIp }),
+    body: JSON.stringify({ teamToken, username, deviceName: hostname, clientIp, identityKey: existingIdentityKey }),
   }) as any;
 
+  const returnedIdentityKey = String(result.identityKey || existingIdentityKey || "");
+
   if (result.status === "pending") {
     log.info(`Join request submitted, awaiting admin approval. userId=${result.userId}`);
     store.setClientHubConnection({
@@ -247,6 +272,8 @@ export async function autoJoinHub(
       userToken: "",
       role: "member",
       connectedAt: Date.now(),
+      identityKey: returnedIdentityKey,
+      lastKnownStatus: "pending",
     });
     throw new PendingApprovalError(result.userId);
   }
@@ -255,6 +282,10 @@ export async function autoJoinHub(
     throw new Error(`Join request was rejected by the Hub admin.`);
   }
 
+  if (result.status === "blocked") {
+    throw new Error(`Your account has been blocked by the Hub admin.`);
+  }
+
   if (!result.userToken) {
     throw new Error(`Hub join failed: ${JSON.stringify(result)}`);
   }
@@ -267,6 +298,8 @@ export async function autoJoinHub(
     userToken: result.userToken,
     role: "member",
     connectedAt: Date.now(),
+    identityKey: returnedIdentityKey,
+    lastKnownStatus: "active",
   });
   return store.getClientHubConnection()!;
 }