tt-help-cli-ycl 1.4.27 → 1.4.29

package/src/watch/data-store.js

@@ -50,6 +50,7 @@ import {
   getJobRow,
   getJobBaseRow,
   getJob,
+  getUserTable,
   getBulkAuthorLocations,
   getAllJobs,
   getVideoRow,
@@ -102,14 +103,13 @@ import {
   claimRefreshTag,
   reportRefreshResult,
   getRefreshStats,
+  getProductiveSearchTask,
+  claimSearchTag,
+  reportSearchResult,
 } from "./db-tags.js";
 
 // LLM 打分
-import {
-  scoreJobLocation,
-  scoreJobsBatch,
-  createLlmOffsetStore,
-} from "./llm-scoring.js";
+import { scoreJobLocation, scoreJobsBatch } from "./llm-scoring.js";
 
 // ===== 薄包装函数（保持外部 API 不变）=====
 
@@ -245,59 +245,87 @@ function getUsersPageFromDb({
 
   const whereSql = where.length ? `WHERE ${where.join(" AND ")}` : "";
 
-  // COUNT 缓存：134 万条数据全表扫描慢，5 秒内返回缓存值
-  const cacheKey = whereSql + "|" + args.join(",");
+  const selectCols = `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`;
+
+  // ── 排序子句 ──
+  // task_queue: 处理中优先于待处理
+  // jobs: 单状态表，无需状态 CASE（所有行状态相同）
+  const tqOrder = `pinned DESC, CASE status WHEN 'processing' THEN 0 ELSE 1 END, COALESCE(processed_at, 0) DESC, COALESCE(follower_count, 0) DESC, unique_id ASC`;
+  const jobsOrder = `pinned DESC, COALESCE(processed_at, 0) DESC, COALESCE(follower_count, 0) DESC, unique_id ASC`;
+
+  // ── COUNT 查询 ──
+  let countSql;
+  let countArgs = args;
+
+  if (status === "pending" || status === "processing") {
+    countSql = `SELECT COUNT(*) as c FROM task_queue ${whereSql}`;
+  } else if (
+    status === "done" ||
+    status === "error" ||
+    status === "restricted"
+  ) {
+    countSql = `SELECT COUNT(*) as c FROM jobs ${whereSql}`;
+  } else {
+    // all: 只查 task_queue（处理中+待处理），不碰 jobs 表
+    countSql = `SELECT COUNT(*) as c FROM task_queue ${whereSql}`;
+  }
+
+  const cacheKey = whereSql + "|" + args.join(",") + "|" + (status || "all");
   if (!getUsersPageFromDb._countCache)
     getUsersPageFromDb._countCache = new Map();
   const cachedCount = getUsersPageFromDb._countCache.get(cacheKey);
   let total;
-  if (cachedCount && Date.now() - cachedCount.time < 5000) {
+  if (cachedCount && Date.now() - cachedCount.time < 30000) {
     total = cachedCount.c;
   } else {
     total = getDb()
-      .prepare(`SELECT COUNT(*) as c FROM jobs ${whereSql}`)
-      .get(...args).c;
+      .prepare(countSql)
+      .get(...countArgs).c;
     getUsersPageFromDb._countCache.set(cacheKey, {
       c: total,
       time: Date.now(),
     });
   }
 
-  // 只查询前端需要的列，避免 SELECT * 带来的大字段传输和 mapJobRow 开销
-  const rows = getDb()
-    .prepare(
-      `
-        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, status || "", target, safeLimit, safeOffset)
-    .map(mapJobRow);
+  // ── 数据查询：单表直查 + 简化排序，all 拆分为独立查询 JS 合并 ──
+  let rows;
+
+  if (status === "pending" || status === "processing") {
+    // 单表：直接查，处理中排前
+    const sql = `SELECT ${selectCols} FROM task_queue ${whereSql}
+      ORDER BY ${tqOrder}
+      LIMIT ? OFFSET ?`;
+    rows = getDb()
+      .prepare(sql)
+      .all(...args, safeLimit, safeOffset)
+      .map(mapJobRow);
+  } else if (
+    status === "done" ||
+    status === "error" ||
+    status === "restricted"
+  ) {
+    // 单表：直接查
+    const sql = `SELECT ${selectCols} FROM jobs ${whereSql}
+      ORDER BY ${jobsOrder}
+      LIMIT ? OFFSET ?`;
+    rows = getDb()
+      .prepare(sql)
+      .all(...args, safeLimit, safeOffset)
+      .map(mapJobRow);
+  } else {
+    // all: 只查 task_queue（处理中+待处理），不碰 jobs 表
+    const sql = `SELECT ${selectCols} FROM task_queue ${whereSql}
+      ORDER BY ${tqOrder}
+      LIMIT ? OFFSET ?`;
+    rows = getDb()
+      .prepare(sql)
+      .all(...args, safeLimit, safeOffset)
+      .map(mapJobRow);
+  }
 
   return {
     total,
@@ -670,14 +698,6 @@ export function createStore(filePath, options = {}) {
   }
 
   // refillJobsFromRaw 的 LLM 打分配置（自动补充任务时使用）
-  const refillLlmConfig = {
-    llmScore: false,
-    llmMinScore: 60,
-    llmSampleSize: 100,
-    llmTagRatio: 0.4,
-    llmCommentRatio: 0.3,
-    ...options.refillLlm,
-  };
 
   let data = [];
   // uniqueId → index 内存索引，O(1) 查找
@@ -687,16 +707,12 @@ export function createStore(filePath, options = {}) {
   let clientLoginStatus = new Map();
   // 活跃客户端追踪：clientId → { type, ip, port, userId, lastSeen }
   let activeClients = new Map();
-  // refill 锁：防止多个 claimNextJob 同时触发 LLM refill
-  let refillLock = null; // Promise | null
   // LLM 采样偏移量记忆：按猜测国家记录上次查询位置，避免重复采样
   // 格式: { "ES": 300, "PL": 500, "NL": 400 }
-  const offsetStore = createLlmOffsetStore();
   if (filePath) {
     // 初始化 SQLite 用户表（用于判重）
     initDb(filePath);
     // 从数据库恢复偏移量
-    offsetStore.load();
   }
 
   // stats 缓存
@@ -860,7 +876,6 @@ export function createStore(filePath, options = {}) {
     // 数据库模式：先保存 LLM 偏移量，再备份数据库
     if (getDb() && getDbPath()) {
       try {
-        offsetStore.save();
       } catch (e) {
         console.error(`[data-store] 保存 LLM 偏移量失败: ${e.message}`);
       }
@@ -1082,443 +1097,6 @@ export function createStore(filePath, options = {}) {
     return data;
   }
 
-  /**
-   * 从 raw_jobs 中移动一批符合条件的任务到 jobs 表
-   * @param {string[]} locations - 目标国家列表（null 表示不限制）
-   * @param {number} limit - 每次移动的最大数量，默认 500
-   * @param {Object} options - 可选配置
-   * @param {boolean} options.llmScore - 是否启用 LLM 打分过滤，默认 false
-   * @param {number} options.llmMinScore - LLM 最低分数阈值，默认 60
-   * @param {number} options.llmSampleSize - LLM 打分的采样数量，默认 100
-   * @returns {{ moved: number }} 实际移动的数量
-   */
-  function refillJobsFromRaw(locations = null, limit = 500, options = {}) {
-    if (!getDb()) {
-      return { moved: 0, error: "getDb() not ready" };
-    }
-
-    const safeLimit = Math.max(1, Math.min(2000, parseInt(limit) || 500));
-    const normalizedLocations = locations
-      ? locations.map((loc) => String(loc).trim().toUpperCase()).filter(Boolean)
-      : null;
-
-    const useLlm = !!options.llmScore;
-    const llmMinScore = options.llmMinScore ?? 60;
-    const llmSampleSize = options.llmSampleSize ?? 100;
-
-    // 构建 WHERE 条件
-    const conditions = [
-      "COALESCE(video_count, 0) > 6",
-      "COALESCE(follower_count, 0) > 0",
-      "COALESCE(following_count, 0) > 0",
-    ];
-    const args = [];
-
-    if (normalizedLocations && normalizedLocations.length > 0) {
-      conditions.push(
-        `(UPPER(COALESCE(guessed_location, '')) IN (${normalizedLocations.map(() => "?").join(", ")}) OR COALESCE(guessed_location, '') = '')`,
-      );
-      args.push(...normalizedLocations);
-    }
-
-    const whereSql = conditions.join(" AND ");
-
-    // 统计符合条件的数量
-    const count =
-      getDb()
-        .prepare(`SELECT COUNT(*) as c FROM raw_jobs WHERE ${whereSql}`)
-        .get(...args)?.c || 0;
-
-    if (!count) {
-      return { moved: 0 };
-    }
-
-    // 如果启用 LLM 打分：tag 和 comment 免打分直接入围，其余走 LLM 打分
-    if (useLlm && normalizedLocations && normalizedLocations.length > 0) {
-      const llmTotal = options.llmTotal ?? 200; // 总条数
-      const llmTagRatio = options.llmTagRatio ?? 0.4; // tag 占比 40%
-      const llmCommentRatio = options.llmCommentRatio ?? 0.3; // comment 占比 30%
-      const llmTagLimit = Math.floor(llmTotal * llmTagRatio); // tag 上限
-      const llmCommentLimit = Math.floor(llmTotal * llmCommentRatio); // comment 上限
-      const llmLLMTarget = llmTotal - llmTagLimit - llmCommentLimit; // LLM 打分目标
-      const llmMinScore = options.llmMinScore ?? 60;
-      const llmSampleSize = options.llmSampleSize ?? 100;
-      const maxBatches = options.llmMaxBatches ?? 10;
-
-      console.error(
-        `[data-store] LLM 调度开始: 总目标 ${llmTotal} 条，tag ${llmTagLimit} 条，comment ${llmCommentLimit} 条（免打分），LLM 打分 ${llmLLMTarget} 条`,
-      );
-
-      // 返回 Promise，调用方需要 await
-      return (async () => {
-        const allTagQualified = [];
-        const allCommentQualified = [];
-        const allLLMQualified = [];
-        const allScores = [];
-
-        // ===== 第一步：一次性取 tag（全局，最多 llmTagLimit 条，免打分）=====
-        let tagOffset = offsetStore.get("_tag") || 0;
-        const tagGlobalCount =
-          getDb()
-            .prepare(
-              `SELECT COUNT(*) as c FROM raw_jobs WHERE ${whereSql} AND sources LIKE '%tag%'`,
-            )
-            .get(...args)?.c || 0;
-
-        if (tagOffset >= tagGlobalCount) {
-          tagOffset = 0;
-          offsetStore.set("_tag", 0);
-        }
-
-        console.error(
-          `[data-store] Tag 全局共 ${tagGlobalCount} 条，从偏移量 ${tagOffset} 开始`,
-        );
-
-        while (
-          allTagQualified.length < llmTagLimit &&
-          tagOffset < tagGlobalCount
-        ) {
-          const batch = getDb()
-            .prepare(
-              `
-              SELECT * FROM raw_jobs WHERE ${whereSql} AND sources LIKE '%tag%'
-              ORDER BY COALESCE(video_count, 0) DESC, created_at DESC
-              LIMIT ? OFFSET ?
-            `,
-            )
-            .all(
-              ...args,
-              Math.min(llmSampleSize, llmTagLimit - allTagQualified.length),
-              tagOffset,
-            );
-
-          if (!batch.length) break;
-
-          allTagQualified.push(...batch.map((s) => s.unique_id));
-          tagOffset += batch.length;
-
-          console.error(
-            `[data-store] Tag 本批 ${batch.length} 条，累计 ${allTagQualified.length}/${llmTagLimit}`,
-          );
-        }
-
-        offsetStore.set("_tag", tagOffset);
-
-        // 让出事件循环，避免长时间阻塞监控页面及其他客户端请求
-        await new Promise(setImmediate);
-
-        // ===== 第二步：一次性取 comment（全局，最多 llmCommentLimit 条，免打分）=====
-        let commentOffset = offsetStore.get("_comment") || 0;
-        const commentGlobalCount =
-          getDb()
-            .prepare(
-              `SELECT COUNT(*) as c FROM raw_jobs WHERE ${whereSql} AND sources LIKE '%comment%' AND sources NOT LIKE '%tag%'`,
-            )
-            .get(...args)?.c || 0;
-
-        if (commentOffset >= commentGlobalCount) {
-          commentOffset = 0;
-          offsetStore.set("_comment", 0);
-        }
-
-        console.error(
-          `[data-store] Comment 全局共 ${commentGlobalCount} 条，从偏移量 ${commentOffset} 开始`,
-        );
-
-        while (
-          allCommentQualified.length < llmCommentLimit &&
-          commentOffset < commentGlobalCount
-        ) {
-          const batch = getDb()
-            .prepare(
-              `
-              SELECT * FROM raw_jobs WHERE ${whereSql} AND sources LIKE '%comment%' AND sources NOT LIKE '%tag%'
-              ORDER BY COALESCE(video_count, 0) DESC, created_at DESC
-              LIMIT ? OFFSET ?
-            `,
-            )
-            .all(
-              ...args,
-              Math.min(
-                llmSampleSize,
-                llmCommentLimit - allCommentQualified.length,
-              ),
-              commentOffset,
-            );
-
-          if (!batch.length) break;
-
-          allCommentQualified.push(...batch.map((s) => s.unique_id));
-          commentOffset += batch.length;
-
-          console.error(
-            `[data-store] Comment 本批 ${batch.length} 条，累计 ${allCommentQualified.length}/${llmCommentLimit}`,
-          );
-        }
-
-        offsetStore.set("_comment", commentOffset);
-
-        // 让出事件循环，避免长时间阻塞监控页面及其他客户端请求
-        await new Promise(setImmediate);
-
-        // ===== 第三步：按国家取非 tag 非 comment，走 LLM 打分，直到合格数达到 llmLLMTarget =====
-        for (const location of normalizedLocations) {
-          if (allLLMQualified.length >= llmLLMTarget) break;
-
-          const llmOffsetKey = `${location}:llm`;
-          let offset = offsetStore.get(llmOffsetKey) || 0;
-
-          const locationArgs = [...args, location];
-          const llmCount =
-            getDb()
-              .prepare(
-                `SELECT COUNT(*) as c FROM raw_jobs WHERE ${whereSql} AND (guessed_location = ? OR COALESCE(guessed_location, '') = '') AND (sources NOT LIKE '%tag%' OR sources IS NULL) AND (sources NOT LIKE '%comment%' OR sources IS NULL)`,
-              )
-              .get(...locationArgs)?.c || 0;
-
-          if (llmCount === 0) {
-            console.error(
-              `[data-store] 国家 ${location}: 无 LLM 打分候选数据，跳过`,
-            );
-            continue;
-          }
-
-          if (offset >= llmCount) {
-            offset = 0;
-            offsetStore.set(llmOffsetKey, 0);
-          }
-
-          console.error(
-            `[data-store] 国家 ${location}: LLM 候选共 ${llmCount} 条，从偏移量 ${offset} 开始`,
-          );
-
-          for (let batch = 0; batch < maxBatches; batch++) {
-            if (allLLMQualified.length >= llmLLMTarget) break;
-
-            const samples = getDb()
-              .prepare(
-                `
-                SELECT * FROM raw_jobs WHERE ${whereSql} AND (guessed_location = ? OR COALESCE(guessed_location, '') = '')
-                  AND (sources NOT LIKE '%tag%' OR sources IS NULL)
-                  AND (sources NOT LIKE '%comment%' OR sources IS NULL)
-                ORDER BY COALESCE(video_count, 0) DESC, created_at DESC
-                LIMIT ? OFFSET ?
-              `,
-              )
-              .all(...locationArgs, llmSampleSize, offset);
-
-            if (!samples.length) break;
-
-            // 让出事件循环，LLM API 调用期间允许处理其他请求
-            await new Promise(setImmediate);
-
-            const scores = await scoreJobsBatch(
-              samples,
-              DEFAULT_TARGET_LOCATIONS,
-            );
-            const qualified = scores.filter((s) => s.score >= llmMinScore);
-            allLLMQualified.push(...qualified.map((s) => s.uniqueId));
-            allScores.push(...scores);
-
-            offset += samples.length;
-            offsetStore.set(llmOffsetKey, offset);
-
-            console.error(
-              `[data-store] ${location} 第 ${batch + 1} 批: 采样 ${samples.length} 条，本批合格 ${qualified.length} 条，LLM 累计 ${allLLMQualified.length}/${llmLLMTarget}`,
-            );
-          }
-        }
-
-        // ===== 最终结果 =====
-        const qualified = [
-          ...allTagQualified,
-          ...allCommentQualified,
-          ...allLLMQualified,
-        ];
-
-        if (!qualified.length) {
-          console.error(
-            `[data-store] LLM 调度后无符合条件的任务（tag: ${allTagQualified.length}, comment: ${allCommentQualified.length}, LLM: ${allLLMQualified.length}）`,
-          );
-          return {
-            moved: 0,
-            scored: allScores.length,
-            qualified: 0,
-            scores: allScores,
-          };
-        }
-
-        console.error(
-          `[data-store] LLM 调度完成: tag ${allTagQualified.length} + comment ${allCommentQualified.length} + LLM ${allLLMQualified.length} = 共 ${qualified.length} 条`,
-        );
-
-        // 让出事件循环，避免事务写入阻塞监控页面
-        await new Promise(setImmediate);
-
-        // 移动符合条件的记录
-        const placeholders = qualified.map(() => "?").join(", ");
-        const moveTxn = getDb().transaction(() => {
-          getDb()
-            .prepare(
-              `
-            INSERT OR IGNORE INTO jobs (
-              unique_id, nickname, status, sources, pinned,
-              tt_seller, verified, video_count, comment_count,
-              guessed_location, location_created, confirmed_location,
-              follower_count, following_count, heart_count,
-              created_at, updated_at, region, signature, bio_link, sec_uid,
-              status_code, latest_video_time
-            )
-            SELECT
-              unique_id, nickname, 'pending', sources, pinned,
-              tt_seller, verified, video_count, comment_count,
-              guessed_location, location_created, confirmed_location,
-              follower_count, following_count, heart_count,
-              created_at, updated_at, region, signature, bio_link, sec_uid,
-              status_code, latest_video_time
-            FROM raw_jobs
-            WHERE unique_id IN (${placeholders})
-          `,
-            )
-            .run(...qualified);
-
-          getDb()
-            .prepare(
-              `DELETE FROM raw_jobs WHERE unique_id IN (${placeholders})`,
-            )
-            .run(...qualified);
-        });
-        moveTxn();
-        markStatsDirty();
-
-        // 持久化偏移量到数据库
-        offsetStore.save();
-
-        // 打印最终偏移量状态
-        const finalOffsetSummary = Array.from(offsetStore.entries())
-          .map(([k, v]) => `${k}:${v}`)
-          .join(", ");
-        console.error(`[data-store] 偏移量记忆更新: ${finalOffsetSummary}`);
-
-        return {
-          moved: qualified.length,
-          scored: allScores.length,
-          qualified: qualified.length,
-          scores: allScores,
-        };
-      })();
-    }
-
-    // 常规移动：多国家时先按国家均衡补充，再用全局兜底补齐剩余额度
-    const insertFromRawSql = `
-      INSERT OR IGNORE INTO jobs (
-        unique_id, nickname, status, sources, pinned,
-        tt_seller, verified, video_count, comment_count,
-        guessed_location, location_created, confirmed_location,
-        follower_count, following_count, heart_count,
-        created_at, updated_at, region, signature, bio_link, sec_uid,
-        status_code, latest_video_time, user_create_time
-      )
-      SELECT
-        unique_id, nickname, 'pending', sources, pinned,
-        tt_seller, verified, video_count, comment_count,
-        guessed_location, location_created, confirmed_location,
-        follower_count, following_count, heart_count,
-        created_at, updated_at, region, signature, bio_link, sec_uid,
-        status_code, latest_video_time, user_create_time
-      FROM raw_jobs
-      WHERE __WHERE__
-      ORDER BY
-        CASE WHEN sources LIKE '%tag%' THEN 0 ELSE 1 END,
-        CASE WHEN sources LIKE '%comment%' THEN 0 ELSE 1 END,
-        COALESCE(video_count, 0) DESC, created_at DESC
-      LIMIT ?
-    `;
-
-    const deleteFromRawSql = `
-      DELETE FROM raw_jobs
-      WHERE unique_id IN (
-        SELECT unique_id FROM raw_jobs
-        WHERE __WHERE__
-        ORDER BY
-          CASE WHEN sources LIKE '%tag%' THEN 0 ELSE 1 END,
-          CASE WHEN sources LIKE '%comment%' THEN 0 ELSE 1 END,
-          COALESCE(video_count, 0) DESC, created_at DESC
-        LIMIT ?
-      )
-    `;
-
-    const uniqueLocations = normalizedLocations
-      ? Array.from(new Set(normalizedLocations))
-      : [];
-    const shouldBalanceByCountry = uniqueLocations.length > 1;
-
-    const moveTxn = getDb().transaction(() => {
-      let moved = 0;
-      const movedByCountry = {};
-
-      if (shouldBalanceByCountry) {
-        const baseQuota = Math.floor(safeLimit / uniqueLocations.length);
-        const remainder = safeLimit % uniqueLocations.length;
-
-        for (let i = 0; i < uniqueLocations.length; i++) {
-          if (moved >= safeLimit) break;
-
-          const location = uniqueLocations[i];
-          const quota = baseQuota + (i < remainder ? 1 : 0);
-          const currentLimit = Math.max(0, Math.min(quota, safeLimit - moved));
-          if (!currentLimit) continue;
-
-          const locationWhere = `${whereSql} AND (UPPER(COALESCE(guessed_location, '')) = ? OR COALESCE(guessed_location, '') = '')`;
-          const locationArgs = [...args, location];
-
-          getDb()
-            .prepare(insertFromRawSql.replace("__WHERE__", locationWhere))
-            .run(...locationArgs, currentLimit);
-          const del = getDb()
-            .prepare(deleteFromRawSql.replace("__WHERE__", locationWhere))
-            .run(...locationArgs, currentLimit);
-
-          const movedThisCountry = del?.changes || 0;
-          moved += movedThisCountry;
-          movedByCountry[location] = movedThisCountry;
-        }
-
-        // 某些国家库存不足时，用全局查询补齐剩余额度（仍受 whereSql 国家范围约束）
-        const remaining = safeLimit - moved;
-        if (remaining > 0) {
-          getDb()
-            .prepare(insertFromRawSql.replace("__WHERE__", whereSql))
-            .run(...args, remaining);
-          const del = getDb()
-            .prepare(deleteFromRawSql.replace("__WHERE__", whereSql))
-            .run(...args, remaining);
-          moved += del?.changes || 0;
-        }
-
-        console.error(
-          `[data-store] refill 国家均衡: ${uniqueLocations
-            .map((loc) => `${loc}:${movedByCountry[loc] || 0}`)
-            .join(", ")} | total=${moved}`,
-        );
-      } else {
-        getDb()
-          .prepare(insertFromRawSql.replace("__WHERE__", whereSql))
-          .run(...args, safeLimit);
-        const del = getDb()
-          .prepare(deleteFromRawSql.replace("__WHERE__", whereSql))
-          .run(...args, safeLimit);
-        moved = del?.changes || 0;
-      }
-
-      return moved;
-    });
-
-    const moved = moveTxn();
-    markStatsDirty();
-    return { moved };
-  }
-
   async function claimNextJob(
     userId,
     expireMs = 5 * 60 * 1000,
@@ -1533,7 +1111,7 @@ export function createStore(filePath, options = {}) {
         .prepare(
           `
           SELECT *
-          FROM jobs
+          FROM task_queue
           WHERE status = 'processing'
             AND claimed_by = ?
             AND claimed_at IS NOT NULL
@@ -1545,7 +1123,7 @@ export function createStore(filePath, options = {}) {
         .get(userId, now, expireMs);
       if (ongoingRow) {
         getDb()
-          .prepare("UPDATE jobs SET claimed_at = ? WHERE unique_id = ?")
+          .prepare("UPDATE task_queue SET claimed_at = ? WHERE unique_id = ?")
           .run(now, ongoingRow.unique_id);
         return {
           uniqueId: ongoingRow.unique_id,
@@ -1566,7 +1144,7 @@ export function createStore(filePath, options = {}) {
       // ---- 过期 processing 回收 ----
       const expiredRow = getDb()
         .prepare(
-          `SELECT * FROM jobs WHERE status = 'processing'
+          `SELECT * FROM task_queue WHERE status = 'processing'
            AND claimed_at IS NOT NULL AND ? - claimed_at > ?
            ORDER BY claimed_at ASC LIMIT 1`,
         )
@@ -1575,7 +1153,7 @@ export function createStore(filePath, options = {}) {
       if (expiredRow) {
         getDb()
           .prepare(
-            "UPDATE jobs SET status = 'pending', claimed_at = NULL WHERE unique_id = ?",
+            "UPDATE task_queue SET status = 'pending', claimed_at = NULL WHERE unique_id = ?",
           )
           .run(expiredRow.unique_id);
         expiredCandidate = expiredRow;
@@ -1637,7 +1215,7 @@ export function createStore(filePath, options = {}) {
 
       const addPart = (prio, subPrio, conditions, params) => {
         sqlParts.push(
-          `SELECT *, ${prio} as _prio, ${subPrio} as _sub_prio FROM jobs WHERE ${conditions}`,
+          `SELECT *, ${prio} as _prio, ${subPrio} as _sub_prio FROM task_queue WHERE ${conditions}`,
         );
         allParams.push(...params);
       };
@@ -1732,7 +1310,7 @@ export function createStore(filePath, options = {}) {
       if (selectedRow) {
         getDb()
           .prepare(
-            "UPDATE jobs SET status = 'processing', claimed_at = ?, claimed_by = ? WHERE unique_id = ?",
+            "UPDATE task_queue SET status = 'processing', claimed_at = ?, claimed_by = ? WHERE unique_id = ?",
           )
           .run(now, userId, selectedRow.unique_id);
         markStatsDirty();
@@ -1744,32 +1322,7 @@ export function createStore(filePath, options = {}) {
         };
       }
 
-      // refill 异步化：不阻塞当前请求
-      if (!refillLock) {
-        refillLock = (async () => {
-          try {
-            const result = refillJobsFromRaw(
-              normalizedLocations.length ? normalizedLocations : null,
-              500,
-              refillLlmConfig,
-            );
-            const r =
-              result && typeof result.then === "function"
-                ? await result
-                : result;
-            if (r.moved > 0) {
-              console.error(
-                `[data-store] 从 raw_jobs 补充了 ${r.moved} 条任务到 jobs`,
-              );
-            }
-          } catch (e) {
-            console.error(`[data-store] refill 异常: ${e.message}`);
-          } finally {
-            refillLock = null;
-          }
-        })();
-      }
-
+      // refill 已移至 sync-raw-jobs.mjs 独立进程处理
       return null;
     }
 
@@ -1925,7 +1478,7 @@ export function createStore(filePath, options = {}) {
         .prepare(
           `
           SELECT *
-          FROM jobs
+          FROM task_queue
           WHERE status = 'processing'
             AND claimed_by = ?
             AND claimed_at IS NOT NULL
@@ -2016,7 +1569,7 @@ export function createStore(filePath, options = {}) {
         }
         const sql = `
           SELECT *
-          FROM jobs
+          FROM task_queue
           WHERE ${where.join(" AND ")}
           ORDER BY follower_count DESC, created_at ASC, unique_id ASC
           LIMIT 1
@@ -2059,7 +1612,7 @@ export function createStore(filePath, options = {}) {
         }
         const sql = `
           SELECT *
-          FROM jobs
+          FROM task_queue
           WHERE ${where.join(" AND ")}
           ORDER BY created_at ASC, unique_id ASC
           LIMIT 1
@@ -2072,7 +1625,7 @@ export function createStore(filePath, options = {}) {
 
       const expiredSql = `
         SELECT *
-        FROM jobs
+        FROM task_queue
         WHERE status = 'processing'
           AND claimed_at IS NOT NULL
           AND ? - claimed_at > ?
@@ -2423,10 +1976,20 @@ export function createStore(filePath, options = {}) {
       updateUserFromResult(user, result);
       user.claimedAt = null;
       const newUsers = processDiscoveredUsers(result);
-      const persistRet = updateJobInfo(uniqueId, user, false);
+      // Phase 1: 先更新 task_queue，再搬移到 jobs 归档，最后从 task_queue 删除
+      const persistRet = updateJobInfo(uniqueId, user, false, "task_queue");
       if (persistRet.error) {
         return { saved: false, error: persistRet.error };
       }
+      // 整行搬移到 jobs 归档
+      getDb()
+        .prepare(
+          `INSERT OR REPLACE INTO jobs SELECT * FROM task_queue WHERE unique_id = ?`,
+        )
+        .run(uniqueId);
+      getDb()
+        .prepare(`DELETE FROM task_queue WHERE unique_id = ?`)
+        .run(uniqueId);
       return { saved: true, status: user.status, newUsers };
     }
 
@@ -2502,8 +2065,24 @@ export function createStore(filePath, options = {}) {
       user.error = null;
       user.restricted = false;
       user.noVideo = false;
-      const ret = updateJobInfo(uniqueId, user, false);
+
+      // Phase 2: 判断用户在哪个表，更新后确保 pending 行在 task_queue
+      const inTq = getDb()
+        .prepare("SELECT 1 FROM task_queue WHERE unique_id = ?")
+        .get(uniqueId);
+      const tableName = inTq ? "task_queue" : "jobs";
+      const ret = updateJobInfo(uniqueId, user, false, tableName);
       if (ret.error) return { saved: false, error: ret.error };
+
+      // 如果原来在 jobs，重置后需移入 task_queue（pending 应在热表）
+      if (!inTq) {
+        getDb()
+          .prepare(
+            "INSERT OR REPLACE INTO task_queue SELECT * FROM jobs WHERE unique_id = ?",
+          )
+          .run(uniqueId);
+        getDb().prepare("DELETE FROM jobs WHERE unique_id = ?").run(uniqueId);
+      }
       markStatsDirty();
       return { saved: true };
     }
@@ -2527,7 +2106,17 @@ export function createStore(filePath, options = {}) {
       const user = getJob(uniqueId);
       if (!user) return { saved: false, error: "user not found" };
       const nextPinned = !user.pinned;
-      const ret = updateJobInfo(uniqueId, { pinned: nextPinned }, false);
+      // Phase 2: 判断用户在哪个表
+      const inTq = getDb()
+        .prepare("SELECT 1 FROM task_queue WHERE unique_id = ?")
+        .get(uniqueId);
+      const tableName = inTq ? "task_queue" : "jobs";
+      const ret = updateJobInfo(
+        uniqueId,
+        { pinned: nextPinned },
+        false,
+        tableName,
+      );
       if (ret.error) return { saved: false, error: ret.error };
       return { saved: true, pinned: nextPinned };
     }
@@ -3097,35 +2686,60 @@ export function createStore(filePath, options = {}) {
     const safeId = String(uniqueId).trim();
     if (!safeId) return false;
 
+    const rawCols = [
+      "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",
+      "user_create_time",
+    ].join(", ");
+
     const moveSingleTxn = getDb().transaction(() => {
+      // Phase 2: 先查 task_queue，再查 jobs
+      const fromTable = getDb()
+        .prepare("SELECT 1 FROM task_queue WHERE unique_id = ?")
+        .get(safeId)
+        ? "task_queue"
+        : "jobs";
+
       getDb()
         .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,
-          user_create_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,
-          user_create_time
-        FROM jobs WHERE unique_id = ?
-      `,
+          `INSERT OR REPLACE INTO raw_jobs (${rawCols}) SELECT ${rawCols} FROM ${fromTable} WHERE unique_id = ?`,
         )
         .run(safeId);
 
-      getDb().prepare("DELETE FROM jobs WHERE unique_id = ?").run(safeId);
+      getDb()
+        .prepare(`DELETE FROM ${fromTable} WHERE unique_id = ?`)
+        .run(safeId);
     });
     moveSingleTxn();
     return true;
@@ -3192,7 +2806,7 @@ export function createStore(filePath, options = {}) {
         getDb()
           .prepare(
             `
-          INSERT OR REPLACE INTO jobs (
+          INSERT OR REPLACE INTO task_queue (
             unique_id, nickname, status, sources, claimed_by, claimed_at,
             error, pinned, no_video, restricted, user_update_count,
             tt_seller, verified, video_count, comment_count,
@@ -3423,6 +3037,7 @@ export function createStore(filePath, options = {}) {
   }
 
   function getPendingCommentTasks(limit, locations = null) {
+    const STALE_TIMEOUT_MS = 10 * 60 * 1000; // 10分钟超时
     if (getDb()) {
       const l = Math.max(1, parseInt(limit) || 1);
       const normalizedLocations =
@@ -3436,33 +3051,40 @@ export function createStore(filePath, options = {}) {
         ? `AND UPPER(COALESCE(location_created, '')) IN (${normalizedLocations.map(() => "?").join(", ")})`
         : "";
 
+      const staleThreshold = Date.now() - STALE_TIMEOUT_MS;
       const rows = getDb()
         .prepare(
           `
           SELECT *
           FROM videos
           WHERE (user_update_count IS NULL OR user_update_count <= 0)
+             OR (user_update_count > 0 AND (claimed_at IS NULL OR claimed_at < ?))
           ${locationFilter}
-          ORDER BY tt_seller DESC, registered_at ASC
+          ORDER BY tt_seller DESC,
+            CASE WHEN user_update_count > 0 THEN 1 ELSE 0 END,
+            registered_at ASC
           LIMIT ?
         `,
         )
-        .all(...(normalizedLocations || []), l);
+        .all(staleThreshold, ...(normalizedLocations || []), l);
       if (rows.length === 0) return [];
+      const now = Date.now();
       const bumpStmt = getDb().prepare(
         `
         UPDATE videos
-        SET user_update_count = COALESCE(user_update_count, 0) + 1
+        SET user_update_count = COALESCE(user_update_count, 0) + 1,
+            claimed_at = ?
         WHERE id = ?
       `,
       );
       const bumpTxn = getDb().transaction((items) => {
-        for (const item of items) bumpStmt.run(item.id);
+        for (const item of items) bumpStmt.run(now, item.id);
       });
       bumpTxn(rows);
       return rows.map((row) => {
         const mapped = mapVideoRow(row);
         mapped.userUpdateCount = (mapped.userUpdateCount || 0) + 1;
+        mapped.claimedAt = now;
         return mapped;
       });
     }
@@ -3497,21 +3119,53 @@ export function createStore(filePath, options = {}) {
     return tasks;
   }
 
+  /**
+   * 将 videos_old 中符合条件的视频恢复到 videos（通用条件 + 分批）
+   * @param {object} options
+   * @param {number} options.limit - 每批最多移动条数
+   * @param {string} options.where - SQL WHERE 条件（不含 WHERE 关键字），如 "tt_seller = 1"、"registered_at >= 1234567890"
+   * @returns {{ moved: number, total: number }}
+   */
+  function restoreVideosFromOld({ limit = 500, where = "" } = {}) {
+    if (!getDb()) return { moved: 0, total: 0, error: "db not ready" };
+    if (!where || !where.trim()) {
+      return { moved: 0, total: 0, error: "no where condition specified" };
+    }
+
+    const whereSql = `WHERE ${where.trim()}`;
+    const count =
+      getDb().prepare(`SELECT COUNT(*) as c FROM videos_old ${whereSql}`).get()
+        ?.c || 0;
+    if (!count) return { moved: 0, total: 0 };
+
+    const safeLimit = Math.min(limit, count);
+    const moved = getDb().transaction(() => {
+      getDb()
+        .prepare(
+          `INSERT OR REPLACE INTO videos SELECT * FROM videos_old ${whereSql} LIMIT ?`,
+        )
+        .run(safeLimit);
+      return getDb()
+        .prepare(
+          `DELETE FROM videos_old WHERE id IN (SELECT id FROM videos_old ${whereSql} LIMIT ?)`,
+        )
+        .run(safeLimit).changes;
+    })();
+
+    return { moved, total: count };
+  }
+
   function commitCommentTask(videoId) {
     if (getDb()) {
       const video = getVideoRow(videoId);
       if (!video) return { ok: false, error: "video not found" };
-      const nextCount = (video.user_update_count || 0) + 1;
       getDb()
         .prepare(
-          `
-        UPDATE videos
-        SET user_update_count = ?
-        WHERE id = ?
-      `,
+          "INSERT OR REPLACE INTO videos_old SELECT * FROM videos WHERE id = ?",
         )
-        .run(nextCount, videoId);
-      return { ok: true, userUpdateCount: nextCount };
+        .run(videoId);
+      getDb().prepare("DELETE FROM videos WHERE id = ?").run(videoId);
+      return { ok: true };
     }
 
     const video = videos.find((v) => v.id === videoId);
@@ -3521,6 +3175,42 @@ export function createStore(filePath, options = {}) {
     return { ok: true, userUpdateCount: video.userUpdateCount };
   }
 
+  /**
+   * 将 videos 中符合条件的视频归档到 videos_old（通用条件 + 分批）
+   * @param {object} options
+   * @param {number} options.limit - 每批最多移动条数
+   * @param {string} options.where - SQL WHERE 条件（不含 WHERE 关键字），如 "tt_seller = 0"、"user_update_count > 1"
+   * @returns {{ moved: number, total: number }}
+   */
+  function archiveVideosToOld({ limit = 500, where = "" } = {}) {
+    if (!getDb()) return { moved: 0, total: 0, error: "db not ready" };
+    if (!where || !where.trim()) {
+      return { moved: 0, total: 0, error: "no where condition specified" };
+    }
+
+    const whereSql = `WHERE ${where.trim()}`;
+    const count =
+      getDb().prepare(`SELECT COUNT(*) as c FROM videos ${whereSql}`).get()
+        ?.c || 0;
+    if (!count) return { moved: 0, total: 0 };
+
+    const safeLimit = Math.min(limit, count);
+    const moved = getDb().transaction(() => {
+      getDb()
+        .prepare(
+          `INSERT OR REPLACE INTO videos_old SELECT * FROM videos ${whereSql} LIMIT ?`,
+        )
+        .run(safeLimit);
+      return getDb()
+        .prepare(
+          `DELETE FROM videos WHERE id IN (SELECT id FROM videos ${whereSql} LIMIT ?)`,
+        )
+        .run(safeLimit).changes;
+    })();
+
+    return { moved, total: count };
+  }
+
   return {
     save,
     flushSave,
@@ -3558,7 +3248,6 @@ export function createStore(filePath, options = {}) {
     getStats,
     getStatusGroups,
     markGroupsDirty,
-    refillJobsFromRaw,
     scoreJobLocation,
     scoreJobsBatch,
     claimNextJob,
@@ -3592,11 +3281,12 @@ export function createStore(filePath, options = {}) {
     getVideoCount,
     getPendingCommentTasks,
     commitCommentTask,
+    restoreVideosFromOld,
+    archiveVideosToOld,
     debugClaimNextJob,
     stopBackup,
     backupDatabase, // 手动备份数据库
     rawQuery,
-    getLlmSampleOffsets, // 获取 LLM 采样偏移量状态
     // Tag 发现与打分
     insertTag,
     insertTagsIfNew,
@@ -3615,14 +3305,13 @@ export function createStore(filePath, options = {}) {
     reportRefreshResult,
     getRefreshStats,
     getTargetRefreshStats,
+    // 搜索
+    getProductiveSearchTask,
+    claimSearchTag,
+    reportSearchResult,
     data,
   };
 
-  // 辅助函数：获取 LLM 采样偏移量
-  function getLlmSampleOffsets() {
-    return Object.fromEntries(offsetStore.entries());
-  }
-
   // ===== 将 jobs/raw_jobs 中商家用户移动到 jobs_base =====
 
   /**