evolclaw 3.1.4 → 3.1.5

package/dist/cli/agent.js

@@ -419,11 +419,14 @@ export async function agentCreateInteractive(opts = {}) {
         catch (e) {
             console.warn(`  ⚠ agent.md generation failed: ${e?.message || e}`);
         }
-        // Attempt hot-load via IPC (if daemon is running)
+        // Attempt hot-load via IPC (if daemon is running).
+        // Cold-starting a new agent (connecting AUN WebSocket) routinely takes
+        // >3s, so use a generous timeout to avoid a false "service not running"
+        // report while the daemon actually finishes bringing the agent online.
         let hotLoaded = false;
         let hotLoadError;
         try {
-            const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid });
+            const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid }, 30_000);
             if (ipcResult?.ok) {
                 hotLoaded = true;
             }
@@ -569,11 +572,14 @@ export async function agentCreateNonInteractive(opts) {
     catch (e) {
         console.warn(`⚠ agent.md generation failed: ${e?.message || e}`);
     }
-    // Attempt hot-load via IPC (if daemon is running)
+    // Attempt hot-load via IPC (if daemon is running).
+    // Cold-starting a new agent (connecting AUN WebSocket) routinely takes
+    // >3s, so use a generous timeout to avoid a false "service not running"
+    // report while the daemon actually finishes bringing the agent online.
     let hotLoaded = false;
     let hotLoadError;
     try {
-        const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid: opts.aid });
+        const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid: opts.aid }, 30_000);
         if (ipcResult?.ok) {
             hotLoaded = true;
         }
@@ -829,7 +835,7 @@ export async function agentChannelUpsert(opts) {
     return {
         ok: true,
         aid: opts.aid,
-        channelKey: `${opts.channel.type}#${encodeURIComponent(opts.aid)}#${opts.channel.name}`,
+        channelKey: `${opts.channel.type}#${opts.aid}#${opts.channel.name}`,
         reloaded,
     };
 }

package/dist/cli/bench.js

@@ -7,7 +7,7 @@ import { promisify } from 'util';
 import { aidList, aidCreate } from '../aun/aid/identity.js';
 import { msgSend, msgPull } from '../aun/msg/index.js';
 import { getPackageRoot, aunPath as defaultAunPath } from '../paths.js';
-import { createAunClient } from '../aun/aid/client.js';
+import { getAidStore, loadClient, SLOT } from '../aun/aid/store.js';
 import { isHelpFlag } from './help.js';
 const execFileAsync = promisify(execFile);
 // ==================== ANSI ====================
