evolclaw 3.1.4 → 3.1.5

package/dist/cli/model.js

@@ -0,0 +1,324 @@
+/**
+ * `evolclaw model` —— 面向 agent 的模型管理命令集。
+ *
+ * 三级作用域由参数决定：
+ *   (无)             → 全局   defaults.json
+ *   --self           → agent  config.json
+ *   --self --peer    → 关系   relations/<peerKey>/preferences.json
+ *
+ * 改某作用域后，对应范围所有会话的下一条消息即时生效（运行时按 关系>agent>全局 解析）。
+ * 与对话内 slash（/model /setmodel /effort /baseagent）互不影响。
+ * 设计见 docs/model-command-design.md。
+ */
+import { isHelpFlag, wantsHelp } from './help.js';
+import { ModelScopeError, normalizePeer, determineScope, activeBaseagent, readScope, writeScope, clearScope, resolveEffectiveModel, } from '../core/model/model-scope.js';
+import { getCatalog, getModelInfo } from '../core/model/model-catalog.js';
+const ALL_EFFORTS = ['low', 'medium', 'high', 'xhigh', 'max', 'auto'];
+const SCOPE_LABEL = {
+    global: '全局', agent: 'agent级', relation: '关系级',
+};
+function getArgValue(args, flag) {
+    const idx = args.indexOf(flag);
+    return idx !== -1 && idx + 1 < args.length ? args[idx + 1] : undefined;
+}
+/** 输出 JSON 并退出（success=false 时 exit 1）。 */
+function emit(formatJson, payload, textFn) {
+    if (formatJson) {
+        console.log(JSON.stringify(payload, null, 2));
+    }
+    else {
+        console.log(textFn());
+    }
+}
+function fail(formatJson, code, message) {
+    if (formatJson) {
+        console.log(JSON.stringify({ ok: false, code, error: message }, null, 2));
+    }
+    else {
+        console.error(`❌ ${message} (${code})`);
+    }
+    process.exit(1);
+}
+/**
+ * 解析 --self / --peer 为作用域选择器。
+ */
+function parseSelector(args, formatJson) {
+    const self = getArgValue(args, '--self');
+    const peerRaw = getArgValue(args, '--peer');
+    let peerKey;
+    if (peerRaw !== undefined) {
+        try {
+            peerKey = normalizePeer(peerRaw);
+        }
+        catch (e) {
+            if (e instanceof ModelScopeError)
+                fail(formatJson, e.code, e.message);
+            throw e;
+        }
+    }
+    const sel = { self, peerKey };
+    // 触发依赖校验（PEER_WITHOUT_SELF）
+    try {
+        determineScope(sel);
+    }
+    catch (e) {
+        if (e instanceof ModelScopeError)
+            fail(formatJson, e.code, e.message);
+        throw e;
+    }
+    return sel;
+}
+const HELP = `用法: evolclaw model <command> [options]
+
+Commands:
+  list                列出可用模型，标注各作用域命中
+  current             显示按优先级解析后实际生效的模型 + 来源
+  info <model-id>     查看单个模型详情（厂商/上下文/价格/模态/effort/状态）
+  use <model-id>      设置模型（作用域由 --self/--peer 决定）
+  reset               清除指定作用域的设置，回落上一级
+  effort <level>      设置推理强度（low|medium|high|xhigh|max|auto）
+
+作用域（由参数决定，越具体越优先：关系 > agent > 全局）:
+  (无参数)                       全局默认  → defaults.json
+  --self <aid>                   agent级   → config.json
+  --self <aid> --peer <X>        关系级    → relations/<peerKey>/preferences.json
+
+改某作用域后，对应范围所有会话的下一条消息即时生效。
+
+Options:
+  --self <aid>        本端 AID
+  --peer <X>          对端：channelType#channelId 或裸 aid（裸 aid 视为 aun#<aid>）
+  --effort <level>    （use 专用）同时设置推理强度
+  --format json       输出 JSON
+  --help, -h          各子命令均支持
+
+示例:
+  evolclaw model list
+  evolclaw model current --self bot.agentid.pub --peer aun#alice.agentid.pub
+  evolclaw model info deepseek-v4-pro
+  evolclaw model use opus
+  evolclaw model use deepseek-v4-pro --self bot.agentid.pub --peer alice.agentid.pub
+  evolclaw model effort high --self bot.agentid.pub
+  evolclaw model reset --self bot.agentid.pub --peer alice.agentid.pub`;
+async function dispatch(sub, args, formatJson) {
+    switch (sub) {
+        case 'list': return await cmdList(args, formatJson);
+        case 'current': return await cmdCurrent(args, formatJson);
+        case 'info': return await cmdInfo(args, formatJson);
+        case 'use': return await cmdUse(args, formatJson);
+        case 'reset': return await cmdReset(args, formatJson);
+        case 'effort': return await cmdEffort(args, formatJson);
+        default:
+            fail(formatJson, 'UNKNOWN_SUBCOMMAND', `未知子命令: ${sub}（model --help 查看用法）`);
+    }
+}
+// ── list ──────────────────────────────────────────────────────────────
+const ICON = {
+    global: '⬡', agent: '◆', relation: '★',
+};
+async function cmdList(args, formatJson) {
+    if (wantsHelp(args)) {
+        console.log(HELP);
+        return;
+    }
+    const sel = parseSelector(args, formatJson);
+    const ba = activeBaseagent(sel.self);
+    const cat = await getCatalog(sel.self, ba);
+    const resolved = resolveEffectiveModel(sel, ba);
+    // 各作用域当前值（仅可达作用域）
+    const scopes = {};
+    scopes.global = readScope('global', sel, ba);
+    if (sel.self)
+        scopes.agent = readScope('agent', sel, ba);
+    if (sel.self && sel.peerKey)
+        scopes.relation = readScope('relation', sel, ba);
+    emit(formatJson, {
+        ok: true,
+        effective: { model: resolved.model ?? null, source: resolved.source ?? null },
+        scopes,
+        catalogSource: cat.source,
+        models: cat.models,
+    }, () => {
+        const lines = [];
+        lines.push(`当前生效: ${resolved.model ?? '(未设置，回落 SDK 默认)'}` +
+            (resolved.source ? `  (来源: ${SCOPE_LABEL[resolved.source]})` : ''));
+        lines.push('');
+        const srcTag = cat.source === 'mock' ? ' [mock]'
+            : cat.source === 'remote' ? ' [remote]'
+                : '';
+        lines.push(`可用模型 (${cat.models.length})${srcTag}:`);
+        const byScope = (m) => {
+            const tags = [];
+            for (const s of ['relation', 'agent', 'global']) {
+                if (scopes[s]?.model === m)
+                    tags.push(`${ICON[s]}${SCOPE_LABEL[s]}`);
+            }
+            return tags.join(' ');
+        };
+        for (const e of cat.models) {
+            const live = resolved.model === e.id ? '✓' : ' ';
+            const tag = byScope(e.id);
+            lines.push(`  ${live} ${e.id.padEnd(28)} ${tag}`.trimEnd());
+        }
+        return lines.join('\n');
+    });
+}
+// ── current ───────────────────────────────────────────────────────────
+async function cmdCurrent(args, formatJson) {
+    if (wantsHelp(args)) {
+        console.log(HELP);
+        return;
+    }
+    const sel = parseSelector(args, formatJson);
+    const ba = activeBaseagent(sel.self);
+    const resolved = resolveEffectiveModel(sel, ba);
+    emit(formatJson, {
+        ok: true,
+        model: resolved.model ?? null,
+        effort: resolved.effort ?? null,
+        source: resolved.source ?? null,
+        chain: resolved.chain.map(c => ({ scope: c.scope, model: c.model ?? null, hit: c.hit })),
+    }, () => {
+        const lines = [];
+        lines.push(`当前生效模型: ${resolved.model ?? '(未设置，回落 SDK 默认)'}`);
+        lines.push(`推理强度:     ${resolved.effort ?? 'auto'}`);
+        lines.push(`来源:         ${resolved.source ? SCOPE_LABEL[resolved.source] : '无'}`);
+        const chain = resolved.chain.map(c => `${SCOPE_LABEL[c.scope]}${c.hit ? ' ✓' : ''}${c.model ? `(${c.model})` : ''}`).join(' > ');
+        lines.push(`解析链:       ${chain}`);
+        return lines.join('\n');
+    });
+}
+// ── info ──────────────────────────────────────────────────────────────
+async function cmdInfo(args, formatJson) {
+    if (wantsHelp(args)) {
+        console.log(HELP);
+        return;
+    }
+    const modelId = args[1] && !args[1].startsWith('--') ? args[1] : undefined;
+    if (!modelId)
+        fail(formatJson, 'MISSING_MODEL_ID', 'info 需要 <model-id>');
+    const self = getArgValue(args, '--self');
+    const info = await getModelInfo(modelId, self);
+    emit(formatJson, { ok: true, ...info }, () => {
+        const price = info.pricing;
+        const fmtPrice = (v) => v === null ? '— (mock)' : `$${v} / 1M tokens`;
+        return [
+            `模型: ${info.id}`,
+            `  厂商:       ${info.owned_by}`,
+            `  上下文窗口: ${info.context_window ?? '—'} tokens`,
+            `  最大输出:   ${info.max_output_tokens ?? '—'} tokens`,
+            `  输入价格:   ${fmtPrice(price?.input_per_mtok ?? null)}`,
+            `  输出价格:   ${fmtPrice(price?.output_per_mtok ?? null)}`,
+            `  支持模态:   ${info.modalities.join(', ')}${info.mocked ? ' (mock)' : ''}`,
+            `  推理强度:   ${info.supports_effort ? '支持' : '不支持'}`,
+            `  状态:       ${info.status === 'available' ? '✓ 可用' : info.status}`,
+        ].join('\n');
+    });
+}
+// ── use / effort / reset 共用写入逻辑 ───────────────────────────────────
+function describeWrite(scope, sel, model, effort, formatJson) {
+    emit(formatJson, {
+        ok: true,
+        scope,
+        self: sel.self ?? null,
+        peerKey: sel.peerKey ?? null,
+        model: model ?? undefined,
+        effort: effort ?? undefined,
+    }, () => {
+        const lines = ['✓ 已设置', `  作用域: ${SCOPE_LABEL[scope]}` +
+                (sel.peerKey ? ` (${sel.peerKey})` : '') + (sel.self ? ` [self=${sel.self}]` : '')];
+        if (model !== null)
+            lines.push(`  模型:   ${model}`);
+        if (effort !== null)
+            lines.push(`  推理强度: ${effort}`);
+        lines.push('  生效:   该范围所有会话的下一条消息起生效。');
+        return lines.join('\n');
+    });
+}
+async function cmdUse(args, formatJson) {
+    if (wantsHelp(args)) {
+        console.log(HELP);
+        return;
+    }
+    const modelId = args[1] && !args[1].startsWith('--') ? args[1] : undefined;
+    if (!modelId)
+        fail(formatJson, 'MISSING_MODEL_ID', 'use 需要 <model-id>');
+    const sel = parseSelector(args, formatJson);
+    const scope = determineScope(sel);
+    const ba = activeBaseagent(sel.self);
+    // 校验模型在 catalog 中
+    const cat = await getCatalog(sel.self, ba);
+    if (!cat.models.some(m => m.id === modelId)) {
+        fail(formatJson, 'UNKNOWN_MODEL', `模型不在目录中: ${modelId}（model list 查看可用模型）`);
+    }
+    const effort = getArgValue(args, '--effort');
+    if (effort !== undefined && !ALL_EFFORTS.includes(effort)) {
+        fail(formatJson, 'INVALID_EFFORT', `无效推理强度: ${effort}（${ALL_EFFORTS.join('/')})`);
+    }
+    const effortVal = effort === 'auto' ? null : (effort ?? undefined);
+    try {
+        writeScope(scope, sel, ba, { model: modelId, effort: effortVal });
+    }
+    catch (e) {
+        if (e instanceof ModelScopeError)
+            fail(formatJson, e.code, e.message);
+        throw e;
+    }
+    describeWrite(scope, sel, modelId, effort ?? null, formatJson);
+}
+async function cmdEffort(args, formatJson) {
+    if (wantsHelp(args)) {
+        console.log(HELP);
+        return;
+    }
+    const level = args[1] && !args[1].startsWith('--') ? args[1] : undefined;
+    if (!level)
+        fail(formatJson, 'INVALID_EFFORT', 'effort 需要 <level>（low|medium|high|xhigh|max|auto）');
+    if (!ALL_EFFORTS.includes(level)) {
+        fail(formatJson, 'INVALID_EFFORT', `无效推理强度: ${level}（${ALL_EFFORTS.join('/')})`);
+    }
+    const sel = parseSelector(args, formatJson);
+    const scope = determineScope(sel);
+    const ba = activeBaseagent(sel.self);
+    const val = level === 'auto' ? null : level;
+    try {
+        writeScope(scope, sel, ba, { effort: val });
+    }
+    catch (e) {
+        if (e instanceof ModelScopeError)
+            fail(formatJson, e.code, e.message);
+        throw e;
+    }
+    describeWrite(scope, sel, null, level, formatJson);
+}
+async function cmdReset(args, formatJson) {
+    if (wantsHelp(args)) {
+        console.log(HELP);
+        return;
+    }
+    const sel = parseSelector(args, formatJson);
+    const scope = determineScope(sel);
+    const ba = activeBaseagent(sel.self);
+    try {
+        clearScope(scope, sel, ba);
+    }
+    catch (e) {
+        if (e instanceof ModelScopeError)
+            fail(formatJson, e.code, e.message);
+        throw e;
+    }
+    emit(formatJson, {
+        ok: true, scope, self: sel.self ?? null, peerKey: sel.peerKey ?? null,
+    }, () => {
+        return `✓ 已清除 ${SCOPE_LABEL[scope]} 设置，回落上一级（该范围所有会话下条消息生效）`;
+    });
+}
+export async function cmdModel(args) {
+    const sub = args[0];
+    const formatJson = getArgValue(args, '--format') === 'json';
+    if (!sub || isHelpFlag(sub)) {
+        console.log(HELP);
+        return;
+    }
+    await dispatch(sub, args, formatJson);
+}

