@xcanwin/manyoyo 6.2.10 → 6.2.14

package/lib/core/event-store.js

@@ -99,6 +99,17 @@ class FileEventStore {
         fs.writeFileSync(temporaryPath, `${JSON.stringify(projection)}\n`);
         fs.renameSync(temporaryPath, targetPath);
     }
+
+    remove(aggregateId) {
+        const eventFilePath = this.getEventFilePath(aggregateId);
+        if (fs.existsSync(eventFilePath)) {
+            fs.unlinkSync(eventFilePath);
+        }
+        const projectionFilePath = this.getProjectionFilePath(aggregateId);
+        if (fs.existsSync(projectionFilePath)) {
+            fs.unlinkSync(projectionFilePath);
+        }
+    }
 }
 
 module.exports = {

package/lib/web/frontend/app.css

@@ -272,6 +272,13 @@ textarea:focus-visible {
     display: none !important;
 }
 
+/* showNotice/showConfirm/showPrompt 可能从已经打开的其它 modal（如目录选择器）内部触发，
+   和其它 .modal-backdrop 共用 z-index:80 时，谁在 DOM 里排后面谁盖住谁，容易被埋到底下；
+   这里给一个更高的 z-index，保证它始终浮在最上层 */
+#genericDialogModal {
+    z-index: 90;
+}
+
 .modal {
     width: min(960px, calc(100vw - 24px));
     max-height: min(92vh, 860px);
@@ -284,6 +291,10 @@ textarea:focus-visible {
     overflow: hidden;
 }
 
+.modal.modal-sm {
+    width: min(420px, calc(100vw - 24px));
+}
+
 .modal-header {
     display: flex;
     align-items: center;
@@ -322,6 +333,28 @@ textarea:focus-visible {
     word-break: break-all;
 }
 
+.modal-message {
+    margin: 0;
+    color: var(--text);
+    font-size: 13px;
+    line-height: 1.6;
+}
+
+.modal-dialog-input {
+    width: 100%;
+    margin-top: 10px;
+    border: 1px solid var(--line);
+    border-radius: 10px;
+    padding: 9px 11px;
+    background: var(--panel-strong);
+    color: var(--text);
+    font-size: 13px;
+}
+
+.modal-dialog-input[hidden] {
+    display: none;
+}
+
 .modal-error {
     margin-top: 10px;
     color: var(--danger);
@@ -573,6 +606,9 @@ textarea:focus-visible {
 
 .crumb-item:hover {
     transform: none;
+    /* 不显式设置背景色的话，通用 button:hover 规则的深色背景会覆盖进来，
+       和同色系的文字撞色看不清，这里保持透明背景即可 */
+    background: transparent;
     text-decoration: underline;
 }
 
@@ -602,6 +638,11 @@ textarea:focus-visible {
     border-radius: 999px;
 }
 
+.crumb-jump-active:hover {
+    /* 同 .crumb-item:hover，避免通用 button:hover 的深色背景和文字撞色 */
+    background: var(--panel-soft);
+}
+
 .session-card {
     position: relative;
 }
@@ -619,7 +660,7 @@ textarea:focus-visible {
 
 .session-card-container .session-card-button,
 .session-card-agent .session-card-button {
-    padding-right: 38px;
+    padding-right: 46px;
 }
 
 .session-card-button:hover {
@@ -747,19 +788,28 @@ textarea:focus-visible {
     }
 }
 
+.crumb-bar .tree-node-menu {
+    position: relative;
+    top: auto;
+    right: auto;
+    transform: none;
+    opacity: 1;
+    pointer-events: auto;
+}
+
 .tree-node-menu-trigger {
-    width: 26px;
-    height: 26px;
+    width: 30px;
+    height: 30px;
     padding: 0;
     display: inline-flex;
     align-items: center;
     justify-content: center;
-    border-radius: 8px;
+    border-radius: 9px;
 }
 
 .tree-node-menu-trigger svg {
-    width: 14px;
-    height: 14px;
+    width: 16px;
+    height: 16px;
     fill: currentColor;
 }
 

package/lib/web/frontend/app.html

@@ -215,6 +215,39 @@
             </section>
         </div>
 
+        <div id="removeConfirmModal" class="modal-backdrop" hidden>
+            <section class="modal modal-sm" role="dialog" aria-modal="true" aria-labelledby="removeConfirmTitle">
+                <header class="modal-header">
+                    <h2 id="removeConfirmTitle">确认删除</h2>
+                    <button type="button" id="removeConfirmCancelBtn" class="secondary">关闭</button>
+                </header>
+                <div class="modal-body">
+                    <p id="removeConfirmMessage" class="modal-message"></p>
+                </div>
+                <footer class="modal-footer">
+                    <button type="button" id="removeConfirmKeepHistoryBtn" class="secondary">否，保留历史</button>
+                    <button type="button" id="removeConfirmWithHistoryBtn" class="danger">是，连同历史一起删除</button>
+                </footer>
+            </section>
+        </div>
+
+        <div id="genericDialogModal" class="modal-backdrop" hidden>
+            <section class="modal modal-sm" role="dialog" aria-modal="true" aria-labelledby="genericDialogTitle">
+                <header class="modal-header">
+                    <h2 id="genericDialogTitle"></h2>
+                    <button type="button" id="genericDialogCloseBtn" class="secondary">关闭</button>
+                </header>
+                <div class="modal-body">
+                    <p id="genericDialogMessage" class="modal-message"></p>
+                    <input type="text" id="genericDialogInput" class="modal-dialog-input" hidden />
+                </div>
+                <footer class="modal-footer">
+                    <button type="button" id="genericDialogCancelBtn" class="secondary" hidden>取消</button>
+                    <button type="button" id="genericDialogConfirmBtn">确定</button>
+                </footer>
+            </section>
+        </div>
+
         <div id="directoryPickerModal" class="modal-backdrop" hidden>
             <section class="modal dir-picker-modal" role="dialog" aria-modal="true" aria-labelledby="directoryPickerTitle">
                 <header class="modal-header">

package/lib/web/frontend/app.js

@@ -179,6 +179,19 @@
     const createEnv = document.getElementById('createEnv');
     const createEnvFile = document.getElementById('createEnvFile');
     const createVolumes = document.getElementById('createVolumes');
+    const removeConfirmModal = document.getElementById('removeConfirmModal');
+    const removeConfirmTitle = document.getElementById('removeConfirmTitle');
+    const removeConfirmMessage = document.getElementById('removeConfirmMessage');
+    const removeConfirmCancelBtn = document.getElementById('removeConfirmCancelBtn');
+    const removeConfirmKeepHistoryBtn = document.getElementById('removeConfirmKeepHistoryBtn');
+    const removeConfirmWithHistoryBtn = document.getElementById('removeConfirmWithHistoryBtn');
+    const genericDialogModal = document.getElementById('genericDialogModal');
+    const genericDialogTitle = document.getElementById('genericDialogTitle');
+    const genericDialogMessage = document.getElementById('genericDialogMessage');
+    const genericDialogInput = document.getElementById('genericDialogInput');
+    const genericDialogCloseBtn = document.getElementById('genericDialogCloseBtn');
+    const genericDialogCancelBtn = document.getElementById('genericDialogCancelBtn');
+    const genericDialogConfirmBtn = document.getElementById('genericDialogConfirmBtn');
     const directoryPickerModal = document.getElementById('directoryPickerModal');
     const directoryPickerTitle = document.getElementById('directoryPickerTitle');
     const directoryPickerTip = document.getElementById('directoryPickerTip');
@@ -1330,7 +1343,7 @@
         }
         const detail = await ensureActiveSessionDetail();
         if (!detail) {
-            alert(state.sessionDetailError || '当前会话详情暂时不可用');
+            await showNotice(state.sessionDetailError || '当前会话详情暂时不可用');
             return;
         }
         state.agentTemplateModalOpen = true;
@@ -1600,7 +1613,7 @@
         }
         const detail = await ensureActiveSessionDetail();
         if (!detail) {
-            alert(state.sessionDetailError || '当前会话详情暂时不可用');
+            await showNotice(state.sessionDetailError || '当前会话详情暂时不可用');
             return;
         }
         state.modelModalOpen = true;
@@ -2635,7 +2648,7 @@
             state.configModalOpen = true;
             setModalVisible(configModal, true);
         } catch (e) {
-            alert(e.message);
+            await showNotice(e.message);
         } finally {
             state.configLoading = false;
             syncUi();
@@ -2690,7 +2703,7 @@
             state.createModalOpen = true;
             setModalVisible(createModal, true);
         } catch (e) {
-            alert(e.message);
+            await showNotice(e.message);
         } finally {
             state.createLoading = false;
             syncUi();
@@ -2822,7 +2835,7 @@
         if (picker.loading || !picker.currentPath) {
             return;
         }
-        const input = window.prompt('请输入新目录名称');
+        const input = await showPrompt('请输入新目录名称');
         const name = String(input || '').trim();
         if (!name) {
             return;
@@ -2928,8 +2941,8 @@
         Promise.all([
             loadMessagesForSession(sessionName),
             loadSessionDetailForSession(sessionName)
-        ]).catch(function (e) {
-            alert(e.message);
+        ]).catch(async function (e) {
+            await showNotice(e.message);
         });
     }
 
@@ -2955,7 +2968,7 @@
                 closeMobileSessionPanel();
             }
         } catch (e) {
-            alert(e.message);
+            await showNotice(e.message);
         } finally {
             state.creatingAgent = false;
             syncUi();
@@ -3126,20 +3139,56 @@
         panel.className = 'tree-node-menu-panel';
         panel.hidden = true;
 
+        // 面板展开时挂到 body 上用 position:fixed 定位，避免被 #sessionList 之类的
+        // overflow:auto 滚动容器裁切（面板本来是靠 .tree-node-menu 的 position:absolute
+        // 定位在卡片内的，一旦触发按钮接近滚动容器底部，面板就会被截断）。
+        // 调用时 panel 必须已经是可见状态（display 不为 none），否则 offsetHeight 测不出真实高度。
+        function positionPanel() {
+            const rect = trigger.getBoundingClientRect();
+            panel.style.position = 'fixed';
+            panel.style.left = 'auto';
+            panel.style.right = (window.innerWidth - rect.right) + 'px';
+            panel.style.top = (rect.bottom + 4) + 'px';
+            panel.style.bottom = 'auto';
+            const panelHeight = panel.offsetHeight;
+            if (rect.bottom + 4 + panelHeight > window.innerHeight) {
+                // 下方空间不够时翻转到触发按钮上方展开，避免超出视口底部
+                panel.style.top = 'auto';
+                panel.style.bottom = (window.innerHeight - rect.top + 4) + 'px';
+            }
+        }
+
         function close() {
             panel.hidden = true;
             trigger.setAttribute('aria-expanded', 'false');
             wrap.classList.remove('is-open');
+            if (panel.parentNode === document.body) {
+                wrap.appendChild(panel);
+            }
+            panel.style.position = '';
+            panel.style.top = '';
+            panel.style.bottom = '';
+            panel.style.left = '';
+            panel.style.right = '';
         }
 
         trigger.addEventListener('click', function (event) {
             event.stopPropagation();
             if (panel.hidden) {
                 closeOpenTreeNodeMenu();
+                document.body.appendChild(panel);
                 panel.hidden = false;
+                positionPanel();
                 trigger.setAttribute('aria-expanded', 'true');
                 wrap.classList.add('is-open');
-                openTreeNodeMenu = { wrap, close };
+                openTreeNodeMenu = {
+                    close: close,
+                    containsTarget: function (target) {
+                        // 面板展开时是 body 的直接子节点，不再是 wrap 的后代，
+                        // “点击外部关闭”判断要把它也算进来
+                        return wrap.contains(target) || panel.contains(target);
+                    }
+                };
             } else {
                 close();
                 openTreeNodeMenu = null;
@@ -3167,11 +3216,124 @@
         return wrap;
     }
 
+    function confirmRemoveChoice(options) {
+        const opts = options && typeof options === 'object' ? options : {};
+        if (!removeConfirmModal) {
+            return Promise.resolve(confirm(opts.message || '确认删除？') ? 'with-history' : null);
+        }
+        return new Promise(function (resolve) {
+            if (removeConfirmTitle) {
+                removeConfirmTitle.textContent = opts.title || '确认删除';
+            }
+            if (removeConfirmMessage) {
+                removeConfirmMessage.textContent = opts.message || '';
+            }
+            let settled = false;
+            function finish(value) {
+                if (settled) return;
+                settled = true;
+                setModalVisible(removeConfirmModal, false);
+                removeConfirmKeepHistoryBtn.removeEventListener('click', onKeepHistory);
+                removeConfirmWithHistoryBtn.removeEventListener('click', onWithHistory);
+                removeConfirmCancelBtn.removeEventListener('click', onCancel);
+                resolve(value);
+            }
+            function onKeepHistory() { finish('keep-history'); }
+            function onWithHistory() { finish('with-history'); }
+            function onCancel() { finish(null); }
+            removeConfirmKeepHistoryBtn.addEventListener('click', onKeepHistory);
+            removeConfirmWithHistoryBtn.addEventListener('click', onWithHistory);
+            removeConfirmCancelBtn.addEventListener('click', onCancel);
+            setModalVisible(removeConfirmModal, true);
+        });
+    }
+
+    // 原生 alert/confirm/prompt 是同步阻塞的，会卡住整个页面（动画、其它交互全部停摆）。
+    // 这里用一个通用的 Promise 化小弹窗承载 notice/confirm/prompt 三种形态，取代它们。
+    function openGenericDialog(config) {
+        const opts = config && typeof config === 'object' ? config : {};
+        const mode = opts.mode === 'prompt' || opts.mode === 'confirm' ? opts.mode : 'notice';
+        if (!genericDialogModal) {
+            if (mode === 'prompt') {
+                return Promise.resolve(window.prompt(opts.message || '', opts.defaultValue || ''));
+            }
+            if (mode === 'confirm') {
+                return Promise.resolve(confirm(opts.message || ''));
+            }
+            alert(opts.message || '');
+            return Promise.resolve();
+        }
+        return new Promise(function (resolve) {
+            genericDialogTitle.textContent = opts.title
+                || (mode === 'notice' ? '提示' : (mode === 'confirm' ? '请确认' : '请输入'));
+            genericDialogMessage.textContent = opts.message || '';
+            genericDialogCancelBtn.hidden = mode === 'notice';
+            genericDialogInput.hidden = mode !== 'prompt';
+            genericDialogInput.value = mode === 'prompt' ? String(opts.defaultValue || '') : '';
+            genericDialogConfirmBtn.textContent = mode === 'notice' ? '知道了' : '确定';
+
+            let settled = false;
+            function resolveValue() {
+                if (mode === 'confirm') return true;
+                if (mode === 'prompt') return genericDialogInput.value;
+                return undefined;
+            }
+            function cancelValue() {
+                if (mode === 'confirm') return false;
+                if (mode === 'prompt') return null;
+                return undefined;
+            }
+            function finish(value) {
+                if (settled) return;
+                settled = true;
+                setModalVisible(genericDialogModal, false);
+                genericDialogConfirmBtn.removeEventListener('click', onConfirm);
+                genericDialogCancelBtn.removeEventListener('click', onCancel);
+                genericDialogCloseBtn.removeEventListener('click', onCancel);
+                genericDialogInput.removeEventListener('keydown', onInputKeydown);
+                resolve(value);
+            }
+            function onConfirm() { finish(resolveValue()); }
+            function onCancel() { finish(cancelValue()); }
+            function onInputKeydown(event) {
+                if (event.key === 'Enter') {
+                    event.preventDefault();
+                    onConfirm();
+                }
+            }
+            genericDialogConfirmBtn.addEventListener('click', onConfirm);
+            genericDialogCancelBtn.addEventListener('click', onCancel);
+            genericDialogCloseBtn.addEventListener('click', onCancel);
+            genericDialogInput.addEventListener('keydown', onInputKeydown);
+            setModalVisible(genericDialogModal, true);
+            if (mode === 'prompt') {
+                genericDialogInput.focus();
+                genericDialogInput.select();
+            }
+        });
+    }
+
+    function showNotice(message, title) {
+        return openGenericDialog({ mode: 'notice', message: message, title: title });
+    }
+
+    function showConfirm(message, title) {
+        return openGenericDialog({ mode: 'confirm', message: message, title: title });
+    }
+
+    function showPrompt(message, defaultValue, title) {
+        return openGenericDialog({ mode: 'prompt', message: message, defaultValue: defaultValue, title: title });
+    }
+
     async function removeContainerByName(containerName) {
         const target = String(containerName || '').trim();
         if (!target) return;
-        const yes = confirm('确认删除容器 ' + target + ' ?');
-        if (!yes) return;
+        const choice = await confirmRemoveChoice({
+            title: '删除容器',
+            message: `确认删除容器 ${target}？可以选择是否同时删除该容器的全部历史记录（消息与事件日志）。`
+        });
+        if (!choice) return;
+        const removeHistory = choice === 'with-history';
         try {
             const wasActiveContainer = parseSessionKey(state.active).containerName === target;
             if (parseSessionKey(state.terminal.sessionName).containerName === target
@@ -3179,7 +3341,8 @@
                 disconnectTerminal('容器删除，终端已断开', true);
             }
             await api('/api/sessions/' + encodeURIComponent(target) + '/remove', {
-                method: 'POST'
+                method: 'POST',
+                body: JSON.stringify({ removeHistory })
             });
             await refreshSessions({
                 preferredName: wasActiveContainer ? target : (state.active || ''),
@@ -3187,15 +3350,19 @@
                 reloadMessages: wasActiveContainer
             });
         } catch (e) {
-            alert(e.message);
+            await showNotice(e.message);
         }
     }
 
     async function removeAgentSessionByName(sessionName, agentLabel) {
         const target = String(sessionName || '').trim();
         if (!target) return;
-        const yes = confirm('确认删除 AGENT ' + (agentLabel || target) + ' ?');
-        if (!yes) return;
+        const choice = await confirmRemoveChoice({
+            title: '删除 AGENT',
+            message: `确认删除 AGENT ${agentLabel || target}？可以选择是否同时删除它的历史记录（消息与事件日志）。`
+        });
+        if (!choice) return;
+        const removeHistory = choice === 'with-history';
         const isActive = target === state.active;
         try {
             const containerName = parseSessionKey(target).containerName;
@@ -3203,7 +3370,8 @@
                 ? findPreferredSessionNameAfterRemoval(state.sessions, target)
                 : '';
             await api('/api/sessions/' + encodeURIComponent(target) + '/remove-with-history', {
-                method: 'POST'
+                method: 'POST',
+                body: JSON.stringify({ removeHistory })
             });
             await refreshSessions({
                 preferredName: isActive ? (fallbackSessionName || '') : (state.active || ''),
@@ -3212,7 +3380,7 @@
                 reloadMessages: isActive
             });
         } catch (e) {
-            alert(e.message);
+            await showNotice(e.message);
         }
     }
 
@@ -3296,6 +3464,9 @@
         if (!sessionBreadcrumb) {
             return;
         }
+        // 展开中的菜单面板会被挂到 body 上（见 createTreeNodeMenu），
+        // 这里要重建 DOM 之前先关掉，否则旧面板会变成脱离 wrap 的孤儿节点
+        closeOpenTreeNodeMenu();
         sessionBreadcrumb.innerHTML = '';
 
         const rootCrumb = document.createElement('button');
@@ -3319,11 +3490,50 @@
             sep.textContent = '›';
             sessionBreadcrumb.appendChild(sep);
 
+            const sessionForCrumb = state.sessions.find(function (session) {
+                return getSessionContainerName(session) === state.navContainer;
+            });
+            const containerRemark = sessionForCrumb && sessionForCrumb.containerRemark ? sessionForCrumb.containerRemark : '';
+            const containerGroupForMenu = { containerName: state.navContainer, containerRemark: containerRemark };
+
             const containerCrumb = document.createElement('span');
             containerCrumb.className = 'crumb-item is-current';
-            containerCrumb.textContent = state.navContainer;
-            containerCrumb.title = state.navContainer;
+            containerCrumb.textContent = containerRemark || state.navContainer;
+            containerCrumb.title = containerRemark ? `${containerRemark}（${state.navContainer}）` : state.navContainer;
             sessionBreadcrumb.appendChild(containerCrumb);
+            sessionBreadcrumb.appendChild(createTreeNodeMenu([
+                {
+                    label: '新建 AGENT',
+                    onClick: function () {
+                        createAgentSession(containerGroupForMenu.containerName);
+                    }
+                },
+                {
+                    label: '编辑备注',
+                    onClick: function () {
+                        editContainerRemark(containerGroupForMenu);
+                    }
+                },
+                {
+                    label: '创建相同配置容器',
+                    onClick: function () {
+                        openCloneModal('clone-config', containerGroupForMenu.containerName);
+                    }
+                },
+                {
+                    label: '复制容器',
+                    onClick: function () {
+                        openCloneModal('duplicate', containerGroupForMenu.containerName);
+                    }
+                },
+                {
+                    label: '删除容器',
+                    danger: true,
+                    onClick: function () {
+                        removeContainerByName(containerGroupForMenu.containerName);
+                    }
+                }
+            ]));
         }
 
         const activeSession = getActiveSession();
@@ -3344,6 +3554,7 @@
     }
 
     function renderContainerLevel(groups) {
+        closeOpenTreeNodeMenu();
         sessionList.innerHTML = '';
         if (!groups.length) {
             const empty = document.createElement('div');
@@ -3358,10 +3569,10 @@
                 kind: 'container',
                 className: status.tone === 'history' ? 'tree-node-tone-history' : '',
                 title: containerGroup.containerRemark || containerGroup.containerName,
-                meta: containerGroup.containerRemark ? containerGroup.containerName : '',
+                meta: containerGroup.containerRemark ? containerGroup.containerName : containerGroup.hostPath,
                 statusLabel: status.label,
                 statusTone: status.tone,
-                subMeta: containerGroup.hostPath,
+                subMeta: containerGroup.containerRemark ? containerGroup.hostPath : '',
                 hasActive: containerContainsActiveSession(containerGroup),
                 onClick: function () {
                     navigateTo('agents', { container: containerGroup.containerName });
@@ -3406,7 +3617,7 @@
 
     async function editContainerRemark(containerGroup) {
         const current = containerGroup.containerRemark || '';
-        const input = window.prompt('设置容器备注（留空清除备注）', current);
+        const input = await showPrompt('设置容器备注（留空清除备注）', current);
         if (input === null) {
             return;
         }
@@ -3418,13 +3629,13 @@
             });
             await refreshSessionsSilent({ preferredName: state.active });
         } catch (e) {
-            alert(e.message);
+            await showNotice(e.message);
         }
     }
 
     async function editAgentRemark(session) {
         const current = session.agentRemark || '';
-        const input = window.prompt('设置 AGENT 备注（留空清除备注）', current);
+        const input = await showPrompt('设置 AGENT 备注（留空清除备注）', current);
         if (input === null) {
             return;
         }
@@ -3436,13 +3647,15 @@
             });
             await refreshSessionsSilent({ preferredName: state.active });
         } catch (e) {
-            alert(e.message);
+            await showNotice(e.message);
         }
     }
 
     function renderAgentLevel(containerGroup) {
+        closeOpenTreeNodeMenu();
         sessionList.innerHTML = '';
-        const sessions = containerGroup && Array.isArray(containerGroup.sessions) ? containerGroup.sessions : [];
+        const allSessions = containerGroup && Array.isArray(containerGroup.sessions) ? containerGroup.sessions : [];
+        const sessions = allSessions.filter(function (session) { return !session.synthetic; });
         if (!sessions.length) {
             const empty = document.createElement('div');
             empty.className = 'empty';
@@ -3514,9 +3727,10 @@
         const containerCount = new Set(state.sessions.map(function (session) {
             return session && session.containerName ? session.containerName : '';
         }).filter(Boolean)).size;
+        const agentCount = state.sessions.filter(function (session) { return !session.synthetic; }).length;
         sessionCount.textContent = state.loadingSessions
             ? '加载中...'
-            : `${containerCount} 个容器 / ${state.sessions.length} 个 AGENT`;
+            : `${containerCount} 个容器 / ${agentCount} 个 AGENT`;
         renderBreadcrumb();
 
         if (state.loadingSessions) {
@@ -3673,7 +3887,7 @@
             closeCloneModal();
             await loadSessions(data.name);
             if (data.resumeMayFail) {
-                alert('复制完成。注意：AGENT 对话历史已复制，但底层 CLI 会话续接可能失败，如遇失败请以新对话继续。');
+                await showNotice('复制完成。注意：AGENT 对话历史已复制，但底层 CLI 会话续接可能失败，如遇失败请以新对话继续。');
             }
         } catch (e) {
             state.cloneModal.submitting = false;
@@ -4378,8 +4592,8 @@
     if (agentTemplateBtn) {
         agentTemplateBtn.addEventListener('click', function () {
             closeComposerOptionsMenu();
-            openAgentTemplateModal().catch(function (e) {
-                alert(e && e.message ? e.message : '加载 Agent 模板失败');
+            openAgentTemplateModal().catch(async function (e) {
+                await showNotice(e && e.message ? e.message : '加载 Agent 模板失败');
             });
         });
     }
@@ -4387,8 +4601,8 @@
     if (activityModelChip) {
         activityModelChip.addEventListener('click', function () {
             closeComposerOptionsMenu();
-            openModelModal().catch(function (e) {
-                alert(e && e.message ? e.message : '加载模型信息失败');
+            openModelModal().catch(async function (e) {
+                await showNotice(e && e.message ? e.message : '加载模型信息失败');
             });
         });
     }
@@ -4622,7 +4836,7 @@
                     body: JSON.stringify({})
                 });
             } catch (e) {
-                alert(e.message);
+                await showNotice(e.message);
                 state.agentRun.stopping = false;
                 syncUi();
             }
@@ -4684,7 +4898,7 @@
             if (mode === 'agent') {
                 const recovered = await recoverAgentRunFromServer(submitSession);
                 if (!recovered && document.visibilityState !== 'hidden') {
-                    alert(e.message);
+                    await showNotice(e.message);
                 }
             } else {
                 if (state.active === submitSession) {
@@ -4693,7 +4907,7 @@
                     });
                     renderMessages(state.messages);
                 }
-                alert(e.message);
+                await showNotice(e.message);
             }
         } finally {
             state.sending = false;
@@ -4876,6 +5090,22 @@
         });
     }
 
