dsh-task-ledger 0.0.45 → 0.0.47

package/dist/client.js

@@ -10,6 +10,8 @@ window.__ModuleLoader__.load({
 		/** host 路由前缀（全仓唯一；与 host/routes.ts 的 API_PREFIX 对应）。 */
 		const API_PREFIX = "api/task-ledger";
 		const DEFAULT_TIMEOUT_MS = 8e3;
+		/** 趋势端点读 history，比快路径慢一个量级（20 万条实测 4s+），超时单给。 */
+		const TREND_TIMEOUT_MS = 3e4;
 		/**
 		* 错误响应榨人话：host 路由（routes.ts）发的是 `{ error: "..." }`，那里的话是**能直接上界面的**
 		* （带工作区名、python3 起不来之类的原文）。不带它界面上只剩「HTTP 500」，等于没报错。
@@ -40,9 +42,24 @@ window.__ModuleLoader__.load({
 				clearTimeout(timer);
 			}
 		}
-		/** 首页快照（在办全量 + 两个完成类统计 + 各工作区身份）。 */
-		function fetchBoard() {
-			return fetchJson("/board");
+		/**
+		* 首页快照（快路径：在办全量 + 统计 + 各工作区身份；**不含趋势**）。
+		* `fresh` = 让 host 先清 1.5s 读缓存再算（手动刷新 / 首读都要最新，不吃上一屏的缓存）。
+		*/
+		function fetchBoardSnapshot(opts = {}) {
+			return fetchJson(`/board/snapshot${freshSuffix(opts)}`);
+		}
+		/**
+		* 趋势（慢路径：近 8 周 + 四个自然周期，host 侧要读 history）。
+		* 超时给得比默认宽：历史量大时读得久（实测 20 万条量级 4s+）；
+		* 旧宿主没有该端点 ⇒ 404，直接抛给调用方兜底，不阻塞列表。
+		*/
+		function fetchTrend(opts = {}) {
+			return fetchJson(`/board/trend${freshSuffix(opts)}`, {}, TREND_TIMEOUT_MS);
+		}
+		/** `?fresh=1` 只在真要最新值时带；不带就吃 host 的 1.5s 缓存。 */
+		function freshSuffix(opts) {
+			return opts.fresh === true ? "?fresh=1" : "";
 		}
 		//#endregion
 		//#region src/client/store.ts
@@ -66,7 +83,10 @@ window.__ModuleLoader__.load({
 				keyword: "",
 				othersKeyword: ""
 			},
-			refreshing: false
+			refreshing: false,
+			trend: null,
+			trendStatus: "idle",
+			trendError: null
 		};
 		const listeners = /* @__PURE__ */ new Set();
 		/** 首读只触发一次（谁先订阅谁触发），之后一律靠 `refresh()` / `setQuery()`。 */
@@ -96,17 +116,24 @@ window.__ModuleLoader__.load({
 				listeners.delete(listener);
 			};
 		}
-		/** 重读：在办快照 + 完成类统计与近 8 周趋势（一次 `/board` 全带回）。 */
+		/**
+		* 重读（2026-10-18 拆端点）：**两段**——先快路径 `/board/snapshot`（只读在办，首屏立即可渲染），
+		* 再慢路径 `/board/trend`（读 history，后台拉；迟到按 token 丢弃，不盖新快照）。
+		* 趋势失败（含旧宿主 404）不阻塞列表：trendStatus 置 error，图表区显示兜底文案。
+		* 两段都带 `fresh=1`：本函数只由首读与手动刷新触发，都要最新值（host 缓存清两次无害，清是全局的）。
+		*/
 		async function refresh() {
 			const token = ++runToken;
 			set({ refreshing: true });
 			try {
-				const board = await fetchBoard();
+				const board = await fetchBoardSnapshot({ fresh: true });
 				if (token !== runToken) return;
 				set({
 					status: "ready",
 					board,
-					error: null
+					error: null,
+					trendStatus: "loading",
+					trendError: null
 				});
 			} catch (error) {
 				if (token !== runToken) return;
@@ -114,9 +141,26 @@ window.__ModuleLoader__.load({
 					status: "error",
 					error: error instanceof Error ? error.message : String(error)
 				});
+				return;
 			} finally {
 				if (token === runToken) set({ refreshing: false });
 			}
+			try {
+				const trend = await fetchTrend({ fresh: true });
+				if (token !== runToken) return;
+				set({
+					trend,
+					trendStatus: "ready",
+					trendError: null
+				});
+			} catch (error) {
+				if (token !== runToken) return;
+				set({
+					trend: null,
+					trendStatus: "error",
+					trendError: error instanceof Error ? error.message : String(error)
+				});
+			}
 		}
 		/** 改筛选：全部在浏览器里完成（快照已含全部在办），不发请求。 */
 		function setQuery(patch) {
@@ -156,10 +200,11 @@ window.__ModuleLoader__.load({
 			return String(b.task.created ?? b.task.started ?? "").localeCompare(String(a.task.created ?? a.task.started ?? ""));
 		}
 		/**
-		* 当前筛选下的两区视图（用户 2026-10-17 定稿）：
+		* 当前筛选下的两区视图（用户 2026-10-18 调整）：
 		*  - 第一区「我的待办」= 我名下 doing/blocked，吃工作区下拉 + 标题搜索，按创建时间倒序；
-		*  - 第二区「其他待办」= 其余任务按工作区分组，吃**状态档**（segmented）+
-		*    **标题 / 执行人搜索**（usersKeyword）；一个整表（外框连着），不是一块一块的。
+		*  - 第二区「全部待办」= **所有**在办任务按工作区分组（含我的——用户明确不要过滤掉自己），
+		*    吃**状态档**（segmented）+ **标题 / 执行人搜索**（othersKeyword）；一个整表（外框连着）。
+		*    ⇒ 我的任务会同时出现在两个区，这是预期（顶部快看 / 底部全量）。
 		*/
 		function selectView(current) {
 			const { board, query } = current;
@@ -167,7 +212,7 @@ window.__ModuleLoader__.load({
 				mine: [],
 				groups: [],
 				total: 0,
-				othersCounts: {
+				allCounts: {
 					total: 0,
 					doing: 0,
 					open: 0,
@@ -175,13 +220,13 @@ window.__ModuleLoader__.load({
 					stale: 0
 				}
 			};
-			const othersAll = board.tasks.filter((task) => !isMine(task, board));
-			const othersCounts = {
-				total: othersAll.length,
-				doing: othersAll.filter((task) => task.status === "doing").length,
-				open: othersAll.filter((task) => task.status === "open").length,
-				blocked: othersAll.filter((task) => task.status === "blocked").length,
-				stale: othersAll.filter((task) => task.stale === true).length
+			const allTasks = board.tasks;
+			const allCounts = {
+				total: allTasks.length,
+				doing: allTasks.filter((task) => task.status === "doing").length,
+				open: allTasks.filter((task) => task.status === "open").length,
+				blocked: allTasks.filter((task) => task.status === "blocked").length,
+				stale: allTasks.filter((task) => task.stale === true).length
 			};
 			const mineRows = board.tasks.filter((task) => isMine(task, board)).filter((task) => query.workspace === "" || task.workspace.id === query.workspace).filter((task) => hitKeyword(query.keyword, [
 				task.title,
@@ -196,7 +241,7 @@ window.__ModuleLoader__.load({
 				task,
 				mine: true
 			}));
-			const rest = query.scope === "mine" ? [] : board.tasks.filter((task) => !isMine(task, board)).filter((task) => statusHit(task, query.status)).filter((task) => hitKeyword(query.othersKeyword, [task.title, task.owner]));
+			const rest = query.scope === "mine" ? [] : board.tasks.filter((task) => statusHit(task, query.status)).filter((task) => hitKeyword(query.othersKeyword, [task.title, task.owner]));
 			const byWorkspace = /* @__PURE__ */ new Map();
 			for (const task of rest) {
 				const entry = byWorkspace.get(task.workspace.id) ?? {
@@ -224,8 +269,8 @@ window.__ModuleLoader__.load({
 			return {
 				mine: mineRows,
 				groups,
-				total: mineRows.length + groups.reduce((sum, group) => sum + group.rows.length, 0),
-				othersCounts
+				total: groups.reduce((sum, group) => sum + group.rows.length, 0),
+				allCounts
 			};
 		}
 		//#endregion
@@ -1166,6 +1211,11 @@ body[data-ds-dark-theme]{
 			const board = state.board;
 			const view = (0, react.useMemo)(() => selectView(state), [state]);
 			const stats = board?.stats;
+			const trend = state.trend;
+			const periods = trend?.trend;
+			const trendPending = state.trendStatus === "idle" || state.trendStatus === "loading";
+			/** 快照 + 趋势两段各自的降级工作区（op 不同，合并展示，别装没看见）。 */
+			const degraded = [...board?.degraded ?? [], ...trend?.degraded ?? []];
 			const workspaceOptions = (0, react.useMemo)(() => [{
 				value: "",
 				label: t("workspaceAll")
@@ -1181,11 +1231,12 @@ body[data-ds-dark-theme]{
 				hint,
 				interactive: false
 			});
-			/** 统计台卡：不可点（首页没有已结案可筛），hover 给具体日期区间。 */
+			/** 统计台卡：不可点（首页没有已结案可筛），hover 给具体日期区间。
+			*  趋势未到 / 读挂 ⇒ 数字留 '—'（StatCard 对 0 的处理）、小字整条不显示，**不拿 0 充数**。 */
 			const periodCard = (label, period) => (0, react.createElement)(StatCard, {
 				label: t(label),
 				value: period?.done ?? 0,
-				hint: t("statCreatedHint", { n: period?.created ?? 0 }),
+				hint: period === void 0 ? void 0 : t("statCreatedHint", { n: period.created }),
 				interactive: false,
 				title: period === void 0 ? void 0 : t("periodRange", {
 					from: period.from,
@@ -1193,7 +1244,7 @@ body[data-ds-dark-theme]{
 				})
 			});
 			const [chartScope, setChartScope] = (0, react.useState)("all");
-			const chartWeeks = (0, react.useMemo)(() => (board === null ? [] : board.closed.weekly[chartScope]).map((bucket) => {
+			const chartWeeks = (0, react.useMemo)(() => (trend?.closed.weekly[chartScope] ?? []).map((bucket) => {
 				const end = bucket.end ?? bucket.week ?? "";
 				return {
 					label: end.slice(5) || bucket.week?.slice(5) || "",
@@ -1203,7 +1254,7 @@ body[data-ds-dark-theme]{
 					title: chartScope === "mine" ? `截至 ${end}（${t("chartOnlyMine")}）` : `截至 ${end}`
 				};
 			}), [
-				board,
+				trend,
 				chartScope,
 				t
 			]);
@@ -1262,7 +1313,7 @@ body[data-ds-dark-theme]{
 				}),
 				title: t("statStaleTitle", { n: stats.staleDays }),
 				interactive: false
-			}), periodCard("statWeekDone", board?.trend.thisWeek), periodCard("statLastWeekDone", board?.trend.lastWeek), periodCard("statMonthDone", board?.trend.thisMonth), periodCard("statLastMonthDone", board?.trend.lastMonth)), (0, react.createElement)("div", {
+			}), periodCard("statWeekDone", periods?.thisWeek), periodCard("statLastWeekDone", periods?.lastWeek), periodCard("statMonthDone", periods?.thisMonth), periodCard("statLastMonthDone", periods?.lastMonth)), (0, react.createElement)("div", {
 				className: "dtl-card",
 				style: chartCardStyle
 			}, (0, react.createElement)("div", { style: {
@@ -1275,7 +1326,13 @@ body[data-ds-dark-theme]{
 				onChange: (event) => {
 					setChartScope(event.target.checked ? "mine" : "all");
 				}
-			}), t("chartOnlyMine"))), chartEmpty ? (0, react.createElement)("div", { style: {
+			}), t("chartOnlyMine"))), trendPending ? (0, react.createElement)("div", { style: {
+				...hintStyle,
+				padding: "var(--dtl-space-4) 0"
+			} }, t("chartLoading")) : state.trendStatus === "error" ? (0, react.createElement)("div", { style: {
+				...hintStyle,
+				padding: "var(--dtl-space-4) 0"
+			} }, `${t("chartUnavailable")}${state.trendError === null ? "" : `：${state.trendError}`}`) : chartEmpty ? (0, react.createElement)("div", { style: {
 				...hintStyle,
 				padding: "var(--dtl-space-4) 0"
 			} }, t("chartEmpty")) : (0, react.createElement)(GroupedBarChart, {
@@ -1305,7 +1362,26 @@ body[data-ds-dark-theme]{
 				tone: "guide",
 				title: t("emptyNoWorkspace"),
 				hint: t("emptyNoWorkspaceHint")
-			}) : (0, react.createElement)("div", null, (0, react.createElement)("div", { style: regionHeadRowStyle }, (0, react.createElement)("span", { style: {
+			}) : (0, react.createElement)("div", null, board !== null && (board.degraded?.length ?? 0) > 0 ? (0, react.createElement)("div", { style: {
+				display: "flex",
+				alignItems: "flex-start",
+				gap: "var(--dtl-space-2)",
+				padding: "var(--dtl-space-2) var(--dtl-space-3)",
+				marginBottom: "var(--dtl-space-3)",
+				border: "1px solid var(--dtl-danger)",
+				borderRadius: "var(--dtl-radius-md)",
+				background: "var(--dtl-danger-soft)",
+				color: "var(--dtl-fg)",
+				fontSize: "var(--dtl-font-sm)",
+				lineHeight: "var(--dtl-line-sm)"
+			} }, (0, react.createElement)("span", { style: {
+				color: "var(--dtl-danger)",
+				flex: "none",
+				fontWeight: 600
+			} }, t("degradedTitle")), (0, react.createElement)("span", null, degraded.map((item) => t("degradedItem", {
+				title: item.workspaceTitle,
+				message: item.message
+			})).join("；"))) : null, (0, react.createElement)("div", { style: regionHeadRowStyle }, (0, react.createElement)("span", { style: {
 				color: "var(--dtl-fg-3)",
 				display: "inline-flex",
 				flex: "none"
@@ -1344,7 +1420,7 @@ body[data-ds-dark-theme]{
 			} }, (0, react.createElement)(_deepseek_ai_dsh_client_ui_primitives.IconFlatListOutlineRegular, { size: 16 })), (0, react.createElement)("span", { style: {
 				...regionHeadTitleStyle,
 				fontSize: "var(--dtl-font-md)"
-			} }, t("regionOthers")), (0, react.createElement)("span", { style: { flex: "1 1 auto" } }), (0, react.createElement)(Segmented, {
+			} }, t("regionAll")), (0, react.createElement)("span", { style: { flex: "1 1 auto" } }), (0, react.createElement)(Segmented, {
 				id: "dtl-others-status",
 				value: state.query.status,
 				label: t("statusLabel"),
@@ -1352,27 +1428,27 @@ body[data-ds-dark-theme]{
 					{
 						value: "all",
 						label: t("statusAll"),
-						badge: orZero(view.othersCounts.total)
+						badge: orZero(view.allCounts.total)
 					},
 					{
 						value: "active",
 						label: t("statusActive"),
-						badge: orZero(view.othersCounts.doing)
+						badge: orZero(view.allCounts.doing)
 					},
 					{
 						value: "open",
 						label: t("statusOpen"),
-						badge: orZero(view.othersCounts.open)
+						badge: orZero(view.allCounts.open)
 					},
 					{
 						value: "blocked",
 						label: t("statusBlocked"),
-						badge: orZero(view.othersCounts.blocked)
+						badge: orZero(view.allCounts.blocked)
 					},
 					{
 						value: "stale",
 						label: t("statusStale"),
-						badge: orZero(view.othersCounts.stale)
+						badge: orZero(view.allCounts.stale)
 					}
 				],
 				onChange: (next) => {
@@ -1395,15 +1471,15 @@ body[data-ds-dark-theme]{
 				fontSize: "var(--dtl-font-lg)",
 				fontWeight: 600,
 				marginBottom: "var(--dtl-space-1)"
-			} }, t("othersEmptyTitle")), (0, react.createElement)("div", { style: {
+			} }, t("allEmptyTitle")), (0, react.createElement)("div", { style: {
 				fontSize: "var(--dtl-font-md)",
 				color: "var(--dtl-fg-2)",
 				marginBottom: "var(--dtl-space-3)"
-			} }, t("othersEmptyHint")), (0, react.createElement)(Button, {
+			} }, t("allEmptyHint")), (0, react.createElement)(Button, {
 				variant: "primary",
 				size: "md",
 				onClick: onBack
-			}, t("othersEmptyAction"))) : (0, react.createElement)("div", { style: { marginTop: "var(--dtl-space-2)" } }, view.groups.map((group) => (0, react.createElement)(WorkspaceGroupView, {
+			}, t("allEmptyAction"))) : (0, react.createElement)("div", { style: { marginTop: "var(--dtl-space-2)" } }, view.groups.map((group) => (0, react.createElement)(WorkspaceGroupView, {
 				key: group.workspaceId,
 				t,
 				group,
@@ -1414,7 +1490,7 @@ body[data-ds-dark-theme]{
 		function orZero(n) {
 			return n > 0 ? n : void 0;
 		}
-		/** 一个工作区分组（其他待办表格段）：段头（点+名+统计）→ 列头行 → 任务行。
+		/** 一个工作区分组（全部待办表格段）：段头（点+名+统计）→ 列头行 → 任务行。
 		*  统计口径（用户 2026-10-18）：共 N｜待办 N｜进行中 N 常显（0 也显）；
 		*  阻塞 / 停滞**只在 >0 时出现**。 */
 		function WorkspaceGroupView(props) {
@@ -1460,6 +1536,8 @@ body[data-ds-dark-theme]{
 			loading: "读取中…",
 			retry: "重试",
 			loadFailed: "读取失败",
+			degradedTitle: "部分工作区读取失败",
+			degradedItem: "{title}：{message}",
 			statsPlaceholder: "统计报表尚未开建（另立任务）：这里以后放分类分布、按人完成数、时间线。",
 			statMyActive: "我的待办",
 			statMyActiveHint: "阻塞 {n} 条",
@@ -1483,6 +1561,8 @@ body[data-ds-dark-theme]{
 			chartCaption: "完成（按结案时间）/ 新增（按创建时间），周一起桶；我的 = owner 是我",
 			chartBucket: "{week} 当周：完成 {done} 条，新增 {created} 条",
 			chartEmpty: "近 8 周没有记录",
+			chartLoading: "趋势读取中…（列表已就绪，统计稍后到）",
+			chartUnavailable: "趋势暂时读不到（不影响上面的任务列表）",
 			chartScopeAll: "所有",
 			chartScopeMine: "我的",
 			chartOnlyMine: "只看我的",
@@ -1504,7 +1584,7 @@ body[data-ds-dark-theme]{
 			workspaceAll: "全部工作区",
 			searchPlaceholder: "搜索",
 			regionMine: "我的待办",
-			regionOthers: "其他待办",
+			regionAll: "全部待办",
 			showingCount: "显示 {n} 条",
 			groupTotal: "共 {n} 条",
 			groupOpen: "待办 {n} 条",
@@ -1516,9 +1596,9 @@ body[data-ds-dark-theme]{
 			colOwner: "执行人",
 			colStatus: "状态",
 			colTime: "时长",
-			othersEmptyTitle: "没有可显示的事项",
-			othersEmptyHint: "切换上面的状态过滤试试，或新建一个任务。",
-			othersEmptyAction: "新建任务",
+			allEmptyTitle: "没有可显示的事项",
+			allEmptyHint: "切换上面的状态过滤试试，或新建一个任务。",
+			allEmptyAction: "新建任务",
 			expandAria: "展开过程文档",
 			collapseAria: "收起",
 			ownerUnclaimed: "待认领",
@@ -1569,6 +1649,8 @@ body[data-ds-dark-theme]{
 			loading: "Loading…",
 			retry: "Retry",
 			loadFailed: "Load failed",
+			degradedTitle: "Some workspaces failed to load",
+			degradedItem: "{title}: {message}",
 			statsPlaceholder: "Stats reports are not built yet (separate task): category breakdown, completions by person, timeline.",
 			statMyActive: "My todos",
 			statMyActiveHint: "blocked {n}",
@@ -1592,6 +1674,8 @@ body[data-ds-dark-theme]{
 			chartCaption: "done (by close time) / created (by create time), weeks start Monday; mine = owner is me",
 			chartBucket: "week of {week}: {done} done, {created} created",
 			chartEmpty: "Nothing in the last 8 weeks",
+			chartLoading: "Loading trend… (list is ready, stats will follow)",
+			chartUnavailable: "Trend is unavailable right now (the task lists above are unaffected)",
 			chartScopeAll: "All",
 			chartScopeMine: "Mine",
 			chartOnlyMine: "Mine only",
@@ -1613,7 +1697,7 @@ body[data-ds-dark-theme]{
 			workspaceAll: "All workspaces",
 			searchPlaceholder: "Search",
 			regionMine: "My todos",
-			regionOthers: "Other tasks",
+			regionAll: "All tasks",
 			showingCount: "{n} shown",
 			groupTotal: "{n} total",
 			groupOpen: "{n} open",
@@ -1625,9 +1709,9 @@ body[data-ds-dark-theme]{
 			colOwner: "Owner",
 			colStatus: "Status",
 			colTime: "Duration",
-			othersEmptyTitle: "Nothing to show",
-			othersEmptyHint: "Try another status filter above, or create a task.",
-			othersEmptyAction: "New task",
+			allEmptyTitle: "Nothing to show",
+			allEmptyHint: "Try another status filter above, or create a task.",
+			allEmptyAction: "New task",
 			expandAria: "Expand worklog",
 			collapseAria: "Collapse",
 			ownerUnclaimed: "unclaimed",