tt-help-cli-ycl 1.4.149 → 1.4.150

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.4.149",
+  "version": "1.4.150",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {

package/scripts/add-claim-index.mjs

@@ -0,0 +1,28 @@
+// 一次性运维脚本：为 task_queue 建 claim 加速复合索引（幂等）
+import { createRequire } from "module";
+const require = createRequire("D:/tiktok/tiktok-cli/package.json");
+const Database = require("better-sqlite3");
+
+const db = new Database("D:/tiktok/data/result.db");
+db.pragma("busy_timeout = 30000");
+const t0 = Date.now();
+db.exec(
+  "CREATE INDEX IF NOT EXISTS idx_tq_claim_fast ON task_queue(status, UPPER(COALESCE(guessed_location,'')), follower_count DESC, created_at ASC, unique_id ASC)",
+);
+console.log(`index created in ${Date.now() - t0}ms`);
+const plan = db
+  .prepare(
+    `EXPLAIN QUERY PLAN SELECT * FROM task_queue WHERE status='pending' AND pinned=0 AND tt_seller=1 AND verified=0 AND UPPER(COALESCE(guessed_location,'')) IN ('PL') AND (status_code IS NULL OR status_code=0 OR status_code=209002) ORDER BY follower_count DESC, created_at ASC, unique_id ASC LIMIT 1`,
+  )
+  .all()
+  .map((r) => r.detail)
+  .join(" | ");
+console.log("plan:", plan);
+const t1 = Date.now();
+db
+  .prepare(
+    `SELECT * FROM task_queue WHERE status='pending' AND pinned=0 AND tt_seller=1 AND verified=0 AND UPPER(COALESCE(guessed_location,'')) IN ('PL') AND (status_code IS NULL OR status_code=0 OR status_code=209002) ORDER BY follower_count DESC, created_at ASC, unique_id ASC LIMIT 1`,
+  )
+  .get();
+console.log(`branch query: ${Date.now() - t1}ms`);
+db.close();

package/scripts/checkpoint-wal.mjs

@@ -0,0 +1,20 @@
+// 一次性运维脚本：对主库执行 wal_checkpoint(TRUNCATE)
+// 安全性：只把已提交的 WAL 帧合并回主库文件并截断 WAL，不丢数据
+import { createRequire } from "module";
+const require = createRequire("D:/tiktok/tiktok-cli/package.json");
+const Database = require("better-sqlite3");
+
+const dbPath = "D:/tiktok/data/result.db";
+const db = new Database(dbPath);
+db.pragma("busy_timeout = 10000");
+
+const before = require("fs").statSync(dbPath + "-wal").size / 1024 / 1024;
+console.log(`WAL before: ${before.toFixed(1)} MB`);
+
+const t0 = Date.now();
+const r = db.pragma("wal_checkpoint(TRUNCATE)");
+console.log(`checkpoint result:`, JSON.stringify(r), `${Date.now() - t0}ms`);
+
+const after = require("fs").statSync(dbPath + "-wal").size / 1024 / 1024;
+console.log(`WAL after: ${after.toFixed(1)} MB`);
+db.close();

package/src/lib/app-config.js

@@ -10,7 +10,10 @@
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
-import { DEFAULT_TARGET_LOCATIONS } from "./target-locations.js";
+import {
+  DEFAULT_TARGET_LOCATIONS,
+  normalizeLocation,
+} from "./target-locations.js";
 
 // 通用配置文件路径（与 ~/.tt-help.json 隔离，避免与看门狗 clientConfig 写入冲突）
 const CONFIG_FILE = join(homedir(), ".tt-help-config.json");
@@ -117,3 +120,14 @@ export function setTargetLocations(locations) {
 export function reloadConfig() {
   _cache = null;
 }
+
+/**
+ * 国家优先级序号：位置越前优先级越高。
+ * 空/未配置国家返回 MAX_SAFE_INTEGER（排最后）。
+ */
+export function locationRank(location) {
+  const normalized = normalizeLocation(location);
+  if (!normalized) return Number.MAX_SAFE_INTEGER;
+  const idx = getTargetLocations().indexOf(normalized);
+  return idx === -1 ? Number.MAX_SAFE_INTEGER : idx;
+}

package/src/lib/browser/cdp.js

@@ -241,6 +241,8 @@ function launchEdgeWithCDP(port, userDataDir, proxyServer) {
       "--disable-breakpad",
       "--disable-background-networking",
       "--disable-sync",
+      // 显式打开 about:blank，避免 Edge 默认打开 MSN 新标签页
+      "about:blank",
     ];
     if (proxyServer) {
       extraArgs.push(`--proxy-server=${proxyServer}`);

package/src/lib/browser/page.js

@@ -307,11 +307,25 @@ export async function findTikTokPage(browser) {
 }
 
 export async function getOrCreatePage(browser) {
+  // 先确定工作页：优先复用已有 TikTok 页，没有才新建。
+  // 必须先建后关：任何时刻至少保留 1 个标签页，避免 Windows 下
+  // 关闭最后一个标签页导致浏览器进程退出、CDP 断连。
   let page = await findTikTokPage(browser);
   if (!page) {
     const defaultCtx = browser.contexts()[0] || (await browser.newContext());
     page = await defaultCtx.newPage();
   }
+  // 关闭其余所有页面：清掉启动残留的默认新标签页（NTP/MSN），
+  // 以及进程崩溃泄漏的搜索 tab。不做 URL 匹配，无需随 Edge 改版维护。
+  // search-collector 的瞬态多 tab 在 finally 自行关闭，且本函数只在
+  // 启动/账户切换/浏览器重建时调用，不会撞上在途搜索 tab。
+  for (const ctx of browser.contexts()) {
+    for (const p of ctx.pages()) {
+      if (p !== page) {
+        await p.close().catch(() => {});
+      }
+    }
+  }
   return page;
 }
 

package/src/lib/target-locations.js

@@ -1,9 +1,5 @@
+// 顺序即领取优先级：越靠前越先领取（旧 tier1/tier2 硬编码分层已改为配置顺序驱动）
 const DEFAULT_TARGET_LOCATIONS = [
-  "CZ",
-  "GR",
-  "HU",
-  "PT",
-  "ES",
   "PL",
   "NL",
   "BE",
@@ -11,9 +7,16 @@ const DEFAULT_TARGET_LOCATIONS = [
   "FR",
   "IT",
   "IE",
+  "ES",
+  "CZ",
+  "GR",
+  "HU",
+  "PT",
   "AT",
   "TH",
   "US",
+  "MY",
+  "VN",
 ];
 
 const DEFAULT_TARGET_LOCATIONS_CSV = DEFAULT_TARGET_LOCATIONS.join(",");

package/src/watch/data-store.js

@@ -20,7 +20,23 @@ import fs from "fs";
 import path from "path";
 import Database from "better-sqlite3";
 import { isLocationInList } from "../lib/target-locations.js";
-import { getTargetLocations } from "../lib/app-config.js";
+import { getTargetLocations, locationRank } from "../lib/app-config.js";
+
+/**
+ * 按目标国家配置顺序解析领取顺序（优先级 = 配置顺序，越靠前越先领）。
+ * 传入子集时：配置内国家按配置顺序在前，配置外国家按传入顺序附在后面。
+ */
+function resolveOrderedLocations(normalizedLocations) {
+  const configured = getTargetLocations();
+  if (!normalizedLocations || normalizedLocations.length === 0)
+    return [...configured];
+  const configSet = new Set(configured);
+  const requestedSet = new Set(normalizedLocations);
+  return [
+    ...configured.filter((loc) => requestedSet.has(loc)),
+    ...normalizedLocations.filter((loc) => !configSet.has(loc)),
+  ];
+}
 
 // Schema 与连接管理
 import {
@@ -925,13 +941,9 @@ export function createStore(filePath, options = {}) {
   let statusGroups = null;
   let groupsDirty = true;
 
-  const tier1LocSet = new Set(["PL", "NL", "BE"]);
-  const tier2LocSet = new Set(["DE", "FR", "IT", "IE", "ES"]);
+  // 优先级 = 目标国家配置顺序（越靠前越优先），空/配置外国家排最后
   function locationTier(u) {
-    const loc = (u.guessedLocation || "").toUpperCase();
-    if (tier1LocSet.has(loc)) return 0;
-    if (tier2LocSet.has(loc)) return 1;
-    return 2;
+    return locationRank(u.guessedLocation);
   }
 
   function sortGroup(key, arr) {
@@ -1278,13 +1290,13 @@ export function createStore(filePath, options = {}) {
         };
       }
 
-      const tier1 = new Set(["PL", "NL", "BE"]);
-      const tier2 = new Set(["DE", "FR", "IT", "IE", "ES"]);
       const normalizedLocations = Array.isArray(locations)
         ? locations
             .map((loc) => String(loc).trim().toUpperCase())
             .filter(Boolean)
         : [];
+      // 优先级 = 目标国家配置顺序；传子集时按配置顺序取交集（配置外国家按传入顺序排后）
+      const orderedCountries = resolveOrderedLocations(normalizedLocations);
 
       // ---- 过期 processing 回收 ----
       const expiredRow = getDb()
@@ -1304,31 +1316,19 @@ export function createStore(filePath, options = {}) {
         expiredCandidate = expiredRow;
       }
 
-      // ---- 构建统一优先级查询（合并原 20+ 次独立 SELECT 为 1 次 UNION） ----
+      // ---- 逐级短路查询：按优先级顺序逐个分支执行，命中即领取 ----
       const statusCodeWhere = loggedIn
         ? "(status_code IS NULL OR status_code = 0 OR status_code = 209002)"
         : "(status_code IS NULL OR status_code = 0)";
       const notSellerWhere = loggedIn ? "" : "AND COALESCE(tt_seller, 0) != 1";
 
-      const tier1List = normalizedLocations.length
-        ? normalizedLocations.filter((loc) => tier1.has(loc))
-        : [...tier1];
-      const tier2List = normalizedLocations.length
-        ? normalizedLocations.filter((loc) => tier2.has(loc))
-        : [...tier2];
-      const otherFiltered = normalizedLocations.length
-        ? normalizedLocations.filter(
-            (loc) => !tier1.has(loc) && !tier2.has(loc),
-          )
-        : null;
-
-      const locIn = (list) => {
+      const locIn = (list, { includeEmpty = true } = {}) => {
         if (!list || list.length === 0) return null;
         const ph = list.map(() => "?").join(", ");
-        return {
-          sql: `(UPPER(COALESCE(guessed_location, '')) IN (${ph}) OR COALESCE(guessed_location, '') = '')`,
-          params: [...list],
-        };
+        const sql = includeEmpty
+          ? `(UPPER(COALESCE(guessed_location, '')) IN (${ph}) OR COALESCE(guessed_location, '') = '')`
+          : `UPPER(COALESCE(guessed_location, '')) IN (${ph})`;
+        return { sql, params: [...list] };
       };
       const locNotIn = (list) => {
         if (!list || list.length === 0) return null;
@@ -1338,13 +1338,6 @@ export function createStore(filePath, options = {}) {
           params: [...list],
         };
       };
-      const locOther = () => {
-        if (otherFiltered && otherFiltered.length > 0)
-          return locIn(otherFiltered);
-        if (normalizedLocations.length === 0)
-          return locNotIn([...tier1, ...tier2]);
-        return null;
-      };
 
       // 全局 location 过滤（pinned 查询用）
       let pinnedLocSql = "";
@@ -1355,45 +1348,38 @@ export function createStore(filePath, options = {}) {
         pinnedLocParams.push(...normalizedLocations);
       }
 
-      const sqlParts = [];
-      const allParams = [];
+      // 逐级短路：单分支 LIMIT 1 走索引仅几十 ms；原 26 分支 UNION ALL 需 MERGE
+      // 收集全部分支结果再排序，task_queue 增长后成为 CPU/延迟瓶颈。
+      // 语义与原「UNION ALL + ORDER BY _prio,_sub_prio,... LIMIT 1」完全等价：
+      // 分支添加顺序即 (_prio,_sub_prio)，首个非空分支的最优行即全局最优行。
+      const branchOrder =
+        " ORDER BY follower_count DESC, created_at ASC, unique_id ASC LIMIT 1";
+      const branches = [];
 
-      const addPart = (prio, subPrio, conditions, params) => {
-        sqlParts.push(
-          `SELECT *, ${prio} as _prio, ${subPrio} as _sub_prio FROM task_queue WHERE ${conditions}`,
-        );
-        allParams.push(...params);
+      const addBranch = (conditions, params) => {
+        branches.push({ conditions, params });
       };
 
       // prio 0: pinned + hasVideo
-      addPart(
-        0,
-        0,
+      addBranch(
         `status = 'pending' AND pinned = 1 AND video_count > 0 ${pinnedLocSql} AND ${statusCodeWhere} ${notSellerWhere}`,
         pinnedLocParams,
       );
       // prio 1: pinned (no video req)
-      addPart(
-        1,
-        0,
+      addBranch(
         `status = 'pending' AND pinned = 1 ${pinnedLocSql} AND ${statusCodeWhere} ${notSellerWhere}`,
         pinnedLocParams,
       );
 
       // prio 2-3: expired candidate（回收的超时任务优先）
       if (expiredCandidate) {
-        addPart(
-          2,
-          0,
+        addBranch(
           `unique_id = ? AND video_count > 0 AND ${statusCodeWhere} ${notSellerWhere}`,
           [expiredCandidate.unique_id],
         );
-        addPart(
-          3,
-          0,
-          `unique_id = ? AND ${statusCodeWhere} ${notSellerWhere}`,
-          [expiredCandidate.unique_id],
-        );
+        addBranch(`unique_id = ? AND ${statusCodeWhere} ${notSellerWhere}`, [
+          expiredCandidate.unique_id,
+        ]);
       }
 
       // 非 pinned 优先级：seed → seller → follow → other，每级 × 3 个 location tier × (hasVideo / noVideoReq)
@@ -1413,27 +1399,25 @@ export function createStore(filePath, options = {}) {
       let basePrio = 4;
       for (const p of priorities) {
         if (p.loggedInOnly && !loggedIn) continue;
-        const tierLocations = [
-          { list: tier1List, fn: locIn },
-          { list: tier2List, fn: locIn },
-          { list: null, fn: locOther },
-        ];
+        // 逐国顺序分支：配置内国家按优先级顺序；未传子集时末尾补“配置外国家”兑底。
+        // 空位置（loc=''）只在首个国家的分支参与：首国的 noVideoReq 分支 miss 即意味着
+        // 空位置池已耗尽，后续分支无需再 OR ''（避免反复扫描空位置大池）
+        const locationBranches = orderedCountries.map((loc, idx) =>
+          locIn([loc], { includeEmpty: idx === 0 }),
+        );
+        if (normalizedLocations.length === 0)
+          locationBranches.push(locNotIn(orderedCountries));
         let subPrio = 0;
-        for (const tl of tierLocations) {
-          const loc = tl.fn(tl.list);
+        for (const loc of locationBranches) {
           if (!loc) continue;
           // hasVideo
-          addPart(
-            basePrio,
-            subPrio,
+          addBranch(
             `status = 'pending' AND pinned = 0 AND ${p.filter} AND video_count > 0 AND ${loc.sql} AND ${statusCodeWhere} ${notSellerWhere}`,
             loc.params,
           );
           subPrio++;
           // noVideoReq
-          addPart(
-            basePrio + 1,
-            subPrio,
+          addBranch(
             `status = 'pending' AND pinned = 0 AND ${p.filter} AND ${loc.sql} AND ${statusCodeWhere} ${notSellerWhere}`,
             loc.params,
           );
@@ -1442,14 +1426,16 @@ export function createStore(filePath, options = {}) {
         basePrio += 2;
       }
 
+      // 逐级执行：首个命中分支的最优行即领取结果（未命中继续下一优先级分支）
       let selectedRow = null;
-      if (sqlParts.length > 0) {
-        const unionSql =
-          sqlParts.join(" UNION ALL ") +
-          " ORDER BY _prio, _sub_prio, follower_count DESC, created_at ASC, unique_id ASC LIMIT 1";
-        selectedRow = getDb()
-          .prepare(unionSql)
-          .get(...allParams);
+      for (const b of branches) {
+        selectedRow =
+          getDb()
+            .prepare(
+              `SELECT * FROM task_queue WHERE ${b.conditions}${branchOrder}`,
+            )
+            .get(...b.params) || null;
+        if (selectedRow) break;
       }
 
       if (selectedRow) {
@@ -1493,15 +1479,8 @@ export function createStore(filePath, options = {}) {
         };
       }
 
-      // 按猜测国家梯队排序
-      const tier1 = new Set(["PL", "NL", "BE"]);
-      const tier2 = new Set(["DE", "FR", "IT", "IE", "ES"]);
-      function locationTier(u) {
-        const loc = (u.guessedLocation || "").toUpperCase();
-        if (tier1.has(loc)) return 0;
-        if (tier2.has(loc)) return 1;
-        return 2;
-      }
+      // 按目标国家配置顺序排序（越靠前越优先）
+      const locationTier = (u) => locationRank(u.guessedLocation);
 
       // 国家过滤：如果指定了 locations，只保留 guessedLocation 在列表中的用户
       function locationFilter(u) {
@@ -1641,8 +1620,6 @@ export function createStore(filePath, options = {}) {
           }
         : null;
 
-      const tier1 = new Set(["PL", "NL", "BE"]);
-      const tier2 = new Set(["DE", "FR", "IT", "IE", "ES"]);
       const normalizedLocations = Array.isArray(locations)
         ? locations
             .map((loc) => String(loc).trim().toUpperCase())
@@ -1650,29 +1627,11 @@ export function createStore(filePath, options = {}) {
         : [];
 
       function getLocationGroups() {
-        const selected = normalizedLocations.length
-          ? normalizedLocations
-          : null;
-        const tier1List = selected
-          ? selected.filter((loc) => tier1.has(loc))
-          : [...tier1];
-        const tier2List = selected
-          ? selected.filter((loc) => tier2.has(loc))
-          : [...tier2];
-        const otherList = selected
-          ? selected.filter((loc) => !tier1.has(loc) && !tier2.has(loc))
-          : null;
-        const groups = [];
-        if (tier1List.length > 0)
-          groups.push({ type: "include", values: tier1List });
-        if (tier2List.length > 0)
-          groups.push({ type: "include", values: tier2List });
-        if (selected) {
-          if (otherList.length > 0)
-            groups.push({ type: "include", values: otherList });
-        } else {
-          groups.push({ type: "exclude", values: [...tier1, ...tier2] });
-        }
+        const ordered = resolveOrderedLocations(normalizedLocations);
+        if (ordered.length === 0) return [];
+        const groups = [{ type: "include", values: ordered }];
+        if (normalizedLocations.length === 0)
+          groups.push({ type: "exclude", values: [...ordered] });
         return groups;
       }
 

package/src/watch/db-schema.js

@@ -446,19 +446,28 @@ export function initDb(filePath) {
     db.exec(`CREATE INDEX IF NOT EXISTS idx_videos_old_id ON videos_old(id)`);
   }
 
-  // ===== task_queue 索引（对应 claimNextJob UNION 查询的 4 个部分索引） =====
+  // ===== task_queue 索引（claimNextJob 逐级短路查询 + 监控列表） =====
+  // idx_tq_claim_fast：claim 分支查询主索引（2026-09-17 实战验证：分支 7s→1ms）。
+  // 普通复合索引，不依赖部分索引的 WHERE 表达式文本匹配（旧 4 个部分索引因
+  // pinned=0 与 COALESCE(pinned,0)=0 文本不一致、首国分支 OR 空串，从未被命中，已废弃清理）。
   const tqIndexes = [
     `CREATE INDEX IF NOT EXISTS idx_tq_status ON task_queue(status)`,
     `CREATE INDEX IF NOT EXISTS idx_tq_claimed_by_status ON task_queue(claimed_by, status, claimed_at)`,
     `CREATE INDEX IF NOT EXISTS idx_tq_status_claimed_at ON task_queue(status, claimed_at)`,
-    `CREATE INDEX IF NOT EXISTS idx_tq_claim_pending_pinned ON task_queue(created_at ASC, unique_id ASC) WHERE status = 'pending' AND COALESCE(pinned, 0) = 1`,
-    `CREATE INDEX IF NOT EXISTS idx_tq_claim_pending_seller ON task_queue(UPPER(COALESCE(guessed_location, '')), follower_count DESC, created_at ASC, unique_id ASC) WHERE status = 'pending' AND COALESCE(pinned, 0) = 0 AND tt_seller = 1 AND verified = 0`,
-    `CREATE INDEX IF NOT EXISTS idx_tq_claim_pending_follow ON task_queue(UPPER(COALESCE(guessed_location, '')), follower_count DESC, created_at ASC, unique_id ASC) WHERE status = 'pending' AND COALESCE(pinned, 0) = 0 AND (instr(COALESCE(sources, ''), '"following"') > 0 OR instr(COALESCE(sources, ''), '"follower"') > 0)`,
-    `CREATE INDEX IF NOT EXISTS idx_tq_claim_pending_other ON task_queue(UPPER(COALESCE(guessed_location, '')), follower_count DESC, created_at ASC, unique_id ASC) WHERE status = 'pending' AND COALESCE(pinned, 0) = 0`,
+    `CREATE INDEX IF NOT EXISTS idx_tq_claim_fast ON task_queue(status, UPPER(COALESCE(guessed_location,'')), follower_count DESC, created_at ASC, unique_id ASC)`,
     // 监控页面用户列表查询加速
     `CREATE INDEX IF NOT EXISTS idx_tq_list_pending ON task_queue(pinned, processed_at, follower_count, unique_id) WHERE status = 'pending'`,
     `CREATE INDEX IF NOT EXISTS idx_tq_list_processing ON task_queue(pinned, processed_at, follower_count, unique_id) WHERE status = 'processing'`,
   ];
+  // 清理从未被命中的旧 claim 部分索引（省写入开销与空间，幂等）
+  for (const oldIdx of [
+    "idx_tq_claim_pending_pinned",
+    "idx_tq_claim_pending_seller",
+    "idx_tq_claim_pending_follow",
+    "idx_tq_claim_pending_other",
+  ]) {
+    db.exec(`DROP INDEX IF EXISTS ${oldIdx}`);
+  }
   for (const sql of tqIndexes) {
     db.exec(sql);
   }

package/src/watch/public/app.js

@@ -182,7 +182,7 @@ function renderStats() {
   flashEl("statTotal", d.totalUsers);
   flashEl("statProcessing", d.processingUsers || 0);
   flashEl("statDone", d.processedUsers);
-  flashEl("statPending", d.pendingUsers);
+  flashEl("statPending", d.pendingUsers, { full: true });
   flashEl("statError", d.errorUsers);
   flashEl("statTarget", d.targetUsers, { full: true });
   flashEl("statPrecise", d.preciseMerchants, { full: true });
@@ -206,7 +206,8 @@ function renderStats() {
   const pendingTotal = document.getElementById("pendingStatTotal");
   if (pendingTotal) pendingTotal.textContent = formatStatNum(d.totalUsers);
   const pendingCount = document.getElementById("pendingStatPending");
-  if (pendingCount) pendingCount.textContent = formatStatNum(d.pendingUsers);
+  if (pendingCount)
+    pendingCount.textContent = formatStatNum(d.pendingUsers, { full: true });
   const pendingUserUpdate = document.getElementById(
     "pendingStatUserUpdateTasks",
   );
@@ -222,7 +223,9 @@ function renderStats() {
     userUpdateTotal.textContent = formatStatNum(d.totalUsers);
   const userUpdatePending = document.getElementById("userUpdateStatPending");
   if (userUpdatePending)
-    userUpdatePending.textContent = formatStatNum(d.pendingUsers);
+    userUpdatePending.textContent = formatStatNum(d.pendingUsers, {
+      full: true,
+    });
   const userUpdateTasks = document.getElementById(
     "userUpdateStatUserUpdateTasks",
   );
@@ -238,7 +241,9 @@ function renderStats() {
     rawPageRawJobs.textContent = formatStatNum(d.rawJobs || 0);
   const rawPagePending = document.getElementById("rawPageStatPending");
   if (rawPagePending)
-    rawPagePending.textContent = formatStatNum(d.pendingUsers || 0);
+    rawPagePending.textContent = formatStatNum(d.pendingUsers || 0, {
+      full: true,
+    });
   const rawPageUserUpdate = document.getElementById(
     "rawPageStatUserUpdateTasks",
   );
@@ -247,11 +252,11 @@ function renderStats() {
   document.getElementById("lastUpdate").textContent =
     "更新于 " + new Date().toLocaleTimeString();
   document.getElementById("fileMeta").textContent =
-    formatStatNum(d.processingUsers || 0) +
+    formatStatNum(d.processingUsers || 0, { full: true }) +
     " 处理中, " +
-    formatStatNum(d.totalUsers) +
+    formatStatNum(d.totalUsers, { full: true }) +
     " 个用户, 待处理 " +
-    formatStatNum(d.pendingUsers || 0);
+    formatStatNum(d.pendingUsers || 0, { full: true });
 
   renderCountryChart(d.countryStats);
   renderSourceChart(d.sourceStats);
@@ -700,6 +705,8 @@ const DEFAULT_LOCATION_OPTIONS = [
   "PT",
   "TH",
   "US",
+  "MY",
+  "VN",
 ];
 let locationOptions = [...DEFAULT_LOCATION_OPTIONS];
 
@@ -1299,8 +1306,12 @@ function handleRoute() {
     showPrecisePage();
   } else if (hash === "#tags") {
     showTagsPage();
-  } else if (hash === "#settings") {
+  } else if (hash === "#settings" || hash.startsWith("#settings/")) {
     showSettingsPage();
+    const sub = hash.startsWith("#settings/")
+      ? hash.slice("#settings/".length)
+      : "";
+    switchSettingsPanel(sub || "llm", false);
   } else if (hash === "#watchdog") {
     showWatchdogPage();
   } else {
@@ -1437,6 +1448,24 @@ function showSettingsPage() {
   loadTargetLocations();
 }
 
+// 设置页左侧分类切换：panel 对应 settings-nav-item 的 data-panel 与 settingsPanel-<panel> 容器
+function switchSettingsPanel(panel, updateHash = true) {
+  document
+    .querySelectorAll("#settingsNav .settings-nav-item")
+    .forEach((btn) =>
+      btn.classList.toggle("active", btn.dataset.panel === panel),
+    );
+  document
+    .querySelectorAll(".settings-panel")
+    .forEach((el) =>
+      el.classList.toggle("active", el.id === "settingsPanel-" + panel),
+    );
+  if (updateHash) {
+    const target = panel === "llm" ? "#settings" : "#settings/" + panel;
+    if (window.location.hash !== target) window.location.hash = target;
+  }
+}
+
 // ========== 目标国家配置（通用 app-config，落盘 ~/.tt-help-config.json） ==========
 
 const AVAILABLE_COUNTRIES = [
@@ -1455,6 +1484,8 @@ const AVAILABLE_COUNTRIES = [
   "PT",
   "TH",
   "US",
+  "MY",
+  "VN",
   "GB",
   "SE",
   "NO",
@@ -1476,6 +1507,11 @@ const AVAILABLE_COUNTRIES = [
   "CO",
 ];
 
+// ========== 目标国家配置（宫格 + 拖拽排序，位置即领取优先级） ==========
+
+let _targetLocations = []; // 顺序即领取优先级，拖拽/增删后需点保存才落盘
+let _targetLocationsSaved = []; // 最近一次加载/保存的快照，用于脏状态提示
+
 function normalizeCountryInput(str) {
   return [
     ...new Set(
@@ -1487,20 +1523,43 @@ function normalizeCountryInput(str) {
   ];
 }
 
+/** 两位国家代码 → 国旗 emoji */
+function countryFlag(code) {
+  if (!/^[A-Za-z]{2}$/.test(code)) return "🏳️";
+  return String.fromCodePoint(
+    ...[...code.toUpperCase()].map(
+      (c) => 0x1f1e6 + c.charCodeAt(0) - 65,
+    ),
+  );
+}
+
+function targetLocationsDirty() {
+  return (
+    _targetLocations.join(",") !== _targetLocationsSaved.join(",")
+  );
+}
+
+function updateTargetLocationsStatus() {
+  const status = document.getElementById("targetLocationsStatus");
+  if (!status) return;
+  if (targetLocationsDirty()) {
+    status.textContent = `⛔ 有未保存的修改（当前 ${_targetLocations.length} 国，顺序: ${_targetLocations.join(" → ")}），点“保存目标国家”生效`;
+    status.className = "settings-status warn";
+  } else {
+    status.textContent = `✅ 已生效：${_targetLocations.length} 国，位置即领取优先级（越靠前越先领）`;
+    status.className = "settings-status ok";
+  }
+}
+
 async function loadTargetLocations() {
-  const input = document.getElementById("targetLocationsInput");
   const status = document.getElementById("targetLocationsStatus");
-  if (!input) return;
   try {
     const res = await fetch("/api/settings/target-locations");
     const data = await res.json();
-    const locations = data.locations || [];
-    input.value = locations.join(",");
-    renderTargetCountryGrid(locations);
-    if (status) {
-      status.textContent = `当前 ${locations.length} 个国家: ${locations.join(", ")}`;
-      status.className = "settings-status ok";
-    }
+    _targetLocations = (data.locations || []).map(String);
+    _targetLocationsSaved = [..._targetLocations];
+    renderTargetLocationsGrid();
+    updateTargetLocationsStatus();
   } catch (e) {
     console.error("loadTargetLocations error:", e);
     if (status) {
@@ -1510,47 +1569,154 @@ async function loadTargetLocations() {
   }
 }
 
-function renderTargetCountryGrid(selected) {
-  const grid = document.getElementById("targetCountryGrid");
+function renderTargetLocationsGrid() {
+  const grid = document.getElementById("targetLocationsGrid");
   if (!grid) return;
-  const selectedSet = new Set(selected || []);
-  grid.innerHTML = AVAILABLE_COUNTRIES.map(
-    (loc) =>
-      `<button type="button" class="loc-option ${selectedSet.has(loc) ? "active" : ""}" onclick="toggleTargetCountry('${loc}')">${loc}</button>`,
-  ).join("");
+  const chips = _targetLocations
+    .map(
+      (loc, i) => `
+      <div class="loc-chip" draggable="true" data-loc="${loc}" data-idx="${i}" title="拖动排序（位置即优先级）">
+        <span class="loc-chip-idx">${i + 1}</span>
+        <span class="loc-chip-flag">${countryFlag(loc)}</span>
+        <span class="loc-chip-code">${loc}</span>
+        <button type="button" class="loc-chip-del" onclick="removeTargetLocation('${loc}')" title="移除 ${loc}">×</button>
+      </div>`,
+    )
+    .join("");
+  grid.innerHTML =
+    chips +
+    `<button type="button" class="loc-chip loc-chip-add" onclick="toggleCountryPicker()" title="添加国家">＋</button>`;
+  bindLocChipDrag(grid);
+  renderCountryPicker();
+}
+
+// ---- 拖拽排序（HTML5 DnD） ----
+let _dragLoc = null;
+
+function bindLocChipDrag(grid) {
+  grid.querySelectorAll(".loc-chip[draggable]").forEach((chip) => {
+    chip.addEventListener("dragstart", (e) => {
+      _dragLoc = chip.dataset.loc;
+      chip.classList.add("dragging");
+      e.dataTransfer.effectAllowed = "move";
+      e.dataTransfer.setData("text/plain", _dragLoc);
+    });
+    chip.addEventListener("dragend", () => {
+      _dragLoc = null;
+      chip.classList.remove("dragging");
+      grid
+        .querySelectorAll(".drop-before,.drop-after")
+        .forEach((el) => el.classList.remove("drop-before", "drop-after"));
+    });
+    chip.addEventListener("dragover", (e) => {
+      e.preventDefault();
+      e.dataTransfer.dropEffect = "move";
+      if (_dragLoc == null || chip.dataset.loc === _dragLoc) return;
+      const rect = chip.getBoundingClientRect();
+      const before = e.clientX < rect.left + rect.width / 2;
+      chip.classList.toggle("drop-before", before);
+      chip.classList.toggle("drop-after", !before);
+    });
+    chip.addEventListener("dragleave", () => {
+      chip.classList.remove("drop-before", "drop-after");
+    });
+    chip.addEventListener("drop", (e) => {
+      e.preventDefault();
+      if (_dragLoc == null || chip.dataset.loc === _dragLoc) return;
+      const rect = chip.getBoundingClientRect();
+      const before = e.clientX < rect.left + rect.width / 2;
+      moveTargetLocation(
+        _dragLoc,
+        Number(chip.dataset.idx) + (before ? 0 : 1),
+      );
+    });
+  });
+}
+
+/** 把 fromLoc 移动到目标插入位（insertAt 为移除前语义下的目标下标） */
+function moveTargetLocation(fromLoc, insertAt) {
+  const fromIdx = _targetLocations.indexOf(fromLoc);
+  if (fromIdx === -1) return;
+  _targetLocations.splice(fromIdx, 1);
+  const target = Math.max(0, Math.min(insertAt, _targetLocations.length));
+  _targetLocations.splice(target, 0, fromLoc);
+  renderTargetLocationsGrid();
+  updateTargetLocationsStatus();
+}
+
+// ---- 添加 / 删除 ----
+function removeTargetLocation(loc) {
+  _targetLocations = _targetLocations.filter((l) => l !== loc);
+  renderTargetLocationsGrid();
+  updateTargetLocationsStatus();
+}
+
+function addTargetLocation(locRaw) {
+  const loc = String(locRaw || "").trim().toUpperCase();
+  if (!/^[A-Z]{2}$/.test(loc)) return false;
+  if (_targetLocations.includes(loc)) return false;
+  _targetLocations.push(loc); // 新增排最后（优先级最低），可拖动调整
+  renderTargetLocationsGrid();
+  updateTargetLocationsStatus();
+  return true;
+}
+
+// ---- 添加面板（＋展开） ----
+function toggleCountryPicker() {
+  const picker = document.getElementById("countryPicker");
+  if (!picker) return;
+  picker.style.display = picker.style.display === "none" ? "block" : "none";
+  renderCountryPicker();
+}
+
+function renderCountryPicker() {
+  const picker = document.getElementById("countryPicker");
+  if (!picker || picker.style.display === "none") return;
+  const selected = new Set(_targetLocations);
+  const grid = document.getElementById("countryPickerGrid");
+  if (grid) {
+    grid.innerHTML = AVAILABLE_COUNTRIES.filter(
+      (loc) => !selected.has(loc),
+    )
+      .map(
+        (loc) =>
+          `<button type="button" class="loc-option" onclick="addTargetLocation('${loc}')">${countryFlag(loc)} ${loc}</button>`,
+      )
+      .join("");
+  }
 }
 
-function toggleTargetCountry(loc) {
-  const input = document.getElementById("targetLocationsInput");
+function addCustomCountry() {
+  const input = document.getElementById("customCountryInput");
   if (!input) return;
-  let current = normalizeCountryInput(input.value);
-  if (current.includes(loc)) {
-    current = current.filter((l) => l !== loc);
+  const ok = addTargetLocation(input.value);
+  if (ok) {
+    input.value = "";
+    input.focus();
   } else {
-    current.push(loc);
+    input.placeholder = "无效或已存在（两位大写字母）";
+    setTimeout(() => (input.placeholder = "其他代码，如 GB"), 2000);
   }
-  input.value = current.join(",");
-  renderTargetCountryGrid(current);
+  renderCountryPicker();
 }
 
+// ---- 保存 / 恢复默认 ----
 async function saveTargetLocations() {
-  const input = document.getElementById("targetLocationsInput");
   const status = document.getElementById("targetLocationsStatus");
-  if (!input) return;
-  const locations = normalizeCountryInput(input.value);
+  if (!status) return;
   status.textContent = "保存中...";
   status.className = "settings-status loading";
   try {
     const res = await fetch("/api/settings/target-locations", {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ locations }),
+      body: JSON.stringify({ locations: _targetLocations }),
     });
     const data = await res.json();
-    input.value = (data.locations || []).join(",");
-    renderTargetCountryGrid(data.locations || []);
-    status.textContent = `已保存 ${(data.locations || []).length} 个国家`;
-    status.className = "settings-status ok";
+    _targetLocations = (data.locations || []).map(String);
+    _targetLocationsSaved = [..._targetLocations];
+    renderTargetLocationsGrid();
+    updateTargetLocationsStatus();
   } catch (e) {
     console.error("saveTargetLocations error:", e);
     status.textContent = "保存失败";
@@ -1571,13 +1737,10 @@ async function resetTargetLocations() {
       body: JSON.stringify({ locations: [] }),
     });
     const data = await res.json();
-    const input = document.getElementById("targetLocationsInput");
-    if (input) input.value = (data.locations || []).join(",");
-    renderTargetCountryGrid(data.locations || []);
-    if (status) {
-      status.textContent = `已恢复默认 ${(data.locations || []).length} 个国家`;
-      status.className = "settings-status ok";
-    }
+    _targetLocations = (data.locations || []).map(String);
+    _targetLocationsSaved = [..._targetLocations];
+    renderTargetLocationsGrid();
+    updateTargetLocationsStatus();
   } catch (e) {
     console.error("resetTargetLocations error:", e);
     if (status) {

package/src/watch/public/index.html

@@ -555,6 +555,13 @@
         <div class="label">← 返回主页面</div>
       </div>
     </div>
+    <div class="settings-layout">
+      <div class="settings-nav" id="settingsNav">
+        <button type="button" class="settings-nav-item active" data-panel="llm" onclick="switchSettingsPanel('llm')">⚙️ LLM 模型</button>
+        <button type="button" class="settings-nav-item" data-panel="countries" onclick="switchSettingsPanel('countries')">🎯 目标国家</button>
+      </div>
+      <div class="settings-panels">
+    <div class="settings-panel active" id="settingsPanel-llm">
     <div class="settings-card">
       <h3>⚙️ LLM 模型配置</h3>
       <p class="settings-hint">切换后立即生效，无需重启服务。配置保存在数据库中。</p>
@@ -586,18 +593,23 @@
         </div>
       </div>
     </div>
+    </div>
+    <div class="settings-panel" id="settingsPanel-countries">
     <div class="settings-card">
       <h3>🎯 目标国家</h3>
-      <p class="settings-hint">设置采集的目标国家列表，保存后写入通用配置文件（~/.tt-help-config.json）。当前仅保存配置，后续接入采集流程后生效。</p>
+      <p class="settings-hint">设置采集的目标国家列表及领取优先级，保存后写入通用配置文件（~/.tt-help-config.json），立即生效。列表顺序即任务领取优先级：越靠前越先领取。</p>
       <div class="settings-form">
         <div class="settings-field">
-          <label>目标国家（英文国家代码，逗号分隔，如 CZ,GR,TH）</label>
-          <input type="text" id="targetLocationsInput" placeholder="CZ,GR,HU,PT,ES,PL,NL,BE,DE,FR,IT,IE,AT,TH,US">
-          <span class="settings-note">可手动输入，或点击下方国家快速选择。</span>
-        </div>
-        <div class="settings-field">
-          <label>快速选择</label>
-          <div class="loc-grid" id="targetCountryGrid"></div>
+          <label>目标国家（拖动卡片排序，位置即领取优先级：越靠前越先领取）</label>
+          <div class="loc-chips" id="targetLocationsGrid"></div>
+          <div class="country-picker" id="countryPicker" style="display:none">
+            <div class="country-picker-title">选择要添加的国家（新加的排最后，可拖动调整优先级）</div>
+            <div class="loc-grid" id="countryPickerGrid"></div>
+            <div class="custom-loc-row">
+              <input type="text" id="customCountryInput" class="custom-loc-input" placeholder="其他代码，如 GB" maxlength="2" onkeydown="if(event.key==='Enter')addCustomCountry()">
+              <button type="button" class="btn-submit" onclick="addCustomCountry()">添加</button>
+            </div>
+          </div>
         </div>
         <div class="settings-status" id="targetLocationsStatus"></div>
         <div class="btn-row">
@@ -606,6 +618,9 @@
         </div>
       </div>
     </div>
+    </div>
+    </div>
+  </div>
   </div>
   <div id="watchdogPage">
     <div class="stats" style="margin-bottom:16px">

package/src/watch/public/style.css

@@ -1703,6 +1703,197 @@ td.user-id:hover {
   display: block;
 }
 
+.settings-layout {
+  display: flex;
+  gap: 20px;
+  max-width: 860px;
+  margin: 0 auto;
+  align-items: flex-start;
+}
+
+.settings-nav {
+  width: 170px;
+  flex-shrink: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  position: sticky;
+  top: 16px;
+}
+
+.settings-nav-item {
+  text-align: left;
+  padding: 10px 14px;
+  background: #1a1a24;
+  border: 1px solid transparent;
+  border-radius: 10px;
+  color: #999;
+  cursor: pointer;
+  font-size: 13px;
+  transition:
+    color 0.15s,
+    background 0.15s,
+    border-color 0.15s;
+}
+
+.settings-nav-item:hover {
+  color: #ccc;
+}
+
+.settings-nav-item.active {
+  color: #60a5fa;
+  border-color: rgba(96, 165, 250, 0.4);
+  background: rgba(96, 165, 250, 0.08);
+}
+
+.settings-panels {
+  flex: 1;
+  min-width: 0;
+}
+
+.settings-panel {
+  display: none;
+}
+
+.settings-panel.active {
+  display: block;
+}
+
+.settings-panel .settings-card {
+  margin: 0;
+}
+
+@media (max-width: 720px) {
+  .settings-layout {
+    flex-direction: column;
+  }
+  .settings-nav {
+    width: 100%;
+    flex-direction: row;
+    flex-wrap: wrap;
+    position: static;
+  }
+}
+
+/* ---- 目标国家宫格（拖拽排序） ---- */
+.loc-chips {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+
+.loc-chip {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 8px 10px;
+  background: #1a1a24;
+  border: 1px solid #333;
+  border-radius: 10px;
+  cursor: grab;
+  user-select: none;
+  font-size: 13px;
+  color: #e0e0e0;
+}
+
+.loc-chip:active {
+  cursor: grabbing;
+}
+
+.loc-chip.dragging {
+  opacity: 0.4;
+  cursor: grabbing;
+}
+
+.loc-chip.drop-before {
+  box-shadow: -3px 0 0 0 #60a5fa;
+}
+
+.loc-chip.drop-after {
+  box-shadow: 3px 0 0 0 #60a5fa;
+}
+
+.loc-chip-idx {
+  min-width: 18px;
+  height: 18px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  background: rgba(96, 165, 250, 0.15);
+  color: #60a5fa;
+  border-radius: 5px;
+  font-size: 11px;
+  font-weight: 600;
+}
+
+.loc-chip-flag {
+  font-size: 15px;
+}
+
+.loc-chip-code {
+  font-weight: 600;
+  letter-spacing: 0.5px;
+}
+
+.loc-chip-del {
+  background: none;
+  border: none;
+  color: #666;
+  font-size: 14px;
+  cursor: pointer;
+  padding: 0 2px;
+  line-height: 1;
+}
+
+.loc-chip-del:hover {
+  color: #f87171;
+}
+
+.loc-chip-add {
+  border: 1px dashed #555;
+  color: #888;
+  background: transparent;
+  font-size: 16px;
+  cursor: pointer;
+  padding: 8px 14px;
+}
+
+.loc-chip-add:hover {
+  border-color: #60a5fa;
+  color: #60a5fa;
+}
+
+.country-picker {
+  margin-top: 12px;
+  padding: 14px;
+  background: #14141c;
+  border: 1px solid #2a2a38;
+  border-radius: 10px;
+}
+
+.country-picker-title {
+  font-size: 12px;
+  color: #888;
+  margin-bottom: 10px;
+}
+
+.country-picker .custom-loc-row {
+  display: flex;
+  gap: 8px;
+  margin-top: 12px;
+}
+
+.country-picker .custom-loc-input {
+  flex: 1;
+  padding: 8px 10px;
+  background: #111;
+  border: 1px solid #333;
+  color: #e0e0e0;
+  border-radius: 6px;
+  font-size: 12px;
+  text-transform: uppercase;
+}
+
 .settings-card {
   background: #1a1a24;
   border-radius: 12px;

package/src/watch/server.js

@@ -2169,7 +2169,7 @@ export function startWatchServer(
           }
           const targetCountries = Array.isArray(body.countries)
             ? body.countries
-            : ["ES"];
+            : getTargetLocations();
           const serverUrl = body.serverUrl || null;
 
           const { scoreTag } = await import("./tag-service.js");
@@ -2192,7 +2192,7 @@ export function startWatchServer(
           const limit = Math.min(parseInt(body.limit) || 10, 50);
           const targetCountries = Array.isArray(body.countries)
             ? body.countries
-            : ["ES"];
+            : getTargetLocations();
           const serverUrl = body.serverUrl || null;
 
           const pendingTags = store.getTagsByStatus("new", limit);