dshmarket 1.66.33 → 1.66.35

package/client/client.js

@@ -9587,12 +9587,12 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				const row = recentRowRef.current;
 				if (row === null || typeof ResizeObserver === "undefined") return;
 				const observer = new ResizeObserver(([entry]) => {
-					if (entry !== void 0) setRecentColumns(Math.max(1, Math.floor((entry.contentRect.width + 10) / 290)));
+					if (entry !== void 0) setRecentColumns(Math.min(2, Math.max(1, Math.floor((entry.contentRect.width + 10) / 290))));
 				});
 				observer.observe(row);
 				return () => observer.disconnect();
 			}, [hasRecent, loadError]);
-			const recentPlugins = recentlyAdded.slice(0, recentColumns);
+			const recentPlugins = recentlyAdded.slice(0, recentColumns * 2);
 			const { currentPage, totalPages, pageSize, goToPage, changePageSize } = usePagination(plugins.length, [
 				q,
 				cat,
@@ -13188,7 +13188,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 									ref: recentRowRef,
 									className: Market_module_css_default.recentRow,
-									style: { gridTemplateColumns: `repeat(${recentPlugins.length}, minmax(0, 1fr))` },
+									style: { gridTemplateColumns: `repeat(${recentColumns}, minmax(0, 1fr))` },
 									children: recentPlugins.map((plugin) => pluginCard(plugin, `recent:${plugin.url}`))
 								})]
 							}),

package/lib/official-desktop.js

@@ -18,8 +18,48 @@ function detail(error) {
         return error.message;
     if (error === undefined)
         return 'plugin manager did not explain the failure';
+    const code = managementCode(error);
+    const copy = code === undefined ? undefined : REFUSAL_COPY[code];
+    // The code stays on the line: it is what the log and the issue report carry.
+    if (copy !== undefined)
+        return `${copy.zh} / ${copy.en} (${code})`;
     return JSON.stringify(error);
 }
