dshmarket 1.20.3 → 1.21.0

package/lib/dsh-cli.js

@@ -15,6 +15,8 @@ import { createProgressTracker } from './ndjson.js';
 import { pluginArgsFor } from './pnpm-compat.js';
 import { isDshProfileName, profileDir } from './profile.js';
 import { activeRegion, DEFAULT_NPM_REGISTRY, routesFor } from './regions.js';
+import { NPM_NAME_RE } from './sources.js';
+import { fetchNpmLatest } from './updates.js';
 // 15 min default (slow networks + git installs), overridable for CI/tests.
 // (#6 by @qichuang321.)
 /**
@@ -185,7 +187,10 @@ export function toolSearchDirs(platform = process.platform, env = process.env, h
         dirs.push(join(home, 'Library', 'pnpm'), join(home, '.local', 'share', 'pnpm'));
     }
     dirs.push(nodeBinDir, ...extraPathDirs);
-    return dirs;
+    // Deduped: PNPM_HOME usually names one of the defaults below it, and a
+    // list that says the same directory twice reads as carelessness in the
+    // one place a user goes looking for an answer.
+    return [...new Set(dirs.filter(dir => dir.trim() !== ''))];
 }
 function spawnEnv() {
     // pnpm v10+ blocks forever on a silent interactive prompt without a TTY;
@@ -276,6 +281,46 @@ export function dshArgv() {
     // Bare `dsh` is a .cmd shim on Windows that only a shell can start (#13).
     return { file: 'dsh', args: [], cwd: undefined, viaShell: winCmdShim };
 }
+/** An npm name with a fully pinned version — the only target their boundary takes. */
+const EXACT_NPM_TARGET_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*@\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/;
+/**
+ * Rewrite an `add` argv into the shape Anywhere Labs' install boundary
+ * accepts, or null when it cannot be expressed there.
+ *
+ * Their validator wants exactly one target of the form `name@1.2.3` — not a
+ * bare name, not `@latest`, and not a `github:` source (read from
+ * `validateExternalMarketInstallArgs`, dsh-plugin-desktop/src/pnpm.ts). The
+ * market sends a bare name for a registry plugin and `dshmarket@latest` for
+ * itself, so both need the version resolved before that boundary will take
+ * them.
+ *
+ * Returning null is a normal outcome, not a failure: a github-sourced plugin
+ * has no `name@version` spelling at all. The caller falls back to the
+ * ordinary path, which on that host reports their own refusal — an accurate
+ * message about their contract, rather than one this package invented.
+ */
+async function exactNpmArgs(args) {
+    const targets = args.slice(1).filter(argument => !argument.startsWith('-'));
+    const target = targets[0];
+    if (targets.length !== 1 || target === undefined)
+        return null;
+    if (EXACT_NPM_TARGET_RE.test(target))
+        return [...args];
+    // A bare name, or one pinned to a dist-tag. Only a registry package can be
+    // resolved; `github:owner/repo` and file paths stop here.
+    const at = target.lastIndexOf('@');
+    const name = at > 0 ? target.slice(0, at) : target;
+    if (!NPM_NAME_RE.test(name))
+        return null;
+    const version = await fetchNpmLatest(name);
+    if (version === null)
+        return null;
+    const rewritten = `${name}@${version}`;
+    if (!EXACT_NPM_TARGET_RE.test(rewritten))
+        return null;
+    logEvent('info', 'install', `desktop install boundary needs an exact version: ${target} -> ${rewritten}`);
+    return args.map(argument => (argument === target ? rewritten : argument));
+}
 /**
  * Kill a spawned child and, on Windows, its whole process tree — `kill()`
  * there only terminates the wrapper, leaving pnpm children running.
@@ -478,7 +523,18 @@ export function provisionHint(corepackOutput, npmOutput, npmFound = true) {
     if (/ETIMEDOUT|ECONNREFUSED|ENOTFOUND|EAI_AGAIN|network|proxy|certificate/i.test(`${corepackOutput}\n${npmOutput}`)) {
         return '装 pnpm 时网络失败。若你在受限网络下，corepack 的 shim 也下载不到 pnpm 本体——请改用完整安装或指定镜像：brew install pnpm（macOS/Linux），或 npm i -g pnpm --registry <你的镜像> / Network failure while installing pnpm. On a restricted network the corepack shim cannot download pnpm either — install it fully or point at a mirror: `brew install pnpm`, or `npm i -g pnpm --registry <your mirror>`';
     }
-    return undefined;
+    // Everything reported success and pnpm still will not run (#228 by
+    // @ZhengXin1023: corepack exit=0, npm -g exit=0, npm found — and the
+    // install button stayed locked with nothing said).
+    //
+    // This used to return undefined, which left the case that most needs an
+    // explanation with none: the user is told "setup failed" while every step
+    // they can see succeeded, and their complaint was exactly that — "又不告诉
+    // 我怎么手动配置". Whatever the cause, the actionable question is the same
+    // one, so ask it: where is pnpm, and is that anywhere this process looks?
+    const searched = toolSearchDirs().join(process.platform === 'win32' ? ' ; ' : ' : ');
+    const locate = process.platform === 'win32' ? 'where pnpm' : 'which pnpm';
+    return `pnpm 装好了，但这个 dsh 进程仍然启动不了它——安装步骤都成功，只是装到的位置不在它搜索的范围内。已找过：${searched}。请在终端执行 \`${locate}\` 看 pnpm 实际在哪：如果它不在上面这些目录里，把该目录设为 PNPM_HOME 后重启 dsh（\`export PNPM_HOME=<那个目录>\`），或者干脆从一个能直接运行 pnpm 的终端里启动 dsh。注意必须重启——正在运行的进程读不到新设的环境变量 / pnpm is installed but this dsh process still cannot start it: every step succeeded, the binary just landed somewhere this process does not look. Searched: ${searched}. Run \`${locate}\` in a terminal to see where pnpm actually is; if that directory is not in the list above, set PNPM_HOME to it and restart dsh (\`export PNPM_HOME=<that directory>\`), or simply start dsh from a terminal where \`pnpm\` already runs. The restart matters — a running process cannot see a newly set variable`;
 }
 /** Singleton progress state; the status route reads it, runDshPlugin writes it. */
 export const progress = {
@@ -677,7 +733,16 @@ export function createDesktopPluginRuntime(service, activeProfileDir, invokingDi
         const abort = new AbortController();
         let handle;
         try {
-            handle = service.runPlugin(prepared.args, invokingDir, abort.signal);
+            // `add` goes through Anywhere Labs' install boundary when that host
+            // publishes one, because their Desktop rejects `add` on `runPlugin`
+            // outright. Feature-detected, never assumed: this method is theirs
+            // alone, and on every other client — including the other desktop app
+            // in #292 — the ordinary call below is what runs, unchanged.
+            const boundary = prepared.args[0] === 'add' ? service.runExternalMarketPluginInstall : undefined;
+            const viaBoundary = boundary === undefined ? null : await exactNpmArgs(prepared.args);
+            handle = boundary === undefined || viaBoundary === null
+                ? service.runPlugin(prepared.args, invokingDir, abort.signal)
+                : boundary.call(service, viaBoundary, invokingDir, abort.signal);
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);

package/lib/sources.js

@@ -9,7 +9,7 @@ function validSubpath(subpath) {
     return !subpath.split('/').some(seg => seg === '' || seg === '.' || seg === '..');
 }
 /** Registry tarball names must be plain npm package names, nothing fancier. */
-const NPM_NAME_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
+export const NPM_NAME_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
 /**
  * Parse a registry source url: a github repo, optionally with a
  * `/tree/<branch>/<subpath>` suffix (how the curated list links monorepo

package/lib/types/dsh-cli.d.ts

@@ -154,17 +154,55 @@ export interface PluginCommandRuntime {
     }>;
     cancelActive(): boolean;
 }
-/** Structural subset of DSH Desktop's public `desktopPnpm` contract. */
+/** One running package operation, however it was started. */
+export interface DesktopPnpmHandleLike {
+    readonly stdout: NodeJS.ReadableStream;
+    readonly stderr: NodeJS.ReadableStream;
+    readonly done: Promise<{
+        readonly exitCode: number | null;
+        readonly signal: NodeJS.Signals | null;
+    }>;
+    cancel(): void;
+}
+/**
+ * Structural subset of DSH Desktop's public `desktopPnpm` contract.
+ *
+ * Anywhere Labs' DSH Desktop is ONE third-party client among several, and
+ * this interface exists only for it. Nothing here is part of the official
+ * DSH protocol — `desktopPnpm`, `installPlugin` and the install boundary
+ * below appear nowhere in `@deepseek-ai/*`. Every other client the market
+ * runs under, including other desktop apps, installs through the ordinary
+ * `dsh plugin --profile <p> add` CLI, and so does the market itself when
+ * none of these services are present.
+ *
+ * That is why every member past `runPlugin` is optional and reached by
+ * feature detection. A host that does not publish one simply never enters
+ * the branch, and the ordinary path it already used stays untouched — the
+ * cost of accommodating one vendor must not be paid by the others, or by
+ * the far larger number of people on plain `dsh web`.
+ */
 export interface DesktopPnpmLike {
-    runPlugin(args: readonly string[], invokingDir: string, signal?: AbortSignal): {
-        readonly stdout: NodeJS.ReadableStream;
-        readonly stderr: NodeJS.ReadableStream;
-        readonly done: Promise<{
-            readonly exitCode: number | null;
-            readonly signal: NodeJS.Signals | null;
-        }>;
-        cancel(): void;
-    };
+    runPlugin(args: readonly string[], invokingDir: string, signal?: AbortSignal): DesktopPnpmHandleLike;
+    /**
+     * Desktop 2.x refuses `add` through `runPlugin` — "plugin add must use the
+     * recoverable install boundary" (#215, #219, #272) — and offers this
+     * instead, which their launcher enables only for the selected market
+     * provider. Same arguments, same handle, no recovery receipt and no
+     * write-ahead log for the caller to reconcile.
+     *
+     * Optional because it is theirs: absent on every other host, including
+     * the other third-party desktop client in #292, which installs perfectly
+     * well through the ordinary CLI.
+     *
+     * Read from their published source rather than assumed: it accepts ONLY
+     * `add` with exactly one target of the form `name@exact.version`
+     * (`validateExternalMarketInstallArgs` in dsh-plugin-desktop/src/pnpm.ts).
+     * A `github:owner/repo` target is rejected before any process starts, so
+     * the 1085 catalog entries with no npm package — 57% of it — cannot be
+     * installed on that host by any spelling this market could send. That is
+     * a gap in their contract, not something to work around here.
+     */
+    runExternalMarketPluginInstall?(args: readonly string[], invokingDir: string, signal?: AbortSignal): DesktopPnpmHandleLike;
 }
 /** Desktop runtime also owns cleanup of any operation started by this fiber. */
 export interface DesktopPluginRuntime extends PluginCommandRuntime {

package/lib/types/sources.d.ts

@@ -2,6 +2,8 @@
  * Registry-source knowledge: how a curated registry entry's URL maps to an
  * installable pnpm target. Pure string logic, no I/O.
  */
+/** Registry tarball names must be plain npm package names, nothing fancier. */
+export declare const NPM_NAME_RE: RegExp;
 /**
  * Parse a registry source url: a github repo, optionally with a
  * `/tree/<branch>/<subpath>` suffix (how the curated list links monorepo

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

package/src/dsh-cli.ts

@@ -17,6 +17,8 @@ import { createProgressTracker, type ProgressPhase } from './ndjson.ts'
 import { pluginArgsFor } from './pnpm-compat.ts'
 import { isDshProfileName, profileDir } from './profile.ts'
 import { activeRegion, DEFAULT_NPM_REGISTRY, routesFor, type Region } from './regions.ts'
+import { NPM_NAME_RE } from './sources.ts'
+import { fetchNpmLatest } from './updates.ts'
 
 // 15 min default (slow networks + git installs), overridable for CI/tests.
 // (#6 by @qichuang321.)
@@ -186,7 +188,10 @@ export function toolSearchDirs(
     dirs.push(join(home, 'Library', 'pnpm'), join(home, '.local', 'share', 'pnpm'))
   }
   dirs.push(nodeBinDir, ...extraPathDirs)
-  return dirs
+  // Deduped: PNPM_HOME usually names one of the defaults below it, and a
+  // list that says the same directory twice reads as carelessness in the
+  // one place a user goes looking for an answer.
+  return [...new Set(dirs.filter(dir => dir.trim() !== ''))]
 }
 
 function spawnEnv(): NodeJS.ProcessEnv {
@@ -328,21 +333,102 @@ export interface PluginCommandRuntime {
   cancelActive(): boolean
 }
 
-/** Structural subset of DSH Desktop's public `desktopPnpm` contract. */
+/** One running package operation, however it was started. */
+export interface DesktopPnpmHandleLike {
+  readonly stdout: NodeJS.ReadableStream
+  readonly stderr: NodeJS.ReadableStream
+  readonly done: Promise<{
+    readonly exitCode: number | null
+    readonly signal: NodeJS.Signals | null
+  }>
+  cancel(): void
+}
+
+/**
+ * Structural subset of DSH Desktop's public `desktopPnpm` contract.
+ *
+ * Anywhere Labs' DSH Desktop is ONE third-party client among several, and
+ * this interface exists only for it. Nothing here is part of the official
+ * DSH protocol — `desktopPnpm`, `installPlugin` and the install boundary
+ * below appear nowhere in `@deepseek-ai/*`. Every other client the market
+ * runs under, including other desktop apps, installs through the ordinary
+ * `dsh plugin --profile <p> add` CLI, and so does the market itself when
+ * none of these services are present.
+ *
+ * That is why every member past `runPlugin` is optional and reached by
+ * feature detection. A host that does not publish one simply never enters
+ * the branch, and the ordinary path it already used stays untouched — the
+ * cost of accommodating one vendor must not be paid by the others, or by
+ * the far larger number of people on plain `dsh web`.
+ */
 export interface DesktopPnpmLike {
   runPlugin(
     args: readonly string[],
     invokingDir: string,
     signal?: AbortSignal,
-  ): {
-    readonly stdout: NodeJS.ReadableStream
-    readonly stderr: NodeJS.ReadableStream
-    readonly done: Promise<{
-      readonly exitCode: number | null
-      readonly signal: NodeJS.Signals | null
-    }>
-    cancel(): void
-  }
+  ): DesktopPnpmHandleLike
+
+  /**
+   * Desktop 2.x refuses `add` through `runPlugin` — "plugin add must use the
+   * recoverable install boundary" (#215, #219, #272) — and offers this
+   * instead, which their launcher enables only for the selected market
+   * provider. Same arguments, same handle, no recovery receipt and no
+   * write-ahead log for the caller to reconcile.
+   *
+   * Optional because it is theirs: absent on every other host, including
+   * the other third-party desktop client in #292, which installs perfectly
+   * well through the ordinary CLI.
+   *
+   * Read from their published source rather than assumed: it accepts ONLY
+   * `add` with exactly one target of the form `name@exact.version`
+   * (`validateExternalMarketInstallArgs` in dsh-plugin-desktop/src/pnpm.ts).
+   * A `github:owner/repo` target is rejected before any process starts, so
+   * the 1085 catalog entries with no npm package — 57% of it — cannot be
+   * installed on that host by any spelling this market could send. That is
+   * a gap in their contract, not something to work around here.
+   */
+  runExternalMarketPluginInstall?(
+    args: readonly string[],
+    invokingDir: string,
+    signal?: AbortSignal,
+  ): DesktopPnpmHandleLike
+}
+
+/** An npm name with a fully pinned version — the only target their boundary takes. */
+const EXACT_NPM_TARGET_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*@\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/
+
+/**
+ * Rewrite an `add` argv into the shape Anywhere Labs' install boundary
+ * accepts, or null when it cannot be expressed there.
+ *
+ * Their validator wants exactly one target of the form `name@1.2.3` — not a
+ * bare name, not `@latest`, and not a `github:` source (read from
+ * `validateExternalMarketInstallArgs`, dsh-plugin-desktop/src/pnpm.ts). The
+ * market sends a bare name for a registry plugin and `dshmarket@latest` for
+ * itself, so both need the version resolved before that boundary will take
+ * them.
+ *
+ * Returning null is a normal outcome, not a failure: a github-sourced plugin
+ * has no `name@version` spelling at all. The caller falls back to the
+ * ordinary path, which on that host reports their own refusal — an accurate
+ * message about their contract, rather than one this package invented.
+ */
+async function exactNpmArgs(args: readonly string[]): Promise<string[] | null> {
+  const targets = args.slice(1).filter(argument => !argument.startsWith('-'))
+  const target = targets[0]
+  if (targets.length !== 1 || target === undefined) return null
+  if (EXACT_NPM_TARGET_RE.test(target)) return [...args]
+  // A bare name, or one pinned to a dist-tag. Only a registry package can be
+  // resolved; `github:owner/repo` and file paths stop here.
+  const at = target.lastIndexOf('@')
+  const name = at > 0 ? target.slice(0, at) : target
+  if (!NPM_NAME_RE.test(name)) return null
+  const version = await fetchNpmLatest(name)
+  if (version === null) return null
+  const rewritten = `${name}@${version}`
+  if (!EXACT_NPM_TARGET_RE.test(rewritten)) return null
+  logEvent('info', 'install', `desktop install boundary needs an exact version: ${target} -> ${rewritten}`)
+  return args.map(argument => (argument === target ? rewritten : argument))
 }
 
 /** Desktop runtime also owns cleanup of any operation started by this fiber. */
@@ -553,7 +639,18 @@ export function provisionHint(corepackOutput: string, npmOutput: string, npmFoun
   if (/ETIMEDOUT|ECONNREFUSED|ENOTFOUND|EAI_AGAIN|network|proxy|certificate/i.test(`${corepackOutput}\n${npmOutput}`)) {
     return '装 pnpm 时网络失败。若你在受限网络下，corepack 的 shim 也下载不到 pnpm 本体——请改用完整安装或指定镜像：brew install pnpm（macOS/Linux），或 npm i -g pnpm --registry <你的镜像> / Network failure while installing pnpm. On a restricted network the corepack shim cannot download pnpm either — install it fully or point at a mirror: `brew install pnpm`, or `npm i -g pnpm --registry <your mirror>`'
   }
-  return undefined
+  // Everything reported success and pnpm still will not run (#228 by
+  // @ZhengXin1023: corepack exit=0, npm -g exit=0, npm found — and the
+  // install button stayed locked with nothing said).
+  //
+  // This used to return undefined, which left the case that most needs an
+  // explanation with none: the user is told "setup failed" while every step
+  // they can see succeeded, and their complaint was exactly that — "又不告诉
+  // 我怎么手动配置". Whatever the cause, the actionable question is the same
+  // one, so ask it: where is pnpm, and is that anywhere this process looks?
+  const searched = toolSearchDirs().join(process.platform === 'win32' ? ' ; ' : ' : ')
+  const locate = process.platform === 'win32' ? 'where pnpm' : 'which pnpm'
+  return `pnpm 装好了，但这个 dsh 进程仍然启动不了它——安装步骤都成功，只是装到的位置不在它搜索的范围内。已找过：${searched}。请在终端执行 \`${locate}\` 看 pnpm 实际在哪：如果它不在上面这些目录里，把该目录设为 PNPM_HOME 后重启 dsh（\`export PNPM_HOME=<那个目录>\`），或者干脆从一个能直接运行 pnpm 的终端里启动 dsh。注意必须重启——正在运行的进程读不到新设的环境变量 / pnpm is installed but this dsh process still cannot start it: every step succeeded, the binary just landed somewhere this process does not look. Searched: ${searched}. Run \`${locate}\` in a terminal to see where pnpm actually is; if that directory is not in the list above, set PNPM_HOME to it and restart dsh (\`export PNPM_HOME=<that directory>\`), or simply start dsh from a terminal where \`pnpm\` already runs. The restart matters — a running process cannot see a newly set variable`
 }
 
 /** Live progress of the running plugin command, for the status route. */
@@ -785,9 +882,18 @@ export function createDesktopPluginRuntime(
     }
 
     const abort = new AbortController()
-    let handle: ReturnType<DesktopPnpmLike['runPlugin']>
+    let handle: DesktopPnpmHandleLike
     try {
-      handle = service.runPlugin(prepared.args, invokingDir, abort.signal)
+      // `add` goes through Anywhere Labs' install boundary when that host
+      // publishes one, because their Desktop rejects `add` on `runPlugin`
+      // outright. Feature-detected, never assumed: this method is theirs
+      // alone, and on every other client — including the other desktop app
+      // in #292 — the ordinary call below is what runs, unchanged.
+      const boundary = prepared.args[0] === 'add' ? service.runExternalMarketPluginInstall : undefined
+      const viaBoundary = boundary === undefined ? null : await exactNpmArgs(prepared.args)
+      handle = boundary === undefined || viaBoundary === null
+        ? service.runPlugin(prepared.args, invokingDir, abort.signal)
+        : boundary.call(service, viaBoundary, invokingDir, abort.signal)
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error)
       const busy = /another desktop pnpm operation is already running/i.test(message)

package/src/sources.ts

@@ -11,7 +11,7 @@ function validSubpath(subpath: string): boolean {
 }
 
 /** Registry tarball names must be plain npm package names, nothing fancier. */
-const NPM_NAME_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/
+export const NPM_NAME_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/
 
 /**
  * Parse a registry source url: a github repo, optionally with a