feat:重试页面检测和重试点击的逻辑抽取为公共逻辑

background/message-router.js

@@ -28,6 +28,7 @@
       executeStepViaCompletionSignal,
       exportSettingsBundle,
       fetchGeneratedEmail,
+      finalizeStep3Completion,
       finalizeIcloudAliasAfterSuccessfulFlow,
       findHotmailAccount,
       flushCommand,
@@ -218,6 +219,19 @@
             notifyStepError(message.step, '流程已被用户停止。');
             return { ok: true };
           }
+          try {
+            if (message.step === 3 && typeof finalizeStep3Completion === 'function') {
+              await finalizeStep3Completion(message.payload || {});
+            }
+          } catch (error) {
+            const errorMessage = error?.message || String(error || '步骤 3 提交后确认失败');
+            await setStepStatus(message.step, 'failed');
+            await addLog(`步骤 ${message.step} 失败：${errorMessage}`, 'error');
+            await appendManualAccountRunRecordIfNeeded(`step${message.step}_failed`, null, errorMessage);
+            notifyStepError(message.step, errorMessage);
+            return { ok: true, error: errorMessage };
+          }
+
           const completionState = message.step === 9 ? await getState() : null;
           await setStepStatus(message.step, 'completed');
           await addLog(`步骤 ${message.step} 已完成`, 'ok');

background/signup-flow-helpers.js

@@ -150,6 +150,37 @@
       return result;
     }
 
+    async function finalizeSignupPasswordSubmitInTab(tabId, password = '', step = 3) {
+      if (!Number.isInteger(tabId)) {
+        throw new Error(`认证页面标签页已关闭，无法完成步骤 ${step} 的提交后确认。`);
+      }
+
+      await ensureContentScriptReadyOnTab('signup-page', tabId, {
+        inject: SIGNUP_PAGE_INJECT_FILES,
+        injectSource: 'signup-page',
+        timeoutMs: 45000,
+        retryDelayMs: 900,
+        logMessage: `步骤 ${step}：认证页仍在切换，正在等待页面恢复后继续确认提交流程...`,
+      });
+
+      const result = await sendToContentScriptResilient('signup-page', {
+        type: 'PREPARE_SIGNUP_VERIFICATION',
+        step,
+        source: 'background',
+        payload: { password: password || '' },
+      }, {
+        timeoutMs: 30000,
+        retryDelayMs: 700,
+        logMessage: `步骤 ${step}：密码已提交，正在确认是否进入下一页面，必要时自动恢复重试页...`,
+      });
+
+      if (result?.error) {
+        throw new Error(result.error);
+      }
+
+      return result || {};
+    }
+
     async function resolveSignupEmailForFlow(state) {
       let resolvedEmail = state.email;
       if (isHotmailProvider(state)) {
@@ -182,6 +213,7 @@
     return {
       ensureSignupEntryPageReady,
       ensureSignupPostEmailPageReadyInTab,
+      finalizeSignupPasswordSubmitInTab,
       ensureSignupPasswordPageReadyInTab,
       openSignupEntryTab,
       resolveSignupEmailForFlow,

background/steps/confirm-oauth.js

@@ -152,6 +152,12 @@
                 break;
               }
 
+              if (effect.restartCurrentStep) {
+                await addLog(`步骤 8：${getStep8EffectLabel(effect)}，准备重新定位“继续”按钮并重试...`, 'warn');
+                await sleepWithStop(STEP8_CLICK_RETRY_DELAY_MS);
+                continue;
+              }
+
               if (round >= STEP8_MAX_ROUNDS) {
                 throw new Error(`步骤 8：连续 ${STEP8_MAX_ROUNDS} 轮点击“继续”后页面仍无反应。`);
               }