fix(feishuadapter): cleanup stale sent approval cards

Author: Cai-Tang-www

internal/feishuadapter/adapter.go

@@ -1139,14 +1139,20 @@ func (a *Adapter) executeApprovalOutbox(ctx context.Context, ops []approvalOutbo
 			var cardID string
 			cardID, err = a.messenger.SendPermissionCard(ctx, op.ChatID, op.PendingCard)
 			if err == nil && strings.TrimSpace(cardID) != "" {
+				normalizedCardID := strings.TrimSpace(cardID)
+				shouldAttach := false
 				a.mu.Lock()
 				fsm := a.approvalFSMByRun[op.RunKey]
 				if fsm != nil && fsm.Generation == op.Generation && fsm.Version == op.Version {
-					fsm.CardID = strings.TrimSpace(cardID)
+					shouldAttach = true
+					fsm.CardID = normalizedCardID
 					a.approvalCardRunIndex[fsm.CardID] = op.RunKey
 					a.rememberRunPermissionCardLocked(op.RunKey, fsm.CardID)
 				}
 				a.mu.Unlock()
+				if !shouldAttach {
+					a.cleanupStalePermissionCard(op, normalizedCardID)
+				}
 			}
 		case approvalOutboxUpdatePendingCard:
 			if strings.TrimSpace(op.CardID) == "" {
@@ -1168,6 +1174,38 @@ func (a *Adapter) executeApprovalOutbox(ctx context.Context, ops []approvalOutbo
 	}
 }
 
+// cleanupStalePermissionCard 在发送审批卡后若发现版本已过期，则立即回收该游离卡片。
+func (a *Adapter) cleanupStalePermissionCard(op approvalOutboxOperation, cardID string) {
+	normalizedCardID := strings.TrimSpace(cardID)
+	if normalizedCardID == "" {
+		return
+	}
+	timeout := a.cfg.RequestTimeout
+	if timeout <= 0 {
+		timeout = 3 * time.Second
+	}
+	callCtx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+	if err := a.messenger.DeleteMessage(callCtx, normalizedCardID); err != nil {
+		a.safeLog(
+			"cleanup stale approval card failed kind=%s run_key=%s request_id=%s card_id=%s err=%v",
+			op.Kind,
+			op.RunKey,
+			op.RequestID,
+			normalizedCardID,
+			err,
+		)
+		return
+	}
+	a.safeLog(
+		"cleanup stale approval card success kind=%s run_key=%s request_id=%s card_id=%s",
+		op.Kind,
+		op.RunKey,
+		op.RequestID,
+		normalizedCardID,
+	)
+}
+
 // shouldExecuteApprovalOutbox 在发送副作用前进行代际/版本栅栏校验，避免旧 outbox 覆写新状态。
 func (a *Adapter) shouldExecuteApprovalOutbox(op approvalOutboxOperation) bool {
 	currentGeneration, currentVersion, ok := a.snapshotApprovalFSMVersion(op.RunKey)

internal/feishuadapter/adapter_test.go

@@ -137,13 +137,14 @@ type sentMessage struct {
 }
 
 type fakeMessenger struct {
-	mu            sync.Mutex
-	messages      []sentMessage
-	nextID        int
-	sendTextErr   error
-	sendCardErr   error
-	updateCardErr error
-	deleteCardErr error
+	mu                     sync.Mutex
+	messages               []sentMessage
+	nextID                 int
+	sendTextErr            error
+	sendCardErr            error
+	updateCardErr          error
+	deleteCardErr          error
+	sendPermissionCardHook func(cardID string, payload PermissionCardPayload)
 }
 
 func (m *fakeMessenger) SendText(_ context.Context, chatID string, text string) error {
@@ -155,10 +156,14 @@ func (m *fakeMessenger) SendText(_ context.Context, chatID string, text string)
 
 func (m *fakeMessenger) SendPermissionCard(_ context.Context, chatID string, payload PermissionCardPayload) (string, error) {
 	m.mu.Lock()
-	defer m.mu.Unlock()
 	m.nextID++
 	cardID := fmt.Sprintf("perm-card-%d", m.nextID)
 	m.messages = append(m.messages, sentMessage{chatID: chatID, kind: "card", card: payload, cardID: cardID})
+	hook := m.sendPermissionCardHook
+	m.mu.Unlock()
+	if hook != nil {
+		hook(cardID, payload)
+	}
 	return cardID, nil
 }
 
@@ -2311,6 +2316,72 @@ func TestApprovalOutboxPreflightDropsStaleOperation(t *testing.T) {
 	}
 }
 
+func TestApprovalOutboxSendCardCleanupWhenVersionAdvancedDuringSend(t *testing.T) {
+	adapter := newTestAdapter(t)
+	sessionID := "session-outbox-race-send"
+	runID := "run-outbox-race-send"
+	runKey := runBindingKey(sessionID, runID)
+	adapter.trackSession(sessionID, runID, "chat-outbox-race-send", "outbox race send task")
+
+	var createdCardID string
+	var hookOnce sync.Once
+	messenger := adapterTestMessenger(adapter)
+	messenger.mu.Lock()
+	messenger.sendPermissionCardHook = func(cardID string, _ PermissionCardPayload) {
+		createdCardID = strings.TrimSpace(cardID)
+		hookOnce.Do(func() {
+			adapter.mu.Lock()
+			if fsm := adapter.approvalFSMByRun[runKey]; fsm != nil {
+				fsm.Version++
+			}
+			adapter.mu.Unlock()
+		})
+	}
+	messenger.mu.Unlock()
+
+	adapter.processPermissionRequested(
+		context.Background(),
+		sessionID,
+		runID,
+		"chat-outbox-race-send",
+		"perm-outbox-race-send",
+		"filesystem_write_file",
+		"write_file",
+		"outbox-race-send.txt",
+		"需要审批",
+	)
+	if strings.TrimSpace(createdCardID) == "" {
+		t.Fatal("expected permission card to be sent")
+	}
+
+	msgs := adapterTestMessenger(adapter).snapshot()
+	foundDelete := false
+	for _, message := range msgs {
+		if message.kind == "delete_card" && message.chatID == createdCardID {
+			foundDelete = true
+			break
+		}
+	}
+	if !foundDelete {
+		t.Fatalf("expected stale sent permission card to be deleted, msgs=%#v", msgs)
+	}
+
+	adapter.mu.RLock()
+	fsm := adapter.approvalFSMByRun[runKey]
+	storedCardID := ""
+	if fsm != nil {
+		storedCardID = strings.TrimSpace(fsm.CardID)
+	}
+	_, indexed := adapter.approvalCardRunIndex[createdCardID]
+	adapter.mu.RUnlock()
+	if storedCardID != "" {
+		t.Fatalf("stale card should not be attached to fsm, got %q", storedCardID)
+	}
+	if indexed {
+		t.Fatalf("stale card should not remain in approvalCardRunIndex: %s", createdCardID)
+	}
+}
+
 func TestTryHandleTextPermissionHandlesAskUserAnswerAndSkip(t *testing.T) {
 	adapter := newTestAdapter(t)
 	sessionID := BuildSessionID("chat-ask-text-cmd")