@xcanwin/manyoyo 8.7.0 → 8.7.1

package/lib/provider-presets.js

@@ -4,71 +4,74 @@
 // 只收录实测可用（Base URL 不带 Key 请求得到 401）且官方文档给了接入方式的服务商。
 // claude：Anthropic 兼容接口；codex：Responses 接口（只收官方文档确认支持 Responses 的）。
 // models 只作“模型”输入框的占位提示，不会自动写入配置；defaultModel 是官方文档要求必须填的，用户可改。
-// Codex 不认环境变量 OPENAI_BASE_URL（0.160 / 0.164 实测），向导写的仍是环境变量，
-// 由 lib/agent-adapters 的 withCodexBaseUrl 在容器里展开成 `-c openai_base_url=…` 才生效。
+// Codex 0.164 实测：exec 不认 OPENAI_BASE_URL / OPENAI_API_KEY / OPENAI_MODEL，向导写的仍是环境变量，
+// 由 lib/agent-adapters 的 withCodexBaseUrl 在容器里展开成自定义 model_provider + --model 才生效，所以 Codex 条目必须有 defaultModel。
+// extraEnv：这家服务必须附带的变量（写进同一个运行配置）。Claude Code 2.1.310 的“工具搜索”会把工具收进 ToolSearch，
+// 智谱的兼容接口用不了（实测模型看不到 Bash），要 ENABLE_TOOL_SEARCH=false；DeepSeek 实测不需要。其余没有 Key 实测的先带上（代价只是多耗一点 token）。
 // 智谱的接口把鉴权失败写在 200 响应体里（`{"code":401,...}`），其余三家直接返回 HTTP 401。
 const PROVIDER_PRESETS = [
     {
         id: 'deepseek',
         label: 'DeepSeek',
         docUrl: 'https://api-docs.deepseek.com/guides/coding_agents',
-        claude: { baseUrl: 'https://api.deepseek.com/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN', models: ['deepseek-flash[1m]'], defaultModel: 'deepseek-flash[1m]' }
+        claude: { baseUrl: 'https://api.deepseek.com/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN', models: ['deepseek-flash[1m]'], defaultModel: 'deepseek-flash[1m]' },
+        codex: { baseUrl: 'https://api.deepseek.com', keyEnv: 'OPENAI_API_KEY', models: ['deepseek-flash'], defaultModel: 'deepseek-flash' }
     },
     {
         id: 'zhipu',
         label: '智谱 GLM',
         docUrl: 'https://docs.bigmodel.cn/cn/coding-plan/tool/claude',
-        claude: { baseUrl: 'https://open.bigmodel.cn/api/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN' },
-        codex: { baseUrl: 'https://open.bigmodel.cn/api/v1', keyEnv: 'OPENAI_API_KEY', docUrl: 'https://docs.bigmodel.cn/cn/coding-plan/tool/codex' }
+        claude: { baseUrl: 'https://open.bigmodel.cn/api/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN', extraEnv: { ENABLE_TOOL_SEARCH: 'false' } },
+        codex: { baseUrl: 'https://open.bigmodel.cn/api/v1', keyEnv: 'OPENAI_API_KEY', models: ['glm-5.3'], defaultModel: 'glm-5.3', docUrl: 'https://docs.bigmodel.cn/cn/coding-plan/tool/codex' }
     },
     {
         id: 'zai',
         label: 'Z.ai（智谱国际）',
         docUrl: 'https://docs.z.ai/devpack/tool/claude',
-        claude: { baseUrl: 'https://api.z.ai/api/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN' }
+        claude: { baseUrl: 'https://api.z.ai/api/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN', extraEnv: { ENABLE_TOOL_SEARCH: 'false' } }
     },
     {
         id: 'kimi',
         label: 'Kimi',
         docUrl: 'https://platform.kimi.com/docs/guide/claude-code-kimi.md',
-        claude: { baseUrl: 'https://api.moonshot.cn/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN' },
+        claude: { baseUrl: 'https://api.moonshot.cn/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN', extraEnv: { ENABLE_TOOL_SEARCH: 'false' } },
         codex: { baseUrl: 'https://api.moonshot.cn/v1', keyEnv: 'OPENAI_API_KEY', docUrl: 'https://platform.kimi.com/docs/guide/codex-kimi.md' }
     },
     {
         id: 'kimi-code',
         label: 'Kimi Code（订阅，海外）',
         docUrl: 'https://www.kimi.com/code/docs/en/third-party-tools/claude-code.html',
-        claude: { baseUrl: 'https://api.kimi.ai/coding/', keyEnv: 'ANTHROPIC_API_KEY' }
+        claude: { baseUrl: 'https://api.kimi.ai/coding/', keyEnv: 'ANTHROPIC_API_KEY', extraEnv: { ENABLE_TOOL_SEARCH: 'false' } }
     },
     {
         id: 'aliyun',
         label: '阿里云百炼',
         docUrl: 'https://help.aliyun.com/zh/model-studio/claude-code',
-        claude: { baseUrl: 'https://coding.dashscope.aliyuncs.com/apps/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN' }
+        claude: { baseUrl: 'https://coding.dashscope.aliyuncs.com/apps/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN', extraEnv: { ENABLE_TOOL_SEARCH: 'false' } }
     },
     {
         id: 'tencent',
         label: '腾讯云',
         docUrl: 'https://cloud.tencent.com/document/product/1823/130097',
-        claude: { baseUrl: 'https://api.lkeap.cloud.tencent.com/coding/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN', models: ['glm-5'] }
+        claude: { baseUrl: 'https://api.lkeap.cloud.tencent.com/coding/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN', models: ['glm-5'], extraEnv: { ENABLE_TOOL_SEARCH: 'false' } }
     },
     {
         id: 'volcengine',
         label: '火山方舟',
         docUrl: 'https://www.volcengine.com/docs/82379/1928262',
-        claude: { baseUrl: 'https://ark.cn-beijing.volces.com/api/coding', keyEnv: 'ANTHROPIC_AUTH_TOKEN' },
+        claude: { baseUrl: 'https://ark.cn-beijing.volces.com/api/coding', keyEnv: 'ANTHROPIC_AUTH_TOKEN', extraEnv: { ENABLE_TOOL_SEARCH: 'false' } },
         codex: { baseUrl: 'https://ark.cn-beijing.volces.com/api/coding/v3', keyEnv: 'OPENAI_API_KEY' }
     },
     {
         id: 'minimax',
         label: 'MiniMax',
         docUrl: 'https://platform.minimax.cn/docs/token-plan/claude-code',
-        claude: { baseUrl: 'https://api.minimax.cn/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN' },
+        claude: { baseUrl: 'https://api.minimax.cn/anthropic', keyEnv: 'ANTHROPIC_AUTH_TOKEN', extraEnv: { ENABLE_TOOL_SEARCH: 'false' } },
         codex: { baseUrl: 'https://api.minimax.cn/v1', keyEnv: 'OPENAI_API_KEY', docUrl: 'https://platform.minimax.cn/docs/token-plan/codex' }
     }
 ];
 
