@xcanwin/manyoyo 8.6.12 → 8.7.1

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