dsh-hot-reload 0.2.1 → 0.2.2

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to `dsh-hot-reload` are documented here. This project
 follows [semantic versioning](https://semver.org/).
 
+## 0.2.2
+
+Reloads now re-import a plugin's whole package, not just its entry module.
+Config and API unchanged.
+
+**Fixes**
+
+- **Multi-file plugins reload as one unit.** The reload used to invalidate only
+  the entry URL and re-import it. Under a hoisted linker (`nodeLinker: hoisted`)
+  a version bump rewrites the package's files in place, so the entry's relative
+  imports (`./routes.js` and friends) resolved to the same URLs and hit the
+  stale cache — the running plugin mixed new entry code with old dependency code,
+  which for a plugin like `dshmarket` surfaced as a crash looking for a file the
+  new version had deleted. The reload now invalidates every cached module under
+  the package's own directory (in both the ESM `loadCache` and the CJS
+  `require.cache`) before re-importing, so the entry and its in-package imports
+  come back together. Shared dependencies live outside that directory and are
+  left alone.
+
 ## 0.2.1
 
 Code-review fixes to the 0.2.0 notification surfaces. No config or API changes,

package/README.md

@@ -1,6 +1,6 @@
 # dsh-hot-reload
 
-English | [中文](README.zh.md)
+English | [中文](README-zh.md)
 
 Live-reload upgraded [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) (dsh) plugins **without restarting dsh**.
 

package/lib/index.js

@@ -1,8 +1,9 @@
 // dsh-hot-reload — live-reload upgraded dsh plugins without restarting dsh.
 //
 // It watches the profile's pnpm-lock.yaml; when an already-loaded plugin
-// package's version changes, it invalidates that module's caches, re-imports
-// the new code, and swaps the running plugin fiber in place — the same
+// package's version changes, it invalidates that package's cached modules
+// (entry plus in-package imports), re-imports the new code, and swaps the
+// running plugin fiber in place — the same
 // technique cordis-plugin-hmr uses, but reaching into node_modules (which HMR
 // deliberately ignores).
 //
@@ -29,8 +30,8 @@
 import { watch } from "chokidar";
 import { readFileSync, existsSync } from "node:fs";
 import { createRequire } from "node:module";
-import { fileURLToPath } from "node:url";
-import { join } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { dirname, join } from "node:path";
 
 export const name = "dsh-hot-reload";
 
@@ -272,6 +273,49 @@ export function apply(ctx, config = {}) {
     } catch {}
   }
 
+  /** Directory, as a trailing-slash file:// URL, of the nearest ancestor that
+   *  has a package.json — the package this module belongs to. A version bump
+   *  rewrites every file inside it in place under a hoisted linker, so a reload
+   *  must drop the whole directory, not just the entry. Returns null when no
+   *  package.json is found (defensive; a node_modules package always has one). */
+  function packageRootUrlOf(url) {
+    let dir = dirname(fileURLToPath(url));
+    for (;;) {
+      if (existsSync(join(dir, "package.json"))) {
+        const href = pathToFileURL(dir).href;
+        return href.endsWith("/") ? href : `${href}/`;
+      }
+      const parent = dirname(dir);
+      if (parent === dir) return null;
+      dir = parent;
+    }
+  }
+
+  /** Invalidate every cached module under one package directory — the entry and
+   *  its transitive in-package imports. Re-importing only the entry would leave
+   *  `./routes.js` and friends on their stale cache entries (the URLs are
+   *  unchanged under a hoisted linker), so the running plugin would mix old and
+   *  new code. Shared dependencies live OUTSIDE this directory and are left
+   *  alone: re-importing them would be wasteful and would fork shared classes. */
+  function invalidateTree(rootUrl) {
+    if (!rootUrl) return;
+    // ESM loadCache.
+    try {
+      for (const u of Map.prototype.keys.call(internal.loadCache)) {
+        if (typeof u === "string" && u.startsWith(rootUrl)) {
+          Map.prototype.delete.call(internal.loadCache, u);
+        }
+      }
+    } catch {}
+    // CJS: modules imported via import() also land in the require cache on Node 24.
+    try {
+      const rootPath = fileURLToPath(rootUrl);
+      for (const fp of Object.keys(cjsRequire.cache)) {
+        if (fp.startsWith(rootPath)) delete cjsRequire.cache[fp];
+      }
+    } catch {}
+  }
+
   /** Reload one loaded entry's module in place. Throws on failure, after rolling
    *  the old plugin back — except when teardown began mid-reload, where it drops
    *  the new plugin and does NOT roll back (the dying context disposes what is
@@ -290,7 +334,14 @@ export function apply(ctx, config = {}) {
     const url = await resolveUrl(specifier, parentURL);
     if (!url) throw new Error(`could not resolve ${specifier}`);
 
-    invalidate(url); // matters for in-place edits; harmless no-op for a version bump (new realpath)
+    // Drop the whole package directory, not just the entry: under a hoisted
+    // linker a version bump rewrites files in place (same URLs), so the entry's
+    // relative imports would otherwise re-hit the stale cache and mix old and
+    // new code. Falls back to the single-URL invalidation only when no
+    // package.json is found.
+    const rootUrl = packageRootUrlOf(url);
+    if (rootUrl) invalidateTree(rootUrl);
+    else invalidate(url);
 
     // Read the version as close to the import as possible: this is what the
     // fresh module actually is, and the only value safe to commit.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-hot-reload",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "type": "module",
   "description": "Live-reload upgraded DeepSeek Harness (dsh) plugins without restarting dsh \u2014 the running plugin is swapped in place, and a reload that fails rolls back to the working old version and asks for a manual restart.",
   "keywords": [
@@ -36,7 +36,7 @@
     "lib",
     "cordis.patch.yml",
     "README.md",
-    "README.zh.md",
+    "README-zh.md",
     "CHANGELOG.md",
     "LICENSE"
   ],