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

package/src/viewer/html.ts

@@ -154,7 +154,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .search-bar input::placeholder{color:var(--text-muted)}
 .search-bar input:focus{border-color:var(--pri);box-shadow:0 0 0 3px var(--pri-glow)}
 .search-bar .search-icon{position:absolute;left:14px;top:50%;transform:translateY(-50%);color:var(--text-muted);font-size:14px;pointer-events:none}
-.search-meta{font-size:12px;color:var(--text-sec);margin-bottom:14px;padding:0 2px}
+.search-meta{font-size:12px;color:var(--text-sec);padding:0 2px}.search-meta:not(:empty){margin-bottom:14px}
 .scope-select{padding:10px 12px;border:1px solid var(--border);border-radius:10px;background:var(--bg-card);color:var(--text);font-size:13px;min-width:110px;outline:none}
 .sharing-inline-meta{font-size:12px;color:var(--text-muted);margin:-8px 0 14px 2px}
 .sharing-sidebar-card{margin:14px 0 18px;border:1px solid var(--border);background:var(--bg-card);border-radius:12px;padding:12px;box-shadow:var(--shadow-sm)}
@@ -194,65 +194,92 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .pending-user-name{font-size:14px;font-weight:700;color:var(--text)}
 .pending-user-meta{font-size:12px;color:var(--text-sec);margin-top:4px}
 .pending-user-actions{display:flex;gap:8px;margin-top:10px}
