dsh-prime-memory 0.20.0-beta.14 → 0.20.0-beta.16

package/CHANGELOG.md

@@ -17,6 +17,25 @@
   - **建议状态(`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.16] — 2026-10-02
+
+> **自生长未注册 slug 直接归入 hall**:底部「自生长未注册」区的每个 chip 现在可拖到 hall 头上——收编 + 归为其子类一步完成。
+
+### 新增
+
+- **grown chip 拖拽/点选归类**:把未注册 slug(如 `git-commits`)拖到 hall 头(或点 chip 上「归」按钮进入挑选态,再点目标 hall)→ dryRun 预览 → 确认实跑。语义 = **原地收编(from,source=grown)→ rename 到 `hall/子类`**:记录 tags 随迁、旧名进目标别名、条目 active 且不戴 ⭐(收编身份)。落回自己 hall 的两级 slug(如 `dsh-plugin/xxx`)= 原地收编。
+- 组合顺序钉死在集成测试(markMered 对未注册 from 会早退——必须先收编 from 再 rename);execMerge 对未注册 from 自动补收编。
+## [0.20.0-beta.15] — 2026-10-02
+
+> 归类实测反馈两连修:①改名后的条目误带「已退役」(会掉出标注词表);②HTML5 拖拽在部分 webview 不生效 → 新增**点选归类**主路径。
+
+### 修复
+
+- **归类(改名)后条目误标 retired**:renameRoom 复用 merge 编排,`markMerged` 的"旧条目转退役"被带了过来——归完类的新 room 显示「已退役」并**掉出标注器词表**(listActive 过滤)。现 rename 收尾恢复先前状态(active 条目改名后仍 active);真 merge(并集语义)不受影响。红测试先行(unit + HTTP 面集成)。
+
+### 变更
+
+- **点选归类为主路径**:点 room 行「归类」→ 进入挑选态(按钮变「选 hall…」,所有 hall 头虚线高亮)→ 点目标 hall 头 → 出 dryRun 预览 → 确认实跑。拖拽保留(支持的環境仍可用),但不再依赖。
 ## [0.20.0-beta.14] — 2026-10-02
 
 > 记忆卡片新增**老化权重**与**召回使用**展示,并开始为"老化权重效果统计"积累数据。口径(用户裁定):**进 topN(被注入上下文)才算被使用**;参与尝试未进 = 仅计尝试。

package/dist/client.js

@@ -4043,6 +4043,7 @@ var __defProp = Object.defineProperty;
 		  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 [picking, setPicking] = (0, import_react16.useState)(null);
 		  const loadAll = (0, import_react16.useCallback)(() => {
 		    rpc("dsh-memory/rooms-get", {}).then((r) => {
 		      if (r && r.ok) {
@@ -4131,7 +4132,12 @@ var __defProp = Object.defineProperty;
 		      return;
 		    }
 		    if (majorOf(from) === hall) {
-		      setMsg(`${from} 已在 ${hall} 下。`);
+		      if (registry.some((e) => e.slug === from)) {
+		        setMsg(`${from} 已在 ${hall} 下。`);
+		        return;
+		      }
+		      setPicking(null);
+		      void adopt(from);
 		      return;
 		    }
 		    const f = { action: "rename", from, to: `${hall}/${suffixOf(from)}` };
@@ -4141,6 +4147,13 @@ var __defProp = Object.defineProperty;
 		  };
 		  const execMerge = () => run(async () => {
 		    if (!preview) return;
+		    if (preview.action === "rename" && !registry.some((e) => e.slug === preview.from)) {
+		      const rr = await rpc("dsh-memory/room-register", { slug: preview.from, source: "grown" });
+		      if (!rr || !rr.ok) {
+		        setError(rr && rr.error ? rr.error.message : "收编源失败");
+		        return;
+		      }
+		    }
 		    const r = await rpc("dsh-memory/room-admin", { action: preview.action, from: preview.from, to: preview.to, dryRun: false });
 		    if (r && r.ok) {
 		      setMsg(String(r.value?.notice ?? "完成"));
@@ -4306,16 +4319,23 @@ var __defProp = Object.defineProperty;
 		            const from = ev.dataTransfer.getData("text/dsh-room");
 		            if (from) beginReclass(from, g.hall);
 		          },
+		          onClick: () => {
+		            if (!picking || busy) return;
+		            const from = picking;
+		            setPicking(null);
+		            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
+		            outline: dragOverHall === g.hall || picking !== null ? "2px dashed var(--dsh-mem-accent)" : void 0,
+		            outlineOffset: dragOverHall === g.hall || picking !== null ? "-2px" : void 0,
+		            cursor: picking ? "pointer" : void 0
 		          },
-		          title: hiPriv ? "拖入 room 归类到该 hall 下(major/minor;记录随迁,旧名进别名,预览后确认)" : void 0,
+		          title: picking ? "点击此 hall:把「" + picking + "」归入 " + g.hall + " 下(major/minor,预览后确认)" : hiPriv ? "拖入 room 归类到该 hall 下(major/minor;记录随迁,旧名进别名,预览后确认)" : void 0,
 		          children: [
 		            /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("span", { style: { fontSize: 12, fontWeight: 600 }, children: [
 		              g.hall,
@@ -4365,7 +4385,27 @@ var __defProp = Object.defineProperty;
 		            (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: picking === e.slug ? "再点一次取消挑选;然后点击目标 hall 头完成归类" : "归类到已有 hall 下:点击后选目标 hall(记录随迁,旧名进别名)",
+		                  onClick: () => {
+		                    if (picking === e.slug) {
+		                      setPicking(null);
+		                      return;
+		                    }
+		                    setForm({ action: "rename", from: e.slug, to: "" });
+		                    setPreview(null);
+		                    setPicking(e.slug);
+		                    setMsg(null);
+		                    setError(null);
+		                  },
+		                  style: { ...btn, ...picking === e.slug ? { color: "var(--dsh-mem-accent)", borderColor: "var(--dsh-mem-accent)" } : {} },
+		                  children: picking === e.slug ? "选 hall…" : "归类"
+		                }
+		              ),
 		              /* @__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);
@@ -4434,8 +4474,41 @@ var __defProp = Object.defineProperty;
 		      ] }),
 		      /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { style: S.muted, children: "(只在 tags 里涌现,不在词表 —— 收编后标注器才会优先挂靠)" }),
 		      grownOpen ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { style: { display: "flex", flexWrap: "wrap", gap: 6, alignItems: "center", marginTop: 6 }, children: grownOnly.map((r) => /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("span", { style: { display: "inline-flex", alignItems: "center", gap: 4 }, children: [
-		        /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { style: { ...btn, cursor: "default", borderRadius: 999, padding: "2px 8px" }, title: "自生长 slug(未注册)", children: r.room + " · " + r.count }),
-		        /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("button", { type: "button", disabled: !hiPriv || busy, title: "收编进注册表(source=grown)", onClick: () => adopt(r.room), style: { ...btn, color: "var(--dsh-mem-accent)", borderColor: "var(--dsh-mem-accent)", opacity: !hiPriv || busy ? 0.5 : 1 }, children: "收编" })
+		        /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+		          "span",
+		          {
+		            style: { ...btn, cursor: hiPriv && !busy ? "grab" : "default", borderRadius: 999, padding: "2px 8px" },
+		            draggable: hiPriv && !busy,
+		            onDragStart: (ev) => {
+		              ev.dataTransfer.setData("text/dsh-room", r.room);
+		              ev.dataTransfer.effectAllowed = "move";
+		            },
+		            title: hiPriv && !busy ? "自生长 slug(未注册)——拖到某个 hall 头上 = 收编并归为其子类" : "自生长 slug(未注册)",
+		            children: r.room + " · " + r.count
+		          }
+		        ),
+		        /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("button", { type: "button", disabled: !hiPriv || busy, title: "收编进注册表(source=grown,原地)", onClick: () => adopt(r.room), style: { ...btn, color: "var(--dsh-mem-accent)", borderColor: "var(--dsh-mem-accent)", opacity: !hiPriv || busy ? 0.5 : 1 }, children: "收编" }),
+		        /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+		          "button",
+		          {
+		            type: "button",
+		            disabled: !hiPriv || busy,
+		            title: "归类到已有 hall 下:点击后选目标 hall(收编+子类一步,记录随迁)",
+		            onClick: () => {
+		              if (picking === r.room) {
+		                setPicking(null);
+		                return;
+		              }
+		              setForm({ action: "rename", from: r.room, to: "" });
+		              setPreview(null);
+		              setPicking(r.room);
+		              setMsg(null);
+		              setError(null);
+		            },
+		            style: { ...btn, opacity: !hiPriv || busy ? 0.5 : 1, ...picking === r.room ? { color: "var(--dsh-mem-accent)", borderColor: "var(--dsh-mem-accent)" } : {} },
+		            children: picking === r.room ? "选 hall…" : "归"
+		          }
+		        )
 		      ] }, r.room)) }) : null
 		    ] }) : null
 		  ] });

package/dist/room-review.d.ts

@@ -65,6 +65,11 @@ export interface RoomMergeStore extends RoomReviewStore {
 export interface RoomRegistryMerge {
     markMerged(fromSlug: string, toSlug: string): Promise<boolean>;
     renameSlug(oldSlug: string, newSlug: string): Promise<boolean>;
+    /** rename 收尾恢复先前状态用(active 条目改名后不掉出标注词表)。 */
+    bySlug?(slug: string): {
+        status: 'active' | 'retired';
+    } | undefined;
+    setStatus?(slug: string, status: 'active' | 'retired'): Promise<boolean>;
 }
 export interface RoomCandidate {
     id: string;
@@ -153,7 +158,9 @@ export declare function mergeRoom(io: {
     dryRun?: boolean;
     cap?: number;
 }): Promise<MergeRoomResult>;
-/** rename = merge 1:1 + 注册表改名(冲突时抛错提示走 merge)。 */
+/** rename = merge 1:1 + 注册表改名(冲突时抛错提示走 merge)。
+ *  归类语义:改名**不是退役**——merge 编排的 markMerged 会把旧条目置 retired,
+ *  这里在改名后恢复其先前状态(active 条目改名后仍 active,不掉出标注词表)。 */
 export declare function renameRoom(io: {
     l1: RoomMergeStore;
     registry: RoomRegistryMerge;

package/dist/room-review.js

@@ -202,11 +202,17 @@ export async function mergeRoom(io, from, to, opts = {}) {
         roomMergeRunning = false;
     }
 }
-/** rename = merge 1:1 + 注册表改名(冲突时抛错提示走 merge)。 */
+/** rename = merge 1:1 + 注册表改名(冲突时抛错提示走 merge)。
+ *  归类语义:改名**不是退役**——merge 编排的 markMerged 会把旧条目置 retired,
+ *  这里在改名后恢复其先前状态(active 条目改名后仍 active,不掉出标注词表)。 */
 export async function renameRoom(io, from, to, opts = {}) {
+    const priorStatus = io.registry.bySlug?.(from)?.status ?? 'active';
     const r = await mergeRoom(io, from, to, opts);
-    if (!r.dryRun && r.applied > 0)
+    if (!r.dryRun && r.applied > 0) {
         await io.registry.renameSlug(from, to);
+        if (priorStatus === 'active')
+            await io.registry.setStatus?.(to, 'active');
+    }
     return r;
 }
 /** 下一条待复查(供 agent 逐个过):记录摘要 + 候选 + 现有 Room 词表 + 剩余数。 */

package/package.json

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