@keyou007/agent-bot 0.1.15-alpha.2 → 0.1.15-alpha.4

package/dist/proxy/ProxySessionController.js

@@ -1,6 +1,7 @@
+import { createHash } from "node:crypto";
 import { promises as fs } from "node:fs";
-import path from "node:path";
 import os from "node:os";
+import path from "node:path";
 import { createProjectlessWorkspace, detectProjectlessWorkspace } from "../codex/ProjectlessWorkspace.js";
 import { resolveUserPath } from "../config/paths.js";
 import { CommandRouter } from "../commands/CommandRouter.js";
@@ -19,7 +20,8 @@ const MESSAGE_RECEIVED_REACTION = "OnIt";
 const MESSAGE_COMPLETED_REACTION = "DONE";
 const MESSAGE_FAILED_REACTION = "ERROR";
 const MESSAGE_CANCELLED_REACTION = "CrossMark";
-const SESSION_PAGE_SIZE = 5;
+const SESSION_PAGE_SIZE = 10;
+const SESSION_PROMPT_PREVIEW_LENGTH = 50;
 const DIRECTORY_PAGE_SIZE = 15;
 const RESET_HISTORY_PAGE_SIZE = 10;
 const MAX_LLM_TURN_RETRIES = 3;
@@ -458,8 +460,18 @@ export class ProxySessionController {
         }
         if (!this.store.claimInboundEvent(action.actionId, "card_action"))
             return;
-        const contextKey = this.cardActionContextKey(action);
-        const scopedAction = contextKey === action.contextKey ? action : { ...action, contextKey };
+        let resolvedAction;
+        try {
+            resolvedAction = this.resolveCardActionBinding(action);
+        }
+        catch (error) {
+            await this.sendError(action.contextKey, error);
+            return;
+        }
+        const contextKey = this.cardActionContextKey(resolvedAction);
+        const scopedAction = contextKey === resolvedAction.contextKey
+            ? resolvedAction
+            : { ...resolvedAction, contextKey };
         const replyTarget = isThreadContextKey(contextKey) && action.messageId
             ? { messageId: action.messageId, replyInThread: true }
             : undefined;
@@ -1237,6 +1249,19 @@ export class ProxySessionController {
             ? turnSession.contextKey
             : action.contextKey;
     }
