@easysociable/cli 0.1.4 → 0.1.5

package/content-engine/workbench/build.py

@@ -379,7 +379,7 @@ def _parse_compact_count(raw: str) -> str:
 def _fill_engagement_from_blob(out: dict[str, str], blob: str) -> None:
     if not blob:
         return
-    # Prefer kind-first matches (discovery + list form), then num-first (capture prose).
+    # Prefer kind-first matches (list form), then num-first (capture prose).
     for kind, num in ENGAGEMENT_KIND_NUM_RE.findall(blob):
         key = f"src_{_normalize_metric_kind(kind)}"
         if key in out and not out[key]:
@@ -395,10 +395,10 @@ def _fill_engagement_from_blob(out: dict[str, str], blob: str) -> None:
 
 
 def parse_engagement_snapshot(text: str) -> dict[str, str]:
-    """Parse engagement into src_* fields from Discovery or Capture/Raw notes.
+    """Parse engagement into src_* fields from Capture / Raw notes.
 
     Supports:
-    - Discovery: `engagement snapshot: likes 113 / replies 18 / ... @ 2026-08-30`
+    - Compact: `engagement snapshot: likes 113 / replies 18 / ... @ 2026-08-30`
     - Capture prose: `Engagement snapshot (fetch DATE): ~92.9k views · 1086 likes · ...`
     - Raw list under `## Engagement snapshot` with `- likes: 3`
     Parenthetical secondary demos after the primary snapshot are ignored.
@@ -684,6 +684,7 @@ def build_graph() -> dict:
         "need_ids",
         "product_ids",
         "product_fit",
+        "recommendation_ids",
         "run",
     )
     if topic_rows:
@@ -801,6 +802,7 @@ def build_graph() -> dict:
                     "need_ids": row.get("need_ids", "") or "",
                     "product_ids": row.get("product_ids", "") or "",
                     "product_fit": row.get("product_fit", "") or "",
+                    "recommendation_ids": row.get("recommendation_ids", "") or "",
                     "run_id": row["run"].strip(),
                     "usage": usage,
                     "src_heat_note": "来源帖热度，不是你的帖",
@@ -811,6 +813,13 @@ def build_graph() -> dict:
             edge(nid("topic", ident), nid("capture", row["capture_id"]), "from_capture")
         if row["run"].strip().startswith("RUN-"):
             edge(nid("topic", ident), nid("run", row["run"].strip()), "opened_run")
+        # Index cells are enough for edges; item frontmatter may repeat the same ids.
+        for need_id in re.findall(r"\bN-\d{8}-\d{2}\b", row.get("need_ids", "") or ""):
+            edge(nid("topic", ident), nid("need", need_id), "from_need")
+        for product_id in PRODUCT_RE.findall(row.get("product_ids", "") or ""):
+            edge(nid("topic", ident), nid("product", product_id), "uses_product")
+        for recommendation_id in RECOMMENDATION_RE.findall(row.get("recommendation_ids", "") or ""):
+            edge(nid("topic", ident), nid("recommendation", recommendation_id), "reviews")
         if item and (ROOT / item).exists():
             body = read(item)
             fm = re.match(r"^---\n(.*?)\n---", body, re.S)
@@ -1238,7 +1247,7 @@ def build_graph() -> dict:
 
 
 def _self_check() -> None:
-    # ponytail: tiny parser asserts; expand if capture/discovery formats drift again.
+    # ponytail: tiny parser asserts; expand if capture/raw formats drift again.
     d = parse_engagement_snapshot(
         "- **engagement snapshot:** likes 113 / replies 18 / bookmarks 17 / views 9574 @ 2026-08-30\n"
     )

package/content-engine/workbench/template.html

@@ -648,6 +648,11 @@
         gap_needs_n: "需求原话未选题 {n}",
         gap_lib_n: "Capture 未入库 {n}",
         gap_review_n: "已发但无法复盘 {n}",
+        topics_lead: "选题必须有明确输入：need / inbox / user / product / recommendation。没有 Discovery 中间层；来源热度不是选题。",
+        kv_lane: "Lane",
+        kv_mode: "生成路径",
+        kv_needs: "需求",
+        kv_recs: "推荐对象",
         kv_profile: "Profile",
         kind_profile: "Profile", kind_account: "账号",
         profile_pillars: "支柱",
@@ -764,6 +769,11 @@
         gap_needs_n: "{n} needs not yet in a topic",
         gap_lib_n: "{n} captures not ingested",
         gap_review_n: "{n} shipped posts not reviewable",
