feat: 增强手机号注册流程，确保手机号输入页就绪后再申请号码并提交

tests/background-signup-step2-branching.test.js

@@ -90,6 +90,7 @@ test('step 2 keeps password flow when landing on password page', async () => {
 
 test('step 2 uses phone activation when resolved signup method is phone', async () => {
   const completedPayloads = [];
+  const sequence = [];
   const sentPayloads = [];
   const activation = {
     activationId: 'signup-activation',
@@ -120,7 +121,10 @@ test('step 2 uses phone activation when resolved signup method is phone', async
     getTabId: async () => 14,
     isTabAlive: async () => true,
     phoneVerificationHelpers: {
-      prepareSignupPhoneActivation: async () => activation,
+      prepareSignupPhoneActivation: async () => {
+        sequence.push('prepareSignupPhoneActivation');
+        return activation;
+      },
       cancelSignupPhoneActivation: async () => {
         throw new Error('activation should not be cancelled on success');
       },
@@ -130,6 +134,15 @@ test('step 2 uses phone activation when resolved signup method is phone', async
       throw new Error('email resolver should not run for phone signup');
     },
     sendToContentScriptResilient: async (_source, message) => {
+      if (message.type === 'ENSURE_SIGNUP_PHONE_ENTRY_READY') {
+        sequence.push('ensureSignupPhoneEntryReady');
+        return {
+          ready: true,
+          state: 'phone_entry',
+          url: 'https://chatgpt.com/',
+        };
+      }
+      sequence.push('submitSignupPhone');
       sentPayloads.push(message.payload);
       return { submitted: true };
     },
@@ -138,6 +151,11 @@ test('step 2 uses phone activation when resolved signup method is phone', async
 
   await executor.executeStep2({ signupMethod: 'phone' });
 
+  assert.deepStrictEqual(sequence, [
+    'ensureSignupPhoneEntryReady',
+    'prepareSignupPhoneActivation',
+    'submitSignupPhone',
+  ]);
   assert.deepStrictEqual(sentPayloads, [
     {
       signupMethod: 'phone',
@@ -204,6 +222,68 @@ test('step 2 stops with an explicit error instead of silently skipping 3/4/5 on
   assert.ok(logs.some((item) => /3\/4\/5/.test(item.message)));
 });
 
+test('step 2 does not force auth-entry retry on logged-out chatgpt home when content reports entry_home', async () => {
+  const completedPayloads = [];
+  const logs = [];
+  const sentPayloads = [];
+  let authEntryCalls = 0;
+
+  const executor = step2Api.createStep2Executor({
+    addLog: async (message, level = 'info') => {
+      logs.push({ message, level });
+    },
+    chrome: {
+      tabs: {
+        update: async () => {},
+        get: async () => ({ url: 'https://chatgpt.com/' }),
+      },
+    },
+    completeStepFromBackground: async (step, payload) => {
+      completedPayloads.push({ step, payload });
+    },
+    ensureContentScriptReadyOnTab: async () => {},
+    ensureSignupAuthEntryPageReady: async () => {
+      authEntryCalls += 1;
+      return { tabId: 15 };
+    },
+    ensureSignupEntryPageReady: async () => ({ tabId: 15 }),
+    ensureSignupPostEmailPageReadyInTab: async () => ({
+      state: 'password_page',
+      url: 'https://auth.openai.com/create-account/password',
+    }),
+    getTabId: async () => 15,
+    isTabAlive: async () => true,
+    resolveSignupEmailForFlow: async () => 'user@example.com',
+    sendToContentScriptResilient: async (_source, message) => {
+      if (message.type === 'ENSURE_SIGNUP_ENTRY_READY') {
+        return { ready: true, state: 'entry_home', url: 'https://chatgpt.com/' };
+      }
+      sentPayloads.push(message.payload);
+      return { submitted: true };
+    },
+    SIGNUP_PAGE_INJECT_FILES: [],
+  });
+
+  await executor.executeStep2({ email: 'user@example.com' });
+
+  assert.equal(authEntryCalls, 0);
+  assert.deepStrictEqual(sentPayloads, [{ email: 'user@example.com' }]);
+  assert.deepStrictEqual(completedPayloads, [
+    {
+      step: 2,
+      payload: {
+        email: 'user@example.com',
+        accountIdentifierType: 'email',
+        accountIdentifier: 'user@example.com',
+        nextSignupState: 'password_page',
+        nextSignupUrl: 'https://auth.openai.com/create-account/password',
+        skippedPasswordStep: false,
+      },
+    },
+  ]);
+  assert.equal(logs.some((item) => /已登录 ChatGPT 首页/.test(item.message)), false);
+});
+
 test('signup flow helper recognizes email verification page as post-email landing page', async () => {
   let ensureCalls = 0;
   let passwordReadyChecks = 0;

tests/signup-step2-email-switch.test.js

@@ -440,6 +440,191 @@ return {
   assert.equal(api.run()?.kind, 'localized-email');
 });
 
+test('ensureSignupPhoneEntryReady opens free signup before switching to the phone entry', async () => {
+  const api = new Function(`
+const logs = [];
+const clicks = [];
+let phase = 'entry';
+let now = 0;
+
+const signupButton = {
+  textContent: '免费注册',
+  value: '',
+  disabled: false,
+  getAttribute(name) {
+    if (name === 'type') return 'button';
+    return '';
+  },
+  getBoundingClientRect() {
+    return { width: 120, height: 36 };
+  },
+};
+
+const switchButton = {
+  textContent: 'Continue with phone number',
+  value: '',
+  disabled: false,
+  getAttribute(name) {
+    if (name === 'type') return 'button';
+    return '';
+  },
+  getBoundingClientRect() {
+    return { width: 200, height: 48 };
+  },
+};
+
+const emailInput = {
+  kind: 'email',
+  getAttribute(name) {
+    if (name === 'type') return 'email';
+    return '';
+  },
+};
+
+const phoneInput = {
+  kind: 'phone',
+  getAttribute(name) {
+    if (name === 'type') return 'tel';
+    return '';
+  },
+};
+
+const document = {
+  querySelector(selector) {
+    if (selector === SIGNUP_EMAIL_INPUT_SELECTOR) {
+      return phase === 'email' ? emailInput : null;
+    }
+    if (selector === SIGNUP_PHONE_INPUT_SELECTOR) {
+      return phase === 'phone' ? phoneInput : null;
+    }
+    return null;
+  },
+  querySelectorAll(selector) {
+    if (selector === 'button, a, [role="button"], [role="link"]') {
+      return phase === 'email' ? [switchButton] : [];
+    }
+    if (selector === 'a, button, [role="button"], [role="link"]') {
+      return phase === 'entry' ? [signupButton] : [];
+    }
+    if (selector === 'input') {
+      if (phase === 'email') return [emailInput];
+      if (phase === 'phone') return [phoneInput];
+      return [];
+    }
+    return [];
+  },
+};
+
+const location = {
+  href: 'https://chatgpt.com/',
+};
+
+const Date = {
+  now() {
+    return now;
+  },
+};
+
+${extractConst('SIGNUP_ENTRY_TRIGGER_PATTERN')}
+${extractConst('SIGNUP_EMAIL_INPUT_SELECTOR')}
+${extractConst('SIGNUP_PHONE_INPUT_SELECTOR')}
+${extractConst('SIGNUP_SWITCH_TO_EMAIL_PATTERN')}
+${extractConst('SIGNUP_SWITCH_ACTION_PATTERN')}
+${extractConst('SIGNUP_EMAIL_ACTION_PATTERN')}
+${extractConst('SIGNUP_WORK_EMAIL_PATTERN')}
+${extractConst('SIGNUP_PHONE_ACTION_PATTERN')}
+${extractConst('SIGNUP_SWITCH_TO_PHONE_PATTERN')}
+${extractConst('SIGNUP_MORE_OPTIONS_PATTERN')}
+
+function isVisibleElement(el) {
+  return Boolean(el);
+}
+
+function isActionEnabled(el) {
+  return Boolean(el) && !el.disabled && el.getAttribute('aria-disabled') !== 'true';
+}
+
+function getActionText(el) {
+  return [el?.textContent, el?.value, el?.getAttribute?.('aria-label'), el?.getAttribute?.('title')]
+    .filter(Boolean)
+    .join(' ')
+    .replace(/\\s+/g, ' ')
+    .trim();
+}
+
+function getSignupPasswordInput() {
+  return null;
+}
+
+function isSignupPasswordPage() {
+  return false;
+}
+
+function getSignupPasswordSubmitButton() {
+  return null;
+}
+
+function getSignupPasswordDisplayedEmail() {
+  return '';
+}
+
+function getPageTextSnapshot() {
+  return phase === 'entry' ? '登录 免费注册' : '';
+}
+
+function throwIfStopped() {}
+
+function log(message, level = 'info') {
+  logs.push({ message, level });
+}
+
+async function humanPause() {}
+
+function simulateClick(target) {
+  clicks.push(getActionText(target));
+  if (target === signupButton) {
+    phase = 'email';
+  } else if (target === switchButton) {
+    phase = 'phone';
+  }
+}
+
+async function sleep(ms) {
+  now += ms;
+}
+
+${extractFunction('getSignupEmailInput')}
+${extractFunction('getSignupPhoneInput')}
+${extractFunction('findSignupUseEmailTrigger')}
+${extractFunction('findSignupUsePhoneTrigger')}
+${extractFunction('findSignupMoreOptionsTrigger')}
+${extractFunction('getSignupEmailContinueButton')}
+${extractFunction('findSignupEntryTrigger')}
+${extractFunction('inspectSignupEntryState')}
+${extractFunction('waitForSignupPhoneEntryState')}
+function getSignupEntryDiagnostics() { return {}; }
+${extractFunction('ensureSignupPhoneEntryReady')}
+
+return {
+  async run() {
+    return ensureSignupPhoneEntryReady();
+  },
+  getClicks() {
+    return clicks.slice();
+  },
+};
+`)();
+
+  const result = await api.run();
+
+  assert.deepEqual(result, {
+    ready: true,
+    state: 'phone_entry',
+    url: 'https://chatgpt.com/',
+  });
+  assert.deepEqual(api.getClicks(), ['免费注册', 'Continue with phone number']);
+});
+
 test('submitSignupPhoneNumberAndContinue switches from email mode to phone mode and submits local number', async () => {
   const api = new Function(`
 const logs = [];

tests/signup-verification-state-guard.test.js

@@ -304,3 +304,68 @@ return {
     state: 'verification',
   });
 });
+
+test('logged-out chatgpt homepage with signup and login actions is not treated as logged-in home', () => {
+  const api = new Function(`
+const location = {
+  href: 'https://chatgpt.com/',
+};
+
+const signupButton = {
+  textContent: '免费注册',
+  disabled: false,
+  getAttribute(name) {
+    if (name === 'type') return 'button';
+    return '';
+  },
+};
+
+const loginButton = {
+  textContent: '登录',
+  disabled: false,
+  getAttribute(name) {
+    if (name === 'type') return 'button';
+    return '';
+  },
+};
+
+const document = {
+  querySelectorAll(selector) {
+    if (selector === 'a, button, [role="button"], [role="link"], input[type="button"], input[type="submit"]') {
+      return [signupButton, loginButton];
+    }
+    return [];
+  },
+};
+
+function findSignupEntryTrigger() {
+  return signupButton;
+}
+
+function getActionText(el) {
+  return [el?.textContent, el?.value, el?.getAttribute?.('aria-label'), el?.getAttribute?.('title')]
+    .filter(Boolean)
+    .join(' ')
+    .replace(/\\s+/g, ' ')
+    .trim();
+}
+
+function isVisibleElement() {
+  return true;
+}
+
+function isActionEnabled(el) {
+  return Boolean(el) && !el.disabled && el.getAttribute('aria-disabled') !== 'true';
+}
+
+${extractFunction('isLikelyLoggedInChatgptHomeUrl')}
+
+return {
+  run() {
+    return isLikelyLoggedInChatgptHomeUrl();
+  },
+};
+`)();
+
+  assert.equal(api.run(), false);
+});