@xcanwin/manyoyo 6.2.8 → 6.2.10

package/lib/web/frontend/app.css

@@ -391,10 +391,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;

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>
@@ -288,6 +288,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: '',
@@ -216,6 +220,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 +1536,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) {
@@ -2083,6 +2208,13 @@
                 { label: '最近 resume', value: lastResumeText },
                 { label: '最近结果', value: detail.lastResumeOk == null ? '暂无' : (detail.lastResumeOk ? '成功' : '失败'), tone: detail.lastResumeOk == null ? 'info' : (detail.lastResumeOk ? 'ok' : 'danger') }
             ]);
+            renderKeyValueCard(detailSummary, '用量统计', detail.usageTotal ? [
+                { label: '累计输入 tokens', value: String(detail.usageTotal.inputTokens) },
+                { label: '累计输出 tokens', value: String(detail.usageTotal.outputTokens) },
+                { label: '累计花费', value: typeof detail.usageTotal.costUsd === 'number' ? `$${detail.usageTotal.costUsd.toFixed(4)}` : '暂不支持' }
+            ] : [
+                { label: '状态', value: '暂无数据（当前 Agent 程序不支持用量统计，或还未执行过对话）', tone: 'info' }
+            ]);
             renderKeyValueCard(detailSummary, '最近活动', [
                 { label: '最近角色', value: latestRoleLabel },
                 { label: '最近时间', value: latestTimestampText },
@@ -2210,7 +2342,7 @@
         if (activityModelChip) {
             activityModelChip.textContent = `模型 · ${resolveToolbarModelLabel()}`;
             activityModelChip.title = state.active
-                ? '当前版本暂不单独配置模型，默认跟随 CLI 或容器内配置'
+                ? '点击选择本会话使用的模型'
                 : '请先选择会话';
         }
         if (viewActivityBtn) viewActivityBtn.classList.toggle('is-active', activityTab);
@@ -2315,6 +2447,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;
         }
@@ -2338,7 +2491,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;
@@ -4231,6 +4384,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();
@@ -4757,6 +4949,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

@@ -189,7 +189,26 @@ function createEmptyWebAgentSession(agentId, agentName) {
         lastResumeAt: null,
         lastResumeOk: null,
         lastResumeError: '',
-        engineSessionId: ''
+        engineSessionId: '',
+        usageTotal: null,
+        model: ''
+    };
+}
+
+function normalizeWebAgentUsageTotal(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return null;
+    }
+    if (typeof value.inputTokens !== 'number' || typeof value.outputTokens !== 'number') {
+        return null;
+    }
+    if (typeof value.costUsd !== 'number' && value.costUsd !== null) {
+        return null;
+    }
+    return {
+        inputTokens: value.inputTokens,
+        outputTokens: value.outputTokens,
+        costUsd: typeof value.costUsd === 'number' ? value.costUsd : null
     };
 }
 
@@ -218,7 +237,9 @@ function normalizeWebAgentSessionRecord(agentId, rawAgent) {
         lastResumeAt: typeof source.lastResumeAt === 'string' ? source.lastResumeAt : null,
         lastResumeOk: typeof source.lastResumeOk === 'boolean' ? source.lastResumeOk : null,
         lastResumeError: typeof source.lastResumeError === 'string' ? source.lastResumeError : '',
-        engineSessionId: typeof source.engineSessionId === 'string' ? source.engineSessionId : ''
+        engineSessionId: typeof source.engineSessionId === 'string' ? source.engineSessionId : '',
+        usageTotal: normalizeWebAgentUsageTotal(source.usageTotal),
+        model: normalizeStoredAgentModelValue(source.model)
     };
 }
 
@@ -756,6 +777,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/
     );
@@ -765,12 +787,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
@@ -805,6 +829,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)(.*)$/,
@@ -815,14 +843,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)
@@ -841,6 +874,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)(.*)$/,
@@ -856,7 +893,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':
@@ -1039,6 +1076,242 @@ function extractEngineSessionId(agentProgram, text) {
     return '';
 }
 
