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

package/src/viewer/html.ts

@@ -804,6 +804,10 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .recall-score.high{background:rgba(34,197,94,.12);color:#22c55e}
 .recall-score.mid{background:rgba(251,191,36,.12);color:#f59e0b}
 .recall-score.low{background:rgba(248,113,113,.1);color:var(--text-muted)}
+.recall-origin{flex-shrink:0;font-size:9px;font-weight:600;padding:1px 5px;border-radius:4px}
+.recall-origin.local-shared{background:rgba(59,130,246,.12);color:#3b82f6}
+.recall-origin.hub-memory{background:rgba(139,92,246,.12);color:#8b5cf6}
+.recall-origin.hub-remote{background:rgba(139,92,246,.12);color:#8b5cf6}
 .recall-summary-short{flex:1;color:var(--text-sec);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .recall-expand-icon{flex-shrink:0;font-size:10px;color:var(--text-muted);transition:transform .15s}
 .recall-item.expanded .recall-expand-icon{transform:rotate(90deg)}
@@ -1216,7 +1220,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
       </div>
       <button class="btn btn-ghost btn-sm" onclick="doLogout()" data-i18n="logout">Logout</button>
     </div>
-  </div>
+    </div>
   </div>
 
   <div class="main-content">
@@ -2229,6 +2233,9 @@ const I18N={
     'logs.recall.noHits':'No matching memories',
     'logs.recall.noneRelevant':'LLM filter: none relevant',
     'logs.recall.more':'{n} more...',
+    'recall.origin.localShared':'Local Shared',
+    'recall.origin.hubMemory':'Team Cache',
+    'recall.origin.hubRemote':'Team',
     'tab.import':'\u{1F4E5} Import',
     'tab.settings':'\u2699 Settings',
     'settings.modelconfig':'Model Configuration',
@@ -2940,6 +2947,9 @@ const I18N={
     'logs.recall.noHits':'未匹配到记忆',
     'logs.recall.noneRelevant':'LLM 过滤：无相关记忆',
     'logs.recall.more':'还有 {n} 条...',
+    'recall.origin.localShared':'本机共享',
+    'recall.origin.hubMemory':'团队缓存',
+    'recall.origin.hubRemote':'团队',
     'tab.import':'\u{1F4E5} 导入',
     'tab.settings':'\u2699 设置',
     'settings.modelconfig':'模型配置',
@@ -4087,7 +4097,7 @@ function adminPaginateHtml(total,page,refilterFn){
   if(end<pages) html+=(end<pages-1?'<span class="pg-info">...</span>':'')+'<button class="pg-btn" onclick="'+refilterFn+'Page('+(pages-1)+')">'+pages+'</button>';
   html+='<button class="pg-btn'+(page>=pages-1?' disabled':'')+'" onclick="'+refilterFn+'Page('+(page+1)+')">\\u2192</button>';
   html+='<span class="pg-info">'+total+' '+t('pagination.total')+'</span>';
-  html+='</div>';
+    html+='</div>';
   return html;
 }
 
@@ -4149,12 +4159,12 @@ async function loadAdminData(){
     var fetches;
     if(isAdmin){
       fetches=await Promise.all([
-        fetch('/api/sharing/users').then(function(r){return r.json();}),
-        fetch('/api/admin/shared-tasks').then(function(r){return r.json();}),
-        fetch('/api/admin/shared-skills').then(function(r){return r.json();}),
-        fetch('/api/sharing/pending-users').then(function(r){return r.json();}),
-        fetch('/api/admin/shared-memories').then(function(r){return r.json();})
-      ]);
+      fetch('/api/sharing/users').then(function(r){return r.json();}),
+      fetch('/api/admin/shared-tasks').then(function(r){return r.json();}),
+      fetch('/api/admin/shared-skills').then(function(r){return r.json();}),
+      fetch('/api/sharing/pending-users').then(function(r){return r.json();}),
+      fetch('/api/admin/shared-memories').then(function(r){return r.json();})
+    ]);
     }else{
       fetches=await Promise.all([
         Promise.resolve({users:[]}),
@@ -5389,6 +5399,13 @@ function parseMemoryAddEntries(out){
   return results;
 }
 
+function recallOriginBadge(origin){
+  if(origin==='local-shared') return '<span class="recall-origin local-shared">'+t('recall.origin.localShared')+'</span>';
+  if(origin==='hub-memory') return '<span class="recall-origin hub-memory">'+t('recall.origin.hubMemory')+'</span>';
+  if(origin==='hub-remote') return '<span class="recall-origin hub-remote">'+t('recall.origin.hubRemote')+'</span>';
+  return '';
+}
+
 function buildLogSummary(lg){
   let inputObj=null;
   try{inputObj=JSON.parse(lg.input);}catch(_){}
@@ -5413,8 +5430,9 @@ function buildLogSummary(lg){
           var scoreClass=c.score>=0.7?'high':c.score>=0.5?'mid':'low';
           var shortText=escapeHtml(c.summary||c.content||c.original_excerpt||'');
           var fullText=escapeHtml(c.content||c.original_excerpt||c.summary||'');
+          var oBadge=recallOriginBadge(c.origin);
           html+='<div class="recall-item" onclick="event.stopPropagation();this.classList.toggle(\\\'expanded\\\')">';
-          html+='<div class="recall-item-head"><span class="recall-score '+scoreClass+'">'+c.score.toFixed(2)+'</span><span class="log-msg-role '+(c.role||'user')+'">'+(c.role||'user')+'</span><span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
+          html+='<div class="recall-item-head"><span class="recall-score '+scoreClass+'">'+c.score.toFixed(2)+'</span><span class="log-msg-role '+(c.role||'user')+'">'+(c.role||'user')+'</span>'+oBadge+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
           html+='<div class="recall-summary-full">'+fullText+'</div>';
           html+='</div>';
         });
@@ -5427,8 +5445,9 @@ function buildLogSummary(lg){
             var scoreClass=f.score>=0.7?'high':f.score>=0.5?'mid':'low';
             var shortText=escapeHtml(f.summary||f.content||f.original_excerpt||'');
             var fullText=escapeHtml(f.content||f.original_excerpt||f.summary||'');
+            var oBadge=recallOriginBadge(f.origin);
             html+='<div class="recall-item" onclick="event.stopPropagation();this.classList.toggle(\\\'expanded\\\')">';
-            html+='<div class="recall-item-head"><span class="recall-score '+scoreClass+'">'+f.score.toFixed(2)+'</span><span class="log-msg-role '+(f.role||'user')+'">'+(f.role||'user')+'</span><span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
+            html+='<div class="recall-item-head"><span class="recall-score '+scoreClass+'">'+f.score.toFixed(2)+'</span><span class="log-msg-role '+(f.role||'user')+'">'+(f.role||'user')+'</span>'+oBadge+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
             html+='<div class="recall-summary-full">'+fullText+'</div>';
             html+='</div>';
           });
@@ -5492,8 +5511,9 @@ function buildRecallDetailHtml(rd){
       var scoreClass=c.score>=0.7?'high':c.score>=0.5?'mid':'low';
       var shortText=escapeHtml(c.summary||c.content||c.original_excerpt||'');
       var fullText=escapeHtml(c.content||c.original_excerpt||c.summary||'');
+      var oBadge=recallOriginBadge(c.origin);
       html+='<div class="recall-item" onclick="event.stopPropagation();this.classList.toggle(\\\'expanded\\\')">';
-      html+='<div class="recall-item-head"><span class="recall-idx">'+(i+1)+'</span><span class="recall-score '+scoreClass+'">'+c.score.toFixed(3)+'</span><span class="log-msg-role '+(c.role||'user')+'">'+(c.role||'user')+'</span><span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
+      html+='<div class="recall-item-head"><span class="recall-idx">'+(i+1)+'</span><span class="recall-score '+scoreClass+'">'+c.score.toFixed(3)+'</span><span class="log-msg-role '+(c.role||'user')+'">'+(c.role||'user')+'</span>'+oBadge+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
       html+='<div class="recall-summary-full">'+fullText+'</div>';
       html+='</div>';
     });
@@ -5507,8 +5527,9 @@ function buildRecallDetailHtml(rd){
       var scoreClass=f.score>=0.7?'high':f.score>=0.5?'mid':'low';
       var shortText=escapeHtml(f.summary||f.content||f.original_excerpt||'');
       var fullText=escapeHtml(f.content||f.original_excerpt||f.summary||'');
+      var oBadge=recallOriginBadge(f.origin);
       html+='<div class="recall-item" onclick="event.stopPropagation();this.classList.toggle(\\\'expanded\\\')">';
-      html+='<div class="recall-item-head"><span class="recall-idx">'+(i+1)+'</span><span class="recall-score '+scoreClass+'">'+f.score.toFixed(3)+'</span><span class="log-msg-role '+(f.role||'user')+'">'+(f.role||'user')+'</span><span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
+      html+='<div class="recall-item-head"><span class="recall-idx">'+(i+1)+'</span><span class="recall-score '+scoreClass+'">'+f.score.toFixed(3)+'</span><span class="log-msg-role '+(f.role||'user')+'">'+(f.role||'user')+'</span>'+oBadge+'<span class="recall-summary-short">'+shortText+'</span><span class="recall-expand-icon">\u25B6</span></div>';
       html+='<div class="recall-summary-full">'+fullText+'</div>';
       html+='</div>';
     });
@@ -6714,8 +6735,8 @@ async function saveHubConfig(){
         if(!td.ok){
           var errMsg=td.error==='cannot_join_self'?t('sharing.cannotJoinSelf'):(td.error||t('settings.hub.test.fail'));
           done();toast(errMsg,'error');return;
-        }
-      }catch(e){
+    }
+  }catch(e){
         done();toast(t('settings.hub.test.fail')+': '+String(e),'error');return;
       }
     }
@@ -7536,8 +7557,8 @@ function getFilterParams(){
   if(scope==='local'){
     p.set('owner',_currentAgentOwner);
   }else if(scope==='allLocal'){
-    const owner=document.getElementById('filterOwner').value;
-    if(owner) p.set('owner',owner);
+  const owner=document.getElementById('filterOwner').value;
+  if(owner) p.set('owner',owner);
   }
   return p;
 }
@@ -7567,11 +7588,11 @@ async function loadMemories(page,silent){
     renderPagination();
   }catch(e){
     if(!silent){
-      list.innerHTML='';
-      totalPages=1;totalCount=0;
+    list.innerHTML='';
+    totalPages=1;totalCount=0;
       _lastMemoriesFingerprint='';
-      renderMemories([]);
-      renderPagination();
+    renderMemories([]);
+    renderPagination();
     }
   }
 }
@@ -7598,9 +7619,9 @@ async function loadHubMemories(silent){
   }catch(e){
     if(!silent){
       _lastMemoriesFingerprint='';
-      document.getElementById('searchMeta').textContent='0'+t('search.meta.results');
-      renderMemories([]);
-      document.getElementById('pagination').innerHTML='';
+    document.getElementById('searchMeta').textContent='0'+t('search.meta.results');
+    renderMemories([]);
+    document.getElementById('pagination').innerHTML='';
     }
   }
 }

package/src/viewer/server.ts

@@ -1780,7 +1780,8 @@ export class ViewerServer {
         localIPs.push("127.0.0.1", "localhost", "0.0.0.0");
         try {
           const u = new URL(hubUrl);
-          if (localIPs.includes(u.hostname)) {
+          const targetPort = u.port || (u.protocol === "https:" ? "443" : "80");
+          if (localIPs.includes(u.hostname) && targetPort === String(this.port)) {
             return this.jsonResponse(res, { ok: false, error: "cannot_join_self" });
           }
         } catch {}
@@ -1788,10 +1789,13 @@ export class ViewerServer {
         const nickname = sharing.client?.nickname;
         const username = nickname || os.userInfo().username || "user";
         const hostname = os.hostname() || "unknown";
+        const persisted = this.store.getClientHubConnection();
+        const existingIdentityKey = persisted?.identityKey || "";
         const result = await hubRequestJson(hubUrl, "", "/api/v1/hub/join", {
           method: "POST",
-          body: JSON.stringify({ teamToken, username, deviceName: hostname, reapply: true }),
+          body: JSON.stringify({ teamToken, username, deviceName: hostname, reapply: true, identityKey: existingIdentityKey }),
         }) as any;
+        const returnedIdentityKey = String(result.identityKey || existingIdentityKey || "");
         this.store.setClientHubConnection({
           hubUrl,
           userId: String(result.userId || ""),
@@ -1799,6 +1803,8 @@ export class ViewerServer {
           userToken: result.userToken || "",
           role: "member",
           connectedAt: Date.now(),
+          identityKey: returnedIdentityKey,
+          lastKnownStatus: result.status || "",
         });
         this.jsonResponse(res, { ok: true, status: result.status || "pending" });
       } catch (err) {
@@ -2592,7 +2598,8 @@ export class ViewerServer {
               localIPs.push("127.0.0.1", "localhost", "0.0.0.0");
               try {
                 const u = new URL(addr.startsWith("http") ? addr : `http://${addr}`);
-                if (localIPs.includes(u.hostname)) {
+                const targetPort = u.port || (u.protocol === "https:" ? "443" : "80");
+                if (localIPs.includes(u.hostname) && targetPort === String(this.port)) {
                   res.writeHead(400, { "Content-Type": "application/json" });
                   res.end(JSON.stringify({ error: "cannot_join_self" }));
                   return;
@@ -2618,17 +2625,22 @@ export class ViewerServer {
           const isClient = newEnabled && newRole === "client";
           if (wasClient && !isClient) {
             this.notifyHubLeave();
-            this.store.clearClientHubConnection();
-            this.log.info("Cleared client hub connection (sharing disabled or role changed)");
+            const oldConn = this.store.getClientHubConnection();
+            if (oldConn) {
+              this.store.setClientHubConnection({ ...oldConn, userToken: "", lastKnownStatus: "left" });
+            }
+            this.log.info("Client hub connection token cleared (sharing disabled or role changed), identity preserved");
           }
 
-          // Detect switching to a different Hub while still in client mode
           if (wasClient && isClient) {
             const newClientAddr = String((merged.client as Record<string, unknown>)?.hubAddress || "");
             if (newClientAddr && oldClientHubAddress && normalizeHubUrl(newClientAddr) !== normalizeHubUrl(oldClientHubAddress)) {
               this.notifyHubLeave();
-              this.store.clearClientHubConnection();
-              this.log.info("Cleared client hub connection (switched to different Hub)");
+              const oldConn = this.store.getClientHubConnection();
+              if (oldConn) {
+                this.store.setClientHubConnection({ ...oldConn, hubUrl: normalizeHubUrl(newClientAddr), userToken: "", lastKnownStatus: "hub_changed" });
+              }
+              this.log.info("Client hub connection token cleared (switched to different Hub), identity preserved");
             }
           }
 
@@ -2645,9 +2657,11 @@ export class ViewerServer {
         this.log.info("Plugin config updated via Viewer");
         this.stopHubHeartbeat();
 
-        // When switching to client mode, immediately send join request
+        // When switching to client mode or re-enabling sharing as client, send join request
         const finalSharing = config.sharing as Record<string, unknown> | undefined;
-        if (finalSharing?.role === "client" && oldSharingRole !== "client") {
+        const nowClient = Boolean(finalSharing?.enabled) && finalSharing?.role === "client";
+        const previouslyClient = oldSharingEnabled && oldSharingRole === "client";
+        if (nowClient && !previouslyClient) {
           this.autoJoinOnSave(finalSharing).catch(e => this.log.warn(`Auto-join on save failed: ${e}`));
         }
 
@@ -2670,10 +2684,13 @@ export class ViewerServer {
     const nickname = String(clientCfg?.nickname || "");
     const username = nickname || os.userInfo().username || "user";
     const hostname = os.hostname() || "unknown";
+    const persisted = this.store.getClientHubConnection();
+    const existingIdentityKey = persisted?.identityKey || "";
     const result = await hubRequestJson(hubUrl, "", "/api/v1/hub/join", {
       method: "POST",
-      body: JSON.stringify({ teamToken, username, deviceName: hostname }),
+      body: JSON.stringify({ teamToken, username, deviceName: hostname, identityKey: existingIdentityKey }),
     }) as any;
+    const returnedIdentityKey = String(result.identityKey || existingIdentityKey || "");
     this.store.setClientHubConnection({
       hubUrl,
       userId: String(result.userId || ""),
@@ -2681,6 +2698,8 @@ export class ViewerServer {
       userToken: result.userToken || "",
       role: "member",
       connectedAt: Date.now(),
+      identityKey: returnedIdentityKey,
+      lastKnownStatus: result.status || "",
     });
     this.log.info(`Auto-join on save: status=${result.status}, userId=${result.userId}`);
     if (result.userToken) {
@@ -2768,10 +2787,10 @@ export class ViewerServer {
               this.log.warn(`Failed to update hub-auth.json: ${e}`);
             }
           } else {
-            const persisted = this.store.getClientHubConnection();
-            if (persisted) {
+            const persistedConn = this.store.getClientHubConnection();
+            if (persistedConn) {
               this.store.setClientHubConnection({
-                ...persisted,
+                ...persistedConn,
                 username: result.username,
                 userToken: result.userToken,
               });
@@ -2798,7 +2817,8 @@ export class ViewerServer {
           const localIPs = this.getLocalIPs();
           localIPs.push("127.0.0.1", "localhost", "0.0.0.0");
           const parsed = new URL(hubUrl.startsWith("http") ? hubUrl : `http://${hubUrl}`);
-          if (localIPs.includes(parsed.hostname)) {
+          const targetPort = parsed.port || (parsed.protocol === "https:" ? "443" : "80");
+          if (localIPs.includes(parsed.hostname) && targetPort === String(this.port)) {
             this.jsonResponse(res, { ok: false, error: "cannot_join_self" });
             return;
           }