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

package/src/storage/sqlite.ts

@@ -3,7 +3,7 @@ import { createHash } from "crypto";
 import * as fs from "fs";
 import * as path from "path";
 import type { Chunk, ChunkRef, DedupStatus, Task, TaskStatus, Skill, SkillStatus, SkillVisibility, SkillVersion, TaskSkillLink, TaskSkillRelation, Logger } from "../types";
-import type { GroupInfo, SharedVisibility, UserInfo, UserRole, UserStatus } from "../sharing/types";
+import type { SharedVisibility, UserInfo, UserRole, UserStatus } from "../sharing/types";
 
 export class SqliteStore {
   private db: Database.Database;
@@ -112,6 +112,10 @@ export class SqliteStore {
     this.migrateSkillEmbeddingsAndFts();
     this.migrateFtsToTrigram();
     this.migrateHubTables();
+    this.migrateHubFtsToTrigram();
+    this.migrateLocalSharedTasksOwner();
+    this.migrateHubUserIdentityFields();
+    this.migrateClientHubConnectionIdentityFields();
     this.log.debug("Database schema initialized");
   }
 
@@ -119,6 +123,59 @@ export class SqliteStore {
     this.db.exec("CREATE INDEX IF NOT EXISTS idx_chunks_dedup_created ON chunks(dedup_status, created_at DESC)");
   }
 
+  private migrateLocalSharedTasksOwner(): void {
+    try {
+      const cols = this.db.prepare("PRAGMA table_info(local_shared_tasks)").all() as Array<{ name: string }>;
+      if (cols.length > 0 && !cols.some((c) => c.name === "original_owner")) {
+        this.db.exec("ALTER TABLE local_shared_tasks ADD COLUMN original_owner TEXT NOT NULL DEFAULT 'agent:main'");
+        this.log.info("Migrated: added original_owner column to local_shared_tasks");
+      }
+    } catch { /* table may not exist yet */ }
+  }
+
+  private migrateHubUserIdentityFields(): void {
+    try {
+      const cols = this.db.prepare("PRAGMA table_info(hub_users)").all() as Array<{ name: string }>;
+      if (cols.length === 0) return;
+      if (!cols.some(c => c.name === "identity_key")) {
+        this.db.exec("ALTER TABLE hub_users ADD COLUMN identity_key TEXT NOT NULL DEFAULT ''");
+        this.db.exec("CREATE INDEX IF NOT EXISTS idx_hub_users_identity_key ON hub_users(identity_key)");
+        this.log.info("Migrated: added identity_key to hub_users");
+      }
+      if (!cols.some(c => c.name === "left_at")) {
+        this.db.exec("ALTER TABLE hub_users ADD COLUMN left_at INTEGER");
+        this.log.info("Migrated: added left_at to hub_users");
+      }
+      if (!cols.some(c => c.name === "removed_at")) {
+        this.db.exec("ALTER TABLE hub_users ADD COLUMN removed_at INTEGER");
+        this.log.info("Migrated: added removed_at to hub_users");
+      }
+      if (!cols.some(c => c.name === "rejected_at")) {
+        this.db.exec("ALTER TABLE hub_users ADD COLUMN rejected_at INTEGER");
+        this.log.info("Migrated: added rejected_at to hub_users");
+      }
+      if (!cols.some(c => c.name === "rejoin_requested_at")) {
+        this.db.exec("ALTER TABLE hub_users ADD COLUMN rejoin_requested_at INTEGER");
+        this.log.info("Migrated: added rejoin_requested_at to hub_users");
+      }
+    } catch { /* table may not exist yet */ }
+  }
+
+  private migrateClientHubConnectionIdentityFields(): void {
+    try {
+      const cols = this.db.prepare("PRAGMA table_info(client_hub_connection)").all() as Array<{ name: string }>;
+      if (cols.length === 0) return;
+      if (!cols.some(c => c.name === "identity_key")) {
+        this.db.exec("ALTER TABLE client_hub_connection ADD COLUMN identity_key TEXT NOT NULL DEFAULT ''");
+        this.log.info("Migrated: added identity_key to client_hub_connection");
+      }
+      if (!cols.some(c => c.name === "last_known_status")) {
+        this.db.exec("ALTER TABLE client_hub_connection ADD COLUMN last_known_status TEXT NOT NULL DEFAULT ''");
+        this.log.info("Migrated: added last_known_status to client_hub_connection");
+      }
+    } catch { /* table may not exist yet */ }
+  }
+
   private migrateOwnerFields(): void {
     const chunkCols = this.db.prepare("PRAGMA table_info(chunks)").all() as Array<{ name: string }>;
     if (!chunkCols.some((c) => c.name === "owner")) {
@@ -273,6 +330,51 @@ export class SqliteStore {
     }
   }
 
+  private migrateHubFtsToTrigram(): void {
+    const tables: Array<{ fts: string; source: string; columns: string; triggers: string[] }> = [
+      {
+        fts: "hub_chunks_fts", source: "hub_chunks", columns: "summary, content",
+        triggers: ["hub_chunks_ai", "hub_chunks_ad", "hub_chunks_au"],
+      },
+      {
+        fts: "hub_skills_fts", source: "hub_skills", columns: "name, description",
+        triggers: ["hub_skills_ai", "hub_skills_ad", "hub_skills_au"],
+      },
+      {
+        fts: "hub_memories_fts", source: "hub_memories", columns: "summary, content",
+        triggers: ["hub_memories_ai", "hub_memories_ad", "hub_memories_au"],
+      },
+    ];
+    for (const t of tables) {
+      try {
+        const row = this.db.prepare(`SELECT sql FROM sqlite_master WHERE name='${t.fts}'`).get() as { sql: string } | undefined;
+        if (!row || !row.sql) continue;
+        if (row.sql.includes("trigram")) continue;
+        this.log.info(`Migrating ${t.fts} to trigram tokenizer...`);
+        for (const tr of t.triggers) this.db.exec(`DROP TRIGGER IF EXISTS ${tr}`);
+        this.db.exec(`DROP TABLE IF EXISTS ${t.fts}`);
+        this.db.exec(`CREATE VIRTUAL TABLE ${t.fts} USING fts5(${t.columns}, content='${t.source}', content_rowid='rowid', tokenize='trigram')`);
+        this.db.exec(`
+          CREATE TRIGGER ${t.triggers[0]} AFTER INSERT ON ${t.source} BEGIN
+            INSERT INTO ${t.fts}(rowid, ${t.columns}) VALUES (new.rowid, ${t.columns.split(", ").map(c => "new." + c).join(", ")});
+          END;
+          CREATE TRIGGER ${t.triggers[1]} AFTER DELETE ON ${t.source} BEGIN
+            INSERT INTO ${t.fts}(${t.fts}, rowid, ${t.columns}) VALUES ('delete', old.rowid, ${t.columns.split(", ").map(c => "old." + c).join(", ")});
+          END;
+          CREATE TRIGGER ${t.triggers[2]} AFTER UPDATE ON ${t.source} BEGIN
+            INSERT INTO ${t.fts}(${t.fts}, rowid, ${t.columns}) VALUES ('delete', old.rowid, ${t.columns.split(", ").map(c => "old." + c).join(", ")});
+            INSERT INTO ${t.fts}(rowid, ${t.columns}) VALUES (new.rowid, ${t.columns.split(", ").map(c => "new." + c).join(", ")});
+          END
+        `);
+        this.db.exec(`INSERT INTO ${t.fts}(rowid, ${t.columns}) SELECT rowid, ${t.columns} FROM ${t.source}`);
+        const cnt = (this.db.prepare(`SELECT COUNT(*) as c FROM ${t.fts}`).get() as { c: number }).c;
+        this.log.info(`Migrated ${t.fts} to trigram: ${cnt} rows indexed`);
+      } catch (err) {
+        this.log.warn(`Failed to migrate ${t.fts} to trigram: ${err}`);
+      }
+    }
+  }
+
   private migrateTaskId(): void {
     const cols = this.db.prepare("PRAGMA table_info(chunks)").all() as Array<{ name: string }>;
     if (!cols.some((c) => c.name === "task_id")) {
@@ -516,12 +618,13 @@ export class SqliteStore {
     ).run(toolName, Math.round(durationMs), success ? 1 : 0, Date.now());
   }
 
-  getToolMetrics(minutes: number): {
+  getToolMetrics(minutes: number, fromMs?: number, toMs?: number): {
     tools: string[];
     series: Array<{ minute: string; [tool: string]: number | string }>;
     aggregated: Array<{ tool: string; totalCalls: number; avgMs: number; p95Ms: number; errorCount: number }>;
   } {
-    const since = Date.now() - minutes * 60 * 1000;
+    const since = fromMs ?? (Date.now() - minutes * 60 * 1000);
+    const until = toMs ?? Date.now();
 
     const rows = this.db.prepare(
       `SELECT tool_name,
@@ -529,9 +632,9 @@ export class SqliteStore {
               success,
               strftime('%Y-%m-%d %H:%M', called_at/1000, 'unixepoch', 'localtime') as minute_key
        FROM tool_calls
-       WHERE called_at >= ?
+       WHERE called_at >= ? AND called_at <= ?
        ORDER BY called_at`,
-    ).all(since) as Array<{ tool_name: string; duration_ms: number; success: number; minute_key: string }>;
+    ).all(since, until) as Array<{ tool_name: string; duration_ms: number; success: number; minute_key: string }>;
 
     const toolSet = new Set<string>();
     const minuteMap = new Map<string, Map<string, { total: number; count: number }>>();
@@ -683,33 +786,49 @@ export class SqliteStore {
         shared_at     INTEGER NOT NULL
       );
 
+      CREATE TABLE IF NOT EXISTS local_shared_memories (
+        chunk_id        TEXT PRIMARY KEY REFERENCES chunks(id) ON DELETE CASCADE,
+        original_owner  TEXT NOT NULL,
+        shared_at       INTEGER NOT NULL
+      );
+
+      -- Client: team share UI metadata only (no hub_memories row — avoids local FTS/embed recall duplication)
+      CREATE TABLE IF NOT EXISTS team_shared_chunks (
+        chunk_id       TEXT PRIMARY KEY REFERENCES chunks(id) ON DELETE CASCADE,
+        hub_memory_id  TEXT NOT NULL DEFAULT '',
+        visibility     TEXT NOT NULL DEFAULT 'public',
+        group_id       TEXT,
+        shared_at      INTEGER NOT NULL
+      );
+
       CREATE TABLE IF NOT EXISTS hub_users (
-        id          TEXT PRIMARY KEY,
-        username    TEXT NOT NULL UNIQUE,
-        device_name TEXT NOT NULL DEFAULT '',
-        role        TEXT NOT NULL,
-        status      TEXT NOT NULL,
-        token_hash  TEXT NOT NULL DEFAULT '',
-        created_at  INTEGER NOT NULL,
-        approved_at INTEGER
+        id             TEXT PRIMARY KEY,
+        username       TEXT NOT NULL UNIQUE,
+        device_name    TEXT NOT NULL DEFAULT '',
+        role           TEXT NOT NULL,
+        status         TEXT NOT NULL,
+        token_hash     TEXT NOT NULL DEFAULT '',
+        created_at     INTEGER NOT NULL,
+        approved_at    INTEGER,
+        last_ip        TEXT NOT NULL DEFAULT '',
+        last_active_at INTEGER
       );
       CREATE INDEX IF NOT EXISTS idx_hub_users_status ON hub_users(status);
       CREATE INDEX IF NOT EXISTS idx_hub_users_role ON hub_users(role);
 
       CREATE TABLE IF NOT EXISTS hub_groups (
         id          TEXT PRIMARY KEY,
-        name        TEXT NOT NULL UNIQUE,
+        name        TEXT NOT NULL,
         description TEXT NOT NULL DEFAULT '',
         created_at  INTEGER NOT NULL
       );
 
       CREATE TABLE IF NOT EXISTS hub_group_members (
-        group_id    TEXT NOT NULL REFERENCES hub_groups(id) ON DELETE CASCADE,
-        user_id     TEXT NOT NULL REFERENCES hub_users(id) ON DELETE CASCADE,
-        joined_at   INTEGER NOT NULL,
+        group_id   TEXT NOT NULL REFERENCES hub_groups(id) ON DELETE CASCADE,
+        user_id    TEXT NOT NULL REFERENCES hub_users(id) ON DELETE CASCADE,
+        joined_at  INTEGER NOT NULL,
         PRIMARY KEY (group_id, user_id)
       );
-      CREATE INDEX IF NOT EXISTS idx_hub_group_members_user ON hub_group_members(user_id);
 
       CREATE TABLE IF NOT EXISTS hub_tasks (
         id             TEXT PRIMARY KEY,
@@ -752,7 +871,7 @@ export class SqliteStore {
         content,
         content='hub_chunks',
         content_rowid='rowid',
-        tokenize='porter unicode61'
+        tokenize='trigram'
       );
 
       CREATE TRIGGER IF NOT EXISTS hub_chunks_ai AFTER INSERT ON hub_chunks BEGIN
@@ -802,7 +921,7 @@ export class SqliteStore {
         description,
         content='hub_skills',
         content_rowid='rowid',
-        tokenize='porter unicode61'
+        tokenize='trigram'
       );
 
       CREATE TRIGGER IF NOT EXISTS hub_skills_ai AFTER INSERT ON hub_skills BEGIN
@@ -852,7 +971,7 @@ export class SqliteStore {
         content,
         content='hub_memories',
         content_rowid='rowid',
-        tokenize='porter unicode61'
+        tokenize='trigram'
       );
 
       CREATE TRIGGER IF NOT EXISTS hub_memories_ai AFTER INSERT ON hub_memories BEGIN
@@ -872,6 +991,32 @@ export class SqliteStore {
         VALUES (new.rowid, new.summary, new.content);
       END;
     `);
+
+    this.db.exec(`
+      CREATE TABLE IF NOT EXISTS hub_notifications (
+        id          TEXT PRIMARY KEY,
+        user_id     TEXT NOT NULL,
+        type        TEXT NOT NULL,
+        resource    TEXT NOT NULL,
+        title       TEXT NOT NULL,
+        message     TEXT NOT NULL DEFAULT '',
+        read        INTEGER NOT NULL DEFAULT 0,
+        created_at  INTEGER NOT NULL
+      );
+      CREATE INDEX IF NOT EXISTS idx_hub_notif_user ON hub_notifications(user_id, read, created_at DESC);
+    `);
+
+    try {
+      const cols = this.db.prepare("PRAGMA table_info(hub_users)").all() as Array<{ name: string }>;
+      if (cols.length > 0 && !cols.some(c => c.name === "last_ip")) {
+        this.db.exec("ALTER TABLE hub_users ADD COLUMN last_ip TEXT NOT NULL DEFAULT ''");
+        this.log.info("Migrated: added last_ip column to hub_users");
+      }
+      if (cols.length > 0 && !cols.some(c => c.name === "last_active_at")) {
+        this.db.exec("ALTER TABLE hub_users ADD COLUMN last_active_at INTEGER");
+        this.log.info("Migrated: added last_active_at column to hub_users");
+      }
+    } catch { /* table may not exist yet */ }
   }
 
   // ─── Write ───
@@ -1047,6 +1192,25 @@ export class SqliteStore {
     }
   }
 
+  hubMemoryPatternSearch(patterns: string[], opts: { limit?: number } = {}): Array<{ memoryId: string; content: string; role: string; createdAt: number }> {
+    if (patterns.length === 0) return [];
+    const limit = opts.limit ?? 10;
+    const conditions = patterns.map(() => "(hm.content LIKE ? OR hm.summary LIKE ?)");
+    const params: (string | number)[] = [];
+    for (const p of patterns) { params.push(`%${p}%`, `%${p}%`); }
+    params.push(limit);
+    try {
+      const rows = this.db.prepare(`
+        SELECT hm.id as memory_id, hm.content, hm.role, hm.created_at
+        FROM hub_memories hm
+        WHERE ${conditions.join(" OR ")}
+        ORDER BY hm.created_at DESC
+        LIMIT ?
+      `).all(...params) as Array<{ memory_id: string; content: string; role: string; created_at: number }>;
+      return rows.map(r => ({ memoryId: r.memory_id, content: r.content, role: r.role, createdAt: r.created_at }));
+    } catch { return []; }
+  }
+
   // ─── Vector Search ───
 
   getAllEmbeddings(ownerFilter?: string[]): Array<{ chunkId: string; vector: number[] }> {
@@ -1213,6 +1377,9 @@ export class SqliteStore {
       "skill_embeddings",
       "skill_versions",
       "skills",
+      "local_shared_memories",
+      "team_shared_chunks",
+      "local_shared_tasks",
       "embeddings",
       "chunks",
       "tasks",
@@ -1333,7 +1500,10 @@ export class SqliteStore {
     const conditions: string[] = [];
     const params: unknown[] = [];
     if (opts.status) { conditions.push("status = ?"); params.push(opts.status); }
-    if (opts.owner) { conditions.push("owner = ?"); params.push(opts.owner); }
+    if (opts.owner) {
+      conditions.push("(owner = ? OR (owner = 'public' AND id IN (SELECT task_id FROM local_shared_tasks WHERE original_owner = ?)))");
+      params.push(opts.owner, opts.owner);
+    }
     const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
 
     const countRow = this.db.prepare(`SELECT COUNT(*) as c FROM tasks ${whereClause}`).get(...params) as { c: number };
@@ -1633,16 +1803,18 @@ export class SqliteStore {
 
   setClientHubConnection(conn: ClientHubConnection): void {
     this.db.prepare(`
-      INSERT INTO client_hub_connection (id, hub_url, user_id, username, user_token, role, connected_at)
-      VALUES (1, ?, ?, ?, ?, ?, ?)
+      INSERT INTO client_hub_connection (id, hub_url, user_id, username, user_token, role, connected_at, identity_key, last_known_status)
+      VALUES (1, ?, ?, ?, ?, ?, ?, ?, ?)
       ON CONFLICT(id) DO UPDATE SET
         hub_url = excluded.hub_url,
         user_id = excluded.user_id,
         username = excluded.username,
         user_token = excluded.user_token,
         role = excluded.role,
-        connected_at = excluded.connected_at
-    `).run(conn.hubUrl, conn.userId, conn.username, conn.userToken, conn.role, conn.connectedAt);
+        connected_at = excluded.connected_at,
+        identity_key = excluded.identity_key,
+        last_known_status = excluded.last_known_status
+    `).run(conn.hubUrl, conn.userId, conn.username, conn.userToken, conn.role, conn.connectedAt, conn.identityKey ?? "", conn.lastKnownStatus ?? "");
   }
 
   getClientHubConnection(): ClientHubConnection | null {
@@ -1684,12 +1856,73 @@ export class SqliteStore {
     return rows.map(r => ({ taskId: r.task_id, hubTaskId: r.hub_task_id, visibility: r.visibility, groupId: r.group_id, syncedChunks: r.synced_chunks }));
   }
 
+  // ─── Local Shared Memories (client-side tracking) ───
+
+  markMemorySharedLocally(chunkId: string): { ok: boolean; owner?: string; originalOwner?: string; sharedAt?: number; reason?: string } {
+    const chunk = this.getChunk(chunkId);
+    if (!chunk) return { ok: false, reason: "not_found" };
+    if (chunk.owner === "public") {
+      const existing = this.getLocalSharedMemory(chunkId);
+      return {
+        ok: true,
+        owner: "public",
+        originalOwner: existing?.originalOwner ?? undefined,
+        sharedAt: existing?.sharedAt ?? undefined,
+      };
+    }
+
+    const sharedAt = Date.now();
+    this.db.transaction(() => {
+      this.db.prepare(`
+        INSERT INTO local_shared_memories (chunk_id, original_owner, shared_at)
+        VALUES (?, ?, ?)
+        ON CONFLICT(chunk_id) DO UPDATE SET
+          original_owner = excluded.original_owner,
+          shared_at = excluded.shared_at
+      `).run(chunkId, chunk.owner, sharedAt);
+      this.updateChunk(chunkId, { owner: "public" });
+    })();
+
+    return { ok: true, owner: "public", originalOwner: chunk.owner, sharedAt };
+  }
+
+  unmarkMemorySharedLocally(chunkId: string, fallbackOwner?: string): { ok: boolean; owner?: string; originalOwner?: string; reason?: string } {
+    const chunk = this.getChunk(chunkId);
+    if (!chunk) return { ok: false, reason: "not_found" };
+    if (chunk.owner !== "public") {
+      return { ok: true, owner: chunk.owner };
+    }
+
+    const existing = this.getLocalSharedMemory(chunkId);
+    const restoreOwner = existing?.originalOwner ?? fallbackOwner;
+    if (!restoreOwner || restoreOwner === "public") {
+      return { ok: false, reason: "original_owner_missing" };
+    }
+
+    this.db.transaction(() => {
+      this.updateChunk(chunkId, { owner: restoreOwner });
+      this.db.prepare("DELETE FROM local_shared_memories WHERE chunk_id = ?").run(chunkId);
+    })();
+
+    return { ok: true, owner: restoreOwner, originalOwner: restoreOwner };
+  }
+
+  getLocalSharedMemory(chunkId: string): { chunkId: string; originalOwner: string; sharedAt: number } | null {
+    const row = this.db.prepare("SELECT chunk_id, original_owner, shared_at FROM local_shared_memories WHERE chunk_id = ?").get(chunkId) as any;
+    if (!row) return null;
+    return {
+      chunkId: row.chunk_id,
+      originalOwner: row.original_owner,
+      sharedAt: row.shared_at,
+    };
+  }
+
   // ─── Hub Users / Groups ───
 
   upsertHubUser(user: HubUserRecord): void {
     this.db.prepare(`
-      INSERT INTO hub_users (id, username, device_name, role, status, token_hash, created_at, approved_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+      INSERT INTO hub_users (id, username, device_name, role, status, token_hash, created_at, approved_at, identity_key, left_at, removed_at, rejected_at, rejoin_requested_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
       ON CONFLICT(id) DO UPDATE SET
         username = excluded.username,
         device_name = excluded.device_name,
@@ -1697,81 +1930,99 @@ export class SqliteStore {
         status = excluded.status,
         token_hash = excluded.token_hash,
         created_at = excluded.created_at,
-        approved_at = excluded.approved_at
-    `).run(user.id, user.username, user.deviceName ?? "", user.role, user.status, user.tokenHash, user.createdAt, user.approvedAt);
+        approved_at = excluded.approved_at,
+        identity_key = excluded.identity_key,
+        left_at = excluded.left_at,
+        removed_at = excluded.removed_at,
+        rejected_at = excluded.rejected_at,
+        rejoin_requested_at = excluded.rejoin_requested_at
+    `).run(user.id, user.username, user.deviceName ?? "", user.role, user.status, user.tokenHash, user.createdAt, user.approvedAt, user.identityKey ?? "", user.leftAt ?? null, user.removedAt ?? null, user.rejectedAt ?? null, user.rejoinRequestedAt ?? null);
   }
 
   getHubUser(userId: string): HubUserRecord | null {
     const row = this.db.prepare('SELECT * FROM hub_users WHERE id = ?').get(userId) as HubUserRow | undefined;
     if (!row) return null;
-    return this.attachGroupsToHubUser(rowToHubUser(row));
+    const user = rowToHubUser(row);
+    user.groups = this.getGroupsForHubUser(userId);
+    return user;
   }
 
   listHubUsers(status?: UserStatus): HubUserRecord[] {
     const rows = status
       ? this.db.prepare('SELECT * FROM hub_users WHERE status = ? ORDER BY created_at').all(status) as HubUserRow[]
       : this.db.prepare('SELECT * FROM hub_users ORDER BY created_at').all() as HubUserRow[];
-    return rows.map((row) => this.attachGroupsToHubUser(rowToHubUser(row)));
+    return rows.map(r => {
+      const user = rowToHubUser(r);
+      user.groups = this.getGroupsForHubUser(r.id);
+      return user;
+    });
   }
 
-  upsertHubGroup(group: HubGroupRecord): void {
-    this.db.prepare(`
-      INSERT INTO hub_groups (id, name, description, created_at)
-      VALUES (?, ?, ?, ?)
-      ON CONFLICT(id) DO UPDATE SET
-        name = excluded.name,
-        description = excluded.description,
-        created_at = excluded.created_at
-    `).run(group.id, group.name, group.description, group.createdAt);
+  deleteHubUser(userId: string, cleanResources = false): boolean {
+    if (cleanResources) {
+      this.db.prepare('DELETE FROM hub_tasks WHERE source_user_id = ?').run(userId);
+      this.db.prepare('DELETE FROM hub_skills WHERE source_user_id = ?').run(userId);
+      this.db.prepare('DELETE FROM hub_memories WHERE source_user_id = ?').run(userId);
+      const result = this.db.prepare('DELETE FROM hub_users WHERE id = ?').run(userId);
+      return result.changes > 0;
+    }
+    const result = this.db.prepare("UPDATE hub_users SET status = 'removed', token_hash = '', removed_at = ? WHERE id = ?").run(Date.now(), userId);
+    return result.changes > 0;
   }
 
-  listHubGroups(): HubGroupRecord[] {
-    const rows = this.db.prepare('SELECT * FROM hub_groups ORDER BY name').all() as HubGroupRow[];
-    return rows.map(rowToHubGroup);
+  findHubUserByIdentityKey(identityKey: string): HubUserRecord | null {
+    if (!identityKey) return null;
+    const row = this.db.prepare('SELECT * FROM hub_users WHERE identity_key = ?').get(identityKey) as HubUserRow | undefined;
+    return row ? rowToHubUser(row) : null;
   }
 
-  addHubGroupMember(groupId: string, userId: string, joinedAt = Date.now()): void {
-    this.db.prepare(`
-      INSERT INTO hub_group_members (group_id, user_id, joined_at)
-      VALUES (?, ?, ?)
-      ON CONFLICT(group_id, user_id) DO UPDATE SET joined_at = excluded.joined_at
-    `).run(groupId, userId, joinedAt);
+  markHubUserLeft(userId: string): boolean {
+    const result = this.db.prepare("UPDATE hub_users SET status = 'left', token_hash = '', left_at = ? WHERE id = ?").run(Date.now(), userId);
+    return result.changes > 0;
   }
 
-  getHubGroupById(groupId: string): HubGroupRecord | undefined {
-    const row = this.db.prepare('SELECT * FROM hub_groups WHERE id = ?').get(groupId) as HubGroupRow | undefined;
-    return row ? rowToHubGroup(row) : undefined;
+  updateHubUserActivity(userId: string, ip: string, timestamp?: number): void {
+    this.db.prepare('UPDATE hub_users SET last_ip = ?, last_active_at = ? WHERE id = ?').run(ip, timestamp ?? Date.now(), userId);
   }
 
-  deleteHubGroup(groupId: string): boolean {
-    const result = this.db.prepare('DELETE FROM hub_groups WHERE id = ?').run(groupId);
-    return result.changes > 0;
+  // ─── Hub Groups ───
+
+  upsertHubGroup(group: { id: string; name: string; description?: string; createdAt: number }): void {
+    this.db.prepare(`
+      INSERT INTO hub_groups (id, name, description, created_at)
+      VALUES (?, ?, ?, ?)
+      ON CONFLICT(id) DO UPDATE SET name = excluded.name, description = excluded.description
+    `).run(group.id, group.name, group.description ?? "", group.createdAt);
   }
 
-  listHubGroupMembers(groupId: string): Array<{ userId: string; username: string; joinedAt: number }> {
-    const rows = this.db.prepare(`
-      SELECT gm.user_id, hu.username, gm.joined_at
-      FROM hub_group_members gm
-      JOIN hub_users hu ON hu.id = gm.user_id
-      WHERE gm.group_id = ?
-      ORDER BY gm.joined_at
-    `).all(groupId) as Array<{ user_id: string; username: string; joined_at: number }>;
-    return rows.map(r => ({ userId: r.user_id, username: r.username, joinedAt: r.joined_at }));
+  addHubGroupMember(groupId: string, userId: string, joinedAt: number): void {
+    this.db.prepare(`
+      INSERT OR IGNORE INTO hub_group_members (group_id, user_id, joined_at)
+      VALUES (?, ?, ?)
+    `).run(groupId, userId, joinedAt);
   }
 
   removeHubGroupMember(groupId: string, userId: string): void {
     this.db.prepare('DELETE FROM hub_group_members WHERE group_id = ? AND user_id = ?').run(groupId, userId);
   }
 
-  getGroupsForHubUser(userId: string): GroupInfo[] {
-    const rows = this.db.prepare(`
-      SELECT g.*
-      FROM hub_group_members gm
-      JOIN hub_groups g ON g.id = gm.group_id
-      WHERE gm.user_id = ?
-      ORDER BY g.name
-    `).all(userId) as HubGroupRow[];
-    return rows.map((row) => ({ id: row.id, name: row.name, description: row.description || undefined }));
+  getGroupsForHubUser(userId: string): Array<{ id: string; name: string; description: string }> {
+    return this.db.prepare(`
+      SELECT g.id, g.name, g.description FROM hub_groups g
+      JOIN hub_group_members m ON m.group_id = g.id
+      WHERE m.user_id = ?
+    `).all(userId) as Array<{ id: string; name: string; description: string }>;
+  }
+
+  getHubUserContributions(): Record<string, { memoryCount: number; taskCount: number; skillCount: number }> {
+    const result: Record<string, { memoryCount: number; taskCount: number; skillCount: number }> = {};
+    const memRows = this.db.prepare('SELECT source_user_id, COUNT(*) as cnt FROM hub_memories GROUP BY source_user_id').all() as Array<{ source_user_id: string; cnt: number }>;
+    const taskRows = this.db.prepare('SELECT source_user_id, COUNT(*) as cnt FROM hub_tasks GROUP BY source_user_id').all() as Array<{ source_user_id: string; cnt: number }>;
+    const skillRows = this.db.prepare('SELECT source_user_id, COUNT(*) as cnt FROM hub_skills GROUP BY source_user_id').all() as Array<{ source_user_id: string; cnt: number }>;
+    for (const r of memRows) { if (!result[r.source_user_id]) result[r.source_user_id] = { memoryCount: 0, taskCount: 0, skillCount: 0 }; result[r.source_user_id].memoryCount = r.cnt; }
+    for (const r of taskRows) { if (!result[r.source_user_id]) result[r.source_user_id] = { memoryCount: 0, taskCount: 0, skillCount: 0 }; result[r.source_user_id].taskCount = r.cnt; }
+    for (const r of skillRows) { if (!result[r.source_user_id]) result[r.source_user_id] = { memoryCount: 0, taskCount: 0, skillCount: 0 }; result[r.source_user_id].skillCount = r.cnt; }
+    return result;
   }
 
   // ─── Hub Shared Data ───
@@ -1795,6 +2046,11 @@ export class SqliteStore {
     return row ? rowToHubTask(row) : null;
   }
 
+  getHubTaskById(taskId: string): HubTaskRecord | null {
+    const row = this.db.prepare('SELECT * FROM hub_tasks WHERE id = ?').get(taskId) as HubTaskRow | undefined;
+    return row ? rowToHubTask(row) : null;
+  }
+
   upsertHubChunk(chunk: HubChunkUpsertInput): void {
     if (!chunk.sourceTaskId) throw new Error("sourceTaskId is required for hub chunk upserts");
     const taskId = this.resolveCanonicalHubTaskId(chunk.hubTaskId, chunk.sourceUserId, chunk.sourceTaskId);
@@ -1870,20 +2126,37 @@ export class SqliteStore {
     return out;
   }
 
+  getVisibleHubSkillEmbeddings(): Array<{ skillId: string; vector: Float32Array }> {
+    const rows = this.db.prepare(`
+      SELECT hse.skill_id, hse.vector, hse.dimensions
+      FROM hub_skill_embeddings hse
+      JOIN hub_skills hs ON hs.id = hse.skill_id
+    `).all() as Array<{ skill_id: string; vector: Buffer; dimensions: number }>;
+    return rows.map(r => ({
+      skillId: r.skill_id,
+      vector: new Float32Array(r.vector.buffer, r.vector.byteOffset, r.dimensions),
+    }));
+  }
+
   searchHubChunks(query: string, options?: { userId?: string; maxResults?: number }): Array<{ hit: HubSearchRow; rank: number }> {
     const limit = options?.maxResults ?? 10;
     const userId = options?.userId ?? "";
     const rows = this.db.prepare(`
-      SELECT hc.id, hc.content, hc.summary, hc.role, hc.created_at, ht.title as task_title, ht.visibility, '' as group_name, hu.username as owner_name,
+      SELECT hc.id, hc.content, hc.summary, hc.role, hc.created_at, ht.title as task_title, ht.visibility,
+             COALESCE(hg.name, '') as group_name, hu.username as owner_name,
              bm25(hub_chunks_fts) as rank
       FROM hub_chunks_fts f
       JOIN hub_chunks hc ON hc.rowid = f.rowid
       JOIN hub_tasks ht ON ht.id = hc.hub_task_id
       LEFT JOIN hub_users hu ON hu.id = ht.source_user_id
+      LEFT JOIN hub_groups hg ON hg.id = ht.group_id
       WHERE hub_chunks_fts MATCH ?
+        AND (ht.visibility = 'public'
+             OR ht.source_user_id = ?
+             OR EXISTS (SELECT 1 FROM hub_group_members gm WHERE gm.group_id = ht.group_id AND gm.user_id = ?))
       ORDER BY rank
       LIMIT ?
-    `).all(sanitizeFtsQuery(query), limit) as HubSearchRow[];
+    `).all(sanitizeFtsQuery(query), userId, userId, limit) as HubSearchRow[];
     return rows.map((row, idx) => ({ hit: row, rank: idx + 1 }));
   }
 
@@ -1908,7 +2181,10 @@ export class SqliteStore {
       FROM hub_embeddings he
       JOIN hub_chunks hc ON hc.id = he.chunk_id
       JOIN hub_tasks ht ON ht.id = hc.hub_task_id
-    `).all() as Array<{ chunk_id: string; vector: Buffer; dimensions: number }>;
+      WHERE ht.visibility = 'public'
+        OR ht.source_user_id = ?
+        OR EXISTS (SELECT 1 FROM hub_group_members gm WHERE gm.group_id = ht.group_id AND gm.user_id = ?)
+    `).all(userId, userId) as Array<{ chunk_id: string; vector: Buffer; dimensions: number }>;
     return rows.map(r => ({
       chunkId: r.chunk_id,
       vector: new Float32Array(r.vector.buffer, r.vector.byteOffset, r.dimensions),
@@ -1917,14 +2193,19 @@ export class SqliteStore {
 
   getVisibleHubSearchHitByChunkId(chunkId: string, userId: string): HubSearchRow | null {
     const row = this.db.prepare(`
-      SELECT hc.id, hc.content, hc.summary, hc.role, hc.created_at, ht.title as task_title, ht.visibility, '' as group_name, hu.username as owner_name,
+      SELECT hc.id, hc.content, hc.summary, hc.role, hc.created_at, ht.title as task_title, ht.visibility,
+             COALESCE(hg.name, '') as group_name, hu.username as owner_name,
              0 as rank
       FROM hub_chunks hc
       JOIN hub_tasks ht ON ht.id = hc.hub_task_id
       LEFT JOIN hub_users hu ON hu.id = ht.source_user_id
+      LEFT JOIN hub_groups hg ON hg.id = ht.group_id
       WHERE hc.id = ?
+        AND (ht.visibility = 'public'
+             OR ht.source_user_id = ?
+             OR EXISTS (SELECT 1 FROM hub_group_members gm WHERE gm.group_id = ht.group_id AND gm.user_id = ?))
       LIMIT 1
-    `).get(chunkId) as HubSearchRow | undefined;
+    `).get(chunkId, userId, userId) as HubSearchRow | undefined;
     return row ?? null;
   }
 
@@ -1940,7 +2221,7 @@ export class SqliteStore {
     let rows: HubSkillSearchRow[];
     if (sanitized) {
       rows = this.db.prepare(`
-        SELECT hs.id, hs.name, hs.description, hs.version, hs.visibility, '' AS group_name, hu.username AS owner_name, hs.quality_score,
+        SELECT hs.id, hs.name, hs.description, hs.version, hs.visibility, '' AS group_name, hu.username AS owner_name, hu.status AS owner_status, hs.quality_score,
                bm25(hub_skills_fts) as rank
         FROM hub_skills_fts f
         JOIN hub_skills hs ON hs.rowid = f.rowid
@@ -1951,7 +2232,7 @@ export class SqliteStore {
       `).all(sanitized, limit) as HubSkillSearchRow[];
     } else {
       rows = this.db.prepare(`
-        SELECT hs.id, hs.name, hs.description, hs.version, hs.visibility, '' AS group_name, hu.username AS owner_name, hs.quality_score,
+        SELECT hs.id, hs.name, hs.description, hs.version, hs.visibility, '' AS group_name, hu.username AS owner_name, hu.status AS owner_status, hs.quality_score,
                0 as rank
         FROM hub_skills hs
         LEFT JOIN hub_users hu ON hu.id = hs.source_user_id
@@ -1966,9 +2247,9 @@ export class SqliteStore {
     this.db.prepare('DELETE FROM hub_skills WHERE source_user_id = ? AND source_skill_id = ?').run(sourceUserId, sourceSkillId);
   }
 
-  listVisibleHubTasks(userId: string, limit = 40): Array<{ id: string; sourceTaskId: string; sourceUserId: string; title: string; summary: string; groupId: string | null; groupName: string | null; visibility: string; ownerName: string; chunkCount: number; createdAt: number; updatedAt: number }> {
+  listVisibleHubTasks(userId: string, limit = 40): Array<{ id: string; sourceTaskId: string; sourceUserId: string; title: string; summary: string; groupId: string | null; groupName: string | null; visibility: string; ownerName: string; ownerStatus: string; chunkCount: number; createdAt: number; updatedAt: number }> {
     const rows = this.db.prepare(`
-      SELECT t.*, u.username AS owner_name, NULL AS group_name,
+      SELECT t.*, u.username AS owner_name, u.status AS owner_status, NULL AS group_name,
         (SELECT COUNT(*) FROM hub_chunks c WHERE c.hub_task_id = t.id) AS chunk_count
       FROM hub_tasks t
       LEFT JOIN hub_users u ON u.id = t.source_user_id
@@ -1978,36 +2259,40 @@ export class SqliteStore {
     return rows.map(r => ({
       id: r.id, sourceTaskId: r.source_task_id, sourceUserId: r.source_user_id,
       title: r.title, summary: r.summary, groupId: r.group_id, groupName: r.group_name ?? null,
-      visibility: r.visibility, ownerName: r.owner_name ?? "unknown", chunkCount: r.chunk_count ?? 0,
+      visibility: r.visibility, ownerName: r.owner_name ?? "unknown", ownerStatus: r.owner_status ?? "", chunkCount: r.chunk_count ?? 0,
       createdAt: r.created_at, updatedAt: r.updated_at,
     }));
   }
 
-  listAllHubTasks(): Array<{ id: string; sourceTaskId: string; sourceUserId: string; title: string; summary: string; groupId: string | null; groupName: string | null; visibility: string; ownerName: string; chunkCount: number; createdAt: number; updatedAt: number }> {
+  listAllHubTasks(): Array<{ id: string; sourceTaskId: string; sourceUserId: string; title: string; summary: string; groupId: string | null; groupName: string | null; visibility: string; ownerName: string; ownerStatus: string; chunkCount: number; createdAt: number; updatedAt: number }> {
     const rows = this.db.prepare(`
-      SELECT t.*, u.username AS owner_name, g.name AS group_name,
+      SELECT t.*, u.username AS owner_name, u.status AS owner_status,
         (SELECT COUNT(*) FROM hub_chunks c WHERE c.hub_task_id = t.id) AS chunk_count
       FROM hub_tasks t
       LEFT JOIN hub_users u ON u.id = t.source_user_id
-      LEFT JOIN hub_groups g ON g.id = t.group_id
       ORDER BY t.updated_at DESC
     `).all() as any[];
     return rows.map(r => ({
       id: r.id, sourceTaskId: r.source_task_id, sourceUserId: r.source_user_id,
-      title: r.title, summary: r.summary, groupId: r.group_id, groupName: r.group_name ?? null,
-      visibility: r.visibility, ownerName: r.owner_name ?? "unknown", chunkCount: r.chunk_count ?? 0,
+      title: r.title, summary: r.summary, groupId: r.group_id, groupName: null as string | null,
+      visibility: r.visibility, ownerName: r.owner_name ?? "unknown", ownerStatus: r.owner_status ?? "", chunkCount: r.chunk_count ?? 0,
       createdAt: r.created_at, updatedAt: r.updated_at,
     }));
   }
 
+  listHubChunksByTaskId(hubTaskId: string): HubChunkRecord[] {
+    const rows = this.db.prepare('SELECT * FROM hub_chunks WHERE hub_task_id = ? ORDER BY created_at ASC').all(hubTaskId) as HubChunkRow[];
+    return rows.map(rowToHubChunk);
+  }
+
   deleteHubTaskById(taskId: string): boolean {
     const info = this.db.prepare('DELETE FROM hub_tasks WHERE id = ?').run(taskId);
     return info.changes > 0;
   }
 
-  listVisibleHubSkills(userId: string, limit = 40): Array<{ id: string; sourceSkillId: string; sourceUserId: string; name: string; description: string; version: number; groupId: string | null; groupName: string | null; visibility: string; ownerName: string; qualityScore: number | null; createdAt: number; updatedAt: number }> {
+  listVisibleHubSkills(userId: string, limit = 40): Array<{ id: string; sourceSkillId: string; sourceUserId: string; name: string; description: string; version: number; groupId: string | null; groupName: string | null; visibility: string; ownerName: string; ownerStatus: string; qualityScore: number | null; createdAt: number; updatedAt: number }> {
     const rows = this.db.prepare(`
-      SELECT s.*, u.username AS owner_name, NULL AS group_name
+      SELECT s.*, u.username AS owner_name, u.status AS owner_status, NULL AS group_name
       FROM hub_skills s
       LEFT JOIN hub_users u ON u.id = s.source_user_id
       ORDER BY s.updated_at DESC
@@ -2017,24 +2302,23 @@ export class SqliteStore {
       id: r.id, sourceSkillId: r.source_skill_id, sourceUserId: r.source_user_id,
       name: r.name, description: r.description, version: r.version,
       groupId: r.group_id, groupName: r.group_name ?? null, visibility: r.visibility,
-      ownerName: r.owner_name ?? "unknown", qualityScore: r.quality_score,
+      ownerName: r.owner_name ?? "unknown", ownerStatus: r.owner_status ?? "", qualityScore: r.quality_score,
       createdAt: r.created_at, updatedAt: r.updated_at,
     }));
   }
 
-  listAllHubSkills(): Array<{ id: string; sourceSkillId: string; sourceUserId: string; name: string; description: string; version: number; groupId: string | null; groupName: string | null; visibility: string; ownerName: string; qualityScore: number | null; createdAt: number; updatedAt: number }> {
+  listAllHubSkills(): Array<{ id: string; sourceSkillId: string; sourceUserId: string; name: string; description: string; version: number; groupId: string | null; groupName: string | null; visibility: string; ownerName: string; ownerStatus: string; qualityScore: number | null; createdAt: number; updatedAt: number }> {
     const rows = this.db.prepare(`
-      SELECT s.*, u.username AS owner_name, g.name AS group_name
+      SELECT s.*, u.username AS owner_name, u.status AS owner_status
       FROM hub_skills s
       LEFT JOIN hub_users u ON u.id = s.source_user_id
-      LEFT JOIN hub_groups g ON g.id = s.group_id
       ORDER BY s.updated_at DESC
     `).all() as any[];
     return rows.map(r => ({
       id: r.id, sourceSkillId: r.source_skill_id, sourceUserId: r.source_user_id,
       name: r.name, description: r.description, version: r.version,
-      groupId: r.group_id, groupName: r.group_name ?? null, visibility: r.visibility,
-      ownerName: r.owner_name ?? "unknown", qualityScore: r.quality_score,
+      groupId: r.group_id, groupName: null as string | null, visibility: r.visibility,
+      ownerName: r.owner_name ?? "unknown", ownerStatus: r.owner_status ?? "", qualityScore: r.quality_score,
       createdAt: r.created_at, updatedAt: r.updated_at,
     }));
   }
@@ -2081,6 +2365,86 @@ export class SqliteStore {
     return info.changes > 0;
   }
 
+  // ─── Team share metadata (Client role — UI only, not used for local recall / FTS) ───
+
+  upsertTeamSharedChunk(
+    chunkId: string,
+    row: { hubMemoryId?: string; visibility?: string; groupId?: string | null },
+  ): void {
+    const now = Date.now();
+    const vis = row.visibility === "group" ? "group" : "public";
+    const gid = vis === "group" ? (row.groupId ?? null) : null;
+    this.db.prepare(`
+      INSERT INTO team_shared_chunks (chunk_id, hub_memory_id, visibility, group_id, shared_at)
+      VALUES (?, ?, ?, ?, ?)
+      ON CONFLICT(chunk_id) DO UPDATE SET
+        hub_memory_id = excluded.hub_memory_id,
+        visibility = excluded.visibility,
+        group_id = excluded.group_id,
+        shared_at = excluded.shared_at
+    `).run(chunkId, row.hubMemoryId ?? "", vis, gid, now);
+  }
+
+  getTeamSharedChunk(chunkId: string): { chunkId: string; hubMemoryId: string; visibility: string; groupId: string | null; sharedAt: number } | null {
+    const r = this.db.prepare("SELECT chunk_id, hub_memory_id, visibility, group_id, shared_at FROM team_shared_chunks WHERE chunk_id = ?").get(chunkId) as {
+      chunk_id: string; hub_memory_id: string; visibility: string; group_id: string | null; shared_at: number;
+    } | undefined;
+    if (!r) return null;
+    return {
+      chunkId: r.chunk_id,
+      hubMemoryId: r.hub_memory_id,
+      visibility: r.visibility,
+      groupId: r.group_id,
+      sharedAt: r.shared_at,
+    };
+  }
+
+  deleteTeamSharedChunk(chunkId: string): boolean {
+    const info = this.db.prepare("DELETE FROM team_shared_chunks WHERE chunk_id = ?").run(chunkId);
+    return info.changes > 0;
+  }
+
+  // ─── Hub Notifications ───
+
+  insertHubNotification(n: { id: string; userId: string; type: string; resource: string; title: string; message?: string }): void {
+    this.db.prepare(
+      'INSERT INTO hub_notifications (id, user_id, type, resource, title, message, read, created_at) VALUES (?, ?, ?, ?, ?, ?, 0, ?)'
+    ).run(n.id, n.userId, n.type, n.resource, n.title, n.message ?? '', Date.now());
+  }
+
+  hasRecentHubNotification(userId: string, type: string, resource: string, windowMs: number = 300_000): boolean {
+    const since = Date.now() - windowMs;
+    const row = this.db.prepare(
+      'SELECT COUNT(*) AS cnt FROM hub_notifications WHERE user_id = ? AND type = ? AND resource = ? AND created_at > ?'
+    ).get(userId, type, resource, since) as { cnt: number };
+    return row.cnt > 0;
+  }
+
+  listHubNotifications(userId: string, opts?: { unreadOnly?: boolean; limit?: number }): Array<{ id: string; userId: string; type: string; resource: string; title: string; message: string; read: boolean; createdAt: number }> {
+    const where = opts?.unreadOnly ? 'WHERE user_id = ? AND read = 0' : 'WHERE user_id = ?';
+    const limit = opts?.limit ?? 50;
+    const rows = this.db.prepare(`SELECT * FROM hub_notifications ${where} ORDER BY created_at DESC LIMIT ?`).all(userId, limit) as any[];
+    return rows.map(r => ({ id: r.id, userId: r.user_id, type: r.type, resource: r.resource, title: r.title, message: r.message, read: !!r.read, createdAt: r.created_at }));
+  }
+
+  countUnreadHubNotifications(userId: string): number {
+    const row = this.db.prepare('SELECT COUNT(*) AS cnt FROM hub_notifications WHERE user_id = ? AND read = 0').get(userId) as { cnt: number };
+    return row.cnt;
+  }
+
+  markHubNotificationsRead(userId: string, ids?: string[]): void {
+    if (ids && ids.length > 0) {
+      const placeholders = ids.map(() => '?').join(',');
+      this.db.prepare(`UPDATE hub_notifications SET read = 1 WHERE user_id = ? AND id IN (${placeholders})`).run(userId, ...ids);
+    } else {
+      this.db.prepare('UPDATE hub_notifications SET read = 1 WHERE user_id = ?').run(userId);
+    }
+  }
+
+  clearHubNotifications(userId: string): void {
+    this.db.prepare('DELETE FROM hub_notifications WHERE user_id = ?').run(userId);
+  }
+
   upsertHubMemoryEmbedding(memoryId: string, vector: Float32Array): void {
     const buf = Buffer.from(vector.buffer, vector.byteOffset, vector.byteLength);
     this.db.prepare(`
@@ -2138,9 +2502,9 @@ export class SqliteStore {
     return row ?? null;
   }
 
-  listVisibleHubMemories(userId: string, limit = 40): Array<{ id: string; sourceChunkId: string; sourceUserId: string; role: string; summary: string; kind: string; groupId: string | null; groupName: string | null; visibility: string; ownerName: string; createdAt: number; updatedAt: number }> {
+  listVisibleHubMemories(userId: string, limit = 40): Array<{ id: string; sourceChunkId: string; sourceUserId: string; role: string; content: string; summary: string; kind: string; groupId: string | null; groupName: string | null; visibility: string; ownerName: string; ownerStatus: string; createdAt: number; updatedAt: number }> {
     const rows = this.db.prepare(`
-      SELECT m.*, u.username AS owner_name, NULL AS group_name
+      SELECT m.*, u.username AS owner_name, u.status AS owner_status, NULL AS group_name
       FROM hub_memories m
       LEFT JOIN hub_users u ON u.id = m.source_user_id
       ORDER BY m.updated_at DESC
@@ -2148,25 +2512,24 @@ export class SqliteStore {
     `).all(limit) as any[];
     return rows.map(r => ({
       id: r.id, sourceChunkId: r.source_chunk_id, sourceUserId: r.source_user_id,
-      role: r.role, summary: r.summary, kind: r.kind,
+      role: r.role, content: r.content ?? "", summary: r.summary, kind: r.kind,
       groupId: r.group_id, groupName: r.group_name ?? null, visibility: r.visibility,
-      ownerName: r.owner_name ?? "unknown", createdAt: r.created_at, updatedAt: r.updated_at,
+      ownerName: r.owner_name ?? "unknown", ownerStatus: r.owner_status ?? "", createdAt: r.created_at, updatedAt: r.updated_at,
     }));
   }
 
-  listAllHubMemories(): Array<{ id: string; sourceChunkId: string; sourceUserId: string; role: string; summary: string; kind: string; groupId: string | null; groupName: string | null; visibility: string; ownerName: string; createdAt: number; updatedAt: number }> {
+  listAllHubMemories(): Array<{ id: string; sourceChunkId: string; sourceUserId: string; role: string; content: string; summary: string; kind: string; groupId: string | null; groupName: string | null; visibility: string; ownerName: string; ownerStatus: string; createdAt: number; updatedAt: number }> {
     const rows = this.db.prepare(`
-      SELECT m.*, u.username AS owner_name, g.name AS group_name
+      SELECT m.*, u.username AS owner_name, u.status AS owner_status
       FROM hub_memories m
       LEFT JOIN hub_users u ON u.id = m.source_user_id
-      LEFT JOIN hub_groups g ON g.id = m.group_id
       ORDER BY m.updated_at DESC
     `).all() as any[];
     return rows.map(r => ({
       id: r.id, sourceChunkId: r.source_chunk_id, sourceUserId: r.source_user_id,
-      role: r.role, summary: r.summary, kind: r.kind,
-      groupId: r.group_id, groupName: r.group_name ?? null, visibility: r.visibility,
-      ownerName: r.owner_name ?? "unknown", createdAt: r.created_at, updatedAt: r.updated_at,
+      role: r.role, content: r.content ?? "", summary: r.summary, kind: r.kind,
+      groupId: r.group_id, groupName: null as string | null, visibility: r.visibility,
+      ownerName: r.owner_name ?? "unknown", ownerStatus: r.owner_status ?? "", createdAt: r.created_at, updatedAt: r.updated_at,
     }));
   }
 
@@ -2190,13 +2553,6 @@ export class SqliteStore {
     throw new Error(`source skill not found for skillId=${skillId}`);
   }
 
-  private attachGroupsToHubUser(user: HubUserRecord): HubUserRecord {
-    return {
-      ...user,
-      groups: this.getGroupsForHubUser(user.id),
-    };
-  }
-
   getSessionOwnerMap(sessionKeys: string[]): Map<string, string> {
     const result = new Map<string, string>();
     if (sessionKeys.length === 0) return result;
@@ -2382,6 +2738,8 @@ interface ClientHubConnection {
   userToken: string;
   role: UserRole;
   connectedAt: number;
+  identityKey?: string;
+  lastKnownStatus?: string;
 }
 
 interface ClientHubConnectionRow {
@@ -2391,6 +2749,8 @@ interface ClientHubConnectionRow {
   user_token: string;
   role: string;
   connected_at: number;
+  identity_key?: string;
+  last_known_status?: string;
 }
 
 function rowToClientHubConnection(row: ClientHubConnectionRow): ClientHubConnection {
@@ -2401,6 +2761,8 @@ function rowToClientHubConnection(row: ClientHubConnectionRow): ClientHubConnect
     userToken: row.user_token,
     role: row.role as UserRole,
     connectedAt: row.connected_at,
+    identityKey: row.identity_key || "",
+    lastKnownStatus: row.last_known_status || "",
   };
 }
 
@@ -2408,6 +2770,13 @@ interface HubUserRecord extends UserInfo {
   tokenHash: string;
   createdAt: number;
   approvedAt: number | null;
+  lastIp: string;
+  lastActiveAt: number | null;
+  identityKey?: string;
+  leftAt?: number | null;
+  removedAt?: number | null;
+  rejectedAt?: number | null;
+  rejoinRequestedAt?: number | null;
 }
 
 interface HubUserRow {
@@ -2419,6 +2788,13 @@ interface HubUserRow {
   token_hash: string;
   created_at: number;
   approved_at: number | null;
+  last_ip: string;
+  last_active_at: number | null;
+  identity_key?: string;
+  left_at?: number | null;
+  removed_at?: number | null;
+  rejected_at?: number | null;
+  rejoin_requested_at?: number | null;
 }
 
 function rowToHubUser(row: HubUserRow): HubUserRecord {
@@ -2432,29 +2808,13 @@ function rowToHubUser(row: HubUserRow): HubUserRecord {
     tokenHash: row.token_hash,
     createdAt: row.created_at,
     approvedAt: row.approved_at,
-  };
-}
-
-interface HubGroupRecord {
-  id: string;
-  name: string;
-  description: string;
-  createdAt: number;
-}
-
-interface HubGroupRow {
-  id: string;
-  name: string;
-  description: string;
-  created_at: number;
-}
-
-function rowToHubGroup(row: HubGroupRow): HubGroupRecord {
-  return {
-    id: row.id,
-    name: row.name,
-    description: row.description,
-    createdAt: row.created_at,
+    lastIp: row.last_ip || "",
+    lastActiveAt: row.last_active_at ?? null,
+    identityKey: row.identity_key || "",
+    leftAt: row.left_at ?? null,
+    removedAt: row.removed_at ?? null,
+    rejectedAt: row.rejected_at ?? null,
+    rejoinRequestedAt: row.rejoin_requested_at ?? null,
   };
 }
 
@@ -2603,6 +2963,7 @@ interface HubSkillSearchRow {
   visibility: string;
   group_name: string | null;
   owner_name: string | null;
+  owner_status: string | null;
   quality_score: number | null;
 }