@keyou007/agent-bot 0.1.16-alpha.0 → 0.1.16-alpha.2

package/src/feishu/CardRenderer.ts

@@ -58,7 +58,7 @@ export interface InitializationWelcomeView {
 export interface SafeRestartStatusView {
   scheduleId: number;
   reason: string;
-  phase: "waiting_tasks" | "waiting_delivery" | "countdown" | "restarting" | "cancelled";
+  phase: "waiting_tasks" | "waiting_delivery" | "countdown" | "restarting" | "cancelled" | "superseded";
   remainingMs?: number;
   pendingFinalDeliveries: number;
   waitingTasks: Array<{
@@ -70,6 +70,7 @@ export interface SafeRestartStatusView {
 export interface PromptQueueCardView {
   sessionId: string;
   contextKey: string;
+  phase?: "active" | "superseded";
   prompts: Array<{
     id: string;
     text: string;
@@ -665,7 +666,8 @@ export class CardRenderer {
   }
 
   renderPromptQueue(view: PromptQueueCardView): Record<string, unknown> {
-    const elements = view.prompts.length === 0
+    const superseded = view.phase === "superseded";
+    const elements: Record<string, unknown>[] = view.prompts.length === 0
       ? [markdown("队列为空")]
       : view.prompts.map((prompt, index) => ({
           tag: "column_set",
@@ -688,7 +690,7 @@ export class CardRenderer {
               tag: "column",
               width: "auto",
               vertical_align: "center",
-              elements: [{
+              elements: superseded ? [] : [{
                 tag: "button",
                 text: { tag: "plain_text", content: "Cancel" },
                 type: "default",
@@ -706,6 +708,9 @@ export class CardRenderer {
             },
           ],
         }));
+    if (superseded) {
+      elements.push({ tag: "hr" }, markdown("此卡片已由新的排队卡片替代。"));
+    }
     return {
       schema: "2.0",
       config: {
@@ -714,7 +719,10 @@ export class CardRenderer {
       },
       header: {
         template: "grey",
-        title: { tag: "plain_text", content: `排队 Prompt · ${view.prompts.length}` },
+        title: {
+          tag: "plain_text",
+          content: superseded ? "排队 Prompt · 已停止" : `排队 Prompt · ${view.prompts.length}`,
+        },
         padding: "8px 12px 8px 12px",
       },
       body: {
@@ -733,6 +741,8 @@ export class CardRenderer {
         ? "0s"
         : view.phase === "cancelled"
           ? "已取消"
+          : view.phase === "superseded"
+            ? "已停止"
         : "等待阻塞项清空后开始";
     const status = view.phase === "waiting_tasks"
       ? "🟠 等待任务完成"
@@ -742,7 +752,9 @@ export class CardRenderer {
           ? "🟡 空闲确认中"
           : view.phase === "restarting"
             ? "🔄 正在重启"
-            : "⚪ 已取消";
+            : view.phase === "cancelled"
+              ? "⚪ 已取消"
+              : "⚪ 已停止";
     const lines = [
       `**状态**：${status}`,
       `**重启原因**：${inlineCode(view.reason)}`,
@@ -761,7 +773,7 @@ export class CardRenderer {
     } else {
       elements.push({ tag: "hr" }, markdown("**当前等待的任务**：无"));
     }
-    if (view.phase !== "restarting" && view.phase !== "cancelled") {
+    if (view.phase !== "restarting" && view.phase !== "cancelled" && view.phase !== "superseded") {
       elements.push(
         { tag: "hr" },
         taskActionRow([{
@@ -775,7 +787,7 @@ export class CardRenderer {
     }
     const template = view.phase === "restarting"
       ? "blue"
-      : view.phase === "cancelled"
+      : view.phase === "cancelled" || view.phase === "superseded"
         ? "grey"
         : "orange";
     return sectionCard("Agent Bot 安全重启", elements, template);

package/src/proxy/ProxySessionController.ts

@@ -2503,17 +2503,28 @@ export class ProxySessionController {
 
   private async presentPromptQueueCard(localSessionId: string, contextKey: string): Promise<void> {
     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);
     });
   }
@@ -2536,10 +2547,15 @@ export class ProxySessionController {
     });
   }
 
-  private renderPromptQueueCard(localSessionId: string, contextKey: string): Record<string, unknown> {
+  private renderPromptQueueCard(
+    localSessionId: string,
+    contextKey: string,
+    phase: "active" | "superseded" = "active",
+  ): Record<string, unknown> {
     return this.cardRenderer.renderPromptQueue({
       sessionId: localSessionId,
       contextKey,
+      phase,
       prompts: this.store.listQueuedPrompts(localSessionId).map((prompt) => ({
         id: prompt.promptId,
         text: prompt.displayPrompt ?? prompt.text,

package/src/supervision/SafeRestartNotifier.ts

@@ -17,6 +17,7 @@ export class SafeRestartNotifier {
   private readonly notificationTargets = new Map<string, RestartNotificationTarget>();
   private activeScheduleId?: number;
   private terminalScheduleId?: number;
+  private lastStatus?: SafeRestartStatus;
   private pendingInitialStatus?: SafeRestartStatus;
   private initialCardTimer?: NodeJS.Timeout;
   private queue = Promise.resolve();
@@ -40,12 +41,24 @@ export class SafeRestartNotifier {
       this.terminalScheduleId = Math.max(this.terminalScheduleId ?? 0, status.scheduleId);
     }
     if (this.activeScheduleId !== status.scheduleId) {
+      const previousStatus = this.lastStatus ?? this.pendingInitialStatus;
+      const previousMessageIds = [...this.messageIds];
+      const previousTargets = new Map(this.notificationTargets);
+      if (
+        previousStatus
+        && previousStatus.phase !== "cancelled"
+        && previousStatus.phase !== "restarting"
+        && previousMessageIds.length > 0
+      ) {
+        this.enqueueSupersededCards(previousStatus, previousMessageIds, previousTargets);
+      }
       this.activeScheduleId = status.scheduleId;
       this.messageIds.clear();
       this.cardHashes.clear();
       this.notificationTargets.clear();
       this.clearInitialCardTimer();
       this.pendingInitialStatus = status;
+      this.lastStatus = status;
       this.collectNotificationTargets(status);
       const delayMs = status.phase === "cancelled"
         ? 0
@@ -59,6 +72,7 @@ export class SafeRestartNotifier {
       }, delayMs);
       return Promise.resolve();
     }
+    this.lastStatus = status;
     this.collectNotificationTargets(status);
     if (this.pendingInitialStatus) {
       this.pendingInitialStatus = status;
@@ -149,9 +163,13 @@ export class SafeRestartNotifier {
         } else {
           created = await this.outbound.sendInteractiveCard(contextKey, card);
         }
-        if (created && this.activeScheduleId === status.scheduleId) {
-          this.messageIds.set(contextKey, created);
-          this.cardHashes.set(contextKey, cardHash);
+        if (created) {
+          if (this.activeScheduleId === status.scheduleId) {
+            this.messageIds.set(contextKey, created);
+            this.cardHashes.set(contextKey, cardHash);
+          } else {
+            await this.stopCard(created, status, reason ?? status.reason);
+          }
         }
       } catch (error) {
         this.logger.warn({ error, contextKey }, "Failed to send safe restart status card.");
@@ -159,6 +177,37 @@ export class SafeRestartNotifier {
     }));
   }
 
+  private enqueueSupersededCards(
+    status: SafeRestartStatus,
+    messageIds: Array<[string, string]>,
+    targets: Map<string, RestartNotificationTarget>,
+  ): void {
+    const queued = this.queue.catch(() => undefined).then(async () => {
+      await Promise.all(messageIds.map(async ([contextKey, messageId]) => {
+        const reason = targets.get(contextKey)?.reason ?? status.reason;
+        await this.stopCard(messageId, status, reason);
+      }));
+    });
+    this.queue = queued;
+  }
+
+  private async stopCard(messageId: string, status: SafeRestartStatus, reason: string): Promise<void> {
+    try {
+      await this.outbound.updateInteractiveCard(messageId, this.renderer.renderSafeRestartStatus({
+        scheduleId: status.scheduleId,
+        reason,
+        phase: "superseded",
+        pendingFinalDeliveries: status.activity.pendingFinalDeliveries,
+        waitingTasks: [],
+      }));
+    } catch (error) {
+      this.logger.warn(
+        { error, messageId, scheduleId: status.scheduleId },
+        "Failed to stop a superseded safe restart status card.",
+      );
+    }
+  }
+
   private collectNotificationTargets(status: SafeRestartStatus): void {
     for (const target of status.notificationTargets ?? []) {
       const contextKey = target.contextKey.trim();

package/src/supervision/SafeRestartScheduler.ts

@@ -58,9 +58,9 @@ export class SafeRestartScheduler {
   schedule(reason: string, notificationTarget?: RestartNotificationTarget): boolean {
     const newlyScheduled = !this.reason;
     if (newlyScheduled) {
-      this.scheduleId += 1;
       this.notificationTargets = [];
     }
+    this.scheduleId += 1;
     this.addNotificationTarget(notificationTarget, reason);
     this.reason = reason;
     this.idleSince = undefined;
@@ -109,12 +109,13 @@ export class SafeRestartScheduler {
   private async poll(): Promise<void> {
     const reason = this.reason;
     if (!reason) return;
+    const scheduleId = this.scheduleId;
     const state = this.options.readActivity();
     if (state.runningSessions > 0 || state.pendingFinalDeliveries > 0) {
       this.idleSince = undefined;
       this.idleInboundAt = undefined;
       await this.emitStatus({
-        scheduleId: this.scheduleId,
+        scheduleId,
         reason,
         notificationTargets: this.notificationTargetsSnapshot(),
         phase: state.runningSessions > 0 ? "waiting_tasks" : "waiting_delivery",
@@ -128,7 +129,7 @@ export class SafeRestartScheduler {
       this.idleSince = Date.now();
       this.idleInboundAt = latestInboundAt;
       await this.emitStatus({
-        scheduleId: this.scheduleId,
+        scheduleId,
         reason,
         notificationTargets: this.notificationTargetsSnapshot(),
         phase: "countdown",
@@ -140,7 +141,7 @@ export class SafeRestartScheduler {
     const remainingMs = Math.max(0, quietPeriodMs - (Date.now() - this.idleSince));
     if (remainingMs > 0) {
       await this.emitStatus({
-        scheduleId: this.scheduleId,
+        scheduleId,
         reason,
         notificationTargets: this.notificationTargetsSnapshot(),
         phase: "countdown",
@@ -159,7 +160,7 @@ export class SafeRestartScheduler {
       this.idleInboundAt = undefined;
       if (confirmed.runningSessions > 0 || confirmed.pendingFinalDeliveries > 0) {
         await this.emitStatus({
-          scheduleId: this.scheduleId,
+          scheduleId,
           reason,
           notificationTargets: this.notificationTargetsSnapshot(),
           phase: confirmed.runningSessions > 0 ? "waiting_tasks" : "waiting_delivery",
@@ -167,7 +168,7 @@ export class SafeRestartScheduler {
         });
       } else {
         await this.emitStatus({
-          scheduleId: this.scheduleId,
+          scheduleId,
           reason,
           notificationTargets: this.notificationTargetsSnapshot(),
           phase: "countdown",
@@ -177,7 +178,6 @@ export class SafeRestartScheduler {
       }
       return;
     }
-    const scheduleId = this.scheduleId;
     const notificationTargets = this.notificationTargetsSnapshot();
     this.clear();
     await this.emitStatus({
@@ -230,7 +230,7 @@ export class SafeRestartScheduler {
     this.notificationTargets[existingIndex] = {
       ...existing,
       reason: target.reason,
-      ...(!existing.replyMessageId && target.replyMessageId
+      ...(target.replyMessageId
         ? { replyMessageId: target.replyMessageId }
         : {}),
     };