feat: 更新2925邮箱处理逻辑，增强验证码重发机制，调整测试用例

tests/mail-2925-content.test.js

@@ -60,13 +60,22 @@ let refreshCalls = 0;
 const clickOrder = [];
 const readAndDeleteCalls = [];
 const seenCodes = new Set();
+const deletedMailIds = new Set();
 const baselineMail = { id: 'baseline', text: 'OpenAI newsletter without code' };
 const newMail = { id: 'new', text: 'OpenAI verification code 654321' };
 
 function findMailItems() {
-  if (state === 'detail') return [];
-  if (state === 'baseline') return [baselineMail];
-  return [baselineMail, newMail];
+  const items = [];
+  if (state === 'detail') return items;
+  if (state === 'baseline' || state === 'with-new') {
+    if (!deletedMailIds.has('baseline')) {
+      items.push(baselineMail);
+    }
+  }
+  if (state === 'with-new' && !deletedMailIds.has('new')) {
+    items.push(newMail);
+  }
+  return items;
 }
 
 function getMailItemId(item) {
@@ -99,7 +108,9 @@ async function sleepRandom() {}
 
 async function returnToInbox() {
   clickOrder.push('inbox');
-  state = 'baseline';
+  if (state === 'detail') {
+    state = 'baseline';
+  }
   return true;
 }
 
@@ -113,6 +124,7 @@ async function refreshInbox() {
 
 async function openMailAndDeleteAfterRead(item) {
   readAndDeleteCalls.push(item.id);
+  deletedMailIds.add(item.id);
   return item.id === 'new' ? 'Your ChatGPT code is 654321' : 'No code here';
 }
 
@@ -142,7 +154,7 @@ return {
 
   assert.equal(result.code, '654321');
   assert.deepEqual(api.getClickOrder(), ['inbox', 'refresh', 'inbox', 'refresh']);
-  assert.deepEqual(api.getReadAndDeleteCalls(), ['new']);
+  assert.deepEqual(api.getReadAndDeleteCalls(), ['baseline', 'new']);
 });
 
 test('handlePollEmail ignores targetEmail and still tests any matching ChatGPT mail', async () => {

tests/verification-flow-polling.test.js

@@ -301,6 +301,73 @@ test('verification flow caps mail polling timeout to the remaining oauth budget'
   assert.equal(mailPollCalls[0].payload.maxAttempts, 2);
 });
 
+test('verification flow keeps 2925 mailbox polling at 15 refresh attempts even when oauth budget is smaller', async () => {
+  const mailPollCalls = [];
+
+  const helpers = api.createVerificationFlowHelpers({
+    addLog: async () => {},
+    chrome: {
+      tabs: {
+        update: async () => {},
+      },
+    },
+    CLOUDFLARE_TEMP_EMAIL_PROVIDER: 'cloudflare-temp-email',
+    completeStepFromBackground: async () => {},
+    confirmCustomVerificationStepBypassRequest: async () => ({ confirmed: true }),
+    getHotmailVerificationPollConfig: () => ({}),
+    getHotmailVerificationRequestTimestamp: () => 0,
+    getState: async () => ({}),
+    getTabId: async () => 1,
+    HOTMAIL_PROVIDER: 'hotmail-api',
+    isStopError: () => false,
+    LUCKMAIL_PROVIDER: 'luckmail-api',
+    MAIL_2925_VERIFICATION_INTERVAL_MS: 15000,
+    MAIL_2925_VERIFICATION_MAX_ATTEMPTS: 15,
+    pollCloudflareTempEmailVerificationCode: async () => ({}),
+    pollHotmailVerificationCode: async () => ({}),
+    pollLuckmailVerificationCode: async () => ({}),
+    sendToContentScript: async (_source, message) => {
+      if (message.type === 'FILL_CODE') {
+        return {};
+      }
+      return {};
+    },
+    sendToMailContentScriptResilient: async (_mail, message, options) => {
+      mailPollCalls.push({
+        type: message.type,
+        payload: message.payload,
+        options,
+      });
+      return { code: '654321', emailTimestamp: 123 };
+    },
+    setState: async () => {},
+    setStepStatus: async () => {},
+    sleepWithStop: async () => {},
+    throwIfStopped: () => {},
+    VERIFICATION_POLL_MAX_ROUNDS: 5,
+  });
+
+  await helpers.resolveVerificationStep(
+    8,
+    {
+      email: 'user@example.com',
+      mailProvider: '2925',
+      lastLoginCode: null,
+    },
+    { provider: '2925', label: '2925 邮箱' },
+    {
+      getRemainingTimeMs: async () => 5000,
+      resendIntervalMs: 0,
+      disableTimeBudgetCap: true,
+    }
+  );
+
+  const pollCall = mailPollCalls.find((entry) => entry.type === 'POLL_EMAIL');
+  assert.ok(pollCall);
+  assert.equal(pollCall.payload.maxAttempts, 15);
+  assert.ok(pollCall.options.timeoutMs >= 250000);
+});
+
 test('verification flow keeps Hotmail request timestamp filtering on the first poll', async () => {
   const pollPayloads = [];