evolcore 0.0.20 → 0.0.21

package/dist/cli/aun-commands.js

@@ -5,6 +5,7 @@ import { isExplicitGroupId } from '../aun/group-identity.js';
 import { getArgValue, isHelpFlag, wantsHelp } from './help.js';
 import { ipcQuery } from '../ipc.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
+import { readBestTaskRuntimeContext } from './task-context.js';
 // ==================== AID ====================
 function resolveAunPath(args) {
     const idx = args.indexOf('--aun-path');
@@ -98,6 +99,14 @@ async function runManagedAid(args, formatJson) {
     if (!delegationToken) {
         failManagedAid(formatJson, 'DELEGATION_REQUIRED', `${AGENT_DELEGATION_TOKEN_ENV} is not set for the active task`);
     }
+    const { resolveManagedAidOperation } = await import('../aun/aid/managed-operation.js');
+    const parsed = resolveManagedAidOperation(['aid', ...args]);
+    if (!parsed.ok)
+        failManagedAid(formatJson, parsed.code, parsed.reason);
+    const runtime = await readBestTaskRuntimeContext();
+    if (runtime?.selfAid && parsed.command.aid !== runtime.selfAid.replace(/^@/, '')) {
+        failManagedAid(formatJson, 'SCOPE_MISMATCH', `托管任务只能操作当前 self AID：${runtime.selfAid}`);
+    }
     const response = await ipcQuery(resolvePaths().socket, {
         type: 'aid.op',
         argv: ['aid', ...args],
@@ -153,6 +162,12 @@ async function runManagedGroup(args, formatJson) {
     if (args.includes('--aun-path') || args.includes('--app')) {
         failManagedGroup(formatJson, 'NOT_ALLOWED', '--aun-path and --app are not allowed in a managed task');
     }
+    const { resolveManagedGroupOperation } = await import('../aun/msg/managed-operation.js');
+    const parsed = resolveManagedGroupOperation(['group', ...args]);
+    if (!parsed.ok)
+        failManagedGroup(formatJson, parsed.code, parsed.reason);
+    const runtime = await readBestTaskRuntimeContext();
+    validateManagedGroupScope(parsed.command.from, parsed.command.groupId, runtime, formatJson);
     const response = await ipcQuery(resolvePaths().socket, {
         type: 'group.op',
         argv: ['group', ...args],
@@ -174,6 +189,33 @@ async function runManagedMsg(args, formatJson) {
     if (!delegationToken) {
         failManagedGroup(formatJson, 'DELEGATION_REQUIRED', `${AGENT_DELEGATION_TOKEN_ENV} is not set for the active task`);
     }
+    const { resolveManagedMsgOperation } = await import('../aun/msg/managed-operation.js');
+    const parsed = resolveManagedMsgOperation(['msg', ...args]);
+    if (!parsed.ok)
+        failManagedGroup(formatJson, parsed.code, parsed.reason);
+    const runtime = await readBestTaskRuntimeContext();
+    if (runtime?.selfAid
+        && parsed.command.from !== runtime.selfAid.replace(/^@/, '')) {
+        failManagedGroup(formatJson, 'SCOPE_MISMATCH', `托管任务只能使用当前 self AID：${runtime.selfAid}`);
+    }
+    const isSelectorHistory = parsed.command.kind === 'history'
+        && !!parsed.command.channelKey
+        && !!parsed.command.peerId;
+    if (isSelectorHistory) {
+        // Trigger tasks retain their originating channel in runtime.channel. The
+        // daemon-created session route is the stable, non-spoofable discriminator.
+        if (runtime && !runtime.channelId?.startsWith('trigger:')) {
+            failManagedGroup(formatJson, 'SCOPE_MISMATCH', '跨渠道 history selector 仅允许可信 Trigger 会话使用');
+        }
+    }
+    else {
+        if (runtime && (runtime.channel !== 'aun' || runtime.chatType !== 'private')) {
+            failManagedGroup(formatJson, 'SCOPE_MISMATCH', 'ec msg history/online 只能读取当前 AUN 私聊关系');
+        }
+        if (runtime?.channelId && parsed.command.target !== runtime.channelId.replace(/^@/, '')) {
+            failManagedGroup(formatJson, 'SCOPE_MISMATCH', `只能读取当前 AUN 私聊对端：${runtime.channelId}`);
+        }
+    }
     const response = await ipcQuery(resolvePaths().socket, {
         type: 'msg.op',
         argv: ['msg', ...args],
@@ -187,6 +229,21 @@ async function runManagedMsg(args, formatJson) {
     }
     return response.result;
 }
+function validateManagedGroupScope(from, groupId, runtime, formatJson) {
+    if (!runtime)
+        return;
+    if (runtime.selfAid && from !== runtime.selfAid.replace(/^@/, '')) {
+        failManagedGroup(formatJson, 'SCOPE_MISMATCH', `托管任务只能使用当前 self AID：${runtime.selfAid}`);
+    }
+    if (!groupId || (runtime.peerRole !== 'member' && runtime.peerRole !== 'visitor'))
+        return;
+    if (runtime.channel !== 'aun' || runtime.chatType !== 'group') {
+        failManagedGroup(formatJson, 'ARGUMENT_MISMATCH', `当前角色 ${runtime.peerRole} 只能在 AUN 群聊任务中操作当前群`);
+    }
+    if (!runtime.channelId || groupId !== runtime.channelId) {
+        failManagedGroup(formatJson, 'ARGUMENT_MISMATCH', `当前角色 ${runtime.peerRole} 只能操作当前群 ${runtime.channelId ?? '<unknown>'}，不能操作 ${groupId}`);
+    }
+}
 function renderManagedMsgResult(sub, result, formatJson) {
     if (formatJson) {
         console.log(JSON.stringify(result));
@@ -992,7 +1049,7 @@ Commands:
   ack <from> <seq> [--app <name>]                      确认已读
   recall <from> <message-id> [<message-id>...]         撤回消息
   online <from> <target-aid> [<target-aid>...]         查询在线状态
-  history <from> <target-aid> [筛选选项]               查询本地消息历史
+  history <from> [<target-aid>|selector] [筛选选项]    查询本地消息历史
 
 Options:
   --text-from-file <path>  从文件读取文本（UTF-8），用于超长消息或避免 Shell 转义
@@ -1008,6 +1065,8 @@ Options:
   --direction <value>   历史方向：in|out|all
   --channel <type>      历史渠道：aun|feishu|wechat|dingtalk|qqbot|wecom
   --channel-name <name> 历史渠道实例名（非 AUN 渠道必须匹配 Agent 配置）
+  --channel-key <key>   非 AUN 已落盘渠道的完整实例键（与 --peer-id 成对）
+  --peer-id <id>        非 AUN 渠道的原生对端 ID（与 --channel-key 成对）
   --return <none|required> 跨会话发送必填：none=仅补充目标上下文，required=回答回流来源
   --content-type <mime> 显式覆盖 MIME（仅 --file 模式）
   --as <type>           附件类型：image|video|voice|file（仅 --file 模式）
@@ -1029,13 +1088,16 @@ Options:
   ec msg ack alice.agentid.pub 42 --app my-bot
   ec msg recall alice.agentid.pub msg-uuid-1 msg-uuid-2
   ec msg online alice.agentid.pub bob.agentid.pub carol.agentid.pub
-  ec msg history alice.agentid.pub bob.agentid.pub --session latest --limit 50`);
+  ec msg history alice.agentid.pub bob.agentid.pub --session latest --limit 50
+  ec msg history alice.agentid.pub --channel-key feishu#alice.agentid.pub#main --peer-id ou_xxx --session all --format json`);
         return;
     }
     if (sub === 'history' && wantsHelp(args)) {
-        console.log(`用法: ec msg history <self-aid> <target-aid> [options]
+        console.log(`用法: ec msg history <self-aid> [<target-aid> | --channel-key <key> --peer-id <id>] [options]
+
+查询指定会话对的本地历史，不调用 message.pull，也不影响收件箱游标。非 AUN selector 按已落盘的 session metadata、完整 channelKey 与原生 peer ID 精确读取，不能传入文件路径。
 
-查询指定会话对的本地历史，不调用 message.pull，也不影响收件箱游标。非 AUN 历史仅通过当前 Agent 已配置的渠道实例读取，不能传入文件路径。
+托管会话限制：普通会话只能使用当前 self AID 和当前 AUN 私聊对端；可信 daemon Trigger 可用精确的 --channel-key/--peer-id selector 读取已落盘的非 AUN 私聊历史。托管任务不支持 --channel、--channel-name、--aun-path 或 --app。
 
 Options:
   --session <latest|all|id> 默认 latest；all 查询全部；也可指定会话 ID
@@ -1043,16 +1105,16 @@ Options:
   --before <time>         开区间；epoch 毫秒或 ISO 时间
   --after <time>          开区间；epoch 毫秒或 ISO 时间
   --direction <value>     in|out|all（默认 all）
-  --channel <type>        aun|feishu|wechat|dingtalk|qqbot|wecom（默认 aun）
-  --channel-name <name>   渠道实例名；省略时仅允许该类型恰好配置一个实例
+  --channel-key <key>     非 AUN 已落盘渠道完整键；必须与 --peer-id 同时给出
+  --peer-id <id>          原生私聊对端 ID；必须与 --channel-key 同时给出
   --format <text|json>    输出格式（默认 text）
 
 示例:
   ec msg history alice.agentid.pub bob.agentid.pub
   ec msg history alice.agentid.pub bob.agentid.pub --session latest
   ec msg history alice.agentid.pub bob.agentid.pub --session all
-  ec msg history alice.agentid.pub oc_xxx --channel feishu --channel-name main --session all --format json
-  ec msg history alice.agentid.pub bob.agentid.pub --session meta_20260713_1783920000000 --format json`);
+  ec msg history alice.agentid.pub bob.agentid.pub --session meta_20260713_1783920000000 --format json
+  ec msg history alice.agentid.pub --channel-key feishu#alice.agentid.pub#main --peer-id ou_xxx --session all --format json`);
         return;
     }
     const from = args[1];
@@ -1073,14 +1135,12 @@ Options:
     const { msgSend, msgPull, msgAck, msgRecall, msgOnline, msgHistory } = await import('../aun/msg/index.js');
     const commonOpts = { aunPath, slotId: appSlot };
     if (sub === 'history') {
-        const target = args[2];
-        if (!target) {
-            console.error('用法: ec msg history <self-aid> <target-aid> [options]');
-            process.exit(1);
-        }
-        const historyValueFlags = new Set(['--session', '--limit', '--before', '--after', '--direction', '--channel', '--channel-name', '--format']);
+        const target = args[2] && !args[2].startsWith('--') ? args[2] : undefined;
+        const historyValueFlags = new Set([
+            '--session', '--limit', '--before', '--after', '--direction', '--channel', '--channel-name', '--format', '--channel-key', '--peer-id',
+        ]);
         const seenHistoryFlags = new Set();
-        for (let index = 3; index < args.length; index++) {
+        for (let index = target ? 3 : 2; index < args.length; index++) {
             const flag = args[index];
             if (!historyValueFlags.has(flag)) {
                 console.error(`❌ 未知 history 参数: ${flag}`);
@@ -1117,25 +1177,47 @@ Options:
             console.error(`❌ --after 必须是 epoch 毫秒或有效时间: ${afterRaw}`);
             process.exit(1);
         }
-        const channel = getArgValue(args, '--channel') ?? 'aun';
-        const channelTypes = new Set(['aun', 'feishu', 'wechat', 'dingtalk', 'qqbot', 'wecom']);
-        if (!channelTypes.has(channel)) {
-            console.error(`❌ 不支持的 channel: ${channel}`);
+        const channelKey = getArgValue(args, '--channel-key');
+        const peerId = getArgValue(args, '--peer-id');
+        const usesSelector = channelKey !== undefined || peerId !== undefined;
+        if (usesSelector && (channelKey === undefined || peerId === undefined)) {
+            console.error('❌ --channel-key 与 --peer-id 必须同时提供');
             process.exit(1);
         }
-        let channelName;
-        try {
-            channelName = resolveHistoryChannelName(from, channel, getArgValue(args, '--channel-name'));
+        if (usesSelector && target) {
+            console.error('❌ --channel-key/--peer-id 不能与 positional target 同时使用');
+            process.exit(1);
         }
-        catch (error) {
-            console.error(`❌ ${error instanceof Error ? error.message : String(error)}`);
+        if (usesSelector && (getArgValue(args, '--channel') !== undefined || getArgValue(args, '--channel-name') !== undefined)) {
+            console.error('❌ --channel-key/--peer-id 不能与 --channel 或 --channel-name 同时使用');
             process.exit(1);
         }
+        if (!usesSelector && !target) {
+            console.error('用法: ec msg history <self-aid> <target-aid> [options]');
+            process.exit(1);
+        }
+        let channel;
+        let channelName;
+        if (!usesSelector) {
+            channel = getArgValue(args, '--channel') ?? 'aun';
+            const channelTypes = new Set(['aun', 'feishu', 'wechat', 'dingtalk', 'qqbot', 'wecom']);
+            if (!channelTypes.has(channel)) {
+                console.error(`❌ 不支持的 channel: ${channel}`);
+                process.exit(1);
+            }
+            try {
+                channelName = resolveHistoryChannelName(from, channel, getArgValue(args, '--channel-name'));
+            }
+            catch (error) {
+                console.error(`❌ ${error instanceof Error ? error.message : String(error)}`);
+                process.exit(1);
+            }
+        }
         const result = msgHistory({
             from,
-            target,
-            channel: channel,
-            channelName,
+            ...(usesSelector
+                ? { channelKey: channelKey, peerId: peerId }
+                : { target: target, channel: channel, channelName }),
             session: getArgValue(args, '--session'),
             limit,
             before,
@@ -1555,23 +1637,25 @@ Options:
     // 收集 --mention（可多次；每次的值支持逗号分隔多个 aid）
     const collectMentions = () => {
         const mentions = [];
+        const optionsEnd = args.indexOf('--');
+        const optionArgs = optionsEnd >= 0 ? args.slice(0, optionsEnd) : args;
         for (let i = 0; i < args.length; i++) {
+            if (args[i] === '--')
+                break;
             if (args[i] !== '--mention')
                 continue;
             const val = args[i + 1];
             if (val === undefined || val.startsWith('--')) {
-                console.error(`❌ --mention 后面缺少 <aid>`);
-                process.exit(1);
+                failManagedGroup(formatJson, 'INVALID_ARGUMENT', '--mention 后面缺少 <aid>');
             }
             for (const aid of val.split(',').map(s => s.trim()).filter(Boolean)) {
                 if (!isValidAid(aid)) {
-                    console.error(`❌ --mention 的 aid 无效: ${aid}`);
-                    process.exit(1);
+                    failManagedGroup(formatJson, 'INVALID_AID', `--mention 的 aid 无效: ${aid}`);
                 }
                 mentions.push({ aid });
             }
         }
-        if (args.includes('--mention-all')) {
+        if (optionArgs.includes('--mention-all')) {
             mentions.push({ scope: 'all' });
         }
         return mentions;
@@ -1638,17 +1722,61 @@ Options:
     // ---- 消息 ----
     if (sub === 'send') {
         const groupId = requireGroupId();
-        const fileVal = getArgValue(args, '--file');
-        const payloadVal = getArgValue(args, '--payload');
+        // Group sends use the dedicated AUN message daemon route rather than the
+        // managed group-operation IPC parser. Apply the same task scope checks
+        // before building or uploading the payload, so a bad target fails locally
+        // instead of reaching the transport layer first.
+        if (process.env.EVOLCORE_SESSION_ID) {
+            if (args.includes('--aun-path') || args.includes('--app')) {
+                failManagedGroup(formatJson, 'NOT_ALLOWED', '--aun-path and --app are not allowed in a managed task');
+            }
+            const runtime = await readBestTaskRuntimeContext();
+            validateManagedGroupScope(from, groupId, runtime, formatJson);
+        }
+        const optionsEnd = args.indexOf('--', 3);
+        const optionArgs = optionsEnd >= 0 ? args.slice(0, optionsEnd) : args;
+        const getSendArgValue = (flag) => getArgValue(optionArgs, flag);
+        const fileVal = getSendArgValue('--file');
+        const payloadVal = getSendArgValue('--payload');
+        const bodyPositionals = collectPositional(args, 3);
+        const bodyFlags = ['--file', '--payload', '--as', '--content-type', '--text', '--transcript', '--thread', '--return'];
+        for (let index = 3; index < args.length; index++) {
+            const flag = args[index];
+            if (flag === '--')
+                break;
+            if (bodyFlags.includes(flag)) {
+                if (index + 1 >= args.length || args[index + 1].startsWith('--')) {
+                    failManagedGroup(formatJson, 'INVALID_ARGUMENT', `${flag} 后面缺少值`);
+                }
+                index++;
+            }
+        }
+        if (optionArgs.includes('--encrypt') && optionArgs.includes('--no-encrypt')) {
+            failManagedGroup(formatJson, 'INVALID_ARGUMENT', '--encrypt 与 --no-encrypt 不能同时使用');
+        }
+        if (fileVal && payloadVal) {
+            failManagedGroup(formatJson, 'INVALID_ARGUMENT', '--file and --payload are mutually exclusive');
+        }
+        if ((fileVal || payloadVal) && bodyPositionals.length > 0) {
+            failManagedGroup(formatJson, 'INVALID_ARGUMENT', '文本正文不能与 --file 或 --payload 同时使用');
+        }
         let body;
         if (fileVal) {
+            const attachmentType = getSendArgValue('--as');
+            if (attachmentType && !['image', 'video', 'voice', 'file'].includes(attachmentType)) {
+                failManagedGroup(formatJson, 'INVALID_ARGUMENT', `--as 仅支持 image|video|voice|file: ${attachmentType}`);
+            }
+            const transcript = getSendArgValue('--transcript');
+            if (transcript !== undefined && attachmentType !== 'voice') {
+                failManagedGroup(formatJson, 'INVALID_ARGUMENT', '--transcript 仅能与 --as voice 一起使用');
+            }
             body = {
                 mode: 'file',
                 filePath: fileVal,
-                as: getArgValue(args, '--as'),
-                contentType: getArgValue(args, '--content-type'),
-                text: getArgValue(args, '--text'),
-                transcript: getArgValue(args, '--transcript'),
+                as: attachmentType,
+                contentType: getSendArgValue('--content-type'),
+                text: getSendArgValue('--text'),
+                transcript,
             };
         }
         else if (payloadVal) {
@@ -1660,9 +1788,17 @@ Options:
                 console.error(`❌ --payload 解析失败: ${e.message}`);
                 process.exit(1);
             }
+            if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+                failManagedGroup(formatJson, 'INVALID_ARGUMENT', '--payload 必须是 JSON 对象');
+            }
             body = { mode: 'payload', payload: parsed };
         }
         else {
+            const fileOnlyFlags = ['--as', '--content-type', '--text', '--transcript']
+                .filter(flag => optionArgs.includes(flag));
+            if (fileOnlyFlags.length > 0) {
+                failManagedGroup(formatJson, 'INVALID_ARGUMENT', `${fileOnlyFlags.join(', ')} 仅能与 --file 一起使用`);
+            }
             const text = collectPositional(args, 3).join(' ');
             if (!text) {
                 console.error('❌ 缺少消息内容（文本或 --file/--payload）');
@@ -1675,11 +1811,10 @@ Options:
         const encryptGroup = args.includes('--no-encrypt')
             ? false
             : args.includes('--encrypt') ? true : undefined;
-        const thread = getArgValue(args, '--thread');
-        const returnPolicyRaw = getArgValue(args, '--return');
+        const thread = getSendArgValue('--thread');
+        const returnPolicyRaw = getSendArgValue('--return');
         if (returnPolicyRaw && returnPolicyRaw !== 'required' && returnPolicyRaw !== 'none') {
-            console.error(`❌ --return 仅支持 required|none: ${returnPolicyRaw}`);
-            process.exit(1);
+            failManagedGroup(formatJson, 'INVALID_ARGUMENT', `--return 仅支持 required|none: ${returnPolicyRaw}`);
         }
         const result = await groupSend({
             from,

package/dist/cli/command-log.js

@@ -5,17 +5,16 @@
  * 挂在唯一 choke-point（src/cli/index.ts 的 main() 第一行），所有子命令必经，
  * 无需改动任何具体命令集代码。
  *
- * 两级落盘：
- *   - 汇总日志 $EVOLCORE_HOME/logs/commands-YYYYMMDD.jsonl：所有命令（不论有无 AID）都记
- *     一份，一处看全貌；记录带 selfAid，按 agent 过滤一行 grep 即可。
- *   - per-agent 日志 agents/<aid>/logs/commands-YYYYMMDD.jsonl：能同步解析出 self-AID 时
- *     额外再记一份，便于单独查看某个 agent。
+ * 统一落盘到 $EVOLCORE_HOME/logs/commands-YYYYMMDD.jsonl。所有命令（不论有无
+ * AID）都记一份；记录带 selfAid，可直接按 agent 过滤。Agent 业务数据目录不存放
+ * 审计或诊断日志。
  *
  * 原则：日志写失败静默降级，绝不影响命令执行（沿用 log-writer.ts 的取舍）。
  */
 import fs from 'fs';
 import path from 'path';
-import { agentLogsDir, resolvePaths } from '../paths.js';
+import { resolvePaths } from '../paths.js';
+import { migrateLegacyAgentJsonlLogs } from '../core/audit/log-integrity.js';
 import { getArgValue } from './help.js';
 import { readTaskRuntimeContextFromEnv } from './task-context.js';
 /** Keep path derivation from accepting arbitrary option values. */
@@ -52,6 +51,10 @@ function resolveSelfAid(args) {
  * @param args 完整 argv 原样
  */
 export function logCliCommand(cmd, args) {
+    const paths = resolvePaths();
+    // This entry point runs for every CLI command, including status/help commands
+    // that do not otherwise call ensureDataDirs().
+    migrateLegacyAgentJsonlLogs(paths.agentsDir, paths.logs);
     const selfAid = resolveSelfAid(args);
     const line = JSON.stringify({
         ts: localTimestamp(),
@@ -62,11 +65,7 @@ export function logCliCommand(cmd, args) {
         sessionId: process.env.EVOLCORE_SESSION_ID || undefined,
     }) + '\n';
     const fileName = `commands-${dayTag()}.jsonl`;
-    // 汇总日志：所有命令（不论有无 AID）都记一份，一处看全貌。
-    appendLine(resolvePaths().logs, fileName, line);
-    // per-agent 日志：有 AID 时再额外记一份到该 agent 自己的 logs/，便于单独查看。
-    if (selfAid)
-        appendLine(agentLogsDir(selfAid), fileName, line);
+    appendLine(paths.logs, fileName, line);
 }
 /** 本地时间字符串 YYYY-MM-DD HH:mm:ss（不含时区偏移，直接可读）。 */
 function localTimestamp() {

package/dist/cli/contact.js

@@ -59,6 +59,7 @@ function fail(message, code = 'INVALID_ARGUMENT', data) {
 }
 function printHelp() {
     console.log(`Usage:
+  ec contact add <primaryId> --self <agent-aid>
   ec contact block <primaryId> --self <agent-aid>
   ec contact unblock <primaryId> --self <agent-aid>
   ec contact list --blocked --self <agent-aid>