From 02cf4b88b6b66819cbfd37ce351443551cb4cde1 Mon Sep 17 00:00:00 2001
From: Zichao Lin <earthjasonlin@163.com>
Date: Mon, 13 Jul 2026 07:12:43 +0800
Subject: [PATCH] fix: add _processing_uids to prevent re-fetching emails being
 processed

---
 main.py             | 7 ++++++-
 src/email_client.py | 3 ---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/main.py b/main.py
index e2f3af4..fea0d4b 100644
--- a/main.py
+++ b/main.py
@@ -30,6 +30,7 @@ logger = logging.getLogger("main")
 _running = True
 _pending_lock = threading.Lock()
 _pending_uids: set[bytes] = set()
+_processing_uids: set[bytes] = set()  # 正在处理（含等待TG发送）的邮件UID
 
 # Queue 1: raw emails → AI processor
 _email_queue: queue_module.Queue = queue_module.Queue()
@@ -51,7 +52,8 @@ def _email_poller(cfg):
                 if not _running:
                     return
                 with _pending_lock:
-                    if mail.uid not in _pending_uids:
+                    if mail.uid not in _processing_uids:
+                        _processing_uids.add(mail.uid)
                         _pending_uids.add(mail.uid)
                         _email_queue.put((acct_idx, mail))
         except Exception as e:
@@ -90,6 +92,7 @@ def _ai_processor(cfg):
                     # AI 失败也要移除 pending，否则永远卡住
                     with _pending_lock:
                         _pending_uids.discard(mail.uid)
+                        _processing_uids.discard(mail.uid)
 
             time.sleep(0.1 if pending_futures else 0.5)
 
@@ -110,6 +113,7 @@ def _tg_worker(cfg):
                 # 发送并标记已读成功后才移除 pending
                 with _pending_lock:
                     _pending_uids.discard(info["uid"])
+                    _processing_uids.discard(info["uid"])
             except queue_module.Empty:
                 break
             except Exception as e:
@@ -118,6 +122,7 @@ def _tg_worker(cfg):
                 try:
                     with _pending_lock:
                         _pending_uids.discard(info["uid"])
+                        _processing_uids.discard(info["uid"])
                 except Exception:
                     pass
 
diff --git a/src/email_client.py b/src/email_client.py
index 7f347ad..cf388da 100644
--- a/src/email_client.py
+++ b/src/email_client.py
@@ -163,9 +163,6 @@ def fetch_unseen_emails(account: EmailAccount) -> list[Email]:
                     emails.append(Email(uid=uid, subject=subject, sender=sender, recipient=recipient,
                                         body=body, date=date_str, reply_to=reply_to, account_email=account.username,
                                         folder=folder))
-
-                    # FETCH 可能被服务器自动标已读，立即标回未读
-                    conn.uid("STORE", uid, "-FLAGS", "\\Seen")
                 except Exception as e:
                     logger.error("    UID %s FETCH 失败，跳过: %s", uid, e)
                     continue