@xcanwin/manyoyo 6.2.10 → 6.2.11

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

@@ -284,6 +284,10 @@ textarea:focus-visible {
     overflow: hidden;
 }
 
+.modal.modal-sm {
+    width: min(420px, calc(100vw - 24px));
+}
+
 .modal-header {
     display: flex;
     align-items: center;
@@ -747,6 +751,15 @@ 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;

package/lib/web/frontend/app.html

@@ -215,6 +215,22 @@
             </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"></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="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,12 @@
     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 directoryPickerModal = document.getElementById('directoryPickerModal');
     const directoryPickerTitle = document.getElementById('directoryPickerTitle');
     const directoryPickerTip = document.getElementById('directoryPickerTip');
@@ -3167,11 +3173,47 @@
         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);
+        });
+    }
+
     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 +3221,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 || ''),
@@ -3194,8 +3237,12 @@
     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 +3250,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 || ''),
@@ -3319,11 +3367,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();
@@ -3442,7 +3529,8 @@
 
     function renderAgentLevel(containerGroup) {
         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 +3602,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) {
@@ -4876,6 +4965,14 @@
         });
     }
 
+    if (removeConfirmModal) {
+        removeConfirmModal.addEventListener('click', function (event) {
+            if (event.target === removeConfirmModal) {
+                removeConfirmCancelBtn.click();
+            }
+        });
+    }
+
     if (directoryPickerModal) {
         directoryPickerModal.addEventListener('click', function (event) {
             if (event.target === directoryPickerModal && !state.directoryPicker.loading) {

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.11",
     "imageVersion": "1.9.1-common",
     "playwrightCliVersion": "0.1.18",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",