evolclaw 2.8.1 → 2.8.3

package/dist/agents/claude-runner.js

@@ -988,15 +988,26 @@ export class AgentRunner {
 // Plugin implementation
 export class ClaudeAgentPlugin {
     name = 'claude';
-    isEnabled(config) {
-        return true;
-    }
-    createAgent(config, callbacks) {
-        const anthropic = resolveAnthropicConfig(config);
-        const agentRunner = new AgentRunner(anthropic.apiKey, anthropic.model, callbacks.onSessionIdUpdate, anthropic.baseUrl, config);
+    isEnabled(_globalConfig, agent) {
+        // Only instantiate this baseagent for agents that declare it.
+        return !!agent.config.agents?.claude;
+    }
+    createAgent(globalConfig, agent, callbacks) {
+        // Per-agent override: read from agent.json's agents.claude block first.
+        const override = agent.config.agents?.claude;
+        const anthropic = resolveAnthropicConfig(globalConfig, override);
+        // Merge per-agent claude block into config so runner reads useSettingSources etc.
+        const merged = {
+            ...globalConfig,
+            agents: {
+                ...(globalConfig.agents || {}),
+                claude: { ...(globalConfig.agents?.claude || {}), ...(override || {}) },
+            },
+        };
+        const agentRunner = new AgentRunner(anthropic.apiKey, anthropic.model, callbacks.onSessionIdUpdate, anthropic.baseUrl, merged);
         if (anthropic.effort) {
             agentRunner.setEffort(anthropic.effort);
         }
-        return { agent: agentRunner };
+        return { evolagentName: agent.name, baseagent: 'claude', agent: agentRunner };
     }
 }

package/dist/agents/codex-runner.js

@@ -301,17 +301,28 @@ export class CodexRunner {
 // ── Plugin ──
 export class CodexAgentPlugin {
     name = 'codex';
-    isEnabled(config) {
+    isEnabled(globalConfig, agent) {
+        if (!agent.config.agents?.codex)
+            return false;
         try {
-            const resolved = resolveOpenaiConfig(config);
+            const override = agent.config.agents.codex;
+            const resolved = resolveOpenaiConfig(globalConfig, override);
             return !!resolved.apiKey;
         }
         catch {
             return false;
         }
     }
-    createAgent(config, callbacks) {
-        const resolved = resolveOpenaiConfig(config);
-        return { agent: new CodexRunner(config, callbacks) };
+    createAgent(globalConfig, agent, callbacks) {
+        const override = agent.config.agents?.codex;
+        // Synthesize a per-agent config view so CodexRunner sees its own credentials.
+        const merged = {
+            ...globalConfig,
+            agents: {
+                ...(globalConfig.agents || {}),
+                codex: { ...(globalConfig.agents?.codex || {}), ...(override || {}) },
+            },
+        };
+        return { evolagentName: agent.name, baseagent: 'codex', agent: new CodexRunner(merged, callbacks) };
     }
 }

package/dist/agents/gemini-runner.js

@@ -405,16 +405,27 @@ export class GeminiRunner {
 // ── Plugin ──
 export class GeminiAgentPlugin {
     name = 'gemini';
-    isEnabled(config) {
+    isEnabled(globalConfig, agent) {
+        if (!agent.config.agents?.gemini)
+            return false;
         try {
-            const resolved = resolveGoogleConfig(config);
+            const override = agent.config.agents.gemini;
+            const resolved = resolveGoogleConfig(globalConfig, override);
             return !!resolved.cliPath;
         }
         catch {
             return false;
         }
     }
-    createAgent(config, callbacks) {
-        return { agent: new GeminiRunner(config, callbacks) };
+    createAgent(globalConfig, agent, callbacks) {
+        const override = agent.config.agents?.gemini;
+        const merged = {
+            ...globalConfig,
+            agents: {
+                ...(globalConfig.agents || {}),
+                gemini: { ...(globalConfig.agents?.gemini || {}), ...(override || {}) },
+            },
+        };
+        return { evolagentName: agent.name, baseagent: 'gemini', agent: new GeminiRunner(merged, callbacks) };
     }
 }

package/dist/agents/templates.js

@@ -0,0 +1,122 @@
+import fs from 'fs';
+import path from 'path';
+import { getPackageRoot, resolveRoot } from '../paths.js';
+import { logger } from '../utils/logger.js';
+const KNOWN_SECTIONS = new Set(['runtime', 'group', 'proactive']);
+const SECTION_RE = /^##\s+(\w+)\s*$/;
+let sections = null;
+let builtinSections = null;
+function parseTemplate(content) {
+    const result = new Map();
+    let currentSection = null;
+    let currentLines = [];
+    for (const line of content.split('\n')) {
+        // Stop parsing at horizontal rule separator (documentation follows)
+        if (/^---\s*$/.test(line)) {
+            if (currentSection) {
+                result.set(currentSection, currentLines.join('\n').trim());
+            }
+            break;
+        }
+        const m = line.match(SECTION_RE);
+        if (m) {
+            if (currentSection) {
+                result.set(currentSection, currentLines.join('\n').trim());
+            }
+            const name = m[1];
+            if (KNOWN_SECTIONS.has(name)) {
+                currentSection = name;
+                currentLines = [];
+            }
+            else {
+                currentSection = null;
+                currentLines = [];
+            }
+        }
+        else if (currentSection) {
+            currentLines.push(line);
+        }
+    }
+    if (currentSection) {
+        result.set(currentSection, currentLines.join('\n').trim());
+    }
+    return result;
+}
+function loadBuiltinTemplate() {
+    const builtinPath = path.join(getPackageRoot(), 'dist', 'templates', 'prompts.md');
+    const srcPath = path.join(getPackageRoot(), 'src', 'templates', 'prompts.md');
+    const filePath = fs.existsSync(builtinPath) ? builtinPath : srcPath;
+    const content = fs.readFileSync(filePath, 'utf-8');
+    return parseTemplate(content);
+}
+export function loadPromptTemplates() {
+    builtinSections = loadBuiltinTemplate();
+    const userPath = path.join(resolveRoot(), 'data', 'prompts.md');
+    if (fs.existsSync(userPath)) {
+        try {
+            const content = fs.readFileSync(userPath, 'utf-8');
+            const parsed = parseTemplate(content);
+            sections = new Map(builtinSections);
+            for (const [key, value] of parsed) {
+                sections.set(key, value);
+            }
+            logger.info(`[PromptTemplates] Loaded user override: ${userPath}`);
+        }
+        catch (err) {
+            logger.warn(`[PromptTemplates] Failed to load user override (${userPath}), using builtin:`, err);
+            sections = builtinSections;
+        }
+    }
+    else {
+        sections = builtinSections;
+        logger.info(`[PromptTemplates] Using builtin templates`);
+    }
+    for (const name of KNOWN_SECTIONS) {
+        if (!sections.has(name)) {
+            logger.warn(`[PromptTemplates] Section "${name}" missing, using builtin fallback`);
+            const fallback = builtinSections.get(name);
+            if (fallback)
+                sections.set(name, fallback);
+        }
+    }
+}
+function isTruthy(val) {
+    if (val === undefined || val === null || val === false || val === '' || val === 0)
+        return false;
+    return true;
+}
+function renderTemplate(template, vars) {
+    // Pass 1: conditional sections {{?key}}...{{/}}
+    let result = template.replace(/\{\{\?(\w+)\}\}([\s\S]*?)\{\{\/\}\}/g, (_match, key, body) => {
+        return isTruthy(vars[key]) ? body : '';
+    });
+    // Pass 2: variable substitution {{key}}
+    result = result.replace(/\{\{(\w+)\}\}/g, (_match, key) => {
+        const val = vars[key];
+        if (!isTruthy(val))
+            return '';
+        return String(val);
+    });
+    // Pass 3: remove blank lines
+    return result.split('\n').filter(line => line.trim() !== '').join('\n');
+}
+export function renderPromptSection(section, vars) {
+    if (!sections)
+        loadPromptTemplates();
+    const template = sections.get(section);
+    if (!template) {
+        logger.warn(`[PromptTemplates] Section "${section}" not found`);
+        return '';
+    }
+    return renderTemplate(template, vars);
+}
+/** Reset loaded templates (for testing) */
+export function _resetTemplates() {
+    sections = null;
+    builtinSections = null;
+}
+/** Load templates from a raw string (for testing) */
+export function _loadFromString(content) {
+    builtinSections = parseTemplate(content);
+    sections = builtinSections;
+}

package/dist/channels/aun-ops.js

@@ -12,7 +12,7 @@ import { execFileSync } from 'child_process';
 import { isWindows } from '../utils/cross-platform.js';
 import { resolvePaths } from '../paths.js';
 // ==================== Constants ====================
-export const MIN_AUN_CORE_SDK = [0, 2, 14];
+export const MIN_AUN_CORE_SDK = [0, 2, 17];
 export const AUN_CORE_SDK_PKG = '@agentunion/fastaun';
 // ==================== SDK & Environment ====================
 function compareVersion(a, min) {

package/dist/channels/aun.js

@@ -80,6 +80,11 @@ export class AUNChannel {
      */
     async callAndTrace(method, params, opts) {
         this.trace('OUT', method, params);
+        // [DIAG-STALE] 记录调用瞬间 SDK 内部 _state，证明是否在 reconnecting 中误发
+        const sdkStateBefore = this.client?._state ?? 'no-client';
+        if (sdkStateBefore !== 'connected') {
+            logger.warn(`[AUN][DIAG-STALE] callAndTrace ${method} on non-connected SDK: sdk_state=${sdkStateBefore} evolclaw_connected=${this.connected}`);
+        }
         try {
             const result = await this.client.call(method, params);
             if (!opts?.silentOk) {
@@ -97,6 +102,9 @@ export class AUNChannel {
                 code: e?.code,
                 name: e?.name,
             });
+            // [DIAG-STALE] 失败时再记录一次 SDK _state，看错误类型是否为 ConnectionError
+            const sdkStateAfter = this.client?._state ?? 'no-client';
+            logger.warn(`[AUN][DIAG-STALE] callAndTrace ${method} FAILED: err_name=${e?.name ?? '?'} err_code=${e?.code ?? '?'} sdk_state_before=${sdkStateBefore} sdk_state_after=${sdkStateAfter} evolclaw_connected=${this.connected}`);
             logger.warn(`${this.logPrefix()} rpc ${method} failed: ${e?.name ?? ''}(${e?.code ?? ''}) ${e?.message ?? e}`);
             throw e;
         }
@@ -887,6 +895,11 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (!data || typeof data !== 'object')
             return;
         const state = data.state ?? '';
+        // [DIAG-STALE] 记录状态切换瞬间 evolclaw 的 connected 标志和 SDK 的内部 _state，
+        // 用于证明"reconnecting 时 connected 保持 true，导致 sendMessage 误放行"的假设
+        const sdkState = this.client?._state ?? 'no-client';
+        const connectedBefore = this.connected;
+        logger.info(`[AUN][DIAG-STALE] connection.state event: state=${state} attempt=${data.attempt ?? '-'} | connected_before=${connectedBefore} sdk_state=${sdkState}`);
         if (state === 'connected') {
             this.connected = true;
             this.reconnectAttempt = 0;
@@ -952,6 +965,15 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         this.recallHandler = handler;
     }
     async sendMessage(channelId, text, context) {
+        // [DIAG-STALE] 进入 sendMessage 时记录 evolclaw connected 标志和 SDK _state，
+        // 用于检测两者是否一致：若 connected=true 但 sdk_state != 'connected'，即为 stale 状态
+        const sdkStateOnEntry = this.client?._state ?? 'no-client';
+        if (this.connected !== (sdkStateOnEntry === 'connected')) {
+            logger.warn(`[AUN][DIAG-STALE] sendMessage entry MISMATCH: connected=${this.connected} sdk_state=${sdkStateOnEntry} channel=${channelId} text=${text.slice(0, 40)}`);
+        }
+        else {
+            logger.debug(`[AUN][DIAG-STALE] sendMessage entry: connected=${this.connected} sdk_state=${sdkStateOnEntry} channel=${channelId}`);
+        }
         if (!this.connected || !this.client) {
             logger.warn(`${this.logPrefix()} Cannot send: not connected`);
             return;

package/dist/channels/qqbot.js

@@ -1,5 +1,5 @@
 import { logger } from '../utils/logger.js';
-import { markdownToPlainText } from '../utils/format.js';
+import { markdownToPlainText } from '../utils/rich-content-renderer.js';
 import { requireOptional } from '../utils/init-channel.js';
 import { normalizeChannelInstances, getChannelShowActivities } from '../config.js';
 // ── QQBotChannel ────────────────────────────────────────────────────────────

package/dist/channels/wechat.js

@@ -4,7 +4,7 @@ import path from 'path';
 import { resolvePaths } from '../paths.js';
 import { logger } from '../utils/logger.js';
 import { sanitizeFileName, saveToUploads, safeFetch } from '../utils/media-cache.js';
-import { markdownToPlainText } from '../utils/format.js';
+import { markdownToPlainText } from '../utils/rich-content-renderer.js';
 const CHANNEL_VERSION = '1.0.0';
 const ILINK_APP_ID = 'bot';
 // iLink-App-ClientVersion: major<<16 | minor<<8 | patch (uint32)