Merge remote-tracking branch 'origin/dev' into dev

tests/background-icloud-mail-provider.test.js

@@ -1,6 +1,11 @@
 const test = require('node:test');
 const assert = require('node:assert/strict');
 const fs = require('node:fs');
+const {
+  getIcloudForwardMailConfig,
+  normalizeIcloudForwardMailProvider,
+  normalizeIcloudTargetMailboxType,
+} = require('../mail-provider-utils.js');
 
 const source = fs.readFileSync('background.js', 'utf8');
 
@@ -51,6 +56,41 @@ function extractFunction(name) {
   return source.slice(start, end);
 }
 
+function createGetMailConfigApi() {
+  const bundle = extractFunction('getMailConfig');
+  return new Function('shared', `
+const ICLOUD_PROVIDER = 'icloud';
+const GMAIL_PROVIDER = 'gmail';
+const HOTMAIL_PROVIDER = 'hotmail-api';
+const LUCKMAIL_PROVIDER = 'luckmail-api';
+const CLOUDFLARE_TEMP_EMAIL_PROVIDER = 'cloudflare-temp-email';
+const getSharedIcloudForwardMailConfig = shared.getIcloudForwardMailConfig;
+const normalizeIcloudTargetMailboxType = shared.normalizeIcloudTargetMailboxType;
+const normalizeIcloudForwardMailProvider = shared.normalizeIcloudForwardMailProvider;
+function normalizeIcloudHost(value = '') {
+  const normalized = String(value || '').trim().toLowerCase();
+  return normalized === 'icloud.com' || normalized === 'icloud.com.cn' ? normalized : '';
+}
+function normalizeInbucketOrigin(value) { return String(value || '').trim(); }
+function getConfiguredIcloudHostPreference(state) {
+  const normalized = String(state?.icloudHostPreference || '').trim().toLowerCase();
+  return normalized === 'icloud.com' || normalized === 'icloud.com.cn' ? normalized : '';
+}
+function getIcloudLoginUrlForHost(host) {
+  return host === 'icloud.com.cn' ? 'https://www.icloud.com.cn/' : 'https://www.icloud.com/';
+}
+function getIcloudMailUrlForHost(host) {
+  return host === 'icloud.com.cn' ? 'https://www.icloud.com.cn/mail/' : 'https://www.icloud.com/mail/';
+}
+${bundle}
+return { getMailConfig };
+`)({
+    getIcloudForwardMailConfig,
+    normalizeIcloudForwardMailProvider,
+    normalizeIcloudTargetMailboxType,
+  });
+}
+
 test('normalizeMailProvider keeps icloud provider', () => {
   const bundle = extractFunction('normalizeMailProvider');
   const api = new Function(`
@@ -69,97 +109,36 @@ return { normalizeMailProvider };
 });
 
 test('getMailConfig returns icloud mail tab config with host preference', () => {
-  const bundle = extractFunction('getMailConfig');
-  const api = new Function(`
-const ICLOUD_PROVIDER = 'icloud';
-const GMAIL_PROVIDER = 'gmail';
-const HOTMAIL_PROVIDER = 'hotmail-api';
-const LUCKMAIL_PROVIDER = 'luckmail-api';
-const CLOUDFLARE_TEMP_EMAIL_PROVIDER = 'cloudflare-temp-email';
-function normalizeIcloudHost(value = '') {
-  const normalized = String(value || '').trim().toLowerCase();
-  return normalized === 'icloud.com' || normalized === 'icloud.com.cn' ? normalized : '';
-}
-function normalizeInbucketOrigin(value) { return String(value || '').trim(); }
-function getConfiguredIcloudHostPreference(state) {
-  const normalized = String(state?.icloudHostPreference || '').trim().toLowerCase();
-  return normalized === 'icloud.com' || normalized === 'icloud.com.cn' ? normalized : '';
-}
-function getIcloudLoginUrlForHost(host) {
-  return host === 'icloud.com.cn' ? 'https://www.icloud.com.cn/' : 'https://www.icloud.com/';
-}
-function getIcloudMailUrlForHost(host) {
-  return host === 'icloud.com.cn' ? 'https://www.icloud.com.cn/mail/' : 'https://www.icloud.com/mail/';
-}
-${bundle}
-return { getMailConfig };
-`)();
+  const api = createGetMailConfigApi();
 
   assert.deepEqual(api.getMailConfig({
     mailProvider: 'icloud',
-    icloudHostPreference: 'icloud.com.cn',
+    icloudHostPreference: 'icloud.com',
   }), {
     source: 'icloud-mail',
-    url: 'https://www.icloud.com.cn/mail/',
+    url: 'https://www.icloud.com/mail/',
     label: 'iCloud 邮箱',
     navigateOnReuse: true,
   });
 });
 
 test('getMailConfig reuses preferred icloud host when preference is auto', () => {
-  const bundle = extractFunction('getMailConfig');
-  const api = new Function(`
-const ICLOUD_PROVIDER = 'icloud';
-const GMAIL_PROVIDER = 'gmail';
-const HOTMAIL_PROVIDER = 'hotmail-api';
-const LUCKMAIL_PROVIDER = 'luckmail-api';
-const CLOUDFLARE_TEMP_EMAIL_PROVIDER = 'cloudflare-temp-email';
-function normalizeIcloudHost(value = '') {
-  const normalized = String(value || '').trim().toLowerCase();
-  return normalized === 'icloud.com' || normalized === 'icloud.com.cn' ? normalized : '';
-}
-function normalizeInbucketOrigin(value) { return String(value || '').trim(); }
-function getConfiguredIcloudHostPreference() {
-  return '';
-}
-function getIcloudLoginUrlForHost(host) {
-  return host === 'icloud.com.cn' ? 'https://www.icloud.com.cn/' : 'https://www.icloud.com/';
-}
-function getIcloudMailUrlForHost(host) {
-  return host === 'icloud.com.cn' ? 'https://www.icloud.com.cn/mail/' : 'https://www.icloud.com/mail/';
-}
-${bundle}
-return { getMailConfig };
-`)();
+  const api = createGetMailConfigApi();
 
   assert.deepEqual(api.getMailConfig({
     mailProvider: 'icloud',
     icloudHostPreference: 'auto',
-    preferredIcloudHost: 'icloud.com.cn',
+    preferredIcloudHost: 'icloud.com',
   }), {
     source: 'icloud-mail',
-    url: 'https://www.icloud.com.cn/mail/',
+    url: 'https://www.icloud.com/mail/',
     label: 'iCloud 邮箱',
     navigateOnReuse: true,
   });
 });
 
 test('getMailConfig keeps provider metadata for 2925 mailboxes', () => {
-  const bundle = extractFunction('getMailConfig');
-  const api = new Function(`
-const ICLOUD_PROVIDER = 'icloud';
-const GMAIL_PROVIDER = 'gmail';
-const HOTMAIL_PROVIDER = 'hotmail-api';
-const LUCKMAIL_PROVIDER = 'luckmail-api';
-const CLOUDFLARE_TEMP_EMAIL_PROVIDER = 'cloudflare-temp-email';
-function normalizeIcloudHost(value = '') { return String(value || '').trim().toLowerCase(); }
-function normalizeInbucketOrigin(value) { return String(value || '').trim(); }
-function getConfiguredIcloudHostPreference() { return ''; }
-function getIcloudLoginUrlForHost(host) { return host; }
-function getIcloudMailUrlForHost(host) { return host; }
-${bundle}
-return { getMailConfig };
-`)();
+  const api = createGetMailConfigApi();
 
   assert.deepEqual(api.getMailConfig({
     mailProvider: '2925',
@@ -172,3 +151,37 @@ return { getMailConfig };
     injectSource: 'mail-2925',
   });
 });
+
+test('getMailConfig uses icloud inbox config when host is com.cn and target mailbox is icloud inbox', () => {
+  const api = createGetMailConfigApi();
+
+  assert.deepEqual(api.getMailConfig({
+    mailProvider: 'icloud',
+    icloudHostPreference: 'icloud.com.cn',
+    icloudTargetMailboxType: 'icloud-inbox',
+    icloudForwardMailProvider: 'gmail',
+  }), {
+    source: 'icloud-mail',
+    url: 'https://www.icloud.com.cn/mail/',
+    label: 'iCloud 邮箱',
+    navigateOnReuse: true,
+  });
+});
+
+test('getMailConfig uses forward mailbox config when target mailbox type is forward', () => {
+  const api = createGetMailConfigApi();
+
+  assert.deepEqual(api.getMailConfig({
+    mailProvider: 'icloud',
+    icloudHostPreference: 'icloud.com.cn',
+    icloudTargetMailboxType: 'forward-mailbox',
+    icloudForwardMailProvider: 'gmail',
+  }), {
+    source: 'gmail-mail',
+    url: 'https://mail.google.com/mail/u/0/#inbox',
+    label: 'iCloud 转发（Gmail 邮箱）',
+    inject: ['content/activation-utils.js', 'content/utils.js', 'content/gmail-mail.js'],
+    injectSource: 'gmail-mail',
+    icloudForwarding: true,
+  });
+});

tests/background-icloud.test.js

@@ -1,6 +1,10 @@
 const test = require('node:test');
 const assert = require('node:assert/strict');
 const fs = require('fs');
+const {
+  normalizeIcloudForwardMailProvider,
+  normalizeIcloudTargetMailboxType,
+} = require('../mail-provider-utils.js');
 
 const source = fs.readFileSync('background.js', 'utf8');
 
@@ -155,6 +159,8 @@ function findIcloudAliasByEmail(aliases, email) {
 function getErrorMessage(error) {
   return String(typeof error === 'string' ? error : error?.message || '');
 }
+const normalizeIcloudTargetMailboxType = overrides.normalizeIcloudTargetMailboxType;
+const normalizeIcloudForwardMailProvider = overrides.normalizeIcloudForwardMailProvider;
 
 ${bundle}
 
@@ -175,9 +181,16 @@ test('normalizeEmailGenerator and label support icloud', () => {
 });
 
 test('normalizePersistentSettingValue handles icloud settings', () => {
-  const api = createApi();
+  const api = createApi({
+    normalizeIcloudTargetMailboxType,
+    normalizeIcloudForwardMailProvider,
+  });
   assert.equal(api.normalizePersistentSettingValue('icloudHostPreference', 'icloud.com'), 'icloud.com');
   assert.equal(api.normalizePersistentSettingValue('icloudHostPreference', 'bad-host'), 'auto');
+  assert.equal(api.normalizePersistentSettingValue('icloudTargetMailboxType', 'forward-mailbox'), 'forward-mailbox');
+  assert.equal(api.normalizePersistentSettingValue('icloudTargetMailboxType', 'wrong'), 'icloud-inbox');
+  assert.equal(api.normalizePersistentSettingValue('icloudForwardMailProvider', 'GMAIL'), 'gmail');
+  assert.equal(api.normalizePersistentSettingValue('icloudForwardMailProvider', 'unknown'), 'qq');
   assert.equal(api.normalizePersistentSettingValue('autoDeleteUsedIcloudAlias', 1), true);
   assert.equal(api.normalizePersistentSettingValue('verificationResendCount', '6'), 6);
   assert.equal(api.normalizePersistentSettingValue('verificationResendCount', 99), 20);

tests/mail-provider-utils.test.js

@@ -3,7 +3,11 @@ const assert = require('node:assert/strict');
 
 const {
   HOTMAIL_PROVIDER,
+  getIcloudForwardMailConfig,
+  getIcloudForwardMailProviderOptions,
   getMailProviderConfig,
+  normalizeIcloudForwardMailProvider,
+  normalizeIcloudTargetMailboxType,
   normalizeMailProvider,
 } = require('../mail-provider-utils.js');
 
@@ -33,3 +37,29 @@ test('getMailProviderConfig preserves the hotmail provider sentinel', () => {
     }
   );
 });
+
+test('iCloud forward mailbox helpers normalize and expose supported providers', () => {
+  assert.equal(normalizeIcloudTargetMailboxType('forward-mailbox'), 'forward-mailbox');
+  assert.equal(normalizeIcloudTargetMailboxType('unknown'), 'icloud-inbox');
+  assert.equal(normalizeIcloudForwardMailProvider('GMAIL'), 'gmail');
+  assert.equal(normalizeIcloudForwardMailProvider('unknown'), 'qq');
+  assert.deepEqual(
+    getIcloudForwardMailProviderOptions().map((option) => option.value),
+    ['qq', '163', '163-vip', '126', 'gmail']
+  );
+});
+
+test('getIcloudForwardMailConfig reuses shared mailbox provider configs', () => {
+  assert.deepEqual(getIcloudForwardMailConfig('126'), {
+    source: 'mail-163',
+    url: 'https://mail.126.com/js6/main.jsp?df=mail163_letter#module=mbox.ListModule%7C%7B%22fid%22%3A1%2C%22order%22%3A%22date%22%2C%22desc%22%3Atrue%7D',
+    label: '126 邮箱',
+  });
+  assert.deepEqual(getIcloudForwardMailConfig('gmail'), {
+    source: 'gmail-mail',
+    url: 'https://mail.google.com/mail/u/0/#inbox',
+    label: 'Gmail 邮箱',
+    inject: ['content/activation-utils.js', 'content/utils.js', 'content/gmail-mail.js'],
+    injectSource: 'gmail-mail',
+  });
+});

tests/sidepanel-cloudflare-temp-email-random-subdomain.test.js

@@ -1,6 +1,10 @@
 const test = require('node:test');
 const assert = require('node:assert/strict');
 const fs = require('node:fs');
+const {
+  normalizeIcloudForwardMailProvider,
+  normalizeIcloudTargetMailboxType,
+} = require('../mail-provider-utils');
 
 const source = fs.readFileSync('sidepanel/sidepanel.js', 'utf8');
 
@@ -172,7 +176,7 @@ return {
 test('updateMailProviderUI keeps the temp domain selector visible and updates the hint when random subdomain is enabled', () => {
   const bundle = extractFunction('updateMailProviderUI');
 
-  const api = new Function(`
+  const api = new Function('normalizeIcloudTargetMailboxType', 'normalizeIcloudForwardMailProvider', `
 let latestState = {
   cloudflareTempEmailDomains: ['mail.example.com'],
 };
@@ -254,7 +258,7 @@ return {
   autoHintText,
   calls,
 };
-  `)();
+  `)(normalizeIcloudTargetMailboxType, normalizeIcloudForwardMailProvider);
 
   api.updateMailProviderUI();
   assert.equal(api.cloudflareTempEmailSection.style.display, '');

tests/sidepanel-contribution-mode.test.js

@@ -1,6 +1,10 @@
 const test = require('node:test');
 const assert = require('node:assert/strict');
 const fs = require('node:fs');
+const {
+  normalizeIcloudForwardMailProvider,
+  normalizeIcloudTargetMailboxType,
+} = require('../mail-provider-utils');
 
 const sidepanelSource = fs.readFileSync('sidepanel/sidepanel.js', 'utf8');
 
@@ -174,7 +178,7 @@ return { renderStepStatuses, rows, statusEls, stepsProgress };
 test('collectSettingsPayload omits custom password and local sync settings in contribution mode', () => {
   const bundle = extractFunction('collectSettingsPayload');
 
-  const api = new Function(`
+  const api = new Function('normalizeIcloudTargetMailboxType', 'normalizeIcloudForwardMailProvider', `
 let latestState = { contributionMode: true };
 let cloudflareDomainEditMode = false;
 let cloudflareTempEmailDomainEditMode = false;
@@ -241,7 +245,7 @@ return {
   collectSettingsPayload,
   setLatestState(nextState) { latestState = nextState; },
 };
-`)();
+`)(normalizeIcloudTargetMailboxType, normalizeIcloudForwardMailProvider);
 
   const contributionPayload = api.collectSettingsPayload();
   assert.equal('panelMode' in contributionPayload, false);

tests/sidepanel-icloud-provider.test.js

@@ -79,3 +79,297 @@ return { getSelectedIcloudHostPreference, getMailProviderLoginUrl };
   assert.equal(api.getSelectedIcloudHostPreference(), 'icloud.com.cn');
   assert.equal(api.getMailProviderLoginUrl(), 'https://www.icloud.com.cn/');
 });
+
+test('collectSettingsPayload persists icloud target mailbox settings', () => {
+  const bundle = extractFunction('collectSettingsPayload');
+
+  const api = new Function(`
+let latestState = { contributionMode: false };
+let cloudflareDomainEditMode = false;
+let cloudflareTempEmailDomainEditMode = false;
+const selectCfDomain = { value: '' };
+const selectTempEmailDomain = { value: '' };
+const selectPanelMode = { value: 'cpa' };
+const inputVpsUrl = { value: '' };
+const inputVpsPassword = { value: '' };
+const inputSub2ApiUrl = { value: '' };
+const inputSub2ApiEmail = { value: '' };
+const inputSub2ApiPassword = { value: '' };
+const inputSub2ApiGroup = { value: '' };
+const inputSub2ApiDefaultProxy = { value: '' };
+const inputCodex2ApiUrl = { value: '' };
+const inputCodex2ApiAdminKey = { value: '' };
+const inputPassword = { value: '' };
+const selectMailProvider = { value: 'icloud' };
+const selectEmailGenerator = { value: 'duck' };
+const checkboxAutoDeleteIcloud = { checked: false };
+const selectIcloudHostPreference = { value: 'auto' };
+const selectIcloudFetchMode = { value: 'reuse_existing' };
+const selectIcloudTargetMailboxType = { value: 'forward-mailbox' };
+const selectIcloudForwardMailProvider = { value: 'gmail' };
+const inputPhoneVerificationEnabled = { checked: false };
+const inputAccountRunHistoryTextEnabled = { checked: false };
+const inputAccountRunHistoryHelperBaseUrl = { value: '' };
+const inputInbucketHost = { value: '' };
+const inputInbucketMailbox = { value: '' };
+const inputHotmailRemoteBaseUrl = { value: '' };
+const inputHotmailLocalBaseUrl = { value: '' };
+const inputLuckmailApiKey = { value: '' };
+const inputLuckmailBaseUrl = { value: '' };
+const selectLuckmailEmailType = { value: 'ms_graph' };
+const inputLuckmailDomain = { value: '' };
+const inputTempEmailBaseUrl = { value: '' };
+const inputTempEmailAdminAuth = { value: '' };
+const inputTempEmailCustomAuth = { value: '' };
+const inputTempEmailReceiveMailbox = { value: '' };
+const inputTempEmailUseRandomSubdomain = { checked: false };
+const inputAutoSkipFailures = { checked: false };
+const inputAutoSkipFailuresThreadIntervalMinutes = { value: '0' };
+const inputAutoDelayEnabled = { checked: false };
+const inputAutoDelayMinutes = { value: '30' };
+const inputAutoStepDelaySeconds = { value: '' };
+const inputVerificationResendCount = { value: '4' };
+const DEFAULT_VERIFICATION_RESEND_COUNT = 4;
+function getCloudflareDomainsFromState() { return { domains: [], activeDomain: '' }; }
+function normalizeCloudflareDomainValue(value) { return String(value || '').trim(); }
+function getCloudflareTempEmailDomainsFromState() { return { domains: [], activeDomain: '' }; }
+function normalizeCloudflareTempEmailDomainValue(value) { return String(value || '').trim(); }
+function getSelectedLocalCpaStep9Mode() { return 'submit'; }
+function getSelectedMail2925Mode() { return 'provide'; }
+function buildManagedAliasBaseEmailPayload() { return { gmailBaseEmail: '', mail2925BaseEmail: '', emailPrefix: '' }; }
+function getSelectedHotmailServiceMode() { return 'local'; }
+function normalizeLuckmailBaseUrl(value) { return String(value || '').trim(); }
+function normalizeLuckmailEmailType(value) { return String(value || '').trim() || 'ms_graph'; }
+function normalizeCloudflareTempEmailBaseUrlValue(value) { return String(value || '').trim(); }
+function normalizeCloudflareTempEmailReceiveMailboxValue(value) { return String(value || '').trim(); }
+function normalizeAccountRunHistoryHelperBaseUrlValue(value) { return String(value || '').trim(); }
+function normalizeAutoRunThreadIntervalMinutes(value) { return Number(value) || 0; }
+function normalizeAutoDelayMinutes(value) { return Number(value) || 30; }
+function normalizeAutoStepDelaySeconds(value) { return value === '' ? null : Number(value); }
+function normalizeVerificationResendCount(value, fallback) { return Number(value) || fallback; }
+function normalizeIcloudTargetMailboxType(value) { return String(value || '').trim().toLowerCase() === 'forward-mailbox' ? 'forward-mailbox' : 'icloud-inbox'; }
+function normalizeIcloudForwardMailProvider(value) { return String(value || '').trim().toLowerCase() === 'gmail' ? 'gmail' : 'qq'; }
+${bundle}
+return { collectSettingsPayload };
+`)();
+
+  const payload = api.collectSettingsPayload();
+  assert.equal(payload.icloudTargetMailboxType, 'forward-mailbox');
+  assert.equal(payload.icloudForwardMailProvider, 'gmail');
+});
+
+test('updateMailProviderUI toggles icloud forward mailbox controls and hint', () => {
+  const bundle = extractFunction('updateMailProviderUI');
+  const createRow = (display = 'none') => ({ style: { display } });
+
+  const api = new Function('createRow', `
+let latestState = { icloudHostPreference: 'icloud.com.cn' };
+let cloudflareDomainEditMode = false;
+let cloudflareTempEmailDomainEditMode = false;
+const ICLOUD_PROVIDER = 'icloud';
+const GMAIL_PROVIDER = 'gmail';
+const GMAIL_ALIAS_GENERATOR = 'gmail-alias';
+const LUCKMAIL_PROVIDER = 'luckmail-api';
+const CUSTOM_EMAIL_POOL_GENERATOR = 'custom-pool';
+const HOTMAIL_SERVICE_MODE_REMOTE = 'remote';
+const HOTMAIL_SERVICE_MODE_LOCAL = 'local';
+const rowMail2925Mode = createRow();
+const rowMail2925PoolSettings = createRow();
+const rowEmailPrefix = createRow();
+const rowCustomMailProviderPool = createRow();
+const rowInbucketHost = createRow();
+const rowInbucketMailbox = createRow();
+const rowEmailGenerator = createRow();
+const rowCfDomain = createRow();
+const rowTempEmailBaseUrl = createRow();
+const rowTempEmailAdminAuth = createRow();
+const rowTempEmailCustomAuth = createRow();
+const rowTempEmailReceiveMailbox = createRow();
+const rowTempEmailRandomSubdomainToggle = createRow();
+const rowTempEmailDomain = createRow();
+const cloudflareTempEmailSection = createRow();
+const hotmailSection = createRow();
+const mail2925Section = createRow();
+const luckmailSection = createRow();
+const icloudSection = createRow();
+const rowIcloudTargetMailboxType = createRow();
+const rowIcloudForwardMailProvider = createRow();
+const labelEmailPrefix = { textContent: '' };
+const inputEmailPrefix = { placeholder: '', style: { display: '' }, readOnly: false };
+const labelMail2925UseAccountPool = createRow();
+const selectMail2925PoolAccount = { style: { display: 'none' }, disabled: false };
+const btnFetchEmail = { hidden: false, disabled: false, textContent: '' };
+const btnMailLogin = { disabled: false, textContent: '', title: '' };
+const inputEmail = { readOnly: false, placeholder: '', value: '' };
+const autoHintText = { textContent: '' };
+const rowHotmailServiceMode = createRow();
+const rowHotmailRemoteBaseUrl = createRow();
+const rowHotmailLocalBaseUrl = createRow();
+const inputMail2925UseAccountPool = { checked: false };
+const selectMailProvider = { value: 'icloud' };
+const selectEmailGenerator = { value: 'duck', disabled: false, options: [] };
+const selectIcloudTargetMailboxType = { value: 'icloud-inbox' };
+const selectIcloudForwardMailProvider = { value: 'gmail' };
+const selectIcloudHostPreference = { value: 'icloud.com.cn' };
+const inputTempEmailUseRandomSubdomain = { checked: false };
+const inputRunCount = { disabled: false };
+const currentAutoRun = { autoRunning: false };
+const MAIL_PROVIDER_LOGIN_CONFIGS = { gmail: { label: 'Gmail 邮箱' } };
+const ICLOUD_FORWARD_MAIL_PROVIDER_LABELS = { gmail: 'Gmail 邮箱' };
+function normalizeIcloudHost(value) { return String(value || '').trim().toLowerCase(); }
+function normalizeIcloudTargetMailboxType(value) { return String(value || '').trim().toLowerCase() === 'forward-mailbox' ? 'forward-mailbox' : 'icloud-inbox'; }
+function normalizeIcloudForwardMailProvider(value) { return String(value || '').trim().toLowerCase() === 'gmail' ? 'gmail' : 'qq'; }
+function getSelectedIcloudHostPreference() { return selectIcloudHostPreference.value; }
+function isLuckmailProvider() { return false; }
+function isCustomMailProvider() { return false; }
+function isIcloudMailProvider() { return selectMailProvider.value === ICLOUD_PROVIDER; }
+function usesCustomMailProviderPool() { return false; }
+function usesGeneratedAliasMailProvider() { return false; }
+function getSelectedMail2925Mode() { return 'provide'; }
+function getManagedAliasProviderUiCopy() { return null; }
+function getCurrentRegistrationEmailUiCopy() { return { buttonLabel: '获取邮箱', placeholder: '邮箱', label: '邮箱' }; }
+function updateMailLoginButtonState() {}
+function getSelectedHotmailServiceMode() { return 'local'; }
+function getCloudflareDomainsFromState() { return { domains: [], activeDomain: '' }; }
+function setCloudflareDomainEditMode() {}
+function getCloudflareTempEmailDomainsFromState() { return { domains: [], activeDomain: '' }; }
+function setCloudflareTempEmailDomainEditMode() {}
+function queueIcloudAliasRefresh() {}
+function hideIcloudLoginHelp() {}
+function syncMail2925PoolAccountOptions() {}
+function getMail2925Accounts() { return []; }
+function renderHotmailAccounts() {}
+function renderMail2925Accounts() {}
+function renderLuckmailPurchases() {}
+function getSelectedEmailGenerator() { return selectEmailGenerator.value; }
+function isAutoRunLockedPhase() { return false; }
+function getCurrentHotmailEmail() { return ''; }
+function getCurrentLuckmailEmail() { return ''; }
+function getCustomEmailPoolSize() { return 0; }
+function getCustomMailProviderPoolSize() { return 0; }
+function syncRunCountFromCustomEmailPool() {}
+function syncRunCountFromCustomMailProviderPool() {}
+function shouldLockRunCountToEmailPool() { return false; }
+${bundle}
+return {
+  updateMailProviderUI,
+  rowIcloudTargetMailboxType,
+  rowIcloudForwardMailProvider,
+  selectIcloudTargetMailboxType,
+  autoHintText,
+};
+`)(createRow);
+
+  api.updateMailProviderUI();
+  assert.equal(api.rowIcloudTargetMailboxType.style.display, '');
+  assert.equal(api.rowIcloudForwardMailProvider.style.display, 'none');
+
+  api.selectIcloudTargetMailboxType.value = 'forward-mailbox';
+  api.updateMailProviderUI();
+  assert.equal(api.rowIcloudForwardMailProvider.style.display, '');
+  assert.match(api.autoHintText.textContent, /Gmail 邮箱/);
+});
+
+test('applySettingsState restores icloud forward mailbox settings before UI refresh', () => {
+  const bundle = extractFunction('applySettingsState');
+  const calls = [];
+
+  const api = new Function('calls', `
+let latestState = {};
+const inputEmail = { value: '' };
+const inputVpsUrl = { value: '' };
+const inputVpsPassword = { value: '' };
+const selectPanelMode = { value: 'cpa' };
+const inputSub2ApiUrl = { value: '' };
+const inputSub2ApiEmail = { value: '' };
+const inputSub2ApiPassword = { value: '' };
+const inputSub2ApiGroup = { value: '' };
+const inputSub2ApiDefaultProxy = { value: '' };
+const inputCodex2ApiUrl = { value: '' };
+const inputCodex2ApiAdminKey = { value: '' };
+const ICLOUD_PROVIDER = 'icloud';
+const GMAIL_PROVIDER = 'gmail';
+const GMAIL_ALIAS_GENERATOR = 'gmail-alias';
+const CUSTOM_EMAIL_POOL_GENERATOR = 'custom-pool';
+const selectMailProvider = { value: '163' };
+const selectEmailGenerator = { value: 'duck' };
+const selectIcloudHostPreference = { value: 'auto' };
+const selectIcloudFetchMode = { value: 'reuse_existing' };
+const selectIcloudTargetMailboxType = { value: 'icloud-inbox' };
+const selectIcloudForwardMailProvider = { value: 'qq' };
+const checkboxAutoDeleteIcloud = { checked: false };
+const inputAccountRunHistoryHelperBaseUrl = { value: '' };
+const inputContributionNickname = { value: '' };
+const inputContributionQq = { value: '' };
+const inputMail2925UseAccountPool = { checked: false };
+const inputInbucketHost = { value: '' };
+const inputInbucketMailbox = { value: '' };
+const inputCustomMailProviderPool = { value: '' };
+const inputCustomEmailPool = { value: '' };
+const inputHotmailRemoteBaseUrl = { value: '' };
+const inputHotmailLocalBaseUrl = { value: '' };
+const inputLuckmailApiKey = { value: '' };
+const inputLuckmailBaseUrl = { value: '' };
+const selectLuckmailEmailType = { value: 'ms_graph' };
+const inputLuckmailDomain = { value: '' };
+const inputAutoSkipFailures = { checked: false };
+const inputAutoSkipFailuresThreadIntervalMinutes = { value: '' };
+const inputAutoDelayEnabled = { checked: false };
+const inputAutoDelayMinutes = { value: '' };
+const inputAutoStepDelaySeconds = { value: '' };
+const inputVerificationResendCount = { value: '' };
+const inputPhoneVerificationEnabled = { checked: false };
+const DEFAULT_PHONE_VERIFICATION_ENABLED = false;
+const inputHeroSmsApiKey = { value: '' };
+const selectHeroSmsCountry = { value: '52', options: [{ value: '52' }] };
+const inputRunCount = { value: '' };
+const DEFAULT_VERIFICATION_RESEND_COUNT = 4;
+function syncLatestState(state) { latestState = { ...latestState, ...state }; }
+function syncAutoRunState() {}
+function syncPasswordField() {}
+function setLocalCpaStep9Mode() {}
+function isCustomMailProvider() { return false; }
+function setMail2925Mode() {}
+function normalizeIcloudFetchMode(value) { return String(value || '') === 'always_new' ? 'always_new' : 'reuse_existing'; }
+function normalizeIcloudTargetMailboxType(value) { return String(value || '').trim().toLowerCase() === 'forward-mailbox' ? 'forward-mailbox' : 'icloud-inbox'; }
+function normalizeIcloudForwardMailProvider(value) { return String(value || '').trim().toLowerCase() === 'gmail' ? 'gmail' : 'qq'; }
+function normalizeAccountRunHistoryHelperBaseUrlValue(value) { return String(value || '').trim(); }
+function setManagedAliasBaseEmailInputForProvider() {}
+function normalizeCustomEmailPoolEntries(value) { return Array.isArray(value) ? value : []; }
+function setHotmailServiceMode() {}
+function normalizeLuckmailBaseUrl(value) { return String(value || '').trim(); }
+function normalizeLuckmailEmailType(value) { return String(value || '').trim() || 'ms_graph'; }
+function applyCloudflareTempEmailSettingsState() {}
+function renderCloudflareDomainOptions() {}
+function setCloudflareDomainEditMode() {}
+function normalizeAutoRunThreadIntervalMinutes(value) { return Number(value) || 0; }
+function normalizeAutoDelayMinutes(value) { return Number(value) || 30; }
+function formatAutoStepDelayInputValue(value) { return value == null ? '' : String(value); }
+function normalizeVerificationResendCount(value, fallback) { return Number(value) || fallback; }
+function normalizeHeroSmsCountryId() { return 52; }
+function getSelectedHeroSmsCountryOption() { return { label: 'Thailand' }; }
+function updateHeroSmsPlatformDisplay() {}
+function applyAutoRunStatus() {}
+function markSettingsDirty() {}
+function updateAutoDelayInputState() {}
+function updateFallbackThreadIntervalInputState() {}
+function updateAccountRunHistorySettingsUI() {}
+function updatePhoneVerificationSettingsUI() {}
+function updatePanelModeUI() {}
+function updateMailProviderUI() { calls.push({ target: selectIcloudTargetMailboxType.value, provider: selectIcloudForwardMailProvider.value }); }
+function isLuckmailProvider() { return false; }
+function updateButtonStates() {}
+${bundle}
+return { applySettingsState, selectIcloudTargetMailboxType, selectIcloudForwardMailProvider };
+`)(calls);
+
+  api.applySettingsState({
+    mailProvider: 'icloud',
+    icloudTargetMailboxType: 'forward-mailbox',
+    icloudForwardMailProvider: 'gmail',
+  });
+
+  assert.equal(api.selectIcloudTargetMailboxType.value, 'forward-mailbox');
+  assert.equal(api.selectIcloudForwardMailProvider.value, 'gmail');
+  assert.deepEqual(calls.at(-1), { target: 'forward-mailbox', provider: 'gmail' });
+});

tests/sidepanel-mail2925-base-email.test.js

@@ -1,6 +1,10 @@
 const test = require('node:test');
 const assert = require('node:assert/strict');
 const fs = require('node:fs');
+const {
+  normalizeIcloudForwardMailProvider,
+  normalizeIcloudTargetMailboxType,
+} = require('../mail-provider-utils');
 
 const sidepanelSource = fs.readFileSync('sidepanel/sidepanel.js', 'utf8');
 
@@ -148,7 +152,7 @@ test('collectSettingsPayload persists currentMail2925AccountId for 2925 account
     extractFunction('collectSettingsPayload'),
   ].join('\n');
 
-  const api = new Function(`
+  const api = new Function('normalizeIcloudTargetMailboxType', 'normalizeIcloudForwardMailProvider', `
 let latestState = {
   contributionMode: false,
   mail2925UseAccountPool: true,
@@ -222,7 +226,7 @@ function normalizeAutoStepDelaySeconds(value) { return value === '' ? null : Num
 function normalizeVerificationResendCount(value, fallback) { return Number(value) || fallback; }
 ${bundle}
 return { collectSettingsPayload };
-`)();
+`)(normalizeIcloudTargetMailboxType, normalizeIcloudForwardMailProvider);
 
   const payload = api.collectSettingsPayload();
 

tests/sidepanel-phone-verification-settings.test.js

@@ -1,6 +1,10 @@
 const test = require('node:test');
 const assert = require('node:assert/strict');
 const fs = require('node:fs');
+const {
+  normalizeIcloudForwardMailProvider,
+  normalizeIcloudTargetMailboxType,
+} = require('../mail-provider-utils');
 
 const sidepanelSource = fs.readFileSync('sidepanel/sidepanel.js', 'utf8');
 
@@ -90,7 +94,7 @@ return {
 });
 
 test('collectSettingsPayload keeps local helper sync enabled while persisting sms toggle state', () => {
-  const api = new Function(`
+  const api = new Function('normalizeIcloudTargetMailboxType', 'normalizeIcloudForwardMailProvider', `
 let latestState = {
   contributionMode: false,
   mail2925UseAccountPool: false,
@@ -168,7 +172,7 @@ ${extractFunction('normalizeHeroSmsCountryLabel')}
 ${extractFunction('getSelectedHeroSmsCountryOption')}
 ${extractFunction('collectSettingsPayload')}
 return { collectSettingsPayload };
-`)();
+`)(normalizeIcloudTargetMailboxType, normalizeIcloudForwardMailProvider);
 
   const payload = api.collectSettingsPayload();
 

tests/step6-login-state.test.js

@@ -96,6 +96,10 @@ function findOneTimeCodeLoginTrigger() {
   return ${JSON.stringify(overrides.switchTrigger || null)};
 }
 
+function findLoginEntryTrigger() {
+  return ${JSON.stringify(overrides.loginEntryTrigger || null)};
+}
+
 function getLoginSubmitButton() {
   return ${JSON.stringify(overrides.submitButton || null)};
 }
@@ -226,6 +230,15 @@ return {
   assert.strictEqual(snapshot.state, 'oauth_consent_page', '第六步应保留 oauth_consent_page 状态');
 }
 
+{
+  const api = createApi({
+    loginEntryTrigger: { id: 'continue-email' },
+  });
+
+  const snapshot = api.inspectLoginAuthState();
+  assert.strictEqual(snapshot.state, 'entry_page');
+}
+
 assert.ok(
   extractFunction('inspectLoginAuthState').includes("state: 'oauth_consent_page'"),
   'inspectLoginAuthState 应产出 oauth_consent_page 状态'