+function extractClaudeTurnUsage(text) {
+    let result = null;
+    for (const rawLine of String(text || '').split('\n')) {
+        const payload = parseJsonObjectLine(rawLine);
+        if (!payload || payload.type !== 'result') {
+            continue;
+        }
+        const usage = toPlainObject(payload.usage);
+        result = {
+            inputTokens: typeof usage.input_tokens === 'number' ? usage.input_tokens : null,
+            outputTokens: typeof usage.output_tokens === 'number' ? usage.output_tokens : null,
+            costUsd: typeof payload.total_cost_usd === 'number' ? payload.total_cost_usd : null
+        };
+    }
+    return result;
+}
+
+function extractCodexTurnUsage(text) {
+    let result = null;
+    for (const rawLine of String(text || '').split('\n')) {
+        const payload = parseJsonObjectLine(rawLine);
+        if (!payload || payload.type !== 'turn.completed') {
+            continue;
+        }
+        const usage = toPlainObject(payload.usage);
+        result = {
+            inputTokens: typeof usage.input_tokens === 'number' ? usage.input_tokens : null,
+            outputTokens: typeof usage.output_tokens === 'number' ? usage.output_tokens : null,
+            costUsd: null
+        };
+    }
+    return result;
+}
+
+function extractOpenCodeTurnUsage(text) {
+    let result = null;
+    for (const rawLine of String(text || '').split('\n')) {
+        const payload = parseJsonObjectLine(rawLine);
+        if (!payload || payload.type !== 'step_finish') {
+            continue;
+        }
+        const part = toPlainObject(payload.part);
+        const tokens = toPlainObject(part.tokens);
+        result = {
+            inputTokens: typeof tokens.input === 'number' ? tokens.input : null,
+            outputTokens: typeof tokens.output === 'number' ? tokens.output : null,
+            costUsd: typeof part.cost === 'number' ? part.cost : null
+        };
+    }
+    return result;
+}
+
+// Gemini 的非交互 stream-json 输出目前没有已确认的 usage/token 字段可解析，故不返回数据（而非猜测字段名）。
+function extractTurnUsage(agentProgram, text) {
+    if (agentProgram === 'claude') {
+        return extractClaudeTurnUsage(text);
+    }
+    if (agentProgram === 'codex') {
+        return extractCodexTurnUsage(text);
+    }
+    if (agentProgram === 'opencode') {
+        return extractOpenCodeTurnUsage(text);
+    }
+    return null;
+}
+
+function accumulateUsageTotal(baseline, turnUsage) {
+    const base = baseline && typeof baseline === 'object'
+        ? baseline
+        : { inputTokens: 0, outputTokens: 0, costUsd: null };
+    const baseCost = typeof base.costUsd === 'number' ? base.costUsd : null;
+    const turnCost = typeof turnUsage.costUsd === 'number' ? turnUsage.costUsd : null;
+    return {
+        inputTokens: (base.inputTokens || 0) + (turnUsage.inputTokens || 0),
+        outputTokens: (base.outputTokens || 0) + (turnUsage.outputTokens || 0),
+        // 引擎从未上报过费用（如 Codex）时保持 null，不要伪装成"花费为 0"
+        costUsd: baseCost === null && turnCost === null ? null : (baseCost || 0) + (turnCost || 0)
+    };
+}
+
+// 起一个短命的容器内子进程，通过对应协议问一次元信息（初始化握手 / 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);
@@ -1744,7 +2017,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');
 
@@ -1762,13 +2036,15 @@ async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
 }
 
 function finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, meta, result) {
+    const turnUsage = extractTurnUsage(agentMeta.agentProgram, result.stdout);
     appendWebSessionMessage(state.webHistoryDir, sessionRef, 'assistant', result.output, {
         exitCode: result.exitCode,
         mode: 'agent',
         contextMode: meta.contextMode,
         resumeAttempted: meta.resumeAttempted,
         resumeSucceeded: meta.resumeSucceeded,
-        interrupted: result.interrupted === true
+        interrupted: result.interrupted === true,
+        ...(turnUsage ? { usage: turnUsage } : {})
     });
     const patch = {
         lastResumeAt: meta.resumeAttempted ? new Date().toISOString() : (agentSession.lastResumeAt || null),
@@ -1779,6 +2055,9 @@ function finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, m
     if (engineSessionId) {
         patch.engineSessionId = engineSessionId;
     }
+    if (turnUsage) {
+        patch.usageTotal = accumulateUsageTotal(agentSession.usageTotal, turnUsage);
+    }
     patchWebAgentSessionState(state.webHistoryDir, sessionRef, patch);
 }
 
@@ -3541,6 +3820,7 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
         agentEnabled: isAgentPromptCommandEnabled(effectiveAgentPromptCommand),
         agentProgram: effectiveAgentProgram || '',
         resumeSupported: effectiveResumeSupported,
+        model: agentSession.model || '',
         hostPath: applied.hostPath || '',
         containerPath: applied.containerPath || ''
     };
@@ -3626,6 +3906,8 @@ function buildSessionDetail(ctx, state, containerMap, name) {
         lastResumeAt: agentSession.lastResumeAt || null,
         lastResumeOk: typeof agentSession.lastResumeOk === 'boolean' ? agentSession.lastResumeOk : null,
         lastResumeError: agentSession.lastResumeError || '',
+        usageTotal: agentSession.usageTotal || null,
+        model: agentSession.model || '',
         applied
     };
 }
@@ -4543,6 +4825,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$/),

package/package.json

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