dsh-prime-memory 0.20.0-beta.12 → 0.20.0-beta.13

package/CHANGELOG.md

@@ -17,6 +17,18 @@
   - **建议状态(`longtask-hint-get`)以纯端点提供**:判定 = 上下文占用达 `contextThresholdPct` 或 todo 漂移达 `driftThreshold`(部署配置可调);配合 `longtask-compress-tail` 作手动压缩入口。
   - **撤下浮动球 UI(`client/src/longtask-fab.ts`;beta.1 起曾随包发布)**:悬浮建议面板的归属本在 context-compression 侧(「建议启动压缩」是其领域),pm 属误载——2026-10-02 用户裁定撤下。撤下不违座位契约(settings.section 恰一个 + 输入栏 pill,body 单例不占座位),但全应用级 overlay 会与其他插件的悬浮 UI 抢占屏幕角落;长任务开关与手动压缩入口待长任务定版时落记忆设置分节。
   - **`session-mode-set` 的 `mode` 转为可选**:与 `longTask` 二选一必传——纯切长任务开关不再被迫发送档位(旧客户端恒传 mode,行为不变)。响应 `mode` 改回当前生效值。
+## [0.20.0-beta.13] — 2026-10-02
+
+> 补全归类逻辑:把 room 归到已有 hall 下(此前只能新增 hall,或合并进别的 room 抹掉身份)。面板支持**拖拽归类**——拖 room 放到 hall 头上即可。
+
+### 新增
+
+- **Hall 页拖拽归类**:room 行可拖(hiPriv 开启时抓手光标),hall 头为放置目标(虚线高亮);松手 = 预填改名(major/minor)并直接出 dryRun 预览,确认后实跑——记录随迁、旧名进别名、分组视图即挂到该 hall 下。触屏/不支持拖放的环境用 room 行「归类」按钮或改名表单里的 hall 快选 chips 兜底。
+- 后端修复:`renameSlug` 目标校验 `isTag` → `isRoomSlug`——此前两级目标(major/minor)被误拒,「归类到 hall 下」这条路实际不通(且 rename 编排会先重写记录再在注册表改名时抛错,留下半程状态)。按 C3 卸除/变更纪律:红测试先行(unit + HTTP 面集成各一),验红后修复回绿。
+
+### 修复
+
+- 同上:`renameSlug` 两级目标校验(beta.5 引入的缺口)。
 ## [0.20.0-beta.12] — 2026-10-02
 
 > lint 清账 + 卸除纪律成文(ENGINEERING-NOTES 新增 C3)。**无功能变更**。

package/dist/client.js

@@ -3978,6 +3978,10 @@ var __defProp = Object.defineProperty;
 		  const i = slug.indexOf("/");
 		  return i === -1 ? slug : slug.slice(0, i);
 		}
