feat: 优化2925账号池表单，修复步骤7无法识别重试页面bug

tests/sidepanel-mail2925-edit.test.js

@@ -2,9 +2,11 @@ const test = require('node:test');
 const assert = require('node:assert/strict');
 const fs = require('node:fs');
 
-test('sidepanel html contains cancel edit button for mail2925 form', () => {
+test('sidepanel html contains collapsible mail2925 form controls', () => {
   const html = fs.readFileSync('sidepanel/sidepanel.html', 'utf8');
-  assert.match(html, /id="btn-cancel-mail2925-edit"/);
+  assert.match(html, /id="btn-toggle-mail2925-form"/);
+  assert.match(html, /id="mail2925-form-shell"/);
+  assert.doesNotMatch(html, /id="btn-cancel-mail2925-edit"/);
 });
 
 test('mail2925 manager renders edit action for existing accounts', () => {
@@ -43,14 +45,15 @@ test('mail2925 manager renders edit action for existing accounts', () => {
     },
     dom: {
       btnAddMail2925Account: { textContent: '', disabled: false, addEventListener() {} },
-      btnCancelMail2925Edit: { style: { display: 'none' }, addEventListener() {} },
       btnDeleteAllMail2925Accounts: { textContent: '', disabled: false, addEventListener() {} },
       btnImportMail2925Accounts: { disabled: false, addEventListener() {} },
+      btnToggleMail2925Form: { textContent: '', setAttribute() {}, addEventListener() {} },
       btnToggleMail2925List: { textContent: '', disabled: false, setAttribute() {}, addEventListener() {} },
       inputMail2925Email: { value: '' },
       inputMail2925Import: { value: '' },
       inputMail2925Password: { value: '' },
       mail2925AccountsList,
+      mail2925FormShell: { hidden: true },
       mail2925ListShell: { classList: { toggle() {} } },
     },
     helpers: {

tests/sidepanel-mail2925-manager.test.js

@@ -17,7 +17,9 @@ test('sidepanel html contains mail2925 pool toggle and selector controls', () =>
 
   assert.match(html, /id="input-mail2925-use-account-pool"/);
   assert.match(html, /id="select-mail2925-pool-account"/);
-  assert.match(html, /id="btn-cancel-mail2925-edit"/);
+  assert.match(html, /id="btn-toggle-mail2925-form"/);
+  assert.match(html, /id="mail2925-form-shell"/);
+  assert.doesNotMatch(html, /id="btn-cancel-mail2925-edit"/);
 });
 
 test('mail2925 manager exposes a factory and renders empty state', () => {
@@ -38,6 +40,12 @@ test('mail2925 manager exposes a factory and renders empty state', () => {
   assert.equal(typeof api?.createMail2925Manager, 'function');
 
   const mail2925AccountsList = { innerHTML: '', addEventListener() {} };
+  const formToggleButton = {
+    textContent: '',
+    disabled: false,
+    setAttribute() {},
+    addEventListener() {},
+  };
   const toggleButton = {
     textContent: '',
     disabled: false,
@@ -55,11 +63,13 @@ test('mail2925 manager exposes a factory and renders empty state', () => {
       btnAddMail2925Account: { disabled: false, addEventListener() {} },
       btnDeleteAllMail2925Accounts: { textContent: '', disabled: false, addEventListener() {} },
       btnImportMail2925Accounts: { disabled: false, addEventListener() {} },
+      btnToggleMail2925Form: formToggleButton,
       btnToggleMail2925List: toggleButton,
       inputMail2925Email: { value: '' },
       inputMail2925Import: { value: '' },
       inputMail2925Password: { value: '' },
       mail2925AccountsList,
+      mail2925FormShell: { hidden: true },
       mail2925ListShell: { classList: noopClassList },
     },
     helpers: {
@@ -88,3 +98,188 @@ test('mail2925 manager exposes a factory and renders empty state', () => {
   manager.renderMail2925Accounts();
   assert.match(mail2925AccountsList.innerHTML, /还没有 2925 账号/);
 });
+
+test('mail2925 manager toggles form container from header button', () => {
+  const source = fs.readFileSync('sidepanel/mail-2925-manager.js', 'utf8');
+  const windowObject = {};
+  const localStorageMock = {
+    getItem() {
+      return null;
+    },
+    setItem() {},
+  };
+
+  const api = new Function('window', 'localStorage', `${source}; return window.SidepanelMail2925Manager;`)(
+    windowObject,
+    localStorageMock
+  );
+
+  const clickHandlers = {};
+  const formToggleButton = {
+    textContent: '',
+    disabled: false,
+    setAttribute(name, value) {
+      this[name] = value;
+    },
+    addEventListener(type, handler) {
+      clickHandlers[type] = handler;
+    },
+  };
+  const formShell = { hidden: true };
+
+  const manager = api.createMail2925Manager({
+    state: {
+      getLatestState: () => ({ currentMail2925AccountId: null, mail2925Accounts: [] }),
+      syncLatestState() {},
+    },
+    dom: {
+      btnAddMail2925Account: { textContent: '', disabled: false, addEventListener() {} },
+      btnDeleteAllMail2925Accounts: { textContent: '', disabled: false, addEventListener() {} },
+      btnImportMail2925Accounts: { disabled: false, addEventListener() {} },
+      btnToggleMail2925Form: formToggleButton,
+      btnToggleMail2925List: { textContent: '', disabled: false, setAttribute() {}, addEventListener() {} },
+      inputMail2925Email: { value: '', focus() { this.focused = true; } },
+      inputMail2925Import: { value: '' },
+      inputMail2925Password: { value: '' },
+      mail2925AccountsList: { innerHTML: '', addEventListener() {} },
+      mail2925FormShell: formShell,
+      mail2925ListShell: { classList: { toggle() {} } },
+    },
+    helpers: {
+      getMail2925Accounts: () => [],
+      escapeHtml: (value) => String(value || ''),
+      showToast() {},
+      openConfirmModal: async () => true,
+      copyTextToClipboard: async () => {},
+      refreshManagedAliasBaseEmail() {},
+    },
+    runtime: {
+      sendMessage: async () => ({}),
+    },
+    constants: {
+      copyIcon: '',
+      displayTimeZone: 'Asia/Shanghai',
+      expandedStorageKey: 'multipage-mail2925-list-expanded',
+    },
+    mail2925Utils: {},
+  });
+
+  manager.bindMail2925Events();
+  assert.equal(formShell.hidden, true);
+  assert.equal(formToggleButton.textContent, '添加账号');
+
+  clickHandlers.click();
+  assert.equal(formShell.hidden, false);
+  assert.equal(formToggleButton.textContent, '取消添加');
+
+  clickHandlers.click();
+  assert.equal(formShell.hidden, true);
+  assert.equal(formToggleButton.textContent, '添加账号');
+});
+
+test('mail2925 manager hides form after save succeeds', async () => {
+  const source = fs.readFileSync('sidepanel/mail-2925-manager.js', 'utf8');
+  const windowObject = {};
+  const localStorageMock = {
+    getItem() {
+      return null;
+    },
+    setItem() {},
+  };
+
+  const api = new Function('window', 'localStorage', `${source}; return window.SidepanelMail2925Manager;`)(
+    windowObject,
+    localStorageMock
+  );
+
+  let latestState = { currentMail2925AccountId: null, mail2925Accounts: [] };
+  const handlers = {};
+  const formToggleButton = {
+    textContent: '',
+    disabled: false,
+    setAttribute() {},
+    addEventListener(type, handler) {
+      if (type === 'click') handlers.toggle = handler;
+    },
+  };
+  const addButton = {
+    textContent: '',
+    disabled: false,
+    addEventListener(type, handler) {
+      if (type === 'click') handlers.add = handler;
+    },
+  };
+  const formShell = { hidden: true };
+  const inputMail2925Email = { value: '', focus() {} };
+  const inputMail2925Password = { value: '' };
+  const toastMessages = [];
+
+  const manager = api.createMail2925Manager({
+    state: {
+      getLatestState: () => latestState,
+      syncLatestState(patch) {
+        latestState = { ...latestState, ...patch };
+      },
+    },
+    dom: {
+      btnAddMail2925Account: addButton,
+      btnDeleteAllMail2925Accounts: { textContent: '', disabled: false, addEventListener() {} },
+      btnImportMail2925Accounts: { disabled: false, addEventListener() {} },
+      btnToggleMail2925Form: formToggleButton,
+      btnToggleMail2925List: { textContent: '', disabled: false, setAttribute() {}, addEventListener() {} },
+      inputMail2925Email,
+      inputMail2925Import: { value: '' },
+      inputMail2925Password,
+      mail2925AccountsList: { innerHTML: '', addEventListener() {} },
+      mail2925FormShell: formShell,
+      mail2925ListShell: { classList: { toggle() {} } },
+    },
+    helpers: {
+      getMail2925Accounts: (state) => state.mail2925Accounts || [],
+      escapeHtml: (value) => String(value || ''),
+      showToast(message) {
+        toastMessages.push(message);
+      },
+      openConfirmModal: async () => true,
+      copyTextToClipboard: async () => {},
+      refreshManagedAliasBaseEmail() {},
+    },
+    runtime: {
+      sendMessage: async () => ({
+        account: {
+          id: 'acc-1',
+          email: 'demo@2925.com',
+          password: 'secret',
+          enabled: true,
+          lastLoginAt: 0,
+          lastUsedAt: 0,
+          lastLimitAt: 0,
+          disabledUntil: 0,
+          lastError: '',
+        },
+      }),
+    },
+    constants: {
+      copyIcon: '',
+      displayTimeZone: 'Asia/Shanghai',
+      expandedStorageKey: 'multipage-mail2925-list-expanded',
+    },
+    mail2925Utils: {
+      upsertMail2925AccountInList: (accounts, nextAccount) => accounts.concat(nextAccount),
+    },
+  });
+
+  manager.bindMail2925Events();
+  handlers.toggle();
+  inputMail2925Email.value = 'demo@2925.com';
+  inputMail2925Password.value = 'secret';
+
+  await handlers.add();
+
+  assert.equal(formShell.hidden, true);
+  assert.equal(formToggleButton.textContent, '添加账号');
+  assert.equal(addButton.textContent, '添加账号');
+  assert.equal(inputMail2925Email.value, '');
+  assert.equal(inputMail2925Password.value, '');
+  assert.match(toastMessages.at(-1) || '', /已保存 2925 账号/);
+});

tests/step6-login-state.test.js

@@ -146,6 +146,27 @@ return {
   assert.strictEqual(snapshot.displayedEmail, 'display.user@example.com');
 }
 
+{
+  const api = createApi({
+    pathname: '/email-verification',
+    retryState: {
+      retryEnabled: true,
+      titleMatched: false,
+      detailMatched: false,
+      routeErrorMatched: true,
+    },
+    verificationTarget: { id: 'otp' },
+    verificationVisible: true,
+  });
+
+  const snapshot = api.inspectLoginAuthState();
+  assert.strictEqual(
+    snapshot.state,
+    'login_timeout_error_page',
+    '第七步在 /email-verification 的登录重试页应优先识别为登录超时报错页'
+  );
+}
+
 {
   const api = createApi({
     oauthConsentPage: true,

tests/step6-timeout-recovery.test.js

@@ -103,3 +103,111 @@ return {
   assert.equal(result.state, 'login_timeout_error_page');
   assert.equal(result.message, '当前页面处于登录超时报错页。');
 });
+
+test('step 7 finalize converts verification page that falls into retry page into recoverable result', async () => {
+  const api = new Function(`
+const logs = [];
+let recoverCalls = 0;
+let currentState = 'verification_page';
+
+const location = {
+  href: 'https://auth.openai.com/email-verification',
+};
+
+function inspectLoginAuthState() {
+  return {
+    state: currentState,
+    url: location.href,
+  };
+}
+
+async function recoverCurrentAuthRetryPage() {
+  recoverCalls += 1;
+  return { recovered: true };
+}
+
+async function sleep() {
+  currentState = 'login_timeout_error_page';
+}
+
+function log(message, level = 'info') {
+  logs.push({ message, level });
+}
+
+function throwIfStopped() {}
+
+function getLoginAuthStateLabel(snapshot) {
+  switch (snapshot?.state) {
+    case 'verification_page':
+      return '登录验证码页';
+    case 'login_timeout_error_page':
+      return '登录超时报错页';
+    default:
+      return '未知页面';
+  }
+}
+
+${extractFunction('createStep6SuccessResult')}
+${extractFunction('createStep6RecoverableResult')}
+${extractFunction('normalizeStep6Snapshot')}
+${extractFunction('createStep6LoginTimeoutRecoverableResult')}
+${extractFunction('finalizeStep6VerificationReady')}
+
+return {
+  async run() {
+    return finalizeStep6VerificationReady({
+      logLabel: '步骤 7 收尾',
+      loginVerificationRequestedAt: 123,
+      via: 'password_submit',
+    });
+  },
+  snapshot() {
+    return { logs, recoverCalls };
+  },
+};
+`)();
+
+  const result = await api.run();
+  const snapshot = api.snapshot();
+
+  assert.equal(snapshot.recoverCalls, 1);
+  assert.equal(result.step6Outcome, 'recoverable');
+  assert.equal(result.reason, 'login_timeout_error_page');
+  assert.equal(result.state, 'login_timeout_error_page');
+  assert.equal(result.message, '登录验证码页面准备就绪前进入登录超时报错页。');
+});
+
+test('waitForLoginVerificationPageReady reports login timeout page without step8 restart prefix', async () => {
+  const api = new Function(`
+const location = {
+  href: 'https://auth.openai.com/email-verification',
+};
+
+function inspectLoginAuthState() {
+  return {
+    state: 'login_timeout_error_page',
+    url: location.href,
+  };
+}
+
+function throwIfStopped() {}
+async function sleep() {}
+
+function getLoginAuthStateLabel(snapshot) {
+  return snapshot?.state === 'login_timeout_error_page' ? '登录超时报错页' : '未知页面';
+}
+
+${extractFunction('waitForLoginVerificationPageReady')}
+
+return {
+  run() {
+    return waitForLoginVerificationPageReady(10);
+  },
+};
+`)();
+
+  await assert.rejects(
+    () => api.run(),
+    /当前未进入登录验证码页面，请先重新完成步骤 7。当前状态：登录超时报错页。URL: https:\/\/auth\.openai\.com\/email-verification/
+  );
+});