Merge remote-tracking branch 'origin/native_memos' into native_memos

tangbotony · tangbotony · commit 138fa18b5e66 · 2026-03-23T15:26:33.000+08:00
diff --git a/.github/workflows/openclaw-plugin-publish.yml b/.github/workflows/openclaw-plugin-publish.yml
@@ -25,7 +25,7 @@ jobs:
         include:
           - os: macos-14
             platform: darwin-arm64
-          - os: macos-13
+          - os: macos-15
             platform: darwin-x64
           - os: ubuntu-latest
             platform: linux-x64
@@ -42,6 +42,11 @@ jobs:
       - name: Install dependencies
         run: npm install
 
+      - name: Rebuild for x64 under Rosetta (darwin-x64 only)
+        if: matrix.platform == 'darwin-x64'
+        run: |
+          arch -x86_64 npm rebuild better-sqlite3
+
       - name: Collect prebuild
         shell: bash
         run: |
diff --git a/apps/memos-local-openclaw/index.ts b/apps/memos-local-openclaw/index.ts
@@ -225,7 +225,7 @@ const memosLocalPlugin = {
       const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, "package.json"), "utf-8"));
       pluginVersion = pkg.version ?? pluginVersion;
     } catch {}
-    const telemetry = new Telemetry(ctx.config.telemetry ?? {}, stateDir, pluginVersion, ctx.log);
+    const telemetry = new Telemetry(ctx.config.telemetry ?? {}, stateDir, pluginVersion, ctx.log, pluginDir);
 
     // Install bundled memory-guide skill so OpenClaw loads it (write from embedded content so it works regardless of deploy layout)
     const workspaceSkillsDir = path.join(workspaceDir, "skills");
@@ -388,8 +388,7 @@ const memosLocalPlugin = {
 
       const memoryId = response?.memoryId ?? `${chunk.id}-hub`;
 
-      // Only persist hub_memories locally in Hub mode where this DB owns the data.
-      // Client mode relies on the remote Hub for storage and search.
+      // Hub role: full hub_memories row for local recall/embeddings. Client: metadata only (team_shared_chunks) for UI.
       if (ctx.config.sharing?.role === "hub") {
         const now = Date.now();
         const existing = store.getHubMemoryBySource(hubClient.userId, chunk.id);
@@ -406,6 +405,8 @@ const memosLocalPlugin = {
           createdAt: existing?.createdAt ?? now,
           updatedAt: now,
         });
+      } else if (ctx.config.sharing?.enabled && hubClient.userId) {
+        store.upsertTeamSharedChunk(chunk.id, { hubMemoryId: memoryId, visibility, groupId });
       }
 
       return { memoryId, visibility, groupId };
@@ -425,6 +426,7 @@ const memosLocalPlugin = {
         body: JSON.stringify({ sourceChunkId: chunk.id }),
       });
       store.deleteHubMemoryBySource(hubClient.userId, chunk.id);
+      store.deleteTeamSharedChunk(chunk.id);
     };
 
     // ─── Tool: memory_search ───
diff --git a/apps/memos-local-openclaw/package.json b/apps/memos-local-openclaw/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@memtensor/memos-local-openclaw-plugin",
-  "version": "1.0.4-beta.14",
+  "version": "1.0.5",
   "description": "MemOS Local memory plugin for OpenClaw — full-write, hybrid-recall, progressive retrieval",
   "type": "module",
   "main": "index.ts",
