evolcore 0.0.31 → 0.0.33

package/dist/cli/index.js

@@ -20,6 +20,7 @@ import { cmdStart, cmdStop, cmdRestart, cmdStatus, cmdLogs, cmdWatchCommand, cmd
 import { logCliCommand } from './command-log.js';
 import { isInitCancelledError, printInitCancelHint } from './init-cancel.js';
 import { assertManagedTopLevelCommandAllowed, ManagedCommandNotAllowedError } from './managed-command-guard.js';
+import { resolveDebugContext, stripAsSessionArgs } from './debug-mode.js';
 const MAIN_HELP = `用法: ec <command> [选项]
 
 服务:
@@ -35,6 +36,7 @@ Agent 与会话:
   agent             管理 EvolAgent
   ctl               当前托管会话的控制命令
   queue             查询或操作 agent 消息队列
+  session           按 ec 会话 id 查询本地 session 存档（含 agentSessionId）
   task              恢复暂停或异常中断的会话任务
   trigger           管理定时与事件触发器
   handoff           查询和完成跨会话回流
@@ -102,8 +104,12 @@ export async function main(args) {
         return;
     }
     const cmd = args[0] || 'start';
+    // 调试路径：--as-session <sessionId> 注入托管会话身份，必须在白名单检查之前
+    await resolveDebugContext(args);
+    // 注入完成后剥除 --as-session <sessionId> 两个参数，避免子命令把它们当作未知参数
+    const strippedArgs = stripAsSessionArgs(args);
     try {
-        assertManagedTopLevelCommandAllowed(cmd, args);
+        assertManagedTopLevelCommandAllowed(cmd, strippedArgs);
     }
     catch (error) {
         if (!(error instanceof ManagedCommandNotAllowedError))
@@ -112,7 +118,7 @@ export async function main(args) {
         process.exitCode = 1;
         return;
     }
-    logCliCommand(cmd, args);
+    logCliCommand(cmd, strippedArgs);
     if (cmd === '--version' || cmd === '-v' || cmd === '-V') {
         const pkg = JSON.parse(fs.readFileSync(path.join(getPackageRoot(), 'package.json'), 'utf-8'));
         console.log(pkg.version);
@@ -125,7 +131,7 @@ export async function main(args) {
     switch (cmd) {
         case 'init': {
             try {
-                if (wantsHelp(args.slice(1))) {
+                if (wantsHelp(strippedArgs.slice(1))) {
                     console.log(`用法: ec init [渠道] [选项]
 
 仅初始化 defaults.json:
@@ -155,49 +161,49 @@ export async function main(args) {
   ec init wecom         企业微信 AI Bot 扫码创建/手工配置`);
                 }
                 else {
-                    const hasChannelTarget = Boolean(args[1] && !args[1].startsWith('-'));
+                    const hasChannelTarget = Boolean(strippedArgs[1] && !strippedArgs[1].startsWith('-'));
                     if (hasChannelTarget)
                         printInitCancelHint();
-                    if (args[1] === 'aun') {
+                    if (strippedArgs[1] === 'aun') {
                         const { suppressSdkLogs } = await import('../aun/aid/index.js');
                         suppressSdkLogs();
                         await cmdInitAun();
                     }
-                    else if (args[1] === 'wechat') {
+                    else if (strippedArgs[1] === 'wechat') {
                         const { suppressSdkLogs } = await import('../aun/aid/index.js');
                         suppressSdkLogs();
                         await cmdInitWechat();
                     }
-                    else if (args[1] === 'feishu') {
+                    else if (strippedArgs[1] === 'feishu') {
                         const { suppressSdkLogs } = await import('../aun/aid/index.js');
                         suppressSdkLogs();
                         await cmdInitFeishu();
                     }
-                    else if (args[1] === 'dingtalk') {
+                    else if (strippedArgs[1] === 'dingtalk') {
                         const { suppressSdkLogs } = await import('../aun/aid/index.js');
                         suppressSdkLogs();
                         await cmdInitDingtalk();
                     }
-                    else if (args[1] === 'qqbot') {
+                    else if (strippedArgs[1] === 'qqbot') {
                         const { suppressSdkLogs } = await import('../aun/aid/index.js');
                         suppressSdkLogs();
                         await cmdInitQQBot();
                     }
-                    else if (args[1] === 'wecom') {
+                    else if (strippedArgs[1] === 'wecom') {
                         await cmdInitWecom();
                     }
-                    else if (args[1] && !args[1].startsWith('-')) {
+                    else if (strippedArgs[1] && !strippedArgs[1].startsWith('-')) {
                         const supported = ['feishu', 'wechat', 'aun', 'dingtalk', 'qqbot', 'wecom'];
-                        console.error(`❌ 不支持的渠道: ${args[1]}`);
+                        console.error(`❌ 不支持的渠道: ${strippedArgs[1]}`);
                         console.error(`   支持的渠道: ${supported.join(', ')}`);
                         process.exit(1);
                     }
                     else {
                         const { suppressSdkLogs } = await import('../aun/aid/index.js');
                         suppressSdkLogs();
-                        const nonInteractive = args.includes('--non-interactive');
-                        const wantsAutoStart = args.includes('--auto-start');
-                        const wantsNoAutoStart = args.includes('--no-auto-start');
+                        const nonInteractive = strippedArgs.includes('--non-interactive');
+                        const wantsAutoStart = strippedArgs.includes('--auto-start');
+                        const wantsNoAutoStart = strippedArgs.includes('--no-auto-start');
                         if (wantsAutoStart && wantsNoAutoStart) {
                             console.error('❌ --auto-start 与 --no-auto-start 不能同时使用');
                             process.exitCode = 1;
@@ -205,12 +211,12 @@ export async function main(args) {
                         }
                         const initialized = await cmdInit({
                             nonInteractive,
-                            baseagent: getArgValue(args, '--baseagent'),
-                            force: args.includes('--force'),
-                            owner: getArgValue(args, '--owner'),
-                            projectpath: getArgValue(args, '--projectpath'),
-                            ecweb: args.includes('--ecweb') ? true : undefined,
-                            format: getArgValue(args, '--format'),
+                            baseagent: getArgValue(strippedArgs, '--baseagent'),
+                            force: strippedArgs.includes('--force'),
+                            owner: getArgValue(strippedArgs, '--owner'),
+                            projectpath: getArgValue(strippedArgs, '--projectpath'),
+                            ecweb: strippedArgs.includes('--ecweb') ? true : undefined,
+                            format: getArgValue(strippedArgs, '--format'),
                             autoStart: wantsAutoStart ? true : wantsNoAutoStart ? false : undefined,
                         });
                         if (!initialized && process.exitCode == null)
@@ -227,31 +233,32 @@ export async function main(args) {
             break;
         }
         case 'start':
-            if (wantsHelp(args.slice(1))) {
+            if (wantsHelp(strippedArgs.slice(1))) {
                 printLifecycleHelp('start');
                 break;
             }
             await cmdStart({
-                diagnose: args.includes('--diagnose') || args.includes('-d'),
-                foreground: args.includes('--foreground'),
+                diagnose: strippedArgs.includes('--diagnose') || strippedArgs.includes('-d'),
+                foreground: strippedArgs.includes('--foreground'),
+                debug: strippedArgs.includes('--debug'),
             });
             break;
         case 'stop':
-            if (wantsHelp(args.slice(1))) {
+            if (wantsHelp(strippedArgs.slice(1))) {
                 printLifecycleHelp('stop');
                 break;
             }
             await cmdStop();
             break;
         case 'restart':
-            if (wantsHelp(args.slice(1))) {
+            if (wantsHelp(strippedArgs.slice(1))) {
                 printLifecycleHelp('restart');
                 break;
             }
-            await cmdRestart({ clear: args.includes('--clear'), diagnose: args.includes('--diagnose') || args.includes('-d') });
+            await cmdRestart({ clear: strippedArgs.includes('--clear'), diagnose: strippedArgs.includes('--diagnose') || strippedArgs.includes('-d') });
             break;
         case 'status':
-            if (wantsHelp(args.slice(1))) {
+            if (wantsHelp(strippedArgs.slice(1))) {
                 printLifecycleHelp('status');
                 break;
             }
@@ -273,21 +280,21 @@ export async function main(args) {
             }
             break;
         case 'logs':
-            if (wantsHelp(args.slice(1))) {
+            if (wantsHelp(strippedArgs.slice(1))) {
                 printLifecycleHelp('logs');
                 break;
             }
-            cmdLogs(args.slice(1));
+            cmdLogs(strippedArgs.slice(1));
             break;
         case 'watch':
-            if (wantsHelp(args.slice(1))) {
+            if (wantsHelp(strippedArgs.slice(1))) {
                 printLifecycleHelp('watch');
                 break;
             }
-            await cmdWatchCommand(args.slice(1));
+            await cmdWatchCommand(strippedArgs.slice(1));
             break;
         case 'restart-monitor':
-            if (wantsHelp(args.slice(1))) {
+            if (wantsHelp(strippedArgs.slice(1))) {
                 printLifecycleHelp('restart-monitor');
                 break;
             }
@@ -297,7 +304,7 @@ export async function main(args) {
             try {
                 // 开发源码仓可提供 mode.js；正式 npm 包可以不携带该内部命令。
                 const { cmdMode } = await import('./mode.js');
-                await cmdMode(args.slice(1));
+                await cmdMode(strippedArgs.slice(1));
             }
             catch (error) {
                 if (error?.code === 'ERR_MODULE_NOT_FOUND' && /(?:^|[\\/])mode\.js(?:$|')/.test(String(error?.message ?? ''))) {
@@ -309,70 +316,70 @@ export async function main(args) {
             }
             break;
         case 'mv':
-            if (wantsHelp(args.slice(1))) {
+            if (wantsHelp(strippedArgs.slice(1))) {
                 printLifecycleHelp('mv');
                 break;
             }
-            await cmdMv(args[1], args[2]);
+            await cmdMv(strippedArgs[1], strippedArgs[2]);
             break;
         case 'diagnose':
-            if (wantsHelp(args.slice(1))) {
+            if (wantsHelp(strippedArgs.slice(1))) {
                 printLifecycleHelp('diagnose');
                 break;
             }
-            await cmdDiagnose(args.slice(1));
+            await cmdDiagnose(strippedArgs.slice(1));
             break;
         case 'data': {
             const { cmdData } = await import('./data-command.js');
-            await cmdData(args.slice(1));
+            await cmdData(strippedArgs.slice(1));
             break;
         }
         case 'net': {
             const { cmdNet } = await import('./net-check.js');
-            await cmdNet(args.slice(1));
+            await cmdNet(strippedArgs.slice(1));
             break;
         }
         case 'ctl':
-            await cmdCtl(args.slice(1));
+            await cmdCtl(strippedArgs.slice(1));
             break;
         case 'memory':
-            await cmdMemory(args.slice(1));
+            await cmdMemory(strippedArgs.slice(1));
             break;
         case 'queue':
-            await cmdQueue(args.slice(1));
+            await cmdQueue(strippedArgs.slice(1));
             break;
         case 'task': {
             const { cmdTask } = await import('./task-command.js');
-            await cmdTask(args.slice(1));
+            await cmdTask(strippedArgs.slice(1));
             break;
         }
         case 'trigger':
             {
                 const { cmdTrigger } = await import('./trigger-command.js');
-                await cmdTrigger(args.slice(1));
+                await cmdTrigger(strippedArgs.slice(1));
             }
             break;
         case 'agent': {
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();
-            await cmdAgent(args.slice(1));
+            await cmdAgent(strippedArgs.slice(1));
             break;
         }
         case 'aid': {
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();
-            await cmdAid(args.slice(1));
+            await cmdAid(strippedArgs.slice(1));
             break;
         }
         case 'rpc': {
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();
-            await cmdRpc(args.slice(1));
+            await cmdRpc(strippedArgs.slice(1));
             break;
         }
         case 'diag': {
             const { cmdDiag } = await import('./diag.js');
-            await cmdDiag(args.slice(1));
+            await cmdDiag(strippedArgs.slice(1));
             break;
         }
         case 'menu-client': {
@@ -380,7 +387,7 @@ export async function main(args) {
             suppressSdkLogs();
             const { cmdMenuClient } = await import('./menu-client.js');
             try {
-                await cmdMenuClient(args.slice(1));
+                await cmdMenuClient(strippedArgs.slice(1));
             }
             catch (error) {
                 const payload = {
@@ -397,80 +404,90 @@ export async function main(args) {
         case 'storage': {
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();
-            await cmdStorage(args.slice(1));
+            await cmdStorage(strippedArgs.slice(1));
             break;
         }
         case 'fs': {
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();
             const { cmdFs } = await import('./fs-command.js');
-            await cmdFs(args.slice(1));
+            await cmdFs(strippedArgs.slice(1));
             break;
         }
         case 'msg': {
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();
-            await cmdMsg(args.slice(1));
+            await cmdMsg(strippedArgs.slice(1));
             break;
         }
         case 'handoff': {
             const { cmdHandoff } = await import('./handoff-command.js');
-            await cmdHandoff(args.slice(1));
+            await cmdHandoff(strippedArgs.slice(1));
+            break;
+        }
+        case 'thread': {
+            const { runThreadCommand } = await import('./thread-command.js');
+            await runThreadCommand(strippedArgs.slice(1));
+            break;
+        }
+        case 'session': {
+            const { runSessionCommand } = await import('./session-command.js');
+            await runSessionCommand(strippedArgs.slice(1));
             break;
         }
         case 'group': {
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();
-            await cmdGroup(args.slice(1));
+            await cmdGroup(strippedArgs.slice(1));
             break;
         }
         case 'model': {
             const { cmdModel } = await import('./model.js');
-            await cmdModel(args.slice(1));
+            await cmdModel(strippedArgs.slice(1));
             break;
         }
         case 'skill': {
             const { cmdSkill } = await import('./skill-command.js');
-            await cmdSkill(args.slice(1));
+            await cmdSkill(strippedArgs.slice(1));
             break;
         }
         case 'response': {
             const { cmdResponse } = await import('./response.js');
-            await cmdResponse(args.slice(1));
+            await cmdResponse(strippedArgs.slice(1));
             break;
         }
         case 'config': {
             const { cmdConfig } = await import('./config.js');
-            await cmdConfig(args.slice(1));
+            await cmdConfig(strippedArgs.slice(1));
             break;
         }
         case 'contact': {
             const { cmdContact } = await import('./contact.js');
-            await cmdContact(args.slice(1));
+            await cmdContact(strippedArgs.slice(1));
             break;
         }
         case 'stats': {
             const { handleStats } = await import('./stats.js');
-            await handleStats(args.slice(1));
+            await handleStats(strippedArgs.slice(1));
             break;
         }
         case 'version':
         case '-v':
         case '--version': {
             const { handleVersion } = await import('./version.js');
-            handleVersion(args.slice(1));
+            handleVersion(strippedArgs.slice(1));
             break;
         }
         case 'bench': {
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();
             const { cmdBench } = await import('./bench.js');
-            await cmdBench(args.slice(1));
+            await cmdBench(strippedArgs.slice(1));
             break;
         }
         case 'link-rules': {
             const { cmdLinkRules } = await import('./link-rules.js');
-            cmdLinkRules(args.slice(1));
+            cmdLinkRules(strippedArgs.slice(1));
             break;
         }
         default:

package/dist/cli/init.js

@@ -561,8 +561,8 @@ export async function initTail(options = {}) {
     async function handleOwnersPrompt(rl) {
         const daemonConfigForOwners = loadDaemonConfig();
         if (daemonConfigForOwners.aid && (!daemonConfigForOwners.owners || daemonConfigForOwners.owners.length === 0)) {
-            const needOwner = (await ask(rl, '\n是否配置进程级管理者（Owner AID）？[y/N] ')).trim().toLowerCase();
-            if (needOwner === 'y' || needOwner === 'yes') {
+            const needOwner = (await ask(rl, '\n是否配置进程级管理者（Owner AID）？[Y/n] ')).trim().toLowerCase();
+            if (!needOwner || needOwner === 'y' || needOwner === 'yes') {
                 console.log('\n📡 进程级管理者绑定 — 请用 evol app 扫描二维码\n');
                 // QR 绑定流程需要暂时关闭 rl，因为它会创建自己的输入监听
                 rl.pause();

package/dist/cli/managed-command-guard.js

@@ -18,8 +18,13 @@ const MANAGED_TASK_COMMANDS = new Set([
     'msg',
     'queue',
     'response',
+    // `session` 按 ec 会话 id 只读查询本地 session 存档（meta 文件尾行的
+    // agentSessionId 等），不触碰 daemon 与进程生命周期。
+    'session',
     // `skill` 管理 EC 技能（安装/开关/校验）。它的主要使用者就是 agent 自己——
     // ec-skill 技能的 SKILL.md 明确指导 agent 调用它。脚本只读写
+    // `thread` 提供话题链操作，通过 thread.op IPC 鉴权
+    'thread',
     // $EVOLCORE_HOME/skills/ 与 kits/skills/ 下的技能文件，不触碰进程生命周期。
     // 本白名单只负责让它进到脚本；具体某一级的读写权限由 skill.mjs 的
     // assertPermission() 按会话上下文判定（群聊一律拒，Agent 级要 owner，

package/dist/cli/memory-command.js

@@ -15,6 +15,8 @@ import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc.js';
 import { isHelpFlag, wantsHelp } from './help.js';
 import { readDelegationCredential } from '../core/auth/agent-delegation.js';
+import { canonicalizeEvolcoreCommandArgv } from '../core/permission/ec-command-parser.js';
+import { formatQueueDetails } from '../core/memory/consolidation-queue-format.js';
 export const MEMORY_MODES = ['notes', 'generalize', 'promote', 'profile', 'forget'];
 const MEMORY_HELP = `用法: ec memory <command> [选项]
 
@@ -63,6 +65,7 @@ ec memory consolidate [--mode <notes|generalize|promote|profile|forget>]
   ec memory update consolidated/commit-convention.md --tags "rule,done"
   ec memory archive consolidated/obsolete.md`;
 export async function cmdMemory(args) {
+    args = canonicalizeEvolcoreCommandArgv(['ec', 'memory', ...args]).slice(2);
     if (args.length === 0 || isHelpFlag(args[0]) || wantsHelp(args)) {
         console.log(MEMORY_HELP);
         return;
@@ -99,13 +102,15 @@ export async function cmdMemory(args) {
  * 解析 `--key value` 与位置参数。未识别的 `--xxx` 一律报错，避免静默忽略。
  * `--debug <sessionId>` 是所有子命令的公共参数，不用每处声明。
  */
-function parseArgs(args, known) {
+function parseArgs(args, known, throwOnUnknown = false) {
     const flags = new Map();
     const positional = [];
     for (let i = 0; i < args.length; i++) {
         const a = args[i];
         if (a.startsWith('--')) {
             if (a !== '--debug' && !known.includes(a)) {
+                if (throwOnUnknown)
+                    throw new Error(`未知参数: ${a}`);
                 console.error(`❌ 未知参数: ${a}`);
                 process.exit(1);
             }
@@ -128,6 +133,76 @@ function parseTags(raw) {
     const tags = raw.split(',').map(t => t.trim()).filter(Boolean);
     return tags.length > 0 ? tags : undefined;
 }
+export function resolveMemoryCommandArgv(argv) {
+    if (argv[0] !== 'memory')
+        throw new Error('Expected a memory command');
+    const noteSub = argv[1] === 'note' && ['update', 'drop', 'list'].includes(argv[2]) ? argv[2] : undefined;
+    const kind = noteSub ? `note.${noteSub}` : argv[1];
+    const known = {
+        note: ['--slug', '--tags', '--speakers'], 'note.update': ['--slug', '--tags'],
+        'note.drop': [], 'note.list': [], create: ['--scope', '--slug', '--desc', '--tags', '--keywords', '--replaces', '--peer'],
+        update: ['--tags', '--touch'], archive: [], demote: ['--scope'], consolidate: ['--mode'], feedback: [],
+    };
+    if (!Object.prototype.hasOwnProperty.call(known, kind))
+        throw new Error('Invalid memory command');
+    const { flags, positional } = parseArgs(argv.slice(noteSub ? 3 : 2), known[kind], true);
+    const required = (value, name) => {
+        if (!value)
+            throw new Error(`${name} is required`);
+        return value;
+    };
+    const content = positional.join(' ').trim();
+    const type = `memory.${kind}`;
+    if (kind === 'note')
+        return { type, slug: required(flags.get('--slug'), '--slug'), content: required(content, 'content'),
+            tags: parseTags(flags.get('--tags')), speakers: parseTags(flags.get('--speakers')) };
+    if (kind === 'note.update') {
+        const newContent = positional.slice(1).join(' ').trim();
+        if (!flags.get('--slug') && !flags.has('--tags') && !newContent)
+            throw new Error('No memory note changes supplied');
+        return { type, slug: required(positional[0], 'slug'), newSlug: flags.get('--slug'),
+            tags: parseTags(flags.get('--tags')), tagsProvided: flags.has('--tags'), content: newContent || undefined };
+    }
+    if (kind === 'note.drop')
+        return { type, slug: required(positional[0], 'slug') };
+    if (kind === 'note.list')
+        return { type };
+    if (kind === 'create') {
+        const scope = flags.get('--scope');
+        if (!scope || !['relation', 'agent', 'owner'].includes(scope))
+            throw new Error('Invalid memory scope');
+        if (!flags.has('--tags'))
+            throw new Error('--tags is required');
+        if (flags.has('--peer') && scope !== 'relation')
+            throw new Error('--peer requires relation scope');
+        return { type, scope, slug: required(flags.get('--slug'), '--slug'), description: required(flags.get('--desc'), '--desc'),
+            content: required(content, 'content'), tags: parseTags(flags.get('--tags')), keywords: parseTags(flags.get('--keywords')),
+            replaces: parseTags(flags.get('--replaces')), targetPeerKey: flags.get('--peer') };
+    }
+    if (kind === 'update') {
+        if (!flags.has('--tags') && !flags.has('--touch'))
+            throw new Error('No memory changes supplied');
+        return { type, filePath: required(positional[0], 'path'), tags: parseTags(flags.get('--tags')), touch: flags.has('--touch') };
+    }
+    if (kind === 'archive') {
+        if (!positional.length)
+            throw new Error('Memory paths are required');
+        return { type, filePaths: positional };
+    }
+    if (kind === 'demote') {
+        const scope = flags.get('--scope') ?? 'agent';
+        if (scope !== 'agent' && scope !== 'owner')
+            throw new Error('Invalid demotion scope');
+        return { type, slug: required(positional[0], 'slug'), scope };
+    }
+    if (kind === 'consolidate') {
+        const mode = flags.get('--mode') ?? 'notes';
+        if (!MEMORY_MODES.includes(mode))
+            throw new Error('Invalid consolidation mode');
+        return { type, mode };
+    }
+    return { type, text: required(content, 'feedback') };
+}
 /** 各子命令的一行完整用法：缺参报错时附上，模型照抄即可重试。 */
 const USAGE = {
     note: 'ec memory note --slug <slug> [--tags <tag1,tag2>] [--speakers <aid1,aid2>] "<正文>"',
@@ -193,7 +268,7 @@ async function cmdMemoryNoteCreate(args) {
         failWithUsage('必须提供记忆内容（content）', USAGE.note);
     const { socketPath, ...session } = requireManagedSession('ec memory note', flags);
     const result = await ipcQuery(socketPath, {
-        type: 'memory.note', ...session, slug, content, tags,
+        type: 'memory.note', argv: ['memory', 'note', ...args], ...session, slug, content, tags,
         speakers: speakers && speakers.length > 0 ? speakers : undefined,
     }, 15_000);
     reportResult(result, (r) => {
@@ -215,7 +290,7 @@ async function cmdMemoryNoteUpdate(args) {
     }
     const { socketPath, ...session } = requireManagedSession('ec memory note update', flags);
     const result = await ipcQuery(socketPath, {
-        type: 'memory.note.update', ...session, slug,
+        type: 'memory.note.update', argv: ['memory', 'note', 'update', ...args], ...session, slug,
         newSlug, tags, tagsProvided: tagsRaw !== undefined,
         content: content || undefined,
     }, 15_000);
@@ -231,7 +306,7 @@ async function cmdMemoryNoteDrop(args) {
         failWithUsage('必须提供要撤销的 slug', USAGE.noteDrop);
     const { socketPath, ...session } = requireManagedSession('ec memory note drop', flags);
     const result = await ipcQuery(socketPath, {
-        type: 'memory.note.drop', ...session, slug,
+        type: 'memory.note.drop', argv: ['memory', 'note', 'drop', ...args], ...session, slug,
     }, 15_000);
     reportResult(result, (r) => {
         console.log(`✓ 已撤销: ${r.filePath ?? slug}`);
@@ -241,7 +316,7 @@ async function cmdMemoryNoteList(args) {
     const { flags } = parseArgs(args, []);
     const { socketPath, ...session } = requireManagedSession('ec memory note list', flags);
     const result = await ipcQuery(socketPath, {
-        type: 'memory.note.list', ...session,
+        type: 'memory.note.list', argv: ['memory', 'note', 'list', ...args], ...session,
     }, 15_000);
     reportResult(result, (r) => {
         const notes = r.notes ?? [];
@@ -286,7 +361,7 @@ async function cmdMemoryCreate(args) {
     }
     const { socketPath, ...session } = requireManagedSession('ec memory create', flags);
     const result = await ipcQuery(socketPath, {
-        type: 'memory.create', ...session, scope, slug, description: desc,
+        type: 'memory.create', argv: ['memory', 'create', ...args], ...session, scope, slug, description: desc,
         content,
         tags: parseTags(tagsRaw),
         keywords: parseTags(keywordsRaw),
@@ -312,7 +387,7 @@ async function cmdMemoryConsolidatedUpdate(args) {
         failWithUsage('至少提供 --tags 或 --touch', USAGE.update);
     const { socketPath, ...session } = requireManagedSession('ec memory update', flags);
     const result = await ipcQuery(socketPath, {
-        type: 'memory.update', ...session, filePath,
+        type: 'memory.update', argv: ['memory', 'update', ...args], ...session, filePath,
         tags: parseTags(tagsRaw), touch,
     }, 15_000);
     reportResult(result, () => {
@@ -325,7 +400,7 @@ async function cmdMemoryArchive(args) {
         failWithUsage('必须提供至少一个要归档的文件路径', USAGE.archive);
     const { socketPath, ...session } = requireManagedSession('ec memory archive', flags);
     const result = await ipcQuery(socketPath, {
-        type: 'memory.archive', ...session, filePaths: positional,
+        type: 'memory.archive', argv: ['memory', 'archive', ...args], ...session, filePaths: positional,
     }, 15_000);
     reportResult(result, (r) => {
         const archived = r.archived ?? positional;
@@ -353,7 +428,7 @@ async function cmdMemoryDemote(args) {
     }
     const { socketPath, ...session } = requireManagedSession('ec memory demote', flags);
     const result = await ipcQuery(socketPath, {
-        type: 'memory.demote', ...session, slug, scope,
+        type: 'memory.demote', argv: ['memory', 'demote', ...args], ...session, slug, scope,
     }, 15_000);
     reportResult(result, (r) => {
         if (r.conflictArchived) {
@@ -385,15 +460,21 @@ async function cmdMemoryConsolidate(args) {
     const { socketPath, ...session } = requireManagedSession('ec memory consolidate', flags);
     console.log(`正在触发记忆整理（mode=${mode}）...`);
     const result = await ipcQuery(socketPath, {
-        type: 'memory.consolidate', ...session, mode,
+        type: 'memory.consolidate', argv: ['memory', 'consolidate', ...args], ...session, mode,
     }, 30_000);
     reportResult(result, (r) => {
+        if (r.queued) {
+            console.log(`⏳ 整理请求已入队（${mode} 模式），前一个整理会话结束后自动启动`);
+            for (const line of formatQueueDetails(r.queued))
+                console.log(`  ${line}`);
+            console.log('启动后整理结果会反馈到发起会话。');
+            return;
+        }
         console.log(`✓ 整理会话已启动（${mode} 模式）`);
         if (r.triggerId)
             console.log(`  triggerId:      ${r.triggerId}`);
         if (r.executionSessionId)
             console.log(`  sessionId:      ${r.executionSessionId}`);
-        console.log(`  agentSessionId: ${r.agentSessionId ?? '（会话仍在初始化，稍后用 sessionId 查）'}`);
         if (r.contextFilePath)
             console.log(`  context:        ${r.contextFilePath}`);
         console.log('整理会话在后台继续运行。');
@@ -418,7 +499,7 @@ async function cmdMemoryFeedback(args) {
     }
     const { socketPath, ...session } = requireManagedSession('ec memory feedback', flags);
     const result = await ipcQuery(socketPath, {
-        type: 'memory.feedback', ...session, text,
+        type: 'memory.feedback', argv: ['memory', 'feedback', ...args], ...session, text,
     }, 15_000);
     reportResult(result, () => {
         console.log('✓ 已记录反馈内容');