-/** 某个 Agent 可用的预设（扁平：{id, label, docUrl, baseUrl, keyEnv, models, defaultModel}） */
+/** 某个 Agent 可用的预设（扁平：{id, label, docUrl, baseUrl, keyEnv, models, defaultModel, extraEnv}） */
 function providersForAgent(agentId) {
     return PROVIDER_PRESETS
         .filter(item => item[agentId])
@@ -79,8 +82,35 @@ function providersForAgent(agentId) {
             baseUrl: item[agentId].baseUrl,
             keyEnv: item[agentId].keyEnv,
             models: [...(item[agentId].models || [])],
-            defaultModel: item[agentId].defaultModel || ''
+            defaultModel: item[agentId].defaultModel || '',
+            extraEnv: { ...(item[agentId].extraEnv || {}) }
         }));
 }
 
-module.exports = { PROVIDER_PRESETS, providersForAgent };
+function normalizeUrl(value) {
+    return String(value || '').trim().replace(/\/+$/, '').toLowerCase();
+}
+
+/** 按 Base URL 找某个 Agent 的预设，对不上返回 null */
+function findProviderByBaseUrl(agentId, baseUrl) {
+    const url = normalizeUrl(baseUrl);
+    if (!url) return null;
+    return providersForAgent(agentId).find(item => normalizeUrl(item.baseUrl) === url) || null;
+}
+
+/**
+ * Codex 接了第三方（env 里有 OPENAI_BASE_URL）时的模型下拉：只列这家的预设模型和当前模型。
+ * `codex app-server` 的目录永远是 OpenAI 的模型名，选了第三方会直接报错。不是第三方返回 null。
+ */
+function thirdPartyCodexModels(env) {
+    const source = env && typeof env === 'object' ? env : {};
+    const baseUrl = typeof source.OPENAI_BASE_URL === 'string' ? source.OPENAI_BASE_URL.trim() : '';
+    if (!baseUrl) return null;
+    const provider = findProviderByBaseUrl('codex', baseUrl);
+    const names = [...(provider ? provider.models : [])];
+    const current = typeof source.OPENAI_MODEL === 'string' ? source.OPENAI_MODEL.trim() : '';
+    if (current && !names.includes(current)) names.push(current);
+    return names.map(value => ({ value, label: value, description: provider ? provider.label : '' }));
+}
+
+module.exports = { PROVIDER_PRESETS, providersForAgent, findProviderByBaseUrl, thirdPartyCodexModels };

