dshmarket 1.66.22 → 1.66.23

package/client/client.js

@@ -557,6 +557,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			marketUpdate: "更新插件市场",
 			updateAll: "全部更新",
 			heldReleaseNotice: "已安装，但不是最新版：这个 profile 的 minimumReleaseAge 挡住了 {0}，安装的是 {1}。",
+			installedDependencyNote: "另有 {0} 个包是插件带进来的依赖，不是插件，未列在上方。",
 			heldReleaseAction: "仍安装 {0}",
 			ignoreUpdateNotice: "重启前不再提醒",
 			ignoreAllUpdateNotices: "重启前都不再提醒",
@@ -1273,6 +1274,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			marketUpdate: "Update the plugin market",
 			updateAll: "Update all",
 			heldReleaseNotice: "Installed, but not the newest: this profile's minimumReleaseAge held {0} back, so {1} was installed.",
+			installedDependencyNote: "{0} more packages came in as dependencies of plugins — they are not plugins, so they are not listed above.",
 			heldReleaseAction: "Install {0} anyway",
 			ignoreUpdateNotice: "Don't remind until restart",
 			ignoreAllUpdateNotices: "Don't remind any until restart",
@@ -10641,7 +10643,19 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			const reminderUpdatableNames = updatableNames.filter((name) => !quietUpdateSet.has(name) && !installedBlocked(name));
 			const reminderBatchUpdatableNames = batchUpdatableNames.filter((name) => !quietUpdateSet.has(name) && !installedBlocked(name));
 			const reminderUpdateNames = [...updates[selfName]?.updateAvailable === true && !updatedNames.includes(selfName) ? [selfName] : [], ...updatableNames].filter((name) => !quietUpdateSet.has(name) && !installedBlocked(name));
-			const installedOtherCount = Object.keys(installed).filter((name) => name !== selfName).length;
+			/**
+			* Installed packages that are not plugins at all: a plain library some
+			* other plugin pulled in — zustand, bufferutil, a peer of ws (#634's
+			* `dependencyOf`, #857). They were rendered as plugin cards with a
+			* working uninstall, which is a real remove path for something a plugin
+			* needs. Out of the list; the count stays visible in one quiet line, so the
+			* list is not silently shorter than package.json.
+			*/
+			const dependencyOnlyNames = (0, react.useMemo)(() => new Set(Object.keys(installed).filter((name) => {
+				const act = activations[name];
+				return act?.state === "inert" && act.dependencyOf !== void 0;
+			})), [installed, activations]);
+			const installedOtherCount = Object.keys(installed).filter((name) => name !== selfName && !dependencyOnlyNames.has(name)).length;
 			const ignoreUpdateNotices = (0, react.useCallback)((names) => {
 				if (bootId === null || names.length === 0) return;
 				setIgnoredUpdateNames((current) => {
@@ -10936,7 +10950,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			const isInstalledListActive = tab === "installed" && installedView === "list";
 			const updatesLoaded = Object.keys(updates).length > 0;
 			const orderedInstalledEntries = (0, react.useMemo)(() => {
-				return Object.entries(displayedInstalled).filter(([name]) => name !== selfName).sort(([nameA, specA], [nameB, specB]) => {
+				return Object.entries(displayedInstalled).filter(([name]) => name !== selfName).filter(([name]) => !dependencyOnlyNames.has(name)).sort(([nameA, specA], [nameB, specB]) => {
 					const aOn = effectiveDisabledSet.has(nameA) ? 0 : 1;
 					const bOn = effectiveDisabledSet.has(nameB) ? 0 : 1;
 					if (aOn !== bOn) return bOn - aOn;
@@ -10948,7 +10962,8 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				displayedInstalled,
 				selfName,
 				updatesLoaded,
-				effectiveDisabledSet
+				effectiveDisabledSet,
+				dependencyOnlyNames
 			]);
 			const missingRestoreCount = Object.keys(pendingDependencies).filter((name) => !installedFiles.includes(name)).length;
 			const hasUpdates = reminderUpdatableNames.length > 0;
@@ -11770,7 +11785,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			*/
 			const pendingRefreshNames = (0, react.useMemo)(() => [.../* @__PURE__ */ new Set([...hotNames, ...refreshNames])], [hotNames, refreshNames]);
 			/** Installed plugins the market itself cannot group (#60). */
-			const groupableNames = Object.keys(installed).filter((name) => name !== "dsh-market" && name !== "dshmarket");
+			const groupableNames = Object.keys(installed).filter((name) => name !== "dsh-market" && name !== "dshmarket" && !dependencyOnlyNames.has(name));
 			/** Names already inside some group; everything else shows under "ungrouped". */
 			const groupedNames = (0, react.useMemo)(() => new Set(Object.values(groups).flat()), [groups]);
 			const ungroupedNames = groupableNames.filter((name) => !groupedNames.has(name));
@@ -13641,6 +13656,10 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 										})]
 									}, name);
 								}
+							}),
+							dependencyOnlyNames.size > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: Market_module_css_default.groupOrgHint,
+								children: t("installedDependencyNote").replace("{0}", String(dependencyOnlyNames.size))
 							})
 						] })
 					}),

