@memtensor/memos-local-openclaw-plugin 1.0.4-beta.2 → 1.0.4-beta.20

package/openclaw.plugin.json

@@ -1,9 +1,9 @@
 {
   "id": "memos-local-openclaw-plugin",
   "name": "MemOS Local Memory",
-  "description": "Full-write local conversation memory with hybrid search (RRF + MMR + recency). Provides memory_search, memory_get, task_summary, memory_timeline, memory_viewer for layered retrieval.",
+  "description": "Full-write local conversation memory with hybrid search (RRF + MMR + recency), task summarization, skill evolution, and team sharing (Hub-Client). Provides memory_search, memory_get, task_summary, skill_search, task_share, network_skill_pull, network_team_info, memory_viewer for layered retrieval and team collaboration.",
   "kind": "memory",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "skills": [
     "skill/memos-memory-guide"
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memtensor/memos-local-openclaw-plugin",
-  "version": "1.0.4-beta.2",
+  "version": "1.0.4-beta.20",
   "description": "MemOS Local memory plugin for OpenClaw — full-write, hybrid-recall, progressive retrieval",
   "type": "module",
   "main": "index.ts",
@@ -10,8 +10,10 @@
     "src",
     "dist",
     "skill",
+    "prebuilds",
     "scripts/postinstall.cjs",
     "openclaw.plugin.json",
+    "telemetry.credentials.json",
     "README.md",
     ".env.example"
   ],
@@ -50,7 +52,6 @@
     "@huggingface/transformers": "^3.8.0",
     "@sinclair/typebox": "^0.34.48",
     "better-sqlite3": "^12.6.2",
-    "posthog-node": "^5.28.0",
     "puppeteer": "^24.38.0",
     "semver": "^7.7.4",
     "uuid": "^10.0.0"

package/scripts/postinstall.cjs

@@ -112,7 +112,7 @@ try {
 function ensureDependencies() {
   phase(0, "检测核心依赖 / Check core dependencies");
 
-  const coreDeps = ["@sinclair/typebox", "uuid", "posthog-node", "@huggingface/transformers"];
+  const coreDeps = ["@sinclair/typebox", "uuid", "@huggingface/transformers"];
   const missing = [];
   for (const dep of coreDeps) {
     try {

package/skill/memos-memory-guide/SKILL.md

@@ -1,17 +1,22 @@
 ---
 name: memos-memory-guide
-description: "Use the MemOS Local memory system to search and use the user's past conversations. Use this skill whenever the user refers to past chats, their own preferences or history, or when you need to answer from prior context. When auto-recall returns nothing (long or unclear user query), generate your own short search query and call memory_search. Available tools: memory_search, memory_get, memory_write_public, task_summary, skill_get, skill_search, skill_install, skill_publish, skill_unpublish, memory_timeline, memory_viewer."
+description: "Use the MemOS Local memory system to search and use the user's past conversations. Use this skill whenever the user refers to past chats, their own preferences or history, or when you need to answer from prior context. When auto-recall returns nothing (long or unclear user query), generate your own short search query and call memory_search. Available tools: memory_search, memory_get, memory_write_public, memory_share, memory_unshare, task_summary, skill_get, skill_search, skill_install, skill_publish, skill_unpublish, network_memory_detail, network_skill_pull, network_team_info, memory_timeline, memory_viewer."
 ---
 
 # MemOS Local Memory — Agent Guide
 
-This skill describes how to use the MemOS memory tools so you can reliably search and use the user's long-term conversation history, query Hub-shared team data, share tasks, and discover or pull reusable skills.
+This skill describes how to use the MemOS memory tools so you can reliably search and use the user's long-term conversation history, query team-shared data, share tasks, and discover or pull reusable skills.
+
+Two sharing planes exist and must not be confused:
+
+- **Local agent sharing:** visible to agents in the same OpenClaw workspace only.
+- **Team sharing:** visible to teammates through the configured team server.
 
 ## How memory is provided each turn
 
 - **Automatic recall (hook):** At the start of each turn, the system runs a memory search using the user's current message and injects relevant past memories into your context. You do not need to call any tool for that.
 - **When that is not enough:** If the user's message is very long, vague, or the automatic search returns **no memories**, you should **generate your own short, focused query** and call `memory_search` yourself.
-- **Memory isolation:** Each agent can only see its own local private memories and local `public` memories. Hub-shared data only appears when you search with `scope="group"` or `scope="all"`.
+- **Memory isolation:** Each agent can only see its own local private memories and local `public` memories. Team-shared data only appears when you search with `scope="group"` or `scope="all"`.
 
 ## Tools — what they do and when to call
 
@@ -24,9 +29,10 @@ This skill describes how to use the MemOS memory tools so you can reliably searc
   - You need to search with a different angle (e.g. filter by `role='user'`).
 - **Parameters:**
   - `query` (string, **required**) — Natural language search query.
-  - `maxResults` (number, optional) — Max results, default 20, max 20.
-  - `minScore` (number, optional) — Minimum score 0–1, default 0.45, floor 0.35.
-  - `role` (string, optional) — Filter by role: `'user'`, `'assistant'`, or `'tool'`. Use `'user'` to find what the user said.
+  - `scope` (string, optional) — `'local'` (default) for current agent + local shared memories, or `'group'` / `'all'` to include team-shared memories.
+  - `maxResults` (number, optional) — Increase when the first search is too narrow.
+  - `minScore` (number, optional) — Lower slightly if recall is too strict.
+  - `role` (string, optional) — Filter local results by `'user'`, `'assistant'`, `'tool'`, or `'system'`.
 
 ### memory_get
 
@@ -38,12 +44,32 @@ This skill describes how to use the MemOS memory tools so you can reliably searc
 
 ### memory_write_public
 
-- **What it does:** Write a piece of information to public memory. Public memories are visible to all agents during `memory_search`. Use for shared knowledge, team decisions, or cross-agent coordination information.
-- **When to call:** In multi-agent or collaborative scenarios, when you have persistent information useful to everyone (e.g. shared decisions, conventions, configurations, workflows). Do not write session-only or purely private content.
+- **What it does:** Create a brand new local shared memory. These memories are visible to all agents in the same OpenClaw workspace during `memory_search`. This does **not** publish anything to the team server.
+- **When to call:** In multi-agent or collaborative scenarios, when you want to create a new persistent shared note from scratch (e.g. shared decisions, conventions, configurations, workflows). Do not use it if you already have a specific memory chunk to expose.
 - **Parameters:**
-  - `content` (string, **required**) — The content to write to public memory.
+  - `content` (string, **required**) — The content to write to local shared memory.
   - `summary` (string, optional) — Short summary of the content.
 
+### memory_share
+
+- **What it does:** Share an existing memory either with local OpenClaw agents, to the team, or to both.
+- **When to call:** You already have a useful memory chunk and want to expose it beyond the current agent.
+- **Do not use when:** You are creating a new shared note from scratch. In that case use `memory_write_public`.
+- **Parameters:**
+  - `chunkId` (string, **required**) — Existing memory chunk ID.
+  - `target` (string, optional) — `'agents'` (default), `'hub'`, or `'both'`.
+  - `visibility` (string, optional) — Team visibility when target includes team: `'public'` (default) or `'group'`.
+  - `groupId` (string, optional) — Optional team group ID when `visibility='group'`.
+
+### memory_unshare
+
+- **What it does:** Remove an existing memory from local agent sharing, team sharing, or both.
+- **When to call:** A memory should no longer be visible outside the current agent or should be removed from the team.
+- **Parameters:**
+  - `chunkId` (string, **required**) — Existing memory chunk ID.
+  - `target` (string, optional) — `'agents'`, `'hub'`, or `'all'` (default).
+  - `privateOwner` (string, optional) — Rare fallback only for older public memories that have no recorded original owner.
+
 ### task_summary
 
 - **What it does:** Get the detailed summary of a complete task: title, status, narrative summary, and related skills. Use when `memory_search` returns a hit with a `task_id` and you need the full story. Preserves critical information: URLs, file paths, commands, error codes, step-by-step instructions.
@@ -62,11 +88,11 @@ This skill describes how to use the MemOS memory tools so you can reliably searc
 
 ### skill_search
 
-- **What it does:** Search available skills by natural language. Searches your own skills, public skills, or both — controlled by the `scope` parameter.
+- **What it does:** Search available skills by natural language. Searches your own skills, local shared skills, or both. It can also include team skills.
 - **When to call:** The current task requires a capability or guide you don't have. Use `skill_search` to find one first; after finding it, use `skill_get` to read it, then `skill_install` to load it for future turns.
 - **Parameters:**
   - `query` (string, **required**) — Natural language description of the needed skill.
-  - `scope` (string, optional) — Search scope: `'mix'` (default, self + public), `'self'` (own only), `'public'` (public only).
+  - `scope` (string, optional) — `'mix'` (default, self + local shared), `'self'`, `'public'` (local shared only), or `'group'` / `'all'` to include team results.
 
 ### skill_install
 
@@ -77,40 +103,46 @@ This skill describes how to use the MemOS memory tools so you can reliably searc
 
 ### skill_publish
 
-- **What it does:** Make a skill public so other agents can discover and install it via `skill_search`.
-- **When to call:** You have a useful skill that other agents could benefit from, and you want to share it.
+- **What it does:** Share a skill with local agents, or publish it to the team.
+- **When to call:** You have a useful skill that other agents or your team could benefit from.
 - **Parameters:**
   - `skillId` (string, **required**) — The skill ID to publish.
+  - `target` (string, optional) — `'agents'` (default) or `'hub'`.
+  - `visibility` (string, optional) — When `target='hub'`, use `'public'` (default) or `'group'`.
+  - `groupId` (string, optional) — Optional team group ID when `target='hub'` and `visibility='group'`.
+  - `scope` (string, optional) — Backward-compatible alias for old calls. Prefer `target` + `visibility` in new calls.
 
 ### skill_unpublish
 
-- **What it does:** Make a skill private again. Other agents will no longer be able to discover it.
+- **What it does:** Stop local agent sharing, remove a team-published copy, or do both.
 - **When to call:** You want to stop sharing a previously published skill.
 - **Parameters:**
   - `skillId` (string, **required**) — The skill ID to unpublish.
+  - `target` (string, optional) — `'agents'` (default), `'hub'`, or `'all'`.
 
 ### network_memory_detail
 
-- **What it does:** Fetches the full content behind a Hub search hit.
-- **When to call:** A `memory_search` result came from the Hub and you need the full shared memory content.
+- **What it does:** Fetches the full content behind a team search hit.
+- **When to call:** A `memory_search` result came from the team and you need the full shared memory content.
 - **Parameters:** `remoteHitId`.
 
 ### task_share / task_unshare
 
-- **What they do:** Share a local task to the Hub, or remove it later.
+- **What they do:** Share a local task to the team, or remove it later.
 - **When to call:** A task is valuable to your group or to the whole team and should be discoverable via shared search.
 - **Parameters:** `taskId`, plus sharing visibility/scope when required.
 
 ### network_skill_pull
 
-- **What it does:** Pulls a Hub-shared skill bundle down into local storage.
-- **When to call:** `skill_search` found a useful Hub skill and you want to use it locally or offline.
+- **What it does:** Pulls a team-shared skill bundle down into local storage.
+- **When to call:** `skill_search` found a useful team skill and you want to use it locally or offline.
 - **Parameters:** `skillId`.
 
 ### network_team_info
 
-- **What it does:** Returns current Hub connection information, user, role, and groups.
+- **What it does:** Returns current team server connection information, user, role, and groups.
 - **When to call:** You need to confirm whether team sharing is configured or which groups the current client belongs to.
+- **Call this first before:** `memory_share(... target='hub'|'both')`, `memory_unshare(... target='hub'|'all')`, `task_share`, `task_unshare`, `skill_publish(... target='hub')`, `skill_unpublish(... target='hub'|'all')`, or `network_skill_pull`.
 - **Parameters:** none.
 
 ### memory_timeline
@@ -147,13 +179,19 @@ This skill describes how to use the MemOS memory tools so you can reliably searc
 6. **You need a capability/guide that you don't have**
    → Call `skill_search(query="...", scope="mix")` to discover available skills.
 
-7. **You have shared knowledge useful to all agents**
-   → Call `memory_write_public(content="...")` to persist it in public memory.
+7. **You have new shared knowledge useful to all local agents**
+   → Call `memory_write_public(content="...")`.
+
+8. **You already have an existing memory chunk and want to expose or hide it**
+   → Call `memory_share(chunkId="...", target="agents|hub|both")` or `memory_unshare(chunkId="...", target="agents|hub|all")`.
+
+9. **You are about to do anything team-sharing-related**
+   → Call `network_team_info()` first if team server availability is uncertain.
 
-8. **You want to share/stop sharing a skill with other agents**
-   → Call `skill_publish(skillId="...")` or `skill_unpublish(skillId="...")`.
+10. **You want to share/stop sharing a skill with local agents or team**
+   → Prefer `skill_publish(skillId="...", target="agents|hub", visibility=...)` and `skill_unpublish(skillId="...", target="agents|hub|all")`.
 
-9. **User asks where to see or manage their memories**
+11. **User asks where to see or manage their memories**
    → Call `memory_viewer()` and share the URL.
 
 ## Writing good search queries
@@ -168,6 +206,6 @@ This skill describes how to use the MemOS memory tools so you can reliably searc
 Each memory is tagged with an `owner` (e.g. `agent:main`, `agent:sales-bot`). This is handled **automatically** — you do not need to pass any owner parameter.
 
 - **Your memories:** All tools (`memory_search`, `memory_get`, `memory_timeline`) automatically scope queries to your agent's own memories.
-- **Public memories:** Memories marked as `public` are visible to all agents. Use `memory_write_public` to write shared knowledge.
+- **Local shared memories:** Memories marked as local shared are visible to all agents in the same OpenClaw workspace. Use `memory_write_public` to create them, or `memory_share(target='agents')` to expose an existing chunk.
 - **Cross-agent isolation:** You cannot see memories owned by other agents (unless they are public).
 - **How it works:** The system identifies your agent ID from the OpenClaw runtime context and applies owner filtering automatically on every search, recall, and retrieval.

package/src/capture/index.ts

@@ -33,6 +33,9 @@ const SENTINEL_FAST_RE = new RegExp(
 const ENVELOPE_PREFIX_RE =
   /^\s*\[(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}(?::\d{2})?\s+[A-Z]{3}[+-]\d{1,2}\]\s*/;
 
+const ENVELOPE_EXTRACT_RE =
+  /^\s*\[(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s+(\d{4}-\d{2}-\d{2})\s+(\d{2}:\d{2}(?::\d{2})?)\s+([A-Z]{3}[+-]\d{1,2})\]/;
+
 /**
  * Extract writable messages from a conversation turn.
  *
@@ -47,9 +50,11 @@ export function captureMessages(
   evidenceTag: string,
   log: Logger,
   owner?: string,
+  userSearchTime?: number,
 ): ConversationMessage[] {
   const now = Date.now();
   const result: ConversationMessage[] = [];
+  let lastTimestamp = 0;
 
   for (const msg of messages) {
     const role = msg.role as Role;
@@ -70,14 +75,24 @@ export function captureMessages(
     if (role === "user") {
       content = stripInboundMetadata(content);
     } else {
+      content = stripThinkingTags(content);
       content = stripEvidenceWrappers(content, evidenceTag);
     }
     if (!content.trim()) continue;
 
+    let ts: number;
+    if (role === "user" && userSearchTime && userSearchTime > 0) {
+      ts = userSearchTime;
+    } else {
+      ts = now;
+    }
+    if (ts <= lastTimestamp) ts = lastTimestamp + 1;
+    lastTimestamp = ts;
+
     result.push({
       role,
       content,
-      timestamp: now,
+      timestamp: ts,
       turnId,
       sessionKey,
       toolName: role === "tool" ? msg.toolName : undefined,
@@ -149,6 +164,30 @@ export function stripInboundMetadata(text: string): string {
   return stripEnvelopePrefix(result.join("\n")).trim();
 }
 
+/** Strip <think…>…</think> blocks emitted by DeepSeek-style reasoning models. */
+const THINKING_TAG_RE = /<think[\s>][\s\S]*?<\/think>\s*/gi;
+
+/** Unwrap <final>…</final> tags from MiniMax-style models (keep content, strip tags). */
+const FINAL_TAG_RE = /<\/?final\s*>/gi;
+
+function stripThinkingTags(text: string): string {
+  return text.replace(THINKING_TAG_RE, "").replace(FINAL_TAG_RE, "").trim();
+}
+
+function extractEnvelopeTimestamp(text: string): number | null {
+  const m = ENVELOPE_EXTRACT_RE.exec(text);
+  if (!m) return null;
+  const [, date, time, tz] = m;
+  const timeStr = time.includes(":") && time.split(":").length === 3 ? time : time + ":00";
+  const offsetMatch = tz.match(/([+-])(\d{1,2})$/);
+  const offsetStr = offsetMatch
+    ? `${offsetMatch[1]}${offsetMatch[2].padStart(2, "0")}:00`
+    : "+00:00";
+  const iso = `${date}T${timeStr}${offsetStr}`;
+  const ts = new Date(iso).getTime();
+  return Number.isNaN(ts) ? null : ts;
+}
+
 function stripEnvelopePrefix(text: string): string {
   return text.replace(ENVELOPE_PREFIX_RE, "");
 }

package/src/client/connector.ts

@@ -1,5 +1,5 @@
 import type { Logger, MemosLocalConfig } from "../types";
-import type { GroupInfo, UserRole, UserStatus } from "../sharing/types";
+import type { UserRole, UserStatus } from "../sharing/types";
 import type { SqliteStore } from "../storage/sqlite";
 import { hubRequestJson, normalizeHubUrl } from "./hub";
 
@@ -10,6 +10,7 @@ export interface HubSessionInfo {
   userToken: string;
   role: UserRole;
   connectedAt: number;
+  identityKey?: string;
 }
 
 export interface HubStatusInfo {
@@ -20,7 +21,7 @@ export interface HubStatusInfo {
     username: string;
     role: UserRole;
     status: UserStatus | string;
-    groups: GroupInfo[];
+    groups?: Array<{ id: string; name: string }>;
   };
 }
 
@@ -35,6 +36,49 @@ export async function connectToHub(store: SqliteStore, config: MemosLocalConfig,
 
   if (!userToken && config.sharing?.client?.teamToken) {
     if (!log) throw new Error("hub client connection is not configured (no userToken, has teamToken but no logger for auto-join)");
+
+    // If DB has a pending connection (userId exists, no token), check registration-status first
+    const persisted = store.getClientHubConnection();
+    if (persisted?.userId && !persisted.userToken && hubAddress) {
+      const hubUrl = normalizeHubUrl(hubAddress);
+      const teamToken = config.sharing.client!.teamToken!;
+      try {
+        const result = await hubRequestJson(hubUrl, "", "/api/v1/hub/registration-status", {
+          method: "POST",
+          body: JSON.stringify({ teamToken, userId: persisted.userId }),
+        }) as any;
+        if (result.status === "active" && result.userToken) {
+          log.info(`Pending user approved! Connecting with token. userId=${persisted.userId}`);
+          store.setClientHubConnection({
+            hubUrl,
+            userId: persisted.userId,
+            username: persisted.username || "",
+            userToken: result.userToken,
+            role: "member",
+            connectedAt: Date.now(),
+            identityKey: persisted.identityKey || "",
+            lastKnownStatus: "active",
+          });
+          return store.getClientHubConnection()!;
+        }
+        if (result.status === "pending") {
+          throw new PendingApprovalError(persisted.userId);
+        }
+        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}`);
+      }
+    }
+
     return autoJoinHub(store, config, log);
   }
 
@@ -44,6 +88,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),
@@ -51,22 +96,35 @@ 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()!;
 }
 
 export async function getHubStatus(store: SqliteStore, config: MemosLocalConfig): Promise<HubStatusInfo> {
   const conn = store.getClientHubConnection();
-  const hubAddress = conn?.hubUrl || config.sharing?.client?.hubAddress || "";
+  const configHubAddress = config.sharing?.client?.hubAddress || "";
+  const hubAddress = conn?.hubUrl || (configHubAddress ? normalizeHubUrl(configHubAddress) : "");
   const userToken = conn?.userToken || config.sharing?.client?.userToken || "";
 
+  if (conn && configHubAddress && conn.hubUrl && normalizeHubUrl(configHubAddress) !== conn.hubUrl) {
+    store.setClientHubConnection({
+      ...conn,
+      hubUrl: normalizeHubUrl(configHubAddress),
+      userToken: "",
+      lastKnownStatus: "hub_changed",
+    });
+    return { connected: false, user: null };
+  }
+
   if (conn && conn.userId && (!userToken || userToken === "")) {
     const teamToken = config.sharing?.client?.teamToken ?? "";
     if (hubAddress && teamToken) {
       try {
-        const result = await hubRequestJson(normalizeHubUrl(hubAddress), "", "/api/v1/hub/join", {
+        const result = await hubRequestJson(normalizeHubUrl(hubAddress), "", "/api/v1/hub/registration-status", {
           method: "POST",
-          body: JSON.stringify({ teamToken, username: conn.username || "user" }),
+          body: JSON.stringify({ teamToken, userId: conn.userId }),
         }) as any;
         if (result.status === "pending") {
           return {
@@ -77,18 +135,19 @@ export async function getHubStatus(store: SqliteStore, config: MemosLocalConfig)
               username: conn.username || "",
               role: "member",
               status: "pending",
-              groups: [],
             },
           };
         }
         if (result.status === "active" && result.userToken) {
           store.setClientHubConnection({
             hubUrl: normalizeHubUrl(hubAddress),
-            userId: String(result.userId),
+            userId: conn.userId,
             username: conn.username || "",
             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 {
@@ -99,13 +158,6 @@ export async function getHubStatus(store: SqliteStore, config: MemosLocalConfig)
               username: String(me.username ?? ""),
               role: String(me.role ?? "member") as UserRole,
               status: String(me.status ?? "active"),
-              groups: Array.isArray(me.groups)
-                ? me.groups.map((group: any) => ({
-                    id: String(group.id),
-                    name: String(group.name),
-                    description: typeof group.description === "string" ? group.description : undefined,
-                  }))
-                : [],
             },
           };
         }
@@ -118,7 +170,6 @@ export async function getHubStatus(store: SqliteStore, config: MemosLocalConfig)
               username: conn.username || "",
               role: "member",
               status: "rejected",
-              groups: [],
             },
           };
         }
@@ -133,24 +184,81 @@ export async function getHubStatus(store: SqliteStore, config: MemosLocalConfig)
 
   try {
     const me = await hubRequestJson(normalizeHubUrl(hubAddress), userToken, "/api/v1/hub/me", { method: "GET" }) as any;
+    const latestUsername = String(me.username ?? "");
+    const latestRole = String(me.role ?? "member") as UserRole;
+    if (conn && (conn.username !== latestUsername || conn.role !== latestRole)) {
+      store.setClientHubConnection({
+        ...conn,
+        username: latestUsername,
+        role: latestRole,
+        lastKnownStatus: "active",
+      });
+    }
     return {
       connected: true,
       hubUrl: normalizeHubUrl(hubAddress),
       user: {
         id: String(me.id),
-        username: String(me.username ?? ""),
-        role: String(me.role ?? "member") as UserRole,
+        username: latestUsername,
+        role: latestRole,
         status: String(me.status ?? "active"),
-        groups: Array.isArray(me.groups)
-          ? me.groups.map((group: any) => ({
-              id: String(group.id),
-              name: String(group.name),
-              description: typeof group.description === "string" ? group.description : undefined,
-            }))
-          : [],
+        groups: Array.isArray(me.groups) ? me.groups : [],
       },
     };
-  } catch {
+  } catch (err: any) {
+    const is401 = typeof err?.message === "string" && err.message.includes("(401)");
+    if (is401 && conn) {
+      const teamToken = config.sharing?.client?.teamToken ?? "";
+      if (hubAddress && teamToken) {
+        try {
+          const regResult = await hubRequestJson(normalizeHubUrl(hubAddress), "", "/api/v1/hub/registration-status", {
+            method: "POST",
+            body: JSON.stringify({ teamToken, userId: conn.userId }),
+          }) as any;
+          if (regResult.status === "active" && regResult.userToken) {
+            store.setClientHubConnection({
+              ...conn,
+              hubUrl: normalizeHubUrl(hubAddress),
+              userToken: regResult.userToken,
+              connectedAt: Date.now(),
+              lastKnownStatus: "active",
+            });
+            try {
+              const me = await hubRequestJson(normalizeHubUrl(hubAddress), regResult.userToken, "/api/v1/hub/me", { method: "GET" }) as any;
+              return {
+                connected: true,
+                hubUrl: normalizeHubUrl(hubAddress),
+                user: {
+                  id: String(me.id),
+                  username: String(me.username ?? ""),
+                  role: String(me.role ?? "member") as UserRole,
+                  status: String(me.status ?? "active"),
+                  groups: Array.isArray(me.groups) ? me.groups : [],
+                },
+              };
+            } catch { /* fall through to token-only return */ }
+            return {
+              connected: true,
+              hubUrl: normalizeHubUrl(hubAddress),
+              user: { id: conn.userId, username: conn.username || "", role: conn.role as UserRole || "member", status: "active" },
+            };
+          }
+          const realStatus = regResult.status as string;
+          store.setClientHubConnection({ ...conn, userToken: "", lastKnownStatus: realStatus });
+          return {
+            connected: false,
+            hubUrl: normalizeHubUrl(hubAddress),
+            user: { id: conn.userId, username: conn.username || "", role: "member", status: realStatus },
+          };
+        } catch { /* registration-status also failed, fall through */ }
+      }
+      store.setClientHubConnection({ ...conn, userToken: "", lastKnownStatus: "token_expired" });
+      return {
+        connected: false,
+        hubUrl: normalizeHubUrl(hubAddress),
+        user: { id: conn.userId, username: conn.username || "", role: "member", status: "token_expired" },
+      };
+    }
     return { connected: false, user: null };
   }
 }
@@ -166,15 +274,32 @@ export async function autoJoinHub(
     throw new Error("hubAddress and teamToken are required for auto-join");
   }
   const hubUrl = normalizeHubUrl(hubAddress);
-  const hostname = typeof globalThis.process !== "undefined" ? (await import("os")).hostname() : "unknown";
-  const username = typeof globalThis.process !== "undefined" ? (await import("os")).userInfo().username : "user";
+  const osModule = typeof globalThis.process !== "undefined" ? await import("os") : null;
+  const hostname = osModule ? osModule.hostname() : "unknown";
+  const nickname = config.sharing?.client?.nickname;
+  const username = nickname || (osModule ? osModule.userInfo().username : "user");
+  let clientIp = "";
+  if (osModule) {
+    const nets = osModule.networkInterfaces();
+    for (const name of Object.keys(nets)) {
+      for (const net of nets[name] ?? []) {
+        if (net.family === "IPv4" && !net.internal) { clientIp = net.address; break; }
+      }
+      if (clientIp) break;
+    }
+  }
+
+  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 }),
+    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({
@@ -184,6 +309,8 @@ export async function autoJoinHub(
       userToken: "",
       role: "member",
       connectedAt: Date.now(),
+      identityKey: returnedIdentityKey,
+      lastKnownStatus: "pending",
     });
     throw new PendingApprovalError(result.userId);
   }
@@ -192,6 +319,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)}`);
   }
@@ -204,6 +335,8 @@ export async function autoJoinHub(
     userToken: result.userToken,
     role: "member",
     connectedAt: Date.now(),
+    identityKey: returnedIdentityKey,
+    lastKnownStatus: "active",
   });
   return store.getClientHubConnection()!;
 }

package/src/client/hub.ts

@@ -157,16 +157,34 @@ export async function hubUpdateUsername(
   return result;
 }
 
+let _cachedClientIp: string | null = null;
+function getClientIp(): string {
+  if (_cachedClientIp !== null) return _cachedClientIp;
+  try {
+    const os = require("os");
+    const nets = os.networkInterfaces();
+    for (const name of Object.keys(nets)) {
+      for (const net of nets[name] ?? []) {
+        if (net.family === "IPv4" && !net.internal) { _cachedClientIp = net.address; return _cachedClientIp!; }
+      }
+    }
+  } catch { /* browser or no os module */ }
+  _cachedClientIp = "";
+  return "";
+}
+
 export async function hubRequestJson(
   hubUrl: string,
   userToken: string,
   route: string,
   init: RequestInit = {},
 ): Promise<unknown> {
+  const clientIp = getClientIp();
   const res = await fetch(`${normalizeHubUrl(hubUrl)}${route}`, {
     ...init,
     headers: {
       authorization: `Bearer ${userToken}`,
+      ...(clientIp ? { "x-client-ip": clientIp } : {}),
       ...(init.body ? { "content-type": "application/json" } : {}),
       ...(init.headers ?? {}),
     },