@xcanwin/manyoyo 8.7.0 → 8.7.1

package/lib/web/model-services.js

@@ -0,0 +1,248 @@
+'use strict';
+
+const os = require('os');
+const containersLib = require('../model-service-containers');
+const importLib = require('../model-service-import');
+const {
+    listModelServices,
+    suggestReuse,
+    buildNewService,
+    buildReuseService,
+    buildServiceEdit,
+    applyConfigOps,
+    keyValueOf,
+    agentLabelOf,
+    assertOpsApplied
+} = require('../model-services');
+const { AGENT_ENV_SCHEMA } = require('../init-config');
+const { providersForAgent } = require('../provider-presets');
+
+// 「模型服务」接口：列表 / 新增（含一键复用）/ 编辑 / 删除 / 测试连接。
+// 全部挂在全局认证网关之后，非 GET 由 handleWebApi 统一校验 X-Requested-With。
+// 响应里只有 Key 的末 4 位；写配置都是“读当前磁盘 → 局部修改 → 写回”，中间没有 await。
+function toObject(value) {
+    return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
+}
+
+function createModelServiceRoutes({ ctx, state, req, res, deps }) {
+    const { sendJson, readJsonBody, decodeSessionName, readSnapshot, writeRaw, baseRawOf, validateRaw, runConnectionTest, defaultHostPath, listManaged } = deps;
+    const homeDir = ctx.homeDir || os.homedir();
+
+    function loadConfig() {
+        const snapshot = readSnapshot();
+        if (snapshot.parseError) {
+            sendJson(res, 400, { error: '当前配置解析失败，无法继续', detail: snapshot.parseError });
+            return null;
+        }
+        return { snapshot, config: snapshot.parsed || {} };
+    }
+
+    // 改动落到原文后必须读得回来（assertOpsApplied），否则不写盘、报错
+    function saveRaw(nextRaw, ops) {
+        validateRaw(nextRaw);
+        assertOpsApplied(nextRaw, ops);
+        writeRaw(nextRaw);
+    }
+
+    function saveOps(snapshot, ops) {
+        saveRaw(applyConfigOps(baseRawOf(snapshot), ops), ops);
+    }
+
+    function fail(e, status = 400) {
+        sendJson(res, status, { error: e && e.message ? e.message : '参数无效' });
+    }
+
+    // 受管容器里还在用这个服务当前 Key 的（按 box/env 里的 Key 相等判断）；运行时查不到就当没有
+    async function usingContainers(config, name) {
+        const service = listModelServices(config).find(item => item.name === name);
+        if (!service) return [];
+        try {
+            return containersLib.findUsingContainers({
+                homeDir,
+                containers: await listManaged(),
+                keyEnv: service.keyEnv,
+                keyValue: keyValueOf(config, name),
+                baseUrlKey: AGENT_ENV_SCHEMA[service.agent].baseUrlKey,
+                baseUrl: service.baseUrl
+            });
+        } catch (e) {
+            return [];
+        }
+    }
+
+    function overview(config) {
+        const quickRun = config.serve && config.serve.quickChat && typeof config.serve.quickChat.run === 'string' ? config.serve.quickChat.run : '';
+        return {
+            services: listModelServices(config).map(item => ({ ...item, quickChatDefault: item.name === quickRun })),
+            suggestions: suggestReuse(config),
+            // 向导里的服务商预设，新增 / 编辑表单据此填地址和模型
+            agents: ['claude', 'codex'].map(id => ({
+                id,
+                label: agentLabelOf(id),
+                providers: providersForAgent(id)
+            }))
+        };
+    }
+
+    return [
+        {
+            method: 'GET',
+            match: p => (p === '/api/model-services' ? [] : null),
+            handler: async () => {
+                const loaded = loadConfig();
+                if (!loaded) return;
+                sendJson(res, 200, overview(loaded.config));
+            }
+        },
+        {
+            // 本机已有的 Key / 地址 / 模型（只读取不写入；Key 只给末 4 位）
+            method: 'GET',
+            match: p => (p === '/api/model-services/import-preview' ? [] : null),
+            handler: async () => {
+                const loaded = loadConfig();
+                if (!loaded) return;
+                const sources = importLib.IMPORT_AGENTS.map(item => ({ agent: item.id, label: agentLabelOf(item.id), where: item.sources }));
+                sendJson(res, 200, { candidates: importLib.toPreview(importLib.scanLocalServices(homeDir, loaded.config)), sources });
+            }
+        },
+        {
+            // 导入选中的候选：{ ids: ['claude', 'codex'] }；服务端重新扫描，不信任前端传来的内容
+            method: 'POST',
+            match: p => (p === '/api/model-services/import' ? [] : null),
+            handler: async () => {
+                const body = toObject(await readJsonBody(req));
+                const loaded = loadConfig();
+                if (!loaded) return;
+                let built;
+                try {
+                    const ids = Array.isArray(body.ids) ? body.ids.map(String) : [];
+                    if (!ids.length) throw new Error('请选择要导入的服务');
+                    built = importLib.buildImportRuns(loaded.config, importLib.scanLocalServices(homeDir, loaded.config), ids, { defaultHostPath: defaultHostPath() });
+                    saveOps(loaded.snapshot, built.map(item => ({ type: 'set', path: ['runs', item.name], value: item.profile })));
+                } catch (e) {
+                    fail(e);
+                    return;
+                }
+                sendJson(res, 200, { saved: true, names: built.map(item => item.name), ...overview(readSnapshot().parsed || {}) });
+            }
+        },
+        {
+            // 新增：{ agent, providerId | baseUrl, key, model?, name? } 或一键复用 { reuseFrom, agent }
+            method: 'POST',
+            match: p => (p === '/api/model-services' ? [] : null),
+            handler: async () => {
+                const body = await readJsonBody(req);
+                const loaded = loadConfig();
+                if (!loaded) return;
+                let built;
+                try {
+                    built = body && body.reuseFrom
+                        ? buildReuseService(loaded.config, String(body.reuseFrom), String(body.agent || ''), { defaultHostPath: defaultHostPath() })
+                        : buildNewService(loaded.config, body || {}, { defaultHostPath: defaultHostPath() });
+                    saveOps(loaded.snapshot, [{ type: 'set', path: ['runs', built.name], value: built.profile }]);
+                } catch (e) {
+                    fail(e);
+                    return;
+                }
+                sendJson(res, 200, { saved: true, name: built.name, ...overview(readSnapshot().parsed || {}) });
+            }
+        },
+        {
+            // 还在用这个服务当前 Key 的容器（编辑页据此提示“N 个容器还在用旧设置”）
+            method: 'GET',
+            match: p => p.match(/^\/api\/model-services\/([^/]+)\/containers$/),
+            handler: async ([, encoded]) => {
+                const name = decodeSessionName(encoded);
+                const loaded = loadConfig();
+                if (!loaded) return;
+                sendJson(res, 200, { containers: (await usingContainers(loaded.config, name)).map(item => item.name) });
+            }
+        },
+        {
+            // syncContainers:true 时，把新值一并写进还在用旧 Key 的容器（下一轮对话生效）
+            method: 'PUT',
+            match: p => p.match(/^\/api\/model-services\/([^/]+)$/),
+            handler: async ([, encoded]) => {
+                const name = decodeSessionName(encoded);
+                const body = toObject(await readJsonBody(req));
+                // 要 await 的事（查容器）放在读配置之前：读 → 改 → 写之间不能有 await，否则会盖掉别人刚写的修改
+                let targets = [];
+                if (body.syncContainers === true) {
+                    const before = loadConfig();
+                    if (!before) return;
+                    targets = await usingContainers(before.config, name);
+                }
+                const loaded = loadConfig();
+                if (!loaded) return;
+                let updatedContainers = [];
+                try {
+                    const { ops } = buildServiceEdit(loaded.config, name, body);
+                    if (ops.length) saveOps(loaded.snapshot, ops);
+                    if (ops.length && targets.length) {
+                        const set = {};
+                        ops.filter(op => op.type === 'set').forEach(op => { set[op.path[op.path.length - 1]] = op.value; });
+                        const remove = ops.filter(op => op.type === 'remove').map(op => op.path[op.path.length - 1]);
+                        updatedContainers = containersLib.applyToContainers({ homeDir, targets, set, remove });
+                    }
+                } catch (e) {
+                    fail(e);
+                    return;
+                }
+                sendJson(res, 200, { saved: true, name, updatedContainers, ...overview(readSnapshot().parsed || {}) });
+            }
+        },
+        {
+            // 只删配置，不影响已有容器；是快捷对话默认时一并清掉，避免指向不存在的运行配置
+            method: 'DELETE',
+            match: p => p.match(/^\/api\/model-services\/([^/]+)$/),
+            handler: async ([, encoded]) => {
+                const name = decodeSessionName(encoded);
+                const loaded = loadConfig();
+                if (!loaded) return;
+                try {
+                    if (!listModelServices(loaded.config).some(item => item.name === name)) throw new Error(`找不到模型服务: ${name}`);
+                    const ops = [{ type: 'remove', path: ['runs', name] }];
+                    const quick = loaded.config.serve && loaded.config.serve.quickChat;
+                    if (quick && quick.run === name) ops.push({ type: 'remove', path: ['serve', 'quickChat', 'run'] });
+                    saveOps(loaded.snapshot, ops);
+                } catch (e) {
+                    fail(e);
+                    return;
+                }
+                sendJson(res, 200, { deleted: true, name, ...overview(readSnapshot().parsed || {}) });
+            }
+        },
+        {
+            // 用已保存的 Key 测试（Key 不经过浏览器）
+            method: 'POST',
+            match: p => p.match(/^\/api\/model-services\/([^/]+)\/test$/),
+            handler: async ([, encoded]) => {
+                const name = decodeSessionName(encoded);
+                await readJsonBody(req);
+                const loaded = loadConfig();
+                if (!loaded) return;
+                const service = listModelServices(loaded.config).find(item => item.name === name);
+                if (!service) {
+                    sendJson(res, 404, { error: `找不到模型服务: ${name}` });
+                    return;
+                }
+                if (state.setupTestRunning) {
+                    sendJson(res, 409, { error: '已有连接测试正在进行，请稍后重试' });
+                    return;
+                }
+                const env = {};
+                for (const [key, value] of Object.entries(loaded.config.runs[name].env || {})) {
+                    if (typeof value === 'string' || typeof value === 'number') env[key] = String(value);
+                }
+                state.setupTestRunning = true;
+                try {
+                    sendJson(res, 200, await runConnectionTest(service.agent, env));
+                } finally {
+                    state.setupTestRunning = false;
+                }
+            }
+        }
+    ];
+}
+
+module.exports = { createModelServiceRoutes };