package/lib/install.js

@@ -328,10 +328,16 @@ export async function withHoistRecovery(run, profile, pluginArgs, profileDirecto
         // no options from us — but the classified message above says the market
         // retried. Say that it did not, or the user reads a retry that never
         // happened and looks for the wrong cause.
-        result = {
-            ...result,
-            stderr: `${result.stderr}\n\n这台宿主（官方桌面端）自己执行安装，不接受市场附加的 pnpm 参数（${unavailableOption}），所以这一步没有自动重试。 / This host (the official desktop app) runs the install itself and takes no pnpm options from the market (${unavailableOption}), so that automatic retry could not be attempted.`,
-        };
+        //
+        // The wait on a fresh release is the one of these where "no retry" leaves
+        // the user with nothing to do at all: the plugin IS published, pnpm just
+        // will not take it yet, and the door the market would open on a plain
+        // `dsh web` host is shut here — so say when the same button starts
+        // working, and what to use meanwhile (#852).
+        const note = unavailableOption === RELEASE_AGE_OVERRIDE
+            ? `这个插件的新版本比本 profile 的 minimumReleaseAge（新版本等待期）还新，pnpm 因此拒绝了本次改动（改别的插件也一样）。官方桌面端由应用自己执行安装，不接受市场的临时放行参数（${unavailableOption}），所以这里没有自动重试。**等这个版本过了等待期再更新一次即可**；想现在就更新，可以在普通的 dsh web 里装。 / The plugin's new version is younger than this profile's minimumReleaseAge, so pnpm refused this change (a change to another plugin too). The official desktop app runs the install itself and takes no one-shot bypass from the market (${unavailableOption}), so no automatic retry happens here. **Update again once the version is past the wait**; to update right now, install from plain dsh web.`
+            : `这台宿主（官方桌面端）自己执行安装，不接受市场附加的 pnpm 参数（${unavailableOption}），所以这一步没有自动重试。 / This host (the official desktop app) runs the install itself and takes no pnpm options from the market (${unavailableOption}), so that automatic retry could not be attempted.`;
+        result = { ...result, stderr: `${result.stderr}\n\n${note}` };
     }
     return result;
 }
@@ -426,7 +432,27 @@ export function failureDetail(result, limit = 300) {
         const code = result.pnpmErrorCode === undefined ? '' : `${result.pnpmErrorCode}: `;
         return `${code}${result.pnpmError}`.slice(0, limit);
     }
