sage-mem 1.5.1 → 1.5.3

package/lib/client.js

@@ -3741,6 +3741,181 @@ h("span", { key: "sep", className: "smem-actions-sep", "aria-hidden": "true" }),
 				notice ? h("div", { className: "smem-ok", key: "ok" }, "✓ " + notice) : null,
 			]);
 		}
+		// ── 文件列表这一屏（1.5.3 从 Section 里抽出；D23 计划的 72 片）──────────
+		// 只负责「按状态/筛选把卡片摆出来 + 四种空态」；状态、筛选语义、动作回调全部由 Section 传。
+		// 抽出的判据：它是 Section 里最大的一块纯渲染，而卡片组件（Card / ArchivedCard）本来就在 50 共享层。
+		function FilesView(props) {
+			const { loading, totalCount, openAdd, statusFilter, setStatusFilter, items, archiveItems, filtered, setTypeFilter, setTagFilter, setQuery, busy, restoring, archDelete, archEdit, archLoad, archSaving, archText, setArchText, openArchEdit, saveArchEdit, cancelArchEdit, restoreFile, setArchDelete, setArchEdit, deleteArchivedFile, expanded, deleting, archiving, archiveReason, setArchiveReason, setArchiving, setDeleting, confirmArchive, toggleLock, openEdit, confirmDelete } = props;
+			let filesView;
+			if (loading && totalCount === 0) {
+				filesView = h("div", { className: "smem-skeleton", key: "loading", "data-loading": "1" }, [0, 1, 2].map(function (i) {
+					return h("div", { className: "smem-skeleton-row", key: i });
+				}));
+			} else if (totalCount === 0) {
+				filesView = h("div", { className: "smem-empty", key: "empty" }, [
+					h("div", { key: "t" }, "还没有记忆文件。对话中值得记住的事会写到这里，也可以手动写入。"),
+					h("button", { type: "button", className: "smem-btn smem-btn-primary", key: "add", onClick: openAdd }, "+ 添加记忆"),
+				]);
+			} else if (statusFilter === "archived" && archiveItems.length === 0) {
+				filesView = h("div", { className: "smem-empty", key: "empty" }, [
+					h("div", { key: "t" }, "档案馆是空的 —— 在活动记忆那张卡上点「归档」，它就会收到这里。"),
+					h("button", { type: "button", className: "smem-btn", key: "back", onClick: function () { setStatusFilter("active"); } }, "回文件列表"),
+				]);
+			} else if (statusFilter === "active" && items.length === 0) {
+				filesView = h("div", { className: "smem-empty", key: "empty" }, [
+					h("div", { key: "t" }, "活动记忆是空的 —— 状态筛到「已归档」还能捞出 " + archiveItems.length + " 条。"),
+					h("button", { type: "button", className: "smem-btn", key: "go", onClick: function () { setStatusFilter("archived"); } }, "切到已归档"),
+				]);
+			} else if (filtered.length === 0) {
+				filesView = h("div", { className: "smem-empty", key: "empty" }, [
+					h("div", { key: "t" }, "没有符合搜索或筛选条件的文件。"),
+					h("button", { type: "button", className: "smem-btn", key: "clear", onClick: function () { setStatusFilter("all"); setTypeFilter([]); setTagFilter([]); setQuery(""); } }, "清除筛选"),
+				]);
+			} else {
+				const list = h("div", { className: "smem-list", key: "list" }, filtered.map(function (it) {
+					if (it.archived === true) {
+						return h(ArchivedCard, {
+							key: it.file,
+							item: it,
+							busy: busy,
+							restoring: restoring === it.file,
+							deleting: archDelete === it.file,
+							editing: archEdit === it.file,
+							loading: archLoad && archEdit === it.file,
+							saving: archSaving && archEdit === it.file,
+							text: archText,
+							onText: setArchText,
+							onEdit: openArchEdit,
+							onSave: saveArchEdit,
+							onCancel: cancelArchEdit,
+							onRestore: restoreFile,
+							// 两个「危险动作的确认」互斥：问到一半又去改文本，界面就会同时摆两个确认条。
+							onAskDelete: function (file) { setArchDelete(file); setArchEdit(null); },
+							onCancelDelete: function () { setArchDelete(null); },
+							onConfirmDelete: deleteArchivedFile,
+						});
+					}
+					return h(Card, {
+						key: it.file,
+						item: it,
+						expanded: !!expanded[it.file],
+						deleting: deleting === it.file,
+						archiving: archiving === it.file,
+						archiveReason: archiveReason,
+						busy: busy,
+						onArchiveReason: setArchiveReason,
+						onAskArchive: function (file) { setArchiving(file); setArchiveReason(""); setDeleting(null); },
+						onCancelArchive: function () { setArchiving(null); setArchiveReason(""); },
+						onConfirmArchive: confirmArchive,
+						onToggleLock: toggleLock,
+						onToggle: function (file) {
+							const nx = {};
+							nx[file] = !expanded[file];
+							setExpanded(Object.assign({}, expanded, nx));
+						},
+						onEdit: openEdit,
+						onAskDelete: function (file) { setDeleting(file); setArchiving(null); },
+						onCancelDelete: function () { setDeleting(null); },
+						onConfirmDelete: confirmDelete,
+					});
+				}));
+				filesView = statusFilter === "archived"
+					? [
+							h("div", { className: "smem-ar-banner", key: "banner" },
+								"档案馆里的记忆不参与检索与星图，原文仍在记忆目录的 archive/ 下 —— 恢复后它就回到活动列表；" +
+								"「编辑」是原样文本编辑，改完存回同一份文件；「彻底删除」会真的从 archive/ 里删掉它（不可恢复，删除前还要再确认一次）。"),
+							list,
+						]
+					: list;
+			}
+
+			return filesView;
+		}
+
+		// ── 筛选条（1.5.2 从 Section 里抽出）────────────────────────────────
+		// 只接收 props、只渲染；筛选语义（哪些项互斥、怎么 AND/OR）仍在 Section 里算好再传进来。
+		// 抽出来的收益是 Section 少了 60 行 UI 细节，而筛选条可以单独看、单独改（比如以后再加
+		// 「只显示锁定」这类维度），不用在一千行的 Section 里翻。
+		function FilterBar(props) {
+			const { hasFilter, statusFilter, setStatusFilter, totalCount, items, archiveItems, statusItems, typeFilter, setTypeFilter, typeList, typeCounts, tagList, tagShown, tagHiddenCount, tagCounts, tagFilter, setTagFilter, tagOpen, setTagOpen, TAG_VISIBLE_MAX, query, setQuery, toggleIn, sumItem } = props;
+			return h("div", { className: "smem-filters" }, [
+							hasFilter
+								? h("div", { className: "smem-filter-summary", key: "sum" }, [
+										statusFilter !== "all"
+											? sumItem("状态：" + (statusFilter === "active" ? "活动中" : "已归档"), function () { setStatusFilter("all"); })
+											: null,
+										typeFilter.map(function (t) {
+											return sumItem("类型：" + (TYPE_LABEL[t] || t), function () { toggleIn(setTypeFilter, t); });
+										}),
+										tagFilter.map(function (g) {
+											return sumItem("标签：#" + g, function () { toggleIn(setTagFilter, g); });
+										}),
+										query.trim() ? sumItem("搜索：" + query.trim(), function () { setQuery(""); }) : null,
+										h("button", {
+											type: "button", className: "smem-sum-clear", key: "all",
+											onClick: function () { setStatusFilter("all"); setTypeFilter([]); setTagFilter([]); setQuery(""); },
+										}, "清除全部"),
+									])
+								: null,
+							h("span", { className: "smem-filters-label", key: "lst" }, "状态"),
+							h("button", {
+								type: "button", key: "st-all", className: "smem-chip",
+								"data-on": statusFilter === "all" ? "1" : "0",
+								title: "活动与已归档一起看（归档条走灰色）",
+								onClick: function () { setStatusFilter("all"); },
+							}, ["全部", h("span", { className: "smem-chip-n", key: "n" }, String(totalCount))]),
+							h("button", {
+								type: "button", key: "st-active", className: "smem-chip",
+								"data-on": statusFilter === "active" ? "1" : "0",
+								title: "正在参与检索与星图的记忆",
+								onClick: function () { setStatusFilter("active"); },
+							}, ["活动中", h("span", { className: "smem-chip-n", key: "n" }, String(items.length))]),
+							h("button", {
+								type: "button", key: "st-arch", className: "smem-chip",
+								"data-on": statusFilter === "archived" ? "1" : "0",
+								title: "已收进档案馆：不参与检索与星图，可编辑 / 恢复",
+								onClick: function () { setStatusFilter("archived"); },
+							}, ["已归档", h("span", { className: "smem-chip-n", key: "n" }, String(archiveItems.length))]),
+							h("span", { className: "smem-sep", key: "sep0" }),
+							h("span", { className: "smem-filters-label", key: "lt" }, "类型"),
+							h("button", {
+								type: "button", key: "all", className: "smem-chip",
+								"data-on": typeFilter.length ? "0" : "1",
+								onClick: function () { setTypeFilter([]); },
+							}, ["全部", h("span", { className: "smem-chip-n", key: "n" }, String(statusItems.length))]),
+							typeList.map(function (t) {
+								return h("button", {
+									type: "button", key: t, className: "smem-chip",
+									"data-on": typeFilter.indexOf(t) >= 0 ? "1" : "0",
+									onClick: function () { toggleIn(setTypeFilter, t); },
+								}, [TYPE_LABEL[t] || t, h("span", { className: "smem-chip-n", key: "n" }, String(typeCounts[t]))]);
+							}),
+							tagList.length ? h("span", { className: "smem-sep", key: "sep" }) : null,
+							tagList.length ? h("span", { className: "smem-filters-label", key: "lgt" }, "标签") : null,
+							tagShown.map(function (g) {
+								return h("button", {
+									type: "button", key: "tag-" + g, className: "smem-chip",
+									"data-on": tagFilter.indexOf(g) >= 0 ? "1" : "0",
+									onClick: function () { toggleIn(setTagFilter, g); },
+								}, ["#" + g, h("span", { className: "smem-chip-n", key: "n" }, String(tagCounts[g]))]);
+							}),
+							tagList.length > TAG_VISIBLE_MAX
+								? h("button", {
+										type: "button", key: "moretag", className: "smem-btn",
+										title: tagOpen ? "收起标签" : "还有一些标签没显示",
+										onClick: function () { setTagOpen(!tagOpen); },
+									}, tagOpen ? "收起标签" : ("更多标签 (" + String(tagHiddenCount) + ")") )
+								: null,
+							hasFilter
+								? h("button", {
+										type: "button", key: "clear", className: "smem-btn",
+										onClick: function () { setStatusFilter("all"); setTypeFilter([]); setTagFilter([]); setQuery(""); },
+									}, "清除筛选")
+								: null,
+
+			]);
+		}
+
 		function Section(props) {
 			// 走 stableRemote：真实宿主里 `ctx.get()` 每次返回新对象（issue #3 的成因）。
 			// 这个面板的 effect 依赖是 `[]`、暂时不会爆，但引用稳定是**所有**面板的共同前提。
@@ -4397,88 +4572,23 @@ h("span", { key: "sep", className: "smem-actions-sep", "aria-hidden": "true" }),
 
 			// 「文件列表」这一屏：状态筛选决定看哪一批，灰色卡片与留痕块自带「退役」语义。
 			// banner 只在**专门看归档**时出现，切到全部时不重复说一遍。
-			let filesView;
-			if (loading && totalCount === 0) {
-				filesView = h("div", { className: "smem-skeleton", key: "loading", "data-loading": "1" }, [0, 1, 2].map(function (i) {
-					return h("div", { className: "smem-skeleton-row", key: i });
-				}));
-			} else if (totalCount === 0) {
-				filesView = h("div", { className: "smem-empty", key: "empty" }, [
-					h("div", { key: "t" }, "还没有记忆文件。对话中值得记住的事会写到这里，也可以手动写入。"),
-					h("button", { type: "button", className: "smem-btn smem-btn-primary", key: "add", onClick: openAdd }, "+ 添加记忆"),
-				]);
-			} else if (statusFilter === "archived" && archiveItems.length === 0) {
-				filesView = h("div", { className: "smem-empty", key: "empty" }, [
-					h("div", { key: "t" }, "档案馆是空的 —— 在活动记忆那张卡上点「归档」，它就会收到这里。"),
-					h("button", { type: "button", className: "smem-btn", key: "back", onClick: function () { setStatusFilter("active"); } }, "回文件列表"),
-				]);
-			} else if (statusFilter === "active" && items.length === 0) {
-				filesView = h("div", { className: "smem-empty", key: "empty" }, [
-					h("div", { key: "t" }, "活动记忆是空的 —— 状态筛到「已归档」还能捞出 " + archiveItems.length + " 条。"),
-					h("button", { type: "button", className: "smem-btn", key: "go", onClick: function () { setStatusFilter("archived"); } }, "切到已归档"),
-				]);
-			} else if (filtered.length === 0) {
-				filesView = h("div", { className: "smem-empty", key: "empty" }, [
-					h("div", { key: "t" }, "没有符合搜索或筛选条件的文件。"),
-					h("button", { type: "button", className: "smem-btn", key: "clear", onClick: function () { setStatusFilter("all"); setTypeFilter([]); setTagFilter([]); setQuery(""); } }, "清除筛选"),
-				]);
-			} else {
-				const list = h("div", { className: "smem-list", key: "list" }, filtered.map(function (it) {
-					if (it.archived === true) {
-						return h(ArchivedCard, {
-							key: it.file,
-							item: it,
-							busy: busy,
-							restoring: restoring === it.file,
-							deleting: archDelete === it.file,
-							editing: archEdit === it.file,
-							loading: archLoad && archEdit === it.file,
-							saving: archSaving && archEdit === it.file,
-							text: archText,
-							onText: setArchText,
-							onEdit: openArchEdit,
-							onSave: saveArchEdit,
-							onCancel: cancelArchEdit,
-							onRestore: restoreFile,
-							// 两个「危险动作的确认」互斥：问到一半又去改文本，界面就会同时摆两个确认条。
-							onAskDelete: function (file) { setArchDelete(file); setArchEdit(null); },
-							onCancelDelete: function () { setArchDelete(null); },
-							onConfirmDelete: deleteArchivedFile,
-						});
-					}
-					return h(Card, {
-						key: it.file,
-						item: it,
-						expanded: !!expanded[it.file],
-						deleting: deleting === it.file,
-						archiving: archiving === it.file,
-						archiveReason: archiveReason,
-						busy: busy,
-						onArchiveReason: setArchiveReason,
-						onAskArchive: function (file) { setArchiving(file); setArchiveReason(""); setDeleting(null); },
-						onCancelArchive: function () { setArchiving(null); setArchiveReason(""); },
-						onConfirmArchive: confirmArchive,
-						onToggleLock: toggleLock,
-						onToggle: function (file) {
-							const nx = {};
-							nx[file] = !expanded[file];
-							setExpanded(Object.assign({}, expanded, nx));
-						},
-						onEdit: openEdit,
-						onAskDelete: function (file) { setDeleting(file); setArchiving(null); },
-						onCancelDelete: function () { setDeleting(null); },
-						onConfirmDelete: confirmDelete,
-					});
-				}));
-				filesView = statusFilter === "archived"
-					? [
-							h("div", { className: "smem-ar-banner", key: "banner" },
-								"档案馆里的记忆不参与检索与星图，原文仍在记忆目录的 archive/ 下 —— 恢复后它就回到活动列表；" +
-								"「编辑」是原样文本编辑，改完存回同一份文件；「彻底删除」会真的从 archive/ 里删掉它（不可恢复，删除前还要再确认一次）。"),
-							list,
-						]
-					: list;
-			}
+			const filesView = h(FilesView, {
+				loading: loading, totalCount: totalCount, openAdd: openAdd,
+				statusFilter: statusFilter, setStatusFilter: setStatusFilter,
+				items: items, archiveItems: archiveItems, filtered: filtered,
+				setTypeFilter: setTypeFilter, setTagFilter: setTagFilter, setQuery: setQuery,
+				busy: busy, restoring: restoring,
+				archDelete: archDelete, archEdit: archEdit, archLoad: archLoad, archSaving: archSaving,
+				archText: archText, setArchText: setArchText,
+				openArchEdit: openArchEdit, saveArchEdit: saveArchEdit, cancelArchEdit: cancelArchEdit,
+				restoreFile: restoreFile, setArchDelete: setArchDelete, setArchEdit: setArchEdit, deleteArchivedFile: deleteArchivedFile,
+				expanded: expanded, deleting: deleting, archiving: archiving,
+				archiveReason: archiveReason, setArchiveReason: setArchiveReason,
+				setArchiving: setArchiving, setDeleting: setDeleting,
+				confirmArchive: confirmArchive, toggleLock: toggleLock,
+				openEdit: openEdit, confirmDelete: confirmDelete,
+			});
+
 
 			return h("div", { className: "smem-root" }, [
 				h("div", { className: "smem-tabs", key: "tabs", role: "tablist" }, [
@@ -4620,81 +4730,15 @@ h("span", { key: "sep", className: "smem-actions-sep", "aria-hidden": "true" }),
 					: null,
 				// 三排筛选：状态 / 类型 / 标签。组内 OR、组间 AND，再与搜索框 AND。
 				tab === "files" && totalCount
-					? h("div", { className: "smem-filters", key: "filters" }, [
-							hasFilter
-								? h("div", { className: "smem-filter-summary", key: "sum" }, [
-										statusFilter !== "all"
-											? sumItem("状态：" + (statusFilter === "active" ? "活动中" : "已归档"), function () { setStatusFilter("all"); })
-											: null,
-										typeFilter.map(function (t) {
-											return sumItem("类型：" + (TYPE_LABEL[t] || t), function () { toggleIn(setTypeFilter, t); });
-										}),
-										tagFilter.map(function (g) {
-											return sumItem("标签：#" + g, function () { toggleIn(setTagFilter, g); });
-										}),
-										query.trim() ? sumItem("搜索：" + query.trim(), function () { setQuery(""); }) : null,
-										h("button", {
-											type: "button", className: "smem-sum-clear", key: "all",
-											onClick: function () { setStatusFilter("all"); setTypeFilter([]); setTagFilter([]); setQuery(""); },
-										}, "清除全部"),
-									])
-								: null,
-							h("span", { className: "smem-filters-label", key: "lst" }, "状态"),
-							h("button", {
-								type: "button", key: "st-all", className: "smem-chip",
-								"data-on": statusFilter === "all" ? "1" : "0",
-								title: "活动与已归档一起看（归档条走灰色）",
-								onClick: function () { setStatusFilter("all"); },
-							}, ["全部", h("span", { className: "smem-chip-n", key: "n" }, String(totalCount))]),
-							h("button", {
-								type: "button", key: "st-active", className: "smem-chip",
-								"data-on": statusFilter === "active" ? "1" : "0",
-								title: "正在参与检索与星图的记忆",
-								onClick: function () { setStatusFilter("active"); },
-							}, ["活动中", h("span", { className: "smem-chip-n", key: "n" }, String(items.length))]),
-							h("button", {
-								type: "button", key: "st-arch", className: "smem-chip",
-								"data-on": statusFilter === "archived" ? "1" : "0",
-								title: "已收进档案馆：不参与检索与星图，可编辑 / 恢复",
-								onClick: function () { setStatusFilter("archived"); },
-							}, ["已归档", h("span", { className: "smem-chip-n", key: "n" }, String(archiveItems.length))]),
-							h("span", { className: "smem-sep", key: "sep0" }),
-							h("span", { className: "smem-filters-label", key: "lt" }, "类型"),
-							h("button", {
-								type: "button", key: "all", className: "smem-chip",
-								"data-on": typeFilter.length ? "0" : "1",
-								onClick: function () { setTypeFilter([]); },
-							}, ["全部", h("span", { className: "smem-chip-n", key: "n" }, String(statusItems.length))]),
-							typeList.map(function (t) {
-								return h("button", {
-									type: "button", key: t, className: "smem-chip",
-									"data-on": typeFilter.indexOf(t) >= 0 ? "1" : "0",
-									onClick: function () { toggleIn(setTypeFilter, t); },
-								}, [TYPE_LABEL[t] || t, h("span", { className: "smem-chip-n", key: "n" }, String(typeCounts[t]))]);
-							}),
-							tagList.length ? h("span", { className: "smem-sep", key: "sep" }) : null,
-							tagList.length ? h("span", { className: "smem-filters-label", key: "lgt" }, "标签") : null,
-							tagShown.map(function (g) {
-								return h("button", {
-									type: "button", key: "tag-" + g, className: "smem-chip",
-									"data-on": tagFilter.indexOf(g) >= 0 ? "1" : "0",
-									onClick: function () { toggleIn(setTagFilter, g); },
-								}, ["#" + g, h("span", { className: "smem-chip-n", key: "n" }, String(tagCounts[g]))]);
-							}),
-							tagList.length > TAG_VISIBLE_MAX
-								? h("button", {
-										type: "button", key: "moretag", className: "smem-btn",
-										title: tagOpen ? "收起标签" : "还有一些标签没显示",
-										onClick: function () { setTagOpen(!tagOpen); },
-									}, tagOpen ? "收起标签" : ("更多标签 (" + String(tagHiddenCount) + ")") )
-								: null,
-							hasFilter
-								? h("button", {
-										type: "button", key: "clear", className: "smem-btn",
-										onClick: function () { setStatusFilter("all"); setTypeFilter([]); setTagFilter([]); setQuery(""); },
-									}, "清除筛选")
-								: null,
-						])
+					? h(FilterBar, {
+						hasFilter: hasFilter, statusFilter: statusFilter, setStatusFilter: setStatusFilter,
+						totalCount: totalCount, items: items, archiveItems: archiveItems, statusItems: statusItems,
+						typeFilter: typeFilter, setTypeFilter: setTypeFilter, typeList: typeList, typeCounts: typeCounts,
+						tagList: tagList, tagShown: tagShown, tagHiddenCount: tagHiddenCount, tagCounts: tagCounts,
+						tagFilter: tagFilter, setTagFilter: setTagFilter, tagOpen: tagOpen, setTagOpen: setTagOpen,
+						TAG_VISIBLE_MAX: TAG_VISIBLE_MAX, query: query, setQuery: setQuery,
+						toggleIn: toggleIn, sumItem: sumItem,
+					})
 					: null,
 				error ? h("div", { className: "smem-err", key: "err", role: "alert" }, "⚠ " + error) : null,
 				notice && !error ? h("div", { className: "smem-ok", key: "ok", role: "status" }, "✓ " + notice) : null,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sage-mem",
   "description": "Cross-session memory for DeepSeek Harness — plain markdown files, no database, no worker.",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "type": "module",
   "main": "lib/index.js",
   "exports": {