evolclaw 3.0.0 → 3.1.1

package/README.md

@@ -263,7 +263,7 @@ evolclaw/
 - `/check` - 系统健康检查（详情）
 - `/activity [all|dm|owner|none]` - 查看/控制中间输出显示模式
 - `/chatmode [interactive|proactive]` - 查看/切换会话模式
-- `/dispatch [mention|all]` - 群聊分发模式（仅 @ 响应或广播）
+- `/dispatch [mention|broadcast]` - 群聊分发模式（仅 @ 响应或广播）
 - `/trigger <动作> ...` - 设置/查看 AI 自主触发器（延迟/定时/周期）
 - `/restart <channel>` - 重连指定渠道
 

package/bin/ec.js

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+import fs from 'fs';
+import path from 'path';
+import { spawnSync } from 'child_process';
+import { fileURLToPath, pathToFileURL } from 'url';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const here = path.dirname(fileURLToPath(import.meta.url));
+const repoRoot = path.resolve(here, '..');
+const srcEntry = path.join(repoRoot, 'src', 'cli', 'index.ts');
+const distEntry = path.join(repoRoot, 'dist', 'cli', 'index.js');
+const args = process.argv.slice(2);
+
+if (fs.existsSync(srcEntry)) {
+  try {
+    const tsxImport = pathToFileURL(require.resolve('tsx')).href;
+    const result = spawnSync(process.execPath, ['--import', tsxImport, srcEntry, ...args], { stdio: 'inherit' });
+    process.exit(result.status ?? (result.error ? 1 : 0));
+  } catch {}
+}
+
+if (fs.existsSync(distEntry)) {
+  const result = spawnSync(process.execPath, [distEntry, ...args], { stdio: 'inherit' });
+  process.exit(result.status ?? (result.error ? 1 : 0));
+}
+
+console.error('ec: missing CLI entrypoint');
+process.exit(1);

package/dist/agents/baseagent-normalize.js

@@ -0,0 +1,19 @@
+const BASEAGENT_ALIASES = {
+    claude: { canonical: 'claude', displayName: 'Claude Code' },
+    cc: { canonical: 'claude', displayName: 'Claude Code' },
+    'claude-code': { canonical: 'claude', displayName: 'Claude Code' },
+    'claude code': { canonical: 'claude', displayName: 'Claude Code' },
+    claudecode: { canonical: 'claude', displayName: 'Claude Code' },
+    codex: { canonical: 'codex', displayName: 'Codex' },
+    'codex-cli': { canonical: 'codex', displayName: 'Codex' },
+    'codex cli': { canonical: 'codex', displayName: 'Codex' },
+    gemini: { canonical: 'gemini', displayName: 'Gemini CLI' },
+    'gemini-cli': { canonical: 'gemini', displayName: 'Gemini CLI' },
+    'gemini cli': { canonical: 'gemini', displayName: 'Gemini CLI' },
+    geminicli: { canonical: 'gemini', displayName: 'Gemini CLI' },
+    hermes: { canonical: 'hermes', displayName: 'Hermes' },
+};
+export function normalizeBaseagent(input) {
+    const key = String(input || '').trim().toLowerCase().replace(/_/g, '-');
+    return BASEAGENT_ALIASES[key] || { canonical: 'unknown', displayName: input ? String(input) : 'Unknown' };
+}

package/dist/agents/claude-runner.js

