@xcanwin/manyoyo 8.6.0 → 8.6.2

package/lib/web/server.js

@@ -13,7 +13,7 @@ const { buildContainerRunArgs, hasNetworkArg } = require('../container-run');
 const { buildContainerIntegration, mergeIntegration } = require('../plugin');
 const { applyAptMirror } = require('../mirrors');
 const containerState = require('../container-state');
-const { buildExecArgs, resolveContainerId } = require('../container-exec');
+const { buildExecArgs, resolveContainerId, readMergedEnv } = require('../container-exec');
 const { createNetworkManager, NETWORK_NAME } = require('../container-network');
 const { normalizePolicy, isUnrestricted: isUnrestrictedPolicy } = require('../network-policy');
 const { withEnvEndpoints } = require('../network-endpoints');
@@ -829,7 +829,7 @@ function buildCodexAgentExecCommand(template, prompt, options = {}) {
         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}` : '';
+        const modelFlag = model && !hasModel ? ` --model ${quoteBashSingleValue(model)}` : '';
         if (sessionId) {
             const promptIndex = suffix.indexOf('{prompt}');
             const resumeSuffix = `${suffix.slice(0, promptIndex)}${quoteBashSingleValue(sessionId)} ${suffix.slice(promptIndex)}`;
@@ -877,7 +877,7 @@ function buildClaudeAgentExecCommand(template, prompt, options = {}) {
     }
     const model = options && typeof options.model === 'string' ? options.model.trim() : '';
     if (model) {
-        flagSpecs.push({ flag: `--model ${model}`, pattern: /(?:^|\s)--model(?:\s|$)/ });
+        flagSpecs.push({ flag: `--model ${quoteBashSingleValue(model)}`, pattern: /(?:^|\s)--model(?:\s|$)/ });
     }
     const claudeTemplate = prependAgentFlags(
         templateText,
@@ -896,7 +896,7 @@ function buildGeminiAgentExecCommand(template, prompt, options = {}) {
     ];
     const model = options && typeof options.model === 'string' ? options.model.trim() : '';
     if (model) {
-        flagSpecs.push({ flag: `--model ${model}`, pattern: /(?:^|\s)(?:-m|--model)(?:\s|$)/ });
+        flagSpecs.push({ flag: `--model ${quoteBashSingleValue(model)}`, pattern: /(?:^|\s)(?:-m|--model)(?:\s|$)/ });
     }
     const geminiTemplate = prependAgentFlags(
         templateText,
@@ -922,7 +922,7 @@ function buildOpenCodeAgentExecCommand(template, prompt, options = {}) {
     }
     const model = options && typeof options.model === 'string' ? options.model.trim() : '';
     if (model) {
-        flagSpecs.push({ flag: `--model ${model}`, pattern: /(?:^|\s)(?:-m|--model)(?:\s|$)/ });
+        flagSpecs.push({ flag: `--model ${quoteBashSingleValue(model)}`, pattern: /(?:^|\s)(?:-m|--model)(?:\s|$)/ });
     }
     const opencodeTemplate = prependAgentFlags(
         templateText,
@@ -1319,6 +1319,61 @@ function extractOpenCodeModelsFromOutput(text) {
         .map(value => ({ value, label: value, description: '' }));
 }
 
+// 模型目录要在容器里起一个 Agent 进程才能问到，很慢：按“容器 + Agent 程序”缓存，
+// 并合并同一时刻的重复请求。缓存挂在 ctx 上（随 serve 实例走），不放模块级，避免测试之间串味
+const MODEL_CATALOG_TTL_MS = 10 * 60 * 1000;
+const modelCatalogCaches = new WeakMap();
+
+async function fetchAgentModelCatalogCached(ctx, containerName, agentProgram) {
+    let cache = modelCatalogCaches.get(ctx);
+    if (!cache) {
+        cache = new Map();
+        modelCatalogCaches.set(ctx, cache);
+    }
+    const key = `${containerName}\u0000${agentProgram}`;
+    const hit = cache.get(key);
+    if (hit && (hit.pending || Date.now() - hit.at < MODEL_CATALOG_TTL_MS)) {
+        return hit.pending || hit.models;
+    }
+    const pending = fetchAgentModelCatalog(ctx, containerName, agentProgram).then(models => {
+        // 探测失败（超时 / 容器没起来）返回空数组，不缓存，下次还能重试
+        if (models.length) cache.set(key, { at: Date.now(), models });
+        else cache.delete(key);
+        return models;
+    }, error => {
+        cache.delete(key);
+        throw error;
+    });
+    cache.set(key, { pending });
+    return pending;
+}
+
+// 以会话实际配置的 env 生成模型选项。defaultModel 是“跟随默认”实际用的模型；
+// Claude 另有按档位别名（opus / sonnet / haiku …）一行一个的选项：value 是别名（--model opus 由 CLI 按 env 解析），
+// label 是该档位对应的真实模型名。不同档位指向同一个模型也各占一行，不合并。
+// 只读 *_MODEL 这类非敏感键，容器可写的 env 只用来展示，不参与任何安全判断
+const CLAUDE_TIER_ORDER = ['opus', 'fable', 'sonnet', 'haiku'];
+
+function buildEnvModelOptions(agentProgram, env) {
+    const source = env && typeof env === 'object' ? env : {};
+    const defaultKey = { claude: 'ANTHROPIC_MODEL', codex: 'OPENAI_MODEL', opencode: 'OPENAI_MODEL', gemini: 'GEMINI_MODEL' }[agentProgram];
+    if (!defaultKey) return { defaultModel: '', options: [] };
+    const defaultModel = normalizeStoredAgentModelValue(source[defaultKey]);
+    if (agentProgram !== 'claude') return { defaultModel, options: [] };
+    const tiers = [];
+    Object.keys(source).forEach(key => {
+        const matched = key.match(/^ANTHROPIC_DEFAULT_([A-Z0-9]+)_MODEL$/);
+        const model = matched ? normalizeStoredAgentModelValue(source[key]) : '';
+        if (model) tiers.push({ alias: matched[1].toLowerCase(), model });
+    });
+    const rank = alias => (CLAUDE_TIER_ORDER.includes(alias) ? CLAUDE_TIER_ORDER.indexOf(alias) : CLAUDE_TIER_ORDER.length);
+    tiers.sort((x, y) => rank(x.alias) - rank(y.alias) || x.alias.localeCompare(y.alias));
+    return {
+        defaultModel,
+        options: tiers.map(tier => ({ value: tier.alias, label: tier.model, description: tier.alias }))
+    };
+}
+
 async function fetchAgentModelCatalog(ctx, containerName, agentProgram) {
     if (agentProgram === 'claude') {
         const requestLine = JSON.stringify({
@@ -5950,7 +6005,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     containerInfo.defaultCommand
                 );
                 const agentProgram = resolveAgentProgram(effectiveTemplate);
-                const models = await fetchAgentModelCatalog(ctx, sessionRef.containerName, agentProgram);
+                const models = await fetchAgentModelCatalogCached(ctx, sessionRef.containerName, agentProgram);
                 sendJson(res, 200, {
                     name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
                     agentProgram,
@@ -5958,6 +6013,34 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 });
             }
         },
+        {
+            // 毫秒级：只读宿主机上的 env 文件，不进容器；慢的 CLI 目录探测走上面的 /models
+            method: 'GET',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/model-options$/),
+            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 agentProgram = resolveAgentProgram(resolveEffectiveAgentPromptCommandForSession(
+                    history,
+                    sessionRef.agentId,
+                    containerInfo.defaultCommand
+                ));
+                let env = {};
+                try {
+                    env = readMergedEnv({ homeDir: ctx.homeDir || os.homedir(), dockerExecArgs: ctx.dockerExecArgs }, sessionRef.containerName);
+                } catch (e) { /* 读不到 env 就只给空选项 */ }
+                sendJson(res, 200, {
+                    name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
+                    agentProgram,
+                    ...buildEnvModelOptions(agentProgram, env)
+                });
+            }
+        },
         {
             method: 'POST',
             match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/model$/),
@@ -6872,5 +6955,6 @@ async function startWebServer(options) {
 }
 
 module.exports = {
-    startWebServer
+    startWebServer,
+    buildEnvModelOptions
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "8.6.0",
+    "version": "8.6.2",
     "imageVersion": "2.2.0-common",
     "playwrightCliVersion": "0.1.19",
     "patchrightCoreVersion": "1.63.0",