evolcore 0.0.31 → 0.0.33

package/dist/core/command/topic-slash.js

@@ -0,0 +1,528 @@
+/**
+ * topic-slash.ts — `/thread` 斜杠命令：话题查看与管理
+ *
+ * 权限（沿用 /memory 的两级模型）：
+ *  - 只读（list / show / history / summary show / summary log / peers）：
+ *    私聊所有角色可看；群聊仅 admin+ 可看
+ *  - 写（create / rename / label / status / delete / summary set / summary clear）：
+ *    仅 admin+（群聊同样要求 admin，且只能操作本群关系）
+ *  - rebuild-index：仅 admin+，且默认只报告不写盘（--write 才落盘）
+ *
+ * 操作对象定位：默认当前对端（私聊=对端 AID，群聊=群 ID）；显式 <ref> 支持
+ * `current`、`<peer>`（该对端主会话）、`<peer>/<threadId>` 三种，与 `ec thread` 一致。
+ * 不支持跨关系浏览以外的越权：非本关系的话题需要显式给出 peer，且按同一套角色判定。
+ */
+import { ThreadService, ThreadServiceError } from '../thread/thread-service.js';
+const TOPIC_STATUSES = ['pending', 'in_progress', 'completed', 'archived'];
+const USAGE = [
+    '用法（更名与总结默认作用于当前话题，无需手写 ref）:',
+    '  /thread rename <新名称>          重命名当前话题',
+    '  /thread summary set <内容> --name <新标题|->   写入 summary（--name 必填；- 不改名）',
+    '  /thread summary                  查看当前话题 summary',
+    '  /thread summary log              查看 summary 历史版本',
+    '  /thread summary clear            清空 summary（历史保留）',
+    '',
+    '  /thread                          当前对端的话题列表（等价 /thread list）',
+    '  /thread list all                 本节点所有对端的话题列表',
+    '  /thread list [ref] [--status <s>] [--label <l>] [--page <n>]',
+    '  /thread peers                    列出有话题记录的所有对端',
+    '  /thread show [ref]               查看话题元数据',
+    '  /thread history [ref] [--limit <n>] [--after <ts>] [--before <ts>]',
+    '                                   读取话题历史消息（--after 上次 summary 的 coveredThroughTs 读增量）',
+    '',
+    '  /thread create <名称> [--label <l>] [--status <s>]  新建话题',
+    '  /thread label [ref] <标签|--clear>  设置/清除标签',
+    '  /thread status [ref] <状态>      更新话题业务状态',
+    '  /thread delete [ref]             删除话题（session 文件移入 _trash）',
+    '  /thread rebuild-index [--write]  检查/重建话题索引',
+    '',
+    'ref 格式: current | <peer> | <peer>/<threadId>',
+    '  省略时：更名/总结取当前话题，list/show/history 取当前对端；',
+    '  也可用 --ref <ref> 显式指定（写子命令用它比位置参数更稳）。',
+    `状态值: ${TOPIC_STATUSES.join(' | ')}`,
+].join('\n');
+const result = (text) => ({ kind: 'command.result', text });
+const error = (text) => ({ kind: 'command.error', text: `❌ ${text}` });
+/** 只读子命令：私聊所有角色；群聊仅 admin+。 */
+export function canReadTopicSlash(ctx) {
+    return ctx.chatType === 'group' ? ctx.isAdmin : true;
+}
+/** 写子命令：仅 admin+（私聊与群聊同判据）。 */
+export function canWriteTopicSlash(ctx) {
+    return ctx.isAdmin;
+}
+/** evolhelp / 菜单是否展示 /thread：能定位到当前关系即可。 */
+export function canUseTopicSlash(ctx) {
+    if (!ctx.peerKey)
+        return ctx.chatType !== 'group';
+    return ctx.chatType === 'group' ? ctx.isAdmin : true;
+}
+/**
+ * evolhelp「话题管理」条目。
+ *
+ * 排序按使用频次：**更名 / 总结** 排第一档（日常最高频的写入与读取），
+ * **话题列表** 排第二档，其余查看类跟随，写操作（新建/状态/删除）与索引维护居后。
+ * 只读条目对所有角色展开，写条目仅 admin+。
+ */
+export function topicHelpEntries(ctx) {
+    const category = '话题管理';
+    const roles = [ctx.role];
+    const write = canWriteTopicSlash(ctx);
+    const out = [];
+    // 第一档：更名 + 总结
+    if (write) {
+        out.push({ command: '/thread rename', description: '重命名当前话题', args: '<新名称>', category, roles }, { command: '/thread summary set', description: '写入当前话题 summary', args: '<内容>', category, roles });
+    }
+    out.push({ command: '/thread summary', description: '查看当前话题 summary', args: '[ref]', category, roles }, { command: '/thread summary log', description: '查看 summary 历史版本', args: '[ref]', category, roles });
+    // 第二档：本节点话题列表 + 增量续读
+    out.push({ command: '/thread', aliases: ['/thread list'], description: '当前对端的话题列表', category, roles }, { command: '/thread list all', description: '本节点所有对端的话题列表', category, roles }, { command: '/thread peers', description: '有话题记录的所有对端', category, roles }, { command: '/thread show', description: '查看话题元数据', args: '[ref]', category, roles }, { command: '/thread history', description: '读取话题历史消息', args: '[ref] [--limit <n>]', category, roles });
+    // 第三档：其余写操作与索引维护
+    if (write) {
+        out.push({ command: '/thread create', description: '新建话题', args: '<名称> [--label <l>]', category, roles }, { command: '/thread label', description: '设置/清除话题标签', args: '[ref] <标签|--clear>', category, roles }, { command: '/thread status', description: '更新话题业务状态', args: '[ref] <状态>', category, roles }, { command: '/thread delete', description: '删除话题', args: '[ref]', category, roles }, { command: '/thread rebuild-index', description: '检查话题索引健康状态', category, roles });
+    }
+    out.push({ command: '/thread help', description: '全部子命令说明', category, roles });
+    return out;
+}
+/**
+ * 把 ref 解析成 { peer, threadId }。
+ *
+ * - 省略 / `current`：优先用当前会话所在话题；无话题时退回当前对端主会话
+ * - `<peer>`：该对端主会话
+ * - `<peer>/<threadId>`：指定话题
+ */
+function resolveRef(raw, ctx, service) {
+    const ref = (raw ?? 'current').trim();
+    if (ref === 'current' || !ref) {
+        if (!ctx.peerKey)
+            return error('当前会话没有关系上下文，请显式指定 <peer>');
+        // 先按 sessionId 反查话题（主会话反查不到）
+        if (ctx.selfAid && ctx.sessionId) {
+            const resolved = service.resolveCurrentThread(ctx.selfAid, ctx.sessionId);
+            if (resolved)
+                return resolved;
+        }
+        if (ctx.threadId && ctx.selfAid) {
+            return { peer: ctx.peerKey, threadId: ctx.threadId };
+        }
+        return { peer: ctx.peerKey };
+    }
+    const parsed = ThreadService.resolveRef(ref);
+    if (parsed.kind === 'current') {
+        return resolveRef(undefined, ctx, service);
+    }
+    if (parsed.kind === 'peer')
+        return { peer: parsed.peer };
+    return { peer: parsed.peer, threadId: parsed.threadId };
+}
+function isPayload(v) {
+    return typeof v === 'object' && v !== null && 'kind' in v;
+}
+// ── 格式化 ──
+function formatTime(ts) {
+    if (!ts)
+        return '-';
+    const d = new Date(ts);
+    const pad = (n) => String(n).padStart(2, '0');
+    return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+}
+function truncate(s, n) {
+    const flat = s.replace(/\s+/g, ' ').trim();
+    return flat.length > n ? `${flat.slice(0, n)}…` : flat;
+}
+function formatThreadLine(t, currentThreadId) {
+    const mark = currentThreadId && t.threadId === currentThreadId ? ' ←当前' : '';
+    // 标题只放标题本身；状态/标签各自成字段，不与标题拼接
+    const bits = [
+        t.name,
+        t.label ? `标签:${t.label}` : '',
+        t.topicStatus ? `状态:${t.topicStatus}` : '',
+        formatTime(t.lastActiveAt),
+        t.lastMsgSnippet ? truncate(t.lastMsgSnippet, 30) : '',
+    ].filter(Boolean);
+    return `  ${bits.join(' · ')}${mark}\n    ref: ${t.peer}/${t.threadId}  (${t.msgTotal ?? 0} 条)`;
+}
+function formatThreadList(threads, opts, currentThreadId) {
+    if (threads.length === 0)
+        return '（没有话题）';
+    const lines = [`共 ${opts.total} 个话题（第 ${opts.page} 页，每页 ${opts.limit}）`, ''];
+    for (const t of threads)
+        lines.push(formatThreadLine(t, currentThreadId));
+    if (opts.hasMore)
+        lines.push('', `还有更多：/thread list <peer> --page ${opts.page + 1}`);
+    return lines.join('\n');
+}
+function formatHistory(messages, opts) {
+    if (messages.length === 0)
+        return '（没有消息）';
+    const lines = [`${opts.threadId ? `话题 ${opts.threadId}` : '主会话'} · 共 ${opts.total} 条，显示 ${messages.length} 条`, ''];
+    for (const m of messages) {
+        const who = m.dir === 'out' ? '→' : '←';
+        lines.push(`  [${formatTime(m.timestamp)}] ${who} ${truncate(m.content, 120)}`);
+    }
+    return lines.join('\n');
+}
+/** 解析 `--key value` / `--flag`，其余进 positional。 */
+function parseArgs(argv) {
+    const positional = [];
+    const flags = {};
+    for (let i = 0; i < argv.length; i++) {
+        const a = argv[i];
+        if (a.startsWith('--')) {
+            const key = a.slice(2);
+            const next = argv[i + 1];
+            if (next === undefined || next.startsWith('--'))
+                flags[key] = true;
+            else {
+                flags[key] = next;
+                i++;
+            }
+        }
+        else {
+            positional.push(a);
+        }
+    }
+    return { positional, flags };
+}
+function normalizeStatus(raw) {
+    if (typeof raw !== 'string')
+        return undefined;
+    return TOPIC_STATUSES.includes(raw) ? raw : undefined;
+}
+function needStatus(raw) {
+    if (typeof raw !== 'string' || !raw)
+        return error(`缺少状态值\n可选: ${TOPIC_STATUSES.join(' / ')}`);
+    const s = normalizeStatus(raw);
+    if (!s)
+        return error(`无效状态: ${raw}\n可选: ${TOPIC_STATUSES.join(' / ')}`);
+    return s;
+}
+/**
+ * 解析 ref 来源。
+ *
+ * 优先 `--ref <ref>`（写子命令用它最稳，名称里含 `/` 也不会被误判）；
+ * 否则看首个位置参数是否**明确像 ref**（`current` 或含 `/`）。
+ * 都不满足时返回 undefined，由 resolveRef 落到"当前话题 / 当前对端"默认值。
+ */
+function refSource(positional, flags) {
+    if (typeof flags.ref === 'string')
+        return flags.ref;
+    const first = positional[0];
+    if (first === 'current' || (first !== undefined && first.includes('/')))
+        return first;
+    return undefined;
+}
+/** 从 positional 里剔除已被当作 ref 的首参数。 */
+function stripRefArg(positional, ref) {
+    return ref !== undefined && positional[0] === ref ? positional.slice(1) : positional;
+}
+export async function handleTopicSlash(ctx) {
+    if (!ctx.selfAid)
+        return error('无法确定当前 agent AID');
+    const service = new ThreadService(ctx.sessionManager);
+    const argv = ctx.content.trim().split(/\s+/).slice(1);
+    const sub = argv[0];
+    const { positional, flags } = parseArgs(argv.slice(1));
+    const write = canWriteTopicSlash(ctx);
+    try {
+        if (sub === 'help')
+            return result(USAGE);
+        // 只读闸门：群聊中非 admin 一律拦下（写操作另有 canWriteTopicSlash）
+        if (!canReadTopicSlash(ctx)) {
+            return error('群聊中话题查看仅限管理员，输入 /thread help 查看详情');
+        }
+        // 无参 / list：话题列表
+        if (!sub || sub === 'list') {
+            return listThreads(ctx, service, positional, flags);
+        }
+        if (sub === 'peers')
+            return listPeers(ctx, service);
+        if (sub === 'show') {
+            const ref = refSource(positional, flags);
+            const target = resolveRef(ref, ctx, service);
+            if (isPayload(target))
+                return target;
+            if (!target.threadId)
+                return error('当前是主会话，不显示话题元数据；请指定 <peer>/<threadId>');
+            const t = service.findInIndex(ctx.selfAid, target.peer, target.threadId);
+            if (!t)
+                return error(`话题不存在: ${target.peer}/${target.threadId}`);
+            const summary = service.showSummary(ctx.selfAid, t.sessionId);
+            const lines = [
+                `话题: ${t.name}`,
+                `ref: ${t.peer}/${t.threadId}`,
+                `session: ${t.sessionId}`,
+                `对端: ${t.peer}（${t.peerKind === 'group' ? '群' : '私聊'}）`,
+                `状态: ${t.topicStatus}`,
+                `标签: ${t.label ?? '(无)'}`,
+                `创建: ${formatTime(t.createdAt)}  最近活跃: ${formatTime(t.lastActiveAt)}`,
+                `消息: ${t.msgTotal ?? 0} 条（24h 内 ${t.msg24h ?? 0} 条）`,
+            ];
+            if (summary)
+                lines.push('', `summary (rev ${summary.rev}): ${truncate(summary.content, 300)}`);
+            return result(lines.join('\n'));
+        }
+        if (sub === 'history') {
+            const ref = refSource(positional, flags);
+            const target = resolveRef(ref, ctx, service);
+            if (isPayload(target))
+                return target;
+            const limit = typeof flags.limit === 'string' ? parseInt(flags.limit, 10) : 20;
+            if (!Number.isFinite(limit) || limit <= 0)
+                return error('--limit 必须是正整数');
+            const h = await service.historyThread({
+                selfAid: ctx.selfAid,
+                peer: target.peer,
+                threadId: target.threadId,
+                limit,
+            });
+            return result(formatHistory(h.messages, { total: h.total, peer: h.peer, threadId: h.threadId }));
+        }
+        if (sub === 'summary') {
+            // 必须 await：summaryCommand 内部的异步异常要落进本函数的 try/catch，
+            // 否则会成为未处理拒绝，用户拿到的是超时/静默而不是错误文案。
+            return await summaryCommand(ctx, service, positional, flags, write);
+        }
+        // ── 以下为写操作 ──
+        if (!write) {
+            return error(ctx.chatType === 'group'
+                ? '群聊中话题管理仅限管理员，输入 /thread help 查看可用的只读命令'
+                : '无权限：话题管理仅限管理员');
+        }
+        if (sub === 'create') {
+            const name = positional[0];
+            if (!name)
+                return error('用法: /thread create <名称> [--label <标签>] [--status <状态>]');
+            if (!ctx.peerKey)
+                return error('当前会话没有关系上下文，无法新建话题');
+            const status = flags.status !== undefined ? needStatus(flags.status) : undefined;
+            if (isPayload(status))
+                return status;
+            if (flags.status !== undefined && !status)
+                return error('无效状态值');
+            const created = await service.createThread({
+                selfAid: ctx.selfAid,
+                peer: ctx.peerKey,
+                peerKind: ctx.chatType === 'group' ? 'group' : 'private',
+                name,
+                ...(typeof flags.label === 'string' ? { label: flags.label } : {}),
+                ...(status ? { topicStatus: status } : {}),
+            });
+            return result(`✅ 已创建话题: ${created.name}\nref: ${created.peer}/${created.threadId}`);
+        }
+        if (sub === 'rename') {
+            const ref = refSource(positional, flags);
+            const name = stripRefArg(positional, ref).join(' ').trim();
+            if (!name)
+                return error('用法: /thread rename <新名称>（默认改当前话题；跨话题用 --ref <peer>/<threadId>）');
+            const target = resolveRef(ref, ctx, service);
+            if (isPayload(target))
+                return target;
+            if (!target.threadId)
+                return error('不能重命名主会话；请指定 <peer>/<threadId> 或用 --ref');
+            const r = await service.renameThread({ selfAid: ctx.selfAid, peer: target.peer, threadId: target.threadId, name });
+            return result(r.changed ? `✅ 已重命名为 ${r.name}` : `话题名称已是 ${r.name}`);
+        }
+        if (sub === 'label') {
+            const ref = refSource(positional, flags);
+            const target = resolveRef(ref, ctx, service);
+            if (isPayload(target))
+                return target;
+            if (!target.threadId)
+                return error('不能标记主会话；请指定 <peer>/<threadId>');
+            const clear = flags.clear === true;
+            const labelArg = stripRefArg(positional, ref).join(' ').trim();
+            if (!clear && !labelArg)
+                return error('用法: /thread label <标签>  或  /thread label --clear');
+            const label = clear ? null : labelArg;
+            await service.labelThread({ selfAid: ctx.selfAid, peer: target.peer, threadId: target.threadId, label });
+            return result(clear ? '✅ 已清除标签' : `✅ 已设置标签: ${label}`);
+        }
+        if (sub === 'status') {
+            const ref = refSource(positional, flags);
+            const target = resolveRef(ref, ctx, service);
+            if (isPayload(target))
+                return target;
+            if (!target.threadId)
+                return error('不能更新主会话状态；请指定 <peer>/<threadId>');
+            const status = needStatus(stripRefArg(positional, ref)[0]);
+            if (isPayload(status))
+                return status;
+            await service.statusThread({ selfAid: ctx.selfAid, peer: target.peer, threadId: target.threadId, topicStatus: status });
+            return result(`✅ 状态已更新为 ${status}`);
+        }
+        if (sub === 'delete') {
+            const ref = refSource(positional, flags);
+            const target = resolveRef(ref, ctx, service);
+            if (isPayload(target))
+                return target;
+            if (!target.threadId)
+                return error('不能删除主会话；请指定 <peer>/<threadId>');
+            await service.deleteThread(ctx.selfAid, target.peer, target.threadId);
+            return result(`✅ 已删除话题 ${target.threadId}（session 文件移入 _trash）`);
+        }
+        if (sub === 'rebuild-index') {
+            const doWrite = flags.write === true;
+            const r = await service.rebuildIndex(ctx.selfAid, !doWrite);
+            const parts = doWrite
+                ? [`✅ 索引已重建（${r.rebuilt} 条）`]
+                : [`索引检查：${r.rebuilt} 条可重建`];
+            if (r.missing)
+                parts.push(`⚠️ ${r.missing} 条 session 文件缺失`);
+            if (!doWrite)
+                parts.push('', '加 --write 才实际写盘。');
+            return result(parts.join('\n'));
+        }
+        return error(`未知子命令: ${sub}\n\n${USAGE}`);
+    }
+    catch (e) {
+        if (e instanceof ThreadServiceError)
+            return error(`${e.message}${e.code ? `（${e.code}）` : ''}`);
+        return error(e instanceof Error ? e.message : String(e));
+    }
+}
+async function listThreads(ctx, service, positional, flags) {
+    const all = flags.all === true;
+    let peer;
+    if (!all) {
+        const ref = refSource(positional, flags);
+        const target = resolveRef(ref, ctx, service);
+        if (isPayload(target))
+            return target;
+        peer = target.peer;
+    }
+    else if (typeof flags.peer === 'string') {
+        peer = flags.peer;
+    }
+    else if (typeof positional[0] === 'string') {
+        peer = positional[0];
+    }
+    const status = flags.status !== undefined ? normalizeStatus(flags.status) : undefined;
+    if (flags.status !== undefined && !status)
+        return error(`无效状态: ${String(flags.status)}`);
+    const page = typeof flags.page === 'string' ? parseInt(flags.page, 10) : 1;
+    const limit = typeof flags.limit === 'string' ? parseInt(flags.limit, 10) : 10;
+    const r = service.listThreads({
+        selfAid: ctx.selfAid,
+        ...(peer ? { peer } : {}),
+        ...(status ? { status } : {}),
+        ...(typeof flags.label === 'string' ? { label: flags.label } : {}),
+        ...(flags.unlabeled === true ? { unlabeled: true } : {}),
+        ...(flags.sort === 'created' ? { sort: 'created' } : {}),
+        page: Number.isFinite(page) && page > 0 ? page : 1,
+        limit: Number.isFinite(limit) && limit > 0 ? limit : 10,
+    });
+    const current = resolveRef(undefined, ctx, service);
+    const currentThreadId = isPayload(current) ? undefined : current.threadId;
+    return result(formatThreadList(r.threads, r, currentThreadId));
+}
+function listPeers(ctx, service) {
+    const peers = service.listPeers(ctx.selfAid);
+    if (peers.length === 0)
+        return result('（没有任何对端的话题记录）');
+    const lines = [`${peers.length} 个对端：`, ''];
+    for (const p of peers) {
+        lines.push(`  ${p.peer}  ${p.peerKind === 'group' ? '群' : '私聊'}  ${p.threadCount} 个话题  ${formatTime(p.lastActiveAt)}`);
+    }
+    return result(lines.join('\n'));
+}
+async function summaryCommand(ctx, service, positional, flags, write) {
+    const action = positional[0];
+    const rest = positional.slice(1);
+    // summary log [ref]
+    if (action === 'log') {
+        const ref = refSource(rest, flags);
+        const target = resolveRef(ref, ctx, service);
+        if (isPayload(target))
+            return target;
+        const sessionId = await sessionIdFor(ctx, service, target);
+        if (typeof sessionId !== 'string')
+            return sessionId;
+        const versions = service.logSummary(ctx.selfAid, sessionId);
+        if (versions.length === 0)
+            return result('（没有 summary 历史）');
+        const lines = [`summary 历史（${versions.length} 个版本）`, ''];
+        for (const v of versions)
+            lines.push(`  rev ${v.rev}  ${formatTime(v.updatedAt)}  ${truncate(v.content, 120)}`);
+        return result(lines.join('\n'));
+    }
+    // summary set <内容> / summary clear
+    if (action === 'set' || action === 'clear') {
+        if (!write) {
+            return error(ctx.chatType === 'group'
+                ? '群聊中修改话题 summary 仅限管理员'
+                : '无权限：修改话题 summary 仅限管理员');
+        }
+        const ref = refSource(rest, flags);
+        const target = resolveRef(ref, ctx, service);
+        if (isPayload(target))
+            return target;
+        const sessionId = await sessionIdFor(ctx, service, target);
+        if (typeof sessionId !== 'string')
+            return sessionId;
+        if (action === 'clear') {
+            service.clearSummary(ctx.selfAid, sessionId);
+            return result('✅ 已清空当前 summary（历史版本保留）');
+        }
+        const content = stripRefArg(rest, ref).join(' ').trim();
+        if (!content)
+            return error('用法: /thread summary set <内容> --name <新标题|->');
+        // --name 必填：显式表达本条摘要对应的标题；不想改名传 `-`。
+        if (typeof flags.name !== 'string') {
+            return error('缺少 --name <新标题>\n'
+                + '不改名请显式传 --name -，例：\n'
+                + '  /thread summary set 摘要内容 --name -');
+        }
+        // 覆盖游标由 service 自动记录，无需传参
+        const ifRev = typeof flags['if-rev'] === 'string' ? parseInt(flags['if-rev'], 10) : undefined;
+        const r = service.setSummary(ctx.selfAid, sessionId, content, Number.isFinite(ifRev) ? ifRev : undefined);
+        const cursorNote = r.coveredThroughTs ? `，覆盖至 ${new Date(r.coveredThroughTs).toLocaleString('zh-CN')}` : '';
+        // --name：顺带改名。主会话没有话题名，跳过改名校验而不是报错。
+        const rawName = flags.name.trim();
+        const newName = rawName && rawName !== '-' ? rawName : undefined;
+        if (newName && !target.threadId) {
+            return result(`✅ summary 已写入（rev ${r.rev}${cursorNote}）\n（主会话没有话题名，--name 已忽略）`);
+        }
+        if (newName && target.threadId) {
+            try {
+                const renamed = await service.renameThread({
+                    selfAid: ctx.selfAid, peer: target.peer, threadId: target.threadId, name: newName,
+                });
+                return result(`✅ summary 已写入（rev ${r.rev}${cursorNote}）\n`
+                    + `✅ 话题已改名: ${renamed.name}`);
+            }
+            catch (e) {
+                const msg = e instanceof ThreadServiceError ? e.message : String(e);
+                return result(`✅ summary 已写入（rev ${r.rev}${cursorNote}）\n⚠️ 改名失败（摘要已写入）: ${msg}`);
+            }
+        }
+        return result(`✅ summary 已写入（rev ${r.rev}${cursorNote}）`);
+    }
+    // summary [ref]：查看
+    const ref = refSource(positional, flags);
+    const target = resolveRef(ref, ctx, service);
+    if (isPayload(target))
+        return target;
+    const sessionId = await sessionIdFor(ctx, service, target);
+    if (typeof sessionId !== 'string')
+        return sessionId;
+    const entry = service.showSummary(ctx.selfAid, sessionId);
+    if (!entry)
+        return result('（当前没有 summary）');
+    return result(`summary (rev ${entry.rev}, ${formatTime(entry.updatedAt)})\n\n${entry.content}`);
+}
+/**
+ * 从 { peer, threadId } 解析出 sessionId。
+ * 主会话（无 threadId）走 showMainSession；话题走索引里的 sessionId。
+ */
+async function sessionIdFor(ctx, service, target) {
+    if (target.threadId) {
+        const entry = service.findInIndex(ctx.selfAid, target.peer, target.threadId);
+        if (!entry)
+            return error(`话题不存在: ${target.peer}/${target.threadId}`);
+        return entry.sessionId;
+    }
+    const main = await service.showMainSession(ctx.selfAid, target.peer);
+    if (!main)
+        return error(`与 ${target.peer} 无活跃主会话`);
+    return main.sessionId;
+}

