dsh-task-ledger 0.0.77 → 0.0.79

package/dist/client.js

@@ -7,18 +7,32 @@ window.__ModuleLoader__.load({
 		let react = require("react");
 		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 		//#region src/client/rows.ts
+		/**
+		* 界面上显示人名的**唯一**口径：显示名（`owner_name` / `creator_name`）优先，
+		* 旧数据 / 名册里没名字才退回 uuid。**只用于显示与搜索** —— 归属判定一律比 uuid（见 `isMine`）。
+		*/
+		function displayName(name, uuid) {
+			const label = (name ?? "").trim();
+			return label !== "" ? label : (uuid ?? "").trim();
+		}
 		/** 关键字命中（标题 / 任务号 / 人 / 分类 / 标签；已结案另含「完成了什么」）。 */
 		function hitKeyword(keyword, parts) {
 			const needle = keyword.trim().toLowerCase();
 			if (needle === "") return true;
 			return parts.some((part) => part?.toLowerCase().includes(needle) === true);
 		}
-		/** 「我的」判定：owner = 该工作区的当前 git 身份，且状态是进行中（blocked 是旧数据，照收；与 host 同口径）。 */
+		/** uuid 比较：两边都 trim + 小写（身份键不分大小写，与脚本 `normalize` 同口径）。 */
+		function sameUuid(a, b) {
+			const left = (a ?? "").trim().toLowerCase();
+			const right = (b ?? "").trim().toLowerCase();
+			return left !== "" && left === right;
+		}
+		/** 「我的」判定：owner = 本机身份 uuid，且状态是进行中（blocked 是旧数据，照收；与 host 同口径）。 */
 		function isMine(task, board) {
 			if (board === null) return false;
 			const identity = board.identities[task.workspace.id] ?? null;
 			if (identity === null || identity === "") return false;
-			return task.owner === identity && (task.status === "doing" || task.status === "blocked");
+			return sameUuid(task.owner, identity) && (task.status === "doing" || task.status === "blocked");
 		}
 		function resolveActions(task, board) {
 			const mine = isMine(task, board);
@@ -88,8 +102,8 @@ window.__ModuleLoader__.load({
 			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,
 				task.id,
-				task.owner,
-				task.creator,
+				displayName(task.owner_name, task.owner),
+				displayName(task.creator_name, task.creator),
 				task.category,
 				...task.tags ?? []
 			])).sort((a, b) => String(b.created ?? b.started ?? "").localeCompare(String(a.created ?? a.started ?? ""))).map((task) => ({
@@ -98,7 +112,7 @@ window.__ModuleLoader__.load({
 				task,
 				mine: true
 			}));
-			const rest = query.scope === "mine" ? [] : board.tasks.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, displayName(task.owner_name, task.owner)]));
 			const byWorkspace = /* @__PURE__ */ new Map();
 			for (const task of rest) {
 				const entry = byWorkspace.get(task.workspace.id) ?? {
@@ -1097,9 +1111,9 @@ body[data-ds-dark-theme]{
 		*/
 		/** 行标题：在办 = 任务名（缺则任务号）；已结案 = 任务包名（缺则「完成了什么」首句）。 */
 		function titleOf(row) {
-			if (row.kind === "task") return row.task.title ?? row.task.id;
-			const title = row.record.workpackage ?? row.record.summary;
-			return title !== void 0 && title !== "" ? title : row.record.src ?? "—";
+			if (row.kind === "task") return row.task.title || row.task.id;
+			const title = row.record.workpackage || row.record.summary || "";
+			return title !== "" ? title : row.record.src ?? "—";
 		}
 		/** 状态语义（异常优先：停滞 > 逾期 > 积压；三者都是 host 按时间算出来的，不是状态）。
 		*  只决定圆点 / 左缘色条这类**单色位**——标签可以多枚，见 MARKS。 */
@@ -1142,7 +1156,7 @@ body[data-ds-dark-theme]{
 			const detailTip = (which) => {
 				if (row.kind !== "task") return void 0;
 				const { task } = row;
-				const owner = task.owner ?? "";
+				const owner = displayName(task.owner_name, task.owner);
 				const who = owner === "" ? t("ownerUnclaimed") : `@${owner}`;
 				const started = stamp(task.started ?? task.created);
 				const updated = stamp(task.updated ?? task.started ?? task.created);
@@ -1215,14 +1229,15 @@ body[data-ds-dark-theme]{
 				title: titleOf(row)
 			}, titleOf(row)));
 			if (variant === "others") {
-				const creator = isTask ? row.task.creator : row.record.owner;
+				const creator = isTask ? row.task.creator : row.record.creator;
 				const owner = isTask ? row.task.owner : null;
+				const creatorLabel = displayName(isTask ? row.task.creator_name : row.record.creator_name, creator);
 				const hasOwner = !(owner === null || owner === void 0 || owner === "");
-				const who = creator === null || creator === void 0 || creator === "" ? "—" : `@${creator}`;
+				const who = creatorLabel === "" ? "—" : `@${creatorLabel}`;
 				const createdOk = created !== null && created !== void 0 && Date.parse(created) >= 0;
 				const startedOk = isTask && row.task.started !== null && row.task.started !== void 0 && Date.parse(row.task.started) >= 0;
 				const ownerTip = t("startedAt", {
-					who: String(owner),
+					who: displayName(isTask ? row.task.owner_name : null, owner),
 					when: startedOk ? formatDateTime(String(row.task.started)) : t("timeUnknown")
 				});
 				const tagLine = (0, react.createElement)("div", { className: "dtl-orow__tags" }, ...statusTags, tags.map((tag) => (0, react.createElement)(Tag, {
@@ -1230,7 +1245,7 @@ body[data-ds-dark-theme]{
 					text: `#${tag}`
 				})));
 				return (0, react.createElement)("div", { className: "dtl-orow" }, (0, react.createElement)("div", { className: "dtl-orow__row" }, (0, react.createElement)("span", { className: `dtl-dot dtl-dot--${tone}` }), (0, react.createElement)("div", { className: "dtl-tcell dtl-tcell--title" }, orowTitleLine, tagLine), (0, react.createElement)("span", { className: "dtl-tcell dtl-tcell--status" }, hasOwner ? (0, react.createElement)(Tag, {
-					text: `@${String(owner)}`,
+					text: `@${displayName(isTask ? row.task.owner_name : null, owner)}`,
 					tone: "person",
 					title: ownerTip
 				}) : null), (0, react.createElement)("span", { className: "dtl-orow__slot" }, (0, react.createElement)("span", { className: "dtl-orow__created" }, t("createdAt", {
@@ -1243,7 +1258,7 @@ body[data-ds-dark-theme]{
 				const startRaw = row.task.started ?? row.task.created;
 				if (startRaw !== void 0 && startRaw !== null && startRaw !== "" && Date.parse(startRaw) >= 0) parts.push(`${formatDateTime(startRaw).slice(0, 10)} ${t("fieldStarted")}`);
 				if (row.task.ageDays !== null && row.task.ageDays !== void 0) parts.push(row.task.ageDays === 0 ? t("ageToday") : t("ageDaysText", { n: row.task.ageDays }));
-			} else parts.push(`${t("fieldFinished")} ${formatDateTime(row.record.time ?? row.record.created ?? "", { fallback: t("timeUnknown") })}`);
+			} else parts.push(`${t("fieldFinished")} ${formatDateTime(row.record.time || row.record.created || "", { fallback: t("timeUnknown") })}`);
 			return (0, react.createElement)("div", { className: "dtl-taskrow" }, (0, react.createElement)("div", { className: "dtl-taskrow__row" }, (0, react.createElement)("span", { className: `dtl-rail dtl-rail--${tone}` }), (0, react.createElement)("div", { style: {
 				flex: "1 1 auto",
 				minWidth: 0