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

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,
@@ -1195,12 +1196,50 @@ function ensureProfile(paths, consumerDirectory, edition) {
 	const basePackages = composition === void 0 ? distribution.dependencies : {
 		"@deepseek-ai/dsh": distribution.dshRange,
 		"@sparkelf/dsh-plus": distribution.version,
+		"@deepseek-ai/cordis": "^4.0.6-alpha.1",
+		"@deepseek-ai/cordis-plugin-group": "^1.0.6-alpha.1",
+		"@deepseek-ai/cordis-plugin-include": "^1.0.11-alpha.1",
+		"@deepseek-ai/cordis-plugin-loader": "^1.0.7-alpha.1",
+		"@deepseek-ai/dsh-home-paths": runtime,
+		"@deepseek-ai/dsh-launch-environment": runtime,
+		"@deepseek-ai/dsh-agent": runtime,
+		"@deepseek-ai/dsh-llm": runtime,
+		"@deepseek-ai/dsh-scope": runtime,
+		"@deepseek-ai/dsh-session": runtime,
+		"@deepseek-ai/dsh-system-prompt": runtime,
+		"@deepseek-ai/dsh-user-approval": runtime,
+		"@deepseek-ai/dsh-attachment": runtime,
+		"@deepseek-ai/dsh-compaction": runtime,
+		"@deepseek-ai/dsh-fs": runtime,
+		"@deepseek-ai/dsh-shell": runtime,
+		"@deepseek-ai/dsh-spill": runtime,
+		"@deepseek-ai/dsh-sandbox": runtime,
+		"@deepseek-ai/dsh-ptc-runtime": runtime,
+		"@deepseek-ai/dsh-llm-deepseek": runtime,
+		"@deepseek-ai/dsh-deepseek-account": runtime,
+		"@deepseek-ai/dsh-anonymous-user-id": runtime,
+		"@deepseek-ai/dsh-bash-local": runtime,
+		"@deepseek-ai/dsh-client-store": runtime,
+		"@deepseek-ai/dsh-jobs": runtime,
+		"@deepseek-ai/dsh-sdk-protocol": runtime,
+		"@deepseek-ai/dsh-session-persistence": runtime,
+		"@deepseek-ai/dsh-session-telemetry": runtime,
+		"@deepseek-ai/dsh-session-title-llm": runtime,
+		"@deepseek-ai/dsh-util-workspace-path": runtime,
+		"@deepseek-ai/dsh-workflow": runtime,
 		...Object.fromEntries(baseBundles.filter((bundle) => bundle.startsWith("@deepseek-ai/dsh-")).map((bundle) => [bundle, runtime]))
 	};
 	const compositionPackages = composition === void 0 ? basePackages : {
 		...basePackages,
 		...composition.packages
 	};
+	for (const [alias, target] of Object.entries({
+		"dsh-better-sidebar": "@sparkelf/dsh-better-sidebar",
+		"dsh-sql-workbench": "@sparkelf/dsh-sql-workbench"
+	})) {
+		const spec = compositionPackages[target];
+		if (spec !== void 0 && compositionPackages[alias] === void 0) compositionPackages[alias] = "npm:" + target + "@" + spec;
+	}
 	const compositionBundles = composition === void 0 ? baseBundles : [...baseBundles, ...composition.bundles];
 	if (existsSync(manifestPath)) {
 		if (composition !== void 0) {
@@ -1260,7 +1299,7 @@ function writeProfileOverrides(profileDirectory, overrides, allowBuilds, omitted
 	for (const [name, spec] of Object.entries(omittedPackages)) document.setIn(["overrides", name], spec);
 	for (const [name, allowed] of Object.entries(allowBuilds)) document.setIn(["allowBuilds", name], allowed);
 	if (document.get("nodeLinker") === void 0) document.set("nodeLinker", "hoisted");
-	if (document.get("autoInstallPeers") === void 0) document.set("autoInstallPeers", false);
+	if (document.get("autoInstallPeers") === void 0) document.set("autoInstallPeers", true);
 	writeFileSync(workspacePath, String(document));
 }
 /** Run git in one directory, returning undefined instead of throwing when asked to. */

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
@@ -492,6 +501,45 @@ export function ensureProfile(paths, consumerDirectory, edition) {
         : {
             '@deepseek-ai/dsh': distribution.dshRange,
             '@sparkelf/dsh-plus': distribution.version,
+            // `dsh-app-boot` declares its launcher as peer dependencies, and pnpm does not
+            // install a profile's transitive peers. Without these the boot loader resolves
+            // `@deepseek-ai/cordis-plugin-group` and fails before any plugin mounts.
+            '@deepseek-ai/cordis': '^4.0.6-alpha.1',
+            '@deepseek-ai/cordis-plugin-group': '^1.0.6-alpha.1',
+            '@deepseek-ai/cordis-plugin-include': '^1.0.11-alpha.1',
+            '@deepseek-ai/cordis-plugin-loader': '^1.0.7-alpha.1',
+            '@deepseek-ai/dsh-home-paths': runtime,
+            '@deepseek-ai/dsh-launch-environment': runtime,
+            // `dsh-session` / `dsh-tools` declare the rest of the runtime as peers; pnpm leaves
+            // them out of a profile install for the same reason as the launcher peers above.
+            '@deepseek-ai/dsh-agent': runtime,
+            '@deepseek-ai/dsh-llm': runtime,
+            '@deepseek-ai/dsh-scope': runtime,
+            '@deepseek-ai/dsh-session': runtime,
+            '@deepseek-ai/dsh-system-prompt': runtime,
+            '@deepseek-ai/dsh-user-approval': runtime,
+            // Capability packages that the official plugins import but declare only as peers.
+            // A profile install leaves them out and boot then fails inside an otherwise
+            // healthy plugin's import with ERR_MODULE_NOT_FOUND.
+            '@deepseek-ai/dsh-attachment': runtime,
+            '@deepseek-ai/dsh-compaction': runtime,
+            '@deepseek-ai/dsh-fs': runtime,
+            '@deepseek-ai/dsh-shell': runtime,
+            '@deepseek-ai/dsh-spill': runtime,
+            '@deepseek-ai/dsh-sandbox': runtime,
+            '@deepseek-ai/dsh-ptc-runtime': runtime,
+            '@deepseek-ai/dsh-llm-deepseek': runtime,
+            '@deepseek-ai/dsh-deepseek-account': runtime,
+            '@deepseek-ai/dsh-anonymous-user-id': runtime,
+            '@deepseek-ai/dsh-bash-local': runtime,
+            '@deepseek-ai/dsh-client-store': runtime,
+            '@deepseek-ai/dsh-jobs': runtime,
+            '@deepseek-ai/dsh-sdk-protocol': runtime,
+            '@deepseek-ai/dsh-session-persistence': runtime,
+            '@deepseek-ai/dsh-session-telemetry': runtime,
+            '@deepseek-ai/dsh-session-title-llm': runtime,
+            '@deepseek-ai/dsh-util-workspace-path': runtime,
+            '@deepseek-ai/dsh-workflow': runtime,
             ...Object.fromEntries(baseBundles
                 .filter(bundle => bundle.startsWith('@deepseek-ai/dsh-'))
                 .map(bundle => [bundle, runtime])),
@@ -499,6 +547,19 @@ export function ensureProfile(paths, consumerDirectory, edition) {
     const compositionPackages = composition === undefined
         ? basePackages
         : { ...basePackages, ...composition.packages };
+    // Official cordis rows name the historical unscoped packages. The fork ships under
+    // `@sparkelf/*`, so the row would fail to resolve unless the profile also carries the
+    // historical name as an alias to the same version.
+    const rowAliases = {
+        'dsh-better-sidebar': '@sparkelf/dsh-better-sidebar',
+        'dsh-sql-workbench': '@sparkelf/dsh-sql-workbench',
+    };
+    for (const [alias, target] of Object.entries(rowAliases)) {
+        const spec = compositionPackages[target];
+        if (spec !== undefined && compositionPackages[alias] === undefined) {
+            compositionPackages[alias] = 'npm:' + target + '@' + spec;
+        }
+    }
     const compositionBundles = composition === undefined
         ? baseBundles
         : [...baseBundles, ...composition.bundles];
@@ -581,7 +642,7 @@ function writeProfileOverrides(profileDirectory, overrides, allowBuilds, omitted
     if (document.get('nodeLinker') === undefined)
         document.set('nodeLinker', 'hoisted');
     if (document.get('autoInstallPeers') === undefined)
-        document.set('autoInstallPeers', false);
+        document.set('autoInstallPeers', true);
     writeFileSync(workspacePath, String(document));
 }
 /** Run git in one directory, returning undefined instead of throwing when asked to. */

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.20",
   "publishConfig": {
     "access": "public"
   },
@@ -65,18 +65,17 @@
         "@sparkelf/dsh-api-client",
         "dsh-right-bg-anim",
         "@sparkelf/dsh-mobile-bridge",
-        "@sparkelf/dsh-quant",
-        "@sparkelf/dsh-client-ui-diagram-viewer"
+        "@sparkelf/dsh-quant"
       ],
       "dependencies": {
         "@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",
+        "dsh-sql-workbench": "npm:@sparkelf/dsh-sql-workbench@0.5.3",
         "@sparkelf/dsh-workbench-vault": "0.1.2",
         "@sparkelf/dsh-ssh-manager": "0.7.4",
         "@sparkelf/dsh-api-client": "0.5.3",
-        "dsh-better-sidebar": "0.28.0",
+        "dsh-better-sidebar": "npm:@sparkelf/dsh-better-sidebar@0.29.0-sparkelf.7",
         "@sparkelf/dsh-office-viewer-fonts": "0.1.5",
         "dsh-video-preview": "0.1.4",
         "dsh-right-bg-anim": "1.1.0",
@@ -85,7 +84,21 @@
         "@sparkelf/dsh-quant": "0.91.0-sparkelf.13",
         "@deepseek-ai/dsh-experimental-auto-review": "0.2.2-alpha.2",
         "@sparkelf/dsh-genui": "0.13.0-sparkelf.3",
-        "@sparkelf/dsh-client-ui-diagram-viewer": "0.2.1-alpha.28"
+        "@deepseek-ai/dsh-anonymous-user-id": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-attachment": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-compaction": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-deepseek-account": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-fs": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-jobs": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-llm-deepseek": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-ptc-runtime": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-sandbox": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-session-persistence": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-session-telemetry": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-session-title-llm": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-shell": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-spill": "0.2.2-alpha.2",
+        "@deepseek-ai/dsh-workflow": "0.2.2-alpha.2"
       },
       "allowBuilds": {
         "@deepseek-ai/dsh-subprocess-local": true,
@@ -132,7 +145,8 @@
         "@deepseek-ai/dsh-client-ui-schedule": "npm:@sparkelf/dsh-client-ui-schedule@0.2.2-alpha.2",
         "@deepseek-ai/dsh-client-ui-sidebar-right": "npm:@sparkelf/dsh-client-ui-sidebar-right@0.2.2-alpha.2",
         "@deepseek-ai/dsh-atomic-write": "npm:@sparkelf/dsh-atomic-write@0.2.2-alpha.2",
-        "@deepseek-ai/dsh-tool-executor-ptc": "npm:@sparkelf/dsh-tool-executor-ptc@0.2.2-alpha.2"
+        "@deepseek-ai/dsh-tool-executor-ptc": "npm:@sparkelf/dsh-tool-executor-ptc@0.2.2-alpha.2",
+        "@deepseek-ai/dsh-client-ui-slots": "0.2.2-alpha.2"
       },
       "standaloneVariants": {
         "dataops": {
@@ -556,35 +570,33 @@
           "@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",
           "@sparkelf/dsh-mobile-bridge",
-          "@sparkelf/dsh-quant",
-          "@sparkelf/dsh-client-ui-diagram-viewer"
+          "@sparkelf/dsh-quant"
         ],
         "packages": {
           "@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-sql-workbench": "0.5.4-sparkelf.1",
+          "@sparkelf/dsh-better-sidebar": "0.29.0-sparkelf.2"
         }
       },
       "team": {
@@ -600,7 +612,6 @@
           "@sparkelf/dsh-ssh-manager",
           "@sparkelf/dsh-api-client",
           "dsh-right-bg-anim",
-          "@sparkelf/dsh-client-ui-diagram-viewer",
           "@sparkelf/dsh-dataops-managed",
           "@sparkelf/dsh-query-result-analysis",
           "@sparkelf/dsh-better-sidebar",
@@ -610,14 +621,14 @@
           "@sparkelf/dsh-ocr",
           "@sparkelf/dsh-dataops-account",
           "@sparkelf/dsh-kb-citation",
-          "@sparkelf/dsh-task-bus"
+          "@sparkelf/dsh-task-bus",
+          "dsh-video-preview"
         ],
         "packages": {
           "@sparkelf/dsh-api-client": "0.5.3",
-          "@sparkelf/dsh-client-ui-diagram-viewer": "0.2.1-alpha.28",
           "@sparkelf/dsh-dataops-managed": "0.3.21",
           "@sparkelf/dsh-genui": "0.15.0-sparkelf.1",
-          "@sparkelf/dsh-knowledge-base": "0.1.21",
+          "@sparkelf/dsh-knowledge-base": "0.1.23",
           "@sparkelf/dsh-mineru": "0.1.4",
           "@sparkelf/dsh-office-viewer-fonts": "0.1.6",
           "@sparkelf/dsh-officecli": "0.1.4",
@@ -626,13 +637,13 @@
           "@sparkelf/dsh-workbench-vault": "0.1.2",
           "dsh-right-bg-anim": "1.1.0",
           "@sparkelf/dsh-task-bus": "0.1.0",
-          "@sparkelf/dsh-credential-manager": "0.1.0",
+          "@sparkelf/dsh-credential-manager": "0.1.1",
           "@sparkelf/dsh-dataops-account": "0.2.0",
           "@sparkelf/dsh-group-chat": "0.5.1",
           "@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.7",
           "dsh-video-preview": "0.1.4",
           "@sparkelf/dsh-sql-workbench": "0.5.4-sparkelf.1"
         }