@nimoxie/dsh-model-organizer 0.3.4 → 0.3.5

package/DEVELOPING.md

@@ -50,6 +50,7 @@ ctx.inject(["slots", "settingsScope", "remote", "remote.settings"], (s) => mount
 ## 写 UI 时踩过的坑
 
 - **primitives 的新组件（MenuSurface/Input/StateDot 等）是 `React.forwardRef` 包装的——是对象不是函数**。`typeof X === "function"` 永远为 false，所有这类门控静默失败、全部走降级路径（本插件因此丢过 MenuSurface 的磨砂和整个搜索框）。组件判定用 `isComponent`：函数，或带 `.render` 函数的对象。`rankByName` 这类工具函数才是真函数。
+- **图标名要用 primitives 实际导出的名字**：只有 `IconXxxOutlineRegular` / `IconXxxOutlineMedium` / `IconXxxFillRegular` 这类后缀，**没有 `IconXxxOutline16`/`14` 尺寸数字名**。猜错名字 `icon()` 静默返回 null——本插件的勾、分组箭头因此从第一版起就没渲染过，靠触发器的文字兜底掩盖至今。发新图标前先 grep 导出表。
 
 - **边框必须用 longhand**（`borderWidth/borderStyle/borderColor`）。用 shorthand `border` 再叠加 `borderColor` 时 React 会展开 shorthand；回退时移除 `borderColor`，`border-color` 落回 `currentColor` → "拖拽结束后高亮边框一直不消失"。
 - **拖拽会把源行留在焦点上**：行加 `tabIndex:-1`，drop/dragend 时 `blur()`；并且不要给行画 `:focus-visible` 背景（官方 `option` 类自带一条 → "拖完还留一块灰底"）。
@@ -70,3 +71,5 @@ npm publish
 发布需要带 **Bypass 2FA** 的 Granular Access Token（npm 2025-11 起只支持 granular token）：npmjs.com → 头像 → Access Tokens → Generate New Token → Packages 选 **All Packages + Read and write (publish and stage)**、**Organizations 选 No access**、勾 **Bypass two-factor authentication**；然后 `npm config set //registry.npmjs.org/:_authToken=npm_xxx`（写进用户级 `.npmrc`，不要放进仓库）。
 
 包是 scoped 名（`@nimoxie/dsh-model-organizer`，用户作用域），`publishConfig.access: "public"` 已写进 package.json，`npm publish` 不用再带参数。老的无作用域名 `dsh-model-organizer` 已停更，记得发一次 `npm deprecate dsh-model-organizer "已迁移到 @nimoxie/dsh-model-organizer"` 留路标。
+
+**改包名是牵一发动全身的**——包名是宿主解析插件的文件系统坐标，不止 package.json：`cordis.patch.yml` 的 `insert.name`（按包名从 node_modules 找插件，找不到则插件整体不加载）、`lib/client.js` 的 `__ModuleLoader__.load({ id })`（模块 id 必须等于包名，否则 bundle 二次执行时被判定为重复抢注，boot 直接失败）。localStorage 键和 locale 命名空间是纯数据键，刻意不改（改了丢用户排序数据）。

package/README.md

@@ -4,19 +4,19 @@
 
 ## 它解决什么问题
 
-官方那个模型下拉是一个扁平长列表——供应商只是粘性小标题，模型多的时候要滚很久，也没法按自己的习惯排序。这个插件把它改成两级：**先看供应商，点开才看模型**，并且供应商和模型的顺序都能直接拖。
+官方那个模型下拉是一个扁平长列表——供应商只是粘性小标题，模型多的时候要滚很久，也没法按自己的习惯排序。这个插件把它改成两级：**根层先选「模型」或「推理等级」，模型层里按供应商分组**，供应商和模型的顺序都能直接拖。
 
 ## 功能
 
 **输入框的模型菜单**
-- 根层与官方一致：「模型」「推理等级」两个入口（推理等级只在模型声明了等级时出现，怎么声明见下文）
+- 根层与官方一致：「模型」「推理等级」两个入口——「推理等级」**常驻**，未配置等级的模型上置灰、不可点
 - 「模型」里保留本插件的改进：按供应商分组、可折叠，顺序与设置页浮窗一致，当前模型打 ✓
 - 模型多于 4 个时，「模型」层顶部有官方同款的「搜索模型」框（0.2.0-rc.2 起官方才有此样式，旧版自动隐藏）
 - 外观完全沿用官方样式（同一个菜单表面、同一套图标，含官方的毛玻璃背景）
 
 **排序**
 - 在「设置 → 模型」右下角的浮窗里，**直接拖动**供应商行或模型行
-- 模型顺序保存到 DSH 的 `settings.yaml`：换浏览器、清缓存都不丢，所有打开这份 DSH 的设备共用；供应商顺序只记在当前浏览器里
+- 模型顺序通过官方设置接口持久化（跟着 DSH 的配置走，不存浏览器）；供应商顺序只记在当前浏览器里
 
 ## 安装
 
@@ -37,20 +37,16 @@ dsh plugin --profile web add github:NimoXie15/dsh-model-organizer
 dsh plugin --profile web add link:/absolute/path/to/dsh-model-organizer
 ```
 
-> **兼容性**：已在 DSH `0.1.7`、`0.2.0-rc.1` 上核验，`0.1.5` 起都可用（0.1.7 调整了一处内部接口，本插件已做兼容处理）。注意 0.2.0 起官方主题把菜单背景改成了半透明，模型菜单也随之变通透——这是跟随官方新皮肤，不是故障。
+> **兼容性**：已在 DSH `0.1.7`、`0.2.0-rc.1`（web）、`0.2.0-rc.2`（桌面端）上核验，`0.1.5` 起都可用。
 >
 > 升级插件后如果界面没变化，按 **Ctrl+Shift+R** 强刷一次（浏览器可能还在用缓存的旧版本）。
 
-## 截图
+## 想让「推理等级」可用，需要模型自己声明
 
-📷 待补充。
-
-## 想让「推理等级」出现，需要模型自己声明
-
-只有模型提供了等级，菜单里才会出现「推理等级」入口——这与官方行为一致。在你的 `settings.yaml` 里给模型加上：
+「推理等级」入口常驻菜单根层；只有模型声明了等级，它才可点、才会在按钮上显示当前等级。在模型配置里加上（`llm-pi-ai.providers.<供应商>.models[]`；0.2.x 在 profile 的 `cordis.patch.yml`，0.1.x 在 `settings.yaml`）：
 
 ```yaml
-# settings.yaml → llm-pi-ai.providers.<供应商>.models[]
+# llm-pi-ai.providers.<供应商>.models[]（0.2.x 在 profile 的 cordis.patch.yml；0.1.x 在 settings.yaml）
 - id: <你的模型 ID>
   reasoningEfforts:      # 键=菜单里显示的等级，值=选中时发给模型的 API 参数；只有 off 可以留空
     off:
@@ -60,7 +56,7 @@ dsh plugin --profile web add link:/absolute/path/to/dsh-model-organizer
 ## 已知限制
 
 - 排序浮窗只列「设置 → 模型」里自己添加的供应商，**DeepSeek 官方供应商不能排序**（输入框菜单里照常出现、可选）
-- 供应商顺序、浮窗位置只存在当前浏览器；模型顺序存在 `settings.yaml` 里，同一份 DSH 的所有设备共用——两台机器各装一份 DSH 则互不相通
+- 供应商顺序、浮窗位置只存在当前浏览器；模型顺序存在 DSH 的用户配置里，同一份 DSH 的所有设备共用——两台机器各装一份 DSH 则互不相通
 - 不修改 DSH 本体，只通过官方提供的扩展点接入
 
 ## 许可

package/cordis.patch.yml

@@ -1,6 +1,6 @@
-# dsh-model-organizer bundle patch: one host row over the web profile.
+# @nimoxie/dsh-model-organizer bundle patch: one host row over the web profile.
 # The row name resolves from the profile's own node_modules where
 # `dsh plugin --profile web add <path>` installed this package.
 - insert:
     - id: model-organizer
-      name: dsh-model-organizer
+      name: "@nimoxie/dsh-model-organizer"

package/lib/client.js

@@ -1,5 +1,5 @@
 window.__ModuleLoader__.load({
-  id: "dsh-model-organizer",
+  id: "@nimoxie/dsh-model-organizer",
   factory: (require) => {
     const module = { exports: {} };
     const exports = module.exports;
@@ -42,6 +42,7 @@ window.__ModuleLoader__.load({
       "composer.searchClear": "清除搜索",
       "composer.searchEmpty": "没有匹配的模型。",
       "composer.selectFailed": "选择失败：{msg}",
+      "composer.effortNone": "未配置",
       "composer.none": "未选择模型",
       "composer.empty": "暂无可用模型",
       "composer.locked": "当前不可切换模型",
@@ -51,7 +52,6 @@ window.__ModuleLoader__.load({
       "composer.effort": "推理等级",
       "composer.effortDefault": "Default",
       "composer.effortEmpty": "当前模型未提供推理等级。",
-      "composer.effortBack": "模型",
       "composer.refreshing": "正在刷新模型列表…",
       "order.title": "模型顺序",
       "order.hint": "拖动 ⠿ 调整，松手即保存",
@@ -72,6 +72,7 @@ window.__ModuleLoader__.load({
       "composer.searchClear": "Clear search",
       "composer.searchEmpty": "No matching models.",
       "composer.selectFailed": "Selection failed: {msg}",
+      "composer.effortNone": "Not configured",
       "composer.none": "No model",
       "composer.empty": "No models available",
       "composer.locked": "Model switching unavailable",
@@ -81,7 +82,6 @@ window.__ModuleLoader__.load({
       "composer.effort": "Effort",
       "composer.effortDefault": "Default",
       "composer.effortEmpty": "This model provides no reasoning effort levels.",
-      "composer.effortBack": "Model",
       "composer.refreshing": "Refreshing model list…",
       "order.title": "Model order",
       "order.hint": "Drag ⠿ to reorder, then save",
@@ -115,7 +115,7 @@ window.__ModuleLoader__.load({
        code changes, so a browser can keep running an old build until a hard reload.
        Kept OFF the UI (it is not user-facing): read it as
        `window.__dshModelOrganizerBuild` when a stale build is suspected. */
-    const BUILD = "b29";
+    const BUILD = "b33";
 
     let officialClasses = null;
     let officialClassesSheets = -1;
@@ -232,6 +232,11 @@ window.__ModuleLoader__.load({
           /* (the header's own arrow button is gone — the row toggles on click) */
 
           ".dsh-mo-model{padding-left:28px;position:relative;}",
+          /* Permanent-but-unconfigured effort cell: caption tone (the search
+             placeholder's token — dimmed is unreadably faint), not-allowed
+             cursor, hover-proof (doubled selectors outrank the shipped rules). */
+          ".dsh-mo-cell-disabled,.dsh-mo-cell-disabled.dsh-mo-cell-disabled{color:var(--dsw-alias-label-caption);cursor:not-allowed;}",
+          ".dsh-mo-cell-disabled:hover,.dsh-mo-cell-disabled.dsh-mo-cell-disabled:hover{background:transparent;cursor:not-allowed;}",
           ".dsh-mo-model::before{content:'';position:absolute;left:15px;top:50%;width:5px;height:5px;margin-top:-2.5px;border-radius:50%;background:var(--dsw-alias-label-tertiary);opacity:.5;}",
           ".dsh-mo-model[aria-checked='true']::before{background:var(--dsw-alias-label-primary);opacity:.9;}"
         ];
@@ -240,6 +245,8 @@ window.__ModuleLoader__.load({
            aria-checked, so the drag lists are untouched. */
         if (C !== null) {
           rules.push("." + C.option + "[aria-checked='true'] ." + C.modelName + "{font-weight:600}");
+          /* cellValue paints its own color; fold it back to the dimmed cell's. */
+          rules.push(".dsh-mo-cell-disabled ." + C.cellValue + "{color:inherit;}");
         }
         style.textContent = rules.join("");
       } catch (e) {}
@@ -815,12 +822,12 @@ window.__ModuleLoader__.load({
         .split("{model}").join(label)
         .split("{effort}").join(effortLabel === undefined ? "" : effortLabel);
 
-      const chevronIcon = icon("IconChevronDownOutline14", {
+      const chevronIcon = icon("IconChevronDownOutlineRegular", {
         className: C !== null ? cx(C.chevron, open && C.chevronOpen) : undefined,
         style: C === null ? S.caret : undefined
       });
       const triggerChildren = [];
-      const triggerGlyph = icon("IconDataOutline16", { key: "g", className: C !== null ? C.triggerIcon : undefined, size: 16 });
+      const triggerGlyph = icon("IconDataOutlineRegular", { key: "g", className: C !== null ? C.triggerIcon : undefined, size: 16 });
       if (triggerGlyph !== null) triggerChildren.push(triggerGlyph);
       triggerChildren.push(h("span", { key: "l", className: C !== null ? C.triggerLabel : undefined, style: C === null ? S.chipLabel : undefined }, label));
       if (effortLabel !== undefined) {
@@ -892,7 +899,7 @@ window.__ModuleLoader__.load({
           h("span", { key: "n", className: C !== null ? C.cellLabel : undefined, style: C === null ? undefined : undefined }, group.name || group.id),
           h("span", { key: "v", className: C !== null ? C.cellValue : undefined, style: C === null ? S.groupCount : undefined }, group.models.length + " " + t("composer.count"))
         ];
-        const groupChevron = icon("IconChevronRightOutline14", {
+        const groupChevron = icon("IconChevronRightOutlineRegular", {
           key: "i",
           className: C !== null ? cx(C.cellChevron, "dsh-mo-chev") : "dsh-mo-chev",
           style: C === null ? S.groupChevron : undefined
@@ -911,7 +918,7 @@ window.__ModuleLoader__.load({
 
         const items = !isOpen ? [] : group.models.map(function (model) {
           const selected = current !== null && current.provider === group.id && current.model === model.id;
-          const check = selected ? icon("IconCheckOutline16", { key: "k" }) : null;
+          const check = selected ? icon("IconCheckOutlineRegular", { key: "k" }) : null;
           return h("button", {
             key: model.id,
             ref: itemRef(),
@@ -956,23 +963,26 @@ window.__ModuleLoader__.load({
         },
           h("span", { key: "l", className: C !== null ? C.cellLabel : undefined }, t("composer.menuModel")),
           h("span", { key: "v", className: C !== null ? C.cellValue : undefined }, label),
-          icon("IconChevronRightOutline14", { key: "c", className: C !== null ? C.cellChevron : undefined })
+          icon("IconChevronRightOutlineRegular", { key: "c", className: C !== null ? C.cellChevron : undefined })
+        ));
+        /* The effort entry is PERMANENT (unlike the shipped conditional one):
+           models without declared levels render it dimmed, unclickable and
+           skipped by the keyboard walk, so the root pair never reflows. */
+        const effortEnabled = reasoning !== undefined;
+        paneChildren.push(h("button", {
+          key: "effort",
+          ref: itemRef(),
+          type: "button",
+          role: "menuitem",
+          className: C !== null ? cx(C.cell, !effortEnabled && "dsh-mo-cell-disabled") : undefined,
+          style: C === null ? S.fallbackGroupTitle : undefined,
+          disabled: !effortEnabled,
+          onClick: effortEnabled ? function () { setPane("effort"); } : undefined
+        },
+          h("span", { key: "l", className: C !== null ? C.cellLabel : undefined }, t("composer.effort")),
+          h("span", { key: "v", className: C !== null ? C.cellValue : undefined }, effortEnabled ? effortLabel : t("composer.effortNone")),
+          icon("IconChevronRightOutlineRegular", { key: "c", className: C !== null ? cx(C.cellChevron, !effortEnabled && "dsh-mo-cell-disabled") : undefined })
         ));
-        if (reasoning !== undefined) {
-          paneChildren.push(h("button", {
-            key: "effort",
-            ref: itemRef(),
-            type: "button",
-            role: "menuitem",
-            className: C !== null ? C.cell : undefined,
-            style: C === null ? S.fallbackGroupTitle : undefined,
-            onClick: function () { setPane("effort"); }
-          },
-            h("span", { key: "l", className: C !== null ? C.cellLabel : undefined }, t("composer.effort")),
-            h("span", { key: "v", className: C !== null ? C.cellValue : undefined }, effortLabel),
-            icon("IconChevronRightOutline14", { key: "c", className: C !== null ? C.cellChevron : undefined })
-          ));
-        }
       } else if (pane === "effort") {
         if (effortChoices.length === 0) {
           paneChildren.push(h("div", { key: "ee", className: C !== null ? C.empty : undefined, style: C === null ? S.menuEmpty : undefined }, t("composer.effortEmpty")));
@@ -983,7 +993,7 @@ window.__ModuleLoader__.load({
             style: C === null ? S.fallbackGroups : undefined
           }, effortChoices.map(function (level) {
             const selected = effectiveEffort === level.effort;
-            const check = selected ? icon("IconCheckOutline16", { key: "k" }) : null;
+            const check = selected ? icon("IconCheckOutlineRegular", { key: "k" }) : null;
             return h("button", {
               key: level.key,
               ref: itemRef(),
@@ -1221,7 +1231,7 @@ window.__ModuleLoader__.load({
       if (note === "ok") notes.push(h("span", { key: "ok", style: S.ok }, t("order.saved")));
       else if (note !== null) notes.push(h("span", { key: "n", style: S.dirty }, note));
       for (let i = 0; i < notes.length; i++) headChildren.push(notes[i]);
-      const headChevron = icon("IconChevronRightOutline14", {
+      const headChevron = icon("IconChevronRightOutlineRegular", {
         key: "c",
         className: C !== null ? cx(C.cellChevron, "dsh-mo-chev") : "dsh-mo-chev",
         style: C === null ? S.groupChevron : undefined
@@ -1292,7 +1302,6 @@ window.__ModuleLoader__.load({
       try { window.localStorage.setItem(ORDER_STORAGE_KEY, JSON.stringify(ids)); } catch (e) {}
     }
 
-    const PANEL_STORAGE_KEY = "dsh-model-organizer.panelOpen";
     const PANEL_POS_KEY = "dsh-model-organizer.panelPos";
 
 
@@ -1311,16 +1320,6 @@ window.__ModuleLoader__.load({
       try { window.localStorage.setItem(PANEL_POS_KEY, JSON.stringify(pos)); } catch (e) {}
     }
 
-    /* ALWAYS expanded on mount. A remembered collapse is indistinguishable from
-       "the default is collapsed" the next time the page opens, which is not what
-       this panel is for. */
-    function readPanelOpen() {
-      return true;
-    }
-
-    function writePanelOpen(open) {
-      try { window.localStorage.setItem(PANEL_STORAGE_KEY, open ? "1" : "0"); } catch (e) {}
-    }
 
     /* Stored order first, then everything else in document order. */
     function applyProviderOrder(ids, preferred) {
@@ -1395,9 +1394,11 @@ window.__ModuleLoader__.load({
       const openState = useState({});
       const openMap = openState[0];
       const setOpenMap = openState[1];
-      const panelState = useState(readPanelOpen);
+      /* The panel always mounts expanded: a remembered collapse is
+         indistinguishable from "collapsed by default" on the next page open. */
+      const panelState = useState(true);
       const panelOpen = panelState[0];
-      const setPanelOpen = function (next) { writePanelOpen(next); panelState[1](next); };
+      const setPanelOpen = panelState[1];
       const posState = useState(readPanelPos);
       const panelPos = posState[0];
       const setPanelPos = posState[1];
@@ -1481,8 +1482,6 @@ window.__ModuleLoader__.load({
       }, [panelPos, panelOpen]);
 
       const ids = order === null ? baseIds : order;
-      const idsKey = ids.join("|");
-      const dirty = order !== null && order.join("|") !== sourceKey;
 
       /* The shipped provider cards are left exactly as React renders them. Ordering used
          to be mirrored onto them with inline `order`; that is gone — this plugin adds a
@@ -1606,7 +1605,7 @@ window.__ModuleLoader__.load({
             h("span", { key: "n", className: C !== null ? C.cellLabel : undefined, style: C === null ? S.rowName : undefined }, profile.displayName || id),
             h("span", { key: "c", className: C !== null ? C.cellValue : undefined, style: C === null ? S.rowMeta : undefined }, count + " " + t("composer.count"))
           ];
-          const rowChevron = icon("IconChevronRightOutline14", {
+          const rowChevron = icon("IconChevronRightOutlineRegular", {
             key: "v",
             className: C !== null ? cx(C.cellChevron, "dsh-mo-chev") : "dsh-mo-chev",
             style: C === null ? S.groupChevron : undefined

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nimoxie/dsh-model-organizer",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "DSH 模型整理插件：输入框的模型下拉改为「供应商分组 + 模型二级折叠菜单」（含推理等级），并在模型设置页提供一个可拖拽的「供应商与模型顺序」浮窗。",
   "type": "module",
   "main": "lib/index.js",