@@ -398,6 +398,25 @@ export class AgentRunner {
         // 尝试发送交互卡片
         let cardSent = false;
         if (permCtx.adapter?.send) {
+            // 发送计划内容：找 plans 目录中最新修改的 .md 文件
+            if (sendPrompt) {
+                try {
+                    const plansDir = path.join(process.env.HOME || '/root', '.claude', 'plans');
+                    const files = fs.readdirSync(plansDir)
+                        .filter((f) => f.endsWith('.md'))
+                        .map((f) => ({ name: f, mtime: fs.statSync(path.join(plansDir, f)).mtimeMs }))
+                        .sort((a, b) => b.mtime - a.mtime);
+                    if (files.length > 0) {
+                        const planContent = fs.readFileSync(path.join(plansDir, files[0].name), 'utf-8');
+                        if (planContent.trim()) {
+                            await sendPrompt(`📋 **计划内容**\n\n${planContent}`);
+                        }
+                    }
+                }
+                catch {
+                    // 读取失败不影响后续审批流程
+                }
+            }
             const requestId = `plan-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
             const interaction = {
                 type: 'interaction',
@@ -494,10 +513,11 @@ export class AgentRunner {
      * 所有 SDK 特有的事件类型引用封装在此方法内
      */
     async *transformStream(sdkStream, sessionId) {
-        let hasTextDelta = false;
         let lastSessionId;
         // tool_use_id → tool_name 映射，用于从 SDKUserMessage 的 tool_result 块中还原工具名
         const toolUseNames = new Map();
+        let turnCount = 0;
+        const seenMessageIds = new Set();
         for await (const event of sdkStream) {
             // 提取 session_id（任意 SDK 事件都可能携带）
             if (event.session_id && event.session_id !== lastSessionId) {
@@ -505,11 +525,6 @@ export class AgentRunner {
                 this.updateSessionId(sessionId, event.session_id);
                 yield { type: 'session_id', sessionId: event.session_id };
             }
-            // text_delta → text
-            if (event.type === 'text_delta' && event.text) {
-                hasTextDelta = true;
-                yield { type: 'text', text: event.text };
-            }
             // system: compact_boundary → compact
             if (event.type === 'system' && event.subtype === 'compact_boundary') {
                 yield { type: 'compact', preTokens: event.compact_metadata?.pre_tokens || 0 };
@@ -529,15 +544,31 @@ export class AgentRunner {
             }
             // assistant: 提取 tool_use 和文本（仅无 text_delta 时提取文本）
             if (event.type === 'assistant' && event.message?.content) {
+                const msgId = event.message.id;
+                if (!msgId || !seenMessageIds.has(msgId)) {
+                    if (msgId)
+                        seenMessageIds.add(msgId);
+                    turnCount++;
+                }
+                // 统计本轮 base agent 全部输出字符数（text + tool_use input）
+                let turnOutputChars = 0;
+                for (const content of event.message.content) {
+                    if (content.type === 'tool_use') {
+                        const inputStr = typeof content.input === 'string' ? content.input : JSON.stringify(content.input || '');
+                        turnOutputChars += inputStr.length;
+                    }
+                    else if (content.type === 'text' && content.text) {
+                        turnOutputChars += content.text.length;
+                    }
+                }
                 for (const content of event.message.content) {
                     if (content.type === 'tool_use') {
-                        // 记录 id → name 映射，供后续 tool_result 使用
                         if (content.id)
                             toolUseNames.set(content.id, content.name);
-                        yield { type: 'tool_use', name: content.name, input: content.input, callId: content.id };
+                        yield { type: 'tool_use', name: content.name, input: content.input, callId: content.id, turn: turnCount, outputTokens: turnOutputChars };
                     }
-                    else if (content.type === 'text' && content.text && !hasTextDelta) {
-                        yield { type: 'text', text: content.text };
+                    else if (content.type === 'text' && content.text) {
+                        yield { type: 'text', text: content.text, outputTokens: turnOutputChars, turn: turnCount };
                     }
                 }
             }
@@ -589,7 +620,11 @@ export class AgentRunner {
                     costUsd: event.total_cost_usd,
                     terminalReason: event.terminal_reason,
                     sessionTitle: event.session_title,
+                    numTurns: event.num_turns,
+                    usage: event.usage,
                 };
+                // result 是 SDK 流的终结事件，不再等待后续（防止 interrupt 后流不关闭导致挂起）
+                return;
             }
         }
     }
@@ -762,7 +797,7 @@ export class AgentRunner {
         const sdkPermissionMode = this.toSdkPermissionMode();
         logger.info(`[AgentRunner] runQuery model=${this.model} effort=${this.effort ?? 'auto'} permMode=${this.permissionMode} sdkMode=${sdkPermissionMode}`);
         if (systemPromptAppend) {
-            logger.info(`[AgentRunner] systemPromptAppend (full):\n${systemPromptAppend}`);
+            logger.info(`[AgentRunner] systemPromptAppend: ${systemPromptAppend.length} chars`);
         }
         else {
             logger.info(`[AgentRunner] systemPromptAppend: none`);
@@ -1059,7 +1094,7 @@ export class AgentRunner {
 export class ClaudeAgentPlugin {
     name = 'claude';
     isEnabled(agent) {
-        return !!agent.config.baseagents?.claude;
+        return agent.baseagent === 'claude';
     }
     createAgent(agent, callbacks) {
         const override = agent.config.baseagents?.claude;

package/dist/agents/codex-runner.js

@@ -302,6 +302,8 @@ export class CodexRunner {
 export class CodexAgentPlugin {
     name = 'codex';
     isEnabled(agent) {
+        if (agent.baseagent !== 'codex')
+            return false;
         if (!agent.config.baseagents?.codex)
             return false;
         try {

package/dist/agents/gemini-runner.js

@@ -14,6 +14,7 @@ import fs from 'fs';
 import path from 'path';
 import os from 'os';
 import { resolveGoogleConfig } from './resolve.js';
+import { commandExists } from '../utils/cross-platform.js';
 import { GeminiSessionFileAdapter } from '../core/session/adapters/gemini-session-file-adapter.js';
 import { logger } from '../utils/logger.js';
 // Strip ANSI escape codes from Gemini CLI text output.
@@ -406,17 +407,16 @@ export class GeminiRunner {
 export class GeminiAgentPlugin {
     name = 'gemini';
     isEnabled(agent) {
-        if (!agent.config.baseagents?.gemini)
+        if (agent.baseagent !== 'gemini')
             return false;
-        try {
-            const override = agent.config.baseagents.gemini;
-            const syntheticConfig = { agents: { gemini: override } };
-            const resolved = resolveGoogleConfig(syntheticConfig, override);
-            return !!resolved.cliPath;
-        }
-        catch {
+        const geminiCfg = agent.config.baseagents?.gemini;
+        if (!geminiCfg)
             return false;
-        }
+        if (geminiCfg.cliPath)
+            return true;
+        if (geminiCfg.apiKey && !geminiCfg.apiKey.includes('your-') && !geminiCfg.apiKey.includes('placeholder'))
+            return true;
+        return commandExists('gemini');
     }
     createAgent(agent, callbacks) {
         const override = agent.config.baseagents?.gemini;

package/dist/agents/kit-renderer.js

@@ -0,0 +1,281 @@
+import fs from 'fs';
+import path from 'path';
+import { kitsDir, eckDebugDir, resolveRoot } from '../paths.js';
+import { logger } from '../utils/logger.js';
+// ── Param descriptions (for debug output) ──
+const PARAM_DESCRIPTIONS = {
+    EVOLCLAW_HOME: '用户数据根目录',
+    PACKAGE_ROOT: 'evolclaw 包根目录',
+    CURRENT_PROJECT: '当前项目完整路径',
+    selfAid: '当前 agent 的 AID',
+    selfName: '当前 agent 的显示名',
+    hasPersona: '是否有 persona 内容',
+    hasWorkingMemory: '是否有 working memory',
+    peerId: '对端在该渠道的原生 ID',
+    peerKey: '对端跨渠道唯一标识（channel#urlEncode(peerId)）',
+    peerName: '对端显示名',
+    peerRole: '对端角色',
+    groupId: '群组 ID（群聊时）',
+    scene: '场景类型',
+    chatType: '聊天类型',
+    channel: '当前渠道',
+    venueUid: 'venue 唯一标识',
+    project: '当前项目目录名（由 CURRENT_PROJECT 派生）',
+    sessionName: '会话名称',
+    sessionMode: '会话模式',
+    readonly: '是否只读模式',
+    canSendFile: '当前渠道是否支持发文件',
+    capabilities: '渠道能力列表',
+    baseAgent: '当前 base agent 规范值（claude/codex/gemini/hermes）',
+    baseAgentName: '当前 base agent 显示名',
+};
+// ── Cache ──
+let _manifestCache = null;
+const _sessionPathCache = new Map();
+// ── Public API ──
+export function loadKitManifest() {
+    _manifestCache = loadAndMergeManifest();
+    logger.info(`[KitRenderer] Loaded manifest: ${_manifestCache.length} sections`);
+}
+export function invalidateKitCache() {
+    _manifestCache = null;
+    _sessionPathCache.clear();
+}
+export function invalidateSessionCache(sessionId) {
+    _sessionPathCache.delete(sessionId);
+}
+export function renderKitSections(ctx) {
+    if (!_manifestCache)
+        loadKitManifest();
+    const sections = _manifestCache;
+    const fileParts = [];
+    for (const section of sections) {
+        if (section.enabled === false)
+            continue;
+        if (!evaluateWhen(section.when, ctx.vars))
+            continue;
+        const files = loadSectionFiles(section, ctx);
+        if (files.length === 0)
+            continue;
+        for (const [filePath, rawContent] of files) {
+            const content = section.needsInjection ? renderTemplate(rawContent, ctx.vars) : rawContent;
+            if (!content.trim())
+                continue;
+            const label = section.description ? `${section.id} — ${section.description}` : section.id;
+            fileParts.push(`Contenu de ${filePath} (${label}):\n\n${content.trimEnd()}`);
+        }
+    }
+    if (fileParts.length === 0)
+        return '';
+    const body = fileParts.join('\n\n');
+    const output = `<system-reminder>\nEvolClaw Context Kit documents are shown below.\n\n${body}\n\nIMPORTANT: Use this context when it affects the current interaction.\n</system-reminder>`;
+    writeDebugFiles(ctx, output);
+    return output;
+}
+export function cleanEckDebug() {
+    const dir = eckDebugDir();
+    const cutoff = Date.now() - 24 * 60 * 60 * 1000;
+    try {
+        for (const f of fs.readdirSync(dir)) {
+            const fp = path.join(dir, f);
+            try {
+                if (fs.statSync(fp).mtimeMs < cutoff)
+                    fs.unlinkSync(fp);
+            }
+            catch { /* skip */ }
+        }
+    }
+    catch { /* dir doesn't exist yet */ }
+}
+// CHUNK_CONTINUE_2
+// ── Manifest loading ──
+function loadAndMergeManifest() {
+    const kitsPath = path.join(kitsDir(), 'eck_manifest.json');
+    const eckPath = path.join(resolveRoot(), 'eck', 'eck_manifest.json');
+    let base;
+    try {
+        base = JSON.parse(fs.readFileSync(kitsPath, 'utf-8'));
+    }
+    catch (err) {
+        logger.error(`[KitRenderer] Failed to load kits/eck_manifest.json: ${err}`);
+        return [];
+    }
+    if (!fs.existsSync(eckPath)) {
+        return sortSections(base.sections);
+    }
+    try {
+        const override = JSON.parse(fs.readFileSync(eckPath, 'utf-8'));
+        if (override.mode === 'replace') {
+            return sortSections(override.sections);
+        }
+        const merged = new Map();
+        for (const s of base.sections)
+            merged.set(s.id, { ...s });
+        for (const s of override.sections) {
+            const existing = merged.get(s.id);
+            if (existing) {
+                merged.set(s.id, { ...existing, ...s });
+            }
+            else {
+                merged.set(s.id, s);
+            }
+        }
+        return sortSections([...merged.values()]);
+    }
+    catch (err) {
+        logger.warn(`[KitRenderer] Failed to load eck override, using kits only: ${err}`);
+        return sortSections(base.sections);
+    }
+}
+function sortSections(sections) {
+    return sections.slice().sort((a, b) => a.order - b.order);
+}
+// ── Section content loading ──
+function loadSectionFiles(section, ctx) {
+    if (section.type === 'file' && section.file) {
+        const result = loadFileSection(section.file, ctx);
+        return result ? [result] : [];
+    }
+    if (section.type === 'directory' && section.path) {
+        return loadDirectorySection(section.path, section.pattern, ctx);
+    }
+    return [];
+}
+function loadFileSection(filePath, ctx) {
+    const resolved = resolvePath(filePath, ctx);
+    if (!resolved)
+        return null;
+    const sessionCache = getSessionCache(ctx.sessionId);
+    if (sessionCache.has(resolved))
+        return [resolved, sessionCache.get(resolved)];
+    try {
+        const content = fs.readFileSync(resolved, 'utf-8');
+        sessionCache.set(resolved, content);
+        return [resolved, content];
+    }
+    catch {
+        return null;
+    }
+}
+function loadDirectorySection(dirPath, pattern, ctx) {
+    const resolved = resolvePath(dirPath, ctx);
+    if (!resolved)
+        return [];
+    return readDirectoryFiles(resolved, pattern).map(([name, content]) => [path.join(resolved, name), content]);
+}
+// ── Path resolution ──
+function resolvePath(rawPath, ctx) {
+    let resolved = rawPath.replace(/\$([A-Z_]+)/g, (_, name) => {
+        const val = ctx.vars[name];
+        if (val === undefined || val === null || val === false || val === '')
+            return '';
+        return String(val);
+    });
+    resolved = resolved.replace(/\{\{(\w+)\}\}/g, (_, key) => {
+        const val = ctx.vars[key];
+        if (val === undefined || val === null || val === false || val === '')
+            return '';
+        return String(val);
+    });
+    if (!resolved || resolved.includes('$') || resolved.includes('{{'))
+        return null;
+    if (!fs.existsSync(resolved))
+        return null;
+    return resolved;
+}
+// CHUNK_CONTINUE_5
+// ── Directory reading ──
+function readDirectoryFiles(dirPath, pattern) {
+    const glob = pattern || '*.md';
+    try {
+        const files = fs.readdirSync(dirPath)
+            .filter(f => matchGlob(f, glob))
+            .sort();
+        return files.map(f => {
+            const content = fs.readFileSync(path.join(dirPath, f), 'utf-8');
+            return [f, content];
+        });
+    }
+    catch {
+        return [];
+    }
+}
+function matchGlob(filename, pattern) {
+    const regex = pattern
+        .replace(/\./g, '\\.')
+        .replace(/\*/g, '.*')
+        .replace(/\{([^}]+)\}/g, (_, alts) => `(${alts.split(',').join('|')})`);
+    return new RegExp(`^${regex}$`).test(filename);
+}
+// ── When condition evaluation ──
+function evaluateWhen(when, vars) {
+    if (when === 'always')
+        return true;
+    if (when.var !== undefined) {
+        const val = vars[when.var];
+        if (when.eq !== undefined)
+            return val === when.eq;
+        if (when.neq !== undefined)
+            return val !== when.neq;
+        if (when.in !== undefined)
+            return when.in.includes(val);
+        if (when.nin !== undefined)
+            return !when.nin.includes(val);
+    }
+    if (when.any)
+        return when.any.some(k => isTruthy(vars[k]));
+    if (when.all)
+        return when.all.every(k => isTruthy(vars[k]));
+    return true;
+}
+function isTruthy(val) {
+    return val !== undefined && val !== null && val !== false && val !== '' && val !== 0;
+}
+// CHUNK_CONTINUE_6
+// ── Template rendering ──
+function renderTemplate(template, vars) {
+    // Pass 1: conditional sections {{?key=value}}...{{/}} and {{?key}}...{{/}}
+    let result = template.replace(/\{\{\?(\w+)(?:=([^}]*))?\}\}([\s\S]*?)\{\{\/\}\}/g, (_match, key, value, body) => {
+        if (value !== undefined) {
+            return String(vars[key]) === value ? body : '';
+        }
+        return isTruthy(vars[key]) ? body : '';
+    });
+    // Pass 2: variable substitution {{key}}
+    result = result.replace(/\{\{(\w+)\}\}/g, (_match, key) => {
+        const val = vars[key];
+        if (!isTruthy(val))
+            return '';
+        return String(val);
+    });
+    // Pass 3: remove blank lines
+    return result.split('\n').filter(line => line.trim() !== '').join('\n');
+}
+// ── Session cache helper ──
+function getSessionCache(sessionId) {
+    let cache = _sessionPathCache.get(sessionId);
+    if (!cache) {
+        cache = new Map();
+        _sessionPathCache.set(sessionId, cache);
+    }
+    return cache;
+}
+// ── Debug output ──
+function writeDebugFiles(ctx, output) {
+    const now = new Date();
+    const ts = now.toISOString().replace(/[T:.]/g, '-').slice(0, 19);
+    const dir = eckDebugDir();
+    const varsData = {
+        timestamp: now.toISOString(),
+        sessionId: ctx.sessionId,
+        params: Object.entries(ctx.vars)
+            .filter(([, v]) => v !== undefined && v !== null)
+            .map(([name, value]) => ({
+            name,
+            value,
+            description: PARAM_DESCRIPTIONS[name] || '',
+        })),
+    };
+    fs.writeFile(path.join(dir, `vars-${ts}.json`), JSON.stringify(varsData, null, 2), () => { });
+    fs.writeFile(path.join(dir, `context-${ts}.md`), output, () => { });
+}

package/dist/aun/aid/identity.js

@@ -3,6 +3,7 @@ import path from 'path';
 import os from 'os';
 import crypto from 'crypto';
 import { getAunClient, downloadCaRoot } from './client.js';
+import { resolvePaths } from '../../paths.js';
 // ==================== Validation ====================
 export function isValidAid(name) {
     const labels = name.split('.');
@@ -129,3 +130,30 @@ export async function aidLookup(aid) {
         return { exists: false, aid, gateway, error: String(e.message || e) };
     }
 }
+function lifecycleLogPath(aid) {
+    const aidName = aid.startsWith('@') ? aid.slice(1) : aid;
+    return path.join(resolvePaths().aidLogsDir, `${aidName}.jsonl`);
+}
+export function appendAidLifecycle(event) {
+    const filePath = lifecycleLogPath(event.aid);
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    fs.appendFileSync(filePath, JSON.stringify(event) + '\n');
+}
+export function readAidLifecycle(aid, lastN = 50) {
+    const filePath = lifecycleLogPath(aid);
+    try {
+        const content = fs.readFileSync(filePath, 'utf-8');
+        const lines = content.trim().split('\n').filter(Boolean);
+        const events = [];
+        for (const line of lines.slice(-lastN)) {
+            try {
+                events.push(JSON.parse(line));
+            }
+            catch { }
+        }
+        return events;
+    }
+    catch {
+        return [];
+    }
+}

package/dist/aun/aid/index.js

@@ -1,3 +1,3 @@
-export { isValidAid, aidList, aidCreate, aidShow, aidDelete, aidLookup } from './identity.js';
+export { isValidAid, aidList, aidCreate, aidShow, aidDelete, aidLookup, appendAidLifecycle, readAidLifecycle } from './identity.js';
 export { buildInitialAgentMd, agentmdGet, agentmdPut } from './agentmd.js';
 export { MIN_AUN_CORE_SDK, AUN_CORE_SDK_PKG, isAunSdkVersionOk, resolveAunCoreSdkPkg, ensureAunSdk, isAunSdkReady, downloadCaRoot, getAunClient, suppressSdkLogs, } from './client.js';

package/dist/aun/aid/lifecycle-log.js

@@ -0,0 +1,33 @@
+import fs from 'fs';
+import path from 'path';
+import { resolvePaths } from '../../paths.js';
+function ensureDir(dir) {
+    fs.mkdirSync(dir, { recursive: true });
+}
+function logPath(aid) {
+    const aidName = aid.startsWith('@') ? aid.slice(1) : aid;
+    return path.join(resolvePaths().aidLogsDir, `${aidName}.jsonl`);
+}
+export function appendAidLifecycle(event) {
+    const filePath = logPath(event.aid);
+    ensureDir(path.dirname(filePath));
+    fs.appendFileSync(filePath, JSON.stringify(event) + '\n');
+}
+export function readAidLifecycle(aid, lastN = 50) {
+    const filePath = logPath(aid);
+    try {
+        const content = fs.readFileSync(filePath, 'utf-8');
+        const lines = content.trim().split('\n').filter(Boolean);
+        const events = [];
+        for (const line of lines.slice(-lastN)) {
+            try {
+                events.push(JSON.parse(line));
+            }
+            catch { }
+        }
+        return events;
+    }
+    catch {
+        return [];
+    }
+}

package/dist/aun/msg/group.js

@@ -25,7 +25,9 @@ export async function groupSend(args) {
         if (args.mentions && args.mentions.length > 0) {
             payload.mentions = args.mentions;
         }
-        const result = await conn.call('group.send', { group_id: args.groupId, payload });
+        const sendParams = { group_id: args.groupId, payload };
+        sendParams.encrypt = args.encrypt === true;
+        const result = await conn.call('group.send', sendParams);
         return {
             ok: true,
             group_id: result?.group_id ?? args.groupId,

package/dist/aun/msg/p2p.js

@@ -1,8 +1,21 @@
+import path from 'path';
 import { createShortConnection } from '../rpc/index.js';
 import { uploadFileAndBuildPayload } from './upload.js';
+import { appendMessageLog, buildOutboundEntry } from '../../core/message/message-log.js';
+import { chatDirPath } from '../../core/session/session-fs-store.js';
+import { resolvePaths } from '../../paths.js';
 export async function msgSend(args) {
     const conn = await createShortConnection(args.from, { aunPath: args.aunPath, slotId: args.slotId });
     try {
+        // 1. 解析对端身份（30天缓存）
+        const { agentsDir } = resolvePaths();
+        const selfAgentDir = path.join(agentsDir, args.from);
+        const { PeerIdentityCache } = await import('../../core/relation/peer-identity.js');
+        const peerIdentity = await PeerIdentityCache.resolve('aun', args.to, selfAgentDir, conn, false);
+        // 2. 决定 chatmode（遵循来源1-3）
+        // 私聊：非 human 对端 → proactive，human 对端 → interactive
+        const chatmode = peerIdentity.isAgent ? 'proactive' : 'interactive';
+        // 3. 构建 payload
         let payload;
         switch (args.body.mode) {
             case 'text':
@@ -29,7 +42,35 @@ export async function msgSend(args) {
                 break;
             }
         }
-        const result = await conn.call('message.send', { to: args.to, payload });
+        // 4. 写入 payload.chatmode
+        payload.chatmode = chatmode;
+        const sendParams = { to: args.to, payload };
+        // Default: plaintext. Set encrypt: true to enable E2EE.
+        sendParams.encrypt = args.encrypt === true;
+        const result = await conn.call('message.send', sendParams);
+        // 5. 写出方向 jsonl（与 daemon 一致格式，标记 source=cli）
+        if (result?.message_id) {
+            try {
+                const sessionsDir = resolvePaths().sessionsDir;
+                const chatDir = chatDirPath(sessionsDir, 'aun', args.to, args.from);
+                const textContent = args.body.mode === 'text' ? args.body.text
+                    : args.body.mode === 'link' ? `[link] ${args.body.url}`
+                        : args.body.mode === 'file' ? `[file] ${args.body.filePath}`
+                            : `[payload]`;
+                appendMessageLog(chatDir, buildOutboundEntry({
+                    from: args.from,
+                    to: args.to,
+                    chatType: 'private',
+                    msgId: result.message_id,
+                    content: textContent,
+                    encrypt: args.encrypt === true,
+                    chatmode, // 使用解析出的 chatmode
+                    msgType: 'text',
+                    source: 'cli',
+                }));
+            }
+            catch { }
+        }
         return {
             ok: true,
             message_id: result?.message_id,