@memtensor/memos-local-openclaw-plugin 1.0.4-beta.12 → 1.0.4-beta.14

package/package.json

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

package/src/client/connector.ts

@@ -208,20 +208,55 @@ export async function getHubStatus(store: SqliteStore, config: MemosLocalConfig)
   } catch (err: any) {
     const is401 = typeof err?.message === "string" && err.message.includes("(401)");
     if (is401 && conn) {
-      store.setClientHubConnection({
-        ...conn,
-        userToken: "",
-        lastKnownStatus: "removed",
-      });
+      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: "removed",
-        },
+        user: { id: conn.userId, username: conn.username || "", role: "member", status: "token_expired" },
       };
     }
     return { connected: false, user: null };

package/src/config.ts

@@ -128,7 +128,8 @@ export function resolveConfig(raw: Partial<MemosLocalConfig> | undefined, stateD
         userToken: cfg.sharing?.client?.userToken ?? "",
         teamToken: cfg.sharing?.client?.teamToken ?? "",
         pendingUserId: cfg.sharing?.client?.pendingUserId ?? "",
-      } : { hubAddress: "", userToken: "", teamToken: "", pendingUserId: "" };
+        nickname: cfg.sharing?.client?.nickname ?? "",
+      } : { hubAddress: "", userToken: "", teamToken: "", pendingUserId: "", nickname: "" };
       return { enabled, role, hub, client, capabilities: sharingCapabilities };
     })(),
   };

package/src/hub/server.ts

@@ -314,6 +314,7 @@ export class HubServer {
           { userId: user.id, username: user.username, role: user.role, status: user.status },
           this.authSecret,
         );
+        this.userManager.approveUser(user.id, token);
         return this.json(res, 200, { status: "active", userToken: token });
       }
       return this.json(res, 200, { status: user.status });

package/src/viewer/html.ts

@@ -976,8 +976,6 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .team-guide-steps li::marker{color:var(--pri);font-weight:700;font-size:11px}
 .team-guide-opt .btn-guide{font-size:11px;padding:5px 14px;border-radius:6px;font-weight:600;border:1px solid rgba(99,102,241,.25);background:rgba(99,102,241,.08);color:var(--pri);cursor:pointer;transition:background .15s,border-color .15s}
 .team-guide-opt .btn-guide:hover{background:rgba(99,102,241,.14);border-color:var(--pri)}
-.team-guide-dismiss{position:absolute;top:10px;right:12px;background:none;border:none;color:var(--text-muted);font-size:15px;cursor:pointer;padding:4px;line-height:1;opacity:.5;transition:opacity .15s}
-.team-guide-dismiss:hover{opacity:1}
 [data-theme="light"] .team-guide{background:linear-gradient(135deg,rgba(6,182,212,.03),rgba(79,70,229,.02));border-color:rgba(6,182,212,.15)}
 [data-theme="light"] .team-guide-opt{box-shadow:0 1px 3px rgba(0,0,0,.03)}
 [data-theme="light"] .team-guide-opt:hover{box-shadow:0 4px 16px rgba(0,0,0,.04)}
@@ -1641,9 +1639,8 @@ input,textarea,select{font-family:inherit;font-size:inherit}
             </div>
           </div>
           <div class="settings-card-body">
-            <!-- team setup guide (inside Hub card) -->
+            <!-- team setup guide (inside Hub card) — always visible when sharing is not configured -->
             <div class="team-guide" id="teamSetupGuide">
-              <button class="team-guide-dismiss" onclick="dismissTeamGuide()" title="Dismiss">&times;</button>
               <div class="team-guide-title">\u{1F680} <span data-i18n="guide.title">Get Started with Team Collaboration</span></div>
               <div class="team-guide-subtitle" data-i18n="guide.subtitle">MemOS supports team memory sharing. Choose one of the following options to enable collaboration, or continue using local-only mode.</div>
               <div class="team-guide-options">