+		function suffixOf(slug) {
+		  const i = slug.indexOf("/");
+		  return i === -1 ? slug : slug.slice(i + 1);
+		}
 		function downloadCsv(csv, name) {
 		  const blob = new Blob([csv], { type: "text/csv;charset=utf-8" });
 		  const url = URL.createObjectURL(blob);
@@ -4012,6 +4016,7 @@ var __defProp = Object.defineProperty;
 		  const [form, setForm] = (0, import_react16.useState)(null);
 		  const [preview, setPreview] = (0, import_react16.useState)(null);
 		  const [grownOpen, setGrownOpen] = (0, import_react16.useState)(false);
+		  const [dragOverHall, setDragOverHall] = (0, import_react16.useState)(null);
 		  const loadAll = (0, import_react16.useCallback)(() => {
 		    rpc("dsh-memory/rooms-get", {}).then((r) => {
 		      if (r && r.ok) {
@@ -4073,22 +4078,41 @@ var __defProp = Object.defineProperty;
 		      loadAll();
 		    } else setError(r && r.error ? r.error.message : "收编失败");
 		  });
-		  const previewMerge = () => run(async () => {
-		    if (!form) return;
-		    const to = form.to.trim();
+		  const previewMerge = (override) => run(async () => {
+		    const fm = override ?? form;
+		    if (!fm) return;
+		    const to = fm.to.trim();
 		    if (!to) {
 		      setError("目标 slug 不能为空");
 		      return;
 		    }
-		    if (to === form.from) {
+		    if (to === fm.from) {
 		      setError("目标与源相同");
 		      return;
 		    }
-		    const r = await rpc("dsh-memory/room-admin", { action: form.action, from: form.from, to });
+		    const r = await rpc("dsh-memory/room-admin", { action: fm.action, from: fm.from, to });
 		    if (r && r.ok) {
-		      setPreview({ action: form.action, from: form.from, to, notice: String(r.value?.notice ?? "") });
+		      setPreview({ action: fm.action, from: fm.from, to, notice: String(r.value?.notice ?? "") });
 		    } else setError(r && r.error ? r.error.message : "预览失败");
 		  });
+		  const beginReclass = (from, hall) => {
+		    if (!busy) {
+		      setMsg(null);
+		      setError(null);
+		    }
+		    if (!hall) {
+		      setError("尚无 hall:先注册一个(如 dsh-plugin),再归类。");
+		      return;
+		    }
+		    if (majorOf(from) === hall) {
+		      setMsg(`${from} 已在 ${hall} 下。`);
+		      return;
+		    }
+		    const f = { action: "rename", from, to: `${hall}/${suffixOf(from)}` };
+		    setForm(f);
+		    setPreview(null);
+		    void previewMerge(f);
+		  };
 		  const execMerge = () => run(async () => {
 		    if (!preview) return;
 		    const r = await rpc("dsh-memory/room-admin", { action: preview.action, from: preview.from, to: preview.to, dryRun: false });
@@ -4239,41 +4263,83 @@ var __defProp = Object.defineProperty;
 		    msg ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { style: S.hint, children: msg }) : null,
 		    error ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { style: S.error, children: error }) : null,
 		    groups.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("p", { style: S.intro, children: "注册表为空。在上方注册 Hall/Room(如 dsh-plugin),或把自生长 slug「收编」进词表 —— 之后候选标注器会优先把相关记忆挂到这些 slug 上。" }) : groups.map((g) => /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("div", { style: { marginBottom: 10, border: "1px solid var(--dsh-mem-border)", borderRadius: 8, overflow: "hidden" }, children: [
-		      /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("div", { style: { display: "flex", alignItems: "center", gap: 8, padding: "5px 10px", background: "var(--dsh-mem-bg-inset)" }, children: [
-		        /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("span", { style: { fontSize: 12, fontWeight: 600 }, children: [
-		          g.hall,
-		          g.label ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { style: S.muted, children: " (" + g.label + ")" }) : null
-		        ] }),
-		        /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { style: S.muted, children: `合计 ${g.total} 条 · ${g.entries.length} 个 room` }),
-		        /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { style: S.grow }),
-		        /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
-		          "button",
-		          {
-		            type: "button",
-		            disabled: !hiPriv || busy,
-		            title: `预填注册表单为 ${g.hall}/…(注册该 hall 下的小类)`,
-		            onClick: () => setRegSlug(g.hall + "/"),
-		            style: btn,
-		            children: "+小类"
-		          }
-		        )
-		      ] }),
+		      /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
+		        "div",
+		        {
+		          onDragOver: (ev) => {
+		            if (!hiPriv || busy) return;
+		            ev.preventDefault();
+		            ev.dataTransfer.dropEffect = "move";
+		            setDragOverHall(g.hall);
+		          },
+		          onDragLeave: () => setDragOverHall((cur) => cur === g.hall ? null : cur),
+		          onDrop: (ev) => {
+		            ev.preventDefault();
+		            setDragOverHall(null);
+		            if (!hiPriv || busy) return;
+		            const from = ev.dataTransfer.getData("text/dsh-room");
+		            if (from) beginReclass(from, g.hall);
+		          },
+		          style: {
+		            display: "flex",
+		            alignItems: "center",
+		            gap: 8,
+		            padding: "5px 10px",
+		            background: "var(--dsh-mem-bg-inset)",
+		            outline: dragOverHall === g.hall ? "2px dashed var(--dsh-mem-accent)" : void 0,
+		            outlineOffset: dragOverHall === g.hall ? "-2px" : void 0
+		          },
+		          title: hiPriv ? "拖入 room 归类到该 hall 下(major/minor;记录随迁,旧名进别名,预览后确认)" : void 0,
+		          children: [
+		            /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("span", { style: { fontSize: 12, fontWeight: 600 }, children: [
+		              g.hall,
+		              g.label ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { style: S.muted, children: " (" + g.label + ")" }) : null
+		            ] }),
+		            /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { style: S.muted, children: `合计 ${g.total} 条 · ${g.entries.length} 个 room` }),
+		            /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { style: S.grow }),
+		            /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+		              "button",
+		              {
+		                type: "button",
+		                disabled: !hiPriv || busy,
+		                title: `预填注册表单为 ${g.hall}/…(注册该 hall 下的小类)`,
+		                onClick: () => setRegSlug(g.hall + "/"),
+		                style: btn,
+		                children: "+小类"
+		              }
+		            )
+		          ]
+		        }
+		      ),
 		      g.entries.map((e) => {
 		        const standalone = e.slug === g.hall;
 		        const count = rooms.find((r) => r.room === e.slug)?.count ?? 0;
 		        const retired = e.status === "retired";
 		        return /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("div", { style: { padding: "4px 10px", borderTop: "1px solid var(--dsh-mem-border)", opacity: retired ? 0.55 : 1 }, children: [
 		          /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("div", { style: { display: "flex", alignItems: "center", gap: 8, flexWrap: "wrap" }, children: [
-		            /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("span", { style: { fontSize: 12 }, title: e.description ? `${e.slug} — ${e.description}` : e.slug, children: [
-		              standalone ? e.slug : "· " + e.slug.slice(g.hall.length + 1),
-		              e.source === "pre-registered" ? " ⭐" : ""
-		            ] }),
+		            /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
+		              "span",
+		              {
+		                style: { fontSize: 12, cursor: hiPriv && !busy ? "grab" : "default" },
+		                draggable: hiPriv && !busy,
+		                onDragStart: (ev) => {
+		                  ev.dataTransfer.setData("text/dsh-room", e.slug);
+		                  ev.dataTransfer.effectAllowed = "move";
+		                },
+		                title: hiPriv && !busy ? "拖到某个 hall 头上归类(major/minor;记录随迁,旧名进别名)" : e.description ? `${e.slug} — ${e.description}` : e.slug,
+		                children: [
+		                  standalone ? e.slug : "· " + e.slug.slice(g.hall.length + 1),
+		                  e.source === "pre-registered" ? " ⭐" : ""
+		                ]
+		              }
+		            ),
 		            e.label ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { style: S.muted, children: e.label }) : null,
 		            /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { style: S.muted, children: count + " 条" }),
 		            retired ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { style: { ...S.muted, color: "var(--dsh-mem-danger)" }, children: "已退役" }) : null,
 		            (e.aliases ?? []).length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { style: S.muted, children: "别名: " + (e.aliases ?? []).join(", ") }) : null,
 		            /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { style: S.grow }),
 		            !hiPriv ? null : /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(import_jsx_runtime16.Fragment, { children: [
+		              /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("button", { type: "button", disabled: busy, title: "归类到已有 hall 下(major/minor;记录随迁)", onClick: () => beginReclass(e.slug, groups.find((gg) => gg.hall !== majorOf(e.slug))?.hall ?? ""), style: btn, children: "归类" }),
 		              /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("button", { type: "button", disabled: busy, title: `改名(= merge 1:1 + 注册表改名)`, onClick: () => {
 		                setForm({ action: "rename", from: e.slug, to: "" });
 		                setPreview(null);
@@ -4303,7 +4369,18 @@ var __defProp = Object.defineProperty;
 		                style: { ...S.input, width: 180, fontSize: 12 }
 		              }
 		            ),
-		            /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("button", { type: "button", disabled: busy, onClick: previewMerge, style: { ...btn, color: "var(--dsh-mem-accent)", borderColor: "var(--dsh-mem-accent)" }, children: "预览" }),
+		            form.action === "rename" ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { style: { display: "inline-flex", gap: 4, flexWrap: "wrap" }, children: groups.filter((gg) => gg.hall !== majorOf(form.from)).map((gg) => /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+		              "button",
+		              {
+		                type: "button",
+		                title: `归入 ${gg.hall} 下(${gg.hall}/${suffixOf(form.from)})`,
+		                onClick: () => setForm({ ...form, to: `${gg.hall}/${suffixOf(form.from)}` }),
+		                style: { ...btn, borderRadius: 999, padding: "1px 8px" },
+		                children: gg.hall
+		              },
+		              gg.hall
+		            )) }) : null,
+		            /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("button", { type: "button", disabled: busy, onClick: () => previewMerge(), style: { ...btn, color: "var(--dsh-mem-accent)", borderColor: "var(--dsh-mem-accent)" }, children: "预览" }),
 		            /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("button", { type: "button", disabled: busy, onClick: () => {
 		              setForm(null);
 		              setPreview(null);

package/dist/store/rooms-registry.d.ts

@@ -50,7 +50,9 @@ export declare class RoomRegistryStore {
     }>;
     /** 改状态(active↔retired);无变化返回 false。 */
     setStatus(slug: string, status: 'active' | 'retired'): Promise<boolean>;
-    /** 改名(merge 1:1 收尾):slug 换名 + 旧 slug 进 aliases。新名与既有条目冲突时走 merge。 */
+    /** 改名(merge 1:1 收尾):slug 换名 + 旧 slug 进 aliases。新名与既有条目冲突时走 merge。
+     *  目标用两级制词表(isRoomSlug)——把 standalone room 归类到 hall 下(改名 major/minor)
+     *  走的就是这条路;isTag 会误拒带 slash 的目标。 */
     renameSlug(oldSlug: string, newSlug: string): Promise<boolean>;
     /** 合并收尾:fromSlug 条目转 retired + toSlug 进 aliases(记录重写由调用方游标执行)。 */
     markMerged(fromSlug: string, toSlug: string): Promise<boolean>;

package/dist/store/rooms-registry.js

@@ -170,11 +170,13 @@ export class RoomRegistryStore {
         await this.persist();
         return true;
     }
-    /** 改名(merge 1:1 收尾):slug 换名 + 旧 slug 进 aliases。新名与既有条目冲突时走 merge。 */
+    /** 改名(merge 1:1 收尾):slug 换名 + 旧 slug 进 aliases。新名与既有条目冲突时走 merge。
+     *  目标用两级制词表(isRoomSlug)——把 standalone room 归类到 hall 下(改名 major/minor)
+     *  走的就是这条路;isTag 会误拒带 slash 的目标。 */
     async renameSlug(oldSlug, newSlug) {
         this.ensureLoaded();
-        if (!isTag(newSlug))
-            throw new Error(`非法 Room slug: ${newSlug}`);
+        if (!isRoomSlug(newSlug))
+            throw new Error(`非法 Room slug: ${newSlug}(两级制:major 或 major/minor)`);
         const found = this.entries.find((e) => e.slug === oldSlug);
         if (!found)
             return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-prime-memory",
-  "version": "0.20.0-beta.12",
+  "version": "0.20.0-beta.13",
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
     "access": "public",