package/dist/core/evolagent-registry.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { EvolAgent } from './evolagent.js';
 import { logger } from '../utils/logger.js';
-import { agentPersonalDir } from '../paths.js';
+import { agentPersonalDir, aidLocalDir } from '../paths.js';
 import { invalidateAgentDisplayName, resolveAgentDisplayName } from '../aun/aid/agentmd.js';
 import { loadAllAgents, ensureAgentDirSkeleton, loadAgent, validateAgentConfig, } from '../config-store.js';
 import { ConfigTarget, read as readConfig, resolveEffective } from '../config/config-manager.js';
@@ -576,12 +576,12 @@ export class EvolAgentRegistry {
             if (fs.existsSync(personaPath)) {
                 const content = fs.readFileSync(personaPath, 'utf-8');
                 const bold = content.match(/我[叫是]\s*\*{1,2}(.+?)\*{1,2}/);
-                if (bold?.[1]) {
+                if (bold?.[1] && bold[1] !== aid) {
                     this.personalNameCache.set(aid, bold[1]);
                     return bold[1];
                 }
-                const plain = content.match(/(?:我是|我叫)\s*([^\s（(，,。.)]+)/);
-                if (plain?.[1]) {
+                const plain = content.match(/(?:我是|我叫)\s*([^\s*_（(，,。.)]+)/);
+                if (plain?.[1] && plain[1] !== aid) {
                     this.personalNameCache.set(aid, plain[1]);
                     return plain[1];
                 }
@@ -600,6 +600,21 @@ export class EvolAgentRegistry {
         const baseagent = safeInfoValue(() => agent.baseagent, agent.config.active_baseagent ?? '');
         const model = baseagent ? safeInfoValue(() => agent.model, undefined) : undefined;
         const effort = baseagent ? safeInfoValue(() => agent.effort, undefined) : undefined;
+        // lastActivity は in-memory のみ更新される。daemon 再起動後は常に undefined に
+        // なるため、aun.db-wal（なければ aun.db）の mtime をディスク fallback として使う。
+        let lastActivity = agent.lastActivity;
+        if (!lastActivity) {
+            try {
+                const aidPath = aidLocalDir(agent.aid);
+                const walPath = path.join(aidPath, 'aun.db-wal');
+                const dbPath = path.join(aidPath, 'aun.db');
+                const candidate = fs.existsSync(walPath) ? walPath : dbPath;
+                if (fs.existsSync(candidate)) {
+                    lastActivity = fs.statSync(candidate).mtimeMs;
+                }
+            }
+            catch { }
+        }
         return {
             name: displayName || agent.name || agent.aid,
             displayName,
@@ -613,7 +628,7 @@ export class EvolAgentRegistry {
             model,
             effort,
             owners,
-            lastActivity: agent.lastActivity,
+            lastActivity,
             activeSessions: agent.activeSessions,
             error: agent.error,
         };

package/dist/core/handoff/ipc-registration.js

@@ -2,6 +2,8 @@ import { isManagementRole } from '../../config/builtin-roles.js';
 import { hasTrustedFullAccessDelegation, trustedExecutionIdentityInput, } from '../auth/agent-delegation.js';
 import { authorizeOperation, buildAuthSubject } from '../auth/auth-gateway.js';
 import { parsePeerKey } from '../relation/peer-identity.js';
+import { parseReturn } from '../../cli/handoff-command.js';
+import { readTriggerLocalFile } from '../../trigger/local-files.js';
 export function registerHandoffIpc({ ipcServer, agentDelegationRegistry, responseEngine, sessionManager, agentRegistry, handoffRuntime, getProcessOwners, }) {
     const resolveManagedHandoffScope = async (params, operation) => {
         const delegation = agentDelegationRegistry.validate(params.delegationToken, params.sessionId, params.delegationCommandHash);
@@ -67,6 +69,8 @@ export function registerHandoffIpc({ ipcServer, agentDelegationRegistry, respons
             managementRole,
             role: subject.role,
             actorId: delegation.grant.actorId,
+            projectPath: session.projectPath,
+            sessionRuntimeDir: delegation.grant.sessionRuntimeDir,
         };
     };
     const resolveHandoffQueryScope = async (params, operation) => {
@@ -87,6 +91,22 @@ export function registerHandoffIpc({ ipcServer, agentDelegationRegistry, respons
         const scope = await resolveManagedHandoffScope({ ...params, sessionId: params.sessionId }, 'ec.handoff.return');
         if (!scope.ok)
             return scope;
+        if (!params.argv || params.argv[0] !== 'handoff' || params.argv[1] !== 'return') {
+            return { ok: false, code: 'ARGUMENT_MISMATCH', error: 'Handoff return requires its approved argv' };
+        }
+        try {
+            const parsed = parseReturn(params.argv.slice(2), {
+                canonical: true,
+                readFile: file => new TextDecoder('utf-8', { fatal: true }).decode(readTriggerLocalFile(file, {
+                    selfAid: scope.aid, projectPath: scope.projectPath,
+                    sessionRuntimeDir: scope.sessionRuntimeDir, cwd: scope.projectPath,
+                })),
+            });
+            params = { ...params, ...parsed };
+        }
+        catch (error) {
+            return { ok: false, code: 'HANDOFF_RETURN_CONTENT_FORBIDDEN', error: error instanceof Error ? error.message : String(error) };
+        }
         return responseEngine.returnAuthorizedHandoffResult({ sessionId: params.sessionId, handoffId: params.handoffId, content: params.content }, scope.aid);
     };
     const recoverHandoff = async (params) => {
@@ -98,6 +118,24 @@ export function registerHandoffIpc({ ipcServer, agentDelegationRegistry, respons
         if (scope.role !== 'owner') {
             return { ok: false, code: 'ROLE_ACCESS_DENIED', error: 'handoff recovery requires the current Agent owner' };
         }
+        if (!params.argv || params.argv[0] !== 'handoff' || params.argv[1] !== 'recover-return') {
+            return { ok: false, code: 'ARGUMENT_MISMATCH', error: 'Handoff recovery requires its approved argv' };
+        }
+        try {
+            const parsed = parseReturn(params.argv.slice(2), {
+                canonical: true,
+                readFile: file => new TextDecoder('utf-8', { fatal: true }).decode(readTriggerLocalFile(file, {
+                    selfAid: scope.aid, projectPath: scope.projectPath,
+                    sessionRuntimeDir: scope.sessionRuntimeDir, cwd: scope.projectPath,
+                })),
+            });
+            if (!parsed.handoffId)
+                return { ok: false, code: 'INVALID_HANDOFF_ID', error: 'Handoff recovery requires an ID' };
+            params = { ...params, handoffId: parsed.handoffId, content: parsed.content };
+        }
+        catch (error) {
+            return { ok: false, code: 'HANDOFF_RETURN_CONTENT_FORBIDDEN', error: error instanceof Error ? error.message : String(error) };
+        }
         return responseEngine.recoverAuthorizedHandoffResult({
             sessionId: params.sessionId,
             handoffId: params.handoffId,