@morehao/dsh-github-trending 0.8.14 → 0.8.15

package/client.js

@@ -1358,8 +1358,14 @@ var CSS = `
   transition:background .12s ease,border-color .12s ease;}
 .dshgt-ver-badge:hover{background:color-mix(in srgb,var(--gt-warn) 12%,transparent);border-color:color-mix(in srgb,var(--gt-warn) 60%,transparent);}
 .dshgt-ver-badge:focus-visible{outline:2px solid var(--gt-accent);outline-offset:1px;}
-/* 纯图标刷新：状态靠图标颜色 + 角标 + 旋转表达，文案走 title（tooltip） */
-.dshgt-refresh{position:relative;}
+/* 纯图标刷新：与 dsh-skills-console 的 .dshsc-tool 逐项一致（尺寸/圆角/无边框/hover 层2底），
+   状态另由图标颜色 + 角标 + 旋转表达，文案走 title（tooltip）。独立成类，不再继承 .dshgt-id-gh。 */
+.dshgt-refresh{position:relative;display:inline-flex;align-items:center;justify-content:center;box-sizing:border-box;
+  width:26px;height:26px;padding:0;border:0;border-radius:7px;background:transparent;color:var(--gt-muted);
+  cursor:pointer;text-decoration:none;transition:background .12s ease,color .12s ease;flex:none;}
+.dshgt-refresh:hover{background:var(--dsw-alias-bg-layer-2);color:var(--gt-fg);}
+.dshgt-refresh:focus-visible{outline:2px solid var(--gt-accent);outline-offset:1px;}
+.dshgt-refresh[aria-expanded="true"]{background:var(--dsw-alias-bg-layer-2);color:var(--gt-fg);}
 .dshgt-refresh svg{display:block;transition:color .12s ease;}
 .dshgt-refresh[data-state="available"]{color:var(--gt-warn);}
 .dshgt-refresh[data-state="available"]::after{content:"";position:absolute;top:3px;right:3px;width:6px;height:6px;border-radius:50%;background:var(--gt-warn);box-shadow:0 0 0 1.5px var(--gt-bg);}
@@ -5686,6 +5692,47 @@ function AboutDialog(props) {
 
 // node_modules/@morehao/dsh-plugin-kit/dist/update-client.js
 var IDLE = { status: "idle", view: null, error: null };
+function deriveUpdateUiState(state) {
+  const { status, view } = state;
+  const busy = status === "checking" || status === "applying";
+  const settled = status === "restart-required" || status === "applied";
+  const updateAvailable = view !== null && view.updateAvailable;
+  const canApply = view !== null && view.canApply;
+  const latestVersion = view === null ? null : view.latestVersion ?? null;
+  let visual;
+  if (busy) visual = "checking";
+  else if (settled) visual = "ok-flash";
+  else if (status === "failed" || view !== null && view.checkFailed) visual = "error";
+  else if (updateAvailable) visual = "available";
+  else visual = "latest";
+  const actionable = updateAvailable && canApply && !busy && !settled;
+  const showBadge = visual === "available" && !busy && !settled && canApply && latestVersion !== null;
+  return {
+    visual,
+    busy,
+    settled,
+    actionable,
+    showBadge,
+    badgeVersion: showBadge ? latestVersion : null,
+    canApply
+  };
+}
+function updateStatusLabel(state) {
+  const { status, view } = state;
+  const latest = view?.latestVersion ?? "";
+  const current = view?.currentVersion ?? "";
+  if (status === "checking" || view === null || status === "idle") {
+    return { key: "checking", params: {} };
+  }
+  if (status === "applying") return { key: "applying", params: { version: latest } };
+  if (status === "restart-required" || status === "applied") return { key: "done", params: { version: latest } };
+  if (status === "failed") {
+    return state.error?.code === "CHECK_FAILED" ? { key: "checkFailed", params: {} } : { key: "failed", params: {} };
+  }
+  if (view.checkFailed) return { key: "checkFailed", params: {} };
+  if (view.updateAvailable) return { key: "available", params: { latest } };
+  return { key: "latest", params: { version: current } };
+}
 function errorOf(error) {
   if (error !== null && typeof error === "object") {
     const value = error;
@@ -5927,26 +5974,25 @@ function IdentityBar(props) {
   const [confirming, setConfirming] = import_react.default.useState(false);
   const [updateState, controller] = usePluginUpdate();
   const view = updateState.view;
-  const status = updateState.status;
-  const busy = status === "checking" || status === "applying";
-  const settled = status === "restart-required" || status === "applied";
   const latestVersion = view === null ? "" : view.latestVersion ?? "";
-  const updateAvailable = view !== null && view.updateAvailable;
-  const actionable = updateAvailable && view !== null && view.canApply && !busy && !settled;
   const currentVersion = view === null ? plugin.version : view.currentVersion ?? plugin.version;
+  const ui = deriveUpdateUiState(updateState);
+  const label = updateStatusLabel(updateState);
+  const busy = ui.busy;
+  const actionable = ui.actionable;
   import_react.default.useEffect(() => {
-    if (!updateAvailable || busy || settled) setConfirming(false);
-  }, [updateAvailable, busy, settled]);
-  function stateAndTip() {
-    if (status === "checking" || view === null) return { state: "checking", tip: t("shell.update.checking") };
-    if (status === "applying") return { state: "checking", tip: t("shell.update.applying", { version: latestVersion }) };
-    if (status === "restart-required" || status === "applied") return { state: "ok-flash", tip: t("shell.update.done", { version: latestVersion }) };
-    if (status === "failed") return { state: "error", tip: updateState.error?.code === "CHECK_FAILED" ? t("shell.update.checkFailed") : t("shell.update.failed") };
-    if (view.checkFailed) return { state: "error", tip: t("shell.update.checkFailed") };
-    if (view.updateAvailable) return { state: "available", tip: t("shell.update.available", { latest: latestVersion }) };
-    return { state: "latest", tip: t("shell.update.latest", { version: currentVersion }) };
-  }
-  const st = stateAndTip();
+    if (!actionable) setConfirming(false);
+  }, [actionable]);
+  const LABEL_COPY = {
+    checking: t("shell.update.checking"),
+    applying: t("shell.update.applying", { version: label.params.version ?? "" }),
+    available: t("shell.update.available", { latest: label.params.latest ?? "" }),
+    latest: t("shell.update.latest", { version: label.params.version ?? "" }),
+    done: t("shell.update.done", { version: label.params.version ?? "" }),
+    checkFailed: t("shell.update.checkFailed"),
+    failed: t("shell.update.failed")
+  };
+  const st = { state: ui.visual, tip: LABEL_COPY[label.key] ?? t("shell.update.latest", { version: currentVersion }) };
   function onRefreshClick() {
     if (busy) return;
     if (actionable) {
@@ -5960,7 +6006,7 @@ function IdentityBar(props) {
     writePendingUpdate(currentVersion, latestVersion);
     void controller.apply();
   }
-  const showBadge = Boolean(updateAvailable && view?.canApply && !busy && !settled);
+  const showBadge = ui.showBadge;
   const confirmOpen = confirming && actionable;
   return h(
     "div",
@@ -5973,13 +6019,10 @@ function IdentityBar(props) {
       { type: "button", className: "dshgt-id-pkg dshgt-mono", title: t("about.title"), onClick: () => props.onOpenAbout() },
       plugin.name
     ),
-    plugin.repository === void 0 ? null : [
-      h("span", { key: "gh-sep", className: "dshgt-id-sep dshgt-id-sep-gh" }),
-      h("a", { key: "gh", className: "dshgt-id-gh", href: plugin.repository, target: "_blank", rel: "noreferrer", title: t("about.repo"), "aria-label": t("about.repo") }, githubIcon())
-    ],
+    // 更新入口：版本徽标 + 纯图标刷新，放在 GitHub 图标左侧、与之一组右对齐。
     h(
       "div",
-      { className: "dshgt-idbar-right" },
+      { className: "dshgt-idbar-actions" },
       h(
         "div",
         { className: "dshgt-upd-unit" },
@@ -5998,7 +6041,7 @@ function IdentityBar(props) {
           "button",
           {
             type: "button",
-            className: "dshgt-id-gh dshgt-refresh",
+            className: "dshgt-refresh",
             "data-state": st.state,
             disabled: busy,
             title: st.tip,
@@ -6009,6 +6052,10 @@ function IdentityBar(props) {
           refreshIcon()
         )
       ),
+      plugin.repository === void 0 ? null : [
+        h("span", { key: "gh-sep", className: "dshgt-id-sep dshgt-id-sep-gh" }),
+        h("a", { key: "gh", className: "dshgt-id-gh", href: plugin.repository, target: "_blank", rel: "noreferrer", title: t("about.repo"), "aria-label": t("about.repo") }, githubIcon())
+      ],
       confirmOpen ? h(
         "div",
         { className: "dshgt-confirm-pop", role: "dialog", "aria-label": t("shell.update.confirmHint") },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morehao/dsh-github-trending",
-  "version": "0.8.14",
+  "version": "0.8.15",
   "description": "GitHub 趋势日报的 DeepSeek Harness 插件：按日 / 周 / 月周期定时 spawn 本地 trendradar 核心，抓取 Trending、生成中文简介与周期总结，并可选把订阅仓库的新 Release 合成中文摘要，一起提交到你的仓库、自动开 PR 合并；内置概览 / 榜单 / 运行记录 / 订阅 / 设置工作台。",
   "type": "module",
   "main": "lib/index.js",
@@ -51,7 +51,7 @@
     }
   },
   "dependencies": {
-    "@morehao/dsh-plugin-kit": "^0.4.0",
+    "@morehao/dsh-plugin-kit": "^0.4.1",
     "@morehao/trendradar-contract": "0.5.0"
   },
   "dsh": {