dshmarket 1.66.29 → 1.66.30

package/lib/install.js

@@ -339,6 +339,21 @@ export async function withHoistRecovery(run, profile, pluginArgs, profileDirecto
             : `这台宿主（官方桌面端）自己执行安装，不接受市场附加的 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}` };
     }
+    // pnpm can append a second rule even on success (#883, #878), including
+    // after a recovery retry or an official Desktop manager install. Repair
+    // the final file now, before another plugin operation reads it; a successful
+    // command must never be retried just because its exclusions needed merging.
+    if (ok(result) && (verb === 'add' || verb === 'remove' || verb === 'install' || verb === 'update')) {
+        try {
+            const merged = mergeDuplicateReleaseAgeExcludes(profile, profileDirectory);
+            if (merged.length > 0) {
+                logEvent('warn', 'install', `merged duplicate minimumReleaseAgeExclude rules for ${merged.join(', ')} after success (#883, #878)`);
+            }
+        }
+        catch (error) {
+            logEvent('warn', 'install', `could not merge minimumReleaseAgeExclude after success (#883, #878): ${String(error)}`);
+        }
+    }
     return result;
 }
 /**

package/lib/pnpm-compat.js

@@ -362,8 +362,27 @@ export function classifyPnpmFailure(output, exitCode) {
     // (MINIMUM_RELEASE_AGE_VIOLATION), and a later add can fail re-resolving
     // the young dep (NO_MATURE_MATCHING_VERSION). Recovery is a one-shot
     // --config.minimum-release-age=0 retry, automated in withHoistRecovery.
+    //
+    // That gate has a THIRD face, and it is the one that fails AFTER the
+    // lockfile check has said yes. pnpm skips that check when the verification
+    // cache holds a run whose recorded window is at least as wide as the
+    // current one (`canTrustPastCheck`: past >= current, pnpm's own
+    // lockfile-verified cache), and the resolver then applies the same policy
+    // from scratch. A re-resolved dependency still inside the window comes back
+    // as a `policyViolation`, which the CLI only knows how to consume through a
+    // handler it never wires on this call path — so it throws
+    // RESOLUTION_POLICY_VIOLATIONS_UNHANDLED instead of reporting anything the
+    // user can act on. Measured on the bundled pnpm 11.7.0 (DSH Desktop), with
+    // a cached pass in place: verification prints "passes supply-chain
+    // policies", and the next phase dies with "2 resolution-policy violations
+    // were produced but no handleResolutionPolicyViolations callback was wired".
+    // Same cause, same cure as the two shapes above — pnpm's hint names
+    // `setupPolicyHandlers`, which an integration calling the CLI cannot wire,
+    // so the only answer is the one-shot override. Classifying it here is what
+    // connects it to that retry; without it the raw internal hint was surfaced.
     if (output.includes('ERR_PNPM_MINIMUM_RELEASE_AGE_VIOLATION')
-        || output.includes('ERR_PNPM_NO_MATURE_MATCHING_VERSION')) {
+        || output.includes('ERR_PNPM_NO_MATURE_MATCHING_VERSION')
+        || output.includes('ERR_PNPM_RESOLUTION_POLICY_VIOLATIONS_UNHANDLED')) {
         return {
             code: 'release-age-violation',
             recoverable: false,

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

package/src/install.ts

@@ -345,6 +345,20 @@ export async function withHoistRecovery(
       : `这台宿主（官方桌面端）自己执行安装，不接受市场附加的 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}` }
   }
+  // pnpm can append a second rule even on success (#883, #878), including
+  // after a recovery retry or an official Desktop manager install. Repair
+  // the final file now, before another plugin operation reads it; a successful
+  // command must never be retried just because its exclusions needed merging.
+  if (ok(result) && (verb === 'add' || verb === 'remove' || verb === 'install' || verb === 'update')) {
+    try {
+      const merged = mergeDuplicateReleaseAgeExcludes(profile, profileDirectory)
+      if (merged.length > 0) {
+        logEvent('warn', 'install', `merged duplicate minimumReleaseAgeExclude rules for ${merged.join(', ')} after success (#883, #878)`)
+      }
+    } catch (error) {
+      logEvent('warn', 'install', `could not merge minimumReleaseAgeExclude after success (#883, #878): ${String(error)}`)
+    }
+  }
   return result
 }
 

package/src/pnpm-compat.ts

@@ -399,8 +399,27 @@ export function classifyPnpmFailure(output: string, exitCode?: number | null): P
   // (MINIMUM_RELEASE_AGE_VIOLATION), and a later add can fail re-resolving
   // the young dep (NO_MATURE_MATCHING_VERSION). Recovery is a one-shot
   // --config.minimum-release-age=0 retry, automated in withHoistRecovery.
+  //
+  // That gate has a THIRD face, and it is the one that fails AFTER the
+  // lockfile check has said yes. pnpm skips that check when the verification
+  // cache holds a run whose recorded window is at least as wide as the
+  // current one (`canTrustPastCheck`: past >= current, pnpm's own
+  // lockfile-verified cache), and the resolver then applies the same policy
+  // from scratch. A re-resolved dependency still inside the window comes back
+  // as a `policyViolation`, which the CLI only knows how to consume through a
+  // handler it never wires on this call path — so it throws
+  // RESOLUTION_POLICY_VIOLATIONS_UNHANDLED instead of reporting anything the
+  // user can act on. Measured on the bundled pnpm 11.7.0 (DSH Desktop), with
+  // a cached pass in place: verification prints "passes supply-chain
+  // policies", and the next phase dies with "2 resolution-policy violations
+  // were produced but no handleResolutionPolicyViolations callback was wired".
+  // Same cause, same cure as the two shapes above — pnpm's hint names
+  // `setupPolicyHandlers`, which an integration calling the CLI cannot wire,
+  // so the only answer is the one-shot override. Classifying it here is what
+  // connects it to that retry; without it the raw internal hint was surfaced.
   if (output.includes('ERR_PNPM_MINIMUM_RELEASE_AGE_VIOLATION')
-    || output.includes('ERR_PNPM_NO_MATURE_MATCHING_VERSION')) {
+    || output.includes('ERR_PNPM_NO_MATURE_MATCHING_VERSION')
+    || output.includes('ERR_PNPM_RESOLUTION_POLICY_VIOLATIONS_UNHANDLED')) {
     return {
       code: 'release-age-violation',
       recoverable: false,