+    if (removeConfirmModal) {
+        removeConfirmModal.addEventListener('click', function (event) {
+            if (event.target === removeConfirmModal) {
+                removeConfirmCancelBtn.click();
+            }
+        });
+    }
+
+    if (genericDialogModal) {
+        genericDialogModal.addEventListener('click', function (event) {
+            if (event.target === genericDialogModal) {
+                genericDialogCloseBtn.click();
+            }
+        });
+    }
+
     if (directoryPickerModal) {
         directoryPickerModal.addEventListener('click', function (event) {
             if (event.target === directoryPickerModal && !state.directoryPicker.loading) {
@@ -4972,6 +5202,12 @@
         if (event.key === 'Escape' && openTreeNodeMenu) {
             closeOpenTreeNodeMenu();
         }
+        if (event.key === 'Escape' && removeConfirmModal && !removeConfirmModal.hidden) {
+            removeConfirmCancelBtn.click();
+        }
+        if (event.key === 'Escape' && genericDialogModal && !genericDialogModal.hidden) {
+            genericDialogCloseBtn.click();
+        }
     });
 
     function onLayoutMediaChange() {
@@ -5029,7 +5265,7 @@
             if (composerOptionsPanel && composerOptionsPanel.contains(target)) return;
             closeComposerOptionsMenu();
         }
-        if (openTreeNodeMenu && !openTreeNodeMenu.wrap.contains(target)) {
+        if (openTreeNodeMenu && !openTreeNodeMenu.containsTarget(target)) {
             closeOpenTreeNodeMenu();
         }
     });
@@ -5061,8 +5297,10 @@
             root: filesPanel,
             api,
             onError: function (message) {
-                alert(message);
-            }
+                showNotice(message);
+            },
+            confirmFn: showConfirm,
+            promptFn: showPrompt
         });
     }
 
