evolcore 0.0.22 → 0.0.24

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 { isManagementRole } from '../config/builtin-roles.js';
 import { readBestTaskRuntimeContext } from './task-context.js';
 // ==================== AID ====================
 function resolveAunPath(args) {
@@ -13,24 +14,35 @@ function resolveAunPath(args) {
         return args[idx + 1];
     return process.env.AUN_HOME || undefined;
 }
+function isRedactedAidShowResult(info) {
+    return 'redacted' in info && info.redacted === true;
+}
 function renderAidShow(info, formatJson) {
     if (formatJson) {
         console.log(JSON.stringify(info, null, 2));
         return;
     }
     console.log(`AID: ${info.aid}`);
-    console.log(`  私钥: ${info.hasPrivateKey ? '有' : '无'}`);
+    const redacted = isRedactedAidShowResult(info);
+    if (!redacted) {
+        console.log(`  私钥: ${info.hasPrivateKey ? '有' : '无'}`);
+    }
     console.log(`  agent.md: ${info.hasAgentMd ? '有' : '无'}`);
     if (info.hasAgentMd) {
+        const signatureReason = redacted ? undefined : info.agentMdSignatureReason;
         const sigLabel = info.agentMdSignature === 'verified' ? '✓ 已验签'
             : info.agentMdSignature === 'unsigned' ? '⚠ 未签名'
-                : info.agentMdSignature === 'invalid' ? `✗ 签名无效${info.agentMdSignatureReason ? ': ' + info.agentMdSignatureReason : ''}`
+                : info.agentMdSignature === 'invalid' ? `✗ 签名无效${signatureReason ? ': ' + signatureReason : ''}`
                     : '? 未知';
         console.log(`  签名状态: ${sigLabel}`);
     }
     console.log(`  证书到期: ${info.certExpiresAt ?? '无证书'}${info.certExpired ? ' (已过期!)' : ''}`);
     if (info.certSubject)
         console.log(`  证书主体: ${info.certSubject}`);
+    if (redacted) {
+        console.log('  本地密钥状态: 已脱敏');
+        return;
+    }
     if (info.keyMatchesCert === false)
         console.log('  密钥/证书: ✗ 公钥不匹配（cert.pem 与 key.json 公钥不一致）');
     else if (info.keyMatchesCert === true)
@@ -104,7 +116,8 @@ async function runManagedAid(args, formatJson) {
     if (!parsed.ok)
         failManagedAid(formatJson, parsed.code, parsed.reason);
     const runtime = await readBestTaskRuntimeContext();
-    if (runtime?.selfAid && parsed.command.aid !== runtime.selfAid.replace(/^@/, '')) {
+    const requiresSelfAid = parsed.command.kind === 'show' || parsed.command.kind === 'agentmd.put';
+    if (requiresSelfAid && runtime?.selfAid && parsed.command.aid !== runtime.selfAid.replace(/^@/, '')) {
         failManagedAid(formatJson, 'SCOPE_MISMATCH', `托管任务只能操作当前 self AID：${runtime.selfAid}`);
     }
     const response = await ipcQuery(resolvePaths().socket, {
@@ -212,7 +225,12 @@ async function runManagedMsg(args, formatJson) {
         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(/^@/, '')) {
+        // owner/admin 可以跨对端读历史（每次查询仍只针对一个对端）。这里只是快速
+        // 预检：角色未知时放行交给 daemon 判定，daemon 侧 handleMsgOperation 才是
+        // 权威关卡，member 由 currentRelationOnly 约束、visitor 直接拒绝。
+        const mayReadCrossPeer = parsed.command.kind === 'history'
+            && (runtime?.peerRole === undefined || isManagementRole(runtime.peerRole));
+        if (!mayReadCrossPeer && runtime?.channelId && parsed.command.target !== runtime.channelId.replace(/^@/, '')) {
             failManagedGroup(formatJson, 'SCOPE_MISMATCH', `只能读取当前 AUN 私聊对端：${runtime.channelId}`);
         }
     }
@@ -299,6 +317,14 @@ function renderManagedGroupResult(args, result, formatJson) {
         console.log(`✓ 成功 ${result.added?.length ?? 0}，失败 ${result.failed?.length ?? 0}`);
         return;
     }
+    if (sub === 'invites') {
+        console.log(`✓ ${result.invites?.length ?? 0} 个待处理邀请`);
+        return;
+    }
+    if (sub === 'accept-invite' || sub === 'reject-invite' || sub === 'revoke-invite') {
+        console.log(`✓ group ${sub} 完成`);
+        return;
+    }
     console.log(`✓ group ${sub} 完成`);
 }
 export async function cmdAid(args) {
@@ -1045,7 +1071,7 @@ Commands:
   send <from> <to> --file <path> [--as <type>]         发送文件（image|video|voice|file）
   send <from> <to> --link <url> [--title T]            发送链接卡片
   send <from> <to> --payload <json>                    发送自定义 payload
-  pull <from> [--after-seq N] [--limit N]              拉取收件箱
+  pull <from> [--after-seq N] [--limit N] --app <name> 拉取收件箱（必须使用独立 slot）
   ack <from> <seq> [--app <name>]                      确认已读
   recall <from> <message-id> [<message-id>...]         撤回消息
   online <from> <target-aid> [<target-aid>...]         查询在线状态
@@ -1134,6 +1160,20 @@ Options:
     }
     const { msgSend, msgPull, msgAck, msgRecall, msgOnline, msgHistory } = await import('../aun/msg/index.js');
     const commonOpts = { aunPath, slotId: appSlot };
+    const requireConsumerSlot = (operation) => {
+        if (appSlot)
+            return appSlot;
+        const error = {
+            ok: false,
+            code: 'APP_SLOT_REQUIRED',
+            error: `${operation} requires an explicit --app <name> isolated consumer slot; refusing to access the daemon inbox`,
+        };
+        if (formatJson)
+            console.log(JSON.stringify(error));
+        else
+            console.error(`❌ ${error.error}`);
+        process.exit(1);
+    };
     if (sub === 'history') {
         const target = args[2] && !args[2].startsWith('--') ? args[2] : undefined;
         const historyValueFlags = new Set([
@@ -1381,9 +1421,7 @@ Options:
         return;
     }
     if (sub === 'pull') {
-        if (!appSlot) {
-            console.warn('⚠ 警告: 未传 --app，当前与 daemon 共享 evolcore 消费通道。pull 会看到/影响 daemon 的消息消费；如需独立消费请用 --app <name>');
-        }
+        const consumerSlot = requireConsumerSlot('ec msg pull');
         const afterSeqStr = getArgValue(args, '--after-seq');
         const limitStr = getArgValue(args, '--limit');
         const afterSeq = afterSeqStr !== undefined ? Number(afterSeqStr) : undefined;
@@ -1396,7 +1434,7 @@ Options:
             console.error(`❌ --limit 必须是数字: ${limitStr}`);
             process.exit(1);
         }
-        const result = await msgPull({ from, afterSeq, limit, ...commonOpts });
+        const result = await msgPull({ from, afterSeq, limit, aunPath, slotId: consumerSlot });
         if (!result.ok) {
             if (formatJson) {
                 console.log(JSON.stringify(result));
@@ -1432,10 +1470,8 @@ Options:
             console.error(`❌ seq 必须是数字: ${seqStr}`);
             process.exit(1);
         }
-        if (!appSlot) {
-            console.warn('⚠ 警告: 未传 --app，ack 将推进与 daemon 共享的 evolcore 消费游标，可能影响 daemon 收消息；如需独立请用 --app <name>');
-        }
-        const result = await msgAck({ from, seq, ...commonOpts });
+        const consumerSlot = requireConsumerSlot('ec msg ack');
+        const result = await msgAck({ from, seq, aunPath, slotId: consumerSlot });
         if (!result.ok) {
             if (formatJson) {
                 console.log(JSON.stringify(result));
@@ -1538,7 +1574,7 @@ export async function cmdGroup(args) {
   send <from> <group-id> <text> --return <none|required> 发送群文本（跨会话时 --return 必填）
   send <from> <group-id> --file <path> [--as <type>]   发送群文件
   send <from> <group-id> --payload <json>              发送自定义 payload
-  pull <from> <group-id> [--after-seq N] [--limit N]   拉取群消息
+  pull <from> <group-id> [--after-seq N] [--limit N] --app <name>   拉取群消息（必须使用独立 slot）
   ack <from> <group-id> <seq> [--app <name>]           确认已读
 
 群管理:
@@ -1558,7 +1594,11 @@ export async function cmdGroup(args) {
 成员:
   join <from> <group-id> [--message M] [--answer A]    申请加入
   leave <from> <group-id>                              退出群
-  invite <from> <group-id> <member-aid> [<member-aid>...]   邀请成员
+  invite <from> <group-id> <member-aid> [<member-aid>...]   创建定向邀请
+  invites <from> [--page N] [--size N]                    查看收到的邀请
+  accept-invite <from> <invite-id>                         接受邀请
+  reject-invite <from> <invite-id>                         拒绝邀请
+  revoke-invite <from> <invite-id>                         撤回邀请
   kick <from> <group-id> <member-aid>                  踢出成员
   members <from> <group-id> [--page N] [--size N]      列出群成员
   online <from> <group-id>                             查看在线成员
@@ -1582,6 +1622,7 @@ Options:
   --text <说明>          附件说明文字（仅 --file 模式）
   --transcript <text>   语音转写（仅 --as voice）
   --group-id <aid>      指定自定义群 AID（仅 create）
+  --member-type <type>  定向邀请成员类型：human|ai（仅 invite）
   --                    end-of-options：其后所有参数按正文处理
                         （用于发送恰好等于某 flag 的文本，如 send a g -- --encrypt）
 
@@ -1617,7 +1658,7 @@ Options:
         renderManagedGroupResult(args, result, formatJson);
         return;
     }
-    const { groupSend, groupPull, groupAck, groupCreate, groupInfo, groupList, groupUpdate, groupDissolve, groupSuspend, groupResume, groupJoin, groupLeave, groupInvite, groupKick, groupMembers, groupOnline, groupSetRole, groupTransferOwner, groupBan, groupUnban, groupBanlist, groupRules, groupUpdateRules, groupRulesFileGet, groupRulesFileSet, groupRulesFilePublish, } = await import('../aun/msg/index.js');
+    const { groupSend, groupPull, groupAck, groupCreate, groupInfo, groupList, groupUpdate, groupDissolve, groupSuspend, groupResume, groupJoin, groupLeave, groupInvite, groupInvites, groupAcceptInvite, groupRejectInvite, groupRevokeInvite, groupKick, groupMembers, groupOnline, groupSetRole, groupTransferOwner, groupBan, groupUnban, groupBanlist, groupRules, groupUpdateRules, groupRulesFileGet, groupRulesFileSet, groupRulesFilePublish, } = await import('../aun/msg/index.js');
     const commonOpts = { aunPath, slotId: appSlot };
     // 通用 group_id 提取（第三参数）
     const requireGroupId = () => {
@@ -1693,6 +1734,31 @@ Options:
         }
         return parsed;
     };
+    if (sub === 'invites') {
+        const page = parseNumberFlag('--page', '--page');
+        const size = parseNumberFlag('--size', '--size');
+        const result = await groupInvites({ from, page, size, ...commonOpts });
+        outputResult(result, () => {
+            const r = result;
+            console.log(`✓ ${r.invites.length} 个待处理邀请:`);
+            for (const invite of r.invites) {
+                console.log(`  ${invite.invite_id ?? invite.id ?? '-'}  ${invite.group_id ?? invite.group_aid ?? '-'}  ${invite.inviter_aid ?? invite.from ?? '-'}`);
+            }
+        });
+        return;
+    }
+    if (sub === 'accept-invite' || sub === 'reject-invite' || sub === 'revoke-invite') {
+        const inviteId = args[2];
+        if (!inviteId || inviteId.startsWith('--')) {
+            console.error(`用法: ec group ${sub} <from> <invite-id>`);
+            process.exit(1);
+        }
+        const action = sub === 'accept-invite' ? groupAcceptInvite
+            : sub === 'reject-invite' ? groupRejectInvite : groupRevokeInvite;
+        const result = await action({ from, inviteId, ...commonOpts });
+        outputResult(result, () => console.log(`✓ 已${sub === 'accept-invite' ? '接受' : sub === 'reject-invite' ? '拒绝' : '撤回'}邀请 ${inviteId}`));
+        return;
+    }
     const requireFlagValue = (flag, label) => {
         const value = getArgValue(args, flag);
         if (value === undefined || value.startsWith('--')) {
@@ -1839,12 +1905,18 @@ Options:
     }
     if (sub === 'pull') {
         const groupId = requireGroupId();
-        if (!appSlot) {
-            console.warn('⚠ 警告: 未传 --app，当前与 daemon 共享 evolcore 消费通道。pull 会看到/影响 daemon 的消息消费；如需独立消费请用 --app <name>');
+        const consumerSlot = appSlot;
+        if (!consumerSlot) {
+            const error = 'ec group pull requires an explicit --app <name> isolated consumer slot; refusing to access the daemon inbox';
+            if (formatJson)
+                console.log(JSON.stringify({ ok: false, code: 'APP_SLOT_REQUIRED', error }));
+            else
+                console.error(`❌ ${error}`);
+            process.exit(1);
         }
         const afterSeq = parseNumberFlag('--after-seq', '--after-seq');
         const limit = parseNumberFlag('--limit', '--limit');
-        const result = await groupPull({ from, groupId, afterSeq, limit, ...commonOpts });
+        const result = await groupPull({ from, groupId, afterSeq, limit, aunPath, slotId: consumerSlot });
         outputResult(result, () => {
             const r = result;
             console.log(`✓ ${r.messages.length} 条消息，latest_seq=${r.latest_message_seq}${r.has_more ? '（还有更多）' : ''}`);
@@ -1867,10 +1939,16 @@ Options:
             console.error(`❌ seq 必须是数字: ${seqStr}`);
             process.exit(1);
         }
-        if (!appSlot) {
-            console.warn('⚠ 警告: 未传 --app，ack 将推进与 daemon 共享的 evolcore 消费游标，可能影响 daemon 收消息；如需独立请用 --app <name>');
+        const consumerSlot = appSlot;
+        if (!consumerSlot) {
+            const error = 'ec group ack requires an explicit --app <name> isolated consumer slot; refusing to access the daemon inbox';
+            if (formatJson)
+                console.log(JSON.stringify({ ok: false, code: 'APP_SLOT_REQUIRED', error }));
+            else
+                console.error(`❌ ${error}`);
+            process.exit(1);
         }
-        const result = await groupAck({ from, groupId, seq, ...commonOpts });
+        const result = await groupAck({ from, groupId, seq, aunPath, slotId: consumerSlot });
         outputResult(result, () => {
             const r = result;
             console.log(`✓ ack_seq=${r.ack_seq}`);
@@ -2147,7 +2225,12 @@ Options:
                 process.exit(1);
             }
         }
-        const result = await groupInvite({ from, groupId, members, ...commonOpts });
+        const memberType = getArgValue(args, '--member-type');
+        if (memberType !== undefined && memberType !== 'human' && memberType !== 'ai') {
+            console.error('❌ --member-type 必须是 human 或 ai');
+            process.exit(1);
+        }
+        const result = await groupInvite({ from, groupId, members, memberType: memberType, ...commonOpts });
         outputResult(result, () => {
             const r = result;
             console.log(`✓ 成功 ${r.added.length}，失败 ${r.failed.length}`);
@@ -2300,7 +2383,7 @@ Options:
         });
         return;
     }
-    console.error(`未知子命令: ${sub}\n用法: ec group [send|pull|ack|create|list|info|update|dissolve|suspend|resume|rules|join|leave|invite|kick|members|online|role|owner|ban|unban]`);
+    console.error(`未知子命令: ${sub}\n用法: ec group [send|pull|ack|create|list|info|update|dissolve|suspend|resume|rules|join|leave|invite|invites|accept-invite|reject-invite|revoke-invite|kick|members|online|role|owner|ban|unban]`);
     process.exit(1);
 }
 // ==================== Main ====================
@@ -2322,6 +2405,7 @@ const VALUE_FLAGS = new Set([
     '--payload', '--title', '--description', '--text', '--transcript',
     '--as', '--content-type', '--mention', '--visibility', '--join-mode',
     '--group-id', '--name', '--message', '--answer', '--page', '--size',
+    '--member-type',
     '--aun-path', '--thread', '--return',
 ]);
 const BOOLEAN_FLAGS = new Set([

package/dist/cli/command-log.js

@@ -59,8 +59,8 @@ export function logCliCommand(cmd, args) {
     const line = JSON.stringify({
         ts: localTimestamp(),
         cmd,
-        // 完整命令行，可直接拷贝执行（含 ec 前缀，含空格的参数自动加引号）
-        command: `ec ${args.map(shellQuote).join(' ')}`,
+        // 可审计命令行（敏感参数掩码；含 ec 前缀，含空格参数自动加引号）
+        command: `ec ${loggableArgs(args).map(shellQuote).join(' ')}`,
         selfAid: selfAid || undefined,
         sessionId: process.env.EVOLCORE_SESSION_ID || undefined,
     }) + '\n';
@@ -82,6 +82,25 @@ function shellQuote(arg) {
         return arg;
     return `'${arg.replace(/'/g, `'\\''`)}'`;
 }
+function loggableArgs(args) {
+    const output = [];
+    let redactNext = false;
+    for (const arg of args) {
+        if (redactNext) {
+            output.push('[REDACTED]');
+            redactNext = false;
+            continue;
+        }
+        const flag = arg.replace(/^--?/, '').replace(/=.*$/, '').toLowerCase();
+        if (/^(?:remote-token|ecweb-token|menu-token|token|password|secret)$/.test(flag)) {
+            output.push(arg.includes('=') ? `${arg.slice(0, arg.indexOf('=') + 1)}[REDACTED]` : arg);
+            redactNext = !arg.includes('=');
+            continue;
+        }
+        output.push(arg.replace(/((?:"|')?(?:ecweb[_-]?token|menu[_-]?token|access[_-]?token|refresh[_-]?token|password|secret)(?:"|')?\s*[:=]\s*)("(?:[^"\\]|\\.)*"|'[^']*'|[^,}\s]+)/gi, '$1"[REDACTED]"'));
+    }
+    return output;
+}
 /** 本地日期 tag YYYYMMDD，用于日志文件按天切分（一天一个文件）。 */
 function dayTag() {
     const d = new Date();

package/dist/cli/ctl-command.js

@@ -7,6 +7,7 @@ const CTL_HELP = `用法: ec ctl <command> [args...]
 
 查询:
   status                    查看会话状态
+  status --format json      查看当前任务的结构化运行上下文
   pwd                       显示当前项目路径
   help                      显示帮助
 
@@ -20,6 +21,7 @@ const CTL_HELP = `用法: ec ctl <command> [args...]
 
 示例:
   ec ctl status
+  ec ctl status --format json
   ec ctl name "新会话名称"
   ec ctl send "任务已完成"
   ec ctl file report.md