-    return (result.stderr || result.stdout).slice(-limit);
+    const text = (result.stderr || result.stdout).trim();
+    if (text.length <= limit)
+        return text;
+    const tail = text.slice(-limit);
+    // Cut at a sentence end instead of mid-word, and say that something was
+    // dropped (#852). The market appends its own explanation to pnpm's output,
+    // and this tail is catalogued into user-facing sentences — including inside
+    // a parenthesis. A blunt cut landed inside the previous sentence and welded
+    // the fragment to the next one: the reporter's log read
+    // `（is, export the log and report it这台宿主…`, which is not a sentence in
+    // either language and says nothing about what to do.
+    const sentenceEnd = /[.!?。！？]["')\]）]?[\s\n]+/gu;
+    const match = sentenceEnd.exec(tail);
+    if (match !== null) {
+        const rest = tail.slice(match.index + match[0].length).trim();
+        // A boundary so near the end would leave a word or two; the raw tail is
+        // more use than the stub.
+        if (rest.length >= 40)
+            return `… ${rest}`;
+    }
+    return `…${tail.trim()}`;
 }
 /**
  * Some registry entries point at collection repos whose actual plugin lives

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.66.22",
+  "version": "1.66.23",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",

package/src/client/MarketSection.tsx

@@ -4462,7 +4462,23 @@ export function MarketSection(props: MarketSectionProps) {
   // The market manages itself from its own settings card (Settings → Plugins
   // → Plugin configuration), not as a row here — listing it in both places
   // read as two different controls for the same thing.
-  const installedOtherCount = Object.keys(installed).filter(name => name !== selfName).length
+  /**
+   * Installed packages that are not plugins at all: a plain library some
+   * other plugin pulled in — zustand, bufferutil, a peer of ws (#634's
+   * `dependencyOf`, #857). They were rendered as plugin cards with a
+   * working uninstall, which is a real remove path for something a plugin
+   * needs. Out of the list; the count stays visible in one quiet line, so the
+   * list is not silently shorter than package.json.
+   */
+  const dependencyOnlyNames = useMemo(
+    () => new Set(Object.keys(installed).filter(name => {
+      const act = activations[name]
+      return act?.state === 'inert' && act.dependencyOf !== undefined
+    })),
+    [installed, activations],
+  )
+  const installedOtherCount = Object.keys(installed)
+    .filter(name => name !== selfName && !dependencyOnlyNames.has(name)).length
 
   const ignoreUpdateNotices = useCallback((names: string[]) => {
     if (bootId === null || names.length === 0) return
@@ -4759,6 +4775,7 @@ export function MarketSection(props: MarketSectionProps) {
   const orderedInstalledEntries = useMemo(() => {
     return Object.entries(displayedInstalled)
       .filter(([name]) => name !== selfName)
+      .filter(([name]) => !dependencyOnlyNames.has(name))
       .sort(([nameA, specA], [nameB, specB]) => {
         // The list reads as "what is running", so a plugin that is off sinks
         // below every one that is on (#745) — even a disabled row with a
@@ -4771,7 +4788,7 @@ export function MarketSection(props: MarketSectionProps) {
         return bUp - aUp
       })
     // eslint-disable-next-line react-hooks/exhaustive-deps -- `updatesLoaded` stands in for `updates`/`updatedNames`: reorder when the check lands, then hold (#631). `effectiveDisabledSet` only re-runs this when a disable state actually changed; the toggled row is the only one that moves.
-  }, [isInstalledListActive, displayedInstalled, selfName, updatesLoaded, effectiveDisabledSet])
+  }, [isInstalledListActive, displayedInstalled, selfName, updatesLoaded, effectiveDisabledSet, dependencyOnlyNames])
   const missingRestoreCount = Object.keys(pendingDependencies).filter(name => !installedFiles.includes(name)).length
   // Self-update lives in the header button and the settings card, not this
   // tab's row list (the market itself is filtered out below) — so a pending
@@ -5520,7 +5537,8 @@ export function MarketSection(props: MarketSectionProps) {
   )
 
   /** Installed plugins the market itself cannot group (#60). */
-  const groupableNames = Object.keys(installed).filter(name => name !== 'dsh-market' && name !== 'dshmarket')
+  const groupableNames = Object.keys(installed)
+    .filter(name => name !== 'dsh-market' && name !== 'dshmarket' && !dependencyOnlyNames.has(name))
   /** Names already inside some group; everything else shows under "ungrouped". */
   const groupedNames = useMemo(() => new Set(Object.values(groups).flat()), [groups])
   const ungroupedNames = groupableNames.filter(name => !groupedNames.has(name))
@@ -7045,6 +7063,13 @@ export function MarketSection(props: MarketSectionProps) {
                           }}
                           />
                         )}
+                {dependencyOnlyNames.size > 0 && (
+                  // The list is complete as a list of PLUGINS; the count keeps it
+                  // from looking like packages went missing (#857).
+                  <p className={css.groupOrgHint}>
+                    {t('installedDependencyNote').replace('{0}', String(dependencyOnlyNames.size))}
+                  </p>
+                )}
                 </>
               )}
       </div>

package/src/client/locales.ts

