npm - acp-ts - Versions diffs - 1.2.2 → 1.2.3 - Mend

acp-ts 1.2.2 → 1.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/dist/agentcp.js +3 -0
package/dist/group/events.d.ts +2 -1
package/dist/group/events.js +25 -1
package/dist/group/index.d.ts +1 -1
package/dist/group/index.js +2 -1
package/dist/group/operations.d.ts +28 -6
package/dist/group/operations.js +62 -6
package/dist/group/types.d.ts +56 -1
package/dist/group/types.js +15 -1
package/dist/server.js +506 -233
package/package.json +1 -1

package/dist/server.js CHANGED Viewed

@@ -53,33 +53,40 @@ const messagestore_1 = require("./messagestore");
 let globalApiUrl = '';
 let globalDataDir = '';
 const messageStores = new Map();
-// ============================================================
-// Browser ↔ Server WebSocket (real-time group message push)
-// ============================================================
-const browserWsClients = new Set();
+const browserWsClients = new Map();
+/**
+ * 向绑定了指定 aid 的浏览器 WS 客户端推送消息
+ */
+function pushToAid(aid, data) {
+    const payload = JSON.stringify(data);
+    for (const [ws, client] of browserWsClients) {
+        if (client.aid === aid && ws.readyState === ws_1.default.OPEN) {
+            ws.send(payload);
+        }
+    }
+}
 /**
  * 向所有已连接的浏览器 WS 客户端广播消息
  */
 function broadcastToBrowser(data) {
     const payload = JSON.stringify(data);
-    for (const client of browserWsClients) {
-        if (client.readyState === ws_1.default.OPEN) {
-            client.send(payload);
+    for (const [ws] of browserWsClients) {
+        if (ws.readyState === ws_1.default.OPEN) {
+            ws.send(payload);
         }
     }
 }
 let agentCP = null;
-let currentAid = '';
 const MAX_AIDS = 10;
 const aidInstances = new Map();
 function getActiveInstance() {
-    return aidInstances.get(currentAid) || null;
+    return null; // legacy stub — use aidInstances.get(aid) directly
 }
 // 正在上线中的 Promise 缓存，防止并发调用重复上线
 const onlinePendingMap = new Map();
 // 确保指定 AID 在线，如果不在线则自动上线，返回实例
 async function ensureOnline(targetAid) {
-    const aid = targetAid || currentAid;
+    const aid = targetAid;
     if (!aid)
         throw new Error('请先选择 AID');
     const existing = aidInstances.get(aid);
@@ -99,6 +106,8 @@ async function ensureOnline(targetAid) {
     }
 }
 async function doEnsureOnline(aid) {
+    // 确保该 AID 的会话数据已从磁盘加载
+    await ensureMessageStoreLoaded(aid);
     // 自动上线
     const cp = new agentcp_1.AgentCP(globalApiUrl, '', globalDataDir || undefined, { persistMessages: true, persistGroupMessages: true });
     await cp.loadAid(aid);
@@ -128,9 +137,7 @@ async function doEnsureOnline(aid) {
     hb.onInvite((invite) => {
         console.log(`[Server] 收到邀请: ${JSON.stringify(invite)}`);
         const session = getMessageStoreForAid(aid).getOrCreateSession(invite.sessionId, invite.inviteCode, invite.inviterAgentId, 'incoming', aid);
-        if (!activeSessionId) {
-            activeSessionId = session.sessionId;
-        }
+        pushToAid(aid, { type: 'sessions_updated' });
         if (instance.agentWS) {
             instance.agentWS.acceptInviteFromHeartbeat(invite.sessionId, invite.inviterAgentId, invite.inviteCode);
         }
@@ -209,13 +216,14 @@ async function doEnsureOnline(aid) {
         }
         if (msgSessionId && getMessageStoreForAid(aid).hasSession(msgSessionId)) {
             getMessageStoreForAid(aid).addMessageToSession(msgSessionId, { type: 'received', content, from, timestamp: Date.now() });
+            pushToAid(aid, { type: 'p2p_message', sessionId: msgSessionId, message: { type: 'received', content, from, timestamp: Date.now() } });
+            pushToAid(aid, { type: 'sessions_updated' });
         }
         else if (msgSessionId && from) {
             getMessageStoreForAid(aid).getOrCreateSession(msgSessionId, '', from, 'incoming', aid);
-            if (!activeSessionId) {
-                activeSessionId = msgSessionId;
-            }
             getMessageStoreForAid(aid).addMessageToSession(msgSessionId, { type: 'received', content, from, timestamp: Date.now() });
+            pushToAid(aid, { type: 'p2p_message', sessionId: msgSessionId, message: { type: 'received', content, from, timestamp: Date.now() } });
+            pushToAid(aid, { type: 'sessions_updated' });
         }
     });
     ws.onStatusChange((status) => {
@@ -366,6 +374,14 @@ async function ensureGroupClient(instance) {
                 event: evt,
             });
         },
+        onDutyDispatch(groupId, context) {
+            console.log(`[Group] onDutyDispatch: group=${groupId} original_msg_id=${context.original_msg_id} sender=${context.sender_id}`);
+            broadcastToBrowser({
+                type: 'duty_dispatch',
+                group_id: groupId,
+                context,
+            });
+        },
     });
     // 同步群组列表（如未同步过）
     if (!instance.groupListSynced) {
@@ -554,7 +570,7 @@ function getAidMdOptionsForAid(aid) {
     return loadAidMdOptions()[aid] || {};
 }
 // 消息与会话管理 — 每个 AID 独立 MessageStore
-let activeSessionId = null;
+const messageStoreLoaded = new Set();
 function getMessageStoreForAid(aid) {
     let store = messageStores.get(aid);
     if (!store) {
@@ -566,10 +582,13 @@ function getMessageStoreForAid(aid) {
     }
     return store;
 }
-function getMessageStore() {
-    if (!currentAid)
-        throw new Error('请先选择 AID');
-    return getMessageStoreForAid(currentAid);
+async function ensureMessageStoreLoaded(aid) {
+    const store = getMessageStoreForAid(aid);
+    if (!messageStoreLoaded.has(aid)) {
+        await store.loadSessionsForAid(aid);
+        messageStoreLoaded.add(aid);
+    }
+    return store;
 }
 // HTML 页面
 const indexHtml = `<!DOCTYPE html>
@@ -581,21 +600,26 @@ const indexHtml = `<!DOCTYPE html>
     <title>ACP 身份管理</title>
     <style>
         * { box-sizing: border-box; margin: 0; padding: 0; }
-        body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; background: #f5f5f5; min-height: 100vh; display: flex; justify-content: center; align-items: flex-start; padding: 40px 20px; }
-        .container { background: white; padding: 32px; border-radius: 12px; box-shadow: 0 4px 20px rgba(0,0,0,0.1); max-width: 560px; width: 100%; }
-        h1 { color: #333; margin-bottom: 24px; text-align: center; font-size: 22px; }
-        .hint { text-align: center; color: #999; font-size: 13px; margin-bottom: 20px; }
-        .create-section { margin-bottom: 24px; display: flex; flex-direction: column; gap: 12px; }
+        body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; background: linear-gradient(135deg, #f0f4ff 0%, #e8edf5 100%); min-height: 100vh; display: flex; justify-content: center; align-items: flex-start; padding: 40px 20px; }
+        .container { background: white; padding: 0; border-radius: 16px; box-shadow: 0 8px 32px rgba(0,0,0,0.08); max-width: 560px; width: 100%; overflow: hidden; }
+        .page-header { background: linear-gradient(135deg, #2563eb 0%, #1e40af 100%); padding: 28px 32px 22px; color: white; text-align: center; }
+        .page-header h1 { font-size: 20px; font-weight: 600; margin-bottom: 12px; letter-spacing: 0.5px; }
+        .nav-links { display: flex; justify-content: center; gap: 8px; }
+        .nav-links a { color: rgba(255,255,255,0.85); text-decoration: none; font-size: 12px; padding: 4px 12px; border-radius: 20px; border: 1px solid rgba(255,255,255,0.25); transition: all 0.2s; }
+        .nav-links a:hover { background: rgba(255,255,255,0.15); color: #fff; border-color: rgba(255,255,255,0.5); }
+        .page-body { padding: 24px 32px 32px; }
+        .hint { text-align: center; color: #9ca3af; font-size: 13px; margin-bottom: 20px; }
+        .create-section { margin-bottom: 24px; display: flex; flex-direction: column; gap: 10px; background: #f8fafc; border: 1px solid #e2e8f0; border-radius: 12px; padding: 18px; }
         .create-section .aid-input-row { display: flex; gap: 8px; align-items: center; }
-        .create-section .aid-input-row input { flex: 1; padding: 10px 14px; border: 1px solid #ddd; border-radius: 8px; font-size: 14px; min-width: 0; }
-        .create-section .aid-input-row input:focus { outline: none; border-color: #007bff; }
-        .create-section .aid-input-row .dot-separator { color: #999; font-size: 16px; flex-shrink: 0; }
+        .create-section .aid-input-row input { flex: 1; padding: 10px 14px; border: 1px solid #e2e8f0; border-radius: 8px; font-size: 14px; min-width: 0; background: #fff; transition: border-color 0.2s, box-shadow 0.2s; }
+        .create-section .aid-input-row input:focus { outline: none; border-color: #2563eb; box-shadow: 0 0 0 3px rgba(37,99,235,0.1); }
+        .create-section .aid-input-row .dot-separator { color: #9ca3af; font-size: 16px; flex-shrink: 0; }
         .create-section .aid-input-row select {
             padding: 10px 30px 10px 14px;
-            border: 1px solid #ddd;
+            border: 1px solid #e2e8f0;
             border-radius: 8px;
             font-size: 14px;
-            background: white;
+            background: #fff;
             flex-shrink: 0;
             cursor: pointer;
             appearance: none;
@@ -605,48 +629,63 @@ const indexHtml = `<!DOCTYPE html>
             background-repeat: no-repeat;
             background-position: right 10px top 50%;
             background-size: 10px auto;
+            transition: border-color 0.2s, box-shadow 0.2s;
         }
-        .create-section .aid-input-row select:focus { outline: none; border-color: #007bff; }
+        .create-section .aid-input-row select:focus { outline: none; border-color: #2563eb; box-shadow: 0 0 0 3px rgba(37,99,235,0.1); }
         .create-section .extra-fields { display: flex; gap: 8px; }
-        .create-section .extra-fields input { flex: 1; padding: 10px 14px; border: 1px solid #ddd; border-radius: 8px; font-size: 14px; min-width: 0; }
-        .create-section .extra-fields input:focus { outline: none; border-color: #007bff; }
-        .btn { display: block; width: 100%; padding: 12px; border: none; border-radius: 8px; font-size: 15px; cursor: pointer; transition: background 0.2s; }
-        .btn-primary { background: #007bff; color: white; }
-        .btn-primary:hover { background: #0056b3; }
+        .create-section .extra-fields input { flex: 1; padding: 10px 14px; border: 1px solid #e2e8f0; border-radius: 8px; font-size: 14px; min-width: 0; background: #fff; transition: border-color 0.2s, box-shadow 0.2s; }
+        .create-section .extra-fields input:focus { outline: none; border-color: #2563eb; box-shadow: 0 0 0 3px rgba(37,99,235,0.1); }
+        .btn { display: block; width: 100%; padding: 11px; border: none; border-radius: 8px; font-size: 14px; font-weight: 500; cursor: pointer; transition: all 0.2s; }
+        .btn-primary { background: linear-gradient(135deg, #2563eb, #1d4ed8); color: white; }
+        .btn-primary:hover { background: linear-gradient(135deg, #1d4ed8, #1e40af); box-shadow: 0 2px 8px rgba(37,99,235,0.3); }
         .btn-sm { display: inline-block; width: auto; padding: 6px 14px; font-size: 13px; border-radius: 6px; }
-        .btn-success { background: #28a745; color: white; }
-        .btn-success:hover { background: #218838; }
-        .btn-danger { background: #dc3545; color: white; }
-        .btn-danger:hover { background: #c82333; }
-        .btn-outline { background: white; color: #007bff; border: 1px solid #007bff; }
-        .btn-outline:hover { background: #e7f1ff; }
-        .btn-outline.active { background: #007bff; color: white; }
-        .btn:disabled { background: #ccc; cursor: not-allowed; border-color: #ccc; color: #fff; }
+        .btn-success { background: #10b981; color: white; }
+        .btn-success:hover { background: #059669; }
+        .btn-danger { background: #ef4444; color: white; }
+        .btn-danger:hover { background: #dc2626; }
+        .btn-outline { background: white; color: #2563eb; border: 1px solid #2563eb; }
+        .btn-outline:hover { background: #eff6ff; }
+        .btn-outline.active { background: #2563eb; color: white; }
+        .btn:disabled { background: #d1d5db; cursor: not-allowed; border-color: #d1d5db; color: #fff; }
         .aid-list { margin-bottom: 24px; }
-        .aid-card { background: #f8f9fa; border: 1px solid #e9ecef; border-radius: 10px; padding: 16px; margin-bottom: 12px; transition: border-color 0.2s; display: flex; align-items: stretch; gap: 12px; }
-        .aid-card.current { border-color: #007bff; background: #f0f7ff; }
+        .aid-card { background: #fff; border: 1px solid #e5e7eb; border-radius: 12px; padding: 16px; margin-bottom: 10px; transition: all 0.2s; display: flex; align-items: stretch; gap: 12px; }
+        .aid-card:hover { border-color: #93c5fd; box-shadow: 0 2px 12px rgba(37,99,235,0.06); }
+        .aid-card.current { border-color: #2563eb; background: #eff6ff; }
         .aid-card-left { flex: 1; min-width: 0; }
         .aid-card-right { display: flex; flex-direction: column; align-items: flex-end; gap: 6px; flex-shrink: 0; justify-content: center; }
         .aid-card-header { margin-bottom: 10px; }
-        .aid-name { font-family: monospace; font-size: 13px; color: #333; word-break: break-all; }
-        .copy-btn { background: none; border: none; color: #6c757d; cursor: pointer; font-size: 12px; padding: 2px 6px; }
-        .copy-btn:hover { color: #333; }
+        .aid-name { font-family: 'SF Mono', 'Fira Code', monospace; font-size: 13px; color: #1f2937; word-break: break-all; }
+        .copy-btn { background: none; border: none; color: #9ca3af; cursor: pointer; font-size: 12px; padding: 2px 6px; transition: color 0.2s; }
+        .copy-btn:hover { color: #2563eb; }
         .aid-card-status { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
         .badge { display: inline-block; padding: 3px 10px; border-radius: 12px; font-size: 12px; font-weight: 500; }
-        .badge-success { background: #d4edda; color: #155724; }
-        .badge-warning { background: #fff3cd; color: #856404; }
-        .badge-danger { background: #f8d7da; color: #721c24; }
-        .badge-info { background: #d1ecf1; color: #0c5460; }
-        .badge-current { background: #007bff; color: white; }
+        .badge-success { background: #d1fae5; color: #065f46; }
+        .badge-warning { background: #fef3c7; color: #92400e; }
+        .badge-danger { background: #fee2e2; color: #991b1b; }
+        .badge-info { background: #dbeafe; color: #1e40af; }
+        .badge-current { background: #2563eb; color: white; }
         .aid-card-actions { display: flex; gap: 6px; flex-wrap: wrap; justify-content: flex-end; }
-        .status { position: fixed; top: 20px; left: 50%; transform: translateX(-50%); padding: 12px 24px; border-radius: 8px; font-size: 14px; display: none; z-index: 1000; }
-        .status.success { display: block; background: #d4edda; color: #155724; }
-        .status.error { display: block; background: #f8d7da; color: #721c24; }
+        .status { position: fixed; top: 20px; left: 50%; transform: translateX(-50%); padding: 12px 24px; border-radius: 10px; font-size: 14px; display: none; z-index: 1000; box-shadow: 0 4px 16px rgba(0,0,0,0.1); }
+        .status.success { display: block; background: #d1fae5; color: #065f46; }
+        .status.error { display: block; background: #fee2e2; color: #991b1b; }
+        @media (max-width: 480px) {
+            body { padding: 16px 8px; }
+            .page-header { padding: 22px 18px 18px; }
+            .page-body { padding: 18px 16px 24px; }
+            .create-section { padding: 14px; }
+        }
     </style>
 </head>
 <body>
     <div class="container">
-        <h1>ACP 身份管理</h1>
+        <div class="page-header">
+            <h1>ACP 身份管理</h1>
+            <div class="nav-links">
+                <a href="https://agentunion.net" target="_blank">AgentUnion排行榜</a>
+                <a href="https://github.com/auliwenjiang/agentcp" target="_blank">ACP 开源GitHub</a>
+            </div>
+        </div>
+        <div class="page-body">
         <div class="hint" id="hint">最多注册 10 个 AID</div>
         <div class="create-section" id="createSection">
@@ -665,10 +704,11 @@ const indexHtml = `<!DOCTYPE html>
         <div class="aid-list" id="aidList"></div>
         <div class="status" id="status"></div>
+        </div>
     </div>
     <script>
-        let aidData = { currentAid: '', aidList: [], aidStatus: [], apiUrl: '' };
+        let aidData = { aidList: [], aidStatus: [], apiUrl: '' };
         async function loadAidInfo() {
             try {
@@ -715,11 +755,9 @@ const indexHtml = `<!DOCTYPE html>
             }
             list.innerHTML = aidData.aidStatus.map(function(item) {
-                var isCurrent = item.aid === aidData.currentAid;
-                var cardClass = 'aid-card' + (isCurrent ? ' current' : '');
+                var cardClass = 'aid-card';
                 var badges = '';
-                if (isCurrent) badges += '<span class="badge badge-current">当前</span>';
                 if (item.online) badges += '<span class="badge badge-success">已上线</span>';
                 if (item.keysExist && item.certValid) {
                     badges += '<span class="badge badge-info">密钥有效</span>';
@@ -730,11 +768,7 @@ const indexHtml = `<!DOCTYPE html>
                 }
                 var actions = '';
-                if (!isCurrent) {
-                    actions += '<button class="btn btn-sm btn-outline" onclick="selectAid(\\'' + escapeAttr(item.aid) + '\\')">选为当前</button>';
-                }
-                // 上线并进入聊天（合并按钮）
-                if (isCurrent && item.keysExist && item.certValid) {
+                if (item.keysExist && item.certValid) {
                     if (item.online) {
                         actions += '<button class="btn btn-sm btn-success" onclick="enterChat(\\'' + escapeAttr(item.aid) + '\\')">进入聊天</button>';
                         actions += '<button class="btn btn-sm btn-danger" onclick="goOffline(\\'' + escapeAttr(item.aid) + '\\')">下线</button>';
@@ -742,9 +776,6 @@ const indexHtml = `<!DOCTYPE html>
                         actions += '<button class="btn btn-sm btn-success" id="goBtn_' + escapeAttr(item.aid) + '" onclick="goOnlineAndChat(\\'' + escapeAttr(item.aid) + '\\')">上线并进入</button>';
                     }
                 }
-                if (!isCurrent && item.online) {
-                    actions += '<button class="btn btn-sm btn-danger" onclick="goOffline(\\'' + escapeAttr(item.aid) + '\\')">下线</button>';
-                }
                 return '<div class="' + cardClass + '">' +
                     '<div class="aid-card-left">' +
@@ -938,7 +969,7 @@ const chatHtml = `<!DOCTYPE html>
         .bubble { padding:10px 14px; border-radius:12px; font-size:14px; line-height:1.5; word-wrap:break-word; box-shadow:0 1px 2px rgba(0,0,0,0.05); }
         .message.sent .bubble { background:var(--sent); color:#fff; border-bottom-right-radius:2px; }
         .message.received .bubble { background:var(--recv-bg); color:var(--t1); border-bottom-left-radius:2px; border:1px solid var(--border); }
-        .msg-meta { font-size:10px; color:var(--t2); margin-top:3px; padding:0 4px; }
+        .msg-meta { font-size:10px; color:var(--t2); margin-bottom:3px; padding:0 4px; }
         .input-area { padding:12px 16px; background:#fff; border-top:1px solid var(--border); display:flex; align-items:center; gap:10px; flex-shrink:0; }
         .input-area input { flex:1; padding:10px 14px; border-radius:20px; border:1px solid var(--border); font-size:14px; background:#f9fafb; }
@@ -974,15 +1005,18 @@ const chatHtml = `<!DOCTYPE html>
         .bubble code { background:rgba(0,0,0,0.1); padding:2px 4px; border-radius:3px; font-family:monospace; font-size:0.9em; }
         .bubble pre { background:#2d2d2d; color:#fff; padding:12px; border-radius:6px; overflow-x:auto; margin:8px 0; }
         .bubble pre code { background:transparent; padding:0; color:inherit; border-radius:0; }
-        .messages { flex:1; padding:16px; overflow-y:auto; display:flex; flex-direction:column; gap:12px; }
+        .messages { flex:1; padding:16px; overflow-y:auto; display:flex; flex-direction:column; gap:12px; position:relative; }
         .message { display:flex; flex-direction:row; max-width:85%; gap:8px; }
         .message.sent { align-self:flex-end; flex-direction:row-reverse; }
         .message.received { align-self:flex-start; }
-        .msg-avatar { width:40px; height:40px; border-radius:50%; object-fit:cover; flex-shrink:0; box-shadow:0 1px 2px rgba(0,0,0,0.1); margin-top:4px; }
+        .msg-avatar { width:40px; height:40px; border-radius:50%; object-fit:cover; flex-shrink:0; box-shadow:0 1px 2px rgba(0,0,0,0.1); margin-top:2px; }
         .msg-content { display:flex; flex-direction:column; max-width:100%; min-width:0; }
         .message.sent .msg-content { align-items:flex-end; }
         .message.received .msg-content { align-items:flex-start; }
         @media (min-width: 1024px) { .message { max-width: 70%; } }
+        .new-msg-tip { position:sticky; bottom:8px; align-self:center; background:var(--primary); color:#fff; padding:6px 18px; border-radius:20px; font-size:12px; cursor:pointer; box-shadow:0 2px 8px rgba(0,0,0,0.15); z-index:10; display:none; transition:opacity 0.2s; animation:newMsgBounce 0.3s ease; }
+        .new-msg-tip:hover { background:var(--primary-h); }
+        @keyframes newMsgBounce { 0%{transform:translateY(10px);opacity:0} 100%{transform:translateY(0);opacity:1} }
         @media (max-width:768px) {
             .sidebar { position:absolute; height:100%; z-index:20; width:280px; }
@@ -1052,6 +1086,8 @@ const chatHtml = `<!DOCTYPE html>
                     <div class="chat-title" id="chatTitle">未选择会话</div>
                 </div>
                 <div class="aid-select-wrap">
+                    <a href="https://agentunion.net" target="_blank" class="manage-btn" title="AgentUnion排行榜">AgentUnion排行榜</a>
+                    <a href="https://github.com/auliwenjiang/agentcp" target="_blank" class="manage-btn" title="ACP 开源GitHub">ACP 开源GitHub</a>
                     <a href="/" class="manage-btn" title="ACP 身份管理">
                         <svg width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24"><path d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"></path></svg> 身份管理
                     </a>
@@ -1082,6 +1118,7 @@ const chatHtml = `<!DOCTYPE html>
                     <div style="font-size:14px;font-weight:500;color:#64748b;margin-bottom:4px;">ACP Agent 安全通信</div>
                     <div style="font-size:12px;color:#94a3b8;">选择或创建一个会话，开始点对点加密聊天</div>
                 </div>
+                <div class="new-msg-tip" id="newMsgTip" onclick="scrollToBottom()">↓ 有新消息</div>
             </div>
             <div class="input-area">
                 <input type="text" id="messageInput" placeholder="输入消息..." onkeypress="if(event.key==='Enter')sendMessage()">
@@ -1105,7 +1142,7 @@ const chatHtml = `<!DOCTYPE html>
         <div class="modal">
             <h3>创建群组</h3>
             <input type="text" id="groupNameInput" placeholder="输入群组名称">
-            <textarea id="groupDescInput" placeholder="输入群组描述（可选）" style="width:100%;padding:10px;border:1px solid var(--border);border-radius:8px;margin-bottom:16px;font-size:14px;resize:vertical;min-height:60px;font-family:inherit;"></textarea>
+            <textarea id="groupDescInput" placeholder="输入群组描述（必填）" style="width:100%;padding:10px;border:1px solid var(--border);border-radius:8px;margin-bottom:16px;font-size:14px;resize:vertical;min-height:60px;font-family:inherit;"></textarea>
             <div style="margin-bottom:16px;">
                 <label style="font-size:13px;color:var(--t2);margin-bottom:8px;display:block;">群组类型</label>
                 <div style="display:flex;gap:12px;">
@@ -1158,7 +1195,7 @@ const chatHtml = `<!DOCTYPE html>
         </div>
     </div>
     <script>
-        var S = { aid:'', sid:null, sessions:[], status:'disconnected', expanded:{}, sidebarOpen:true, aidList:[], closed:false, tab:'p2p', activeGroupId:null, groups:[], groupMsgs:[], groupTargetAid:'', isGroupCreator:false };
+        var S = { aid:'', sid:null, sessionId:null, sessions:[], status:'disconnected', expanded:{}, sidebarOpen:true, aidList:[], closed:false, tab:'p2p', activeGroupId:null, groups:[], groupMsgs:[], groupTargetAid:'', isGroupCreator:false };
         var D = {};
         var agentInfoCache = {};
         function $(id){ return document.getElementById(id); }
@@ -1180,12 +1217,12 @@ const chatHtml = `<!DOCTYPE html>
             e.stopPropagation();
             if(!confirm('确认删除该会话？')) return;
             try {
-                var r = await fetch('/api/sessions/delete', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ sessionId: sessionId }) });
+                var r = await fetch('/api/sessions/delete', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ sessionId: sessionId, aid: S.aid }) });
                 var d = await r.json();
                 if(d.success){
-                    if(S.sid === sessionId){ S.sid = null; D.title.textContent='未选择会话'; D.msgs.innerHTML=''; D.input.disabled=false; }
+                    if(S.sid === sessionId){ S.sid = null; S.sessionId=null; D.title.textContent='未选择会话'; D.msgs.innerHTML=''; D.input.disabled=false; }
                     D.sList.dataset.s=''; // force update
-                    poll();
+                    loadSessions();
                 } else { alert(d.error || '删除失败'); }
             } catch(err){ alert('删除失败: ' + err.message); }
         }
@@ -1194,30 +1231,43 @@ const chatHtml = `<!DOCTYPE html>
             e.stopPropagation();
             if(!confirm('确认删除与 ' + peerAid + ' 的所有会话？')) return;
             try {
-                var r = await fetch('/api/peers/delete', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ peerAid: peerAid }) });
+                var r = await fetch('/api/peers/delete', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ peerAid: peerAid, aid: S.aid }) });
                 var d = await r.json();
                 if(d.success){
-                    S.sid = null; D.title.textContent='未选择会话'; D.msgs.innerHTML='';
+                    S.sid = null; S.sessionId=null; D.title.textContent='未选择会话'; D.msgs.innerHTML='';
                     D.sList.dataset.s=''; // force update
-                    poll();
+                    loadSessions();
                 } else { alert(d.error || '删除失败'); }
             } catch(err){ alert('删除失败: ' + err.message); }
         }
-        function initDom(){ D.myAid=$('myAid'); D.sList=$('sessionList'); D.title=$('chatTitle'); D.msgs=$('messages'); D.input=$('messageInput'); D.sendBtn=$('sendBtn'); D.dot=$('statusDot'); D.modal=$('modal'); D.tInput=$('targetAidInput'); D.cBtn=$('connectBtn'); D.sidebar=$('sidebar'); D.aidSel=$('aidSelect'); D.aidDot=$('aidOnlineDot'); D.aidStatusToggle=$('aidStatusToggle'); D.aidStatusText=$('aidStatusText'); D.p2pPanel=$('p2pPanel'); D.groupPanel=$('groupPanel'); D.groupList=$('groupList'); D.groupInfoBar=$('groupInfoBar'); D.groupInfoText=$('groupInfoText'); D.tabP2P=$('tabP2P'); D.tabGroup=$('tabGroup'); D.encryptBanner=$('encryptBanner'); }
+        function initDom(){ D.myAid=$('myAid'); D.sList=$('sessionList'); D.title=$('chatTitle'); D.msgs=$('messages'); D.input=$('messageInput'); D.sendBtn=$('sendBtn'); D.dot=$('statusDot'); D.modal=$('modal'); D.tInput=$('targetAidInput'); D.cBtn=$('connectBtn'); D.sidebar=$('sidebar'); D.aidSel=$('aidSelect'); D.aidDot=$('aidOnlineDot'); D.aidStatusToggle=$('aidStatusToggle'); D.aidStatusText=$('aidStatusText'); D.p2pPanel=$('p2pPanel'); D.groupPanel=$('groupPanel'); D.groupList=$('groupList'); D.groupInfoBar=$('groupInfoBar'); D.groupInfoText=$('groupInfoText'); D.tabP2P=$('tabP2P'); D.tabGroup=$('tabGroup'); D.encryptBanner=$('encryptBanner'); D.newMsgTip=$('newMsgTip'); }
+        function isAtBottom(){ return D.msgs.scrollHeight-D.msgs.scrollTop-D.msgs.clientHeight<150; }
+        function scrollToBottom(){ D.msgs.scrollTop=D.msgs.scrollHeight; hideNewMsgTip(); }
+        function showNewMsgTip(){ if(D.newMsgTip) D.newMsgTip.style.display='block'; }
+        function hideNewMsgTip(){ if(D.newMsgTip) D.newMsgTip.style.display='none'; }
         async function init(){
             initDom();
+            // 监听滚动，用户滚到底部时自动隐藏新消息提示
+            D.msgs.addEventListener('scroll',function(){ if(isAtBottom()) hideNewMsgTip(); });
             try {
                 var r = await fetch('/api/aid'); var d = await r.json();
-                if(d.currentAid){
-                    S.aid=d.currentAid; D.myAid.textContent='我的身份: '+d.currentAid; D.myAid.title=d.currentAid;
-                    // 填充 AID 切换下拉
-                    S.aidList=d.aidStatus||[];
+                S.aidList=d.aidStatus||[];
+                if(S.aidList.length){
+                    // 优先从当前标签页恢复，再 fallback 到全局默认
+                    var saved=sessionStorage.getItem('selectedAid')||localStorage.getItem('selectedAid');
+                    var found=saved&&S.aidList.find(function(a){ return a.aid===saved; });
+                    S.aid=(found?saved:S.aidList[0].aid)||'';
+                    if(S.aid) sessionStorage.setItem('selectedAid',S.aid);
+                }
+                if(S.aid){
+                    D.myAid.textContent='我的身份: '+S.aid; D.myAid.title=S.aid;
                     renderAidSelect();
-                    // 初始加载一次ws状态，后续通过WebSocket推送更新
-                    fetch('/api/ws/status').then(function(r){return r.json();}).then(function(d){updateDot(d.status);}).catch(function(){});
-                    poll(); setInterval(poll,1000);
+                    connectGroupWs();
+                    fetch('/api/ws/status?aid='+encodeURIComponent(S.aid)).then(function(r){return r.json();}).then(function(d){updateDot(d.status);}).catch(function(){});
+                    loadSessions();
                 } else { window.location.href='/'; }
             } catch(e){ console.error(e); }
         }
@@ -1239,20 +1289,28 @@ const chatHtml = `<!DOCTYPE html>
         async function switchAid(aid){
             if(aid===S.aid) return;
-            try {
-                var r=await fetch('/api/aid/select',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({aid:aid})});
-                var d=await r.json();
-                if(!d.success) return;
-                // 检查是否在线，不在线则自动上线
-                var r2=await fetch('/api/aid'); var d2=await r2.json();
-                var aidList=d2.aidStatus||[];
-                var info=aidList.find(function(a){ return a.aid===aid; });
-                if(!info || !info.online){
+            S.aid=aid;
+            S.sid=null; S.sessionId=null;
+            _groupInited=false; // 切换 aid 后需重新初始化群组客户端
+            localStorage.setItem('selectedAid',aid);
+            sessionStorage.setItem('selectedAid',aid);
+            D.myAid.textContent='我的身份: '+aid; D.myAid.title=aid;
+            renderAidSelect();
+            // 通知服务端本标签页绑定的 aid（WS 已连接则立即发，否则 onopen 会发）
+            if(_groupWs&&_groupWs.readyState===WebSocket.OPEN){
+                _groupWs.send(JSON.stringify({type:'bind_aid',aid:aid}));
+            }
+            // 检查是否在线，不在线则自动上线
+            var info=S.aidList.find(function(a){ return a.aid===aid; });
+            if(!info||!info.online){
+                try {
                     await fetch('/api/ws/start',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({aid:aid})});
-                }
-                // 刷新页面以加载新身份的数据
-                location.reload();
-            } catch(e){}
+                } catch(e){}
+            }
+            D.msgs.innerHTML=''; D.title.textContent='未选择会话';
+            D.sList.dataset.s='';
+            fetch('/api/ws/status?aid='+encodeURIComponent(aid)).then(function(r){return r.json();}).then(function(d){updateDot(d.status);}).catch(function(){});
+            loadSessions();
         }
         async function toggleOnline(){
@@ -1269,19 +1327,29 @@ const chatHtml = `<!DOCTYPE html>
             } catch(e){}
         }
-        async function poll(){
+        async function loadSessions(){
+            if(!S.aid) return;
             try {
-                // P2P会话和消息仅在P2P标签页时刷新
-                if(S.tab==='p2p'){
-                    var [sr,mr] = await Promise.all([fetch('/api/sessions'),fetch('/api/messages')]);
-                    var sd=await sr.json(), md=await mr.json();
-                    if(sd.sessions) updateSessions(sd.sessions, sd.activeSessionId);
-                    S.closed=md.closed||false;
-                    if(md.messages) renderMsgs(md.messages, S.closed);
-                }
+                var r=await fetch('/api/sessions?aid='+encodeURIComponent(S.aid));
+                var d=await r.json();
+                if(d.sessions) updateSessions(d.sessions, S.sid);
+            } catch(e){}
+        }
+        async function loadMessages(){
+            if(!S.aid||!S.sid||S.tab!=='p2p') return;
+            try {
+                var r=await fetch('/api/messages?aid='+encodeURIComponent(S.aid)+'&sessionId='+encodeURIComponent(S.sid));
+                var d=await r.json();
+                S.closed=d.closed||false;
+                D.msgs.dataset.s='';
+                if(d.messages) renderMsgs(d.messages, S.closed);
             } catch(e){}
         }
+        // legacy poll kept for compatibility (no-op, replaced by WS push)
+        function poll(){}
         function updateSessions(sessions, activeId){
             var sig=JSON.stringify(sessions)+activeId+S.sid;
             if(D.sList.dataset.s===sig) return;
@@ -1395,8 +1463,8 @@ const chatHtml = `<!DOCTYPE html>
                 return '<div class="message '+m.type+'">' +
                        '<img class="msg-avatar" src="'+avatarSrc+'" title="'+escH(name)+'">' +
                        '<div class="msg-content">' +
-                       '<div class="bubble">'+c+'</div>' +
                        '<div class="msg-meta">'+(sent?'我':escH(name))+' · '+t+'</div>' +
+                       '<div class="bubble">'+c+'</div>' +
                        '</div></div>';
             }).join('');
             if(closed){
@@ -1405,9 +1473,17 @@ const chatHtml = `<!DOCTYPE html>
             } else {
                 D.input.disabled=false; D.input.placeholder='输入消息...';
             }
-            var wasAtBottom=D.msgs.scrollHeight-D.msgs.scrollTop-D.msgs.clientHeight<150;
-            D.msgs.innerHTML=html;
-            if(wasAtBottom) D.msgs.scrollTop=D.msgs.scrollHeight;
+            var wasAtBottom=isAtBottom();
+            var prevScrollTop=D.msgs.scrollTop;
+            D.msgs.innerHTML=html+'<div class="new-msg-tip" id="newMsgTip" onclick="scrollToBottom()" style="display:none;">↓ 有新消息</div>';
+            D.newMsgTip=$('newMsgTip');
+            // 不自动滚动，保持用户当前位置；有新消息时显示提示
+            if(!wasAtBottom&&msgs.length>0){
+                D.msgs.scrollTop=prevScrollTop;
+                if(D.msgs.dataset.force!=='avatar') showNewMsgTip();
+            } else {
+                D.msgs.scrollTop=prevScrollTop;
+            }
         }
         function updateDot(st){
@@ -1416,26 +1492,38 @@ const chatHtml = `<!DOCTYPE html>
         }
         async function pickSession(sid,peer){
-            S.sid=sid;
+            if(S.tab!=='p2p') switchTab('p2p');
+            S.sid=sid; S.sessionId=sid;
+            hideNewMsgTip();
             D.title.textContent=peer;
             try {
-                await fetch('/api/sessions/active',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({sessionId:sid})});
-                var r=await fetch('/api/messages'); var d=await r.json();
+                await fetch('/api/sessions/active',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({sessionId:sid,aid:S.aid})});
+                // 通知服务端本标签页的 activeSessionId
+                if(_groupWs&&_groupWs.readyState===WebSocket.OPEN){
+                    _groupWs.send(JSON.stringify({type:'set_active_session',sessionId:sid}));
+                }
+                var r=await fetch('/api/messages?aid='+encodeURIComponent(S.aid)+'&sessionId='+encodeURIComponent(sid));
+                var d=await r.json();
                 S.closed=d.closed||false;
                 D.msgs.dataset.s=''; // force
                 renderMsgs(d.messages||[], S.closed);
+                scrollToBottom();
+                // 刷新会话列表，确保新会话出现在侧边栏
+                loadSessions();
             } catch(e){}
         }
         async function sendMessage(){
             var txt=D.input.value.trim();
             if(!txt){ return; }
+            // 用户主动发送消息，确保滚动到底部
+            hideNewMsgTip();
             // 群组模式
             if(S.tab==='group'){
                 if(!S.activeGroupId){ alert('请先选择一个群组'); return; }
                 try {
                     D.input.value='';
-                    var r=await fetch('/api/group/send',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({groupId:S.activeGroupId,message:txt})});
+                    var r=await fetch('/api/group/send',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({groupId:S.activeGroupId,message:txt,aid:S.aid})});
                     var d=await r.json();
                     if(!d.success) alert(d.error||'发送失败');
                     else {
@@ -1447,6 +1535,7 @@ const chatHtml = `<!DOCTYPE html>
                                 _lastGroupMsgs.push(sentMsg);
                                 _lastGroupMsgSig='';
                                 renderGroupMsgs(_lastGroupMsgs);
+                                scrollToBottom();
                             }
                         }
                     }
@@ -1458,9 +1547,10 @@ const chatHtml = `<!DOCTYPE html>
             if(S.closed){ alert('该会话已关闭，请新建会话继续通信'); return; }
             try {
                 D.input.value='';
-                var r=await fetch('/api/ws/send',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({message:txt,sessionId:S.sid})});
+                var r=await fetch('/api/ws/send',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({message:txt,sessionId:S.sid,aid:S.aid})});
                 var d=await r.json();
                 if(!d.success) alert(d.error||'发送失败');
+                else { await loadMessages(); scrollToBottom(); }
             } catch(e){ alert('发送失败'); }
         }
@@ -1474,7 +1564,7 @@ const chatHtml = `<!DOCTYPE html>
         async function newSessionWith(peerAid){
             try {
-                var r=await fetch('/api/ws/connect',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({targetAid:peerAid})});
+                var r=await fetch('/api/ws/connect',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({targetAid:peerAid,aid:S.aid})});
                 var d=await r.json();
                 if(d.success){ pickSession(d.sessionId,peerAid); }
                 else { alert(d.error||'连接失败'); }
@@ -1486,7 +1576,7 @@ const chatHtml = `<!DOCTYPE html>
             if(!aid) return;
             D.cBtn.disabled=true; D.cBtn.textContent='连接中...';
             try {
-                var r=await fetch('/api/ws/connect',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({targetAid:aid})});
+                var r=await fetch('/api/ws/connect',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({targetAid:aid,aid:S.aid})});
                 var d=await r.json();
                 if(d.success){ hideModal(); pickSession(d.sessionId,aid); }
                 else { alert(d.error||'连接失败'); }
@@ -1505,11 +1595,15 @@ const chatHtml = `<!DOCTYPE html>
             if(isNaN(d.getTime())) return '';
             var now=new Date();
             var pad=function(v){ return v<10?'0'+v:''+v; };
-            var H=pad(d.getHours()), M=pad(d.getMinutes()), ss=pad(d.getSeconds());
+            var H=pad(d.getHours()), M=pad(d.getMinutes());
             if(d.getFullYear()===now.getFullYear()&&d.getMonth()===now.getMonth()&&d.getDate()===now.getDate()){
-                return H+':'+M+':'+ss;
+                return H+':'+M;
             }
-            return d.getFullYear()+'/'+pad(d.getMonth()+1)+'/'+pad(d.getDate())+' '+H+':'+M+':'+ss;
+            // 今年内省略年份
+            if(d.getFullYear()===now.getFullYear()){
+                return pad(d.getMonth()+1)+'/'+pad(d.getDate())+' '+H+':'+M;
+            }
+            return d.getFullYear()+'/'+pad(d.getMonth()+1)+'/'+pad(d.getDate())+' '+H+':'+M;
         }
         // ============================================================
@@ -1531,7 +1625,7 @@ const chatHtml = `<!DOCTYPE html>
                 _lastGroupMsgSig='';
                 initGroupClient();
                 pollGroupList();
-                if(S.activeGroupId) pollGroupMessages();
+                if(S.activeGroupId) pollGroupMessages().then(function(){ scrollToBottom(); });
                 else { D.msgs.innerHTML='<div style="text-align:center;color:#ccc;margin-top:20px;font-size:12px;">选择或创建一个群组</div>'; }
             } else {
                 D.encryptBanner.style.display='flex';
@@ -1539,15 +1633,19 @@ const chatHtml = `<!DOCTYPE html>
                 D.input.placeholder='输入消息...';
                 D.input.disabled=false;
                 _lastGroupMsgSig='';
-                // 切回P2P时立即刷新消息
+                // 立即清空消息区域，防止群消息残留
+                D.msgs.innerHTML='';
+                // 切回P2P时立即刷新会话列表和消息
+                D.sList.dataset.s='';
                 D.msgs.dataset.s='';
+                loadSessions();
                 if(S.sid){
-                    fetch('/api/messages').then(function(r){ return r.json(); }).then(function(d){
+                    fetch('/api/messages?aid='+encodeURIComponent(S.aid)+'&sessionId='+encodeURIComponent(S.sid)).then(function(r){ return r.json(); }).then(function(d){
+                        if(S.tab!=='p2p') return;
                         S.closed=d.closed||false;
                         if(d.messages) renderMsgs(d.messages, S.closed);
+                        scrollToBottom();
                     }).catch(function(){});
-                } else {
-                    D.msgs.innerHTML='';
                 }
             }
         }
@@ -1556,7 +1654,7 @@ const chatHtml = `<!DOCTYPE html>
         async function initGroupClient(){
             if(_groupInited) return;
             try {
-                var r=await fetch('/api/group/init',{method:'POST'});
+                var r=await fetch('/api/group/init',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({aid:S.aid})});
                 var d=await r.json();
                 if(d.success){ _groupInited=true; if(d.targetAid) S.groupTargetAid=d.targetAid; }
             } catch(e){ console.error('群组初始化失败',e); }
@@ -1564,7 +1662,7 @@ const chatHtml = `<!DOCTYPE html>
         async function pollGroupList(){
             try {
-                var r=await fetch('/api/group/list');
+                var r=await fetch('/api/group/list?aid='+encodeURIComponent(S.aid));
                 var d=await r.json();
                 if(d.groups){ S.groups=d.groups; renderGroupList(); }
             } catch(e){}
@@ -1586,6 +1684,8 @@ const chatHtml = `<!DOCTYPE html>
         async function pickGroup(groupId,name){
             S.activeGroupId=groupId;
             S.isGroupCreator=false;
+            _lastGroupMsgSig='';
+            hideNewMsgTip();
             D.title.textContent=name;
             D.groupInfoBar.style.display='flex';
             D.groupInfoText.textContent=name;
@@ -1598,11 +1698,11 @@ const chatHtml = `<!DOCTYPE html>
             $('groupReviewBtn').style.display='none';
             renderGroupList();
             try {
-                await fetch('/api/group/select',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({groupId:groupId})});
+                await fetch('/api/group/select',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({groupId:groupId,aid:S.aid})});
             } catch(e){}
             // 获取群信息判断是否为创建者
             try {
-                var r=await fetch('/api/group/info?groupId='+encodeURIComponent(groupId));
+                var r=await fetch('/api/group/info?groupId='+encodeURIComponent(groupId)+'&aid='+encodeURIComponent(S.aid));
                 var d=await r.json();
                 if(d.creator&&d.creator===S.aid){
                     S.isGroupCreator=true;
@@ -1615,16 +1715,16 @@ const chatHtml = `<!DOCTYPE html>
                 // 获取失败时默认显示复制群链接
                 $('groupCopyLinkBtn').style.display='';
             }
-            pollGroupMessages();
+            pollGroupMessages().then(function(){ scrollToBottom(); });
         }
         var _lastGroupMsgSig='';
         async function pollGroupMessages(){
             if(!S.activeGroupId||S.tab!=='group') return;
             try {
-                var r=await fetch('/api/group/messages?groupId='+encodeURIComponent(S.activeGroupId));
+                var r=await fetch('/api/group/messages?groupId='+encodeURIComponent(S.activeGroupId)+'&aid='+encodeURIComponent(S.aid));
                 var d=await r.json();
-                if(d.messages) renderGroupMsgs(d.messages);
+                if(S.tab==='group'&&d.messages) renderGroupMsgs(d.messages);
             } catch(e){}
         }
@@ -1633,17 +1733,31 @@ const chatHtml = `<!DOCTYPE html>
         // ============================================================
         var _groupWs=null;
         var _groupWsReconnectTimer=null;
+        var _groupWsReconnectDelay=1000; // exponential backoff start
+        var _groupWsPingTimer=null;
         function connectGroupWs(){
             if(_groupWs&&(_groupWs.readyState===WebSocket.OPEN||_groupWs.readyState===WebSocket.CONNECTING)) return;
             var proto=location.protocol==='https:'?'wss:':'ws:';
-            _groupWs=new WebSocket(proto+'//'+location.host+'/ws/group');
+            _groupWs=new WebSocket(proto+'//'+location.host+'/ws/ui');
             _groupWs.onopen=function(){
-                console.log('[WS] group connected');
+                console.log('[WS] ui connected');
+                _groupWsReconnectDelay=1000; // reset backoff on success
                 if(_groupWsReconnectTimer){ clearTimeout(_groupWsReconnectTimer); _groupWsReconnectTimer=null; }
-                // 重连后主动拉取最新状态，防止断连期间丢失推送
-                fetch('/api/ws/status').then(function(r){return r.json();}).then(function(d){updateDot(d.status);}).catch(function(){});
+                // 绑定当前 aid
+                if(S.aid) _groupWs.send(JSON.stringify({type:'bind_aid',aid:S.aid}));
+                // 重连后主动拉取最新状态
+                if(S.aid) fetch('/api/ws/status?aid='+encodeURIComponent(S.aid)).then(function(r){return r.json();}).then(function(d){updateDot(d.status);}).catch(function(){});
                 fetch('/api/aid').then(function(r){return r.json();}).then(function(d){if(d.aidStatus){S.aidList=d.aidStatus;renderAidSelect();}}).catch(function(){});
+                // 重连后补拉一次会话列表，防止断连期间丢失推送
+                loadSessions();
+                // 启动 keepalive ping（每 25s 发一次，防止代理/防火墙断连）
+                if(_groupWsPingTimer) clearInterval(_groupWsPingTimer);
+                _groupWsPingTimer=setInterval(function(){
+                    if(_groupWs&&_groupWs.readyState===WebSocket.OPEN){
+                        try{ _groupWs.send(JSON.stringify({type:'ping'})); }catch(e){}
+                    }
+                },25000);
             };
             _groupWs.onmessage=function(ev){
                 try {
@@ -1652,12 +1766,17 @@ const chatHtml = `<!DOCTYPE html>
                 } catch(e){ console.error('[WS] parse error',e); }
             };
             _groupWs.onclose=function(){
-                console.log('[WS] group disconnected, reconnecting in 3s...');
+                console.log('[WS] ui disconnected, reconnecting in '+_groupWsReconnectDelay+'ms...');
                 _groupWs=null;
-                _groupWsReconnectTimer=setTimeout(connectGroupWs,3000);
+                if(_groupWsPingTimer){ clearInterval(_groupWsPingTimer); _groupWsPingTimer=null; }
+                _groupWsReconnectTimer=setTimeout(function(){
+                    _groupWsReconnectDelay=Math.min(_groupWsReconnectDelay*2,30000); // cap at 30s
+                    connectGroupWs();
+                },_groupWsReconnectDelay);
             };
             _groupWs.onerror=function(e){
-                console.error('[WS] group error',e);
+                console.error('[WS] ui error',e);
+                // onerror is always followed by onclose, so reconnect is handled there
             };
         }
@@ -1671,6 +1790,17 @@ const chatHtml = `<!DOCTYPE html>
                 renderAidSelect();
                 return;
             }
+            if(data.type==='p2p_message'){
+                // 实时推送的 P2P 消息
+                if(S.tab==='p2p' && data.sessionId===S.sid){
+                    loadMessages();
+                }
+                return;
+            }
+            if(data.type==='sessions_updated'){
+                loadSessions();
+                return;
+            }
             if(data.type==='group_message'){
                 // 实时推送的完整消息
                 var msg=data.message;
@@ -1713,17 +1843,18 @@ const chatHtml = `<!DOCTYPE html>
             }
         }
-        // 启动 WebSocket 连接
-        connectGroupWs();
         var _lastGroupMsgs=[];
         function renderGroupMsgs(msgs){
+            // 不在群组 tab 时不渲染，防止覆盖 P2P 消息
+            if(S.tab!=='group') return;
             var sig=msgs.length+(msgs.length>0?(msgs[msgs.length-1].msg_id||0):'');
             if(_lastGroupMsgSig===sig&&!msgs._forceRender) return;
+            var prevCount=_lastGroupMsgs.length;
             _lastGroupMsgSig=sig;
             _lastGroupMsgs=msgs;
             if(!msgs.length){
-                D.msgs.innerHTML='<div style="text-align:center;color:#ccc;margin-top:20px;font-size:12px;">暂无消息</div>';
+                D.msgs.innerHTML='<div style="text-align:center;color:#ccc;margin-top:20px;font-size:12px;">暂无消息</div><div class="new-msg-tip" id="newMsgTip" onclick="scrollToBottom()" style="display:none;">↓ 有新消息</div>';
+                D.newMsgTip=$('newMsgTip');
                 return;
             }
             var needFetch=[];
@@ -1740,17 +1871,26 @@ const chatHtml = `<!DOCTYPE html>
                 return '<div class="message '+(sent?'sent':'received')+'">' +
                        '<img class="msg-avatar" src="'+avatarSrc+'" title="'+escH(name)+'">' +
                        '<div class="msg-content">' +
-                       '<div class="bubble">'+c+'</div>' +
                        '<div class="msg-meta">'+(sent?'我':escH(name))+' · '+t+'</div>' +
+                       '<div class="bubble">'+c+'</div>' +
                        '</div></div>';
             }).join('');
-            var wasAtBottom=D.msgs.scrollHeight-D.msgs.scrollTop-D.msgs.clientHeight<150;
-            D.msgs.innerHTML=html;
-            if(wasAtBottom) D.msgs.scrollTop=D.msgs.scrollHeight;
+            var wasAtBottom=isAtBottom();
+            var prevScrollTop=D.msgs.scrollTop;
+            D.msgs.innerHTML=html+'<div class="new-msg-tip" id="newMsgTip" onclick="scrollToBottom()" style="display:none;">↓ 有新消息</div>';
+            D.newMsgTip=$('newMsgTip');
+            // 有新消息且用户不在底部：保持位置，显示提示
+            if(msgs.length>prevCount&&prevCount>0&&!wasAtBottom){
+                D.msgs.scrollTop=prevScrollTop;
+                showNewMsgTip();
+            } else {
+                D.msgs.scrollTop=prevScrollTop;
+            }
             // 异步加载未缓存的 agent info，加载完成后重新渲染以更新头像
             var unique=needFetch.filter(function(v,i,a){ return a.indexOf(v)===i; });
             unique.forEach(function(aid){
                 fetchAgentInfo(aid).then(function(){
+                    if(S.tab!=='group') return;
                     _lastGroupMsgSig='';
                     _lastGroupMsgs._forceRender=true;
                     renderGroupMsgs(_lastGroupMsgs);
@@ -1769,6 +1909,7 @@ const chatHtml = `<!DOCTYPE html>
             var name=$('groupNameInput').value.trim();
             if(!name) return;
             var description=$('groupDescInput').value.trim();
+            if(!description){ $('groupDescInput').focus(); return; }
             var visibility=document.querySelector('input[name="groupVisibility"]:checked').value;
             var btn=$('createGroupBtn');
             btn.disabled=true; btn.textContent='创建中...';
@@ -1799,7 +1940,7 @@ const chatHtml = `<!DOCTYPE html>
             var btn=$('joinGroupBtn');
             btn.disabled=true; btn.textContent=code?'加入中...':'申请中...';
             try {
-                var r=await fetch('/api/group/join',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({groupUrl:groupUrl,code:code||undefined})});
+                var r=await fetch('/api/group/join',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({groupUrl:groupUrl,code:code||undefined,aid:S.aid})});
                 var d=await r.json();
                 if(d.success){
                     hideJoinGroupModal();
@@ -1821,7 +1962,7 @@ const chatHtml = `<!DOCTYPE html>
         async function generateInviteLink(){
             if(!S.activeGroupId) return;
             try {
-                var r=await fetch('/api/group/invite-code',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({groupId:S.activeGroupId})});
+                var r=await fetch('/api/group/invite-code',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({groupId:S.activeGroupId,aid:S.aid})});
                 var d=await r.json();
                 if(d.success&&d.code){
                     var baseUrl=d.group_url||('https://'+S.groupTargetAid+'/'+S.activeGroupId);
@@ -1895,7 +2036,7 @@ const chatHtml = `<!DOCTYPE html>
         async function showGroupMembers(){
             if(!S.activeGroupId) return;
             try {
-                var r=await fetch('/api/group/members?groupId='+encodeURIComponent(S.activeGroupId));
+                var r=await fetch('/api/group/members?groupId='+encodeURIComponent(S.activeGroupId)+'&aid='+encodeURIComponent(S.aid));
                 var d=await r.json();
                 if(d.members){
                     var html=d.members.map(function(m){
@@ -1966,7 +2107,7 @@ const chatHtml = `<!DOCTYPE html>
         async function showPendingRequests(){
             if(!S.activeGroupId) return;
             try {
-                var r=await fetch('/api/group/pending-requests?groupId='+encodeURIComponent(S.activeGroupId));
+                var r=await fetch('/api/group/pending-requests?groupId='+encodeURIComponent(S.activeGroupId)+'&aid='+encodeURIComponent(S.aid));
                 var d=await r.json();
                 if(d.requests&&d.requests.length>0){
                     // 先渲染基础结构，然后异步加载 agent info
@@ -2020,7 +2161,7 @@ const chatHtml = `<!DOCTYPE html>
         async function reviewJoin(agentId,action){
             if(!S.activeGroupId) return;
             try {
-                var r=await fetch('/api/group/review-join',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({groupId:S.activeGroupId,agentId:agentId,action:action})});
+                var r=await fetch('/api/group/review-join',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({groupId:S.activeGroupId,agentId:agentId,action:action,aid:S.aid})});
                 var d=await r.json();
                 if(d.success){ showPendingRequests(); }
                 else { alert(d.error||'操作失败'); }
@@ -2030,7 +2171,7 @@ const chatHtml = `<!DOCTYPE html>
         async function leaveGroup(groupId){
             if(!confirm('确认退出该群组？')) return;
             try {
-                var r=await fetch('/api/group/leave',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({groupId:groupId})});
+                var r=await fetch('/api/group/leave',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({groupId:groupId,aid:S.aid})});
                 var d=await r.json();
                 if(d.success){
                     if(S.activeGroupId===groupId){
@@ -2054,7 +2195,7 @@ const chatHtml = `<!DOCTYPE html>
             showMyGroupsModal();
             $('myGroupsContent').innerHTML='<div style="text-align:center;padding:20px;color:#999;">加载中...</div>';
             try {
-                var r=await fetch('/api/group/my-groups');
+                var r=await fetch('/api/group/my-groups?aid='+encodeURIComponent(S.aid));
                 var d=await r.json();
                 if(!d.success){ $('myGroupsContent').innerHTML='<div style="text-align:center;padding:20px;color:#e74c3c;">'+escH(d.error||'获取失败')+'</div>'; return; }
                 var groups=d.groups||[];
@@ -2192,7 +2333,7 @@ async function handleRequest(req, res) {
         try {
             const aidList = await datamanager_1.CertAndKeyStore.getAids();
             const aidStatus = await getAidStatusList();
-            sendJson(res, { currentAid, aidList, aidStatus, apiUrl: globalApiUrl });
+            sendJson(res, { aidList, aidStatus, apiUrl: globalApiUrl });
         }
         catch (e) {
             sendJson(res, { error: e.message }, 500);
@@ -2218,11 +2359,8 @@ async function handleRequest(req, res) {
             }
             const loaded = await agentCP.loadAid(aid);
             if (loaded) {
-                const oldAid = currentAid;
-                currentAid = aid;
-                // 切换会话：保存旧 AID 的会话，加载新 AID 的会话
-                await getMessageStoreForAid(aid).loadSessionsForAid(aid);
-                activeSessionId = null;
+                // 加载该 AID 的持久化会话
+                await ensureMessageStoreLoaded(aid);
                 // 切换身份时自动上线（含群组初始化），A/B 同时保持在线
                 try {
                     await ensureOnline(aid);
@@ -2270,7 +2408,6 @@ async function handleRequest(req, res) {
             }
             try {
                 const created = await agentCP.createAid(aid);
-                currentAid = created;
                 // 保存自定义昵称和描述
                 const nickname = (body.nickname || '').trim();
                 const description = (body.description || '').trim();
@@ -2359,7 +2496,7 @@ async function handleRequest(req, res) {
     if (pathname === '/api/ws/start' && method === 'POST') {
         try {
             const body = await parseBody(req);
-            const targetAid = body.aid || currentAid;
+            const targetAid = body.aid;
             if (!targetAid) {
                 sendJson(res, { success: false, error: '请先选择 AID' });
                 return;
@@ -2375,9 +2512,13 @@ async function handleRequest(req, res) {
     if (pathname === '/api/ws/connect' && method === 'POST') {
         try {
             const body = await parseBody(req);
-            const targetAid = body.targetAid;
+            const { targetAid, aid } = body;
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
             // 自动上线
-            const instance = await ensureOnline();
+            const instance = await ensureOnline(aid);
             if (!instance.agentWS) {
                 sendJson(res, { success: false, error: '自动上线失败' });
                 return;
@@ -2400,9 +2541,8 @@ async function handleRequest(req, res) {
                     console.log('邀请状态:', status);
                 });
             });
-            // 创建 outgoing session 并设为活跃
-            getMessageStore().getOrCreateSession(result.sessionId, result.identifyingCode, targetAid, 'outgoing', currentAid);
-            activeSessionId = result.sessionId;
+            // 创建 outgoing session
+            getMessageStoreForAid(aid).getOrCreateSession(result.sessionId, result.identifyingCode, targetAid, 'outgoing', aid);
             sendJson(res, Object.assign({ success: true }, result));
         }
         catch (e) {
@@ -2413,24 +2553,26 @@ async function handleRequest(req, res) {
     if (pathname === '/api/ws/send' && method === 'POST') {
         try {
             const body = await parseBody(req);
-            const { message, sessionId } = body;
+            const { message, sessionId, aid } = body;
             if (!message) {
                 sendJson(res, { success: false, error: '消息不能为空' });
                 return;
             }
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
             // 自动上线
-            const instance = await ensureOnline();
+            const instance = await ensureOnline(aid);
             if (!instance.agentWS) {
                 sendJson(res, { success: false, error: '自动上线失败' });
                 return;
             }
-            // 使用指定的 sessionId 或当前活跃会话
-            const sid = sessionId || activeSessionId;
-            if (!sid) {
-                sendJson(res, { success: false, error: '没有活跃会话' });
+            if (!sessionId) {
+                sendJson(res, { success: false, error: '缺少 sessionId' });
                 return;
             }
-            const session = getMessageStore().getSession(sid);
+            const session = getMessageStoreForAid(aid).getSession(sessionId);
             if (!session) {
                 sendJson(res, { success: false, error: '会话不存在' });
                 return;
@@ -2440,7 +2582,7 @@ async function handleRequest(req, res) {
                 return;
             }
             instance.agentWS.send(message, session.peerAid, session.sessionId, session.identifyingCode);
-            getMessageStore().addMessageToSession(sid, {
+            getMessageStoreForAid(aid).addMessageToSession(sessionId, {
                 type: 'sent',
                 content: message,
                 to: session.peerAid,
@@ -2454,12 +2596,20 @@ async function handleRequest(req, res) {
         return;
     }
     if (pathname === '/api/messages' && method === 'GET') {
-        const session = activeSessionId ? getMessageStore().getSession(activeSessionId) : null;
-        sendJson(res, { messages: session ? session.messages : [], activeSessionId, closed: session ? (session.closed || false) : false });
+        const aid = parsedUrl.query.aid;
+        const sessionId = parsedUrl.query.sessionId;
+        if (!aid || !sessionId) {
+            sendJson(res, { messages: [], activeSessionId: null, closed: false });
+            return;
+        }
+        const store = await ensureMessageStoreLoaded(aid);
+        const session = store.getSession(sessionId);
+        sendJson(res, { messages: session ? session.messages : [], activeSessionId: sessionId, closed: session ? (session.closed || false) : false });
         return;
     }
     if (pathname === '/api/ws/status' && method === 'GET') {
-        const instance = getActiveInstance();
+        const aid = parsedUrl.query.aid;
+        const instance = aid ? aidInstances.get(aid) : null;
         if (!instance || !instance.agentWS) {
             sendJson(res, { connected: false, status: 'disconnected' });
         }
@@ -2469,19 +2619,26 @@ async function handleRequest(req, res) {
         return;
     }
     if (pathname === '/api/sessions' && method === 'GET') {
-        sendJson(res, { sessions: getMessageStore().getSessionList(currentAid), activeSessionId });
+        const aid = parsedUrl.query.aid;
+        if (!aid) {
+            sendJson(res, { sessions: [], activeSessionId: null });
+            return;
+        }
+        const store = await ensureMessageStoreLoaded(aid);
+        sendJson(res, { sessions: store.getSessionList(aid), activeSessionId: null });
         return;
     }
     if (pathname === '/api/sessions/active' && method === 'POST') {
         try {
             const body = await parseBody(req);
-            const { sessionId } = body;
-            if (!sessionId || !getMessageStore().hasSession(sessionId)) {
+            const { sessionId, aid } = body;
+            if (!aid || !sessionId || !getMessageStoreForAid(aid).hasSession(sessionId)) {
                 sendJson(res, { success: false, error: '会话不存在' });
                 return;
             }
-            activeSessionId = sessionId;
-            sendJson(res, { success: true, activeSessionId });
+            // 通知绑定了该 aid 的客户端更新 activeSessionId
+            pushToAid(aid, { type: 'set_active_session', sessionId });
+            sendJson(res, { success: true, activeSessionId: sessionId });
         }
         catch (e) {
             sendJson(res, { success: false, error: e.message });
@@ -2491,15 +2648,17 @@ async function handleRequest(req, res) {
     if (pathname === '/api/sessions/delete' && method === 'POST') {
         try {
             const body = await parseBody(req);
-            const { sessionId } = body;
+            const { sessionId, aid } = body;
             if (!sessionId) {
                 sendJson(res, { success: false, error: '会话ID不能为空' });
                 return;
             }
-            const deleted = await getMessageStore().deleteSession(sessionId);
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
+            const deleted = await getMessageStoreForAid(aid).deleteSession(sessionId);
             if (deleted) {
-                if (activeSessionId === sessionId)
-                    activeSessionId = null;
                 sendJson(res, { success: true });
             }
             else {
@@ -2514,18 +2673,16 @@ async function handleRequest(req, res) {
     if (pathname === '/api/peers/delete' && method === 'POST') {
         try {
             const body = await parseBody(req);
-            const { peerAid } = body;
+            const { peerAid, aid } = body;
             if (!peerAid) {
                 sendJson(res, { success: false, error: 'AID不能为空' });
                 return;
             }
-            const count = await getMessageStore().deletePeer(peerAid, currentAid);
-            if (activeSessionId) {
-                const session = getMessageStore().getSession(activeSessionId);
-                if (!session || session.peerAid === peerAid) {
-                    activeSessionId = null;
-                }
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
             }
+            const count = await getMessageStoreForAid(aid).deletePeer(peerAid, aid);
             sendJson(res, { success: true, count });
         }
         catch (e) {
@@ -2538,7 +2695,13 @@ async function handleRequest(req, res) {
     // ============================================================
     if (pathname === '/api/group/init' && method === 'POST') {
         try {
-            const instance = await ensureOnline();
+            const body = await parseBody(req);
+            const aid = body.aid;
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
+            const instance = await ensureOnline(aid);
             await ensureGroupClient(instance);
             sendJson(res, { success: true, targetAid: instance.groupTargetAid });
         }
@@ -2550,12 +2713,16 @@ async function handleRequest(req, res) {
     if (pathname === '/api/group/create' && method === 'POST') {
         try {
             const body = await parseBody(req);
-            const { name, visibility, description } = body;
+            const { name, visibility, description, aid } = body;
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
             if (!name) {
                 sendJson(res, { success: false, error: '群组名称不能为空' });
                 return;
             }
-            const instance = await ensureOnline();
+            const instance = await ensureOnline(aid);
             await ensureGroupClient(instance);
             const ops = instance.agentCP.groupOps;
             const target = instance.groupTargetAid;
@@ -2568,6 +2735,8 @@ async function handleRequest(req, res) {
             console.log('[ACP] createGroup 返回:', JSON.stringify(result, null, 2));
             // 加入本地存储
             instance.agentCP.addGroupToStore(result.group_id, name);
+            // 注册在线，才能收到实时消息推送
+            await instance.agentCP.joinGroupSession(result.group_id);
             sendJson(res, Object.assign({ success: true }, result));
         }
         catch (e) {
@@ -2577,7 +2746,12 @@ async function handleRequest(req, res) {
     }
     if (pathname === '/api/group/list' && method === 'GET') {
         try {
-            const instance = await ensureOnline();
+            const aid = parsedUrl.query.aid;
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid', groups: [] });
+                return;
+            }
+            const instance = await ensureOnline(aid);
             await ensureGroupClient(instance);
             // 首次访问时从服务端同步群组列表
             if (!instance.groupListSynced) {
@@ -2600,8 +2774,12 @@ async function handleRequest(req, res) {
     if (pathname === '/api/group/select' && method === 'POST') {
         try {
             const body = await parseBody(req);
-            const { groupId } = body;
-            const instance = await ensureOnline();
+            const { groupId, aid } = body;
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
+            const instance = await ensureOnline(aid);
             instance.activeGroupId = groupId || null;
             sendJson(res, { success: true });
         }
@@ -2613,11 +2791,16 @@ async function handleRequest(req, res) {
     if (pathname === '/api/group/info' && method === 'GET') {
         try {
             const groupId = parsedUrl.query.groupId;
+            const aid = parsedUrl.query.aid;
             if (!groupId) {
                 sendJson(res, { success: false, error: '缺少 groupId' });
                 return;
             }
-            const instance = await ensureOnline();
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
+            const instance = await ensureOnline(aid);
             await ensureGroupClient(instance);
             const info = await instance.agentCP.groupOps.getGroupInfo(instance.groupTargetAid, groupId);
             sendJson(res, Object.assign({ success: true }, info));
@@ -2630,12 +2813,16 @@ async function handleRequest(req, res) {
     if (pathname === '/api/group/send' && method === 'POST') {
         try {
             const body = await parseBody(req);
-            const { groupId, message } = body;
+            const { groupId, message, aid } = body;
             if (!groupId || !message) {
                 sendJson(res, { success: false, error: '缺少 groupId 或 message' });
                 return;
             }
-            const instance = await ensureOnline();
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
+            const instance = await ensureOnline(aid);
             await ensureGroupClient(instance);
             const result = await instance.agentCP.groupOps.sendGroupMessage(instance.groupTargetAid, groupId, message, 'text');
             // 添加到本地存储
@@ -2656,7 +2843,12 @@ async function handleRequest(req, res) {
     if (pathname === '/api/group/messages' && method === 'GET') {
         try {
             const groupId = parsedUrl.query.groupId || '';
-            const instance = await ensureOnline();
+            const aid = parsedUrl.query.aid;
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid', messages: [] });
+                return;
+            }
+            const instance = await ensureOnline(aid);
             if (!groupId) {
                 sendJson(res, { success: true, messages: [] });
                 return;
@@ -2675,12 +2867,16 @@ async function handleRequest(req, res) {
     if (pathname === '/api/group/invite-code' && method === 'POST') {
         try {
             const body = await parseBody(req);
-            const { groupId } = body;
+            const { groupId, aid } = body;
             if (!groupId) {
                 sendJson(res, { success: false, error: '缺少 groupId' });
                 return;
             }
-            const instance = await ensureOnline();
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
+            const instance = await ensureOnline(aid);
             await ensureGroupClient(instance);
             const result = await instance.agentCP.groupOps.createInviteCode(instance.groupTargetAid, groupId, body.options);
             const groupUrl = `https://${instance.groupTargetAid}/${groupId}`;
@@ -2694,17 +2890,20 @@ async function handleRequest(req, res) {
     if (pathname === '/api/group/join' && method === 'POST') {
         try {
             const body = await parseBody(req);
-            const { groupUrl, code } = body;
+            const { groupUrl, code, aid } = body;
             if (!groupUrl) {
                 sendJson(res, { success: false, error: '缺少群聊链接' });
                 return;
             }
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
             const { targetAid, groupId } = group_1.GroupOperations.parseGroupUrl(groupUrl);
-            const instance = await ensureOnline();
+            const instance = await ensureOnline(aid);
             await ensureGroupClient(instance);
-            if (code) {
-                // 免审核：邀请码加入
-                await instance.agentCP.groupOps.useInviteCode(targetAid, groupId, code);
+            // 加入成功后的统一处理：获取群名、写入本地存储、注册在线会话
+            const finalizeJoin = async () => {
                 let groupName = groupId;
                 try {
                     const info = await instance.agentCP.groupOps.getGroupInfo(targetAid, groupId);
@@ -2712,12 +2911,26 @@ async function handleRequest(req, res) {
                 }
                 catch (_) { }
                 instance.agentCP.addGroupToStore(groupId, groupName);
+                await instance.agentCP.joinGroupSession(groupId);
+            };
+            if (code) {
+                // 免审核：邀请码加入
+                await instance.agentCP.groupOps.useInviteCode(targetAid, groupId, code);
+                await finalizeJoin();
                 sendJson(res, { success: true, group_id: groupId });
             }
             else {
-                // 审核模式：发送入群申请
-                const requestId = await instance.agentCP.groupOps.requestJoin(targetAid, groupId, body.message || '');
-                sendJson(res, { success: true, pending: true, request_id: requestId });
+                // 申请加入：公开群直接加入，私密群等待审核
+                const result = await instance.agentCP.groupOps.requestJoin(targetAid, groupId, body.message || '');
+                if (result.status === 'joined') {
+                    // 公开群：直接加入成功
+                    await finalizeJoin();
+                    sendJson(res, { success: true, group_id: groupId });
+                }
+                else {
+                    // 私密群：等待管理员审核
+                    sendJson(res, { success: true, pending: true, request_id: result.request_id });
+                }
             }
         }
         catch (e) {
@@ -2728,11 +2941,16 @@ async function handleRequest(req, res) {
     if (pathname === '/api/group/pending-requests' && method === 'GET') {
         try {
             const groupId = parsedUrl.query.groupId;
+            const aid = parsedUrl.query.aid;
             if (!groupId) {
                 sendJson(res, { success: false, error: '缺少 groupId' });
                 return;
             }
-            const instance = await ensureOnline();
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
+            const instance = await ensureOnline(aid);
             await ensureGroupClient(instance);
             const result = await instance.agentCP.groupOps.getPendingRequests(instance.groupTargetAid, groupId);
             sendJson(res, Object.assign({ success: true }, result));
@@ -2745,12 +2963,16 @@ async function handleRequest(req, res) {
     if (pathname === '/api/group/review-join' && method === 'POST') {
         try {
             const body = await parseBody(req);
-            const { groupId, agentId, action } = body;
+            const { groupId, agentId, action, aid } = body;
             if (!groupId || !agentId || !action) {
                 sendJson(res, { success: false, error: '缺少参数' });
                 return;
             }
-            const instance = await ensureOnline();
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
+            const instance = await ensureOnline(aid);
             await ensureGroupClient(instance);
             await instance.agentCP.groupOps.reviewJoinRequest(instance.groupTargetAid, groupId, agentId, action, body.reason || '');
             sendJson(res, { success: true });
@@ -2763,11 +2985,16 @@ async function handleRequest(req, res) {
     if (pathname === '/api/group/members' && method === 'GET') {
         try {
             const groupId = parsedUrl.query.groupId;
+            const aid = parsedUrl.query.aid;
             if (!groupId) {
                 sendJson(res, { success: false, error: '缺少 groupId' });
                 return;
             }
-            const instance = await ensureOnline();
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
+            const instance = await ensureOnline(aid);
             await ensureGroupClient(instance);
             const result = await instance.agentCP.groupOps.getMembers(instance.groupTargetAid, groupId);
             sendJson(res, Object.assign({ success: true }, result));
@@ -2779,7 +3006,12 @@ async function handleRequest(req, res) {
     }
     if (pathname === '/api/group/my-groups' && method === 'GET') {
         try {
-            const instance = await ensureOnline();
+            const aid = parsedUrl.query.aid;
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid', groups: [] });
+                return;
+            }
+            const instance = await ensureOnline(aid);
             await ensureGroupClient(instance);
             const ops = instance.agentCP.groupOps;
             const target = instance.groupTargetAid;
@@ -2805,12 +3037,16 @@ async function handleRequest(req, res) {
     if (pathname === '/api/group/leave' && method === 'POST') {
         try {
             const body = await parseBody(req);
-            const { groupId } = body;
+            const { groupId, aid } = body;
             if (!groupId) {
                 sendJson(res, { success: false, error: '缺少 groupId' });
                 return;
             }
-            const instance = await ensureOnline();
+            if (!aid) {
+                sendJson(res, { success: false, error: '缺少 aid' });
+                return;
+            }
+            const instance = await ensureOnline(aid);
             await ensureGroupClient(instance);
             await instance.agentCP.groupOps.leaveGroup(instance.groupTargetAid, groupId);
             await instance.agentCP.removeGroupFromStore(groupId);
@@ -2862,22 +3098,58 @@ function startServer(port, apiUrl, dataDir = '') {
                     await agentCP.loadCurrentAid();
                 }
             }
-            currentAid = aid;
             console.log(`已加载 AID: ${aid}`);
             // 加载该 AID 的持久化会话
-            await getMessageStoreForAid(aid).loadSessionsForAid(aid);
+            await ensureMessageStoreLoaded(aid);
             console.log(`已加载会话`);
         }
     }).catch(() => { });
     const server = http.createServer(handleRequest);
     // WebSocket server for browser ↔ server real-time communication
     const wss = new ws_1.default.Server({ noServer: true });
+    // Periodically terminate dead connections (no pong within 30s)
+    const wsAliveMap = new WeakMap();
+    const wssHeartbeat = setInterval(() => {
+        for (const [ws] of browserWsClients) {
+            if (wsAliveMap.get(ws) === false) {
+                ws.terminate();
+                browserWsClients.delete(ws);
+                continue;
+            }
+            wsAliveMap.set(ws, false);
+            ws.ping();
+        }
+    }, 30000);
     server.on('upgrade', (req, socket, head) => {
         const pathname = url.parse(req.url || '', true).pathname;
-        if (pathname === '/ws/group') {
+        if (pathname === '/ws/ui' || pathname === '/ws/group') {
             wss.handleUpgrade(req, socket, head, (ws) => {
-                browserWsClients.add(ws);
+                const client = { ws, aid: '', activeSessionId: null };
+                browserWsClients.set(ws, client);
+                wsAliveMap.set(ws, true);
+                ws.on('pong', () => wsAliveMap.set(ws, true));
                 console.log(`[WS] browser client connected, total=${browserWsClients.size}`);
+                ws.on('message', (raw) => {
+                    try {
+                        const msg = JSON.parse(raw.toString());
+                        if (msg.type === 'ping') {
+                            if (ws.readyState === ws_1.default.OPEN)
+                                ws.send(JSON.stringify({ type: 'pong' }));
+                        }
+                        else if (msg.type === 'bind_aid') {
+                            client.aid = msg.aid || '';
+                            // 推送当前该 aid 的 ws 状态
+                            const instance = aidInstances.get(client.aid);
+                            if (instance) {
+                                ws.send(JSON.stringify({ type: 'ws_status', aid: client.aid, status: instance.wsStatus }));
+                            }
+                        }
+                        else if (msg.type === 'set_active_session') {
+                            client.activeSessionId = msg.sessionId || null;
+                        }
+                    }
+                    catch (_a) { }
+                });
                 ws.on('close', () => {
                     browserWsClients.delete(ws);
                     console.log(`[WS] browser client disconnected, total=${browserWsClients.size}`);
@@ -2895,6 +3167,7 @@ function startServer(port, apiUrl, dataDir = '') {
     // 资源清理函数
     const cleanup = async () => {
         console.log('\n正在关闭服务...');
+        clearInterval(wssHeartbeat);
         // 持久化 agent info 缓存
         saveAgentInfoCacheToDisk();
         // 持久化当前会话
@@ -2932,8 +3205,8 @@ function startServer(port, apiUrl, dataDir = '') {
         }
         aidInstances.clear();
         // 关闭所有浏览器 WS 连接
-        for (const client of browserWsClients) {
-            client.close();
+        for (const [ws] of browserWsClients) {
+            ws.close();
         }
         browserWsClients.clear();
         wss.close();