@keyou007/agent-bot 0.1.16-alpha.1 → 0.1.16-alpha.3

package/dist/proxy/ProxySessionController.js

@@ -1900,18 +1900,20 @@ export class ProxySessionController {
     }
     async presentPromptQueueCard(localSessionId, contextKey) {
         await this.serializePromptQueueCardWrite(localSessionId, async () => {
-            const card = this.renderPromptQueueCard(localSessionId, contextKey);
-            const existing = this.queuedPromptCards.get(localSessionId)?.get(contextKey);
+            const cards = this.queuedPromptCards.get(localSessionId);
+            const existing = cards?.get(contextKey);
             if (existing) {
                 try {
-                    await this.outbound.updateInteractiveCard(contextKey, existing, card);
-                    return;
+                    await this.outbound.updateInteractiveCard(contextKey, existing, this.renderPromptQueueCard(localSessionId, contextKey, "superseded"));
                 }
                 catch (error) {
-                    this.logger.warn({ error, localSessionId, contextKey, messageId: existing }, "Failed to update prompt queue card; sending a replacement.");
+                    this.logger.warn({ error, localSessionId, contextKey, messageId: existing }, "Failed to stop the previous prompt queue card; sending a replacement.");
                 }
+                cards?.delete(contextKey);
+                if (cards?.size === 0)
+                    this.queuedPromptCards.delete(localSessionId);
             }
-            const messageId = await this.outbound.sendInteractiveCard(contextKey, card);
+            const messageId = await this.outbound.sendInteractiveCard(contextKey, this.renderPromptQueueCard(localSessionId, contextKey));
             if (messageId)
                 this.rememberPromptQueueCard(localSessionId, contextKey, messageId);
         });
@@ -1931,10 +1933,11 @@ export class ProxySessionController {
             }));
         });
     }
-    renderPromptQueueCard(localSessionId, contextKey) {
+    renderPromptQueueCard(localSessionId, contextKey, phase = "active") {
         return this.cardRenderer.renderPromptQueue({
             sessionId: localSessionId,
             contextKey,
+            phase,
             prompts: this.store.listQueuedPrompts(localSessionId).map((prompt) => ({
                 id: prompt.promptId,
                 text: prompt.displayPrompt ?? prompt.text,
@@ -3794,7 +3797,43 @@ export class ProxySessionController {
         if (!current.remoteSessionId || !this.isCodexSession(current)) {
             throw new Error("当前任务不是可 Reset 的 App Server 任务。");
         }
-        const allTurns = this.store.listTaskTurnGraph(current.localSessionId);
+        const completedTurns = this.store.listTaskTurnGraph(current.localSessionId);
+        const completedTurnIds = new Set(completedTurns.map((turn) => turn.turnId));
+        const runningTurnId = current.lastTurnStatus === "running" && current.lastTurnId
+            && !completedTurnIds.has(current.lastTurnId)
+            ? current.lastTurnId
+            : undefined;
+        const persistedRunningSnapshot = runningTurnId
+            ? turnViewSnapshot(this.store.getTurnSnapshot(runningTurnId))
+            : undefined;
+        const runningAttempt = runningTurnId
+            ? this.store.findIncompleteTurnAttemptByTurnId(runningTurnId)
+            : undefined;
+        const attemptStartedAt = Date.parse(runningAttempt?.createdAt ?? "");
+        const runningSnapshot = runningTurnId
+            ? persistedRunningSnapshot ?? {
+                sessionId: current.localSessionId,
+                turnId: runningTurnId,
+                prompt: runningAttempt?.promptText ?? current.title,
+                status: "running",
+                startedAt: Number.isFinite(attemptStartedAt) ? attemptStartedAt : Date.now(),
+                assistantText: "",
+                plan: [],
+                activities: [],
+                completedTools: [],
+                failedTools: [],
+                fileSummary: [],
+            }
+            : undefined;
+        const runningTurn = runningTurnId && runningSnapshot
+            ? {
+                turnId: runningTurnId,
+                parentTurnId: this.store.getTurnParent(runningTurnId, current.localSessionId),
+                snapshot: runningSnapshot,
+                updatedAt: runningAttempt?.updatedAt ?? new Date(runningSnapshot.startedAt).toISOString(),
+            }
+            : undefined;
+        const allTurns = runningTurn ? [runningTurn, ...completedTurns] : completedTurns;
         const graphRows = buildTurnGraphRows(allTurns.map((turn) => ({
             turnId: turn.turnId,
             parentTurnId: turn.parentTurnId,
@@ -3811,16 +3850,18 @@ export class ProxySessionController {
             const graph = graphRows[offset + index];
             const summary = truncateText((snapshot.prompt ?? snapshot.taskTitle ?? "未记录对话内容").replace(/\s+/g, " ").trim(), 100);
             const isCurrent = current.lastTurnId === turn.turnId && current.lastTurnStatus === "completed";
+            const isRunning = runningTurnId === turn.turnId;
             return [{
                     sequence: graph.sequence,
                     graphNodeLine: graph.nodeLine,
                     graphConnectorLine: graph.connectorLine,
                     lines: [
-                        `**${cardText(summary || "未记录对话内容")}**`,
-                        `${formatResetTurnTime(snapshot.completedAt ?? snapshot.startedAt)} · ${cardCode(turn.turnId)}`,
+                        cardText(summary || "未记录对话内容"),
+                        `${formatResetTurnTime(snapshot.completedAt ?? snapshot.startedAt)} · ${cardText(turn.turnId)}`,
                     ],
                     current: isCurrent,
-                    actions: isCurrent ? undefined : [{
+                    running: isRunning,
+                    actions: isCurrent || isRunning ? undefined : [{
                             text: "Reset",
                             value: {
                                 action: "turn_reset",
@@ -3856,7 +3897,9 @@ export class ProxySessionController {
         const card = this.cardRenderer.renderResetHistoryCard({
             entries,
             footerLines: [
-                `第 ${page + 1}/${totalPages} 页 · 共 ${total} 个已完成 turn`,
+                runningTurn
+                    ? `第 ${page + 1}/${totalPages} 页 · 共 ${total} 个 turn（${completedTurns.length} 个已完成，1 个运行中）`
+                    : `第 ${page + 1}/${totalPages} 页 · 共 ${total} 个已完成 turn`,
             ],
             pageActions,
         });
@@ -4199,8 +4242,8 @@ export class ProxySessionController {
                     reference: entry.reference,
                     summary: `${offset + index + 1}. ${marker}${title} · ${entry.agentName}`,
                     detailLines: [
-                        cardText(lastUserPrompt),
-                        `**更新时间**：${cardText(entry.updatedLabel)}`,
+                        `**最新 Prompt**：${cardText(lastUserPrompt)}`,
+                        `<font color='grey'>最近更新：${cardText(entry.updatedLabel)}</font>`,
                     ],
                     actions,
                     current: entry.current,