dsh-plugin-experts 0.1.0 → 0.1.2

package/dist/dsh-package.mjs

@@ -0,0 +1,116 @@
+/**
+ * Reaching an official Harness package from a third-party Host half.
+ *
+ * Why this exists: `install_bundle` links a workspace directory into the
+ * profile, and Node resolves a plugin's bare-specifier imports from that
+ * directory's **realpath** — the user's source tree, far outside the dsh
+ * installation. So `import '@deepseek-ai/dsh-mcp-client'` fails with
+ * ERR_MODULE_NOT_FOUND even though the package is right there in the running
+ * app. Verified on 0.2.0-rc.2; see docs/PORTING-NOTES.md §9.
+ *
+ * The anchor order mirrors app-boot's own `resolveBundleDir`: the installation
+ * first, the profile second, so an in-box package is never shadowed by a
+ * profile-local copy. Resolution through the same anchor also means the import
+ * lands on the same absolute file the official rows use, so Node's module cache
+ * hands back the same instance rather than a second one.
+ *
+ * @module shared/dsh-package
+ */
+
+import { createRequire } from 'node:module'
+import { isAbsolute, join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+
+/**
+ * Candidate resolution anchors, most authoritative first.
+ * @param {{ argv?: readonly string[], cwd?: string }} [options] - overrides for tests.
+ * @returns {string[]} absolute anchors suitable for `createRequire`.
+ */
+export function dshResolutionAnchors({ argv = process.argv, cwd = process.cwd() } = {}) {
+  const anchors = []
+  // The script the host process was started with lives inside the installation:
+  //   <dsh home>/node_modules/@deepseek-ai/dsh-desktop-host/lib/index.js
+  if (typeof argv[1] === 'string' && isAbsolute(argv[1])) anchors.push(argv[1])
+  // The desktop host is additionally handed the dsh home as its first argument.
+  if (typeof argv[2] === 'string' && isAbsolute(argv[2])) anchors.push(join(argv[2], 'package.json'))
+  // Profile-local packages last, so they can never shadow the installation.
+  anchors.push(join(cwd, 'package.json'))
+  return [...new Set(anchors)]
+}
+
+/**
+ * Test seam: specifiers answered from memory instead of the installation.
+ *
+ * Offline verification runs a Host half's `apply()` outside DSH, where the
+ * installation does not exist. A feature that needs `storageDomain` or the MCP
+ * client would otherwise be unverifiable until it is installed — exactly the
+ * situation shared/host/route.mjs and the rest of the harness exist to avoid.
+ *
+ * This only substitutes *resolution*; the real anchor walk stays the default and
+ * is covered directly by tests/dsh-package.test.mjs.
+ *
+ * The map lives on `globalThis` under a symbol: the published bundle ships this
+ * file as its own module (`dist/dsh-package.mjs`), so a test process holds two
+ * instances of it — the repo copy and the bundle copy. Module-level state would
+ * split them, and stubs registered through the repo copy would silently stop
+ * resolving inside the bundle. One shared registry keeps every instance honest.
+ * @type {Map<string, Record<string, unknown>>}
+ */
+const STUBS_KEY = Symbol.for('dsh-skills:dsh-package-stubs')
+const stubs = (globalThis[STUBS_KEY] ??= new Map())
+
+/**
+ * Answer one specifier from memory for the rest of this process.
+ * @param {string} specifier - package name to stub.
+ * @param {Record<string, unknown>} module - the module namespace to return.
+ * @returns {void}
+ */
+export function setDshPackageStub(specifier, module) {
+  stubs.set(specifier, module)
+}
+
+/** Remove every stub. */
+export function clearDshPackageStubs() {
+  stubs.clear()
+}
+
+/**
+ * Resolve an official package to its entry file.
+ * @param {string} specifier - the package name to resolve.
+ * @param {{ argv?: readonly string[], cwd?: string }} [options] - overrides for tests.
+ * @returns {string} absolute path of the resolved entry file.
+ * @throws {Error} with the anchors and codes tried when nothing resolves.
+ */
+export function resolveDshPackage(specifier, options = {}) {
+  if (stubs.has(specifier)) return `stub:${specifier}`
+  const tried = []
+  for (const anchor of dshResolutionAnchors(options)) {
+    try {
+      return createRequire(anchor).resolve(specifier)
+    } catch (error) {
+      tried.push(`${anchor} (${error?.code ?? error?.name ?? 'error'})`)
+    }
+  }
+  throw new Error(
+    `dsh-skills: cannot resolve ${JSON.stringify(specifier)} from the dsh installation or the profile.\n`
+    + `Tried: ${tried.join(', ')}\n`
+    + 'A Host half must not import an official package by bare specifier: Node resolves that from\n'
+    + "this plugin's realpath, which is outside the installation. Use importDshPackage() instead.",
+  )
+}
+
+/**
+ * Import an official package from the installation.
+ *
+ * Resolving to the same absolute file the official rows use means a second
+ * module instance is never created, which matters for plugins that coordinate
+ * through module-level state (for example mcp-client's `serverName` reservations).
+ * @param {string} specifier - the package name to import.
+ * @param {{ argv?: readonly string[], cwd?: string }} [options] - overrides for tests.
+ * @returns {Promise<Record<string, unknown>>} the imported module namespace.
+ */
+export async function importDshPackage(specifier, options) {
+  const stub = stubs.get(specifier)
+  if (stub !== undefined) return stub
+  return import(pathToFileURL(resolveDshPackage(specifier, options)).href)
+}

package/dist/host.js

@@ -60,7 +60,8 @@ function dshResolutionAnchors({ argv = process.argv, cwd = process.cwd() } = {})
   anchors.push(join(cwd, "package.json"));
   return [...new Set(anchors)];
 }
-var stubs = /* @__PURE__ */ new Map();
+var STUBS_KEY = /* @__PURE__ */ Symbol.for("dsh-skills:dsh-package-stubs");
+var stubs = globalThis[STUBS_KEY] ??= /* @__PURE__ */ new Map();
 function resolveDshPackage(specifier, options = {}) {
   if (stubs.has(specifier)) return `stub:${specifier}`;
   const tried = [];
@@ -951,6 +952,7 @@ function registerExpertManagerSkill(ctx) {
 }
 
 // ../library/src/tools.js
+import { importDshPackage as importDshPackage2 } from "./dsh-package.mjs";
 function compileValue(node) {
   if (node === null || typeof node !== "object") throw new Error("dsh-plugin-library: schema node must be an object");
   if (node.type === "object") {
@@ -1003,7 +1005,7 @@ var cached2;
 async function loadDefineTool() {
   if (cached2 !== void 0) return cached2;
   try {
-    const mod = await importDshPackage("@deepseek-ai/dsh-tools");
+    const mod = await importDshPackage2("@deepseek-ai/dsh-tools");
     if (typeof mod?.defineTool === "function") {
       cached2 = mod.defineTool;
       return cached2;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "dsh-plugin-experts",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "可复用的专家角色：草稿、不可变的已发布修订，以及按会话采用。",
   "type": "module",
   "main": "dist/host.js",
   "exports": {
-    ".": "./index.js",
+    ".": "./dist/host.js",
     "./client": "./dist/client.js",
     "./package.json": "./package.json",
     "./locale/*.json": "./locale/*.json"
@@ -30,6 +30,7 @@
   "files": [
     "dist/host.js",
     "dist/client.js",
+    "dist/dsh-package.mjs",
     "cordis.patch.yml",
     "locale/*.json",
     "resources/**/*",