package/lib/web/server.js

@@ -27,6 +27,8 @@ const { createDeniedNotifier } = require('./denied-notify');
 const { domainRuleAllows } = require('../network-policy');
 const { createPortForwarder } = require('../port-forward');
 const { createContainerManageRoutes, pendingRisks, STALE_PAGE_MESSAGE } = require('./container-manage');
+const { createModelServiceRoutes } = require('./model-services');
+const { thirdPartyCodexModels } = require('../provider-presets');
 const { resolveManageOptions } = require('../container-manage-options');
 const { defaultPolicy, usesProxy } = require('../network-policy');
 const { normalizeMirrors } = require('../runtime-normalizers');
@@ -38,7 +40,7 @@ const { resolveQuickChatPath, expandTemplate } = require('../name-template');
 const { AGENT_ENV_SCHEMA } = require('../init-config');
 const { ensureImagePresent, pullImageProcess } = require('../image-pull');
 const { waitForImport } = require('../offline-import');
-const { baseRawOf, buildAgentConfigRaw, buildPasswordConfigRaw, shouldWriteMirrors, buildMirrorsConfigRaw, buildAgentInstructionsConfigRaw, buildBooleanConfigRaw } = require('../setup-config');
+const { baseRawOf, buildAgentConfigRaw, buildPasswordConfigRaw, shouldWriteMirrors, buildMirrorsConfigRaw, buildAgentInstructionsConfigRaw, buildBooleanConfigRaw, buildSetupSkippedConfigRaw } = require('../setup-config');
 const { createImageAgentProbe } = require('../image-agents');
 const { createAuthStore } = require('./auth-store');
 const webUploads = require('./uploads');
