evolclaw 3.1.0 → 3.1.2

package/dist/cli/index.js

@@ -4,7 +4,7 @@ import path from 'path';
 import os from 'os';
 import { spawn, execFileSync, execFile } from 'child_process';
 import { promisify } from 'util';
-import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot } from '../paths.js';
+import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot, agentMdPath } from '../paths.js';
 import { loadDefaults, loadAllAgents, mergeForAgent } from '../config-store.js';
 import { resolveAnthropicConfig } from '../agents/resolve.js';
 import { migrateProject } from '../config-store.js';
@@ -231,11 +231,61 @@ function reportOrphans(orphans) {
     console.log('  这些进程不属于当前 HOME 的实例登记簿，自动清理不会处理它们。');
     console.log('  使用 evolclaw restart --clear 一并清掉，或手动 kill。');
 }
-async function cmdStart() {
-    const cmdStartedAt = Date.now();
+function formatLocalTime(ms) {
+    const d = new Date(ms);
+    return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')} ${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')}`;
+}
+function printStartupInfo(opts = {}) {
     const pkgRoot = getPackageRoot();
     const isNpmInstall = pkgRoot.includes('node_modules');
-    console.log(`⏱ ${new Date().toLocaleString()}  [${isNpmInstall ? 'pkg' : 'dev'}] ${pkgRoot}`);
+    const cliRunsSource = !import.meta.url.includes('/dist/');
+    const daemonEntry = path.join(pkgRoot, 'dist', 'index.js');
+    const daemonRunsDist = fs.existsSync(daemonEntry);
+    const scanDir = path.join(pkgRoot, daemonRunsDist ? 'dist' : 'src');
+    let latestMtime = 0;
+    const scanRecursive = (dir) => {
+        try {
+            for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+                if (entry.name === 'node_modules')
+                    continue;
+                const full = path.join(dir, entry.name);
+                if (entry.isDirectory()) {
+                    scanRecursive(full);
+                    continue;
+                }
+                if (entry.name.endsWith('.js') || entry.name.endsWith('.ts')) {
+                    const mt = fs.statSync(full).mtimeMs;
+                    if (mt > latestMtime)
+                        latestMtime = mt;
+                }
+            }
+        }
+        catch { }
+    };
+    scanRecursive(scanDir);
+    let version = '?';
+    try {
+        version = JSON.parse(fs.readFileSync(path.join(pkgRoot, 'package.json'), 'utf-8')).version;
+    }
+    catch { }
+    let aunVer = null;
+    try {
+        aunVer = JSON.parse(fs.readFileSync(path.join(pkgRoot, 'node_modules', '@agentunion', 'fastaun', 'package.json'), 'utf-8')).version;
+    }
+    catch { }
+    const pidPart = opts.pid ? ` (PID: ${opts.pid})` : '';
+    const aunPart = aunVer ? `  fastaun v${aunVer}` : '';
+    const prefix = opts.running ? '✓ EvolClaw is running , v' : '  EvolClaw v';
+    console.log(`${prefix}${version}${pidPart}${aunPart}`);
+    console.log(`  包路径:     ${pkgRoot}`);
+    console.log(`  安装类型:   ${isNpmInstall ? 'npm全局安装' : '开发仓(link)'}`);
+    console.log(`  CLI执行:    ${cliRunsSource ? '源码(tsx)' : '编译产物(dist)'}`);
+    console.log(`  Daemon执行: ${daemonRunsDist ? '编译产物(dist)' : '未知'}`);
+    console.log(`  代码时间:   ${latestMtime ? formatLocalTime(latestMtime) : '?'}`);
+}
+async function cmdStart() {
+    const cmdStartedAt = Date.now();
+    printStartupInfo();
     const p = resolvePaths();
     ensureDataDirs();
     // 旧配置自动迁移（evolclaw.json → 新结构）
@@ -263,7 +313,7 @@ async function cmdStart() {
     if (aliveMains.length > 0) {
         const first = aliveMains[0];
         console.log(`❌ EvolClaw is already running (PID: ${aliveMains.map(m => m.record.pid).join(', ')})`);
-        console.log(`  启动于: ${first.record.startedAtIso}`);
+        console.log(`  启动于: ${new Date(first.record.startedAtIso).toLocaleString()}`);
         console.log(`  启动方式: ${first.record.launchedBy}`);
         // 报告 AID 状态
         if (status.aidLastActivity.size > 0) {
@@ -444,9 +494,7 @@ async function cmdStop() {
 }
 async function cmdRestart(opts = {}) {
     const cmdStartedAt = Date.now();
-    const pkgRoot = getPackageRoot();
-    const isNpmInstall = pkgRoot.includes('node_modules');
-    console.log(`⏱ ${new Date().toLocaleString()}  [${isNpmInstall ? 'pkg' : 'dev'}] ${pkgRoot}`);
+    printStartupInfo();
     console.log('🔄 Restarting EvolClaw...');
     // 版本检查与自动升级
     console.log('📦 Checking for updates...');
@@ -789,7 +837,7 @@ async function cmdStatus() {
         console.log('');
     }
     if (pid) {
-        console.log(`✓ EvolClaw is running (PID: ${pid})`);
+        printStartupInfo({ pid, running: true });
         console.log('');
         console.log('📊 Process Info:');
         try {
@@ -835,8 +883,8 @@ async function cmdStatus() {
                     const configChannelNames = new Set();
                     for (const cfg of agents) {
                         for (const inst of cfg.channels) {
-                            // effective key: <aid>#<type>#<name>
-                            configChannelNames.add(`${cfg.aid}#${inst.type}#${inst.name}`);
+                            // effective key: <type>#<urlEncode(selfPeerId)>#<name>
+                            configChannelNames.add(`${inst.type}#${encodeURIComponent(cfg.aid)}#${inst.name}`);
                         }
                     }
                     for (const s of allSessions) {
@@ -965,7 +1013,7 @@ async function cmdStatus() {
     }
 }
 /**
- * 把 channel fingerprint 列表（`<aid>#<type>#<name>`）折叠成展示用摘要。
+ * 把 channel fingerprint 列表（`<type>#<selfPeerId>#<name>`）折叠成展示用摘要。
  *
  * 聚合规则：
  *   - 按 type 分组
@@ -987,8 +1035,8 @@ function summarizeChannelFingerprints(fingerprints) {
             }
             continue;
         }
-        const type = parts[1];
-        const name = parts.slice(2).join('#');
+        const type = parts[0];
+        const name = parts[2];
         if (!groups.has(type)) {
             groups.set(type, []);
             order.push(type);
@@ -1523,7 +1571,7 @@ function cmdWatch() {
         }
         const m = aliveMainEntries[0].record;
         const uptime = formatTimeAgo(Date.now() - m.startedAt);
-        console.log(`📦 Instance: PID ${m.pid} | 启动于 ${m.startedAtIso} (${uptime}) | via ${m.launchedBy}`);
+        console.log(`📦 Instance: PID ${m.pid} | 启动于 ${new Date(m.startedAtIso).toLocaleString()} (${uptime}) | via ${m.launchedBy}`);
         if (instStatus.aidLastActivity.size > 0) {
             const now = Date.now();
             const aidLines = [];
@@ -1694,10 +1742,10 @@ async function cmdWatchAid() {
     const refreshedAids = new Set();
     function readLocalName(aid) {
         try {
-            const agentMdPath = path.join(os.homedir(), '.aun', 'AIDs', aid, 'agent.md');
-            if (!fs.existsSync(agentMdPath))
+            const mdPath = agentMdPath(aid);
+            if (!fs.existsSync(mdPath))
                 return undefined;
-            const content = fs.readFileSync(agentMdPath, 'utf-8');
+            const content = fs.readFileSync(mdPath, 'utf-8');
             const fmMatch = content.match(/^---\n([\s\S]*?)\n---/);
             if (!fmMatch)
                 return undefined;
@@ -1773,6 +1821,11 @@ async function cmdWatchAid() {
     const COL_LRECV = 10;
     const COL_LSENT = 10;
     const COL_PEERS = 5;
+    // 表头跟随系统语言
+    const isChinese = (process.env.LANG || process.env.LC_ALL || process.env.LANGUAGE || Intl.DateTimeFormat().resolvedOptions().locale || '').toLowerCase().includes('zh');
+    const HEADERS = isChinese
+        ? { aid: 'AID', status: '状态', uptime: '运行', state: '工作', reconn: '重连', recv: '收', sent: '发', sys: '系统', bin: '入流量', bout: '出流量', lrecv: '最后收', lsent: '最后发', peers: '对端' }
+        : { aid: 'AID', status: 'STATUS', uptime: 'UPTIME', state: 'STATE', reconn: 'RECONN', recv: 'RECV', sent: 'SENT', sys: 'SYS R/S', bin: 'BYTES IN', bout: 'BYTES OUT', lrecv: 'LAST RECV', lsent: 'LAST SENT', peers: 'PEERS' };
     function formatDuration(ms) {
         const sec = Math.floor(ms / 1000);
         if (sec < 60)
@@ -1790,19 +1843,19 @@ async function cmdWatchAid() {
     }
     function renderHeader() {
         return '  ' +
-            padRight('AID', COL_AID) +
-            padRight('STATUS', COL_STATUS) +
-            padRight('UPTIME', COL_UPTIME) +
-            padRight('STATE', COL_STATE) +
-            padRight('RECONN', COL_RECONN) +
-            padRight('RECV', COL_RECV) +
-            padRight('SENT', COL_SENT) +
-            padRight('SYS R/S', COL_SYS) +
-            padRight('BYTES IN', COL_BIN) +
-            padRight('BYTES OUT', COL_BOUT) +
-            padRight('LAST RECV', COL_LRECV) +
-            padRight('LAST SENT', COL_LSENT) +
-            padRight('PEERS', COL_PEERS);
+            padRight(HEADERS.aid, COL_AID) +
+            padRight(HEADERS.status, COL_STATUS) +
+            padRight(HEADERS.uptime, COL_UPTIME) +
+            padRight(HEADERS.state, COL_STATE) +
+            padRight(HEADERS.reconn, COL_RECONN) +
+            padRight(HEADERS.recv, COL_RECV) +
+            padRight(HEADERS.sent, COL_SENT) +
+            padRight(HEADERS.sys, COL_SYS) +
+            padRight(HEADERS.bin, COL_BIN) +
+            padRight(HEADERS.bout, COL_BOUT) +
+            padRight(HEADERS.lrecv, COL_LRECV) +
+            padRight(HEADERS.lsent, COL_LSENT) +
+            padRight(HEADERS.peers, COL_PEERS);
     }
     function renderRow(aid, stats, projectPath) {
         const aidLabel = aid.aid.length > COL_AID - 2 ? aid.aid.slice(0, COL_AID - 4) + '..' : aid.aid;
@@ -1841,6 +1894,13 @@ async function cmdWatchAid() {
         const nameReset = refreshedAids.has(aid.aid) ? '' : RST;
         const BLUE = useColor ? '\x1b[34m' : '';
         const ORANGE = useColor ? '\x1b[38;5;208m' : '';
+        const MAGENTA = useColor ? '\x1b[35m' : '';
+        // 标记生成：[明文/密文|自主/响应]（紫色=工具渲染标记）
+        const mkTags = (encrypt, chatmode) => {
+            const enc = encrypt ? '密文' : '明文';
+            const mode = chatmode === 'proactive' ? '自主' : '响应';
+            return `${MAGENTA}[${enc}|${mode}]${RST}`;
+        };
         let msgPreview = '';
         if (stats?.lastReceivedAt || stats?.lastSentAt) {
             const recvTs = stats.lastReceivedAt ?? 0;
@@ -1851,13 +1911,53 @@ async function cmdWatchAid() {
             }
             else if (stats.lastSentText) {
                 const toShort = stats.lastSentTo ? stats.lastSentTo.split('.')[0] : '';
-                msgPreview = `${BLUE}↑ ${toShort ? `${ORANGE}${toShort}${RST}${BLUE}: ` : ''}${stats.lastSentText.replace(/\n/g, ' ').slice(0, 60)}${RST}`;
+                const tags = mkTags(stats.lastSentEncrypt, stats.lastSentChatmode);
+                // task 进行中时也显示计数（processing > 0 说明还在跑）
+                const isWorking = (stats.processing ?? 0) > 0;
+                const taskEnd = stats?.lastTaskEnd;
+                const counts = isWorking && taskEnd
+                    ? `${MAGENTA}[大模型${taskEnd.numTurns}|调用${taskEnd.toolUseCount}|thought${taskEnd.thoughtPutCount}|msg${taskEnd.replyCount}]${RST}`
+                    : '';
+                msgPreview = `${BLUE}↑${tags}${counts} ${toShort ? `${ORANGE}${toShort}${RST}${BLUE}: ` : ''}${stats.lastSentText.replace(/\n/g, ' ').slice(0, 60)}${RST}`;
             }
             else if (stats.lastReceivedText) {
                 const fromShort = stats.lastReceivedFrom ? stats.lastReceivedFrom.split('.')[0] : '';
                 msgPreview = `${GREEN}↓ ${fromShort ? `${ORANGE}${fromShort}${RST}${GREEN}: ` : ''}${stats.lastReceivedText.replace(/\n/g, ' ').slice(0, 60)}${RST}`;
             }
         }
+        // 任务结束状态覆盖：仅当 taskEnd 比最后收发都新时才覆盖
+        const taskEnd = stats?.lastTaskEnd;
+        if (taskEnd && taskEnd.ts >= (stats?.lastSentAt ?? 0) && taskEnd.ts >= (stats?.lastReceivedAt ?? 0)) {
+            const tags = mkTags(taskEnd.encrypt, taskEnd.chatmode);
+            // 计数标记: [大模型N|调用N|thoughtN(streamN)|msgN]
+            const thoughtLabel = taskEnd.thoughtPutCount > 0
+                ? `thought${taskEnd.numTurns}(stream${taskEnd.thoughtPutCount})`
+                : `thought${taskEnd.numTurns}`;
+            const counts = `${MAGENTA}[大模型${taskEnd.numTurns}|调用${taskEnd.toolUseCount}|${thoughtLabel}|msg${taskEnd.replyCount}]${RST}`;
+            if (taskEnd.status === 'error') {
+                msgPreview = `${RED}${tags}${counts} 错误: ${taskEnd.errorType ?? '未知错误'}${RST}`;
+            }
+            else if (taskEnd.sentDuringTask) {
+                // 有 message.send：蓝色加粗 + 内容
+                const toShort = stats?.lastSentTo ? stats.lastSentTo.split('.')[0] : '';
+                const textPreview = stats?.lastSentText ? stats.lastSentText.replace(/\n/g, ' ').slice(0, 60) : '';
+                msgPreview = `${BOLD}${BLUE}↑${tags}${counts} ${toShort ? `${ORANGE}${toShort}${RST}${BOLD}${BLUE}: ` : ''}${textPreview}${RST}`;
+            }
+            else if (taskEnd.thoughtDuringTask) {
+                // 只有 thought：普通蓝色 + thought 内容
+                const textPreview = taskEnd.lastThoughtText
+                    ? taskEnd.lastThoughtText.replace(/\n/g, ' ').slice(0, 60)
+                    : (taskEnd.finalText ? taskEnd.finalText.replace(/\n/g, ' ').slice(0, 60) : '');
+                msgPreview = `${BLUE}↑${tags}${counts} ${textPreview}${RST}`;
+            }
+            else {
+                // 既没 send 也没 thought
+                const textPreview = taskEnd.finalText
+                    ? taskEnd.finalText.replace(/\n/g, ' ').slice(0, 60)
+                    : '(无输出)';
+                msgPreview = `${ORANGE}${tags}${counts} ${textPreview}${RST}`;
+            }
+        }
         const subLine1 = `    ${nameColor}${namePart}${nameReset}${msgPreview ? '  ' + msgPreview : ''}`;
         const dirLabel = projectPath || '—';
         const subLine2 = `${DIM}    ${dirLabel}${RST}`;
@@ -2371,12 +2471,14 @@ function archiveSelfHealLog(p, log) {
  * Searches across all channel types (feishu, wechat, aun) for a matching instance.
  */
 function resolveInstanceConfig(instanceName) {
-    // 新结构：channel key 是 <aid>#<type>#<name>，解析后从对应 agent 的 channels[] 找
+    // 新结构：channel key 是 <type>#<selfPeerId>#<name>，解析后从对应 agent 的 channels[] 找
     const parts = instanceName.split('#');
     if (parts.length === 3) {
-        const [aid, type, name] = parts;
+        const [type, encodedSelfPeerId, name] = parts;
+        const selfPeerId = decodeURIComponent(encodedSelfPeerId);
         const { agents } = loadAllAgents();
-        const agent = agents.find(a => a.aid === aid);
+        // AUN channel 的 selfPeerId 就是 agent.aid
+        const agent = agents.find(a => a.aid === selfPeerId);
         if (!agent)
             return null;
         const inst = agent.channels.find((c) => c.type === type && c.name === name);
@@ -2698,7 +2800,7 @@ async function cmdCtl(args) {
 async function cmdAgent(args) {
     const sub = args[0];
     const formatJson = args.includes('--format') && args[args.indexOf('--format') + 1] === 'json';
-    if (sub === 'help' || sub === '--help' || sub === '-h' || args.includes('--help') || args.includes('-h')) {
+    if (!sub || sub === 'help' || sub === '--help' || sub === '-h' || args.includes('--help') || args.includes('-h')) {
         console.log(`用法: evolclaw agent <command>
 
 Commands:
@@ -2750,17 +2852,43 @@ Options:
             console.log('No agents configured.');
             return;
         }
-        console.log('NAME'.padEnd(14) + 'STATUS'.padEnd(10) + 'CHANNELS'.padEnd(24) +
-            'PROJECT'.padEnd(22) + 'BASEAGENT'.padEnd(11) + 'LAST ACTIVE');
+        // 表头跟随系统语言
+        const isChinese = (process.env.LANG || process.env.LC_ALL || process.env.LANGUAGE || Intl.DateTimeFormat().resolvedOptions().locale || '').toLowerCase().includes('zh');
+        const headers = isChinese
+            ? { name: '名称', status: '状态', channels: '渠道', project: '项目', baseagent: '基座', lastActive: '最后活跃' }
+            : { name: 'NAME', status: 'STATUS', channels: 'CHANNELS', project: 'PROJECT', baseagent: 'BASEAGENT', lastActive: 'LAST ACTIVE' };
+        // 计算各列实际需要的宽度
+        let maxNameLen = headers.name.length;
+        let maxStatusLen = headers.status.length;
+        let maxChannelsLen = headers.channels.length;
+        let maxProjectLen = headers.project.length;
+        let maxBaseagentLen = headers.baseagent.length;
+        for (const info of result.agents) {
+            maxNameLen = Math.max(maxNameLen, info.name.length);
+            maxStatusLen = Math.max(maxStatusLen, (info.status || 'stopped').length);
+            const channelsStr = info.channels?.length > 0 ? info.channels.join(', ') : '—';
+            maxChannelsLen = Math.max(maxChannelsLen, channelsStr.length);
+            const projectStr = info.projectPath ? path.basename(info.projectPath) : '—';
+            maxProjectLen = Math.max(maxProjectLen, projectStr.length);
+            maxBaseagentLen = Math.max(maxBaseagentLen, (info.baseagent || '—').length);
+        }
+        // 加 2 作为列间距
+        const colName = maxNameLen + 2;
+        const colStatus = maxStatusLen + 2;
+        const colChannels = maxChannelsLen + 1;
+        const colProject = maxProjectLen + 2;
+        const colBaseagent = maxBaseagentLen + 2;
+        console.log(headers.name.padEnd(colName) + headers.status.padEnd(colStatus) + headers.channels.padEnd(colChannels) +
+            headers.project.padEnd(colProject) + headers.baseagent.padEnd(colBaseagent) + headers.lastActive);
         for (const info of result.agents) {
             const name = info.name;
             const status = info.status || 'stopped';
-            const channels = info.channels?.length > 0 ? info.channels.join(', ').slice(0, 22) : '—';
+            const channels = info.channels?.length > 0 ? info.channels.join(', ') : '—';
             const project = info.projectPath ? path.basename(info.projectPath) : '—';
             const baseagent = info.baseagent || '—';
             const lastActive = info.lastActivity ? formatTimeAgo(Date.now() - info.lastActivity) : '—';
-            console.log(name.padEnd(14) + status.padEnd(10) + channels.padEnd(24) +
-                project.padEnd(22) + baseagent.padEnd(11) + lastActive);
+            console.log(name.padEnd(colName) + status.padEnd(colStatus) + channels.padEnd(colChannels) +
+                project.padEnd(colProject) + baseagent.padEnd(colBaseagent) + lastActive);
         }
         return;
     }
@@ -2803,7 +2931,11 @@ Options:
                 console.log(result.agentmdUploaded
                     ? '  ✓ agent.md 已发布'
                     : '  ⚠ agent.md 上传失败（可用 evolclaw aid agentmd put 重试）');
-                console.log('  Run `evolclaw restart` to activate.');
+                console.log(result.hotLoaded
+                    ? '  ✓ 已热重载，agent 已上线'
+                    : result.hotLoadError
+                        ? `  ✗ 热重载失败：${result.hotLoadError}`
+                        : '  ⚠ 服务未运行，下次 evolclaw start 时生效');
             }
         }
         else {
@@ -2825,7 +2957,11 @@ Options:
                 console.log(result.agentmdUploaded
                     ? '  ✓ agent.md 已发布'
                     : '  ⚠ agent.md 上传失败（可用 evolclaw aid agentmd put 重试）');
-                console.log('  Run `evolclaw restart` to activate.');
+                console.log(result.hotLoaded
+                    ? '  ✓ 已热重载，agent 已上线'
+                    : result.hotLoadError
+                        ? `  ✗ 热重载失败：${result.hotLoadError}`
+                        : '  ⚠ 服务未运行，下次 evolclaw start 时生效');
             }
         }
         return;
@@ -3161,7 +3297,7 @@ async function cmdAid(args) {
     const sub = args[0] || 'list';
     const formatJson = args.includes('--format') && args[args.indexOf('--format') + 1] === 'json';
     const aunPath = resolveAunPath(args);
-    if (sub === 'help' || sub === '--help' || sub === '-h' || args.includes('--help') || args.includes('-h')) {
+    if (!sub || sub === 'help' || sub === '--help' || sub === '-h' || args.includes('--help') || args.includes('-h')) {
         console.log(`用法: evolclaw aid <command>
 
 Commands:
@@ -3320,8 +3456,7 @@ Options:
                 console.error(`❌ 无效 AID 格式: ${aid}`);
                 process.exit(1);
             }
-            const aunBase = aunPath ?? path.join(os.homedir(), '.aun');
-            const localPath = path.join(aunBase, 'AIDs', aid, 'agent.md');
+            const localPath = agentMdPath(aid);
             if (!fs.existsSync(localPath)) {
                 console.error(`❌ 本地无 agent.md: ${aid}`);
                 process.exit(1);
@@ -3629,12 +3764,15 @@ Options:
   --app <name>          指定应用 slot（隔离 ack 游标）
   --as-daemon           ack 时显式以 daemon 身份（高危，会污染 daemon 游标）
   --format json         输出 JSON 格式
+  --encrypt             启用端到端加密
+  --thread <id>         指定话题 ID（用于多话题路由）
   --content-type <mime> 显式覆盖 MIME（仅 --file 模式）
   --text <说明>          附件说明文字（仅 --file 模式）
   --transcript <text>   语音转写（仅 --as voice）
 
 示例:
   evolclaw msg send alice.agentid.pub bob.agentid.pub "hello"
+  evolclaw msg send alice.agentid.pub bob.agentid.pub "讨论项目A" --thread "project-A"
   evolclaw msg send alice.agentid.pub bob.agentid.pub --file ./pic.png
   evolclaw msg send alice.agentid.pub bob.agentid.pub --file ./demo.mp4 --as video
   evolclaw msg send alice.agentid.pub bob.agentid.pub --link https://example.com --title "AUN"
@@ -3708,7 +3846,29 @@ Options:
             body = { mode: 'text', text };
         }
         const encrypt = args.includes('--encrypt');
-        const result = await msgSend({ from, to, body, encrypt, ...commonOpts });
+        const thread = getArgValue(args, '--thread');
+        // 文件上传进度展示（非 JSON 输出时）。仅在大文件降级到 HTTP PUT 阶段会逐块更新。
+        let lastPctShown = -1;
+        const onUploadProgress = formatJson ? undefined : (info) => {
+            if (info.phase === 'inline')
+                return; // 内联阶段不分块，跳过
+            if (info.phase === 'http-put') {
+                const pct = info.total > 0 ? Math.floor((info.bytes / info.total) * 100) : 0;
+                if (pct === lastPctShown && info.bytes < info.total)
+                    return;
+                lastPctShown = pct;
+                const mb = (n) => (n / 1024 / 1024).toFixed(2);
+                const eol = info.bytes >= info.total ? '\n' : '\r';
+                process.stderr.write(`  ⏫ uploading: ${pct}% (${mb(info.bytes)}/${mb(info.total)} MB)${eol}`);
+            }
+            else if (info.phase === 'session-create') {
+                process.stderr.write('  ⏫ requesting upload session...\n');
+            }
+            else if (info.phase === 'session-complete') {
+                process.stderr.write('  ⏫ finalizing upload...\n');
+            }
+        };
+        const result = await msgSend({ from, to, body, encrypt, thread, onUploadProgress, ...commonOpts });
         if (!result.ok) {
             if (formatJson) {
                 console.log(JSON.stringify(result));
@@ -4290,15 +4450,23 @@ export async function main(args) {
   evolclaw init wecom         企业微信 AI Bot 配置（手动输入）`);
             }
             else if (args[1] === 'wechat') {
+                const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                suppressSdkLogs();
                 await cmdInitWechat();
             }
             else if (args[1] === 'feishu') {
+                const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                suppressSdkLogs();
                 await cmdInitFeishu();
             }
             else if (args[1] === 'dingtalk') {
+                const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                suppressSdkLogs();
                 await cmdInitDingtalk();
             }
             else if (args[1] === 'qqbot') {
+                const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                suppressSdkLogs();
                 await cmdInitQQBot();
             }
             else if (args[1] === 'wecom') {
@@ -4311,6 +4479,8 @@ export async function main(args) {
                 process.exit(1);
             }
             else {
+                const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                suppressSdkLogs();
                 const nonInteractive = args.includes('--non-interactive');
                 await cmdInit({
                     nonInteractive,
@@ -4391,9 +4561,12 @@ export async function main(args) {
         case 'ctl':
             await cmdCtl(args.slice(1));
             break;
-        case 'agent':
+        case 'agent': {
+            const { suppressSdkLogs } = await import('../aun/aid/index.js');
+            suppressSdkLogs();
             await cmdAgent(args.slice(1));
             break;
+        }
         case 'aid': {
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();

package/dist/cli/init-channel.js

@@ -10,6 +10,7 @@ import readline from 'readline';
 import path from 'path';
 import os from 'os';
 import crypto from 'crypto';
+import { aidLocalDir } from '../paths.js';
 import { selectInstance } from './init.js';
 import { npmInstallGlobal } from '../utils/npm-ops.js';
 import { loadAllAgents, loadAgent } from '../config-store.js';
@@ -470,8 +471,9 @@ export async function setupAunAid(rl, _config) {
                 console.log(`  ⚠ agent.md 发布失败（首次连接将自动重试）: ${String(e.message || e).slice(0, 100)}`);
                 // Still write local copy as fallback
                 try {
-                    fs.mkdirSync(aidDir, { recursive: true });
-                    fs.writeFileSync(path.join(aidDir, 'agent.md'), content, 'utf-8');
+                    const localDir = aidLocalDir(aid);
+                    fs.mkdirSync(localDir, { recursive: true });
+                    fs.writeFileSync(path.join(localDir, 'agent.md'), content, 'utf-8');
                     console.log('  ✓ agent.md 已写入本地');
                 }
                 catch (we) {

package/dist/cli/init.js

@@ -1,9 +1,9 @@
 import fs from 'fs';
-import path from 'path';
 import readline from 'readline';
 import { resolvePaths, ensureDataDirs } from '../paths.js';
 import { commandExists } from '../utils/cross-platform.js';
 import { scanInstances } from '../utils/instance-registry.js';
+import { saveDefaultsSafe, loadAllAgents } from '../config-store.js';
 // ==================== Helpers ====================
 function ask(rl, question) {
     return new Promise(resolve => rl.question(question, resolve));
@@ -28,9 +28,8 @@ function buildDefaults(chosen) {
         baseagents: { [chosen]: env ? { apiKey: `$ENV:${env}` } : {} },
     };
 }
-function writeDefaults(defaultsPath, chosen) {
-    fs.mkdirSync(path.dirname(defaultsPath), { recursive: true });
-    fs.writeFileSync(defaultsPath, JSON.stringify(buildDefaults(chosen), null, 2) + '\n');
+function writeDefaults(_defaultsPath, chosen) {
+    saveDefaultsSafe(buildDefaults(chosen));
 }
 // ==================== Main ====================
 export async function cmdInit(options) {
@@ -82,19 +81,21 @@ export async function cmdInit(options) {
         writeDefaults(defaultsPath, chosen);
         console.log(`✓ 已${exists ? '覆盖' : '创建'}: ${defaultsPath}`);
         console.log(`  active_baseagent: ${chosen}`);
+        const { agents } = loadAllAgents();
+        if (agents.length === 0) {
+            console.log('\n提示：尚无 agent，运行以下命令创建：');
+            console.log('  evolclaw agent new <aid>.agentid.pub');
+        }
         return;
     }
     // ── 4. 交互式分支 ──
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    try {
-        if (exists) {
-            const ans = (await ask(rl, `配置文件已存在: ${defaultsPath}\n  是否覆盖？[y/N] `)).trim().toLowerCase();
-            if (ans !== 'y' && ans !== 'yes') {
-                console.log('  已取消');
-                return;
-            }
-        }
+    async function askBaseagent() {
         const defaultBa = pickDefault(available);
+        if (available.length === 1) {
+            console.log(`  baseagent: ${defaultBa}`);
+            return defaultBa;
+        }
         let chosen = null;
         while (chosen === null) {
             const input = (await ask(rl, `默认 baseagent (${available.join('/')}) [${defaultBa}]: `)).trim() || defaultBa;
@@ -108,17 +109,37 @@ export async function cmdInit(options) {
             }
             chosen = input;
         }
-        writeDefaults(defaultsPath, chosen);
-        console.log(`\n✓ 已${exists ? '覆盖' : '创建'}: ${defaultsPath}`);
-        console.log(`  active_baseagent: ${chosen}\n`);
-        rl.close();
-        // ── 5. 嵌套 agent new ──
-        console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-        console.log('下一步：创建 agent\n');
-        const { agentCreateInteractive } = await import('./agent.js');
-        const result = await agentCreateInteractive();
-        if (!result.ok) {
-            console.error(`❌ ${result.error}`);
+        return chosen;
+    }
+    try {
+        if (exists) {
+            const ans = (await ask(rl, `配置文件已存在: ${defaultsPath}\n  是否覆盖？[y/N] `)).trim().toLowerCase();
+            if (ans === 'y' || ans === 'yes') {
+                const chosen = await askBaseagent();
+                writeDefaults(defaultsPath, chosen);
+                console.log(`\n✓ 已覆盖: ${defaultsPath}`);
+                console.log(`  active_baseagent: ${chosen}\n`);
+            }
+            else {
+                console.log('  已跳过（保留现有配置）\n');
+            }
+        }
+        else {
+            const chosen = await askBaseagent();
+            writeDefaults(defaultsPath, chosen);
+            console.log(`\n✓ 已创建: ${defaultsPath}`);
+            console.log(`  active_baseagent: ${chosen}\n`);
+        }
+        // ── 5. 无 agent 时自动进入 agent new ──
+        const { agents } = loadAllAgents();
+        if (agents.length === 0) {
+            console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+            console.log('下一步：创建 agent\n');
+            const { agentCreateInteractive } = await import('./agent.js');
+            const result = await agentCreateInteractive({ rl });
+            if (!result.ok) {
+                console.error(`❌ ${result.error}`);
+            }
         }
     }
     finally {