Fix add-email preserve identity email state flow

background/cloudmail-provider.js

@@ -17,6 +17,7 @@
       normalizeCloudMailDomain,
       normalizeCloudMailDomains,
       normalizeCloudMailMailApiMessages,
+      persistRegistrationEmailState = null,
       pickVerificationMessageWithTimeFallback,
       setEmailState = async () => {},
       setPersistentSettings = async () => {},
@@ -24,6 +25,14 @@
       throwIfStopped = () => {},
     } = deps;
 
+    async function persistResolvedEmailState(state = null, email, options = {}) {
+      if (typeof persistRegistrationEmailState === 'function') {
+        await persistRegistrationEmailState(state, email, options);
+        return;
+      }
+      await setEmailState(email, options);
+    }
+
     function getCloudMailConfig(state = {}) {
       return {
         baseUrl: normalizeCloudMailBaseUrl(state.cloudMailBaseUrl),
@@ -185,7 +194,10 @@
           throw err;
         }
       }
-      await setEmailState(address, { source: 'generated:cloudmail' });
+      await persistResolvedEmailState(latestState, address, {
+        source: 'generated:cloudmail',
+        preserveAccountIdentity: Boolean(options?.preserveAccountIdentity),
+      });
       await addLog(`Cloud Mail：已生成 ${address}`, 'ok');
       return address;
     }

background/generated-email-helpers.js

@@ -22,12 +22,21 @@
       normalizeCloudflareTempEmailAddress,
       normalizeEmailGenerator,
       isGeneratedAliasProvider,
+      persistRegistrationEmailState = null,
       reuseOrCreateTab,
       sendToContentScript,
       setEmailState,
       throwIfStopped,
     } = deps;
 
+    async function persistResolvedEmailState(state = null, email, options = {}) {
+      if (typeof persistRegistrationEmailState === 'function') {
+        await persistRegistrationEmailState(state, email, options);
+        return;
+      }
+      await setEmailState(email, options);
+    }
+
     function generateCloudflareAliasLocalPart() {
       const letters = 'abcdefghijklmnopqrstuvwxyz';
       const digits = '0123456789';
@@ -60,7 +69,10 @@
       const localPart = String(options.localPart || '').trim().toLowerCase() || generateCloudflareAliasLocalPart();
       const aliasEmail = `${localPart}@${domain}`;
 
-      await setEmailState(aliasEmail, { source: 'generated:cloudflare' });
+      await persistResolvedEmailState(latestState, aliasEmail, {
+        source: 'generated:cloudflare',
+        preserveAccountIdentity: Boolean(options?.preserveAccountIdentity),
+      });
       await addLog(`Cloudflare 邮箱：已生成 ${aliasEmail}`, 'ok');
       return aliasEmail;
     }
@@ -162,7 +174,10 @@
         throw new Error('Cloudflare Temp Email 未返回可用邮箱地址。');
       }
 
-      await setEmailState(address, { source: 'generated:cloudflare-temp-email' });
+      await persistResolvedEmailState(latestState, address, {
+        source: 'generated:cloudflare-temp-email',
+        preserveAccountIdentity: Boolean(options?.preserveAccountIdentity),
+      });
       await addLog(`Cloudflare Temp Email：已生成 ${address}`, 'ok');
       return address;
     }
@@ -176,6 +191,7 @@
       const {
         generateNew = true,
         baselineEmail = '',
+        state = null,
       } = options;
 
       await addLog(`Duck 邮箱：正在打开自动填充设置（${generateNew ? '生成新地址' : '复用当前地址'}）...`);
@@ -197,7 +213,10 @@
         throw new Error('未返回 Duck 邮箱地址。');
       }
 
-      await setEmailState(result.email, { source: 'generated:duck' });
+      await persistResolvedEmailState(state, result.email, {
+        source: 'generated:duck',
+        preserveAccountIdentity: Boolean(options?.preserveAccountIdentity),
+      });
       await addLog(`Duck 邮箱：${result.generated ? '已生成' : '已读取'} ${result.email}`, 'ok');
       return result.email;
     }
@@ -215,7 +234,10 @@
         );
       }
 
-      await setEmailState(email, { source: 'generated:custom-pool' });
+      await persistResolvedEmailState(latestState, email, {
+        source: 'generated:custom-pool',
+        preserveAccountIdentity: Boolean(options?.preserveAccountIdentity),
+      });
       await addLog(`自定义邮箱池：已取用 ${email}`, 'ok');
       return email;
     }
@@ -254,7 +276,10 @@
       }
 
       const email = buildGeneratedAliasEmail(mergedState);
-      await setEmailState(email, { source: `generated:${provider || 'alias'}` });
+      await persistResolvedEmailState(mergedState, email, {
+        source: `generated:${provider || 'alias'}`,
+        preserveAccountIdentity: Boolean(options?.preserveAccountIdentity),
+      });
       await addLog(`${provider === 'gmail' ? 'Gmail +tag' : '2925'}：已生成 ${email}`, 'ok');
       return email;
     }