@@ -587,6 +589,26 @@ function createWebSessionMessageId() {
     return `${Date.now()}-${Math.random().toString(16).slice(2, 8)}`;
 }
 
+// 容器状态类的系统消息（已创建并启动 / 已启动 / 首次命令已执行）只在会话已经有对话时才写：
+// 新会话一建好就写一条，聊天页就不是空的，输入框不再居中；对话中途重建或启动容器时才值得告诉用户
+function appendWebContainerNotice(webHistoryDir, sessionRefOrContainerName, content) {
+    const sessionRef = typeof sessionRefOrContainerName === 'string'
+        ? { containerName: sessionRefOrContainerName, agentId: WEB_DEFAULT_AGENT_ID }
+        : sessionRefOrContainerName;
+    const history = loadWebSessionHistory(webHistoryDir, sessionRef.containerName);
+    const agentSession = getWebAgentSession(history, sessionRef.agentId, { create: true, includeArchived: true });
+    if (agentSession.messages.length) {
+        appendWebSessionMessage(webHistoryDir, sessionRef, 'system', content);
+        return;
+    }
+    // 不写消息，但新建的会话照样要落盘（列表里是真的 AGENT，不是现算出来的）
+    const timestamp = new Date().toISOString();
+    if (!agentSession.createdAt) agentSession.createdAt = timestamp;
+    agentSession.updatedAt = timestamp;
+    history.updatedAt = timestamp;
+    saveWebSessionHistory(webHistoryDir, sessionRef.containerName, history);
+}
+
 function appendWebSessionMessage(webHistoryDir, sessionRefOrContainerName, role, content, extra = {}) {
     const sessionRef = typeof sessionRefOrContainerName === 'string'
         ? { containerName: sessionRefOrContainerName, agentId: WEB_DEFAULT_AGENT_ID }
@@ -760,33 +782,6 @@ function removeWebSessionMessagesFrom(webHistoryDir, sessionRef, messageId) {
     return removed;
 }
 
-// 从页面隐藏 / 取消隐藏某一组（用户消息 + 它的执行过程 + 回复）：只改展示，agent 仍记得
-function setWebSessionTurnHidden(webHistoryDir, sessionRef, userMessageId, hidden) {
-    const history = loadWebSessionHistory(webHistoryDir, sessionRef.containerName);
-    const agentSession = getWebAgentSession(history, sessionRef.agentId, { includeArchived: true });
-    if (!agentSession) {
-        return 0;
-    }
-    const start = agentSession.messages.findIndex(item => item && String(item.id || '') === String(userMessageId) && item.role === 'user');
-    if (start === -1) {
-        return 0;
-    }
-    let end = start + 1;
-    while (end < agentSession.messages.length && agentSession.messages[end].role !== 'user') {
-        end += 1;
-    }
-    for (let i = start; i < end; i += 1) {
-        if (hidden) agentSession.messages[i].hidden = true;
-        else delete agentSession.messages[i].hidden;
-    }
-    agentSession.epoch = messagesView.createEpoch();
-    const timestamp = new Date().toISOString();
-    agentSession.updatedAt = timestamp;
-    history.updatedAt = timestamp;
-    saveWebSessionHistory(webHistoryDir, sessionRef.containerName, history);
-    return end - start;
-}
-
 function setWebSessionAgentPromptCommand(webHistoryDir, containerName, agentPromptCommand) {
     const history = loadWebSessionHistory(webHistoryDir, containerName);
     history.agentPromptCommand = normalizeAgentPromptCommandTemplate(agentPromptCommand, 'agentPromptCommand');
@@ -1032,9 +1027,8 @@ function buildCodexAgentExecCommand(template, prompt, options = {}) {
         }
     }
     // 兼容服务：OPENAI_BASE_URL 在容器里由 shell 展开成 -c openai_base_url=…（codex 不认这个环境变量，见 withCodexBaseUrl）
-    return withCodexBaseUrl(codexTemplate === templateText
-        ? renderAgentPromptCommand(templateText, prompt)
-        : renderAgentPromptCommand(codexTemplate, prompt));
+    // 先给模板加占位再渲染提示词：用户的提示词里写了 model_provider / --model 之类的字也不会让注入失效
+    return renderAgentPromptCommand(withCodexBaseUrl(codexTemplate), prompt);
 }
 
 function prependAgentFlags(commandText, matchPattern, flagSpecs) {
@@ -4232,20 +4226,15 @@ async function ensureWebContainer(ctx, state, containerInput, messageSessionRef
             mirrors,
             warn: message => console.warn(message)
         });
