dsh-brief-sidebar 0.9.5 → 0.9.7

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-brief-sidebar",
-  "version": "0.9.5",
+  "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

@@ -253,7 +253,7 @@ window.__ModuleLoader__.load({
 			display: "flex",
 			flexDirection: "column"
 		};
-		const ROW_STYLE$6 = {
+		const ROW_STYLE$5 = {
 			display: "flex",
 			alignItems: "flex-start",
 			gap: 8,
@@ -305,7 +305,7 @@ window.__ModuleLoader__.load({
 		/** One task row. */
 		function TodoRow(props) {
 			const { item, t } = props;
-			return (0, react.createElement)("li", { style: ROW_STYLE$6 }, (0, react.createElement)("span", { style: pillStyle(item.status) }, t(statusKey(item.status))), (0, react.createElement)("span", { style: contentStyle(item.status) }, item.content));
+			return (0, react.createElement)("li", { style: ROW_STYLE$5 }, (0, react.createElement)("span", { style: pillStyle(item.status) }, t(statusKey(item.status))), (0, react.createElement)("span", { style: contentStyle(item.status) }, item.content));
 		}
 		/**
 		* The progress section. The subscription is unconditional (a plain listener,
@@ -1363,7 +1363,7 @@ window.__ModuleLoader__.load({
 			display: "flex",
 			flexDirection: "column"
 		};
-		const ROW_STYLE$5 = {
+		const ROW_STYLE$4 = {
 			display: "flex",
 			alignItems: "flex-start",
 			gap: 8,
@@ -1409,11 +1409,11 @@ window.__ModuleLoader__.load({
 			const title = plan === null ? path : `${t("deliverable.codeplanTag")}: ${plan.task} · ${path}`;
 			const label = basename(path);
 			const content = plan === null ? null : (0, react.createElement)("span", { style: TAG_STYLE$2 }, t("deliverable.codeplanTag"));
-			if (open === void 0) return (0, react.createElement)("li", { style: ROW_STYLE$5 }, content, (0, react.createElement)("span", {
+			if (open === void 0) return (0, react.createElement)("li", { style: ROW_STYLE$4 }, content, (0, react.createElement)("span", {
 				style: PATH_STYLE,
 				title
 			}, label));
-			return (0, react.createElement)("li", { style: ROW_STYLE$5 }, content, (0, react.createElement)("button", {
+			return (0, react.createElement)("li", { style: ROW_STYLE$4 }, content, (0, react.createElement)("button", {
 				style: BUTTON_STYLE,
 				title,
 				onClick: () => {
@@ -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
@@ -2004,7 +2053,7 @@ window.__ModuleLoader__.load({
 			display: "flex",
 			flexDirection: "column"
 		};
-		const ROW_STYLE$4 = {
+		const ROW_STYLE$3 = {
 			display: "flex",
 			alignItems: "baseline",
 			gap: 8,
@@ -2072,7 +2121,7 @@ window.__ModuleLoader__.load({
 				marker: "skill-usage-invoked-group"
 			}), (0, react.createElement)("ul", { style: LIST_STYLE$3 }, view.session.map((entry) => (0, react.createElement)("li", {
 				key: entry.name,
-				style: ROW_STYLE$4,
+				style: ROW_STYLE$3,
 				"data-dsh-brief-sidebar": "skill-usage-row"
 			}, (0, react.createElement)("span", { style: NAME_STYLE$1 }, entry.name), (0, react.createElement)("span", { style: COUNT_STYLE }, expandPair(t("skillUsage.uses"), entry.count, entry.count)), latestNames.includes(entry.name) && (0, react.createElement)("span", { style: TAG_STYLE$1 }, t("skillUsage.latestTag"))))), rest.length > 0 && (0, react.createElement)(FoldToggle, {
 				label: expandCount(t("skillUsage.availableGroup"), rest.length),
@@ -2086,7 +2135,7 @@ window.__ModuleLoader__.load({
 				marker: "skill-usage-available-capped"
 			}), availableOpen && (0, react.createElement)("ul", { style: LIST_STYLE$3 }, rest.map((name) => (0, react.createElement)("li", {
 				key: name,
-				style: ROW_STYLE$4,
+				style: ROW_STYLE$3,
 				"data-dsh-brief-sidebar": "skill-usage-available-row"
 			}, (0, react.createElement)("span", { style: NAME_STYLE$1 }, name)))), view.session.length > 0 && (0, react.createElement)("div", { style: FOOTER_STYLE$3 }, expandPair(t("skillUsage.count"), view.callTotal, view.sessionTotal)));
 		}
@@ -2096,15 +2145,19 @@ window.__ModuleLoader__.load({
 		* The search-reference section: the `dshSummarySearchRefs` projection drawn as
 		* one tab of the references section.
 		*
-		* It answers "what did this session pull in from outside": the queries it ran
-		* — via the harness's `web_search` or the user's own `advanced_search` — and the
-		* sources those searches returned. Each query row carries its tool name, because
-		* which of the two answered is a fact the reader asks about. Two groups, because
-		* they are two different facts — a query says what was asked, a source says what
-		* came back, and an older `dsh-free-search` without `presentationMeta` produces
-		* queries with no sources at all. That degraded case is stated rather than
-		* hidden, because an empty source list would otherwise read as "the search found
-		* nothing".
+		* It answers "what did this session pull in from outside", and it answers it the
+		* way the conversation to its left does: **one left-aligned bubble per source**,
+		* title as a link, host and provider snippet under it. No group headers, no list
+		* of query titles — that wall duplicated what the transcript already shows, and a
+		* reader who opens this tab is looking for the results, not for a restatement of
+		* the questions.
+		*
+		* The fold still records which query and which tool (`web_search` or the user's
+		* own `advanced_search`) surfaced each source; that data stays in the frame for
+		* any surface that wants it, it is just no longer drawn here. An older
+		* `dsh-free-search` without `presentationMeta` yields queries with no sources —
+		* that degraded case is stated (`searchRefs.noSourcesHint`) rather than left as
+		* an empty pane, because an empty list reads as "the search found nothing".
 		*
 		* Optional on both sides: no registry, or a host half that never registered the
 		* unit, means the client reads capability absence and the section hides.
@@ -2130,31 +2183,45 @@ window.__ModuleLoader__.load({
 		const LIST_STYLE$2 = {
 			listStyle: "none",
 			margin: 0,
-			padding: "6px 0",
-			display: "flex",
-			flexDirection: "column"
-		};
-		const ROW_STYLE$3 = {
+			padding: "8px 12px 10px",
 			display: "flex",
+			flexDirection: "column",
 			alignItems: "flex-start",
-			gap: 8,
-			padding: "6px 12px"
+			gap: 8
 		};
-		const QUERY_STYLE = {
+		/**
+		* One result, drawn as a chat bubble: left-aligned, background-filled, rounded,
+		* and narrower than the column. The reader reads this tab the way they read the
+		* conversation to its left — each bubble is one thing the session pulled in — so
+		* the list chrome (row rules, group headers, per-query title lines) is dropped
+		* rather than restyled.
+		*
+		* `alignItems: flex-start` on the list is what keeps bubbles hugging the left
+		* edge; without it a flex child stretches to the full column and the bubble
+		* reads as a plain card.
+		*/
+		const BUBBLE_STYLE$1 = {
+			maxWidth: "92%",
+			padding: "8px 10px",
+			borderRadius: 10,
+			background: "var(--dsw-alias-bg-layer-3)",
+			border: "1px solid var(--dsw-alias-border-l2)",
+			color: "var(--dsw-alias-label-primary)",
+			fontSize: 12,
+			lineHeight: "17px",
 			minWidth: 0,
-			flex: "1 1 auto",
-			overflowWrap: "anywhere",
-			color: "var(--dsw-alias-label-secondary)"
+			display: "flex",
+			flexDirection: "column",
+			gap: 2
 		};
-		/** The source title, one line: the host and URL carry the identification. */
+		/** The source title, up to three lines: inside a bubble it IS the content. */
 		const TITLE_STYLE$2 = {
 			minWidth: 0,
-			flex: "1 1 auto",
+			overflowWrap: "anywhere",
 			display: "-webkit-box",
-			WebkitLineClamp: 2,
+			WebkitLineClamp: 3,
 			WebkitBoxOrient: "vertical",
-			overflow: "hidden",
-			color: "var(--dsw-alias-label-secondary)"
+			overflow: "hidden"
 		};
 		const SNIPPET_STYLE = {
 			margin: 0,
@@ -2164,12 +2231,19 @@ window.__ModuleLoader__.load({
 			fontSize: 11,
 			lineHeight: "16px"
 		};
-		const META_STYLE$2 = {
-			flexShrink: 0,
+		const HOST_STYLE = {
 			color: "var(--dsw-alias-label-tertiary)",
 			fontSize: 11,
-			lineHeight: "18px",
-			whiteSpace: "nowrap"
+			lineHeight: "16px",
+			overflowWrap: "anywhere"
+		};
+		/** The bubble's own footer strip — where the "本轮" pill lives now. */
+		const BUBBLE_FOOT_STYLE = {
+			display: "flex",
+			alignItems: "center",
+			gap: 6,
+			marginTop: 2,
+			minWidth: 0
 		};
 		/** The "本轮" pill: same form as the skill tag, tertiary emphasis. */
 		const TAG_STYLE = {
@@ -2205,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,
@@ -2214,52 +2289,49 @@ window.__ModuleLoader__.load({
 				color: "var(--dsw-alias-label-secondary)"
 			} }, t("searchRefs.empty")), (0, react.createElement)("div", null, t("searchRefs.emptyHint"))));
 			const body = [];
-			if (view.queries.length > 0) {
-				body.push((0, react.createElement)(GroupHeader, {
-					key: "qh",
-					text: expandCount(t("searchRefs.queryGroup"), view.queries.length),
-					marker: "search-refs-query-group"
+			/** 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", {
+					style: TITLE_STYLE$2,
+					href,
+					target: "_blank",
+					rel: "noreferrer noopener"
+				}, label);
+				const latest = isLatestSource(view, item.url);
+				return (0, react.createElement)("li", {
+					key: item.url,
+					style: { minWidth: 0 },
+					"data-dsh-brief-sidebar": "search-refs-source"
+				}, (0, react.createElement)("div", {
+					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: "ql",
-					style: LIST_STYLE$2
-				}, view.queries.map((row) => (0, react.createElement)("li", {
-					key: `${row.turn}:${row.query}`,
-					style: ROW_STYLE$3,
-					"data-dsh-brief-sidebar": "search-refs-query"
-				}, (0, react.createElement)("span", { style: QUERY_STYLE }, row.query), (0, react.createElement)("span", { style: TAG_STYLE }, row.tool), (0, react.createElement)("span", { style: META_STYLE$2 }, expandCount(t("searchRefs.hits"), row.hits))))));
+					key: `b:${key}`,
+					style: LIST_STYLE$2,
+					"data-dsh-brief-sidebar": "search-refs-cluster-items"
+				}, cluster.items.map(renderBubble)));
 			}
-			if (view.sources.length > 0) {
-				body.push((0, react.createElement)(GroupHeader, {
-					key: "sh",
-					text: expandCount(t("searchRefs.sourceGroup"), view.sources.length),
-					marker: "search-refs-source-group"
-				}));
-				body.push((0, react.createElement)("ul", {
-					key: "sl",
-					style: LIST_STYLE$2
-				}, view.sources.map((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", {
-						style: TITLE_STYLE$2,
-						href,
-						target: "_blank",
-						rel: "noreferrer noopener"
-					}, label);
-					return (0, react.createElement)("li", {
-						key: item.url,
-						style: ROW_STYLE$3,
-						"data-dsh-brief-sidebar": "search-refs-source"
-					}, (0, react.createElement)("div", { style: {
-						minWidth: 0,
-						flex: "1 1 auto",
-						display: "flex",
-						flexDirection: "column",
-						gap: 2
-					} }, link, (0, react.createElement)("span", { style: META_STYLE$2 }, item.host), item.snippet !== void 0 && (0, react.createElement)("p", { style: SNIPPET_STYLE }, item.snippet)), isLatestSource(view, item.url) && (0, react.createElement)("span", { style: TAG_STYLE }, t("searchRefs.latestTag")));
-				})));
-			} else body.push((0, react.createElement)("div", {
+			else body.push((0, react.createElement)("div", {
 				key: "ns",
 				style: FOOTER_STYLE$2,
 				"data-dsh-brief-sidebar": "search-refs-no-sources"