dsh-at-menu 0.1.0 → 0.1.1

package/README.en.md

@@ -34,23 +34,21 @@ dsh plugin --profile desktop add dsh-at-menu
 
 Restart DSH afterwards. Replace `desktop` with your own profile name if you use another one.
 
-Requirements: the DSH 0.2.1 line, desktop app or `dsh web` (needs the @ menu of the conversation composer).
-Compatible with DSH 0.2.1 (alpha / rc / stable); 0.3 and later are not guaranteed.
+Requirements: DSH 0.2.1 or later, desktop app or `dsh web` (needs the @ menu of the conversation composer; verified on 0.2.2-rc.1).
+Requires DSH >= 0.2.1-alpha.3; verified on 0.2.1-alpha.3 and 0.2.2-rc.1, later versions untested.
 
-## Recommended: disable the built-in @ menu
+## Works alongside the built-in @ menu
 
-The built-in reference menu (loader id `ui-reference`) also registers sources named "Workspace files"
-and "Past sessions". Two sources with the same name produce duplicated groups. Disable it in the
-profile's `cordis.patch.yml`:
+Keep the built-in `ui-reference` enabled; the two run together. It owns `source "reference"`, which
+handles two things this plugin does not:
 
-```yaml
-- id: ui-reference
-  disabled: true
-```
+- file reference cards created by dropping files onto the composer (or the add-file button) are turned
+  into text by it — without it, sending fails with
+  `slash: no serializer for reference source "reference"`;
+- the decoration and click-to-open on `@path` mentions in past messages.
 
-What that costs: `@path` mentions in past messages lose their decoration and file references are no
-longer clickable — the text itself stays. Leaving it enabled still works (this plugin hides the
-built-in menu visually); only the candidates are duplicated.
+This panel only takes over the look of the @ menu: the built-in's candidate group is not shown here,
+and the keyboard highlight is pushed back to a visible category when it lands on it.
 
 ## How it works
 
@@ -65,7 +63,7 @@ built-in menu visually); only the candidates are duplicated.
 
 ## Known limits
 
-- With the built-in `ui-reference` enabled, groups with the same name appear twice (see above).
+- With the built-in `ui-reference` enabled, its merged "files + sessions" group is not shown in this panel (the keyboard skips it too); use the built-in menu for that merged view.
 - Tabs only show sources registered in `CATEGORY_SOURCES`; a plugin that registers a new source name
   needs that line in `src/entry.jsx` edited before its tab shows up.
 - This plugin only changes the look and grouping of the @ menu; it does not change the insertion format.

package/README.md

@@ -32,21 +32,19 @@ dsh plugin --profile desktop add dsh-at-menu
 
 装完重启 DSH。用别的 profile 就把 `desktop` 换成你的 profile 名。
 
-要求：DSH 0.2.1 系列的桌面端或 `dsh web`（需要会话输入框的 @ 菜单）。
-兼容：DSH 0.2.1 系列（alpha / rc / 正式版均可）；0.3 起不保证。
+要求：DSH 0.2.1 及以上的桌面端或 `dsh web`（需要会话输入框的 @ 菜单；验证版本 0.2.2-rc.1）。
+要求 DSH >= 0.2.1-alpha.3；实测 0.2.1-alpha.3、0.2.2-rc.1，更高版本未验证。
 
-## 建议同时关掉内置的 @ 菜单
+## 与内置 @ 菜单共存
 
-内置的引用菜单（loader id `ui-reference`）也会注册「工作区文件」「历史会话」这类源。
-两份源同名同时存在，菜单里会出现重复组。推荐在 profile 的 `cordis.patch.yml` 里把它关掉：
+内置的 `ui-reference` 不用关，两者同时启用。它提供 `source "reference"`，管两件本插件不做的事：
 
-```yaml
-- id: ui-reference
-  disabled: true
-```
+- 往输入框拖文件、或点「添加文件」时生成的文件引用卡片，由它转成文字；它不在，发送会报
+  `slash: no serializer for reference source "reference"`；
+- 历史消息里 `@路径` 的装饰样式和点击打开。
 
-关掉之后的代价：历史消息里的 `@路径` 不再有装饰样式、文件引用不再能点击打开——文字内容不丢。
-不关也能用（本插件会隐藏内置菜单的外观），只是候选会有重复。
+本插件的面板只接管 @ 菜单的外观：内置那一组候选不进面板，键盘高亮落到它时会被推回可见类别。
+两边同时启用不会出现重复候选。
 
 ## 怎么工作
 
@@ -59,7 +57,7 @@ dsh plugin --profile desktop add dsh-at-menu
 
 ## 已知限制
 
-- 与内置 `ui-reference` 同时启用时，同名的候选组会重复出现（见上一节）。
+- 内置 `ui-reference` 的「文件＋会话」混合候选组不显示在本面板里（键盘也会跳过它）；要看那组混合视图得用内置菜单。
 - 类别标签只显示 `CATEGORY_SOURCES` 里登记过的源；新插件注册了新名字的源，要改 `src/entry.jsx`
   里那一行才会出标签。
 - 只改 @ 菜单的外观与分组，不改变草稿的插入格式。

package/lib/client.js

@@ -201,6 +201,13 @@ function AtMenuPanel({ menu, headers, onPick, onCrumb, onHover, onDismiss }) {
     const highlight = state.highlight;
     if (highlight !== null && active !== null && highlight.source !== active && CATEGORY_SOURCES.includes(highlight.source)) setActive(highlight.source);
   }, [state, active]);
+  (0, import_react.useEffect)(() => {
+    if (!state.open) return;
+    const highlight = state.highlight;
+    if (highlight === null || CATEGORY_SOURCES.includes(highlight.source)) return;
+    const first = state.groups.find((group) => CATEGORY_SOURCES.includes(group.source) && group.status === "ready" && group.items.length > 0);
+    if (first !== void 0) onHover(first.source, 0);
+  }, [state]);
   (0, import_react.useEffect)(() => {
     if (!state.open) return;
     const onPointerDown = (ev) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-at-menu",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "在 @ 引用菜单顶部加一排类别标签，点标签只看该类候选。",
   "type": "module",
   "main": "index.js",
@@ -23,7 +23,7 @@
   ],
   "engines": {
     "node": "^22.19.0 || >=24.0.0",
-    "dsh": ">=0.2.1-0 <0.3.0-0"
+    "dsh": ">=0.2.1-0"
   },
   "dsh": {
     "client": {

package/src/entry.jsx

@@ -204,6 +204,18 @@ export function AtMenuPanel({ menu, headers, onPick, onCrumb, onHover, onDismiss
       && CATEGORY_SOURCES.includes(highlight.source)) setActive(highlight.source)
   }, [state, active])
 
+  // 内置 ui-reference 启用时，它的 source "reference" 也在这份菜单数据里，本面板不显示那一组。
+  // 高亮一旦落到不显示的组，键盘就会走进看不见的行、回车选中没看见的候选——
+  // 把它推回第一个可见类别的首项。
+  useEffect(() => {
+    if (!state.open) return
+    const highlight = state.highlight
+    if (highlight === null || CATEGORY_SOURCES.includes(highlight.source)) return
+    const first = state.groups.find(group => CATEGORY_SOURCES.includes(group.source)
+      && group.status === 'ready' && group.items.length > 0)
+    if (first !== undefined) onHover(first.source, 0)
+  }, [state])
+
   // 点面板外（且不在输入框里）关闭菜单。
   useEffect(() => {
     if (!state.open) return