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

package/src/viewer/html.ts

@@ -221,13 +221,71 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .admin-tab.active .at-count{background: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:14px 16px;background:var(--bg-card);margin-bottom:10px;transition:all .2s;position:relative;overflow:hidden}
+.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-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-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)}
+.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}
-.admin-card-actions{display:flex;gap:8px;margin-top:10px}
+.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}
+.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.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}
+.admin-card-tag.tag-status{background:rgba(6,182,212,.1);color:#06b6d4}
+.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-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}
+@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-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-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))}
+.admin-card-detail-content{font-size:13px;line-height:1.75;color:var(--text-sec);white-space:pre-wrap;word-break:break-all;max-height:400px;overflow-y:auto;padding:16px 20px;background:var(--bg-card);border-radius:10px;border:1px solid var(--border);scrollbar-width:thin;scrollbar-color:rgba(99,102,241,.2) transparent}
+.admin-card-detail-content::-webkit-scrollbar{width:5px}
+.admin-card-detail-content::-webkit-scrollbar-thumb{background:rgba(99,102,241,.2);border-radius:4px}
+.admin-card-detail-content::-webkit-scrollbar-track{background:transparent}
+.admin-task-meta .meta-item .task-status-badge{border:none;padding:0;font-size:11px}
+.admin-task-summary-body{font-size:13.5px;line-height:1.8;color:var(--text);padding:16px 20px;background:var(--bg-card);border-radius:10px;border:1px solid var(--border)}
+.admin-task-summary-body .summary-section-title{font-size:12px;font-weight:700;color:var(--pri);margin:16px 0 6px;padding-bottom:5px;border-bottom:1px dashed var(--border)}
+.admin-task-summary-body .summary-section-title:first-child{margin-top:0}
+.admin-task-summary-body ul{margin:6px 0 12px;padding-left:18px}
+.admin-task-summary-body li{margin:4px 0;color:var(--text-sec);line-height:1.7;font-size:13px}
+.admin-task-summary-body p{margin:6px 0;font-size:13px;line-height:1.7}
+.admin-task-chunks{display:flex;flex-direction:column;gap:0;padding:0;border:1px solid var(--border);border-radius:10px;overflow:hidden;background:var(--bg-card)}
+.adm-msg{display:flex;gap:0;border-bottom:1px solid var(--border)}
+.adm-msg:last-child{border-bottom:none}
+.adm-msg-side{width:144px;flex-shrink:0;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:4px;padding:12px 10px;border-right:1px solid var(--border)}
+.adm-msg-side.user{background:rgba(99,102,241,.04)}
+.adm-msg-side.assistant{background:rgba(52,211,153,.04)}
+.adm-msg-role{font-size:10px;font-weight:700;letter-spacing:.03em;text-transform:uppercase}
+.adm-msg-side.user .adm-msg-role{color:var(--pri)}
+.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-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}
+.admin-card-clickable{cursor:pointer}
+.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)}
@@ -240,6 +298,19 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 [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%)}
+.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}
+@keyframes confirmIn{from{opacity:0;transform:scale(.95) translateY(8px)}to{opacity:1;transform:scale(1) translateY(0)}}
+.confirm-panel-header{padding:20px 24px 0;font-size:15px;font-weight:700;color:var(--text)}
+.confirm-panel-body{padding:14px 24px 20px;font-size:13px;line-height:1.65;color:var(--text-sec);white-space:pre-wrap;word-break:break-word}
+.confirm-panel-footer{display:flex;justify-content:flex-end;gap:10px;padding:0 24px 20px}
+.confirm-panel-footer .btn-confirm-cancel{padding:8px 20px;border:1px solid var(--border);border-radius:10px;background:var(--bg);color:var(--text-sec);font-size:13px;font-weight:500;cursor:pointer;transition:all .15s;font-family:inherit}
+.confirm-panel-footer .btn-confirm-cancel:hover{background:var(--bg-card);border-color:var(--text-muted)}
+.confirm-panel-footer .btn-confirm-ok{padding:8px 20px;border:none;border-radius:10px;background:var(--pri);color:#fff;font-size:13px;font-weight:600;cursor:pointer;transition:all .15s;font-family:inherit}
+.confirm-panel-footer .btn-confirm-ok:hover{opacity:.9;box-shadow:0 2px 8px rgba(99,102,241,.3)}
+.confirm-panel-footer .btn-confirm-ok.danger{background:var(--rose)}
+.confirm-panel-footer .btn-confirm-ok.danger:hover{box-shadow:0 2px 8px rgba(244,63,94,.3)}
 .task-detail-actions{display:flex;align-items:center;gap:8px;flex-wrap:wrap}
 .shared-memory-overlay,.shared-memory-overlay.show{display:none}
 .shared-memory-overlay.show{display:flex;position:fixed;inset:0;align-items:center;justify-content:center;background:rgba(0,0,0,.55);z-index:1200;padding:24px}
@@ -270,6 +341,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .card-content.show{max-height:600px;overflow-y:auto}
 .card-content pre{white-space:pre-wrap;word-break:break-all;background:rgba(0,0,0,.25);padding:14px;border-radius:10px;font-size:12px;font-family:ui-monospace,monospace;margin-top:10px;border:1px solid var(--border);color:var(--text-sec)}
 .card-actions{display:flex;align-items:center;gap:8px;margin-top:14px}
+.card-actions-inline{display:inline-flex;align-items:center;gap:4px;margin-left:auto;flex-shrink:0}
 .vscore-badge{display:inline-flex;align-items:center;background:rgba(59,130,246,.15);color:#60a5fa;font-size:10px;font-weight:700;padding:4px 10px;border-radius:8px;margin-left:auto}
 .merge-badge{display:inline-flex;align-items:center;gap:4px;background:rgba(16,185,129,.12);color:#10b981;font-size:10px;font-weight:600;padding:3px 10px;border-radius:8px}
 .merge-history{margin-top:12px;padding:12px 14px;background:rgba(0,0,0,.15);border-radius:10px;border:1px solid var(--border);font-size:12px;line-height:1.7;color:var(--text-sec);max-height:200px;overflow-y:auto}
@@ -409,8 +481,36 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .toast.success{background:var(--green-bg);color:var(--green);border-color:rgba(16,185,129,.3)}
 .toast.error{background:var(--rose-bg);color:var(--rose);border-color:rgba(244,63,94,.3)}
 .toast.info{background:var(--pri-glow);color:var(--pri);border-color:rgba(99,102,241,.15)}
+.toast.warn{background:rgba(245,158,11,.1);color:#f59e0b;border-color:rgba(245,158,11,.3)}
 @keyframes slideIn{from{transform:translateX(100px);opacity:0}to{transform:translateX(0);opacity:1}}
 
+.notif-bell{position:relative;cursor:pointer;font-size:16px;padding:5px 7px;border-radius:8px;background:none;border:1px solid transparent;color:var(--text-sec);transition:all .2s}
+.notif-bell:hover{background:var(--bg-card-hover);color:var(--text)}
+.notif-bell .notif-badge{position:absolute;top:1px;right:1px;min-width:16px;height:16px;line-height:16px;text-align:center;font-size:10px;font-weight:700;color:#fff;background:var(--rose);border-radius:8px;padding:0 4px;display:none;pointer-events:none}
+.notif-bell .notif-badge.show{display:block;animation:notifPop .3s ease}
+@keyframes notifPop{0%{transform:scale(0)}60%{transform:scale(1.2)}100%{transform:scale(1)}}
+.notif-panel{position:absolute;top:calc(100% + 8px);right:0;width:380px;max-height:440px;background:var(--bg);border:1px solid var(--border);border-radius:var(--radius-lg);box-shadow:var(--shadow-lg);z-index:200;display:none;flex-direction:column;overflow:hidden;backdrop-filter:blur(16px)}
+.notif-panel.show{display:flex;animation:notifSlide .2s ease}
+@keyframes notifSlide{from{opacity:0;transform:translateY(-8px)}to{opacity:1;transform:translateY(0)}}
+.notif-panel-header{display:flex;align-items:center;justify-content:space-between;padding:12px 16px;border-bottom:1px solid var(--border);font-size:13px;font-weight:600;color:var(--text)}
+.notif-panel-header .notif-mark-all{font-size:11px;font-weight:500;color:var(--pri);cursor:pointer;background:none;border:none;padding:4px 8px;border-radius:6px;transition:background .15s}
+.notif-panel-header .notif-mark-all:hover{background:var(--pri-glow)}
+.notif-panel-body{overflow-y:auto;flex:1;max-height:380px}
+.notif-item{display:flex;gap:10px;padding:12px 16px;border-bottom:1px solid var(--border);cursor:pointer;transition:background .15s;align-items:flex-start}
+.notif-item:last-child{border-bottom:none}
+.notif-item:hover{background:var(--bg-card-hover)}
+.notif-item.unread{background:rgba(99,102,241,.04)}
+.notif-item-icon{font-size:18px;flex-shrink:0;width:28px;height:28px;display:flex;align-items:center;justify-content:center;border-radius:8px;background:rgba(244,63,94,.08)}
+.notif-item-body{flex:1;min-width:0}
+.notif-item-title{font-size:12px;color:var(--text-sec);margin-bottom:2px}
+.notif-item-name{font-size:13px;font-weight:600;color:var(--text);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.notif-item-time{font-size:11px;color:var(--text-muted);margin-top:2px}
+.notif-item-dot{flex-shrink:0;width:8px;height:8px;border-radius:50%;background:var(--pri);margin-top:6px;display:none}
+.notif-item.unread .notif-item-dot{display:block}
+.notif-empty{text-align:center;padding:32px 16px;color:var(--text-muted);font-size:13px}
+[data-theme="light"] .notif-panel{background:rgba(255,255,255,.96)}
+[data-theme="light"] .notif-item.unread{background:rgba(99,102,241,.06)}
+
 .empty{text-align:center;padding:64px 20px;color:var(--text-sec)}
 .empty .icon{font-size:52px;margin-bottom:16px;opacity:.5}
 .empty p{font-size:15px;font-weight:500}
@@ -484,28 +584,35 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .task-detail-summary .summary-section-title:first-child{margin-top:0}
 .task-detail-summary ul{margin:4px 0 8px 0;padding-left:20px}
 .task-detail-summary li{margin:3px 0;color:var(--text-sec);line-height:1.6}
-.task-detail-chunks-title{font-size:12px;font-weight:700;color:var(--text-muted);text-transform:uppercase;letter-spacing:.06em;margin-bottom:12px}
-.task-detail-chunks{display:flex;flex-direction:column;gap:14px;padding:8px 0}
-.task-chunk-item{display:flex;flex-direction:column;max-width:82%;font-size:13px;line-height:1.6}
-.task-chunk-item.role-user{align-self:flex-end;align-items:flex-end}
-.task-chunk-item.role-assistant,.task-chunk-item.role-tool{align-self:flex-start;align-items:flex-start}
-.task-chunk-role{font-size:10px;font-weight:600;text-transform:uppercase;letter-spacing:.05em;margin-bottom:3px;padding:0 4px}
+.task-detail-chunks-title{font-size:12px;font-weight:700;color:var(--text-muted);text-transform:uppercase;letter-spacing:.06em;margin-bottom:12px;display:flex;align-items:center;gap:8px}
+.task-detail-chunks-title::before{content:'';width:3px;height:14px;border-radius:2px;background:linear-gradient(180deg,var(--pri),rgba(99,102,241,.3))}
+.task-detail-chunks{display:flex;flex-direction:column;gap:12px;padding:8px 0}
+.task-chunk-item{display:flex;gap:12px;align-items:flex-start;width:100%;font-size:13px;line-height:1.6}
+.task-chunk-item.role-user{flex-direction:row-reverse}
+.task-chunk-avatar{width:32px;height:32px;border-radius:10px;display:flex;align-items:center;justify-content:center;font-size:14px;flex-shrink:0;font-weight:700}
+.role-user .task-chunk-avatar{background:linear-gradient(135deg,var(--pri),var(--pri-dark));color:#fff}
+.role-assistant .task-chunk-avatar{background:linear-gradient(135deg,var(--green),#059669);color:#fff}
+.role-tool .task-chunk-avatar{background:linear-gradient(135deg,var(--amber),#d97706);color:#fff}
+.task-chunk-body{flex:1;min-width:0;max-width:85%}
+.task-chunk-header{display:flex;align-items:center;gap:8px;margin-bottom:4px}
+.role-user .task-chunk-header{flex-direction:row-reverse}
+.task-chunk-role{font-size:11px;font-weight:700;letter-spacing:.02em}
 .task-chunk-role.user{color:var(--pri)}
 .task-chunk-role.assistant{color:var(--green)}
 .task-chunk-role.tool{color:var(--amber)}
-.task-chunk-bubble{padding:12px 16px;border-radius:16px;white-space:pre-wrap;word-break:break-word;max-height:none;overflow:hidden;position:relative;transition:all .2s}
+.task-chunk-time{font-size:10px;color:var(--text-muted)}
+.task-chunk-bubble{padding:14px 18px;border-radius:12px;white-space:pre-wrap;word-break:break-word;max-height:none;overflow:hidden;position:relative;transition:all .2s}
 .task-chunk-bubble.collapsed{max-height:200px}
-.task-chunk-expand{display:none;align-items:center;justify-content:center;gap:4px;margin-top:4px;padding:4px 12px;font-size:12px;font-weight:600;color:var(--text-sec);cursor:pointer;user-select:none;border-radius:8px;transition:all .15s}
+.task-chunk-expand{display:none;align-items:center;justify-content:center;gap:4px;margin-top:6px;padding:4px 12px;font-size:12px;font-weight:600;color:var(--text-sec);cursor:pointer;user-select:none;border-radius:8px;transition:all .15s}
 .task-chunk-expand:hover{color:var(--pri);background:rgba(99,102,241,.08)}
 .task-chunk-expand .expand-arrow{display:inline-block;font-size:10px;transition:transform .2s}
 .task-chunk-expand.is-expanded .expand-arrow{transform:rotate(180deg)}
-.role-user .task-chunk-bubble{background:var(--pri);color:#000;border-bottom-right-radius:4px}
-.role-assistant .task-chunk-bubble{background:var(--bg-card);border:1px solid var(--border);color:var(--text-sec);border-bottom-left-radius:4px}
-.role-tool .task-chunk-bubble{background:rgba(245,158,11,.08);border:1px solid rgba(245,158,11,.2);color:var(--text-sec);border-bottom-left-radius:4px;font-family:'SF Mono',Monaco,Consolas,monospace;font-size:12px}
-.task-chunk-bubble:hover{filter:brightness(1.05)}
-.task-chunk-time{font-size:10px;color:var(--text-muted);margin-top:3px;padding:0 4px}
-[data-theme="light"] .role-user .task-chunk-bubble{background:var(--pri);color:#fff}
-[data-theme="light"] .role-assistant .task-chunk-bubble{background:#f0f0f0;border:none;color:#333}
+.role-user .task-chunk-bubble{background:linear-gradient(135deg,rgba(99,102,241,.12),rgba(99,102,241,.06));border:1px solid rgba(99,102,241,.2);color:var(--text);border-radius:12px 12px 4px 12px}
+.role-assistant .task-chunk-bubble{background:var(--bg-card);border:1px solid var(--border);color:var(--text-sec);border-radius:12px 12px 12px 4px}
+.role-tool .task-chunk-bubble{background:rgba(245,158,11,.06);border:1px solid rgba(245,158,11,.15);color:var(--text-sec);border-radius:12px 12px 12px 4px;font-family:'SF Mono',Monaco,Consolas,monospace;font-size:12px}
+.task-chunk-bubble:hover{border-color:rgba(99,102,241,.3);box-shadow:0 2px 8px rgba(0,0,0,.1)}
+[data-theme="light"] .role-user .task-chunk-bubble{background:linear-gradient(135deg,rgba(79,70,229,.08),rgba(79,70,229,.04));border-color:rgba(79,70,229,.15);color:#111827}
+[data-theme="light"] .role-assistant .task-chunk-bubble{background:#f8f9fb;border-color:#e2e4e9;color:#4b5563}
 [data-theme="light"] .task-detail-panel{background:#fff}
 [data-theme="light"] .task-card{background:#fff}
 [data-theme="light"] .tasks-stat{background:#fff}
@@ -521,7 +628,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
 .skill-card.archived::before{background:var(--text-muted)}
 .skill-card-top{display:flex;align-items:flex-start;justify-content:space-between;gap:12px;margin-bottom:6px}
 .skill-card-name{font-size:15px;font-weight:700;color:var(--text);flex:1}
-.skill-card-badges{display:flex;gap:6px;align-items:center}
+.task-card-badges,.skill-card-badges{display:flex;gap:6px;align-items:center}
 .skill-badge{font-size:10px;font-weight:700;text-transform:uppercase;letter-spacing:.05em;padding:3px 10px;border-radius:20px}
 .skill-badge.version{color:var(--violet);background:rgba(139,92,246,.15)}
 .skill-badge.installed{color:var(--green);background:var(--green-bg)}
@@ -1043,13 +1150,20 @@ input,textarea,select{font-family:inherit;font-size:inherit}
         <button class="tab" data-view="analytics" onclick="switchView('analytics')" data-i18n="tab.analytics">\u{1F4CA} Analytics</button>
         <button class="tab" data-view="logs" onclick="switchView('logs')" data-i18n="tab.logs">\u{1F4DD} Logs</button>
         <button class="tab" data-view="import" onclick="switchView('import')" data-i18n="tab.import">\u{1F4E5} Import</button>
-        <button class="tab" data-view="admin" onclick="switchView('admin')" data-i18n="tab.admin">\u{1F6E1} Admin</button>
+        <button class="tab" data-view="admin" onclick="switchView('admin')" data-i18n="tab.admin">\u{1F6E1} Admin<span id="adminPendingBadge" style="display:none;background:var(--rose);color:#fff;font-size:10px;font-weight:700;padding:1px 5px;border-radius:8px;margin-left:4px;vertical-align:top"></span></button>
         <button class="tab" data-view="settings" onclick="switchView('settings')" data-i18n="tab.settings">\u2699 Settings</button>
       </nav>
     </div>
     <div class="actions">
       <button class="btn btn-icon" onclick="toggleLang()" aria-label="Switch language" style="font-size:12px;font-weight:700;padding:4px 8px"><span data-i18n="lang.switch">EN</span></button>
       <button class="btn btn-icon theme-toggle" onclick="toggleViewerTheme()" title="Toggle light/dark" aria-label="Toggle theme"><span class="theme-icon-dark">\u{1F319}</span><span class="theme-icon-light">\u2600</span></button>
+      <div style="position:relative;display:inline-block" id="notifBellWrap">
+        <button class="notif-bell" onclick="toggleNotifPanel(event)" title="Notifications" aria-label="Notifications">\u{1F514}<span class="notif-badge" id="notifBadge"></span></button>
+        <div class="notif-panel" id="notifPanel">
+          <div class="notif-panel-header"><span data-i18n="notif.title">\u{1F514} Notifications</span><div style="display:flex;gap:6px"><button class="notif-mark-all" onclick="markAllNotifsRead()" data-i18n="notif.markAll">Mark all read</button><button class="notif-mark-all" onclick="clearAllNotifs()" style="color:var(--rose)" data-i18n="notif.clearAll">Clear all</button></div></div>
+          <div class="notif-panel-body" id="notifPanelBody"><div class="notif-empty" data-i18n="notif.empty">No notifications</div></div>
+        </div>
+      </div>
       <button class="btn btn-ghost btn-sm" onclick="loadAll()" data-i18n="refresh">\u21BB Refresh</button>
       <button class="btn btn-ghost btn-sm" onclick="doLogout()" data-i18n="logout">Logout</button>
     </div>
@@ -1086,7 +1200,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
         </select>
         <select id="memorySearchScope" class="filter-select" onchange="onMemoryScopeChange()">
           <option value="local" data-i18n="scope.local">Local</option>
-          <option value="all" data-i18n="scope.hub">Hub</option>
+          <option value="all" data-i18n="scope.hub">Team</option>
         </select>
       </div>
       <div class="search-meta" id="searchMeta"></div>
@@ -1130,7 +1244,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
           <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()">
             <option value="local" data-i18n="scope.local">Local</option>
-            <option value="all" data-i18n="scope.hub">Hub</option>
+            <option value="all" data-i18n="scope.hub">Team</option>
           </select>
           <button class="btn btn-sm btn-ghost" onclick="loadTasks()" style="margin-left:auto" data-i18n="refresh">\u21BB Refresh</button>
         </div>
@@ -1172,7 +1286,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
         <input type="text" id="skillSearchInput" placeholder="Search skills..." data-i18n-ph="skills.search.placeholder" oninput="debounceSkillSearch()">
         <select id="skillSearchScope" class="scope-select" onchange="onSkillScopeChange()">
           <option value="local" data-i18n="scope.local">Local</option>
-          <option value="all" data-i18n="scope.hub">Hub</option>
+          <option value="all" data-i18n="scope.hub">Team</option>
         </select>
       </div>
       <div class="search-meta" id="skillSearchMeta"></div>
@@ -1200,7 +1314,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
       </div>
       <div class="tasks-list" id="skillsList"><div class="spinner"></div></div>
       <div id="hubSkillsSection" style="display:none;margin-top:16px">
-        <div class="section-title" style="margin-bottom:12px" data-i18n="skills.hub.title">\u{1F310} Hub Skills</div>
+        <div class="section-title" style="margin-bottom:12px" data-i18n="skills.hub.title">\u{1F310} Team Skills</div>
         <div class="tasks-list" id="hubSkillsList"></div>
       </div>
     </div>
@@ -1209,6 +1323,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
         <div class="task-detail-header">
           <h2 id="skillDetailTitle"></h2>
           <div style="display:flex;gap:8px;align-items:center">
+            <span id="skillScopeBadge"></span>
             <button class="skill-vis-btn" id="skillVisibilityBtn" onclick="toggleSkillVisibility()"></button>
             <button class="skill-download-btn" id="skillDownloadBtn" onclick="downloadSkill()" data-i18n="skills.download">\u2B07 Download</button>
             <button class="btn btn-icon" onclick="closeSkillDetail()" title="Close">\u2715</button>
@@ -1216,7 +1331,6 @@ input,textarea,select{font-family:inherit;font-size:inherit}
         </div>
         <div class="task-detail-meta" id="skillDetailMeta"></div>
         <div class="skill-detail-desc" id="skillDetailDesc"></div>
-        <div id="skillShareActions" style="display:flex;gap:8px;align-items:center;flex-wrap:wrap;margin:8px 0"></div>
         <div class="task-detail-chunks-title" data-i18n="skills.files">Skill Files</div>
         <div class="skill-files-list" id="skillFilesList"></div>
         <div class="task-detail-chunks-title" id="skillContentTitle" data-i18n="skills.content">SKILL.md Content</div>
@@ -1250,10 +1364,18 @@ input,textarea,select{font-family:inherit;font-size:inherit}
       <div class="analytics-section" id="toolPerfSection" style="position:relative">
         <div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:20px">
           <h3 style="margin-bottom:0"><span class="icon">\u26A1</span> <span data-i18n="chart.toolperf">Tool Response Time</span> <span style="font-size:10px;color:var(--text-muted);font-weight:500;text-transform:none;letter-spacing:0;margin-left:4px">(per minute avg)</span></h3>
-          <div style="display:flex;gap:6px;align-items:center">
+          <div style="display:flex;gap:6px;align-items:center;flex-wrap:wrap">
             <button class="range-btn tool-range active" data-mins="60" onclick="setToolMinutes(60)">1h</button>
             <button class="range-btn tool-range" data-mins="360" onclick="setToolMinutes(360)">6h</button>
             <button class="range-btn tool-range" data-mins="1440" onclick="setToolMinutes(1440)">24h</button>
+            <button class="range-btn tool-range" data-mins="4320" onclick="setToolMinutes(4320)">3d</button>
+            <button class="range-btn tool-range" data-mins="10080" onclick="setToolMinutes(10080)">7d</button>
+            <button class="range-btn tool-range" data-mins="43200" onclick="setToolMinutes(43200)">30d</button>
+            <span style="color:var(--border);margin:0 2px">|</span>
+            <input type="datetime-local" id="toolRangeFrom" style="font-size:11px;padding:3px 6px;border:1px solid var(--border);border-radius:6px;background:var(--bg-card);color:var(--text)" title="From">
+            <span style="font-size:11px;color:var(--text-muted)">–</span>
+            <input type="datetime-local" id="toolRangeTo" style="font-size:11px;padding:3px 6px;border:1px solid var(--border);border-radius:6px;background:var(--bg-card);color:var(--text)" title="To">
+            <button class="range-btn" onclick="applyCustomToolRange()" data-i18n="chart.apply">Apply</button>
           </div>
         </div>
         <div id="toolChart" style="width:100%;height:280px;position:relative;overflow:hidden;border-radius:12px"></div>
@@ -1284,7 +1406,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
     <div class="settings-view" id="settingsView">
       <div class="settings-tabs-bar">
         <button class="settings-tab-btn active" data-tab="models" onclick="switchSettingsTab('models',this)"><span class="stab-dot"></span><span data-i18n="settings.models">AI Models</span></button>
-        <button class="settings-tab-btn" data-tab="hub" onclick="switchSettingsTab('hub',this)"><span class="stab-dot"></span><span data-i18n="settings.hub">Hub & Team</span></button>
+        <button class="settings-tab-btn" data-tab="hub" onclick="switchSettingsTab('hub',this)"><span class="stab-dot"></span><span data-i18n="settings.hub">Team Sharing</span></button>
         <button class="settings-tab-btn" data-tab="general" onclick="switchSettingsTab('general',this)"><span class="stab-dot"></span><span data-i18n="settings.general">General</span></button>
       </div>
       <div class="settings-cards-grid">
@@ -1336,7 +1458,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
             <div class="test-conn-row">
               <button class="btn btn-sm btn-ghost" onclick="testModel('embedding')" id="testEmbBtn" data-i18n="settings.test">Test Connection</button>
               <span class="test-result" id="testEmbResult"></span>
-            </div>
+        </div>
 
             <div class="settings-card-divider"></div>
 
@@ -1381,7 +1503,7 @@ input,textarea,select{font-family:inherit;font-size:inherit}
             <div class="test-conn-row">
               <button class="btn btn-sm btn-ghost" onclick="testModel('summarizer')" id="testSumBtn" data-i18n="settings.test">Test Connection</button>
               <span class="test-result" id="testSumResult"></span>
-            </div>
+        </div>
 
             <div class="settings-card-divider"></div>
 
@@ -1408,44 +1530,44 @@ input,textarea,select{font-family:inherit;font-size:inherit}
             </div>
             <div style="margin-top:14px">
               <div class="settings-card-subtitle" style="margin-bottom:4px" data-i18n="settings.skill.model">Skill Dedicated Model</div>
-              <div class="field-hint" style="margin-bottom:12px" data-i18n="settings.skill.model.hint">If not configured, the main Summarizer Model above will be used for skill generation. Configure a dedicated model here for higher quality skill output.</div>
-              <div class="settings-grid">
-                <div class="settings-field">
-                  <label data-i18n="settings.provider">Provider</label>
-                  <select id="cfgSkillProvider" onchange="onProviderChange('skill')">
-                    <option value="">\u2014 <span data-i18n="settings.skill.usemain">Use main summarizer</span> \u2014</option>
-                    <option value="openai_compatible">OpenAI Compatible</option>
-                    <option value="openai">OpenAI</option>
-                    <option value="siliconflow">SiliconFlow (\u7845\u57FA\u6D41\u52A8)</option>
-                    <option value="zhipu">Zhipu AI (\u667A\u8C31)</option>
-                    <option value="deepseek">DeepSeek</option>
-                    <option value="bailian">Alibaba Bailian (\u767E\u70BC)</option>
-                    <option value="moonshot">Moonshot (Kimi)</option>
-                    <option value="anthropic">Anthropic</option>
-                    <option value="gemini">Gemini</option>
-                    <option value="azure_openai">Azure OpenAI</option>
-                    <option value="bedrock">Bedrock</option>
-                    <option value="openclaw">OpenClaw Host</option>
-                  </select>
-                </div>
-                <div class="settings-field">
-                  <label data-i18n="settings.model">Model</label>
-                  <input type="text" id="cfgSkillModel" placeholder="e.g. claude-4.6-opus">
-                </div>
-                <div class="settings-field full-width">
-                  <label>Endpoint</label>
-                  <input type="text" id="cfgSkillEndpoint" placeholder="https://...">
-                </div>
-                <div class="settings-field">
-                  <label>API Key</label>
-                  <input type="password" id="cfgSkillApiKey" placeholder="\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022">
-                </div>
+            <div class="field-hint" style="margin-bottom:12px" data-i18n="settings.skill.model.hint">If not configured, the main Summarizer Model above will be used for skill generation. Configure a dedicated model here for higher quality skill output.</div>
+            <div class="settings-grid">
+              <div class="settings-field">
+                <label data-i18n="settings.provider">Provider</label>
+                <select id="cfgSkillProvider" onchange="onProviderChange('skill')">
+                  <option value="">\u2014 <span data-i18n="settings.skill.usemain">Use main summarizer</span> \u2014</option>
+                  <option value="openai_compatible">OpenAI Compatible</option>
+                  <option value="openai">OpenAI</option>
+                  <option value="siliconflow">SiliconFlow (\u7845\u57FA\u6D41\u52A8)</option>
+                  <option value="zhipu">Zhipu AI (\u667A\u8C31)</option>
+                  <option value="deepseek">DeepSeek</option>
+                  <option value="bailian">Alibaba Bailian (\u767E\u70BC)</option>
+                  <option value="moonshot">Moonshot (Kimi)</option>
+                  <option value="anthropic">Anthropic</option>
+                  <option value="gemini">Gemini</option>
+                  <option value="azure_openai">Azure OpenAI</option>
+                  <option value="bedrock">Bedrock</option>
+                  <option value="openclaw">OpenClaw Host</option>
+                </select>
               </div>
-              <div class="test-conn-row">
-                <button class="btn btn-sm btn-ghost" onclick="testModel('skill')" id="testSkillBtn" data-i18n="settings.test">Test Connection</button>
-                <span class="test-result" id="testSkillResult"></span>
+              <div class="settings-field">
+                <label data-i18n="settings.model">Model</label>
+                <input type="text" id="cfgSkillModel" placeholder="e.g. claude-4.6-opus">
+              </div>
+              <div class="settings-field full-width">
+                <label>Endpoint</label>
+                <input type="text" id="cfgSkillEndpoint" placeholder="https://...">
+              </div>
+              <div class="settings-field">
+                <label>API Key</label>
+                <input type="password" id="cfgSkillApiKey" placeholder="\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022">
               </div>
             </div>
+            <div class="test-conn-row">
+              <button class="btn btn-sm btn-ghost" onclick="testModel('skill')" id="testSkillBtn" data-i18n="settings.test">Test Connection</button>
+              <span class="test-result" id="testSkillResult"></span>
+            </div>
+            </div>
 
             <div class="settings-card-divider"></div>
             <div class="settings-actions">
@@ -1457,12 +1579,12 @@ input,textarea,select{font-family:inherit;font-size:inherit}
           </div>
         </div>
 
-        <!-- ══ Card: Hub & Team ══ -->
+        <!-- ══ Card: Team Sharing ══ -->
         <div class="settings-card card-hub" id="settingsSharingConfig" data-stab="hub">
           <div class="settings-card-header">
             <div class="settings-card-icon" style="background:rgba(6,182,212,.1);border-color:rgba(6,182,212,.15)">\u{1F310}</div>
             <div class="settings-card-title-wrap">
-              <div class="settings-card-title" data-i18n="settings.hub">Hub & Team</div>
+              <div class="settings-card-title" data-i18n="settings.hub">Team Sharing</div>
               <div class="settings-card-desc" data-i18n="settings.hub.desc">Share memories, tasks and skills with your team</div>
             </div>
           </div>
@@ -1478,11 +1600,11 @@ input,textarea,select{font-family:inherit;font-size:inherit}
                     <div class="team-guide-opt-icon" style="background:rgba(6,182,212,.1);border:1px solid rgba(6,182,212,.15)">\u{1F310}</div>
                     <div class="team-guide-opt-title" data-i18n="guide.join.title">Join a Remote Team</div>
                   </div>
-                  <div class="team-guide-opt-desc" data-i18n="guide.join.desc">Your team already has a Hub running? Join it to share memories, tasks and skills with team members.</div>
+                  <div class="team-guide-opt-desc" data-i18n="guide.join.desc">Your team already has a server running? Join it to share memories, tasks and skills with team members.</div>
                   <ol class="team-guide-steps">
-                    <li><span data-i18n="guide.join.s1">Ask your Hub admin for the Hub Address and Team Token</span></li>
+                    <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 Hub Address and Team Token, click "Test Connection"</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>
                   </ol>
                   <button class="btn-guide" onclick="guideGoToHub('client')" data-i18n="guide.join.btn">\u2192 Configure Client Mode</button>
@@ -1490,16 +1612,16 @@ input,textarea,select{font-family:inherit;font-size:inherit}
                 <div class="team-guide-opt">
                   <div class="team-guide-opt-header">
                     <div class="team-guide-opt-icon" style="background:rgba(139,92,246,.1);border:1px solid rgba(139,92,246,.15)">\u{1F5A5}\uFE0F</div>
-                    <div class="team-guide-opt-title" data-i18n="guide.hub.title">Start Your Own Hub</div>
+                    <div class="team-guide-opt-title" data-i18n="guide.hub.title">Start Your Own Team Server</div>
                   </div>
-                  <div class="team-guide-opt-desc" data-i18n="guide.hub.desc">Be the team server. Run a Hub on this device so others can connect and share memories with you.</div>
+                  <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 "Hub" mode</span></li>
+                    <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.s3">Share the Hub Address and Team Token with your team members</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>
-                  <button class="btn-guide" onclick="guideGoToHub('hub')" data-i18n="guide.hub.btn">\u2192 Configure Hub Mode</button>
+                  <button class="btn-guide" onclick="guideGoToHub('hub')" data-i18n="guide.hub.btn">\u2192 Configure Server Mode</button>
                 </div>
               </div>
             </div>
@@ -1510,26 +1632,26 @@ input,textarea,select{font-family:inherit;font-size:inherit}
                 <input type="checkbox" id="cfgSharingEnabled" onchange="onSharingToggle()">
                 <span class="toggle-slider"></span>
               </label>
-              <label data-i18n="settings.hub.enable.label">Enable Hub Sharing</label>
+              <label data-i18n="settings.hub.enable.label">Enable Team Sharing</label>
             </div>
 
             <div id="sharingConfigPanel" style="display:none">
               <div style="margin-bottom:14px">
                 <label style="font-size:11px;font-weight:600;color:var(--text-muted);text-transform:uppercase;letter-spacing:.04em;display:block;margin-bottom:6px" data-i18n="settings.hub.role">Role</label>
                 <div style="display:flex;gap:8px">
-                  <button class="btn btn-sm" id="btnRoleHub" onclick="selectSharingRole('hub')" data-i18n="settings.hub.role.hub">Hub (Server)</button>
-                  <button class="btn btn-sm" id="btnRoleClient" onclick="selectSharingRole('client')" data-i18n="settings.hub.role.client">Client (Connect to Hub)</button>
+                  <button class="btn btn-sm" id="btnRoleHub" onclick="selectSharingRole('hub')" data-i18n="settings.hub.role.hub">Server (Host a team)</button>
+                  <button class="btn btn-sm" id="btnRoleClient" onclick="selectSharingRole('client')" data-i18n="settings.hub.role.client">Client (Join a team)</button>
                 </div>
-                <div class="field-hint" style="margin-top:6px" data-i18n="settings.hub.role.hint">Hub: this device runs the central server. Client: connect to an existing Hub. The two modes are mutually exclusive.</div>
+                <div class="field-hint" style="margin-top:6px" data-i18n="settings.hub.role.hint">Server = host the team server; Client = join an existing team. These two modes are mutually exclusive.</div>
               </div>
 
               <div id="hubModeConfig" style="display:none">
                 <input type="hidden" id="cfgHubTeamToken" value="">
                 <div class="settings-grid">
                   <div class="settings-field">
-                    <label data-i18n="settings.hub.port">Hub Port</label>
+                    <label data-i18n="settings.hub.port">Server Port</label>
                     <input type="number" id="cfgHubPort" placeholder="18800" value="18800">
-                    <div class="field-hint" data-i18n="settings.hub.port.hint">Port for Hub service. Default: 18800</div>
+                    <div class="field-hint" data-i18n="settings.hub.port.hint">Port for team server. Default: 18800</div>
                   </div>
                   <div class="settings-field">
                     <label data-i18n="settings.hub.teamName">Team Name</label>
@@ -1549,20 +1671,20 @@ input,textarea,select{font-family:inherit;font-size:inherit}
               <div id="clientModeConfig" style="display:none">
                 <div style="background:rgba(99,102,241,.08);border:1px solid rgba(99,102,241,.2);border-radius:10px;padding:14px 18px;margin-bottom:14px;font-size:12px;line-height:1.7;color:var(--text-sec)">
                   <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 Hub admin for Hub Address and Team Token</span></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>
                 <div class="settings-grid">
                   <div class="settings-field full-width">
-                    <label data-i18n="settings.hub.hubAddress">Hub Address</label>
+                    <label data-i18n="settings.hub.hubAddress">Server Address</label>
                     <input type="text" id="cfgClientHubAddress" placeholder="e.g. 192.168.1.100:18800">
-                    <div class="field-hint" data-i18n="settings.hub.hubAddress.hint">Hub server address, e.g. 192.168.1.100:18800 or hub.example.com:18800</div>
+                    <div class="field-hint" data-i18n="settings.hub.hubAddress.hint">Team server address, e.g. 192.168.1.100:18800</div>
                   </div>
                   <div class="settings-field">
                     <label data-i18n="settings.hub.teamTokenClient">Team Token</label>
                     <input type="text" id="cfgClientTeamToken" placeholder="">
-                    <div class="field-hint" data-i18n="settings.hub.teamTokenClient.hint">Get this from your Hub admin to join the team</div>
+                    <div class="field-hint" data-i18n="settings.hub.teamTokenClient.hint">Get this from your team admin to join</div>
                   </div>
                   <input type="hidden" id="cfgClientUserToken" value="">
                 </div>
@@ -1574,13 +1696,12 @@ input,textarea,select{font-family:inherit;font-size:inherit}
             </div>
 
             <div id="sharingPanelsWrap" style="display:none">
-              <div class="settings-card-divider"></div>
-              <div id="sharingStatusPanel"></div>
-              <div id="sharingTeamPanel"></div>
-              <div id="sharingAdminPanel"></div>
+            <div class="settings-card-divider"></div>
+            <div id="sharingStatusPanel"></div>
+            <div id="sharingTeamPanel"></div>
+            <div id="sharingAdminPanel"></div>
             </div>
 
-            <div class="settings-card-divider"></div>
             <div class="settings-actions">
               <span class="settings-saved" id="hubSaved">\u2713 <span data-i18n="settings.saved">Saved</span></span>
               <button class="btn btn-ghost" onclick="loadConfig()" data-i18n="settings.reset">Reset</button>
@@ -1637,24 +1758,24 @@ input,textarea,select{font-family:inherit;font-size:inherit}
     <div class="admin-view" id="adminView">
       <div id="adminNotEnabled" style="display:none"></div>
       <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">Hub 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>
-          </div>
-          <div class="admin-header-sub" data-i18n="admin.subtitle">Manage team members, groups, and shared resources</div>
-          <div class="admin-stat-row" id="adminStats"></div>
-        </div>
-        <div class="admin-tabs" id="adminTabsBar">
-          <button class="admin-tab active" onclick="switchAdminTab('users',this)"><span class="at-icon">\u{1F465}</span> <span data-i18n="admin.tab.users">Users</span> <span class="at-count" id="adminTabCountUsers">0</span></button>
-          <button class="admin-tab" onclick="switchAdminTab('sharedMemories',this)"><span class="at-icon">\u{1F4AD}</span> <span data-i18n="admin.tab.sharedMemories">Shared Memories</span> <span class="at-count" id="adminTabCountMemories">0</span></button>
-          <button class="admin-tab" onclick="switchAdminTab('memories',this)"><span class="at-icon">\u{1F4CB}</span> <span data-i18n="admin.tab.memories">Shared Tasks</span> <span class="at-count" id="adminTabCountTasks">0</span></button>
-          <button class="admin-tab" onclick="switchAdminTab('skills',this)"><span class="at-icon">\u{1F9E0}</span> <span data-i18n="admin.tab.skills">Shared Skills</span> <span class="at-count" id="adminTabCountSkills">0</span></button>
+      <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>
         </div>
-        <div class="admin-panel active" id="adminUsersPanel"></div>
-        <div class="admin-panel" id="adminSharedMemoriesPanel"></div>
-        <div class="admin-panel" id="adminMemoriesPanel"></div>
-        <div class="admin-panel" id="adminSkillsPanel"></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>
+      </div>
+      <div class="admin-tabs" id="adminTabsBar">
+        <button class="admin-tab active" onclick="switchAdminTab('users',this)"><span class="at-icon">\u{1F465}</span> <span data-i18n="admin.tab.users">Users</span> <span class="at-count" id="adminTabCountUsers">0</span></button>
+          <button class="admin-tab" onclick="switchAdminTab('memories',this)"><span class="at-icon">\u{1F4AD}</span> <span data-i18n="admin.tab.memories">Shared Memories</span> <span class="at-count" id="adminTabCountMemories">0</span></button>
+          <button class="admin-tab" onclick="switchAdminTab('tasks',this)"><span class="at-icon">\u{1F4CB}</span> <span data-i18n="admin.tab.tasks">Shared Tasks</span> <span class="at-count" id="adminTabCountTasks">0</span></button>
+        <button class="admin-tab" onclick="switchAdminTab('skills',this)"><span class="at-icon">\u{1F9E0}</span> <span data-i18n="admin.tab.skills">Shared Skills</span> <span class="at-count" id="adminTabCountSkills">0</span></button>
+      </div>
+      <div class="admin-panel active" id="adminUsersPanel"></div>
+        <div class="admin-panel" id="adminTasksPanel"></div>
+      <div class="admin-panel" id="adminMemoriesPanel"></div>
+      <div class="admin-panel" id="adminSkillsPanel"></div>
       </div>
     </div>
 
@@ -1901,14 +2022,14 @@ const I18N={
     'skills.search.local':'Local',
     'skills.search.noresult':'No matching skills found',
     'skills.load.error':'Failed to load skills',
-    'skills.hub.title':'\u{1F310} Hub Skills',
+    'skills.hub.title':'\u{1F310} Team Skills',
     'scope.local':'Local',
     'scope.group':'Group',
     'scope.all':'All',
-    'skills.visibility.public':'Public',
-    'skills.visibility.private':'Private',
-    'skills.setPublic':'Set Public',
-    'skills.setPrivate':'Set Private',
+    'skills.visibility.public':'Shared Locally',
+    'skills.visibility.private':'This Agent Only',
+    'skills.setPublic':'Share Locally',
+    'skills.setPrivate':'This Agent Only',
     'tasks.total':'Total Tasks',
     'tasks.active':'Active',
     'tasks.completed':'Completed',
@@ -1925,6 +2046,17 @@ const I18N={
     'tasks.skipped.default':'This conversation was too brief to generate a summary. It will not appear in search results.',
     'refresh':'\\u21BB Refresh',
     'logout':'Logout',
+    'notif.title':'\\u{1F514} Notifications',
+    'notif.markAll':'Mark all read',
+    'notif.empty':'No notifications yet',
+    'notif.removed.memory':'Your shared memory was removed by admin',
+    'notif.removed.task':'Your shared task was removed by admin',
+    'notif.removed.skill':'Your shared skill was removed by admin',
+    'notif.clearAll':'Clear all',
+    'notif.timeAgo.just':'just now',
+    'notif.timeAgo.min':'{n}m ago',
+    'notif.timeAgo.hour':'{n}h ago',
+    'notif.timeAgo.day':'{n}d ago',
     'stat.memories':'Memories',
     'stat.sessions':'Sessions',
     'stat.embeddings':'Embeddings',
@@ -1979,6 +2111,8 @@ const I18N={
     'chart.nodata':'No data in this range',
     'chart.nocalls':'No viewer calls in this range',
     'chart.toolperf':'Tool Response Time',
+    'chart.apply':'Apply',
+    'chart.selectRange':'Please select a time range',
     'chart.list':'List',
     'chart.search':'Search',
     'modal.edit':'Edit Memory',
@@ -1994,11 +2128,14 @@ const I18N={
     'toast.deleted':'Memory deleted',
     'toast.opfail':'Operation failed',
     'toast.delfail':'Delete failed',
-    'toast.setPublic':'Set to public',
-    'toast.setPrivate':'Set to private',
+    'toast.setPublic':'Shared locally',
+    'toast.setPrivate':'Now visible to this agent only',
     'toast.cleared':'All memories cleared',
     'toast.clearfail':'Clear failed',
     'toast.notfound':'Memory not found in cache',
+    'confirm.title':'Confirm',
+    'confirm.ok':'Confirm',
+    'confirm.cancel':'Cancel',
     'confirm.delete':'Delete this memory?',
     'confirm.clearall':'Delete ALL memories? This cannot be undone.',
     'confirm.clearall2':'Are you absolutely sure?',
@@ -2174,16 +2311,16 @@ const I18N={
     'tasks.error.detail':'Failed to load task details',
     'tasks.untitled.related':'Untitled',
     'tab.admin':'\u{1F6E1} Admin',
-    'settings.hub':'Hub & Team',
-    'settings.hub.enable':'Enable Hub Sharing',
+    'settings.hub':'Team Sharing',
+    'settings.hub.enable':'Enable Team Sharing',
     'settings.hub.enable.hint':'When off, everything works locally as usual.',
-    'settings.hub.enable.label':'Enable Hub Sharing',
+    'settings.hub.enable.label':'Enable Team Sharing',
     'settings.hub.role':'Role',
-    'settings.hub.role.hub':'Hub (Server)',
-    'settings.hub.role.client':'Client (Connect to Hub)',
-    'settings.hub.role.hint':'Hub = run the server; Client = connect to one. These two modes are mutually exclusive.',
-    'settings.hub.port':'Hub Port',
-    'settings.hub.port.hint':'Port for Hub service. Default: 18800',
+    'settings.hub.role.hub':'Server (Host a team)',
+    'settings.hub.role.client':'Client (Join a team)',
+    'settings.hub.role.hint':'Server = host the team server; Client = join an existing team. These two modes are mutually exclusive.',
+    'settings.hub.port':'Server Port',
+    'settings.hub.port.hint':'Port for team server. Default: 18800',
     'settings.hub.teamName':'Team Name',
     'settings.hub.teamName.hint':'Display name for your team',
     'settings.hub.teamToken':'Team Token',
@@ -2192,23 +2329,23 @@ const I18N={
     '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.s3':'Share the Hub Address and Team Token below with your team members',
+    '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 Hub admin for Hub Address and Team Token',
+    '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.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':'Hub sharing config saved! Please restart the OpenClaw gateway for changes to take effect.\\n\\nRun: openclaw gateway stop && openclaw gateway start',
-    'settings.hub.hubAddress':'Hub Address',
-    'settings.hub.hubAddress.hint':'Hub server address, e.g. 192.168.1.100:18800',
+    '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.hubAddress':'Server Address',
+    'settings.hub.hubAddress.hint':'Team server address, e.g. 192.168.1.100:18800',
     'settings.hub.teamTokenClient':'Team Token',
-    'settings.hub.teamTokenClient.hint':'Get this from your Hub admin to join the team',
+    'settings.hub.teamTokenClient.hint':'Get this from your team admin to join',
     'settings.hub.userToken':'User Token',
     '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 Hub address first',
+    'settings.hub.test.noAddr':'Please enter server address first',
     'settings.hub.test.testing':'Testing...',
     'settings.hub.test.ok':'Connected successfully',
     'settings.hub.test.fail':'Connection failed',
@@ -2224,16 +2361,16 @@ const I18N={
     'sharing.sidebar.notConfigured':'Not configured',
     'sharing.sidebar.identity':'Identity:',
     'sharing.sidebar.admin':'Admin',
-    'sharing.sidebar.targetHub':'Target Hub:',
-    'sharing.pendingApproval.hint':'Your join request has been submitted. Please wait for the Hub admin to approve.',
-    'sharing.rejected.hint':'Your join request was rejected by the Hub admin. Please contact the admin or retry.',
+    '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.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.retryJoin.success':'Join request re-submitted. Waiting for admin approval.',
     'sharing.retryJoin.fail':'Failed to retry join',
-    'sharing.cannotJoinSelf':'Cannot join your own Hub. Please enter a remote Hub address.',
-    'scope.hub':'Hub',
+    'sharing.cannotJoinSelf':'Cannot join your own server. Please enter a remote server address.',
+    'scope.hub':'Team',
     'memory.detail.title':'Memory Detail',
     'memory.detail.loading':'Loading...',
     'memory.detail.notFound':'Memory not found',
@@ -2241,12 +2378,13 @@ const I18N={
     'memory.detail.created':'Created ',
     'memory.detail.updated':'Updated ',
     'memory.detail.viewTarget':'View target: ',
-    'admin.title':'Hub Admin Panel',
+    'admin.title':'Team Admin Panel',
     'admin.subtitle':'Manage team members and shared resources',
     'admin.refresh':'\u21BB Refresh',
     'admin.tab.users':'Users',
+    'admin.tab.tasks':'Shared Tasks',
     'admin.tab.groups':'Groups',
-    'admin.tab.memories':'Shared Tasks',
+    'admin.tab.memories':'Shared Memories',
     'admin.tab.skills':'Shared Skills',
     'admin.stat.activeUsers':'Active Users',
     'admin.stat.pending':'Pending',
@@ -2260,6 +2398,43 @@ const I18N={
     'admin.approve':'Approve',
     'admin.reject':'Reject',
     'admin.device':'Device: ',
+    'admin.joined':'Joined: ',
+    'admin.approved':'Approved: ',
+    'admin.lastActive':'Last Active: ',
+    'admin.ip':'IP: ',
+    'admin.contrib.memories':'Memories',
+    'admin.contrib.tasks':'Tasks',
+    'admin.contrib.skills':'Skills',
+    'admin.groups':'Groups: ',
+    'admin.neverActive':'Never',
+    'admin.promoteAdmin':'Promote to Admin',
+    'admin.demoteMember':'Demote to Member',
+    'admin.editName':'Edit Name',
+    'admin.lastAdminHint':'Last admin — cannot remove or demote',
+    '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?',
+    'toast.roleChanged':'Role updated',
+    'toast.roleChangeFail':'Role change failed',
+    'toast.usernameChanged':'Username updated',
+    'toast.renameFail':'Rename failed',
+    'toast.invalidUsername':'Username must be 2-32 characters',
+    'admin.filterAll':'All Users',
+    'admin.filterAllValues':'All',
+    'admin.filter.owner':'All Users',
+    'admin.filter.visibility':'Visibility',
+    'admin.filter.group':'Group',
+    'admin.search.placeholder':'Search...',
+    'admin.sort.newest':'Newest first',
+    'admin.sort.oldest':'Oldest first',
+    'admin.filter.role':'Role',
+    'admin.filter.status':'Status',
+    'admin.expand':'Expand',
+    'admin.collapse':'Collapse',
+    'admin.noContent':'No content',
+    'admin.summary':'Summary',
+    'admin.description':'Description',
+    'admin.contentLabel':'Content',
     'admin.groups':'Groups',
     'admin.newGroup':'+ New Group',
     'admin.groupName':'Group name',
@@ -2273,16 +2448,20 @@ const I18N={
     'admin.add':'Add',
     'admin.remove':'Remove',
     'admin.sharedTasks':'Shared Tasks',
-    'admin.noSharedTasks':'No shared tasks on Hub.',
+    'admin.noSharedTasks':'No shared tasks in team.',
     'admin.owner':'Owner: ',
     'admin.group':'Group: ',
+    'admin.kind':'Kind: ',
+    'admin.role':'Role: ',
+    'admin.visibility':'Visibility: ',
+    'admin.session':'Session',
+    'admin.content':'Content',
     'admin.chunks':'Chunks: ',
     'admin.updated':'Updated: ',
     'admin.sharedSkills':'Shared Skills',
-    'admin.noSharedSkills':'No shared skills on Hub.',
+    'admin.noSharedSkills':'No shared skills in team.',
     'admin.sharedMemories':'Shared Memories',
-    'admin.noSharedMemories':'No shared memories on Hub.',
-    'admin.tab.sharedMemories':'Shared Memories',
+    'admin.noSharedMemories':'No shared memories in team.',
     'admin.version':'v',
     'admin.quality':'Quality: ',
     'admin.membersCount':'Members ({n}):',
@@ -2291,6 +2470,7 @@ const I18N={
     'admin.noPermission':'You do not have admin permissions to access this panel.',
     'admin.groupsFailed':'Failed to load groups: ',
     'toast.userApproved':'User approved',
+    'sharing.approved.toast':'Your join request has been approved!',
     'toast.userRejected':'User rejected',
     'toast.approveFail':'Approve failed',
     'toast.rejectFail':'Reject failed',
@@ -2307,27 +2487,32 @@ const I18N={
     'toast.removeFail':'Remove failed',
     'toast.groupNameRequired':'Group name is required',
     'confirm.rejectUser':'Reject this user?',
+    'confirm.removeUser':'Remove this user from the team? This will revoke their access.',
+    'confirm.cleanResources':'Also delete all shared resources (tasks, skills, memories) from this user?',
+    'toast.userRemoved':'User removed',
+    'toast.removeFail':'Remove failed',
+    'admin.remove':'Remove',
     'confirm.removeGroupMember':'Remove this member from the group?',
     'confirm.removeMember':'Remove this member?',
     'confirm.deleteGroup':'Delete group "{name}"? Members will be removed.',
     'confirm.deleteGroupShort':'Delete group "{name}"?',
-    'confirm.removeTask':'Remove shared task "{name}" from Hub? This cannot be undone.',
-    'confirm.removeSkill':'Remove shared skill "{name}" from Hub? This cannot be undone.',
-    'confirm.removeMemory':'Remove shared memory "{name}" from Hub? This cannot be undone.',
+    'confirm.removeTask':'Remove shared task "{name}" from team? This cannot be undone.',
+    'confirm.removeSkill':'Remove shared skill "{name}" from team? This cannot be undone.',
+    'confirm.removeMemory':'Remove shared memory "{name}" from team? This cannot be undone.',
     'sharing.disabled':'Sharing disabled',
-    'sharing.disabled.hint':'Enable sharing in plugin config to connect a Hub.',
-    'sharing.hubAdmin':'Hub Admin',
+    'sharing.disabled.hint':'Enable sharing in settings to connect a team.',
+    'sharing.hubAdmin':'Team Admin',
     'sharing.client':'Client',
-    'sharing.hubMode':'Hub mode',
+    'sharing.hubMode':'Server mode',
     'sharing.hubMode.status':'Status: not connected to self',
-    'sharing.hubMode.hint':'Configure sharing.client with hubAddress and userToken pointing to this Hub to enable admin UI.',
+    'sharing.hubMode.hint':'Configure sharing.client with hubAddress and userToken pointing to this server to enable admin UI.',
     'sharing.clientConfigured':'Client configured',
     'sharing.clientDisconnected':'Status: disconnected',
-    'sharing.clientDisconnected.hint':'Viewer will keep showing local data; Hub actions may fail until the connection is restored.',
+    'sharing.clientDisconnected.hint':'Viewer will keep showing local data; team actions may fail until the connection is restored.',
     'sharing.clientNotConfigured':'Client not configured',
     'sharing.clientNotConfigured.hint':'Set hubAddress and userToken in sharing.client to enable team features.',
     'sharing.settingsDisabled':'Sharing is disabled.',
-    'sharing.settingsDisabled.hint':'Enable sharing in config to use Hub memory and skill collaboration.',
+    'sharing.settingsDisabled.hint':'Enable sharing in settings to use team memory and skill collaboration.',
     'sharing.noTeam':'No team connection.',
     'sharing.adminUnavailable':'Admin tools unavailable.',
     'sharing.adminEnabled':'Admin controls enabled',
@@ -2342,15 +2527,15 @@ const I18N={
     'sharing.username.taken':'Username already taken',
     'sharing.username.updated':'Username updated',
     'sharing.username.error':'Failed to update username',
-    'sharing.hubNotConfigured':'Hub is running but client connection is not configured.',
-    'sharing.hubNotConfigured.hint':'Add sharing.client.hubAddress and sharing.client.userToken pointing to this Hub to enable the admin interface.',
-    'sharing.notConnected':'Not connected to Hub.',
+    'sharing.hubNotConfigured':'Server is running but client connection is not configured.',
+    'sharing.hubNotConfigured.hint':'Add sharing.client.hubAddress and sharing.client.userToken pointing to this server to enable the admin interface.',
+    'sharing.notConnected':'Not connected to team server.',
     'sharing.role':'Role:',
     'sharing.mode':'Mode:',
-    'sharing.role.hub':'Server (hosting the Hub)',
-    'sharing.role.client':'Member (connected to Hub)',
+    'sharing.role.hub':'Server (hosting the team)',
+    'sharing.role.client':'Member (connected to team)',
     'sharing.clientConfiguredLabel':'Client configured:',
-    'sharing.configuredHub':'Configured Hub:',
+    'sharing.configuredHub':'Team Server:',
     'sharing.connected':'Connected:',
     'sharing.yes':'yes',
     'sharing.no':'no',
@@ -2361,9 +2546,9 @@ const I18N={
     'sharing.loadingGroups':'Loading groups...',
     'sharing.noGroupsYet':'No groups yet.',
     'search.localResults':'Local Results',
-    'search.hubResults':'Hub Results',
+    'search.hubResults':'Team Results',
     'search.noLocal':'No local results.',
-    'search.noHub':'No Hub results.',
+    'search.noHub':'No team results.',
     'search.viewDetail':'View Detail',
     'search.sharedMemory':'Shared Memory',
     'search.loadFailed':'Failed to load shared memory',
@@ -2371,20 +2556,48 @@ const I18N={
     'share.shareBtn':'Share',
     'share.updateBtn':'Update',
     'share.unshareBtn':'Unshare',
-    'toast.taskShared':'Task shared',
+    'share.hub.sharedBadge':'Shared to Team',
+    'share.hub.shareBtn':'Share to Team',
+    'share.hub.unshareBtn':'Remove from Team',
+    'share.status.thisAgent':'This Agent',
+    '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.current':'Current',
+    'share.scope.teamDisabled':'Not connected to team server',
+    'share.scope.teamIncludes':'Includes visibility to all local agents',
+    'share.scope.confirm':'Confirm',
+    'share.scope.cancel':'Cancel',
+    'share.scope.shrinkToLocal':'This will remove the content from team. Team members will no longer be able to find it. Continue?',
+    'share.scope.shrinkToPrivate':'This will remove the content from team and local sharing. Continue?',
+    'share.scope.shrinkLocalToPrivate':'This will stop sharing with other local agents. Continue?',
+    'share.scope.changed':'Sharing scope updated',
+    'share.scope.changeFail':'Failed to update sharing scope',
+    'share.scope.inactiveDisabled':'Merged/duplicate memories cannot be shared (not included in search results)',
+    'share.scope.taskNotCompleted':'Only completed tasks can be shared (active/skipped tasks are excluded)',
+    'share.scope.skillNotActive':'Only active skills can be shared (draft/archived skills are excluded)',
+    'skill.pullToLocal':'Pull to Local',
+    'toast.taskShared':'Task shared to team',
     'toast.taskShareFail':'Task share failed',
-    'toast.taskUnshared':'Task unshared',
+    'toast.taskUnshared':'Task removed from team',
     'toast.taskUnshareFail':'Task unshare failed',
-    'toast.memoryShared':'Memory shared',
+    'toast.memoryShared':'Memory shared to team',
     'toast.memoryShareFail':'Memory share failed',
-    'toast.memoryUnshared':'Memory unshared',
+    'toast.memoryUnshared':'Memory removed from team',
     'toast.memoryUnshareFail':'Memory unshare failed',
-    'toast.skillShared':'Skill shared',
+    'toast.skillShared':'Skill shared to team',
     'toast.skillShareFail':'Skill share failed',
-    'toast.skillUnshared':'Skill unshared',
+    'toast.skillUnshared':'Skill removed from team',
     'toast.skillUnshareFail':'Skill unshare failed',
     'share.memoryVisibilityPrompt':'Share visibility (public or group):',
-    'share.memoryUnshareConfirm':'Unshare this memory?',
+    'share.memoryUnshareConfirm':'Remove this memory from team?',
+    'share.memoryLocalUnshareConfirm':'Stop sharing this memory locally?',
+    'share.localUnshareConfirm':'Stop sharing locally?',
+    'share.teamUnshareConfirm':'Remove from team sharing?',
+    'share.local.originalOwnerMissing':'This shared memory has no recorded original owner, so it cannot be restored automatically.',
     'share.group':'Group',
     'share.public':'Public',
     'toast.skillPulled':'Skill pulled to local storage',
@@ -2415,35 +2628,35 @@ const I18N={
     'update.failed':'Update failed',
     'update.restarting':'Restarting service, page will refresh automatically...',
     'update.dismiss':'Dismiss',
-    'sharing.disable.confirm.hub':'You are about to shut down the Hub 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 Hub.\\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.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',
     '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 Hub sharing first.',
-    'admin.notEnabled.setupHub':'Set Up as Hub Server',
+    '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',
     'admin.notEnabled.joinTeam':'Join an Existing Team',
     'admin.notEnabled.hint':'If you have previously configured sharing, your data is still preserved. Re-enabling sharing will restore access to all shared content.',
-    'sharing.disconnected.hint':'Unable to reach the Hub server. The Hub may be offline or the network is unavailable.',
+    'sharing.disconnected.hint':'Unable to reach the team server. The server may be offline or the network is unavailable.',
     'sharing.retryConnection':'Retry Connection',
     'sharing.retryConnection.loading':'Connecting...',
     'sharing.retryConnection.success':'Connected successfully!',
-    'sharing.retryConnection.fail':'Still unable to connect. Check if the Hub is online.',
+    'sharing.retryConnection.fail':'Still unable to connect. Check if the team server is online.',
     'guide.title':'Get Started with Team Collaboration',
     'guide.subtitle':'MemOS supports team memory sharing. Choose one of the following options to enable collaboration, or continue using local-only mode.',
     'guide.join.title':'Join a Remote Team',
-    'guide.join.desc':'Your team already has a Hub running? Join it to share memories, tasks and skills with team members.',
-    'guide.join.s1':'Ask your Hub admin for the Hub Address and Team Token',
-    'guide.join.s2':'Go to Settings \u2192 Hub & Team, enable sharing, select "Client" mode',
-    'guide.join.s3':'Fill in Hub Address and Team Token, click "Test Connection"',
+    'guide.join.desc':'Your team already has a server running? Join it to share memories, tasks and skills with team members.',
+    '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.btn':'\u2192 Configure Client Mode',
-    'guide.hub.title':'Start Your Own Hub',
-    'guide.hub.desc':'Be the team server. Run a Hub on this device so others can connect and share memories with you.',
-    'guide.hub.s1':'Go to Settings \u2192 Hub & Team, enable sharing, select "Hub" 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.s3':'Share the Hub Address and Team Token with your team members',
+    '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 Hub Mode'
+    'guide.hub.btn':'\u2192 Configure Server Mode'
   },
   zh:{
     'title':'MemOS 记忆',
@@ -2490,14 +2703,14 @@ const I18N={
     'skills.search.local':'本地',
     'skills.search.noresult':'未找到匹配的技能',
     'skills.load.error':'加载技能失败',
-    'skills.hub.title':'\u{1F310} Hub 共享技能',
+    'skills.hub.title':'\u{1F310} 团队共享技能',
     'scope.local':'本地',
     'scope.group':'团队',
     'scope.all':'全部',
-    'skills.visibility.public':'公开',
-    'skills.visibility.private':'私有',
-    'skills.setPublic':'设为公开',
-    'skills.setPrivate':'设为私有',
+    'skills.visibility.public':'本机共享',
+    'skills.visibility.private':'仅本智能体',
+    'skills.setPublic':'共享给本机智能体',
+    'skills.setPrivate':'仅本智能体',
     'tasks.total':'任务总数',
     'tasks.active':'进行中',
     'tasks.completed':'已完成',
@@ -2514,6 +2727,17 @@ const I18N={
     'tasks.skipped.default':'对话内容过少，未生成摘要。该任务不会出现在检索结果中。',
     'refresh':'\\u21BB 刷新',
     'logout':'退出',
+    'notif.title':'\\u{1F514} 通知',
+    'notif.markAll':'全部已读',
+    'notif.empty':'暂无通知',
+    'notif.removed.memory':'你共享的记忆被管理员移除',
+    'notif.removed.task':'你共享的任务被管理员移除',
+    'notif.removed.skill':'你共享的技能被管理员移除',
+    'notif.clearAll':'清除全部',
+    'notif.timeAgo.just':'刚刚',
+    'notif.timeAgo.min':'{n}分钟前',
+    'notif.timeAgo.hour':'{n}小时前',
+    'notif.timeAgo.day':'{n}天前',
     'stat.memories':'记忆',
     'stat.sessions':'会话',
     'stat.embeddings':'嵌入',
@@ -2568,6 +2792,8 @@ const I18N={
     'chart.nodata':'此范围内暂无数据',
     'chart.nocalls':'此范围内暂无查看器调用',
     'chart.toolperf':'工具响应耗时',
+    'chart.apply':'应用',
+    'chart.selectRange':'请选择时间范围',
     'chart.list':'列表',
     'chart.search':'搜索',
     'modal.edit':'编辑记忆',
@@ -2583,11 +2809,14 @@ const I18N={
     'toast.deleted':'记忆已删除',
     'toast.opfail':'操作失败',
     'toast.delfail':'删除失败',
-    'toast.setPublic':'已设为公开',
-    'toast.setPrivate':'已设为私有',
+    'toast.setPublic':'已共享给本机智能体',
+    'toast.setPrivate':'现在仅本智能体可见',
     'toast.cleared':'所有记忆已清除',
     'toast.clearfail':'清除失败',
     'toast.notfound':'缓存中未找到此记忆',
+    'confirm.title':'确认',
+    'confirm.ok':'确定',
+    'confirm.cancel':'取消',
     'confirm.delete':'确定要删除这条记忆吗？',
     'confirm.clearall':'确定要删除所有记忆？此操作不可撤销。',
     'confirm.clearall2':'你真的确定吗？',
@@ -2763,16 +2992,16 @@ const I18N={
     'tasks.error.detail':'加载任务详情失败',
     'tasks.untitled.related':'未命名',
     'tab.admin':'\u{1F6E1} 管理',
-    'settings.hub':'Hub 与团队',
-    'settings.hub.enable':'启用 Hub 共享',
+    'settings.hub':'团队共享',
+    'settings.hub.enable':'启用团队共享',
     'settings.hub.enable.hint':'关闭时仅本地使用，不影响其他功能。',
-    'settings.hub.enable.label':'启用 Hub 共享',
+    'settings.hub.enable.label':'启用团队共享',
     'settings.hub.role':'角色',
-    'settings.hub.role.hub':'Hub（服务端）',
-    'settings.hub.role.client':'Client（连接到 Hub）',
-    'settings.hub.role.hint':'Hub = 本机做服务端；Client = 连接别人的服务端。两种模式互斥，不能同时使用。',
-    'settings.hub.port':'Hub 端口',
-    'settings.hub.port.hint':'Hub 服务端口，默认 18800',
+    'settings.hub.role.hub':'服务端（托管团队）',
+    'settings.hub.role.client':'客户端（加入团队）',
+    'settings.hub.role.hint':'服务端 = 本机托管团队；客户端 = 加入别人的团队。两种模式互斥，不能同时使用。',
+    'settings.hub.port':'服务端口',
+    'settings.hub.port.hint':'团队服务端口，默认 18800',
     'settings.hub.teamName':'团队名称',
     'settings.hub.teamName.hint':'你的团队显示名称',
     'settings.hub.teamToken':'团队令牌',
@@ -2781,23 +3010,23 @@ const I18N={
     'settings.hub.hubSteps.title':'快速配置（3 步）',
     'settings.hub.hubSteps.s1':'填写下方团队名称（或保持默认）',
     'settings.hub.hubSteps.s2':'点击"保存设置"，然后重启 OpenClaw 网关',
-    'settings.hub.hubSteps.s3':'将下方的 Hub 地址和团队令牌分享给团队成员',
+    'settings.hub.hubSteps.s3':'将下方的服务器地址和团队令牌分享给团队成员',
     'settings.hub.clientSteps.title':'快速配置（3 步）',
-    'settings.hub.clientSteps.s1':'向 Hub 管理员获取 Hub 地址和团队令牌',
+    'settings.hub.clientSteps.s1':'向团队管理员获取服务器地址和团队令牌',
     'settings.hub.clientSteps.s2':'填入下方，点击"测试连接"验证连通性',
     'settings.hub.clientSteps.s3':'点击「保存设置」，然后重启 OpenClaw 网关（页面会自动刷新）',
     'settings.hub.shareInfo.title':'请将以下信息分享给团队成员：',
     'settings.hub.shareInfo.yourIP':'你的IP',
     'settings.hub.shareInfo.clickCopy':'点击复制',
-    'settings.hub.restartAlert':'Hub 共享配置已保存！请重启 OpenClaw 网关使配置生效。\\n\\n执行命令：openclaw gateway stop && openclaw gateway start',
-    'settings.hub.hubAddress':'Hub 地址',
-    'settings.hub.hubAddress.hint':'Hub 服务器地址，如 192.168.1.100:18800',
+    'settings.hub.restartAlert':'团队共享配置已保存！请重启 OpenClaw 网关使配置生效。\\n\\n执行命令：openclaw gateway stop && openclaw gateway start',
+    'settings.hub.hubAddress':'服务器地址',
+    'settings.hub.hubAddress.hint':'团队服务器地址，如 192.168.1.100:18800',
     'settings.hub.teamTokenClient':'团队令牌',
-    'settings.hub.teamTokenClient.hint':'向 Hub 管理员获取此令牌以加入团队',
+    'settings.hub.teamTokenClient.hint':'向团队管理员获取此令牌以加入团队',
     'settings.hub.userToken':'用户令牌',
     'settings.hub.userToken.hint':'通常在加入团队后自动获取，无需手动填写。',
     'settings.hub.testConnection':'测试连接',
-    'settings.hub.test.noAddr':'请先输入 Hub 地址',
+    'settings.hub.test.noAddr':'请先输入服务器地址',
     'settings.hub.test.testing':'测试中...',
     'settings.hub.test.ok':'连接成功',
     'settings.hub.test.fail':'连接失败',
@@ -2813,16 +3042,16 @@ const I18N={
     'sharing.sidebar.notConfigured':'未配置',
     'sharing.sidebar.identity':'身份：',
     'sharing.sidebar.admin':'管理员',
-    'sharing.sidebar.targetHub':'目标 Hub：',
-    'sharing.pendingApproval.hint':'加入申请已提交，请等待 Hub 管理员审核通过。',
-    'sharing.rejected.hint':'您的加入申请已被 Hub 管理员拒绝，请联系管理员或重新申请。',
+    'sharing.sidebar.targetHub':'团队服务器：',
+    'sharing.pendingApproval.hint':'加入申请已提交，请等待团队管理员审核通过。',
+    'sharing.rejected.hint':'您的加入申请已被团队管理员拒绝，请联系管理员或重新申请。',
     'sharing.retryJoin':'重新申请',
     'sharing.retryJoin.hint':'清除本地连接数据并重新提交加入申请',
     'sharing.retryJoin.confirm':'这将清除当前连接数据并重新提交加入申请，是否继续？',
     'sharing.retryJoin.success':'加入申请已重新提交，请等待管理员审核。',
     'sharing.retryJoin.fail':'重新申请失败',
-    'sharing.cannotJoinSelf':'不能加入自己的 Hub，请输入远程 Hub 地址。',
-    'scope.hub':'Hub',
+    'sharing.cannotJoinSelf':'不能加入自己的服务端，请输入远程服务器地址。',
+    'scope.hub':'团队',
     'memory.detail.title':'记忆详情',
     'memory.detail.loading':'加载中...',
     'memory.detail.notFound':'未找到该记忆',
@@ -2830,12 +3059,13 @@ const I18N={
     'memory.detail.created':'创建于 ',
     'memory.detail.updated':'更新于 ',
     'memory.detail.viewTarget':'查看目标: ',
-    'admin.title':'Hub 管理面板',
+    'admin.title':'团队管理面板',
     'admin.subtitle':'管理团队成员和共享资源',
     'admin.refresh':'\u21BB 刷新',
     'admin.tab.users':'用户',
+    'admin.tab.tasks':'共享任务',
     'admin.tab.groups':'分组',
-    'admin.tab.memories':'共享任务',
+    'admin.tab.memories':'共享记忆',
     'admin.tab.skills':'共享技能',
     'admin.stat.activeUsers':'活跃用户',
     'admin.stat.pending':'待审核',
@@ -2849,6 +3079,43 @@ const I18N={
     'admin.approve':'批准',
     'admin.reject':'拒绝',
     'admin.device':'设备：',
+    'admin.joined':'加入：',
+    'admin.approved':'审批：',
+    'admin.lastActive':'最后活跃：',
+    'admin.ip':'IP：',
+    'admin.contrib.memories':'记忆',
+    'admin.contrib.tasks':'任务',
+    'admin.contrib.skills':'技能',
+    'admin.groups':'分组：',
+    'admin.neverActive':'从未',
+    'admin.promoteAdmin':'提升为管理员',
+    'admin.demoteMember':'降为成员',
+    'admin.editName':'编辑名称',
+    'admin.lastAdminHint':'唯一管理员 — 无法删除或降级',
+    'admin.editNamePrompt':'请输入新用户名：',
+    'confirm.promoteAdmin':'确定要将此用户提升为管理员吗？管理员可以管理所有团队成员和资源。',
+    'confirm.demoteMember':'确定要将此管理员降为普通成员吗？',
+    'toast.roleChanged':'角色已更新',
+    'toast.roleChangeFail':'角色更新失败',
+    'toast.usernameChanged':'用户名已更新',
+    'toast.renameFail':'重命名失败',
+    'toast.invalidUsername':'用户名长度需为 2-32 个字符',
+    'admin.filterAll':'全部用户',
+    'admin.filterAllValues':'全部',
+    'admin.filter.owner':'全部用户',
+    'admin.filter.visibility':'可见性',
+    'admin.filter.group':'团队',
+    'admin.search.placeholder':'搜索...',
+    'admin.sort.newest':'最新优先',
+    'admin.sort.oldest':'最早优先',
+    'admin.filter.role':'角色',
+    'admin.filter.status':'状态',
+    'admin.expand':'展开',
+    'admin.collapse':'收起',
+    'admin.noContent':'暂无内容',
+    'admin.summary':'摘要',
+    'admin.description':'描述',
+    'admin.contentLabel':'内容',
     'admin.groups':'分组',
     'admin.newGroup':'+ 新建分组',
     'admin.groupName':'分组名称',
@@ -2862,16 +3129,20 @@ const I18N={
     'admin.add':'添加',
     'admin.remove':'移除',
     'admin.sharedTasks':'共享任务',
-    'admin.noSharedTasks':'Hub 上暂无共享任务。',
+    'admin.noSharedTasks':'团队暂无共享任务。',
     'admin.owner':'归属：',
     'admin.group':'分组：',
+    'admin.kind':'类型：',
+    'admin.role':'角色：',
+    'admin.visibility':'可见性：',
+    'admin.session':'会话',
+    'admin.content':'内容',
     'admin.chunks':'记忆片段：',
     'admin.updated':'更新于：',
     'admin.sharedSkills':'共享技能',
-    'admin.noSharedSkills':'Hub 上暂无共享技能。',
+    'admin.noSharedSkills':'团队暂无共享技能。',
     'admin.sharedMemories':'共享记忆',
-    'admin.noSharedMemories':'Hub 上暂无共享记忆。',
-    'admin.tab.sharedMemories':'共享记忆',
+    'admin.noSharedMemories':'团队暂无共享记忆。',
     'admin.version':'v',
     'admin.quality':'质量：',
     'admin.membersCount':'成员（{n}）：',
@@ -2880,6 +3151,7 @@ const I18N={
     'admin.noPermission':'您没有管理员权限，无法访问此面板。',
     'admin.groupsFailed':'加载分组失败：',
     'toast.userApproved':'用户已批准',
+    'sharing.approved.toast':'您的加入申请已通过审核！',
     'toast.userRejected':'用户已拒绝',
     'toast.approveFail':'批准失败',
     'toast.rejectFail':'拒绝失败',
@@ -2896,27 +3168,32 @@ const I18N={
     'toast.removeFail':'移除失败',
     'toast.groupNameRequired':'请输入分组名称',
     'confirm.rejectUser':'确定要拒绝此用户吗？',
+    'confirm.removeUser':'确定要移除此用户吗？移除后该用户将无法访问团队资源。',
+    'confirm.cleanResources':'是否同时删除该用户共享的所有资源（任务、技能、记忆）？',
+    'toast.userRemoved':'用户已移除',
+    'toast.removeFail':'移除失败',
+    'admin.remove':'移除',
     'confirm.removeGroupMember':'确定要将此成员移出分组吗？',
     'confirm.removeMember':'确定要移除此成员吗？',
     'confirm.deleteGroup':'确定要删除分组「{name}」吗？成员将被移除。',
     'confirm.deleteGroupShort':'确定要删除分组「{name}」吗？',
-    'confirm.removeTask':'确定要从 Hub 移除共享任务「{name}」吗？此操作不可撤销。',
-    'confirm.removeSkill':'确定要从 Hub 移除共享技能「{name}」吗？此操作不可撤销。',
-    'confirm.removeMemory':'确定要从 Hub 移除共享记忆「{name}」吗？此操作不可撤销。',
+    'confirm.removeTask':'确定要从团队移除共享任务「{name}」吗？此操作不可撤销。',
+    'confirm.removeSkill':'确定要从团队移除共享技能「{name}」吗？此操作不可撤销。',
+    'confirm.removeMemory':'确定要从团队移除共享记忆「{name}」吗？此操作不可撤销。',
     'sharing.disabled':'共享已禁用',
-    'sharing.disabled.hint':'在插件配置中启用共享以连接 Hub。',
-    'sharing.hubAdmin':'Hub 管理员',
+    'sharing.disabled.hint':'在设置中启用共享以连接团队。',
+    'sharing.hubAdmin':'团队管理员',
     'sharing.client':'客户端',
-    'sharing.hubMode':'Hub 模式',
+    'sharing.hubMode':'服务端模式',
     'sharing.hubMode.status':'状态：未连接到自身',
-    'sharing.hubMode.hint':'配置 sharing.client 的 hubAddress 和 userToken 指向此 Hub 以启用管理界面。',
+    'sharing.hubMode.hint':'配置 sharing.client 的 hubAddress 和 userToken 指向此服务端以启用管理界面。',
     'sharing.clientConfigured':'客户端已配置',
     'sharing.clientDisconnected':'状态：已断开',
-    'sharing.clientDisconnected.hint':'查看器将继续显示本地数据；Hub 操作可能在连接恢复前失败。',
+    'sharing.clientDisconnected.hint':'查看器将继续显示本地数据；团队操作可能在连接恢复前失败。',
     'sharing.clientNotConfigured':'客户端未配置',
     'sharing.clientNotConfigured.hint':'设置 sharing.client 中的 hubAddress 和 userToken 以启用团队功能。',
     'sharing.settingsDisabled':'共享已禁用。',
-    'sharing.settingsDisabled.hint':'在配置中启用共享以使用 Hub 记忆和技能协作。',
+    'sharing.settingsDisabled.hint':'在设置中启用共享以使用团队记忆和技能协作。',
     'sharing.noTeam':'无团队连接。',
     'sharing.adminUnavailable':'管理工具不可用。',
     'sharing.adminEnabled':'管理控制已启用',
@@ -2931,15 +3208,15 @@ const I18N={
     'sharing.username.taken':'用户名已被占用',
     'sharing.username.updated':'用户名已更新',
     'sharing.username.error':'更新用户名失败',
-    'sharing.hubNotConfigured':'Hub 正在运行，但客户端连接未配置。',
-    'sharing.hubNotConfigured.hint':'添加 sharing.client.hubAddress 和 sharing.client.userToken 指向此 Hub 以启用管理界面。',
-    'sharing.notConnected':'未连接到 Hub。',
+    'sharing.hubNotConfigured':'服务端正在运行，但客户端连接未配置。',
+    'sharing.hubNotConfigured.hint':'添加 sharing.client.hubAddress 和 sharing.client.userToken 指向此服务端以启用管理界面。',
+    'sharing.notConnected':'未连接到团队服务器。',
     'sharing.role':'角色：',
     'sharing.mode':'身份：',
-    'sharing.role.hub':'服务端（Hub 主机）',
-    'sharing.role.client':'成员（连接到 Hub）',
+    'sharing.role.hub':'服务端（托管团队）',
+    'sharing.role.client':'成员（连接到团队）',
     'sharing.clientConfiguredLabel':'客户端已配置：',
-    'sharing.configuredHub':'配置的 Hub：',
+    'sharing.configuredHub':'团队服务器：',
     'sharing.connected':'已连接：',
     'sharing.yes':'是',
     'sharing.no':'否',
@@ -2950,9 +3227,9 @@ const I18N={
     'sharing.loadingGroups':'正在加载分组...',
     'sharing.noGroupsYet':'暂无分组。',
     'search.localResults':'本地结果',
-    'search.hubResults':'Hub 结果',
+    'search.hubResults':'团队结果',
     'search.noLocal':'无本地结果。',
-    'search.noHub':'无 Hub 结果。',
+    'search.noHub':'无团队结果。',
     'search.viewDetail':'查看详情',
     'search.sharedMemory':'共享记忆',
     'search.loadFailed':'加载共享记忆失败',
@@ -2960,20 +3237,48 @@ const I18N={
     'share.shareBtn':'共享',
     'share.updateBtn':'更新共享',
     'share.unshareBtn':'取消共享',
-    'toast.taskShared':'任务已共享',
+    'share.hub.sharedBadge':'已共享到团队',
+    'share.hub.shareBtn':'共享到团队',
+    'share.hub.unshareBtn':'从团队移除',
+    'share.status.thisAgent':'当前智能体',
+    'share.status.agents':'本机',
+    'share.status.hub':'团队',
+    'share.scope.title':'共享范围',
+    'share.scope.private':'仅本智能体',
+    'share.scope.local':'本机所有智能体',
+    'share.scope.team':'团队',
+    'share.scope.current':'当前',
+    'share.scope.teamDisabled':'未连接团队服务器',
+    'share.scope.teamIncludes':'包含本机所有智能体的可见性',
+    'share.scope.confirm':'确认',
+    'share.scope.cancel':'取消',
+    'share.scope.shrinkToLocal':'将从团队中移除此内容，团队成员将无法搜索到。确认？',
+    'share.scope.shrinkToPrivate':'将从团队和本机共享中移除此内容。确认？',
+    'share.scope.shrinkLocalToPrivate':'将停止共享给其他智能体。确认？',
+    'share.scope.changed':'共享范围已更新',
+    'share.scope.changeFail':'更新共享范围失败',
+    'share.scope.inactiveDisabled':'已合并/重复的记忆无法共享（不会出现在检索结果中）',
+    'share.scope.taskNotCompleted':'仅已完成的任务可以共享（进行中/已跳过的任务无法共享）',
+    'share.scope.skillNotActive':'仅活跃的技能可以共享（草稿/已归档的技能无法共享）',
+    'skill.pullToLocal':'拉取到本地',
+    'toast.taskShared':'任务已共享到团队',
     'toast.taskShareFail':'任务共享失败',
-    'toast.taskUnshared':'任务已取消共享',
+    'toast.taskUnshared':'任务已从团队移除',
     'toast.taskUnshareFail':'取消共享失败',
-    'toast.memoryShared':'记忆已共享',
+    'toast.memoryShared':'记忆已共享到团队',
     'toast.memoryShareFail':'记忆共享失败',
-    'toast.memoryUnshared':'记忆已取消共享',
+    'toast.memoryUnshared':'记忆已从团队移除',
     'toast.memoryUnshareFail':'记忆取消共享失败',
-    'toast.skillShared':'技能已共享',
+    'toast.skillShared':'技能已共享到团队',
     'toast.skillShareFail':'技能共享失败',
-    'toast.skillUnshared':'技能已取消共享',
+    'toast.skillUnshared':'技能已从团队移除',
     'toast.skillUnshareFail':'技能取消共享失败',
-    'share.memoryVisibilityPrompt':'共享可见性（public 或 group）：',
-    'share.memoryUnshareConfirm':'取消共享此记忆？',
+    'share.memoryVisibilityPrompt':'共享范围（public 或 group）：',
+    'share.memoryUnshareConfirm':'从团队移除该记忆？',
+    'share.memoryLocalUnshareConfirm':'停止本机共享该记忆？',
+    'share.localUnshareConfirm':'停止本机共享？',
+    'share.teamUnshareConfirm':'从团队共享中移除？',
+    'share.local.originalOwnerMissing':'该共享记忆没有记录原始所有者，无法自动恢复。',
     'share.group':'团队',
     'share.public':'公开',
     'toast.skillPulled':'技能已拉取到本地',
@@ -3004,35 +3309,35 @@ const I18N={
     'update.failed':'更新失败',
     'update.restarting':'正在重启服务，页面将自动刷新...',
     'update.dismiss':'关闭',
-    'sharing.disable.confirm.hub':'你即将关闭 Hub 服务。\\n\\n关闭后将会：\\n\\u2022 所有已连接的团队成员将断开连接\\n\\u2022 他们将无法继续同步记忆、任务和技能\\n\\u2022 已共享的数据会保留，重新开启后仍可使用\\n\\n确定要关闭吗？',
-    'sharing.disable.confirm.client':'你即将断开与团队 Hub 的连接。\\n\\n断开后将会：\\n\\u2022 你将无法再接收团队共享的记忆、任务和技能\\n\\u2022 你的本地数据不受影响，会完整保留\\n\\u2022 之后可以随时重新开启共享来恢复连接\\n\\n确定要断开吗？',
+    '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',
     'admin.notEnabled.title':'团队共享尚未开启',
-    'admin.notEnabled.desc':'管理面板用于管理团队成员、共享的记忆、任务和技能。使用此功能前，需要先开启 Hub 共享。',
-    'admin.notEnabled.setupHub':'配置为 Hub 服务端',
+    'admin.notEnabled.desc':'管理面板用于管理团队成员、共享的记忆、任务和技能。使用此功能前，需要先开启团队共享。',
+    'admin.notEnabled.setupHub':'配置为团队服务端',
     'admin.notEnabled.joinTeam':'加入已有团队',
     'admin.notEnabled.hint':'如果之前配置过共享，你的数据仍然保留。重新开启共享即可恢复访问所有共享内容。',
-    'sharing.disconnected.hint':'无法连接到 Hub 服务器，Hub 可能已下线或网络不可用。',
+    'sharing.disconnected.hint':'无法连接到团队服务器，服务器可能已下线或网络不可用。',
     'sharing.retryConnection':'重试连接',
     'sharing.retryConnection.loading':'连接中...',
     'sharing.retryConnection.success':'连接成功！',
-    'sharing.retryConnection.fail':'仍然无法连接，请检查 Hub 是否在线。',
+    'sharing.retryConnection.fail':'仍然无法连接，请检查团队服务器是否在线。',
     'guide.title':'开始团队协作',
     'guide.subtitle':'MemOS 支持团队记忆共享。选择以下方式之一开启协作，或继续使用纯本地模式。',
     'guide.join.title':'加入远程团队',
-    'guide.join.desc':'你的团队已有 Hub 在运行？加入即可与团队成员共享记忆、任务和技能。',
-    'guide.join.s1':'向 Hub 管理员索取 Hub 地址和 Team Token',
-    'guide.join.s2':'前往「设置 → Hub & Team」，开启共享，选择「Client」模式',
-    'guide.join.s3':'填写 Hub 地址和 Team Token，点击「测试连接」',
+    'guide.join.desc':'你的团队已有服务器在运行？加入即可与团队成员共享记忆、任务和技能。',
+    'guide.join.s1':'向团队管理员索取服务器地址和团队令牌',
+    'guide.join.s2':'前往「设置 → 团队共享」，开启共享，选择「客户端」模式',
+    'guide.join.s3':'填写服务器地址和团队令牌，点击「测试连接」',
     'guide.join.s4':'保存设置并重启 OpenClaw 网关（页面会自动刷新）',
-    'guide.join.btn':'\u2192 配置 Client 模式',
-    'guide.hub.title':'自建 Hub 服务',
+    'guide.join.btn':'\u2192 配置客户端模式',
+    'guide.hub.title':'自建团队服务',
     'guide.hub.desc':'将本机作为团队服务端，让其他成员连接过来共享记忆。',
-    'guide.hub.s1':'前往「设置 → Hub & Team」，开启共享，选择「Hub」模式',
+    'guide.hub.s1':'前往「设置 → 团队共享」，开启共享，选择「服务端」模式',
     'guide.hub.s2':'设置团队名称，保存设置后重启网关（页面会自动刷新）',
-    'guide.hub.s3':'将 Hub 地址和 Team Token 分享给团队成员',
+    'guide.hub.s3':'将服务器地址和团队令牌分享给团队成员',
     'guide.hub.s4':'在管理面板中审批加入请求',
-    'guide.hub.btn':'\u2192 配置 Hub 模式'
+    'guide.hub.btn':'\u2192 配置服务端模式'
   }
 };
 const LANG_KEY='memos-viewer-lang';
@@ -3142,6 +3447,10 @@ function _genToken(len){
 function onSharingToggle(){
   var on=document.getElementById('cfgSharingEnabled').checked;
   document.getElementById('sharingConfigPanel').style.display=on?'block':'none';
+  var pw=document.getElementById('sharingPanelsWrap');
+  if(pw) pw.style.display=on?'':'none';
+  var tg=document.getElementById('teamSetupGuide');
+  if(tg) tg.style.display=on?'none':'';
   if(on) selectSharingRole(_sharingRole);
 }
 function selectSharingRole(role){
@@ -3184,10 +3493,10 @@ function updateHubShareInfo(){
     var addr=ip?(ip+':'+esc(port)):('&lt;'+t('settings.hub.shareInfo.yourIP')+'&gt;:'+esc(port));
     var tip=t('settings.hub.shareInfo.clickCopy');
     content.innerHTML=
-      '<span style="font-size:11px;color:var(--text-muted);font-weight:500">Hub '+t('settings.hub.hubAddress')+'</span>'+
-      '<span style="'+cpStyle+'" onclick="navigator.clipboard.writeText(this.textContent);toast(&#39;Copied!&#39;,&#39;success&#39;)" title="'+tip+'">'+addr+'</span>'+
+      '<span style="font-size:11px;color:var(--text-muted);font-weight:500">'+t('settings.hub.hubAddress')+'</span>'+
+      '<span style="'+cpStyle+'" onclick="navigator.clipboard.writeText(this.textContent);toast(t(&#39;copy.done&#39;),&#39;success&#39;)" title="'+tip+'">'+addr+'</span>'+
       '<span style="font-size:11px;color:var(--text-muted);font-weight:500">Team Token</span>'+
-      '<span style="'+cpStyle+'" onclick="navigator.clipboard.writeText(this.textContent);toast(&#39;Copied!&#39;,&#39;success&#39;)" title="'+tip+'">'+esc(token)+'</span>';
+      '<span style="'+cpStyle+'" onclick="navigator.clipboard.writeText(this.textContent);toast(t(&#39;copy.done&#39;),&#39;success&#39;)" title="'+tip+'">'+esc(token)+'</span>';
   };
   if(_cachedLocalIP){renderShare(_cachedLocalIP);return;}
   renderShare('');
@@ -3306,6 +3615,7 @@ function onTaskScopeChange(){
   loadTasks();
 }
 
+var _clientPendingPollTimer=null;
 async function loadSharingStatus(forcePending){
   try{
     const r=await fetch('/api/sharing/status');
@@ -3315,6 +3625,14 @@ 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){
+      clearInterval(_clientPendingPollTimer);
+      _clientPendingPollTimer=null;
+      if(conn.connected) toast(t('sharing.approved.toast'),'success');
+    }
   }catch(e){
     renderSharingSidebar(null);
     renderSharingSettings(null);
@@ -3397,6 +3715,7 @@ function renderSharingSettings(data){
   if(data.role) _sharingRole=data.role;
   var isAdmin=(data.admin&&data.admin.canManageUsers)||(conn.connected&&user.role==='admin')||(actualRole==='hub');
   window._isHubAdmin=isAdmin;
+  if(isAdmin) startAdminPoll();
   var hubAdminBtn=document.getElementById('hubAdminEntryBtn');
 
   if(actualRole==='hub'){
@@ -3470,7 +3789,7 @@ async function retryConnection(){
 }
 
 async function retryHubJoin(){
-  if(!confirm(t('sharing.retryJoin.confirm'))) return;
+  if(!(await confirmModal(t('sharing.retryJoin.confirm')))) return;
   try{
     var r=await fetch('/api/sharing/retry-join',{method:'POST',headers:{'Content-Type':'application/json'}});
     var d=await r.json();
@@ -3590,152 +3909,48 @@ function guideGoToHub(role){
   if(card) card.scrollIntoView({behavior:'smooth',block:'start'});
 }
 
-/* ─── Group Manager ─── */
-var groupManagerUsers=[];
-async function loadGroupManager(){
-  var panel=document.getElementById('groupManagerPanel');
-  if(!panel) return;
-  panel.style.display='block';
-  panel.innerHTML=t('sharing.loadingGroups');
-  try{
-    var [gr,ur]=await Promise.all([
-      fetch('/api/sharing/groups').then(function(r){return r.json();}),
-      fetch('/api/sharing/users').then(function(r){return r.json();})
-    ]);
-    var groups=Array.isArray(gr.groups)?gr.groups:[];
-    groupManagerUsers=Array.isArray(ur.users)?ur.users:[];
-    renderGroupManager(panel,groups);
-  }catch(e){panel.innerHTML=t('admin.groupsFailed')+esc(String(e));}
-}
-function renderGroupManager(panel,groups){
-  var html='<div style="margin-bottom:8px;display:flex;gap:8px;align-items:center;font-size:12px">'+
-    '<strong>'+t('admin.groups')+' ('+groups.length+')</strong>'+
-    '<button class="btn btn-sm" onclick="showCreateGroupForm()" style="font-size:11px">'+t('admin.newGroup')+'</button>'+
-  '</div>';
-  html+='<div id="createGroupForm" style="display:none;margin-bottom:10px;padding:10px;background:var(--bg);border:1px solid var(--border);border-radius:8px;font-size:12px">'+
-    '<input id="newGroupName" type="text" placeholder="'+t('admin.groupName')+'" style="width:60%;padding:4px 8px;border:1px solid var(--border);border-radius:6px;font-size:12px;margin-right:6px;background:var(--bg);color:var(--text)">'+
-    '<input id="newGroupDesc" type="text" placeholder="'+t('admin.groupDesc')+'" style="width:60%;padding:4px 8px;border:1px solid var(--border);border-radius:6px;font-size:12px;margin-right:6px;margin-top:6px;background:var(--bg);color:var(--text)">'+
-    '<div style="margin-top:6px"><button class="btn btn-sm btn-primary" onclick="createGroup()" style="font-size:11px">'+t('admin.create')+'</button> '+
-    '<button class="btn btn-sm btn-ghost" onclick="hideCreateGroupForm()" style="font-size:11px">'+t('admin.cancel')+'</button></div>'+
-  '</div>';
-  if(groups.length===0){
-    html+='<div style="font-size:12px;color:var(--text-muted);padding:6px 0">'+t('sharing.noGroupsYet')+'</div>';
-  }else{
-    html+='<div style="display:flex;flex-direction:column;gap:6px">';
-    for(var i=0;i<groups.length;i++){
-      var g=groups[i];
-      html+='<div style="padding:8px 12px;background:var(--bg);border:1px solid var(--border);border-radius:8px;font-size:12px">'+
-        '<div style="display:flex;justify-content:space-between;align-items:center">'+
-          '<div><strong style="font-size:12px">'+esc(g.name)+'</strong>'+(g.description?' — <span style="color:var(--text-sec);font-size:11px">'+esc(g.description)+'</span>':'')+'</div>'+
-          '<div style="display:flex;gap:6px">'+
-            '<button class="btn btn-sm" onclick="toggleGroupMembers(&quot;'+escAttr(g.id)+'&quot;)" style="font-size:11px;padding:2px 8px">'+t('admin.members')+'</button>'+
-            '<button class="btn btn-sm btn-ghost" onclick="deleteGroup(&quot;'+escAttr(g.id)+'&quot;,&quot;'+escAttr(g.name)+'&quot;)" style="color:#ef4444;font-size:11px;padding:2px 8px">'+t('admin.delete')+'</button>'+
-          '</div>'+
-        '</div>'+
-        '<div id="groupMembers_'+escAttr(g.id)+'" style="display:none;margin-top:6px;font-size:12px"></div>'+
-      '</div>';
-    }
-    html+='</div>';
+
+/* ─── Hub Admin Panel ─── */
+var adminDataCache={users:[],groups:[],tasks:[],skills:[],memories:[]};
+var ADMIN_PAGE_SIZE=20;
+var adminPage={users:0,tasks:0,skills:0,memories:0};
+
+function adminPaginateHtml(total,page,refilterFn){
+  var pages=Math.ceil(total/ADMIN_PAGE_SIZE);
+  if(pages<=1) return '';
+  var html='<div class="pagination" style="padding:16px 0">';
+  html+='<button class="pg-btn'+(page===0?' disabled':'')+'" onclick="'+refilterFn+'Page(-1)">\\u2190</button>';
+  var start=Math.max(0,page-2),end=Math.min(pages,page+3);
+  if(start>0) html+='<button class="pg-btn" onclick="'+refilterFn+'Page(0)">1</button>'+(start>1?'<span class="pg-info">...</span>':'');
+  for(var i=start;i<end;i++){
+    html+='<button class="pg-btn'+(i===page?' active':'')+'" onclick="'+refilterFn+'Page('+i+')">'+(i+1)+'</button>';
   }
-  panel.innerHTML=html;
-}
-function showCreateGroupForm(){var f=document.getElementById('createGroupForm');if(f)f.style.display='block';}
-function hideCreateGroupForm(){var f=document.getElementById('createGroupForm');if(f)f.style.display='none';}
-async function createGroup(){
-  var name=(document.getElementById('newGroupName')).value.trim();
-  var desc=(document.getElementById('newGroupDesc')).value.trim();
-  if(!name){toast(t('toast.groupNameRequired'),'error');return;}
-  try{
-    var r=await fetch('/api/sharing/groups',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({name:name,description:desc})});
-    var d=await r.json();
-    if(d.ok){toast(t('toast.groupCreated'),'success');hideCreateGroupForm();loadGroupManager();}else{toast(d.error||t('toast.createFail'),'error');}
-  }catch(e){toast(t('toast.createFail')+': '+e.message,'error');}
+  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>';
+  return html;
 }
-async function deleteGroup(groupId,groupName){
-  if(!confirm(t('confirm.deleteGroup').replace('{name}',groupName))) return;
-  try{
-    var r=await fetch('/api/sharing/groups/'+encodeURIComponent(groupId),{method:'DELETE'});
-    var d=await r.json();
-    if(d.ok){toast(t('toast.groupDeleted'),'success');loadGroupManager();}else{toast(d.error||t('toast.deleteFail'),'error');}
-  }catch(e){toast(t('toast.deleteFail')+': '+e.message,'error');}
+
+var _adminPollTimer=null;
+function startAdminPoll(){
+  if(_adminPollTimer) return;
+  _adminPollTimer=setInterval(function(){pollAdminPending();},30000);
+  pollAdminPending();
 }
-async function toggleGroupMembers(groupId){
-  var el=document.getElementById('groupMembers_'+groupId);
-  if(!el) return;
-  if(el.style.display!=='none'){el.style.display='none';return;}
-  el.style.display='block';
-  el.innerHTML=t('sharing.loading');
+async function pollAdminPending(){
   try{
-    var r=await fetch('/api/sharing/groups/'+encodeURIComponent(groupId)+'/members');
+    var r=await fetch('/api/sharing/pending-users');
     var d=await r.json();
-    var members=Array.isArray(d.members)?d.members:[];
-    renderGroupMembers(el,groupId,members);
-  }catch(e){el.innerHTML=t('admin.groupsFailed')+esc(String(e));}
-}
-function renderGroupMembers(el,groupId,members){
-  var html='<div style="font-size:12px;margin-bottom:6px;color:var(--text-sec)">'+t('admin.membersCount').replace('{n}',members.length)+'</div>';
-  if(members.length>0){
-    html+='<div style="display:flex;flex-wrap:wrap;gap:6px;margin-bottom:8px">';
-    for(var i=0;i<members.length;i++){
-      var m=members[i];
-      html+='<span style="display:inline-flex;align-items:center;gap:4px;padding:3px 10px;background:var(--bg-card);border:1px solid var(--border);border-radius:12px;font-size:12px">'+
-        esc(m.username||m.userId)+
-        ' <button style="background:none;border:none;color:#ef4444;cursor:pointer;font-size:11px;padding:0 2px" onclick="removeGroupMember(&quot;'+escAttr(groupId)+'&quot;,&quot;'+escAttr(m.userId)+'&quot;)">&times;</button>'+
-      '</span>';
-    }
-    html+='</div>';
-  }else{
-    html+='<div style="font-size:12px;color:var(--text-muted);margin-bottom:8px">'+t('admin.noMembersYet')+'</div>';
-  }
-  var memberIds=new Set(members.map(function(m){return m.userId;}));
-  var available=groupManagerUsers.filter(function(u){return !memberIds.has(u.id);});
-  if(available.length>0){
-    html+='<div style="display:flex;gap:6px;align-items:center">'+
-      '<select id="addMemberSelect_'+escAttr(groupId)+'" style="padding:4px 8px;border:1px solid var(--border);border-radius:6px;font-size:12px">';
-    for(var j=0;j<available.length;j++){
-      html+='<option value="'+escAttr(available[j].id)+'">'+esc(available[j].username)+'</option>';
+    var count=Array.isArray(d.users)?d.users.length:0;
+    var badge=document.getElementById('adminPendingBadge');
+    if(badge){
+      if(count>0){badge.textContent=count;badge.style.display='inline';}
+      else{badge.style.display='none';}
     }
-    html+='</select>'+
-      '<button class="btn btn-sm" onclick="addGroupMember(&quot;'+escAttr(groupId)+'&quot;)">'+t('admin.add')+'</button>'+
-    '</div>';
-  }
-  el.innerHTML=html;
-}
-async function addGroupMember(groupId){
-  var sel=document.getElementById('addMemberSelect_'+groupId);
-  if(!sel) return;
-  var userId=sel.value;
-  if(!userId) return;
-  try{
-    var r=await fetch('/api/sharing/groups/'+encodeURIComponent(groupId)+'/members',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({userId:userId})});
-    var d=await r.json();
-    if(d.ok){toast(t('toast.memberAdded'),'success');reloadGroupMembers(groupId);}else{toast(d.error||t('toast.addFail'),'error');}
-  }catch(e){toast(t('toast.addFail')+': '+e.message,'error');}
-}
-async function removeGroupMember(groupId,userId){
-  if(!confirm(t('confirm.removeGroupMember'))) return;
-  try{
-    var r=await fetch('/api/sharing/groups/'+encodeURIComponent(groupId)+'/members',{method:'DELETE',headers:{'Content-Type':'application/json'},body:JSON.stringify({userId:userId})});
-    var d=await r.json();
-    if(d.ok){toast(t('toast.memberRemoved'),'success');reloadGroupMembers(groupId);}else{toast(d.error||t('toast.removeFail'),'error');}
-  }catch(e){toast(t('toast.removeFail')+': '+e.message,'error');}
-}
-async function reloadGroupMembers(groupId){
-  var el=document.getElementById('groupMembers_'+groupId);
-  if(!el) return;
-  el.style.display='block';
-  el.innerHTML=t('sharing.loading');
-  try{
-    var r=await fetch('/api/sharing/groups/'+encodeURIComponent(groupId)+'/members');
-    var d=await r.json();
-    var members=Array.isArray(d.members)?d.members:[];
-    renderGroupMembers(el,groupId,members);
-  }catch(e){el.innerHTML=t('admin.groupsFailed')+esc(String(e));}
+  }catch(e){}
 }
 
-/* ─── Hub Admin Panel ─── */
-var adminDataCache={users:[],groups:[],tasks:[],skills:[],memories:[]};
-
 function switchAdminTab(tab,btn){
   document.querySelectorAll('.admin-tabs .admin-tab').forEach(function(t){t.classList.remove('active');});
   btn.classList.add('active');
@@ -3787,16 +4002,18 @@ async function loadAdminData(){
       fetch('/api/admin/shared-memories').then(function(r){return r.json();})
     ]);
     adminDataCache.users=Array.isArray(usersR.users)?usersR.users:[];
-    adminDataCache.groups=[];
     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 pending=Array.isArray(pendingR.users)?pendingR.users:[];
+    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';}}
     renderAdminStats(pending.length);
     renderAdminUsers(adminDataCache.users, pending);
-    renderAdminMemories(adminDataCache.tasks);
+    renderAdminTasks(adminDataCache.tasks);
     renderAdminSkills(adminDataCache.skills);
-    renderAdminSharedMemories(adminDataCache.memories);
+    renderAdminMemories(adminDataCache.memories);
   }catch(e){
     var statsEl=document.getElementById('adminStats');
     if(statsEl) statsEl.innerHTML='<div class="admin-empty">'+t('admin.loadFailed')+esc(String(e))+'</div>';
@@ -3809,9 +4026,9 @@ function renderAdminStats(pendingCount){
   el.innerHTML=
     '<div class="admin-stat-box"><span class="as-icon">\u{1F465}</span><div class="val">'+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>'+
+    '<div class="admin-stat-box"><span class="as-icon">\u{1F4AD}</span><div class="val">'+(adminDataCache.memories||[]).length+'</div><div class="lbl">'+t('admin.stat.sharedMemories')+'</div></div>'+
     '<div class="admin-stat-box"><span class="as-icon">\u{1F4CB}</span><div class="val">'+adminDataCache.tasks.length+'</div><div class="lbl">'+t('admin.stat.sharedTasks')+'</div></div>'+
-    '<div class="admin-stat-box"><span class="as-icon">\u{1F9E0}</span><div class="val">'+adminDataCache.skills.length+'</div><div class="lbl">'+t('admin.stat.sharedSkills')+'</div></div>'+
-    '<div class="admin-stat-box"><span class="as-icon">\u{1F4AD}</span><div class="val">'+(adminDataCache.memories||[]).length+'</div><div class="lbl">'+t('admin.stat.sharedMemories')+'</div></div>';
+    '<div class="admin-stat-box"><span class="as-icon">\u{1F9E0}</span><div class="val">'+adminDataCache.skills.length+'</div><div class="lbl">'+t('admin.stat.sharedSkills')+'</div></div>';
   var tc=document.getElementById('adminTabCountUsers');if(tc)tc.textContent=adminDataCache.users.length+pendingCount;
   tc=document.getElementById('adminTabCountMemories');if(tc)tc.textContent=(adminDataCache.memories||[]).length;
   tc=document.getElementById('adminTabCountTasks');if(tc)tc.textContent=adminDataCache.tasks.length;
@@ -3839,15 +4056,61 @@ function renderAdminUsers(users,pending){
   if(users.length===0){
     html+='<div class="admin-empty"><span class="ae-icon">\u{1F465}</span>'+t('admin.noActiveUsers')+'</div>';
   }else{
-    for(var i=0;i<users.length;i++){
+    var totalUsers=users.length;
+    var usersPages=Math.ceil(totalUsers/ADMIN_PAGE_SIZE);
+    if(adminPage.users>=usersPages) adminPage.users=Math.max(0,usersPages-1);
+    var usersStart=adminPage.users*ADMIN_PAGE_SIZE;
+    var usersEnd=Math.min(usersStart+ADMIN_PAGE_SIZE,totalUsers);
+    var adminCount=users.filter(function(x){return x.role==='admin';}).length;
+    for(var i=usersStart;i<usersEnd;i++){
       var u=users[i];
-      html+='<div class="admin-card"><div class="admin-card-header"><div class="admin-card-title">'+esc(u.username||u.id)+'</div>'+
+      var uid=escAttr(u.id);
+      var uname=escAttr(u.username||'');
+
+      var titleDisplay='<span class="admin-card-title" id="au_name_'+uid+'">'+esc(u.username||u.id)+
+        ' <button onclick="adminStartEditName(this,&quot;'+uid+'&quot;,&quot;'+uname+'&quot;)" style="background:none;border:none;cursor:pointer;color:var(--text-muted);padding:2px;font-size:13px;vertical-align:middle;opacity:.5;transition:opacity .15s" onmouseenter="this.style.opacity=1" onmouseleave="this.style.opacity=.5" title="'+t('admin.editName')+'">\u270E</button></span>';
+
+      var editRow='<div id="au_edit_'+uid+'" style="display:none;align-items:center;gap:6px">'+
+        '<input id="au_input_'+uid+'" type="text" value="'+uname+'" style="flex:1;padding:5px 10px;border:1px solid var(--pri);border-radius:8px;font-size:13px;font-weight:600;background:var(--bg);color:var(--text);outline:none;min-width:0" onkeydown="if(event.key===&quot;Enter&quot;)adminSaveEditName(&quot;'+uid+'&quot;);if(event.key===&quot;Escape&quot;)adminCancelEditName(&quot;'+uid+'&quot;)">'+
+        '<button onclick="adminSaveEditName(&quot;'+uid+'&quot;)" class="btn btn-sm btn-primary" style="padding:4px 12px;font-size:11px;white-space:nowrap">\u2713</button>'+
+        '<button onclick="adminCancelEditName(&quot;'+uid+'&quot;)" class="btn btn-sm btn-ghost" style="padding:4px 8px;font-size:11px;color:var(--text-muted)">\u2717</button></div>';
+
+      var mc=u.memoryCount||0, tc=u.taskCount||0, sc=u.skillCount||0;
+      var contribHtml='<div class="au-contrib">'+
+        '<span class="au-contrib-item"><span class="au-contrib-num" style="color:var(--pri)">'+mc+'</span> '+t('admin.contrib.memories')+'</span>'+
+        '<span class="au-contrib-item"><span class="au-contrib-num" style="color:var(--green)">'+tc+'</span> '+t('admin.contrib.tasks')+'</span>'+
+        '<span class="au-contrib-item"><span class="au-contrib-num" style="color:var(--amber)">'+sc+'</span> '+t('admin.contrib.skills')+'</span>'+
+      '</div>';
+
+      var infoRows=[];
+      if(u.deviceName) infoRows.push('<span class="au-info-item">\u{1F4BB} '+t('admin.device')+esc(u.deviceName)+'</span>');
+      if(u.lastIp) infoRows.push('<span class="au-info-item">\u{1F310} '+t('admin.ip')+esc(u.lastIp)+'</span>');
+      if(u.createdAt) infoRows.push('<span class="au-info-item">\u{1F4C5} '+t('admin.joined')+formatDateTimeSeconds(u.createdAt)+'</span>');
+      if(u.approvedAt) infoRows.push('<span class="au-info-item">\u2705 '+t('admin.approved')+formatDateTimeSeconds(u.approvedAt)+'</span>');
+      infoRows.push('<span class="au-info-item">\u{1F552} '+t('admin.lastActive')+(u.lastActiveAt?formatDateTimeSeconds(u.lastActiveAt):t('admin.neverActive'))+'</span>');
+      var infoHtml='<div class="au-info">'+infoRows.join('')+'</div>';
+
+      var actions='';
+      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>';
+        actions+='<button class="btn btn-sm btn-ghost" onclick="adminRemoveUser(&quot;'+uid+'&quot;,&quot;'+uname+'&quot;)" style="color:var(--rose)">'+t('admin.remove')+'</button>';
+      }else if(adminCount>1){
+        actions+='<button class="btn btn-sm btn-ghost" onclick="adminToggleRole(&quot;'+uid+'&quot;,&quot;member&quot;)">'+t('admin.demoteMember')+'</button>';
+        actions+='<button class="btn btn-sm btn-ghost" onclick="adminRemoveUser(&quot;'+uid+'&quot;,&quot;'+uname+'&quot;)" style="color:var(--rose)">'+t('admin.remove')+'</button>';
+      }else{
+        actions+='<span style="font-size:11px;color:var(--text-muted);padding:4px 0">'+t('admin.lastAdminHint')+'</span>';
+      }
+      html+='<div class="admin-card au-card"><div class="admin-card-header"><div style="flex:1;min-width:0">'+titleDisplay+editRow+'</div>'+
         '<span class="admin-badge '+(u.role==='admin'?'admin':'member')+'">'+esc(u.role||'member')+'</span></div>'+
-        '<div class="admin-card-meta">ID: '+esc(u.id)+(u.status?' \u00B7 Status: '+esc(u.status):'')+'</div></div>';
+        contribHtml+infoHtml+
+        (actions?'<div class="admin-card-actions" style="border-top:1px dashed var(--border);padding-top:10px;margin-top:4px">'+actions+'</div>':'')+
+        '</div>';
     }
+    html+=adminPaginateHtml(totalUsers,adminPage.users,'adminUsers');
   }
   el.innerHTML=html;
 }
+function adminUsersPage(p){var maxP=Math.max(0,Math.ceil(adminDataCache.users.length/ADMIN_PAGE_SIZE)-1);if(p<0){adminPage.users=Math.max(0,adminPage.users-1);}else{adminPage.users=Math.min(p,maxP);}renderAdminUsers(adminDataCache.users,adminDataCache._pending||[]);}
 
 async function adminApproveUser(userId,username){
   try{
@@ -3857,140 +4120,151 @@ async function adminApproveUser(userId,username){
   }catch(e){toast(t('toast.approveFail')+': '+e.message,'error');}
 }
 async function adminRejectUser(userId){
-  if(!confirm(t('confirm.rejectUser'))) return;
+  if(!(await confirmModal(t('confirm.rejectUser'),{danger:true}))) return;
   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');}
   }catch(e){toast(t('toast.rejectFail')+': '+e.message,'error');}
 }
-
-function renderAdminGroups(groups){
-  var el=document.getElementById('adminGroupsPanel');
-  if(!el) return;
-  var html='<div style="margin-bottom:12px;display:flex;justify-content:space-between;align-items:center">'+
-    '<h3 style="font-size:14px;font-weight:600;color:var(--text)">'+t('admin.groups')+' ('+groups.length+')</h3>'+
-    '<button class="btn btn-sm btn-primary" onclick="showAdminCreateGroup()">'+t('admin.newGroup')+'</button></div>';
-  html+='<div id="adminCreateGroupForm" style="display:none;margin-bottom:14px;padding:14px;background:var(--bg);border:1px solid var(--border);border-radius:10px">'+
-    '<div style="display:flex;flex-direction:column;gap:8px">'+
-    '<input id="adminNewGroupName" type="text" placeholder="'+t('admin.groupName')+'" style="padding:8px 12px;border:1px solid var(--border);border-radius:8px;font-size:13px;background:var(--bg-card);color:var(--text)">'+
-    '<input id="adminNewGroupDesc" type="text" placeholder="'+t('admin.groupDesc')+'" style="padding:8px 12px;border:1px solid var(--border);border-radius:8px;font-size:13px;background:var(--bg-card);color:var(--text)">'+
-    '<div style="display:flex;gap:8px"><button class="btn btn-sm btn-primary" onclick="adminCreateGroup()">'+t('admin.create')+'</button>'+
-    '<button class="btn btn-sm btn-ghost" onclick="hideAdminCreateGroup()">'+t('admin.cancel')+'</button></div></div></div>';
-  if(groups.length===0){
-    html+='<div class="admin-empty"><span class="ae-icon">\u{1F4C2}</span>'+t('admin.noGroups')+'</div>';
-  }else{
-    for(var i=0;i<groups.length;i++){
-      var g=groups[i];
-      html+='<div class="admin-card"><div class="admin-card-header"><div class="admin-card-title">'+esc(g.name)+'</div>'+
-        '<button class="btn btn-sm btn-ghost" onclick="adminDeleteGroup(&quot;'+escAttr(g.id)+'&quot;,&quot;'+escAttr(g.name)+'&quot;)" style="color:var(--rose);font-size:11px">'+t('admin.delete')+'</button></div>'+
-        (g.description?'<div class="admin-card-meta">'+esc(g.description)+'</div>':'')+
-        '<div id="adminGroupMembers_'+escAttr(g.id)+'" style="margin-top:10px"></div>'+
-      '</div>';
-    }
-  }
-  el.innerHTML=html;
-  for(var i=0;i<groups.length;i++){adminLoadGroupMembers(groups[i].id);}
-}
-function showAdminCreateGroup(){var f=document.getElementById('adminCreateGroupForm');if(f)f.style.display='block';}
-function hideAdminCreateGroup(){var f=document.getElementById('adminCreateGroupForm');if(f)f.style.display='none';}
-async function adminCreateGroup(){
-  var name=(document.getElementById('adminNewGroupName')).value.trim();
-  var desc=(document.getElementById('adminNewGroupDesc')).value.trim();
-  if(!name){toast(t('toast.groupNameRequired'),'error');return;}
+async function adminToggleRole(userId,newRole){
+  var msg=newRole==='admin'?t('confirm.promoteAdmin'):t('confirm.demoteMember');
+  if(!(await confirmModal(msg))) return;
   try{
-    var r=await fetch('/api/sharing/groups',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({name:name,description:desc})});
+    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||d.id){toast(t('toast.groupCreated'),'success');hideAdminCreateGroup();loadAdminData();}else{toast(d.error||t('toast.createFail'),'error');}
-  }catch(e){toast(t('toast.createFail')+': '+e.message,'error');}
-}
-async function adminDeleteGroup(groupId,groupName){
-  if(!confirm(t('confirm.deleteGroupShort').replace('{name}',groupName))) return;
+    if(d.ok){toast(t('toast.roleChanged'),'success');loadAdminData();}else{toast(d.error||t('toast.roleChangeFail'),'error');}
+  }catch(e){toast(t('toast.roleChangeFail')+': '+e.message,'error');}
+}
+function adminStartEditName(btn,userId,currentName){
+  var nameEl=document.getElementById('au_name_'+userId);
+  var editEl=document.getElementById('au_edit_'+userId);
+  var inputEl=document.getElementById('au_input_'+userId);
+  if(!nameEl||!editEl||!inputEl) return;
+  nameEl.style.display='none';
+  editEl.style.display='flex';
+  inputEl.value=currentName;
+  inputEl.focus();
+  inputEl.select();
+}
+function adminCancelEditName(userId){
+  var nameEl=document.getElementById('au_name_'+userId);
+  var editEl=document.getElementById('au_edit_'+userId);
+  if(nameEl) nameEl.style.display='';
+  if(editEl) editEl.style.display='none';
+}
+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;}
+  inputEl.disabled=true;
   try{
-    var r=await fetch('/api/sharing/groups/'+encodeURIComponent(groupId),{method:'DELETE'});
+    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.groupDeleted'),'success');loadAdminData();}else{toast(d.error||t('toast.deleteFail'),'error');}
-  }catch(e){toast(t('toast.deleteFail')+': '+e.message,'error');}
+    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');}
 }
-async function adminLoadGroupMembers(groupId){
-  var el=document.getElementById('adminGroupMembers_'+groupId);
-  if(!el) return;
-  el.innerHTML=t('sharing.loading');
-  try{
-    var r=await fetch('/api/sharing/groups/'+encodeURIComponent(groupId)+'/members');
-    var d=await r.json();
-    var members=Array.isArray(d.members)?d.members:[];
-    var html='<div style="font-size:12px;margin-bottom:6px;color:var(--text-sec)">'+t('admin.membersCount').replace('{n}',members.length)+'</div>';
-    if(members.length>0){
-      html+='<div style="display:flex;flex-wrap:wrap;gap:6px;margin-bottom:8px">';
-      for(var i=0;i<members.length;i++){
-        var m=members[i];
-        html+='<span style="display:inline-flex;align-items:center;gap:4px;padding:3px 10px;background:var(--bg-card);border:1px solid var(--border);border-radius:12px;font-size:12px">'+
-          esc(m.username||m.userId)+
-          ' <button style="background:none;border:none;color:#ef4444;cursor:pointer;font-size:11px;padding:0 2px" onclick="adminRemoveGroupMember(&quot;'+escAttr(groupId)+'&quot;,&quot;'+escAttr(m.userId)+'&quot;)">&times;</button></span>';
-      }
-      html+='</div>';
-    }else{
-      html+='<div style="font-size:12px;color:var(--text-muted);margin-bottom:8px">'+t('admin.noMembers')+'</div>';
-    }
-    var memberIds=new Set(members.map(function(m){return m.userId;}));
-    var available=adminDataCache.users.filter(function(u){return !memberIds.has(u.id);});
-    if(available.length>0){
-      html+='<div style="display:flex;gap:6px;align-items:center">'+
-        '<select id="adminAddMember_'+escAttr(groupId)+'" style="padding:4px 8px;border:1px solid var(--border);border-radius:6px;font-size:12px;background:var(--bg-card);color:var(--text)">';
-      for(var j=0;j<available.length;j++){
-        html+='<option value="'+escAttr(available[j].id)+'">'+esc(available[j].username)+'</option>';
-      }
-      html+='</select><button class="btn btn-sm" onclick="adminAddGroupMember(&quot;'+escAttr(groupId)+'&quot;)">'+t('admin.add')+'</button></div>';
-    }
-    el.innerHTML=html;
-  }catch(e){el.innerHTML=t('admin.groupsFailed')+esc(String(e));}
-}
-async function adminAddGroupMember(groupId){
-  var sel=document.getElementById('adminAddMember_'+groupId);
-  if(!sel) return;
-  try{
-    var r=await fetch('/api/sharing/groups/'+encodeURIComponent(groupId)+'/members',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({userId:sel.value})});
-    var d=await r.json();
-    if(d.ok){toast(t('toast.memberAdded'),'success');adminLoadGroupMembers(groupId);}else{toast(d.error||t('toast.addFail'),'error');}
-  }catch(e){toast(t('toast.addFail')+': '+e.message,'error');}
-}
-async function adminRemoveGroupMember(groupId,userId){
-  if(!confirm(t('confirm.removeMember'))) return;
+
+async function adminRemoveUser(userId,username){
+  if(!(await confirmModal(t('confirm.removeUser'),{danger:true}))) return;
+  var clean=await confirmModal(t('confirm.cleanResources'));
   try{
-    var r=await fetch('/api/sharing/groups/'+encodeURIComponent(groupId)+'/members',{method:'DELETE',headers:{'Content-Type':'application/json'},body:JSON.stringify({userId:userId})});
+    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.memberRemoved'),'success');adminLoadGroupMembers(groupId);}else{toast(d.error||t('toast.removeFail'),'error');}
+    if(d.ok){toast(t('toast.userRemoved'),'success');loadAdminData();}else{toast(d.error||t('toast.removeFail'),'error');}
   }catch(e){toast(t('toast.removeFail')+': '+e.message,'error');}
 }
 
-function renderAdminMemories(tasks){
-  var el=document.getElementById('adminMemoriesPanel');
+
+function adminToolbarHtml(items,keyFn,filterId,searchId,onchangeFn,opts){
+  opts=opts||{};
+  var owners={};
+  for(var i=0;i<items.length;i++){var n=keyFn(items[i]);if(n)owners[n]=1;}
+  var names=Object.keys(owners).sort();
+  var html='';
+  if(names.length>=1){
+    html+='<select id="'+filterId+'" onchange="'+onchangeFn+'()" class="admin-toolbar select"><option value="">'+t('admin.filter.owner')+'</option>';
+    for(var j=0;j<names.length;j++) html+='<option value="'+escAttr(names[j])+'">'+esc(names[j])+'</option>';
+    html+='</select>';
+  }
+  if(opts.sortId){
+    html+='<select id="'+opts.sortId+'" onchange="'+onchangeFn+'()" class="admin-toolbar select">'+
+      '<option value="newest">'+t('admin.sort.newest')+'</option>'+
+      '<option value="oldest">'+t('admin.sort.oldest')+'</option></select>';
+  }
+  if(opts.extraFilters){
+    for(var ef=0;ef<opts.extraFilters.length;ef++){
+      var f=opts.extraFilters[ef];
+      var vals={};
+      for(var fi=0;fi<items.length;fi++){var fv=f.keyFn(items[fi]);if(fv)vals[fv]=1;}
+      var fkeys=Object.keys(vals).sort();
+      if(fkeys.length>=1){
+        html+='<select id="'+f.id+'" onchange="'+onchangeFn+'()" class="admin-toolbar select"><option value="">'+esc(f.label)+'</option>';
+        for(var fk=0;fk<fkeys.length;fk++) html+='<option value="'+escAttr(fkeys[fk])+'">'+esc(fkeys[fk])+'</option>';
+        html+='</select>';
+      }
+    }
+  }
+  return html;
+}
+function renderAdminTasks(tasks){
+  var el=document.getElementById('adminTasksPanel');
   if(!el) return;
   adminTasksCache=tasks;
-  var html='<h3 style="font-size:14px;font-weight:600;color:var(--text);margin-bottom:10px">'+t('admin.sharedTasks')+' ('+tasks.length+')</h3>';
-  if(tasks.length===0){
+  var filterVal=document.getElementById('adminTaskFilter')?document.getElementById('adminTaskFilter').value:'';
+  var sortVal=document.getElementById('adminTaskSort')?document.getElementById('adminTaskSort').value:'newest';
+  var statusVal=document.getElementById('adminTaskStatusFilter')?document.getElementById('adminTaskStatusFilter').value:'';
+  var filtered=tasks;
+  if(filterVal) filtered=filtered.filter(function(tk){return (tk.ownerName||tk.sourceUserId||'')===filterVal;});
+  if(statusVal) filtered=filtered.filter(function(tk){return (tk.status||'')===statusVal;});
+  filtered=filtered.slice().sort(function(a,b){var ta=a.updatedAt||a.createdAt||0,tb=b.updatedAt||b.createdAt||0;return sortVal==='oldest'?ta-tb:tb-ta;});
+  var html='<div class="admin-toolbar"><h3>'+t('admin.sharedTasks')+' ('+filtered.length+'/'+tasks.length+')</h3>'+
+    adminToolbarHtml(tasks,function(tk){return tk.ownerName||tk.sourceUserId||'';},'adminTaskFilter','adminTaskSearch','refilterAdminTasks',{sortId:'adminTaskSort',extraFilters:[
+      {id:'adminTaskStatusFilter',label:t('admin.filter.status'),keyFn:function(tk){return tk.status||''}}
+    ]})+'</div>';
+  if(filtered.length===0){
     html+='<div class="admin-empty"><span class="ae-icon">\u{1F4CB}</span>'+t('admin.noSharedTasks')+'</div>';
   }else{
-    for(var i=0;i<tasks.length;i++){
-      var tk=tasks[i];
-      html+='<div class="admin-card" onclick="openHubTaskDetailFromCache(\\\'admin\\\','+i+')" style="cursor:pointer"><div class="admin-card-header"><div class="admin-card-title">'+esc(tk.title||tk.id)+'</div>'+
+    var tPages=Math.ceil(filtered.length/ADMIN_PAGE_SIZE);
+    if(adminPage.tasks>=tPages) adminPage.tasks=Math.max(0,tPages-1);
+    var tStart=adminPage.tasks*ADMIN_PAGE_SIZE,tEnd=Math.min(tStart+ADMIN_PAGE_SIZE,filtered.length);
+    for(var i=tStart;i<tEnd;i++){
+      var tk=filtered[i];
+      var cardId='adminTaskCard_'+i;
+      var timeRange='';
+      if(tk.startedAt) timeRange+=formatTime(tk.startedAt);
+      if(tk.endedAt) timeRange+=' \u2192 '+formatTime(tk.endedAt);
+      html+='<div class="admin-card admin-card-clickable" id="'+cardId+'" onclick="toggleAdminTaskCard(&quot;'+cardId+'&quot;,'+i+')">'+
+        '<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>'+
+            (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>'+
-        '<div class="admin-card-meta">'+
-          t('admin.owner')+esc(tk.ownerName||tk.sourceUserId||'unknown')+
-          (tk.chunkCount!=null?' \u00B7 '+t('admin.chunks')+tk.chunkCount:'')+
-          ' \u00B7 '+t('admin.updated')+new Date(tk.updatedAt||tk.createdAt).toLocaleDateString()+
+          '<span class="admin-card-actions" onclick="event.stopPropagation()">'+
+            '<button class="btn btn-sm btn-ghost" onclick="adminDeleteTask(&quot;'+escAttr(tk.id)+'&quot;,&quot;'+escAttr(tk.title||tk.id)+'&quot;)" style="color:var(--rose)">'+t('admin.remove')+'</button>'+
+            '<button class="btn btn-sm btn-ghost admin-card-expand-btn" onclick="toggleAdminTaskCard(&quot;'+cardId+'&quot;,'+i+')">'+t('admin.expand')+'</button>'+
+            '<span class="admin-card-time">'+(timeRange||formatDateTimeSeconds(tk.updatedAt||tk.createdAt))+'</span>'+
+          '</span>'+
         '</div>'+
-        '<div class="admin-card-actions">'+
-          '<button class="btn btn-sm btn-ghost" onclick="event.stopPropagation();adminDeleteTask(&quot;'+escAttr(tk.id)+'&quot;,&quot;'+escAttr(tk.title||tk.id)+'&quot;)" style="color:var(--rose)">'+t('admin.remove')+'</button>'+
-        '</div></div>';
+        (tk.summary?'<div class="admin-card-preview">'+esc(tk.summary.slice(0,120))+'</div>':'')+
+        '<div class="admin-card-detail" id="'+cardId+'_detail" onclick="event.stopPropagation()"></div>'+
+      '</div>';
     }
+    html+=adminPaginateHtml(filtered.length,adminPage.tasks,'adminTasks');
   }
   el.innerHTML=html;
+  if(filterVal){var sel=document.getElementById('adminTaskFilter');if(sel)sel.value=filterVal;}
+  if(sortVal!=='newest'){var so=document.getElementById('adminTaskSort');if(so)so.value=sortVal;}
+  if(statusVal){var sf=document.getElementById('adminTaskStatusFilter');if(sf)sf.value=statusVal;}
 }
+function refilterAdminTasks(){adminPage.tasks=0;renderAdminTasks(adminTasksCache||[]);}
+function adminTasksPage(p){if(p<0){adminPage.tasks=Math.max(0,adminPage.tasks-1);}else{adminPage.tasks=p;}renderAdminTasks(adminTasksCache||[]);}
 
 async function adminDeleteTask(taskId,taskTitle){
-  if(!confirm(t('confirm.removeTask').replace('{name}',taskTitle))) return;
+  if(!(await confirmModal(t('confirm.removeTask').replace('{name}',taskTitle),{danger:true}))) return;
   try{
     var r=await fetch('/api/admin/shared-tasks/'+encodeURIComponent(taskId),{method:'DELETE'});
     var d=await r.json();
@@ -4002,30 +4276,59 @@ function renderAdminSkills(skills){
   var el=document.getElementById('adminSkillsPanel');
   if(!el) return;
   adminSkillsCache=skills;
-  var html='<h3 style="font-size:14px;font-weight:600;color:var(--text);margin-bottom:10px">'+t('admin.sharedSkills')+' ('+skills.length+')</h3>';
-  if(skills.length===0){
+  var filterVal=document.getElementById('adminSkillFilter')?document.getElementById('adminSkillFilter').value:'';
+  var sortVal=document.getElementById('adminSkillSort')?document.getElementById('adminSkillSort').value:'newest';
+  var statusVal=document.getElementById('adminSkillStatusFilter')?document.getElementById('adminSkillStatusFilter').value:'';
+  var filtered=skills;
+  if(filterVal) filtered=filtered.filter(function(s){return (s.ownerName||s.sourceUserId||'')===filterVal;});
+  if(statusVal) filtered=filtered.filter(function(s){return (s.status||'')===statusVal;});
+  filtered=filtered.slice().sort(function(a,b){var ta=a.updatedAt||a.createdAt||0,tb=b.updatedAt||b.createdAt||0;return sortVal==='oldest'?ta-tb:tb-ta;});
+  var html='<div class="admin-toolbar"><h3>'+t('admin.sharedSkills')+' ('+filtered.length+'/'+skills.length+')</h3>'+
+    adminToolbarHtml(skills,function(s){return s.ownerName||s.sourceUserId||'';},'adminSkillFilter','adminSkillSearch','refilterAdminSkills',{sortId:'adminSkillSort',extraFilters:[
+      {id:'adminSkillStatusFilter',label:t('admin.filter.status'),keyFn:function(s){return s.status||''}}
+    ]})+'</div>';
+  if(filtered.length===0){
     html+='<div class="admin-empty"><span class="ae-icon">\u{1F9E0}</span>'+t('admin.noSharedSkills')+'</div>';
   }else{
-    for(var i=0;i<skills.length;i++){
-      var s=skills[i];
-      html+='<div class="admin-card" onclick="openHubSkillDetailFromCache(\\\'admin\\\','+i+')" style="cursor:pointer"><div class="admin-card-header"><div class="admin-card-title">'+esc(s.name||s.id)+'</div>'+
+    var sPages=Math.ceil(filtered.length/ADMIN_PAGE_SIZE);
+    if(adminPage.skills>=sPages) adminPage.skills=Math.max(0,sPages-1);
+    var sStart=adminPage.skills*ADMIN_PAGE_SIZE,sEnd=Math.min(sStart+ADMIN_PAGE_SIZE,filtered.length);
+    for(var i=sStart;i<sEnd;i++){
+      var s=filtered[i];
+      var cardId='adminSkillCard_'+i;
+      var qs=s.qualityScore;
+      html+='<div class="admin-card admin-card-clickable" id="'+cardId+'" onclick="toggleAdminSkillCard(&quot;'+cardId+'&quot;,'+i+')">'+
+        '<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>'+
+            (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>':'')+
         '</div>'+
-        '<div class="admin-card-meta">'+
-          (s.description?esc(s.description)+'<br>':'')+
-          t('admin.owner')+esc(s.ownerName||s.sourceUserId||'unknown')+
-          (s.version!=null?' \u00B7 '+t('admin.version')+s.version:'')+
-          (s.qualityScore!=null?' \u00B7 '+t('admin.quality')+s.qualityScore:'')+
+          '<span class="admin-card-actions" onclick="event.stopPropagation()">'+
+            '<button class="btn btn-sm btn-ghost" onclick="adminDeleteSkill(&quot;'+escAttr(s.id)+'&quot;,&quot;'+escAttr(s.name||s.id)+'&quot;)" style="color:var(--rose)">'+t('admin.remove')+'</button>'+
+            '<button class="btn btn-sm btn-ghost admin-card-expand-btn" onclick="toggleAdminSkillCard(&quot;'+cardId+'&quot;,'+i+')">'+t('admin.expand')+'</button>'+
+            (s.sourceSkillId?'<button class="btn btn-sm btn-ghost" onclick="window.open(&quot;/api/skill/'+encodeURIComponent(s.sourceSkillId)+'/download&quot;,&quot;_blank&quot;)" style="color:var(--pri)">\u2B07</button>':'')+
+            '<span class="admin-card-time">'+formatDateTimeSeconds(s.updatedAt||s.createdAt)+'</span>'+
+          '</span>'+
         '</div>'+
-        '<div class="admin-card-actions">'+
-          '<button class="btn btn-sm btn-ghost" onclick="event.stopPropagation();adminDeleteSkill(&quot;'+escAttr(s.id)+'&quot;,&quot;'+escAttr(s.name||s.id)+'&quot;)" style="color:var(--rose)">'+t('admin.remove')+'</button>'+
-        '</div></div>';
+        (s.description?'<div class="admin-card-preview">'+esc(s.description.slice(0,150))+'</div>':'')+
+        '<div class="admin-card-detail" id="'+cardId+'_detail" onclick="event.stopPropagation()"></div>'+
+      '</div>';
     }
+    html+=adminPaginateHtml(filtered.length,adminPage.skills,'adminSkills');
   }
   el.innerHTML=html;
+  if(filterVal){var sel=document.getElementById('adminSkillFilter');if(sel)sel.value=filterVal;}
+  if(sortVal!=='newest'){var so=document.getElementById('adminSkillSort');if(so)so.value=sortVal;}
+  if(statusVal){var sf=document.getElementById('adminSkillStatusFilter');if(sf)sf.value=statusVal;}
 }
+function refilterAdminSkills(){adminPage.skills=0;renderAdminSkills(adminSkillsCache||[]);}
+function adminSkillsPage(p){if(p<0){adminPage.skills=Math.max(0,adminPage.skills-1);}else{adminPage.skills=p;}renderAdminSkills(adminSkillsCache||[]);}
 
 async function adminDeleteSkill(skillId,skillName){
-  if(!confirm(t('confirm.removeSkill').replace('{name}',skillName))) return;
+  if(!(await confirmModal(t('confirm.removeSkill').replace('{name}',skillName),{danger:true}))) return;
   try{
     var r=await fetch('/api/admin/shared-skills/'+encodeURIComponent(skillId),{method:'DELETE'});
     var d=await r.json();
@@ -4033,34 +4336,242 @@ async function adminDeleteSkill(skillId,skillName){
   }catch(e){toast(t('toast.removeFail')+': '+e.message,'error');}
 }
 
-function renderAdminSharedMemories(memories){
-  var el=document.getElementById('adminSharedMemoriesPanel');
+function renderAdminMemories(memories){
+  var el=document.getElementById('adminMemoriesPanel');
   if(!el) return;
   adminMemoriesCache=memories||[];
-  var html='<h3 style="font-size:14px;font-weight:600;color:var(--text);margin-bottom:10px">'+t('admin.sharedMemories')+' ('+(memories||[]).length+')</h3>';
-  if(!memories||memories.length===0){
+  var all=memories||[];
+  var filterVal=document.getElementById('adminMemoryFilter')?document.getElementById('adminMemoryFilter').value:'';
+  var sortVal=document.getElementById('adminMemorySort')?document.getElementById('adminMemorySort').value:'newest';
+  var roleVal=document.getElementById('adminMemoryRoleFilter')?document.getElementById('adminMemoryRoleFilter').value:'';
+  var filtered=all;
+  if(filterVal) filtered=filtered.filter(function(m){return (m.ownerName||m.sourceUserId||'')===filterVal;});
+  if(roleVal) filtered=filtered.filter(function(m){return (m.role||'')===roleVal;});
+  filtered=filtered.slice().sort(function(a,b){var ta=a.updatedAt||a.createdAt||0,tb=b.updatedAt||b.createdAt||0;return sortVal==='oldest'?ta-tb:tb-ta;});
+  var html='<div class="admin-toolbar"><h3>'+t('admin.sharedMemories')+' ('+filtered.length+'/'+all.length+')</h3>'+
+    adminToolbarHtml(all,function(m){return m.ownerName||m.sourceUserId||'';},'adminMemoryFilter','adminMemorySearch','refilterAdminMemories',{sortId:'adminMemorySort',extraFilters:[
+      {id:'adminMemoryRoleFilter',label:t('admin.filter.role'),keyFn:function(m){return m.role||''}}
+    ]})+'</div>';
+  if(filtered.length===0){
     html+='<div class="admin-empty"><span class="ae-icon">\u{1F4AD}</span>'+t('admin.noSharedMemories')+'</div>';
   }else{
-    for(var i=0;i<memories.length;i++){
-      var m=memories[i];
-      html+='<div class="admin-card" onclick="openHubMemoryDetail(\\\'admin\\\','+i+')" style="cursor:pointer"><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-meta">'+
-          t('admin.owner')+esc(m.ownerName||m.sourceUserId||'unknown')+
-          (m.kind?' \u00B7 Kind: '+esc(m.kind):'')+
-          (m.role?' \u00B7 Role: '+esc(m.role):'')+
-          ' \u00B7 '+t('admin.updated')+new Date(m.updatedAt||m.createdAt).toLocaleDateString()+
+    var mPages=Math.ceil(filtered.length/ADMIN_PAGE_SIZE);
+    if(adminPage.memories>=mPages) adminPage.memories=Math.max(0,mPages-1);
+    var mStart=adminPage.memories*ADMIN_PAGE_SIZE,mEnd=Math.min(mStart+ADMIN_PAGE_SIZE,filtered.length);
+    for(var i=mStart;i<mEnd;i++){
+      var m=filtered[i];
+      var cardId='adminMemCard_'+i;
+      var preview=m.content?esc(m.content.slice(0,120)):'';
+      html+='<div class="admin-card" id="'+cardId+'">'+
+        '<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>'+
+            (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>'+
-        '<div class="admin-card-actions">'+
+          '<span class="admin-card-actions">'+
           '<button class="btn btn-sm btn-ghost" onclick="event.stopPropagation();adminDeleteMemory(&quot;'+escAttr(m.id)+'&quot;,&quot;'+escAttr(m.summary||m.id)+'&quot;)" style="color:var(--rose)">'+t('admin.remove')+'</button>'+
-        '</div></div>';
+            '<button class="btn btn-sm btn-ghost admin-card-expand-btn" onclick="event.stopPropagation();toggleAdminMemoryCard(&quot;'+cardId+'&quot;,'+i+')">'+t('admin.expand')+'</button>'+
+            '<span class="admin-card-time">'+formatDateTimeSeconds(m.updatedAt||m.createdAt)+'</span>'+
+          '</span>'+
+        '</div>'+
+        (preview?'<div class="admin-card-preview">'+preview+'</div>':'')+
+        '<div class="admin-card-detail" id="'+cardId+'_detail"></div>'+
+      '</div>';
     }
+    html+=adminPaginateHtml(filtered.length,adminPage.memories,'adminMemories');
   }
   el.innerHTML=html;
+  if(filterVal){var sel=document.getElementById('adminMemoryFilter');if(sel)sel.value=filterVal;}
+  if(sortVal!=='newest'){var so=document.getElementById('adminMemorySort');if(so)so.value=sortVal;}
+  if(roleVal){var rf=document.getElementById('adminMemoryRoleFilter');if(rf)rf.value=roleVal;}
+}
+function refilterAdminMemories(){adminPage.memories=0;renderAdminMemories(adminMemoriesCache||[]);}
+function adminMemoriesPage(p){if(p<0){adminPage.memories=Math.max(0,adminPage.memories-1);}else{adminPage.memories=p;}renderAdminMemories(adminMemoriesCache||[]);}
+
+function toggleAdminMemoryCard(cardId,idx){
+  var card=document.getElementById(cardId);
+  if(!card) return;
+  var detail=document.getElementById(cardId+'_detail');
+  var btn=card.querySelector('.admin-card-expand-btn');
+  if(card.classList.contains('expanded')){
+    card.classList.remove('expanded');
+    if(btn) btn.textContent=t('admin.expand');
+    return;
+  }
+  card.classList.add('expanded');
+  if(btn) btn.textContent=t('admin.collapse');
+  if(detail.getAttribute('data-loaded')) return;
+  detail.setAttribute('data-loaded','1');
+  var m=(adminMemoriesCache||[])[idx];
+  if(!m){detail.innerHTML='<div style="color:var(--text-muted);font-size:13px">'+t('admin.noContent')+'</div>';return;}
+  var metaHtml='<div class="admin-card-detail-meta">'+
+    (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>'+
+    (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>';
+  var summaryHtml=m.summary?'<div class="admin-card-detail-section"><div class="detail-label">'+t('admin.summary')+'</div><div style="font-size:13px;color:var(--text);line-height:1.6">'+esc(m.summary)+'</div></div>':'';
+  var contentHtml='<div class="admin-card-detail-section"><div class="detail-label">'+t('admin.contentLabel')+'</div><div class="admin-card-detail-content" id="'+cardId+'_content">'+
+    (m.content?esc(m.content):t('sharing.loading'))+'</div></div>';
+  detail.innerHTML=metaHtml+summaryHtml+contentHtml;
+  if(!m.content&&(m.remoteHitId||m.id)){
+    fetch('/api/sharing/memory-detail',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({remoteHitId:m.remoteHitId||m.id})})
+    .then(function(r){return r.json();}).then(function(d){
+      var ce=document.getElementById(cardId+'_content');
+      if(!ce) return;
+      if(!d.error&&d.content){ce.textContent=d.content;}
+      else{ce.textContent=t('admin.noContent');}
+    }).catch(function(){
+      var ce=document.getElementById(cardId+'_content');
+      if(ce) ce.textContent=t('admin.noContent');
+    });
+  }
+}
+
+async function toggleAdminTaskCard(cardId,idx){
+  var card=document.getElementById(cardId);
+  if(!card) return;
+  var detail=document.getElementById(cardId+'_detail');
+  var btn=card.querySelector('.admin-card-expand-btn');
+  if(card.classList.contains('expanded')){
+    card.classList.remove('expanded');
+    if(btn) btn.textContent=t('admin.expand');
+    return;
+  }
+  card.classList.add('expanded');
+  if(btn) btn.textContent=t('admin.collapse');
+  if(detail.getAttribute('data-loaded')) return;
+  detail.setAttribute('data-loaded','1');
+  var tk=(adminTasksCache||[])[idx];
+  if(!tk){detail.innerHTML='<div style="color:var(--text-muted);font-size:14px;padding:12px">'+t('admin.noContent')+'</div>';return;}
+  var localTaskId=tk.sourceTaskId||tk.id;
+  detail.innerHTML='<div class="spinner"></div>';
+  var task=null;
+  try{
+    var r=await fetch('/api/task/'+encodeURIComponent(localTaskId));
+    if(r.ok) task=await r.json();
+  }catch(e){}
+  if(!task){detail.innerHTML='<div style="color:var(--text-muted);font-size:14px;padding:12px">'+t('admin.noContent')+'</div>';return;}
+  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>'+
+    (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>':'')+
+    (task.endedAt?'<span class="meta-item">\u2192 '+formatDateTimeSeconds(task.endedAt)+'</span>':'')+
+    '<span class="meta-item">'+t('admin.updated')+new Date(tk.updatedAt||tk.createdAt||0).toLocaleString(dateLoc())+'</span>'+
+  '</div>';
+  var summaryHtml=(task.summary||tk.summary)?
+    '<div class="admin-card-detail-section admin-task-summary"><div class="detail-label">'+t('admin.summary')+'</div><div class="admin-task-summary-body">'+renderSummaryHtml(task.summary||tk.summary)+'</div></div>':
+    '<div class="admin-card-detail-section"><div style="color:var(--text-muted);font-size:14px">'+t('admin.noContent')+'</div></div>';
+  var chunksHtml='';
+  if(task.chunks&&task.chunks.length>0){
+    var safeId=cardId.replace(/[^a-zA-Z0-9_-]/g,'_');
+    chunksHtml='<div class="admin-card-detail-section"><div class="detail-label">'+t('tasks.chunks')+' ('+task.chunks.length+')</div><div class="admin-task-chunks">'+
+      task.chunks.map(function(c,i){
+        var role=c.role||'assistant';
+        var roleLabel=role==='user'?t('tasks.role.user'):role==='assistant'?t('tasks.role.assistant'):role.toUpperCase();
+        var bid='admchunk_b_'+safeId+'_'+i;
+        var eid='admchunk_e_'+safeId+'_'+i;
+        return '<div class="adm-msg">'+
+          '<div class="adm-msg-side '+role+'"><div class="adm-msg-role">'+roleLabel+'</div><div class="adm-msg-time">'+formatDateTimeSeconds(c.createdAt)+'</div></div>'+
+          '<div style="flex:1;min-width:0"><div class="adm-msg-body collapsed" id="'+bid+'">'+esc(c.content||'')+'</div>'+
+          '<div class="adm-msg-toggle" id="'+eid+'" onclick="event.stopPropagation();toggleAdminChunkExpand(&quot;'+cardId.replace(/"/g,'&amp;quot;')+'&quot;,'+i+')">'+t('tasks.expand')+'</div></div></div>';
+      }).join('')+'</div></div>';
+  }else{
+    chunksHtml='<div class="admin-card-detail-section"><div class="detail-label">'+t('tasks.chunks')+'</div><div style="color:var(--text-muted);font-size:13px;padding:8px 0">'+t('tasks.nochunks')+'</div></div>';
+  }
+  detail.innerHTML=metaHtml+summaryHtml+chunksHtml;
+  if(task.chunks&&task.chunks.length>0) setTimeout(function(){initAdminChunkExpanders(cardId,task.chunks.length)},50);
+}
+function toggleAdminChunkExpand(cardId,i){
+  var safeId=cardId.replace(/[^a-zA-Z0-9_-]/g,'_');
+  var b=document.getElementById('admchunk_b_'+safeId+'_'+i);
+  var e=document.getElementById('admchunk_e_'+safeId+'_'+i);
+  if(!b||!e)return;
+  if(b.classList.contains('collapsed')){b.classList.remove('collapsed');e.textContent=t('tasks.collapse');}
+  else{b.classList.add('collapsed');e.textContent=t('tasks.expand');}
+}
+function initAdminChunkExpanders(cardId,count){
+  var safeId=cardId.replace(/[^a-zA-Z0-9_-]/g,'_');
+  for(var i=0;i<count;i++){
+    var b=document.getElementById('admchunk_b_'+safeId+'_'+i);
+    var e=document.getElementById('admchunk_e_'+safeId+'_'+i);
+    if(b&&b.scrollHeight>b.clientHeight+4&&e)e.style.display='block';
+    else if(b)b.classList.remove('collapsed');
+  }
+}
+
+async function toggleAdminSkillCard(cardId,idx){
+  var card=document.getElementById(cardId);
+  if(!card) return;
+  var detail=document.getElementById(cardId+'_detail');
+  var btn=card.querySelector('.admin-card-expand-btn');
+  if(card.classList.contains('expanded')){
+    card.classList.remove('expanded');
+    if(btn) btn.textContent=t('admin.expand');
+    return;
+  }
+  card.classList.add('expanded');
+  if(btn) btn.textContent=t('admin.collapse');
+  if(detail.getAttribute('data-loaded')) return;
+  detail.setAttribute('data-loaded','1');
+  var sk=(adminSkillsCache||[])[idx];
+  if(!sk){detail.innerHTML='<div style="color:var(--text-muted);font-size:13px">'+t('admin.noContent')+'</div>';return;}
+  detail.innerHTML='<div class="spinner"></div>';
+  var localSkillId=sk.sourceSkillId||sk.id;
+  var localData=null;
+  try{
+    var lr=await fetch('/api/skill/'+encodeURIComponent(localSkillId));
+    if(lr.ok) localData=await lr.json();
+  }catch(e){}
+  var localSkill=localData&&localData.skill?localData.skill:sk;
+  var files=localData&&localData.files?localData.files:[];
+  var versions=localData&&localData.versions?localData.versions:[];
+  var qs=localSkill.qualityScore!=null?localSkill.qualityScore:sk.qualityScore;
+  var metaHtml='<div class="admin-card-detail-meta">'+
+    (localSkill.version!=null?'<span class="meta-item"><span class="skill-badge version">v'+localSkill.version+'</span></span>':'')+
+    (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>'+
+    (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>';
+  var descHtml=(localSkill.description||sk.description)?'<div class="admin-card-detail-section"><div class="detail-label">'+t('admin.description')+'</div><div style="font-size:13px;color:var(--text);line-height:1.6">'+esc(localSkill.description||sk.description)+'</div></div>':'';
+  var filesHtml='';
+  if(files.length>0){
+    var fileIcons={'skill':'\u{1F4D6}','script':'\u{2699}','reference':'\u{1F4CE}','file':'\u{1F4C4}'};
+    filesHtml='<div class="admin-card-detail-section"><div class="detail-label" style="display:flex;align-items:center;justify-content:space-between">'+t('skills.files')+
+      '<button class="btn btn-sm btn-ghost" onclick="event.stopPropagation();window.open(\\x27/api/skill/'+encodeURIComponent(localSkillId)+'/download\\x27,\\x27_blank\\x27)" style="font-size:11px">\u2B07 '+t('skills.download')+'</button>'+
+      '</div><div class="skill-files-list">'+
+      files.map(function(f){return '<div class="skill-file-item">'+
+        '<span class="skill-file-icon">'+(fileIcons[f.type]||'\u{1F4C4}')+'</span>'+
+        '<span class="skill-file-name">'+esc(f.path)+'</span>'+
+        '<span class="skill-file-type">'+f.type+'</span>'+
+        '<span class="skill-file-size">'+(f.size>1024?(f.size/1024).toFixed(1)+'KB':f.size+'B')+'</span>'+
+      '</div>';}).join('')+
+    '</div></div>';
+  }
+  var contentHtml='';
+  if(versions.length>0&&versions[0].content){
+    contentHtml='<div class="admin-card-detail-section"><div class="detail-label">SKILL.md (v'+versions[0].version+')</div><div class="admin-card-detail-content">'+renderSkillMarkdown(versions[0].content)+'</div></div>';
+  }else if(localSkill.content||sk.content){
+    contentHtml='<div class="admin-card-detail-section"><div class="detail-label">'+t('admin.contentLabel')+'</div><div class="admin-card-detail-content"><pre style="margin:0;white-space:pre-wrap">'+esc(localSkill.content||sk.content)+'</pre></div></div>';
+  }
+  detail.innerHTML=metaHtml+descHtml+filesHtml+contentHtml;
+  if(!descHtml&&!filesHtml&&!contentHtml){
+    detail.innerHTML+=('<div style="color:var(--text-muted);font-size:13px;padding:8px 0">'+t('admin.noContent')+'</div>');
+  }
 }
 
 async function adminDeleteMemory(memoryId,memoryTitle){
-  if(!confirm(t('confirm.removeMemory').replace('{name}',memoryTitle))) return;
+  if(!(await confirmModal(t('confirm.removeMemory').replace('{name}',memoryTitle),{danger:true}))) return;
   try{
     var r=await fetch('/api/admin/shared-memories/'+encodeURIComponent(memoryId),{method:'DELETE'});
     var d=await r.json();
@@ -4073,7 +4584,7 @@ function renderSharingMemorySearchResults(data,query){
   const localHits=(data&&data.local&&Array.isArray(data.local.hits))?data.local.hits:[];
   const hubHits=(data&&data.hub&&Array.isArray(data.hub.hits))?data.hub.hits:[];
   document.getElementById('searchMeta').textContent='Search results for "'+query+'"';
-  document.getElementById('sharingSearchMeta').textContent='Local '+localHits.length+' · Hub '+hubHits.length;
+  document.getElementById('sharingSearchMeta').textContent=t('scope.local')+' '+localHits.length+' · '+t('scope.hub')+' '+hubHits.length;
   document.getElementById('pagination').innerHTML='';
   list.innerHTML=''+
     '<div class="result-section">'+
@@ -4113,7 +4624,7 @@ async function openSharedMemoryDetail(remoteHitId,title,owner,groupName){
   currentSharedMemoryHitId=remoteHitId;
   document.getElementById('sharedMemoryOverlay').classList.add('show');
   document.getElementById('sharedMemoryTitle').textContent=title||t('search.sharedMemory');
-  document.getElementById('sharedMemoryMeta').innerHTML='<span class="meta-item">Hub</span>'+(owner?'<span class="meta-item">'+t('admin.owner')+esc(owner)+'</span>':'')+(groupName?'<span class="meta-item">'+t('admin.group')+esc(groupName)+'</span>':'');
+  document.getElementById('sharedMemoryMeta').innerHTML='<span class="meta-item">'+t('scope.hub')+'</span>'+(owner?'<span class="meta-item">'+t('admin.owner')+esc(owner)+'</span>':'')+(groupName?'<span class="meta-item">'+t('admin.group')+esc(groupName)+'</span>':'');
   document.getElementById('sharedMemorySummary').textContent=t('sharing.loading');
   document.getElementById('sharedMemoryContent').textContent='';
   try{
@@ -4139,18 +4650,19 @@ async function openHubMemoryDetail(cacheKey,idx){
   if(!m) return;
   var overlay=document.getElementById('sharedMemoryOverlay');
   overlay.classList.add('show');
-  document.getElementById('sharedMemoryTitle').textContent=m.summary||m.content?.slice(0,80)||'(no summary)';
-  var metaHtml='<span class="meta-item">\\u{1F310} Hub</span>'+
+  var titleText=m.summary||m.content?.slice(0,80)||'(no summary)';
+  document.getElementById('sharedMemoryTitle').textContent=titleText;
+  var metaHtml='<span class="meta-item">\\u{1F310} '+t('scope.hub')+'</span>'+
     (m.ownerName?'<span class="meta-item">'+t('admin.owner')+esc(m.ownerName)+'</span>':'')+
     (m.groupName?'<span class="meta-item">'+t('admin.group')+esc(m.groupName)+'</span>':'')+
-    (m.kind?'<span class="meta-item">Kind: '+esc(m.kind)+'</span>':'')+
-    (m.role?'<span class="meta-item">Role: '+esc(m.role)+'</span>':'')+
-    '<span class="meta-item">visibility: '+esc(m.visibility||'hub')+'</span>'+
+    (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">'+new Date(m.updatedAt||m.createdAt||0).toLocaleString(dateLoc())+'</span>';
   document.getElementById('sharedMemoryMeta').innerHTML=metaHtml;
   document.getElementById('sharedMemorySummary').textContent=m.summary||'';
-  document.getElementById('sharedMemoryContent').textContent=m.content||t('sharing.loading');
-  // try to fetch full content from Hub API
+  var hasContent=m.content&&m.content.length>0;
+  document.getElementById('sharedMemoryContent').textContent=hasContent?m.content:t('sharing.loading');
   var remoteId=m.remoteHitId||m.id;
   if(remoteId){
     try{
@@ -4159,8 +4671,14 @@ async function openHubMemoryDetail(cacheKey,idx){
       if(!d.error&&(d.content||d.summary)){
         if(d.summary) document.getElementById('sharedMemorySummary').textContent=d.summary;
         document.getElementById('sharedMemoryContent').textContent=d.content||m.content||'';
+      }else if(!hasContent){
+        document.getElementById('sharedMemoryContent').textContent=m.content||t('memory.detail.notFound');
       }
-    }catch(e){}
+    }catch(e){
+      if(!hasContent) document.getElementById('sharedMemoryContent').textContent=m.content||t('memory.detail.notFound');
+    }
+  }else if(!hasContent){
+    document.getElementById('sharedMemoryContent').textContent=t('memory.detail.notFound');
   }
 }
 
@@ -4173,11 +4691,11 @@ function openHubTaskDetailFromCache(cacheKey,idx){
   document.getElementById('taskDetailTitle').textContent=task.title||'(no title)';
   document.getElementById('taskShareActions').innerHTML='';
   var meta=[
-    '<span class="meta-item">\\u{1F310} Hub</span>',
+    '<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>',
     task.groupName?'<span class="meta-item">'+t('admin.group')+esc(task.groupName)+'</span>':'',
-    '<span class="meta-item">visibility: '+esc(task.visibility||'hub')+'</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>':'',
     task.startedAt?'<span class="meta-item">\\u{1F4C5} '+formatTime(task.startedAt)+'</span>':'',
     task.endedAt?'<span class="meta-item">\\u2192 '+formatTime(task.endedAt)+'</span>':'',
@@ -4201,7 +4719,7 @@ function openHubSkillDetailFromCache(cacheKey,idx){
   var qs=skill.qualityScore;
   var qsBadge=(qs!==null&&qs!==undefined)?'<span class="meta-item"><span class="skill-badge quality '+(qs>=7?'high':qs>=5?'mid':'low')+'">\\u2605 '+(+qs).toFixed(1)+'/10</span></span>':'';
   var meta=[
-    '<span class="meta-item">\\u{1F310} Hub</span>',
+    '<span class="meta-item">\\u{1F310} '+t('scope.hub')+'</span>',
     skill.version!=null?'<span class="meta-item"><span class="skill-badge version">v'+skill.version+'</span></span>':'',
     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>',
@@ -4220,26 +4738,163 @@ function openHubSkillDetailFromCache(cacheKey,idx){
   if(visBtn) visBtn.style.display='none';
   var dlBtn=document.getElementById('skillDownloadBtn');
   if(dlBtn) dlBtn.style.display='none';
-  var shareBtn=document.getElementById('skillShareActions');
-  if(shareBtn) shareBtn.innerHTML='';
+  var scopeBadge=document.getElementById('skillScopeBadge');
+  if(scopeBadge) scopeBadge.innerHTML='';
 }
 
 function escAttr(s){return String(s||'').replace(/&/g,'&amp;').replace(/'/g,'&#39;').replace(/"/g,'&quot;').replace(/</g,'&lt;').replace(/>/g,'&gt;');}
 
+/* ─── Unified Sharing Scope Selector ─── */
+
+function getScopeLabel(scope){
+  if(scope==='team') return t('share.scope.team');
+  if(scope==='local') return t('share.scope.local');
+  return t('share.scope.private');
+}
+function getScopeIcon(scope){
+  if(scope==='team') return '\\u{1F310}';
+  if(scope==='local') return '\\u{1F465}';
+  return '\\u{1F512}';
+}
+function getScopeColor(scope){
+  if(scope==='team') return '#22c55e';
+  if(scope==='local') return '#3b82f6';
+  return '#f59e0b';
+}
+
+function renderScopeBadge(scope){
+  var color=getScopeColor(scope);
+  var icon=getScopeIcon(scope);
+  var label=getScopeLabel(scope);
+  if(scope==='private') return '<span style="display:inline-flex;align-items:center;gap:3px;padding:2px 8px;background:'+color+'14;border:1px solid '+color+'33;border-radius:10px;font-size:11px;color:'+color+'">'+icon+' '+label+'</span>';
+  return '<span style="display:inline-flex;align-items:center;gap:3px;padding:2px 8px;background:'+color+'18;border:1px solid '+color+'44;border-radius:10px;font-size:11px;color:'+color+'">'+icon+' '+label+'</span>';
+}
+
+function openScopeSelectorModal(resourceType, resourceId, currentScope, onConfirm){
+  var existing=document.getElementById('scopeSelectorOverlay');
+  if(existing) existing.remove();
+  var teamEnabled=sharingStatusCache&&sharingStatusCache.enabled;
+  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';
+  var scopeDescs={private:'',local:'',team:t('share.scope.teamIncludes')};
+  var scopes=['private','local','team'];
+  var h='<div style="background:var(--bg-card);border:1px solid var(--border-glow);border-radius:12px;padding:0;width:340px;box-shadow:0 16px 48px rgba(0,0,0,0.35);overflow:hidden">';
+  h+='<div style="padding:14px 18px 10px;border-bottom:1px solid var(--border)">';
+  h+='<div style="font-size:14px;font-weight:600;color:var(--text)">'+t('share.scope.title')+'</div>';
+  h+='</div>';
+  h+='<div style="padding:6px 8px">';
+  for(var i=0;i<scopes.length;i++){
+    var sc=scopes[i];
+    var isCurrent=sc===currentScope;
+    var isDisabled=sc==='team'&&!teamEnabled;
+    var color=getScopeColor(sc);
+    var cursor=isDisabled?'not-allowed':'pointer';
+    var opacity=isDisabled?'0.4':'1';
+    var selBg=isCurrent?color+'16':'transparent';
+    var selBorder=isCurrent?'2px solid '+color+'55':'2px solid transparent';
+    h+='<div class="scope-option'+(isCurrent?' selected':'')+'" data-scope="'+sc+'" data-color="'+color+'" style="display:flex;align-items:center;gap:12px;padding:10px 12px;margin:3px 0;border:'+selBorder+';border-radius:10px;background:'+selBg+';cursor:'+cursor+';opacity:'+opacity+';transition:all 0.12s ease"';
+    if(!isDisabled) h+=' onclick="selectScopeOption(this,\\''+sc+'\\')"';
+    h+='>';
+    h+='<div style="width:34px;height:34px;border-radius:9px;background:'+color+'22;display:flex;align-items:center;justify-content:center;font-size:17px;flex-shrink:0">'+getScopeIcon(sc)+'</div>';
+    h+='<div style="flex:1;min-width:0">';
+    h+='<div style="font-size:13px;font-weight:600;color:var(--text);display:flex;align-items:center;gap:6px">'+getScopeLabel(sc);
+    if(isCurrent) h+='<span style="font-size:10px;font-weight:600;color:#fff;background:'+color+';padding:1px 7px;border-radius:4px">'+t('share.scope.current')+'</span>';
+    h+='</div>';
+    var desc=isDisabled?t('share.scope.teamDisabled'):(scopeDescs[sc]||'');
+    if(desc) h+='<div style="font-size:11px;color:var(--text-sec);margin-top:2px;line-height:1.3">'+desc+'</div>';
+    h+='</div></div>';
+  }
+  h+='</div>';
+  h+='<div style="padding:8px 14px 12px;border-top:1px solid var(--border);display:flex;gap:8px;justify-content:flex-end">';
+  h+='<button class="btn btn-sm btn-ghost" onclick="closeScopeSelectorModal()" style="font-size:13px">'+t('share.scope.cancel')+'</button>';
+  h+='<button class="btn btn-sm" id="scopeConfirmBtn" onclick="confirmScopeSelection()" disabled style="font-size:13px;min-width:56px">'+t('share.scope.confirm')+'</button>';
+  h+='</div></div>';
+  overlay.innerHTML=h;
+  overlay.addEventListener('click',function(e){if(e.target===overlay)closeScopeSelectorModal();});
+  document.body.appendChild(overlay);
+  window._scopeSelectionState={resourceType:resourceType,resourceId:resourceId,currentScope:currentScope,selectedScope:currentScope,onConfirm:onConfirm};
+}
+function selectScopeOption(el,scope){
+  if(!window._scopeSelectionState)return;
+  var overlay=document.getElementById('scopeSelectorOverlay');
+  if(!overlay)return;
+  var color=getScopeColor(scope);
+  var options=overlay.querySelectorAll('.scope-option');
+  options.forEach(function(opt){opt.classList.remove('selected');opt.style.border='2px solid transparent';opt.style.background='transparent';});
+  el.classList.add('selected');
+  el.style.border='2px solid '+color+'55';
+  el.style.background=color+'16';
+  window._scopeSelectionState.selectedScope=scope;
+  document.getElementById('scopeConfirmBtn').disabled=(scope===window._scopeSelectionState.currentScope);
+}
+function closeScopeSelectorModal(){
+  var overlay=document.getElementById('scopeSelectorOverlay');
+  if(overlay) overlay.remove();
+  window._scopeSelectionState=null;
+}
+async function confirmScopeSelection(){
+  if(!window._scopeSelectionState)return;
+  var st=Object.assign({},window._scopeSelectionState);
+  var newScope=st.selectedScope;
+  var oldScope=st.currentScope;
+  if(newScope===oldScope){closeScopeSelectorModal();return;}
+  closeScopeSelectorModal();
+  var shrinking=(oldScope==='team'&&newScope!=='team')||(oldScope==='local'&&newScope==='private');
+  if(shrinking){
+    var msg=oldScope==='team'&&newScope==='local'?t('share.scope.shrinkToLocal'):
+            oldScope==='team'&&newScope==='private'?t('share.scope.shrinkToPrivate'):
+            t('share.scope.shrinkLocalToPrivate');
+    if(!(await confirmModal(msg,{danger:true})))return;
+  }
+  try{
+    var url='/api/'+st.resourceType+'/'+st.resourceId+'/scope';
+    var r=await fetch(url,{method:'PUT',headers:{'Content-Type':'application/json'},body:JSON.stringify({scope:newScope})});
+    var d=await r.json();
+    if(d.ok){
+      toast(t('share.scope.changed'),'success');
+      if(st.onConfirm) st.onConfirm(newScope);
+      else loadAll();
+    }else{
+      toast(d.error||t('share.scope.changeFail'),'error');
+    }
+  }catch(e){toast(t('share.scope.changeFail')+': '+e.message,'error');}
+}
+
 function renderTaskShareActions(task){
   currentTaskDetail=task||null;
   const el=document.getElementById('taskShareActions');
   if(!el){return;}
   if(!task||!task.id){el.innerHTML='';return;}
-  const current=(task.sharingVisibility||task.visibility||null);
-  const isShared=!!current;
-  var statusHtml='';
-  if(isShared){
-    statusHtml='<span style="display:inline-flex;align-items:center;gap:4px;padding:3px 10px;background:#22c55e22;border:1px solid #22c55e44;border-radius:12px;font-size:12px;color:#22c55e">\u2713 '+t('share.alreadyShared')+'</span>';
+  var isLocalShared=task.owner==='public';
+  var isTeamShared=!!(task.sharingVisibility||task.hubTaskId);
+  var currentScope=isTeamShared?'team':isLocalShared?'local':'private';
+  if(task.status==='completed'){
+    el.innerHTML=renderScopeBadge(currentScope)+
+      '<button class="btn btn-sm btn-ghost" onclick="openTaskScopeModal()">\u270F '+t('share.shareBtn')+'</button>';
+  }else{
+    el.innerHTML=renderScopeBadge(currentScope)+
+      '<button class="btn btn-sm btn-ghost" style="opacity:0.45;cursor:not-allowed" onclick="toast(t(\\x27share.scope.taskNotCompleted\\x27),\\x27warn\\x27)">\u270F '+t('share.shareBtn')+'</button>';
   }
-  el.innerHTML=statusHtml+
-    '<button class="btn btn-sm" onclick="shareCurrentTask()">'+(isShared?t('share.updateBtn'):t('share.shareBtn'))+'</button>'+
-    (isShared?'<button class="btn btn-sm btn-ghost" onclick="unshareCurrentTask()">'+t('share.unshareBtn')+'</button>':'');
+}
+function openTaskScopeModal(){
+  if(!currentTaskDetail) return;
+  var task=currentTaskDetail;
+  var isLocalShared=task.owner==='public';
+  var isTeamShared=!!(task.sharingVisibility||task.hubTaskId);
+  var cs=isTeamShared?'team':isLocalShared?'local':'private';
+  openScopeSelectorModal('task',task.id,cs,function(s){
+    if(s==='team'){task.sharingVisibility='public';task.hubTaskId=task.hubTaskId||'shared';}
+    else if(s==='local'){task.sharingVisibility=null;task.owner='public';}
+    else{task.sharingVisibility=null;task.owner=task._origOwner||'agent:main';}
+    renderTaskShareActions(task);
+    updateTaskCardBadge(task.id,s);
+  });
+}
+function openTaskScopeModalFromList(taskId,currentScope){
+  openScopeSelectorModal('task',taskId,currentScope,function(s){
+    updateTaskCardBadge(taskId,s);
+  });
 }
 
 async function shareCurrentTask(){
@@ -4262,18 +4917,34 @@ async function unshareCurrentTask(){
 }
 
 function renderSkillShareActions(skill){
-  const el=document.getElementById('skillShareActions');
+  var el=document.getElementById('skillScopeBadge');
   if(!el){return;}
   if(!skill||!skill.id){el.innerHTML='';return;}
-  const current=(skill.sharingVisibility||null);
-  const isShared=!!current;
-  var statusHtml='';
-  if(isShared){
-    statusHtml='<span style="display:inline-flex;align-items:center;gap:4px;padding:3px 10px;background:#22c55e22;border:1px solid #22c55e44;border-radius:12px;font-size:12px;color:#22c55e">\u2713 '+t('share.alreadyShared')+'</span>';
-  }
-  el.innerHTML=statusHtml+
-    '<button class="btn btn-sm" onclick="shareCurrentSkill()">'+(isShared?t('share.updateBtn'):t('share.shareBtn'))+'</button>'+
-    (isShared?'<button class="btn btn-sm btn-ghost" onclick="unshareCurrentSkill()">'+t('share.unshareBtn')+'</button>':'');
+  var isLocalShared=skill.visibility==='public';
+  var isTeamShared=!!(skill.sharingVisibility);
+  var currentScope=isTeamShared?'team':isLocalShared?'local':'private';
+  el.innerHTML=renderScopeBadge(currentScope);
+}
+function openSkillScopeModal(){
+  if(!currentSkillDetail) return;
+  var skill=currentSkillDetail;
+  var isLocalShared=skill.visibility==='public';
+  var isTeamShared=!!skill.sharingVisibility;
+  var cs=isTeamShared?'team':isLocalShared?'local':'private';
+  openScopeSelectorModal('skill',skill.id,cs,function(s){
+    if(s==='team'){skill.sharingVisibility='public';}
+    else if(s==='local'){skill.sharingVisibility=null;skill.visibility='public';}
+    else{skill.sharingVisibility=null;skill.visibility='private';}
+    renderSkillShareActions(skill);
+    var scopeBadgeEl=document.getElementById('skillScopeBadge');
+    if(scopeBadgeEl) scopeBadgeEl.innerHTML=renderScopeBadge(s);
+    updateSkillCardBadge(skill.id,s);
+  });
+}
+function openSkillScopeModalFromList(skillId,currentScope){
+  openScopeSelectorModal('skill',skillId,currentScope,function(s){
+    updateSkillCardBadge(skillId,s);
+  });
 }
 
 async function shareCurrentSkill(){
@@ -4299,18 +4970,34 @@ async function shareMemoryPrompt(chunkId){
   try{
     const r=await fetch('/api/sharing/memories/share',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({chunkId:chunkId,visibility:'public'})});
     const d=await r.json();
-    if(d.ok){toast(t('toast.memoryShared'),'success');loadMemories();} else {toast(d.error||t('toast.memoryShareFail'),'error');}
+    if(d.ok){
+      toast(t('toast.memoryShared'),'success');
+      if(memoryCache[chunkId]){memoryCache[chunkId].sharingVisibility='public';}
+      updateMemoryCardBadge(chunkId,'team');
+    } else {toast(d.error||t('toast.memoryShareFail'),'error');}
   }catch(e){toast(t('toast.memoryShareFail')+': '+e.message,'error');}
 }
 
 async function unshareMemory(chunkId){
+  if(!(await confirmModal(t('share.memoryUnshareConfirm'),{danger:true}))) return;
   try{
     const r=await fetch('/api/sharing/memories/unshare',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({chunkId:chunkId})});
     const d=await r.json();
-    if(d.ok){toast(t('toast.memoryUnshared'),'success');loadMemories();} else {toast(d.error||t('toast.memoryUnshareFail'),'error');}
+    if(d.ok){
+      toast(t('toast.memoryUnshared'),'success');
+      if(memoryCache[chunkId]){memoryCache[chunkId].sharingVisibility=null;}
+      var m=memoryCache[chunkId];
+      var newScope=(m&&m.owner==='public')?'local':'private';
+      updateMemoryCardBadge(chunkId,newScope);
+    } else {toast(d.error||t('toast.memoryUnshareFail'),'error');}
   }catch(e){toast(t('toast.memoryUnshareFail')+': '+e.message,'error');}
 }
 
+function localMemoryErrorMessage(err){
+  if(err==='original_owner_missing') return t('share.local.originalOwnerMissing');
+  return err||t('toast.opfail');
+}
+
 function debounceSkillSearch(){
   clearTimeout(skillSearchTimer);
   skillSearchTimer=setTimeout(function(){loadSkills();},300);
@@ -4700,10 +5387,13 @@ async function loadTasks(){
       const timeStr=formatTime(task.startedAt);
       const endStr=task.endedAt?formatTime(task.endedAt):'';
       const durationStr=task.endedAt?formatDuration(task.endedAt-task.startedAt):'';
+      var taskIsLocalShared=task.owner==='public';
+      var taskIsTeamShared=!!task.sharingVisibility;
+      var taskScope=taskIsTeamShared?'team':taskIsLocalShared?'local':'private';
       return '<div class="task-card status-'+task.status+'" onclick="openTaskDetail(\\''+task.id+'\\')">'+
         '<div class="task-card-top">'+
           '<div class="task-card-title">'+esc(task.title)+'</div>'+
-          '<span class="task-status-badge '+task.status+'">'+t('tasks.status.'+task.status)+'</span>'+
+          '<div class="task-card-badges">'+renderScopeBadge(taskScope)+'<span class="task-status-badge '+task.status+'">'+t('tasks.status.'+task.status)+'</span></div>'+
         '</div>'+
         (task.summary?'<div class="task-card-summary'+(task.status==='skipped'?' skipped-reason':'')+'">'+esc(task.summary)+'</div>':'')+
         '<div class="task-card-bottom">'+
@@ -4715,6 +5405,9 @@ async function loadTasks(){
         '<div class="card-actions" onclick="event.stopPropagation()">'+
           '<button class="btn btn-sm btn-ghost" onclick="openTaskDetail(\\''+task.id+'\\')">'+t('card.expand')+'</button>'+
           (task.status==='completed'&&(!task.skillStatus||task.skillStatus==='not_generated'||task.skillStatus==='skipped')?'<button class="btn btn-sm btn-ghost" onclick="retrySkillGen(\\''+task.id+'\\')">'+t('task.retrySkill.short')+'</button>':'')+
+          (task.status==='completed'
+            ?'<button class="btn btn-sm btn-ghost" onclick="openTaskScopeModalFromList(\\''+task.id+'\\',\\''+taskScope+'\\')">\\u270F '+t('share.shareBtn')+'</button>'
+            :'<button class="btn btn-sm btn-ghost" style="opacity:0.45;cursor:not-allowed" onclick="toast(t(\\x27share.scope.taskNotCompleted\\x27),\\x27warn\\x27)">\\u270F '+t('share.shareBtn')+'</button>')+
           '<button class="btn btn-sm btn-ghost" style="color:var(--accent)" onclick="deleteTask(\\''+task.id+'\\')">'+t('task.delete')+'</button>'+
         '</div>'+
       '</div>';
@@ -4727,6 +5420,20 @@ async function loadTasks(){
   }
 }
 
+function updateTaskCardBadge(taskId,newScope){
+  var cards=document.querySelectorAll('.task-card');
+  for(var i=0;i<cards.length;i++){
+    var onclick=cards[i].getAttribute('onclick')||'';
+    if(onclick.indexOf(taskId)===-1) continue;
+    var badges=cards[i].querySelector('.task-card-badges');
+    if(!badges) continue;
+    var oldBadge=badges.querySelectorAll('span[style*="border-radius:10px"]');
+    for(var j=0;j<oldBadge.length;j++) oldBadge[j].remove();
+    badges.insertAdjacentHTML('afterbegin',renderScopeBadge(newScope));
+    break;
+  }
+}
+
 function renderTasksPagination(total){
   const el=document.getElementById('tasksPagination');
   const pages=Math.ceil(total/TASKS_PER_PAGE);
@@ -4766,9 +5473,9 @@ async function openTaskDetail(taskId){
 
     const meta=[
       '<span class="meta-item"><span class="task-status-badge '+task.status+'">'+t('tasks.status.'+task.status)+'</span></span>',
-      '<span class="meta-item">\\u{1F4C5} '+formatTime(task.startedAt)+'</span>',
+      '<span class="meta-item">\\u{1F4C5} '+formatDateTimeSeconds(task.startedAt)+'</span>',
     ];
-    if(task.endedAt) meta.push('<span class="meta-item">\\u2192 '+formatTime(task.endedAt)+'</span>');
+    if(task.endedAt) meta.push('<span class="meta-item">\\u2192 '+formatDateTimeSeconds(task.endedAt)+'</span>');
     meta.push('<span class="meta-item">\\u{1F4C2} '+task.sessionKey+'</span>');
     meta.push('<span class="meta-item">\\u{1F4DD} '+task.chunks.length+' '+t('tasks.chunks.label')+'</span>');
     meta.push('<div style="width:100%;margin-top:4px"><span class="meta-item" style="width:100%">'+t('tasks.taskid')+'<span class="task-id-full">'+esc(task.id)+'</span></span></div>');
@@ -4793,11 +5500,17 @@ async function openTaskDetail(taskId){
     }else{
       document.getElementById('taskDetailChunks').innerHTML=task.chunks.map(function(c,i){
         var roleLabel=c.role==='user'?t('tasks.role.user'):c.role==='assistant'?t('tasks.role.assistant'):c.role.toUpperCase();
+        var avatarIcon=c.role==='user'?'U':c.role==='assistant'?'A':'T';
         return '<div class="task-chunk-item role-'+c.role+'">'+
+          '<div class="task-chunk-avatar">'+avatarIcon+'</div>'+
+          '<div class="task-chunk-body">'+
+            '<div class="task-chunk-header">'+
           '<div class="task-chunk-role '+c.role+'">'+roleLabel+'</div>'+
+              '<div class="task-chunk-time">'+formatDateTimeSeconds(c.createdAt)+'</div>'+
+            '</div>'+
           '<div class="task-chunk-bubble collapsed" id="chunk_b_'+i+'">'+esc(c.content)+'</div>'+
           '<div class="task-chunk-expand" id="chunk_e_'+i+'" onclick="toggleChunkExpand('+i+')"><span class="expand-arrow">▼</span> <span class="expand-label">'+t('tasks.expand')+'</span></div>'+
-          '<div class="task-chunk-time">'+formatTime(c.createdAt)+'</div>'+
+          '</div>'+
         '</div>';
       }).join('');
       setTimeout(function(){initChunkExpanders(task.chunks.length)},50);
@@ -4890,14 +5603,13 @@ function toggleChunkExpand(i){
     e.querySelector('.expand-label').textContent=t('tasks.expand');
   }
 }
-
 function closeTaskDetail(event){
   if(event && event.target!==document.getElementById('taskDetailOverlay')) return;
   document.getElementById('taskDetailOverlay').classList.remove('show');
 }
 
 async function retrySkillGen(taskId){
-  if(!confirm(t('task.retrySkill.confirm'))) return;
+  if(!(await confirmModal(t('task.retrySkill.confirm')))) return;
   try{
     const r=await fetch('/api/task/'+taskId+'/retry-skill',{method:'POST'});
     const d=await r.json();
@@ -4907,7 +5619,7 @@ async function retrySkillGen(taskId){
 }
 
 async function deleteTask(taskId){
-  if(!confirm(t('task.delete.confirm'))) return;
+  if(!(await confirmModal(t('task.delete.confirm'),{danger:true}))) return;
   try{
     const r=await fetch('/api/task/'+taskId,{method:'DELETE'});
     const d=await r.json();
@@ -4929,6 +5641,22 @@ function setSkillStatusFilter(btn,status){
   loadSkills();
 }
 
+function updateSkillCardBadge(skillId,newScope){
+  var cards=document.querySelectorAll('.skill-card');
+  for(var i=0;i<cards.length;i++){
+    var onclick=cards[i].getAttribute('onclick')||'';
+    if(onclick.indexOf(skillId)===-1) continue;
+    var badges=cards[i].querySelector('.skill-card-badges');
+    if(!badges) continue;
+    var oldBadge=badges.querySelectorAll('span[style*="border-radius:10px"]');
+    for(var j=0;j<oldBadge.length;j++) oldBadge[j].remove();
+    var versionBadge=badges.querySelector('.version');
+    if(versionBadge) versionBadge.insertAdjacentHTML('afterend',renderScopeBadge(newScope));
+    else badges.insertAdjacentHTML('afterbegin',renderScopeBadge(newScope));
+    break;
+  }
+}
+
 async function loadSkills(){
   const list=document.getElementById('skillsList');
   const hubList=document.getElementById('hubSkillsList');
@@ -4976,14 +5704,16 @@ async function loadSkills(){
         const sourceLabel=tags.includes('hub-import')?'hub-import':skill.sourceType;
         const qs=skill.qualityScore;
         const qsBadge=qs!==null&&qs!==undefined?'<span class="skill-badge quality '+(qs>=7?'high':qs>=5?'mid':'low')+'">★ '+qs.toFixed(1)+'</span>':'';
-        const visBadge=skill.visibility==='public'?'<span class="skill-badge visibility-public">🌐 '+t('skills.visibility.public')+'</span>':'';
+        const skillIsLocalShared=skill.visibility==='public';
+        const skillIsTeamShared=!!skill.sharingVisibility;
+        const skillScope=skillIsTeamShared?'team':skillIsLocalShared?'local':'private';
         return '<div class="skill-card '+installedClass+' '+statusClass+'" onclick="openSkillDetail(&quot;'+escAttr(skill.id)+'&quot;)">'+
           '<div class="skill-card-top">'+
             '<div class="skill-card-name">🧠 '+esc(skill.name)+'</div>'+
             '<div class="skill-card-badges">'+
               qsBadge+
               '<span class="skill-badge version">v'+skill.version+'</span>'+
-              visBadge+
+              renderScopeBadge(skillScope)+
               (skill.installed?'<span class="skill-badge installed">'+t('skills.installed.badge')+'</span>':'')+
               '<span class="skill-badge status-'+skill.status+'">'+t('skills.status.'+skill.status)+'</span>'+
             '</div>'+
@@ -4992,7 +5722,13 @@ async function loadSkills(){
           '<div class="skill-card-bottom">'+
             '<span class="tag"><span class="icon">📅</span> '+timeStr+'</span>'+
             '<span class="tag"><span class="icon">📦</span> '+sourceLabel+'</span>'+
-            (tags.length>0?'<div class="skill-card-tags">'+tags.map(t=>'<span class="skill-tag">'+esc(t)+'</span>').join('')+'</div>':'')+
+            (tags.length>0?'<div class="skill-card-tags">'+tags.map(tg=>'<span class="skill-tag">'+esc(tg)+'</span>').join('')+'</div>':'')+
+            '<span class="card-actions-inline" onclick="event.stopPropagation()">'+
+              '<button class="btn btn-sm btn-ghost" onclick="openSkillDetail(&quot;'+escAttr(skill.id)+'&quot;)">'+t('card.expand')+'</button>'+
+              (skill.status==='active'
+                ?'<button class="btn btn-sm btn-ghost" onclick="openSkillScopeModalFromList(&quot;'+escAttr(skill.id)+'&quot;,&quot;'+skillScope+'&quot;)">\\u270F '+t('share.shareBtn')+'</button>'
+                :'<button class="btn btn-sm btn-ghost" style="opacity:0.45;cursor:not-allowed" onclick="toast(t(\\x27share.scope.skillNotActive\\x27),\\x27warn\\x27)">\\u270F '+t('share.shareBtn')+'</button>')+
+            '</span>'+
           '</div>'+
         '</div>';
       }).join('');
@@ -5052,12 +5788,12 @@ async function loadSkills(){
             '<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(&quot;'+escAttr(skill.skillId)+'&quot;)">Pull to Local</button></div>'+
+          '<div class="hub-skill-actions"><button class="btn btn-sm" onclick="event.stopPropagation();pullHubSkill(&quot;'+escAttr(skill.skillId)+'&quot;)">'+t('skill.pullToLocal')+'</button></div>'+
         '</div>';
       }).join(''):'';
     }
 
-    document.getElementById('skillSearchMeta').textContent=t('skills.search.local')+' '+localHits.length+(hubHits.length?' · Hub '+hubHits.length:'');
+    document.getElementById('skillSearchMeta').textContent=t('skills.search.local')+' '+localHits.length+(hubHits.length?' · '+t('scope.hub')+' '+hubHits.length:'');
     document.getElementById('skillsTotalCount').textContent=formatNum(localHits.length+hubHits.length);
     document.getElementById('skillsActiveCount').textContent=formatNum(localHits.length);
     document.getElementById('skillsDraftCount').textContent='0';
@@ -5096,7 +5832,7 @@ async function loadHubSkills(hubList){
           '<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)+'\\')">Pull to Local</button></div>'+
+        '<div class="hub-skill-actions"><button class="btn btn-sm" onclick="event.stopPropagation();pullHubSkill(\\''+escAttr(skill.sourceSkillId)+'\\')">'+t('skill.pullToLocal')+'</button></div>'+
       '</div>';
     }).join('');
   }catch(e){
@@ -5125,6 +5861,7 @@ async function openSkillDetail(skillId){
   document.getElementById('skillRelatedTasks').innerHTML='';
   var vb=document.getElementById('skillVisibilityBtn');if(vb)vb.style.display='';
   var db=document.getElementById('skillDownloadBtn');if(db)db.style.display='';
+  var sb=document.getElementById('skillScopeBadge');if(sb)sb.innerHTML='';
   document.getElementById('skillDetailActions').innerHTML='';
 
   try{
@@ -5146,32 +5883,29 @@ async function openSkillDetail(skillId){
 
     const qs=skill.qualityScore;
     const qsBadge=qs!==null&&qs!==undefined?'<span class="meta-item"><span class="skill-badge quality '+(qs>=7?'high':qs>=5?'mid':'low')+'">\\u2605 '+qs.toFixed(1)+'/10</span></span>':'';
-    const visMeta=skill.visibility==='public'?'<span class="meta-item"><span class="skill-badge visibility-public">\\u{1F310} '+t('skills.visibility.public')+'</span></span>':'<span class="meta-item"><span class="skill-badge">\\u{1F512} '+t('skills.visibility.private')+'</span></span>';
+    const detailSkillIsLocalShared=skill.visibility==='public';
+    const detailSkillIsTeamShared=!!skill.sharingVisibility;
+    const detailSkillScope=detailSkillIsTeamShared?'team':detailSkillIsLocalShared?'local':'private';
     document.getElementById('skillDetailMeta').innerHTML=[
       '<span class="meta-item"><span class="skill-badge version">v'+skill.version+'</span></span>',
       '<span class="meta-item"><span class="skill-badge status-'+skill.status+'">'+t('skills.status.'+skill.status)+'</span></span>',
-      visMeta,
       qsBadge,
       skill.installed?'<span class="meta-item"><span class="skill-badge installed">'+t('skills.installed.badge')+'</span></span>':'',
       '<span class="meta-item">\\u{1F4C5} '+formatTime(skill.createdAt)+'</span>',
       '<span class="meta-item">\\u270F '+t('skills.updated')+formatTime(skill.updatedAt)+'</span>',
     ].filter(Boolean).join('');
 
+    var scopeBadgeEl=document.getElementById('skillScopeBadge');
+    if(scopeBadgeEl) scopeBadgeEl.innerHTML=renderScopeBadge(detailSkillScope);
+
     const visBtn=document.getElementById('skillVisibilityBtn');
     visBtn.className='skill-vis-btn';
-    if(skill.visibility==='public'){
-      visBtn.textContent='\\u{1F512} '+t('skills.setPrivate');
-      visBtn.classList.add('is-public');
-      visBtn.dataset.vis='public';
-    } else {
-      visBtn.textContent='\\u{1F310} '+t('skills.setPublic');
-      visBtn.classList.add('is-private');
-      visBtn.dataset.vis='private';
-    }
+    visBtn.textContent='\\u270F '+t('share.shareBtn');
+    visBtn.dataset.vis=detailSkillScope;
+    visBtn.onclick=function(){openSkillScopeModal();};
 
     document.getElementById('skillDetailDesc').textContent=skill.description;
     currentSkillDetail=skill;
-    renderSkillShareActions(skill);
 
     if(files.length>0){
       const fileIcons={'skill':'\\u{1F4D6}','script':'\\u{2699}','reference':'\\u{1F4CE}','file':'\\u{1F4C4}'};
@@ -5577,7 +6311,7 @@ async function saveModelsConfig(){
       if(!hasSkillConfig){msgs.push(t('settings.save.skill.fallback'));}
       var fbInfo=fb.available?(fb.model+' ('+fb.baseUrl+')'):t('settings.save.fallback.none');
       var confirmMsg=msgs.join('\\n')+'\\n\\n'+t('settings.save.fallback.model')+fbInfo+'\\n\\n'+t('settings.save.fallback.confirm');
-      if(!confirm(confirmMsg)){done();return;}
+      if(!(await confirmModal(confirmMsg))){done();return;}
     }catch(e){}
   }
 
@@ -5631,7 +6365,7 @@ async function saveHubConfig(){
   var prevRole=sharingStatusCache&&sharingStatusCache.role;
   if(prevSharingEnabled&&!sharingEnabled){
     var confirmMsg=prevRole==='hub'?t('sharing.disable.confirm.hub'):t('sharing.disable.confirm.client');
-    if(!confirm(confirmMsg)){done();return;}
+    if(!(await confirmModal(confirmMsg,{danger:true}))){done();return;}
   }
 
   var ok=await doSaveConfig(cfg, saveBtn, 'hubSaved');
@@ -5734,7 +6468,7 @@ function closeSkillDetail(event){
 }
 
 async function deleteSkill(skillId){
-  if(!confirm(t('skill.delete.confirm'))) return;
+  if(!(await confirmModal(t('skill.delete.confirm'),{danger:true}))) return;
   try{
     const r=await fetch('/api/skill/'+skillId,{method:'DELETE'});
     const d=await r.json();
@@ -5762,6 +6496,19 @@ function formatTime(ts){
   return new Date(ts).toLocaleString(dateLoc(),{month:'2-digit',day:'2-digit',hour:'2-digit',minute:'2-digit'});
 }
 
+function formatDateTimeSeconds(ts){
+  if(!ts) return '-';
+  return new Date(ts).toLocaleString(dateLoc(),{
+    year:'numeric',
+    month:'2-digit',
+    day:'2-digit',
+    hour:'2-digit',
+    minute:'2-digit',
+    second:'2-digit',
+    hour12:false
+  });
+}
+
 function fillDays(rows,days){
   const map=new Map((rows||[]).map(r=>[r.date,{...r}]));
   const out=[];const now=new Date();
@@ -5846,19 +6593,43 @@ function renderChartCalls(rows){
 
 /* ─── Tool Performance Chart ─── */
 let toolMinutes=60;
+let toolCustomFrom='';
+let toolCustomTo='';
 const TOOL_COLORS=['#818cf8','#34d399','#fbbf24','#f87171','#38bdf8','#a78bfa','#fb923c'];
 
 function setToolMinutes(m){
   toolMinutes=m;
+  toolCustomFrom='';
+  toolCustomTo='';
+  var fi=document.getElementById('toolRangeFrom');
+  var ti=document.getElementById('toolRangeTo');
+  if(fi) fi.value='';
+  if(ti) ti.value='';
   document.querySelectorAll('.tool-range').forEach(b=>{
     b.classList.toggle('active',Number(b.dataset.mins)===m);
   });
   loadToolMetrics();
 }
 
+function applyCustomToolRange(){
+  var fi=document.getElementById('toolRangeFrom');
+  var ti=document.getElementById('toolRangeTo');
+  var from=fi?fi.value:'';
+  var to=ti?ti.value:'';
+  if(!from&&!to){toast(t('chart.selectRange'),'warn');return;}
+  toolCustomFrom=from;
+  toolCustomTo=to;
+  document.querySelectorAll('.tool-range').forEach(b=>b.classList.remove('active'));
+  loadToolMetrics();
+}
+
 async function loadToolMetrics(){
   try{
-    const r=await fetch('/api/tool-metrics?minutes='+toolMinutes);
+    var qs='minutes='+toolMinutes;
+    if(toolCustomFrom) qs='from='+encodeURIComponent(new Date(toolCustomFrom).toISOString());
+    if(toolCustomTo) qs+='&to='+encodeURIComponent(new Date(toolCustomTo).toISOString());
+    else if(toolCustomFrom) qs+='&to='+encodeURIComponent(new Date().toISOString());
+    const r=await fetch('/api/tool-metrics?'+qs);
     if(!r.ok) return;
     const d=await r.json();
     if(d.error) return;
@@ -6032,6 +6803,147 @@ function stopSharingPoll(){
   if(_sharingPollTimer){clearInterval(_sharingPollTimer);_sharingPollTimer=null;}
 }
 
+/* ─── Notifications ─── */
+var _notifCache=[];
+var _notifUnread=0;
+var _notifPollTimer=null;
+var _notifPanelOpen=false;
+
+function toggleNotifPanel(e){
+  if(e)e.stopPropagation();
+  var panel=document.getElementById('notifPanel');
+  _notifPanelOpen=!_notifPanelOpen;
+  if(_notifPanelOpen){
+    panel.classList.add('show');
+    loadNotifications();
+  }else{
+    panel.classList.remove('show');
+  }
+}
+
+document.addEventListener('click',function(e){
+  if(!_notifPanelOpen) return;
+  var wrap=document.getElementById('notifBellWrap');
+  if(wrap&&!wrap.contains(e.target)){
+    _notifPanelOpen=false;
+    document.getElementById('notifPanel').classList.remove('show');
+  }
+});
+
+function notifTimeAgo(ts){
+  var diff=Date.now()-ts;
+  if(diff<60000) return t('notif.timeAgo.just');
+  if(diff<3600000) return t('notif.timeAgo.min').replace('{n}',Math.floor(diff/60000));
+  if(diff<86400000) return t('notif.timeAgo.hour').replace('{n}',Math.floor(diff/3600000));
+  return t('notif.timeAgo.day').replace('{n}',Math.floor(diff/86400000));
+}
+
+function notifIcon(resource){
+  if(resource==='memory') return '\\u{1F4DD}';
+  if(resource==='task') return '\\u{1F4CB}';
+  if(resource==='skill') return '\\u{1F9E0}';
+  return '\\u{1F514}';
+}
+
+function notifTypeText(n){
+  if(n.type==='resource_removed'){
+    return t('notif.removed.'+n.resource)||t('notif.removed.memory');
+  }
+  return n.message||n.type;
+}
+
+async function loadNotifications(){
+  try{
+    var r=await fetch('/api/sharing/notifications');
+    var d=await r.json();
+    _notifCache=d.notifications||[];
+    _notifUnread=d.unreadCount||0;
+    renderNotifBadge();
+    renderNotifPanel();
+  }catch(e){}
+}
+
+async function pollNotifCount(){
+  try{
+    var r=await fetch('/api/sharing/notifications?unread=1');
+    var d=await r.json();
+    _notifUnread=d.unreadCount||0;
+    renderNotifBadge();
+  }catch(e){}
+}
+
+function renderNotifBadge(){
+  var badge=document.getElementById('notifBadge');
+  if(!badge) return;
+  if(_notifUnread>0){
+    badge.textContent=_notifUnread>99?'99+':_notifUnread;
+    badge.classList.add('show');
+  }else{
+    badge.classList.remove('show');
+  }
+}
+
+function renderNotifPanel(){
+  var body=document.getElementById('notifPanelBody');
+  if(!body) return;
+  if(_notifCache.length===0){
+    body.innerHTML='<div class="notif-empty">'+t('notif.empty')+'</div>';
+    return;
+  }
+  body.innerHTML=_notifCache.map(function(n){
+    var cls='notif-item'+(n.read?'':' unread');
+    return '<div class="'+cls+'" onclick="markNotifRead(&quot;'+esc(n.id)+'&quot;)">'+
+      '<div class="notif-item-icon">'+notifIcon(n.resource)+'</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-time">'+notifTimeAgo(n.createdAt)+'</div>'+
+      '</div>'+
+      '<div class="notif-item-dot"></div>'+
+    '</div>';
+  }).join('');
+}
+
+async function markNotifRead(id){
+  try{
+    await fetch('/api/sharing/notifications/read',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({ids:[id]})});
+    _notifCache.forEach(function(n){if(n.id===id)n.read=true;});
+    _notifUnread=Math.max(0,_notifUnread-1);
+    renderNotifBadge();
+    renderNotifPanel();
+  }catch(e){}
+}
+
+async function markAllNotifsRead(){
+  try{
+    await fetch('/api/sharing/notifications/read',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({all:true})});
+    _notifCache.forEach(function(n){n.read=true;});
+    _notifUnread=0;
+    renderNotifBadge();
+    renderNotifPanel();
+  }catch(e){}
+}
+
+async function clearAllNotifs(){
+  try{
+    await fetch('/api/sharing/notifications/clear',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({})});
+    _notifCache=[];
+    _notifUnread=0;
+    renderNotifBadge();
+    renderNotifPanel();
+  }catch(e){}
+}
+
+function startNotifPoll(){
+  if(_notifPollTimer) return;
+  pollNotifCount();
+  _notifPollTimer=setInterval(pollNotifCount,15000);
+}
+
+function stopNotifPoll(){
+  if(_notifPollTimer){clearInterval(_notifPollTimer);_notifPollTimer=null;}
+}
+
 /* ─── Data loading ─── */
 async function loadAll(){
   await Promise.all([loadStats(),loadMemories(),loadSharingStatus(false)]);
@@ -6039,6 +6951,7 @@ async function loadAll(){
   connectPPSSE();
   checkForUpdate();
   startSharingPoll();
+  startNotifPoll();
 }
 
 async function loadStats(ownerFilter){
@@ -6320,9 +7233,10 @@ function renderMemories(items){
     const importBadge=isImported?'<span class="import-badge">\u{1F990} '+t('card.imported')+'</span>':'';
     const ownerVal=m.owner||'agent:main';
     const isPublicMem=ownerVal==='public';
-    const ownerBadge=isPublicMem?'<span class="owner-badge public">\\u{1F310} '+t('filter.public')+'</span>':'<span class="owner-badge agent">\\u{1F512} '+t('filter.private')+'</span>';
+    const localManaged=!!m.localSharingManaged;
     const memShared=m.sharingVisibility||null;
-    const memShareBadge=memShared?'<span style="display:inline-flex;align-items:center;gap:3px;padding:2px 8px;background:#22c55e22;border:1px solid #22c55e44;border-radius:10px;font-size:11px;color:#22c55e">\\u2713 '+(memShared==='group'?t('share.group'):t('share.public'))+'</span>':'';
+    const memScope=memShared?'team':isPublicMem?'local':'private';
+    const memScopeBadge=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>':'';
@@ -6347,7 +7261,7 @@ function renderMemories(items){
       }catch(e){}
     }
     return '<div class="memory-card'+(isInactive?' dedup-inactive':'')+'">'+
-      '<div class="card-header"><div class="meta"><span class="role-tag '+role+'">'+role+'</span>'+ownerBadge+importBadge+dedupBadge+mergeBadge+'</div><span class="card-time"><span class="session-tag" title="'+esc(sid)+'">'+esc(sidShort)+'</span> '+time+updatedAt+'</span></div>'+
+      '<div class="card-header"><div class="meta"><span class="role-tag '+role+'">'+role+'</span>'+memScopeBadge+importBadge+dedupBadge+mergeBadge+'</div><span class="card-time"><span class="session-tag" title="'+esc(sid)+'">'+esc(sidShort)+'</span> '+time+updatedAt+'</span></div>'+
       '<div class="card-summary">'+cardTitle+'</div>'+
       (function(){
         if(mc<=0) return '';
@@ -6371,14 +7285,37 @@ function renderMemories(items){
         '<button class="btn btn-sm btn-ghost" onclick="toggleContent(\\''+id+'\\')">'+t('card.expand')+'</button>'+
         (mc>0?'<button class="btn btn-sm btn-ghost" onclick="toggleHistory(\\''+id+'\\')">'+t('card.evolveHistory')+'</button>':'')+
         '<button class="btn btn-sm btn-ghost" onclick="openEditModal(\\''+id+'\\')">'+t('card.edit')+'</button>'+
-        (isPublicMem?'<button class="btn btn-sm btn-ghost" onclick="toggleMemoryPublic(\\''+id+'\\',false)">\\u{1F512} '+t('skills.setPrivate')+'</button>':'<button class="btn btn-sm btn-ghost mem-public-btn" onclick="toggleMemoryPublic(\\''+id+'\\',true)">\\u{1F310} '+t('skills.setPublic')+'</button>')+
-        (memShared?'<button class="btn btn-sm btn-ghost" onclick="unshareMemory(\\''+id+'\\')">'+t('share.unshareBtn')+'</button>':'<button class="btn btn-sm btn-ghost" onclick="shareMemoryPrompt(\\''+id+'\\')">'+t('share.shareBtn')+'</button>')+
+        (isInactive
+          ?'<button class="btn btn-sm btn-ghost" style="opacity:0.45;cursor:not-allowed" onclick="toast(t(\\x27share.scope.inactiveDisabled\\x27),\\x27warn\\x27)">\\u270F '+t('share.shareBtn')+'</button>'
+          :'<button class="btn btn-sm btn-ghost" onclick="openMemoryScopeModal(\\''+id+'\\',\\''+memScope+'\\')">\\u270F '+t('share.shareBtn')+'</button>')+
         '<button class="btn btn-sm btn-ghost" style="color:var(--accent)" onclick="deleteMemory(\\''+id+'\\')">'+t('card.delete')+'</button>'+
         vscore+
       '</div></div>';
   }).join('');
 }
 
+function updateMemoryCardBadge(chunkId,newScope){
+  var cards=document.querySelectorAll('.memory-card');
+  for(var i=0;i<cards.length;i++){
+    var btns=cards[i].querySelectorAll('button');
+    var shareBtn=null;
+    for(var b=0;b<btns.length;b++){
+      var oc=btns[b].getAttribute('onclick')||'';
+      if(oc.indexOf('openMemoryScopeModal')>=0&&oc.indexOf(chunkId)>=0){shareBtn=btns[b];break;}
+    }
+    if(!shareBtn) continue;
+    var metaDiv=cards[i].querySelector('.meta');
+    if(!metaDiv) continue;
+    var oldBadge=metaDiv.querySelectorAll('span[style*="border-radius:10px"]');
+    for(var j=0;j<oldBadge.length;j++) oldBadge[j].remove();
+    var roleTag=metaDiv.querySelector('.role-tag');
+    if(roleTag&&roleTag.nextSibling) roleTag.insertAdjacentHTML('afterend',renderScopeBadge(newScope));
+    else metaDiv.insertAdjacentHTML('beforeend',renderScopeBadge(newScope));
+    shareBtn.setAttribute('onclick','openMemoryScopeModal(\\x27'+chunkId+'\\x27,\\x27'+newScope+'\\x27)');
+    break;
+  }
+}
+
 function renderPagination(){
   const el=document.getElementById('pagination');
   if(totalPages<=1){el.innerHTML='';return}
@@ -6459,13 +7396,13 @@ async function showMemoryModal(chunkId){
     if(m.summary) h+='<div class="mm-summary">'+esc(m.summary)+'</div>';
     h+='</div>';
     if(m.content){
-      h+='<div class="mm-section"><div class="mm-section-label">Content</div><pre class="mm-content">'+esc(m.content)+'</pre></div>';
+      h+='<div class="mm-section"><div class="mm-section-label">'+t('admin.content')+'</div><pre class="mm-content">'+esc(m.content)+'</pre></div>';
     }
     h+='<div class="mm-meta">';
-    if(m.session_key) h+='<div class="mm-meta-chip"><strong>Session</strong><span>'+esc(m.session_key.slice(0,12))+'</span></div>';
+    if(m.session_key) h+='<div class="mm-meta-chip"><strong>'+t('admin.session')+'</strong><span>'+esc(m.session_key.slice(0,12))+'</span></div>';
     h+='<div class="mm-meta-chip"><strong>'+t('memory.detail.created')+'</strong><span>'+fmtModalDate(m.created_at)+'</span></div>';
     if(m.updated_at) h+='<div class="mm-meta-chip"><strong>'+t('memory.detail.updated')+'</strong><span>'+fmtModalDate(m.updated_at)+'</span></div>';
-    if(m.kind) h+='<div class="mm-meta-chip"><strong>Kind</strong><span>'+esc(m.kind)+'</span></div>';
+    if(m.kind) h+='<div class="mm-meta-chip"><strong>'+t('admin.kind')+'</strong><span>'+esc(m.kind)+'</span></div>';
     h+='</div>';
     if(m.dedup_reason){
       h+='<div class="mm-dedup"><div class="mm-dedup-box">'+esc(m.dedup_reason)+'</div></div>';
@@ -6548,27 +7485,46 @@ async function submitModal(){
 }
 
 async function deleteMemory(id){
-  if(!confirm(t('confirm.delete')))return;
+  if(!(await confirmModal(t('confirm.delete'),{danger:true})))return;
   const r=await fetch('/api/memory/'+id,{method:'DELETE'});
   const d=await r.json();
   if(d.ok){toast(t('toast.deleted'),'success');loadAll();}
   else{toast(t('toast.delfail'),'error')}
 }
 
+function openMemoryScopeModal(id,currentScope){
+  openScopeSelectorModal('memory',id,currentScope,function(newScope){
+    if(memoryCache[id]){
+      if(newScope==='team'){memoryCache[id].sharingVisibility='public';}
+      else if(newScope==='local'){memoryCache[id].sharingVisibility=null;memoryCache[id].owner='public';}
+      else{memoryCache[id].sharingVisibility=null;memoryCache[id].owner='agent:main';}
+    }
+    updateMemoryCardBadge(id,newScope);
+  });
+}
+
 async function toggleMemoryPublic(id,setPublic){
-  const newOwner=setPublic?'public':'agent:main';
   try{
-    const r=await fetch('/api/memory/'+id,{method:'PUT',headers:{'Content-Type':'application/json'},body:JSON.stringify({owner:newOwner})});
+    if(!setPublic && !(await confirmModal(t('share.memoryLocalUnshareConfirm'),{danger:true}))) return;
+    const memory=memoryCache[id]||{};
+    const url=setPublic?'/api/memories/share-local':'/api/memories/unshare-local';
+    const body=setPublic?{chunkId:id}:{chunkId:id,privateOwner:memory.localOriginalOwner||undefined};
+    const r=await fetch(url,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});
     const d=await r.json();
-    if(d.ok){toast(setPublic?t('toast.setPublic'):t('toast.setPrivate'),'success');loadAll();}
-    else{toast(d.error||t('toast.opfail'),'error')}
-  }catch(e){toast('Error: '+e.message,'error')}
+    if(d.ok){
+      toast(setPublic?t('toast.setPublic'):t('toast.setPrivate'),'success');
+      var newScope=setPublic?'local':'private';
+      if(memoryCache[id]){memoryCache[id].owner=setPublic?'public':'agent:main';}
+      updateMemoryCardBadge(id,newScope);
+    }
+    else{toast(localMemoryErrorMessage(d.error),'error')}
+  }catch(e){toast(localMemoryErrorMessage(e.message),'error')}
 }
 
 async function clearAll(){
   try{
-    if(!confirm(t('confirm.clearall')))return;
-    if(!confirm(t('confirm.clearall2')))return;
+    if(!(await confirmModal(t('confirm.clearall'),{danger:true})))return;
+    if(!(await confirmModal(t('confirm.clearall2'),{danger:true})))return;
     const r=await fetch('/api/memories',{method:'DELETE'});
     if(r.status===401){toast(t('settings.session.expired'),'error');return;}
     const d=await r.json();
@@ -6670,14 +7626,14 @@ async function migrateScan(showToast){
   }
 }
 
-function migrateStart(){
+async function migrateStart(){
   const isResume=document.getElementById('migrateStartBtn').textContent===t('migrate.resume');
   if(!isResume){
     if(!migrateScanData||!migrateScanData.configReady){
       toast(t('migrate.scan.required'),'error');
       return;
     }
-    if(!confirm(t('migrate.start')+'?'))return;
+    if(!(await confirmModal(t('migrate.start')+'?')))return;
   }
 
   const concSel=document.getElementById('migrateConcurrency');
@@ -7177,12 +8133,32 @@ function toast(msg,type='info'){
   const c=document.getElementById('toasts');
   const t=document.createElement('div');
   t.className='toast '+type;
-  const icons={success:'\\u2705',error:'\\u274C',info:'\\u2139\\uFE0F'};
+  const icons={success:'\\u2705',error:'\\u274C',info:'\\u2139\\uFE0F',warn:'\\u26A0\\uFE0F'};
   t.innerHTML=(icons[type]||'')+' '+esc(msg);
   c.appendChild(t);
   setTimeout(()=>t.remove(),3500);
 }
 
+var _confirmResolve=null;
+function confirmModal(message,opts){
+  opts=opts||{};
+  return new Promise(function(resolve){
+    _confirmResolve=resolve;
+    var overlay=document.getElementById('confirmOverlay');
+    document.getElementById('confirmTitle').textContent=opts.title||t('confirm.title')||'\u786E\u8BA4';
+    document.getElementById('confirmBody').textContent=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';
+    overlay.classList.add('show');
+  });
+}
+function confirmModalClose(result){
+  document.getElementById('confirmOverlay').classList.remove('show');
+  if(_confirmResolve){var r=_confirmResolve;_confirmResolve=null;r(result);}
+}
+
 /* ─── Theme ─── */
 const VIEWER_THEME_KEY='memos-viewer-theme';
 function initViewerTheme(){const s=localStorage.getItem(VIEWER_THEME_KEY);const theme=(s==='light'||s==='dark')?s:'dark';document.documentElement.setAttribute('data-theme',theme);}
@@ -7247,30 +8223,34 @@ async function checkForUpdate(){
     const pkgSpec=d.installCommand?d.installCommand.replace(/^(?:npx\s+)?openclaw\s+plugins\s+install\s+/,''):(d.packageName+'@'+d.latest);
     var banner=document.createElement('div');
     banner.id='updateBanner';
-    banner.style.cssText='display:flex;align-items:center;gap:10px;padding:12px 20px;font-size:13px;font-weight:500;border-radius:10px;margin:0 32px;animation:slideIn .3s ease;background:rgba(245,158,11,.1);color:#d97706;border:1px solid rgba(245,158,11,.25)';
+    banner.style.cssText='display:flex;align-items:center;gap:12px;padding:10px max(32px,calc((100% - 1400px)/2 + 32px));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)';
     var textNode=document.createElement('div');
-    textNode.style.cssText='display:flex;align-items:center;gap:8px;flex-shrink:0';
-    textNode.innerHTML='\u{1F4E6} '+t('update.available')+' <b style="margin:0 2px">v'+esc(d.current)+'</b> \u2192 <b style="margin:0 2px">v'+esc(d.latest)+'</b>';
+    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>';
     var btnUpdate=document.createElement('button');
-    btnUpdate.className='emb-banner-btn';
+    btnUpdate.style.cssText='background:var(--pri);color:#fff;border:none;border-radius:8px;padding:5px 16px;font-size:12px;font-weight:600;cursor:pointer;white-space:nowrap;transition:opacity .15s,transform .1s;margin-left:4px';
     btnUpdate.textContent=t('update.btn');
+    btnUpdate.onmouseenter=function(){this.style.opacity='.9';this.style.transform='scale(1.02)'};
+    btnUpdate.onmouseleave=function(){this.style.opacity='1';this.style.transform='scale(1)'};
     var statusDiv=document.createElement('div');
-    statusDiv.style.cssText='font-size:11px;opacity:.8;flex-shrink:0';
+    statusDiv.style.cssText='font-size:11px;opacity:.7;flex-shrink:0';
     btnUpdate.onclick=function(){doUpdateInstall(pkgSpec,btnUpdate,statusDiv)};
     textNode.appendChild(btnUpdate);
     var spacer=document.createElement('div');
     spacer.style.cssText='flex:1';
     var btnClose=document.createElement('button');
-    btnClose.className='emb-banner-close';
+    btnClose.style.cssText='background:none;border:none;font-size:16px;color:var(--text-muted);cursor:pointer;opacity:.5;padding:0 2px;line-height:1;transition:opacity .15s';
     btnClose.innerHTML='&times;';
+    btnClose.onmouseenter=function(){this.style.opacity='1'};
+    btnClose.onmouseleave=function(){this.style.opacity='.5'};
     btnClose.onclick=function(){banner.remove()};
     banner.appendChild(textNode);
     banner.appendChild(statusDiv);
     banner.appendChild(spacer);
     banner.appendChild(btnClose);
-    var embBanner=document.querySelector('.emb-banner');
-    if(embBanner&&embBanner.parentNode){embBanner.parentNode.insertBefore(banner,embBanner);}
-    else{var ct=document.querySelector('.content-area')||document.querySelector('main')||document.body;if(ct.firstChild)ct.insertBefore(banner,ct.firstChild);else ct.appendChild(banner);}
+    var tb=document.querySelector('.topbar');
+    if(tb&&tb.parentNode){tb.parentNode.insertBefore(banner,tb);}
+    else{document.body.insertBefore(banner,document.body.firstChild);}
   }catch(e){}
 }
 
@@ -7292,6 +8272,16 @@ checkAuth();
   </div>
 </div>
 
+    <div class="confirm-overlay" id="confirmOverlay" onclick="confirmModalClose(false)">
+      <div class="confirm-panel" onclick="event.stopPropagation()">
+        <div class="confirm-panel-header" id="confirmTitle"></div>
+        <div class="confirm-panel-body" id="confirmBody"></div>
+        <div class="confirm-panel-footer">
+          <button class="btn-confirm-cancel" id="confirmCancelBtn" onclick="confirmModalClose(false)"></button>
+          <button class="btn-confirm-ok" id="confirmOkBtn" onclick="confirmModalClose(true)"></button>
+        </div>
+      </div>
+    </div>
 </body>
 </html>`;
 }