dshmarket 1.11.2 → 1.11.3

package/README.md

@@ -27,7 +27,7 @@ Restart `dsh web`, then open **Settings → Plugin Market**.
 
 ## What you get
 
-- **Browse & search** the full community catalog (800+ plugins, growing daily) — category filters, star counts, top/new sorting, bilingual descriptions that follow your UI language
+- **Browse & search** the full community catalog (1200+ plugins, growing daily) — category filters, star counts, top/new sorting, bilingual descriptions that follow your UI language
 - **Screenshots** — AppStore-style screenshots in the install dialog: author-curated via the registry, with automatic README extraction as fallback; images load from GitHub hosting only, and only after you open the dialog
 - **Themes** — a dedicated tab for community themes and skins: install → active immediately, switch with one click (themes are mutually exclusive, your choice survives restarts), uninstall to revert
 - **One-click install** — confirm the source, watch live progress; most plugins go live after a page refresh, no restart
@@ -37,9 +37,10 @@ Restart `dsh web`, then open **Settings → Plugin Market**.
 - **Hot disable / enable** — toggles write `- id: …` + `disabled: true|false` into the profile's `cordis.patch.yml` (the official patch layer, mechanism ported from [dsh-plugin-hub](https://github.com/Noob-stupid/dsh-plugin-hub)): DSH's HMR re-composes within ~1s, no restart, and the loader re-applies the choice on every boot; hand-edited patch rows show as badges, host-infrastructure plugins are protected from toggling, and a malformed patch file is never made worse
 - **Restart when needed** — changes that cannot hot-load show a one-click restart beside the pending-change banner; the action is restricted to same-origin loopback requests
 - **Zero jargon** — if a component is missing (pnpm), the market detects it and offers a one-click automatic setup
-- **Log export** — one click produces a sanitized plain-text log for bug reports (home paths and credential shapes are masked; nothing is ever sent anywhere)
+- **Log export** — one click produces a sanitized plain-text log for bug reports (home paths and credential shapes are masked; nothing is ever sent anywhere). The market's version sits next to the page heading, so a screenshot of a problem already carries it
 - **Diagnostics** — the plugin load order and conflict surface, one page: bundle stack with official/community badges, duplicate loader entries, dependency version mismatches, multi-version core packages, overrides and invalid config entries. Plain-language terms, problem blocks highlighted, everything collapsible
 
+- **Load order** — drag community bundles into the order you want, or take the suggested one derived from the plugins' own before/after rules. Nothing is written until a trial composition passes, and the panel tells you what the new order would change (overrides, invalid or duplicate entries) before you apply it
 - **AI fix** — one click copies a diagnostics-driven fix prompt (errors/warnings/order conflicts + conservative scope instructions) to the clipboard; you paste it into a new conversation and decide whether to send
 
 ## Speed

package/README.zh.md

@@ -27,16 +27,20 @@ dsh plugin --profile web add dshmarket
 
 ## 你会得到
 
-- **逛与搜**——完整社区目录（800+ 插件，每天在涨），分类筛选、star 数、最热/最新排序，中英描述跟随界面语言
+- **逛与搜**——完整社区目录（1200+ 插件，每天在涨），分类筛选、star 数、最热/最新排序，中英描述跟随界面语言
 - **截图展示**——安装弹窗内 App Store 式截图：作者可在 registry 里策展，没有则自动从 README 抽取；图片仅从 GitHub 图床加载，且只在你打开弹窗后才发请求
 - **主题**——独立主题页：装完立即生效，点一下切换（主题互斥、选择跨重启保留），卸载即恢复
 - **一键安装**——确认来源，实时进度；多数插件刷新页面即可用，无需重启
 - **备份与恢复**——把 profile 的插件清单与配置导出为可读 JSON，换机导入，存到 WebDAV 并每日自动备份，或通过私有 GitHub Gist 跨机器同步；恢复采用**合并**方式（备份之后新装的插件会保留），写入前校验、失败自动回滚
 - **更新**——逐插件检测（npm 版本或锁定 commit 对比 HEAD），一键更新或全部更新；市场自己也走同一通道升级
 - **卸载**——两步确认防误触；本次会话装的插件即点即卸
