@xcanwin/manyoyo 6.2.9 → 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;
@@ -391,10 +395,15 @@ textarea:focus-visible {
     color: var(--muted);
 }
 
+.text-block[hidden] {
+    display: none;
+}
+
 .form-grid input,
 .form-grid select,
 .text-block textarea,
-.text-block input {
+.text-block input,
+.text-block select {
     border: 1px solid var(--line);
     border-radius: 10px;
     padding: 9px 11px;
@@ -742,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

@@ -121,7 +121,7 @@
                                         <button type="button" id="activityAgentBtn" class="secondary is-active">Agent对话</button>
                                         <button type="button" id="activityCommandBtn" class="secondary">系统命令</button>
                                         <button type="button" id="agentTemplateBtn" class="secondary">CLI · —</button>
-                                        <span id="activityModelChip" class="composer-options-info" aria-live="polite">模型 · —</span>
+                                        <button type="button" id="activityModelChip" class="secondary">模型 · —</button>
                                     </div>
                                 </div>
                                 <button type="submit" id="sendBtn">发送</button>
@@ -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">
@@ -288,6 +304,31 @@
             </section>
         </div>
 
+        <div id="modelModal" class="modal-backdrop" hidden>
+            <section class="modal" role="dialog" aria-modal="true" aria-labelledby="modelModalTitle">
+                <header class="modal-header">
+                    <h2 id="modelModalTitle">选择模型</h2>
+                    <button type="button" id="modelModalCancelBtn" class="secondary">关闭</button>
+                </header>
+                <div class="modal-body">
+                    <div id="modelModalLoading" class="modal-tip" hidden>正在获取模型列表…</div>
+                    <label class="text-block">模型
+                        <select id="modelSelect">
+                            <option value="">跟随默认（不传 --model）</option>
+                            <option value="__custom__">自定义…</option>
+                        </select>
+                    </label>
+                    <label class="text-block" id="modelCustomGroup" hidden>自定义模型名称
+                        <input type="text" id="modelCustomInput" placeholder="例如 gemini-2.5-pro">
+                    </label>
+                    <div id="modelModalError" class="modal-error" hidden></div>
+                </div>
+                <footer class="modal-footer">
+                    <button type="button" id="modelModalSaveBtn">保存</button>
+                </footer>
+            </section>
+        </div>
+
         <div id="externalLinkModal" class="modal-backdrop" hidden>
             <section class="modal" role="dialog" aria-modal="true" aria-labelledby="externalLinkTitle">
                 <header class="modal-header">

package/lib/web/frontend/app.js

@@ -53,6 +53,10 @@
         createModalOpen: false,
         agentTemplateModalOpen: false,
         externalLinkModalOpen: false,
+        modelModalOpen: false,
+        modelModalSaving: false,
+        modelModalLoading: false,
+        modelModalCatalog: [],
         configLoading: false,
         configSaving: false,
         configSaveMessage: '',
@@ -175,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');
@@ -216,6 +226,14 @@
     const agentTemplateCancelBtn = document.getElementById('agentTemplateCancelBtn');
     const agentTemplateResetBtn = document.getElementById('agentTemplateResetBtn');
     const agentTemplateSaveBtn = document.getElementById('agentTemplateSaveBtn');
+    const modelModal = document.getElementById('modelModal');
+    const modelModalLoading = document.getElementById('modelModalLoading');
+    const modelSelect = document.getElementById('modelSelect');
+    const modelCustomGroup = document.getElementById('modelCustomGroup');
+    const modelCustomInput = document.getElementById('modelCustomInput');
+    const modelModalError = document.getElementById('modelModalError');
+    const modelModalCancelBtn = document.getElementById('modelModalCancelBtn');
+    const modelModalSaveBtn = document.getElementById('modelModalSaveBtn');
     const externalLinkModal = document.getElementById('externalLinkModal');
     const externalLinkUrl = document.getElementById('externalLinkUrl');
     const externalLinkCancelBtn = document.getElementById('externalLinkCancelBtn');
@@ -1524,7 +1542,120 @@
         if (!state.active) {
             return '—';
         }
-        return '自动';
+        const activeSession = getActiveSession();
+        const detail = state.sessionDetail && state.active === (state.sessionDetail.name || state.active) ? state.sessionDetail : null;
+        const model = String(
+            (detail && detail.model)
+            || (activeSession && activeSession.model)
+            || ''
+        ).trim();
+        return model || '自动';
+    }
+
+    const MODEL_CUSTOM_OPTION_VALUE = '__custom__';
+
+    function populateModelSelect(models, selectedModel) {
+        if (!modelSelect) {
+            return;
+        }
+        modelSelect.innerHTML = '';
+        const followOption = document.createElement('option');
+        followOption.value = '';
+        followOption.textContent = '跟随默认（不传 --model）';
+        modelSelect.appendChild(followOption);
+
+        const knownValues = new Set();
+        (Array.isArray(models) ? models : []).forEach(function (model) {
+            if (!model || !model.value) {
+                return;
+            }
+            knownValues.add(model.value);
+            const option = document.createElement('option');
+            option.value = model.value;
+            option.textContent = model.description ? `${model.label} · ${model.description}` : model.label;
+            modelSelect.appendChild(option);
+        });
+
+        const customOption = document.createElement('option');
+        customOption.value = MODEL_CUSTOM_OPTION_VALUE;
+        customOption.textContent = '自定义…';
+        modelSelect.appendChild(customOption);
+
+        if (selectedModel && knownValues.has(selectedModel)) {
+            modelSelect.value = selectedModel;
+            if (modelCustomGroup) modelCustomGroup.hidden = true;
+        } else if (selectedModel) {
+            modelSelect.value = MODEL_CUSTOM_OPTION_VALUE;
+            if (modelCustomInput) modelCustomInput.value = selectedModel;
+            if (modelCustomGroup) modelCustomGroup.hidden = false;
+        } else {
+            modelSelect.value = '';
+            if (modelCustomGroup) modelCustomGroup.hidden = true;
+        }
+    }
+
+    function showModelModalError(message) {
+        if (!modelModalError) return;
+        modelModalError.textContent = message || '';
+        modelModalError.hidden = !message;
+    }
+
+    async function openModelModal() {
+        if (!state.active || state.modelModalSaving) {
+            return;
+        }
+        const detail = await ensureActiveSessionDetail();
+        if (!detail) {
+            alert(state.sessionDetailError || '当前会话详情暂时不可用');
+            return;
+        }
+        state.modelModalOpen = true;
+        state.modelModalLoading = true;
+        state.modelModalCatalog = [];
+        showModelModalError('');
+        populateModelSelect([], detail.model || '');
+        syncUi();
+        try {
+            const data = await api('/api/sessions/' + encodeURIComponent(state.active) + '/models');
+            state.modelModalCatalog = Array.isArray(data && data.models) ? data.models : [];
+        } catch (e) {
+            state.modelModalCatalog = [];
+        } finally {
+            state.modelModalLoading = false;
+            populateModelSelect(state.modelModalCatalog, detail.model || '');
+            syncUi();
+        }
+    }
+
+    function closeModelModal() {
+        state.modelModalOpen = false;
+        showModelModalError('');
+    }
+
+    async function saveModelModal() {
+        if (!state.active || state.modelModalSaving) {
+            return;
+        }
+        const rawValue = modelSelect && modelSelect.value === MODEL_CUSTOM_OPTION_VALUE
+            ? (modelCustomInput ? modelCustomInput.value : '')
+            : (modelSelect ? modelSelect.value : '');
+        state.modelModalSaving = true;
+        showModelModalError('');
+        syncUi();
+        try {
+            await api('/api/sessions/' + encodeURIComponent(state.active) + '/model', {
+                method: 'POST',
+                body: JSON.stringify({ model: String(rawValue || '').trim() })
+            });
+            await refreshSessionsSilent({ preferredName: state.active });
+            await loadSessionDetailForSession(state.active);
+            closeModelModal();
+        } catch (e) {
+            showModelModalError(e && e.message ? e.message : '保存失败');
+        } finally {
+            state.modelModalSaving = false;
+            syncUi();
+        }
     }
 
     function buildMessageMetaLines(message) {
@@ -2217,7 +2348,7 @@
         if (activityModelChip) {
             activityModelChip.textContent = `模型 · ${resolveToolbarModelLabel()}`;
             activityModelChip.title = state.active
-                ? '当前版本暂不单独配置模型，默认跟随 CLI 或容器内配置'
+                ? '点击选择本会话使用的模型'
                 : '请先选择会话';
         }
         if (viewActivityBtn) viewActivityBtn.classList.toggle('is-active', activityTab);
@@ -2322,6 +2453,27 @@
         if (externalLinkModal) {
             externalLinkModal.hidden = !state.externalLinkModalOpen;
         }
+        if (modelModal) {
+            modelModal.hidden = !state.modelModalOpen;
+        }
+        if (modelModalLoading) {
+            modelModalLoading.hidden = !state.modelModalLoading;
+        }
+        if (modelSelect) {
+            modelSelect.disabled = state.modelModalSaving || state.modelModalLoading;
+        }
+        if (modelCustomInput) {
+            modelCustomInput.disabled = state.modelModalSaving || state.modelModalLoading;
+        }
+        if (modelModalSaveBtn) {
+            modelModalSaveBtn.disabled = state.modelModalSaving || state.modelModalLoading;
+        }
+        if (modelModalCancelBtn) {
+            modelModalCancelBtn.disabled = state.modelModalSaving;
+        }
+        if (activityModelChip) {
+            activityModelChip.disabled = !state.active;
+        }
         if (agentTemplateSaveBtn) {
             agentTemplateSaveBtn.disabled = state.agentTemplateSaving || !state.active;
         }
@@ -2345,7 +2497,7 @@
         }
         document.body.classList.toggle(
             'modal-open',
-            state.configModalOpen || state.createModalOpen || state.directoryPicker.open || state.agentTemplateModalOpen || state.externalLinkModalOpen || state.cloneModal.open
+            state.configModalOpen || state.createModalOpen || state.directoryPicker.open || state.agentTemplateModalOpen || state.externalLinkModalOpen || state.cloneModal.open || state.modelModalOpen
         );
         if (composer) {
             composer.hidden = !activityTab;
@@ -3021,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
@@ -3033,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 || ''),
@@ -3048,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;
@@ -3057,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 || ''),
@@ -3173,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();
@@ -3296,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';
@@ -3368,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) {
@@ -4238,6 +4473,45 @@
         });
     }
 