package/lib/setup-cli.js

@@ -10,6 +10,7 @@ const readline = require('readline');
 const { Writable } = require('stream');
 const JSON5 = require('json5');
 const { listSetupAgents, buildAgentRunProfile, validateSetupPassword, listMirrorPresets } = require('./setup');
+const { uniqueRunName } = require('./model-services');
 const { baseRawOf, buildAgentConfigRaw, buildPasswordConfigRaw, shouldWriteMirrors, buildMirrorsConfigRaw } = require('./setup-config');
 const { normalizeMirrors } = require('./runtime-normalizers');
 const { writeConfigFileSecure } = require('./secure-file');
@@ -155,6 +156,8 @@ async function runSetupCli(deps) {
             keyName = agent.requiredAnyOf[keyIndex];
         }
         let defaultModel = '';
+        // 名字里的服务商标记：选了预设用预设 id，官方 Key 是 official，自定义地址是 custom
+        let nameTag = modeIndex === 1 ? 'custom' : 'official';
         if (modeIndex === 1) {
             const providers = agent.providers || [];
             const baseUrlItems = [
@@ -168,6 +171,8 @@ async function runSetupCli(deps) {
                 env[agent.baseUrlKey] = provider.baseUrl;
                 keyName = provider.keyEnv;
                 defaultModel = provider.defaultModel;
+                nameTag = provider.id;
+                Object.assign(env, provider.extraEnv || {});
                 log(`官方说明：${provider.docUrl}`);
             } else if (baseIndex < providers.length + agent.baseUrlPresets.length) {
                 env[agent.baseUrlKey] = agent.baseUrlPresets[baseIndex - providers.length].value;
@@ -188,7 +193,11 @@ async function runSetupCli(deps) {
         env[keyName] = key;
         const model = String(await prompter.ask(defaultModel
             ? `模型（${agent.modelKey}，回车使用 ${defaultModel}）: `
-            : `模型（${agent.modelKey}，可选，回车跳过）: `)).trim() || defaultModel;
+            : `模型（${agent.modelKey}，${agent.id === 'codex' && modeIndex === 1 ? '必填' : '可选，回车跳过'}）: `)).trim() || defaultModel;
+        if (!model && agent.id === 'codex' && modeIndex === 1) {
+            log('Codex 接兼容服务必须指定模型，已退出，没有改动任何配置。');
+            return 1;
+        }
         if (model) env[agent.modelKey] = model;
 
         log('\n第 3 / 4 步 · 工作目录');
@@ -215,14 +224,18 @@ async function runSetupCli(deps) {
         const exists = fs.existsSync(configPath);
         const snapshot = { exists, raw: exists ? fs.readFileSync(configPath, 'utf-8') : '' };
         const parsed = exists && snapshot.raw.trim() ? JSON5.parse(snapshot.raw) : {};
-        const existingRun = parsed.runs && typeof parsed.runs === 'object' ? parsed.runs[agent.id] : undefined;
-        const profile = buildAgentRunProfile(agent.id, env, { existingRun, hostPath });
-        let nextRaw = buildAgentConfigRaw(baseRawOf(snapshot), agent.id, profile);
+        // 已有同名运行配置时新增一套（名字带服务商），绝不覆盖；第一次配置仍叫 Agent 的名字
+        const runs = parsed.runs && typeof parsed.runs === 'object' ? parsed.runs : {};
+        const runName = runs[agent.id] ? uniqueRunName(runs, `${agent.id}-${nameTag}`) : agent.id;
+        // 默认工作目录根不写进运行配置：新建容器各自建 <根>/<时间> 子目录
+        const profile = buildAgentRunProfile(agent.id, env, { hostPath: hostPath === path.resolve(defaultWork) ? '' : hostPath });
+        if (runName !== agent.id) profile.containerName = `my-${runName}-{now}`;
+        let nextRaw = buildAgentConfigRaw(baseRawOf(snapshot), runName, profile);
         nextRaw = buildPasswordConfigRaw(nextRaw, password);
         if (shouldWriteMirrors(parsed, mirrors)) nextRaw = buildMirrorsConfigRaw(nextRaw, normalizeMirrors(mirrors));
         JSON5.parse(nextRaw);
         writeConfigFileSecure(configPath, nextRaw);
-        log(`已保存到 ${configPath}（权限 0600）：Agent ${agent.id}、工作目录 ${hostPath}、登录密码${Object.keys(mirrors).length > 0 ? '、软件源' : ''}。`);
+        log(`已保存到 ${configPath}（权限 0600）：运行配置 ${runName}（${agent.id}）、工作目录 ${hostPath}、登录密码${Object.keys(mirrors).length > 0 ? '、软件源' : ''}。`);
     } catch (error) {
         if (error instanceof InputClosedError) {
             log('输入已结束，没有改动任何配置。');

package/lib/setup-config.js

@@ -38,4 +38,9 @@ function buildBooleanConfigRaw(baseRaw, key, value) {
     return upsertValueByPath(baseRaw, [key], value ? 'true' : 'false');
 }
 
-module.exports = { buildBooleanConfigRaw, EMPTY_CONFIG_RAW, baseRawOf, buildAgentConfigRaw, buildPasswordConfigRaw, shouldWriteMirrors, buildMirrorsConfigRaw, buildAgentInstructionsConfigRaw };
+// 向导“跳过”要落盘，否则刷新后又弹
+function buildSetupSkippedConfigRaw(baseRaw) {
+    return upsertValueByPath(baseRaw, ['serve', 'setupSkipped'], 'true');
+}
+
+module.exports = { buildSetupSkippedConfigRaw, buildBooleanConfigRaw, EMPTY_CONFIG_RAW, baseRawOf, buildAgentConfigRaw, buildPasswordConfigRaw, shouldWriteMirrors, buildMirrorsConfigRaw, buildAgentInstructionsConfigRaw };

package/lib/setup.js

@@ -3,6 +3,8 @@
 const { AGENT_ENV_SCHEMA } = require('./init-config');
 const { parseEnvEntry } = require('./runtime-normalizers');
 const { providersForAgent } = require('./provider-presets');
+const { findAdapterByAlias } = require('./agent-adapters');
+const { resolveAgentProgram } = require('./agent-resume');
 
 const SETUP_AGENTS = Object.keys(AGENT_ENV_SCHEMA);
 
@@ -32,10 +34,31 @@ function hasNonEmptyRequiredKey(spec, env) {
     return spec.requiredAnyOf.some(key => typeof source[key] === 'string' && source[key].trim() !== '');
 }
 
-// 已有可用 runs.<agent>：run 存在，且必填变量（任意一个）非空
+// 运行配置属于哪个 Agent：yolo → shell / agentPromptCommand 里的程序 → 名字前缀；认不出返回空串
+function identifyRunAgent(name, run) {
+    if (!isPlainObject(run)) return '';
+    const profile = run;
+    const byYolo = findAdapterByAlias(profile.yolo);
+    if (byYolo && AGENT_ENV_SCHEMA[byYolo.id]) return byYolo.id;
+    for (const text of [profile.shell, profile.agentPromptCommand]) {
+        if (typeof text !== 'string' || !text.trim()) continue;
+        const program = resolveAgentProgram(text);
+        if (AGENT_ENV_SCHEMA[program]) return program;
+    }
+    const prefix = String(name || '').toLowerCase().split(/[-_.\s]/)[0];
+    const byName = findAdapterByAlias(prefix);
+    return byName && AGENT_ENV_SCHEMA[byName.id] ? byName.id : '';
+}
+
+// 已有可用的运行配置：不论叫什么名字，能认出 Agent 且必填变量（任意一个）非空
 function getConfiguredAgents(config) {
     const runs = isPlainObject(config && config.runs) ? config.runs : {};
-    return SETUP_AGENTS.filter(id => isPlainObject(runs[id]) && hasNonEmptyRequiredKey(AGENT_ENV_SCHEMA[id], runs[id].env));
+    const found = new Set();
+    for (const [name, run] of Object.entries(runs)) {
+        const agent = identifyRunAgent(name, run);
+        if (agent && hasNonEmptyRequiredKey(AGENT_ENV_SCHEMA[agent], run.env)) found.add(agent);
+    }
+    return SETUP_AGENTS.filter(id => found.has(id));
 }
 
 /**
@@ -70,13 +93,18 @@ function buildAgentRunProfile(agent, envInput, options = {}) {
     const existingEnv = isPlainObject(existing.env) ? existing.env : {};
     const profile = { ...existing };
     profile.env = { ...existingEnv, ...provided };
+    // 换成订阅令牌时，同一个运行配置里的 API Key 类变量和 Base URL 要删掉：Claude Code 同时有 Key 时优先用 Key，订阅就被绕过了
+    if (agent === 'claude' && provided.CLAUDE_CODE_OAUTH_TOKEN && !['ANTHROPIC_AUTH_TOKEN', 'ANTHROPIC_API_KEY'].some(key => provided[key])) {
+        for (const key of ['ANTHROPIC_AUTH_TOKEN', 'ANTHROPIC_API_KEY', 'ANTHROPIC_BASE_URL']) delete profile.env[key];
+    }
     if (!hasNonEmptyRequiredKey(spec, profile.env)) {
         throw new Error(`请填写 ${spec.requiredAnyOf.join(' 或 ')}`);
     }
     if (profile.containerName === undefined) profile.containerName = `my-${agent}-{now}`;
     if (profile.yolo === undefined) profile.yolo = spec.yolo;
+    // 只写用户选定的目录。默认的工作目录根不写：新建容器按 {quickChatPath}/{now} 各建一个子目录，
+    // 写了根目录，对话框里目录是空白、每个新容器都会把整个工作目录根挂进去
     if (options.hostPath) profile.hostPath = options.hostPath;
-    else if (profile.hostPath === undefined && options.defaultHostPath) profile.hostPath = options.defaultHostPath;
     return profile;
 }
 
@@ -86,6 +114,16 @@ const CONNECTION_RULES = [
         pattern: /\b(401|403)\b|unauthori[sz]ed|invalid[ _-]?(x-)?api[ _-]?key|incorrect api key|authentication[ _](failed|error)|forbidden|permission_denied|invalid[ _]token/i,
         message: '认证失败：Key 或令牌无效，请检查后重新填写'
     },
+    {
+        category: 'quota',
+        pattern: /\b429\b|rate[ _-]?limit|too many requests|insufficient[ _](quota|balance)|quota exceeded|余额不足|无可用资源包|\b1113\b/i,
+        message: '额度不足或请求太频繁：请检查账户余额 / 套餐额度；套餐 Key 不能用在按量计费的地址上，反过来也一样'
+    },
+    {
+        category: 'model',
+        pattern: /model(?! metadata)[^\n]{0,80}(not found|does not exist|not exist|not supported|unknown)|(unknown|invalid|unsupported) model|no such model|模型[^\n]{0,20}(不存在|不支持)/i,
+        message: '模型名不存在或该 Key 不能用这个模型，请检查模型名'
+    },
     {
         category: 'network',
         pattern: /ENOTFOUND|ECONNREFUSED|ECONNRESET|ETIMEDOUT|EAI_AGAIN|EHOSTUNREACH|ENETUNREACH|fetch failed|getaddrinfo|could not resolve|network (is )?unreachable|connection (refused|reset|timed out)|socket hang up|unable to connect/i,
@@ -94,13 +132,21 @@ const CONNECTION_RULES = [
 ];
 
 /**
- * 把容器内最小请求的结果归类为 success / network / auth / missing_cli / other。
+ * 把容器内最小请求的结果归类为 success / no_tools / quota / model / network / auth / missing_cli / other。
  * 返回值只含固定文案和经过脱敏的尾部片段，不回传完整输出。
  */
-function classifyConnectionResult(result, secrets = []) {
+function classifyConnectionResult(result, secrets = [], options = {}) {
     const exitCode = result && Number.isInteger(result.exitCode) ? result.exitCode : 1;
     const output = String(result && result.output || '');
     if (exitCode === 0) {
+        // 只回一句 OK 发现不了“能连通但调不了工具”，测试要求执行一条命令并读回结果
+        if (options.expectOutput && !output.includes(options.expectOutput)) {
+            return {
+                category: 'no_tools',
+                message: '能连通，但模型没有执行命令：Agent 在这个服务上可能调不了工具，换个模型或服务商再试',
+                detail: redactSecrets(output.trim().slice(-300), secrets)
+            };
+        }
         return { category: 'success', message: '连接成功', detail: '' };
     }
     const detail = redactSecrets(output.trim().slice(-300), secrets);
@@ -188,6 +234,7 @@ module.exports = {
     SETUP_AGENTS,
     listSetupAgents,
     getConfiguredAgents,
+    identifyRunAgent,
     buildAgentRunProfile,
     classifyConnectionResult,
     redactSecrets