tt-help-cli-ycl 1.4.17 → 1.4.19

package/src/watch/db-tags.js

@@ -22,7 +22,13 @@ export function insertTag(tag, countries, source = "llm") {
     return { inserted: false, error: "invalid tag" };
   }
   try {
-    // ON CONFLICT: 合并 countries 数组，避免跨国家共享 tag 时信息丢失
+    // 先查是否已存在且为 dead 状态，如果是则重置为 new（给二次机会）
+    const existing = db
+      .prepare("SELECT status FROM tags WHERE tag = ?")
+      .get(normalized);
+    const resetDead = existing && existing.status === "dead";
+
+    // ON CONFLICT: 合并 countries 数组；如果原状态是 dead 则重置为 new
     const result = db
       .prepare(
         `INSERT INTO tags (tag, countries, source) VALUES (@tag, @countries, @source)
@@ -32,9 +38,12 @@ export function insertTag(tag, countries, source = "llm") {
              UNION
              SELECT value FROM json_each(@countries)
            )
-         )`,
+         )${resetDead ? ", status = 'new', score = NULL, last_error = NULL, dead_reason = NULL, scored_at = NULL, score_count = 0" : ""}`,
       )
       .run({ tag: normalized, countries: JSON.stringify(countries), source });
+    if (resetDead) {
+      console.error(`[tags] 🔄 dead tag #${normalized} 重新生成，重置为 new`);
+    }
     return { inserted: result.changes > 0, tag: normalized };
   } catch (e) {
     return { inserted: false, error: e.message };
@@ -55,7 +64,8 @@ export function getTagsByStatus(
     sql += " AND countries LIKE ?";
     params.push(`%"${country}"%`);
   }
-  sql += " ORDER BY score ASC, created_at ASC LIMIT ? OFFSET ?";
+  sql +=
+    " ORDER BY refreshed_at DESC NULLS LAST, score ASC, created_at ASC LIMIT ? OFFSET ?";
   params.push(limit, offset);
   const rows = db.prepare(sql).all(...params);
   return rows.map(parseTagRow);
@@ -96,6 +106,48 @@ export function getTagStats(country = null) {
   };
 }
 
+export function getRefreshStats(hours = 24) {
+  const db = getDb();
+  if (!db) return { countries: [], total: 0, refreshed: 0 };
+
+  const rows = db
+    .prepare(
+      "SELECT countries FROM tags WHERE status = 'productive' AND score > 70",
+    )
+    .all();
+  const countrySet = new Set();
+  for (const r of rows) {
+    try {
+      for (const c of JSON.parse(r.countries || "[]")) countrySet.add(c);
+    } catch {}
+  }
+
+  const results = [];
+  let totalAll = 0;
+  let refreshedAll = 0;
+  const countryList = [...countrySet].sort();
+
+  const stmtTotal = db.prepare(
+    "SELECT COUNT(*) as cnt FROM tags WHERE status = 'productive' AND score > 70 AND countries LIKE ?",
+  );
+  const stmtRefresh = db.prepare(
+    `SELECT COUNT(*) as cnt FROM tags WHERE status = 'productive' AND score > 70 AND countries LIKE ? AND refreshed_at >= datetime('now', ?)`,
+  );
+
+  for (const c of countryList) {
+    const like = `%"${c}"%`;
+    const total = stmtTotal.get(like).cnt;
+    const refreshed = stmtRefresh.get(like, `-${hours} hours`).cnt;
+    if (total > 0) {
+      totalAll += total;
+      refreshedAll += refreshed;
+      results.push({ country: c, total, refreshed });
+    }
+  }
+
+  return { countries: results, total: totalAll, refreshed: refreshedAll };
+}
+
 export function getTagsByCountry(country, minScore = 0) {
   const db = getDb();
   if (!db) return [];
@@ -233,7 +285,8 @@ export function getAllTags(limit = 200, offset = 0, country = null) {
     sql += " WHERE countries LIKE ?";
     params.push(`%"${country}"%`);
   }
-  sql += " ORDER BY score DESC, created_at DESC LIMIT ? OFFSET ?";
+  sql +=
+    " ORDER BY refreshed_at DESC NULLS LAST, score DESC, created_at DESC LIMIT ? OFFSET ?";
   params.push(limit, offset);
   const rows = db.prepare(sql).all(...params);
   return rows.map(parseTagRow);
@@ -319,6 +372,7 @@ export function insertDiscoverLog({
   round,
   strategy,
   tagsGenerated,
+  tagsRaw,
   tagsAdded,
   productiveSample,
   deadSample,
@@ -332,15 +386,16 @@ export function insertDiscoverLog({
     const result = db
       .prepare(
         `INSERT INTO discover_log
-         (country, round, strategy, tags_generated, tags_added,
+         (country, round, strategy, tags_generated, tags_raw, tags_added,
           productive_sample, dead_sample, avg_productive_score, avg_dead_score)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       )
       .run(
         country,
         round,
         strategy || null,
         JSON.stringify(tagsGenerated || []),
+        tagsRaw ? JSON.stringify(tagsRaw) : null,
         tagsAdded || 0,
         JSON.stringify(productiveSample || []),
         JSON.stringify(deadSample || []),
@@ -386,6 +441,51 @@ export function getAllExistingTagNames() {
   return new Set(rows.map((r) => r.tag));
 }
 
+/**
+ * 获取活跃 tag 名集合（仅 productive + scored），用于全局去重
+ * 排除 dead tag，因为 insertTag 会在冲突时将 dead 重置为 new。
+ */
+export function getActiveTagNames() {
+  const db = getDb();
+  if (!db) return new Set();
+  const rows = db
+    .prepare("SELECT tag FROM tags WHERE status IN ('productive', 'scored')")
+    .all();
+  return new Set(rows.map((r) => r.tag));
+}
+
+/**
+ * 获取某国家最近一轮 discover 中 LLM 原始生成的全部 tag（去重前）
+ * 用于反馈给 LLM："你上轮生成了这些，全部已被数据库覆盖，换方向"
+ */
+export function getLastRoundAllGeneratedTags(country) {
+  const db = getDb();
+  if (!db) return null;
+
+  const row = db
+    .prepare(
+      `SELECT tags_raw, tags_generated, tags_added FROM discover_log
+       WHERE country = ?
+       ORDER BY round DESC
+       LIMIT 1`,
+    )
+    .get(country);
+
+  if (!row) return null;
+
+  const raw = JSON.parse(row.tags_raw || "[]");
+  const survived = JSON.parse(row.tags_generated || "[]");
+  const rejected = raw.filter((t) => !survived.includes(t));
+
+  return {
+    raw,
+    survived,
+    rejected,
+    tagsAdded: row.tags_added,
+    allRejected: row.tags_added === 0 && raw.length > 0,
+  };
+}
+
 export function getRecentGeneratedTags(country, lookback = 10) {
   const db = getDb();
   if (!db) return [];