+    if (activityModelChip) {
+        activityModelChip.addEventListener('click', function () {
+            closeComposerOptionsMenu();
+            openModelModal().catch(function (e) {
+                alert(e && e.message ? e.message : '加载模型信息失败');
+            });
+        });
+    }
+
+    if (modelModalCancelBtn) {
+        modelModalCancelBtn.addEventListener('click', function () {
+            closeModelModal();
+            syncUi();
+        });
+    }
+
+    if (modelModalSaveBtn) {
+        modelModalSaveBtn.addEventListener('click', function () {
+            saveModelModal();
+        });
+    }
+
+    if (modelSelect) {
+        modelSelect.addEventListener('change', function () {
+            if (modelCustomGroup) {
+                modelCustomGroup.hidden = modelSelect.value !== MODEL_CUSTOM_OPTION_VALUE;
+            }
+        });
+    }
+
+    if (modelModal) {
+        modelModal.addEventListener('click', function (event) {
+            if (event.target === modelModal && !state.modelModalSaving) {
+                closeModelModal();
+                syncUi();
+            }
+        });
+    }
+
     if (configCancelBtn) {
         configCancelBtn.addEventListener('click', function () {
             closeConfigModal();
@@ -4691,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) {
@@ -4764,6 +5046,10 @@
             closeAgentTemplateModal();
             syncUi();
         }
+        if (event.key === 'Escape' && state.modelModalOpen && !state.modelModalSaving) {
+            closeModelModal();
+            syncUi();
+        }
         if (event.key === 'Escape' && state.externalLinkModalOpen) {
             closeExternalLinkModalView();
             syncUi();

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: [],
@@ -190,7 +191,8 @@ function createEmptyWebAgentSession(agentId, agentName) {
         lastResumeOk: null,
         lastResumeError: '',
         engineSessionId: '',
-        usageTotal: null
+        usageTotal: null,
+        model: ''
     };
 }
 
@@ -220,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 : [],
@@ -237,7 +240,8 @@ function normalizeWebAgentSessionRecord(agentId, rawAgent) {
         lastResumeOk: typeof source.lastResumeOk === 'boolean' ? source.lastResumeOk : null,
         lastResumeError: typeof source.lastResumeError === 'string' ? source.lastResumeError : '',
         engineSessionId: typeof source.engineSessionId === 'string' ? source.engineSessionId : '',
-        usageTotal: normalizeWebAgentUsageTotal(source.usageTotal)
+        usageTotal: normalizeWebAgentUsageTotal(source.usageTotal),
+        model: normalizeStoredAgentModelValue(source.model)
     };
 }
 
@@ -310,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,
@@ -343,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));
 }
 