-        appendWebSessionMessage(
-            state.webHistoryDir,
-            messageSessionRef || runtime.containerName,
-            'system',
-            `容器 ${runtime.containerName} 已创建并启动。`
-        );
+        appendWebContainerNotice(state.webHistoryDir, messageSessionRef || runtime.containerName, `容器 ${runtime.containerName} 已创建并启动。`);
         if (runtime.first) {
             const firstResult = await runWebFirstCommand(ctx, runtime.containerName, runtime.first);
-            appendWebSessionMessage(
-                state.webHistoryDir,
-                messageSessionRef || runtime.containerName,
-                'system',
-                firstResult.exitCode === 0 ? '首次命令已执行' : formatWebFirstFailure(firstResult, runtime.first)
-            );
+            if (firstResult.exitCode === 0) {
+                appendWebContainerNotice(state.webHistoryDir, messageSessionRef || runtime.containerName, '首次命令已执行');
+            } else {
+                // 失败一律写：用户必须看到
+                appendWebSessionMessage(state.webHistoryDir, messageSessionRef || runtime.containerName, 'system', formatWebFirstFailure(firstResult, runtime.first));
+            }
         }
         return;
     }
@@ -4253,12 +4242,7 @@ async function ensureWebContainer(ctx, state, containerInput, messageSessionRef
     const status = ctx.getContainerStatus(runtime.containerName);
     if (status !== 'running') {
         ctx.dockerExecArgs(['start', runtime.containerName], { stdio: 'pipe' });
-        appendWebSessionMessage(
-            state.webHistoryDir,
-            messageSessionRef || runtime.containerName,
-            'system',
-            `容器 ${runtime.containerName} 已启动。`
-        );
+        appendWebContainerNotice(state.webHistoryDir, messageSessionRef || runtime.containerName, `容器 ${runtime.containerName} 已启动。`);
     }
     await getWebNetworkManager(ctx, state).ensureReady(runtime.containerName);
 }
