dshmarket 1.73.2 → 1.73.3

package/lib/pending-updates.js

@@ -24,7 +24,7 @@ import { randomUUID } from 'node:crypto';
 import { mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { logEvent } from './log.js';
-import { readInstalledVersion, readManifestDeps, readProfileBundles } from './profile.js';
+import { readInstalledManifest, readInstalledVersion, readManifestDeps, readProfileBundles } from './profile.js';
 const STATE_VERSION = 1;
 /**
  * The per-profile journal file.
@@ -175,14 +175,29 @@ function managerSucceeded(result) {
         || result.application === 'overridden';
 }
 /**
- * Whether this profile still wants the package: declared in its manifest, or
- * listed as a bundle. `readInstalledVersion` only looks at node_modules, and
- * the half-removed state #928 describes is exactly "still on disk, no longer
- * declared" — treating that as settled cleared the record while the plugin
- * was not composed at all (#949 review).
+ * Whether this profile is actually composed with the package.
+ *
+ * `readInstalledVersion` only looks at node_modules, and the half-removed
+ * state #928 describes is exactly "still on disk, no longer declared" —
+ * treating that as settled cleared the record while the plugin was not
+ * composed at all (#949 review). Being declared is necessary but not
+ * sufficient: a package that loads through the bundle layer is composed only
+ * when the profile lists it in `dsh.profile.bundles`, and the desktop manager
+ * can fail at its application stage AFTER writing the build and the
+ * dependency but BEFORE that row (#928) — the reporter's restart restored
+ * files and dependencies, left `dsh.profile.bundles` without the name, and
+ * the record said "recorded as finished".
+ *
+ * The row is required only of a package that declares `dsh.bundle`: a
+ * client-only package has no bundle layer to be listed in, and demanding the
+ * row of one would reinstall it on every start.
  */
-function profileStillWants(profile, profileDirectory, name) {
-    if (Object.hasOwn(readManifestDeps(profile, profileDirectory), name))
+function composed(profile, profileDirectory, name) {
+    if (!Object.hasOwn(readManifestDeps(profile, profileDirectory), name))
+        return false;
+    const manifest = readInstalledManifest(profile, name, profileDirectory);
+    const dsh = manifest?.dsh;
+    if (dsh?.bundle === undefined)
         return true;
     return readProfileBundles(profileDirectory).includes(name);
 }
@@ -242,16 +257,17 @@ export async function repairInterruptedUpdates(options) {
     const pending = journal.list().filter(entry => entry.profile === options.profile);
     for (const entry of pending) {
         const installed = readInstalledVersion(options.profile, entry.name, options.profileDirectory);
-        const wanted = profileStillWants(options.profile, options.profileDirectory, entry.name);
-        // Settled means BOTH halves agree: the build is on disk AND the profile
-        // still declares it. "On disk but no longer declared" is the interrupted
-        // removal itself, so it falls through to the reinstall.
-        if (installed !== null && wanted && (entry.to === '' || installed === entry.to || installed === entry.from)) {
+        const settled = composed(options.profile, options.profileDirectory, entry.name);
+        // Settled means every half agrees: the build is on disk, the profile
+        // declares it, and a bundle-layer package is listed as one. "On disk but
+        // no longer composed" is the interrupted removal itself, so it falls
+        // through to the reinstall.
+        if (installed !== null && settled && (entry.to === '' || installed === entry.to || installed === entry.from)) {
             journal.finish(entry.id);
             report.finished.push(entry.name);
             continue;
         }
-        if (installed !== null && wanted) {
+        if (installed !== null && settled) {
             journal.bump(entry.id);
             report.failed.push({
                 name: entry.name,
@@ -275,6 +291,13 @@ export async function repairInterruptedUpdates(options) {
                 if (after === null || (entry.to !== '' && after !== entry.to)) {
                     throw new Error(`the desktop app refused the reinstall (${result.application})`);
                 }
+                // The files landing is not the same answer as the plugin loading:
+                // this manager failed at the application stage, which is the step
+                // that writes `dsh.profile.bundles` (#928). Finishing here cleared
+                // the record for a package the host still would not compose.
+                if (!composed(options.profile, options.profileDirectory, entry.name)) {
+                    throw new Error(`the desktop app wrote ${after} but did not compose it — no dsh.profile.bundles row`);
+                }
                 journal.finish(entry.id);
                 report.reinstalled.push(entry.name);
                 logEvent('warn', 'update-repair', `${entry.name}: the interrupted update had already written ${after}; recorded as finished`);

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.73.2",
+  "version": "1.73.3",
   "icon": "assets/logo.svg",
   "type": "module",
   "main": "lib/index.js",