+- **热禁用 / 启用**——开关会往 profile 的 `cordis.patch.yml`（官方补丁层，机制移植自 [dsh-plugin-hub](https://github.com/Noob-stupid/dsh-plugin-hub)）写入 `- id: …` + `disabled: true|false`：DSH 的 HMR 约 1 秒内重新组合，无需重启，loader 每次启动都会重新应用这个选择；手工改过的补丁行会显示成徽标，宿主基础设施插件禁止开关，补丁文件格式不对时绝不会被写得更糟
 - **按需重启**——无法热加载的变更会在待重启提示旁显示一键重启；操作仅接受本机同源请求
 - **零术语**——缺组件（pnpm）时市场自己发现、一键自动装好，全程不见命令行
-- **导出日志**——一键生成脱敏纯文本日志方便反馈（home 路径与密钥形状已打码；任何数据都不会被上传）
+- **导出日志**——一键生成脱敏纯文本日志方便反馈（home 路径与密钥形状已打码；任何数据都不会被上传）。市场版本号就在标题旁边，截图反馈时自带版本信息
+- **诊断**——插件加载顺序与冲突一页看全：bundle 栈（官方/社区徽标）、重复的 loader 条目、依赖版本不一致、核心包多版本共存、覆盖项与非法配置条目。术语说人话，问题块高亮，全部可折叠
+- **加载顺序**——拖拽调整社区 bundle 的顺序，或直接采用按插件自身 before/after 规则推导出的建议顺序。写入前先跑一次静态组合校验，通过才落盘；应用之前面板会告诉你这个顺序会改变什么（多少处覆盖、多少无效或重复条目）
+- **AI 修复**——一键把诊断结果生成的修复 prompt（错误/警告/顺序冲突 + 保守的改动范围约束）复制到剪贴板，你粘进新对话，自己决定发不发
 
 ## 速度
 

package/client/client.js

@@ -919,146 +919,146 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			document.head.appendChild(tag);
 		}
 		var Market_module_css_default = {
-			"switchKnob": "eGUBIq_switchKnob",
-			"warnLine": "eGUBIq_warnLine",
-			"pageInfo": "eGUBIq_pageInfo",
-			"sp": "eGUBIq_sp",
-			"ovFrom": "eGUBIq_ovFrom",
-			"backupCheckList": "eGUBIq_backupCheckList",
-			"pageEllipsis": "eGUBIq_pageEllipsis",
-			"barFill": "eGUBIq_barFill",
-			"tabSearch": "eGUBIq_tabSearch",
-			"switchOn": "eGUBIq_switchOn",
-			"modalNote": "eGUBIq_modalNote",
-			"diagVal": "eGUBIq_diagVal",
-			"assignRow": "eGUBIq_assignRow",
-			"collapseHead": "eGUBIq_collapseHead",
+			"on": "eGUBIq_on",
+			"diagBadgeOfficial": "eGUBIq_diagBadgeOfficial",
+			"shots": "eGUBIq_shots",
+			"tab": "eGUBIq_tab",
+			"backupCard": "eGUBIq_backupCard",
+			"spin": "eGUBIq_spin",
+			"ovByTag": "eGUBIq_ovByTag",
 			"spec": "eGUBIq_spec",
-			"orphRow": "eGUBIq_orphRow",
-			"srcBtn": "eGUBIq_srcBtn",
+			"inlineInput": "eGUBIq_inlineInput",
+			"star": "eGUBIq_star",
+			"backupWarn": "eGUBIq_backupWarn",
+			"specTagGit": "eGUBIq_specTagGit",
+			"groupHead": "eGUBIq_groupHead",
+			"collapseIcon": "eGUBIq_collapseIcon",
 			"card": "eGUBIq_card",
-			"backupActions": "eGUBIq_backupActions",
-			"diagBadgeShadow": "eGUBIq_diagBadgeShadow",
 			"dragging": "eGUBIq_dragging",
-			"tag": "eGUBIq_tag",
-			"diagList": "eGUBIq_diagList",
-			"diagBadgeOfficial": "eGUBIq_diagBadgeOfficial",
-			"grow": "eGUBIq_grow",
-			"actWarn": "eGUBIq_actWarn",
-			"inlineInput": "eGUBIq_inlineInput",
-			"spin": "eGUBIq_spin",
-			"panelNote": "eGUBIq_panelNote",
-			"collapseTitle": "eGUBIq_collapseTitle",
-			"root": "eGUBIq_root",
-			"groupName": "eGUBIq_groupName",
+			"tabSearchRow": "eGUBIq_tabSearchRow",
+			"head": "eGUBIq_head",
+			"barWave": "eGUBIq_barWave",
+			"owner": "eGUBIq_owner",
+			"groupMember": "eGUBIq_groupMember",
+			"cmd": "eGUBIq_cmd",
+			"bannerIcon": "eGUBIq_bannerIcon",
+			"swatches": "eGUBIq_swatches",
+			"ovFrom": "eGUBIq_ovFrom",
 			"sub": "eGUBIq_sub",
-			"irow": "eGUBIq_irow",
-			"groupMembers": "eGUBIq_groupMembers",
-			"diagBadgeCommunity": "eGUBIq_diagBadgeCommunity",
-			"backupWarn": "eGUBIq_backupWarn",
-			"diagIndex": "eGUBIq_diagIndex",
-			"diagArrow": "eGUBIq_diagArrow",
-			"viewBar": "eGUBIq_viewBar",
+			"dragHandle": "eGUBIq_dragHandle",
+			"diagPage": "eGUBIq_diagPage",
+			"titleRow": "eGUBIq_titleRow",
+			"tabs": "eGUBIq_tabs",
+			"diagRow": "eGUBIq_diagRow",
 			"sectionOverview": "eGUBIq_sectionOverview",
+			"specTag": "eGUBIq_specTag",
+			"switch": "eGUBIq_switch",
+			"collapseBody": "eGUBIq_collapseBody",
 			"orphBadge": "eGUBIq_orphBadge",
-			"bannerHint": "eGUBIq_bannerHint",
-			"empty": "eGUBIq_empty",
-			"act": "eGUBIq_act",
-			"groupActions": "eGUBIq_groupActions",
-			"sectAction": "eGUBIq_sectAction",
-			"diagEmpty": "eGUBIq_diagEmpty",
-			"swatches": "eGUBIq_swatches",
-			"dragHandle": "eGUBIq_dragHandle",
-			"viewOn": "eGUBIq_viewOn",
-			"cmd": "eGUBIq_cmd",
+			"backupMessage": "eGUBIq_backupMessage",
+			"diagBadgeShadow": "eGUBIq_diagBadgeShadow",
+			"bar": "eGUBIq_bar",
+			"backupCheckList": "eGUBIq_backupCheckList",
 			"groupAddPanel": "eGUBIq_groupAddPanel",
-			"assignSelect": "eGUBIq_assignSelect",
-			"collapseIcon": "eGUBIq_collapseIcon",
-			"ovByTag": "eGUBIq_ovByTag",
-			"diagKey": "eGUBIq_diagKey",
-			"tab": "eGUBIq_tab",
-			"backupGrid": "eGUBIq_backupGrid",
-			"cats": "eGUBIq_cats",
+			"descTight": "eGUBIq_descTight",
+			"av": "eGUBIq_av",
 			"catsRow": "eGUBIq_catsRow",
-			"actWhy": "eGUBIq_actWhy",
-			"deprecate": "eGUBIq_deprecate",
-			"nm": "eGUBIq_nm",
-			"groupHint": "eGUBIq_groupHint",
-			"diagRow": "eGUBIq_diagRow",
-			"switch": "eGUBIq_switch",
-			"groupHead": "eGUBIq_groupHead",
-			"dot": "eGUBIq_dot",
-			"head": "eGUBIq_head",
-			"top": "eGUBIq_top",
-			"hiddenFile": "eGUBIq_hiddenFile",
-			"backupInput": "eGUBIq_backupInput",
-			"grid": "eGUBIq_grid",
-			"irowMissing": "eGUBIq_irowMissing",
 			"okState": "eGUBIq_okState",
-			"diagPage": "eGUBIq_diagPage",
-			"dshmSlide": "eGUBIq_dshmSlide",
-			"diagSection": "eGUBIq_diagSection",
-			"err": "eGUBIq_err",
-			"tabSearchRow": "eGUBIq_tabSearchRow",
+			"grow": "eGUBIq_grow",
+			"pager": "eGUBIq_pager",
 			"depBadge": "eGUBIq_depBadge",
-			"catsWrap": "eGUBIq_catsWrap",
-			"av": "eGUBIq_av",
-			"specTag": "eGUBIq_specTag",
-			"ovRow": "eGUBIq_ovRow",
-			"groupCreate": "eGUBIq_groupCreate",
+			"groupRow": "eGUBIq_groupRow",
+			"act": "eGUBIq_act",
+			"version": "eGUBIq_version",
+			"viewBar": "eGUBIq_viewBar",
+			"switchKnob": "eGUBIq_switchKnob",
+			"groupName": "eGUBIq_groupName",
+			"diagBundle": "eGUBIq_diagBundle",
+			"panelNote": "eGUBIq_panelNote",
+			"tag": "eGUBIq_tag",
+			"diagSummaryItem": "eGUBIq_diagSummaryItem",
 			"body": "eGUBIq_body",
-			"foot": "eGUBIq_foot",
-			"on": "eGUBIq_on",
-			"fixFallback": "eGUBIq_fixFallback",
-			"themesGrid": "eGUBIq_themesGrid",
-			"dragOver": "eGUBIq_dragOver",
-			"topBtn": "eGUBIq_topBtn",
-			"diagSummary": "eGUBIq_diagSummary",
-			"loading": "eGUBIq_loading",
-			"descTight": "eGUBIq_descTight",
+			"progress": "eGUBIq_progress",
+			"catsCollapsed": "eGUBIq_catsCollapsed",
 			"row1": "eGUBIq_row1",
+			"dot": "eGUBIq_dot",
+			"ovRow": "eGUBIq_ovRow",
+			"specTagFile": "eGUBIq_specTagFile",
+			"root": "eGUBIq_root",
+			"cats": "eGUBIq_cats",
+			"pct": "eGUBIq_pct",
 			"desc": "eGUBIq_desc",
-			"banner": "eGUBIq_banner",
-			"owner": "eGUBIq_owner",
-			"staleAction": "eGUBIq_staleAction",
+			"switchOn": "eGUBIq_switchOn",
+			"backupInput": "eGUBIq_backupInput",
 			"actLive": "eGUBIq_actLive",
-			"pager": "eGUBIq_pager",
-			"diagBundle": "eGUBIq_diagBundle",
+			"assignRow": "eGUBIq_assignRow",
+			"groupMembers": "eGUBIq_groupMembers",
+			"groupCreate": "eGUBIq_groupCreate",
 			"shot": "eGUBIq_shot",
-			"pct": "eGUBIq_pct",
+			"diagSummaryMeta": "eGUBIq_diagSummaryMeta",
 			"diagMeta": "eGUBIq_diagMeta",
-			"specTagGit": "eGUBIq_specTagGit",
+			"viewOn": "eGUBIq_viewOn",
+			"ovArrow": "eGUBIq_ovArrow",
+			"diagVal": "eGUBIq_diagVal",
+			"staleAction": "eGUBIq_staleAction",
+			"collapseHead": "eGUBIq_collapseHead",
+			"dshmSlide": "eGUBIq_dshmSlide",
+			"bannerHint": "eGUBIq_bannerHint",
+			"dragOver": "eGUBIq_dragOver",
+			"diagIndex": "eGUBIq_diagIndex",
+			"actWarn": "eGUBIq_actWarn",
+			"diagAlert": "eGUBIq_diagAlert",
+			"backupGrid": "eGUBIq_backupGrid",
+			"empty": "eGUBIq_empty",
+			"diagBadgeCommunity": "eGUBIq_diagBadgeCommunity",
+			"top": "eGUBIq_top",
+			"fixFallback": "eGUBIq_fixFallback",
+			"diagList": "eGUBIq_diagList",
+			"srcBtn": "eGUBIq_srcBtn",
+			"tabSearch": "eGUBIq_tabSearch",
+			"orphRow": "eGUBIq_orphRow",
+			"diagSummary": "eGUBIq_diagSummary",
 			"fixFallbackText": "eGUBIq_fixFallbackText",
-			"groupRow": "eGUBIq_groupRow",
+			"diagEmpty": "eGUBIq_diagEmpty",
+			"modalNote": "eGUBIq_modalNote",
+			"grid": "eGUBIq_grid",
+			"nm": "eGUBIq_nm",
+			"depLine": "eGUBIq_depLine",
+			"switchMixed": "eGUBIq_switchMixed",
 			"src": "eGUBIq_src",
-			"diagCount": "eGUBIq_diagCount",
+			"irowMissing": "eGUBIq_irowMissing",
+			"catsToggle": "eGUBIq_catsToggle",
+			"barFill": "eGUBIq_barFill",
+			"assignSelect": "eGUBIq_assignSelect",
+			"collapseTitle": "eGUBIq_collapseTitle",
+			"groupHint": "eGUBIq_groupHint",
+			"actWhy": "eGUBIq_actWhy",
+			"loading": "eGUBIq_loading",
+			"backupCheck": "eGUBIq_backupCheck",
+			"diagSection": "eGUBIq_diagSection",
+			"topBtn": "eGUBIq_topBtn",
+			"banner": "eGUBIq_banner",
+			"catsWrap": "eGUBIq_catsWrap",
+			"themesGrid": "eGUBIq_themesGrid",
+			"irow": "eGUBIq_irow",
+			"groupActions": "eGUBIq_groupActions",
 			"actBroken": "eGUBIq_actBroken",
-			"backupCard": "eGUBIq_backupCard",
-			"diagAlert": "eGUBIq_diagAlert",
-			"catsCollapsed": "eGUBIq_catsCollapsed",
-			"barWave": "eGUBIq_barWave",
-			"switchMixed": "eGUBIq_switchMixed",
-			"star": "eGUBIq_star",
-			"depLine": "eGUBIq_depLine",
+			"title": "eGUBIq_title",
+			"backupActions": "eGUBIq_backupActions",
+			"hiddenFile": "eGUBIq_hiddenFile",
+			"pageEllipsis": "eGUBIq_pageEllipsis",
+			"sectAction": "eGUBIq_sectAction",
+			"deprecate": "eGUBIq_deprecate",
+			"diagArrow": "eGUBIq_diagArrow",
+			"sp": "eGUBIq_sp",
+			"diagCount": "eGUBIq_diagCount",
 			"viewBtn": "eGUBIq_viewBtn",
-			"backupMessage": "eGUBIq_backupMessage",
-			"progress": "eGUBIq_progress",
+			"diagKey": "eGUBIq_diagKey",
+			"err": "eGUBIq_err",
 			"pagerPages": "eGUBIq_pagerPages",
-			"shots": "eGUBIq_shots",
-			"ovArrow": "eGUBIq_ovArrow",
-			"tabs": "eGUBIq_tabs",
-			"bar": "eGUBIq_bar",
-			"collapseBody": "eGUBIq_collapseBody",
-			"diagSummaryMeta": "eGUBIq_diagSummaryMeta",
-			"title": "eGUBIq_title",
-			"titleRow": "eGUBIq_titleRow",
-			"diagSummaryItem": "eGUBIq_diagSummaryItem",
-			"backupCheck": "eGUBIq_backupCheck",
-			"specTagFile": "eGUBIq_specTagFile",
-			"groupMember": "eGUBIq_groupMember",
-			"catsToggle": "eGUBIq_catsToggle",
-			"version": "eGUBIq_version",
-			"bannerIcon": "eGUBIq_bannerIcon"
+			"warnLine": "eGUBIq_warnLine",
+			"pageInfo": "eGUBIq_pageInfo",
+			"foot": "eGUBIq_foot"
 		};
 		//#endregion
 		//#region src/client/Diagnostics.tsx

