evolclaw 2.8.1 → 2.8.3

package/dist/config.js

@@ -48,82 +48,97 @@ function loadCodexSettings() {
     catch { }
     return {};
 }
-export function resolveAnthropicConfig(config) {
+/**
+ * Resolve anthropic credentials with optional override (from agent.json).
+ *
+ * Priority: override > globalConfig.agents.claude > env > ~/.claude/settings.json
+ *
+ * Override is matched against the same shape as `config.agents.claude` so
+ * EvolAgent's `agents.claude` block is wired in directly.
+ */
+export function resolveAnthropicConfig(config, override) {
     const settings = loadClaudeSettings();
-    // 过滤占位符，视为未配置
-    const configApiKey = config.agents?.claude?.apiKey;
-    const isPlaceholderKey = !configApiKey ||
-        configApiKey.includes('your-') ||
-        configApiKey.includes('placeholder');
-    const apiKey = (isPlaceholderKey ? null : configApiKey)
+    const isPlaceholder = (v) => !v || v.includes('your-') || v.includes('placeholder');
+    // apiKey: override → global → env → settings.json
+    const overrideApiKey = isPlaceholder(override?.apiKey) ? undefined : override?.apiKey;
+    const globalApiKey = isPlaceholder(config.agents?.claude?.apiKey) ? undefined : config.agents?.claude?.apiKey;
+    const apiKey = overrideApiKey
+        || globalApiKey
         || process.env.ANTHROPIC_AUTH_TOKEN
         || settings.env?.ANTHROPIC_AUTH_TOKEN;
     if (!apiKey) {
-        throw new Error('No API key found. Set one of: agents.claude.apiKey, env ANTHROPIC_AUTH_TOKEN, or ~/.claude/settings.json env.ANTHROPIC_AUTH_TOKEN');
+        throw new Error('No API key found. Set one of: agents.claude.apiKey (per-agent or global), env ANTHROPIC_AUTH_TOKEN, or ~/.claude/settings.json env.ANTHROPIC_AUTH_TOKEN');
     }
-    // baseUrl 也过滤占位符
-    const configBaseUrl = config.agents?.claude?.baseUrl;
-    const isPlaceholderUrl = configBaseUrl?.includes('api.anthropic.com');
-    const baseUrl = (isPlaceholderUrl ? null : configBaseUrl)
+    const isPlaceholderUrl = (v) => !v || v.includes('api.anthropic.com');
+    const overrideBaseUrl = isPlaceholderUrl(override?.baseUrl) ? undefined : override?.baseUrl;
+    const globalBaseUrl = isPlaceholderUrl(config.agents?.claude?.baseUrl) ? undefined : config.agents?.claude?.baseUrl;
+    const baseUrl = overrideBaseUrl
+        || globalBaseUrl
         || process.env.ANTHROPIC_BASE_URL
         || settings.env?.ANTHROPIC_BASE_URL;
-    const model = config.agents?.claude?.model
+    const model = override?.model
+        || config.agents?.claude?.model
         || settings.model
         || 'sonnet';
-    const effort = config.agents?.claude?.effort
+    const effort = override?.effort
+        || config.agents?.claude?.effort
         || settings.effortLevel
         || undefined;
-    const configExecPath = config.agents?.claude?.pathToClaudeCodeExecutable;
-    const isPlaceholderExec = !configExecPath || configExecPath.includes('your-') || configExecPath.includes('placeholder');
-    const pathToClaudeCodeExecutable = isPlaceholderExec ? undefined : configExecPath;
+    const pickExec = (v) => (!v || v.includes('your-') || v.includes('placeholder')) ? undefined : v;
+    const pathToClaudeCodeExecutable = pickExec(override?.pathToClaudeCodeExecutable)
+        || pickExec(config.agents?.claude?.pathToClaudeCodeExecutable);
     return { apiKey, baseUrl, model, effort, pathToClaudeCodeExecutable };
 }
-export function resolveOpenaiConfig(config) {
+export function resolveOpenaiConfig(config, override) {
     const codexSettings = loadCodexSettings();
-    // 过滤占位符，视为未配置
-    const configApiKey = config.agents?.codex?.apiKey;
-    const isPlaceholderKey = !configApiKey ||
-        configApiKey.includes('your-') ||
-        configApiKey.includes('placeholder');
-    const apiKey = (isPlaceholderKey ? null : configApiKey)
+    const isPlaceholder = (v) => !v || v.includes('your-') || v.includes('placeholder');
+    const overrideApiKey = isPlaceholder(override?.apiKey) ? undefined : override?.apiKey;
+    const globalApiKey = isPlaceholder(config.agents?.codex?.apiKey) ? undefined : config.agents?.codex?.apiKey;
+    const apiKey = overrideApiKey
+        || globalApiKey
         || process.env.OPENAI_API_KEY
         || codexSettings.apiKey;
     if (!apiKey) {
-        throw new Error('No OpenAI API key found. Set one of: agents.codex.apiKey, env OPENAI_API_KEY, or ~/.codex/auth.json');
+        throw new Error('No OpenAI API key found. Set one of: agents.codex.apiKey (per-agent or global), env OPENAI_API_KEY, or ~/.codex/auth.json');
     }
-    // baseUrl 也过滤占位符（与 anthropic 保持一致：只检查默认域名）
-    const configBaseUrl = config.agents?.codex?.baseUrl;
-    const isPlaceholderUrl = configBaseUrl?.includes('api.openai.com');
-    const baseUrl = (isPlaceholderUrl ? null : configBaseUrl)
+    const isPlaceholderUrl = (v) => !v || v.includes('api.openai.com');
+    const overrideBaseUrl = isPlaceholderUrl(override?.baseUrl) ? undefined : override?.baseUrl;
+    const globalBaseUrl = isPlaceholderUrl(config.agents?.codex?.baseUrl) ? undefined : config.agents?.codex?.baseUrl;
+    const baseUrl = overrideBaseUrl
+        || globalBaseUrl
         || process.env.OPENAI_BASE_URL
         || codexSettings.baseUrl
         || undefined;
-    const model = config.agents?.codex?.model
+    const model = override?.model
+        || config.agents?.codex?.model
         || codexSettings.model
         || 'gpt-5.2-codex';
-    const effort = config.agents?.codex?.effort || config.agents?.codex?.reasoning || undefined;
+    const effort = override?.effort
+        || override?.reasoning
+        || config.agents?.codex?.effort
+        || config.agents?.codex?.reasoning
+        || undefined;
     return { apiKey, baseUrl, model, effort };
 }
-export function resolveGoogleConfig(config) {
+export function resolveGoogleConfig(config, override) {
     const googleCfg = config.agents?.gemini;
-    // CLI path: config → which gemini
-    let cliPath = googleCfg?.cliPath || '';
+    const isPlaceholder = (v) => !v || v.includes('your-') || v.includes('placeholder');
+    let cliPath = override?.cliPath || googleCfg?.cliPath || '';
     if (!cliPath) {
         cliPath = commandExists('gemini') ? 'gemini' : '';
     }
-    // Model: config → default
-    const model = googleCfg?.model || 'gemini-2.5-flash';
-    // API key: config → env (optional, CLI has OAuth)
-    const configApiKey = googleCfg?.apiKey;
-    const isPlaceholder = !configApiKey || configApiKey.includes('your-') || configApiKey.includes('placeholder');
-    const apiKey = (isPlaceholder ? undefined : configApiKey)
+    const model = override?.model || googleCfg?.model || 'gemini-2.5-flash';
+    const overrideApiKey = isPlaceholder(override?.apiKey) ? undefined : override?.apiKey;
+    const globalApiKey = isPlaceholder(googleCfg?.apiKey) ? undefined : googleCfg?.apiKey;
+    const apiKey = overrideApiKey
+        || globalApiKey
         || process.env.GEMINI_API_KEY
         || process.env.GOOGLE_API_KEY
         || undefined;
-    const mode = googleCfg?.mode || 'cli';
-    const useVertex = googleCfg?.useVertex || false;
-    const project = googleCfg?.project || process.env.GOOGLE_CLOUD_PROJECT || undefined;
-    const location = googleCfg?.location || process.env.GOOGLE_CLOUD_LOCATION || 'us-central1';
+    const mode = override?.mode || googleCfg?.mode || 'cli';
+    const useVertex = override?.useVertex ?? googleCfg?.useVertex ?? false;
+    const project = override?.project || googleCfg?.project || process.env.GOOGLE_CLOUD_PROJECT || undefined;
+    const location = override?.location || googleCfg?.location || process.env.GOOGLE_CLOUD_LOCATION || 'us-central1';
     return { cliPath, model, apiKey, mode, useVertex, project, location };
 }
 export function loadConfig(configPath = resolvePaths().config) {
@@ -228,6 +243,45 @@ export function normalizeChannelInstances(cfg, defaultName) {
     }
     return [{ ...cfg, name: cfg.name ?? defaultName }];
 }
+/**
+ * Parse a defaultChannel reference. Supports:
+ *   "feishu"           → { type: "feishu" }
+ *   "feishu/feilun"    → { type: "feishu", instance: "feilun" }
+ */
+export function parseDefaultChannelRef(ref) {
+    const slash = ref.indexOf('/');
+    if (slash < 0)
+        return { type: ref };
+    return { type: ref.slice(0, slash), instance: ref.slice(slash + 1) };
+}
+/**
+ * Validate a defaultChannel reference against a channels config block.
+ * Returns an error message string if invalid, or null if OK.
+ *   - type must be in channelTypes
+ *   - type must have at least one instance configured
+ *   - if instance specified, must match an existing instance.name
+ *   - if instance omitted, type must have exactly 1 instance (else ambiguous)
+ */
+export function validateDefaultChannelRef(ref, channelsBlock) {
+    const { type, instance } = parseDefaultChannelRef(ref);
+    if (!channelTypes.includes(type)) {
+        return `channels.defaultChannel='${ref}' references unknown channel type '${type}'`;
+    }
+    const instances = normalizeChannelInstances(channelsBlock?.[type], type);
+    if (instances.length === 0) {
+        return `channels.defaultChannel='${ref}' but channels.${type} has no instances`;
+    }
+    if (instance) {
+        if (!instances.some(i => i.name === instance)) {
+            return `channels.defaultChannel='${ref}' but channels.${type} has no instance named '${instance}'`;
+        }
+    }
+    else if (instances.length > 1) {
+        const names = instances.map(i => i.name).join(', ');
+        return `channels.defaultChannel='${ref}' is ambiguous: channels.${type} has ${instances.length} instances (${names}); use 'type/instanceName' form`;
+    }
+    return null;
+}
 /**
  * Validate that all channel instance names are unique across all channel types.
  * Throws if duplicate names are found.
@@ -263,10 +317,14 @@ export function getOwner(config, channelOrType) {
     }
     return undefined;
 }
-export function setOwner(config, instanceName, userId, configPath = resolvePaths().config) {
-    if (!config.channels)
-        config.channels = {};
-    const channels = config.channels;
+/**
+ * Find a channel instance by name in a config-like object and set its owner.
+ * Returns true if the instance was found and updated.
+ */
+export function writeOwnerToChannelInstance(root, instanceName, userId) {
+    const channels = root?.channels;
+    if (!channels || typeof channels !== 'object')
+        return false;
     for (const type of channelTypes) {
         const raw = channels[type];
         if (raw === undefined)
@@ -275,26 +333,37 @@ export function setOwner(config, instanceName, userId, configPath = resolvePaths
             const inst = raw.find((item) => item.name === instanceName);
             if (inst) {
                 inst.owner = userId;
-                saveConfig(config, configPath);
-                return;
+                return true;
             }
         }
         else {
-            // Single-object form: match if name matches (or defaults to type name)
             const effectiveName = raw.name ?? type;
             if (effectiveName === instanceName) {
                 raw.owner = userId;
-                saveConfig(config, configPath);
-                return;
+                return true;
             }
         }
     }
-    // Fallback: if instanceName matches a channel type with no config, create it
+    return false;
+}
+export function setOwner(config, instanceName, userId, configPath = resolvePaths().config) {
+    if (!config.channels)
+        config.channels = {};
+    // 1. Try writing to evolclaw.json (default-agent channels)
+    if (writeOwnerToChannelInstance(config, instanceName, userId)) {
+        saveConfig(config, configPath);
+        return;
+    }
+    // 2. Last resort: if instanceName matches a channel type with no config, create it
     if (channelTypes.includes(instanceName)) {
-        channels[instanceName] = { owner: userId };
+        config.channels[instanceName] = { owner: userId };
         saveConfig(config, configPath);
         return;
     }
+    // 3. I4: No match — warn (don't silently lose owner). Callers managing
+    // agent-owned channels should route through EvolAgent.setOwner before
+    // falling back to this global setter.
+    logger.warn(`[setOwner] Channel instance "${instanceName}" not found in evolclaw.json. Owner ${userId} not persisted.`);
 }
 export function getChannelShowActivities(config, instanceName) {
     for (const type of channelTypes) {
@@ -353,10 +422,10 @@ export function getDefaultSessionMode(config, chatType) {
     return cm.private;
 }
 export function isOwner(config, channelOrType, userId) {
-    // 按实例名精确匹配
+    // 按实例名精确匹配（evolclaw.json）
     if (getOwner(config, channelOrType) === userId)
         return true;
-    // 按 channelType 匹配：检查该类型下所有实例
+    // 按 channelType 匹配：检查该类型下所有实例（evolclaw.json）
     for (const type of channelTypes) {
         if (type !== channelOrType)
             continue;
@@ -483,17 +552,35 @@ export function validateConfigIntegrity(config) {
             reasons.push(`agents.defaultAgent='${defaultAgent}' but agents.${defaultAgent} does not exist`);
         }
     }
-    // channels — 单通道时自动推断，无需显式 defaultChannel
-    const defaultChannel = config.channels?.defaultChannel;
-    if (!defaultChannel) {
-        const channelKeys = channelTypes.filter(t => config.channels?.[t]);
-        if (channelKeys.length === 0) {
-            reasons.push('Missing channels.defaultChannel (no channels configured)');
+    // channels — 单实例自动推断，多实例必填 defaultChannel
+    // 支持两种形式：
+    //   "feishu"           → type 级，要求该 type 下只有 1 个实例
+    //   "feishu/feilun"    → type/instanceName，精确指向实例
+    const totalInstances = channelTypes.reduce((acc, t) => {
+        return acc + normalizeChannelInstances(config.channels?.[t], t).length;
+    }, 0);
+    if (totalInstances === 0) {
+        reasons.push('Missing channels: no channel instances configured');
+    }
+    else if (totalInstances === 1) {
+        // 单实例：defaultChannel 可省略（自动推断）
+        const dc = config.channels?.defaultChannel;
+        if (dc) {
+            const err = validateDefaultChannelRef(dc, config.channels);
+            if (err)
+                reasons.push(err);
         }
     }
     else {
-        if (!config.channels?.[defaultChannel]) {
-            reasons.push(`channels.defaultChannel='${defaultChannel}' but channels.${defaultChannel} does not exist`);
+        // 多实例：defaultChannel 必填
+        const dc = config.channels?.defaultChannel;
+        if (!dc) {
+            reasons.push('Missing channels.defaultChannel (multiple channel instances configured; must specify "type" or "type/instanceName")');
+        }
+        else {
+            const err = validateDefaultChannelRef(dc, config.channels);
+            if (err)
+                reasons.push(err);
         }
     }
     // projects

package/dist/core/agent-loader.js

@@ -1,14 +1,12 @@
 /**
  * Agent Plugin System
  *
- * Provides a lightweight plugin interface for agent integration.
+ * Per-EvolAgent runner instantiation: each (EvolAgent × baseagent) gets its
+ * own runner so that runtime state (model/effort/permissionMode/credentials)
+ * is fully isolated.
  */
 import { logger } from '../utils/logger.js';
-/**
- * Agent Loader
- *
- * Manages agent plugin registration and creation.
- */
+/** Agent Loader — produces one runner per (EvolAgent × baseagent). */
 export class AgentLoader {
     plugins = new Map();
     register(plugin) {
@@ -18,20 +16,37 @@ export class AgentLoader {
         this.plugins.set(plugin.name, plugin);
         logger.debug(`Registered agent plugin: ${plugin.name}`);
     }
-    createAll(config, callbacks) {
+    /**
+     * Iterate over all EvolAgents (DefaultAgent + each named agent in registry)
+     * × all registered plugins. Each successful (agent, plugin) pair yields one
+     * runner instance.
+     */
+    createAll(globalConfig, registry, callbacks) {
         const instances = [];
-        for (const [name, plugin] of this.plugins) {
-            if (!plugin.isEnabled(config)) {
-                logger.info(`Agent '${name}' is disabled, skipping`);
-                continue;
-            }
-            try {
-                const instance = plugin.createAgent(config, callbacks);
-                instances.push(instance);
-                logger.info(`✓ Agent '${name}' instance created`);
-            }
-            catch (error) {
-                logger.error(`✗ Failed to create agent '${name}':`, error);
+        const allAgents = [];
+        const def = registry.get('[default]');
+        if (def)
+            allAgents.push(def);
+        for (const a of registry.runnableAgents())
+            allAgents.push(a);
+        for (const agent of allAgents) {
+            for (const [pluginName, plugin] of this.plugins) {
+                if (!plugin.isEnabled(globalConfig, agent)) {
+                    logger.debug(`Plugin '${pluginName}' disabled for agent '${agent.name}', skipping`);
+                    continue;
+                }
+                try {
+                    const instance = plugin.createAgent(globalConfig, agent, callbacks);
+                    if (!instance) {
+                        logger.debug(`Plugin '${pluginName}' returned null for agent '${agent.name}', skipping`);
+                        continue;
+                    }
+                    instances.push(instance);
+                    logger.info(`✓ Runner created: agent=${instance.evolagentName} baseagent=${instance.baseagent}`);
+                }
+                catch (error) {
+                    logger.error(`✗ Failed to create runner for agent='${agent.name}' baseagent='${pluginName}':`, error);
+                }
             }
         }
         return instances;