@@ -366,6 +366,7 @@ export const zh = {
   marketUpdate: '更新插件市场',
   updateAll: '全部更新',
   heldReleaseNotice: '已安装，但不是最新版：这个 profile 的 minimumReleaseAge 挡住了 {0}，安装的是 {1}。',
+  installedDependencyNote: '另有 {0} 个包是插件带进来的依赖，不是插件，未列在上方。',
   heldReleaseAction: '仍安装 {0}',
   ignoreUpdateNotice: '重启前不再提醒',
   ignoreAllUpdateNotices: '重启前都不再提醒',
@@ -1096,6 +1097,7 @@ export const en: Record<MarketKey, string> = {
   marketUpdate: 'Update the plugin market',
   updateAll: 'Update all',
   heldReleaseNotice: 'Installed, but not the newest: this profile\'s minimumReleaseAge held {0} back, so {1} was installed.',
+  installedDependencyNote: '{0} more packages came in as dependencies of plugins — they are not plugins, so they are not listed above.',
   heldReleaseAction: 'Install {0} anyway',
   ignoreUpdateNotice: "Don't remind until restart",
   ignoreAllUpdateNotices: "Don't remind any until restart",

package/src/install.ts

@@ -334,10 +334,16 @@ export async function withHoistRecovery(
     // no options from us — but the classified message above says the market
     // retried. Say that it did not, or the user reads a retry that never
     // happened and looks for the wrong cause.
-    result = {
-      ...result,
-      stderr: `${result.stderr}\n\n这台宿主（官方桌面端）自己执行安装，不接受市场附加的 pnpm 参数（${unavailableOption}），所以这一步没有自动重试。 / This host (the official desktop app) runs the install itself and takes no pnpm options from the market (${unavailableOption}), so that automatic retry could not be attempted.`,
-    }
+    //
+    // The wait on a fresh release is the one of these where "no retry" leaves
+    // the user with nothing to do at all: the plugin IS published, pnpm just
+    // will not take it yet, and the door the market would open on a plain
+    // `dsh web` host is shut here — so say when the same button starts
+    // working, and what to use meanwhile (#852).
+    const note = unavailableOption === RELEASE_AGE_OVERRIDE
+      ? `这个插件的新版本比本 profile 的 minimumReleaseAge（新版本等待期）还新，pnpm 因此拒绝了本次改动（改别的插件也一样）。官方桌面端由应用自己执行安装，不接受市场的临时放行参数（${unavailableOption}），所以这里没有自动重试。**等这个版本过了等待期再更新一次即可**；想现在就更新，可以在普通的 dsh web 里装。 / The plugin's new version is younger than this profile's minimumReleaseAge, so pnpm refused this change (a change to another plugin too). The official desktop app runs the install itself and takes no one-shot bypass from the market (${unavailableOption}), so no automatic retry happens here. **Update again once the version is past the wait**; to update right now, install from plain dsh web.`
+      : `这台宿主（官方桌面端）自己执行安装，不接受市场附加的 pnpm 参数（${unavailableOption}），所以这一步没有自动重试。 / This host (the official desktop app) runs the install itself and takes no pnpm options from the market (${unavailableOption}), so that automatic retry could not be attempted.`
+    result = { ...result, stderr: `${result.stderr}\n\n${note}` }
   }
   return result
 }
@@ -432,7 +438,25 @@ export function failureDetail(result: InstallResult, limit = 300): string {
     const code = result.pnpmErrorCode === undefined ? '' : `${result.pnpmErrorCode}: `
     return `${code}${result.pnpmError}`.slice(0, limit)
   }
-  return (result.stderr || result.stdout).slice(-limit)
+  const text = (result.stderr || result.stdout).trim()
+  if (text.length <= limit) return text
+  const tail = text.slice(-limit)
+  // Cut at a sentence end instead of mid-word, and say that something was
+  // dropped (#852). The market appends its own explanation to pnpm's output,
+  // and this tail is catalogued into user-facing sentences — including inside
+  // a parenthesis. A blunt cut landed inside the previous sentence and welded
+  // the fragment to the next one: the reporter's log read
+  // `（is, export the log and report it这台宿主…`, which is not a sentence in
+  // either language and says nothing about what to do.
+  const sentenceEnd = /[.!?。！？]["')\]）]?[\s\n]+/gu
+  const match = sentenceEnd.exec(tail)
+  if (match !== null) {
+    const rest = tail.slice(match.index + match[0].length).trim()
+    // A boundary so near the end would leave a word or two; the raw tail is
+    // more use than the stub.
+    if (rest.length >= 40) return `… ${rest}`
+  }
+  return `…${tail.trim()}`
 }
 
 /**