dsh-brief-sidebar 0.9.6 → 0.9.7

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-brief-sidebar",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "main": "./lib/index.mjs",
   "description": "会话简报侧栏页（brief）：把会话的 todo 列表（`todos` 投影的进展看板）、产物列表（`dshSummaryDeliverables` 投影的实时产出文件）与记忆槽位（`memorySlots` 投影，来自 dsh-prime-memory，开关可关）一起渲染成右侧栏的一个「概要」tab，并遮蔽 DSH 官方那条 composer 上方的 todo 面板。只读展示，不做写回。",
   "engines": {

package/lib/client.js

@@ -1622,18 +1622,30 @@ window.__ModuleLoader__.load({
 		function readTool(value) {
 			return typeof value === "string" && value.length > 0 ? value : "advanced_search";
 		}
+		/**
+		* The queries that surfaced a source, newest first.
+		*
+		* Two legacy shapes are repaired rather than dropped: a frame written before
+		* the cluster change carries a single `query` string, and a drifted value
+		* (non-array, or an array of junk) reads as "member of no cluster" — the row
+		* still shows, it just joins the tail group.
+		*/
+		function readQueries(value) {
+			if (Array.isArray(value)) return [...new Set(value.filter((q) => typeof q === "string" && q.length > 0))];
+			if (typeof value === "string" && value.length > 0) return [value];
+			return [];
+		}
 		/** Narrow one source row; `undefined` = malformed, dropped. */
 		function readItem$1(value) {
 			if (value === null || typeof value !== "object" || Array.isArray(value)) return void 0;
 			const raw = value;
 			if (typeof raw["url"] !== "string" || raw["url"].length === 0) return void 0;
 			if (typeof raw["host"] !== "string") return void 0;
-			if (typeof raw["query"] !== "string") return void 0;
 			if (!isCounter$2(raw["count"]) || !isCounter$2(raw["lastTurn"])) return void 0;
 			const item = {
 				url: raw["url"],
 				host: raw["host"],
-				query: raw["query"],
+				queries: readQueries(raw["queries"] ?? raw["query"]),
 				tool: readTool(raw["tool"]),
 				count: raw["count"],
 				lastTurn: raw["lastTurn"]
@@ -1699,6 +1711,43 @@ window.__ModuleLoader__.load({
 			return view.latest?.urls.includes(urlKey(url)) === true;
 		}
 		/**
+		* Cluster the result bubbles under the queries that surfaced them.
+		*
+		* Membership is the source's own `queries` list, so a source a merged
+		* multi-query `web_search` brought back appears under each of them — that is
+		* what happened, and hiding the repeat would make the counts under the headers
+		* disagree with the cards on screen. Queries come newest-first from the fold;
+		* a source no listed query claims (its query aged out of the capped list, or a
+		* pre-cluster frame) lands in a tail group rather than disappearing.
+		*/
+		function clusterByQuery(view) {
+			const latestTurn = view.latest?.turn;
+			const claimed = /* @__PURE__ */ new Set();
+			const out = [];
+			for (const row of view.queries) {
+				const items = view.sources.filter((item) => item.queries.includes(row.query));
+				for (const item of items) claimed.add(item.url);
+				out.push({
+					query: row.query,
+					tool: row.tool,
+					turn: row.turn,
+					hits: row.hits,
+					items,
+					latest: latestTurn !== void 0 && row.turn === latestTurn
+				});
+			}
+			const rest = view.sources.filter((item) => !claimed.has(item.url));
+			if (rest.length > 0) out.push({
+				query: "",
+				tool: rest[0]?.tool ?? "",
+				turn: rest[0]?.lastTurn ?? 0,
+				hits: rest.length,
+				items: rest,
+				latest: false
+			});
+			return out;
+		}
+		/**
 		* The href to render for a source URL, or `undefined` when it must not be a link.
 		*
 		* Search results are untrusted external data: a `javascript:` or `data:` URL in
@@ -2230,6 +2279,7 @@ window.__ModuleLoader__.load({
 		function SearchRefSection(props) {
 			const { t, ctx, scope, hideHeader = false } = props;
 			const view = readSearchRefs(useProjectionValue(ctx, scope?.sessionId, SEARCH_REFS_KEY));
+			const [openMap, setOpenMap] = (0, react.useState)({});
 			if (view === void 0) return null;
 			if (view.queries.length === 0 && view.sources.length === 0) return (0, react.createElement)("div", {
 				style: SECTION_STYLE$3,
@@ -2239,10 +2289,8 @@ window.__ModuleLoader__.load({
 				color: "var(--dsw-alias-label-secondary)"
 			} }, t("searchRefs.empty")), (0, react.createElement)("div", null, t("searchRefs.emptyHint"))));
 			const body = [];
-			if (view.sources.length > 0) body.push((0, react.createElement)("ul", {
-				key: "sl",
-				style: LIST_STYLE$2
-			}, view.sources.map((item) => {
+			/** One result bubble; shared by every cluster so the cards stay identical. */
+			const renderBubble = (item) => {
 				const href = safeHref(item.url);
 				const label = item.title ?? item.url;
 				const link = href === void 0 ? (0, react.createElement)("span", { style: TITLE_STYLE$2 }, label) : (0, react.createElement)("a", {
@@ -2260,7 +2308,29 @@ window.__ModuleLoader__.load({
 					style: BUBBLE_STYLE$1,
 					"data-dsh-brief-sidebar": "search-refs-bubble"
 				}, link, (0, react.createElement)("span", { style: HOST_STYLE }, item.host), item.snippet !== void 0 && (0, react.createElement)("p", { style: SNIPPET_STYLE }, item.snippet), (latest || item.count > 1) && (0, react.createElement)("div", { style: BUBBLE_FOOT_STYLE }, latest && (0, react.createElement)("span", { style: TAG_STYLE }, t("searchRefs.latestTag")), item.count > 1 && (0, react.createElement)("span", { style: HOST_STYLE }, `\u00d7${item.count}`))));
-			})));
+			};
+			if (view.sources.length > 0) for (const cluster of clusterByQuery(view)) {
+				const key = cluster.query === "" ? "\0tail" : cluster.query;
+				const open = openMap[key] ?? cluster.latest;
+				body.push((0, react.createElement)(FoldToggle, {
+					key: `h:${key}`,
+					label: cluster.query === "" ? expandCount(t("searchRefs.sourceGroup"), cluster.items.length) : `${cluster.query} · ${expandCount(t("searchRefs.hits"), cluster.hits)}`,
+					open,
+					marker: "search-refs-cluster",
+					onToggle: () => {
+						setOpenMap((prev) => ({
+							...prev,
+							[key]: !open
+						}));
+					}
+				}));
+				if (!open) continue;
+				body.push((0, react.createElement)("ul", {
+					key: `b:${key}`,
+					style: LIST_STYLE$2,
+					"data-dsh-brief-sidebar": "search-refs-cluster-items"
+				}, cluster.items.map(renderBubble)));
+			}
 			else body.push((0, react.createElement)("div", {
 				key: "ns",
 				style: FOOTER_STYLE$2,