@xcanwin/manyoyo 5.9.2 → 5.9.3

package/lib/web/frontend/app.html

@@ -58,9 +58,10 @@
                             >更多</button>
                             <div class="header-actions" id="headerActions">
                                 <button type="button" id="refreshBtn" class="secondary">刷新</button>
-                                <button type="button" id="addAgentBtn" class="secondary">新建AGENT</button>
-                                <button type="button" id="removeBtn" class="danger-outline">删除容器</button>
-                                <button type="button" id="removeAllBtn" class="danger">删除对话</button>
+                                <button type="button" id="openCreateMenuBtn" class="secondary">新建容器</button>
+                                <button type="button" id="removeBtn" class="danger">删除容器</button>
+                                <button type="button" id="addAgentBtn" class="secondary">新建 AGENT</button>
+                                <button type="button" id="removeAllBtn" class="danger">删除 AGENT</button>
                             </div>
                         </div>
                     </div>

package/lib/web/frontend/app.js

@@ -57,6 +57,7 @@
         configSaveMessage: '',
         createLoading: false,
         createSubmitting: false,
+        creatingAgent: false,
         agentTemplateSaving: false,
         configSnapshot: null,
         sessionDetail: null,
@@ -131,6 +132,7 @@
     const sidebarBackdrop = document.getElementById('sidebarBackdrop');
     const openConfigBtn = document.getElementById('openConfigBtn');
     const openCreateBtn = document.getElementById('openCreateBtn');
+    const openCreateMenuBtn = document.getElementById('openCreateMenuBtn');
     const configModal = document.getElementById('configModal');
     const configModalTitle = document.getElementById('configModalTitle');
     const configPath = document.getElementById('configPath');
@@ -2193,10 +2195,11 @@
         }
 
         const activeAgentRunning = isAgentRunActiveForSession(state.active) || hasPendingAgentMessagesForSession(state.active);
-        const busy = state.loadingSessions || state.loadingMessages || state.sending;
+        const busy = state.loadingSessions || state.loadingMessages || state.sending || state.creatingAgent;
         refreshBtn.disabled = busy;
         if (addAgentBtn) {
             addAgentBtn.disabled = !state.active || busy;
+            addAgentBtn.textContent = state.creatingAgent ? '新建中...' : '新建 AGENT';
         }
         removeBtn.disabled = !state.active || busy;
         removeAllBtn.disabled = !state.active || busy;
@@ -2221,6 +2224,9 @@
         if (openCreateBtn) {
             openCreateBtn.disabled = state.createLoading || state.createSubmitting;
         }
+        if (openCreateMenuBtn) {
+            openCreateMenuBtn.disabled = state.createLoading || state.createSubmitting;
+        }
         if (openConfigBtn) {
             openConfigBtn.disabled = state.configLoading || state.configSaving;
         }
@@ -2251,6 +2257,9 @@
             if (!state.active) {
                 sendState.textContent = '未选择会话';
                 sendState.classList.remove('is-active');
+            } else if (state.creatingAgent) {
+                sendState.textContent = '正在新建 AGENT…';
+                sendState.classList.add('is-active');
             } else if (activeAgentRunning && agentMode) {
                 sendState.textContent = state.agentRun.stopping ? '正在停止 Agent…' : 'Agent 执行中';
                 sendState.classList.add('is-active');
@@ -2304,6 +2313,8 @@
         );
         if (!state.active) {
             sendState.textContent = '未选择会话';
+        } else if (state.creatingAgent) {
+            sendState.textContent = '正在新建 AGENT…';
         } else if (agentMode && !agentEnabled) {
             sendState.textContent = '当前会话未配置 AGENT 模板';
         } else if (state.sending) {
@@ -2313,7 +2324,7 @@
         } else {
             sendState.textContent = '就绪';
         }
-        sendState.classList.toggle('is-active', state.sending);
+        sendState.classList.toggle('is-active', state.sending || state.creatingAgent);
         if (composer) {
             composer.hidden = !activityTab;
         }