+        topics_lead: "Topics need an explicit input: need, inbox, user, product, or recommendation. No Discovery layer; source heat is not a topic.",
+        kv_lane: "Lane",
+        kv_mode: "Generation mode",
+        kv_needs: "Needs",
+        kv_recs: "Recommendations",
         kv_profile: "Profile",
         kind_profile: "Profile", kind_account: "Account",
         profile_pillars: "Pillars",
@@ -946,9 +956,8 @@
     let topicPillar = "";
     let topicSrc = "";
     let topicUsage = "";
-    let discStatus = "";
-    let discSort = "recommend";
     let capIngest = "";
+    const TOPIC_SOURCES = ["need", "inbox", "user", "product", "recommendation"];
     let selected = null;
     const $list = document.getElementById("list");
     const $insp = document.getElementById("insp");
@@ -1353,7 +1362,7 @@
     function qmatch(n) {
       const q = $q.value.trim().toLowerCase();
       if (!q) return true;
-      const blob = [n.ident, n.label, n.kind, n.status, n.pillar, n.lane, n.generation_mode, n.profile, n.profiles, n.src_handle, n.url, n.notes, n.type, n.atom_type, n.topic_id, n.audience, n.product_ids, n.product_fit, n.recommendation_ids].filter(Boolean).join(" ").toLowerCase();
+      const blob = [n.ident, n.label, n.kind, n.status, n.pillar, n.lane, n.generation_mode, n.profile, n.profiles, n.src_handle, n.url, n.notes, n.type, n.atom_type, n.topic_id, n.audience, n.need_ids, n.product_ids, n.product_fit, n.recommendation_ids, n.source_type, n.capture_id].filter(Boolean).join(" ").toLowerCase();
       return blob.includes(q);
     }
     function connected(id) {
@@ -1454,7 +1463,7 @@
       }).join("");
       return `<div class="heat" title="${esc(t("heat_hint"))}">${chips}</div>${hint}`;
     }