package/lib/hot.js

@@ -93,7 +93,13 @@ function readPkgDsh(profileDir, packageName) {
 export function parseSimplePatch(patchText) {
     const rows = [];
     let pending = null;
-    for (const raw of patchText.split('\n')) {
+    // Split on CRLF too. `#.*$` cannot strip a comment that ends in \r —
+    // JS treats \r as a line terminator, so `.` will not cross it and `$`
+    // only anchors at the very end — leaving the comment text in place,
+    // matching none of the row shapes, and failing the whole patch. Any
+    // plugin whose patch was authored on Windows then reads as
+    // "contains config/expression rows" and can never hot-mount.
+    for (const raw of patchText.split(/\r?\n/)) {
         const line = raw.replace(/#.*$/, '').trimEnd();
         if (line.trim() === '')
             continue;
@@ -386,7 +392,7 @@ export function readUserPatchControls(profileDir) {
     const names = new Set();
     try {
         const text = readFileSync(join(profileDir, 'cordis.patch.yml'), 'utf8');
-        for (const line of text.split('\n')) {
+        for (const line of text.split(/\r?\n/)) {
             const id = /^\s*-?\s*id:\s*['"]?([A-Za-z0-9._/@-]+)/.exec(line);
             if (id !== null)
                 ids.add(id[1]);

package/lib/patch.js

@@ -29,7 +29,7 @@ import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { logEvent } from './log.js';
 import { parsePatchFile } from './check.js';
-import { bundlePatchInsertedIds } from './profile.js';
+import { bundlePatchInsertedIds, parsePatchRows } from './profile.js';
 /**
  * Host infrastructure rows: disabling any of these breaks the very chain
  * the patch layer runs on (e.g. timer → HMR, webserver → the page itself),
@@ -189,25 +189,13 @@ export function rowIdsForPackage(host, profileDirectory, packageName) {
     catch { /* package not installed — loader side may still know it */ }
     // The conventional location too: a package may ship cordis.patch.yml at
     // its root without declaring dsh.bundle.patch (the loader probes it too).
-    // Same rule — only ids nested under an `insert:` key.
+    // Same parser, deliberately: this used to be a second hand-rolled scan
+    // that closed the insert block only on `id:` lines, so `- disable:` with
+    // nested ids under it claimed the neighbour's rows — #147 all over again
+    // on the path #147 did not touch.
     try {
-        let insertIndent = null;
-        for (const raw of readFileSync(join(packageDir, 'cordis.patch.yml'), 'utf8').split('\n')) {
-            const line = raw.replace(/#.*$/u, '');
-            if (line.trim() === '')
-                continue;
-            const indent = line.length - line.trimStart().length;
-            if (/^\s*-?\s*insert:\s*$/u.test(line)) {
-                insertIndent = indent;
-                continue;
-            }
-            const id = /^\s*-?\s*id:\s*['"]?([A-Za-z0-9_.-]+)/u.exec(line);
-            if (id === null)
-                continue;
-            if (insertIndent !== null && indent > insertIndent)
-                ids.add(id[1]);
-            else
-                insertIndent = null;
+        for (const id of parsePatchRows(readFileSync(join(packageDir, 'cordis.patch.yml'), 'utf8')).insertedIds) {
+            ids.add(id);
         }
     }
     catch { /* no conventional patch — nothing more to add */ }

package/lib/profile.js

@@ -205,27 +205,30 @@ export function bundlePatchInsertedIds(dir) {
  * but for "what does this bundle bring in" any row counts. `insertedIds` is
  * the subset nested under an `insert:` key (#147).
  */
-function readBundlePatchRows(dir) {
-    let patchPath;
-    try {
-        const manifest = JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8'));
-        const declared = manifest.dsh?.bundle?.patch;
-        if (typeof declared !== 'string' || declared === '')
-            return { names: [], ids: [], insertedIds: [] };
-        patchPath = join(dir, declared);
-    }
-    catch {
-        return { names: [], ids: [], insertedIds: [] };
-    }
+/**
+ * Rows of one patch file. Exported because a package may ship its patch at
+ * the conventional path INSTEAD of declaring `dsh.bundle.patch`, and the
+ * patch layer has to read that one by the same rules — a second hand-rolled
+ * scan drifted from this one and re-introduced #147 on that path (it closed
+ * the insert block only on `id:` lines, so `- disable:` followed by nested
+ * ids claimed the neighbour's rows).
+ */
+export function parsePatchRows(text) {
     const names = [];
     const ids = [];
     const insertedIds = [];
-    try {
+    {
         // `insert:` opens a nested list; every id below it, at deeper
         // indentation, is a row this package brings in. A row at or above the
         // `insert:` indentation closes the block — those target OTHER plugins.
         let insertIndent = null;
-        for (const raw of readFileSync(patchPath, 'utf8').split('\n')) {
+        // CRLF too, for consistency with the hot-mount parser, which a
+        // Windows-authored patch genuinely broke. Here it changes no outcome
+        // today — every row pattern below is `^`-anchored and a comment line
+        // always starts with `#`, so an unstripped comment matches nothing —
+        // and it is deliberately NOT covered by a spec, because a test that
+        // passes with or without the change tests nothing.
+        for (const raw of text.split(/\r?\n/)) {
             const line = raw.replace(/#.*$/, '');
             if (line.trim() === '')
                 continue;
@@ -256,9 +259,22 @@ function readBundlePatchRows(dir) {
             }
         }
     }
-    catch { /* unreadable patch — nothing to report */ }
     return { names, ids, insertedIds };
 }
+/** Rows of the patch a package DECLARES through `dsh.bundle.patch`. */
+function readBundlePatchRows(dir) {
+    const empty = { names: [], ids: [], insertedIds: [] };
+    try {
+        const manifest = JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8'));
+        const declared = manifest.dsh?.bundle?.patch;
+        if (typeof declared !== 'string' || declared === '')
+            return empty;
+        return parsePatchRows(readFileSync(join(dir, declared), 'utf8'));
+    }
+    catch {
+        return empty;
+    }
+}
 /** The profile manifest's `dsh.profile.bundles` — what the CLI reconciled. */
 export function readProfileBundles(profileDirectory) {
     try {
@@ -397,7 +413,7 @@ export function setAllowBuilds(profile, packages, explicitDir) {
     const map = {};
     const blockMatch = blockRe.exec(yaml);
     if (blockMatch !== null) {
-        for (const line of blockMatch[1].split('\n')) {
+        for (const line of blockMatch[1].split(/\r?\n/)) {
             // The key itself may contain colons: git-hosted deps are only matched
             // by a `name@git+https://…` key (#68). The anchored boolean tail makes
             // the split land on the LAST colon, never inside a `://` — and doubles

package/lib/routes.js

@@ -15,7 +15,7 @@ import { createGroup, deleteGroup, removeFromGroups, renameGroup, setGroupMember
 import { exportLogs, logEvent } from './log.js';
 import { diagnosePackageManifests } from './diagnostics.js';
 import { BOOT_ID, cancelActive, probePnpm, progress, provisionPnpm, runDshPlugin, } from './dsh-cli.js';
-import { INBOX_BUNDLES, profileDir, readInstalled, readInstalledManifest, readInstalledVersion, readLockCommits, readManifestDeps, readProfileBundles, restoreManifestDeps, setAllowBuilds } from './profile.js';
+import { hasLoadableEntry, INBOX_BUNDLES, profileDir, readInstalled, readInstalledManifest, readInstalledVersion, readLockCommits, readManifestDeps, readProfileBundles, restoreManifestDeps, setAllowBuilds } from './profile.js';
 import { analyzeProfile } from './check.js';
 import { applyBundleOrder, mergeOrder, readBundleRules, readBundleStack, validateOrder } from './order.js';
 import { trialValidate } from './trial.js';
@@ -238,8 +238,24 @@ export function mountMarketRoutes(host, config, commandRuntime) {
     function liveNames() {
         const live = new Set(listHotMounts());
         for (const entry of host.loader.entries()) {
-            if (entry.fiber !== undefined && entry.options.name !== undefined)
+            if (entry.fiber === undefined)
+                continue;
+            if (entry.options.name !== undefined)
                 live.add(entry.options.name);
+            // Entry IDS too, under a `#` prefix that cannot collide with a package
+            // name. A CARRIER bundle's row names the package it mounts, not
+            // itself (#156: @tt-a1i/archify-dsh inserts an entry named
+            // @deepseek-ai/dsh-skill-filesystem), so its own name never appears
+            // here — but the id it created does, and that id is unique to its
+            // patch. Verification needs both, and putting them in one set means
+            // no call site can pass the names and forget the ids.
+            if (entry.options.id !== undefined && entry.options.id !== '') {
+                live.add(`#${entry.options.id}`);
+                // Loader ids may carry an include prefix (`include:archify-…`).
+                const bare = entry.options.id.split(':').pop();
+                if (bare !== undefined && bare !== entry.options.id)
+                    live.add(`#${bare}`);
+            }
         }
         return live;
     }
@@ -1056,6 +1072,24 @@ export function mountMarketRoutes(host, config, commandRuntime) {
                             if (stale)
                                 ok = false;
                         }
+                        // The new build has to be loadable (#159). pnpm exits 0 for any
+                        // tarball it can extract, and the version really did change, so
+                        // nothing above notices a package that arrived without its entry
+                        // artifact — a registry mirror serving a source-only tarball for
+                        // a just-published version is the reported case, a plugin author
+                        // shipping a broken `files` list is the other one.
+                        //
+                        // Activation cannot stand in for this check: a package updating
+                        // ITSELF still reports live, because the running fiber belongs to
+                        // the OLD code that is already in memory. The failure only
+                        // surfaces on the next boot, as a profile that will not start.
+                        let brokenEntry = false;
+                        if (ok && !hasLoadableEntry(activeProfileDir, name)) {
+                            brokenEntry = true;
+                            ok = false;
+                            const rolledBack = restoreManifestDeps(config.profile, manifestBefore, activeProfileDir);
+                            logEvent('error', 'update', `${name}: updated build has no loadable entry — rolled back the pin${rolledBack.length > 0 ? ` (${rolledBack.join(', ')})` : ''}`);
+                        }
                         if (ok) {
                             invalidateUpdates();
                             activation = { [name]: verifyActivation(config.profile, name, liveNames(), activeProfileDir, disabled.has(name)) };
@@ -1071,6 +1105,11 @@ export function mountMarketRoutes(host, config, commandRuntime) {
                             : staleReason === 'release-age'
                                 ? '这个新版本刚发布不久。为了安全，系统默认会等它发布满一天后再安装——刚发布的版本偶尔会被发现问题然后撤回。可以明天再试，或点「立即更新」不再等待。 / This version was just released; for safety, installs normally wait about a day after a release. Try again tomorrow, or click "Update now" to install it right away.'
                                 : '更新命令执行完成，但版本没有变化，原因未能确认。点「立即更新」重试通常能解决；若仍不行，请导出日志反馈。 / The update command completed but the version did not change; the cause could not be confirmed. Clicking "Update now" to retry usually resolves it — if not, export the log and report it.';
+                        // Actionable, because the user's own recovery is the right one:
+                        // the bad artifact is cached under its integrity hash, so a plain
+                        // re-add reuses it — the package has to be removed first.
+                        const brokenEntryError = !brokenEntry ? null
+                            : `${name} 更新后缺少入口文件（package.json 的 main/exports 指向的文件不存在），已回滚版本号以免下次启动失败。这通常是镜像源在新版本刚发布时同步不完整。请先卸载再从官方源重装：dsh plugin --profile ${config.profile} remove ${name} 然后 add ${name} --registry=https://registry.npmjs.org / ${name} arrived without the entry file its package.json points at; the version pin was rolled back so the next boot still works. A registry mirror serving an incomplete tarball for a just-published version is the usual cause. Remove it and reinstall from the official registry — a plain retry reuses the cached bad artifact.`;
                         const cancelDiff = cancelled ? changedSince(beforeInstalled) : null;
                         // Build-script blocks hit updates too (#69): a leftover invalid
                         // allowBuilds entry (pnpm's placeholder bug, #56) or a newly
@@ -1090,7 +1129,7 @@ export function mountMarketRoutes(host, config, commandRuntime) {
                             activation,
                             ignoredBuilds,
                             staleReason: staleReason ?? undefined,
-                            error: staleError ?? undefined,
+                            error: brokenEntryError ?? staleError ?? undefined,
                             exitCode: result.exitCode,
                             timedOut: result.timedOut,
                             stdout: result.stdout,

package/lib/types/profile.d.ts

@@ -82,6 +82,25 @@ export declare function bundlePatchEntryIds(dir: string): string[];
  * the DeepSeek model with it.
  */
 export declare function bundlePatchInsertedIds(dir: string): string[];
+/**
+ * `name:` and `id:` rows of the package's declared bundle patch. Line-wise
+ * on purpose: the strict hot-mount parser rejects config/expression rows,
+ * but for "what does this bundle bring in" any row counts. `insertedIds` is
+ * the subset nested under an `insert:` key (#147).
+ */
+/**
+ * Rows of one patch file. Exported because a package may ship its patch at
+ * the conventional path INSTEAD of declaring `dsh.bundle.patch`, and the
+ * patch layer has to read that one by the same rules — a second hand-rolled
+ * scan drifted from this one and re-introduced #147 on that path (it closed
+ * the insert block only on `id:` lines, so `- disable:` followed by nested
+ * ids claimed the neighbour's rows).
+ */
+export declare function parsePatchRows(text: string): {
+    names: string[];
+    ids: string[];
+    insertedIds: string[];
+};
 /** The profile manifest's `dsh.profile.bundles` — what the CLI reconciled. */
 export declare function readProfileBundles(profileDirectory: string): string[];
 /**

package/lib/verify.js

@@ -26,7 +26,7 @@
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { listHotMounts, parseSimplePatch } from './hot.js';
-import { hasDshManifest, hasLoadableEntry, profileDir } from './profile.js';
+import { bundlePatchInsertedIds, hasDshManifest, hasLoadableEntry, profileDir } from './profile.js';
 /** The profile manifest's `dsh.profile.bundles` — what the CLI reconciled. */
 function readBundles(profile, explicitDir) {
     try {
@@ -58,6 +58,28 @@ function liveIncludes(live, packageName) {
             return true;
     return false;
 }
+/**
+ * True when a loader entry this package's OWN bundle patch inserts is up.
+ *
+ * A carrier bundle (#103) ships no plugin of its own: its patch mounts
+ * ANOTHER package with configuration, so the live entry carries that other
+ * package's name and `liveIncludes` can never match. The entry ID is the
+ * part that belongs to this package — its patch created it — which is why
+ * matching on it is both sufficient and precise: a neighbour that happens
+ * to mount the same package does so under a different id.
+ *
+ * Without this the market kept telling users to restart for a plugin that
+ * had been running since the restart (#156).
+ */
+function carriedRowLive(live, profileDirectory, packageName) {
+    try {
+        return bundlePatchInsertedIds(join(profileDirectory, 'node_modules', packageName))
+            .some(id => live.has(`#${id}`));
+    }
+    catch {
+        return false;
+    }
+}
 function readPkgDsh(profile, name, explicitDir) {
     try {
         const manifest = JSON.parse(readFileSync(join(profileDir(profile, explicitDir), 'node_modules', name, 'package.json'), 'utf8'));
@@ -106,7 +128,7 @@ export function verifyActivation(profile, name, live = new Set(listHotMounts()),
     // loaded by name from a bundle patch — @deepseek-ai/dsh-tools is loaded by
     // the official dsh-base patch and has no `dsh` field at all — so this check
     // has to come before any manifest-based verdict.
-    const loaderLive = liveIncludes(live, name);
+    const loaderLive = liveIncludes(live, name) || carriedRowLive(live, activeProfileDir, name);
     if (!hasDshManifest(dir)) {
         if (loaderLive) {
             return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dshmarket",
   "description": "Visual plugin market inside DeepSeek Harness — browse, search, and one-click install community plugins. · DSH 可视化插件市场：逛一逛，点一下，装好。",
-  "version": "1.11.2",
+  "version": "1.11.3",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -21,7 +21,7 @@
     "plugin-manager"
   ],
   "scripts": {
-    "typecheck": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.client.json --noEmit",
+    "typecheck": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.client.json --noEmit && tsc -p tsconfig.tests.json --noEmit",
     "build": "tsc -p tsconfig.json && npm run build:client",
     "build:client": "tsdown && node scripts/normalize-client-banner.mjs",
     "check": "npm run typecheck && npm run build && node scripts/restart-smoke.mjs",

package/src/hot.ts

@@ -110,7 +110,13 @@ function readPkgDsh(profileDir: string, packageName: string): { client?: unknown
 export function parseSimplePatch(patchText: string): HotRow[] | null {
   const rows: HotRow[] = []
   let pending: string | null = null
-  for (const raw of patchText.split('\n')) {
+  // Split on CRLF too. `#.*$` cannot strip a comment that ends in \r —
+  // JS treats \r as a line terminator, so `.` will not cross it and `$`
+  // only anchors at the very end — leaving the comment text in place,
+  // matching none of the row shapes, and failing the whole patch. Any
+  // plugin whose patch was authored on Windows then reads as
+  // "contains config/expression rows" and can never hot-mount.
+  for (const raw of patchText.split(/\r?\n/)) {
     const line = raw.replace(/#.*$/, '').trimEnd()
     if (line.trim() === '') continue
     if (/^-\s+insert:\s*$/.test(line)) continue
@@ -428,7 +434,7 @@ export function readUserPatchControls(profileDir: string): { ids: Set<string>; n
   const names = new Set<string>()
   try {
     const text = readFileSync(join(profileDir, 'cordis.patch.yml'), 'utf8')
-    for (const line of text.split('\n')) {
+    for (const line of text.split(/\r?\n/)) {
       const id = /^\s*-?\s*id:\s*['"]?([A-Za-z0-9._/@-]+)/.exec(line)
       if (id !== null) ids.add(id[1])
       const name = /^\s*name:\s*['"]?([^'"\s]+)/.exec(line)

package/src/patch.ts

@@ -30,7 +30,7 @@ import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { logEvent } from './log.ts'
 import { parsePatchFile } from './check.ts'
-import { bundlePatchInsertedIds } from './profile.ts'
+import { bundlePatchInsertedIds, parsePatchRows } from './profile.ts'
 
 /** The slice of the loader tree this module needs. */
 export interface PatchHost {
@@ -205,21 +205,13 @@ export function rowIdsForPackage(host: PatchHost, profileDirectory: string, pack
   } catch { /* package not installed — loader side may still know it */ }
   // The conventional location too: a package may ship cordis.patch.yml at
   // its root without declaring dsh.bundle.patch (the loader probes it too).
-  // Same rule — only ids nested under an `insert:` key.
+  // Same parser, deliberately: this used to be a second hand-rolled scan
+  // that closed the insert block only on `id:` lines, so `- disable:` with
+  // nested ids under it claimed the neighbour's rows — #147 all over again
+  // on the path #147 did not touch.
   try {
-    let insertIndent: number | null = null
-    for (const raw of readFileSync(join(packageDir, 'cordis.patch.yml'), 'utf8').split('\n')) {
-      const line = raw.replace(/#.*$/u, '')
-      if (line.trim() === '') continue
-      const indent = line.length - line.trimStart().length
-      if (/^\s*-?\s*insert:\s*$/u.test(line)) {
-        insertIndent = indent
-        continue
-      }
-      const id = /^\s*-?\s*id:\s*['"]?([A-Za-z0-9_.-]+)/u.exec(line)
-      if (id === null) continue
-      if (insertIndent !== null && indent > insertIndent) ids.add(id[1])
-      else insertIndent = null
+    for (const id of parsePatchRows(readFileSync(join(packageDir, 'cordis.patch.yml'), 'utf8')).insertedIds) {
+      ids.add(id)
     }
   } catch { /* no conventional patch — nothing more to add */ }
   const prefix = includePrefix(host)

package/src/profile.ts

@@ -211,27 +211,30 @@ export function bundlePatchInsertedIds(dir: string): string[] {
  * but for "what does this bundle bring in" any row counts. `insertedIds` is
  * the subset nested under an `insert:` key (#147).
  */
-function readBundlePatchRows(dir: string): { names: string[]; ids: string[]; insertedIds: string[] } {
-  let patchPath: string
-  try {
-    const manifest = JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8')) as {
-      dsh?: { bundle?: { patch?: unknown } }
-    }
-    const declared = manifest.dsh?.bundle?.patch
-    if (typeof declared !== 'string' || declared === '') return { names: [], ids: [], insertedIds: [] }
-    patchPath = join(dir, declared)
-  } catch {
-    return { names: [], ids: [], insertedIds: [] }
-  }
+/**
+ * Rows of one patch file. Exported because a package may ship its patch at
+ * the conventional path INSTEAD of declaring `dsh.bundle.patch`, and the
+ * patch layer has to read that one by the same rules — a second hand-rolled
+ * scan drifted from this one and re-introduced #147 on that path (it closed
+ * the insert block only on `id:` lines, so `- disable:` followed by nested
+ * ids claimed the neighbour's rows).
+ */
+export function parsePatchRows(text: string): { names: string[]; ids: string[]; insertedIds: string[] } {
   const names: string[] = []
   const ids: string[] = []
   const insertedIds: string[] = []
-  try {
+  {
     // `insert:` opens a nested list; every id below it, at deeper
     // indentation, is a row this package brings in. A row at or above the
     // `insert:` indentation closes the block — those target OTHER plugins.
     let insertIndent: number | null = null
-    for (const raw of readFileSync(patchPath, 'utf8').split('\n')) {
+    // CRLF too, for consistency with the hot-mount parser, which a
+    // Windows-authored patch genuinely broke. Here it changes no outcome
+    // today — every row pattern below is `^`-anchored and a comment line
+    // always starts with `#`, so an unstripped comment matches nothing —
+    // and it is deliberately NOT covered by a spec, because a test that
+    // passes with or without the change tests nothing.
+    for (const raw of text.split(/\r?\n/)) {
       const line = raw.replace(/#.*$/, '')
       if (line.trim() === '') continue
       const indent = line.length - line.trimStart().length
@@ -256,10 +259,25 @@ function readBundlePatchRows(dir: string): { names: string[]; ids: string[]; ins
         }
       }
     }
-  } catch { /* unreadable patch — nothing to report */ }
+  }
   return { names, ids, insertedIds }
 }
 
+/** Rows of the patch a package DECLARES through `dsh.bundle.patch`. */
+function readBundlePatchRows(dir: string): { names: string[]; ids: string[]; insertedIds: string[] } {
+  const empty = { names: [], ids: [], insertedIds: [] }
+  try {
+    const manifest = JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8')) as {
+      dsh?: { bundle?: { patch?: unknown } }
+    }
+    const declared = manifest.dsh?.bundle?.patch
+    if (typeof declared !== 'string' || declared === '') return empty
+    return parsePatchRows(readFileSync(join(dir, declared), 'utf8'))
+  } catch {
+    return empty
+  }
+}
+
 /** The profile manifest's `dsh.profile.bundles` — what the CLI reconciled. */
 export function readProfileBundles(profileDirectory: string): string[] {
   try {
@@ -396,7 +414,7 @@ export function setAllowBuilds(profile: string, packages: string[], explicitDir?
   const map: Record<string, string> = {}
   const blockMatch = blockRe.exec(yaml)
   if (blockMatch !== null) {
-    for (const line of blockMatch[1].split('\n')) {
+    for (const line of blockMatch[1].split(/\r?\n/)) {
       // The key itself may contain colons: git-hosted deps are only matched
       // by a `name@git+https://…` key (#68). The anchored boolean tail makes
       // the split land on the LAST colon, never inside a `://` — and doubles

package/src/routes.ts

@@ -23,7 +23,7 @@ import {
   BOOT_ID, cancelActive, probePnpm, progress, provisionPnpm, runDshPlugin,
   type PluginCommandRuntime,
 } from './dsh-cli.ts'
-import { INBOX_BUNDLES, profileDir, readInstalled, readInstalledManifest, readInstalledVersion, readLockCommits, readManifestDeps, readProfileBundles, restoreManifestDeps, setAllowBuilds } from './profile.ts'
+import { hasLoadableEntry, INBOX_BUNDLES, profileDir, readInstalled, readInstalledManifest, readInstalledVersion, readLockCommits, readManifestDeps, readProfileBundles, restoreManifestDeps, setAllowBuilds } from './profile.ts'
 import { analyzeProfile } from './check.ts'
 import { applyBundleOrder, mergeOrder, readBundleRules, readBundleStack, validateOrder } from './order.ts'
 import { trialValidate } from './trial.ts'
@@ -281,7 +281,21 @@ export function mountMarketRoutes(
   function liveNames(): Set<string> {
     const live = new Set(listHotMounts())
     for (const entry of host.loader.entries()) {
-      if (entry.fiber !== undefined && entry.options.name !== undefined) live.add(entry.options.name)
+      if (entry.fiber === undefined) continue
+      if (entry.options.name !== undefined) live.add(entry.options.name)
+      // Entry IDS too, under a `#` prefix that cannot collide with a package
+      // name. A CARRIER bundle's row names the package it mounts, not
+      // itself (#156: @tt-a1i/archify-dsh inserts an entry named
+      // @deepseek-ai/dsh-skill-filesystem), so its own name never appears
+      // here — but the id it created does, and that id is unique to its
+      // patch. Verification needs both, and putting them in one set means
+      // no call site can pass the names and forget the ids.
+      if (entry.options.id !== undefined && entry.options.id !== '') {
+        live.add(`#${entry.options.id}`)
+        // Loader ids may carry an include prefix (`include:archify-…`).
+        const bare = entry.options.id.split(':').pop()
+        if (bare !== undefined && bare !== entry.options.id) live.add(`#${bare}`)
+      }
     }
     return live
   }
@@ -1089,6 +1103,25 @@ export function mountMarketRoutes(
               })
               if (stale) ok = false
             }
+            // The new build has to be loadable (#159). pnpm exits 0 for any
+            // tarball it can extract, and the version really did change, so
+            // nothing above notices a package that arrived without its entry
+            // artifact — a registry mirror serving a source-only tarball for
+            // a just-published version is the reported case, a plugin author
+            // shipping a broken `files` list is the other one.
+            //
+            // Activation cannot stand in for this check: a package updating
+            // ITSELF still reports live, because the running fiber belongs to
+            // the OLD code that is already in memory. The failure only
+            // surfaces on the next boot, as a profile that will not start.
+            let brokenEntry = false
+            if (ok && !hasLoadableEntry(activeProfileDir, name)) {
+              brokenEntry = true
+              ok = false
+              const rolledBack = restoreManifestDeps(config.profile, manifestBefore, activeProfileDir)
+              logEvent('error', 'update',
+                `${name}: updated build has no loadable entry — rolled back the pin${rolledBack.length > 0 ? ` (${rolledBack.join(', ')})` : ''}`)
+            }
             if (ok) {
               invalidateUpdates()
               activation = { [name]: verifyActivation(config.profile, name, liveNames(), activeProfileDir, disabled.has(name)) }
@@ -1104,6 +1137,12 @@ export function mountMarketRoutes(
               : staleReason === 'release-age'
                 ? '这个新版本刚发布不久。为了安全，系统默认会等它发布满一天后再安装——刚发布的版本偶尔会被发现问题然后撤回。可以明天再试，或点「立即更新」不再等待。 / This version was just released; for safety, installs normally wait about a day after a release. Try again tomorrow, or click "Update now" to install it right away.'
                 : '更新命令执行完成，但版本没有变化，原因未能确认。点「立即更新」重试通常能解决；若仍不行，请导出日志反馈。 / The update command completed but the version did not change; the cause could not be confirmed. Clicking "Update now" to retry usually resolves it — if not, export the log and report it.'
+            // Actionable, because the user's own recovery is the right one:
+            // the bad artifact is cached under its integrity hash, so a plain
+            // re-add reuses it — the package has to be removed first.
+            const brokenEntryError = !brokenEntry ? null
+              : `${name} 更新后缺少入口文件（package.json 的 main/exports 指向的文件不存在），已回滚版本号以免下次启动失败。这通常是镜像源在新版本刚发布时同步不完整。请先卸载再从官方源重装：dsh plugin --profile ${config.profile} remove ${name} 然后 add ${name} --registry=https://registry.npmjs.org / ${name} arrived without the entry file its package.json points at; the version pin was rolled back so the next boot still works. A registry mirror serving an incomplete tarball for a just-published version is the usual cause. Remove it and reinstall from the official registry — a plain retry reuses the cached bad artifact.`
+
             const cancelDiff = cancelled ? changedSince(beforeInstalled) : null
             // Build-script blocks hit updates too (#69): a leftover invalid
             // allowBuilds entry (pnpm's placeholder bug, #56) or a newly
@@ -1124,7 +1163,7 @@ export function mountMarketRoutes(
               activation,
               ignoredBuilds,
               staleReason: staleReason ?? undefined,
-              error: staleError ?? undefined,
+              error: brokenEntryError ?? staleError ?? undefined,
               exitCode: result.exitCode,
               timedOut: result.timedOut,
               stdout: result.stdout,

package/src/verify.ts

@@ -27,7 +27,7 @@
 import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { listHotMounts, parseSimplePatch } from './hot.ts'
-import { hasDshManifest, hasLoadableEntry, profileDir } from './profile.ts'
+import { bundlePatchInsertedIds, hasDshManifest, hasLoadableEntry, profileDir } from './profile.ts'
 
 export type ActivationState = 'live' | 'restart' | 'inert' | 'broken' | 'missing' | 'disabled'
 
@@ -77,6 +77,28 @@ function liveIncludes(live: ReadonlySet<string>, packageName: string): boolean {
   return false
 }
 
+/**
+ * True when a loader entry this package's OWN bundle patch inserts is up.
+ *
+ * A carrier bundle (#103) ships no plugin of its own: its patch mounts
+ * ANOTHER package with configuration, so the live entry carries that other
+ * package's name and `liveIncludes` can never match. The entry ID is the
+ * part that belongs to this package — its patch created it — which is why
+ * matching on it is both sufficient and precise: a neighbour that happens
+ * to mount the same package does so under a different id.
+ *
+ * Without this the market kept telling users to restart for a plugin that
+ * had been running since the restart (#156).
+ */
+function carriedRowLive(live: ReadonlySet<string>, profileDirectory: string, packageName: string): boolean {
+  try {
+    return bundlePatchInsertedIds(join(profileDirectory, 'node_modules', packageName))
+      .some(id => live.has(`#${id}`))
+  } catch {
+    return false
+  }
+}
+
 function readPkgDsh(profile: string, name: string, explicitDir?: string): PkgDsh | null {
   try {
     const manifest = JSON.parse(
@@ -136,7 +158,7 @@ export function verifyActivation(
   // loaded by name from a bundle patch — @deepseek-ai/dsh-tools is loaded by
   // the official dsh-base patch and has no `dsh` field at all — so this check
   // has to come before any manifest-based verdict.
-  const loaderLive = liveIncludes(live, name)
+  const loaderLive = liveIncludes(live, name) || carriedRowLive(live, activeProfileDir, name)
   if (!hasDshManifest(dir)) {
     if (loaderLive) {
       return {