package/dist/cli/net-check.js

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import path from 'path';
+import os from 'os';
 import net from 'net';
 import tls from 'tls';
 import dns from 'dns/promises';
@@ -7,7 +8,7 @@ import https from 'https';
 // @ts-ignore
 import { WebSocket } from 'ws';
 import { 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 GREEN = '\x1b[32m';
 const RED = '\x1b[31m';
@@ -21,7 +22,7 @@ function ok(msg) { return `  ${GREEN}✓${RST} ${msg}`; }
 function fail(msg) { return `  ${RED}✗${RST} ${msg}`; }
 function skip(msg) { return `  ${YELLOW}○${RST} ${DIM}${msg}${RST}`; }
 function ms(n) { return `${DIM}${n}ms${RST}`; }
-function step(n, label) { return `${DIM}[${n}/10]${RST} ${CYAN}${label}${RST}`; }
+function step(n, label) { return `${DIM}[${n}/11]${RST} ${CYAN}${label}${RST}`; }
 const isZh = (process.env.LANG || process.env.LC_ALL || process.env.LANGUAGE || Intl.DateTimeFormat().resolvedOptions().locale || '').toLowerCase().startsWith('zh');
 const i18n = {
     resolve: isZh ? '解析' : 'resolve',
@@ -124,7 +125,7 @@ function suppressSdkOutput(fn) {
     });
 }
 // ==================== Check pipeline ====================
