tt-help-cli-ycl 1.3.65 → 1.3.73

package/src/watch/data-store.js

@@ -104,6 +104,8 @@ function initUserDb(filePath) {
       comment_count INTEGER DEFAULT 0,
       guessed_location TEXT,
       location_created TEXT,
+      confirmed_location TEXT,
+      modified_at INTEGER,
       follower_count INTEGER DEFAULT 0,
       following_count INTEGER DEFAULT 0,
       heart_count INTEGER DEFAULT 0,
@@ -132,6 +134,15 @@ function initUserDb(filePath) {
   if (!existingJobColumns.has("latest_video_time")) {
     db.exec(`ALTER TABLE jobs ADD COLUMN latest_video_time INTEGER`);
   }
+  if (!existingJobColumns.has("confirmed_location")) {
+    db.exec(`ALTER TABLE jobs ADD COLUMN confirmed_location TEXT`);
+  }
+  if (!existingJobColumns.has("modified_at")) {
+    db.exec(`ALTER TABLE jobs ADD COLUMN modified_at INTEGER`);
+  }
+  if (!existingJobColumns.has("bio_link")) {
+    db.exec(`ALTER TABLE jobs ADD COLUMN bio_link TEXT`);
+  }
   db.exec(`
     CREATE TABLE IF NOT EXISTS raw_jobs (
       unique_id TEXT PRIMARY KEY,
@@ -151,6 +162,8 @@ function initUserDb(filePath) {
       comment_count INTEGER DEFAULT 0,
       guessed_location TEXT,
       location_created TEXT,
+      confirmed_location TEXT,
+      modified_at INTEGER,
       follower_count INTEGER DEFAULT 0,
       following_count INTEGER DEFAULT 0,
       heart_count INTEGER DEFAULT 0,
@@ -180,6 +193,15 @@ function initUserDb(filePath) {
   if (!existingRawJobColumns.has("latest_video_time")) {
     db.exec(`ALTER TABLE raw_jobs ADD COLUMN latest_video_time INTEGER`);
   }
+  if (!existingRawJobColumns.has("confirmed_location")) {
+    db.exec(`ALTER TABLE raw_jobs ADD COLUMN confirmed_location TEXT`);
+  }
+  if (!existingRawJobColumns.has("modified_at")) {
+    db.exec(`ALTER TABLE raw_jobs ADD COLUMN modified_at INTEGER`);
+  }
+  if (!existingRawJobColumns.has("bio_link")) {
+    db.exec(`ALTER TABLE raw_jobs ADD COLUMN bio_link TEXT`);
+  }
   db.exec(`
     CREATE TABLE IF NOT EXISTS videos (
       id TEXT PRIMARY KEY,
@@ -445,9 +467,10 @@ function addJobToDb(user) {
       updated_at,
       region,
       signature,
+      bio_link,
       sec_uid
     )
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `,
   ).run(
     user.uniqueId,
@@ -491,6 +514,7 @@ function addJobToDb(user) {
     user.updatedAt || now,
     user.region || null,
     user.signature || null,
+    user.bioLink?.link || user.bioLink?.url || user.bioLink || null,
     user.secUid || null,
   );
 }
@@ -534,44 +558,46 @@ function getRawJobsCount() {
 function getDashboardStatsFromDb(targetLocations = []) {
   if (!db) return null;
 
-  const total = getJobsCount();
-  const statusCounts = {
-    pending: 0,
-    processing: 0,
-    done: 0,
-    error: 0,
-    restricted: 0,
-  };
-  const rows = db
+  const targetPlaceholders = targetLocations.map(() => "?").join(", ");
+  const targetParams = targetLocations.length ? targetLocations : [];
+
+  // 合并所有 jobs 表的聚合统计为单次扫描
+  const aggregateRow = db
     .prepare(
       `
-      SELECT status, COUNT(*) as count
+      SELECT
+        COUNT(*) as total,
+        SUM(CASE WHEN status = 'pending' THEN 1 ELSE 0 END) as pending,
+        SUM(CASE WHEN status = 'processing' THEN 1 ELSE 0 END) as processing,
+        SUM(CASE WHEN status = 'done' THEN 1 ELSE 0 END) as done,
+        SUM(CASE WHEN status = 'error' THEN 1 ELSE 0 END) as error,
+        SUM(CASE WHEN status = 'restricted' THEN 1 ELSE 0 END) as restricted,
+        SUM(CASE WHEN tt_seller = 1 AND verified = 0 ${
+          targetLocations.length
+            ? `AND location_created IN (${targetPlaceholders})`
+            : "AND 1 = 0"
+        } THEN 1 ELSE 0 END) as targetUsers,
+        SUM(CASE WHEN no_video = 1 THEN 1 ELSE 0 END) as noVideo,
+        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"video"') > 0 THEN 1 ELSE 0 END) as video,
+        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"comment"') > 0 THEN 1 ELSE 0 END) as comment,
+        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"guess"') > 0 THEN 1 ELSE 0 END) as guess,
+        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"following"') > 0 THEN 1 ELSE 0 END) as following,
+        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"follower"') > 0 THEN 1 ELSE 0 END) as follower,
+        SUM(CASE
+          WHEN status != 'done'
+            AND instr(COALESCE(sources, ''), '"video"') = 0
+            AND instr(COALESCE(sources, ''), '"comment"') = 0
+            AND instr(COALESCE(sources, ''), '"guess"') = 0
+            AND instr(COALESCE(sources, ''), '"following"') = 0
+            AND instr(COALESCE(sources, ''), '"follower"') = 0
+          THEN 1 ELSE 0 END) as seed,
+        SUM(CASE WHEN COALESCE(tt_seller, '') = '' AND COALESCE(user_update_count, 0) <= 0 THEN 1 ELSE 0 END) as userUpdateTasks
       FROM jobs
-      GROUP BY status
     `,
     )
-    .all();
-  for (const row of rows) {
-    if (row.status && statusCounts[row.status] !== undefined) {
-      statusCounts[row.status] = row.count;
-    }
-  }
-
-  const targetPlaceholders = targetLocations.map(() => "?").join(", ");
-  const targetUsers = targetLocations.length
-    ? db
-        .prepare(
-          `
-          SELECT COUNT(*) as c
-          FROM jobs
-          WHERE tt_seller = 1
-            AND verified = 0
-            AND location_created IN (${targetPlaceholders})
-        `,
-        )
-        .get(...targetLocations).c
-    : 0;
+    .get(...targetParams);
 
+  // countryStats 和 targetCountryStats 需要 GROUP BY，保留为独立查询
   const countryStats = db
     .prepare(
       `
@@ -591,7 +617,7 @@ function getDashboardStatsFromDb(targetLocations = []) {
       ORDER BY count DESC
     `,
     )
-    .all(...targetLocations);
+    .all(...targetParams);
 
   const targetCountryStats = targetLocations.length
     ? db
@@ -609,58 +635,32 @@ function getDashboardStatsFromDb(targetLocations = []) {
         .all(...targetLocations)
     : [];
 
-  const sourceRow = db
-    .prepare(
-      `
-      SELECT
-        SUM(CASE WHEN status = 'done' THEN 1 ELSE 0 END) as processed,
-        SUM(CASE WHEN status = 'restricted' THEN 1 ELSE 0 END) as restricted,
-        SUM(CASE WHEN status = 'error' THEN 1 ELSE 0 END) as error,
-        SUM(CASE WHEN no_video = 1 THEN 1 ELSE 0 END) as noVideo,
-        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"video"') > 0 THEN 1 ELSE 0 END) as video,
-        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"comment"') > 0 THEN 1 ELSE 0 END) as comment,
-        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"guess"') > 0 THEN 1 ELSE 0 END) as guess,
-        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"following"') > 0 THEN 1 ELSE 0 END) as following,
-        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"follower"') > 0 THEN 1 ELSE 0 END) as follower,
-        SUM(CASE
-          WHEN status != 'done'
-            AND instr(COALESCE(sources, ''), '"video"') = 0
-            AND instr(COALESCE(sources, ''), '"comment"') = 0
-            AND instr(COALESCE(sources, ''), '"guess"') = 0
-            AND instr(COALESCE(sources, ''), '"following"') = 0
-            AND instr(COALESCE(sources, ''), '"follower"') = 0
-          THEN 1 ELSE 0 END) as seed
-      FROM jobs
-    `,
-    )
-    .get();
-
   return {
-    totalUsers: total,
+    totalUsers: aggregateRow.total,
     rawJobs: getRawJobsCount(),
     dbTotalUsers: getUserDbCount(),
-    jobsTotal: total,
-    jobsPending: getPendingJobsCount(),
-    processedUsers: statusCounts.done,
-    pendingUsers: statusCounts.pending,
-    processingUsers: statusCounts.processing,
-    restrictedUsers: statusCounts.restricted,
-    errorUsers: statusCounts.error,
-    targetUsers,
-    userUpdateTasks: getPendingJobsUserUpdateCount(),
+    jobsTotal: aggregateRow.total,
+    jobsPending: aggregateRow.pending,
+    processedUsers: aggregateRow.done,
+    pendingUsers: aggregateRow.pending,
+    processingUsers: aggregateRow.processing,
+    restrictedUsers: aggregateRow.restricted,
+    errorUsers: aggregateRow.error,
+    targetUsers: aggregateRow.targetUsers,
+    userUpdateTasks: aggregateRow.userUpdateTasks,
     targetCountryStats,
     countryStats,
     sourceStats: {
-      seed: sourceRow.seed || 0,
-      video: sourceRow.video || 0,
-      comment: sourceRow.comment || 0,
-      guess: sourceRow.guess || 0,
-      following: sourceRow.following || 0,
-      follower: sourceRow.follower || 0,
-      processed: sourceRow.processed || 0,
-      restricted: sourceRow.restricted || 0,
-      error: sourceRow.error || 0,
-      noVideo: sourceRow.noVideo || 0,
+      seed: aggregateRow.seed || 0,
+      video: aggregateRow.video || 0,
+      comment: aggregateRow.comment || 0,
+      guess: aggregateRow.guess || 0,
+      following: aggregateRow.following || 0,
+      follower: aggregateRow.follower || 0,
+      processed: aggregateRow.done,
+      restricted: aggregateRow.restricted,
+      error: aggregateRow.error,
+      noVideo: aggregateRow.noVideo || 0,
     },
   };
 }
@@ -857,7 +857,7 @@ function moveJobsToRawByCountry(scope, country) {
 
   let scopeWhere = "";
   if (normalizedScope === "pending") {
-    scopeWhere = `status = 'pending'`;
+    scopeWhere = `status = 'pending' AND COALESCE(user_update_count, 0) >= 2`;
   } else if (normalizedScope === "userUpdate") {
     scopeWhere = `COALESCE(tt_seller, '') = '' AND COALESCE(user_update_count, 0) <= 0`;
   } else {
@@ -1105,14 +1105,14 @@ function restoreRawJobById(uniqueId) {
         pinned, no_video, restricted, user_update_count, tt_seller, verified,
         video_count, comment_count, guessed_location, location_created,
         follower_count, following_count, heart_count, refresh_time,
-        processed, processed_at, created_at, updated_at, region, signature, sec_uid
+        processed, processed_at, created_at, updated_at, region, signature, bio_link, sec_uid
       )
       SELECT
         unique_id, nickname, status, sources, claimed_by, claimed_at, error,
         pinned, no_video, restricted, user_update_count, tt_seller, verified,
         video_count, comment_count, guessed_location, location_created,
         follower_count, following_count, heart_count, refresh_time,
-        processed, processed_at, created_at, updated_at, region, signature, sec_uid
+        processed, processed_at, created_at, updated_at, region, signature, bio_link, sec_uid
       FROM raw_jobs WHERE unique_id = ?
     `,
     ).run(safeId);
@@ -1176,14 +1176,14 @@ function restoreRawJobsByFilter({ search, location, hasVideo, hasFollower }) {
         pinned, no_video, restricted, user_update_count, tt_seller, verified,
         video_count, comment_count, guessed_location, location_created,
         follower_count, following_count, heart_count, refresh_time,
-        processed, processed_at, created_at, updated_at, region, signature, sec_uid
+        processed, processed_at, created_at, updated_at, region, signature, bio_link, sec_uid
       )
       SELECT
         unique_id, nickname, status, sources, claimed_by, claimed_at, error,
         pinned, no_video, restricted, user_update_count, tt_seller, verified,
         video_count, comment_count, guessed_location, location_created,
         follower_count, following_count, heart_count, refresh_time,
-        processed, processed_at, created_at, updated_at, region, signature, sec_uid
+        processed, processed_at, created_at, updated_at, region, signature, bio_link, sec_uid
       FROM raw_jobs WHERE ${whereSql}
     `,
     ).run(...args);
@@ -1313,46 +1313,59 @@ function getUsersPageFromDb({
   }
 
   const whereSql = where.length ? `WHERE ${where.join(" AND ")}` : "";
-  const total = db
-    .prepare(`SELECT COUNT(*) as c FROM jobs ${whereSql}`)
-    .get(...args).c;
 
+  // COUNT 缓存：134 万条数据全表扫描慢，5 秒内返回缓存值
+  const cacheKey = whereSql + "|" + args.join(",");
+  if (!getUsersPageFromDb._countCache)
+    getUsersPageFromDb._countCache = new Map();
+  const cachedCount = getUsersPageFromDb._countCache.get(cacheKey);
+  let total;
+  if (cachedCount && Date.now() - cachedCount.time < 5000) {
+    total = cachedCount.c;
+  } else {
+    total = db
+      .prepare(`SELECT COUNT(*) as c FROM jobs ${whereSql}`)
+      .get(...args).c;
+    getUsersPageFromDb._countCache.set(cacheKey, {
+      c: total,
+      time: Date.now(),
+    });
+  }
+
+  // 只查询前端需要的列，避免 SELECT * 带来的大字段传输和 mapJobRow 开销
   const rows = db
     .prepare(
       `
-      SELECT *
-      FROM jobs
-      ${whereSql}
-      ORDER BY
-        pinned DESC,
-        CASE status
-          WHEN 'processing' THEN 0
-          WHEN 'pending' THEN 1
-          WHEN 'done' THEN 2
-          WHEN 'error' THEN 3
-          WHEN 'restricted' THEN 4
-          ELSE 9
-        END ASC,
-        CASE
-          WHEN status = 'done' THEN -COALESCE(processed_at, 0)
-          ELSE 0
-        END ASC,
-        CASE
-          WHEN status = 'pending' AND tt_seller = 1 AND verified = 0 THEN 0
-          ELSE 1
-        END ASC,
-        CASE
-          WHEN status = 'pending' AND UPPER(COALESCE(guessed_location, '')) IN ('PL', 'NL', 'BE', 'AT') THEN 0
-          WHEN status = 'pending' AND UPPER(COALESCE(guessed_location, '')) IN ('DE', 'FR', 'IT', 'IE', 'ES') THEN 1
-          ELSE 2
-        END ASC,
-        COALESCE(follower_count, 0) DESC,
-        COALESCE(processed_at, 0) DESC,
-        unique_id ASC
-      LIMIT ? OFFSET ?
-    `,
+        SELECT
+          unique_id, nickname, sec_uid, status, sources,
+          tt_seller, verified, follower_count, following_count,
+          location_created, latest_video_time, refresh_time,
+          guessed_location, pinned, processed_at, video_count,
+          no_video, claimed_by, claimed_at, created_at, updated_at
+        FROM jobs
+        ${whereSql}
+        ORDER BY
+          pinned DESC,
+          CASE
+            WHEN ? = 'done' THEN COALESCE(processed_at, 0) * -1
+            WHEN ? = '1' THEN COALESCE(refresh_time, 0) * -1
+            ELSE 0
+          END ASC,
+          CASE status
+            WHEN 'processing' THEN 0
+            WHEN 'pending' THEN 1
+            WHEN 'done' THEN 2
+            WHEN 'error' THEN 3
+            WHEN 'restricted' THEN 4
+            ELSE 9
+          END ASC,
+          COALESCE(follower_count, 0) DESC,
+          COALESCE(processed_at, 0) DESC,
+            unique_id ASC
+          LIMIT ? OFFSET ?
+        `,
     )
-    .all(...args, safeLimit, safeOffset)
+    .all(...args, status || "", target, safeLimit, safeOffset)
     .map(mapJobRow);
 
   return {
@@ -1371,18 +1384,12 @@ function getTargetUsersFromDb(targetLocations = []) {
   const rows = db
     .prepare(
       `
-      SELECT
-        unique_id,
-        nickname,
-        follower_count,
-        tt_seller,
-        verified,
-        location_created,
-        latest_video_time,
-        status,
-        sources
-      FROM jobs
-      WHERE tt_seller = 1
+        SELECT
+          unique_id, nickname, sec_uid, status, sources,
+          tt_seller, verified, follower_count, following_count,
+          location_created, latest_video_time, refresh_time,
+          guessed_location, pinned, processed_at, video_count,
+          no_video, claimed_by, claimed_at, created_at, updated_at
         AND verified = 0
         AND location_created IN (${placeholders})
       ORDER BY COALESCE(follower_count, 0) DESC, unique_id ASC
@@ -1397,13 +1404,109 @@ function getTargetUsersFromDb(targetLocations = []) {
   };
 }
 
-function getTargetUsersByCountryFromDb(targetLocations = []) {
+function getTargetUsersByCountryFromDb(targetLocations = [], options = {}) {
   if (!db) return null;
   if (!targetLocations.length) {
     return { countries: [] };
   }
 
+  const {
+    summaryOnly = false,
+    country: filterCountry,
+    search,
+    limit,
+    offset,
+  } = options;
   const placeholders = targetLocations.map(() => "?").join(", ");
+  const baseParams = [...targetLocations];
+
+  // 摘要模式：只返回各国统计数，不返回用户数据
+  if (summaryOnly) {
+    const statsRows = db
+      .prepare(
+        `
+        SELECT location_created as country, COUNT(*) as count
+        FROM jobs
+        WHERE tt_seller = 1
+          AND verified = 0
+          AND location_created IN (${placeholders})
+        GROUP BY location_created
+        ORDER BY count DESC
+      `,
+      )
+      .all(...targetLocations);
+
+    const countries = statsRows.map((r) => ({
+      country: r.country,
+      count: r.count,
+      users: undefined,
+    }));
+    return {
+      total: statsRows.reduce((s, r) => s + r.count, 0),
+      countries,
+    };
+  }
+
+  // 分页模式：按国家或全局分页查询用户
+  if (limit !== undefined) {
+    let sql = `
+      SELECT
+        unique_id,
+        nickname,
+        follower_count,
+        video_count,
+        tt_seller,
+        verified,
+        location_created,
+        confirmed_location,
+        modified_at,
+        latest_video_time,
+        refresh_time,
+        status,
+        sources
+      FROM jobs
+      WHERE tt_seller = 1
+        AND verified = 0
+        AND location_created IN (${placeholders})
+    `;
+    const params = [...targetLocations];
+
+    if (filterCountry) {
+      sql += ` AND location_created = ?`;
+      params.push(filterCountry);
+    }
+
+    if (search) {
+      sql += ` AND (unique_id LIKE ? OR nickname LIKE ?)`;
+      const likeSearch = `%${search}%`;
+      params.push(likeSearch, likeSearch);
+    }
+
+    sql += ` ORDER BY location_created ASC, COALESCE(latest_video_time, 0) DESC`;
+
+    const countSql = sql.replace(
+      /SELECT[^FROM]*FROM/,
+      "SELECT COUNT(*) as cnt FROM",
+    );
+    const total = db.prepare(countSql).get(...params)?.cnt || 0;
+
+    sql += ` LIMIT ? OFFSET ?`;
+    const safeLimit = Math.min(Math.floor(limit), 10000);
+    const safeOffset = Math.max(Math.floor(offset), 0);
+
+    const rows = db
+      .prepare(sql)
+      .all(...params, safeLimit, safeOffset)
+      .map(mapJobRow);
+
+    return {
+      total,
+      limit: safeLimit,
+      offset: safeOffset,
+      users: rows,
+    };
+  }
+
   const rows = db
     .prepare(
       `
@@ -1415,6 +1518,8 @@ function getTargetUsersByCountryFromDb(targetLocations = []) {
         tt_seller,
         verified,
         location_created,
+        confirmed_location,
+        modified_at,
         latest_video_time,
         refresh_time,
         status,
@@ -1490,6 +1595,8 @@ const writableJobColumns = new Set([
   "comment_count",
   "guessed_location",
   "location_created",
+  "confirmed_location",
+  "modified_at",
   "follower_count",
   "following_count",
   "heart_count",
@@ -1499,6 +1606,7 @@ const writableJobColumns = new Set([
   "updated_at",
   "region",
   "signature",
+  "bio_link",
   "sec_uid",
   "status_code",
   "latest_video_time",
@@ -1587,7 +1695,9 @@ function updateJobInfo(uniqueId, info, incrementCount = true) {
   for (const [key, value] of Object.entries(info || {})) {
     if (key === "uniqueId" || key === "unique_id") continue;
     if (value === undefined || value === "") continue;
-    const column = camelToSnake(key);
+    let column = camelToSnake(key);
+    // 字段别名：bio → signature
+    if (column === "bio") column = "signature";
     if (!writableJobColumns.has(column)) continue;
     nextValues[column] = normalizeJobValue(column, value);
   }
@@ -2754,7 +2864,9 @@ export function createStore(filePath) {
       user.ttSeller = result.userInfo?.ttSeller ?? user.ttSeller;
       user.verified = result.userInfo?.verified ?? user.verified;
       user.region = result.userInfo?.region || user.region;
-      user.signature = result.userInfo?.signature ?? user.signature;
+      user.signature =
+        result.userInfo?.signature ?? result.userInfo?.bio ?? user.signature;
+      user.bioLink = result.userInfo?.bioLink ?? user.bioLink;
       user.followingCount =
         result.userInfo?.followingCount ?? user.followingCount;
       user.heartCount = result.userInfo?.heartCount ?? user.heartCount;
@@ -3201,39 +3313,161 @@ export function createStore(filePath) {
     return { ok: true, userUpdateCount: user.userUpdateCount };
   }
 
+  function updateUserLocation(uniqueId, location) {
+    if (db) {
+      const existing = db
+        .prepare("SELECT * FROM jobs WHERE unique_id = ?")
+        .get(uniqueId);
+      if (!existing) return { error: "user not found" };
+      const now = Date.now();
+      db.prepare(
+        "UPDATE jobs SET location_created = ?, modified_at = ?, updated_at = ? WHERE unique_id = ?",
+      ).run(location, now, now, uniqueId);
+      return { ok: true, location, modifiedAt: now };
+    }
+
+    const user = getUser(uniqueId);
+    if (!user) return { error: "user not found" };
+    user.locationCreated = location;
+    user.modifiedAt = Date.now();
+    user.updatedAt = Date.now();
+    user.userUpdateCount = (user.userUpdateCount || 0) + 1;
+    save();
+    return { ok: true, location, modifiedAt: user.modifiedAt };
+  }
+
+  // 将单个 job 移动到 raw_jobs 表（完整字段复制 + 删除原记录）
+  function moveJobToRaw(uniqueId) {
+    if (!db) return false;
+    const safeId = String(uniqueId).trim();
+    if (!safeId) return false;
+
+    const moveSingleTxn = db.transaction(() => {
+      db.prepare(
+        `
+        INSERT OR REPLACE INTO raw_jobs (
+          unique_id, nickname, status, sources, claimed_by, claimed_at,
+          error, pinned, no_video, restricted, user_update_count,
+          tt_seller, verified, video_count, comment_count,
+          guessed_location, location_created, confirmed_location, modified_at,
+          follower_count, following_count, heart_count, refresh_time,
+          processed, processed_at, created_at, updated_at,
+          region, signature, bio_link, sec_uid, status_code, latest_video_time
+        )
+        SELECT
+          unique_id, nickname, status, sources, claimed_by, claimed_at,
+          error, pinned, no_video, restricted, user_update_count,
+          tt_seller, verified, video_count, comment_count,
+          guessed_location, location_created, confirmed_location, modified_at,
+          follower_count, following_count, heart_count, refresh_time,
+          processed, processed_at, created_at, updated_at,
+          region, signature, bio_link, sec_uid, status_code, latest_video_time
+        FROM jobs WHERE unique_id = ?
+      `,
+      ).run(safeId);
+
+      db.prepare("DELETE FROM jobs WHERE unique_id = ?").run(safeId);
+    });
+    moveSingleTxn();
+    return true;
+  }
+
   function batchUpdateUserInfo(updates) {
     if (db) {
-      const txn = db.transaction((items) =>
-        items.map((item) => {
+      const results = [];
+      const moveList = [];
+
+      const txn = db.transaction((items) => {
+        items.forEach((item) => {
+          const uniqueId = item.uniqueId;
           // 处理 { error: true, statusCode: xxx } 的情况
           const info = item.info;
+          let updateResult;
           if (info && info.error && info.statusCode !== undefined) {
             // 只更新 status_code，不更新其他字段
-            return updateJobInfo(
-              item.uniqueId,
+            updateResult = updateJobInfo(
+              uniqueId,
               { statusCode: info.statusCode },
               true,
             );
+          } else {
+            updateResult = updateJobInfo(uniqueId, info, true);
           }
-          return updateJobInfo(item.uniqueId, info, true);
-        }),
-      );
-      return txn(updates).map((result, index) =>
-        result.error
-          ? { uniqueId: updates[index].uniqueId, error: result.error }
-          : {
-              uniqueId: updates[index].uniqueId,
+
+          if (updateResult.error) {
+            results.push({ uniqueId, error: updateResult.error });
+            return;
+          }
+
+          // 检查 tt_seller：非商家则标记为需要移动到毛料表
+          const row = getJobRow(uniqueId);
+          const ttSeller = row ? row.tt_seller : null;
+          if (ttSeller) {
+            // 商家：保持当前逻辑
+            results.push({
+              uniqueId,
               ok: true,
-              userUpdateCount: result.userUpdateCount,
-            },
-      );
+              userUpdateCount: updateResult.userUpdateCount,
+            });
+          } else {
+            // 非商家：标记移动
+            results.push({
+              uniqueId,
+              ok: true,
+              userUpdateCount: updateResult.userUpdateCount,
+              _movedToRaw: true,
+            });
+            moveList.push(uniqueId);
+          }
+        });
+      });
+      txn(updates);
+
+      // 在事务外执行移动操作（避免嵌套 transaction 问题）
+      if (moveList.length > 0) {
+        const moveTxn = db.transaction((ids) => {
+          ids.forEach((uid) => {
+            db.prepare(
+              `
+              INSERT OR REPLACE INTO raw_jobs (
+                unique_id, nickname, status, sources, claimed_by, claimed_at,
+                error, pinned, no_video, restricted, user_update_count,
+                tt_seller, verified, video_count, comment_count,
+                guessed_location, location_created, confirmed_location, modified_at,
+                follower_count, following_count, heart_count, refresh_time,
+                processed, processed_at, created_at, updated_at,
+                region, signature, bio_link, sec_uid, status_code, latest_video_time
+              )
+              SELECT
+                unique_id, nickname, status, sources, claimed_by, claimed_at,
+                error, pinned, no_video, restricted, user_update_count,
+                tt_seller, verified, video_count, comment_count,
+                guessed_location, location_created, confirmed_location, modified_at,
+                follower_count, following_count, heart_count, refresh_time,
+                processed, processed_at, created_at, updated_at,
+                region, signature, bio_link, sec_uid, status_code, latest_video_time
+              FROM jobs WHERE unique_id = ?
+            `,
+            ).run(uid);
+
+            db.prepare("DELETE FROM jobs WHERE unique_id = ?").run(uid);
+          });
+        });
+        moveTxn(moveList);
+      }
+
+      // 清理内部标记
+      return results.map((r) => {
+        const { _movedToRaw, ...rest } = r;
+        return rest;
+      });
     }
 
-    const results = [];
+    const memResults = [];
     for (const item of updates) {
       const user = getUser(item.uniqueId);
       if (!user) {
-        results.push({ uniqueId: item.uniqueId, error: "user not found" });
+        memResults.push({ uniqueId: item.uniqueId, error: "user not found" });
         continue;
       }
       const info = item.info;
@@ -3255,14 +3489,14 @@ export function createStore(filePath) {
       }
       user.userUpdateCount = (user.userUpdateCount || 0) + 1;
       user.updatedAt = Date.now();
-      results.push({
+      memResults.push({
         uniqueId: item.uniqueId,
         ok: true,
         userUpdateCount: user.userUpdateCount,
       });
     }
     save();
-    return results;
+    return memResults;
   }
 
   // 视频登记
@@ -3350,7 +3584,7 @@ export function createStore(filePath) {
   }
 
   function getVideosPage(limit, offset) {
-    const safeLimit = Math.max(1, Math.min(200, parseInt(limit) || 50));
+    const safeLimit = Math.max(1, Math.min(100, parseInt(limit) || 50));
     const safeOffset = Math.max(0, parseInt(offset) || 0);
 
     if (db) {
@@ -3503,6 +3737,7 @@ export function createStore(filePath) {
     commitRedoJob,
     getPendingUserUpdateTasks,
     updateUserInfo,
+    updateUserLocation,
     batchUpdateUserInfo,
     reportClientError,
     deleteClientError,