evolcore 0.0.28 → 0.0.29

package/dist/cli/data-command.js

@@ -99,7 +99,7 @@ export async function cmdData(args) {
         // when there is no legacy source to process.
         const existing = requestedId ? readDataMigration(root, requestedId) : undefined;
         let manifest = existing ?? planDataMigration(root);
-        if (manifest.operations.length === 0 && Object.keys(manifest.supersededSourceHashes ?? {}).length === 0) {
+        if (manifest.operations.length === 0) {
             printSummary(manifest);
             console.log('No legacy data requires migration.');
             return;
@@ -119,9 +119,6 @@ export async function cmdData(args) {
                 manifest = applyDataMigration(manifest);
                 manifest = verifyDataMigration(manifest, { strictTargetContent: true });
                 printSummary(manifest);
-                if (manifest.state !== 'completed') {
-                    throw new Error(`migration is not fully verified; fix the listed operations and run ec data migrate --apply ${manifest.id}`);
-                }
             }
             else {
                 // A completed manifest may come from the previous copy-only workflow,
@@ -133,6 +130,9 @@ export async function cmdData(args) {
             console.log(`archive: ${finalization.archivePath}`);
             console.log(`archive-sha256: ${finalization.archiveSha256}`);
             console.log(`removed legacy sources: ${finalization.sourcePaths.length}`);
+            if (manifest.state !== 'completed') {
+                throw new Error(`migration is not fully verified; fix the listed operations and run ec data migrate --apply ${manifest.id}`);
+            }
             if (wasRunning) {
                 console.log('Starting daemon and Agent runtimes after data migration...');
                 await cmdStart();

package/dist/cli/handoff-command.js

@@ -5,6 +5,7 @@ import { HANDOFF_QUERY_DEFAULT_LIMIT, HANDOFF_QUERY_MAX_LIMIT, HANDOFF_STATES }
 import { HANDOFF_ID_RE } from '../core/handoff/store.js';
 import { isHelpFlag, wantsHelp } from './help.js';
 import { readDelegationCredential } from '../core/auth/agent-delegation.js';
+import { canonicalizeEvolcoreCommandArgv } from '../core/permission/ec-command-parser.js';
 function parseLimit(value) {
     const limit = Number(value);
     if (!value || !Number.isInteger(limit) || limit < 1 || limit > HANDOFF_QUERY_MAX_LIMIT) {
@@ -70,6 +71,7 @@ export function parseTrace(args) {
     return parsed;
 }
 export function parseReturn(args) {
+    args = canonicalizeEvolcoreCommandArgv(['ec', 'handoff', 'return', ...args]).slice(3);
     const dash = args.indexOf('--');
     if (dash >= 0) {
         const beforeDash = args.slice(0, dash);

package/dist/cli/index.js

@@ -14,6 +14,7 @@ import { cmdRestartMonitor } from './restart-monitor.js';
 import { cmdAid, cmdRpc, cmdStorage, cmdMsg, cmdGroup } from './aun-commands.js';
 import { cmdAgent } from './agent-command.js';
 import { cmdCtl } from './ctl-command.js';
+import { cmdMemory } from './memory-command.js';
 import { cmdQueue } from './queue-command.js';
 import { cmdStart, cmdStop, cmdRestart, cmdStatus, cmdLogs, cmdWatchCommand, cmdMv, cmdDiagnose } from './daemon-commands.js';
 import { logCliCommand } from './command-log.js';
@@ -80,7 +81,7 @@ function printLifecycleHelp(command) {
         restart: `用法: ec restart [--clear] [--diagnose|-d]\n\n  --clear        同时清理跨 HOME 残留的 EvolCore 主进程\n  --diagnose, -d 以诊断模式启动新 daemon`,
         status: '用法: ec status\n\n查看 daemon、agent、渠道与会话运行状态。',
         logs: `用法: ec logs [选项]\n\n  --level <error|warn|info|debug>  最低日志级别\n  --module <name>                  只显示指定模块\n  --raw                            原始输出\n  --no-color                       禁用颜色`,
-        watch: `用法: ec watch [logs|log|aid|msg|web|session]\n\n  ec watch                 打开监控选择菜单\n  ec watch logs            选择日志类型后监控\n  ec watch log <类型...>   直接监控指定日志类型\n  ec watch aid             监控 AID 连接\n  ec watch msg             打开消息 TUI\n  ec watch web             安装/升级并启动 EC Web\n  ec watch session         ec watch web 的兼容别名`,
+        watch: `用法: ec watch [logs|log|aid|msg|diag|web|session]\n\n  ec watch                 打开监控选择菜单\n  ec watch logs            选择日志类型后监控\n  ec watch log <类型...>   直接监控指定日志类型\n  ec watch aid             监控 AID 连接\n  ec watch msg             打开消息 TUI\n  ec watch diag            实时诊断消息生命周期（AUN→daemon→任务）\n  ec watch web             安装/升级并启动 EC Web\n  ec watch session         ec watch web 的兼容别名`,
         'restart-monitor': '用法: ec restart-monitor\n\n运行内 daemon 重启与升级监控器。',
         diagnose: '用法: ec diagnose [--codex-hook]\n\n检查配置、数据库、进程和编译产物。\n\n  --codex-hook 运行 Windows Codex managed hook 启动探针。',
         mv: '用法: ec mv <old-directory> <new-directory>\n\n迁移项目目录以及 Claude、Codex 和 EvolCore 会话路径。',
@@ -92,6 +93,14 @@ process.removeAllListeners('warning');
 process.on('warning', (w) => { if (w.name === 'ExperimentalWarning')
     return; process.stderr.write((w.stack ?? String(w)) + '\n'); });
 export async function main(args) {
+    // 托管任务里裸跑 `ec` 想问的是"有哪些命令"，而不是要启动 daemon。
+    // 默认回落到 `start` 会让守卫抛出 "Command start is not available"，
+    // 把用户引向进程生命周期，而真实意图是查用法。这里直接给帮助。
+    if (args.length === 0 && process.env.EVOLCORE_SESSION_ID) {
+        console.log(MAIN_HELP);
+        process.exitCode = 1;
+        return;
+    }
     const cmd = args[0] || 'start';
     try {
         assertManagedTopLevelCommandAllowed(cmd, args);
@@ -326,6 +335,9 @@ export async function main(args) {
         case 'ctl':
             await cmdCtl(args.slice(1));
             break;
+        case 'memory':
+            await cmdMemory(args.slice(1));
+            break;
         case 'queue':
             await cmdQueue(args.slice(1));
             break;
@@ -417,6 +429,11 @@ export async function main(args) {
             await cmdModel(args.slice(1));
             break;
         }
+        case 'skill': {
+            const { cmdSkill } = await import('./skill-command.js');
+            await cmdSkill(args.slice(1));
+            break;
+        }
         case 'response': {
             const { cmdResponse } = await import('./response.js');
             await cmdResponse(args.slice(1));

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

@@ -11,10 +11,20 @@ const MANAGED_TASK_COMMANDS = new Set([
     'fs',
     'group',
     'handoff',
+    // `memory` only works inside a managed task: both subcommands require
+    // EVOLCORE_SESSION_ID and authorize through their daemon IPC entrypoints.
+    'memory',
     'model',
     'msg',
     'queue',
     'response',
+    // `skill` 管理 EC 技能（安装/开关/校验）。它的主要使用者就是 agent 自己——
+    // ec-skill 技能的 SKILL.md 明确指导 agent 调用它。脚本只读写
+    // $EVOLCORE_HOME/skills/ 与 kits/skills/ 下的技能文件，不触碰进程生命周期。
+    // 本白名单只负责让它进到脚本；具体某一级的读写权限由 skill.mjs 的
+    // assertPermission() 按会话上下文判定（群聊一律拒，Agent 级要 owner，
+    // 本机级要 daemonowner），故此处不额外收紧。
+    'skill',
     // `stats` reads the usage database directly. It authorizes each managed call
     // against the task's relation role in `resolveManagedStatsScope`.
     'stats',

package/dist/cli/memory-command.js

@@ -0,0 +1,441 @@
+/**
+ * memory-command.ts — `ec memory` 子命令实现（v3）
+ *
+ * 主会话可用：
+ *   ec memory note --slug <slug> [--tags <...>] <content>
+ *   ec memory note update <slug> [--slug <新slug>] [--tags <...>] [<content>]
+ *   ec memory note drop <slug>
+ *   ec memory note list
+ *   ec memory consolidate [--mode notes|generalize|promote|profile|forget]
+ *
+ * 整理会话（sessionType=memory）另有 create / update / archive 三个写命令，
+ * 实现见 core/memory/memory-writer.ts，在这里只做 CLI 分发与权限委托。
+ */
+import { resolvePaths } from '../paths.js';
+import { ipcQuery } from '../ipc.js';
+import { isHelpFlag, wantsHelp } from './help.js';
+import { readDelegationCredential } from '../core/auth/agent-delegation.js';
+export const MEMORY_MODES = ['notes', 'generalize', 'promote', 'profile', 'forget'];
+const MEMORY_HELP = `用法: ec memory <command> [选项]
+
+命令:
+  note         写入 / 修改 / 撤销 / 查看临时记忆（主会话）
+  create       新建正式记忆（仅整理会话）
+  update       修改正式记忆的标签，或续期（仅整理会话）
+  archive      归档正式记忆（仅整理会话）
+  demote       把记忆降级回上一层（agent→relation，owner→agent）
+  consolidate  触发记忆整理（启动整理会话）
+
+ec memory note --slug <slug> [--tags <tag1,tag2,...>] <content>
+
+选项:
+  --slug <slug>      文件名标识，字母/数字/连字符，长度 1-64（必填）
+  --tags <...>       标签列表，逗号分隔；取值见 \$KITS_DOCS/evolcore/memory-tags.md
+
+ec memory note update <slug> [--slug <新slug>] [--tags <...>] [<content>]
+ec memory note drop <slug>
+ec memory note list
+
+ec memory create --scope <relation|agent|owner> --slug <slug> --desc <description> \\
+    --tags <...> [--keywords <...>] [--replaces <path,...>] <content>
+
+ec memory update <path> [--tags <...>] [--touch]
+
+ec memory archive <path...>
+
+ec memory consolidate [--mode <notes|generalize|promote|profile|forget>]
+
+选项:
+  --mode              整理模式（默认 notes）
+
+公共选项（所有子命令）:
+  --debug <sessionId> 在宿主终端模拟该会话的托管环境（仅开发仓 daemon 支持）；
+                      会话没有运行中任务时，daemon 从会话文件重建运行时上下文
+
+示例:
+  ec memory note --slug commit-convention --tags "rule,long-term" "commit 消息必须用中文"
+  ec memory note update commit-convention --tags "rule,done" "commit 消息必须用中文"
+  ec memory note drop commit-convention
+  ec memory note list
+  ec memory consolidate
+  ec memory consolidate --mode promote
+  ec memory create --scope relation --slug profile --desc "对端画像" --tags "profile" --replaces consolidated/profile.md "（画像正文）"
+  ec memory update consolidated/commit-convention.md --tags "rule,done"
+  ec memory archive consolidated/obsolete.md`;
+export async function cmdMemory(args) {
+    if (args.length === 0 || isHelpFlag(args[0]) || wantsHelp(args)) {
+        console.log(MEMORY_HELP);
+        return;
+    }
+    const sub = args[0];
+    if (sub === 'note') {
+        await cmdMemoryNote(args.slice(1));
+    }
+    else if (sub === 'consolidate') {
+        await cmdMemoryConsolidate(args.slice(1));
+    }
+    else if (sub === 'create') {
+        await cmdMemoryCreate(args.slice(1));
+    }
+    else if (sub === 'update') {
+        await cmdMemoryConsolidatedUpdate(args.slice(1));
+    }
+    else if (sub === 'archive') {
+        await cmdMemoryArchive(args.slice(1));
+    }
+    else if (sub === 'demote') {
+        await cmdMemoryDemote(args.slice(1));
+    }
+    else if (sub === 'feedback') {
+        await cmdMemoryFeedback(args.slice(1));
+    }
+    else {
+        console.error(`❌ 未知子命令: ${sub}`);
+        console.error(MEMORY_HELP);
+        process.exit(1);
+    }
+}
+/**
+ * 解析 `--key value` 与位置参数。未识别的 `--xxx` 一律报错，避免静默忽略。
+ * `--debug <sessionId>` 是所有子命令的公共参数，不用每处声明。
+ */
+function parseArgs(args, known) {
+    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)) {
+                console.error(`❌ 未知参数: ${a}`);
+                process.exit(1);
+            }
+            if (i + 1 >= args.length || args[i + 1].startsWith('--')) {
+                // --touch 这类布尔开关不带值
+                flags.set(a, '');
+                continue;
+            }
+            flags.set(a, args[++i]);
+        }
+        else {
+            positional.push(a);
+        }
+    }
+    return { flags, positional };
+}
+function parseTags(raw) {
+    if (raw === undefined)
+        return undefined;
+    const tags = raw.split(',').map(t => t.trim()).filter(Boolean);
+    return tags.length > 0 ? tags : undefined;
+}
+/** 各子命令的一行完整用法：缺参报错时附上，模型照抄即可重试。 */
+const USAGE = {
+    note: 'ec memory note --slug <slug> [--tags <tag1,tag2>] [--speakers <aid1,aid2>] "<正文>"',
+    noteUpdate: 'ec memory note update <slug> [--slug <新slug>] [--tags <...>] ["<新正文>"]',
+    noteDrop: 'ec memory note drop <slug>',
+    create: 'ec memory create --scope <relation|agent|owner> --slug <slug> --desc "<描述>" --tags <tag1,tag2> [--keywords <...>] [--replaces <路径,...>] [--peer <peerKey>] "<正文>"',
+    update: 'ec memory update <路径> [--tags <tag1,tag2>] [--touch]（至少给一项）',
+    archive: 'ec memory archive <路径...>',
+};
+function failWithUsage(message, usage) {
+    console.error(`❌ ${message}`);
+    console.error(`用法: ${usage}`);
+    process.exit(1);
+}
+/**
+ * 取当前会话。`--debug <sessionId>` 在宿主终端模拟托管环境（仅开发仓 daemon 认）；
+ * 否则读 EVOLCORE_SESSION_ID。
+ */
+function requireManagedSession(cmd, flags) {
+    const debugSessionId = flags.get('--debug');
+    if (flags.has('--debug') && !debugSessionId) {
+        console.error(`❌ --debug 需要提供 sessionId（如 --debug meta_20260910_1789013149542）`);
+        process.exit(1);
+    }
+    const sessionId = debugSessionId || process.env.EVOLCORE_SESSION_ID;
+    if (!sessionId) {
+        console.error(`错误: EVOLCORE_SESSION_ID 未设置（${cmd} 仅在 evolcore 托管环境中可用；调试可加 --debug <sessionId>）`);
+        process.exit(1);
+    }
+    if (debugSessionId)
+        console.error(`[debug] 模拟会话 ${debugSessionId}`);
+    return {
+        sessionId,
+        socketPath: resolvePaths().socket,
+        delegationToken: readDelegationCredential(),
+        ...(debugSessionId ? { debug: true } : {}),
+    };
+}
+// ── note ───────────────────────────────────────────────────────────────────
+async function cmdMemoryNote(args) {
+    if (wantsHelp(args)) {
+        console.log(MEMORY_HELP);
+        return;
+    }
+    const sub = args[0];
+    if (sub === 'update')
+        return cmdMemoryNoteUpdate(args.slice(1));
+    if (sub === 'drop')
+        return cmdMemoryNoteDrop(args.slice(1));
+    if (sub === 'list')
+        return cmdMemoryNoteList(args.slice(1));
+    return cmdMemoryNoteCreate(args);
+}
+async function cmdMemoryNoteCreate(args) {
+    const { flags, positional } = parseArgs(args, ['--slug', '--tags', '--speakers']);
+    const content = positional.join(' ').trim();
+    const slug = flags.get('--slug');
+    const tags = parseTags(flags.get('--tags'));
+    const speakers = parseTags(flags.get('--speakers'));
+    if (!slug)
+        failWithUsage('必须提供 --slug', USAGE.note);
+    if (!content)
+        failWithUsage('必须提供记忆内容（content）', USAGE.note);
+    const { socketPath, ...session } = requireManagedSession('ec memory note', flags);
+    const result = await ipcQuery(socketPath, {
+        type: 'memory.note', ...session, slug, content, tags,
+        speakers: speakers && speakers.length > 0 ? speakers : undefined,
+    }, 15_000);
+    reportResult(result, (r) => {
+        if (r.filePath)
+            console.log(r.filePath);
+    });
+}
+async function cmdMemoryNoteUpdate(args) {
+    const { flags, positional } = parseArgs(args, ['--slug', '--tags']);
+    const slug = positional[0];
+    const content = positional.slice(1).join(' ').trim();
+    const newSlug = flags.get('--slug');
+    const tagsRaw = flags.get('--tags');
+    const tags = parseTags(tagsRaw);
+    if (!slug)
+        failWithUsage('必须提供要修改的 slug', USAGE.noteUpdate);
+    if (!newSlug && tagsRaw === undefined && !content) {
+        failWithUsage('至少提供一项要改的内容（--slug / --tags / 正文）', USAGE.noteUpdate);
+    }
+    const { socketPath, ...session } = requireManagedSession('ec memory note update', flags);
+    const result = await ipcQuery(socketPath, {
+        type: 'memory.note.update', ...session, slug,
+        newSlug, tags, tagsProvided: tagsRaw !== undefined,
+        content: content || undefined,
+    }, 15_000);
+    reportResult(result, (r) => {
+        if (r.filePath)
+            console.log(r.filePath);
+    });
+}
+async function cmdMemoryNoteDrop(args) {
+    const { flags, positional } = parseArgs(args, []);
+    const slug = positional[0];
+    if (!slug)
+        failWithUsage('必须提供要撤销的 slug', USAGE.noteDrop);
+    const { socketPath, ...session } = requireManagedSession('ec memory note drop', flags);
+    const result = await ipcQuery(socketPath, {
+        type: 'memory.note.drop', ...session, slug,
+    }, 15_000);
+    reportResult(result, (r) => {
+        console.log(`✓ 已撤销: ${r.filePath ?? slug}`);
+    });
+}
+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,
+    }, 15_000);
+    reportResult(result, (r) => {
+        const notes = r.notes ?? [];
+        if (notes.length === 0) {
+            console.log('（没有待整理的 note）');
+            return;
+        }
+        for (const n of notes) {
+            const tags = n.tags?.length ? ` [${n.tags.join(', ')}]` : '';
+            console.log(`${n.slug}${tags}${n.updatedAt ? `  (${n.updatedAt})` : ''}`);
+            if (n.firstLine)
+                console.log(`    ${n.firstLine}`);
+        }
+    });
+}
+// ── create / update / archive（仅整理会话） ─────────────────────────────────
+async function cmdMemoryCreate(args) {
+    const { flags, positional } = parseArgs(args, [
+        '--scope', '--slug', '--desc', '--tags', '--keywords', '--replaces', '--peer',
+    ]);
+    const content = positional.join(' ').trim();
+    const scope = flags.get('--scope');
+    const slug = flags.get('--slug');
+    const desc = flags.get('--desc');
+    const tagsRaw = flags.get('--tags');
+    const keywordsRaw = flags.get('--keywords');
+    const replacesRaw = flags.get('--replaces');
+    const targetPeerKey = flags.get('--peer');
+    if (!scope || !['agent', 'relation', 'owner'].includes(scope)) {
+        failWithUsage('--scope 必须是 agent / relation / owner 之一', USAGE.create);
+    }
+    if (!slug)
+        failWithUsage('必须提供 --slug', USAGE.create);
+    if (!desc)
+        failWithUsage('必须提供 --desc', USAGE.create);
+    if (tagsRaw === undefined)
+        failWithUsage('必须提供 --tags', USAGE.create);
+    if (!content)
+        failWithUsage('必须提供记忆内容（content）', USAGE.create);
+    if (targetPeerKey !== undefined && scope !== 'relation') {
+        failWithUsage('--peer 只在 --scope relation 时有效', USAGE.create);
+    }
+    const { socketPath, ...session } = requireManagedSession('ec memory create', flags);
+    const result = await ipcQuery(socketPath, {
+        type: 'memory.create', ...session, scope, slug, description: desc,
+        content,
+        tags: parseTags(tagsRaw),
+        keywords: parseTags(keywordsRaw),
+        replaces: replacesRaw ? replacesRaw.split(',').map(s => s.trim()).filter(Boolean) : undefined,
+        targetPeerKey: targetPeerKey ?? undefined,
+    }, 15_000);
+    reportResult(result, (r) => {
+        if (r.filePath)
+            console.log(r.filePath);
+        if (Array.isArray(r.archived) && r.archived.length > 0) {
+            console.log(`已归档: ${r.archived.join(', ')}`);
+        }
+    });
+}
+async function cmdMemoryConsolidatedUpdate(args) {
+    const { flags, positional } = parseArgs(args, ['--tags', '--touch']);
+    const filePath = positional[0];
+    const tagsRaw = flags.get('--tags');
+    const touch = flags.has('--touch');
+    if (!filePath)
+        failWithUsage('必须提供要修改的记忆文件路径', USAGE.update);
+    if (tagsRaw === undefined && !touch)
+        failWithUsage('至少提供 --tags 或 --touch', USAGE.update);
+    const { socketPath, ...session } = requireManagedSession('ec memory update', flags);
+    const result = await ipcQuery(socketPath, {
+        type: 'memory.update', ...session, filePath,
+        tags: parseTags(tagsRaw), touch,
+    }, 15_000);
+    reportResult(result, () => {
+        console.log(`✓ 已更新: ${filePath}`);
+    });
+}
+async function cmdMemoryArchive(args) {
+    const { flags, positional } = parseArgs(args, []);
+    if (positional.length === 0)
+        failWithUsage('必须提供至少一个要归档的文件路径', USAGE.archive);
+    const { socketPath, ...session } = requireManagedSession('ec memory archive', flags);
+    const result = await ipcQuery(socketPath, {
+        type: 'memory.archive', ...session, filePaths: positional,
+    }, 15_000);
+    reportResult(result, (r) => {
+        const archived = r.archived ?? positional;
+        console.log(`✓ 已归档 ${archived.length} 个文件:`);
+        for (const f of archived)
+            console.log(`  ${f}`);
+    });
+}
+// ── consolidate ────────────────────────────────────────────────────────────
+async function cmdMemoryDemote(args) {
+    if (wantsHelp(args)) {
+        console.log(MEMORY_HELP);
+        return;
+    }
+    const { flags, positional } = parseArgs(args, ['--scope']);
+    const slug = positional[0];
+    if (!slug) {
+        console.error('用法: ec memory demote <slug> [--scope agent|owner]');
+        process.exit(1);
+    }
+    const scope = flags.get('--scope') ?? 'agent';
+    if (scope !== 'agent' && scope !== 'owner') {
+        console.error('--scope 必须是 agent 或 owner');
+        process.exit(1);
+    }
+    const { socketPath, ...session } = requireManagedSession('ec memory demote', flags);
+    const result = await ipcQuery(socketPath, {
+        type: 'memory.demote', ...session, slug, scope,
+    }, 15_000);
+    reportResult(result, (r) => {
+        if (r.conflictArchived) {
+            console.log(`⚠ 目标层已有同名文件，当前记忆已归档至:`);
+            console.log(`  ${r.conflictArchived}`);
+        }
+        else {
+            console.log(`✓ 已降级`);
+            console.log(`  ${r.destPath}`);
+        }
+    });
+}
+async function cmdMemoryConsolidate(args) {
+    if (wantsHelp(args)) {
+        console.log(MEMORY_HELP);
+        return;
+    }
+    // 先于通用解析处理已废弃的 --scope，给出可操作的提示而不是「未知参数」
+    if (args.includes('--scope')) {
+        console.error('❌ `--scope` 已废弃。作用域由模式唯一决定，请改用 `--mode <notes|generalize|promote|profile|forget>`');
+        process.exit(1);
+    }
+    const { flags } = parseArgs(args, ['--mode']);
+    const mode = (flags.get('--mode') ?? 'notes');
+    if (!MEMORY_MODES.includes(mode)) {
+        console.error(`❌ --mode 必须是 ${MEMORY_MODES.join(' / ')} 之一`);
+        process.exit(1);
+    }
+    const { socketPath, ...session } = requireManagedSession('ec memory consolidate', flags);
+    console.log(`正在触发记忆整理（mode=${mode}）...`);
+    const result = await ipcQuery(socketPath, {
+        type: 'memory.consolidate', ...session, mode,
+    }, 30_000);
+    reportResult(result, (r) => {
+        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('整理会话在后台继续运行。');
+    });
+}
+// ── feedback（整理会话反馈）─────────────────────────────────────────────────
+/**
+ * 整理会话用 `ec memory feedback "<文本>"` 记录本次整理的反馈内容。
+ * 文本写入批次目录的 ops.jsonl（op=feedback-set），收尾时据此投递回发起会话。
+ * 未调用则不写，收尾回退到默认统计模板。
+ */
+async function cmdMemoryFeedback(args) {
+    if (wantsHelp(args)) {
+        console.log(MEMORY_HELP);
+        return;
+    }
+    const { flags, positional } = parseArgs(args, []);
+    const text = positional.join(' ').trim();
+    if (!text) {
+        console.error('用法: ec memory feedback "<反馈文本>"');
+        process.exit(1);
+    }
+    const { socketPath, ...session } = requireManagedSession('ec memory feedback', flags);
+    const result = await ipcQuery(socketPath, {
+        type: 'memory.feedback', ...session, text,
+    }, 15_000);
+    reportResult(result, () => {
+        console.log('✓ 已记录反馈内容');
+    });
+}
+// ── 结果输出 ───────────────────────────────────────────────────────────────
+function reportResult(result, ok) {
+    if (!result) {
+        console.error('错误: 无法连接 evolcore 服务');
+        process.exit(1);
+    }
+    const r = result;
+    if (r.ok) {
+        ok(r);
+    }
+    else {
+        console.error(r.error || '操作失败');
+        process.exit(1);
+    }
+}

package/dist/cli/restart-monitor.js

@@ -3,7 +3,7 @@ import path from 'path';
 import { spawn, execFile } from 'child_process';
 import { promisify } from 'util';
 import { resolvePaths, getPackageRoot, daemonControlDir } from '../paths.js';
-import { loadDaemonConfig } from '../config-store.js';
+import { isRestartRecoveryEnabled, loadDaemonConfig } from '../config-store.js';
 import * as platform from '../utils/cross-platform.js';
 import { EventBus } from '../core/event-bus.js';
 import { applyCachedPackageUpgrades, recordPackageUpgrade } from '../utils/package-version-info.js';
@@ -13,10 +13,52 @@ import { scanInstances, cleanupInstances, writeRestartMonitor, removeRestartMoni
 import { MAIN_PACKAGE_NAME, WEB_PACKAGE_NAME } from '../product.js';
 import { shouldSuppressRealRestart } from '../utils/restart-safety.js';
 import { rotateStdoutLog } from '../utils/log-writer.js';
-import { inspectDataMigrationRequirement } from '../core/data-migration.js';
+import { applyDataMigration, finalizeDataMigration, planDataMigration, verifyDataMigration, } from '../core/data-migration.js';
 import { DAEMON_SHUTDOWN_TIMEOUT_MS, requestDaemonShutdown, stopCodexAppServerOrphans } from './daemon-commands.js';
 import { getProcessStartTime, startTimeMatches } from '../utils/process-introspect.js';
 const execFileAsync = promisify(execFile);
+/** Read-only check performed before stopping the current daemon. */
+function preflightDataMigration(root, log) {
+    try {
+        const plan = planDataMigration(root);
+        const operations = plan.operations.filter(operation => operation.status !== 'acknowledged').length;
+        log(`Data migration preflight passed (${operations} pending operation(s))`);
+        for (const warning of plan.warnings)
+            log(`Migration preflight warning: ${warning}`);
+        return { ok: true, operations };
+    }
+    catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
+        log(`Data migration preflight failed: ${reason}`);
+        return { ok: false, reason };
+    }
+}
+/** Execute the migration transaction while the daemon is stopped. */
+function applyPendingDataMigration(root, log) {
+    try {
+        const plan = planDataMigration(root);
+        const pending = plan.operations.filter(operation => operation.status !== 'acknowledged');
+        if (pending.length === 0) {
+            log('Data migration not required after upgrade');
+            return { ok: true, operations: 0 };
+        }
+        log(`Applying data migration (${pending.length} operation(s))`);
+        const applied = applyDataMigration(plan);
+        const verified = verifyDataMigration(applied, { strictTargetContent: true });
+        const finalization = finalizeDataMigration(root, verified);
+        if (verified.state !== 'completed') {
+            const failed = verified.operations.filter(operation => operation.status === 'error' || operation.issues?.length);
+            throw new Error(`migration verification failed (${failed.length} operation(s)); completed sources archived: ${finalization.archivePath}`);
+        }
+        log(`Data migration completed and legacy sources archived: ${finalization.archivePath}`);
+        return { ok: true, operations: pending.length };
+    }
+    catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
+        log(`Data migration failed: ${reason}`);
+        return { ok: false, reason };
+    }
+}
 // Bound network notifications so they cannot hold up recovery after shutdown.
 const OWNER_NOTIFICATION_TIMEOUT_MS = 5000;
 let foregroundDaemonExit;
@@ -126,9 +168,9 @@ export async function cmdRestartMonitor() {
     const pendingFile = path.join(daemonControlDir(), 'restart-pending.json');
     // 升级成功时记下版本变化，回执里要告诉 agent 实际跑的是哪个版本。
     let upgradeVersions;
-    const migrationRequirement = inspectDataMigrationRequirement(p.root);
-    if (migrationRequirement.required) {
-        const message = `Pending user-data migration (${migrationRequirement.operationCount} operations); leaving the current service running. Run ec data migrate --dry-run, then ec data migrate --apply.`;
+    const migrationPreflight = preflightDataMigration(p.root, log);
+    if (!migrationPreflight.ok) {
+        const message = `重启前用户数据迁移预检失败：${migrationPreflight.reason ?? 'unknown error'}`;
         log(message);
         console.error(`❌ ${message}`);
         cleanupPendingFile(pendingFile, log);
@@ -341,6 +383,13 @@ export async function cmdRestartMonitor() {
         log(`↩ ${buildOutcome.reason ?? '已回滚'}；继续以上一版本启动`);
         await notifyDaemonOwners(p, `⚠️ ${buildOutcome.reason ?? '已回滚'}，正在以上一版本启动服务`, log);
     }
+    const migration = applyPendingDataMigration(p.root, log);
+    if (!migration.ok) {
+        const message = `服务未重启：用户数据迁移失败（${migration.reason ?? 'unknown error'}）`;
+        markRestartOutcome(pendingFile, 'migration-failed', migration.reason, log);
+        cleanupPendingFile(pendingFile, log);
+        process.exit(1);
+    }
     // ECWeb is owned by the daemon. Starting it here used to race with the
     // daemon's own launcher and ECWeb's stale-instance cleanup, which could
     // leave ServiceProxy pointed at a dead PID.
@@ -428,6 +477,13 @@ export async function cmdRestartMonitor() {
         cleanupPendingFile(pendingFile, log);
         process.exit(1);
     }
+    if (!isRestartRecoveryEnabled()) {
+        const message = '服务启动失败，restartRecovery.enabled 已关闭，已跳过 Claude 自动修复。';
+        log(`⚠️ ${message}`);
+        await notifyDaemonOwners(p, `⚠️ ${message}`, log);
+        cleanupPendingFile(pendingFile, log);
+        process.exit(1);
+    }
     // 启动失败，进入 self-heal 循环
     log('❌ Service failed to start, entering self-heal loop');
     eventBus.publish({ type: 'self-heal:started', reason: 'Service failed to start after restart' });
@@ -975,7 +1031,7 @@ async function invokeClaude(claudePath, p, attempt, maxAttempts, timeout, log) {
 - 检查是否有旧进程仍在运行：\`ps aux | grep 'node.*dist/index.js' | grep -v grep\`，旧进程可能占用端口或锁文件
 - 可以运行 \`EVOLCORE_HOME=${p.root} node dist/cli/index.js diagnose\` 快速检查配置和数据库
 - 如果进程无任何输出就 exit(1)，说明是 process.exit(1) 被显式调用，搜索源码中所有 process.exit(1) 位置
-- 配置文件使用双 rename 原子写（foo.json → foo.json_ → foo.json__），崩溃时可从 foo.json_ 恢复
+ - 配置文件先写入 foo.json__，再保留旧版本到 foo.json_，最后原子切换为 foo.json；崩溃后会丢弃未完成的 foo.json__，仅在 foo.json 缺失时从 foo.json_ 恢复
 
 请执行以下步骤：
 1. 读取 ${stdoutLog} 和 ${p.logs}/daemon-*.log（最新文件）的最后 50 行