-async function runCheck(aid, formatJson) {
+async function runCheck(aid, formatJson, kickTest) {
     const results = [];
     const log = (r) => {
         results.push(r);
@@ -216,18 +217,23 @@ async function runCheck(aid, formatJson) {
         }
     }
     // ── Step 7: AID 认证 ──
-    let accessToken;
+    let authResult;
     try {
         const start = Date.now();
         const aunPath = process.env.AUN_HOME || defaultAunPath();
-        const result = await suppressSdkOutput(async () => {
-            const client = await createAunClient({ aunPath });
-            await client.auth.createAid({ aid });
-            const authResult = await client.auth.authenticate({ aid });
-            await client.close().catch(() => { });
-            return authResult;
+        authResult = await suppressSdkOutput(async () => {
+            const store = await getAidStore({ slotId: SLOT.netcheck, aunPath });
+            try {
+                const client = await loadClient(store, aid);
+                const result = await client.authenticate();
+                await client.close();
+                return result;
+            }
+            finally {
+                store.close();
+            }
         });
-        accessToken = result?.access_token;
+        const accessToken = authResult?.access_token;
         const elapsed = Date.now() - start;
         if (accessToken) {
             log({ step: 'Auth', index: 7, ok: true, detail: `${aid} ${i18n.authOk} (login1→login2→token)`, ms: elapsed });
@@ -270,16 +276,17 @@ async function runCheck(aid, formatJson) {
     try {
         const start = Date.now();
         const aunPath = process.env.AUN_HOME || defaultAunPath();
-        const sendResult = await suppressSdkOutput(async () => {
-            const client = await createAunClient({ aunPath });
-            await client.auth.createAid({ aid });
-            const authResult = await client.auth.authenticate({ aid });
-            const at = authResult?.access_token || client._access_token;
-            const gw = client._gatewayUrl || authResult?.gateway;
-            await client.connect({ access_token: at, gateway: gw, connection_kind: 'short' }, { auto_reconnect: false });
-            const r = await client.call('meta.ping', {});
-            await client.close().catch(() => { });
-            return r;
+        await suppressSdkOutput(async () => {
+            const store = await getAidStore({ slotId: SLOT.netcheck, aunPath });
+            try {
+                const client = await loadClient(store, aid);
+                await client.connect();
+                await client.call('meta.ping', {});
+                await client.close();
+            }
+            finally {
+                store.close();
+            }
         });
         const elapsed = Date.now() - start;
         log({ step: 'Ping', index: 9, ok: true, detail: `meta.ping ${i18n.pingOk}`, ms: elapsed });
@@ -362,14 +369,14 @@ async function runCheck(aid, formatJson) {
             return results;
         }
         if (!formatJson) {
-            console.log(`  ${DIM}[10/10]${RST} ${CYAN}Echo${RST}  ${DIM}${targets.length} target(s)${RST}`);
+            console.log(`  ${DIM}[10/11]${RST} ${CYAN}Echo${RST}  ${DIM}${targets.length} target(s)${RST}`);
         }
         const echoResults = [];
         // 读取所有目标的 agent.md（含签名验证）获取昵称和类型
         const { agentmdGet: agentmdGetFn } = await import('../aun/aid/index.js');
         const targetMeta = new Map();
         if (!formatJson) {
-            console.log(`  ${DIM}[10/10]${RST} ${CYAN}Echo${RST}  ${DIM}reading agent.md for ${targets.length} target(s)...${RST}`);
+            console.log(`  ${DIM}[10/11]${RST} ${CYAN}Echo${RST}  ${DIM}reading agent.md for ${targets.length} target(s)...${RST}`);
         }
         await Promise.all(targets.map(async (t) => {
             const start = Date.now();
@@ -420,29 +427,31 @@ async function runCheck(aid, formatJson) {
             const label = targetLabel(target);
             try {
                 const replyText = await suppressSdkOutput(async () => {
-                    const client = await createAunClient({ aunPath });
-                    await client.auth.createAid({ aid });
-                    const authResult = await client.auth.authenticate({ aid });
-                    const at = authResult?.access_token || client._access_token;
-                    const gw = client._gatewayUrl || authResult?.gateway;
-                    await client.connect({ access_token: at, gateway: gw, slot_id: 'net-check', connection_kind: 'short' }, { auto_reconnect: false });
-                    // 取基线 seq
-                    const baseline = await client.call('message.pull', { limit: 100 });
-                    const baselineSeq = baseline?.latest_seq ?? 0;
-                    if (baselineSeq > 0) {
-                        await client.call('message.ack', { seq: baselineSeq });
+                    const store = await getAidStore({ slotId: SLOT.netcheck, aunPath });
+                    try {
+                        const client = await loadClient(store, aid);
+                        await client.connect();
+                        // 取基线 seq
+                        const baseline = await client.call('message.pull', { limit: 100 });
+                        const baselineSeq = baseline?.latest_seq ?? 0;
+                        if (baselineSeq > 0) {
+                            await client.call('message.ack', { seq: baselineSeq });
+                        }
+                        await client.call('message.send', {
+                            to: target,
+                            payload: { type: 'text', text: 'echo[nc]' },
+                            encrypt: false,
+                        });
+                        await new Promise(r => setTimeout(r, 1500));
+                        const pullResult = await client.call('message.pull', { after_seq: baselineSeq, limit: 10 });
+                        await client.close();
+                        const messages = pullResult?.messages || [];
+                        const reply = messages.find((m) => m.from === target && m.payload?.text?.includes('[EvolClaw.'));
+                        return reply?.payload?.text || null;
+                    }
+                    finally {
+                        store.close();
                     }
-                    await client.call('message.send', {
-                        to: target,
-                        payload: { type: 'text', text: 'echo[nc]' },
-                        encrypt: false,
-                    });
-                    await new Promise(r => setTimeout(r, 1500));
-                    const pullResult = await client.call('message.pull', { after_seq: baselineSeq, limit: 10 });
-                    await client.close().catch(() => { });
-                    const messages = pullResult?.messages || [];
-                    const reply = messages.find((m) => m.from === target && m.payload?.text?.includes('[EvolClaw.'));
-                    return reply?.payload?.text || null;
                 });
                 const elapsed = Date.now() - targetStart;
                 if (replyText) {
@@ -481,6 +490,77 @@ async function runCheck(aid, formatJson) {
     catch (e) {
         log({ step: 'Echo', index: 10, ok: false, detail: `echo ${i18n.failed}: ${e.message?.slice(0, 100) || String(e)}` });
     }
+    // ── Step 11: 踢人测试 / extra_info 验证 ──
+    if (kickTest) {
+        try {
+            const kickStart = Date.now();
+            const aunPath = process.env.AUN_HOME || defaultAunPath();
+            const hostname = os.hostname();
+            const kickResult = await suppressSdkOutput(async () => {
+                const store = await getAidStore({ slotId: SLOT.netcheck, aunPath });
+                try {
+                    const client = await loadClient(store, aid);
+                    const disconnectEvents = [];
+                    client.on('gateway.disconnect', (payload) => {
+                        disconnectEvents.push(payload);
+                    });
+                    await client.connect({
+                        connection_kind: 'long',
+                        extra_info: {
+                            app: 'evolclaw',
+                            role: 'netcheck-kicktest',
+                            pid: process.pid,
+                            hostname,
+                        },
+                    });
+                    // 等待 3 秒收集可能的 disconnect 事件
+                    await new Promise(r => setTimeout(r, 3000));
+                    await client.close();
+                    return { connected: true, disconnectEvents };
+                }
+                finally {
+                    store.close();
+                }
+            });
+            const elapsed = Date.now() - kickStart;
+            const { connected, disconnectEvents } = kickResult;
+            if (connected) {
+                if (disconnectEvents.length > 0) {
+                    const evt = disconnectEvents[0];
+                    const selfInfo = evt.detail?.self_extra_info ? JSON.stringify(evt.detail.self_extra_info) : 'none';
+                    const newInfo = evt.detail?.new_extra_info ? JSON.stringify(evt.detail.new_extra_info) : 'none';
+                    log({
+                        step: 'KickTest',
+                        index: 11,
+                        ok: true,
+                        detail: `connected, received disconnect (code=${evt.code}, self=${selfInfo}, new=${newInfo})`,
+                        ms: elapsed,
+                    });
+                    if (!formatJson) {
+                        console.log(`    ${YELLOW}⚠${RST} ${DIM}This test may have disconnected the running daemon (it will auto-reconnect)${RST}`);
+                    }
+                }
+                else {
+                    log({
+                        step: 'KickTest',
+                        index: 11,
+                        ok: true,
+                        detail: `connected, no disconnect event (daemon may not be running or already disconnected)`,
+                        ms: elapsed,
+                    });
+                }
+            }
+            else {
+                log({ step: 'KickTest', index: 11, ok: false, detail: `failed to connect`, ms: elapsed });
+            }
+        }
+        catch (e) {
+            log({ step: 'KickTest', index: 11, ok: false, detail: `kick test failed: ${e.message?.slice(0, 100) || String(e)}` });
+        }
+    }
+    else {
+        log({ step: 'KickTest', index: 11, ok: true, detail: `skipped (use --kick-test to enable)`, skipped: true });
+    }
     return results;
 }
 // 添加这个常量到 ANSI 块（如果还没有）
@@ -563,10 +643,11 @@ function shuffle(arr) {
 export async function cmdNet(args) {
     const sub = args[0];
     const formatJson = args.includes('--format') && args.includes('json');
+    const kickTest = args.includes('--kick-test');
     if (isHelpFlag(sub)) {
-        console.log(`用法: evolclaw net check [<aid>] [--format json]
+        console.log(`用法: evolclaw net check [<aid>] [--format json] [--kick-test]
 
-检查 AUN 网络链路连通性（10 步逐层诊断）。
+检查 AUN 网络链路连通性（11 步逐层诊断）。
 
 步骤:
   1.  DNS (AID)      AID 域名解析
@@ -578,13 +659,15 @@ export async function cmdNet(args) {
   7.  Auth           AID 认证（login1 + login2 → token）
   8.  Session        会话建立
   9.  Ping           meta.ping RPC
-  10. Message        self-to-self 消息收发
+  10. Echo           self-to-self 消息收发
+  11. KickTest       踢人测试 / extra_info 验证（可选）
 
 参数:
   <aid>    要检查的 AID（可选，默认取前 3 个本地 AID）
 
 选项:
-  --format json    JSON 格式输出`);
+  --format json    JSON 格式输出
+  --kick-test      启用踢人测试（会断开 daemon 长连接，daemon 会自动重连）`);
         return;
     }
     if (sub && sub !== 'check' && !sub.startsWith('-') && !sub.includes('.')) {
@@ -616,7 +699,7 @@ export async function cmdNet(args) {
         if (!formatJson) {
             console.log(`\n${BOLD}── ${targetAid} ──${RST}\n`);
         }
-        const results = await runCheck(targetAid, formatJson);
+        const results = await runCheck(targetAid, formatJson, kickTest);
         allResults.push({ aid: targetAid, checks: results });
     }
     if (formatJson) {

package/dist/cli/watch-msg.js

@@ -131,11 +131,11 @@ function shortAid(aid) {
     return aid.split('.')[0];
 }
 // ==================== Data Layer ====================
-function getSessionsAunDir() {
+export function getSessionsAunDir() {
     const p = resolvePaths();
     return path.join(p.sessionsDir, 'aun');
 }
-function listLocalAids(aunDir) {
+export function listLocalAids(aunDir) {
     try {
         return fs.readdirSync(aunDir, { withFileTypes: true })
             .filter(e => e.isDirectory())
@@ -145,7 +145,7 @@ function listLocalAids(aunDir) {
         return [];
     }
 }
-function listPeers(aunDir, localAid) {
+export function listPeers(aunDir, localAid) {
     const aidDir = path.join(aunDir, encodeSegment(localAid));
     try {
         return fs.readdirSync(aidDir, { withFileTypes: true })
@@ -156,7 +156,7 @@ function listPeers(aunDir, localAid) {
         return [];
     }
 }
-function readMessages(aunDir, localAid, peerId) {
+export function readMessages(aunDir, localAid, peerId) {
     const msgPath = path.join(aunDir, encodeSegment(localAid), encodeSegment(peerId), 'messages.jsonl');
     return readAllJsonlLines(msgPath);
 }
@@ -173,7 +173,7 @@ function readPeerName(aunDir, localAid, peerId) {
 function encodeSegment(s) {
     return s.replace(/[/%\\:*?"<>|]/g, ch => '%' + ch.charCodeAt(0).toString(16).toUpperCase().padStart(2, '0'));
 }
-function loadAidInfo(aunDir, aid) {
+export function loadAidInfo(aunDir, aid) {
     const peers = listPeers(aunDir, aid);
     let totalIn = 0, totalOut = 0;
     for (const peer of peers) {
@@ -187,7 +187,7 @@ function loadAidInfo(aunDir, aid) {
     }
     return { aid, totalIn, totalOut, peerCount: peers.length };
 }
-function loadPeerInfos(aunDir, localAid) {
+export function loadPeerInfos(aunDir, localAid) {
     const peers = listPeers(aunDir, localAid);
     const infos = [];
     for (const peerId of peers) {
@@ -207,7 +207,7 @@ function loadPeerInfos(aunDir, localAid) {
     infos.sort((a, b) => b.lastAt - a.lastAt);
     return infos;
 }
-function loadAllMessages(aunDir, localAid) {
+export function loadAllMessages(aunDir, localAid) {
     const peers = listPeers(aunDir, localAid);
     const all = [];
     for (const peer of peers) {

package/dist/cli/watch-web/debug-log.js

@@ -0,0 +1,18 @@
+/**
+ * watch-web 调试日志 — 写入 $EVOLCLAW_HOME/logs/watch-web.log。
+ *
+ * cmdWatchWeb 启动时清空该文件并调用 setDebugLog 注入 writer，
+ * 各 source / server 通过 dlog() 写调试信息，建立「运行→看日志→定位」的闭环。
+ */
+let _writer = null;
+export function setDebugLog(writer) {
+    _writer = writer;
+}
+export function dlog(line) {
+    if (_writer) {
+        try {
+            _writer(line);
+        }
+        catch { /* ignore */ }
+    }
+}