+/**
+ * What the manager's refusal means, in the user's terms.
+ *
+ * These codes are the manager's localization keys, not sentences; they used to
+ * reach the page as `{"code":"already-installed"}` and, on the update route,
+ * wrapped in "restoration of the previous build could not be verified" — alarm
+ * about a profile that was never touched (#897). The bilingual half is picked
+ * by the same `localizeBilingual` every other server message goes through.
+ */
+const REFUSAL_COPY = {
+    'already-installed': {
+        zh: '桌面端认为这个包已经装在 profile 里，因此在运行 pnpm 之前就拒绝了这次安装，profile 没有任何改动',
+        en: 'the desktop app treats this package as already installed and refused the install before pnpm ran, so the profile is unchanged',
+    },
+    'not-removable': {
+        zh: '这个插件由桌面端自己管理，市场不能移除它',
+        en: 'the desktop app manages this plugin itself, so the market cannot remove it',
+    },
+    'bundle-in-use': {
+        zh: '这个插件正在使用中，桌面端不允许现在移除',
+        en: 'the plugin is in use, and the desktop app will not remove it right now',
+    },
+    'stop-profile': {
+        zh: '要移除它得先停止这个 profile',
+        en: 'removing it requires stopping this profile first',
+    },
+    'management-required': {
+        zh: '这个 profile 由桌面端自己管理，市场不能直接改动',
+        en: 'this profile is managed by the desktop app itself, so the market cannot change it',
+    },
+    'incompatible-version': {
+        zh: '这个版本与当前 DSH 不兼容，宿主拒绝安装',
+        en: 'this version is not compatible with the running DSH, so the host refused it',
+    },
+};
 /** The manager's own refusal code, whether it was returned or thrown. */
 function managementCode(error) {
     const code = error?.code;
@@ -172,11 +212,14 @@ _profileDirectory) {
                 stdout: output,
                 stderr: message,
                 cancelled: current.cancelled || result.application === 'cancelled',
+                // No package result means the manager stopped before it ran pnpm: the
+                // profile is untouched, and the route must not try to "restore" it.
+                wroteNothing: !ok && result.packageResult === undefined,
             };
         }, (error) => {
             const message = detail(error);
             progress.error = message;
-            return failure(message, 127);
+            return { ...failure(message, 127), wroteNothing: managementCode(error) !== undefined };
         }).finally(() => {
             progress.active = false;
             progress.cancelling = false;

package/lib/routes.js

@@ -4597,7 +4597,13 @@ export function mountMarketRoutes(host, config, commandRuntime, agentsLookup, ho
                                 + (dropped ? '' : ' (nothing to drop: the profile did not declare it under either key)'));
                         };
                         if ((result.exitCode !== 0 || result.timedOut) && !cancelled && result.busy !== true
-                            && !pnpmNeverStarted(result)) {
+                            && !pnpmNeverStarted(result)
+                            // The host refused before running pnpm (#897): nothing was
+                            // written, so there is nothing to restore — and the "could not
+                            // verify restoration, inspect this profile" warning this block
+                            // raises on a failed rollback would be alarm about an untouched
+                            // profile.
+                            && result.wroteNothing !== true) {
                             if (pnpmBlockedByOpenFiles(result)) {
                                 const kept = keepLockedBuild();
                                 rollbackOk = kept.ok;
@@ -4941,7 +4947,13 @@ export function mountMarketRoutes(host, config, commandRuntime, agentsLookup, ho
                             // Last, so the specific ones above keep the floor they had: this
                             // only fills the case where every named branch said nothing and
                             // the user would otherwise get pnpm's stack (#848).
-                            error: versionFailureError ?? renamedError ?? trialError ?? brokenEntryError ?? hardFailureRollbackError ?? staleError ?? pnpmFailureMessage(result) ?? undefined,
+                            // The host's own refusal sentence (#897): when it stopped
+                            // before running pnpm there is no classifier for its words and
+                            // no rollback behind it, so without this the answer carried no
+                            // reason at all.
+                            error: versionFailureError ?? renamedError ?? trialError ?? brokenEntryError ?? hardFailureRollbackError ?? staleError
+                                ?? (result.wroteNothing === true && result.stderr.trim() !== '' ? result.stderr.trim() : undefined)
+                                ?? pnpmFailureMessage(result) ?? undefined,
                             exitCode: result.exitCode,
                             timedOut: result.timedOut,
                             stdout: result.stdout,

package/lib/types/dsh-cli.d.ts

@@ -161,6 +161,17 @@ export interface InstallResult {
     cancelled: boolean;
     /** Desktop's generation-wide package-operation gate rejected the start. */
     busy?: boolean;
+    /**
+     * The host refused before it ran the package manager, so the profile is
+     * exactly as it was.
+     *
+     * The update route answers a failed run by reinstalling the previous build
+     * and, when that cannot be verified, tells the user to inspect a profile
+     * nothing touched. Desktop's manager has refusals of this kind of its own —
+     * it declines a spec it considers already installed before pnpm starts
+     * (#897) — and their only true account is "nothing happened".
+     */
+    wroteNothing?: boolean;
     /** Package names pnpm reported as having ignored build scripts (ndjson). */
     ignoredBuilds?: string[];
     /**

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

package/src/client/MarketSection.tsx

@@ -3074,18 +3074,22 @@ export function MarketSection(props: MarketSectionProps) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [data, tab, q, cat, timeRange, lang, hostCompatibility, compatibleWithHost, blockedNameSet, installed, repoIdentities, repoHints])
   const recentRowRef = useRef<HTMLDivElement>(null)
+  // Two per row, like the grid below it: three across read as a different
+  // list rather than the same one (and left an odd one out at any width).
+  // Two rows of two keeps the block square and the cards the size of the
+  // cards underneath.
   const [recentColumns, setRecentColumns] = useState(1)
   const hasRecent = recentlyAdded.length > 0
   useLayoutEffect(() => {
     const row = recentRowRef.current
     if (row === null || typeof ResizeObserver === 'undefined') return
     const observer = new ResizeObserver(([entry]) => {
-      if (entry !== undefined) setRecentColumns(Math.max(1, Math.floor((entry.contentRect.width + 10) / 290)))
+      if (entry !== undefined) setRecentColumns(Math.min(2, Math.max(1, Math.floor((entry.contentRect.width + 10) / 290))))
     })
     observer.observe(row)
     return () => observer.disconnect()
   }, [hasRecent, loadError])
-  const recentPlugins = recentlyAdded.slice(0, recentColumns)
+  const recentPlugins = recentlyAdded.slice(0, recentColumns * 2)
   const { currentPage, totalPages, pageSize, goToPage, changePageSize } =
     usePagination(plugins.length, [q, cat, sortField, sortDir, timeRange, compatibleWithHost], scrollToTop)
   const pagePlugins = plugins.slice((currentPage - 1) * pageSize, currentPage * pageSize)
@@ -6490,7 +6494,7 @@ export function MarketSection(props: MarketSectionProps) {
                     {hasRecent && (
                       <section aria-labelledby="dshm-recently-added">
                         <h3 id="dshm-recently-added" className={css.favoritesSectionHead}>{t('recentlyAdded')}</h3>
-                        <div ref={recentRowRef} className={css.recentRow} style={{ gridTemplateColumns: `repeat(${recentPlugins.length}, minmax(0, 1fr))` }}>
+                        <div ref={recentRowRef} className={css.recentRow} style={{ gridTemplateColumns: `repeat(${recentColumns}, minmax(0, 1fr))` }}>
                           {recentPlugins.map(plugin => pluginCard(plugin, `recent:${plugin.url}`))}
                         </div>
                       </section>

package/src/dsh-cli.ts

@@ -500,6 +500,17 @@ export interface InstallResult {
   cancelled: boolean
   /** Desktop's generation-wide package-operation gate rejected the start. */
   busy?: boolean
+  /**
+   * The host refused before it ran the package manager, so the profile is
+   * exactly as it was.
+   *
+   * The update route answers a failed run by reinstalling the previous build
+   * and, when that cannot be verified, tells the user to inspect a profile
+   * nothing touched. Desktop's manager has refusals of this kind of its own —
+   * it declines a spec it considers already installed before pnpm starts
+   * (#897) — and their only true account is "nothing happened".
+   */
+  wroteNothing?: boolean
   /** Package names pnpm reported as having ignored build scripts (ndjson). */
   ignoredBuilds?: string[]
   /**

package/src/official-desktop.ts

@@ -31,9 +31,49 @@ function detail(error: unknown): string {
   if (typeof error === 'string') return error
   if (error instanceof Error) return error.message
   if (error === undefined) return 'plugin manager did not explain the failure'
+  const code = managementCode(error)
+  const copy = code === undefined ? undefined : REFUSAL_COPY[code]
+  // The code stays on the line: it is what the log and the issue report carry.
+  if (copy !== undefined) return `${copy.zh} / ${copy.en} (${code})`
   return JSON.stringify(error)
 }
 
+/**
+ * What the manager's refusal means, in the user's terms.
+ *
+ * These codes are the manager's localization keys, not sentences; they used to
+ * reach the page as `{"code":"already-installed"}` and, on the update route,
+ * wrapped in "restoration of the previous build could not be verified" — alarm
+ * about a profile that was never touched (#897). The bilingual half is picked
+ * by the same `localizeBilingual` every other server message goes through.
+ */
+const REFUSAL_COPY: Record<string, { zh: string; en: string }> = {
+  'already-installed': {
+    zh: '桌面端认为这个包已经装在 profile 里，因此在运行 pnpm 之前就拒绝了这次安装，profile 没有任何改动',
+    en: 'the desktop app treats this package as already installed and refused the install before pnpm ran, so the profile is unchanged',
+  },
+  'not-removable': {
+    zh: '这个插件由桌面端自己管理，市场不能移除它',
+    en: 'the desktop app manages this plugin itself, so the market cannot remove it',
+  },
+  'bundle-in-use': {
+    zh: '这个插件正在使用中，桌面端不允许现在移除',
+    en: 'the plugin is in use, and the desktop app will not remove it right now',
+  },
+  'stop-profile': {
+    zh: '要移除它得先停止这个 profile',
+    en: 'removing it requires stopping this profile first',
+  },
+  'management-required': {
+    zh: '这个 profile 由桌面端自己管理，市场不能直接改动',
+    en: 'this profile is managed by the desktop app itself, so the market cannot change it',
+  },
+  'incompatible-version': {
+    zh: '这个版本与当前 DSH 不兼容，宿主拒绝安装',
+    en: 'this version is not compatible with the running DSH, so the host refused it',
+  },
+}
+
 /** The manager's own refusal code, whether it was returned or thrown. */
 function managementCode(error: unknown): string | undefined {
   const code = (error as { code?: unknown } | null | undefined)?.code
@@ -189,11 +229,14 @@ export function createOfficialDesktopRuntime(
         stdout: output,
         stderr: message,
         cancelled: current.cancelled || result.application === 'cancelled',
+        // No package result means the manager stopped before it ran pnpm: the
+        // profile is untouched, and the route must not try to "restore" it.
+        wroteNothing: !ok && result.packageResult === undefined,
       }
     }, (error): InstallResult => {
       const message = detail(error)
       progress.error = message
-      return failure(message, 127)
+      return { ...failure(message, 127), wroteNothing: managementCode(error) !== undefined }
     }).finally(() => {
       progress.active = false
       progress.cancelling = false

package/src/routes.ts

@@ -4808,7 +4808,13 @@ sendJson(response, 200, { updates })
                 + (dropped ? '' : ' (nothing to drop: the profile did not declare it under either key)'))
             }
             if ((result.exitCode !== 0 || result.timedOut) && !cancelled && result.busy !== true
-              && !pnpmNeverStarted(result)) {
+              && !pnpmNeverStarted(result)
+              // The host refused before running pnpm (#897): nothing was
+              // written, so there is nothing to restore — and the "could not
+              // verify restoration, inspect this profile" warning this block
+              // raises on a failed rollback would be alarm about an untouched
+              // profile.
+              && result.wroteNothing !== true) {
               if (pnpmBlockedByOpenFiles(result)) {
                 const kept = keepLockedBuild()
                 rollbackOk = kept.ok
@@ -5170,7 +5176,13 @@ sendJson(response, 200, { updates })
               // Last, so the specific ones above keep the floor they had: this
               // only fills the case where every named branch said nothing and
               // the user would otherwise get pnpm's stack (#848).
-              error: versionFailureError ?? renamedError ?? trialError ?? brokenEntryError ?? hardFailureRollbackError ?? staleError ?? pnpmFailureMessage(result) ?? undefined,
+              // The host's own refusal sentence (#897): when it stopped
+              // before running pnpm there is no classifier for its words and
+              // no rollback behind it, so without this the answer carried no
+              // reason at all.
+              error: versionFailureError ?? renamedError ?? trialError ?? brokenEntryError ?? hardFailureRollbackError ?? staleError
+                ?? (result.wroteNothing === true && result.stderr.trim() !== '' ? result.stderr.trim() : undefined)
+                ?? pnpmFailureMessage(result) ?? undefined,
               exitCode: result.exitCode,
               timedOut: result.timedOut,
               stdout: result.stdout,