@@ -297,6 +322,9 @@
         const stateFetchMode = String(mergedState.icloudFetchMode || '').trim().toLowerCase();
         const icloudOptions = {
           generateNew: Boolean(options.generateNew) || stateFetchMode === 'always_new',
+          preserveAccountIdentity: Boolean(options?.preserveAccountIdentity),
+          source: 'generated:icloud',
+          state: mergedState,
         };
         if (mergedState.icloudHostPreference !== undefined) {
           icloudOptions.hostPreference = mergedState.icloudHostPreference;
@@ -325,6 +353,7 @@
         ).trim();
       return fetchDuckEmail({
         ...options,
+        state: mergedState,
         baselineEmail: resolvedDuckBaselineEmail,
       });
     }

background/registration-email-state.js

@@ -65,6 +65,45 @@
       };
     }
 
+    function getPreservedPhoneIdentity(state = {}) {
+      const accountIdentifierType = String(state?.accountIdentifierType || '').trim().toLowerCase();
+      const signupPhoneNumber = normalizeEmailValue(
+        state?.signupPhoneNumber
+        || (accountIdentifierType === 'phone' ? state?.accountIdentifier : '')
+        || state?.signupPhoneCompletedActivation?.phoneNumber
+        || state?.signupPhoneActivation?.phoneNumber
+        || ''
+      );
+      if (accountIdentifierType !== 'phone' && !signupPhoneNumber) {
+        return null;
+      }
+      return {
+        accountIdentifierType: 'phone',
+        accountIdentifier: signupPhoneNumber || normalizeEmailValue(state?.accountIdentifier),
+        signupPhoneNumber,
+        signupPhoneActivation: state?.signupPhoneActivation || null,
+        signupPhoneCompletedActivation: state?.signupPhoneCompletedActivation || null,
+        signupPhoneVerificationRequestedAt: state?.signupPhoneVerificationRequestedAt ?? null,
+        signupPhoneVerificationPurpose: String(state?.signupPhoneVerificationPurpose || '').trim(),
+      };
+    }
+
+    function buildFlowRegistrationEmailStateUpdates(state = {}, options = {}) {
+      const registrationEmailUpdates = buildRegistrationEmailStateUpdates(state, options);
+      if (!Boolean(options?.preserveAccountIdentity)) {
+        return registrationEmailUpdates;
+      }
+      const preservedPhoneIdentity = getPreservedPhoneIdentity(state);
+      if (!preservedPhoneIdentity) {
+        return registrationEmailUpdates;
+      }
+      return {
+        ...registrationEmailUpdates,
+        phoneNumber: '',
+        ...preservedPhoneIdentity,
+      };
+    }
+
     function getRegistrationEmailBaseline(state = {}, options = {}) {
       const currentState = getRegistrationEmailState(state);
       const preferredEmail = normalizeEmailValue(options.preferredEmail);
@@ -74,9 +113,11 @@
 
     return {
       DEFAULT_REGISTRATION_EMAIL_STATE: cloneDefaultRegistrationEmailState(),
+      buildFlowRegistrationEmailStateUpdates,
       buildRegistrationEmailStateUpdates,
       getRegistrationEmailBaseline,
       getRegistrationEmailState,
+      getPreservedPhoneIdentity,
       normalizeRegistrationEmailState,
     };
   }

background/signup-flow-helpers.js

@@ -20,6 +20,7 @@
       isSignupPasswordPageUrl,
       isSignupPhoneVerificationPageUrl = null,
       isSignupProfilePageUrl = null,
+      persistRegistrationEmailState = null,
       reuseOrCreateTab,
       sendToContentScriptResilient,
       setEmailState,
@@ -328,8 +329,17 @@
       if (resolvedEmail === state.email && !options?.preserveAccountIdentity) {
         return;
       }
-      const preservedPhoneIdentity = getPreservedPhoneIdentityForEmailResolution(state, options);
       const generatedEmailAlreadyPersisted = Boolean(options?.generatedEmailAlreadyPersisted);
+      if (typeof persistRegistrationEmailState === 'function') {
+        if (!generatedEmailAlreadyPersisted) {
+          await persistRegistrationEmailState(state, resolvedEmail, {
+            source: 'flow',
+            preserveAccountIdentity: Boolean(options?.preserveAccountIdentity),
+          });
+        }
+        return;
+      }
+      const preservedPhoneIdentity = getPreservedPhoneIdentityForEmailResolution(state, options);
       if (preservedPhoneIdentity && typeof setState === 'function') {
         if (!generatedEmailAlreadyPersisted && resolvedEmail !== state.email) {
           await setEmailState(resolvedEmail, { source: 'flow' });