@@ -248,34 +248,48 @@ function computeMetrics(results, received, durationSec) {
 function filterBySize(results, received, cls, durationSec) {
     return computeMetrics(results.filter(r => r.sizeClass === cls), received.filter(r => r.sizeClass === cls), durationSec);
 }
-async function benchAuth(aids, concurrency, aunPath, slotId) {
-    const resolvedAunPath = aunPath ?? defaultAunPath();
-    const tasks = aids.map(aid => async () => {
+async function benchAuth(aids, concurrency, aunPath) {
+    const tasks = aids.map((aid, index) => async () => {
         const start = Date.now();
+        const slotId = `${SLOT.bench}-${index}`;
+        let store = null;
+        let client = null;
         try {
-            const client = await createAunClient({ aunPath: resolvedAunPath });
-            await client.auth.createAid({ aid });
-            const authResult = await client.auth.authenticate({ aid });
-            const accessToken = authResult?.access_token ?? client._access_token;
-            const gateway = client._gatewayUrl ?? authResult?.gateway ?? '';
-            await client.connect({ access_token: accessToken, gateway, slot_id: slotId ?? '', connection_kind: 'short' }, { auto_reconnect: false });
+            store = await getAidStore({ slotId, aunPath });
+            client = await loadClient(store, aid);
+            await client.connect({ auto_reconnect: false });
+            const gateway = ''; // Gateway URL not exposed in 0.4.3
+            const authMs = Date.now() - start;
             try {
                 await client.close();
             }
             catch { }
-            return { aid, ok: true, authMs: Date.now() - start, gateway };
+            try {
+                store.close();
+            }
+            catch { }
+            return { aid, ok: true, authMs, gateway };
         }
         catch (e) {
+            if (client)
+                try {
+                    await client.close();
+                }
+                catch { }
+            if (store)
+                try {
+                    store.close();
+                }
+                catch { }
             return { aid, ok: false, authMs: Date.now() - start, error: e.message };
         }
     });
     return runPool(tasks, concurrency);
 }
-async function benchSwitch(aids, rounds, aunPath, useCli, slotId, encrypt) {
+async function benchSwitch(aids, rounds, aunPath, useCli, encrypt) {
     const results = [];
     const start = Date.now();
     let seq = 0;
-    const slot = slotId ?? 'bench';
     for (let round = 0; round < rounds; round++) {
         for (let i = 0; i < aids.length; i++) {
             const from = aids[i];
@@ -286,8 +300,9 @@ async function benchSwitch(aids, rounds, aunPath, useCli, slotId, encrypt) {
             let ok = false;
             let serverTimestamp;
             if (useCli) {
+                const slotId = `${SLOT.bench}-${i}`;
                 try {
-                    const res = await withTimeout(cliSend(from, to, text, slot, encrypt), 10000, `${from.split('.')[0]}→${to.split('.')[0]}`);
+                    const res = await withTimeout(cliSend(from, to, text, slotId, encrypt), 10000, `${from.split('.')[0]}→${to.split('.')[0]}`);
                     ok = res.ok;
                     serverTimestamp = res.timestamp;
                 }
@@ -296,8 +311,9 @@ async function benchSwitch(aids, rounds, aunPath, useCli, slotId, encrypt) {
                 }
             }
             else {
+                const slotId = `${SLOT.bench}-${i}`;
                 try {
-                    const res = await withTimeout(msgSend({ from, to, body: { mode: 'text', text }, slotId: slot, aunPath, encrypt }), 10000, `${from.split('.')[0]}→${to.split('.')[0]}`);
+                    const res = await withTimeout(msgSend({ from, to, body: { mode: 'text', text }, slotId, aunPath, encrypt }), 10000, `${from.split('.')[0]}→${to.split('.')[0]}`);
                     ok = res.ok;
                     serverTimestamp = res.ok ? res.timestamp : undefined;
                 }
@@ -392,7 +408,6 @@ Options:
     const defaultWait = encrypt ? '10' : '3';
     const waitSec = Math.max(1, parseInt(getArgValue(args, '--wait') || defaultWait, 10));
     const sessionId = crypto.randomBytes(4).toString('hex');
-    const benchSlot = `bench-${sessionId}`;
     if (!formatJson) {
         console.log(`\n${BOLD}  evolclaw bench${RST} — AUN 消息性能基准测试`);
         console.log(`  ${'━'.repeat(50)}`);
@@ -495,14 +510,15 @@ Options:
         authTasks.push(...aids);
     let authResults;
     if (cliMode) {
-        const cliAuthTasks = authTasks.map(aid => async () => {
-            const r = await cliAuth(aid, benchSlot);
+        const cliAuthTasks = authTasks.map((aid, index) => async () => {
+            const slotId = `${SLOT.bench}-${index}`;
+            const r = await cliAuth(aid, slotId);
             return { aid, ok: r.ok, authMs: r.authMs };
         });
         authResults = await runPool(cliAuthTasks, concurrency);
     }
     else {
-        authResults = await benchAuth(authTasks, concurrency, aunPath, benchSlot);
+        authResults = await benchAuth(authTasks, concurrency, aunPath);
     }
     const authOk = authResults.filter(r => r.ok);
     const authFail = authResults.filter(r => !r.ok);
@@ -592,7 +608,7 @@ Options:
     // Suppress SDK error logs during send phase (we track errors ourselves)
     const origError2 = console.error;
     console.error = () => { };
-    const sendFns = tasks.map(t => async () => {
+    const sendFns = tasks.map((t, taskIndex) => async () => {
         let lastError;
         let retries = 0;
         for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
@@ -605,10 +621,11 @@ Options:
                 ? buildFileChunkText(t.seq, fileChunks.length, sendTs, sessionId, fileChunks[t.seq]?.toString('base64') ?? '')
                 : buildMessageText(t.seq, t.sizeClass, sendTs, sessionId);
             const t0 = Date.now();
+            const slotId = `${SLOT.bench}-${taskIndex % concurrency}`;
             try {
                 const sendPromise = cliMode
-                    ? cliSend(t.from, t.to, text, benchSlot, encrypt)
-                    : msgSend({ from: t.from, to: t.to, body: { mode: 'text', text }, slotId: benchSlot, aunPath, encrypt });
+                    ? cliSend(t.from, t.to, text, slotId, encrypt)
+                    : msgSend({ from: t.from, to: t.to, body: { mode: 'text', text }, slotId, aunPath, encrypt });
                 const res = await withTimeout(sendPromise, SEND_TIMEOUT_MS, `${t.from.split('.')[0]}→${t.to.split('.')[0]}`);
                 if (cliMode) {
                     const cliRes = res;
@@ -922,7 +939,7 @@ Options:
     if (!formatJson)
         console.log(`${DIM}  Phase 5: 频繁切换账号收发测试${RST}`);
     const switchRounds = Math.max(2, Math.min(rounds, 5));
-    const switchOut = await benchSwitch(aids, switchRounds, aunPath, cliMode, benchSlot, encrypt);
+    const switchOut = await benchSwitch(aids, switchRounds, aunPath, cliMode, encrypt);
     const switchOkResults = switchOut.results.filter(r => r.ok);
     const switchLatencies = switchOkResults
         .filter(r => r.serverTimestamp !== undefined)

package/dist/cli/index.js

@@ -884,8 +884,8 @@ async function cmdStatus() {
                     const configChannelNames = new Set();
                     for (const cfg of agents) {
                         for (const inst of cfg.channels) {
-                            // effective key: <type>#<urlEncode(selfPeerId)>#<name>
-                            configChannelNames.add(`${inst.type}#${encodeURIComponent(cfg.aid)}#${inst.name}`);
+                            // effective key: <type>#<selfAID>#<name>
+                            configChannelNames.add(`${inst.type}#${cfg.aid}#${inst.name}`);
                         }
                     }
                     for (const s of allSessions) {
@@ -1014,7 +1014,7 @@ async function cmdStatus() {
     }
 }
 /**
- * 把 channel fingerprint 列表（`<type>#<selfPeerId>#<name>`）折叠成展示用摘要。
+ * 把 channel fingerprint 列表（`<type>#<selfAID>#<name>`）折叠成展示用摘要。
  *
  * 聚合规则：
  *   - 按 type 分组
@@ -1414,6 +1414,7 @@ async function cmdWatchMenu() {
         { key: 'log', label: 'log', desc: 'real-time log tail' },
         { key: 'aid', label: 'aid', desc: 'AID connection stats' },
         { key: 'msg', label: 'msg', desc: 'message inspector' },
+        { key: 'web', label: 'web', desc: 'browser dashboard (aid/msg/session)' },
     ];
     let index = 0;
     const useColor = !!process.stdout.isTTY;
@@ -1477,6 +1478,9 @@ async function cmdWatchMenu() {
                     const { cmdWatchMsg } = await import('./watch-msg.js');
                     await cmdWatchMsg();
                 }
+                else if (chosen === 'web') {
+                    await cmdWatchWeb();
+                }
                 resolve();
             }
         };
@@ -2098,6 +2102,97 @@ async function cmdWatchAid() {
     }
     platform.onShutdown(cleanup);
 }
+async function cmdWatchWeb() {
+    const p = resolvePaths();
+    fs.mkdirSync(p.instanceDir, { recursive: true });
+    const useColor = !!process.stdout.isTTY;
+    const RST = useColor ? '\x1b[0m' : '';
+    const DIM = useColor ? '\x1b[2m' : '';
+    const BOLD = useColor ? '\x1b[1m' : '';
+    const CYAN = useColor ? '\x1b[36m' : '';
+    const GREEN = useColor ? '\x1b[32m' : '';
+    const YELLOW = useColor ? '\x1b[33m' : '';
+    const logLine = (line) => {
+        const t = new Date();
+        const ts = `${String(t.getHours()).padStart(2, '0')}:${String(t.getMinutes()).padStart(2, '0')}:${String(t.getSeconds()).padStart(2, '0')}`;
+        process.stdout.write(`${DIM}${ts}${RST} ${line}\n`);
+    };
+    // 调试日志文件：每次运行 watch web 时清空，便于建立调试闭环
+    // 查看 sessions 调试日志 → 读这个文件
+    const logFile = path.join(p.logs, 'watch-web.log');
+    try {
+        fs.mkdirSync(p.logs, { recursive: true });
+        fs.writeFileSync(logFile, `# watch-web debug log\n# started ${new Date().toISOString()} pid=${process.pid}\n`);
+    }
+    catch { /* best effort */ }
+    const fileLog = (line) => {
+        const t = new Date();
+        const ts = `${String(t.getHours()).padStart(2, '0')}:${String(t.getMinutes()).padStart(2, '0')}:${String(t.getSeconds()).padStart(2, '0')}.${String(t.getMilliseconds()).padStart(3, '0')}`;
+        try {
+            fs.appendFileSync(logFile, `${ts} ${line.replace(/\x1b\[[0-9;]*m/g, '')}\n`);
+        }
+        catch { /* ignore */ }
+    };
+    // 同时输出到终端和日志文件
+    const log = (line) => { logLine(line); fileLog(line); };
+    const { startWatchWebServer } = await import('./watch-web/server.js');
+    let handle;
+    try {
+        handle = await startWatchWebServer({ log });
+    }
+    catch (e) {
+        console.error(`❌ 启动 Web 服务失败: ${e?.message || e}`);
+        process.exit(1);
+    }
+    // 注册 instance 文件
+    const instanceFile = path.join(p.instanceDir, `watch-web-${process.pid}.json`);
+    fs.writeFileSync(instanceFile, JSON.stringify({
+        pid: process.pid, startedAt: Date.now(), startedAtIso: new Date().toISOString(),
+        type: 'watch-web', port: handle.port,
+    }, null, 2));
+    // 列出本机访问地址
+    const os = await import('os');
+    const ifaces = os.networkInterfaces();
+    const lanIps = [];
+    for (const list of Object.values(ifaces)) {
+        for (const ni of list || []) {
+            if (ni.family === 'IPv4' && !ni.internal)
+                lanIps.push(ni.address);
+        }
+    }
+    process.stdout.write(`\n${BOLD}${CYAN}🔭 EvolClaw Watch Web${RST}\n\n`);
+    process.stdout.write(`  ${BOLD}配对码:${RST}  ${GREEN}${BOLD}${handle.pairingCode}${RST}  ${DIM}(5 分钟内有效，配对后 token 缓存 24h 自动续期)${RST}\n\n`);
+    process.stdout.write(`  ${BOLD}本机:${RST}    http://localhost:${handle.port}\n`);
+    for (const ip of lanIps) {
+        process.stdout.write(`  ${BOLD}局域网:${RST}  http://${ip}:${handle.port}\n`);
+    }
+    process.stdout.write(`\n  ${DIM}绑定 0.0.0.0，远程可访问。按任意键退出。${RST}\n`);
+    process.stdout.write(`  ${DIM}调试日志: ${logFile}${RST}\n\n`);
+    const cleanup = () => {
+        try {
+            fs.unlinkSync(instanceFile);
+        }
+        catch { }
+        handle.close().finally(() => process.exit(0));
+    };
+    process.on('exit', () => { try {
+        fs.unlinkSync(instanceFile);
+    }
+    catch { } });
+    process.on('SIGINT', cleanup);
+    process.on('SIGTERM', cleanup);
+    platform.onShutdown(cleanup);
+    // 按任意键退出
+    if (process.stdin.isTTY) {
+        process.stdin.setRawMode(true);
+        process.stdin.resume();
+        process.stdin.on('data', (key) => {
+            logLine(`${YELLOW}收到退出指令，关闭服务…${RST}`);
+            cleanup();
+        });
+    }
+    await new Promise(() => { });
+}
 async function cmdRestartMonitor() {
     const p = resolvePaths();
     const restartLog = path.join(p.logs, 'restart.log');
@@ -2472,14 +2567,13 @@ function archiveSelfHealLog(p, log) {
  * Searches across all channel types (feishu, wechat, aun) for a matching instance.
  */
 function resolveInstanceConfig(instanceName) {
-    // 新结构：channel key 是 <type>#<selfPeerId>#<name>，解析后从对应 agent 的 channels[] 找
+    // 新结构：channel key 是 <type>#<selfAID>#<name>，解析后从对应 agent 的 channels[] 找
     const parts = instanceName.split('#');
     if (parts.length === 3) {
-        const [type, encodedSelfPeerId, name] = parts;
-        const selfPeerId = decodeURIComponent(encodedSelfPeerId);
+        const [type, selfAID, name] = parts;
         const { agents } = loadAllAgents();
-        // AUN channel 的 selfPeerId 就是 agent.aid
-        const agent = agents.find(a => a.aid === selfPeerId);
+        // AUN channel 的 selfAID 就是 agent.aid
+        const agent = agents.find(a => a.aid === selfAID);
         if (!agent)
             return null;
         const inst = agent.channels.find((c) => c.type === type && c.name === name);
@@ -3467,7 +3561,7 @@ Options:
             console.log('无匹配 AID');
             return;
         }
-        console.log(`本地 AID${noVerify ? '（静态扫描，未实测）' : ''}:`);
+        console.log(`本地 AID${noVerify ? '（静态扫描，未实测）' : ''}（${aunPath ?? resolveRoot()}）:`);
         for (const a of aids) {
             const keyIcon = a.hasPrivateKey ? '🔑' : '  ';
             let signIcon = '  ';
@@ -3533,40 +3627,63 @@ Options:
     }
     if (sub === 'new') {
         if (wantsHelp(args)) {
-            console.log(`用法: evolclaw aid new <完整AID>
+            console.log(`用法: evolclaw aid new <完整AID> [--force]
 
 创建新 AID 身份：生成 ECDSA 密钥对、向 Issuer 申请证书、构建并上传初始 agent.md。
 
-例: evolclaw aid new reviewer.agentid.pub`);
+选项:
+  --force    强制重新注册，覆盖已存在的身份（即使签名验证失败）
+
+例: evolclaw aid new reviewer.agentid.pub
+    evolclaw aid new reviewer.agentid.pub --force`);
             return;
         }
         const aid = args[1];
+        const force = args.includes('--force');
         if (!aid) {
-            console.error('用法: evolclaw aid new <完整AID>\n例: evolclaw aid new reviewer.agentid.pub');
+            console.error('用法: evolclaw aid new <完整AID> [--force]\n例: evolclaw aid new reviewer.agentid.pub');
             process.exit(1);
         }
         if (!isValidAid(aid)) {
             console.error(`❌ 无效 AID 格式: ${aid}`);
             process.exit(1);
         }
-        const result = await aidCreate(aid, { aunPath });
-        if (!result.alreadyExisted) {
-            const content = buildInitialAgentMd({ aid });
+        try {
+            const result = await aidCreate(aid, { aunPath, force });
+            if (!result.alreadyExisted) {
+                const content = buildInitialAgentMd({ aid });
+                try {
+                    await agentmdPut(content, { aid, aunPath });
+                    console.log('✓ agent.md 已发布');
+                }
+                catch (e) {
+                    console.warn(`⚠ agent.md 发布失败（首次连接将自动重试）: ${String(e.message || e).slice(0, 100)}`);
+                }
+            }
             try {
-                await agentmdPut(content, { aid, client: result.client, aunPath });
-                console.log('✓ agent.md 已发布');
+                await result.client.close();
             }
-            catch (e) {
-                console.warn(`⚠ agent.md 发布失败（首次连接将自动重试）: ${String(e.message || e).slice(0, 100)}`);
+            catch { }
+            try {
+                result.store?.close();
             }
+            catch { }
+            const verb = result.alreadyExisted ? '已存在且有效' : (force ? '已重新创建' : '已创建');
+            console.log(`✓ ${aid} ${verb}`);
+            console.log('  如需上线 AUN 通道，运行 evolclaw agent new ' + aid);
         }
-        try {
-            await result.client.close();
+        catch (e) {
+            if (e.code === 'AID_INVALID') {
+                console.error(`❌ ${e.message}`);
+                process.exit(1);
+            }
+            if (e.code === -32052 || e.constructor?.name === 'IdentityConflictError') {
+                console.error(`❌ AID ${aid} 已在服务端注册，但本地密钥无法匹配。\n` +
+                    `该 AID 可能由其他设备创建，无法在本地恢复。请选择其他名称。`);
+                process.exit(1);
+            }
+            throw e;
         }
-        catch { }
-        const verb = result.alreadyExisted ? '已存在' : '已创建';
-        console.log(`✓ ${aid} ${verb}`);
-        console.log('  如需上线 AUN 通道，运行 evolclaw agent new ' + aid);
         return;
     }
     if (sub === 'delete') {
@@ -4069,7 +4186,6 @@ async function cmdMsg(args) {
     const formatJson = args.includes('--format') && args[args.indexOf('--format') + 1] === 'json';
     const appIdx = args.indexOf('--app');
     const appSlot = appIdx >= 0 ? args[appIdx + 1] : undefined;
-    const asDaemon = args.includes('--as-daemon');
     if (!sub || isHelpFlag(sub)) {
         console.log(`用法: evolclaw msg <command> <from-aid> [args...] [options]
 
@@ -4079,13 +4195,12 @@ Commands:
   send <from> <to> --link <url> [--title T]            发送链接卡片
   send <from> <to> --payload <json>                    发送自定义 payload
   pull <from> [--after-seq N] [--limit N]              拉取收件箱
-  ack <from> <seq> --app <name>                        确认已读（必须传 --app）
+  ack <from> <seq> [--app <name>]                      确认已读
   recall <from> <message-id> [<message-id>...]         撤回消息
   online <from> <target-aid> [<target-aid>...]         查询在线状态
 
 Options:
-  --app <name>          指定应用 slot（隔离 ack 游标）
-  --as-daemon           ack 时显式以 daemon 身份（高危，会污染 daemon 游标）
+  --app <name>          指定应用 slot（独立消费通道，不影响 daemon）
   --format json         输出 JSON 格式
   --encrypt             启用端到端加密
   --thread <id>         指定话题 ID（用于多话题路由）
@@ -4211,7 +4326,7 @@ Options:
     }
     if (sub === 'pull') {
         if (!appSlot) {
-            console.error('⚠ 警告: 未传 --app，将使用 daemon 共享 slot（可能与 daemon 看到同一批消息）');
+            console.warn('⚠ 警告: 未传 --app，当前与 daemon 共享 evolclaw 消费通道。pull 会看到/影响 daemon 的消息消费；如需独立消费请用 --app <name>');
         }
         const afterSeqStr = getArgValue(args, '--after-seq');
         const limitStr = getArgValue(args, '--limit');
@@ -4253,7 +4368,7 @@ Options:
     if (sub === 'ack') {
         const seqStr = args[2];
         if (!seqStr) {
-            console.error('用法: evolclaw msg ack <from> <seq> --app <name>');
+            console.error('用法: evolclaw msg ack <from> <seq> [--app <name>]');
             process.exit(1);
         }
         const seq = Number(seqStr);
@@ -4261,10 +4376,8 @@ Options:
             console.error(`❌ seq 必须是数字: ${seqStr}`);
             process.exit(1);
         }
-        if (!appSlot && !asDaemon) {
-            console.error('❌ ack 必须传 --app <name>（或 --as-daemon 显式以 daemon 身份，高危）');
-            console.error('   理由: 不传 --app 会推进 daemon 共享的 ack 游标，导致 daemon 丢消息');
-            process.exit(1);
+        if (!appSlot) {
+            console.warn('⚠ 警告: 未传 --app，ack 将推进与 daemon 共享的 evolclaw 消费游标，可能影响 daemon 收消息；如需独立请用 --app <name>');
         }
         const result = await msgAck({ from, seq, ...commonOpts });
         if (!result.ok) {
@@ -4355,7 +4468,6 @@ async function cmdGroup(args) {
     const formatJson = args.includes('--format') && args[args.indexOf('--format') + 1] === 'json';
     const appIdx = args.indexOf('--app');
     const appSlot = appIdx >= 0 ? args[appIdx + 1] : undefined;
-    const asDaemon = args.includes('--as-daemon');
     if (!sub || isHelpFlag(sub)) {
         console.log(`用法: evolclaw group <command> <from-aid> [args...] [options]
 
@@ -4364,7 +4476,7 @@ async function cmdGroup(args) {
   send <from> <group-id> --file <path> [--as <type>]   发送群文件
   send <from> <group-id> --payload <json>              发送自定义 payload
   pull <from> <group-id> [--after-seq N] [--limit N]   拉取群消息
-  ack <from> <group-id> <seq> --app <name>             确认已读（必须传 --app）
+  ack <from> <group-id> <seq> [--app <name>]           确认已读
 
 群管理:
   create <from> <name> [--visibility public|private] [--description D] [--join-mode M]  创建群
@@ -4382,8 +4494,7 @@ async function cmdGroup(args) {
   online <from> <group-id>                             查看在线成员
 
 Options:
-  --app <name>          指定应用 slot（隔离 ack 游标）
-  --as-daemon           ack 时显式以 daemon 身份（高危）
+  --app <name>          指定应用 slot（独立消费通道，不影响 daemon）
   --format json         输出 JSON 格式
   --mention <aid>       发送时 @ 某个成员（可多次）
   --mention-all         发送时 @ 所有人
@@ -4496,7 +4607,7 @@ Options:
     if (sub === 'pull') {
         const groupId = requireGroupId();
         if (!appSlot) {
-            console.error('⚠ 警告: 未传 --app，将使用 daemon 共享 slot');
+            console.warn('⚠ 警告: 未传 --app，当前与 daemon 共享 evolclaw 消费通道。pull 会看到/影响 daemon 的消息消费；如需独立消费请用 --app <name>');
         }
         const afterSeqStr = getArgValue(args, '--after-seq');
         const limitStr = getArgValue(args, '--limit');
@@ -4517,7 +4628,7 @@ Options:
         const groupId = requireGroupId();
         const seqStr = args[3];
         if (!seqStr) {
-            console.error('用法: evolclaw group ack <from> <group-id> <seq> --app <name>');
+            console.error('用法: evolclaw group ack <from> <group-id> <seq> [--app <name>]');
             process.exit(1);
         }
         const seq = Number(seqStr);
@@ -4525,9 +4636,8 @@ Options:
             console.error(`❌ seq 必须是数字: ${seqStr}`);
             process.exit(1);
         }
-        if (!appSlot && !asDaemon) {
-            console.error('❌ group ack 必须传 --app <name>（或 --as-daemon 显式以 daemon 身份，高危）');
-            process.exit(1);
+        if (!appSlot) {
+            console.warn('⚠ 警告: 未传 --app，ack 将推进与 daemon 共享的 evolclaw 消费游标，可能影响 daemon 收消息；如需独立请用 --app <name>');
         }
         const result = await groupAck({ from, groupId, seq, ...commonOpts });
         outputResult(result, () => {
@@ -4857,6 +4967,9 @@ export async function main(args) {
             else if (args[1] === 'log') {
                 cmdWatch();
             }
+            else if (args[1] === 'web' || args[1] === 'session') {
+                await cmdWatchWeb();
+            }
             else if (!args[1]) {
                 await cmdWatchMenu();
             }
@@ -4920,6 +5033,11 @@ export async function main(args) {
             await cmdGroup(args.slice(1));
             break;
         }
+        case 'model': {
+            const { cmdModel } = await import('./model.js');
+            await cmdModel(args.slice(1));
+            break;
+        }
         case 'bench': {
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();
@@ -4970,6 +5088,14 @@ Commands:
                           --force                            (覆盖已有 config.json)
                   agent reload       全量 resync（扫磁盘，新增上线、删除下线、修改热更新）
                   agent reload <n>   热重载指定 agent 配置
+  model         模型管理（查看/切换，作用域：全局/agent/关系/会话）
+                  model list         列出可用模型，标注各作用域命中
+                  model current      显示实际生效的模型 + 来源
+                  model info <id>    查看单个模型详情（价格/上下文/模态等）
+                  model use <id>     切换模型（--self/--peer/--session 决定作用域）
+                  model effort <lv>  设置推理强度
+                  model reset        清除指定作用域设置，回落上一级
+                  model help         查看完整用法
   aid           AID 身份管理
                   aid list           列出本地所有 AID
                   aid show <aid>     查看本地 AID 详情（证书有效期、私钥状态）

package/dist/cli/init-channel.js

@@ -463,7 +463,7 @@ export async function setupAunAid(rl, _config) {
             const agentType = typeInput === 'human' ? 'human' : 'ai';
             const content = buildInitialAgentMd({ aid, type: agentType });
             try {
-                await agentmdPut(content, { aid, client: result.client });
+                await agentmdPut(content, { aid });
                 console.log('  ✓ agent.md 已发布并写入本地');
             }
             catch (e) {
@@ -484,6 +484,10 @@ export async function setupAunAid(rl, _config) {
                 await result.client.close();
             }
             catch { /* ignore */ }
+            try {
+                result.store?.close();
+            }
+            catch { /* ignore */ }
         }
         catch (e) {
             const msg = e.message || String(e);