@@ -2126,6 +2123,8 @@ const I18N={
     'notif.userJoin':'New user requests to join the team',
     'notif.userOnline':'User came online',
     'notif.userOffline':'User went offline',
+    'notif.membershipApproved':'Your team join request has been approved',
+    'notif.membershipRejected':'Your team join request has been declined',
     'notif.clearAll':'Clear all',
     'notif.timeAgo.just':'just now',
     'notif.timeAgo.min':'{n}m ago',
@@ -2448,6 +2447,9 @@ const I18N={
     'sharing.pendingApproval.hint':'Your join request has been submitted. Please wait for the team admin to approve.',
     'sharing.rejected.hint':'Your join request was rejected by the team admin. Please contact the admin or retry.',
     'sharing.removed.hint':'You have been removed from the team by the admin. You can re-apply to join.',
+    'sharing.joinTeam':'Join Team',
+    'sharing.joinSent.pending':'Join request sent! Waiting for admin approval.',
+    'sharing.joinSent.active':'Successfully joined the team!',
     'sharing.retryJoin':'Retry Join',
     'sharing.retryJoin.hint':'Clears local data and re-submits the join request',
     'sharing.retryJoin.confirm':'This will clear your current connection and re-submit a join request. Continue?',
@@ -2840,6 +2842,8 @@ const I18N={
     'notif.userJoin':'有新用户申请加入团队',
     'notif.userOnline':'用户上线了',
     'notif.userOffline':'用户下线了',
+    'notif.membershipApproved':'你的团队加入申请已通过',
+    'notif.membershipRejected':'你的团队加入申请已被拒绝',
     'notif.clearAll':'清除全部',
     'notif.timeAgo.just':'刚刚',
     'notif.timeAgo.min':'{n}分钟前',
@@ -3162,6 +3166,9 @@ const I18N={
     'sharing.pendingApproval.hint':'加入申请已提交，请等待团队管理员审核通过。',
     'sharing.rejected.hint':'您的加入申请已被团队管理员拒绝，请联系管理员或重新申请。',
     'sharing.removed.hint':'您已被管理员从团队中移除，可以重新申请加入。',
+    'sharing.joinTeam':'加入团队',
+    'sharing.joinSent.pending':'加入申请已发送，等待管理员审批。',
+    'sharing.joinSent.active':'成功加入团队！',
     'sharing.retryJoin':'重新申请',
     'sharing.retryJoin.hint':'清除本地连接数据并重新提交加入申请',
     'sharing.retryJoin.confirm':'这将清除当前连接数据并重新提交加入申请，是否继续？',
@@ -3592,20 +3599,25 @@ function selectSharingRole(role){
   var tp=document.getElementById('sharingTeamPanel');
   var ap=document.getElementById('sharingAdminPanel');
   if(role==='client'){
-    if(sp) sp.style.display='none';
+    if(sp) { sp.style.display='none'; sp.innerHTML=''; }
     if(tp) tp.style.display='none';
     if(ap) ap.style.display='none';
   }else{
-    if(sp) sp.style.display='';
+    if(sp) { sp.style.display='none'; sp.innerHTML=''; }
     if(tp) tp.style.display='';
-    if(ap) ap.style.display='';
+    if(ap) tp.style.display='';
   }
+  _lastSettingsFingerprint='';
+  setTimeout(function(){ loadSharingStatus(true); },200);
   if(role==='hub'){
     var tk=document.getElementById('cfgHubTeamToken');
     if(!tk.value.trim()) tk.value=_genToken(18);
     var tn=document.getElementById('cfgHubTeamName');
     if(!tn.value.trim()) tn.value='My Team';
   }
+  var card=document.getElementById('settingsSharingConfig');
+  var saveBtn=card&&card.querySelector('.settings-actions .btn-primary');
+  if(saveBtn&&typeof _hubSaveBtnLabel==='function') saveBtn.textContent=_hubSaveBtnLabel();
 }
 var _cachedLocalIP='';
 function updateHubShareInfo(){
@@ -3697,19 +3709,19 @@ function switchView(view){
   else if(view==='analytics') loadMetrics();
   else if(view==='logs') loadLogs();
   else if(view==='settings'){loadConfig().then(function(){
-    var notDismissed=localStorage.getItem('memos-team-guide-dismissed')!=='1';
     var sharingOn=document.getElementById('cfgSharingEnabled');
     var sharingNotEnabled=!sharingOn||!sharingOn.checked;
-    if(notDismissed&&sharingNotEnabled){
+    if(sharingNotEnabled){
       switchSettingsTab('hub',document.querySelector('.settings-tab-btn[data-tab="hub"]'));
     }
   });loadModelHealth();}
   else if(view==='import'){if(!window._migrateRunning) migrateScan(false);}
-  else if(view==='admin'){loadAdminData();}
+  else if(view==='admin'){_lastAdminFingerprint='';loadAdminData();}
 }
 
 function onMemoryScopeChange(){
   memorySearchScope=document.getElementById('memorySearchScope')?.value||'local';
+  try{localStorage.setItem('memos_memorySearchScope',memorySearchScope);}catch(e){}
   currentPage=1;
   activeSession=null;activeRole='';
   _lastMemoriesFingerprint='';
@@ -3775,10 +3787,13 @@ async function loadSharingStatus(forcePending){
     if(_lastSharingConnStatus==='pending'&&curStatus==='connected'){
       toast(t('sharing.approved.toast'),'success');
       loadMemories();loadTasks();loadSkills();
+      if(_notifSSE){_notifSSE.close();_notifSSE=null;_notifSSEConnected=false;}
+      connectNotifSSE();
+      loadNotifications();
     }
     _lastSharingConnStatus=curStatus;
     if(curStatus==='pending'&&!_clientPendingPollTimer){
-      _clientPendingPollTimer=setInterval(function(){loadSharingStatus(false);},10000);
+      _clientPendingPollTimer=setInterval(function(){loadSharingStatus(false);},5000);
     }
     if(curStatus!=='pending'&&_clientPendingPollTimer){
       clearInterval(_clientPendingPollTimer);
@@ -3832,6 +3847,7 @@ function renderSharingSidebar(data){
     html+='<span class="label">'+t('sharing.sidebar.identity')+'</span><span class="value">'+esc(conn.user.username||'-')+'</span>';
     if(conn.teamName) html+='<span class="label">'+t('sharing.team')+'</span><span class="value">'+esc(conn.teamName)+'</span>';
     html+='</div>';
+    html+='<div style="margin-top:8px"><button class="btn btn-sm btn-primary" onclick="retryHubJoin()" style="font-size:11px">'+t('sharing.retryJoin')+'</button></div>';
     statusEl.innerHTML=html;
     hintEl.textContent=t('sharing.rejected.hint');
   }else if(conn.removed&&conn.user){
@@ -3840,6 +3856,7 @@ function renderSharingSidebar(data){
     html+='<span class="label">'+t('sharing.sidebar.identity')+'</span><span class="value">'+esc(conn.user.username||'-')+'</span>';
     if(conn.teamName) html+='<span class="label">'+t('sharing.team')+'</span><span class="value">'+esc(conn.teamName)+'</span>';
     html+='</div>';
+    html+='<div style="margin-top:8px"><button class="btn btn-sm btn-primary" onclick="retryHubJoin()" style="font-size:11px">'+t('sharing.retryJoin')+'</button></div>';
     statusEl.innerHTML=html;
     hintEl.textContent=t('sharing.removed.hint');
   }else if(conn.connected&&conn.user){
@@ -3876,6 +3893,9 @@ function renderSharingSettings(data){
   if(!data||!data.enabled){
     statusEl.innerHTML='';teamEl.innerHTML='';adminEl.innerHTML='';
     if(panelsWrap) panelsWrap.style.display='none';
+    var adminNavTab0=document.querySelector('.tab[data-view="admin"]');
+    if(adminNavTab0) adminNavTab0.style.display='none';
+    if(_activeView==='admin') switchView('memories');
     return;
   }
   if(panelsWrap) panelsWrap.style.display='';
@@ -3883,9 +3903,20 @@ function renderSharingSettings(data){
   var user=conn.user||{};
   var actualRole=data.role||_sharingRole||'client';
   if(data.role) _sharingRole=data.role;
+  var prevIsAdmin=!!window._isHubAdmin;
   var isAdmin=(data.admin&&data.admin.canManageUsers)||(conn.connected&&user.role==='admin')||(actualRole==='hub');
   window._isHubAdmin=isAdmin;
   if(isAdmin) startAdminPoll();
+  var adminNavTab=document.querySelector('.tab[data-view="admin"]');
+  if(adminNavTab){
+    var showTab=(actualRole==='hub')||(conn.connected);
+    adminNavTab.style.display=showTab?'':'none';
+    if(!showTab&&_activeView==='admin') switchView('memories');
+  }
+  if(prevIsAdmin&&!isAdmin&&_activeView==='admin'){
+    _lastAdminFingerprint='';
+    loadAdminData();
+  }
   var hubAdminBtn=document.getElementById('hubAdminEntryBtn');
 
   if(actualRole==='hub'){
@@ -4059,7 +4090,7 @@ async function approveSharingUser(userId,username){
   try{
     const r=await fetch('/api/sharing/approve-user',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({userId:userId,username:username})});
     const d=await r.json();
-    if(d.ok){toast(t('toast.userApproved'),'success');loadSharingPendingUsers();loadSharingStatus(true);} else {toast(d.error||t('toast.approveFail'),'error');}
+    if(d.ok){toast(t('toast.userApproved'),'success');loadSharingPendingUsers();loadSharingStatus(true);_lastAdminFingerprint='';loadAdminData();} else {toast(d.error||t('toast.approveFail'),'error');}
   }catch(e){toast(t('toast.approveFail')+': '+e.message,'error');}
 }
 
@@ -4067,24 +4098,17 @@ async function rejectSharingUser(userId,username){
   try{
     const r=await fetch('/api/sharing/reject-user',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({userId:userId,username:username})});
     const d=await r.json();
-    if(d.ok){toast(t('toast.userRejected'),'success');loadSharingPendingUsers();} else {toast(d.error||t('toast.rejectFail'),'error');}
+    if(d.ok){toast(t('toast.userRejected'),'success');loadSharingPendingUsers();_lastAdminFingerprint='';loadAdminData();} else {toast(d.error||t('toast.rejectFail'),'error');}
   }catch(e){toast(t('toast.rejectFail')+': '+e.message,'error');}
 }
 
 /* ─── Team Setup Guide ─── */
-var TEAM_GUIDE_DISMISSED_KEY='memos-team-guide-dismissed';
 function updateTeamGuide(sharingData){
   var el=document.getElementById('teamSetupGuide');
   if(!el) return;
-  if(localStorage.getItem(TEAM_GUIDE_DISMISSED_KEY)==='1'){el.style.display='none';return;}
   var isConfigured=sharingData&&sharingData.enabled;
   el.style.display=isConfigured?'none':'block';
 }
-function dismissTeamGuide(){
-  localStorage.setItem(TEAM_GUIDE_DISMISSED_KEY,'1');
-  var el=document.getElementById('teamSetupGuide');
-  if(el) el.style.display='none';
-}
 function guideGoToHub(role){
   switchSettingsTab('hub',document.querySelector('.settings-tab-btn[data-tab="hub"]'));
   var chk=document.getElementById('cfgSharingEnabled');
@@ -4200,7 +4224,7 @@ async function loadAdminData(){
     var _newMemories=Array.isArray(memoriesR.memories)?memoriesR.memories:[];
     var pending=isAdmin?(Array.isArray(pendingR.users)?pendingR.users:[]):[];
     var _fp=_newUsers.length+':'+_newTasks.length+':'+_newSkills.length+':'+_newMemories.length+':'+pending.length
-      +':'+_newUsers.map(function(u){return u.id+'|'+(u.isOnline?1:0)+'|'+(u.role||'')+'|'+(u.username||'')+'|'+(u.memoryCount||0)+'|'+(u.taskCount||0)+'|'+(u.skillCount||0)}).join(',')
+      +':'+_newUsers.map(function(u){return u.id+'|'+(u.isOnline?1:0)+'|'+(u.role||'')+'|'+(u.status||'')+'|'+(u.username||'')+'|'+(u.memoryCount||0)+'|'+(u.taskCount||0)+'|'+(u.skillCount||0)}).join(',')
       +':'+_newMemories.map(function(m){return m.id}).join(',')
       +':'+_newTasks.map(function(t){return t.id+'|'+(t.status||'')}).join(',')
       +':'+_newSkills.map(function(s){return s.id+'|'+(s.status||'')}).join(',')
@@ -4396,7 +4420,7 @@ async function adminApproveUser(userId,username){
   try{
     var r=await fetch('/api/sharing/approve-user',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({userId:userId,username:username})});
     var d=await r.json();
-    if(d.ok){toast(t('toast.userApproved'),'success');loadAdminData();}else{toast(d.error||t('toast.approveFail'),'error');}
+    if(d.ok){toast(t('toast.userApproved'),'success');_lastAdminFingerprint='';loadAdminData();}else{toast(d.error||t('toast.approveFail'),'error');}
   }catch(e){toast(t('toast.approveFail')+': '+e.message,'error');}
 }
 async function adminRejectUser(userId){
@@ -4404,7 +4428,7 @@ async function adminRejectUser(userId){
   try{
     var r=await fetch('/api/sharing/reject-user',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({userId:userId})});
     var d=await r.json();
-    if(d.ok){toast(t('toast.userRejected'),'success');loadAdminData();}else{toast(d.error||t('toast.rejectFail'),'error');}
+    if(d.ok){toast(t('toast.userRejected'),'success');_lastAdminFingerprint='';loadAdminData();}else{toast(d.error||t('toast.rejectFail'),'error');}
   }catch(e){toast(t('toast.rejectFail')+': '+e.message,'error');}
 }
 async function adminToggleRole(userId,newRole){
@@ -4413,7 +4437,14 @@ async function adminToggleRole(userId,newRole){
   try{
     var r=await fetch('/api/sharing/change-role',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({userId:userId,role:newRole})});
     var d=await r.json();
-    if(d.ok){toast(t('toast.roleChanged'),'success');loadAdminData();}
+    if(d.ok){
+      toast(t('toast.roleChanged'),'success');
+      _lastAdminFingerprint='';
+      _lastSettingsFingerprint='';
+      _lastSidebarFingerprint='';
+      await loadSharingStatus(false);
+      loadAdminData();
+    }
     else if(d.error==='cannot_demote_owner'){toast(t('admin.ownerHint'),'error');}
     else{toast(d.error||t('toast.roleChangeFail'),'error');}
   }catch(e){toast(t('toast.roleChangeFail')+': '+e.message,'error');}
@@ -4465,7 +4496,7 @@ async function adminRemoveUser(userId,username){
   try{
     var r=await fetch('/api/sharing/remove-user',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({userId:userId,cleanResources:clean})});
     var d=await r.json();
-    if(d.ok){toast(t('toast.userRemoved'),'success');loadAdminData();}
+    if(d.ok){toast(t('toast.userRemoved'),'success');_lastAdminFingerprint='';loadAdminData();}
     else if(d.error==='cannot_remove_owner'){toast(t('admin.ownerHint'),'error');}
     else{toast(d.error||t('toast.removeFail'),'error');}
   }catch(e){toast(t('toast.removeFail')+': '+e.message,'error');}
@@ -6597,16 +6628,16 @@ async function doSaveConfig(cfg, btnEl, savedId){
   function done(){btnEl.disabled=false;btnEl.textContent=t('settings.save');}
   try{
     const r=await fetch('/api/config',{method:'PUT',headers:{'Content-Type':'application/json'},body:JSON.stringify(cfg)});
-    if(r.status===401){done();toast(t('settings.session.expired'),'error');return false;}
+    if(r.status===401){done();toast(t('settings.session.expired'),'error');return null;}
     if(!r.ok) throw new Error(await r.text());
+    var data=await r.json().catch(function(){return {ok:true};});
     flashSaved(savedId);
-    toast(t('settings.saved'),'success');
     done();
-    return true;
+    return data;
   }catch(e){
     toast(t('settings.save.fail')+': '+e.message,'error');
     done();
-    return false;
+    return null;
   }
 }
 
@@ -6701,11 +6732,19 @@ async function saveModelsConfig(){
   await doSaveConfig(cfg, saveBtn, 'modelsSaved');
 }
 
+function _hubSaveBtnLabel(){
+  var on=document.getElementById('cfgSharingEnabled');
+  if(on&&on.checked&&_sharingRole==='client'){
+    var prevClient=sharingStatusCache&&sharingStatusCache.enabled&&sharingStatusCache.role==='client';
+    return prevClient?t('settings.save'):t('sharing.joinTeam');
+  }
+  return t('settings.save');
+}
 async function saveHubConfig(){
   var card=document.getElementById('settingsSharingConfig');
   var saveBtn=card.querySelector('.settings-actions .btn-primary');
   saveBtn.disabled=true;saveBtn.textContent=t('settings.test.loading');
-  function done(){saveBtn.disabled=false;saveBtn.textContent=t('settings.save');}
+  function done(){saveBtn.disabled=false;saveBtn.textContent=_hubSaveBtnLabel();}
 
   const cfg={};
   var sharingEnabled=document.getElementById('cfgSharingEnabled').checked;
@@ -6772,14 +6811,25 @@ async function saveHubConfig(){
     if(!(await confirmModal(switchMsg,{danger:true}))){done();return;}
   }
 
-  var ok=await doSaveConfig(cfg, saveBtn, 'hubSaved');
-  if(ok){
+  var result=await doSaveConfig(cfg, saveBtn, 'hubSaved');
+  if(result){
     if(sharingEnabled&&_sharingRole==='hub'){
       var adminNameEl=document.getElementById('cfgHubAdminName');
       if(adminNameEl&&adminNameEl.value.trim()){
         try{await fetch('/api/sharing/update-username',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({username:adminNameEl.value.trim()})});}catch(e){}
       }
     }
+    if(sharingEnabled&&_sharingRole==='client'&&result.joinStatus){
+      if(result.joinStatus==='pending'){
+        toast(t('sharing.joinSent.pending'),'success');
+      }else if(result.joinStatus==='active'){
+        toast(t('sharing.joinSent.active'),'success');
+      }else{
+        toast(t('settings.saved'),'success');
+      }
+    }else{
+      toast(t('settings.saved'),'success');
+    }
     _lastSidebarFingerprint='';
     _lastSettingsFingerprint='';
     _lastSharingConnStatus='';
@@ -7354,6 +7404,12 @@ function notifTypeText(n){
   if(n.type==='user_offline'){
     return t('notif.userOffline');
   }
+  if(n.type==='membership_approved'){
+    return t('notif.membershipApproved');
+  }
+  if(n.type==='membership_rejected'){
+    return t('notif.membershipRejected');
+  }
   return n.message||n.type;
 }
 
@@ -8810,6 +8866,14 @@ async function checkForUpdate(){
 }
 
 /* ─── Init ─── */
+try{
+  var savedScope=localStorage.getItem('memos_memorySearchScope');
+  if(savedScope&&(savedScope==='local'||savedScope==='allLocal'||savedScope==='hub')){
+    memorySearchScope=savedScope;
+    var scopeEl=document.getElementById('memorySearchScope');
+    if(scopeEl) scopeEl.value=savedScope;
+  }
+}catch(e){}
 document.getElementById('modalOverlay').addEventListener('click',e=>{if(e.target.id==='modalOverlay')closeModal()});
 document.getElementById('searchInput').addEventListener('keydown',e=>{if(e.key==='Escape'){e.target.value='';currentPage=1;if(memorySearchScope==='hub')loadHubMemories();else loadMemories();}});
 applyI18n();

package/src/viewer/server.ts

@@ -2440,6 +2440,7 @@ export class ViewerServer {
     res.write("data: {\"type\":\"connected\"}\n\n");
     this.notifSSEClients.push(res);
     if (!this.notifPollTimer) this.startNotifPoll();
+    else this.notifPollImmediate();
     req.on("close", () => {
       this.notifSSEClients = this.notifSSEClients.filter((c) => c !== res);
       if (this.notifSSEClients.length === 0) this.stopNotifPoll();
@@ -2475,6 +2476,20 @@ export class ViewerServer {
     if (this.notifPollTimer) { clearInterval(this.notifPollTimer); this.notifPollTimer = undefined; }
   }
 
+  private notifPollImmediate(): void {
+    const hub = this.resolveHubConnection();
+    if (!hub) return;
+    hubRequestJson(hub.hubUrl, hub.userToken, "/api/v1/hub/notifications?unread=1")
+      .then((data: any) => {
+        const count = data?.unreadCount ?? 0;
+        if (count !== this.lastKnownNotifCount) {
+          this.lastKnownNotifCount = count;
+          this.broadcastNotifSSE({ type: "update", unreadCount: count });
+        }
+      })
+      .catch(() => {});
+  }
+
   private startHubHeartbeat(): void {
     this.stopHubHeartbeat();
     const sendHeartbeat = async () => {
@@ -2660,11 +2675,16 @@ export class ViewerServer {
         const finalSharing = config.sharing as Record<string, unknown> | undefined;
         const nowClient = Boolean(finalSharing?.enabled) && finalSharing?.role === "client";
         const previouslyClient = oldSharingEnabled && oldSharingRole === "client";
+        let joinStatus: string | undefined;
         if (nowClient && !previouslyClient) {
-          this.autoJoinOnSave(finalSharing).catch(e => this.log.warn(`Auto-join on save failed: ${e}`));
+          try {
+            joinStatus = await this.autoJoinOnSave(finalSharing);
+          } catch (e) {
+            this.log.warn(`Auto-join on save failed: ${e}`);
+          }
         }
 
-        this.jsonResponse(res, { ok: true });
+        this.jsonResponse(res, { ok: true, joinStatus });
       } catch (e) {
         this.log.warn(`handleSaveConfig error: ${e}`);
         res.writeHead(500, { "Content-Type": "application/json" });
@@ -2673,11 +2693,11 @@ export class ViewerServer {
     });
   }
 
-  private async autoJoinOnSave(sharing: Record<string, unknown>): Promise<void> {
+  private async autoJoinOnSave(sharing: Record<string, unknown>): Promise<string | undefined> {
     const clientCfg = sharing.client as Record<string, unknown> | undefined;
     const hubAddress = String(clientCfg?.hubAddress || "");
     const teamToken = String(clientCfg?.teamToken || "");
-    if (!hubAddress || !teamToken) return;
+    if (!hubAddress || !teamToken) return undefined;
     const hubUrl = normalizeHubUrl(hubAddress);
     const os = await import("os");
     const nickname = String(clientCfg?.nickname || "");
@@ -2704,6 +2724,7 @@ export class ViewerServer {
     if (result.userToken) {
       this.startHubHeartbeat();
     }
+    return result.status;
   }
 
   private async notifyHubLeave(): Promise<void> {