@@ -5893,7 +5877,10 @@ function sendHtml(res, statusCode, html, extraHeaders = {}, options = {}) {
 }
 
 const SETUP_TEST_TIMEOUT_SECONDS = 60;
-const SETUP_TEST_PROMPT = 'Reply with the single word OK.';
+// 要求真的调一次工具：只回一句 OK 发现不了“能连通但调不了工具”（智谱 + Claude Code 工具搜索就是这样）。
+// 命令文本里没有 42，算出来的结果只会来自真的执行
+const SETUP_TEST_PROMPT = 'Run the shell command `echo mp-$((6*7))` and reply with its exact output only.';
+const SETUP_TEST_EXPECT_OUTPUT = 'mp-42';
 
 function getSetupWorkpath(state) {
     return path.join(path.dirname(path.resolve(state.webConfigPath)), 'work');
@@ -5980,7 +5967,7 @@ async function runSetupConnectionTest(ctx, state, agent, envMap) {
     if (!template) {
         return { category: 'other', message: `${spec.label} 暂不支持连接测试`, detail: '' };
     }
-    const agentCommand = withCodexBaseUrl(renderAgentPromptCommand(template, SETUP_TEST_PROMPT));
+    const agentCommand = renderAgentPromptCommand(withCodexBaseUrl(template), SETUP_TEST_PROMPT);
     const command = `timeout ${SETUP_TEST_TIMEOUT_SECONDS} /bin/bash -lc ${quoteBashSingleValue(agentCommand)}`;
 
     const workpath = getSetupWorkpath(state);
@@ -6018,7 +6005,7 @@ async function runSetupConnectionTest(ctx, state, agent, envMap) {
             })
         ]);
         clearTimeout(timer);
