@sparkelf/dsh-plus 0.2.2-alpha.2.2 → 0.2.2-alpha.2.3

package/lib/bin.js

@@ -1009,6 +1009,7 @@ function installProfilePackages(paths, consumerDirectory) {
 function installWithRegistryFallback(paths) {
 	const registries = registryOrder();
 	for (const [index, registry] of registries.entries()) {
+		if (index > 0) rmSync(join(paths.profileDirectory, "pnpm-lock.yaml"), { force: true });
 		const result = spawnSync("pnpm", [
 			"install",
 			"--no-frozen-lockfile",
@@ -1077,7 +1078,7 @@ const MAINLAND_REGISTRY = "https://registry.npmmirror.com";
 */
 function registryOrder() {
 	const configured = process.env.DSH_PLUS_INSTALL_REGISTRY;
-	if (configured !== void 0 && configured !== "") return [configured, MAINLAND_REGISTRY];
+	if (configured !== void 0 && configured !== "") return [configured, configured === MAINLAND_REGISTRY ? OFFICIAL_REGISTRY : MAINLAND_REGISTRY];
 	const locale = [
 		process.env.LANG,
 		process.env.LC_ALL,

package/lib/types/standalone-profile.js

@@ -9,7 +9,7 @@
  * bundle's own list.
  */
 import { spawnSync } from 'node:child_process';
-import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, symlinkSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { fileURLToPath } from 'node:url';
 import { homedir } from 'node:os';
@@ -276,6 +276,11 @@ export function installProfilePackages(paths, consumerDirectory) {
 function installWithRegistryFallback(paths) {
     const registries = registryOrder();
     for (const [index, registry] of registries.entries()) {
+        // A lockfile written against the previous registry keeps its resolved URLs, so the
+        // second attempt would fetch from the registry that just failed. Drop it and resolve
+        // against the registry being tried.
+        if (index > 0)
+            rmSync(join(paths.profileDirectory, 'pnpm-lock.yaml'), { force: true });
         const result = spawnSync('pnpm', ['install', '--no-frozen-lockfile', '--registry', registry], {
             cwd: paths.profileDirectory,
             stdio: 'inherit',
@@ -345,8 +350,12 @@ const MAINLAND_REGISTRY = 'https://registry.npmmirror.com';
  */
 export function registryOrder() {
     const configured = process.env.DSH_PLUS_INSTALL_REGISTRY;
-    if (configured !== undefined && configured !== '')
-        return [configured, MAINLAND_REGISTRY];
+    if (configured !== undefined && configured !== '') {
+        // The fallback must be the other registry, not the configured one again: an override
+        // set to the mirror used to fall back to the same mirror and fail twice.
+        const fallback = configured === MAINLAND_REGISTRY ? OFFICIAL_REGISTRY : MAINLAND_REGISTRY;
+        return [configured, fallback];
+    }
     // Intl reports the system locale on every platform. The POSIX variables are empty on
     // Windows, so reading them alone classified every Windows console as non-mainland and
     // reached the origin first — measured in a consumer's log, which showed npmjs failing

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sparkelf/dsh-plus",
   "description": "DeepSeek Harness Plus official-base Web distribution profile and ranged compatibility patchset",
-  "version": "0.2.2-alpha.2.2",
+  "version": "0.2.2-alpha.2.3",
   "publishConfig": {
     "access": "public"
   },
@@ -556,12 +556,12 @@
           "@sparkelf/dsh-mineru",
           "@sparkelf/dsh-officecli",
           "dshmarket",
-          "dsh-better-sidebar",
+          "@sparkelf/dsh-better-sidebar",
           "@sparkelf/dsh-office-viewer-fonts",
           "dsh-video-preview",
           "@sparkelf/dsh-genui",
           "@sparkelf/dsh-plugin-supervisor",
-          "dsh-sql-workbench",
+          "@sparkelf/dsh-sql-workbench",
           "@sparkelf/dsh-ssh-manager",
           "@sparkelf/dsh-api-client",
           "dsh-right-bg-anim",
@@ -573,18 +573,18 @@
           "@sparkelf/dsh-mineru": "0.1.4",
           "@sparkelf/dsh-officecli": "0.1.4",
           "@sparkelf/dsh-plugin-supervisor": "0.1.9",
-          "dsh-sql-workbench": "0.5.3",
           "@sparkelf/dsh-workbench-vault": "0.1.2",
-          "@sparkelf/dsh-ssh-manager": "0.7.4",
+          "@sparkelf/dsh-ssh-manager": "0.7.5",
           "@sparkelf/dsh-api-client": "0.5.3",
-          "dsh-better-sidebar": "0.28.0",
-          "@sparkelf/dsh-office-viewer-fonts": "0.1.5",
+          "@sparkelf/dsh-office-viewer-fonts": "0.1.6",
           "dsh-video-preview": "0.1.4",
           "dsh-right-bg-anim": "1.1.0",
           "@sparkelf/dsh-mobile-bridge": "0.2.18",
           "@sparkelf/dsh-quant": "0.91.0-sparkelf.13",
-          "@sparkelf/dsh-genui": "0.13.0-sparkelf.3",
-          "@sparkelf/dsh-client-ui-diagram-viewer": "0.2.1-alpha.28"
+          "@sparkelf/dsh-genui": "0.15.0-sparkelf.1",
+          "@sparkelf/dsh-client-ui-diagram-viewer": "0.2.1-alpha.28",
+          "@sparkelf/dsh-sql-workbench": "0.5.4-sparkelf.1",
+          "@sparkelf/dsh-better-sidebar": "0.29.0-sparkelf.2"
         }
       },
       "team": {
@@ -632,7 +632,7 @@
           "@sparkelf/dsh-kb-citation": "0.1.3",
           "@sparkelf/dsh-ocr": "0.1.0",
           "@sparkelf/dsh-query-result-analysis": "0.1.4",
-          "@sparkelf/dsh-better-sidebar": "0.28.0-sparkelf.grid.17",
+          "@sparkelf/dsh-better-sidebar": "0.29.0-sparkelf.2",
           "dsh-video-preview": "0.1.4",
           "@sparkelf/dsh-sql-workbench": "0.5.4-sparkelf.1"
         }