evolclaw 2.7.3 → 2.8.1

package/dist/core/message/message-processor.js

@@ -316,11 +316,17 @@ export class MessageProcessor {
             });
             const imageInfo = message.images && message.images.length > 0 ? ` [${message.images.length} image(s)]` : '';
             const modeInfo = isBackground ? ' [\u540e\u53f0]' : '';
-            logger.info(`[${message.channel}] ${message.channelId}: ${message.content}${imageInfo}${modeInfo}`);
-            logger.info(`[MessageProcessor] session=${session.id} task=${taskId} chatType=${session.chatType} sessionMode=${session.sessionMode} agentId=${session.agentId} msgChatType=${message.chatType ?? 'n/a'}`);
+            const e2eeInfo = message.replyContext?.metadata?.encrypted != null ? ` encrypt=${message.replyContext.metadata.encrypted}` : '';
+            logger.info(`[${message.channel}] ${message.channelId}: ${message.content}${imageInfo}${modeInfo}${e2eeInfo}`);
+            // 构建 peer 标识（优先 peerName，退化到 peerId / channelId）
+            const peerName = session.metadata?.peerName ?? message.peerName;
+            const peerId = session.metadata?.peerId ?? message.peerId ?? message.channelId;
+            const peerShort = peerId ? peerId.split('.')[0].split(':')[0] : '?';
+            const peerLabel = peerName && peerName !== peerShort ? `${peerShort}(${peerName})` : peerShort;
+            logger.info(`[MessageProcessor] session=${session.id} task=${taskId} peer=${peerLabel} chatType=${session.chatType} sessionMode=${session.sessionMode} agentId=${session.agentId} msgChatType=${message.chatType ?? 'n/a'}`);
             // 记录开始处理
             this.eventBus.publish({ type: 'message:processing', sessionId: session.id });