diff --git a/apps/memos-local-openclaw/src/capture/index.ts b/apps/memos-local-openclaw/src/capture/index.ts
@@ -167,8 +167,11 @@ export function stripInboundMetadata(text: string): string {
 /** 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, "");
+  return text.replace(THINKING_TAG_RE, "").replace(FINAL_TAG_RE, "").trim();
 }
 
 function extractEnvelopeTimestamp(text: string): number | null {
diff --git a/apps/memos-local-openclaw/src/hub/server.ts b/apps/memos-local-openclaw/src/hub/server.ts
@@ -414,6 +414,10 @@ export class HubServer {
         ttlMs,
       );
       this.userManager.approveUser(updated.id, newToken);
+      if (updated.id === this.authState.bootstrapAdminUserId) {
+        this.authState.bootstrapAdminToken = newToken;
+        this.saveAuthState();
+      }
       this.opts.log.info(`Hub: user "${auth.userId}" renamed to "${newUsername}"`);
       return this.json(res, 200, { ok: true, username: newUsername, userToken: newToken });
     }
@@ -522,6 +526,10 @@ export class HubServer {
       const updated = this.opts.store.getHubUser(userId)!;
       const finalUser = { ...updated, username: newUsername };
       this.opts.store.upsertHubUser(finalUser);
+      if (userId === this.authState.bootstrapAdminUserId) {
+        this.authState.bootstrapAdminToken = newToken;
+        this.saveAuthState();
+      }
       this.opts.log.info(`Hub: admin "${auth.userId}" renamed user "${userId}" to "${newUsername}"`);
       return this.json(res, 200, { ok: true, username: newUsername });
     }
@@ -942,7 +950,18 @@ export class HubServer {
       const deleted = this.opts.store.deleteHubMemoryById(memoryId);
       if (!deleted) return this.json(res, 404, { error: "not_found" });
       if (memInfo) {
-        this.opts.store.insertHubNotification({ id: randomUUID(), userId: memInfo.sourceUserId, type: "resource_removed", resource: "memory", title: memInfo.summary || memInfo.id });
+        const payload = JSON.stringify({
+          memoryId,
+          sourceChunkId: memInfo.sourceChunkId,
+        });
+        this.opts.store.insertHubNotification({
+          id: randomUUID(),
+          userId: memInfo.sourceUserId,
+          type: "resource_removed",
+          resource: "memory",
+          title: memInfo.summary || memInfo.id,
+          message: payload,
+        });
       }
       return this.json(res, 200, { ok: true });
     }
diff --git a/apps/memos-local-openclaw/src/storage/sqlite.ts b/apps/memos-local-openclaw/src/storage/sqlite.ts
@@ -792,6 +792,15 @@ export class SqliteStore {
         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,
@@ -1369,6 +1378,7 @@ export class SqliteStore {
       "skill_versions",
       "skills",
       "local_shared_memories",
+      "team_shared_chunks",
       "local_shared_tasks",
       "embeddings",
       "chunks",
@@ -2355,6 +2365,45 @@ 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 {
diff --git a/apps/memos-local-openclaw/src/telemetry.ts b/apps/memos-local-openclaw/src/telemetry.ts
@@ -18,28 +18,27 @@ export interface TelemetryConfig {
   enabled?: boolean;
 }
 
-function loadTelemetryCredentials(): { endpoint: string; pid: string; env: string } {
+function loadTelemetryCredentials(pluginDir?: string): { endpoint: string; pid: string; env: string } {
   if (process.env.MEMOS_ARMS_ENDPOINT) {
     return {
       endpoint: process.env.MEMOS_ARMS_ENDPOINT,
       pid: process.env.MEMOS_ARMS_PID ?? "",
       env: process.env.MEMOS_ARMS_ENV ?? "prod",
     };
   }
-  try {
-    const credPath = path.resolve(__dirname, "..", "telemetry.credentials.json");
-    const raw = fs.readFileSync(credPath, "utf-8");
-    const creds = JSON.parse(raw);
-    if (creds.endpoint) return { endpoint: creds.endpoint, pid: creds.pid ?? "", env: creds.env ?? "prod" };
-  } catch {}
+  const bases = pluginDir ? [pluginDir, path.join(pluginDir, "src")] : [];
+  if (typeof __dirname === "string") bases.push(path.resolve(__dirname, ".."), __dirname);
+  const candidates = bases.map(b => path.join(b, "telemetry.credentials.json"));
+  for (const credPath of candidates) {
+    try {
+      const raw = fs.readFileSync(credPath, "utf-8");
+      const creds = JSON.parse(raw);
+      if (creds.endpoint) return { endpoint: creds.endpoint, pid: creds.pid ?? "", env: creds.env ?? "prod" };
+    } catch {}
+  }
   return { endpoint: "", pid: "", env: "prod" };
 }
 
-const _creds = loadTelemetryCredentials();
-const ARMS_ENDPOINT = _creds.endpoint;
-const ARMS_PID = _creds.pid;
-const ARMS_ENV = _creds.env;
-
 const FLUSH_AT = 10;
 const FLUSH_INTERVAL_MS = 30_000;
 const SEND_TIMEOUT_MS = 30_000;
@@ -67,19 +66,27 @@ export class Telemetry {
   private flushTimer: ReturnType<typeof setInterval> | null = null;
   private sessionId: string;
   private firstSeenDate: string;
+  private armsEndpoint: string;
+  private armsPid: string;
+  private armsEnv: string;
 
-  constructor(config: TelemetryConfig, stateDir: string, pluginVersion: string, log: Logger) {
+  constructor(config: TelemetryConfig, stateDir: string, pluginVersion: string, log: Logger, pluginDir?: string) {
     this.log = log;
     this.pluginVersion = pluginVersion;
     this.enabled = config.enabled !== false;
     this.distinctId = this.loadOrCreateAnonymousId(stateDir);
     this.firstSeenDate = this.loadOrCreateFirstSeen(stateDir);
     this.sessionId = this.loadOrCreateSessionId(stateDir);
 
-    if (!this.enabled || !ARMS_ENDPOINT) {
+    const creds = loadTelemetryCredentials(pluginDir);
+    this.armsEndpoint = creds.endpoint;
+    this.armsPid = creds.pid;
+    this.armsEnv = creds.env;
+
+    if (!this.enabled || !this.armsEndpoint) {
       this.enabled = false;
       this.log.debug(
-        !ARMS_ENDPOINT
+        !this.armsEndpoint
           ? "Telemetry disabled (no credentials configured)"
           : "Telemetry disabled (opt-out)",
       );
@@ -192,8 +199,8 @@ export class Telemetry {
   private buildPayload(events: ArmsEvent[]): Record<string, unknown> {
     return {
       app: {
-        id: ARMS_PID,
-        env: ARMS_ENV,
+        id: this.armsPid,
+        env: this.armsEnv,
         version: this.pluginVersion,
         type: "node",
       },
@@ -212,7 +219,7 @@ export class Telemetry {
     const payload = this.buildPayload(batch);
 
     try {
-      const resp = await fetch(ARMS_ENDPOINT, {
+      const resp = await fetch(this.armsEndpoint, {
         method: "POST",
         headers: { "Content-Type": "text/plain" },
         body: JSON.stringify(payload),
diff --git a/apps/memos-local-openclaw/src/viewer/html.ts b/apps/memos-local-openclaw/src/viewer/html.ts
@@ -287,7 +287,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .admin-card-tag.tag-version{background:rgba(139,92,246,.1);color:#8b5cf6}
 .admin-card-tag.tag-visibility{background:rgba(99,102,241,.08);color:var(--pri)}
 .admin-card-tag.tag-group{background:rgba(139,92,246,.08);color:#8b5cf6}
-.admin-card-preview{font-size:12px;color:var(--text-sec);line-height:1.5;margin:8px 0;padding:10px 12px;background:rgba(99,102,241,.02);border-radius:10px;border:1px solid rgba(99,102,241,.08);max-height:120px;overflow:hidden;white-space:pre-wrap;word-break:break-all;position:relative;-webkit-mask-image:linear-gradient(to bottom,#000 70%,transparent 100%);mask-image:linear-gradient(to bottom,#000 70%,transparent 100%)}
+.admin-card-preview{font-size:12px;color:var(--text-sec);line-height:1.5;margin:8px 0;padding:10px 12px;background:rgba(99,102,241,.02);border-radius:10px;border:1px solid rgba(99,102,241,.08);max-height:120px;overflow:hidden;white-space:pre-wrap;word-break:break-all;position:relative;-webkit-mask-image:linear-gradient(to bottom,#000 88%,transparent 100%);mask-image:linear-gradient(to bottom,#000 88%,transparent 100%)}
 .admin-card-actions{display:inline-flex;gap:6px;margin-left:auto;align-items:center;flex-shrink:0}
 .admin-card-time{font-size:11px;color:var(--text-muted)}
 .admin-card-detail{display:none;margin-top:0;padding:20px 24px 24px;border-top:1px dashed rgba(99,102,241,.12);background:linear-gradient(180deg,rgba(99,102,241,.02) 0%,transparent 60%);animation:adminDetailIn .25s ease}
@@ -322,7 +322,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .adm-msg-side.assistant .adm-msg-role{color:var(--green)}
 .adm-msg-time{font-size:9px;color:var(--text-muted)}
 .adm-msg-body{flex:1;min-width:0;padding:12px 16px;font-size:13px;line-height:1.75;color:var(--text);white-space:pre-wrap;word-break:break-word}
-.adm-msg-body.collapsed{max-height:120px;overflow:hidden;-webkit-mask-image:linear-gradient(180deg,#000 65%,transparent);mask-image:linear-gradient(180deg,#000 65%,transparent)}
+.adm-msg-body.collapsed{max-height:120px;overflow:hidden;-webkit-mask-image:linear-gradient(180deg,#000 88%,transparent);mask-image:linear-gradient(180deg,#000 88%,transparent)}
 .adm-msg-toggle{display:none;padding:0 16px 8px;font-size:11px;color:var(--pri);cursor:pointer;transition:color .15s}
 .adm-msg-toggle:hover{color:var(--pri-dark)}
 .admin-card-expand-btn{font-size:12px;color:var(--pri);cursor:pointer;background:none;border:none;padding:2px 6px;font-family:inherit}
@@ -7419,6 +7419,9 @@ function connectNotifSSE(){
           _notifUnread=d.unreadCount||0;
           renderNotifBadge();
           if(_notifUnread>prev&&_notifPanelOpen) loadNotifications();
+          if(_notifUnread>prev&&_activeView==='memories'&&memorySearchScope!=='hub'){
+            syncTeamShareRemovedFromNotifications().then(function(){ loadMemories(currentPage,true); });
+          }
         }
         if(d.type==='cleared'){
           _notifUnread=0;_notifCache=[];
@@ -7764,11 +7767,31 @@ function getFilterParams(){
   return p;
 }
 
+/** Hub admin removed a shared memory — badge-only: clear team_shared_chunks (never touches chunks/embeddings/hub_memories recall data). */
+async function syncTeamShareRemovedFromNotifications(){
+  try{
+    var r=await fetch('/api/sharing/notifications');
+    var d=await r.json();
+    var list=d.notifications||[];
+    for(var i=0;i<list.length;i++){
+      var n=list[i];
+      if(n.type!=='resource_removed'||n.resource!=='memory'||!n.message) continue;
+      try{
+        var meta=JSON.parse(n.message);
+        if(meta.sourceChunkId){
+          await fetch('/api/sharing/sync-hub-removal',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({sourceChunkId:meta.sourceChunkId,memoryId:meta.memoryId||''})});
+        }
+      }catch(e){}
+    }
+  }catch(e){}
+}
+
 async function loadMemories(page,silent){
   if(page) currentPage=page;
   const list=document.getElementById('memoryList');
   if(!silent) list.innerHTML='<div class="spinner"></div>';
   try{
+    if(!silent) await syncTeamShareRemovedFromNotifications();
     const p=getFilterParams();
     p.set('limit',PAGE_SIZE);
     p.set('page',currentPage);
diff --git a/apps/memos-local-openclaw/src/viewer/server.ts b/apps/memos-local-openclaw/src/viewer/server.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@memtensor/memos-local-openclaw-plugin",`
`3`		`- "version": "1.0.4-beta.14",`
	`3`	`+ "version": "1.0.5",`
`4`	`4`	`"description": "MemOS Local memory plugin for OpenClaw — full-write, hybrid-recall, progressive retrieval",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "index.ts",`