-    function discoveryRowEl(n, extra) {
+    function listRowEl(n, extra) {
       const d = document.createElement("div");
       d.className = "row" + (selected === n.id ? " sel" : "");
       d.dataset.kind = n.kind;
@@ -1473,46 +1482,6 @@
         </div>`;
       return d;
     }
-    function angleRecommendRank(n) {
-      const r = String(n.angle_recommend || "").toLowerCase();
-      if (r === "promote") return 0;
-      if (r === "library") return 1;
-      if (r === "hold") return 2;
-      if (r === "reject") return 3;
-      if (String(n.next_action || "") === "promote_to_topic") return 0;
-      return 4;
-    }
-    function discoveryUnprocessed(n) {
-      const st = String(n.status || "");
-      if (st === "promoted" || st === "rejected") return false;
-      const ang = String(n.angle_status || "");
-      if (ang === "accepted") return false;
-      if (ang === "held" || ang === "rejected") return false;
-      if (ang === "proposed" && (n.angle_recommend === "promote" || !n.angle_recommend)) return true;
-      if (String(n.next_action || "") === "promote_to_topic") return true;
-      return false;
-    }
-    function sortDiscoveries(rows, mode) {
-      const missing = -1;
-      const num = (n, key) => {
-        const v = Number(String(n[`src_${key}`] ?? "").replace(/,/g, ""));
-        return Number.isFinite(v) ? v : missing;
-      };
-      return rows.slice().sort((a, b) => {
-        if (mode === "recommend" || !mode) {
-          const rec = angleRecommendRank(a) - angleRecommendRank(b);
-          if (rec !== 0) return rec;
-        }
-        let cmp = 0;
-        if (mode === "likes") cmp = num(b, "likes") - num(a, "likes");
-        else if (mode === "replies") cmp = num(b, "replies") - num(a, "replies");
-        else if (mode === "views") cmp = num(b, "views") - num(a, "views");
-        else if (mode === "date") cmp = String(b.date || "").localeCompare(String(a.date || ""));
-        else cmp = num(b, "bookmarks") - num(a, "bookmarks");
-        if (cmp !== 0) return cmp;
-        return String(b.date || "").localeCompare(String(a.date || ""));
-      });
-    }
     function pills(n) {
       const bits = [];
       if (n.kind === "need") {
@@ -1522,18 +1491,10 @@
         if (n.source_type) bits.push(`<span class="pill">${esc(n.source_type)}</span>`);
         if (n.frequency) bits.push(`<span class="pill">×${esc(n.frequency)}</span>`);
       }
-      if (n.kind === "discovery") {
-        const st = n.status || "";
-        const cls = st === "read" || st === "promoted" ? "ok"
-          : (st === "saved" || st === "rejected" || st === "unread" ? "gap" : "");
-        if (st) bits.push(`<span class="pill ${cls}">${esc(st)}</span>`);
-        if (n.angle_recommend) bits.push(`<span class="pill ${n.angle_recommend === "promote" && discoveryUnprocessed(n) ? "gap" : ""}">${esc(n.angle_recommend)}</span>`);
-        else if (discoveryUnprocessed(n)) bits.push(`<span class="pill gap">${esc(t("gap_angle"))}</span>`);
-        if (n.source_role) bits.push(`<span class="pill">${esc(n.source_role)}</span>`);
-        if (n.next_action && n.next_action !== "none") bits.push(`<span class="pill">${esc(n.next_action)}</span>`);
-      }
       if (n.kind === "topic") {
         bits.push(`<span class="pill">${esc(n.status)}</span>`);
+        if (n.source_type) bits.push(`<span class="pill">${esc(n.source_type)}</span>`);
+        if (n.generation_mode) bits.push(`<span class="pill">${esc(n.generation_mode)}</span>`);
         bits.push(n.usage === "unused" ? `<span class="pill gap">${t("unused")}</span>` : `<span class="pill ok">${esc(n.usage)}</span>`);
       }
       if (n.kind === "run") {
@@ -1594,7 +1555,7 @@
           n.frequency ? `×${n.frequency}` : "",
           n.topic_ids && n.topic_ids !== "none" ? n.topic_ids : "",
         ].filter(Boolean).join(" · ");
-        cards.appendChild(discoveryRowEl(n, meta));
+        cards.appendChild(listRowEl(n, meta));
       });
       if (!needs.length) {
         cards.innerHTML = `<p class='empty'>${t("no_need")}</p><p class="note">${esc(t("need_empty_hint"))}</p>`;
@@ -1709,58 +1670,31 @@
       onReady(wrap);
     }
 
-    function renderDiscovery() {
-      $list.innerHTML = "";
-      const statuses = [...new Set(nodesOf("discovery").map(x => x.status).filter(Boolean))];
-      const sortOpts = [
-        ["recommend", "f_sort_recommend"],
-        ["bookmarks", "f_sort_bookmarks"],
-        ["replies", "f_sort_replies"],
-        ["likes", "f_sort_likes"],
-        ["views", "f_sort_views"],
-        ["date", "f_sort_date"],
-      ];
-      filterBar(
-        `<select id="d-st"><option value="">${t("f_status")}</option>${statuses.map(s => `<option value="${s}" ${s === discStatus ? "selected" : ""}>${esc(s)}</option>`).join("")}</select>
-         <select id="d-sort" title="${esc(t("f_sort"))}"><option value="" disabled>${esc(t("f_sort"))}</option>${sortOpts.map(([v, k]) => `<option value="${v}" ${v === discSort ? "selected" : ""}>${esc(t(k))}</option>`).join("")}</select>`,
-        (w) => {
-          const status = w.querySelector("#d-st");
-          const sortEl = w.querySelector("#d-sort");
-          const paint = () => {
-            discStatus = status.value;
-            discSort = sortEl.value || "recommend";
-            const cards = document.createElement("div");
-            cards.className = "cards";
-            let rows = nodesOf("discovery").filter(qmatch);
-            if (discStatus) rows = rows.filter(x => x.status === discStatus);
-            rows = sortDiscoveries(rows, discSort);
-            rows.forEach(x => {
-              const meta = [
-                x.angle_recommend || "",
-                x.source_role,
-                x.next_action && x.next_action !== "none" ? x.next_action : "",
-                `@${x.source_handle || "—"}`,
-              ].filter(Boolean).join(" · ");
-              cards.appendChild(discoveryRowEl(x, meta));
-            });
-            if (!rows.length) cards.innerHTML = `<p class='empty'>${t("no_discovery")}</p>`;
-            [...$list.querySelectorAll(".cards")].forEach(n => n.remove());
-            $list.appendChild(cards);
-          };
-          status.onchange = paint;
-          sortEl.onchange = paint;
-          paint();
-        }
-      );
+    function topicMeta(x) {
+      const score = x.fit ? `${x.craft}/${x.fit}` : (x.craft || x.total || "—");
+      const bits = [
+        score,
+        formatPillar(x.pillar),
+        x.lane,
+        x.generation_mode,
+        x.source_type,
+        x.need_ids && x.need_ids !== "none" ? x.need_ids : "",
+        x.product_ids && x.product_ids !== "none" ? x.product_ids : "",
+        x.recommendation_ids && x.recommendation_ids !== "none" ? x.recommendation_ids : "",
+        x.capture_id || "",
+      ].filter(Boolean);
+      return bits.join(" · ");
     }
 
     function renderTopics() {
       $list.innerHTML = "";
+      $list.insertAdjacentHTML("beforeend", `<p class="lead">${esc(t("topics_lead"))}</p>`);
+      if (topicSrc && !TOPIC_SOURCES.includes(topicSrc)) topicSrc = "";
       const statuses = [...new Set(nodesOf("topic").map(x => x.status).filter(Boolean))];
       filterBar(
         `<select id="f-st"><option value="">${t("f_status")}</option>${statuses.map(s => `<option value="${s}" ${s === topicStatus ? "selected" : ""}>${esc(s)}</option>`).join("")}</select>
          <select id="f-p"><option value="">${t("f_pillar")}</option>${pillarIds().map(id => `<option value="${id}" ${id === topicPillar ? "selected" : ""}>${esc(formatPillar(id))}</option>`).join("")}</select>
-         <select id="f-src"><option value="">${t("f_src")}</option>${["watchlist", "inbox", "user", "discovery", "need"].map(s => `<option value="${s}" ${s === topicSrc ? "selected" : ""}>${s}</option>`).join("")}</select>
+         <select id="f-src"><option value="">${t("f_src")}</option>${TOPIC_SOURCES.map(s => `<option value="${s}" ${s === topicSrc ? "selected" : ""}>${s}</option>`).join("")}</select>
          <select id="f-u"><option value="">${t("f_use")}</option>
            <option value="unused" ${topicUsage === "unused" ? "selected" : ""}>${t("f_unused")}</option>
            <option value="promoted" ${topicUsage === "promoted" ? "selected" : ""}>${t("f_promoted")}</option></select>`,
@@ -1783,8 +1717,7 @@
             if (topicSrc) rows = rows.filter(x => x.source_type === topicSrc);
             if (topicUsage) rows = rows.filter(x => x.usage === topicUsage);
             rows.forEach(x => {
-              const score = x.fit ? `${x.craft}/${x.fit}` : (x.craft || x.total || "—");
-              cards.appendChild(rowEl(x, `${score} · ${formatPillar(x.pillar)} · ${x.source_type} @${x.src_handle || "—"}`));
+              cards.appendChild(rowEl(x, topicMeta(x)));
             });
             if (!rows.length) cards.innerHTML = `<p class='empty'>${t("no_topic")}</p>`;
             $list.appendChild(cards);
@@ -1826,7 +1759,7 @@
         let caps = nodesOf("capture").filter(qmatch).sort((a, b) => (b.date || "").localeCompare(a.date || ""));
         if (capIngest === "ingested") caps = caps.filter(c => c.status === "ingested");
         if (capIngest === "not_ingested") caps = caps.filter(c => c.status !== "ingested");
-        caps.forEach(c => cards.appendChild(discoveryRowEl(c, `${c.type} · ${c.status} · raw ${c.has_raw ? t("raw_yes") : t("raw_no")}`)));
+        caps.forEach(c => cards.appendChild(listRowEl(c, `${c.type} · ${c.status} · raw ${c.has_raw ? t("raw_yes") : t("raw_no")}`)));
         if (!caps.length) cards.innerHTML = `<p class='empty'>${t("no_note")}</p>`;
         $list.appendChild(cards);
         return;
@@ -2047,20 +1980,18 @@
 
     function gapsFor(profileId) {
       const topics = profileId ? nodesOfAll("topic").filter(n => n.profile === profileId) : nodesOfAll("topic");
-      const discs = profileId ? nodesOfAll("discovery").filter(n => n.profile === profileId) : nodesOfAll("discovery");
       const needs = profileId ? nodesOfAll("need").filter(n => n.profile === profileId) : nodesOfAll("need");
       const caps = profileId ? nodesOfAll("capture").filter(n => n.profile === profileId) : nodesOfAll("capture");
       const pubs = profileId ? nodesOfAll("published").filter(n => n.profile === profileId) : nodesOfAll("published");
       const needCount = needs.length;
       const gaps = [
         [topics.filter(x => x.status === "ready" && x.usage === "unused").length, "gap_ready_n"],
-        [discs.filter(discoveryUnprocessed).length, "gap_angle_n"],
         [needs.filter(n => n.status === "captured" && (!n.topic_ids || n.topic_ids === "none")).length, "gap_needs_n"],
         [caps.filter(c => c.status !== "ingested").length, "gap_lib_n"],
         [pubs.filter(p => !p.reviewable).length, "gap_review_n"],
       ].filter(([n]) => n > 0);
       if (GRAPH.needs_index_present && needCount < 3) {
-        gaps.splice(2, 0, [needCount, "gap_needs_thin_n"]);
+        gaps.splice(1, 0, [needCount, "gap_needs_thin_n"]);
       }
       return gaps;
     }
@@ -2166,20 +2097,21 @@
           ? `${n.win || 0}w / ${n.loss || 0}l / n=${n.n}`
           : "",
         [t("kv_pillar")]: formatPillar(n.pillar),
-        Lane: n.kind === "topic" ? (n.lane || "") : "",
-        "Generation mode": n.kind === "topic" ? (n.generation_mode || "") : "",
+        [t("kv_lane")]: n.kind === "topic" ? (n.lane || "") : "",
+        [t("kv_mode")]: n.kind === "topic" ? (n.generation_mode || "") : "",
         [t("kv_plat")]: n.platform || n.platforms,
         [t("kv_profile")]: n.profile || n.profile_id || (n.profiles || ""),
         [t("kv_score")]: n.fit ? `${n.craft} opp / ${n.fit} aud` : n.total,
-        [t("kv_use")]: n.kind === "discovery" ? (n.angle_recommend || n.next_action || "") : n.usage,
-        [t("kv_src")]: n.kind === "discovery" ? (n.source_role || "") : n.source_type,
-        Angle: n.kind === "discovery" ? ([n.angle_status, n.need_ids].filter(Boolean).join(" · ")) : "",
+        [t("kv_use")]: n.usage,
+        [t("kv_src")]: n.source_type,
+        [t("kv_needs")]: n.kind === "topic" ? (n.need_ids || "") : "",
         Quote: n.kind === "need" ? (n.quote || "") : "",
         Speaker: n.kind === "need" ? (n.speaker || "") : "",
         Frequency: n.kind === "need" ? (n.frequency || "") : "",
         Topics: n.kind === "need" ? (n.topic_ids || "") : "",
         Products: n.kind === "topic" ? (n.product_ids || "") : "",
         "Product fit": n.kind === "topic" ? (n.product_fit || "") : "",
+        [t("kv_recs")]: n.kind === "topic" ? (n.recommendation_ids || "") : "",
         Audience: n.kind === "product" ? (n.audience || "") : "",
         Price: n.kind === "product" ? (n.price || "") : "",
         "Effective from": n.kind === "product" ? (n.effective_from || "") : "",
@@ -2187,10 +2119,10 @@
         Relationship: n.kind === "recommendation" ? (n.relationship || "") : "",
         "Last researched": n.kind === "recommendation" ? (n.last_researched || "") : "",
         Handle: n.source_handle || n.src_handle || "",
-        [t("kv_heat_at")]: (n.kind === "discovery" || n.kind === "capture") ? (n.engagement_at || "") : "",
+        [t("kv_heat_at")]: n.kind === "capture" ? (n.engagement_at || "") : "",
         [t("kv_result")]: n.result,
       }).filter(([, v]) => v);
-      const heatBlock = (n.kind === "discovery" || n.kind === "capture")
+      const heatBlock = n.kind === "capture"
         ? `${heatStripHtml(n, { hint: true })}${n.source_url ? `<p class="note">${t("src_url")}<a href="${esc(n.source_url)}" target="_blank" rel="noreferrer">${esc(n.source_url)}</a></p>` : ""}`
         : "";
       $insp.innerHTML = `<h2>${t("obj")}</h2>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easysociable/cli",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Agent-first CLI for EasySociable: Content Engine, Template, Slideshow, and MCP",
   "type": "module",
   "license": "MIT",
@@ -49,9 +49,9 @@
     "tsup": "^8.0.2",
     "typescript": "^5.8.3",
     "vitest": "^1.3.1",
+    "@easysociable/template-gateway-client": "0.0.0",
     "@easysociable/mcp-server": "0.0.0",
     "@easysociable/tsconfig": "0.0.0",
-    "@easysociable/template-gateway-client": "0.0.0",
     "@easysociable/vitest-config": "0.0.0"
   },
   "scripts": {