-/* ─── Admin Panel ─── */
-.admin-header{position:relative;padding:28px 28px 20px;background:linear-gradient(135deg,rgba(99,102,241,.08) 0%,rgba(139,92,246,.06) 50%,rgba(6,182,212,.05) 100%);border:1px solid rgba(99,102,241,.12);border-radius:16px;margin-bottom:20px;overflow:hidden}
-.admin-header::before{content:'';position:absolute;top:0;left:0;right:0;height:3px;background:linear-gradient(90deg,var(--violet),var(--pri),var(--cyan));border-radius:16px 16px 0 0}
-.admin-header-top{display:flex;justify-content:space-between;align-items:center}
-.admin-header h2{font-size:20px;font-weight:800;color:var(--text);display:flex;align-items:center;gap:10px;margin:0}
-.admin-header h2 .ah-icon{width:36px;height:36px;border-radius:10px;background:linear-gradient(135deg,var(--pri),var(--violet));display:flex;align-items:center;justify-content:center;font-size:18px;box-shadow:0 4px 12px rgba(99,102,241,.25)}
-.admin-header-sub{font-size:12px;color:var(--text-muted);margin-top:6px}
-.admin-stat-row{display:grid;grid-template-columns:repeat(auto-fit,minmax(130px,1fr));gap:10px;margin-top:18px}
-.admin-stat-box{position:relative;text-align:center;padding:16px 8px 14px;background:var(--bg-card);border:1px solid var(--border);border-radius:12px;overflow:hidden;transition:all .2s}
-.admin-stat-box:hover{border-color:rgba(99,102,241,.25);transform:translateY(-1px);box-shadow:0 4px 12px rgba(0,0,0,.06)}
-.admin-stat-box::before{content:'';position:absolute;top:0;left:50%;transform:translateX(-50%);width:40px;height:2px;border-radius:0 0 4px 4px}
-.admin-stat-box:nth-child(1)::before{background:var(--green)}
-.admin-stat-box:nth-child(2)::before{background:var(--amber)}
-.admin-stat-box:nth-child(3)::before{background:var(--violet)}
-.admin-stat-box:nth-child(4)::before{background:var(--cyan)}
-.admin-stat-box:nth-child(5)::before{background:var(--pri)}
-.admin-stat-box:nth-child(6)::before{background:var(--rose)}
-.admin-stat-box .as-icon{font-size:16px;margin-bottom:4px;display:block}
-.admin-stat-box .val{font-size:22px;font-weight:800;color:var(--text);font-variant-numeric:tabular-nums}
-.admin-stat-box .lbl{font-size:10px;color:var(--text-muted);margin-top:3px;letter-spacing:.03em}
-.admin-tabs{display:flex;gap:4px;padding:4px;background:var(--bg);border:1px solid var(--border);border-radius:14px;overflow-x:auto;-webkit-overflow-scrolling:touch;margin-bottom:20px}
-.admin-tab{position:relative;display:flex;align-items:center;gap:6px;padding:9px 16px;border:none;background:transparent;color:var(--text-muted);font-size:13px;font-weight:500;cursor:pointer;border-radius:10px;transition:all .2s;white-space:nowrap;font-family:inherit}
-.admin-tab:hover{background:rgba(99,102,241,.06);color:var(--text)}
-.admin-tab.active{background:var(--bg-card);color:var(--text);font-weight:600;box-shadow:0 2px 8px rgba(0,0,0,.06),0 0 0 1px rgba(99,102,241,.1)}
+/* ─── Admin Panel (Cyber) ─── */
+@keyframes adminGlow{0%,100%{opacity:.6}50%{opacity:1}}
+@keyframes adminPulse{0%{box-shadow:0 0 0 0 rgba(99,102,241,.4)}70%{box-shadow:0 0 0 8px rgba(99,102,241,0)}100%{box-shadow:0 0 0 0 rgba(99,102,241,0)}}
+@keyframes adminScanline{0%{background-position:0 0}100%{background-position:0 100%}}
+@keyframes adminSlideIn{from{opacity:0;transform:translateY(10px)}to{opacity:1;transform:translateY(0)}}
+@keyframes adminCountUp{from{opacity:0;transform:translateY(8px) scale(.8)}to{opacity:1;transform:translateY(0) scale(1)}}
+@keyframes pendingPulse{0%,100%{border-color:rgba(251,191,36,.3)}50%{border-color:rgba(251,191,36,.7)}}
+@keyframes dotBreathe{0%,100%{transform:scale(1);opacity:.8}50%{transform:scale(1.3);opacity:1}}
+.admin-header{position:relative;padding:32px 32px 24px;background:linear-gradient(135deg,rgba(99,102,241,.06) 0%,rgba(6,182,212,.04) 50%,rgba(139,92,246,.06) 100%);border:1px solid rgba(99,102,241,.15);border-radius:20px;margin-bottom:24px;overflow:hidden}
+.admin-header::before{content:'';position:absolute;top:0;left:0;right:0;height:2px;background:linear-gradient(90deg,transparent,var(--pri),var(--cyan),var(--violet),transparent);animation:adminGlow 3s ease-in-out infinite}
+.admin-header::after{content:'';position:absolute;inset:0;background:repeating-linear-gradient(0deg,transparent,transparent 2px,rgba(99,102,241,.015) 2px,rgba(99,102,241,.015) 4px);background-size:100% 8px;animation:adminScanline 8s linear infinite;pointer-events:none}
+.admin-header-top{display:flex;justify-content:space-between;align-items:center;position:relative;z-index:1}
+.admin-header h2{font-size:18px;font-weight:800;color:var(--text);display:flex;align-items:center;gap:12px;margin:0;letter-spacing:-.01em}
+.admin-header h2 .ah-icon{width:40px;height:40px;border-radius:12px;background:linear-gradient(135deg,var(--pri),var(--violet));display:flex;align-items:center;justify-content:center;font-size:20px;box-shadow:0 4px 20px rgba(99,102,241,.3),inset 0 1px 0 rgba(255,255,255,.15);animation:adminPulse 2.5s infinite}
+.admin-header-sub{font-size:11px;color:var(--text-muted);margin-top:6px;position:relative;z-index:1;letter-spacing:.02em}
+.admin-stat-row{display:grid;grid-template-columns:repeat(auto-fit,minmax(120px,1fr));gap:10px;margin-top:20px;position:relative;z-index:1}
+.admin-stat-box{position:relative;text-align:center;padding:18px 10px 16px;background:rgba(var(--bg-card-rgb,30,30,40),.6);backdrop-filter:blur(12px);border:1px solid rgba(99,102,241,.12);border-radius:14px;overflow:hidden;transition:all .25s cubic-bezier(.4,0,.2,1)}
+.admin-stat-box:hover{border-color:rgba(99,102,241,.35);transform:translateY(-2px);box-shadow:0 8px 24px rgba(99,102,241,.12)}
+.admin-stat-box::before{content:'';position:absolute;top:0;left:0;right:0;height:2px;opacity:.8}
+.admin-stat-box:nth-child(1)::before{background:linear-gradient(90deg,transparent,#22c55e,transparent)}
+.admin-stat-box:nth-child(2)::before{background:linear-gradient(90deg,transparent,#fbbf24,transparent)}
+.admin-stat-box:nth-child(3)::before{background:linear-gradient(90deg,transparent,#8b5cf6,transparent)}
+.admin-stat-box:nth-child(4)::before{background:linear-gradient(90deg,transparent,#06b6d4,transparent)}
+.admin-stat-box:nth-child(5)::before{background:linear-gradient(90deg,transparent,#6366f1,transparent)}
+.admin-stat-box:nth-child(6)::before{background:linear-gradient(90deg,transparent,#f43f5e,transparent)}
+.admin-stat-box::after{content:'';position:absolute;inset:0;background:radial-gradient(circle at 50% 0%,rgba(99,102,241,.06),transparent 70%);pointer-events:none}
+.admin-stat-box .as-icon{font-size:18px;margin-bottom:6px;display:block;filter:drop-shadow(0 2px 4px rgba(0,0,0,.15))}
+.admin-stat-box .val{font-size:26px;font-weight:800;color:var(--text);font-variant-numeric:tabular-nums;animation:adminCountUp .4s ease-out;text-shadow:0 0 20px rgba(99,102,241,.15)}
+.admin-stat-box .lbl{font-size:10px;color:var(--text-muted);margin-top:4px;letter-spacing:.05em;text-transform:uppercase}
+.admin-tabs{display:flex;gap:3px;padding:3px;background:rgba(99,102,241,.03);border:1px solid rgba(99,102,241,.1);border-radius:14px;overflow-x:auto;-webkit-overflow-scrolling:touch;margin-bottom:24px;backdrop-filter:blur(8px)}
+.admin-tab{position:relative;display:flex;align-items:center;gap:6px;padding:10px 18px;border:none;background:transparent;color:var(--text-muted);font-size:13px;font-weight:500;cursor:pointer;border-radius:11px;transition:all .25s cubic-bezier(.4,0,.2,1);white-space:nowrap;font-family:inherit}
+.admin-tab:hover{background:rgba(99,102,241,.08);color:var(--text)}
+.admin-tab.active{background:linear-gradient(135deg,rgba(99,102,241,.12),rgba(139,92,246,.08));color:var(--text);font-weight:600;box-shadow:0 2px 12px rgba(99,102,241,.1),inset 0 1px 0 rgba(255,255,255,.05);border:1px solid rgba(99,102,241,.15)}
 .admin-tab .at-icon{font-size:14px;line-height:1}
-.admin-tab .at-count{font-size:10px;font-weight:700;padding:1px 6px;border-radius:8px;background:rgba(99,102,241,.1);color:var(--pri);min-width:18px;text-align:center}
-.admin-tab.active .at-count{background:rgba(99,102,241,.15)}
+.admin-tab .at-count{font-size:10px;font-weight:700;padding:2px 7px;border-radius:8px;background:rgba(99,102,241,.12);color:var(--pri);min-width:18px;text-align:center;transition:all .2s}
+.admin-tab.active .at-count{background:rgba(99,102,241,.2);box-shadow:0 0 8px rgba(99,102,241,.15)}
 .admin-panel{display:none}
-.admin-panel.active{display:block}
-.admin-card{border:1px solid var(--border);border-radius:12px;padding:16px 18px;background:var(--bg-card);margin-bottom:10px;transition:all .2s;position:relative;overflow:hidden}
+.admin-panel.active{display:block;animation:adminSlideIn .3s ease-out}
+.admin-card{border:1px solid var(--border);border-radius:14px;padding:18px 20px;background:var(--bg-card);margin-bottom:12px;transition:all .25s cubic-bezier(.4,0,.2,1);position:relative;overflow:hidden}
 .admin-card-clickable{cursor:pointer}
-.admin-card::before{content:'';position:absolute;top:0;left:0;bottom:0;width:3px;border-radius:3px 0 0 3px;background:var(--pri);opacity:.5}
-.admin-card:hover{border-color:rgba(99,102,241,.25);box-shadow:0 2px 12px rgba(0,0,0,.04);transform:translateY(-1px)}
+.admin-card::before{content:'';position:absolute;top:0;left:0;bottom:0;width:3px;border-radius:3px 0 0 3px;background:var(--pri);opacity:.4;transition:opacity .2s}
+.admin-card:hover{border-color:rgba(99,102,241,.25);box-shadow:0 4px 20px rgba(99,102,241,.06);transform:translateY(-1px)}
+.admin-card:hover::before{opacity:.8}
 .admin-card-header{display:flex;align-items:center;justify-content:space-between;margin-bottom:6px}
 .admin-card-title{font-size:14px;font-weight:700;color:var(--text);flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .admin-card-meta{font-size:12px;color:var(--text-muted);line-height:1.5}
-.au-contrib{display:flex;gap:16px;padding:10px 0;margin:6px 0;border-top:1px solid var(--border);border-bottom:1px solid var(--border)}
-.au-contrib-item{font-size:12px;color:var(--text-sec);display:flex;align-items:center;gap:4px}
-.au-contrib-num{font-size:18px;font-weight:700;line-height:1}
-.au-info{display:flex;flex-wrap:wrap;gap:6px 14px;padding:8px 0;font-size:12px}
-.au-info-item{color:var(--text-muted);white-space:nowrap}
-.au-status-dot{display:inline-block;width:8px;height:8px;border-radius:50%;margin-right:4px;vertical-align:middle;flex-shrink:0}
-.au-status-dot.online{background:#22c55e;box-shadow:0 0 6px rgba(34,197,94,.5)}
-.au-status-dot.offline{background:#9ca3af}
-.au-status-text{font-size:11px;font-weight:500}
-.au-status-text.online{color:#22c55e}
-.au-status-text.offline{color:#9ca3af}
-.au-group-header{font-size:13px;font-weight:600;color:var(--text-sec);margin:18px 0 8px;display:flex;align-items:center;gap:8px}
+.au-contrib{display:flex;gap:20px;padding:12px 0;margin:8px 0;border-top:1px solid rgba(99,102,241,.08);border-bottom:1px solid rgba(99,102,241,.08)}
+.au-contrib-item{font-size:12px;color:var(--text-sec);display:flex;align-items:center;gap:5px}
+.au-contrib-num{font-size:20px;font-weight:800;line-height:1;font-variant-numeric:tabular-nums}
+.au-info{display:flex;flex-wrap:wrap;gap:6px 16px;padding:8px 0;font-size:11px}
+.au-info-item{color:var(--text-muted);white-space:nowrap;display:inline-flex;align-items:center;gap:3px}
+.au-status-dot{display:inline-block;width:8px;height:8px;border-radius:50%;margin-right:5px;vertical-align:middle;flex-shrink:0;transition:all .3s}
+.au-status-dot.online{background:#22c55e;box-shadow:0 0 8px rgba(34,197,94,.6),0 0 16px rgba(34,197,94,.2);animation:dotBreathe 2s ease-in-out infinite}
+.au-status-dot.offline{background:#6b7280;box-shadow:none}
+.au-status-text{font-size:10px;font-weight:600;letter-spacing:.04em;padding:3px 10px;border-radius:6px;white-space:nowrap}
+.au-status-text.online{color:#22c55e;background:rgba(34,197,94,.08);border:1px solid rgba(34,197,94,.18);text-shadow:0 0 8px rgba(34,197,94,.2)}
+.au-status-text.offline{color:#6b7280;background:rgba(107,114,128,.06);border:1px solid rgba(107,114,128,.1)}
+[data-theme="light"] .au-status-text.online{background:rgba(34,197,94,.06);border-color:rgba(34,197,94,.15)}
+[data-theme="light"] .au-status-text.offline{background:rgba(0,0,0,.03);border-color:rgba(0,0,0,.06)}
+.au-group-header{font-size:13px;font-weight:700;color:var(--text-sec);margin:20px 0 10px;display:flex;align-items:center;gap:8px;letter-spacing:.02em}
 .au-group-header:first-child{margin-top:0}
 .au-group-header .au-group-dot{display:inline-block;width:8px;height:8px;border-radius:50%}
-.au-group-header .au-group-dot.online{background:#22c55e}
-.au-group-header .au-group-dot.offline{background:#9ca3af}
+.au-group-header .au-group-dot.online{background:#22c55e;box-shadow:0 0 6px rgba(34,197,94,.5)}
+.au-group-header .au-group-dot.offline{background:#6b7280}
 .au-group-header .au-group-count{font-size:12px;font-weight:400;color:var(--text-muted)}
-.au-card.au-offline{opacity:.7}
-.au-card.au-offline::before{background:#9ca3af}
-.au-card.au-online::before{background:#22c55e}
+.au-card.au-offline{opacity:.55}
+.au-card.au-offline:hover{opacity:.8}
+.au-card.au-offline::before{background:#6b7280}
+.au-card.au-online::before{background:#22c55e;box-shadow:0 0 8px rgba(34,197,94,.3)}
+.admin-pending-section{position:relative;margin-bottom:20px;padding:20px;border-radius:16px;border:1px solid rgba(251,191,36,.25);background:linear-gradient(135deg,rgba(251,191,36,.04),rgba(245,158,11,.02));animation:pendingPulse 3s ease-in-out infinite;overflow:hidden}
+.admin-pending-section::before{content:'';position:absolute;top:0;left:0;right:0;height:2px;background:linear-gradient(90deg,transparent,#fbbf24,#f59e0b,transparent)}
+.admin-pending-section h3{font-size:14px;font-weight:700;color:#fbbf24;margin:0 0 14px;display:flex;align-items:center;gap:8px}
+.admin-pending-section h3 .pending-count{display:inline-flex;align-items:center;justify-content:center;min-width:22px;height:22px;padding:0 6px;border-radius:11px;background:rgba(251,191,36,.2);font-size:12px;font-weight:800;color:#fbbf24}
+.admin-pending-card{border:1px solid rgba(251,191,36,.15);border-radius:12px;padding:16px 18px;background:rgba(251,191,36,.03);margin-bottom:8px;transition:all .2s;position:relative;overflow:hidden}
+.admin-pending-card::before{content:'';position:absolute;top:0;left:0;bottom:0;width:3px;background:linear-gradient(180deg,#fbbf24,#f59e0b);border-radius:3px 0 0 3px}
+.admin-pending-card:hover{border-color:rgba(251,191,36,.35);box-shadow:0 4px 16px rgba(251,191,36,.08)}
+.admin-pending-card .apc-name{font-size:14px;font-weight:700;color:var(--text)}
+.admin-pending-card .apc-meta{font-size:11px;color:var(--text-muted);margin-top:4px;display:flex;align-items:center;gap:6px}
+.admin-pending-card .apc-actions{display:flex;gap:8px;margin-top:12px}
+.admin-pending-card .apc-actions .btn-approve{background:linear-gradient(135deg,#22c55e,#16a34a);color:#fff;border:none;padding:6px 18px;border-radius:8px;font-size:12px;font-weight:600;cursor:pointer;transition:all .2s;box-shadow:0 2px 8px rgba(34,197,94,.25)}
+.admin-pending-card .apc-actions .btn-approve:hover{transform:translateY(-1px);box-shadow:0 4px 16px rgba(34,197,94,.35)}
+.admin-pending-card .apc-actions .btn-reject{background:transparent;color:var(--rose);border:1px solid rgba(244,63,94,.2);padding:6px 14px;border-radius:8px;font-size:12px;font-weight:500;cursor:pointer;transition:all .2s}
+.admin-pending-card .apc-actions .btn-reject:hover{background:rgba(244,63,94,.06);border-color:rgba(244,63,94,.4)}
 .admin-card-tags{display:flex;gap:5px;margin:8px 0;align-items:center}
 .admin-card-tags-left{display:flex;flex-wrap:wrap;gap:5px;align-items:center;flex:1;min-width:0}
-.admin-card-tag{display:inline-flex;align-items:center;gap:3px;padding:2px 8px;border-radius:6px;font-size:11px;font-weight:500}
+.admin-card-tag{display:inline-flex;align-items:center;gap:3px;padding:3px 10px;border-radius:6px;font-size:11px;font-weight:600;letter-spacing:.01em}
 .admin-card-tag.tag-role{background:rgba(99,102,241,.1);color:var(--pri)}
 .admin-card-tag.tag-kind{background:rgba(245,158,11,.1);color:#f59e0b}
 .admin-card-tag.tag-owner{background:rgba(34,197,94,.1);color:#22c55e}
@@ -260,16 +287,16 @@ 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:8px 10px;background:var(--bg);border-radius:8px;border:1px solid var(--border);max-height:60px;overflow:hidden;white-space:pre-wrap;word-break:break-all}
-.admin-card-actions{display:inline-flex;gap:4px;margin-left:auto;align-items:center;flex-shrink:0}
+.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 var(--border);background:linear-gradient(180deg,rgba(99,102,241,.015) 0%,var(--bg) 60%);animation:adminDetailIn .25s ease}
+.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}
 @keyframes adminDetailIn{from{opacity:0;transform:translateY(-6px)}to{opacity:1;transform:translateY(0)}}
 .admin-card.expanded .admin-card-detail{display:block}
-.admin-card.expanded{border-color:rgba(99,102,241,.3);box-shadow:0 4px 24px rgba(99,102,241,.08),0 0 0 1px rgba(99,102,241,.06)}
+.admin-card.expanded{border-color:rgba(99,102,241,.3);box-shadow:0 4px 24px rgba(99,102,241,.1),0 0 0 1px rgba(99,102,241,.08)}
 .admin-card-detail-meta{display:flex;flex-wrap:wrap;gap:6px;margin-bottom:18px;font-size:12px;color:var(--text-muted)}
-.admin-card-detail-meta .meta-item{display:inline-flex;align-items:center;gap:4px;padding:5px 12px;background:var(--bg-card);border:1px solid var(--border);border-radius:20px;font-size:11px;color:var(--text-sec);transition:border-color .15s,background .15s}
-.admin-card-detail-meta .meta-item:hover{border-color:rgba(99,102,241,.25);background:rgba(99,102,241,.03)}
+.admin-card-detail-meta .meta-item{display:inline-flex;align-items:center;gap:4px;padding:5px 12px;background:rgba(99,102,241,.03);border:1px solid rgba(99,102,241,.08);border-radius:20px;font-size:11px;color:var(--text-sec);transition:all .2s}
+.admin-card-detail-meta .meta-item:hover{border-color:rgba(99,102,241,.25);background:rgba(99,102,241,.06)}
 .admin-card-detail-section{margin-top:20px}
 .admin-card-detail-section .detail-label{font-size:11px;font-weight:700;color:var(--pri);margin-bottom:12px;text-transform:uppercase;letter-spacing:.06em;display:flex;align-items:center;gap:8px}
 .admin-card-detail-section .detail-label::before{content:'';width:3px;height:14px;border-radius:2px;background:linear-gradient(180deg,var(--pri),rgba(99,102,241,.3))}
@@ -295,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}
@@ -303,18 +330,24 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .admin-toolbar{display:flex;align-items:center;gap:10px;margin-bottom:14px;flex-wrap:wrap}
 .admin-toolbar h3{font-size:14px;font-weight:600;color:var(--text);white-space:nowrap;margin:0;margin-right:auto;line-height:32px}
 .admin-toolbar select{box-sizing:border-box;height:32px;font-size:12px;border:1px solid var(--border);border-radius:8px;background:var(--bg-card);color:var(--text);vertical-align:middle;margin:0;padding:0 10px}
-.admin-badge{display:inline-flex;align-items:center;gap:4px;font-size:10px;font-weight:700;padding:3px 10px;border-radius:999px;letter-spacing:.02em}
-.admin-badge.admin{background:rgba(52,199,89,.15);color:#34c759}
-.admin-badge.member{background:rgba(142,142,147,.12);color:var(--text-muted)}
-.admin-badge.pending{background:rgba(255,159,10,.15);color:#ff9f0a}
-.admin-badge.public{background:rgba(99,102,241,.1);color:var(--pri)}
-.admin-badge.group{background:rgba(139,92,246,.1);color:var(--violet)}
-.admin-empty{font-size:13px;color:var(--text-muted);padding:40px 20px;text-align:center;border:1px dashed var(--border);border-radius:12px;background:var(--bg)}
-.admin-empty .ae-icon{font-size:28px;display:block;margin-bottom:8px;opacity:.5}
-[data-theme="light"] .admin-badge.admin{background:rgba(5,150,105,.1);color:#059669}
-[data-theme="light"] .admin-badge.member{background:rgba(0,0,0,.06);color:#6b7280}
-[data-theme="light"] .admin-badge.pending{background:rgba(245,158,11,.1);color:#d97706}
-[data-theme="light"] .admin-header{background:linear-gradient(135deg,rgba(99,102,241,.05) 0%,rgba(139,92,246,.04) 50%,rgba(6,182,212,.03) 100%)}
+.admin-badge{display:inline-flex;align-items:center;gap:4px;font-size:9px;font-weight:700;padding:3px 10px;border-radius:6px;letter-spacing:.06em;text-transform:uppercase;position:relative;backdrop-filter:blur(4px);transition:all .25s}
+.admin-badge.admin{background:linear-gradient(135deg,rgba(34,197,94,.12),rgba(16,185,129,.06));color:#22c55e;border:1px solid rgba(34,197,94,.2);box-shadow:0 0 12px rgba(34,197,94,.08),inset 0 1px 0 rgba(255,255,255,.05)}
+.admin-badge.admin:hover{box-shadow:0 0 20px rgba(34,197,94,.15),inset 0 1px 0 rgba(255,255,255,.08)}
+.admin-badge.member{background:rgba(99,102,241,.06);color:var(--text-muted);border:1px solid rgba(99,102,241,.12)}
+.admin-badge.pending{background:linear-gradient(135deg,rgba(251,191,36,.12),rgba(245,158,11,.06));color:#fbbf24;border:1px solid rgba(251,191,36,.2);box-shadow:0 0 12px rgba(251,191,36,.08)}
+.admin-badge.public{background:rgba(99,102,241,.08);color:var(--pri);border:1px solid rgba(99,102,241,.15)}
+.admin-badge.group{background:rgba(139,92,246,.08);color:#8b5cf6;border:1px solid rgba(139,92,246,.15)}
+.admin-badge.owner{background:linear-gradient(135deg,rgba(251,191,36,.12),rgba(245,158,11,.08));color:#f59e0b;border:1px solid rgba(251,191,36,.25);box-shadow:0 0 12px rgba(251,191,36,.1),inset 0 1px 0 rgba(255,255,255,.06)}
+.au-badges{display:flex;align-items:center;gap:6px;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end}
+.admin-empty{font-size:13px;color:var(--text-muted);padding:48px 24px;text-align:center;border:1px dashed rgba(99,102,241,.15);border-radius:16px;background:rgba(99,102,241,.02)}
+.admin-empty .ae-icon{font-size:32px;display:block;margin-bottom:10px;opacity:.4}
+[data-theme="light"] .admin-badge.admin{background:rgba(5,150,105,.08);color:#059669;border-color:rgba(5,150,105,.18)}
+[data-theme="light"] .admin-badge.member{background:rgba(0,0,0,.04);color:#6b7280;border-color:rgba(0,0,0,.08)}
+[data-theme="light"] .admin-badge.pending{background:rgba(245,158,11,.08);color:#d97706;border-color:rgba(245,158,11,.18)}
+[data-theme="light"] .admin-badge.owner{background:rgba(245,158,11,.08);color:#b45309;border-color:rgba(245,158,11,.2)}
+[data-theme="light"] .admin-header{background:linear-gradient(135deg,rgba(99,102,241,.04) 0%,rgba(6,182,212,.03) 50%,rgba(139,92,246,.04) 100%)}
+[data-theme="light"] .admin-stat-box{background:rgba(255,255,255,.8)}
+[data-theme="light"] .admin-pending-section{background:linear-gradient(135deg,rgba(251,191,36,.03),rgba(245,158,11,.015))}
 .confirm-overlay{display:none;position:fixed;inset:0;align-items:center;justify-content:center;background:rgba(0,0,0,.45);backdrop-filter:blur(4px);z-index:9999;padding:20px}
 .confirm-overlay.show{display:flex}
 .confirm-panel{width:min(400px,90vw);background:var(--bg-card);border:1px solid var(--border);border-radius:16px;box-shadow:0 20px 60px rgba(0,0,0,.2);overflow:hidden;animation:confirmIn .2s ease}
@@ -712,7 +745,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 [data-theme="light"] .nav-tabs{background:rgba(0,0,0,.05)}
 [data-theme="light"] .nav-tabs .tab.active{background:#fff;border-color:rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.08);color:var(--text)}
 .analytics-view,.settings-view,.logs-view,.migrate-view,.admin-view{flex:1;min-width:0;flex-direction:column;gap:20px}
-.feed-wrap,.tasks-view,.skills-view,.analytics-view,.settings-view,.logs-view,.migrate-view,.admin-view{max-width:960px;margin:0 auto}
+.feed-wrap,.tasks-view,.skills-view,.analytics-view,.logs-view,.migrate-view,.admin-view,.settings-view{max-width:960px}
 
 /* ─── Logs ─── */
 .logs-toolbar{display:flex;align-items:center;justify-content:space-between;padding:8px 0}
@@ -771,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)}
@@ -939,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)}
@@ -1183,7 +1218,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">
@@ -1192,7 +1227,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
         <div class="stat-card pri"><div class="stat-value" id="statTotal">-</div><div class="stat-label" data-i18n="stat.memories">Memories</div></div>
         <div class="stat-card green"><div class="stat-value" id="statSessions">-</div><div class="stat-label" data-i18n="stat.sessions">Sessions</div></div>
         <div class="stat-card amber"><div class="stat-value" id="statEmbeddings">-</div><div class="stat-label" data-i18n="stat.embeddings">Embeddings</div></div>
-        <div class="stat-card rose"><div class="stat-value" id="statTimeSpan">-</div><div class="stat-label" data-i18n="stat.days">Days</div></div>
+        <div class="stat-card rose"><div class="stat-value" id="statAgents">-</div><div class="stat-label" data-i18n="stat.agents">Agents</div></div>
       </div>
       <div id="sidebarSharingSection" style="display:none">
         <div class="sharing-sidebar-card">
@@ -1215,7 +1250,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
         <select id="filterOwner" class="filter-select" onchange="onOwnerFilterChange()">
           <option value="" data-i18n="filter.allagents">All agents</option>
         </select>
-        <select id="memorySearchScope" class="filter-select" onchange="onMemoryScopeChange()">
+        <select id="memorySearchScope" class="filter-select" onchange="onMemoryScopeChange()" style="display:none">
           <option value="local" data-i18n="scope.thisAgent">This Agent</option>
           <option value="allLocal" data-i18n="scope.thisDevice">This Device</option>
           <option value="hub" data-i18n="scope.hub">Team</option>
@@ -1227,7 +1262,6 @@ input,textarea,select{font-family:inherit;font-size:inherit}
         <button class="filter-chip active" data-role="" onclick="setRoleFilter(this,'')" data-i18n="filter.all">All</button>
         <button class="filter-chip" data-role="user" onclick="setRoleFilter(this,'user')">User</button>
         <button class="filter-chip" data-role="assistant" onclick="setRoleFilter(this,'assistant')">Assistant</button>
-        <button class="filter-chip" data-role="system" onclick="setRoleFilter(this,'system')">System</button>
         <span class="filter-sep"></span>
         <select id="filterSort" class="filter-select" onchange="applyFilters()">
           <option value="newest" data-i18n="filter.newest">Newest first</option>
@@ -1260,7 +1294,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
           <button class="filter-chip" data-task-status="active" onclick="setTaskStatusFilter(this,'active')" data-i18n="tasks.status.active">Active</button>
           <button class="filter-chip" data-task-status="completed" onclick="setTaskStatusFilter(this,'completed')" data-i18n="tasks.status.completed">Completed</button>
           <button class="filter-chip" data-task-status="skipped" onclick="setTaskStatusFilter(this,'skipped')" data-i18n="tasks.status.skipped">Skipped</button>
-          <select id="taskSearchScope" class="scope-select" onchange="onTaskScopeChange()">
+          <select id="taskSearchScope" class="scope-select" onchange="onTaskScopeChange()" style="display:none">
             <option value="local" data-i18n="scope.thisAgent">This Agent</option>
             <option value="allLocal" data-i18n="scope.thisDevice">This Device</option>
             <option value="hub" data-i18n="scope.hub">Team</option>
@@ -1302,13 +1336,13 @@ input,textarea,select{font-family:inherit;font-size:inherit}
       <div class="search-bar">
         <span class="search-icon">🔍</span>
         <input type="text" id="skillSearchInput" placeholder="Search skills..." data-i18n-ph="skills.search.placeholder" oninput="debounceSkillSearch()">
-        <select id="skillSearchScope" class="scope-select" onchange="onSkillScopeChange()">
+        <select id="skillSearchScope" class="scope-select" onchange="onSkillScopeChange()" style="display:none">
           <option value="local" data-i18n="scope.thisAgent">This Agent</option>
           <option value="allLocal" data-i18n="scope.thisDevice">This Device</option>
           <option value="hub" data-i18n="scope.hub">Team</option>
         </select>
       </div>
-      <div class="search-meta" id="skillSearchMeta"></div>
+      <div class="search-meta" id="skillSearchMeta" style="display:none"></div>
       <div class="tasks-header">
         <div class="tasks-stats">
           <div class="tasks-stat"><span class="tasks-stat-value" id="skillsTotalCount">-</span><span class="tasks-stat-label" data-i18n="skills.total">Total Skills</span></div>
@@ -1322,8 +1356,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
           <button class="filter-chip" data-skill-status="active" onclick="setSkillStatusFilter(this,'active')" data-i18n="skills.filter.active">Active</button>
           <button class="filter-chip" data-skill-status="draft" onclick="setSkillStatusFilter(this,'draft')" data-i18n="skills.filter.draft">Draft</button>
           <button class="filter-chip" data-skill-status="archived" onclick="setSkillStatusFilter(this,'archived')" data-i18n="skills.filter.archived">Archived</button>
-          <span class="filter-sep"></span>
-          <select id="skillVisibilityFilter" class="filter-select" onchange="loadSkills()">
+          <select id="skillVisibilityFilter" class="filter-select" onchange="loadSkills()" style="display:none">
             <option value="" data-i18n="filter.allvisibility">All visibility</option>
             <option value="public" data-i18n="filter.public">Public</option>
             <option value="private" data-i18n="filter.private">Private</option>
@@ -1410,7 +1443,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
           <select id="logToolFilter" onchange="onLogFilterChange()" style="font-size:12px;padding:4px 8px;border-radius:6px;border:1px solid var(--border);background:var(--card);color:var(--text);min-width:120px">
             <option value="" data-i18n="logs.allTools">All Tools</option>
           </select>
-          <button class="btn btn-sm btn-ghost" onclick="loadLogs()" style="font-size:12px">\u21BB <span data-i18n="logs.refresh">Refresh</span></button>
+          
         </div>
         <div class="logs-toolbar-right">
           <input type="checkbox" id="logAutoRefresh" style="display:none">
@@ -1606,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">
@@ -1622,7 +1654,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
                     <li><span data-i18n="guide.join.s1">Ask your team admin for the Server Address and Team Token</span></li>
                     <li><span data-i18n="guide.join.s2">Enable sharing above, select "Client" mode</span></li>
                     <li><span data-i18n="guide.join.s3">Fill in Server Address and Team Token, click "Test Connection"</span></li>
-                    <li><span data-i18n="guide.join.s4">Save settings and restart the OpenClaw gateway (page refreshes automatically)</span></li>
+                    <li><span data-i18n="guide.join.s4">Click "Save & Apply" — the service restarts automatically (page refreshes)</span></li>
                   </ol>
                   <button class="btn-guide" onclick="guideGoToHub('client')" data-i18n="guide.join.btn">\u2192 Configure Client Mode</button>
                 </div>
@@ -1634,7 +1666,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
                   <div class="team-guide-opt-desc" data-i18n="guide.hub.desc">Be the team server. Run it on this device so others can connect and share memories with you.</div>
                   <ol class="team-guide-steps">
                     <li><span data-i18n="guide.hub.s1">Enable sharing above, select "Server" mode</span></li>
-                    <li><span data-i18n="guide.hub.s2">Set a team name, save settings, and restart the gateway (page refreshes automatically)</span></li>
+                    <li><span data-i18n="guide.hub.s2">Set a team name, click "Save & Apply" — the service restarts automatically</span></li>
                     <li><span data-i18n="guide.hub.s3">Share the Server Address and Team Token with your team members</span></li>
                     <li><span data-i18n="guide.hub.s4">Approve join requests in the Admin Panel</span></li>
                   </ol>
@@ -1695,7 +1727,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
                   <div style="font-weight:700;color:var(--text);margin-bottom:4px" data-i18n="settings.hub.clientSteps.title">Quick Setup (3 steps)</div>
                   <div><span style="color:var(--accent)">1.</span> <span data-i18n="settings.hub.clientSteps.s1">Ask your team admin for the Server Address and Team Token</span></div>
                   <div><span style="color:var(--accent)">2.</span> <span data-i18n="settings.hub.clientSteps.s2">Fill them in below, click "Test Connection" to verify</span></div>
-                  <div><span style="color:var(--accent)">3.</span> <span data-i18n="settings.hub.clientSteps.s3">Click "Save Settings", then restart OpenClaw gateway (page refreshes automatically)</span></div>
+                  <div><span style="color:var(--accent)">3.</span> <span data-i18n="settings.hub.clientSteps.s3">Click "Save & Apply" — the service will restart and page refreshes automatically</span></div>
                 </div>
                 <div class="settings-grid">
                   <div class="settings-field full-width">
@@ -1786,8 +1818,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
       <div id="adminMainContent">
       <div class="admin-header">
         <div class="admin-header-top">
-            <h2><span class="ah-icon">\u{1F6E1}</span> <span data-i18n="admin.title">Team Admin Panel</span></h2>
-          <button class="btn btn-sm btn-ghost" onclick="loadAdminData()" style="backdrop-filter:blur(8px)" data-i18n="admin.refresh">\u21BB Refresh</button>
+            <h2><span class="ah-icon">\u{26A1}</span> <span data-i18n="admin.title">Team Admin Panel</span></h2>
         </div>
           <div class="admin-header-sub" data-i18n="admin.subtitle">Manage team members and shared resources</div>
         <div class="admin-stat-row" id="adminStats"></div>
@@ -2000,7 +2031,9 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 <script>
 let activeSession=null,activeRole='',editingId=null,searchTimer=null,memoryCache={},currentPage=1,totalPages=1,totalCount=0,PAGE_SIZE=40,metricsDays=30;
 let memorySearchScope='local',skillSearchScope='local',taskSearchScope='local';
+let _lastMemoriesFingerprint='',_lastTasksFingerprint='',_lastSkillsFingerprint='';
 let _embeddingWarningShown=false;
+let _currentAgentOwner='agent:main';
 
 /* ─── i18n ─── */
 const I18N={
@@ -2051,8 +2084,8 @@ const I18N={
     'skills.load.error':'Failed to load skills',
     'skills.hub.title':'\u{1F310} Team Skills',
     'scope.local':'Local',
-    'scope.thisAgent':'This Agent',
-    'scope.thisDevice':'This Device',
+    'scope.thisAgent':'This Agent Only',
+    'scope.thisDevice':'All Local Agents',
     'scope.group':'Group',
     'scope.all':'All',
     'skills.visibility.public':'Shared Locally',
@@ -2090,6 +2123,13 @@ const I18N={
     'notif.userJoin':'New user requests to join the team',
     'notif.userOnline':'User came online',
     'notif.userOffline':'User went offline',
+    'notif.userLeft':'User has left the team',
+    'notif.membershipApproved':'Your team join request has been approved',
+    'notif.membershipRejected':'Your team join request has been declined',
+    'notif.membershipRemoved':'You have been removed from the team by the admin',
+    'notif.hubShutdown':'The team server has been shut down',
+    'notif.rolePromoted':'You have been promoted to admin',
+    'notif.roleDemoted':'You have been changed to member',
     'notif.clearAll':'Clear all',
     'notif.timeAgo.just':'just now',
     'notif.timeAgo.min':'{n}m ago',
@@ -2098,7 +2138,7 @@ const I18N={
     'stat.memories':'Memories',
     'stat.sessions':'Sessions',
     'stat.embeddings':'Embeddings',
-    'stat.days':'Days',
+    'stat.agents':'Agents',
     'stat.active':'active',
     'stat.deduped':'deduped',
     'sidebar.sessions':'Sessions',
@@ -2197,6 +2237,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',
@@ -2237,12 +2280,12 @@ const I18N={
     'settings.test.ok':'Connected',
     'settings.test.fail':'Failed',
     'settings.session.expired':'Session expired, please refresh the page to log in again',
-    'settings.save':'Save Settings',
+    'settings.save':'Save & Apply',
     'settings.reset':'Reset',
     'settings.saved':'Saved',
-    'settings.restart.hint':'Some changes require restarting the OpenClaw gateway to take effect.',
-    'settings.restart.autoRefresh':'Page will refresh automatically after the gateway restarts...',
-    'settings.restart.waiting':'Configuration saved. Waiting for gateway to restart...',
+    'settings.restart.hint':'Changes will take effect after the service restarts automatically.',
+    'settings.restart.autoRefresh':'Service restarting, page will refresh automatically...',
+    'settings.restart.waiting':'Configuration saved. Service is restarting...',
     'settings.save.fail':'Failed to save settings',
     'settings.save.emb.required':'Embedding model is required. Please configure an embedding model before saving.',
     'settings.save.emb.fail':'Embedding model test failed, cannot save',
@@ -2369,16 +2412,16 @@ const I18N={
     'settings.hub.tokenCopied':'Team Token copied!',
     'settings.hub.hubSteps.title':'Quick Setup (3 steps)',
     'settings.hub.hubSteps.s1':'Fill in Team Name below (or keep default)',
-    'settings.hub.hubSteps.s2':'Click "Save Settings", then restart OpenClaw gateway',
+    'settings.hub.hubSteps.s2':'Click "Save & Apply" — the service will restart automatically',
     'settings.hub.hubSteps.s3':'Share the Server Address and Team Token below with your team members',
     'settings.hub.clientSteps.title':'Quick Setup (3 steps)',
     'settings.hub.clientSteps.s1':'Ask your team admin for the Server Address and Team Token',
     'settings.hub.clientSteps.s2':'Fill them in below, click "Test Connection" to verify',
-    'settings.hub.clientSteps.s3':'Click "Save Settings", then restart OpenClaw gateway (page refreshes automatically)',
+    'settings.hub.clientSteps.s3':'Click "Save & Apply" — the service will restart and page refreshes automatically',
     'settings.hub.shareInfo.title':'Share this info with your team members:',
     'settings.hub.shareInfo.yourIP':'your-IP',
     'settings.hub.shareInfo.clickCopy':'Click to copy',
-    'settings.hub.restartAlert':'Team sharing config saved! Please restart the OpenClaw gateway for changes to take effect.\\n\\nRun: openclaw gateway stop && openclaw gateway start',
+    'settings.hub.restartAlert':'Team sharing config saved! The service will restart automatically to apply changes.',
     'settings.hub.hubAddress':'Server Address',
     'settings.hub.hubAddress.hint':'Team server address, e.g. 192.168.1.100:18800',
     'settings.hub.teamTokenClient':'Team Token',
@@ -2389,6 +2432,7 @@ const I18N={
     'settings.hub.userToken.hint':'Usually auto-obtained after joining. Only fill if given by admin.',
     'settings.hub.testConnection':'Test Connection',
     'settings.hub.test.noAddr':'Please enter server address first',
+    'settings.hub.teamToken.required':'Please enter team token',
     'settings.hub.test.testing':'Testing...',
     'settings.hub.test.ok':'Connected successfully',
     'settings.hub.test.fail':'Connection failed',
@@ -2398,6 +2442,10 @@ const I18N={
     'sidebar.hub':'\u{1F310} Team Sharing',
     'sharing.sidebar.connected':'Connected',
     'sharing.sidebar.disconnected':'Disconnected',
+    'sharing.sidebar.hubRunning':'Hub Running',
+    'sharing.sidebar.teamName':'Team',
+    'sharing.sidebar.members':'Members',
+    'sharing.sidebar.online':'online',
     'sharing.sidebar.pending':'Pending Approval',
     'sharing.sidebar.rejected':'Rejected',
     'sharing.sidebar.starting':'Starting...',
@@ -2407,11 +2455,21 @@ const I18N={
     'sharing.sidebar.targetHub':'Team Server:',
     '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?',
+    'sharing.leaveTeam':'Leave Team',
+    'sharing.leaveTeam.confirm':'You are about to leave team "{team}".\\n\\nWhat will happen:\\n\\u2022 You will disconnect from the team server\\n\\u2022 The team admin will be notified that you left\\n\\u2022 You will no longer receive shared memories, tasks, or skills\\n\\u2022 Your local data is preserved and not affected\\n\\u2022 You can rejoin later if the admin approves\\n\\nAre you sure?',
+    'sharing.leaveTeam.success':'You have left the team. Sharing has been disabled.',
+    'sharing.leaveTeam.fail':'Failed to leave team',
+    'sharing.team.default':'the team',
     'sharing.retryJoin.success':'Join request re-submitted. Waiting for admin approval.',
     'sharing.retryJoin.fail':'Failed to retry join',
+    'sharing.ownerRemoved':'(removed)',
     'sharing.cannotJoinSelf':'Cannot join your own server. Please enter a remote server address.',
     'scope.hub':'Team',
     'memory.detail.title':'Memory Detail',
@@ -2462,6 +2520,7 @@ const I18N={
     'admin.editName':'Edit Name',
     'admin.lastAdminHint':'Last admin — cannot remove or demote',
     'admin.ownerHint':'Hub owner — cannot be demoted or removed',
+    'admin.selfHint':'This is you',
     'admin.editNamePrompt':'Enter new username:',
     'confirm.promoteAdmin':'Promote this user to admin? They will be able to manage all team members and resources.',
     'confirm.demoteMember':'Demote this admin to member?',
@@ -2522,6 +2581,9 @@ const I18N={
     'admin.groupsFailed':'Failed to load groups: ',
     'toast.userApproved':'User approved',
     'sharing.approved.toast':'Your join request has been approved!',
+    'sharing.rejected.toast':'Your join request was rejected by the admin.',
+    'sharing.hubOffline.toast':'Team server is offline. Will reconnect automatically when it comes back.',
+    'sharing.hubReconnected.toast':'Team server is back online! Connection restored.',
     'toast.userRejected':'User rejected',
     'toast.approveFail':'Approve failed',
     'toast.rejectFail':'Reject failed',
@@ -2614,9 +2676,9 @@ const I18N={
     'share.status.agents':'Local',
     'share.status.hub':'Team',
     'share.scope.title':'Sharing Scope',
-    'share.scope.private':'This Agent Only',
-    'share.scope.local':'All Local Agents',
-    'share.scope.team':'Team',
+    'share.scope.private':'Private',
+    'share.scope.local':'Local Shared',
+    'share.scope.team':'Team Shared',
     'share.scope.current':'Current',
     'share.scope.teamDisabled':'Not connected to team server',
     'share.scope.teamIncludes':'Includes visibility to all local agents',
@@ -2681,7 +2743,10 @@ const I18N={
     'update.dismiss':'Dismiss',
     'sharing.disable.confirm.hub':'You are about to shut down the team server.\\n\\nWhat will happen:\\n\\u2022 All connected team members will be disconnected\\n\\u2022 They will no longer be able to sync memories, tasks, or skills\\n\\u2022 Shared data is preserved and will be available when you re-enable\\n\\nAre you sure?',
     'sharing.disable.confirm.client':'You are about to disconnect from the team.\\n\\nWhat will happen:\\n\\u2022 You will no longer receive shared memories, tasks, or skills from the team\\n\\u2022 Your local data is preserved and will not be affected\\n\\u2022 You can reconnect later by re-enabling sharing\\n\\nAre you sure?',
-    'sharing.disable.restartAlert':'Sharing has been disabled. Please restart the OpenClaw gateway for the change to take effect.\\n\\nRun: openclaw gateway stop && openclaw gateway start',
+    'sharing.disable.restartAlert':'Sharing has been disabled. The service will restart automatically to apply the change.',
+    'sharing.switch.hubToClient':'You are about to switch from Server to Client mode.\\n\\nWhat will happen:\\n\\u2022 The Hub server will shut down after the service restarts\\n\\u2022 All connected team members will be disconnected\\n\\u2022 Shared data on the Hub is preserved for future use\\n\\u2022 You will join the specified remote team as a client\\n\\nAre you sure?',
+    'sharing.switch.clientToHub':'You are about to switch from Client to Server mode.\\n\\nWhat will happen:\\n\\u2022 You will disconnect from the current team\\n\\u2022 A new Hub server will start after the service restarts\\n\\u2022 Your local data is not affected\\n\\nAre you sure?',
+    'sharing.switch.hubAddress':'You are about to leave the current team and join a different one.\\n\\nWhat will happen:\\n\\u2022 You will disconnect from the current team server\\n\\u2022 The current team admin will be notified that you left\\n\\u2022 You will join the new team server as a new member\\n\\u2022 Your local data is not affected\\n\\nAre you sure?',
     'admin.notEnabled.title':'Team sharing is not enabled',
     'admin.notEnabled.desc':'The Admin Panel is used to manage team members, shared memories, tasks, and skills. To use this feature, you need to enable team sharing first.',
     'admin.notEnabled.setupHub':'Set Up as Team Server',
@@ -2699,12 +2764,12 @@ const I18N={
     'guide.join.s1':'Ask your team admin for the Server Address and Team Token',
     'guide.join.s2':'Go to Settings \u2192 Team Sharing, enable sharing, select "Client" mode',
     'guide.join.s3':'Fill in Server Address and Team Token, click "Test Connection"',
-    'guide.join.s4':'Save settings and restart the OpenClaw gateway (page refreshes automatically)',
+    'guide.join.s4':'Click "Save & Apply" — the service restarts automatically (page refreshes)',
     'guide.join.btn':'\u2192 Configure Client Mode',
     'guide.hub.title':'Start Your Own Team Server',
     'guide.hub.desc':'Be the team server. Run it on this device so others can connect and share memories with you.',
     'guide.hub.s1':'Go to Settings \u2192 Team Sharing, enable sharing, select "Server" mode',
-    'guide.hub.s2':'Set a team name, save settings, and restart the gateway (page refreshes automatically)',
+    'guide.hub.s2':'Set a team name, click "Save & Apply" — the service restarts automatically',
     'guide.hub.s3':'Share the Server Address and Team Token with your team members',
     'guide.hub.s4':'Approve join requests in the Admin Panel',
     'guide.hub.btn':'\u2192 Configure Server Mode'
@@ -2756,8 +2821,8 @@ const I18N={
     'skills.load.error':'加载技能失败',
     'skills.hub.title':'\u{1F310} 团队共享技能',
     'scope.local':'本地',
-    'scope.thisAgent':'当前智能体',
-    'scope.thisDevice':'本机全部',
+    'scope.thisAgent':'仅本智能体',
+    'scope.thisDevice':'本机所有智能体',
     'scope.group':'团队',
     'scope.all':'全部',
     'skills.visibility.public':'本机共享',
@@ -2795,6 +2860,13 @@ const I18N={
     'notif.userJoin':'有新用户申请加入团队',
     'notif.userOnline':'用户上线了',
     'notif.userOffline':'用户下线了',
+    'notif.userLeft':'用户已退出团队',
+    'notif.membershipApproved':'你的团队加入申请已通过',
+    'notif.membershipRejected':'你的团队加入申请已被拒绝',
+    'notif.membershipRemoved':'你已被管理员移出团队',
+    'notif.hubShutdown':'团队服务已关闭',
+    'notif.rolePromoted':'你已被提升为管理员',
+    'notif.roleDemoted':'你已被设为普通成员',
     'notif.clearAll':'清除全部',
     'notif.timeAgo.just':'刚刚',
     'notif.timeAgo.min':'{n}分钟前',
@@ -2803,7 +2875,7 @@ const I18N={
     'stat.memories':'记忆',
     'stat.sessions':'会话',
     'stat.embeddings':'嵌入',
-    'stat.days':'天数',
+    'stat.agents':'智能体',
     'stat.active':'活跃',
     'stat.deduped':'已去重',
     'sidebar.sessions':'会话列表',
@@ -2902,6 +2974,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':'模型配置',
@@ -2942,12 +3017,12 @@ const I18N={
     'settings.test.ok':'连接成功',
     'settings.test.fail':'连接失败',
     'settings.session.expired':'登录已过期，请刷新页面重新登录',
-    'settings.save':'保存设置',
+    'settings.save':'保存并应用',
     'settings.reset':'重置',
     'settings.saved':'已保存',
-    'settings.restart.hint':'部分设置修改后需要重启 OpenClaw 网关才能生效。',
-    'settings.restart.autoRefresh':'网关重启后页面将自动刷新...',
-    'settings.restart.waiting':'配置已保存，正在等待网关重启...',
+    'settings.restart.hint':'修改将在服务自动重启后生效。',
+    'settings.restart.autoRefresh':'服务重启中，页面将自动刷新...',
+    'settings.restart.waiting':'配置已保存，服务正在重启...',
     'settings.save.fail':'保存设置失败',
     'settings.save.emb.required':'嵌入模型为必填项，请先配置嵌入模型再保存。',
     'settings.save.emb.fail':'嵌入模型测试失败，无法保存',
@@ -3074,16 +3149,16 @@ const I18N={
     'settings.hub.tokenCopied':'团队令牌已复制！',
     'settings.hub.hubSteps.title':'快速配置（3 步）',
     'settings.hub.hubSteps.s1':'填写下方团队名称（或保持默认）',
-    'settings.hub.hubSteps.s2':'点击"保存设置"，然后重启 OpenClaw 网关',
+    'settings.hub.hubSteps.s2':'点击「保存并应用」，服务将自动重启',
     'settings.hub.hubSteps.s3':'将下方的服务器地址和团队令牌分享给团队成员',
     'settings.hub.clientSteps.title':'快速配置（3 步）',
     'settings.hub.clientSteps.s1':'向团队管理员获取服务器地址和团队令牌',
     'settings.hub.clientSteps.s2':'填入下方，点击"测试连接"验证连通性',
-    'settings.hub.clientSteps.s3':'点击「保存设置」，然后重启 OpenClaw 网关（页面会自动刷新）',
+    'settings.hub.clientSteps.s3':'点击「保存并应用」，服务将自动重启（页面会自动刷新）',
     'settings.hub.shareInfo.title':'请将以下信息分享给团队成员：',
     'settings.hub.shareInfo.yourIP':'你的IP',
     'settings.hub.shareInfo.clickCopy':'点击复制',
-    'settings.hub.restartAlert':'团队共享配置已保存！请重启 OpenClaw 网关使配置生效。\\n\\n执行命令：openclaw gateway stop && openclaw gateway start',
+    'settings.hub.restartAlert':'团队共享配置已保存！服务将自动重启以应用更改。',
     'settings.hub.hubAddress':'服务器地址',
     'settings.hub.hubAddress.hint':'团队服务器地址，如 192.168.1.100:18800',
     'settings.hub.teamTokenClient':'团队令牌',
@@ -3094,6 +3169,7 @@ const I18N={
     'settings.hub.userToken.hint':'通常在加入团队后自动获取，无需手动填写。',
     'settings.hub.testConnection':'测试连接',
     'settings.hub.test.noAddr':'请先输入服务器地址',
+    'settings.hub.teamToken.required':'请输入团队令牌',
     'settings.hub.test.testing':'测试中...',
     'settings.hub.test.ok':'连接成功',
     'settings.hub.test.fail':'连接失败',
@@ -3103,6 +3179,10 @@ const I18N={
     'sidebar.hub':'\u{1F310} 团队共享',
     'sharing.sidebar.connected':'已连接',
     'sharing.sidebar.disconnected':'已断开',
+    'sharing.sidebar.hubRunning':'服务运行中',
+    'sharing.sidebar.teamName':'团队',
+    'sharing.sidebar.members':'成员',
+    'sharing.sidebar.online':'在线',
     'sharing.sidebar.pending':'等待审核',
     'sharing.sidebar.rejected':'已拒绝',
     'sharing.sidebar.starting':'启动中...',
@@ -3112,11 +3192,21 @@ const I18N={
     'sharing.sidebar.targetHub':'团队服务器：',
     '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':'这将清除当前连接数据并重新提交加入申请，是否继续？',
+    'sharing.leaveTeam':'退出团队',
+    'sharing.leaveTeam.confirm':'你即将退出团队「{team}」。\\n\\n退出后将会：\\n\\u2022 断开与团队服务器的连接\\n\\u2022 团队管理员会收到你退出的通知\\n\\u2022 你将无法再接收团队共享的记忆、任务和技能\\n\\u2022 你的本地数据不受影响，会完整保留\\n\\u2022 之后可以重新申请加入（需管理员审批）\\n\\n确定要退出吗？',
+    'sharing.leaveTeam.success':'你已退出团队，团队共享已关闭。',
+    'sharing.leaveTeam.fail':'退出团队失败',
+    'sharing.team.default':'该团队',
     'sharing.retryJoin.success':'加入申请已重新提交，请等待管理员审核。',
     'sharing.retryJoin.fail':'重新申请失败',
+    'sharing.ownerRemoved':'(已移除)',
     'sharing.cannotJoinSelf':'不能加入自己的服务端，请输入远程服务器地址。',
     'scope.hub':'团队',
     'memory.detail.title':'记忆详情',
@@ -3167,6 +3257,7 @@ const I18N={
     'admin.editName':'编辑名称',
     'admin.lastAdminHint':'唯一管理员 — 无法删除或降级',
     'admin.ownerHint':'Hub 创建者 — 不可降级或移除',
+    'admin.selfHint':'这是你自己',
     'admin.editNamePrompt':'请输入新用户名：',
     'confirm.promoteAdmin':'确定要将此用户提升为管理员吗？管理员可以管理所有团队成员和资源。',
     'confirm.demoteMember':'确定要将此管理员降为普通成员吗？',
@@ -3227,6 +3318,9 @@ const I18N={
     'admin.groupsFailed':'加载分组失败：',
     'toast.userApproved':'用户已批准',
     'sharing.approved.toast':'您的加入申请已通过审核！',
+    'sharing.rejected.toast':'您的加入申请已被管理员拒绝。',
+    'sharing.hubOffline.toast':'团队服务已离线，恢复后将自动重新连接。',
+    'sharing.hubReconnected.toast':'团队服务已恢复上线，连接已自动恢复！',
     'toast.userRejected':'用户已拒绝',
     'toast.approveFail':'批准失败',
     'toast.rejectFail':'拒绝失败',
@@ -3319,9 +3413,9 @@ const I18N={
     'share.status.agents':'本机',
     'share.status.hub':'团队',
     'share.scope.title':'共享范围',
-    'share.scope.private':'仅本智能体',
-    'share.scope.local':'本机所有智能体',
-    'share.scope.team':'团队',
+    'share.scope.private':'私有',
+    'share.scope.local':'本机共享',
+    'share.scope.team':'团队共享',
     'share.scope.current':'当前',
     'share.scope.teamDisabled':'未连接团队服务器',
     'share.scope.teamIncludes':'包含本机所有智能体的可见性',
@@ -3386,7 +3480,10 @@ const I18N={
     'update.dismiss':'关闭',
     'sharing.disable.confirm.hub':'你即将关闭团队服务。\\n\\n关闭后将会：\\n\\u2022 所有已连接的团队成员将断开连接\\n\\u2022 他们将无法继续同步记忆、任务和技能\\n\\u2022 已共享的数据会保留，重新开启后仍可使用\\n\\n确定要关闭吗？',
     'sharing.disable.confirm.client':'你即将断开与团队的连接。\\n\\n断开后将会：\\n\\u2022 你将无法再接收团队共享的记忆、任务和技能\\n\\u2022 你的本地数据不受影响，会完整保留\\n\\u2022 之后可以随时重新开启共享来恢复连接\\n\\n确定要断开吗？',
-    'sharing.disable.restartAlert':'共享已关闭。请重启 OpenClaw 网关使更改生效。\\n\\n执行命令：openclaw gateway stop && openclaw gateway start',
+    'sharing.disable.restartAlert':'共享已关闭，服务将自动重启以应用更改。',
+    'sharing.switch.hubToClient':'你即将从服务端模式切换为客户端模式。\\n\\n切换后将会：\\n\\u2022 Hub 服务将在服务重启后关闭\\n\\u2022 所有已连接的团队成员将断开连接\\n\\u2022 Hub 上的共享数据会保留，以后可恢复使用\\n\\u2022 你将作为客户端加入指定的远程团队\\n\\n确定要切换吗？',
+    'sharing.switch.clientToHub':'你即将从客户端模式切换为服务端模式。\\n\\n切换后将会：\\n\\u2022 你将断开与当前团队的连接\\n\\u2022 服务重启后将启动新的 Hub 服务\\n\\u2022 你的本地数据不受影响\\n\\n确定要切换吗？',
+    'sharing.switch.hubAddress':'你即将离开当前团队并加入新的团队。\\n\\n操作后将会：\\n\\u2022 你将断开与当前团队服务器的连接\\n\\u2022 当前团队管理员会收到你离开的通知\\n\\u2022 你将作为新成员加入新的团队服务器\\n\\u2022 你的本地数据不受影响\\n\\n确定要切换吗？',
     'admin.notEnabled.title':'团队共享尚未开启',
     'admin.notEnabled.desc':'管理面板用于管理团队成员、共享的记忆、任务和技能。使用此功能前，需要先开启团队共享。',
     'admin.notEnabled.setupHub':'配置为团队服务端',
@@ -3404,12 +3501,12 @@ const I18N={
     'guide.join.s1':'向团队管理员索取服务器地址和团队令牌',
     'guide.join.s2':'前往「设置 → 团队共享」，开启共享，选择「客户端」模式',
     'guide.join.s3':'填写服务器地址和团队令牌，点击「测试连接」',
-    'guide.join.s4':'保存设置并重启 OpenClaw 网关（页面会自动刷新）',
+    'guide.join.s4':'点击「保存并应用」，服务将自动重启（页面会自动刷新）',
     'guide.join.btn':'\u2192 配置客户端模式',
     'guide.hub.title':'自建团队服务',
     'guide.hub.desc':'将本机作为团队服务端，让其他成员连接过来共享记忆。',
     'guide.hub.s1':'前往「设置 → 团队共享」，开启共享，选择「服务端」模式',
-    'guide.hub.s2':'设置团队名称，保存设置后重启网关（页面会自动刷新）',
+    'guide.hub.s2':'设置团队名称，点击「保存并应用」，服务将自动重启',
     'guide.hub.s3':'将服务器地址和团队令牌分享给团队成员',
     'guide.hub.s4':'在管理面板中审批加入请求',
     'guide.hub.btn':'\u2192 配置服务端模式'
@@ -3515,12 +3612,28 @@ async function doReset(){
 }
 
 var _sharingRole='client';
+var _loadedClientHubAddress='';
 function _genToken(len){
   var a=new Uint8Array(len||18);crypto.getRandomValues(a);
   return btoa(String.fromCharCode.apply(null,a)).replace(/\\+/g,'-').replace(/\\//g,'_').replace(/=+$/,'');
 }
-function onSharingToggle(){
-  var on=document.getElementById('cfgSharingEnabled').checked;
+async function onSharingToggle(){
+  var chk=document.getElementById('cfgSharingEnabled');
+  var on=chk.checked;
+  if(!on && sharingStatusCache && sharingStatusCache.enabled){
+    var prevRole=sharingStatusCache.role;
+    var confirmMsg=prevRole==='hub'?t('sharing.disable.confirm.hub'):t('sharing.disable.confirm.client');
+    if(!(await confirmModal(confirmMsg,{danger:true}))){
+      chk.checked=true;
+      return;
+    }
+    var cfg={sharing:{enabled:false,role:prevRole}};
+    chk.disabled=true;
+    var result=await doSaveConfig(cfg, null, 'hubSaved');
+    chk.disabled=false;
+    if(!result){chk.checked=true;return;}
+    return;
+  }
   document.getElementById('sharingConfigPanel').style.display=on?'block':'none';
   var pw=document.getElementById('sharingPanelsWrap');
   if(pw) pw.style.display=on?'':'none';
@@ -3538,20 +3651,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='';
   }
+  _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(){
@@ -3586,13 +3704,6 @@ async function testHubConnection(){
   if(!addr){result.innerHTML='<span style="color:var(--rose)">\u274C '+t('settings.hub.test.noAddr')+'</span>';return;}
   btn.disabled=true;result.innerHTML=t('settings.hub.test.testing');
   try{
-    var ipsData=await fetch('/api/local-ips').then(function(r){return r.json();});
-    var localAddrs=['127.0.0.1','localhost','0.0.0.0'].concat(ipsData.ips||[]);
-    var parsed=new URL(addr.indexOf('://')>-1?addr:'http://'+addr);
-    if(localAddrs.indexOf(parsed.hostname)>=0){
-      result.innerHTML='<span style="color:var(--rose)">\u274C '+t('sharing.cannotJoinSelf')+'</span>';
-      btn.disabled=false;return;
-    }
   }catch(e){}
   try{
     var url=addr.match(/^https?:\\/\\//)?addr:'http://'+addr;
@@ -3642,23 +3753,38 @@ function switchView(view){
   else if(view==='skills') loadSkills();
   else if(view==='analytics') loadMetrics();
   else if(view==='logs') loadLogs();
-  else if(view==='settings'){loadConfig();loadModelHealth();}
+  else if(view==='settings'){loadConfig().then(function(){
+    var sharingOn=document.getElementById('cfgSharingEnabled');
+    var sharingNotEnabled=!sharingOn||!sharingOn.checked;
+    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='';
   var isHub=memorySearchScope==='hub';
+  var isLocal=memorySearchScope==='local';
   var ownerSel=document.getElementById('filterOwner');
   var filterBar=document.getElementById('filterBar');
   var dateFilter=document.querySelector('.date-filter');
-  if(ownerSel) ownerSel.style.display=isHub?'none':'';
+  if(ownerSel){ownerSel.style.display=(isHub||isLocal)?'none':'';if(isHub||isLocal)ownerSel.value='';}
   if(filterBar) filterBar.style.display=isHub?'none':'';
   if(dateFilter) dateFilter.style.display=isHub?'none':'';
   if(document.getElementById('searchInput').value.trim()) doSearch(document.getElementById('searchInput').value);
   else if(isHub) { document.getElementById('sharingSearchMeta').textContent=''; loadHubMemories(); }
-  else { document.getElementById('sharingSearchMeta').textContent=''; loadStats(); loadMemories(); }
+  else {
+    document.getElementById('sharingSearchMeta').textContent='';
+    var ownerArg=isLocal?_currentAgentOwner:undefined;
+    loadStats(ownerArg); loadMemories();
+  }
 }
 
 function onSkillScopeChange(){
@@ -3673,6 +3799,14 @@ function onTaskScopeChange(){
 }
 
 var _clientPendingPollTimer=null;
+var _lastSharingConnStatus='';
+function _updateScopeSelectorsVisibility(hubAvailable){
+  var ids=['memorySearchScope','taskSearchScope','skillSearchScope'];
+  for(var i=0;i<ids.length;i++){
+    var el=document.getElementById(ids[i]);
+    if(el) el.style.display=hubAvailable?'':'none';
+  }
+}
 async function loadSharingStatus(forcePending){
   try{
     const r=await fetch('/api/sharing/status');
@@ -3682,27 +3816,64 @@ async function loadSharingStatus(forcePending){
     renderSharingSettings(d);
     updateTeamGuide(d);
     if(forcePending && d && d.admin && d.admin.canManageUsers) loadSharingPendingUsers();
-    var conn=d&&d.connection||{};
-    if(conn.pendingApproval&&!_clientPendingPollTimer){
-      _clientPendingPollTimer=setInterval(function(){loadSharingStatus(false);},10000);
-    }else if(!conn.pendingApproval&&_clientPendingPollTimer){
+    if(!d||!d.enabled){
+      if(_clientPendingPollTimer){clearInterval(_clientPendingPollTimer);_clientPendingPollTimer=null;}
+      _lastSharingConnStatus='';
+      _updateScopeSelectorsVisibility(false);
+      return;
+    }
+    var conn=d.connection||{};
+    var curStatus=conn.rejected?'rejected':conn.pendingApproval?'pending':conn.connected?'connected':'none';
+    var hubActive=d.role==='hub'||curStatus==='connected';
+    _updateScopeSelectorsVisibility(hubActive);
+    if(_lastSharingConnStatus==='pending'&&curStatus==='rejected'&&d.role==='client'){
+      toast(t('sharing.rejected.toast'),'error');
+    }
+    if(_lastSharingConnStatus==='pending'&&curStatus==='connected'&&d.role==='client'){
+      toast(t('sharing.approved.toast'),'success');
+      loadMemories();loadTasks();loadSkills();
+      if(_notifSSE){_notifSSE.close();_notifSSE=null;_notifSSEConnected=false;}
+      connectNotifSSE();
+      loadNotifications();
+    }
+    if(_lastSharingConnStatus==='connected'&&curStatus==='none'&&d.role==='client'){
+      toast(t('sharing.hubOffline.toast'),'error');
+    }
+    if(_lastSharingConnStatus==='none'&&curStatus==='connected'&&d.role==='client'){
+      toast(t('sharing.hubReconnected.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);},5000);
+    }
+    if(curStatus!=='pending'&&_clientPendingPollTimer){
       clearInterval(_clientPendingPollTimer);
       _clientPendingPollTimer=null;
-      if(conn.connected) toast(t('sharing.approved.toast'),'success');
     }
   }catch(e){
     renderSharingSidebar(null);
     renderSharingSettings(null);
     updateTeamGuide(null);
+    _updateScopeSelectorsVisibility(false);
   }
 }
 
+var _lastSidebarFingerprint='';
 function renderSharingSidebar(data){
   var section=document.getElementById('sidebarSharingSection');
   var statusEl=document.getElementById('sharingSidebarStatus');
   var hintEl=document.getElementById('sharingSidebarHint');
   var badgeEl=document.getElementById('sharingSidebarConnBadge');
   if(!statusEl||!hintEl) return;
+  var conn=data&&data.connection||{};
+  var hs=data&&data.hubStats||{};
+  var fp=JSON.stringify({e:!!data&&!!data.enabled,r:data&&data.role,pa:!!conn.pendingApproval,rj:!!conn.rejected,c:!!conn.connected,u:conn.user&&conn.user.username,tn:conn.teamName,cc:!!data&&!!data.clientConfigured,hu:data&&data.hubUrl,tm:hs.totalMembers,om:hs.onlineMembers,pm:hs.pendingMembers});
+  if(fp===_lastSidebarFingerprint) return;
+  _lastSidebarFingerprint=fp;
   if(!data||!data.enabled){
     if(section) section.style.display='none';
     window._isHubAdmin=false;
@@ -3715,8 +3886,16 @@ function renderSharingSidebar(data){
     badgeEl.innerHTML='<span style="display:inline-flex;align-items:center;gap:4px;font-size:10px;font-weight:600;padding:2px 8px;border-radius:9999px;background:'+color+'15;color:'+color+'"><span style="display:inline-block;width:6px;height:6px;border-radius:50%;background:'+color+(glow?';box-shadow:0 0 4px '+color:'')+'"></span>'+esc(text)+'</span>';
   }
   if(data.role==='hub'){
-    setBadge('#34d399',t('sharing.sidebar.connected'),true);
-    statusEl.innerHTML='';
+    setBadge('#34d399',t('sharing.sidebar.hubRunning'),true);
+    var hs=data.hubStats||{};
+    var html='<div class="info-grid">';
+    if(conn.teamName) html+='<span class="label">'+t('sharing.sidebar.teamName')+'</span><span class="value" style="font-weight:600">'+esc(conn.teamName)+'</span>';
+    html+='<span class="label">'+t('sharing.sidebar.members')+'</span><span class="value">'+(hs.totalMembers||0)+' <span style="opacity:.5;font-size:10px">/ '+t('sharing.sidebar.online')+' '+(hs.onlineMembers||0)+'</span></span>';
+    if(hs.pendingMembers>0){
+      html+='<span class="label">'+t('sharing.sidebar.pending')+'</span><span class="value" style="color:var(--yellow,#fbbf24);font-weight:600">'+hs.pendingMembers+'</span>';
+    }
+    html+='</div>';
+    statusEl.innerHTML=html;
     hintEl.textContent='';
   }else if(conn.pendingApproval&&conn.user){
     setBadge('#fbbf24',t('sharing.sidebar.pending'),false);
@@ -3732,8 +3911,18 @@ 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){
+    setBadge('#ef4444',t('sharing.sidebar.disconnected'),false);
+    var html='<div class="info-grid">';
+    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){
     var isAdmin=conn.user.role==='admin';
     setBadge('#34d399',t('sharing.sidebar.connected'),true);
@@ -3754,25 +3943,43 @@ function renderSharingSidebar(data){
   }
 }
 
+var _lastSettingsFingerprint='';
 function renderSharingSettings(data){
   var statusEl=document.getElementById('sharingStatusPanel');
   var teamEl=document.getElementById('sharingTeamPanel');
   var adminEl=document.getElementById('sharingAdminPanel');
   var panelsWrap=document.getElementById('sharingPanelsWrap');
   if(!statusEl||!teamEl||!adminEl) return;
+  var conn2=data&&data.connection||{};
+  var fp2=JSON.stringify({e:!!data&&!!data.enabled,r:data&&data.role,pa:!!conn2.pendingApproval,rj:!!conn2.rejected,c:!!conn2.connected,u:conn2.user&&conn2.user.username,ur:conn2.user&&conn2.user.role,tn:conn2.teamName,cc:!!data&&!!data.clientConfigured,cm:data&&data.admin&&data.admin.canManageUsers});
+  if(fp2===_lastSettingsFingerprint) return;
+  _lastSettingsFingerprint=fp2;
   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='';
   var conn=data.connection||{};
   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'){
@@ -3794,6 +4001,8 @@ function renderSharingSettings(data){
       connBadge='<span class="hic-badge pending"><span class="hic-dot amber"></span>'+t('sharing.sidebar.pending')+'</span>';
     }else if(conn.rejected){
       connBadge='<span class="hic-badge disconnected"><span class="hic-dot red"></span>'+t('sharing.sidebar.rejected')+'</span>';
+    }else if(conn.removed){
+      connBadge='<span class="hic-badge disconnected"><span class="hic-dot red"></span>'+t('sharing.sidebar.disconnected')+'</span>';
     }else if(conn.connected){
       connBadge='<span class="hic-badge connected"><span class="hic-dot green"></span>'+t('sharing.sidebar.connected')+'</span>';
     }else{
@@ -3809,13 +4018,21 @@ function renderSharingSettings(data){
       sh+='</div><div class="hic-empty" style="color:#ef4444">'+t('sharing.rejected.hint')+'</div>'+
         '<div style="margin-top:10px;padding:0 16px 14px"><button class="btn btn-sm btn-primary" onclick="retryHubJoin()">'+t('sharing.retryJoin')+'</button>'+
         '<span style="font-size:11px;color:var(--text-muted);margin-left:8px">'+t('sharing.retryJoin.hint')+'</span></div></div>';
+    }else if(conn.removed){
+      if(user.username) sh+='<span class="hic-label">'+t('sharing.user')+'</span><span class="hic-value">'+esc(user.username)+'</span>';
+      sh+='</div><div class="hic-empty" style="color:#ef4444">'+t('sharing.removed.hint')+'</div>'+
+        '<div style="margin-top:10px;padding:0 16px 14px"><button class="btn btn-sm btn-primary" onclick="retryHubJoin()">'+t('sharing.retryJoin')+'</button>'+
+        '<span style="font-size:11px;color:var(--text-muted);margin-left:8px">'+t('sharing.retryJoin.hint')+'</span></div></div>';
     }else if(conn.connected&&user.username){
       sh+='<span class="hic-label">'+t('sharing.user')+'</span><span class="hic-value" style="display:flex;align-items:center;gap:6px">'+
         '<input type="text" id="hubUsernameInput" value="'+esc(user.username)+'" style="border:1px solid var(--border);border-radius:6px;padding:3px 8px;font-size:12px;background:var(--bg);color:var(--text);width:120px;font-family:inherit" />'+
         '<button class="btn btn-sm" onclick="updateHubUsername()" style="padding:2px 10px;font-size:11px">'+t('sharing.saveUsername')+'</button>'+
       '</span>';
       sh+='<span class="hic-label">'+t('sharing.team')+'</span><span class="hic-value">'+esc(conn.teamName||'-')+'</span>';
-      sh+='</div></div>';
+      sh+='</div>'+
+        '<div style="border-top:1px solid var(--border);margin-top:10px;padding:10px 16px 6px;display:flex;align-items:center;justify-content:flex-end">'+
+        '<button class="btn btn-sm" onclick="leaveTeam()" style="color:#ef4444;border-color:rgba(239,68,68,.3);font-size:11px;padding:4px 12px">'+t('sharing.leaveTeam')+'</button>'+
+        '</div></div>';
     }else{
       sh+='</div><div class="hic-empty" style="color:var(--text-muted)">'+t('sharing.disconnected.hint')+'</div>'+
         '<div style="margin-top:10px;padding:0 16px 14px"><button class="btn btn-sm btn-primary" id="btnRetryConn" onclick="retryConnection()">'+t('sharing.retryConnection')+'</button>'+
@@ -3834,6 +4051,7 @@ async function retryConnection(){
   var result=document.getElementById('retryConnResult');
   if(btn){btn.disabled=true;btn.textContent=t('sharing.retryConnection.loading');}
   if(result) result.innerHTML='<span style="color:var(--text-muted)">'+t('sharing.retryConnection.loading')+'</span>';
+  toast(t('sharing.retryConnection.loading'),'info');
   try{
     await loadSharingStatus(false);
     var d=sharingStatusCache;
@@ -3841,9 +4059,11 @@ async function retryConnection(){
       toast(t('sharing.retryConnection.success'),'success');
       if(result) result.innerHTML='<span style="color:#22c55e">\\u2705 '+t('sharing.retryConnection.success')+'</span>';
     }else{
+      toast(t('sharing.retryConnection.fail'),'error');
       if(result) result.innerHTML='<span style="color:#ef4444">'+t('sharing.retryConnection.fail')+'</span>';
     }
   }catch(e){
+    toast(t('sharing.retryConnection.fail'),'error');
     if(result) result.innerHTML='<span style="color:#ef4444">'+t('sharing.retryConnection.fail')+'</span>';
   }
   if(btn){btn.disabled=false;btn.textContent=t('sharing.retryConnection');}
@@ -3856,19 +4076,36 @@ async function retryHubJoin(){
     var d=await r.json();
     if(d.ok){
       toast(t('sharing.retryJoin.success'),'success');
-      setTimeout(function(){location.reload();},1500);
+      _lastSidebarFingerprint='';_lastSettingsFingerprint='';_lastSharingConnStatus='';
+      setTimeout(function(){loadSharingStatus(true);},800);
     }else{
       toast(d.error||t('sharing.retryJoin.fail'),'error');
     }
   }catch(e){toast(t('sharing.retryJoin.fail')+': '+e.message,'error');}
 }
 
+async function leaveTeam(){
+  var teamName=(sharingStatusCache&&sharingStatusCache.connection&&sharingStatusCache.connection.teamName)||'';
+  var msg=t('sharing.leaveTeam.confirm').replace('{team}',teamName||t('sharing.team.default'));
+  if(!(await confirmModal(msg,{danger:true}))) return;
+  try{
+    var r=await fetch('/api/sharing/leave',{method:'POST',headers:{'Content-Type':'application/json'},body:'{}'});
+    var d=await r.json();
+    if(d.ok){
+      toast(t('sharing.leaveTeam.success'),'success');
+      showRestartOverlay(t('settings.restart.waiting'));
+    }else{
+      toast(d.error||t('sharing.leaveTeam.fail'),'error');
+    }
+  }catch(e){toast(t('sharing.leaveTeam.fail')+': '+e.message,'error');}
+}
+
 async function updateHubUsername(){
   var input=document.getElementById('hubUsernameInput');
   if(!input) return;
   var newName=input.value.trim();
   if(!newName||newName.length<2||newName.length>32){
-    toast(t('sharing.username.invalid'),'error');
+    alertModal(t('sharing.username.invalid'));
     return;
   }
   try{
@@ -3879,17 +4116,17 @@ async function updateHubUsername(){
     });
     var d=await r.json();
     if(d.error==='username_taken'){
-      toast(t('sharing.username.taken'),'error');
+      alertModal(t('sharing.username.taken'),{danger:true});
       return;
     }
     if(d.error){
-      toast(d.error,'error');
+      alertModal(d.error,{danger:true});
       return;
     }
     toast(t('sharing.username.updated'),'success');
     loadSharingStatus(false);
   }catch(e){
-    toast(t('sharing.username.error'),'error');
+    alertModal(t('sharing.username.error'),{danger:true});
   }
 }
 
@@ -3935,7 +4172,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');}
 }
 
@@ -3943,23 +4180,15 @@ 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';
+  el.style.display='block';
 }
 function guideGoToHub(role){
   switchSettingsTab('hub',document.querySelector('.settings-tab-btn[data-tab="hub"]'));
@@ -3973,6 +4202,7 @@ function guideGoToHub(role){
 
 /* ─── Hub Admin Panel ─── */
 var adminDataCache={users:[],groups:[],tasks:[],skills:[],memories:[]};
+var _lastAdminFingerprint='';
 var hubTasksCache=[];
 var hubSkillsCache=[];
 var ADMIN_PAGE_SIZE=20;
@@ -3991,7 +4221,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;
 }
 
@@ -4053,12 +4283,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:[]}),
@@ -4069,11 +4299,23 @@ async function loadAdminData(){
       ]);
     }
     var usersR=fetches[0],tasksR=fetches[1],skillsR=fetches[2],pendingR=fetches[3],memoriesR=fetches[4];
-    adminDataCache.users=Array.isArray(usersR.users)?usersR.users:[];
-    adminDataCache.tasks=Array.isArray(tasksR.tasks)?tasksR.tasks:[];
-    adminDataCache.skills=Array.isArray(skillsR.skills)?skillsR.skills:[];
-    adminDataCache.memories=Array.isArray(memoriesR.memories)?memoriesR.memories:[];
+    var _newUsers=Array.isArray(usersR.users)?usersR.users:[];
+    var _newTasks=Array.isArray(tasksR.tasks)?tasksR.tasks:[];
+    var _newSkills=Array.isArray(skillsR.skills)?skillsR.skills:[];
+    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.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(',')
+      +':'+pending.map(function(p){return p.id}).join(',');
+    if(_fp===_lastAdminFingerprint) return;
+    _lastAdminFingerprint=_fp;
+    adminDataCache.users=_newUsers;
+    adminDataCache.tasks=_newTasks;
+    adminDataCache.skills=_newSkills;
+    adminDataCache.memories=_newMemories;
     adminDataCache._pending=pending;
     var badge=document.getElementById('adminPendingBadge');
     if(badge){if(pending.length>0){badge.textContent=pending.length;badge.style.display='inline';}else{badge.style.display='none';}}
@@ -4116,11 +4358,15 @@ function updateAdminTabsVisibility(){
   if(subEl) subEl.textContent=isAdmin?t('admin.subtitle'):t('admin.subtitle.member');
 }
 
+var _lastAdminStatsFp='';
 function renderAdminStats(pendingCount){
   var el=document.getElementById('adminStats');
   if(!el) return;
   var isAdmin=!!window._isHubAdmin;
   var onlineCount=adminDataCache.users.filter(function(u){return !!u.isOnline;}).length;
+  var sfp=onlineCount+':'+adminDataCache.users.length+':'+pendingCount+':'+(adminDataCache.memories||[]).length+':'+adminDataCache.tasks.length+':'+adminDataCache.skills.length+':'+isAdmin;
+  if(sfp===_lastAdminStatsFp) return;
+  _lastAdminStatsFp=sfp;
   el.innerHTML=
     (isAdmin?'<div class="admin-stat-box"><span class="as-icon">\u{1F465}</span><div class="val">'+onlineCount+' / '+adminDataCache.users.length+'</div><div class="lbl">'+t('admin.stat.activeUsers')+'</div></div>'+
     '<div class="admin-stat-box"><span class="as-icon">\u{23F3}</span><div class="val">'+pendingCount+'</div><div class="lbl">'+t('admin.stat.pending')+'</div></div>':'')+
@@ -4142,9 +4388,10 @@ function auRelativeTime(ts){
   return t('notif.timeAgo.day').replace('{n}',Math.floor(diff/86400000));
 }
 
-function renderAdminUserCard(u,adminCount){
+function renderAdminUserCard(u,adminCount,myUserId){
   var uid=escAttr(u.id);
   var uname=escAttr(u.username||'');
+  var isSelf=!!(myUserId&&u.id===myUserId);
   var online=!!u.isOnline;
   var statusCls=online?'online':'offline';
 
@@ -4178,7 +4425,9 @@ function renderAdminUserCard(u,adminCount){
   var infoHtml='<div class="au-info">'+infoRows.join('')+'</div>';
 
   var actions='';
-  if(u.isOwner){
+  if(isSelf){
+    actions+='<span style="font-size:11px;color:var(--text-muted);padding:4px 0">'+t('admin.selfHint')+'</span>';
+  }else if(u.isOwner){
     actions+='<span style="font-size:11px;color:var(--text-muted);padding:4px 0">'+t('admin.ownerHint')+'</span>';
   }else if(u.role!=='admin'){
     actions+='<button class="btn btn-sm btn-ghost" onclick="adminToggleRole(&quot;'+uid+'&quot;,&quot;admin&quot;)" style="color:var(--accent)">'+t('admin.promoteAdmin')+'</button>';
@@ -4189,14 +4438,15 @@ function renderAdminUserCard(u,adminCount){
   }else{
     actions+='<span style="font-size:11px;color:var(--text-muted);padding:4px 0">'+t('admin.lastAdminHint')+'</span>';
   }
-  var ownerBadge=u.isOwner?' <span style="font-size:10px;background:linear-gradient(135deg,var(--amber),#f59e0b);color:#fff;padding:1px 6px;border-radius:4px;font-weight:600;vertical-align:middle;margin-left:4px">Owner</span>':'';
+  var badgesHtml='<div class="au-badges">'+statusLabel+
+    '<span class="admin-badge '+(u.role==='admin'?'admin':'member')+'">'+esc(u.role||'member').toUpperCase()+'</span>'+
+    (u.isOwner?'<span class="admin-badge owner">OWNER</span>':'')+
+    '</div>';
 
-  return '<div class="admin-card au-card au-'+statusCls+'"><div class="admin-card-header"><div style="flex:1;min-width:0;display:flex;align-items:center;gap:8px;flex-wrap:wrap">'+
-    '<div style="flex:1;min-width:0">'+titleDisplay+editRow+'</div>'+statusLabel+
-    '</div>'+
-    '<span class="admin-badge '+(u.role==='admin'?'admin':'member')+'">'+esc(u.role||'member')+'</span>'+ownerBadge+'</div>'+
+  return '<div class="admin-card au-card au-'+statusCls+'"><div class="admin-card-header"><div style="flex:1;min-width:0">'+titleDisplay+editRow+'</div>'+
+    badgesHtml+'</div>'+
     contribHtml+infoHtml+
-    (actions?'<div class="admin-card-actions" style="border-top:1px dashed var(--border);padding-top:10px;margin-top:4px">'+actions+'</div>':'')+
+    (actions?'<div class="admin-card-actions" style="border-top:1px solid rgba(99,102,241,.08);padding-top:12px;margin-top:6px">'+actions+'</div>':'')+
     '</div>';
 }
 
@@ -4210,14 +4460,15 @@ function renderAdminUsers(users,pending){
   }
   var html='';
   if(pending&&pending.length>0){
-    html+='<div style="margin-bottom:16px"><h3 style="font-size:14px;font-weight:600;color:var(--amber);margin-bottom:10px">'+t('admin.pendingApproval')+' ('+pending.length+')</h3>';
+    html+='<div class="admin-pending-section"><h3>'+t('admin.pendingApproval')+' <span class="pending-count">'+pending.length+'</span></h3>';
     for(var p=0;p<pending.length;p++){
       var pu=pending[p];
-      html+='<div class="admin-card"><div class="admin-card-header"><div class="admin-card-title">'+esc(pu.username||pu.id||'Unknown')+'</div><span class="admin-badge pending">pending</span></div>'+
-        '<div class="admin-card-meta">'+t('admin.device')+esc(pu.deviceName||'unknown')+'</div>'+
-        '<div class="admin-card-actions">'+
-          '<button class="btn btn-sm btn-primary" onclick="adminApproveUser(&quot;'+escAttr(pu.id)+'&quot;,&quot;'+escAttr(pu.username||'')+'&quot;)">'+t('admin.approve')+'</button>'+
-          '<button class="btn btn-sm btn-ghost" onclick="adminRejectUser(&quot;'+escAttr(pu.id)+'&quot;)" style="color:var(--rose)">'+t('admin.reject')+'</button>'+
+      html+='<div class="admin-pending-card">'+
+        '<div class="apc-name">'+esc(pu.username||pu.id||'Unknown')+'</div>'+
+        '<div class="apc-meta"><span>\u{1F4BB} '+esc(pu.deviceName||'unknown')+'</span>'+(pu.createdAt?'<span>\u{1F552} '+formatDateTimeSeconds(pu.createdAt)+'</span>':'')+'</div>'+
+        '<div class="apc-actions">'+
+          '<button class="btn-approve" onclick="adminApproveUser(&quot;'+escAttr(pu.id)+'&quot;,&quot;'+escAttr(pu.username||'')+'&quot;)">'+t('admin.approve')+'</button>'+
+          '<button class="btn-reject" onclick="adminRejectUser(&quot;'+escAttr(pu.id)+'&quot;)">'+t('admin.reject')+'</button>'+
         '</div></div>';
     }
     html+='</div>';
@@ -4228,6 +4479,7 @@ function renderAdminUsers(users,pending){
   offlineUsers.sort(function(a,b){return (b.lastActiveAt||0)-(a.lastActiveAt||0);});
   var sorted=onlineUsers.concat(offlineUsers);
   var adminCount=users.filter(function(x){return x.role==='admin';}).length;
+  var myUserId=sharingStatusCache&&sharingStatusCache.connection&&sharingStatusCache.connection.user?sharingStatusCache.connection.user.id:null;
 
   if(sorted.length===0){
     html+='<div class="admin-empty"><span class="ae-icon">\u{1F465}</span>'+t('admin.noActiveUsers')+'</div>';
@@ -4236,13 +4488,13 @@ function renderAdminUsers(users,pending){
     if(onlineUsers.length===0){
       html+='<div style="font-size:12px;color:var(--text-muted);padding:8px 0 12px">\u2014</div>';
     }else{
-      for(var i=0;i<onlineUsers.length;i++) html+=renderAdminUserCard(onlineUsers[i],adminCount);
+      for(var i=0;i<onlineUsers.length;i++) html+=renderAdminUserCard(onlineUsers[i],adminCount,myUserId);
     }
     html+='<div class="au-group-header"><span class="au-group-dot offline"></span>'+t('admin.offlineUsers')+' <span class="au-group-count">('+offlineUsers.length+')</span></div>';
     if(offlineUsers.length===0){
       html+='<div style="font-size:12px;color:var(--text-muted);padding:8px 0 12px">\u2014</div>';
     }else{
-      for(var j=0;j<offlineUsers.length;j++) html+=renderAdminUserCard(offlineUsers[j],adminCount);
+      for(var j=0;j<offlineUsers.length;j++) html+=renderAdminUserCard(offlineUsers[j],adminCount,myUserId);
     }
   }
   el.innerHTML=html;
@@ -4253,7 +4505,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){
@@ -4261,7 +4513,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){
@@ -4270,7 +4522,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');}
@@ -4296,13 +4555,24 @@ async function adminSaveEditName(userId){
   var inputEl=document.getElementById('au_input_'+userId);
   if(!inputEl) return;
   var newName=inputEl.value.trim();
-  if(!newName||newName.length<2||newName.length>32){toast(t('toast.invalidUsername'),'warn');return;}
+  if(!newName||newName.length<2||newName.length>32){
+    alertModal(t('toast.invalidUsername'),{title:t('admin.editName')});
+    return;
+  }
   inputEl.disabled=true;
   try{
     var r=await fetch('/api/sharing/rename-user',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({userId:userId,username:newName})});
     var d=await r.json();
-    if(d.ok){toast(t('toast.usernameChanged'),'success');loadAdminData();}else{inputEl.disabled=false;toast(d.error||t('toast.renameFail'),'error');}
-  }catch(e){inputEl.disabled=false;toast(t('toast.renameFail')+': '+e.message,'error');}
+    if(d.ok){toast(t('toast.usernameChanged'),'success');adminCancelEditName(userId);loadAdminData();}
+    else{
+      inputEl.disabled=false;
+      if(d.error==='username_taken'){
+        alertModal(t('sharing.username.taken'),{title:t('admin.editName'),danger:true});
+      }else{
+        alertModal(d.error||t('toast.renameFail'),{title:t('admin.editName'),danger:true});
+      }
+    }
+  }catch(e){inputEl.disabled=false;alertModal(t('toast.renameFail'),{title:t('admin.editName'),danger:true});}
 }
 
 async function adminRemoveUser(userId,username){
@@ -4311,7 +4581,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');}
@@ -4380,7 +4650,7 @@ function renderAdminTasks(tasks){
         '<div class="admin-card-header"><div class="admin-card-title">'+esc(tk.title||tk.id)+'</div></div>'+
         '<div class="admin-card-tags">'+
           '<div class="admin-card-tags-left">'+
-            '<span class="admin-card-tag tag-owner">\u{1F464} '+esc(tk.ownerName||tk.sourceUserId||'unknown')+'</span>'+
+            '<span class="admin-card-tag tag-owner">\u{1F464} '+fmtOwner(tk)+'</span>'+
             (tk.status?'<span class="admin-card-tag tag-status">'+esc(tk.status)+'</span>':'')+
             (tk.chunkCount!=null?'<span class="admin-card-tag tag-kind">\u{1F4DD} '+tk.chunkCount+' '+t('admin.chunks')+'</span>':'')+
         '</div>'+
@@ -4442,7 +4712,7 @@ function renderAdminSkills(skills){
         '<div class="admin-card-header"><div class="admin-card-title">'+esc(s.name||s.id)+'</div></div>'+
         '<div class="admin-card-tags">'+
           '<div class="admin-card-tags-left">'+
-            '<span class="admin-card-tag tag-owner">\u{1F464} '+esc(s.ownerName||s.sourceUserId||'unknown')+'</span>'+
+            '<span class="admin-card-tag tag-owner">\u{1F464} '+fmtOwner(s)+'</span>'+
             (s.status?'<span class="admin-card-tag tag-status">'+esc(s.status)+'</span>':'')+
             (s.version!=null?'<span class="admin-card-tag tag-version">v'+s.version+'</span>':'')+
             (qs!=null?'<span class="admin-card-tag tag-kind">\u2605 '+Number(qs).toFixed(1)+'</span>':'')+
@@ -4507,7 +4777,7 @@ function renderAdminMemories(memories){
         '<div class="admin-card-header"><div class="admin-card-title">'+esc(m.summary||m.content?.slice(0,80)||m.id)+'</div></div>'+
         '<div class="admin-card-tags">'+
           '<div class="admin-card-tags-left">'+
-            '<span class="admin-card-tag tag-owner">\u{1F464} '+esc(m.ownerName||m.sourceUserId||'unknown')+'</span>'+
+            '<span class="admin-card-tag tag-owner">\u{1F464} '+fmtOwner(m)+'</span>'+
             (m.role?'<span class="admin-card-tag tag-role">'+esc(m.role)+'</span>':'')+
             (m.kind?'<span class="admin-card-tag tag-kind">'+esc(m.kind)+'</span>':'')+
         '</div>'+
@@ -4551,7 +4821,7 @@ function toggleAdminMemoryCard(cardId,idx){
     (m.kind?'<span class="meta-item">'+t('admin.kind')+esc(m.kind)+'</span>':'')+
     (m.role?'<span class="meta-item">'+t('admin.role')+esc(m.role)+'</span>':'')+
     (m.visibility?'<span class="meta-item">'+t('admin.visibility')+esc(m.visibility)+'</span>':'')+
-    '<span class="meta-item">'+t('admin.owner')+esc(m.ownerName||m.sourceUserId||'unknown')+'</span>'+
+    '<span class="meta-item">'+t('admin.owner')+fmtOwner(m)+'</span>'+
     (m.groupName?'<span class="meta-item">'+t('admin.group')+esc(m.groupName)+'</span>':'')+
     '<span class="meta-item">'+new Date(m.updatedAt||m.createdAt||0).toLocaleString(dateLoc())+'</span>'+
   '</div>';
@@ -4607,7 +4877,7 @@ async function toggleAdminTaskCard(cardId,idx){
   var metaHtml='<div class="admin-card-detail-meta admin-task-meta">'+
     (tk.status?'<span class="meta-item"><span class="task-status-badge '+tk.status+'">'+esc(tk.status)+'</span></span>':'')+
     (tk.visibility?'<span class="meta-item">'+t('admin.visibility')+esc(tk.visibility)+'</span>':'')+
-    '<span class="meta-item">'+t('admin.owner')+esc(tk.ownerName||'unknown')+'</span>'+
+    '<span class="meta-item">'+t('admin.owner')+fmtOwner(tk)+'</span>'+
     (tk.groupName?'<span class="meta-item">'+t('admin.group')+esc(tk.groupName)+'</span>':'')+
     (task.chunks&&task.chunks.length?'<span class="meta-item">\u{1F4AC} '+task.chunks.length+' '+t('tasks.chunks.label')+'</span>':'')+
     (task.startedAt?'<span class="meta-item">\u{1F4C5} '+formatDateTimeSeconds(task.startedAt)+'</span>':'')+
@@ -4694,7 +4964,7 @@ async function toggleAdminSkillCard(cardId,idx){
     (localSkill.status?'<span class="meta-item"><span class="skill-badge status-'+localSkill.status+'">'+esc(localSkill.status)+'</span></span>':'')+
     (sk.visibility?'<span class="meta-item">'+t('admin.visibility')+esc(sk.visibility||'hub')+'</span>':'')+
     (qs!=null?'<span class="meta-item"><span class="skill-badge quality '+(qs>=7?'high':qs>=5?'mid':'low')+'">\u2605 '+Number(qs).toFixed(1)+'/10</span></span>':'')+
-    '<span class="meta-item">'+t('admin.owner')+esc(sk.ownerName||'unknown')+'</span>'+
+    '<span class="meta-item">'+t('admin.owner')+fmtOwner(sk)+'</span>'+
     (sk.groupName?'<span class="meta-item">'+t('admin.group')+esc(sk.groupName)+'</span>':'')+
     '<span class="meta-item">'+t('admin.updated')+new Date(sk.updatedAt||sk.createdAt||0).toLocaleString(dateLoc())+'</span>'+
   '</div>';
@@ -4763,7 +5033,7 @@ function renderSharingMemorySearchResults(data,query){
           '<div class="summary">'+(idx+1)+'. '+esc(hit.summary||'(no summary)')+'</div>'+
           '<div class="excerpt">'+esc(hit.excerpt||'')+'</div>'+
           '<div class="hub-hit-meta">'+
-            '<span class="meta-chip">owner: '+esc(hit.ownerName||'unknown')+'</span>'+
+            '<span class="meta-chip">owner: '+fmtOwner(hit)+'</span>'+
             (hit.groupName?'<span class="meta-chip">group: '+esc(hit.groupName)+'</span>':'')+
             '<span class="meta-chip">visibility: '+esc(hit.visibility||'hub')+'</span>'+
           '</div>'+
@@ -4848,7 +5118,7 @@ function openHubTaskDetailFromCache(cacheKey,idx){
   var meta=[
     '<span class="meta-item">\\u{1F310} '+t('scope.hub')+'</span>',
     task.status?'<span class="meta-item"><span class="task-status-badge '+task.status+'">'+esc(task.status)+'</span></span>':'',
-    '<span class="meta-item">'+t('admin.owner')+esc(task.ownerName||'unknown')+'</span>',
+    '<span class="meta-item">'+t('admin.owner')+fmtOwner(task)+'</span>',
     task.groupName?'<span class="meta-item">'+t('admin.group')+esc(task.groupName)+'</span>':'',
     task.visibility?'<span class="meta-item">'+t('admin.visibility')+esc(task.visibility)+'</span>':'',
     task.chunkCount!=null?'<span class="meta-item">\\u{1F4DD} '+esc(String(task.chunkCount))+' '+t('tasks.chunks.label')+'</span>':'',
@@ -4879,14 +5149,14 @@ function openHubSkillDetailFromCache(cacheKey,idx){
     skill.status?'<span class="meta-item"><span class="skill-badge status-'+skill.status+'">'+esc(skill.status)+'</span></span>':'',
     '<span class="meta-item">visibility: '+esc(skill.visibility||'hub')+'</span>',
     qsBadge,
-    '<span class="meta-item">'+t('admin.owner')+esc(skill.ownerName||'unknown')+'</span>',
+    '<span class="meta-item">'+t('admin.owner')+fmtOwner(skill)+'</span>',
     skill.groupName?'<span class="meta-item">'+t('admin.group')+esc(skill.groupName)+'</span>':'',
     (skill.updatedAt||skill.createdAt)?'<span class="meta-item">'+t('admin.updated')+new Date(skill.updatedAt||skill.createdAt).toLocaleString(dateLoc())+'</span>':'',
   ].filter(Boolean);
   document.getElementById('skillDetailMeta').innerHTML=meta.join('');
   document.getElementById('skillDetailDesc').textContent=skill.description||'';
   document.getElementById('skillFilesList').innerHTML='';
-  document.getElementById('skillDetailContent').innerHTML=skill.content?'<pre>'+esc(skill.content)+'</pre>':'';
+  document.getElementById('skillDetailContent').innerHTML=skill.content?renderSkillMarkdown(skill.content):'';
   document.getElementById('skillVersionsList').innerHTML='';
   document.getElementById('skillRelatedTasks').innerHTML='';
   var visBtn=document.getElementById('skillVisibilityBtn');
@@ -4929,6 +5199,7 @@ function openScopeSelectorModal(resourceType, resourceId, currentScope, onConfir
   var existing=document.getElementById('scopeSelectorOverlay');
   if(existing) existing.remove();
   var teamEnabled=sharingStatusCache&&sharingStatusCache.enabled;
+  var teamConnected=teamEnabled&&sharingStatusCache.connection&&sharingStatusCache.connection.connected;
   var overlay=document.createElement('div');
   overlay.id='scopeSelectorOverlay';
   overlay.style.cssText='position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.5);backdrop-filter:blur(6px);z-index:10000;display:flex;align-items:center;justify-content:center;animation:fadeIn 0.12s ease';
@@ -4942,7 +5213,7 @@ function openScopeSelectorModal(resourceType, resourceId, currentScope, onConfir
   for(var i=0;i<scopes.length;i++){
     var sc=scopes[i];
     var isCurrent=sc===currentScope;
-    var isDisabled=sc==='team'&&!teamEnabled;
+    var isDisabled=sc==='team'&&(!teamEnabled||!teamConnected);
     var color=getScopeColor(sc);
     var cursor=isDisabled?'not-allowed':'pointer';
     var opacity=isDisabled?'0.4':'1';
@@ -5011,7 +5282,8 @@ async function confirmScopeSelection(){
       if(st.onConfirm) st.onConfirm(newScope);
       else loadAll();
     }else{
-      toast(d.error||t('share.scope.changeFail'),'error');
+      var errMsg=d.error==='inactive_memory'?t('share.scope.inactiveDisabled'):(d.message||d.error||t('share.scope.changeFail'));
+      toast(errMsg,'error');
     }
   }catch(e){toast(t('share.scope.changeFail')+': '+e.message,'error');}
 }
@@ -5262,6 +5534,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(_){}
@@ -5286,8 +5565,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>';
         });
@@ -5300,8 +5580,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>';
           });
@@ -5365,8 +5646,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>';
     });
@@ -5380,8 +5662,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>';
     });
@@ -5511,12 +5794,12 @@ function setTaskStatusFilter(btn,status){
   loadTasks();
 }
 
-async function loadTasks(){
+async function loadTasks(silent){
   const scope=document.getElementById('taskSearchScope')?document.getElementById('taskSearchScope').value:taskSearchScope;
   taskSearchScope=scope||'local';
   if(taskSearchScope==='hub'){ return loadHubTasks(); }
   const list=document.getElementById('tasksList');
-  list.innerHTML='<div class="spinner"></div>';
+  if(!silent) list.innerHTML='<div class="spinner"></div>';
   try{
     const params=new URLSearchParams({limit:String(TASKS_PER_PAGE),offset:String(tasksPage*TASKS_PER_PAGE)});
     if(tasksStatusFilter) params.set('status',tasksStatusFilter);
@@ -5530,6 +5813,14 @@ async function loadTasks(){
       fetch('/api/tasks?status=completed&limit=1&offset=0&'+baseP).then(r=>r.json()),
       fetch('/api/tasks?status=skipped&limit=1&offset=0&'+baseP).then(r=>r.json())
     ]);
+    if(silent){
+      var fp=JSON.stringify((data.tasks||[]).map(function(tk){return tk.id+'|'+tk.status+'|'+(tk.updatedAt||tk.startedAt)}));
+      fp+=':'+allD.total+':'+activeD.total+':'+compD.total+':'+skipD.total;
+      if(fp===_lastTasksFingerprint) return;
+      _lastTasksFingerprint=fp;
+    }else{
+      _lastTasksFingerprint='';
+    }
     document.getElementById('tasksTotalCount').textContent=formatNum(allD.total);
     document.getElementById('tasksActiveCount').textContent=formatNum(activeD.total);
     document.getElementById('tasksCompletedCount').textContent=formatNum(compD.total);
@@ -5815,17 +6106,17 @@ function updateSkillCardBadge(skillId,newScope){
   }
 }
 
-async function loadSkills(){
+async function loadSkills(silent){
   const list=document.getElementById('skillsList');
   const hubList=document.getElementById('hubSkillsList');
-  list.innerHTML='<div class="spinner"></div>';
+  if(!silent) list.innerHTML='<div class="spinner"></div>';
   var hubSection=document.getElementById('hubSkillsSection');
   if(hubList){
     if(skillSearchScope==='local'||skillSearchScope==='allLocal'){
       if(hubSection) hubSection.style.display='none';
     }else{
       if(hubSection) hubSection.style.display='block';
-      hubList.innerHTML='<div class="spinner"></div>';
+      if(!silent) hubList.innerHTML='<div class="spinner"></div>';
     }
   }
 
@@ -5849,6 +6140,13 @@ async function loadSkills(){
         return haystack.includes(q);
       });
     }
+    if(silent){
+      var fp=JSON.stringify(localSkills.map(function(s){return s.id+'|'+s.status+'|'+s.version+'|'+(s.visibility||'')}));
+      if(fp===_lastSkillsFingerprint) return;
+      _lastSkillsFingerprint=fp;
+    }else{
+      _lastSkillsFingerprint='';
+    }
 
     const renderLocalCards=function(skills){
       if(!skills||skills.length===0){
@@ -5907,7 +6205,8 @@ async function loadSkills(){
 
     if(!query){
       if(hubSection) hubSection.style.display='block';
-      if(hubList){ loadHubSkills(hubList); }
+      var localIds=new Set(localSkills.map(function(s){return s.id;}));
+      if(hubList){ loadHubSkills(hubList, localIds); }
       document.getElementById('skillSearchMeta').textContent=t('skills.search.local')+' '+localSkills.length;
       document.getElementById('skillsTotalCount').textContent=formatNum(localSkills.length);
       document.getElementById('skillsActiveCount').textContent=formatNum(localSkills.filter(s=>s.status==='active').length);
@@ -5941,7 +6240,7 @@ async function loadSkills(){
           '<div class="summary">'+esc(skill.name)+'</div>'+
           '<div class="excerpt">'+esc(skill.description||'')+'</div>'+
           '<div class="hub-skill-meta">'+
-            '<span class="meta-chip">owner: '+esc(skill.ownerName||'unknown')+'</span>'+
+            '<span class="meta-chip">owner: '+fmtOwner(skill)+'</span>'+
             (skill.groupName?'<span class="meta-chip">group: '+esc(skill.groupName)+'</span>':'')+
             '<span class="meta-chip">visibility: '+esc(skill.visibility||'hub')+'</span>'+
             (skill.version!=null?'<span class="meta-chip">v'+skill.version+'</span>':'')+
@@ -5988,12 +6287,12 @@ async function loadHubTasks(){
       return '<div class="task-card" onclick="openHubTaskDetailFromCache(\\x27hub\\x27,'+idx+')" style="cursor:pointer">'+
         '<div class="task-card-top">'+
           '<div class="task-card-title">'+esc(task.title||'(no title)')+'</div>'+
-          '<div class="task-card-badges"><span class="scope-badge team">\\u{1F310} '+t('scope.hub')+'</span></div>'+
+          '<div class="task-card-badges">'+renderScopeBadge('team')+'</div>'+
         '</div>'+
         (task.summary?'<div class="task-card-summary">'+esc(task.summary)+'</div>':'')+
         '<div class="task-card-bottom">'+
           (timeStr?'<span class="tag"><span class="icon">\\u{1F4C5}</span> '+timeStr+'</span>':'')+
-          '<span class="tag"><span class="icon">\\u{1F464}</span> '+esc(task.ownerName||'unknown')+'</span>'+
+          '<span class="tag"><span class="icon">\\u{1F464}</span> '+fmtOwner(task)+'</span>'+
           (task.chunkCount!=null?'<span class="tag"><span class="icon">\\u{1F4DD}</span> '+task.chunkCount+' '+t('tasks.chunks.label')+'</span>':'')+
         '</div>'+
       '</div>';
@@ -6005,7 +6304,7 @@ async function loadHubTasks(){
   }
 }
 
-async function loadHubSkills(hubList){
+async function loadHubSkills(hubList, localIds){
   if(!hubList) hubList=document.getElementById('hubSkillsList');
   if(!hubList) return;
   var hubSection=document.getElementById('hubSkillsSection');
@@ -6013,7 +6312,8 @@ async function loadHubSkills(hubList){
   try{
     const r=await fetch('/api/sharing/skills/list?limit=40');
     const d=await r.json();
-    const skills=Array.isArray(d.skills)?d.skills:[];
+    var allSkills=Array.isArray(d.skills)?d.skills:[];
+    const skills=localIds?allSkills.filter(function(s){return !localIds.has(s.sourceSkillId);}):allSkills;
     hubSkillsCache=skills;
     if(!skills.length){
       if(hubSection) hubSection.style.display='none';
@@ -6025,12 +6325,12 @@ async function loadHubSkills(hubList){
         '<div class="summary">'+esc(skill.name)+'</div>'+
         '<div class="excerpt">'+esc(skill.description||'')+'</div>'+
         '<div class="hub-skill-meta">'+
-          '<span class="meta-chip">owner: '+esc(skill.ownerName||'unknown')+'</span>'+
+          '<span class="meta-chip">owner: '+fmtOwner(skill)+'</span>'+
           (skill.groupName?'<span class="meta-chip">group: '+esc(skill.groupName)+'</span>':'')+
           '<span class="meta-chip">visibility: '+esc(skill.visibility||'hub')+'</span>'+
           (skill.version!=null?'<span class="meta-chip">v'+skill.version+'</span>':'')+
         '</div>'+
-        '<div class="hub-skill-actions"><button class="btn btn-sm" onclick="event.stopPropagation();pullHubSkill(\\''+escAttr(skill.sourceSkillId)+'\\')">'+t('skill.pullToLocal')+'</button></div>'+
+        '<div class="hub-skill-actions"><button class="btn btn-sm" onclick="event.stopPropagation();pullHubSkill(\\''+escAttr(skill.id)+'\\')">'+t('skill.pullToLocal')+'</button></div>'+
       '</div>';
     }).join('');
   }catch(e){
@@ -6364,6 +6664,7 @@ async function loadConfig(){
     document.getElementById('cfgHubTeamName').value=hub.teamName||'';
     document.getElementById('cfgHubTeamToken').value=hub.teamToken||'';
     document.getElementById('cfgClientHubAddress').value=client.hubAddress||'';
+    _loadedClientHubAddress=client.hubAddress||'';
     document.getElementById('cfgClientTeamToken').value=client.teamToken||'';
     document.getElementById('cfgClientNickname').value=client.nickname||'';
     document.getElementById('cfgClientUserToken').value=client.userToken||'';
@@ -6409,20 +6710,24 @@ function flashSaved(id){
 }
 
 async function doSaveConfig(cfg, btnEl, savedId){
-  btnEl.disabled=true;btnEl.textContent=t('settings.test.loading');
-  function done(){btnEl.disabled=false;btnEl.textContent=t('settings.save');}
+  if(btnEl){btnEl.disabled=true;btnEl.textContent=t('settings.test.loading');}
+  function done(){if(btnEl){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;
+    if(data&&data.restart){
+      showRestartOverlay(t('settings.restart.waiting'));
+    }else{
+      done();
+    }
+    return data;
   }catch(e){
     toast(t('settings.save.fail')+': '+e.message,'error');
     done();
-    return false;
+    return null;
   }
 }
 
@@ -6517,11 +6822,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;
@@ -6535,7 +6848,7 @@ async function saveHubConfig(){
     var hubTeamName=document.getElementById('cfgHubTeamName').value.trim();
     var hubTeamToken=document.getElementById('cfgHubTeamToken').value.trim();
     var hubAdminName=document.getElementById('cfgHubAdminName').value.trim();
-    cfg.sharing.hub={port:hubPort?Number(hubPort):18800};
+    if(hubPort) cfg.sharing.hub={port:Number(hubPort)}; else cfg.sharing.hub={};
     if(hubTeamName) cfg.sharing.hub.teamName=hubTeamName;
     if(hubTeamToken) cfg.sharing.hub.teamToken=hubTeamToken;
     cfg.sharing.client={hubAddress:'',userToken:'',teamToken:''};
@@ -6545,21 +6858,29 @@ async function saveHubConfig(){
     var clientTeamToken=document.getElementById('cfgClientTeamToken').value.trim();
     var clientUserToken=document.getElementById('cfgClientUserToken').value.trim();
     var clientNickname=document.getElementById('cfgClientNickname').value.trim();
+    if(!clientAddr){done();toast(t('settings.hub.test.noAddr'),'error');return;}
+    if(!clientTeamToken){done();toast(t('settings.hub.teamToken.required'),'error');return;}
     cfg.sharing.client={};
     if(clientAddr) cfg.sharing.client.hubAddress=clientAddr;
     if(clientNickname) cfg.sharing.client.nickname=clientNickname;
     if(clientTeamToken) cfg.sharing.client.teamToken=clientTeamToken;
     if(clientUserToken) cfg.sharing.client.userToken=clientUserToken;
-    cfg.sharing.hub={port:18800,teamName:'',teamToken:''};
+    cfg.sharing.hub={teamName:'',teamToken:''};
     if(clientAddr){
       try{
-        var ips=await fetch('/api/local-ips').then(function(r){return r.json();});
-        var localAddrs=['127.0.0.1','localhost','0.0.0.0'].concat(ips.ips||[]);
-        var parsed=new URL(clientAddr.indexOf('://')>-1?clientAddr:'http://'+clientAddr);
-        if(localAddrs.indexOf(parsed.hostname)>=0){
-          done();toast(t('sharing.cannotJoinSelf'),'error');return;
-        }
       }catch(e){}
+      try{
+        var testUrl=clientAddr.indexOf('://')>-1?clientAddr:'http://'+clientAddr;
+        testUrl=testUrl.replace(/\\/+$/,'');
+        var tr=await fetch('/api/sharing/test-hub',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({hubUrl:testUrl})});
+        var td=await tr.json();
+        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){
+        done();toast(t('settings.hub.test.fail')+': '+String(e),'error');return;
+      }
     }
   }
 
@@ -6569,21 +6890,44 @@ async function saveHubConfig(){
     var confirmMsg=prevRole==='hub'?t('sharing.disable.confirm.hub'):t('sharing.disable.confirm.client');
     if(!(await confirmModal(confirmMsg,{danger:true}))){done();return;}
   }
+  if(prevSharingEnabled&&sharingEnabled&&prevRole&&prevRole!==_sharingRole){
+    var switchMsg=prevRole==='hub'?t('sharing.switch.hubToClient'):t('sharing.switch.clientToHub');
+    if(!(await confirmModal(switchMsg,{danger:true}))){done();return;}
+  }
+  if(prevSharingEnabled&&sharingEnabled&&prevRole==='client'&&_sharingRole==='client'){
+    var newAddr=(document.getElementById('cfgClientHubAddress').value||'').trim();
+    if(_loadedClientHubAddress&&newAddr&&newAddr!==_loadedClientHubAddress){
+      if(!(await confirmModal(t('sharing.switch.hubAddress'),{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){}
       }
     }
-    loadSharingStatus(false);
-    var needsRestart=sharingEnabled||(prevSharingEnabled&&!sharingEnabled);
-    if(sharingEnabled) updateHubShareInfo();
-    if(needsRestart){
-      setTimeout(function(){showRestartOverlay(t('settings.restart.waiting'));},300);
+    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='';
+    _lastAdminFingerprint='';
+    _lastAdminStatsFp='';
+    if(sharingEnabled) updateHubShareInfo();
+    loadSharingStatus(true);
+    if(_activeView==='admin') loadAdminData();
   }
 }
 
@@ -6673,6 +7017,8 @@ function renderSkillMarkdown(md){
 function closeSkillDetail(event){
   if(event && event.target!==document.getElementById('skillDetailOverlay')) return;
   document.getElementById('skillDetailOverlay').classList.remove('show');
+  currentSkillId='';
+  currentSkillDetail=null;
 }
 
 async function deleteSkill(skillId){
@@ -7007,16 +7353,29 @@ var _livePollBusy=false;
 async function _livePollTick(){
   if(_livePollBusy||document.hidden) return;
   _livePollBusy=true;
+  var _savedScrollY=window.scrollY;
+  var _scrollTargets=['memoryList','tasksList','skillsList','adminUsersPanel','adminMemoriesPanel','adminTasksPanel','adminSkillsPanel'];
+  var _savedScrollMap={};
+  _scrollTargets.forEach(function(id){var el=document.getElementById(id);if(el&&el.scrollTop)_savedScrollMap[id]=el.scrollTop;});
   try{
-    if(sharingStatusCache&&sharingStatusCache.enabled) loadSharingStatus(false);
-    if(!_notifSSEConnected) pollNotifCount();
-    pollAdminPending();
-    if(_activeView==='admin') loadAdminData();
-    else if(_activeView==='memories'){loadStats();loadMemories();}
-    else if(_activeView==='tasks') loadTasks();
-    else if(_activeView==='skills') loadSkills();
-    else if(_activeView==='analytics') loadMetrics();
+    if(sharingStatusCache&&sharingStatusCache.enabled&&_lastSharingConnStatus!=='rejected') await loadSharingStatus(false);
+    if(!_notifSSEConnected) await pollNotifCount();
+    await pollAdminPending();
+    if(_activeView==='admin') await loadAdminData();
+    else if(_activeView==='memories'){
+      var _searchVal=(document.getElementById('searchInput')||{}).value||'';
+      if(!_searchVal.trim()){
+        if(memorySearchScope==='hub') await loadHubMemories(true);
+        else{var _pollOwner=memorySearchScope==='local'?_currentAgentOwner:undefined;await loadStats(_pollOwner);await loadMemories(null,true);}
+      }
+    }
+    else if(_activeView==='tasks') await loadTasks(true);
+    else if(_activeView==='skills') await loadSkills(true);
+    else if(_activeView==='analytics') await loadMetrics();
   }catch(e){}
+  await new Promise(function(r){requestAnimationFrame(r);});
+  window.scrollTo(0,_savedScrollY);
+  for(var _sid in _savedScrollMap){var _sel=document.getElementById(_sid);if(_sel)_sel.scrollTop=_savedScrollMap[_sid];}
   _livePollBusy=false;
 }
 
@@ -7060,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=[];
@@ -7109,7 +7471,12 @@ function notifTimeAgo(ts){
 function notifIcon(resource,type){
   if(type==='user_online') return '\\u{1F7E2}';
   if(type==='user_offline') return '\\u{1F534}';
+  if(type==='user_left') return '\\u{1F6AA}';
   if(type==='user_join_request') return '\\u{1F464}';
+  if(type==='membership_removed') return '\\u{26D4}';
+  if(type==='hub_shutdown') return '\\u{1F6D1}';
+  if(type==='role_promoted') return '\\u{2B06}';
+  if(type==='role_demoted') return '\\u{2B07}';
   if(resource==='memory') return '\\u{1F4DD}';
   if(resource==='task') return '\\u{1F4CB}';
   if(resource==='skill') return '\\u{1F9E0}';
@@ -7135,6 +7502,27 @@ function notifTypeText(n){
   if(n.type==='user_offline'){
     return t('notif.userOffline');
   }
+  if(n.type==='user_left'){
+    return t('notif.userLeft');
+  }
+  if(n.type==='membership_approved'){
+    return t('notif.membershipApproved');
+  }
+  if(n.type==='membership_rejected'){
+    return t('notif.membershipRejected');
+  }
+  if(n.type==='membership_removed'){
+    return t('notif.membershipRemoved');
+  }
+  if(n.type==='hub_shutdown'){
+    return t('notif.hubShutdown');
+  }
+  if(n.type==='role_promoted'){
+    return t('notif.rolePromoted');
+  }
+  if(n.type==='role_demoted'){
+    return t('notif.roleDemoted');
+  }
   return n.message||n.type;
 }
 
@@ -7169,6 +7557,21 @@ function renderNotifBadge(){
   }
 }
 
+var _notifKnownTypes={membership_approved:1,membership_rejected:1,membership_removed:1,hub_shutdown:1,user_left:1,user_online:1,user_offline:1,user_join_request:1,role_promoted:1,role_demoted:1,resource_removed:1,resource_shared:1,resource_unshared:1};
+function notifDisplayTitle(n){
+  if(_notifKnownTypes[n.type]) return notifTypeText(n);
+  return n.title||notifTypeText(n);
+}
+function notifDisplayDetail(n){
+  if(_notifKnownTypes[n.type]){
+    if(n.type==='resource_removed'||n.type==='resource_shared'||n.type==='resource_unshared') return n.title||'';
+    var m=n.title&&n.title.match(/["\u201C]([^"\u201D]+)["\u201D]/);
+    if(m) return m[1];
+    if(n.type==='user_left'||n.type==='user_online'||n.type==='user_offline'||n.type==='user_join_request') return n.title||'';
+    return '';
+  }
+  return n.title||'';
+}
 function renderNotifPanel(){
   var body=document.getElementById('notifPanelBody');
   if(!body) return;
@@ -7178,11 +7581,12 @@ function renderNotifPanel(){
   }
   body.innerHTML=_notifCache.map(function(n){
     var cls='notif-item'+(n.read?'':' unread');
+    var detail=notifDisplayDetail(n);
     return '<div class="'+cls+'" onclick="markNotifRead(&quot;'+esc(n.id)+'&quot;)">'+
       '<div class="notif-item-icon">'+notifIcon(n.resource,n.type)+'</div>'+
       '<div class="notif-item-body">'+
-        '<div class="notif-item-title">'+esc(notifTypeText(n))+'</div>'+
-        '<div class="notif-item-name">'+esc(n.title)+'</div>'+
+        '<div class="notif-item-title">'+esc(notifDisplayTitle(n))+'</div>'+
+        (detail?'<div class="notif-item-name">'+esc(detail)+'</div>':'')+
         '<div class="notif-item-time">'+notifTimeAgo(n.createdAt)+'</div>'+
       '</div>'+
       '<div class="notif-item-dot"></div>'+
@@ -7225,7 +7629,10 @@ function stopNotifPoll(){ }
 
 /* ─── Data loading ─── */
 async function loadAll(){
-  await Promise.all([loadStats(),loadMemories(),loadSharingStatus(false)]);
+  await loadStats();
+  var initOwner=memorySearchScope==='local'?_currentAgentOwner:undefined;
+  if(initOwner) await loadStats(initOwner);
+  await Promise.all([loadMemories(),loadSharingStatus(false)]);
   checkMigrateStatus();
   connectPPSSE();
   checkForUpdate();
@@ -7233,6 +7640,7 @@ async function loadAll(){
   startLivePoller();
 }
 
+var _lastStatsFp='';
 async function loadStats(ownerFilter){
   let d;
   try{
@@ -7242,28 +7650,22 @@ async function loadStats(ownerFilter){
     d=await r.json();
   }catch(e){ d={}; }
   if(!d||typeof d!=='object') d={};
+  if(d.currentAgentOwner) _currentAgentOwner=d.currentAgentOwner;
   const tm=d.totalMemories||0;
   const dedupB=d.dedupBreakdown||{};
   const activeCount=dedupB.active||tm;
   const inactiveCount=(dedupB.duplicate||0)+(dedupB.merged||0);
+  var agentCount=(d.owners&&d.owners.length)?d.owners.length:1;
+  var sfp=tm+':'+(d.totalSessions||0)+':'+(d.totalEmbeddings||0)+':'+agentCount+':'+(d.embeddingProvider||'none')+':'+(ownerFilter||'');
+  if(sfp===_lastStatsFp) return;
+  _lastStatsFp=sfp;
   document.getElementById('statTotal').textContent=tm;
   if(inactiveCount>0){
     document.getElementById('statTotal').title=activeCount+' '+t('stat.active')+', '+inactiveCount+' '+t('stat.deduped');
   }
   document.getElementById('statSessions').textContent=d.totalSessions||0;
   document.getElementById('statEmbeddings').textContent=d.totalEmbeddings||0;
-  let days=0;
-  if(d.timeRange&&d.timeRange.earliest!=null&&d.timeRange.latest!=null){
-    let e=Number(d.timeRange.earliest), l=Number(d.timeRange.latest);
-    if(Number.isFinite(e)&&Number.isFinite(l)){
-      if(e<1e12) e*=1000;
-      if(l<1e12) l*=1000;
-      days=Math.round((l-e)/86400000);
-      days=Math.max(0,Math.min(36500,days));
-      if(days===0) days=1;
-    }
-  }
-  document.getElementById('statTimeSpan').textContent=days;
+  document.getElementById('statAgents').textContent=agentCount;
 
   const provEl=document.getElementById('embeddingStatus');
   if(d.embeddingProvider && d.embeddingProvider!=='none'){
@@ -7355,55 +7757,108 @@ function getFilterParams(){
   if(dt) p.set('dateTo',dt);
   const sort=document.getElementById('filterSort').value;
   if(sort==='oldest') p.set('sort','oldest');
+  const scope=memorySearchScope||'local';
+  if(scope==='local'){
+    p.set('owner',_currentAgentOwner);
+  }else if(scope==='allLocal'){
   const owner=document.getElementById('filterOwner').value;
   if(owner) p.set('owner',owner);
+  }
   return p;
 }
 
-async function loadMemories(page){
+/** 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');
-  list.innerHTML='<div class="spinner"></div>';
+  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);
     const r=await fetch('/api/memories?'+p.toString());
     const d=await r.json();
+    var items=d.memories||[];
+    if(silent){
+      var fp=JSON.stringify(items.map(function(m){return m.id+'|'+m.updated_at}));
+      if(fp===_lastMemoriesFingerprint) return;
+      _lastMemoriesFingerprint=fp;
+    }else{
+      _lastMemoriesFingerprint=JSON.stringify(items.map(function(m){return m.id+'|'+m.updated_at}));
+    }
     totalPages=d.totalPages||1;
     totalCount=d.total||0;
     document.getElementById('searchMeta').textContent=totalCount+t('search.meta.total');
-    renderMemories(d.memories||[]);
+    renderMemories(items);
     renderPagination();
   }catch(e){
+    if(!silent){
     list.innerHTML='';
     totalPages=1;totalCount=0;
+      _lastMemoriesFingerprint='';
     renderMemories([]);
     renderPagination();
+    }
   }
 }
 
-async function loadHubMemories(){
+async function loadHubMemories(silent){
   const list=document.getElementById('memoryList');
-  list.innerHTML='<div class="spinner"></div>';
+  if(!silent) list.innerHTML='<div class="spinner"></div>';
   try{
     const r=await fetch('/api/sharing/memories/list?limit='+PAGE_SIZE);
     const d=await r.json();
     const items=d.memories||[];
+    if(silent){
+      var fp=JSON.stringify(items.map(function(m){return m.id+'|'+(m.updated_at||m.created_at)}));
+      if(fp===_lastMemoriesFingerprint) return;
+      _lastMemoriesFingerprint=fp;
+    }else{
+      _lastMemoriesFingerprint=JSON.stringify(items.map(function(m){return m.id+'|'+(m.updated_at||m.created_at)}));
+    }
+    totalPages=1;totalCount=items.length;currentPage=1;
     document.getElementById('searchMeta').textContent=items.length+t('search.meta.total');
     document.getElementById('sharingSearchMeta').textContent='';
     renderMemories(items);
     document.getElementById('pagination').innerHTML='';
   }catch(e){
+    if(!silent){
+      _lastMemoriesFingerprint='';
     document.getElementById('searchMeta').textContent='0'+t('search.meta.results');
     renderMemories([]);
     document.getElementById('pagination').innerHTML='';
+    }
   }
 }
 
 async function doSearch(query){
   query=(query||'').trim();
-  if(!query){loadMemories();return;}
+  if(!query){
+    currentPage=1;
+    if(memorySearchScope==='hub') loadHubMemories();
+    else loadMemories();
+    return;
+  }
+  currentPage=1;
   var scope=document.getElementById('memorySearchScope')?.value||memorySearchScope||'local';
   var list=document.getElementById('memoryList');
   list.innerHTML='<div class="spinner"></div>';
@@ -7415,6 +7870,7 @@ async function doSearch(query){
         body:JSON.stringify({query:query,scope:scope,maxResults:20,role:activeRole||undefined})
       });
       var data=await r.json();
+      totalPages=1;totalCount=(data.results||[]).length;
       renderSharingMemorySearchResults(data,query);
     }catch(e){
       document.getElementById('searchMeta').textContent='0'+t('search.meta.results');
@@ -7429,6 +7885,7 @@ async function doSearch(query){
       var r=await fetch('/api/search?'+p.toString());
       var d=await r.json();
       var total=d.total||0;
+      totalPages=1;totalCount=total;
       var meta=[];
       if(d.vectorCount>0) meta.push(d.vectorCount+t('search.meta.semantic'));
       if(d.ftsCount>0) meta.push(d.ftsCount+t('search.meta.text'));
@@ -7509,7 +7966,7 @@ function renderMemories(items){
     const mergeBadge=mc>0?'<span class="merge-badge">\\u{1F504} '+t('card.evolved')+' '+mc+t('card.times')+'</span>':'';
     const updatedAt=(m.updated_at&&m.updated_at>m.created_at)?'<span class="card-updated">'+t('card.updated')+' '+new Date(m.updated_at).toLocaleString(dateLoc())+'</span>':'';
     const ds=m.dedup_status||'active';
-    const isInactive=ds==='merged';
+    const isInactive=ds==='merged'||ds==='duplicate';
     const dedupBadge=ds==='duplicate'?'<span class="dedup-badge duplicate">'+t('card.dedupDuplicate')+'</span>':ds==='merged'?'<span class="dedup-badge merged">'+t('card.dedupMerged')+'</span>':'';
     const isImported=sid.startsWith('openclaw-import-')||sid.startsWith('openclaw-session-');
     const importBadge=isImported?'<span class="import-badge">\u{1F990} '+t('card.imported')+'</span>':'';
@@ -7517,8 +7974,9 @@ function renderMemories(items){
     const isPublicMem=ownerVal==='public';
     const localManaged=!!m.localSharingManaged;
     const memShared=m.sharingVisibility||null;
+    const isHubScope=memorySearchScope==='hub';
     const memScope=memShared?'team':isPublicMem?'local':'private';
-    const memScopeBadge=renderScopeBadge(memScope);
+    const memScopeBadge=isHubScope?renderScopeBadge('team'):renderScopeBadge(memScope);
     let dedupInfo='';
     if(ds==='duplicate'||ds==='merged'){
       const reason=m.dedup_reason?'<span style="font-size:11px;color:var(--text-muted)">'+t('card.dedupReason')+esc(m.dedup_reason)+'</span>':'';
@@ -7622,7 +8080,8 @@ function renderPagination(){
 function goPage(p){
   if(p<1||p>totalPages||p===currentPage) return;
   currentPage=p;
-  loadMemories();
+  if(memorySearchScope==='hub') loadHubMemories();
+  else loadMemories();
   document.getElementById('memoryList').scrollIntoView({behavior:'smooth',block:'start'});
 }
 
@@ -7702,6 +8161,11 @@ function esc(s){
   if(!s)return'';
   return s.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;');
 }
+function fmtOwner(item){
+  var name=item.ownerName||item.sourceUserId||'unknown';
+  if(item.ownerStatus==='removed') return esc(name)+' <span style="color:#ef4444;font-size:0.9em">'+t('sharing.ownerRemoved')+'</span>';
+  return esc(name);
+}
 
 function renderSummaryHtml(raw){
   if(!raw)return'';
@@ -8428,18 +8892,25 @@ function confirmModal(message,opts){
     _confirmResolve=resolve;
     var overlay=document.getElementById('confirmOverlay');
     document.getElementById('confirmTitle').textContent=opts.title||t('confirm.title')||'\u786E\u8BA4';
-    document.getElementById('confirmBody').textContent=message||'';
+    document.getElementById('confirmBody').innerText=message||'';
     var okBtn=document.getElementById('confirmOkBtn');
     okBtn.textContent=opts.okText||t('confirm.ok')||'\u786E\u5B9A';
     okBtn.className='btn-confirm-ok'+(opts.danger?' danger':'');
-    document.getElementById('confirmCancelBtn').textContent=opts.cancelText||t('confirm.cancel')||'\u53D6\u6D88';
+    var cancelBtn=document.getElementById('confirmCancelBtn');
+    cancelBtn.textContent=opts.cancelText||t('confirm.cancel')||'\u53D6\u6D88';
+    cancelBtn.style.display=opts.hideCancel?'none':'';
     overlay.classList.add('show');
   });
 }
 function confirmModalClose(result){
   document.getElementById('confirmOverlay').classList.remove('show');
+  document.getElementById('confirmCancelBtn').style.display='';
   if(_confirmResolve){var r=_confirmResolve;_confirmResolve=null;r(result);}
 }
+function alertModal(message,opts){
+  opts=opts||{};
+  return confirmModal(message,Object.assign({},opts,{hideCancel:true,okText:opts.okText||t('confirm.ok')||'\u77E5\u9053\u4E86'}));
+}
 
 /* ─── Theme ─── */
 const VIEWER_THEME_KEY='memos-viewer-theme';
@@ -8462,14 +8933,35 @@ function showRestartOverlay(msg){
 /* ─── Update check ─── */
 function waitForGatewayAndReload(maxAttempts,attempt){
   attempt=attempt||0;
+  var phase=arguments.length>2?arguments[2]:'waitDown';
+  var MAX_WAIT_DOWN=8;
   function forceReload(){window.location.href=window.location.pathname+'?_t='+Date.now();}
   if(attempt>=maxAttempts){forceReload();return;}
+  var delay=phase==='waitDown'?1500:2500;
   setTimeout(function(){
     fetch('/api/auth/status').then(function(r){
-      if(r.ok||r.status===401||r.status===403) forceReload();
-      else waitForGatewayAndReload(maxAttempts,attempt+1);
-    }).catch(function(){waitForGatewayAndReload(maxAttempts,attempt+1);});
-  },3000);
+      if(phase==='waitDown'){
+        if(r.ok||r.status===401||r.status===403){
+          if(attempt>=MAX_WAIT_DOWN){
+            forceReload();
+          }else{
+            waitForGatewayAndReload(maxAttempts,attempt+1,'waitDown');
+          }
+        }else{
+          waitForGatewayAndReload(maxAttempts,0,'waitUp');
+        }
+      }else{
+        if(r.ok||r.status===401||r.status===403) forceReload();
+        else waitForGatewayAndReload(maxAttempts,attempt+1,'waitUp');
+      }
+    }).catch(function(){
+      if(phase==='waitDown'){
+        waitForGatewayAndReload(maxAttempts,0,'waitUp');
+      }else{
+        waitForGatewayAndReload(maxAttempts,attempt+1,'waitUp');
+      }
+    });
+  },delay);
 }
 function doUpdateInstall(packageSpec,btnEl,statusEl){
   btnEl.disabled=true;
@@ -8503,9 +8995,12 @@ async function checkForUpdate(){
     const d=await r.json();
     if(!d.updateAvailable)return;
     const pkgSpec=d.installCommand?d.installCommand.replace(/^(?:npx\s+)?openclaw\s+plugins\s+install\s+/,''):(d.packageName+'@'+d.latest);
+    var bannerWrap=document.createElement('div');
+    bannerWrap.id='updateBannerWrap';
+    bannerWrap.style.cssText='background:linear-gradient(135deg,rgba(99,102,241,.08),rgba(139,92,246,.06));border-bottom:1px solid rgba(99,102,241,.18);backdrop-filter:blur(8px);animation:slideIn .3s ease';
     var banner=document.createElement('div');
     banner.id='updateBanner';
-    banner.style.cssText='display:flex;align-items:center;gap:12px;padding:10px 32px;max-width:1400px;margin:0 auto;width:100%;font-size:13px;font-weight:500;box-sizing:border-box;animation:slideIn .3s ease;background:linear-gradient(135deg,rgba(99,102,241,.08),rgba(139,92,246,.06));color:var(--pri);border-bottom:1px solid rgba(99,102,241,.18);backdrop-filter:blur(8px)';
+    banner.style.cssText='display:flex;align-items:center;gap:12px;padding:10px 32px;width:100%;max-width:1400px;margin:0 auto;font-size:13px;font-weight:500;box-sizing:border-box;color:var(--pri)';
     var textNode=document.createElement('div');
     textNode.style.cssText='display:flex;align-items:center;gap:8px;flex-shrink:0;font-size:13px';
     textNode.innerHTML='<span style="font-size:15px">\u2728</span> '+t('update.available')+' <span style="padding:2px 8px;border-radius:6px;background:rgba(99,102,241,.1);font-size:12px;font-weight:600">v'+esc(d.current)+'</span> <span style="opacity:.5">\u2192</span> <span style="padding:2px 8px;border-radius:6px;background:rgba(52,211,153,.12);color:var(--green);font-size:12px;font-weight:600">v'+esc(d.latest)+'</span>';
@@ -8525,20 +9020,32 @@ async function checkForUpdate(){
     btnClose.innerHTML='&times;';
     btnClose.onmouseenter=function(){this.style.opacity='1'};
     btnClose.onmouseleave=function(){this.style.opacity='.5'};
-    btnClose.onclick=function(){banner.remove()};
+    btnClose.onclick=function(){bannerWrap.remove()};
+    var spacerL=document.createElement('div');
+    spacerL.style.cssText='flex:1';
+    banner.appendChild(spacerL);
     banner.appendChild(textNode);
     banner.appendChild(statusDiv);
     banner.appendChild(spacer);
     banner.appendChild(btnClose);
+    bannerWrap.appendChild(banner);
     var tb=document.querySelector('.topbar');
-    if(tb&&tb.parentNode){tb.parentNode.insertBefore(banner,tb);}
-    else{document.body.insertBefore(banner,document.body.firstChild);}
+    if(tb&&tb.parentNode){tb.parentNode.insertBefore(bannerWrap,tb);}
+    else{document.body.insertBefore(bannerWrap,document.body.firstChild);}
   }catch(e){}
 }
 
 /* ─── 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='';loadMemories()}});
+document.getElementById('searchInput').addEventListener('keydown',e=>{if(e.key==='Escape'){e.target.value='';currentPage=1;if(memorySearchScope==='hub')loadHubMemories();else loadMemories();}});
 applyI18n();
 checkAuth();
 </script>