dshm-compat 0.1.2 → 0.1.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.1.3
+
+- Fixed dsh-ops recipe dispatch for GitHub specs: the converter now keys on
+  `report.package.name`, not `report.resolved.name` (which is `owner/repo` for
+  GitHub). `compat_convert("https://github.com/T-Auto/dsh-ops", ...)` now
+  reaches the recipe and returns `needs-native-build` instead of `skipped`.
+- The dsh-ops recipe relaxes `peerDependencies["@deepseek-ai/dsh"]` to
+  `workspace:*` so installing it does not make the DSHM core fail its
+  prerelease compatibility check on the next boot.
+- Clearer S2 skipped message ("needs a recipe or an external native build").
+- Offline regression suite: 24/24.
+
 ## 0.1.2
 
 - Added `compat_doctor`: one read-only diagnosis of DSHM mode, core version,

package/INSTALL.md

@@ -1,6 +1,6 @@
 # Installing dshm-compat
 
-The artifact is a normal DSH bundle package: `dshm-compat-0.1.2.tgz`.
+The artifact is a normal DSH bundle package: `dshm-compat-0.1.3.tgz`.
 It is host-only, has no runtime dependencies, and adds eight agent tools.
 
 ## A. DSHM (the tablet)
@@ -15,7 +15,7 @@ input calls `pnpm view` before installing and fails with
 `Command failed with EACCES: pnpm view ... spawn pnpm EACCES`. Use one of these
 instead:
 
-- ask the DSHM Agent to run `pnpm add dshm-compat@0.1.2` in its bash tool (the
+- ask the DSHM Agent to run `pnpm add dshm-compat@0.1.3` in its bash tool (the
   bundled pnpm shim routes that command to the host install queue); or
 - install from a GitHub repository URL; or
 - after any working install, use the plugin's own `compat_install` tool for
@@ -28,7 +28,7 @@ not accept local paths, `file:` or `http://` specs.
 
 ### A2. HTTPS tarball
 
-Put `dshm-compat-0.1.2.tgz` on any HTTPS host (GitHub Release, Gitee Release,
+Put `dshm-compat-0.1.3.tgz` on any HTTPS host (GitHub Release, Gitee Release,
 object storage) and paste the `.tgz` URL into the same Add plugin input. DSHM's
 installer accepts tarball specs; if the current market UI refuses a plain URL,
 use A1.
@@ -38,7 +38,7 @@ use A1.
 If `hdc` is available and the app can read the path:
 
 ```sh
-hdc file send dshm-compat-0.1.2.tgz /data/storage/el2/base/haps/entry/files/dshm-compat-0.1.2.tgz
+hdc file send dshm-compat-0.1.3.tgz /data/storage/el2/base/haps/entry/files/dshm-compat-0.1.3.tgz
 ```
 
 Then enter the absolute path (or `file:/...`) in the Add plugin input. This
@@ -47,7 +47,7 @@ depends on the DSHM build's local-file support; A1 is safer.
 ## B. Desktop DSH (for testing only)
 
 ```powershell
-& 'D:\安装\dsh-desktop\resources\runtime\cli\bin\dsh.cmd' plugin --profile desktop add 'D:\dsh\dsh-26-09-30\dshm-compat\dshm-compat-0.1.2.tgz'
+& 'D:\安装\dsh-desktop\resources\runtime\cli\bin\dsh.cmd' plugin --profile desktop add 'D:\dsh\dsh-26-09-30\dshm-compat\dshm-compat-0.1.3.tgz'
 ```
 
 If the profile reports `ERR_PNPM_UNEXPECTED_VIRTUAL_STORE`, its `node_modules`

package/README.md

@@ -5,7 +5,8 @@ them through the least invasive strategy that can work.
 
 ## Current phase
 
-0.1.2 adds `compat_doctor`, rollback-safe local installs, and codeload
+0.1.3 fixes dsh-ops recipe dispatch for GitHub specs and relaxes its DSH peer
+range; it also adds `compat_doctor`, rollback-safe local installs, and codeload
 fallbacks for GitHub. Phase 1 ships the analyzer, the S0/S1 converter, the
 dsh-ops recipe, guest probing/provisioning, the DSHM install-queue transport,
 and a profile-local fallback for artifacts the host queue rejects:

package/lib/convert.js

@@ -47,7 +47,7 @@ function safeName(name) {
  */
 export async function convert(spec, options = {}) {
   const report = options.report ?? await analyze(spec, { textScan: false, signal: options.signal, registry: options.registry })
-  if (report.resolved?.name === 'dsh-ops' && report.rule?.nativeBuild?.language === 'rust') {
+  if (report.package?.name === 'dsh-ops' && report.rule?.nativeBuild?.language === 'rust') {
     const { convertDshOps } = await import('./recipes/dsh-ops.js')
     return await convertDshOps(spec, {
       report,
@@ -62,7 +62,7 @@ export async function convert(spec, options = {}) {
       strategy: report.strategy,
       reasons: report.reasons,
       next: report.next,
-      message: `strategy ${report.strategy} is not handled by the phase-1 manifest converter`,
+      message: `strategy ${report.strategy} needs a recipe or an external native build; see next`,
     }
   }
   if (report.signals?.hasDsh !== true) {

package/lib/recipes/dsh-ops.js

@@ -128,6 +128,14 @@ export async function convertDshOps(spec, options = {}) {
   const pkg = JSON.parse(pkgFile.data.toString('utf8'))
   delete pkg.os
   delete pkg.cpu
+  // DSHM core is a prerelease (e.g. 0.2.1-alpha.4+dshm.56). The upstream
+  // ^0.2.0-rc.2 range does not match 0.2.1-*, and the bundle loader would throw
+  // on the next boot. "workspace:*" follows the running core instead.
+  if (pkg.peerDependencies !== null && typeof pkg.peerDependencies === 'object' && !Array.isArray(pkg.peerDependencies)) {
+    if (typeof pkg.peerDependencies['@deepseek-ai/dsh'] === 'string') {
+      pkg.peerDependencies['@deepseek-ai/dsh'] = 'workspace:*'
+    }
+  }
   if (pkg.optionalDependencies !== null && typeof pkg.optionalDependencies === 'object') {
     delete pkg.optionalDependencies['@dsh-ops/bash-win32-x64']
     delete pkg.optionalDependencies['@dsh-ops/pwsh-win32-x64']
@@ -165,6 +173,7 @@ export async function convertDshOps(spec, options = {}) {
     'added linux-arm64 to PLATFORMS and mapped openharmony/linux-arm64 to it',
     'wrapped the file worker spawn in bash -c so dshm-vm-bash routes it to the guest',
     'removed package.json os/cpu gates and win32 optional payloads',
+    'relaxed @deepseek-ai/dsh peer range to workspace:* for the DSHM core',
     'added dsh-plugin.json openharmony/linux-arm64 targets',
     `staged ${workerPath}`,
   ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dshm-compat",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Analyze and convert DSH plugins that cannot be installed or run on HarmonyOS DSHM.",
   "type": "module",
   "main": "index.js",