@@ -5076,7 +5314,7 @@
     setMobileSessionPanel(false);
     document.body.classList.add('agent-mode');
     syncUi();
-    loadSessions().catch(function (e) {
-        alert(e.message);
+    loadSessions().catch(async function (e) {
+        await showNotice(e.message);
     });
 })();

package/lib/web/frontend/file-browser.js

@@ -75,6 +75,14 @@
         const onError = options && typeof options.onError === 'function'
             ? options.onError
             : function (message) { window.alert(message); };
+        // confirmFn/promptFn 可由调用方注入非阻塞的自定义弹窗，缺省退回原生 confirm/prompt
+        // （和上面 onError 的兜底写法保持一致）。
+        const confirmFn = options && typeof options.confirmFn === 'function'
+            ? options.confirmFn
+            : function (message) { return Promise.resolve(window.confirm(message)); };
+        const promptFn = options && typeof options.promptFn === 'function'
+            ? options.promptFn
+            : function (message, defaultValue) { return Promise.resolve(window.prompt(message, defaultValue)); };
         if (!root || typeof api !== 'function') {
             return {
                 sync: function () {}
@@ -455,7 +463,7 @@
             const fileSize = Number(selectedEntry && selectedEntry.size);
             const requiresReadonlyConfirm = Number.isFinite(fileSize) && fileSize >= FILE_EDIT_MAX_BYTES;
             if (requiresReadonlyConfirm) {
-                const yes = window.confirm(`文件较大（${formatBytes(fileSize)}），继续后将以只读方式全量预览，无法保存。是否继续？`);
+                const yes = await confirmFn(`文件较大（${formatBytes(fileSize)}），继续后将以只读方式全量预览，无法保存。是否继续？`);
                 if (!yes) {
                     return;
                 }
@@ -553,7 +561,7 @@
             if (!state.sessionName || state.historyOnly === true || state.loadingList || state.loadingFile) {
                 return;
             }
-            const input = window.prompt('请输入新目录名称');
+            const input = await promptFn('请输入新目录名称');
             const name = String(input || '').trim();
             if (!name) {
                 return;

package/lib/web/server.js

@@ -182,6 +182,7 @@ function createEmptyWebAgentSession(agentId, agentName) {
         agentName: normalizeWebAgentName(agentId, agentName),
         agentPromptCommand: '',
         remark: '',
+        archived: false,
         createdAt: null,
         updatedAt: null,
         messages: [],
@@ -221,6 +222,7 @@ function normalizeWebAgentSessionRecord(agentId, rawAgent) {
             ? normalizeAgentPromptCommandTemplate(source.agentPromptCommand, `agents.${agentId}.agentPromptCommand`)
             : '',
         remark: normalizeRemarkText(source.remark),
+        archived: source.archived === true,
         createdAt: typeof source.createdAt === 'string' ? source.createdAt : null,
         updatedAt: typeof source.updatedAt === 'string' ? source.updatedAt : null,
         messages: Array.isArray(source.messages) ? source.messages : [],
@@ -312,7 +314,7 @@ function normalizeWebHistoryRecord(containerName, rawData) {
         });
     }
 
-    if (!Object.keys(history.agents).length && Array.isArray(data.messages)) {
+    if (!Object.keys(history.agents).length && Array.isArray(data.messages) && data.messages.length > 0) {
         history.agents[WEB_DEFAULT_AGENT_ID] = normalizeWebAgentSessionRecord(WEB_DEFAULT_AGENT_ID, {
             agentName: data.agentName || WEB_DEFAULT_AGENT_NAME,
             updatedAt: typeof data.updatedAt === 'string' ? data.updatedAt : null,
@@ -345,16 +347,18 @@ function saveWebSessionHistory(webHistoryDir, containerName, history) {
     const filePath = getWebHistoryFile(webHistoryDir, containerName);
     const normalized = normalizeWebHistoryRecord(containerName, history);
     const runtimeMeta = getAgentRuntimeMeta(normalized.agentPromptCommand || '');
-    const defaultAgent = getWebAgentSession(normalized, WEB_DEFAULT_AGENT_ID) || createEmptyWebAgentSession(WEB_DEFAULT_AGENT_ID);
+    const defaultAgent = getWebAgentSession(normalized, WEB_DEFAULT_AGENT_ID);
     const legacyCompatible = {
         ...normalized,
-        messages: Array.isArray(defaultAgent.messages) ? defaultAgent.messages : [],
         agentProgram: runtimeMeta.agentProgram || '',
-        resumeSupported: runtimeMeta.resumeSupported === true,
-        lastResumeAt: defaultAgent.lastResumeAt || null,
-        lastResumeOk: typeof defaultAgent.lastResumeOk === 'boolean' ? defaultAgent.lastResumeOk : null,
-        lastResumeError: defaultAgent.lastResumeError || ''
+        resumeSupported: runtimeMeta.resumeSupported === true
     };
+    if (defaultAgent) {
+        legacyCompatible.messages = Array.isArray(defaultAgent.messages) ? defaultAgent.messages : [];
+        legacyCompatible.lastResumeAt = defaultAgent.lastResumeAt || null;
+        legacyCompatible.lastResumeOk = typeof defaultAgent.lastResumeOk === 'boolean' ? defaultAgent.lastResumeOk : null;
+        legacyCompatible.lastResumeError = defaultAgent.lastResumeError || '';
+    }
     fs.writeFileSync(filePath, JSON.stringify(legacyCompatible, null, 4));
 }
 
@@ -366,6 +370,28 @@ function removeWebSessionHistory(webHistoryDir, containerName) {
     }
 }
 
+// 容器可能已经被删过一次（例如并发请求、或用户对着一条"仅历史"幽灵条目重复点删除），
+// containerExists 和真正执行删除之间存在竞态，因此仍需 try/catch 兜底，
+// 吞掉"已经不存在"这一类错误，让操作保持幂等。
+function removeContainerIdempotent(ctx, containerName) {
+    if (!ctx.containerExists(containerName)) {
+        return { removedContainer: false };
+    }
+    try {
+        ctx.removeContainer(containerName);
+        return { removedContainer: true };
+    } catch (e) {
+        return { removedContainer: false, error: e };
+    }
+}
+
+function removeAllAgentHistoryArtifacts(webHistoryDir, containerName, agentIds) {
+    const eventStore = new FileEventStore(webHistoryDir);
+    (Array.isArray(agentIds) ? agentIds : []).forEach(agentId => {
+        eventStore.remove(buildWebSessionKey(containerName, agentId));
+    });
+}
+
 function listWebHistorySessionNames(webHistoryDir, isValidContainerName) {
     ensureWebHistoryDir(webHistoryDir);
     return fs.readdirSync(webHistoryDir)
@@ -405,14 +431,19 @@ function parseWebSessionKey(sessionKey) {
     };
 }
 
+function isVisibleWebAgentSession(agentSession) {
+    return Boolean(agentSession) && agentSession.archived !== true;
+}
+
 function getWebAgentSession(history, agentId, options = {}) {
     const sessionHistory = history && typeof history === 'object' ? history : { agents: {} };
     if (!sessionHistory.agents || typeof sessionHistory.agents !== 'object' || Array.isArray(sessionHistory.agents)) {
         sessionHistory.agents = {};
     }
     const requestedAgentId = String(agentId || WEB_DEFAULT_AGENT_ID).trim() || WEB_DEFAULT_AGENT_ID;
-    if (sessionHistory.agents[requestedAgentId]) {
-        return sessionHistory.agents[requestedAgentId];
+    const existing = sessionHistory.agents[requestedAgentId];
+    if (isVisibleWebAgentSession(existing)) {
+        return existing;
     }
     if (options.create === true) {
         const agentSession = createEmptyWebAgentSession(requestedAgentId);
@@ -427,21 +458,20 @@ function listWebAgentSessions(history, options = {}) {
     const agents = sessionHistory.agents && typeof sessionHistory.agents === 'object' && !Array.isArray(sessionHistory.agents)
         ? sessionHistory.agents
         : {};
-    const agentIds = Object.keys(agents);
-    if (!agentIds.length && options.includeSyntheticDefault === true) {
-        return [createEmptyWebAgentSession(WEB_DEFAULT_AGENT_ID)];
-    }
-    return agentIds
+    const visibleSessions = Object.keys(agents)
         .map(agentId => agents[agentId])
-        .filter(Boolean)
-        .sort((a, b) => {
-            const orderA = a.agentId === WEB_DEFAULT_AGENT_ID ? 0 : 1;
-            const orderB = b.agentId === WEB_DEFAULT_AGENT_ID ? 0 : 1;
-            if (orderA !== orderB) {
-                return orderA - orderB;
-            }
-            return String(a.agentName || '').localeCompare(String(b.agentName || ''), 'zh-CN');
-        });
+        .filter(isVisibleWebAgentSession);
+    if (!visibleSessions.length && options.includeSyntheticDefault === true) {
+        return [{ ...createEmptyWebAgentSession(WEB_DEFAULT_AGENT_ID), synthetic: true }];
+    }
+    return visibleSessions.sort((a, b) => {
+        const orderA = a.agentId === WEB_DEFAULT_AGENT_ID ? 0 : 1;
+        const orderB = b.agentId === WEB_DEFAULT_AGENT_ID ? 0 : 1;
+        if (orderA !== orderB) {
+            return orderA - orderB;
+        }
+        return String(a.agentName || '').localeCompare(String(b.agentName || ''), 'zh-CN');
+    });
 }
 
 function getWebAgentCreationRank(agentId) {
@@ -3019,19 +3049,6 @@ async function createClonedContainer(ctx, state, sourceContainerName, requestedN
     };
 }
 
-function resolveContainerNamesByHostPath(ctx, state, hostPath) {
-    const target = String(hostPath || '').trim();
-    const containerMap = listWebManyoyoContainers(ctx);
-    const names = new Set([
-        ...Object.keys(containerMap),
-        ...listWebHistorySessionNames(state.webHistoryDir, ctx.isValidContainerName)
-    ]);
-    return Array.from(names).filter(name => {
-        const summary = buildSessionSummary(ctx, state, containerMap, { containerName: name, agentId: WEB_DEFAULT_AGENT_ID });
-        return summary && String(summary.hostPath || '').trim() === target;
-    });
-}
-
 // Estimate container start time from "Up X hours/minutes/seconds" status string.
 // Uses relative time to avoid Podman Machine VM clock drift issues.
 function estimateStartTimeFromStatus(status) {
@@ -3781,11 +3798,13 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
     const containerName = sessionRef && sessionRef.containerName ? sessionRef.containerName : '';
     const agentId = sessionRef && sessionRef.agentId ? sessionRef.agentId : WEB_DEFAULT_AGENT_ID;
     const history = loadWebSessionHistory(state.webHistoryDir, containerName);
-    const agentSession = getWebAgentSession(history, agentId)
+    const realAgentSession = getWebAgentSession(history, agentId);
+    const agentSession = realAgentSession
         || (agentId === WEB_DEFAULT_AGENT_ID ? createEmptyWebAgentSession(WEB_DEFAULT_AGENT_ID) : null);
     if (!agentSession) {
         return null;
     }
+    const synthetic = !realAgentSession;
     const latestMessage = agentSession.messages.length ? agentSession.messages[agentSession.messages.length - 1] : null;
     const containerInfo = containerMap[containerName] || {};
     const effectiveAgentPromptCommand = resolveEffectiveAgentPromptCommandForSession(history, agentId, containerInfo.defaultCommand);
@@ -3822,7 +3841,8 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
         resumeSupported: effectiveResumeSupported,
         model: agentSession.model || '',
         hostPath: applied.hostPath || '',
-        containerPath: applied.containerPath || ''
+        containerPath: applied.containerPath || '',
+        ...(synthetic ? { synthetic: true } : {})
     };
 }
 
@@ -4569,37 +4589,6 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 sendJson(res, 200, { name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId), remark });
             }
         },
-        {
-            method: 'POST',
-            match: currentPath => currentPath === '/api/sessions/by-directory/remove' ? [] : null,
-            handler: async () => {
-                const payload = await readJsonBody(req);
-                const hostPath = typeof payload.hostPath === 'string' ? payload.hostPath : '';
-                if (!hostPath.trim()) {
-                    sendJson(res, 400, { error: 'hostPath 不能为空' });
-                    return;
-                }
-                const targets = resolveContainerNamesByHostPath(ctx, state, hostPath);
-                if (!targets.length) {
-                    sendJson(res, 404, { error: '未找到该工作目录下的容器' });
-                    return;
-                }
-                const removed = [];
-                const errors = [];
-                targets.forEach(name => {
-                    try {
-                        if (ctx.containerExists(name)) {
-                            ctx.removeContainer(name);
-                        }
-                        removeWebSessionHistory(state.webHistoryDir, name);
-                        removed.push(name);
-                    } catch (e) {
-                        errors.push({ name, error: e.message || String(e) });
-                    }
-                });
-                sendJson(res, 200, { hostPath, removed, errors });
-            }
-        },
         {
             method: 'GET',
             match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/messages$/),
@@ -5235,12 +5224,23 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     return;
                 }
 
-                if (ctx.containerExists(sessionRef.containerName)) {
-                    ctx.removeContainer(sessionRef.containerName);
+                const payload = await readJsonBody(req);
+                const removeHistory = payload.removeHistory === true;
+                const { removedContainer } = removeContainerIdempotent(ctx, sessionRef.containerName);
+
+                if (removeHistory) {
+                    const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
+                    removeAllAgentHistoryArtifacts(state.webHistoryDir, sessionRef.containerName, Object.keys(history.agents || {}));
+                    removeWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
+                } else if (removedContainer) {
                     appendWebSessionMessage(state.webHistoryDir, sessionRef, 'system', `容器 ${sessionRef.containerName} 已删除。`);
                 }
 
-                sendJson(res, 200, { removed: true, name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId) });
+                sendJson(res, 200, {
+                    removed: true,
+                    removedHistory: removeHistory,
+                    name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId)
+                });
             }
         },
         {
@@ -5252,12 +5252,17 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     return;
                 }
 
+                const payload = await readJsonBody(req);
+                const removeHistory = payload.removeHistory === true;
+
                 const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
                 if (history.agents && typeof history.agents === 'object') {
-                    if (sessionRef.agentId === WEB_DEFAULT_AGENT_ID) {
-                        delete history.agents[WEB_DEFAULT_AGENT_ID];
-                    } else {
+                    if (removeHistory) {
                         delete history.agents[sessionRef.agentId];
+                        removeAllAgentHistoryArtifacts(state.webHistoryDir, sessionRef.containerName, [sessionRef.agentId]);
+                    } else if (history.agents[sessionRef.agentId]) {
+                        history.agents[sessionRef.agentId].archived = true;
+                        history.agents[sessionRef.agentId].updatedAt = new Date().toISOString();
                     }
                 }
                 if (!Object.keys(history.agents || {}).length && !ctx.containerExists(sessionRef.containerName)) {
@@ -5266,7 +5271,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     saveWebSessionHistory(state.webHistoryDir, sessionRef.containerName, history);
                 }
                 sendJson(res, 200, {
-                    removedHistory: true,
+                    removedHistory: removeHistory,
                     name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId)
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "6.2.10",
+    "version": "6.2.14",
     "imageVersion": "1.9.1-common",
     "playwrightCliVersion": "0.1.18",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",