evolclaw 3.1.11 → 3.3.0

package/dist/config-store.js

@@ -21,6 +21,15 @@ import { checkAgentDir, isValidAid } from './aun/aid/validation.js';
 import { isValidChannelName } from './core/channel-loader.js';
 import { CONFIG_SCHEMA_VERSION } from './types.js';
 import { logger } from './utils/logger.js';
+/** 读 {root}/evolclaw.json。文件不存在返回 {}，不报错。 */
+export function loadEvolclawConfig() {
+    const raw = atomicReadJson(resolvePaths().evolclawJson);
+    return raw ?? {};
+}
+/** 原子写入 {root}/evolclaw.json。调用方负责传完整对象（含要保留的字段）。 */
+export function saveEvolclawConfig(value) {
+    atomicWriteJson(resolvePaths().evolclawJson, value);
+}
 const SUPPORTED_CHANNEL_TYPES = new Set([
     'aun', 'feishu', 'wechat', 'dingtalk', 'qqbot', 'wecom',
 ]);
@@ -122,14 +131,41 @@ export function saveDefaultsSafe(patch) {
         : { $schema_version: CONFIG_SCHEMA_VERSION, ...patch };
     atomicWriteJson(p, merged);
 }
-export function loadProcessConfig() {
-    const raw = atomicReadJson(resolvePaths().processConfig);
+// ── 进程配置迁移（旧 {root}/config.json ProcessConfig → evolclaw.json）──────
+//
+// ProcessConfig 类型 + loadProcessConfig/saveProcessConfig 已废弃并删除：
+// 唯一有效字段 aun.encryptionSeed 已迁入 evolclaw.json（见 migrateProcessConfigIfNeeded），
+// 读取源切到 loadEvolclawConfig（store.ts）。log / aun.gateway / aun.keystorePath 是死字段。
+/**
+ * 一次性迁移：{root}/config.json（旧 ProcessConfig）→ {root}/evolclaw.json。
+ * - 仅搬运 aun.encryptionSeed（逐字节原样，含 null）；log / aun.gateway / aun.keystorePath 是死字段，丢弃。
+ * - 合并写入（不覆盖 evolclaw.json 已有字段如 aid）。
+ * - 完成后归档 config.json → config.json.migrated（保留备份，不直接删）。
+ *
+ * ⚠️ encryptionSeed 是 AID 私钥的加密种子，迁移前后 getAidStore 拿到的 seed 必须逐字节一致，
+ * 否则所有已注册 AID 私钥解不开。这里只搬运不改值（含 null）。
+ */
+export function migrateProcessConfigIfNeeded() {
+    const p = resolvePaths();
+    const oldPath = p.processConfig; // {root}/config.json
+    const raw = atomicReadJson(oldPath);
     if (raw === null)
-        return {};
-    return expandEnvRefs(raw);
-}
-export function saveProcessConfig(value) {
-    atomicWriteJson(resolvePaths().processConfig, value);
+        return; // 不存在 → no-op
+    const evc = loadEvolclawConfig();
+    // 仅当旧文件确实带 aun.encryptionSeed 字段时才搬（hasOwnProperty，保 null 语义）
+    const didMigrateSeed = !!(raw.aun && Object.prototype.hasOwnProperty.call(raw.aun, 'encryptionSeed'));
+    if (didMigrateSeed) {
+        evc.aun = { ...(evc.aun ?? {}), encryptionSeed: raw.aun.encryptionSeed };
+    }
+    evc.$schema_version = evc.$schema_version ?? 1;
+    saveEvolclawConfig(evc);
+    // 归档旧文件（不删，留备份）
+    try {
+        fs.renameSync(oldPath, oldPath + '.migrated');
+    }
+    catch { /* ignore */ }
+    const what = didMigrateSeed ? 'aun.encryptionSeed 已搬运' : 'aun.encryptionSeed 不存在（无需搬运）';
+    logger.info(`[migrate] config.json → evolclaw.json (${what}，config.json 已归档为 .migrated)`);
 }
 // ── 自动迁移 ───────────────────────────────────────────────────────────
 /**
@@ -492,6 +528,8 @@ export function mergeForAgent(agent, defaults) {
         debounce: agent.debounce ?? d.debounce,
         debug: deepMergeBlocks(d.debug, agent.debug),
         enable_rich_content: agent.enable_rich_content ?? d.enable_rich_content,
+        dispatch: agent.dispatch,
+        observable: agent.observable,
     };
     return merged;
 }
@@ -570,10 +608,9 @@ export function migrateIdentitiesIfNeeded() {
 }
 // ── Project Migration ────────────────────────────────────────────────────────
 import os from 'os';
-/** 将绝对路径编码为 Claude Code 的目录名格式（/ \ . 替换为 -） */
-function encodePath(p) {
-    return p.replace(/[/\\\.]/g, '-');
-}
+// 复用与 Claude SDK 对齐的统一编码（resolve→realpath→NFC→非字母数字替换为 -），
+// 避免本地实现规则不一致导致中文/非 ASCII 路径迁移时找不到 SDK 会话目录。
+import { encodePath } from './utils/cross-platform.js';
 /** 查找最新的 ~/.codex/state_*.sqlite */
 function findCodexDb() {
     const codexHome = path.join(os.homedir(), '.codex');

package/dist/core/channel-loader.js

@@ -6,11 +6,21 @@
  * The main service (index.ts) handles registration and message flow wiring.
  */
 import { logger } from '../utils/logger.js';
-/**
- * Channel Loader
- *
- * Manages channel plugin registration and lifecycle.
- */
+/** Resolve showActivities for a single instance (instance overrides default). */
+export function resolveShowActivities(inst) {
+    return inst.showActivities ?? 'all';
+}
+/** Standard showMiddleResult / showIdleMonitor policy function. */
+export function showActivitiesPolicy(mode, chatType, identity) {
+    if (mode === 'none')
+        return false;
+    if (mode === 'dm-only')
+        return chatType === 'private';
+    if (mode === 'owner-dm-only')
+        return chatType === 'private' && identity === 'owner';
+    return true;
+}
+// ── ChannelLoader ──────────────────────────────────────────────────────────
 export class ChannelLoader {
     plugins = new Map();
     register(plugin) {
@@ -20,81 +30,70 @@ export class ChannelLoader {
         this.plugins.set(plugin.name, plugin);
         logger.debug(`Registered channel plugin: ${plugin.name}`);
     }
+    /** Look up a registered plugin by channel type (used by reload hooks). */
+    getPlugin(type) {
+        return this.plugins.get(type);
+    }
     /**
-     * 新结构入口：从 EvolAgent 的 channels[] 列表创建 channel 实例。
-     *
-     * 内部把 ChannelInstance[] 翻成各 plugin 期望的 dict 形态（`{ type: [instances...] }`），
-     * 然后调用现有 plugin.createChannels / createChannel。
-     *
-     * 当所有 channel plugin 重写为直接吃 ChannelInstance[] 后，本方法可简化。
+     * Create all runtime channels for an agent directly from its config.channels[].
+     * AUN is always created implicitly from agent.aid (no explicit entry required).
      */
     async createForAgent(agent) {
-        const rewrittenChannels = {};
-        // AUN channel 从 agent.aid 隐式创建——不需要在 channels[] 里显式声明
+        const ctx = {
+            agentName: agent.aid,
+            defaultProjectPath: agent.config.projects?.defaultPath ?? process.cwd(),
+            enableRichContent: agent.config.enable_rich_content,
+            debug: agent.config.debug,
+        };
+        // Build the full list of config instances to create.
+        // AUN is synthesised from agent.aid; any explicit aun entry in channels[] is skipped.
         const aunEffName = agent.effectiveChannelName('aun', 'main');
-        rewrittenChannels['aun'] = [{
-                type: 'aun',
-                name: aunEffName,
-                aid: agent.aid,
-                enabled: true,
-                agentName: agent.aid,
-                // agent 顶层 owners[0] 透传给 AUN channel.owner（用于首次连接发欢迎消息）
-                owner: agent.config.owners?.[0],
-            }];
-        // 其它 channels（非 AUN）从 config.channels[] 取
+        const aunInst = {
+            type: 'aun',
+            name: aunEffName,
+            aid: agent.aid,
+            enabled: true,
+            owner: agent.config.owners?.[0],
+        };
+        const configInsts = [aunInst];
         for (const inst of agent.config.channels) {
             if (inst.type === 'aun')
-                continue; // 跳过显式声明的 AUN（已隐式处理）
+                continue;
             const effName = agent.effectiveChannelName(inst.type, inst.name);
-            const rewritten = { ...inst, name: effName, agentName: agent.aid };
-            (rewrittenChannels[inst.type] ??= []).push(rewritten);
+            configInsts.push({ ...inst, name: effName });
         }
-        // syntheticConfig 是老 Config schema（channel plugin 沿用旧接口），
-        // 新 schema 字段命名为 snake_case，这里转 camelCase 透传。
-        const syntheticConfig = {
-            agents: agent.config.baseagents,
-            channels: rewrittenChannels,
-            projects: agent.config.projects,
-            chatmode: agent.config.chatmode,
-            debug: agent.config.debug,
-            showActivities: agent.config.show_activities,
-            flushDelay: agent.config.flush_delay,
-            debounce: agent.config.debounce,
-            enableRichContent: agent.config.enable_rich_content,
-        };
-        return this.createAll(syntheticConfig);
+        return this._buildInstances(configInsts, ctx);
     }
-    async createAll(config) {
-        const instances = [];
-        for (const [name, plugin] of this.plugins) {
-            if (!plugin.isEnabled(config)) {
-                logger.info(`Channel '${name}' is disabled, skipping`);
+    /** Build runtime instances for a list of config instances + context. */
+    async _buildInstances(configInsts, ctx) {
+        const result = [];
+        for (const inst of configInsts) {
+            const plugin = this.plugins.get(inst.type);
+            if (!plugin) {
+                logger.debug(`No plugin for channel type '${inst.type}', skipping`);
                 continue;
             }
             try {
-                if (plugin.createChannels) {
-                    const channelInstances = await plugin.createChannels(config);
-                    instances.push(...channelInstances);
-                    logger.info(`✓ Channel '${name}' created ${channelInstances.length} instance(s)`);
+                const runtime = await plugin.createInstance(inst, ctx);
+                if (runtime) {
+                    result.push(runtime);
+                    logger.info(`✓ Channel '${inst.name}' (${inst.type}) created`);
                 }
                 else {
-                    const instance = await plugin.createChannel(config);
-                    instances.push(instance);
-                    logger.info(`✓ Channel '${name}' instance created`);
+                    logger.info(`Channel '${inst.name}' (${inst.type}) disabled or invalid credentials, skipping`);
                 }
             }
-            catch (error) {
-                logger.error(`✗ Failed to create channel '${name}':`, error);
+            catch (err) {
+                logger.error(`✗ Failed to create channel '${inst.name}' (${inst.type}):`, err);
             }
         }
-        return instances;
+        return result;
     }
     async connectAll(instances, { concurrency = 3, intervalMs = 50 } = {}) {
         const connected = [];
         const failed = [];
         const inflight = new Set();
         for (const inst of instances) {
-            // 等待并发数降到 concurrency 以下
             while (inflight.size >= concurrency) {
                 await Promise.race(inflight);
             }
@@ -110,12 +109,10 @@ export class ChannelLoader {
             })();
             const tracked = task.then(() => { inflight.delete(tracked); });
             inflight.add(tracked);
-            // 间隔发起，避免瞬间并发冲击网关
             if (intervalMs > 0) {
                 await new Promise(r => setTimeout(r, intervalMs));
             }
         }
-        // 等待所有剩余任务完成
         await Promise.allSettled(inflight);
         if (failed.length > 0) {
             logger.warn(`[connectAll] ${failed.length} channel(s) failed initial connect (will retry in background): ${failed.map(f => f.name).join(', ')}`);
@@ -123,7 +120,7 @@ export class ChannelLoader {
         return connected;
     }
     async disconnectAll(instances) {
-        await Promise.allSettled(instances.map((inst) => inst.disconnect()));
+        await Promise.allSettled(instances.map(inst => inst.disconnect()));
     }
 }
 const SEP = '#';
@@ -197,34 +194,39 @@ export function buildReloadHooks(deps) {
             }
         },
         async startChannel(agent, channelName) {
-            const channels = agent.config.channels;
-            let channelType = null;
-            for (const [type, raw] of Object.entries(channels)) {
-                const instances = Array.isArray(raw) ? raw : [raw];
-                for (const inst of instances) {
-                    const name = inst.name ?? type;
-                    if (name === channelName) {
-                        channelType = type;
-                        break;
-                    }
-                }
-                if (channelType)
-                    break;
-            }
-            if (!channelType) {
-                const msg = `[Reload] Channel ${channelName} not found in agent ${agent.name} config`;
+            // The implicit AUN channel is synthesised from agent.aid (not in config.channels[]).
+            // Reconstruct it the same way createForAgent does before falling back to config scan.
+            const aid = agent.aid ?? agent.config?.aid;
+            const aunEffName = agent.effectiveChannelName?.('aun', 'main') ?? 'aun-main';
+            const isImplicitAun = channelName === aunEffName;
+            // Find config instance: implicit AUN gets a synthetic entry; others scan channels[].
+            const cfgInst = isImplicitAun
+                ? { type: 'aun', name: aunEffName, aid, enabled: true, owner: agent.config?.owners?.[0] }
+                : (() => {
+                    const agentChannels = agent.config?.channels ?? [];
+                    return agentChannels.find((i) => {
+                        const effName = agent.effectiveChannelName?.(i.type, i.name) ?? i.name;
+                        return effName === channelName;
+                    }) ?? null;
+                })();
+            if (!cfgInst) {
+                const msg = `[Reload] Channel ${channelName} not found in agent config`;
                 logger.error(msg);
                 throw new Error(msg);
             }
-            const partialConfig = {
-                agents: agent.config.agents,
-                channels: { [channelType]: channels[channelType] },
-                projects: agent.config.projects,
+            const ctx = {
+                agentName: agent.aid ?? agent.config?.aid,
+                defaultProjectPath: agent.config?.projects?.defaultPath ?? process.cwd(),
+                enableRichContent: agent.config?.enable_rich_content,
+                debug: agent.config?.debug,
             };
-            const newInstances = await channelLoader.createAll(partialConfig);
-            const newInst = newInstances.find(i => i.adapter.channelName === channelName);
+            const plugin = channelLoader.getPlugin(cfgInst.type);
+            if (!plugin)
+                throw new Error(`[Reload] No plugin for channel type '${cfgInst.type}'`);
+            const effInst = { ...cfgInst, name: channelName };
+            const newInst = await plugin.createInstance(effInst, ctx);
             if (!newInst)
-                throw new Error(`[Reload] Failed to create instance ${channelName}`);
+                throw new Error(`[Reload] createInstance returned null for ${channelName}`);
             registerChannelInstance(newInst);
             await newInst.connect();
             channelInstances.push(newInst);