lark-remote 0.5.20 → 0.5.21

package/dist/router/commands/resume.js

@@ -12,10 +12,8 @@ function sessionPreviewLine(text, max) {
     const oneLine = text.replace(/\s+/g, ' ').trim();
     return oneLine.length > max ? oneLine.slice(0, max - 1) + '…' : oneLine;
 }
-export function buildResumeCommand(args, ctx, offset, deps) {
-    const entry = deps.getSessionEntry(ctx.userId);
-    const cwd = entry?.cwd;
-    let agentKind = deps.defaultAgent;
+function parseResumeArgs(args, defaultAgent) {
+    let agentKind = defaultAgent;
     let limit;
     let sessionIdArg;
     if (args[0]) {
@@ -35,88 +33,87 @@ export function buildResumeCommand(args, ctx, offset, deps) {
             sessionIdArg = args[0];
         }
     }
-    if (sessionIdArg) {
-        if (!entry || !cwd)
-            return { text: '请先 /cd 设置工作目录' };
-        const reader = agentKind !== deps.defaultAgent ? deps.readerFor(agentKind) : deps.defaultReader();
-        const verifyContent = reader.readSessionContent(sessionIdArg, cwd);
-        if (verifyContent.events.length === 0 &&
-            !verifyContent.usage &&
-            !verifyContent.aiTitle &&
-            !verifyContent.recap &&
-            !verifyContent.displayTitle) {
+    return { agentKind, limit, sessionIdArg };
+}
+function readerForAgent(deps, agentKind) {
+    return agentKind !== deps.defaultAgent ? deps.readerFor(agentKind) : deps.defaultReader();
+}
+/** 恢复指定 session 前的校验；返回 CommandResult 表示应当中止。 */
+function verifyResumeTarget(reader, deps, agentKind, sessionIdArg, cwd) {
+    const verifyContent = reader.readSessionContent(sessionIdArg, cwd);
+    if (verifyContent.events.length === 0 &&
+        !verifyContent.usage &&
+        !verifyContent.aiTitle &&
+        !verifyContent.recap &&
+        !verifyContent.displayTitle) {
+        return {
+            text: `未找到 session ${sessionIdArg}（当前目录: ${cwd}）。请确认该 session 属于此目录，或先 /cd 到正确目录。`,
+        };
+    }
+    if (agentKind === 'dsh' && deps.defaultAgent === 'dsh') {
+        const mismatch = deps.dshPresetMismatch(reader, sessionIdArg, cwd);
+        if (mismatch) {
             return {
-                text: `未找到 session ${sessionIdArg}（当前目录: ${cwd}）。请确认该 session 属于此目录，或先 /cd 到正确目录。`,
+                text: `⚠️ 该 DSH session 的 preset 是「${mismatch.sessionPreset}」，与当前配置「${mismatch.currentPreset}」不一致。\n` +
+                    `preset 在 session 创建时固定，无法中途切换（DSH 返回 agent-preset-conflict）。\n` +
+                    `继续恢复将在下次 run 失败。请在 /config 中把预设模式改回「${mismatch.sessionPreset}」后重试，或保持当前配置并发新消息新建会话。`,
             };
         }
-        if (agentKind === 'dsh' && deps.defaultAgent === 'dsh') {
-            const mismatch = deps.dshPresetMismatch(reader, sessionIdArg, cwd);
-            if (mismatch) {
-                return {
-                    text: `⚠️ 该 DSH session 的 preset 是「${mismatch.sessionPreset}」，与当前配置「${mismatch.currentPreset}」不一致。\n` +
-                        `preset 在 session 创建时固定，无法中途切换（DSH 返回 agent-preset-conflict）。\n` +
-                        `继续恢复将在下次 run 失败。请在 /config 中把预设模式改回「${mismatch.sessionPreset}」后重试，或保持当前配置并发新消息新建会话。`,
-                };
-            }
-        }
-        deps.setSessionId(ctx.userId, agentKind, sessionIdArg, cwd);
-        const display = deps.readDisplay(sessionIdArg, cwd, {
-            agentKind,
-            maxEvents: AUTO_RESUME_MAX_EVENTS,
-        });
-        const actions = deps.buildActions({
-            isActive: display.isActive,
-            activeRunRunId: display.activeRunRunId,
-            cwd,
-            compact: deps.canCompact(agentKind, cwd) ? { sessionId: sessionIdArg, agentKind } : undefined,
-            newSession: true,
-        });
-        return {
-            card: buildSessionHistoryCard({
-                sessionId: sessionIdArg,
-                cwd,
-                displayTitle: display.displayTitle,
-                aiTitle: display.aiTitle,
-                recap: display.recap,
-                events: display.events,
-                usage: display.usage,
-            }, {
-                agentKind,
-                headerText: `📂 \`${cwd}\`\n会话: **${sessionIdArg}**`,
-                title: `${display.isActive ? '⏳ 恢复会话（完成中）' : '🔁 恢复会话'} · ${agentDisplayName(agentKind)}`,
-                usageResult: 'success',
-                emptyPlaceholder: '_该会话暂无新消息可显示（最后一条为用户输入）_',
-                actions,
-            }),
-        };
     }
-    if (!cwd)
-        return { text: '请先 /cd 设置工作目录' };
-    const pageSize = clampInt(limit ?? RESUME_PAGE_SIZE, 1, RESUME_PAGE_SIZE);
-    const reader = agentKind === deps.defaultAgent ? deps.defaultReader() : deps.readerFor(agentKind);
+    return undefined;
+}
+function resumeSessionCard(ctx, deps, agentKind, sessionIdArg, cwd) {
+    deps.setSessionId(ctx.userId, agentKind, sessionIdArg, cwd);
+    const display = deps.readDisplay(sessionIdArg, cwd, {
+        agentKind,
+        maxEvents: AUTO_RESUME_MAX_EVENTS,
+    });
+    const actions = deps.buildActions({
+        isActive: display.isActive,
+        activeRunRunId: display.activeRunRunId,
+        cwd,
+        compact: deps.canCompact(agentKind, cwd) ? { sessionId: sessionIdArg, agentKind } : undefined,
+        newSession: true,
+    });
+    return {
+        card: buildSessionHistoryCard({
+            sessionId: sessionIdArg,
+            cwd,
+            displayTitle: display.displayTitle,
+            aiTitle: display.aiTitle,
+            recap: display.recap,
+            events: display.events,
+            usage: display.usage,
+        }, {
+            agentKind,
+            headerText: `📂 \`${cwd}\`\n会话: **${sessionIdArg}**`,
+            title: `${display.isActive ? '⏳ 恢复会话（完成中）' : '🔁 恢复会话'} · ${agentDisplayName(agentKind)}`,
+            usageResult: 'success',
+            emptyPlaceholder: '_该会话暂无新消息可显示（最后一条为用户输入）_',
+            actions,
+        }),
+    };
+}
+function resumeById(ctx, deps, agentKind, sessionIdArg, cwd) {
+    const reader = readerForAgent(deps, agentKind);
+    const rejected = verifyResumeTarget(reader, deps, agentKind, sessionIdArg, cwd);
+    if (rejected)
+        return rejected;
+    return resumeSessionCard(ctx, deps, agentKind, sessionIdArg, cwd);
+}
+/** 一次列表读取 + offset 页对齐；异常交给调用方转文案。 */
+function loadResumePage(reader, cwd, pageSize, offset) {
     let pageOffset = offset;
-    let pageResult;
-    try {
+    let pageResult = reader.listSessions(cwd, { limit: pageSize, offset: pageOffset });
+    const maxOffset = Math.max(0, Math.ceil(pageResult.total / pageSize) - 1) * pageSize;
+    if (pageOffset < 0 || pageOffset > maxOffset) {
+        pageOffset = clampInt(pageOffset, 0, maxOffset);
         pageResult = reader.listSessions(cwd, { limit: pageSize, offset: pageOffset });
-        const maxOffset = Math.max(0, Math.ceil(pageResult.total / pageSize) - 1) * pageSize;
-        if (pageOffset < 0 || pageOffset > maxOffset) {
-            pageOffset = clampInt(pageOffset, 0, maxOffset);
-            pageResult = reader.listSessions(cwd, { limit: pageSize, offset: pageOffset });
-        }
-    }
-    catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        return { text: `读取 ${agentDisplayName(agentKind)} session 列表失败: ${msg}` };
-    }
-    const { sessions: allSessions, total } = pageResult;
-    if (allSessions.length === 0) {
-        const hint = agentKind === deps.defaultAgent
-            ? `\n提示：可使用 /resume <agent> 切换查看其他 Agent 的 session`
-            : '';
-        return {
-            text: `当前目录没有 ${agentDisplayName(agentKind)} session 记录\n${cwd}${hint}`,
-        };
     }
+    return { pageOffset, sessions: pageResult.sessions, total: pageResult.total };
+}
+/** 行级预览字段缺失时才预取，且只预取前 5 条。 */
+function prefetchResumeMeta(reader, allSessions, cwd) {
     const sessionMeta = new Map();
     for (const session of allSessions.slice(0, RESUME_CONTENT_PREFETCH)) {
         if (session.title || session.lastUserMessage || session.lastAssistantMessage)
@@ -133,72 +130,88 @@ export function buildResumeCommand(args, ctx, offset, deps) {
             })();
         sessionMeta.set(session.sessionId, meta);
     }
-    const now = Date.now();
-    const formatRelativeTime = (mtimeMs) => {
-        const diffSec = Math.floor((now - mtimeMs) / 1000);
-        if (diffSec < 60)
-            return '刚刚';
-        if (diffSec < 3600)
-            return `${Math.floor(diffSec / 60)} 分钟前`;
-        if (diffSec < 86400)
-            return `${Math.floor(diffSec / 3600)} 小时前`;
-        if (diffSec < 604800)
-            return `${Math.floor(diffSec / 86400)} 天前`;
-        return new Date(mtimeMs).toLocaleDateString('zh-CN');
-    };
-    const elements = [
-        { tag: 'div', text: { tag: 'lark_md', content: `📂 当前工作目录：\`${cwd}\`` } },
-    ];
-    const currentId = entry.sessions.get(agentKind) ?? '';
-    for (const session of allSessions) {
-        const isCurrent = agentKind === deps.defaultAgent && session.sessionId === currentId;
-        const meta = sessionMeta.get(session.sessionId);
-        const summaryIsPlaceholder = RESUME_SUMMARY_PLACEHOLDERS.has(session.summary.trim());
-        const prefetchedTitle = meta?.displayTitle;
-        const rowTitleRaw = session.title?.trim() ?? '';
-        const rowTitle = rowTitleRaw && !RESUME_SUMMARY_PLACEHOLDERS.has(rowTitleRaw) ? rowTitleRaw : undefined;
-        const titleText = prefetchedTitle ?? rowTitle ?? (summaryIsPlaceholder ? '' : session.summary);
-        const titleLabel = prefetchedTitle
-            ? meta?.aiTitle
-                ? 'AI 标题'
-                : '最近输入'
-            : rowTitle
-                ? '标题'
-                : summaryIsPlaceholder
-                    ? ''
-                    : '会话摘要';
-        const sections = [];
-        if (titleText) {
-            sections.push(`🏷️ **${titleLabel}**\n${titleText.slice(0, 80)}${titleText.length > 80 ? '...' : ''}`);
-        }
-        if (meta?.recap) {
-            sections.push(`📝 **Recap**\n${meta.recap.slice(0, 60)}${meta.recap.length > 60 ? '...' : ''}`);
-        }
-        if (session.lastUserMessage) {
-            sections.push(`✏️ **最近输入**\n${sessionPreviewLine(session.lastUserMessage, RESUME_PREVIEW_MAX)}`);
-        }
-        if (session.lastAssistantMessage) {
-            sections.push(`📤 **最后输出**\n${sessionPreviewLine(session.lastAssistantMessage, RESUME_PREVIEW_MAX)}`);
-        }
-        const infoStr = sections.length > 0 ? '\n' + sections.join('\n──\n') : '';
-        elements.push({ tag: 'hr' }, {
+    return sessionMeta;
+}
+function formatRelativeTime(mtimeMs, now) {
+    const diffSec = Math.floor((now - mtimeMs) / 1000);
+    if (diffSec < 60)
+        return '刚刚';
+    if (diffSec < 3600)
+        return `${Math.floor(diffSec / 60)} 分钟前`;
+    if (diffSec < 86400)
+        return `${Math.floor(diffSec / 3600)} 小时前`;
+    if (diffSec < 604800)
+        return `${Math.floor(diffSec / 86400)} 天前`;
+    return new Date(mtimeMs).toLocaleDateString('zh-CN');
+}
+function resumeTitleParts(session, meta) {
+    const summaryIsPlaceholder = RESUME_SUMMARY_PLACEHOLDERS.has(session.summary.trim());
+    const prefetchedTitle = meta?.displayTitle;
+    const rowTitleRaw = session.title?.trim() ?? '';
+    const rowTitle = rowTitleRaw && !RESUME_SUMMARY_PLACEHOLDERS.has(rowTitleRaw) ? rowTitleRaw : undefined;
+    const titleText = prefetchedTitle ?? rowTitle ?? (summaryIsPlaceholder ? '' : session.summary);
+    const titleLabel = prefetchedTitle
+        ? meta?.aiTitle
+            ? 'AI 标题'
+            : '最近输入'
+        : rowTitle
+            ? '标题'
+            : summaryIsPlaceholder
+                ? ''
+                : '会话摘要';
+    return { titleText, titleLabel };
+}
+function resumeInfoSections(session, meta, titleText, titleLabel) {
+    const sections = [];
+    if (titleText) {
+        sections.push(`🏷️ **${titleLabel}**\n${titleText.slice(0, 80)}${titleText.length > 80 ? '...' : ''}`);
+    }
+    if (meta?.recap) {
+        sections.push(`📝 **Recap**\n${meta.recap.slice(0, 60)}${meta.recap.length > 60 ? '...' : ''}`);
+    }
+    if (session.lastUserMessage) {
+        sections.push(`✏️ **最近输入**\n${sessionPreviewLine(session.lastUserMessage, RESUME_PREVIEW_MAX)}`);
+    }
+    if (session.lastAssistantMessage) {
+        sections.push(`📤 **最后输出**\n${sessionPreviewLine(session.lastAssistantMessage, RESUME_PREVIEW_MAX)}`);
+    }
+    return sections;
+}
+function resumeRowElements(session, opts) {
+    const isCurrent = opts.agentKind === opts.defaultAgent && session.sessionId === opts.currentId;
+    const meta = opts.meta.get(session.sessionId);
+    const { titleText, titleLabel } = resumeTitleParts(session, meta);
+    const sections = resumeInfoSections(session, meta, titleText, titleLabel);
+    const infoStr = sections.length > 0 ? '\n' + sections.join('\n──\n') : '';
+    return [
+        { tag: 'hr' },
+        {
             tag: 'div',
             text: {
                 tag: 'lark_md',
-                content: `**${session.sessionId}**${infoStr}\n⏱ ${formatRelativeTime(session.mtime)}${isCurrent ? '  •' : ''}`,
+                content: `**${session.sessionId}**${infoStr}\n⏱ ${formatRelativeTime(session.mtime, opts.now)}${isCurrent ? '  •' : ''}`,
             },
-        }, {
+        },
+        {
             tag: 'column_set',
             columns: [
                 {
                     tag: 'column',
                     width: 'auto',
                     elements: [
-                        cardButton(isCurrent ? '✓ 当前会话' : '恢复此会话', { cmd: 'resume.use', sessionId: session.sessionId, agent: agentKind }, { type: isCurrent ? 'default' : 'primary', disabled: isCurrent }),
+                        cardButton(isCurrent ? '✓ 当前会话' : '恢复此会话', { cmd: 'resume.use', sessionId: session.sessionId, agent: opts.agentKind }, { type: isCurrent ? 'default' : 'primary', disabled: isCurrent }),
                     ],
                 },
             ],
-        });
+        },
+    ];
+}
+function resumeListElements(allSessions, cwd, total, pageSize, pageOffset, opts) {
+    const elements = [
+        { tag: 'div', text: { tag: 'lark_md', content: `📂 当前工作目录：\`${cwd}\`` } },
+    ];
+    for (const session of allSessions) {
+        elements.push(...resumeRowElements(session, opts));
     }
     if (total > pageSize) {
         const { totalPages, currentPage } = pageInfo(total, pageOffset, pageSize);
@@ -207,10 +220,40 @@ export function buildResumeCommand(args, ctx, offset, deps) {
             offset: pageOffset,
             pageSize,
             total,
-            extra: { agent: agentKind, pageSize },
+            extra: { agent: opts.agentKind, pageSize },
             label: `第 ${currentPage}/${totalPages} 页 · 共 ${total} 个会话`,
         }));
     }
+    return elements;
+}
+function resumeList(deps, entry, agentKind, limit, offset, cwd) {
+    const pageSize = clampInt(limit ?? RESUME_PAGE_SIZE, 1, RESUME_PAGE_SIZE);
+    const reader = agentKind === deps.defaultAgent ? deps.defaultReader() : deps.readerFor(agentKind);
+    let page;
+    try {
+        page = loadResumePage(reader, cwd, pageSize, offset);
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        return { text: `读取 ${agentDisplayName(agentKind)} session 列表失败: ${msg}` };
+    }
+    const { sessions: allSessions, total, pageOffset } = page;
+    if (allSessions.length === 0) {
+        const hint = agentKind === deps.defaultAgent
+            ? `\n提示：可使用 /resume <agent> 切换查看其他 Agent 的 session`
+            : '';
+        return {
+            text: `当前目录没有 ${agentDisplayName(agentKind)} session 记录\n${cwd}${hint}`,
+        };
+    }
+    const meta = prefetchResumeMeta(reader, allSessions, cwd);
+    const elements = resumeListElements(allSessions, cwd, total, pageSize, pageOffset, {
+        agentKind,
+        defaultAgent: deps.defaultAgent,
+        currentId: entry.sessions.get(agentKind) ?? '',
+        meta,
+        now: Date.now(),
+    });
     return {
         card: {
             schema: '2.0',
@@ -225,4 +268,17 @@ export function buildResumeCommand(args, ctx, offset, deps) {
         },
     };
 }
+export function buildResumeCommand(args, ctx, offset, deps) {
+    const entry = deps.getSessionEntry(ctx.userId);
+    const cwd = entry?.cwd;
+    const { agentKind, limit, sessionIdArg } = parseResumeArgs(args, deps.defaultAgent);
+    if (sessionIdArg) {
+        if (!entry || !cwd)
+            return { text: '请先 /cd 设置工作目录' };
+        return resumeById(ctx, deps, agentKind, sessionIdArg, cwd);
+    }
+    if (!cwd)
+        return { text: '请先 /cd 设置工作目录' };
+    return resumeList(deps, entry, agentKind, limit, offset, cwd);
+}
 //# sourceMappingURL=resume.js.map