-        return classifyConnectionResult(result, secrets);
+        return classifyConnectionResult(result, secrets, { expectOutput: SETUP_TEST_EXPECT_OUTPUT });
     } catch (e) {
         return classifyConnectionResult({ exitCode: 1, output: e && e.message ? e.message : '' }, secrets);
     } finally {
@@ -6076,8 +6063,10 @@ async function buildSetupStatus(ctx, state) {
     const snapshot = readWebConfigSnapshot(state.webConfigPath);
     const config = snapshot.parseError ? {} : snapshot.parsed;
     const configuredAgents = getConfiguredAgents(config);
+    const setupSkipped = Boolean(config.serve && typeof config.serve === 'object' && config.serve.setupSkipped === true);
     return {
-        needsSetup: configuredAgents.length === 0,
+        needsSetup: configuredAgents.length === 0 && !setupSkipped,
+        setupSkipped,
         configuredAgents,
         serverUser: ctx.authUser,
         // 自动生成（用户看不到）的密码不算“已设置”
@@ -6108,12 +6097,13 @@ function resolveSetupRunInput(ctx, state, payload) {
         if (!hostPath || !path.isAbsolute(hostPath)) {
             throw new Error('hostPath 必须是绝对路径');
         }
-        if (hostPath === getSetupWorkpath(state)) fs.mkdirSync(hostPath, { recursive: true });
         ctx.validateHostPath(hostPath);
     }
+    // 选的就是默认工作目录根：不写进运行配置（新建容器各自建 <根>/<时间> 子目录，见 buildAgentRunProfile）
+    if (hostPath === getSetupWorkpath(state)) hostPath = '';
+    fs.mkdirSync(getSetupWorkpath(state), { recursive: true });
     const profile = buildAgentRunProfile(agent, body.env === undefined ? {} : body.env, {
         existingRun,
-        defaultHostPath: getSetupWorkpath(state),
         hostPath
     });
     return { agent, snapshot, profile };
@@ -7169,6 +7159,28 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 sendJson(res, 200, { saved: true, agent: input.agent, run: sanitizeSensitiveData(input.profile) });
             }
         },
+        {
+            method: 'POST',
+            match: currentPath => currentPath === '/api/setup/skip' ? [] : null,
+            handler: async () => {
+                await readJsonBody(req);
+                const snapshot = readWebConfigSnapshot(state.webConfigPath);
+                if (snapshot.parseError) {
+                    sendJson(res, 400, { error: '当前配置解析失败，无法继续', detail: snapshot.parseError });
+                    return;
+                }
+                let nextRaw;
+                try {
+                    nextRaw = buildSetupSkippedConfigRaw(baseRawOf(snapshot));
+                    parseAndValidateConfigRaw(nextRaw);
+                } catch (e) {
+                    sendJson(res, 400, { error: '配置写入失败', detail: e.message || '' });
+                    return;
+                }
+                writeConfigFileSecure(path.resolve(state.webConfigPath), nextRaw);
+                sendJson(res, 200, { saved: true });
+            }
+        },
         {
             method: 'POST',
             match: currentPath => currentPath === '/api/setup/password' ? [] : null,
@@ -8158,27 +8170,6 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 sendJson(res, 200, outcome);
             }
         },