@@ -364,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)
@@ -403,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);
@@ -425,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) {
@@ -775,6 +807,7 @@ function renderAgentPromptCommand(template, prompt) {
 function buildCodexAgentExecCommand(template, prompt, options = {}) {
     const templateText = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
     const sessionId = options && typeof options.sessionId === 'string' ? options.sessionId.trim() : '';
+    const model = options && typeof options.model === 'string' ? options.model.trim() : '';
     const execMatch = templateText.match(
         /^((?:(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)\s+)*)codex\s+exec\b/
     );
@@ -784,12 +817,14 @@ function buildCodexAgentExecCommand(template, prompt, options = {}) {
         const suffix = templateText.slice(execMatch[0].length);
         const hasJson = /(?:^|\s)--json(?:\s|$)/.test(suffix);
         const injectedFlags = hasJson ? '' : ' --json';
+        const hasModel = /(?:^|\s)(?:-m|--model)(?:\s|$)/.test(suffix);
+        const modelFlag = model && !hasModel ? ` --model ${model}` : '';
         if (sessionId) {
             const promptIndex = suffix.indexOf('{prompt}');
             const resumeSuffix = `${suffix.slice(0, promptIndex)}${quoteBashSingleValue(sessionId)} ${suffix.slice(promptIndex)}`;
-            codexTemplate = `${prefix}codex exec resume${injectedFlags}${resumeSuffix}`;
+            codexTemplate = `${prefix}codex exec resume${injectedFlags}${modelFlag}${resumeSuffix}`;
         } else {
-            codexTemplate = `${prefix}codex exec${injectedFlags}${suffix}`;
+            codexTemplate = `${prefix}codex exec${injectedFlags}${modelFlag}${suffix}`;
         }
     }
     return codexTemplate === templateText
@@ -824,6 +859,10 @@ function buildClaudeAgentExecCommand(template, prompt, options = {}) {
     if (sessionId) {
         flagSpecs.push({ flag: `-r ${sessionId}`, pattern: /(?:^|\s)-r(?:\s|$)/ });
     }
+    const model = options && typeof options.model === 'string' ? options.model.trim() : '';
+    if (model) {
+        flagSpecs.push({ flag: `--model ${model}`, pattern: /(?:^|\s)--model(?:\s|$)/ });
+    }
     const claudeTemplate = prependAgentFlags(
         templateText,
         /^(((?:(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)\s+)*)claude\b)(.*)$/,
@@ -834,14 +873,19 @@ function buildClaudeAgentExecCommand(template, prompt, options = {}) {
         : renderAgentPromptCommand(claudeTemplate, prompt);
 }
 
-function buildGeminiAgentExecCommand(template, prompt) {
+function buildGeminiAgentExecCommand(template, prompt, options = {}) {
     const templateText = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
+    const flagSpecs = [
+        { flag: '--output-format stream-json', pattern: /(?:^|\s)--output-format(?:\s|$)/ }
+    ];
+    const model = options && typeof options.model === 'string' ? options.model.trim() : '';
+    if (model) {
+        flagSpecs.push({ flag: `--model ${model}`, pattern: /(?:^|\s)(?:-m|--model)(?:\s|$)/ });
+    }
     const geminiTemplate = prependAgentFlags(
         templateText,
         /^(((?:(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)\s+)*)gemini\b)(.*)$/,
-        [
-            { flag: '--output-format stream-json', pattern: /(?:^|\s)--output-format(?:\s|$)/ }
-        ]
+        flagSpecs
     );
     return geminiTemplate === templateText
         ? renderAgentPromptCommand(templateText, prompt)
@@ -860,6 +904,10 @@ function buildOpenCodeAgentExecCommand(template, prompt, options = {}) {
             pattern: /(?:^|\s)(?:--session|-s)(?:\s|$)/
         });
     }
+    const model = options && typeof options.model === 'string' ? options.model.trim() : '';
+    if (model) {
+        flagSpecs.push({ flag: `--model ${model}`, pattern: /(?:^|\s)(?:-m|--model)(?:\s|$)/ });
+    }
     const opencodeTemplate = prependAgentFlags(
         templateText,
         /^(((?:(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)\s+)*)opencode\b.*?\s+run\b)(.*)$/,
@@ -875,7 +923,7 @@ function buildWebAgentExecCommand(template, prompt, agentProgram, options = {})
     case 'claude':
         return buildClaudeAgentExecCommand(template, prompt, options);
     case 'gemini':
-        return buildGeminiAgentExecCommand(template, prompt);
+        return buildGeminiAgentExecCommand(template, prompt, options);
     case 'codex':
         return buildCodexAgentExecCommand(template, prompt, options);
     case 'opencode':
@@ -1138,6 +1186,162 @@ function accumulateUsageTotal(baseline, turnUsage) {
     };
 }
 
+// 起一个短命的容器内子进程，通过对应协议问一次元信息（初始化握手 / model 列表），拿到结果就杀掉进程——
+// 不是长驻会话，不会产生真实对话轮次或费用。
+function runAgentProtocolProcess(ctx, containerName, command, options = {}) {
+    const stdinLines = Array.isArray(options.stdinLines) ? options.stdinLines : [];
+    const onLine = typeof options.onLine === 'function' ? options.onLine : null;
+    const timeoutMs = typeof options.timeoutMs === 'number' ? options.timeoutMs : 8000;
+    return new Promise(resolve => {
+        let settled = false;
+        let pending = '';
+        let stdoutAll = '';
+        let child;
+        try {
+            child = spawn(ctx.dockerCmd, ['exec', '-i', containerName, '/bin/bash', '-lc', command], { stdio: ['pipe', 'pipe', 'pipe'] });
+        } catch (e) {
+            resolve({ result: null, stdout: '' });
+            return;
+        }
+        const timer = setTimeout(() => finish(null), timeoutMs);
+        function finish(result) {
+            if (settled) return;
+            settled = true;
+            clearTimeout(timer);
+            try { child.kill('SIGKILL'); } catch (e) { /* 进程可能已退出 */ }
+            resolve({ result, stdout: stdoutAll });
+        }
+        child.on('error', () => finish(null));
+        child.on('close', () => finish(null));
+        child.stdout.on('data', chunk => {
+            const text = chunk.toString('utf-8');
+            stdoutAll += text;
+            if (!onLine) {
+                return;
+            }
+            pending += text;
+            let newlineIndex = pending.indexOf('\n');
+            while (newlineIndex !== -1) {
+                const line = pending.slice(0, newlineIndex);
+                pending = pending.slice(newlineIndex + 1);
+                const trimmed = line.trim();
+                if (trimmed) {
+                    const payload = parseJsonObjectLine(trimmed);
+                    if (payload) {
+                        const matched = onLine(payload);
+                        if (matched !== undefined) {
+                            finish(matched);
+                            return;
+                        }
+                    }
+                }
+                newlineIndex = pending.indexOf('\n');
+            }
+        });
+        try {
+            stdinLines.forEach(line => child.stdin.write(`${line}\n`));
+            if (!stdinLines.length) {
+                child.stdin.end();
+            }
+        } catch (e) { /* 进程可能已提前退出 */ }
+    });
+}
+
+function normalizeAgentModelCatalogEntry(item) {
+    const value = pickFirstString(item && item.value, item && item.id, item && item.model);
+    if (!value) {
+        return null;
+    }
+    return {
+        value,
+        label: pickFirstString(item && item.displayName, value),
+        description: pickFirstString(item && item.description)
+    };
+}
+
+function extractClaudeModelsFromControlResponse(payload) {
+    if (!payload || payload.type !== 'control_response') {
+        return undefined;
+    }
+    const response = toPlainObject(payload.response);
+    if (response.request_id !== 'manyoyo-model-catalog') {
+        return undefined;
+    }
+    const inner = toPlainObject(response.response);
+    const models = Array.isArray(inner.models) ? inner.models : [];
+    return models.map(normalizeAgentModelCatalogEntry).filter(Boolean);
+}
+
+function extractCodexModelsFromListResponse(payload) {
+    if (!payload || payload.id !== 'manyoyo-model-list' || !payload.result) {
+        return undefined;
+    }
+    const data = Array.isArray(payload.result.data) ? payload.result.data : [];
+    return data.map(normalizeAgentModelCatalogEntry).filter(Boolean);
+}
+
+function extractOpenCodeModelsFromOutput(text) {
+    return String(text || '')
+        .split('\n')
+        .map(line => line.trim())
+        .filter(Boolean)
+        .map(value => ({ value, label: value, description: '' }));
+}
+
+async function fetchAgentModelCatalog(ctx, containerName, agentProgram) {
+    if (agentProgram === 'claude') {
+        const requestLine = JSON.stringify({
+            type: 'control_request',
+            request_id: 'manyoyo-model-catalog',
+            request: { subtype: 'initialize' }
+        });
+        const { result } = await runAgentProtocolProcess(
+            ctx,
+            containerName,
+            'claude -p --input-format stream-json --output-format stream-json --verbose',
+            { stdinLines: [requestLine], onLine: extractClaudeModelsFromControlResponse }
+        );
+        return Array.isArray(result) ? result : [];
+    }
+    if (agentProgram === 'codex') {
+        const stdinLines = [
+            JSON.stringify({ jsonrpc: '2.0', id: 'manyoyo-init', method: 'initialize', params: { clientInfo: { name: 'manyoyo', version: '1.0.0' } } }),
+            JSON.stringify({ jsonrpc: '2.0', id: 'manyoyo-model-list', method: 'model/list', params: {} })
+        ];
+        const { result } = await runAgentProtocolProcess(
+            ctx,
+            containerName,
+            'codex app-server',
+            { stdinLines, onLine: extractCodexModelsFromListResponse }
+        );
+        return Array.isArray(result) ? result : [];
+    }
+    if (agentProgram === 'opencode') {
+        const { stdout } = await runAgentProtocolProcess(ctx, containerName, 'opencode models', {});
+        return extractOpenCodeModelsFromOutput(stdout);
+    }
+    // Gemini 的 --acp 模式在认证前就会挂起重试，没有可用的“认证前”探测窗口，暂不支持目录抓取。
+    return [];
+}
+
+const SAFE_AGENT_MODEL_VALUE_PATTERN = /^[A-Za-z0-9._\-[\]/]+$/;
+
+function normalizeAgentModelValueInput(value) {
+    const trimmed = String(value || '').trim();
+    if (!trimmed) {
+        return '';
+    }
+    if (!SAFE_AGENT_MODEL_VALUE_PATTERN.test(trimmed)) {
+        throw new Error(`模型名称包含非法字符: ${trimmed}`);
+    }
+    return trimmed;
+}
+
+function normalizeStoredAgentModelValue(value) {
+    const trimmed = typeof value === 'string' ? value.trim() : '';
+    return SAFE_AGENT_MODEL_VALUE_PATTERN.test(trimmed) ? trimmed : '';
+}
+
 function getAgentRuntimeMeta(template) {
     const normalizedTemplate = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
     const agentProgram = resolveAgentProgram(normalizedTemplate);
@@ -1843,7 +2047,8 @@ async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
         ? prompt
         : buildAgentPromptWithHistory(agentSession, prompt);
     const command = buildWebAgentExecCommand(effectiveTemplate, effectivePrompt, agentMeta.agentProgram, {
-        sessionId: sessionIdForRun
+        sessionId: sessionIdForRun,
+        model: agentSession.model || ''
     });
     const contextMode = resumeSucceeded ? 'resume' : (hasPriorConversation ? 'history-injected' : 'first-turn');
 
@@ -2844,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) {
@@ -3606,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);
@@ -3645,8 +3839,10 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
         agentEnabled: isAgentPromptCommandEnabled(effectiveAgentPromptCommand),
         agentProgram: effectiveAgentProgram || '',
         resumeSupported: effectiveResumeSupported,
+        model: agentSession.model || '',
         hostPath: applied.hostPath || '',
-        containerPath: applied.containerPath || ''
+        containerPath: applied.containerPath || '',
+        ...(synthetic ? { synthetic: true } : {})
     };
 }
 
@@ -3731,6 +3927,7 @@ function buildSessionDetail(ctx, state, containerMap, name) {
         lastResumeOk: typeof agentSession.lastResumeOk === 'boolean' ? agentSession.lastResumeOk : null,
         lastResumeError: agentSession.lastResumeError || '',
         usageTotal: agentSession.usageTotal || null,
+        model: agentSession.model || '',
         applied
     };
 }
@@ -4392,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$/),
@@ -4648,6 +4814,51 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 sendJson(res, 200, { name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId), detail });
             }
         },
