@web-auto/webauto 0.1.4 → 0.1.7

package/apps/webauto/entry/account.mjs

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
 import minimist from 'minimist';
 import path from 'node:path';
-import { existsSync } from 'node:fs';
-import { spawnSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import {
   addAccount,
@@ -14,6 +12,8 @@ import {
 } from './lib/account-store.mjs';
 import { ensureProfile } from './lib/profilepool.mjs';
 import { syncXhsAccountByProfile, syncXhsAccountsByProfiles } from './lib/account-detect.mjs';
+import { publishBusEvent } from './lib/bus-publish.mjs';
+import { runCamo } from './lib/camo-cli.mjs';
 
 const ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../..');
 const XHS_HOME_URL = 'https://www.xiaohongshu.com';
@@ -35,42 +35,6 @@ function parseBoolean(value, fallback = false) {
   return fallback;
 }
 
-function getCamoRunner() {
-  const local = path.join(ROOT, 'node_modules', '.bin', process.platform === 'win32' ? 'camo.cmd' : 'camo');
-  if (existsSync(local)) return { cmd: local, prefix: [] };
-  return { cmd: process.platform === 'win32' ? 'npx.cmd' : 'npx', prefix: ['@web-auto/camo'] };
-}
-
-function runCamo(args) {
-  const runner = getCamoRunner();
-  const ret = spawnSync(runner.cmd, [...runner.prefix, ...args], {
-    cwd: ROOT,
-    env: process.env,
-    encoding: 'utf8',
-  });
-  const stdout = String(ret.stdout || '').trim();
-  const stderr = String(ret.stderr || '').trim();
-  let parsed = null;
-  if (stdout) {
-    const lines = stdout.split('\n').map((line) => line.trim()).filter(Boolean).reverse();
-    for (const line of lines) {
-      try {
-        parsed = JSON.parse(line);
-        break;
-      } catch {
-        continue;
-      }
-    }
-  }
-  return {
-    ok: ret.status === 0,
-    code: ret.status,
-    stdout,
-    stderr,
-    json: parsed,
-  };
-}
-
 function inferLoginUrl(platform) {
   const value = String(platform || '').trim().toLowerCase();
   if (!value || value === 'xiaohongshu' || value === 'xhs') return XHS_HOME_URL;
@@ -82,6 +46,18 @@ function normalizeAlias(input) {
   return value || null;
 }
 
+async function publishAccountEvent(type, payload) {
+  try {
+    await publishBusEvent({
+      type,
+      payload: payload || null,
+      ts: new Date().toISOString(),
+    });
+  } catch {
+    // ignore bus errors
+  }
+}
+
 async function detectAliasFromActivePage(profileId, selector) {
   const { callAPI } = await import('../../../modules/camo-runtime/src/utils/browser-service.mjs');
   const script = `(() => {
@@ -140,13 +116,13 @@ Usage:
   webauto account --help
   webauto account list [--json]
   webauto account list --records [--json]
-  webauto account add [--platform <name>] [--alias <alias>] [--name <name>] [--username <username>] [--profile <id>] [--fingerprint <id>] [--json]
+  webauto account add [--platform <name>] [--alias <alias>] [--name <name>] [--username <username>] [--profile <id>] [--fingerprint <id>] [--status pending|active|disabled|archived] [--json]
   webauto account get <id|alias> [--json]
-  webauto account update <id|alias> [--alias <alias>|--clear-alias] [--name <name>] [--username <name>] [--profile <id>] [--fingerprint <id>] [--status active|disabled|archived] [--json]
+  webauto account update <id|alias> [--alias <alias>|--clear-alias] [--name <name>] [--username <name>] [--profile <id>] [--fingerprint <id>] [--status pending|active|disabled|archived] [--json]
   webauto account delete <id|alias> [--delete-profile] [--delete-fingerprint] [--json]
-  webauto account login <id|alias> [--url <url>] [--sync-alias] [--json]
+  webauto account login <id|alias> [--url <url>] [--idle-timeout <duration>] [--sync-alias] [--json]
   webauto account sync-alias <id|alias> [--selector <css>] [--alias <value>] [--json]
-  webauto account sync <profileId|all> [--json]
+  webauto account sync <profileId|all> [--pending-while-login] [--resolve-alias] [--json]
 
 Notes:
   - 账号数据默认保存到 ~/.webauto/accounts（可用 WEBAUTO_PATHS_ACCOUNTS 覆盖）
@@ -154,12 +130,13 @@ Notes:
   - add 会自动创建并关联 profile/fingerprint（未指定时自动编号）
   - login 会通过 @web-auto/camo 拉起浏览器并绑定账号 profile
   - 只有识别到账号 id 的 profile 才会进入 valid 状态
+  - sync --pending-while-login 会在登录过程中保持待登录状态，避免过早标记失效
 
 Examples:
   webauto account add --platform xiaohongshu --alias 主号
   webauto account list
   webauto account sync all
-  webauto account login xhs-0001 --url https://www.xiaohongshu.com
+  webauto account login xhs-0001 --url https://www.xiaohongshu.com --idle-timeout 30m
   webauto account sync-alias xhs-0001
   webauto account update xhs-0001 --alias 运营1号
   webauto account delete xhs-0001 --delete-profile --delete-fingerprint
@@ -188,6 +165,13 @@ async function cmdAdd(argv, jsonMode) {
     status: argv.status,
   });
   output({ ok: true, ...result }, jsonMode);
+  await publishAccountEvent('account:add', {
+    profileId: result?.account?.profileId || null,
+    accountId: result?.account?.accountId || null,
+    alias: result?.account?.alias || null,
+    status: result?.account?.status || null,
+    valid: result?.account?.valid === true,
+  });
 }
 
 async function cmdGet(idOrAlias, jsonMode) {
@@ -219,6 +203,13 @@ async function cmdUpdate(idOrAlias, argv, jsonMode) {
   }
   const account = await updateAccount(idOrAlias, patch);
   output({ ok: true, account }, jsonMode);
+  await publishAccountEvent('account:update', {
+    profileId: account?.profileId || null,
+    accountId: account?.accountId || null,
+    alias: account?.alias || null,
+    status: account?.status || null,
+    valid: account?.valid === true,
+  });
 }
 
 async function cmdDelete(idOrAlias, argv, jsonMode) {
@@ -227,14 +218,27 @@ async function cmdDelete(idOrAlias, argv, jsonMode) {
     deleteFingerprint: argv['delete-fingerprint'] === true,
   });
   output({ ok: true, ...result }, jsonMode);
+  await publishAccountEvent('account:delete', {
+    profileId: result?.removed?.profileId || null,
+    accountId: result?.removed?.accountId || null,
+    alias: result?.removed?.alias || null,
+  });
 }
 
 async function cmdLogin(idOrAlias, argv, jsonMode) {
   const account = getAccount(idOrAlias);
   await ensureProfile(account.profileId);
   const url = String(argv.url || inferLoginUrl(account.platform)).trim();
+  const idleTimeout = String(argv['idle-timeout'] || process.env.WEBAUTO_LOGIN_IDLE_TIMEOUT || '30m').trim() || '30m';
+
+  const pendingProfile = await syncXhsAccountByProfile(account.profileId, { pendingWhileLogin: true }).catch((error) => ({
+    profileId: account.profileId,
+    valid: false,
+    status: 'pending',
+    reason: `waiting_login_sync:${error?.message || String(error)}`,
+  }));
 
-  const initResult = runCamo(['init']);
+  const initResult = runCamo(['init'], { rootDir: ROOT });
   if (!initResult.ok) {
     output({
       ok: false,
@@ -245,7 +249,7 @@ async function cmdLogin(idOrAlias, argv, jsonMode) {
     process.exit(1);
   }
 
-  const startResult = runCamo(['start', account.profileId, '--url', url]);
+  const startResult = runCamo(['start', account.profileId, '--url', url, '--idle-timeout', idleTimeout], { rootDir: ROOT });
   if (!startResult.ok) {
     output({
       ok: false,
@@ -257,6 +261,11 @@ async function cmdLogin(idOrAlias, argv, jsonMode) {
     process.exit(1);
   }
 
+  const cookieAuto = runCamo(['cookies', 'auto', 'start', account.profileId, '--interval', '5000'], {
+    rootDir: ROOT,
+    timeoutMs: 20000,
+  });
+
   let aliasSync = null;
   if (parseBoolean(argv['sync-alias'], false)) {
     try {
@@ -271,11 +280,11 @@ async function cmdLogin(idOrAlias, argv, jsonMode) {
     }
   }
 
-  const accountSync = await syncXhsAccountByProfile(account.profileId).catch((error) => ({
+  const accountSync = await syncXhsAccountByProfile(account.profileId, { pendingWhileLogin: true }).catch((error) => ({
     profileId: account.profileId,
     valid: false,
-    status: 'invalid',
-    reason: error?.message || String(error),
+    status: 'pending',
+    reason: `waiting_login_sync:${error?.message || String(error)}`,
   }));
 
   output({
@@ -283,10 +292,22 @@ async function cmdLogin(idOrAlias, argv, jsonMode) {
     account,
     profileId: account.profileId,
     url,
+    idleTimeout,
     camo: startResult.json || startResult.stdout || null,
+    pendingProfile,
+    cookieAuto: cookieAuto.ok
+      ? { ok: true }
+      : { ok: false, code: cookieAuto.code, error: cookieAuto.stderr || cookieAuto.stdout || 'cookie auto start failed' },
     aliasSync,
     accountSync,
   }, jsonMode);
+  await publishAccountEvent('account:login', {
+    profileId: account?.profileId || null,
+    accountId: account?.accountId || null,
+    alias: account?.alias || null,
+    status: accountSync?.status || null,
+    valid: accountSync?.valid === true,
+  });
 }
 
 async function cmdSyncAlias(idOrAlias, argv, jsonMode) {
@@ -308,24 +329,39 @@ async function cmdSyncAlias(idOrAlias, argv, jsonMode) {
     source,
     candidates,
   }, jsonMode);
+  await publishAccountEvent('account:alias', {
+    profileId: updated?.profileId || null,
+    accountId: updated?.accountId || null,
+    alias: updated?.alias || null,
+    source,
+  });
 }
 
-async function cmdSync(target, jsonMode) {
+async function cmdSync(target, argv, jsonMode) {
+  const pendingWhileLogin = parseBoolean(argv['pending-while-login'], false);
+  const resolveAlias = parseBoolean(argv['resolve-alias'], false);
   const value = String(target || '').trim().toLowerCase();
   if (!value || value === 'all') {
     const rows = listAccountProfiles().profiles;
     const profileIds = rows.map((item) => item.profileId);
-    const synced = await syncXhsAccountsByProfiles(profileIds);
+    const synced = await syncXhsAccountsByProfiles(profileIds, { pendingWhileLogin, resolveAlias });
     output({ ok: true, count: synced.length, profiles: synced }, jsonMode);
+    await publishAccountEvent('account:sync', {
+      count: synced.length,
+      profiles: synced,
+    });
     return;
   }
-  const synced = await syncXhsAccountByProfile(target);
+  const synced = await syncXhsAccountByProfile(target, { pendingWhileLogin, resolveAlias });
   output({ ok: true, profile: synced }, jsonMode);
+  await publishAccountEvent('account:sync', {
+    profile: synced,
+  });
 }
 
 async function main() {
   const argv = minimist(process.argv.slice(2), {
-    boolean: ['help', 'json', 'clear-alias', 'delete-profile', 'delete-fingerprint', 'sync-alias', 'records'],
+    boolean: ['help', 'json', 'clear-alias', 'delete-profile', 'delete-fingerprint', 'sync-alias', 'resolve-alias', 'records'],
     alias: { h: 'help' },
   });
   const cmd = String(argv._[0] || '').trim();
@@ -344,7 +380,7 @@ async function main() {
   if (cmd === 'delete' || cmd === 'remove' || cmd === 'rm') return cmdDelete(arg1, argv, jsonMode);
   if (cmd === 'login') return cmdLogin(arg1, argv, jsonMode);
   if (cmd === 'sync-alias') return cmdSyncAlias(arg1, argv, jsonMode);
-  if (cmd === 'sync') return cmdSync(arg1, jsonMode);
+  if (cmd === 'sync') return cmdSync(arg1, argv, jsonMode);
 
   throw new Error(`unknown account command: ${cmd}`);
 }

package/apps/webauto/entry/browser-status.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import path from 'node:path';
-import { spawnSync } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
+import { runCamo } from './lib/camo-cli.mjs';
 
 const profileId = String(process.argv[2] || '').trim();
 if (!profileId) {
@@ -8,17 +9,13 @@ if (!profileId) {
   process.exit(1);
 }
 
-const cliPath = path.resolve(process.cwd(), 'bin', 'camoufox-cli.mjs');
-const ret = spawnSync(process.execPath, [cliPath, 'status', profileId], { encoding: 'utf8' });
-const stdout = String(ret.stdout || '').trim();
-const stderr = String(ret.stderr || '').trim();
-let parsed = null;
-try { parsed = stdout ? JSON.parse(stdout) : null; } catch {}
+const ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../..');
+const ret = runCamo(['status', profileId, '--json'], { rootDir: ROOT, timeoutMs: 20000 });
 
-if (ret.status !== 0) {
-  console.error(JSON.stringify({ ok: false, code: ret.status, stderr: stderr || stdout }));
+if (!ret.ok) {
+  console.error(JSON.stringify({ ok: false, code: ret.code, stderr: ret.stderr || ret.stdout }));
   process.exit(1);
 }
 
-const session = parsed?.session || null;
+const session = ret.json?.session || null;
 console.log(JSON.stringify({ ok: true, profileId, online: Boolean(session), session }));

package/apps/webauto/entry/lib/account-detect.mjs

@@ -1,11 +1,17 @@
 import { callAPI } from '../../../../modules/camo-runtime/src/utils/browser-service.mjs';
-import { markProfileInvalid, upsertProfileAccountState } from './account-store.mjs';
+import { listAccountProfiles, markProfileInvalid, markProfilePending, upsertProfileAccountState } from './account-store.mjs';
+
+const XHS_PROFILE_URL = 'https://www.xiaohongshu.com/user/profile';
 
 function normalizeText(value) {
   const text = String(value ?? '').trim();
   return text || null;
 }
 
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 function buildDetectScript() {
   return `(() => {
     const guard = Boolean(document.querySelector('.login-container, .login-dialog, #login-container'));
@@ -16,15 +22,67 @@ function buildDetectScript() {
       if (text === '我' || text === '我的' || text === '个人主页') return null;
       return text;
     };
+    const isSelfLabel = (value) => {
+      const text = String(value || '').replace(/\\s+/g, ' ').trim();
+      if (!text) return false;
+      return (
+        text === '我'
+        || text === '我的'
+        || text === '个人主页'
+        || text === '我的主页'
+        || text === '我的账号'
+      );
+    };
+    const readLabelCandidates = (node) => {
+      if (!node) return [];
+      const text = String(node.textContent || '').replace(/\\s+/g, ' ').trim();
+      const title = String(node.getAttribute ? (node.getAttribute('title') || '') : '').trim();
+      const aria = String(node.getAttribute ? (node.getAttribute('aria-label') || '') : '').trim();
+      return [text, title, aria].filter((item) => Boolean(item));
+    };
+    const cleanAlias = (value) => {
+      let text = normalizeAlias(value);
+      if (!text) return null;
+      text = text.replace(/\\s*[-–—]\\s*(小红书|XiaoHongShu|xiaohongshu).*$/i, '').trim();
+      if (!text) return null;
+      const blocked = ['小红书', '登录', '注册', '搜索'];
+      if (blocked.includes(text)) return null;
+      return text;
+    };
     const pushCandidate = (id, alias, source) => {
       const value = String(id || '').trim();
       if (!value) return;
       candidates.push({
         id: value,
-        alias: normalizeAlias(alias),
+        alias: cleanAlias(alias),
         source: String(source || '').trim() || null,
       });
     };
+    const findAliasFromDom = () => {
+      const selectors = [
+        '[class*="user"] [class*="name"]',
+        '[class*="nickname"]',
+        '[class*="account"] [class*="name"]',
+        'a[href*="/user/profile"] span',
+        'header a[href*="/user"] span',
+        'nav a[href*="/user"] span',
+      ];
+      const picks = [];
+      for (const sel of selectors) {
+        const nodes = Array.from(document.querySelectorAll(sel)).slice(0, 6);
+        for (const node of nodes) {
+          const text = cleanAlias(node.textContent || '');
+          if (text) picks.push({ text, source: sel });
+        }
+      }
+      const metaTitle = document.querySelector('meta[property="og:title"], meta[name="og:title"]');
+      const metaText = cleanAlias(metaTitle ? metaTitle.getAttribute('content') || '' : '');
+      if (metaText) picks.push({ text: metaText, source: 'meta:og:title' });
+      const title = cleanAlias(document.title || '');
+      if (title) picks.push({ text: title, source: 'document.title' });
+      const picked = picks.find((item) => item.text && item.text.length >= 2) || null;
+      return picked ? picked.text : null;
+    };
 
     const initialState = (typeof window !== 'undefined' && window.__INITIAL_STATE__) || null;
     const rawUserInfo = initialState && initialState.user && initialState.user.userInfo
@@ -36,7 +94,7 @@ function buildDetectScript() {
       : null;
     if (rawUserInfo) {
       const initUserId = String(rawUserInfo.user_id || rawUserInfo.userId || '').trim();
-      const initNickname = normalizeAlias(rawUserInfo.nickname || rawUserInfo.name || rawUserInfo.nickName || null);
+      const initNickname = cleanAlias(rawUserInfo.nickname || rawUserInfo.name || rawUserInfo.nickName || null);
       if (initUserId) {
         pushCandidate(initUserId, initNickname, 'initial_state.user_info');
       }
@@ -52,8 +110,8 @@ function buildDetectScript() {
 
     const selfNavEntry = Array.from(document.querySelectorAll('a[href*="/user/profile/"]'))
       .find((node) => {
-        const text = String(node.textContent || '').replace(/\\s+/g, ' ').trim();
-        return text === '我' || text === '我的' || text === '个人主页';
+        const labels = readLabelCandidates(node);
+        return labels.some(isSelfLabel);
       });
     if (selfNavEntry) {
       const href = String(selfNavEntry.getAttribute('href') || '').trim();
@@ -71,7 +129,12 @@ function buildDetectScript() {
       if (!matched) matched = href.match(/\\/user\\/([^/?#]+)/);
       if (!matched || !matched[1]) continue;
       const alias = String(anchor.textContent || '').trim();
-      pushCandidate(matched[1], alias, 'anchor');
+      const labels = readLabelCandidates(anchor);
+      if (labels.some(isSelfLabel)) {
+        pushCandidate(matched[1], alias, 'anchor.self');
+      } else {
+        pushCandidate(matched[1], alias, 'anchor');
+      }
     }
 
     const avatar = document.querySelector('img[alt], [class*="avatar"] img[alt]');
@@ -83,11 +146,15 @@ function buildDetectScript() {
       }
     }
 
-    const best = candidates
+    const strongCandidates = candidates.filter((item) => item.source !== 'localStorage.search_history');
+    const best = strongCandidates
       .find((item) => item.source === 'initial_state.user_info')
+      || strongCandidates.find((item) => item.source === 'nav.self')
+      || strongCandidates.find((item) => item.source === 'anchor.self')
+      || strongCandidates.find((item) => item.source === 'anchor' && item.alias)
+      || strongCandidates.find((item) => item.source === 'anchor')
+      || strongCandidates.find((item) => item.id && item.id.length >= 6)
       || candidates.find((item) => item.source === 'localStorage.search_history')
-      || candidates.find((item) => item.source === 'nav.self')
-      || candidates.find((item) => item.id && item.id.length >= 6)
       || candidates[0]
       || null;
     let alias = best ? best.alias : null;
@@ -95,7 +162,12 @@ function buildDetectScript() {
       const aliasNode = Array.from(document.querySelectorAll('a[href*="/user/profile/"], [class*="user"] a[href*="/user/profile/"]'))
         .find((node) => String(node.getAttribute && node.getAttribute('href') || '').includes(best.id));
       const text = aliasNode ? String(aliasNode.textContent || '').replace(/\\s+/g, ' ').trim() : '';
-      if (text && text !== '我' && text !== '我的') alias = text;
+      const picked = cleanAlias(text);
+      if (picked) alias = picked;
+    }
+    if (!alias && (!best || !best.id)) {
+      const picked = findAliasFromDom();
+      if (picked) alias = picked;
     }
     return {
       url: location.href,
@@ -108,32 +180,174 @@ function buildDetectScript() {
   })()`;
 }
 
-export async function detectXhsAccountIdentity(profileId) {
-  const payload = await callAPI('evaluate', {
-    profileId,
-    script: buildDetectScript(),
-  });
-  const result = payload?.result || payload?.data || payload || {};
-  return {
-    profileId: String(profileId || '').trim(),
-    url: normalizeText(result.url),
-    hasLoginGuard: result.hasLoginGuard === true,
-    accountId: normalizeText(result.accountId),
-    alias: normalizeText(result.alias),
-    source: normalizeText(result.source),
-    candidates: Array.isArray(result.candidates) ? result.candidates : [],
+function buildAliasResolveScript() {
+  return `(() => {
+    const candidates = [];
+    const normalizeAlias = (value) => {
+      const text = String(value || '').replace(/\\s+/g, ' ').trim();
+      if (!text) return null;
+      if (text === '我' || text === '我的' || text === '个人主页') return null;
+      return text;
+    };
+    const cleanAlias = (value) => {
+      let text = normalizeAlias(value);
+      if (!text) return null;
+      text = text.replace(/\\s*[-—–]\\s*(小红书|xiaohongshu).*$/i, '').trim();
+      if (!text) return null;
+      const blocked = ['小红书', '登录', '注册', '搜索'];
+      if (blocked.includes(text)) return null;
+      return text;
+    };
+    const pushCandidate = (text, source) => {
+      const alias = cleanAlias(text);
+      if (!alias) return;
+      candidates.push({ text: alias, source });
+    };
+    const initialState = (typeof window !== 'undefined' && window.__INITIAL_STATE__) || null;
+    const rawUserInfo = initialState && initialState.user && initialState.user.userInfo
+      ? (
+        (initialState.user.userInfo._rawValue && typeof initialState.user.userInfo._rawValue === 'object' && initialState.user.userInfo._rawValue)
+        || (initialState.user.userInfo._value && typeof initialState.user.userInfo._value === 'object' && initialState.user.userInfo._value)
+        || (typeof initialState.user.userInfo === 'object' ? initialState.user.userInfo : null)
+      )
+      : null;
+    if (rawUserInfo) {
+      pushCandidate(rawUserInfo.nickname || rawUserInfo.name || rawUserInfo.nickName || null, 'initial_state.user_info');
+    }
+    const selectors = [
+      '[class*="user"] [class*="name"]',
+      '[class*="user"] [class*="nickname"]',
+      '[class*="nickname"]',
+      '[class*="user-name"]',
+      'header [class*="name"]',
+      'header h1',
+      'header h2',
+    ];
+    for (const sel of selectors) {
+      const nodes = Array.from(document.querySelectorAll(sel)).slice(0, 8);
+      for (const node of nodes) {
+        pushCandidate(node.textContent || '', sel);
+      }
+    }
+    const metaTitle = document.querySelector('meta[property="og:title"], meta[name="og:title"]');
+    if (metaTitle) pushCandidate(metaTitle.getAttribute('content') || '', 'meta:og:title');
+    pushCandidate(document.title || '', 'document.title');
+    const picked = candidates.find((item) => item.text && item.text.length >= 2) || null;
+    return {
+      alias: picked ? picked.text : null,
+      source: picked ? picked.source : null,
+      candidates,
+    };
+  })()`;
+}
+
+async function resolveAliasFromProfilePage(profileId, accountId) {
+  if (!profileId || !accountId) return null;
+  let originalUrl = null;
+  try {
+    const urlPayload = await callAPI('evaluate', { profileId, script: 'window.location.href' });
+    originalUrl = normalizeText(urlPayload?.result || urlPayload?.data?.result || urlPayload?.url);
+  } catch {
+    originalUrl = null;
+  }
+  const targetUrl = `${XHS_PROFILE_URL}/${accountId}`;
+  const shouldNavigate = !originalUrl || !String(originalUrl).includes(`/user/profile/${accountId}`);
+  try {
+    if (shouldNavigate) {
+      await callAPI('goto', { profileId, url: targetUrl });
+      await sleep(1200);
+    }
+    const payload = await callAPI('evaluate', { profileId, script: buildAliasResolveScript() });
+    const result = payload?.result || payload?.data || payload || {};
+    return {
+      alias: normalizeText(result.alias),
+      source: normalizeText(result.source) || 'profile_page',
+      candidates: Array.isArray(result.candidates) ? result.candidates : [],
+    };
+  } catch {
+    return null;
+  } finally {
+    if (shouldNavigate && originalUrl) {
+      try {
+        await callAPI('goto', { profileId, url: originalUrl });
+      } catch {
+        // ignore restore failures
+      }
+    }
+  }
+}
+
+export async function detectXhsAccountIdentity(profileId, options = {}) {
+  const runDetect = async () => {
+    const payload = await callAPI('evaluate', {
+      profileId,
+      script: buildDetectScript(),
+    });
+    const result = payload?.result || payload?.data || payload || {};
+    return {
+      profileId: String(profileId || '').trim(),
+      url: normalizeText(result.url),
+      hasLoginGuard: result.hasLoginGuard === true,
+      accountId: normalizeText(result.accountId),
+      alias: normalizeText(result.alias),
+      source: normalizeText(result.source),
+      candidates: Array.isArray(result.candidates) ? result.candidates : [],
+    };
   };
+
+  let detected = await runDetect();
+  const shouldRetry = !detected.hasLoginGuard && (
+    !detected.accountId
+    || detected.source === 'localStorage.search_history'
+    || !detected.alias
+  );
+  if (shouldRetry) {
+    await sleep(1200);
+    const retry = await runDetect();
+    if (retry.accountId && (!detected.accountId || detected.source === 'localStorage.search_history')) {
+      detected.accountId = retry.accountId;
+      detected.source = retry.source || detected.source;
+      detected.candidates = retry.candidates;
+    }
+    if (retry.alias && !detected.alias) {
+      detected.alias = retry.alias;
+      if (!detected.source) detected.source = retry.source || detected.source;
+    }
+    if (retry.url && !detected.url) detected.url = retry.url;
+  }
+  if (options?.resolveAlias === true && detected.accountId && !detected.alias) {
+    const resolved = await resolveAliasFromProfilePage(detected.profileId, detected.accountId);
+    if (resolved?.alias) {
+      detected.alias = resolved.alias;
+      detected.source = resolved.source || detected.source;
+    }
+  }
+  return detected;
 }
 
-export async function syncXhsAccountByProfile(profileId) {
+export async function syncXhsAccountByProfile(profileId, options = {}) {
   const normalizedProfileId = String(profileId || '').trim();
   if (!normalizedProfileId) throw new Error('profileId is required');
+  const pendingWhileLogin = options?.pendingWhileLogin === true;
   try {
-    const detected = await detectXhsAccountIdentity(normalizedProfileId);
+    const existing = listAccountProfiles().profiles.find(
+      (item) => String(item?.profileId || '').trim() === normalizedProfileId,
+    );
+    const shouldResolveAlias = options?.resolveAlias === true
+      || (!existing?.alias && options?.resolveAlias !== false);
+    const detected = await detectXhsAccountIdentity(normalizedProfileId, {
+      resolveAlias: shouldResolveAlias,
+    });
     if (detected.hasLoginGuard) {
+      if (pendingWhileLogin) {
+        return markProfilePending(normalizedProfileId, 'waiting_login_guard');
+      }
       return markProfileInvalid(normalizedProfileId, 'login_guard');
     }
     if (!detected.accountId) {
+      if (pendingWhileLogin) {
+        return markProfilePending(normalizedProfileId, 'waiting_login');
+      }
       return markProfileInvalid(normalizedProfileId, 'missing_account_id');
     }
     return upsertProfileAccountState({
@@ -145,15 +359,27 @@ export async function syncXhsAccountByProfile(profileId) {
       detectedAt: new Date().toISOString(),
     });
   } catch (error) {
+    const msg = String(error?.message || error || '');
+    if (msg.toLowerCase().includes('operation is insecure')) {
+      try {
+        const existing = listAccountProfiles().profiles.find((item) => String(item?.profileId || '').trim() === normalizedProfileId);
+        if (existing && existing.valid) return existing;
+      } catch {
+        // ignore fallback lookup
+      }
+    }
+    if (pendingWhileLogin) {
+      return markProfilePending(normalizedProfileId, `waiting_login_sync:${error?.message || String(error)}`);
+    }
     return markProfileInvalid(normalizedProfileId, `sync_failed:${error?.message || String(error)}`);
   }
 }
 
-export async function syncXhsAccountsByProfiles(profileIds = []) {
+export async function syncXhsAccountsByProfiles(profileIds = [], options = {}) {
   const list = Array.from(new Set((Array.isArray(profileIds) ? profileIds : []).map((item) => String(item || '').trim()).filter(Boolean)));
   const out = [];
   for (const profileId of list) {
-    const state = await syncXhsAccountByProfile(profileId);
+    const state = await syncXhsAccountByProfile(profileId, options);
     out.push(state);
   }
   return out;