+    resolveCardActionBinding(action) {
+        if (typeof action.value.action === "string")
+            return action;
+        const token = typeof action.value.t === "string" ? action.value.t : undefined;
+        if (!token)
+            return action;
+        if (!action.messageId)
+            throw new Error("任务列表卡片缺少消息 ID，请重新发送 /sessions。");
+        const value = this.store.getCardActionBinding(action.messageId, token);
+        if (!value)
+            throw new Error("任务列表卡片已失效，请重新发送 /sessions。");
+        return { ...action, value };
+    }
     async execute(contextKey, command, messageId, replyTarget, localImagePaths, userId, incomingMessage) {
         const context = this.store.getOrCreateUserContext(contextKey, this.config.defaults.agent);
         if (!this.currentSession(contextKey) && isThreadContextKey(contextKey) && commandRequiresCurrentSession(command)) {
@@ -3969,10 +3994,28 @@ export class ProxySessionController {
         const remoteHint = remoteErrors.length > 0
             ? `部分 Agent 的任务读取失败：${remoteErrors.join("；")}`
             : undefined;
-        const entries = orderTaskListByProject(mergeTaskList(localSessions, remoteSessions, context.currentSessionId)
+        const latestLocalUserPrompts = new Map();
+        for (const session of localSessions) {
+            const persisted = this.store.findLatestTurnSnapshotForSession(session.localSessionId);
+            const prompt = latestUserPromptFromTurnView(turnViewSnapshot(persisted?.snapshot));
+            if (prompt)
+                latestLocalUserPrompts.set(session.localSessionId, prompt);
+        }
+        const latestRemoteUserPrompts = new Map();
+        for (const { agentName, session: remote } of remoteSessions) {
+            const local = this.store.findSessionByRemoteSessionId(remote.id, undefined, agentName);
+            if (!local)
+                continue;
+            const persisted = this.store.findLatestTurnSnapshotForSession(local.localSessionId);
+            const prompt = latestUserPromptFromTurnView(turnViewSnapshot(persisted?.snapshot));
+            if (prompt)
+                latestRemoteUserPrompts.set(agentRemoteKey(agentName, remote.id), prompt);
+        }
+        const globallyOrderedEntries = orderTaskListByRecency(mergeTaskList(localSessions, remoteSessions, context.currentSessionId, latestLocalUserPrompts, latestRemoteUserPrompts)
             .filter((entry) => !normalizedSearch
             || [entry.id, entry.title, entry.cwd, entry.agentName]
                 .some((value) => value.toLowerCase().includes(normalizedSearch))));
+        const entries = groupTaskListPagesByProject(globallyOrderedEntries, SESSION_PAGE_SIZE);
         const activeCount = entries.filter((entry) => entry.active).length;
         const lastKnownPage = Math.max(0, Math.ceil(entries.length / SESSION_PAGE_SIZE) - 1);
         const page = remoteHasMore ? requestedPage : Math.min(requestedPage, lastKnownPage);
@@ -3987,14 +4030,16 @@ export class ProxySessionController {
         const hasPrevious = page > 0;
         const hasNext = remoteHasMore || entries.length > offset + SESSION_PAGE_SIZE;
         this.lastSessionListings.set(contextKey, entries.map((entry) => entry.reference));
+        const cardActionBindings = new Map();
+        const bindCardAction = (action) => bindSessionCardAction(action, cardActionBindings);
         const cardEntries = visibleEntries.map((entry, index) => {
             const project = taskProjectInfo(entry);
             const projectActionSource = projectActionSources.get(project.key) ?? entry;
-            const marker = entry.current ? "✅" : entry.active ? "🟢" : "•";
+            const marker = entry.current ? "✅ " : entry.active ? "🟢 " : "";
             const showStop = entry.status === "外部执行中"
                 && entry.reference !== options.forceSwitchTaskId
                 && entry.id !== options.forceSwitchTaskId;
-            const actions = entry.current ? [] : [{
+            const actions = entry.current ? [] : [bindCardAction({
                     text: showStop ? "Stop" : "Switch",
                     type: showStop ? "danger" : "default",
                     value: {
@@ -4004,8 +4049,8 @@ export class ProxySessionController {
                         page: String(page),
                         contextKey,
                     },
-                }];
-            const projectActions = [{
+                })];
+            const projectActions = [bindCardAction({
                     text: "New",
                     value: {
                         action: "session_new",
@@ -4014,7 +4059,7 @@ export class ProxySessionController {
                         page: String(page),
                         contextKey,
                     },
-                }, {
+                }), bindCardAction({
                     text: "NewGroup",
                     value: {
                         action: "session_new_group",
@@ -4023,8 +4068,8 @@ export class ProxySessionController {
                         page: String(page),
                         contextKey,
                     },
-                }];
-            actions.push({
+                })];
+            actions.push(bindCardAction({
                 text: "Fork",
                 value: {
                     action: "session_fork",
@@ -4033,8 +4078,8 @@ export class ProxySessionController {
                     page: String(page),
                     contextKey,
                 },
-            });
-            actions.push({
+            }));
+            actions.push(bindCardAction({
                 text: "ForkGroup",
                 value: {
                     action: "session_fork_group",
@@ -4043,16 +4088,16 @@ export class ProxySessionController {
                     page: String(page),
                     contextKey,
                 },
-            });
-            actions.push({
+            }));
+            actions.push(bindCardAction({
                 text: "Status",
                 value: {
                     action: "session_status",
                     sessionId: entry.reference,
                     contextKey,
                 },
-            });
-            actions.push({
+            }));
+            actions.push(bindCardAction({
                 text: "Archive",
                 value: {
                     action: "session_archive",
@@ -4061,18 +4106,18 @@ export class ProxySessionController {
                     page: String(page),
                     contextKey,
                 },
-            });
+            }));
             const title = truncateText(entry.title.replace(/\s+/gu, " ").trim() || "未命名任务", 56);
+            const lastUserPrompt = sessionPromptPreview(entry.lastUserPrompt);
             return {
                 project,
                 projectActions,
                 cardEntry: {
                     reference: entry.reference,
-                    summary: `${offset + index + 1}. ${marker} ${title} · ${entry.agentName}`,
+                    summary: `${offset + index + 1}. ${marker}${title} · ${entry.agentName}`,
                     detailLines: [
-                        `**状态 / 更新时间**：${cardText(entry.status)} / ${cardText(entry.updatedLabel)}`,
-                        `**Agent / 任务 ID**：${cardCode(entry.agentName)} / ${cardCode(entry.id)}`,
-                        `**目录**：${cardCode(entry.cwd || "目录未知")}`,
+                        cardText(lastUserPrompt),
+                        `**更新时间**：${cardText(entry.updatedLabel)}`,
                     ],
                     actions,
                     current: entry.current,
@@ -4099,10 +4144,10 @@ export class ProxySessionController {
             ...(remoteHint ? [remoteHint] : []),
             `第 ${page + 1} 页 · 每页 ${SESSION_PAGE_SIZE} 个任务${hasNext ? "" : ` · 当前共 ${entries.length} 个任务`}`,
             "",
-            "> 项目行：**New** 新建任务，**NewGroup** 新建群。",
+            "> 项目菜单：**New** 新建任务，**NewGroup** 新建群。",
             "> 任务详情：**Switch** 切换，**Stop** 停止，**Fork** / **ForkGroup** 创建分支，**Status** 查看状态，**Archive** 归档。",
         ], [
-            ...(hasPrevious ? [{
+            ...(hasPrevious ? [bindCardAction({
                     text: "Previous",
                     value: {
                         action: "session_page",
@@ -4110,8 +4155,8 @@ export class ProxySessionController {
                         page: String(page - 1),
                         contextKey,
                     },
-                }] : []),
-            ...(hasNext ? [{
+                })] : []),
+            ...(hasNext ? [bindCardAction({
                     text: "Next",
                     value: {
                         action: "session_page",
@@ -4119,13 +4164,20 @@ export class ProxySessionController {
                         page: String(page + 1),
                         contextKey,
                     },
-                }] : []),
+                })] : []),
         ]);
+        const bindings = [...cardActionBindings.values()];
         if (options.updateMessageId) {
+            this.store.upsertCardActionBindings(options.updateMessageId, bindings);
             await this.outbound.updateInteractiveCard(contextKey, options.updateMessageId, card);
+            this.store.retainCardActionBindings(options.updateMessageId, bindings.map((binding) => binding.token));
         }
         else {
-            await this.outbound.sendInteractiveCard(contextKey, card);
+            const messageId = await this.outbound.sendInteractiveCard(contextKey, card);
+            if (messageId) {
+                this.store.upsertCardActionBindings(messageId, bindings);
+                this.store.retainCardActionBindings(messageId, bindings.map((binding) => binding.token));
+            }
         }
     }
     async refreshSessionsCardFromAction(action, options = {}) {
@@ -4815,28 +4867,26 @@ function statusRefreshAction(sessionId, contextKey) {
         },
     };
 }
-function orderTaskListByProject(entries) {
-    const groups = new Map();
-    for (const entry of entries) {
-        const project = taskProjectInfo(entry);
-        const group = groups.get(project.key);
-        if (group)
-            group.entries.push(entry);
-        else
-            groups.set(project.key, { project, entries: [entry] });
-    }
-    const orderedGroups = [...groups.values()]
-        .map((group) => ({
-        ...group,
-        current: group.entries.some((entry) => entry.current),
-        active: group.entries.some((entry) => entry.active),
-        updatedAt: Math.max(...group.entries.map((entry) => entry.updatedAt)),
-    }))
-        .sort((left, right) => Number(right.current) - Number(left.current)
-        || Number(right.active) - Number(left.active)
-        || right.updatedAt - left.updatedAt
-        || left.project.title.localeCompare(right.project.title, undefined, { sensitivity: "base" }));
-    return orderedGroups.flatMap((group) => group.entries.sort(compareTaskListEntries));
+function orderTaskListByRecency(entries) {
+    return [...entries].sort(compareTaskListEntries);
+}
+function groupTaskListPagesByProject(entries, pageSize) {
+    const result = [];
+    for (let offset = 0; offset < entries.length; offset += pageSize) {
+        const groups = new Map();
+        for (const entry of entries.slice(offset, offset + pageSize)) {
+            const key = taskProjectInfo(entry).key;
+            const group = groups.get(key);
+            if (group)
+                group.push(entry);
+            else
+                groups.set(key, [entry]);
+        }
+        for (const group of groups.values()) {
+            result.push(...group.sort(compareTaskListEntries));
+        }
+    }
+    return result;
 }
 function compareTaskListEntries(left, right) {
     return Number(right.current) - Number(left.current)
@@ -4859,7 +4909,7 @@ function taskProjectInfo(entry) {
         title: `📁 ${abbreviateHomeDirectory(entry.cwd)}`,
     };
 }
-function mergeTaskList(localSessions, remoteSessions, currentLocalSessionId) {
+function mergeTaskList(localSessions, remoteSessions, currentLocalSessionId, latestLocalUserPrompts = new Map(), latestRemoteUserPrompts = new Map()) {
     const localByRemoteId = new Map(localSessions
         .filter((session) => session.runtimeKind === "codex" && session.remoteSessionId)
         .map((session) => [agentRemoteKey(session.agentName, session.remoteSessionId), session]));
@@ -4882,6 +4932,9 @@ function mergeTaskList(localSessions, remoteSessions, currentLocalSessionId) {
             status,
             active,
             current: Boolean(local && local.localSessionId === currentLocalSessionId),
+            lastUserPrompt: remote.lastUserPrompt
+                ?? (local ? latestLocalUserPrompts.get(local.localSessionId) : undefined)
+                ?? latestRemoteUserPrompts.get(agentRemoteKey(agentName, remote.id)),
             updatedAt: (recencyAt ?? 0) * 1_000,
             updatedLabel: formatRemoteTime(recencyAt),
         };
@@ -4901,6 +4954,7 @@ function mergeTaskList(localSessions, remoteSessions, currentLocalSessionId) {
             status: sessionStatusLabel(local.status),
             active: local.status === "running",
             current: local.localSessionId === currentLocalSessionId,
+            lastUserPrompt: latestLocalUserPrompts.get(local.localSessionId),
             updatedAt: Number.isNaN(updatedAt) ? 0 : updatedAt,
             updatedLabel: formatStatusTime(local.updatedAt),
         });
@@ -4929,6 +4983,16 @@ function parseRemoteSessionReference(reference) {
         return undefined;
     }
 }
+function bindSessionCardAction(action, bindings) {
+    const serialized = JSON.stringify(action.value);
+    const token = createHash("sha256").update(serialized).digest("hex").slice(0, 16);
+    const existing = bindings.get(token);
+    if (existing && JSON.stringify(existing.value) !== serialized) {
+        throw new Error("任务列表卡片操作令牌发生冲突，请重试。");
+    }
+    bindings.set(token, { token, value: action.value });
+    return { ...action, value: { t: token } };
+}
 function runtimeErrorMessage(error) {
     return error instanceof Error ? error.message : String(error);
 }
@@ -4948,6 +5012,19 @@ function turnViewSnapshot(value) {
         ? candidate
         : undefined;
 }
+function latestUserPromptFromTurnView(snapshot) {
+    const latestUserActivity = [...(snapshot?.activities ?? [])]
+        .reverse()
+        .find((activity) => activity.kind === "user" && Boolean(activity.text.trim()));
+    return latestUserActivity?.text.trim() || snapshot?.prompt?.trim() || undefined;
+}
+function sessionPromptPreview(prompt) {
+    const normalized = prompt?.replace(/\s+/gu, " ").trim() || "暂无用户 Prompt";
+    const characters = Array.from(normalized);
+    return characters.length > SESSION_PROMPT_PREVIEW_LENGTH
+        ? `${characters.slice(0, SESSION_PROMPT_PREVIEW_LENGTH).join("")}...`
+        : normalized;
+}
 function isTerminalTurnViewStatus(status) {
     return status === "completed" || status === "cancelled" || status === "failed";
 }