-        {
-            method: 'POST',
-            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/messages\/hide$/),
-            handler: async match => {
-                const sessionRef = getValidSessionRef(ctx, res, match[1]);
-                if (!sessionRef) {
-                    return;
-                }
-                const payload = await readJsonBody(req);
-                if (state.agentRuns.has(sessionRef.containerName)) {
-                    sendJson(res, 409, { error: '任务进行中，暂时不能隐藏' });
-                    return;
-                }
-                const changed = setWebSessionTurnHidden(state.webHistoryDir, sessionRef, String(payload.messageId || ''), payload.hidden !== false);
-                if (!changed) {
-                    sendJson(res, 404, { error: '没有找到这一组' });
-                    return;
-                }
-                sendJson(res, 200, { ok: true, count: changed });
-            }
-        },
         {
             // “改动”视图：工作目录所在 git 仓库的改动列表（按需请求，前端不轮询）
             method: 'GET',
@@ -8258,7 +8249,14 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     containerInfo.defaultCommand
                 );
                 const agentProgram = resolveAgentProgram(effectiveTemplate);
-                const models = await fetchAgentModelCatalogCached(ctx, sessionRef.containerName, agentProgram);
+                let models = null;
+                if (agentProgram === 'codex') {
+                    // 接了第三方时目录里全是 OpenAI 的模型名，改用这家的预设模型
+                    try {
+                        models = thirdPartyCodexModels(readMergedEnv({ homeDir: ctx.homeDir || os.homedir(), dockerExecArgs: ctx.dockerExecArgs }, sessionRef.containerName));
+                    } catch (e) { /* 读不到 env 就走原来的目录探测 */ }
+                }
+                if (!models) models = await fetchAgentModelCatalogCached(ctx, sessionRef.containerName, agentProgram);
                 sendJson(res, 200, {
                     name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
                     agentProgram,
@@ -8755,6 +8753,28 @@ async function handleWebApi(req, res, pathname, ctx, state) {
         }
     ];
 
+    routes.push(...createModelServiceRoutes({
+        ctx,
+        state,
+        req,
+        res,
+        deps: {
+            sendJson,
+            readJsonBody,
+            decodeSessionName,
+            readSnapshot: () => readWebConfigSnapshot(state.webConfigPath),
+            writeRaw: raw => writeConfigFileSecure(path.resolve(state.webConfigPath), raw),
+            baseRawOf,
+            validateRaw: parseAndValidateConfigRaw,
+            runConnectionTest: (agent, env) => runSetupConnectionTest(ctx, state, agent, env),
+            defaultHostPath: () => getSetupWorkpath(state),
+            listManaged: async () => {
+                const manager = getWebNetworkManager(ctx, state);
+                return typeof manager.listManaged === 'function' ? manager.listManaged() : [];
+            }
+        }
+    }));
+
     routes.push(...createContainerManageRoutes({
         ctx,
         state,

package/manyoyo.example.json

@@ -86,12 +86,14 @@
     // 一旦设置 title，则固定显示该值（不再随会话变化），留空字符串 "" 即固定显示为空
     // quickChat 是网页端"快捷对话"按钮的配置：path 为工作根目录（每次点击按时间戳建子目录），
     // run 为使用哪个 runs.<name> 配置；也可以在网页「系统设置 > 快捷对话」里填写，效果一样
+    // setupSkipped 为 true 表示用户点过首次向导的“跳过”，之后不再自动弹出（网页写入，一般不用手写）
     // "serve": {
     //     "title": "My MANYOYO",
     //     "quickChat": {
     //         "path": "~/.manyoyo/work/",
     //         "run": "claude"
-    //     }
+    //     },
+    //     "setupSkipped": true
     // },
 
     // 可选插件（manyoyo playwright）：容器内浏览器默认就能用，这里只放少量可调项

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "8.7.0",
+    "version": "8.7.1",
     "imageVersion": "2.3.0-common",
     "playwrightCliVersion": "0.1.22",
     "patchrightCoreVersion": "1.64.1",