+        {
+            method: 'GET',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/models$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) {
+                    return;
+                }
+                const containerMap = listWebManyoyoContainers(ctx);
+                const containerInfo = containerMap[sessionRef.containerName] || {};
+                const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
+                const effectiveTemplate = resolveEffectiveAgentPromptCommandForSession(
+                    history,
+                    sessionRef.agentId,
+                    containerInfo.defaultCommand
+                );
+                const agentProgram = resolveAgentProgram(effectiveTemplate);
+                const models = await fetchAgentModelCatalog(ctx, sessionRef.containerName, agentProgram);
+                sendJson(res, 200, {
+                    name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
+                    agentProgram,
+                    models
+                });
+            }
+        },
+        {
+            method: 'POST',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/model$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) {
+                    return;
+                }
+                const payload = await readJsonBody(req);
+                let model;
+                try {
+                    model = normalizeAgentModelValueInput(payload.model);
+                } catch (e) {
+                    sendJson(res, 400, { error: e.message || String(e) });
+                    return;
+                }
+                patchWebAgentSessionState(state.webHistoryDir, sessionRef, { model });
+                sendJson(res, 200, { name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId), model });
+            }
+        },
         {
             method: 'GET',
             match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/audit$/),
@@ -5013,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)
+                });
             }
         },
         {
@@ -5030,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)) {
@@ -5044,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.9",
+    "version": "6.2.11",
     "imageVersion": "1.9.1-common",
     "playwrightCliVersion": "0.1.18",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",