@xcanwin/manyoyo 5.7.20 → 5.8.0

package/lib/web/frontend/app.css

@@ -403,6 +403,10 @@ textarea:focus-visible {
     resize: vertical;
 }
 
+.agent-template-modal {
+    width: min(760px, calc(100vw - 24px));
+}
+
 .session-head {
     display: flex;
     justify-content: space-between;
@@ -1581,14 +1585,36 @@ details.trace-card > .trace-card-summary {
     margin-bottom: 10px;
 }
 
+.composer-toolbar-meta {
+    display: inline-flex;
+    align-items: center;
+    gap: 10px;
+    margin-left: auto;
+}
+
 .composer-mode-switch {
     display: inline-flex;
     gap: 8px;
 }
 
-.composer-toolbar-tip {
+.toolbar-mini-btn {
+    padding: 7px 12px;
+    font-size: 12px;
+    white-space: nowrap;
+}
+
+.toolbar-chip {
+    display: inline-flex;
+    align-items: center;
+    min-height: 32px;
+    padding: 7px 12px;
+    border: 1px solid var(--line);
+    border-radius: 10px;
+    background: var(--panel-soft);
     color: var(--muted);
     font-size: 12px;
+    line-height: 1;
+    white-space: nowrap;
 }
 
 .composer-inner {
@@ -1833,8 +1859,10 @@ details.trace-card > .trace-card-summary {
         align-items: flex-start;
     }
 
-    .composer-toolbar-tip {
-        display: none;
+    .composer-toolbar-meta {
+        width: 100%;
+        justify-content: space-between;
+        margin-left: 0;
     }
 
     .composer-mode-switch {

package/lib/web/frontend/app.html

@@ -105,7 +105,10 @@
                                 <button type="button" id="activityAgentBtn" class="secondary is-active">Agent</button>
                                 <button type="button" id="activityCommandBtn" class="secondary">命令</button>
                             </div>
-                            <div class="composer-toolbar-tip">活动页支持 Agent 提示词和容器命令两种输入。</div>
+                            <div class="composer-toolbar-meta">
+                                <button type="button" id="agentTemplateBtn" class="secondary toolbar-mini-btn">CLI · —</button>
+                                <span id="activityModelChip" class="toolbar-chip" aria-live="polite">模型 · —</span>
+                            </div>
                         </div>
                         <div class="composer-inner">
                             <textarea id="commandInput" placeholder="输入容器命令，例如: ls -la"></textarea>
@@ -220,6 +223,31 @@
                 </div>
             </section>
         </div>
+
+        <div id="agentTemplateModal" class="modal-backdrop" hidden>
+            <section class="modal agent-template-modal" role="dialog" aria-modal="true" aria-labelledby="agentTemplateTitle">
+                <header class="modal-header">
+                    <h2 id="agentTemplateTitle">设置 CLI / Agent 模板</h2>
+                    <button type="button" id="agentTemplateCancelBtn" class="secondary">关闭</button>
+                </header>
+                <div class="modal-body">
+                    <div id="agentTemplateTip" class="modal-tip"></div>
+                    <label class="text-block">容器默认 agentPromptCommand
+                        <textarea id="containerAgentPromptEditor" placeholder="例如 codex exec --skip-git-repo-check {prompt}"></textarea>
+                    </label>
+                    <div id="agentTemplateOverrideGroup">
+                        <label class="text-block">当前 AGENT 覆盖模板
+                            <textarea id="agentPromptOverrideEditor" placeholder="留空则继承容器默认模板"></textarea>
+                        </label>
+                    </div>
+                    <div id="agentTemplateError" class="modal-error" hidden></div>
+                </div>
+                <footer class="modal-footer">
+                    <button type="button" id="agentTemplateResetBtn" class="secondary">恢复当前值</button>
+                    <button type="button" id="agentTemplateSaveBtn">保存</button>
+                </footer>
+            </section>
+        </div>
     </div>
 
     <script src="/app/vendor/xterm.js"></script>

package/lib/web/frontend/app.js

@@ -50,14 +50,17 @@
         mobileActionsOpen: false,
         configModalOpen: false,
         createModalOpen: false,
+        agentTemplateModalOpen: false,
         configLoading: false,
         configSaving: false,
         createLoading: false,
         createSubmitting: false,
+        agentTemplateSaving: false,
         configSnapshot: null,
         sessionDetail: null,
         sessionDetailError: '',
         sessionDetailRequestId: 0,
+        agentTemplateError: '',
         createAgentPromptAuto: false,
         createContainerPathBase: '',
         createDefaults: null,
@@ -167,6 +170,8 @@
     const activeMeta = document.getElementById('activeMeta');
     const activityCommandBtn = document.getElementById('activityCommandBtn');
     const activityAgentBtn = document.getElementById('activityAgentBtn');
+    const agentTemplateBtn = document.getElementById('agentTemplateBtn');
+    const activityModelChip = document.getElementById('activityModelChip');
     const messagesNode = document.getElementById('messages');
     const terminalPanel = document.getElementById('terminalPanel');
     const detailPanel = document.getElementById('detailPanel');
@@ -182,6 +187,15 @@
     const sendState = document.getElementById('sendState');
     const sendBtn = document.getElementById('sendBtn');
     const stopBtn = document.getElementById('stopBtn');
+    const agentTemplateModal = document.getElementById('agentTemplateModal');
+    const agentTemplateTip = document.getElementById('agentTemplateTip');
+    const containerAgentPromptEditor = document.getElementById('containerAgentPromptEditor');
+    const agentTemplateOverrideGroup = document.getElementById('agentTemplateOverrideGroup');
+    const agentPromptOverrideEditor = document.getElementById('agentPromptOverrideEditor');
+    const agentTemplateError = document.getElementById('agentTemplateError');
+    const agentTemplateCancelBtn = document.getElementById('agentTemplateCancelBtn');
+    const agentTemplateResetBtn = document.getElementById('agentTemplateResetBtn');
+    const agentTemplateSaveBtn = document.getElementById('agentTemplateSaveBtn');
     const refreshBtn = document.getElementById('refreshBtn');
     const removeBtn = document.getElementById('removeBtn');
     const removeAllBtn = document.getElementById('removeAllBtn');
@@ -192,6 +206,8 @@
     const TERMINAL_MIN_ROWS = 12;
     const TERMINAL_DEFAULT_COLS = 120;
     const TERMINAL_DEFAULT_ROWS = 36;
+    const WEB_SESSION_KEY_SEPARATOR = '~';
+    const WEB_DEFAULT_AGENT_ID = 'default';
     const YOLO_COMMAND_MAP = {
         claude: 'IS_SANDBOX=1 claude --dangerously-skip-permissions',
         cc: 'IS_SANDBOX=1 claude --dangerously-skip-permissions',
@@ -1055,6 +1071,133 @@
         }) || null;
     }
 
+    function parseSessionKey(sessionName) {
+        const raw = String(sessionName || '').trim();
+        if (!raw) {
+            return {
+                containerName: '',
+                agentId: WEB_DEFAULT_AGENT_ID
+            };
+        }
+        const separatorIndex = raw.indexOf(WEB_SESSION_KEY_SEPARATOR);
+        if (separatorIndex === -1) {
+            return {
+                containerName: raw,
+                agentId: WEB_DEFAULT_AGENT_ID
+            };
+        }
+        return {
+            containerName: raw.slice(0, separatorIndex),
+            agentId: raw.slice(separatorIndex + 1) || WEB_DEFAULT_AGENT_ID
+        };
+    }
+
+    function isActiveAgentOverrideEditable() {
+        const sessionRef = parseSessionKey(state.active);
+        return Boolean(state.active && sessionRef.agentId && sessionRef.agentId !== WEB_DEFAULT_AGENT_ID);
+    }
+
+    function showAgentTemplateError(message) {
+        state.agentTemplateError = String(message || '').trim();
+        if (!agentTemplateError) {
+            return;
+        }
+        agentTemplateError.hidden = !state.agentTemplateError;
+        agentTemplateError.textContent = state.agentTemplateError;
+    }
+
+    function fillAgentTemplateForm(detail) {
+        const currentDetail = detail && typeof detail === 'object' ? detail : {};
+        if (containerAgentPromptEditor) {
+            containerAgentPromptEditor.value = currentDetail.containerAgentPromptCommand || '';
+        }
+        if (agentPromptOverrideEditor) {
+            agentPromptOverrideEditor.value = currentDetail.agentPromptCommandOverride || '';
+        }
+        if (agentTemplateOverrideGroup) {
+            agentTemplateOverrideGroup.hidden = !isActiveAgentOverrideEditable();
+        }
+        if (agentTemplateTip) {
+            const sessionName = currentDetail.agentName || state.active || '当前会话';
+            const sourceMap = {
+                agent: '当前 AGENT 覆盖',
+                container: '容器默认模板',
+                inferred: '从容器启动命令推导',
+                none: '未配置'
+            };
+            const sourceLabel = sourceMap[currentDetail.agentPromptSource] || '未配置';
+            const effectiveTemplate = currentDetail.agentPromptCommand || '—';
+            agentTemplateTip.textContent = `${sessionName} · 当前生效来源：${sourceLabel} · 生效模板：${effectiveTemplate}`;
+        }
+        showAgentTemplateError('');
+    }
+
+    async function ensureActiveSessionDetail() {
+        if (!state.active) {
+            return null;
+        }
+        if (state.sessionDetail && state.active === (state.sessionDetail.name || state.active)) {
+            return state.sessionDetail;
+        }
+        await loadSessionDetailForSession(state.active);
+        return state.sessionDetail;
+    }
+
+    async function openAgentTemplateModal() {
+        if (!state.active || state.agentTemplateSaving) {
+            return;
+        }
+        const detail = await ensureActiveSessionDetail();
+        if (!detail) {
+            alert(state.sessionDetailError || '当前会话详情暂时不可用');
+            return;
+        }
+        state.agentTemplateModalOpen = true;
+        fillAgentTemplateForm(detail);
+        syncUi();
+        if (containerAgentPromptEditor) {
+            containerAgentPromptEditor.focus();
+        }
+    }
+
+    function closeAgentTemplateModal() {
+        state.agentTemplateModalOpen = false;
+        showAgentTemplateError('');
+    }
+
+    function resetAgentTemplateModal() {
+        fillAgentTemplateForm(state.sessionDetail || {});
+    }
+
+    async function saveAgentTemplateModal() {
+        if (!state.active || state.agentTemplateSaving) {
+            return;
+        }
+        state.agentTemplateSaving = true;
+        showAgentTemplateError('');
+        syncUi();
+        try {
+            const payload = {
+                containerAgentPromptCommand: containerAgentPromptEditor ? String(containerAgentPromptEditor.value || '').trim() : ''
+            };
+            if (isActiveAgentOverrideEditable() && agentPromptOverrideEditor) {
+                payload.agentPromptCommandOverride = String(agentPromptOverrideEditor.value || '').trim();
+            }
+            const data = await api('/api/sessions/' + encodeURIComponent(state.active) + '/agent-template', {
+                method: 'PUT',
+                body: JSON.stringify(payload)
+            });
+            state.sessionDetail = data && data.detail ? data.detail : state.sessionDetail;
+            await refreshSessionsSilent({ preferredName: state.active });
+            closeAgentTemplateModal();
+        } catch (e) {
+            showAgentTemplateError(e && e.message ? e.message : '保存失败');
+        } finally {
+            state.agentTemplateSaving = false;
+            syncUi();
+        }
+    }
+
     function isAgentRunActiveForSession(sessionName) {
         return Boolean(
             state.agentRun
@@ -1078,6 +1221,24 @@
         return Boolean(active && active.agentEnabled);
     }
 
+    function resolveToolbarCliLabel() {
+        const activeSession = getActiveSession();
+        const detail = state.sessionDetail && state.active ? state.sessionDetail : null;
+        const agentProgram = String(
+            (detail && detail.agentProgram)
+            || (activeSession && activeSession.agentProgram)
+            || ''
+        ).trim();
+        return agentProgram || '未配置';
+    }
+
+    function resolveToolbarModelLabel() {
+        if (!state.active) {
+            return '—';
+        }
+        return '自动';
+    }
+
     function buildActiveMeta(session) {
         if (!session) {
             return '会话不可用';
@@ -1566,6 +1727,13 @@
         let resumeStatusDetail = detail.resumeSupported
             ? '支持 resume，但当前会话还没有最近一次执行记录。'
             : '当前 Agent 程序或模板不支持 resume。';
+        const templateSourceMap = {
+            agent: '当前 AGENT 覆盖',
+            container: '容器默认模板',
+            inferred: '从启动命令推导',
+            none: '未配置'
+        };
+        const templateSourceLabel = templateSourceMap[detail.agentPromptSource] || '未配置';
         if (detail.lastResumeOk === true) {
             resumeStatusValue = '最近成功';
             resumeStatusTone = 'ok';
@@ -1596,6 +1764,7 @@
             commandEntries.push({ label: '启动命令', value: applied.defaultCommand || '—' });
         }
         commandEntries.push({ label: 'Agent 模板', value: detail.agentPromptCommand || '—' });
+        commandEntries.push({ label: '模板来源', value: templateSourceLabel });
         commandEntries.push({ label: 'yolo', value: applied.yolo || '—' });
 
         if (detailSummary) {
@@ -1611,6 +1780,7 @@
             renderKeyValueCard(detailSummary, 'Agent 运行', [
                 { label: '已启用', value: detail.agentEnabled ? '是' : '否', tone: detail.agentEnabled ? 'ok' : 'warn' },
                 { label: '程序', value: detail.agentProgram || '—' },
+                { label: '模板来源', value: templateSourceLabel },
                 { label: '支持 resume', value: detail.resumeSupported ? '是' : '否', tone: detail.resumeSupported ? 'ok' : 'warn' },
                 { label: '最近 resume', value: lastResumeText },
                 { label: '最近结果', value: detail.lastResumeOk == null ? '暂无' : (detail.lastResumeOk ? '成功' : '失败'), tone: detail.lastResumeOk == null ? 'info' : (detail.lastResumeOk ? 'ok' : 'danger') }
@@ -1728,6 +1898,18 @@
             activityAgentBtn.classList.toggle('is-active', agentMode);
             activityAgentBtn.setAttribute('aria-pressed', agentMode ? 'true' : 'false');
         }
+        if (agentTemplateBtn) {
+            agentTemplateBtn.textContent = `CLI · ${resolveToolbarCliLabel()}`;
+            agentTemplateBtn.title = state.active
+                ? '查看或修改当前会话的 CLI 模板'
+                : '请先选择会话';
+        }
+        if (activityModelChip) {
+            activityModelChip.textContent = `模型 · ${resolveToolbarModelLabel()}`;
+            activityModelChip.title = state.active
+                ? '当前版本暂不单独配置模型，默认跟随 CLI 或容器内配置'
+                : '请先选择会话';
+        }
         if (viewActivityBtn) viewActivityBtn.classList.toggle('is-active', activityTab);
         if (viewTerminalBtn) viewTerminalBtn.classList.toggle('is-active', terminalTab);
         if (viewDetailBtn) viewDetailBtn.classList.toggle('is-active', detailTab);
@@ -1764,6 +1946,9 @@
         if (stopBtn) {
             stopBtn.disabled = !activityTab || !agentMode || !activeAgentRunning || state.agentRun.stopping;
         }
+        if (agentTemplateBtn) {
+            agentTemplateBtn.disabled = !state.active || state.agentTemplateSaving;
+        }
         commandInput.disabled = !activityTab || !state.active || (agentMode && !agentEnabled);
         if (commandInput) {
             commandInput.placeholder = agentMode
@@ -1823,9 +2008,21 @@
         if (directoryPickerModal) {
             directoryPickerModal.hidden = !state.directoryPicker.open;
         }
+        if (agentTemplateModal) {
+            agentTemplateModal.hidden = !state.agentTemplateModalOpen;
+        }
+        if (agentTemplateSaveBtn) {
+            agentTemplateSaveBtn.disabled = state.agentTemplateSaving || !state.active;
+        }
+        if (agentTemplateResetBtn) {
+            agentTemplateResetBtn.disabled = state.agentTemplateSaving;
+        }
+        if (agentTemplateCancelBtn) {
+            agentTemplateCancelBtn.disabled = state.agentTemplateSaving;
+        }
         document.body.classList.toggle(
             'modal-open',
-            state.configModalOpen || state.createModalOpen || state.directoryPicker.open
+            state.configModalOpen || state.createModalOpen || state.directoryPicker.open || state.agentTemplateModalOpen
         );
         if (!state.active) {
             sendState.textContent = '未选择会话';
@@ -3009,6 +3206,9 @@
                 return;
             }
             state.sessionDetail = data && data.detail ? data.detail : null;
+            if (state.agentTemplateModalOpen && targetSession === state.active) {
+                fillAgentTemplateForm(state.sessionDetail || {});
+            }
         } catch (e) {
             if (requestId !== state.sessionDetailRequestId) {
                 return;
@@ -3296,6 +3496,14 @@
         });
     }
 
+    if (agentTemplateBtn) {
+        agentTemplateBtn.addEventListener('click', function () {
+            openAgentTemplateModal().catch(function (e) {
+                alert(e && e.message ? e.message : '加载 Agent 模板失败');
+            });
+        });
+    }
+
     if (configCancelBtn) {
         configCancelBtn.addEventListener('click', function () {
             closeConfigModal();
@@ -3360,6 +3568,25 @@
         });
     }
 
+    if (agentTemplateCancelBtn) {
+        agentTemplateCancelBtn.addEventListener('click', function () {
+            closeAgentTemplateModal();
+            syncUi();
+        });
+    }
+
+    if (agentTemplateResetBtn) {
+        agentTemplateResetBtn.addEventListener('click', function () {
+            resetAgentTemplateModal();
+        });
+    }
+
+    if (agentTemplateSaveBtn) {
+        agentTemplateSaveBtn.addEventListener('click', function () {
+            saveAgentTemplateModal();
+        });
+    }
+
     if (createRun) {
         createRun.addEventListener('change', function () {
             applyCurrentRunDefaults();
@@ -3686,6 +3913,15 @@
         });
     }
 
+    if (agentTemplateModal) {
+        agentTemplateModal.addEventListener('click', function (event) {
+            if (event.target === agentTemplateModal && !state.agentTemplateSaving) {
+                closeAgentTemplateModal();
+                syncUi();
+            }
+        });
+    }
+
     window.addEventListener('keydown', function (event) {
         if (event.key === 'Escape' && state.configModalOpen) {
             closeConfigModal();
@@ -3698,6 +3934,10 @@
         if (event.key === 'Escape' && state.directoryPicker.open) {
             closeDirectoryPicker();
         }
+        if (event.key === 'Escape' && state.agentTemplateModalOpen) {
+            closeAgentTemplateModal();
+            syncUi();
+        }
         if (event.key === 'Escape' && state.mobileSidebarOpen) {
             closeMobileSessionPanel();
         }

package/lib/web/server.js

@@ -137,6 +137,7 @@ function createEmptyWebAgentSession(agentId, agentName) {
     return {
         agentId,
         agentName: normalizeWebAgentName(agentId, agentName),
+        agentPromptCommand: '',
         updatedAt: null,
         messages: [],
         lastResumeAt: null,
@@ -150,6 +151,9 @@ function normalizeWebAgentSessionRecord(agentId, rawAgent) {
     return {
         agentId,
         agentName: normalizeWebAgentName(agentId, source.agentName),
+        agentPromptCommand: typeof source.agentPromptCommand === 'string'
+            ? normalizeAgentPromptCommandTemplate(source.agentPromptCommand, `agents.${agentId}.agentPromptCommand`)
+            : '',
         updatedAt: typeof source.updatedAt === 'string' ? source.updatedAt : null,
         messages: Array.isArray(source.messages) ? source.messages : [],
         lastResumeAt: typeof source.lastResumeAt === 'string' ? source.lastResumeAt : null,
@@ -253,7 +257,7 @@ function saveWebSessionHistory(webHistoryDir, containerName, history) {
     ensureWebHistoryDir(webHistoryDir);
     const filePath = getWebHistoryFile(webHistoryDir, containerName);
     const normalized = normalizeWebHistoryRecord(containerName, history);
-    const runtimeMeta = getAgentRuntimeMeta(normalized);
+    const runtimeMeta = getAgentRuntimeMeta(normalized.agentPromptCommand || '');
     const defaultAgent = getWebAgentSession(normalized, WEB_DEFAULT_AGENT_ID) || createEmptyWebAgentSession(WEB_DEFAULT_AGENT_ID);
     const legacyCompatible = {
         ...normalized,
@@ -383,6 +387,81 @@ function setWebSessionAgentPromptCommand(webHistoryDir, containerName, agentProm
     saveWebSessionHistory(webHistoryDir, containerName, history);
 }
 
+function setWebAgentSessionPromptCommand(webHistoryDir, sessionRefOrContainerName, agentPromptCommand) {
+    const sessionRef = typeof sessionRefOrContainerName === 'string'
+        ? { containerName: sessionRefOrContainerName, agentId: WEB_DEFAULT_AGENT_ID }
+        : sessionRefOrContainerName;
+    if (sessionRef.agentId === WEB_DEFAULT_AGENT_ID) {
+        throw new Error('默认 AGENT 请直接修改容器级 agentPromptCommand');
+    }
+    const history = loadWebSessionHistory(webHistoryDir, sessionRef.containerName);
+    const agentSession = getWebAgentSession(history, sessionRef.agentId, { create: true });
+    agentSession.agentPromptCommand = normalizeAgentPromptCommandTemplate(
+        agentPromptCommand,
+        `agents.${sessionRef.agentId}.agentPromptCommand`
+    );
+    saveWebSessionHistory(webHistoryDir, sessionRef.containerName, history);
+}
+
+function deriveAgentPromptCommandFromDefaultCommand(defaultCommand) {
+    const normalizedCommand = String(defaultCommand || '').trim();
+    if (!normalizedCommand) {
+        return '';
+    }
+    try {
+        return normalizeAgentPromptCommandTemplate(
+            resolveAgentPromptCommandTemplate(normalizedCommand),
+            'agentPromptCommand'
+        );
+    } catch (e) {
+        return '';
+    }
+}
+
+function resolveEffectiveSessionAgentPromptCommand(history, defaultCommand) {
+    return resolveEffectiveAgentPromptCommandForSession(history, WEB_DEFAULT_AGENT_ID, defaultCommand);
+}
+
+function resolveEffectiveAgentPromptCommandForSession(history, agentId, defaultCommand) {
+    const sessionHistory = history && typeof history === 'object' ? history : {};
+    const requestedAgentId = String(agentId || WEB_DEFAULT_AGENT_ID).trim() || WEB_DEFAULT_AGENT_ID;
+    const agentSession = getWebAgentSession(sessionHistory, requestedAgentId);
+    const agentTemplate = agentSession && typeof agentSession.agentPromptCommand === 'string'
+        ? normalizeAgentPromptCommandTemplate(agentSession.agentPromptCommand, `agents.${requestedAgentId}.agentPromptCommand`)
+        : '';
+    if (isAgentPromptCommandEnabled(agentTemplate)) {
+        return agentTemplate;
+    }
+    const historyTemplate = typeof sessionHistory.agentPromptCommand === 'string'
+        ? normalizeAgentPromptCommandTemplate(sessionHistory.agentPromptCommand, 'agentPromptCommand')
+        : '';
+    if (isAgentPromptCommandEnabled(historyTemplate)) {
+        return historyTemplate;
+    }
+    return deriveAgentPromptCommandFromDefaultCommand(defaultCommand);
+}
+
+function getEffectiveAgentPromptCommandSource(history, agentId, defaultCommand) {
+    const sessionHistory = history && typeof history === 'object' ? history : {};
+    const requestedAgentId = String(agentId || WEB_DEFAULT_AGENT_ID).trim() || WEB_DEFAULT_AGENT_ID;
+    const agentSession = getWebAgentSession(sessionHistory, requestedAgentId);
+    const agentTemplate = agentSession && typeof agentSession.agentPromptCommand === 'string'
+        ? normalizeAgentPromptCommandTemplate(agentSession.agentPromptCommand, `agents.${requestedAgentId}.agentPromptCommand`)
+        : '';
+    if (isAgentPromptCommandEnabled(agentTemplate)) {
+        return 'agent';
+    }
+    const historyTemplate = typeof sessionHistory.agentPromptCommand === 'string'
+        ? normalizeAgentPromptCommandTemplate(sessionHistory.agentPromptCommand, 'agentPromptCommand')
+        : '';
+    if (isAgentPromptCommandEnabled(historyTemplate)) {
+        return 'container';
+    }
+    return isAgentPromptCommandEnabled(deriveAgentPromptCommandFromDefaultCommand(defaultCommand))
+        ? 'inferred'
+        : 'none';
+}
+
 function patchWebSessionHistory(webHistoryDir, containerName, patch) {
     const history = loadWebSessionHistory(webHistoryDir, containerName);
     if (!patch || typeof patch !== 'object') {
@@ -694,10 +773,9 @@ function extractAgentMessageFromStructuredOutput(agentProgram, text) {
     return '';
 }
 
-function getAgentRuntimeMeta(history) {
-    const sessionHistory = history && typeof history === 'object' ? history : {};
-    const template = normalizeAgentPromptCommandTemplate(sessionHistory.agentPromptCommand, 'agentPromptCommand');
-    const agentProgram = resolveAgentProgram(template);
+function getAgentRuntimeMeta(template) {
+    const normalizedTemplate = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
+    const agentProgram = resolveAgentProgram(normalizedTemplate);
     const resumeCommand = buildAgentResumeCommand(agentProgram);
     return {
         agentProgram: agentProgram || '',
@@ -1362,17 +1440,34 @@ function prepareCodexTraceEvent(payload) {
 async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
     const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
     const agentSession = getWebAgentSession(history, sessionRef.agentId, { create: true });
-    const normalizedTemplate = normalizeAgentPromptCommandTemplate(history.agentPromptCommand, 'agentPromptCommand');
-    if (normalizedTemplate !== history.agentPromptCommand) {
-        history.agentPromptCommand = normalizedTemplate;
+    const containerMap = listWebManyoyoContainers(ctx);
+    const containerInfo = containerMap[sessionRef.containerName] || {};
+    const normalizedContainerTemplate = normalizeAgentPromptCommandTemplate(history.agentPromptCommand, 'agentPromptCommand');
+    if (normalizedContainerTemplate !== history.agentPromptCommand) {
+        history.agentPromptCommand = normalizedContainerTemplate;
         saveWebSessionHistory(state.webHistoryDir, sessionRef.containerName, history);
     }
-    if (!isAgentPromptCommandEnabled(history.agentPromptCommand)) {
+    if (agentSession && typeof agentSession.agentPromptCommand === 'string') {
+        const normalizedAgentTemplate = normalizeAgentPromptCommandTemplate(
+            agentSession.agentPromptCommand,
+            `agents.${sessionRef.agentId}.agentPromptCommand`
+        );
+        if (normalizedAgentTemplate !== agentSession.agentPromptCommand) {
+            agentSession.agentPromptCommand = normalizedAgentTemplate;
+            saveWebSessionHistory(state.webHistoryDir, sessionRef.containerName, history);
+        }
+    }
+    const effectiveTemplate = resolveEffectiveAgentPromptCommandForSession(
+        history,
+        sessionRef.agentId,
+        containerInfo.defaultCommand
+    );
+    if (!isAgentPromptCommandEnabled(effectiveTemplate)) {
         throw new Error('当前会话未配置 agentPromptCommand');
     }
 
     await ensureWebContainer(ctx, state, sessionRef.containerName, sessionRef);
-    const agentMeta = getAgentRuntimeMeta(history);
+    const agentMeta = getAgentRuntimeMeta(effectiveTemplate);
     const hasPriorConversation = hasAgentConversationHistory(agentSession);
     let resumeAttempted = false;
     let resumeSucceeded = false;
@@ -1391,7 +1486,7 @@ async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
     const effectivePrompt = resumeSucceeded
         ? prompt
         : buildAgentPromptWithHistory(agentSession, prompt);
-    const command = buildWebAgentExecCommand(history.agentPromptCommand, effectivePrompt, agentMeta.agentProgram);
+    const command = buildWebAgentExecCommand(effectiveTemplate, effectivePrompt, agentMeta.agentProgram);
     const contextMode = resumeSucceeded ? 'resume' : (hasPriorConversation ? 'history-injected' : 'first-turn');
 
     return {
@@ -2204,11 +2299,23 @@ function listWebManyoyoContainers(ctx) {
         if (!imageName.includes('manyoyo') && !name.startsWith('manyoyo-') && !name.startsWith('my-')) {
             return;
         }
+        let defaultCommand = '';
+        try {
+            defaultCommand = String(
+                ctx.dockerExecArgs(
+                    ['inspect', '-f', '{{index .Config.Labels "manyoyo.default_cmd"}}', name],
+                    { ignoreError: true }
+                ) || ''
+            ).trim();
+        } catch (e) {
+            defaultCommand = '';
+        }
         map[name] = {
             name,
             status: status || 'unknown',
             image: imageName,
-            createdAt: estimateStartTimeFromStatus(status)
+            createdAt: estimateStartTimeFromStatus(status),
+            defaultCommand
         };
     });
 
@@ -2588,7 +2695,6 @@ 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 agentMeta = getAgentRuntimeMeta(history);
     const agentSession = getWebAgentSession(history, agentId)
         || (agentId === WEB_DEFAULT_AGENT_ID ? createEmptyWebAgentSession(WEB_DEFAULT_AGENT_ID) : null);
     if (!agentSession) {
@@ -2596,10 +2702,15 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
     }
     const latestMessage = agentSession.messages.length ? agentSession.messages[agentSession.messages.length - 1] : null;
     const containerInfo = containerMap[containerName] || {};
+    const effectiveAgentPromptCommand = resolveEffectiveAgentPromptCommandForSession(history, agentId, containerInfo.defaultCommand);
+    const agentMeta = getAgentRuntimeMeta(effectiveAgentPromptCommand);
+    const effectiveAgentProgram = agentMeta.agentProgram || resolveAgentProgram(effectiveAgentPromptCommand);
+    const effectiveResumeSupported = agentMeta.resumeSupported || Boolean(buildAgentResumeCommand(effectiveAgentProgram));
     const applied = history.applied && typeof history.applied === 'object' && !Array.isArray(history.applied)
         ? history.applied
         : buildSessionFallbackApplied(ctx, state, containerName, history, {
-            status: containerInfo.status || 'history'
+            status: containerInfo.status || 'history',
+            defaultCommand: containerInfo.defaultCommand || ''
         });
     const updatedAt = agentSession.updatedAt || history.updatedAt || (latestMessage && latestMessage.timestamp) || containerInfo.createdAt || null;
     return {
@@ -2611,9 +2722,9 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
         image: containerInfo.image || '',
         updatedAt,
         messageCount: agentSession.messages.length,
-        agentEnabled: isAgentPromptCommandEnabled(history.agentPromptCommand),
-        agentProgram: agentMeta.agentProgram,
-        resumeSupported: agentMeta.resumeSupported,
+        agentEnabled: isAgentPromptCommandEnabled(effectiveAgentPromptCommand),
+        agentProgram: effectiveAgentProgram || '',
+        resumeSupported: effectiveResumeSupported,
         hostPath: applied.hostPath || '',
         containerPath: applied.containerPath || ''
     };
@@ -2622,14 +2733,18 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
 function buildSessionFallbackApplied(ctx, state, name, history, summary) {
     const snapshot = readWebConfigSnapshot(state.webConfigPath);
     const defaults = buildConfigDefaults(ctx, snapshot.parseError ? {} : snapshot.parsed);
-    const effectiveAgentPromptCommand = history.agentPromptCommand || defaults.agentPromptCommand || '';
-    const effectiveAgentProgram = resolveAgentProgram(effectiveAgentPromptCommand) || '';
-    const effectiveResumeSupported = Boolean(buildAgentResumeCommand(effectiveAgentProgram));
-    const defaultCommand = buildDefaultCommand(
+    const configuredDefaultCommand = buildDefaultCommand(
         defaults.shellPrefix,
         defaults.shell,
         defaults.shellSuffix
     ) || buildStaticContainerRuntime(ctx, name).defaultCommand;
+    const defaultCommand = pickFirstString(
+        summary && summary.defaultCommand,
+        configuredDefaultCommand
+    );
+    const effectiveAgentPromptCommand = resolveEffectiveSessionAgentPromptCommand(history, defaultCommand);
+    const effectiveAgentProgram = resolveAgentProgram(effectiveAgentPromptCommand) || '';
+    const effectiveResumeSupported = Boolean(buildAgentResumeCommand(effectiveAgentProgram));
 
     return {
         containerName: name,
@@ -2656,7 +2771,12 @@ function buildSessionFallbackApplied(ctx, state, name, history, summary) {
 function buildSessionDetail(ctx, state, containerMap, name) {
     const sessionRef = typeof name === 'string' ? parseWebSessionKey(name) : name;
     const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
-    const normalizedTemplate = normalizeAgentPromptCommandTemplate(history.agentPromptCommand, 'agentPromptCommand');
+    const containerInfo = containerMap[sessionRef.containerName] || {};
+    const normalizedTemplate = resolveEffectiveAgentPromptCommandForSession(
+        history,
+        sessionRef.agentId,
+        containerInfo.defaultCommand
+    );
     const summary = buildSessionSummary(ctx, state, containerMap, sessionRef);
     const agentSession = getWebAgentSession(history, sessionRef.agentId)
         || (sessionRef.agentId === WEB_DEFAULT_AGENT_ID ? createEmptyWebAgentSession(WEB_DEFAULT_AGENT_ID) : null);
@@ -2677,6 +2797,14 @@ function buildSessionDetail(ctx, state, containerMap, name) {
         latestRole: latestMessage && latestMessage.role ? String(latestMessage.role) : '',
         latestTimestamp: latestMessage && latestMessage.timestamp ? latestMessage.timestamp : summary.updatedAt,
         agentPromptCommand: normalizedTemplate || '',
+        containerAgentPromptCommand: typeof history.agentPromptCommand === 'string'
+            ? normalizeAgentPromptCommandTemplate(history.agentPromptCommand, 'agentPromptCommand')
+            : '',
+        agentPromptCommandOverride: agentSession && typeof agentSession.agentPromptCommand === 'string'
+            ? normalizeAgentPromptCommandTemplate(agentSession.agentPromptCommand, `agents.${sessionRef.agentId}.agentPromptCommand`)
+            : '',
+        inferredAgentPromptCommand: deriveAgentPromptCommandFromDefaultCommand(containerInfo.defaultCommand),
+        agentPromptSource: getEffectiveAgentPromptCommandSource(history, sessionRef.agentId, containerInfo.defaultCommand),
         agentProgram: summary.agentProgram || '',
         resumeSupported: summary.resumeSupported === true,
         lastResumeAt: agentSession.lastResumeAt || null,
@@ -3216,6 +3344,63 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 sendJson(res, 200, { name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId), detail });
             }
         },
+        {
+            method: 'PUT',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/agent-template$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) {
+                    return;
+                }
+
+                let payload = null;
+                try {
+                    payload = await readJsonBody(req);
+                } catch (e) {
+                    sendJson(res, 400, { error: e.message || '请求参数错误' });
+                    return;
+                }
+                const normalizedPayload = payload && typeof payload === 'object' && !Array.isArray(payload) ? payload : {};
+                const hasContainerTemplate = hasOwn(normalizedPayload, 'containerAgentPromptCommand');
+                const hasAgentOverride = hasOwn(normalizedPayload, 'agentPromptCommandOverride');
+                if (!hasContainerTemplate && !hasAgentOverride) {
+                    sendJson(res, 400, { error: '至少提供一个模板字段' });
+                    return;
+                }
+                if (hasAgentOverride && sessionRef.agentId === WEB_DEFAULT_AGENT_ID) {
+                    sendJson(res, 400, { error: '默认 AGENT 不支持单独覆盖模板，请直接修改容器模板' });
+                    return;
+                }
+
+                try {
+                    if (hasContainerTemplate) {
+                        setWebSessionAgentPromptCommand(
+                            state.webHistoryDir,
+                            sessionRef.containerName,
+                            normalizedPayload.containerAgentPromptCommand
+                        );
+                    }
+                    if (hasAgentOverride) {
+                        setWebAgentSessionPromptCommand(
+                            state.webHistoryDir,
+                            sessionRef,
+                            normalizedPayload.agentPromptCommandOverride
+                        );
+                    }
+                } catch (e) {
+                    sendJson(res, 400, { error: e.message || '保存 Agent 模板失败' });
+                    return;
+                }
+
+                const containerMap = listWebManyoyoContainers(ctx);
+                const detail = buildSessionDetail(ctx, state, containerMap, sessionRef);
+                sendJson(res, 200, {
+                    saved: true,
+                    name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
+                    detail
+                });
+            }
+        },
         {
             method: 'POST',
             match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/run$/),

package/package.json

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