-            adapter.sendProcessingStatus?.(message.channelId, 'start', session.id, taskId, this.getReplyContext(message));
+            adapter.sendProcessingStatus?.(message.channelId, 'start', session.id, taskId, taskReplyContext());
             logger.message({
                 msgId: messageId,
                 sessionId: session.id,
@@ -363,7 +369,7 @@ export class MessageProcessor {
             // Proactive 模式可观测：创建 ThoughtEmitter，将静默的流式事件转发为 thought
             // selector: context = { type: 'task', id: taskId }
             if (isProactive && adapter.putThought) {
-                thoughtEmitter = new ThoughtEmitter(adapter, message.channelId, taskId, chatmode);
+                thoughtEmitter = new ThoughtEmitter(adapter, message.channelId, taskId, chatmode, this.getReplyContext(message));
             }
             // 调用 AgentRunner（含上下文过长自动 compact 重试）
             // 捕获当前消息的上下文（闭包），避免后续消息处理时串台
@@ -389,7 +395,10 @@ export class MessageProcessor {
             // 设置 per-session 权限模式（默认 bypass，所有角色统一）
             agent.setMode(session.metadata?.permissionMode ?? DEFAULT_PERMISSION_MODE);
             // 标记会话为处理中（实时持久化，重启后可恢复）
-            this.sessionManager.markProcessing(session.id);
+            this.sessionManager.markProcessing(session.id, taskId);
+            if (message.replyContext?.metadata?.encrypted != null) {
+                this.sessionManager.setSessionEncrypt(session.id, !!(message.replyContext.metadata.encrypted));
+            }
             logger.info(`[MessageProcessor] session ${session.id} marked as processing task=${taskId}`);
             // 检查是否因新消息自动中断 — 包装 prompt 让 Agent 知道上下文
             const prevInterruptReason = this.interruptedSessions.get(session.id);
@@ -527,8 +536,13 @@ export class MessageProcessor {
                 for (const match of fileMatches) {
                     // 兼容旧格式 (1组) 和新格式 (2组)
                     const hasChannelGroup = match.length >= 3;
-                    const targetSpec = hasChannelGroup ? (match[1] ?? undefined) : undefined;
-                    const filePath = (hasChannelGroup ? match[2] : match[1]).trim();
+                    let targetSpec = hasChannelGroup ? (match[1] ?? undefined) : undefined;
+                    let filePath = (hasChannelGroup ? match[2] : match[1]).trim();
+                    // 白名单校验：targetSpec 必须是已注册通道，否则视为路径的一部分（如 Windows 盘符 C:）
+                    if (targetSpec && !this.channels.has(targetSpec) && !this.channelTypeMap.has(targetSpec)) {
+                        filePath = `${targetSpec}:${filePath}`;
+                        targetSpec = undefined;
+                    }
                     if (this.isPlaceholderPath(filePath)) {
                         logger.info(`[${adapter.channelName}] Skipped placeholder file marker: [SEND_FILE:${filePath}]`);
                         continue;
@@ -635,7 +649,7 @@ export class MessageProcessor {
                 const errorSummary = streamResult.errors?.join('; ') || '任务执行失败';
                 const rawSubtype = streamResult.subtype || 'agent_error';
                 const errorType = prefixErrorType(ERROR_PREFIX.AGENT, rawSubtype);
-                adapter.sendProcessingStatus?.(message.channelId, 'error', session.id, taskId, this.getReplyContext(message));
+                adapter.sendProcessingStatus?.(message.channelId, 'error', session.id, taskId, taskReplyContext());
                 this.eventBus.publish({
                     type: 'message:error',
                     sessionId: session.id,
@@ -663,7 +677,7 @@ export class MessageProcessor {
             }
             else {
                 // 真正的成功
-                adapter.sendProcessingStatus?.(message.channelId, interruptReason ? 'interrupted' : 'done', session.id, taskId, this.getReplyContext(message));
+                adapter.sendProcessingStatus?.(message.channelId, interruptReason ? 'interrupted' : 'done', session.id, taskId, taskReplyContext());
                 await this.sessionManager.recordSuccess(session.id);
                 this.eventBus.publish({
                     type: 'message:completed',
@@ -718,7 +732,7 @@ export class MessageProcessor {
             // 用户主动中断（新消息打断 或 /stop 命令）时静默，不发送中断/错误提示
             if (!isUserInterrupt) {
                 try {
-                    adapter.sendProcessingStatus?.(message.channelId, procStatus, session.id, taskId, this.getReplyContext(message));
+                    adapter.sendProcessingStatus?.(message.channelId, procStatus, session.id, taskId, taskReplyContext());
                 }
                 catch { }
             }

package/dist/core/message/thought-emitter.js

@@ -14,8 +14,9 @@ export class ThoughtEmitter {
     channelId;
     taskId;
     chatmode;
+    replyContext;
     hasEmittedText = false;
-    constructor(adapter, channelId, taskId, chatmode = 'proactive') {
+    constructor(adapter, channelId, taskId, chatmode = 'proactive', replyContext) {
         if (!taskId) {
             throw new Error('[ThoughtEmitter] taskId is required at construction');
         }
@@ -23,6 +24,7 @@ export class ThoughtEmitter {
         this.channelId = channelId;
         this.taskId = taskId;
         this.chatmode = chatmode;
+        this.replyContext = replyContext;
         logger.info(`[ThoughtEmitter] created channel=${channelId} task=${taskId} chatmode=${chatmode}`);
     }
     async emit(event) {
@@ -45,7 +47,7 @@ export class ThoughtEmitter {
         payload.task_id = this.taskId;
         payload.chatmode = this.chatmode;
         try {
-            await this.adapter.putThought(this.channelId, this.taskId, payload);
+            await this.adapter.putThought(this.channelId, this.taskId, payload, this.replyContext);
         }
         catch (err) {
             logger.debug(`[ThoughtEmitter] putThought failed: ${err.message}`);

package/dist/core/session/session-manager.js

@@ -13,6 +13,7 @@ export class SessionManager {
     adminResolver;
     sessionModeResolver;
     fileAdapters = new Map();
+    sessionEncryptState = new Map();
     constructor(dbPath = resolvePaths().db, eventBus, ownerResolver, adminResolver) {
         ensureDir(path.dirname(dbPath));
         this.db = new DatabaseSync(dbPath);
@@ -428,11 +429,21 @@ export class SessionManager {
     }
     /**
      * 标记会话为处理中（实时写 DB，crash 也能恢复）
+     * processing_state 格式: "timestamp:taskId"
      */
-    markProcessing(sessionId) {
+    markProcessing(sessionId, taskId) {
         const now = Date.now();
+        const state = taskId ? `${now}:${taskId}` : String(now);
         this.db.prepare(`UPDATE sessions SET processing_state = ?, updated_at = ? WHERE id = ?`)
-            .run(String(now), now, sessionId);
+            .run(state, now, sessionId);
+    }
+    /** 从 processing_state 解析当前活跃 taskId */
+    getActiveTaskId(sessionId) {
+        const row = this.db.prepare(`SELECT processing_state FROM sessions WHERE id = ?`).get(sessionId);
+        if (!row?.processing_state)
+            return undefined;
+        const colonIdx = row.processing_state.indexOf(':');
+        return colonIdx > 0 ? row.processing_state.slice(colonIdx + 1) : undefined;
     }
     /**
      * 清除会话处理中状态
@@ -440,6 +451,13 @@ export class SessionManager {
     clearProcessing(sessionId) {
         this.db.prepare(`UPDATE sessions SET processing_state = NULL, updated_at = ? WHERE id = ?`)
             .run(Date.now(), sessionId);
+        this.sessionEncryptState.delete(sessionId);
+    }
+    setSessionEncrypt(sessionId, encrypted) {
+        this.sessionEncryptState.set(sessionId, encrypted);
+    }
+    getSessionEncrypt(sessionId) {
+        return this.sessionEncryptState.get(sessionId);
     }
     /**
      * 获取所有处于 processing 状态的会话（用于重启后恢复）
@@ -453,7 +471,8 @@ export class SessionManager {
         const now = Date.now();
         const result = [];
         for (const row of rows) {
-            const ts = parseInt(row.processing_state, 10);
+            const colonIdx = row.processing_state.indexOf(':');
+            const ts = parseInt(colonIdx > 0 ? row.processing_state.slice(0, colonIdx) : row.processing_state, 10);
             if (!isNaN(ts) && (now - ts) < maxAgeMs) {
                 result.push(this.rowToSession(row));
             }

package/dist/index.js

@@ -289,6 +289,14 @@ async function main() {
                     });
                 });
             }
+            // proactive 模式入站白名单：注入 sessionMode 查询器
+            if (typeof inst.channel.setSessionModeResolver === 'function') {
+                const chName = inst.adapter.channelName;
+                inst.channel.setSessionModeResolver(async (channelId) => {
+                    const session = await sessionManager.getActiveSession(chName, channelId);
+                    return session?.sessionMode;
+                });
+            }
         }
         if (channelType === 'dingtalk') {
             msgBridge.register(inst.adapter.channelName, (handler) => inst.channel.onMessage(async (event) => {
@@ -340,18 +348,6 @@ async function main() {
     for (const inst of channelInstances) {
         registerChannelInstance(inst);
     }
-    // ── 设置热加载回调 ──
-    cmdHandler.setHotLoadChannel(async (inst) => {
-        registerChannelInstance(inst);
-        channelInstances.push(inst);
-        await inst.connect();
-        eventBus.publish({
-            type: 'channel:connected',
-            channel: (inst.channelType || inst.adapter.channelName).toLowerCase(),
-            channelName: inst.adapter.channelName,
-            timestamp: Date.now(),
-        });
-    });
     // ── 连接所有渠道 ──
     const connected = await channelLoader.connectAll(channelInstances);
     // 预填充 Feishu 已知 thread_id（重启后避免误判话题创建）

package/dist/paths.js

@@ -32,6 +32,7 @@ export function resolvePaths() {
         pid: path.join(root, 'logs', 'evolclaw.pid'),
         dataDir: path.join(root, 'data'),
         logs: path.join(root, 'logs'),
+        agentsDir: path.join(root, 'agents'),
         lineStats: path.join(root, 'logs', 'line-stats.log'),
         readySignal: path.join(root, 'logs', 'ready.signal'),
         selfHealLog: path.join(root, 'logs', 'self-heal.md'),
@@ -49,6 +50,7 @@ export function ensureDataDirs() {
     const p = resolvePaths();
     fs.mkdirSync(p.dataDir, { recursive: true });
     fs.mkdirSync(p.logs, { recursive: true });
+    fs.mkdirSync(p.agentsDir, { recursive: true });
 }
 export function getPackageRoot() {
     // import.meta.dirname is available in Node.js 21.2+ and always returns

package/dist/templates/prompts.md

@@ -22,6 +22,7 @@
 调用 Bash 工具执行命令 ：evolclaw ctl send "<消息内容>"
 发送文件： evolclaw ctl file <路径>
 可多次调用发送多条消息 ，如果不想回复停止调用即可。
+禁止使用 AskUserQuestion 和 ExitPlanMode 工具——proactive 模式下应由你主动用 ctl send 与用户沟通。
 
 
 ---

package/dist/utils/init-channel.js

@@ -10,13 +10,13 @@ import readline from 'readline';
 import path from 'path';
 import os from 'os';
 import crypto from 'crypto';
-import { fileURLToPath } from 'url';
-import { execFile, execFileSync } from 'child_process';
+import { execFile } from 'child_process';
 import { promisify } from 'util';
 import { resolvePaths } from '../paths.js';
 import { normalizeChannelInstances } from '../config.js';
 import { selectInstance } from './init.js';
 import { isWindows } from './cross-platform.js';
+import { AUN_CORE_SDK_PKG, MIN_AUN_CORE_SDK, resolveAunCoreSdkPkg, isAunSdkVersionOk, isValidAid, aidCreate, agentmdPut, buildInitialAgentMd, } from '../channels/aun-ops.js';
 const execFileAsync = promisify(execFile);
 export async function npmInstallGlobal(pkg) {
     const npmCmd = isWindows ? 'npm.cmd' : 'npm';
@@ -580,91 +580,9 @@ export async function cmdInitWechat() {
     process.exit(1);
 }
 // ==================== AUN ====================
-// 最低 @agentunion/fastaun 版本要求
-const MIN_AUN_CORE_SDK = [0, 2, 14];
-const AUN_CORE_SDK_PKG = '@agentunion/fastaun';
-function compareVersion(a, min) {
-    const parts = a.split('.').map(n => parseInt(n, 10));
-    if (parts.length < 3 || parts.some(isNaN))
-        return false;
-    if (parts[0] !== min[0])
-        return parts[0] > min[0];
-    if (parts[1] !== min[1])
-        return parts[1] > min[1];
-    return parts[2] >= min[2];
-}
-export function resolveAunCoreSdkPkg() {
-    const pkgName = AUN_CORE_SDK_PKG;
-    // Strategy 1: walk up node_modules from this file (no require.resolve — avoids ESM exports issues)
-    try {
-        let dir = path.dirname(fileURLToPath(import.meta.url));
-        while (true) {
-            const candidate = path.join(dir, 'node_modules', pkgName, 'package.json');
-            if (fs.existsSync(candidate)) {
-                const data = JSON.parse(fs.readFileSync(candidate, 'utf-8'));
-                if (data.name === pkgName)
-                    return { version: data.version, path: candidate };
-            }
-            const parent = path.dirname(dir);
-            if (parent === dir)
-                break;
-            dir = parent;
-        }
-    }
-    catch { /* fall through */ }
-    // Strategy 2: npm root -g fallback (globally installed SDK)
-    try {
-        const npmCmd = isWindows ? 'npm.cmd' : 'npm';
-        const globalRoot = execFileSync(npmCmd, ['root', '-g'], {
-            encoding: 'utf-8', timeout: 10000, shell: isWindows,
-        }).trim();
-        const pkgPath = path.join(globalRoot, pkgName, 'package.json');
-        if (fs.existsSync(pkgPath)) {
-            const data = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-            return { version: data.version, path: pkgPath };
-        }
-    }
-    catch { /* not found */ }
-    return null;
-}
-/**
- * Download AUN CA root certificate to ~/.aun/CA/root/root.crt.
- * Idempotent: skips if file already exists. Returns true if a cert is on disk
- * after the call (either pre-existing or freshly downloaded).
- *
- * Must be called BEFORE constructing any AUNClient that needs to verify
- * gateway-issued certificates (e.g. for uploadAgentMd) — the SDK loads trusted
- * roots from disk at client construction time and won't pick up later writes.
- */
-export async function downloadCaRoot(aunPath, gatewayUrl, indent = '') {
-    const caDir = path.join(aunPath, 'CA', 'root');
-    const caCertPath = path.join(caDir, 'root.crt');
-    if (fs.existsSync(caCertPath))
-        return true;
-    if (!gatewayUrl)
-        return false;
-    try {
-        fs.mkdirSync(caDir, { recursive: true });
-        const gwHttp = gatewayUrl.replace(/^wss?:/, 'https:').replace(/\/aun$/, '');
-        const resp = await fetch(`${gwHttp}/pki/chain`, { redirect: 'follow' });
-        if (!resp.ok) {
-            console.warn(`${indent}⚠ CA 根证书下载失败: HTTP ${resp.status}`);
-            return false;
-        }
-        const body = await resp.text();
-        if (!body.includes('BEGIN CERTIFICATE')) {
-            console.warn(`${indent}⚠ CA 根证书响应内容无效，跳过写入`);
-            return false;
-        }
-        fs.writeFileSync(caCertPath, body);
-        console.log(`${indent}✓ CA 根证书已下载`);
-        return true;
-    }
-    catch (e) {
-        console.warn(`${indent}⚠ CA 根证书下载失败: ${e}，可稍后手动下载`);
-        return false;
-    }
-}
+//
+// AUN 原子操作（aidCreate, agentmdPut, downloadCaRoot, isValidAid, ...）
+// 已迁移至 src/channels/aun-ops.ts。本节仅保留交互式 UI 编排。
 export async function checkAunEnvironment(rl) {
     console.log('\n🔍 AUN 环境检查...\n');
     const minVer = MIN_AUN_CORE_SDK.join('.');
@@ -688,7 +606,7 @@ export async function checkAunEnvironment(rl) {
         console.log('');
         return true;
     }
-    if (compareVersion(installed.version, MIN_AUN_CORE_SDK)) {
+    if (isAunSdkVersionOk(installed.version)) {
         console.log(`  ✓ ${AUN_CORE_SDK_PKG} v${installed.version}`);
         console.log('');
         return true;
@@ -711,95 +629,8 @@ export async function checkAunEnvironment(rl) {
     console.log('');
     return true;
 }
-export function isValidAid(name) {
-    const labels = name.split('.');
-    return labels.length >= 3 && labels.every(l => /^[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?$/.test(l));
-}
-/**
- * Non-interactive AID creation + agent.md publish.
- * Reuses the same logic as `evolclaw init --non-interactive --channel aun`.
- *
- * Returns the created AID string, or throws on failure.
- */
-export async function createAidSilent(opts) {
-    const aunPath = path.join(os.homedir(), '.aun');
-    const aidDir = path.join(aunPath, 'AIDs', opts.aid);
-    // Skip creation if AID already exists locally
-    if (fs.existsSync(aidDir) && fs.existsSync(path.join(aidDir, 'private'))) {
-        return { aid: opts.aid, alreadyExisted: true };
-    }
-    const { AUNClient, GatewayDiscovery } = await import('@agentunion/fastaun');
-    let client = new AUNClient({ aun_path: aunPath });
-    const result = await client.auth.createAid({ aid: opts.aid });
-    // Download CA root cert (if not already present)
-    const caDownloaded = await downloadCaRoot(aunPath, result.gateway || '');
-    // Rebuild client with CA cert + AID identity for uploadAgentMd
-    const caCertPath = path.join(aunPath, 'CA', 'root', 'root.crt');
-    if (caDownloaded && fs.existsSync(caCertPath)) {
-        try {
-            await client.close();
-        }
-        catch { /* ignore */ }
-        client = new AUNClient({ aun_path: aunPath, root_ca_path: caCertPath, aid: opts.aid });
-    }
-    // Set gateway URL for uploadAgentMd
-    let gatewayUrl = result.gateway || '';
-    if (!gatewayUrl) {
-        try {
-            const discovery = new GatewayDiscovery({});
-            gatewayUrl = await discovery.discover(`https://${opts.aid}/.well-known/aun-gateway`);
-        }
-        catch { /* fall through */ }
-    }
-    if (gatewayUrl) {
-        client._gatewayUrl = gatewayUrl;
-    }
-    // Write initial agent.md (initialized: false, name = aid first label)
-    const agentName = opts.aid.split('.')[0];
-    const agentMdContent = `---\naid: "${opts.aid}"\nname: "${agentName}"\ntype: "ai"\nversion: "1.0.0"\ndescription: ""\ntags:\n  - evolclaw\ninitialized: false\n---\n`;
-    const agentMdPath = path.join(aidDir, 'agent.md');
-    try {
-        await client.auth.uploadAgentMd(agentMdContent);
-    }
-    catch (e) {
-        // Non-fatal: first connection will auto-retry
-    }
-    fs.writeFileSync(agentMdPath, agentMdContent, 'utf-8');
-    try {
-        await client.close();
-    }
-    catch { /* ignore */ }
-    if (!fs.existsSync(agentMdPath)) {
-        throw new Error(`agent.md write verification failed: ${agentMdPath}`);
-    }
-    return { aid: opts.aid, alreadyExisted: false };
-}
-/**
- * Append a new AUN instance to the config's channels.aun array and save.
- * Handles upgrade from single-object to array format.
- */
-export function appendAunInstance(config, inst) {
-    if (!config.channels)
-        config.channels = {};
-    const newInst = {
-        name: inst.name,
-        enabled: inst.enabled ?? true,
-        aid: inst.aid,
-        ...(inst.owner && { owner: inst.owner }),
-    };
-    if (Array.isArray(config.channels.aun)) {
-        config.channels.aun.push(newInst);
-    }
-    else if (config.channels.aun) {
-        const oldInst = { ...config.channels.aun, name: config.channels.aun.name || 'aun' };
-        config.channels.aun = [oldInst, newInst];
-    }
-    else {
-        config.channels.aun = [newInst];
-    }
-    const p = resolvePaths();
-    fs.writeFileSync(p.config, JSON.stringify(config, null, 2) + '\n');
-}
+// isValidAid, createAidSilent → 已迁移至 src/channels/aun-ops.ts
+// appendAunInstance → 已迁移至 src/channels/aun-ops.ts
 export async function setupAunAid(rl, _config) {
     let aid = '';
     // Outer loop: allows retrying with a different AID
@@ -829,64 +660,35 @@ export async function setupAunAid(rl, _config) {
             console.log('  已跳过 AID 创建（启动时可能连接失败）');
             break;
         }
-        // Create AID using TS SDK directly
+        // Create AID + agent.md via atomic ops
         console.log('  正在创建 AID...');
         let failed = false;
         try {
-            const { AUNClient, GatewayDiscovery } = await import('@agentunion/fastaun');
-            let client = new AUNClient({ aun_path: aunPath });
-            const result = await client.auth.createAid({ aid });
+            const result = await aidCreate(aid);
             console.log(`  ✓ AID ${result.aid} 创建成功`);
-            // 下载 CA 根证书（如果本地不存在），从 SDK 返回的实际网关 URL 派生
-            const caDownloaded = await downloadCaRoot(aunPath, result.gateway || '', '  ');
-            // 重建 client：传 root_ca_path 以验证 server cert，传 aid 以加载身份
-            const caCertPath = path.join(aunPath, 'CA', 'root', 'root.crt');
-            if (caDownloaded && fs.existsSync(caCertPath)) {
-                try {
-                    await client.close();
-                }
-                catch { /* ignore */ }
-                client = new AUNClient({ aun_path: aunPath, root_ca_path: caCertPath, aid });
-            }
-            // 设置 gateway URL（从 createAid 返回值或 well-known 自动发现）
-            let gatewayUrl = result.gateway || '';
-            if (!gatewayUrl) {
-                try {
-                    const discovery = new GatewayDiscovery({});
-                    gatewayUrl = await discovery.discover(`https://${aid}/.well-known/aun-gateway`);
-                }
-                catch { /* fall through */ }
-            }
-            if (gatewayUrl) {
-                client._gatewayUrl = gatewayUrl;
-            }
-            // Collect agent.md info and publish
+            // Collect agent.md type and upload
             const typeInput = (await ask(rl, '  Agent 类型 human/ai [ai]: ')).trim().toLowerCase();
             const agentType = typeInput === 'human' ? 'human' : 'ai';
-            const agentName = aid.split('.')[0];
-            const agentMdContent = `---\naid: "${aid}"\nname: "${agentName}"\ntype: "${agentType}"\nversion: "1.0.0"\ndescription: ""\ntags:\n  - evolclaw\ninitialized: false\n---\n`;
-            const agentMdPath = path.join(aidDir, 'agent.md');
+            const content = buildInitialAgentMd({ aid, type: agentType });
             try {
-                await client.auth.uploadAgentMd(agentMdContent);
-                console.log('  ✓ agent.md 已发布');
+                await agentmdPut(content, { aid, client: result.client });
+                console.log('  ✓ agent.md 已发布并写入本地');
             }
             catch (e) {
                 console.log(`  ⚠ agent.md 发布失败（首次连接将自动重试）: ${String(e.message || e).slice(0, 100)}`);
-            }
-            fs.writeFileSync(agentMdPath, agentMdContent, 'utf-8');
-            if (!fs.existsSync(agentMdPath)) {
+                // Still write local copy as fallback
                 try {
-                    await client.close();
+                    fs.mkdirSync(aidDir, { recursive: true });
+                    fs.writeFileSync(path.join(aidDir, 'agent.md'), content, 'utf-8');
+                    console.log('  ✓ agent.md 已写入本地');
+                }
+                catch (we) {
+                    console.log(`  ✗ agent.md 本地写入失败: ${String(we.message || we).slice(0, 100)}`);
+                    failed = true;
                 }
-                catch { /* ignore */ }
-                console.log(`  ✗ agent.md 本地写入校验失败: ${agentMdPath}`);
-                failed = true;
-            }
-            else {
-                console.log('  ✓ agent.md 已写入本地');
             }
             try {
-                await client.close();
+                await result.client.close();
             }
             catch { /* ignore */ }
         }
@@ -1610,3 +1412,71 @@ export async function cmdInitWecom() {
     console.log(`  配置已写入: ${p.config}`);
     console.log(`\n现在可以启动服务: evolclaw restart`);
 }
+export function getChannelCredentialCollector(type) {
+    switch (type) {
+        case 'feishu':
+            return async () => {
+                const result = await runFeishuQrFlow();
+                if (!result)
+                    return null;
+                return { appId: result.appId, appSecret: result.appSecret, enabled: true };
+            };
+        case 'wechat':
+            return async () => {
+                const result = await runWechatQrFlow();
+                if (!result)
+                    return null;
+                return { baseUrl: result.baseUrl, token: result.token, enabled: true };
+            };
+        case 'aun':
+            return async () => {
+                const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+                try {
+                    if (!await checkAunEnvironment(rl))
+                        return null;
+                    const result = await setupAunAid(rl, {});
+                    if (!result)
+                        return null;
+                    return { aid: result.aid, owner: result.owner, enabled: true };
+                }
+                finally {
+                    rl.close();
+                }
+            };
+        case 'dingtalk':
+            return async () => {
+                const result = await runDingtalkQrFlowSimple();
+                if (!result)
+                    return null;
+                return { clientId: result.clientId, clientSecret: result.clientSecret, enabled: true };
+            };
+        case 'qqbot':
+            return async () => {
+                const result = await runQQBotBindFlowSimple();
+                if (!result)
+                    return null;
+                return { appId: result.appId, clientSecret: result.clientSecret, enabled: true };
+            };
+        case 'wecom':
+            return async () => {
+                const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+                const ask = (q) => new Promise(r => rl.question(q, r));
+                try {
+                    console.log('企业微信 AI Bot 配置\n');
+                    console.log('请在企业微信管理后台 → AI Bot 页面获取 Bot ID 和 Secret\n');
+                    const botId = (await ask('  Bot ID: ')).trim();
+                    if (!botId)
+                        return null;
+                    const secret = (await ask('  Secret: ')).trim();
+                    if (!secret)
+                        return null;
+                    return { botId, secret, enabled: true };
+                }
+                finally {
+                    rl.close();
+                }
+            };
+        default:
+            return null;
+    }
+}