feat: 增强步骤 3 的手机号注册逻辑，确保手机号身份优先处理并添加相关测试用例

background/signup-flow-helpers.js

@@ -10,6 +10,7 @@
       ensureHotmailAccountForFlow,
       ensureMail2925AccountForFlow,
       ensureLuckmailPurchaseForFlow,
+      fetchGeneratedEmail,
       isGeneratedAliasProvider,
       isReusableGeneratedAliasEmail,
       isHotmailProvider,
@@ -22,6 +23,7 @@
       reuseOrCreateTab,
       sendToContentScriptResilient,
       setEmailState,
+      setState,
       SIGNUP_ENTRY_URL,
       SIGNUP_PAGE_INJECT_FILES,
       waitForTabStableComplete = null,
@@ -256,8 +258,52 @@
       return result || {};
     }
 
-    async function resolveSignupEmailForFlow(state) {
+    function getPreservedPhoneIdentityForEmailResolution(state = {}, options = {}) {
+      if (!Boolean(options?.preserveAccountIdentity)) {
+        return null;
+      }
+      const accountIdentifierType = String(state?.accountIdentifierType || '').trim().toLowerCase();
+      const signupPhoneNumber = String(
+        state?.signupPhoneNumber
+        || (accountIdentifierType === 'phone' ? state?.accountIdentifier : '')
+        || state?.signupPhoneCompletedActivation?.phoneNumber
+        || state?.signupPhoneActivation?.phoneNumber
+        || ''
+      ).trim();
+      if (accountIdentifierType !== 'phone' && !signupPhoneNumber) {
+        return null;
+      }
+      return {
+        accountIdentifierType: 'phone',
+        accountIdentifier: signupPhoneNumber || String(state?.accountIdentifier || '').trim(),
+        signupPhoneNumber,
+        signupPhoneActivation: state?.signupPhoneActivation || null,
+        signupPhoneCompletedActivation: state?.signupPhoneCompletedActivation || null,
+        signupPhoneVerificationRequestedAt: state?.signupPhoneVerificationRequestedAt ?? null,
+        signupPhoneVerificationPurpose: state?.signupPhoneVerificationPurpose || '',
+      };
+    }
+
+    async function persistResolvedSignupEmail(resolvedEmail, state = {}, options = {}) {
+      if (resolvedEmail === state.email && !options?.preserveAccountIdentity) {
+        return;
+      }
+      const preservedPhoneIdentity = getPreservedPhoneIdentityForEmailResolution(state, options);
+      if (preservedPhoneIdentity && typeof setState === 'function') {
+        await setState({
+          email: resolvedEmail,
+          ...preservedPhoneIdentity,
+        });
+        return;
+      }
+      if (resolvedEmail !== state.email) {
+        await setEmailState(resolvedEmail);
+      }
+    }
+
+    async function resolveSignupEmailForFlow(state, options = {}) {
       let resolvedEmail = state.email;
+      let generatedEmailAlreadyPersisted = false;
       if (isHotmailProvider(state)) {
         const account = await ensureHotmailAccountForFlow({
           allowAllocate: true,
@@ -281,14 +327,17 @@
         if (!isReusableGeneratedAliasEmail?.(state, resolvedEmail)) {
           resolvedEmail = buildGeneratedAliasEmail(state);
         }
+      } else if (!resolvedEmail && typeof fetchGeneratedEmail === 'function') {
+        resolvedEmail = await fetchGeneratedEmail(state, options);
+        generatedEmailAlreadyPersisted = true;
       }
 
       if (!resolvedEmail) {
         throw new Error('缺少邮箱地址，请先在侧边栏粘贴邮箱。');
       }
 
-      if (resolvedEmail !== state.email) {
-        await setEmailState(resolvedEmail);
+      if (!generatedEmailAlreadyPersisted || options?.preserveAccountIdentity) {
+        await persistResolvedSignupEmail(resolvedEmail, state, options);
       }
 
       return resolvedEmail;

background/steps/fetch-login-code.js

@@ -145,7 +145,9 @@
       }
 
       const latestState = typeof getState === 'function' ? await getState() : state;
-      const resolvedEmail = await resolveSignupEmailForFlow(latestState);
+      const resolvedEmail = await resolveSignupEmailForFlow(latestState, {
+        preserveAccountIdentity: true,
+      });
       await addLog(`步骤 ${visibleStep}：检测到添加邮箱页，正在添加邮箱 ${resolvedEmail} 并进入邮箱验证码页...`);
 
       const timeoutMs = typeof getOAuthFlowStepTimeoutMs === 'function'

background/steps/fill-password.js

@@ -9,22 +9,47 @@
       generatePassword,
       getTabId,
       isTabAlive,
+      resolveSignupMethod,
       sendToContentScript,
       setPasswordState,
       setState,
       SIGNUP_PAGE_INJECT_FILES,
     } = deps;
 
+    function normalizeSignupMethod(value = '') {
+      return String(value || '').trim().toLowerCase() === 'phone'
+        ? 'phone'
+        : 'email';
+    }
+
+    function getResolvedSignupMethodForStep3(state = {}) {
+      if (typeof resolveSignupMethod === 'function') {
+        return normalizeSignupMethod(resolveSignupMethod(state));
+      }
+      const frozenMethod = String(state?.resolvedSignupMethod || '').trim().toLowerCase();
+      if (frozenMethod === 'phone' || frozenMethod === 'email') {
+        return normalizeSignupMethod(frozenMethod);
+      }
+      return normalizeSignupMethod(state?.signupMethod);
+    }
+
     function resolveStep3AccountIdentity(state = {}) {
       const resolvedEmail = String(state?.email || '').trim();
+      const rawAccountIdentifierType = String(state?.accountIdentifierType || '').trim().toLowerCase();
       const signupPhoneNumber = String(
         state?.signupPhoneNumber
-        || (state?.accountIdentifierType === 'phone' ? state?.accountIdentifier : '')
+        || (rawAccountIdentifierType === 'phone' ? state?.accountIdentifier : '')
         || ''
       ).trim();
-      const accountIdentifierType = signupPhoneNumber && state?.accountIdentifierType === 'phone'
+      const explicitEmailIdentity = rawAccountIdentifierType === 'email' && resolvedEmail;
+      const shouldUsePhoneIdentity = !explicitEmailIdentity && (
+        rawAccountIdentifierType === 'phone'
+        || Boolean(signupPhoneNumber)
+        || getResolvedSignupMethodForStep3(state) === 'phone'
+      );
+      const accountIdentifierType = shouldUsePhoneIdentity
         ? 'phone'
-        : (resolvedEmail ? 'email' : (signupPhoneNumber ? 'phone' : 'email'));
+        : (resolvedEmail ? 'email' : 'email');
       const accountIdentifier = accountIdentifierType === 'phone'
         ? signupPhoneNumber
         : resolvedEmail;
@@ -40,6 +65,9 @@
     async function executeStep3(state) {
       const identity = resolveStep3AccountIdentity(state);
       if (!identity.accountIdentifier) {
+        if (identity.accountIdentifierType === 'phone') {
+          throw new Error('缺少注册手机号，请先完成步骤 2 或在侧栏填写注册手机号后再执行步骤 3。');
+        }
         throw new Error('缺少注册账号，请先完成步骤 2。');
       }