@@ -2699,6 +2710,11 @@
         if (!targetContainer) {
             return;
         }
+        if (state.creatingAgent) {
+            return;
+        }
+        state.creatingAgent = true;
+        syncUi();
         try {
             const data = await api('/api/sessions/' + encodeURIComponent(targetContainer) + '/agents', {
                 method: 'POST',
@@ -2712,6 +2728,9 @@
             }
         } catch (e) {
             alert(e.message);
+        } finally {
+            state.creatingAgent = false;
+            syncUi();
         }
     }
 
@@ -2755,9 +2774,7 @@
             });
             group.containers.forEach(function (containerGroup) {
                 containerGroup.sessions.sort(function (a, b) {
-                    const timeA = a && a.updatedAt ? new Date(a.updatedAt).getTime() : 0;
-                    const timeB = b && b.updatedAt ? new Date(b.updatedAt).getTime() : 0;
-                    return timeB - timeA;
+                    return compareSessionByCreatedDesc(a, b);
                 });
             });
             return group;
@@ -2772,6 +2789,72 @@
         return (parts || []).filter(Boolean).join(' · ');
     }
 
+    function getSessionCreatedTime(session) {
+        if (session && session.createdAt) {
+            const time = new Date(session.createdAt).getTime();
+            if (Number.isFinite(time)) {
+                return time;
+            }
+        }
+        return 0;
+    }
+
+    function getSessionUpdatedTime(session) {
+        if (session && session.updatedAt) {
+            const time = new Date(session.updatedAt).getTime();
+            if (Number.isFinite(time)) {
+                return time;
+            }
+        }
+        return 0;
+    }
+
+    function getSessionAgentCreationRank(session) {
+        const agentId = session && session.agentId ? String(session.agentId) : '';
+        if (!agentId || agentId === 'default') {
+            return 1;
+        }
+        const matched = agentId.match(/^agent-(\d+)$/);
+        return matched ? (Number(matched[1]) || 0) : 0;
+    }
+
+    function compareSessionByCreatedDesc(a, b) {
+        const createdA = getSessionCreatedTime(a);
+        const createdB = getSessionCreatedTime(b);
+        if (createdA !== createdB) {
+            return createdB - createdA;
+        }
+        if (a && b && a.containerName && a.containerName === b.containerName) {
+            const rankA = getSessionAgentCreationRank(a);
+            const rankB = getSessionAgentCreationRank(b);
+            if (rankA !== rankB) {
+                return rankB - rankA;
+            }
+        }
+        const updatedA = getSessionUpdatedTime(a);
+        const updatedB = getSessionUpdatedTime(b);
+        if (updatedA !== updatedB) {
+            return updatedB - updatedA;
+        }
+        return String((a && a.name) || '').localeCompare(String((b && b.name) || ''), 'zh-CN');
+    }
+
+    function findLatestCreatedSessionName(sessions, preferredContainerName) {
+        const list = Array.isArray(sessions) ? sessions.filter(Boolean) : [];
+        if (!list.length) {
+            return '';
+        }
+        const targetContainer = String(preferredContainerName || '').trim();
+        const scoped = targetContainer
+            ? list.filter(function (session) {
+                return session && session.containerName === targetContainer;
+            })
+            : list;
+        const candidates = scoped.length ? scoped : list;
+        const sorted = candidates.slice().sort(compareSessionByCreatedDesc);
+        return sorted.length && sorted[0] && sorted[0].name ? sorted[0].name : '';
+    }
+
     function createDisclosureButton(expanded, label) {
         const button = document.createElement('button');
         button.type = 'button';
@@ -2916,7 +2999,7 @@
                     const addAgentBtn = document.createElement('button');
                     addAgentBtn.type = 'button';
                     addAgentBtn.className = 'secondary tree-node-menu-item';
-                    addAgentBtn.textContent = '新建AGENT';
+                    addAgentBtn.textContent = '新建 AGENT';
                     addAgentBtn.addEventListener('click', function (event) {
                         event.stopPropagation();
                         createAgentSession(containerName);
@@ -3302,7 +3385,7 @@
         }
     }
 
-    function applySessionsSnapshot(rawSessions, preferredName) {
+    function applySessionsSnapshot(rawSessions, preferredName, preferredContainerName) {
         const previousActive = state.active;
         state.sessions = Array.isArray(rawSessions) ? rawSessions : [];
         pruneSidebarTreeState();
@@ -3317,7 +3400,7 @@
             state.sessionDetailError = '';
         }
         if (!state.active && state.sessions.length) {
-            state.active = state.sessions[0].name;
+            state.active = findLatestCreatedSessionName(state.sessions, preferredContainerName) || state.sessions[0].name;
         }
         if (state.active && state.active !== previousActive) {
             ensureSessionPathExpanded(state.active);
@@ -3341,7 +3424,7 @@
         let requestError = null;
         try {
             const data = await api('/api/sessions');
-            applySessionsSnapshot(data.sessions, opts.preferredName);
+            applySessionsSnapshot(data.sessions, opts.preferredName, opts.preferredContainerName);
         } catch (e) {
             requestError = e;
         } finally {
@@ -3767,6 +3850,13 @@
         });
     }
 
+    if (openCreateMenuBtn) {
+        openCreateMenuBtn.addEventListener('click', function () {
+            closeMobileActionsMenu();
+            openCreateModal();
+        });
+    }
+
     if (agentTemplateBtn) {
         agentTemplateBtn.addEventListener('click', function () {
             openAgentTemplateModal().catch(function (e) {
@@ -4347,14 +4437,18 @@
         closeMobileActionsMenu();
         const activeSession = getActiveSession();
         const targetAgent = activeSession && activeSession.agentName ? activeSession.agentName : state.active;
-        const yes = confirm('确认删除对话 ' + targetAgent + ' ?');
+        const yes = confirm('确认删除 AGENT ' + targetAgent + ' ?');
         if (!yes) return;
         try {
-            const current = state.active;
-            await api('/api/sessions/' + encodeURIComponent(current) + '/remove-with-history', {
+            const targetContainerName = activeSession && activeSession.containerName ? activeSession.containerName : '';
+            await api('/api/sessions/' + encodeURIComponent(state.active) + '/remove-with-history', {
                 method: 'POST'
             });
-            await loadSessions(current);
+            await refreshSessions({
+                preferredContainerName: targetContainerName,
+                withLoading: true,
+                reloadMessages: true
+            });
         } catch (e) {
             alert(e.message);
         }

package/lib/web/server.js

@@ -165,6 +165,7 @@ function createEmptyWebAgentSession(agentId, agentName) {
         agentId,
         agentName: normalizeWebAgentName(agentId, agentName),
         agentPromptCommand: '',
+        createdAt: null,
         updatedAt: null,
         messages: [],
         lastResumeAt: null,
@@ -181,6 +182,7 @@ function normalizeWebAgentSessionRecord(agentId, rawAgent) {
         agentPromptCommand: typeof source.agentPromptCommand === 'string'
             ? normalizeAgentPromptCommandTemplate(source.agentPromptCommand, `agents.${agentId}.agentPromptCommand`)
             : '',
+        createdAt: typeof source.createdAt === 'string' ? source.createdAt : null,
         updatedAt: typeof source.updatedAt === 'string' ? source.updatedAt : null,
         messages: Array.isArray(source.messages) ? source.messages : [],
         lastResumeAt: typeof source.lastResumeAt === 'string' ? source.lastResumeAt : null,
@@ -384,6 +386,45 @@ function listWebAgentSessions(history, options = {}) {
         });
 }
 
+function getWebAgentCreationRank(agentId) {
+    if (agentId === WEB_DEFAULT_AGENT_ID) {
+        return 1;
+    }
+    const matched = String(agentId || '').match(/^agent-(\d+)$/);
+    return matched ? (Number(matched[1]) || 0) : 0;
+}
+
+function getWebSessionCreatedTime(sessionSummary) {
+    if (sessionSummary && sessionSummary.createdAt) {
+        const time = new Date(sessionSummary.createdAt).getTime();
+        if (Number.isFinite(time)) {
+            return time;
+        }
+    }
+    return 0;
+}
+
+function compareWebSessionCreatedDesc(a, b) {
+    const timeA = getWebSessionCreatedTime(a);
+    const timeB = getWebSessionCreatedTime(b);
+    if (timeA !== timeB) {
+        return timeB - timeA;
+    }
+    if (a && b && a.containerName === b.containerName) {
+        const rankA = getWebAgentCreationRank(a.agentId);
+        const rankB = getWebAgentCreationRank(b.agentId);
+        if (rankA !== rankB) {
+            return rankB - rankA;
+        }
+    }
+    const updatedA = a && a.updatedAt ? new Date(a.updatedAt).getTime() : 0;
+    const updatedB = b && b.updatedAt ? new Date(b.updatedAt).getTime() : 0;
+    if (updatedA !== updatedB) {
+        return updatedB - updatedA;
+    }
+    return String((a && a.name) || '').localeCompare(String((b && b.name) || ''), 'zh-CN');
+}
+
 function createWebSessionMessageId() {
     return `${Date.now()}-${Math.random().toString(16).slice(2, 8)}`;
 }
@@ -402,6 +443,9 @@ function appendWebSessionMessage(webHistoryDir, sessionRefOrContainerName, role,
         timestamp,
         ...extra
     };
+    if (!agentSession.createdAt) {
+        agentSession.createdAt = timestamp;
+    }
     agentSession.messages.push(message);
 
     if (agentSession.messages.length > WEB_HISTORY_MAX_MESSAGES) {
@@ -584,7 +628,11 @@ function createWebAgentSession(history) {
     }
     const agentId = `agent-${agentIndex}`;
     const agentSession = createEmptyWebAgentSession(agentId, `AGENT ${agentIndex}`);
+    const timestamp = new Date().toISOString();
+    agentSession.createdAt = timestamp;
+    agentSession.updatedAt = timestamp;
     sessionHistory.agents[agentId] = agentSession;
+    sessionHistory.updatedAt = timestamp;
     return agentSession;
 }
 
@@ -3041,6 +3089,7 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
             status: containerInfo.status || 'history',
             defaultCommand: containerInfo.defaultCommand || ''
         });
+    const createdAt = agentSession.createdAt || containerInfo.createdAt || null;
     const updatedAt = agentSession.updatedAt || history.updatedAt || (latestMessage && latestMessage.timestamp) || containerInfo.createdAt || null;
     return {
         name: buildWebSessionKey(containerName, agentId),
@@ -3049,6 +3098,7 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
         agentName: agentSession.agentName,
         status: containerInfo.status || 'history',
         image: containerInfo.image || '',
+        createdAt,
         updatedAt,
         messageCount: agentSession.messages.length,
         agentEnabled: isAgentPromptCommandEnabled(effectiveAgentPromptCommand),
@@ -3594,11 +3644,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                             }))
                             .filter(Boolean);
                     })
-                    .sort((a, b) => {
-                        const timeA = a.updatedAt ? new Date(a.updatedAt).getTime() : 0;
-                        const timeB = b.updatedAt ? new Date(b.updatedAt).getTime() : 0;
-                        return timeB - timeA;
-                    });
+                    .sort(compareWebSessionCreatedDesc);
 
                 sendJson(res, 200, { sessions });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.9.2",
+    "version": "5.9.3",
     "imageVersion": "1.9.0-common",
     "playwrightCliVersion": "0.1.1",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",