dsh-preview-market 0.1.1 → 0.1.2

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.2
+
+- Add a top-level **Settings → Preview market** section, next to dsh-market, with Discover / Installed tabs.
+- Keep the Settings → Plugins tab for discoverability; both render the same panel.
+
 ## 0.1.1
 
 - Enable/disable installed preview plugins from the market when dsh-market is present (`/dsh-market/toggle`), with the current state read from `/dsh-market/installed`.

package/README.md

@@ -1,25 +1,29 @@
 # dsh-preview-market
 
-A **vertical preview market** for DeepSeek Harness. One settings tab lists the preview plugins that exist for DSH, shows which ones the active profile already has, and hands installs/updates to [dsh-market](https://github.com/dsh-market/dsh-market) or the official `dsh plugin` command.
+A **vertical preview market** for DeepSeek Harness. A top-level settings section (and a Settings → Plugins tab) lists the preview plugins that exist for DSH, shows which ones the active profile already has, and hands installs/updates to [dsh-market](https://github.com/dsh-market/dsh-market) or the official `dsh plugin` command.
 
 It is not a general plugin market, and it does not implement previews itself: every preview plugin stays an independent Loader entry with its own repository, version and settings. The market only provides the catalog, the installed view and the entry points.
 
+![Preview market in Settings](https://raw.githubusercontent.com/439436269-ctrl/dsh-preview-market/main/docs/preview-market-section.png)
+
 ## Install
 
 ```sh
 dsh plugin --profile <profile> add dsh-preview-market
 ```
 
-Open **Settings → Plugins → Preview market**.
+Open **Settings → Preview market** (the same panel is also under **Settings → Plugins**).
+
+Upgrading from `dsh-media-preview` / `dsh-blend-preview` / `dsh-stl-preview`? See [MIGRATION.md](MIGRATION.md).
 
 ## What it does
 
 - **Catalog** — first-party preview plugins with their formats, host requirements and versions.
-- **Installed view** — reads the active profile's `package.json` and each package's `dsh.preview` manifest; never imports child plugin code.
+- **Installed view** — reads the active profile's `package.json`, matching catalog names by default and honouring a package's `dsh.preview` manifest when present; never imports child plugin code.
 - **Install / update** — delegates to `dsh-market` when it is present. Without it, the card shows the exact `dsh plugin --profile <profile> add <package>@<version>` command to copy.
 - **Independent plugins** — media, Blender and STL remain separate packages; this page has no renderer and does not merge their code.
 
-## Catalog (0.1.0)
+## Catalog (0.1.2)
 
 | Package | Formats | Host requirement |
 |---|---|---|
@@ -38,12 +42,25 @@ Settings → Plugins → Preview market (namespace `preview-market`):
 | `profileDir` | `""` | Profile to inspect. Empty uses the Host `profileContext`, then `$DSH_HOME/profiles/desktop`. |
 | `debug` | `false` | Reserved for request diagnostics. |
 
+## Examples
+
+- [`examples/profile-overrides.yml`](examples/profile-overrides.yml) — a safe starting point for per-profile overrides (media chunk size, Blender path, STL unit scale).
+- [`catalog.json`](catalog.json) — machine-readable snapshot of the shipped catalog, enforced by a unit test.
+
 ## Development
 
 ```sh
 node --test test/*.test.js
 ```
 
+`catalog.json` is a machine-readable snapshot of the shipped catalog; regenerate it with `npm run catalog:write` and keep it in sync (a test enforces this).
+
+Settings-section end-to-end (requires a running host with the plugin installed):
+
+```sh
+node scripts/e2e-section.mjs --base http://127.0.0.1:<port> --token <token>
+```
+
 Settings-tab end-to-end (requires a running host with the plugin installed):
 
 ```sh
@@ -66,4 +83,4 @@ The client bundle is `lib/client.js` (classic `__ModuleLoader__.load` factory, n
 
 ## Status
 
-`0.1.1` — catalog + installed inventory + Settings → Plugins tab + enable/disable through dsh-market. One-click install requires the package to be present in the connected dsh-market registry; otherwise use the copyable command. Configuration stays in each child plugin's own Settings → Plugins page.
+`0.1.2` — top-level Settings → Preview market section with Discover / Installed tabs, plus the Settings → Plugins tab. Enable/disable goes through dsh-market. One-click install requires the package in the connected dsh-market registry; otherwise use the copyable command. Configuration stays in each child plugin's own Settings → Plugins page.

package/README.zh.md

@@ -4,22 +4,26 @@
 
 它不是通用插件市场，也不自己实现预览：每个预览插件仍是独立的 Loader 条目，有自己的仓库、版本和设置；市场只提供目录、已安装视图和入口。
 
+![设置里的预览市场](https://raw.githubusercontent.com/439436269-ctrl/dsh-preview-market/main/docs/preview-market-section.png)
+
 ## 安装
 
 ```sh
 dsh plugin --profile <profile> add dsh-preview-market
 ```
 
-打开 **设置 → 插件 → 预览市场**。
+打开 **设置 → 预览市场**（同一个面板也在 **设置 → 插件** 下）。
+
+从 `dsh-media-preview` / `dsh-blend-preview` / `dsh-stl-preview` 升级？见 [MIGRATION.md](MIGRATION.md)。
 
 ## 功能
 
 - **目录** — 第一方预览插件及其格式、宿主依赖、版本。
-- **已安装** — 读当前 profile 的 `package.json` 与各包的 `dsh.preview` 清单，不 import 子插件代码。
+- **已安装** — 读当前 profile 的 `package.json`，默认按目录名匹配；包内声明 `dsh.preview` 清单时也认。不 import 子插件代码。
 - **安装/更新** — 检测到 dsh-market 时委托给它；没有时显示可复制的 `dsh plugin --profile <profile> add <包>@<版本>` 命令。
 - **独立插件** — media、Blender、STL 仍是独立包；本页不注册渲染器，也不合并它们的代码。
 
-## 目录（0.1.0）
+## 目录（0.1.2）
 
 | 包 | 格式 | 宿主依赖 |
 |---|---|---|
@@ -38,6 +42,11 @@ dsh plugin --profile <profile> add dsh-preview-market
 | `profileDir` | `""` | 要检查的 profile；空则用 Host `profileContext`，再退到 `$DSH_HOME/profiles/desktop`。 |
 | `debug` | `false` | 预留的请求诊断。 |
 
+## 示例
+
+- [`examples/profile-overrides.yml`](examples/profile-overrides.yml)：按 profile 覆盖媒体分块、Blender 路径、STL 单位。
+- [`catalog.json`](catalog.json)：目录的机器可读快照，单测会检查它与代码一致。
+
 ## 开发
 
 ```sh
@@ -48,4 +57,4 @@ node --test test/*.test.js
 
 ## 状态
 
-`0.1.0` — 目录 + 已安装清单 + 设置页。一键安装要求对应包已进入所连接 dsh-market 的 registry；否则用可复制命令。启用/停用仍在 **设置 → 插件**。
+`0.1.2` — 顶层「设置 → 预览市场」+ 发现/已安装两个 tab，同时保留「设置 → 插件」里的入口。启用/停用走 dsh-market；一键安装要求对应包已进入所连接 dsh-market 的 registry，否则用可复制命令。配置仍在各子插件自己的 设置 → 插件 页面。

package/VERIFY.md

@@ -1,4 +1,4 @@
-# Verification record — dsh-preview-market 0.1.1
+# Verification record — dsh-preview-market 0.1.2
 
 ## Unit tests (2026-10-23)
 
@@ -18,6 +18,14 @@
 - The Web boot graph (`__DSH_BOOT__`) contains `dsh-preview-market` and injects `__DSH_PREVIEW_MARKET_CONFIG__`.
 - The combo bundle URL returned **200** (16,213 B) and contains `settings.plugins.tab` + `dsh-preview-market`.
 
+## Top-level section e2e (2026-10-23, preview-test)
+
+```sh
+node scripts/e2e-section.mjs --base http://127.0.0.1:59010 --token <token>
+```
+
+Result: **PASS** — the Settings nav contains `预览市场` immediately after `插件市场`; opening it shows the `发现` / `已安装` tabs and the three catalog cards (`dsh-preview-media`, `dsh-preview-blender`, `dsh-preview-stl`). No page errors. Screenshot: `docs/preview-market-section.png`.
+
 ## Settings tab e2e (2026-10-23, preview-test)
 
 Installed `dsh-preview-market@0.1.0` plus `dsh-preview-media@0.1.4`, `dsh-preview-blender@0.1.0`, `dsh-preview-stl@0.1.0` into `preview-test`, started the Web host, and ran:
@@ -48,8 +56,29 @@ node scripts/e2e-toggle.mjs --base http://127.0.0.1:59006 --token <token>
 
 Result: **PASS** — the STL card showed `停用`; clicking it wrote `dsh-preview-stl` into `/dsh-market/installed`'s `disabled` list and showed `已切换，刷新页面后生效`; clicking `启用` removed it again. The media card's `配置` showed `在 设置 → 插件 → dsh-preview-media 配置。` No page errors; screenshot: `%TEMP%\dsh-preview-market-toggle.png`.
 
-## Not yet verified live
+## npm artifact install (2026-10-23, preview-test)
+
+Replaced the local tarball with the published `dsh-preview-market@0.1.1` from npm (`dsh plugin --profile preview-test add dsh-preview-market@0.1.1`), then ran the settings e2e against that install:
+
+```sh
+node scripts/e2e-settings.mjs --base http://127.0.0.1:59007 --token <token>
+```
+
+Result: **PASS** — tab and all three installed cards rendered from the npm artifact. `package.json` dependency is `0.1.1`, `node_modules/dsh-preview-market/package.json` reports `0.1.1`.
+
+## One-click install e2e (fixture registry, 2026-10-23)
 
-- One-click install through dsh-market (requires the new packages in its curated registry; the market entries are scheduled for 2026-10-24).
+To exercise the real install route without waiting for the production catalog, a local registry fixture was served on `127.0.0.1:59008`:
+
+```json
+{"plugins":[{"name":"dsh-preview-stl","url":"https://github.com/439436269-ctrl/dsh-preview-stl","npm":"dsh-preview-stl","category":["ui"]}]}
+```
+
+The host was started with `DSHM_REGISTRY_URL=http://127.0.0.1:59008/plugins.json`, `dsh-preview-stl` was removed from `preview-test`, and the market's STL card was clicked. Result: **PASS** — dshmarket installed `dsh-preview-stl@0.1.0`; `/dsh-market/installed` contained it, the notice said `已安装: dsh-preview-stl`, and the card switched to `已是最新` with `停用`/`配置`. No page errors. Screenshot: `%TEMP%\market-oneclick.png`.
+
+This proves the install route itself; the production catalog still needs the entries scheduled for 2026-10-24.
+
+## Not yet verified live
 
-This is the next check after the new market entries are accepted.
+- Production one-click install through the real dsh-market catalog (the new entries are scheduled for 2026-10-24).
+- Desktop installation (the desktop profile is Electron-managed).

package/catalog.json

@@ -0,0 +1,123 @@
+{
+  "schema": 1,
+  "plugins": [
+    {
+      "name": "dsh-preview-media",
+      "npm": "dsh-preview-media",
+      "capability": "media",
+      "kind": "media",
+      "repo": "https://github.com/439436269-ctrl/dsh-preview-media",
+      "version": "0.1.4",
+      "minDsh": "0.2.0-rc.2",
+      "requires": [],
+      "extensions": [
+        "mp4",
+        "m4v",
+        "mov",
+        "webm",
+        "ogv",
+        "ogg",
+        "mkv",
+        "avi",
+        "wmv",
+        "flv",
+        "3gp",
+        "ts",
+        "m2ts",
+        "mts",
+        "mp3",
+        "wav",
+        "flac",
+        "m4a",
+        "aac",
+        "oga",
+        "opus",
+        "weba",
+        "wma",
+        "aiff",
+        "aif"
+      ],
+      "formats": {
+        "video": [
+          "mp4",
+          "m4v",
+          "mov",
+          "webm",
+          "ogv",
+          "ogg",
+          "mkv",
+          "avi",
+          "wmv",
+          "flv",
+          "3gp",
+          "ts",
+          "m2ts",
+          "mts"
+        ],
+        "audio": [
+          "mp3",
+          "wav",
+          "flac",
+          "m4a",
+          "aac",
+          "oga",
+          "opus",
+          "weba",
+          "wma",
+          "aiff",
+          "aif"
+        ]
+      },
+      "description": {
+        "zh": "视频与音频：右侧栏原生播放器，HTTP Range 流式读取，桌面端可拖动进度。",
+        "en": "Video and audio in the right-Sidebar document preview, streamed with HTTP Range and seekable in the desktop app."
+      }
+    },
+    {
+      "name": "dsh-preview-blender",
+      "npm": "dsh-preview-blender",
+      "capability": "blender",
+      "kind": "three",
+      "repo": "https://github.com/439436269-ctrl/dsh-preview-blender",
+      "version": "0.1.0",
+      "minDsh": "0.2.0-rc.2",
+      "requires": [
+        "blender"
+      ],
+      "extensions": [
+        "blend"
+      ],
+      "formats": {
+        "model": [
+          "blend"
+        ]
+      },
+      "description": {
+        "zh": "Blender 场景：headless 导出缓存 GLB，右侧栏 WebGL 视口 + 对象/三角面/mm 包围盒/材质统计。",
+        "en": "Blender scenes: a cached headless GLB export rendered in a WebGL viewport, with object, triangle, mm-bounds and material statistics."
+      }
+    },
+    {
+      "name": "dsh-preview-stl",
+      "npm": "dsh-preview-stl",
+      "capability": "stl",
+      "kind": "three",
+      "repo": "https://github.com/439436269-ctrl/dsh-preview-stl",
+      "version": "0.1.0",
+      "minDsh": "0.2.0-rc.2",
+      "requires": [],
+      "extensions": [
+        "stl"
+      ],
+      "formats": {
+        "model": [
+          "stl"
+        ]
+      },
+      "description": {
+        "zh": "STL 网格：浏览器解析二进制/ASCII，右侧栏 WebGL 视口 + 尺寸/体积/表面积/水密统计。",
+        "en": "STL meshes: binary/ASCII parsed in the browser, with a WebGL viewport and size, volume, surface-area and watertightness statistics."
+      }
+    }
+  ]
+}

package/lib/client.js

@@ -1,7 +1,8 @@
 /**
  * dsh-preview-market browser half.
  *
- * Registers one Settings → Plugins tab. The tab reads the Host catalog and the
+ * Registers a top-level Settings → Preview market section and keeps the
+ * Settings → Plugins tab. Both render the same panel: the Host catalog plus the
  * active profile inventory, then either delegates installs/updates to
  * dsh-market's same-origin API or shows the official `dsh plugin add` command.
  * It never imports a preview plugin's client bundle; those stay independent
@@ -14,8 +15,9 @@ window.__ModuleLoader__.load({
     var exports = module.exports;
     const React = require("react");
 
-    /** Locale namespace and settings-tab id. */
+    /** Locale namespace, section id and Settings → Plugins tab id. */
     const NS = "previewMarket";
+    const SECTION_ID = "preview-market";
     const TAB_ID = "dsh-preview-market";
     const DEFAULT_ROUTE_ROOT = "/api/preview-market";
 
@@ -53,7 +55,10 @@ window.__ModuleLoader__.load({
       manageHint: "到 设置 → 插件 启用/停用。",
       toggled: "已切换。",
       toggleRefresh: "已切换，刷新页面后生效。",
-      toggleFailed: "切换失败"
+      toggleFailed: "切换失败",
+      tabDiscover: "发现",
+      tabInstalled: "已安装",
+      installedEmpty: "还没有安装本市场的预览插件。"
     };
 
     const en = {
@@ -90,7 +95,10 @@ window.__ModuleLoader__.load({
       manageHint: "Use Settings → Plugins to enable or disable it.",
       toggled: "Toggled.",
       toggleRefresh: "Toggled; refresh the page to apply.",
-      toggleFailed: "Toggle failed"
+      toggleFailed: "Toggle failed",
+      tabDiscover: "Discover",
+      tabInstalled: "Installed",
+      installedEmpty: "No preview plugins from this market are installed yet."
     };
 
     /** Route root published by the Host at boot. */
@@ -205,6 +213,7 @@ window.__ModuleLoader__.load({
       });
       const [notice, setNotice] = React.useState("");
       const [busy, setBusy] = React.useState("");
+      const [tab, setTab] = React.useState("discover");
 
       const load = React.useCallback(async () => {
         setState((previous) => ({ ...previous, loading: true, error: "" }));
@@ -252,6 +261,8 @@ window.__ModuleLoader__.load({
       }, [load]);
 
       const installedByName = new Map(state.installed.map((entry) => [entry.name, entry]));
+      const installedCards = state.catalog.filter((item) => installedByName.has(item.name));
+      const visible = tab === "installed" ? installedCards : state.catalog;
 
       const install = React.useCallback(async (item) => {
         setBusy(item.name);
@@ -334,6 +345,36 @@ window.__ModuleLoader__.load({
             )
           )
         ),
+        React.createElement(
+          "div",
+          { className: "dsh-pm-tabs", role: "tablist" },
+          React.createElement(
+            "button",
+            {
+              type: "button",
+              role: "tab",
+              className: "dsh-pm-tab",
+              "data-active": tab === "discover",
+              "aria-selected": tab === "discover",
+              onClick: () => setTab("discover")
+            },
+            t("tabDiscover"),
+            React.createElement("span", { className: "dsh-pm-count" }, state.catalog.length)
+          ),
+          React.createElement(
+            "button",
+            {
+              type: "button",
+              role: "tab",
+              className: "dsh-pm-tab",
+              "data-active": tab === "installed",
+              "aria-selected": tab === "installed",
+              onClick: () => setTab("installed")
+            },
+            t("tabInstalled"),
+            React.createElement("span", { className: "dsh-pm-count" }, installedCards.length)
+          )
+        ),
         state.loading
           ? React.createElement("p", { className: "dsh-pm-empty" }, t("loading"))
           : state.error !== ""
@@ -343,12 +384,12 @@ window.__ModuleLoader__.load({
                 React.createElement("p", null, `${t("failed")}: ${state.error}`),
                 React.createElement("button", { type: "button", className: "dsh-pm-button", onClick: () => void load() }, t("retry"))
               )
-            : state.catalog.length === 0
-              ? React.createElement("p", { className: "dsh-pm-empty" }, t("empty"))
+            : visible.length === 0
+              ? React.createElement("p", { className: "dsh-pm-empty" }, tab === "installed" ? t("installedEmpty") : t("empty"))
               : React.createElement(
                   "div",
                   { className: "dsh-pm-grid" },
-                  state.catalog.map((item) =>
+                  visible.map((item) =>
                     React.createElement(Card, {
                       key: item.name,
                       item,
@@ -385,6 +426,10 @@ window.__ModuleLoader__.load({
         "[data-preview-market] .dsh-pm-status{display:flex;gap:6px;flex-wrap:wrap}",
         "[data-preview-market] .dsh-pm-pill{border-radius:999px;padding:3px 9px;font-size:11px;background:var(--dsw-alias-interactive-bg-hover,rgba(0,0,0,.06))}",
         "[data-preview-market] .dsh-pm-pill[data-tone=ok]{color:#1f7a4d;background:rgba(46,160,92,.14)}",
+        "[data-preview-market] .dsh-pm-tabs{display:flex;gap:2px;border-bottom:1px solid var(--dsw-alias-border-l1,rgba(0,0,0,.1))}",
+        "[data-preview-market] .dsh-pm-tab{appearance:none;border:0;border-bottom:2px solid transparent;background:none;color:inherit;font:inherit;font-size:12px;padding:7px 10px;cursor:pointer;opacity:.62;display:inline-flex;align-items:center;gap:6px}",
+        "[data-preview-market] .dsh-pm-tab[data-active=true]{opacity:1;font-weight:650;border-bottom-color:var(--dsw-alias-label-accent,#2c6ef2)}",
+        "[data-preview-market] .dsh-pm-count{font-size:10.5px;border-radius:999px;padding:1px 6px;background:rgba(0,0,0,.06)}",
         "[data-preview-market] .dsh-pm-grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(300px,1fr));gap:12px}",
         "[data-preview-market] .dsh-pm-card{border:1px solid var(--dsw-alias-border-l1,rgba(0,0,0,.1));border-radius:12px;padding:14px;display:flex;flex-direction:column;gap:9px;background:var(--dsw-alias-bg-layer-2,rgba(0,0,0,.02))}",
         "[data-preview-market] .dsh-pm-card-head{display:flex;justify-content:space-between;gap:8px;align-items:center}",
@@ -418,6 +463,21 @@ window.__ModuleLoader__.load({
       installStyle();
       const t = ctx.locale.bind(NS);
       ctx.effect(() => ctx.locale.register(NS, { zh, en }), "preview-market: dictionaries");
+      // Top-level Settings section, next to dsh-market's "Plugin market" row.
+      ctx.slots.inject("settings.section", () =>
+        ctx.slots.register(
+          {
+            name: "settings.section",
+            id: SECTION_ID,
+            order: 41,
+            label: () => t("nav"),
+            locale: NS,
+            inject: () => ({ t })
+          },
+          () => React.createElement(MarketPanel, { t })
+        )
+      );
+      // Keep the tab under Settings → Plugins for discoverability.
       ctx.slots.inject("settings.plugins.tab", () =>
         ctx.slots.register(
           {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-preview-market",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Vertical preview market for DeepSeek Harness: discover, install and configure preview plugins (media, Blender, STL, ...) from one panel.",
   "type": "module",
   "license": "MIT",
@@ -21,6 +21,7 @@
   },
   "files": [
     "lib/**/*.js",
+    "catalog.json",
     "cordis.patch.yml",
     "README.md",
     "README.zh.md",
@@ -66,7 +67,9 @@
   },
   "scripts": {
     "test": "node --test test/*.test.js",
+    "catalog:write": "node scripts/write-catalog.mjs",
     "e2e": "node scripts/e2e-settings.mjs",
+    "e2e:section": "node scripts/e2e-section.mjs",
     "e2e:fallback": "node scripts/e2e-fallback.mjs",
     "e2e:toggle": "node scripts/e2e-toggle.mjs"
   }