better-dsh 0.2.5 → 0.3.0

package/lib/bundle-delivery.d.ts

@@ -0,0 +1,20 @@
+import { Context } from "@deepseek-ai/cordis";
+import { ProfileContext } from "@deepseek-ai/dsh-app-boot";
+
+//#region src/bundle-delivery.d.ts
+declare const name = "dashr-bundle-delivery";
+declare const inject: string[];
+interface DeliveryResult {
+  installed: string[];
+  restartRequired: boolean;
+}
+/** First registration enables a companion; native reconciliation preserves retained disablement. */
+declare function reconcileBundledDelivery(profile: ProfileContext, signal?: AbortSignal): Promise<DeliveryResult>;
+declare function apply(ctx: Context): void;
+declare const _default: {
+  name: string;
+  inject: string[];
+  apply: typeof apply;
+};
+//#endregion
+export { apply, _default as default, inject, name, reconcileBundledDelivery };

package/lib/bundle-delivery.js

@@ -0,0 +1,209 @@
+import { createHash, randomUUID } from "node:crypto";
+import { spawn } from "node:child_process";
+import { mkdir, readFile, realpath, rename, rm, writeFile } from "node:fs/promises";
+import { dirname, isAbsolute, join, relative, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { withFileLock, writeFileAtomic } from "@deepseek-ai/dsh-atomic-write";
+
+//#region src/bundle-delivery.ts
+const name = "dashr-bundle-delivery";
+const inject = ["profileContext", "appReady"];
+const hash = (bytes) => createHash("sha256").update(bytes).digest("hex");
+const json = async (path$1) => JSON.parse(await readFile(path$1, "utf8"));
+async function optionalJson(path$1) {
+	try {
+		return await json(path$1);
+	} catch (error) {
+		if (error.code === "ENOENT") return void 0;
+		throw error;
+	}
+}
+async function contained(root, path$1) {
+	if (isAbsolute(path$1)) throw new Error("Pack delivery path must be relative");
+	const base = await realpath(root), file = await realpath(resolve(base, path$1));
+	const rel = relative(base, file);
+	if (rel === ".." || rel.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`) || isAbsolute(rel)) throw new Error("Pack delivery path escapes its owner");
+	return file;
+}
+/** A child process avoids inheriting a running HMR transaction's AsyncLocalStorage. */
+async function installNative(profile, archive, expected, signal) {
+	signal?.throwIfAborted();
+	const childScript = fileURLToPath(new URL("../scripts/register-bundle.mjs", import.meta.url));
+	return new Promise((done, fail) => {
+		const child = spawn(process.execPath, [childScript], {
+			stdio: [
+				"pipe",
+				"pipe",
+				"pipe"
+			],
+			cwd: profile.dir
+		});
+		let output = "", diagnostic = "";
+		const abort = () => {
+			child.kill("SIGTERM");
+		};
+		const timeout = setTimeout(abort, 36e4);
+		signal?.addEventListener("abort", abort, { once: true });
+		child.stdout.setEncoding("utf8").on("data", (chunk) => {
+			output = (output + chunk).slice(-32768);
+		});
+		child.stderr.setEncoding("utf8").on("data", (chunk) => {
+			diagnostic = (diagnostic + chunk).slice(-4096);
+		});
+		child.on("error", fail);
+		child.on("close", (code) => {
+			clearTimeout(timeout);
+			signal?.removeEventListener("abort", abort);
+			if (signal?.aborted) {
+				fail(signal.reason);
+				return;
+			}
+			if (code !== 0) {
+				fail(/* @__PURE__ */ new Error(`Native companion registration failed (${code}): ${diagnostic.trim() || output.trim()}`));
+				return;
+			}
+			try {
+				const result = JSON.parse(output);
+				if (result.exitCode !== 0) fail(/* @__PURE__ */ new Error(`Native companion registration failed (${result.exitCode}); diagnostics: ${result.logPath ?? "unavailable"}`));
+				else if (![
+					"installed",
+					"owner-changed",
+					"companion-changed",
+					"companion-removed"
+				].includes(result.disposition)) fail(/* @__PURE__ */ new Error("Native companion registration returned an invalid disposition"));
+				else done(result.disposition);
+			} catch (error) {
+				fail(error);
+			}
+		});
+		child.stdin.on("error", () => {});
+		child.stdin.end(JSON.stringify({
+			profile,
+			archive,
+			expected
+		}));
+	});
+}
+/** First registration enables a companion; native reconciliation preserves retained disablement. */
+async function reconcileBundledDelivery(profile, signal) {
+	const directory = join(profile.home, "bundle-artifacts");
+	await mkdir(directory, {
+		recursive: true,
+		mode: 448
+	});
+	const key = hash(profile.dir);
+	return withFileLock(join(directory, key + ".delivery"), async () => {
+		signal?.throwIfAborted();
+		const receiptPath = join(directory, key + ".json");
+		const receipts = await optionalJson(receiptPath) ?? {};
+		const manifest = await json(join(profile.dir, "package.json"));
+		const result = {
+			installed: [],
+			restartRequired: false
+		};
+		for (const owner of Object.keys(manifest.dependencies ?? {})) {
+			const ownerDir = join(profile.dir, "node_modules", owner);
+			const ownerManifest = await optionalJson(join(ownerDir, "package.json"));
+			if (ownerManifest?.superd?.delivery === void 0) continue;
+			const descriptorPath = await contained(ownerDir, ownerManifest.superd.delivery);
+			const descriptor = await json(descriptorPath);
+			if (!Array.isArray(descriptor.companions)) throw new Error("Invalid pack delivery descriptor");
+			for (const item of descriptor.companions) {
+				if (item.name !== "better-dsh" || item.version !== ownerManifest.dependencies?.[item.name] || !/^[a-f0-9]{64}$/.test(item.sha256)) throw new Error("Invalid companion identity/version/digest");
+				const bytes = await readFile(await contained(dirname(descriptorPath), item.tarball));
+				if (hash(bytes) !== item.sha256) throw new Error(`Pack companion SHA256 mismatch: ${item.name}`);
+				const archive = join(directory, `${item.name}-${item.sha256}.tgz`);
+				const cached = await optionalJson(join(profile.dir, "node_modules", item.name, "package.json"));
+				const current = await json(join(profile.dir, "package.json"));
+				const ownerSpec = current.dependencies?.[owner];
+				if (ownerSpec === void 0) continue;
+				const priorSpec = current.dependencies?.[item.name];
+				const receiptKey = `${owner}:${item.name}`;
+				if (priorSpec === void 0 && receipts[receiptKey] === item.sha256) continue;
+				if (priorSpec === "file:" + archive && cached?.name === item.name && cached.version === item.version) {
+					receipts[receiptKey] = item.sha256;
+					await writeFileAtomic(receiptPath, JSON.stringify(receipts) + "\n", { mode: 384 });
+					continue;
+				}
+				try {
+					if (hash(await readFile(archive)) !== item.sha256) throw new Error(`Cached companion SHA256 mismatch: ${item.name}`);
+				} catch (error) {
+					if (error.code !== "ENOENT") throw error;
+					const temporary = archive + "." + randomUUID() + ".tmp";
+					try {
+						await writeFile(temporary, bytes, {
+							flag: "wx",
+							mode: 384
+						});
+						await rename(temporary, archive);
+					} finally {
+						await rm(temporary, { force: true });
+					}
+				}
+				signal?.throwIfAborted();
+				const disposition = await installNative(profile, archive, {
+					owner,
+					ownerSpec,
+					companion: item,
+					...priorSpec === void 0 ? {} : { priorSpec }
+				}, signal);
+				if (disposition === "owner-changed" || disposition === "companion-changed") continue;
+				receipts[receiptKey] = item.sha256;
+				await writeFileAtomic(receiptPath, JSON.stringify(receipts) + "\n", { mode: 384 });
+				if (disposition === "companion-removed") continue;
+				result.installed.push(`${item.name}@${item.version}`);
+				result.restartRequired ||= priorSpec !== void 0;
+			}
+		}
+		return result;
+	}, { waitMs: 12e4 });
+}
+function apply(ctx) {
+	const signal = new AbortController();
+	let started = false, running = false, again = false;
+	const reconcile = async () => {
+		if (!started || signal.signal.aborted) return;
+		if (running) {
+			again = true;
+			return;
+		}
+		running = true;
+		try {
+			const result = await reconcileBundledDelivery(ctx.profileContext, signal.signal);
+			if (result.installed.length) {
+				ctx.logger.info(`Registered ${result.installed.join(", ")} from its containing local pack${result.restartRequired ? "; restart DSH to use the updated code" : ""}`);
+				ctx.emit("plugin-manager/changed", { reason: "install" });
+			}
+		} catch (error) {
+			if (!signal.signal.aborted) ctx.logger.error("Local pack companion registration failed; retry by re-enabling the bundle", error);
+		} finally {
+			running = false;
+			if (again && !signal.signal.aborted) {
+				again = false;
+				reconcile();
+			}
+		}
+	};
+	ctx.effect(() => {
+		const offReady = ctx.appReady.onReady(() => {
+			started = true;
+			reconcile();
+		});
+		const offChange = ctx.on("plugin-manager/changed", () => {
+			reconcile();
+		});
+		return () => {
+			offReady();
+			offChange();
+			signal.abort();
+		};
+	}, "bundle-delivery: native registration");
+}
+var bundle_delivery_default = {
+	name,
+	inject,
+	apply
+};
+
+//#endregion
+export { apply, bundle_delivery_default as default, inject, name, reconcileBundledDelivery };

package/lib/chunk-DQxbwPpZ.js

@@ -0,0 +1,30 @@
+import { createRequire } from "node:module";
+
+//#region rolldown:runtime
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __commonJS = (cb, mod) => function() {
+	return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+var __require = /* @__PURE__ */ createRequire(import.meta.url);
+
+//#endregion
+export { __require as n, __toESM as r, __commonJS as t };

package/lib/client/index.js

@@ -64,7 +64,7 @@ const zh = {
 };
 
 //#endregion
-//#region \0dsh-css:/home/u1/workspaces/dashr/better-dsh/src/failover/client/FailoverRow.module.css.mjs
+//#region \0dsh-css:/home/u1/workspaces/superd/better-dsh/src/failover/client/FailoverRow.module.css.mjs
 const css$1 = "\n._440e1d7b_row {\n  display: flex;\n  align-items: center;\n  gap: 8px;\n  padding: 12px 0;\n}\n\n._a4f2ceec_rowText {\n  flex: 1;\n  min-width: 0;\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n}\n\n._9865b509_title {\n  font-weight: 600;\n  font-size: 14px;\n}\n\n\n._3cfec826_slots {\n  display: flex;\n  flex-direction: column;\n  align-items: flex-end;\n  gap: 6px;\n}\n\n._11c2662d_select {\n  width: 280px;\n  max-width: 100%;\n  min-width: 0;\n}\n\n._b7c358f9_alert {\n  color: var(--dsw-alias-danger, #c0392b);\n  font-size: 12px;\n}\n";
 const tagId$1 = "better-dsh/FailoverRow.module.css";
 if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$1) + "]") === null) {
@@ -463,7 +463,7 @@ const zh$1 = {
 };
 
 //#endregion
-//#region \0dsh-css:/home/u1/workspaces/dashr/better-dsh/src/compaction/client/CompactionRow.module.css.mjs
+//#region \0dsh-css:/home/u1/workspaces/superd/better-dsh/src/compaction/client/CompactionRow.module.css.mjs
 const css = "\n\n\n._13e3747c_thresholdRow {\n  display: flex;\n  align-items: center;\n  gap: 8px;\n  padding: 16px 0;\n  border-bottom: 0.5px solid var(--dsw-alias-border-l2);\n}\n\n._8ad3ff3f_thresholdText {\n  flex: 1;\n  min-width: 0;\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n  padding-right: 48px;\n}\n\n._9ffb627e_thresholdTitle {\n  font-size: 14px;\n  font-weight: 400;\n  line-height: 22px;\n  color: var(--dsw-alias-label-primary);\n}\n\n._01bea389_thresholdDesc {\n  font-size: 12px;\n  font-weight: 400;\n  line-height: 18px;\n  color: var(--dsw-alias-label-tertiary);\n}\n\n._7f9578de_thresholdError {\n  font-size: 12px;\n  font-weight: 400;\n  line-height: 18px;\n  color: var(--dsw-alias-danger, #c0392b);\n}\n\n\n._cddd78cd_thresholdControl {\n  display: inline-flex;\n  align-items: center;\n  gap: 8px;\n}\n\n._6058fea9_thresholdStepper {\n  position: relative; \n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  min-width: 72px;\n  height: 36px;\n  border-radius: 18px;\n  background: var(--dsw-alias-bg-module-platform);\n}\n\n._39d30469_thresholdValue {\n  min-width: 18px;\n  text-align: center;\n  font-size: 14px;\n  line-height: 22px;\n  font-variant-numeric: tabular-nums;\n  color: var(--dsw-alias-label-primary);\n}\n\n._68bd35c6_thresholdUnit {\n  font-size: 14px;\n  line-height: 22px;\n  color: var(--dsw-alias-label-secondary);\n}\n\n\n._904da366_thresholdArrows {\n  position: absolute;\n  right: 8px;\n  display: flex;\n  flex-direction: column;\n  gap: 2px;\n  opacity: 0;\n}\n\n._6058fea9_thresholdStepper:hover ._904da366_thresholdArrows,\n._6058fea9_thresholdStepper:focus-within ._904da366_thresholdArrows {\n  opacity: 1;\n}\n\n\n._ae9106b1_thresholdArrow {\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  width: 17px;\n  height: 12px;\n  padding: 0;\n  border: none;\n  border-radius: 3px;\n  background: color-mix(in srgb, var(--dsw-alias-bg-layer-1) 75%, transparent);\n  color: var(--dsw-alias-label-primary);\n  cursor: pointer;\n}\n\n._ae9106b1_thresholdArrow:hover:not(:disabled) {\n  background: var(--dsw-alias-bg-layer-1);\n}\n\n._ae9106b1_thresholdArrow:disabled {\n  color: var(--dsw-alias-label-caption);\n  cursor: default;\n}\n";
 const tagId = "better-dsh/CompactionRow.module.css";
 if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId) + "]") === null) {

package/lib/compaction/index.d.ts

@@ -1,5 +1,5 @@
+import { t as Schema } from "../index-DTDXUe6m.js";
 import { Context, Volatile } from "@deepseek-ai/cordis";
-import z from "@deepseek-ai/schemastery";
 
 //#region src/compaction/config.d.ts
 
@@ -30,7 +30,7 @@ declare const inject: string[];
  * `retainTokens` is composition-only (see {@link DEFAULT_RETAIN_TOKENS}) and
  * stays non-volatile — form writes never touch it, a patch file still can.
  */
-declare const Config: z<CompactionTuningConfig>;
+declare const Config: Schema<CompactionTuningConfig>;
 /**
  * The row config as cordis hands it over post-resolution: the volatile
  * threshold arrives as a live reference, not a plain number.
@@ -50,7 +50,7 @@ declare function apply(ctx: Context, config: ResolvedCompactionTuningConfig | un
 declare const _default: {
   name: string;
   inject: string[];
-  Config: z<CompactionTuningConfig>;
+  Config: Schema<CompactionTuningConfig>;
   apply: typeof apply;
 };
 //#endregion

package/lib/compaction/index.js

@@ -1,5 +1,5 @@
+import { t as Schema } from "../lib-C8_jXvwA.js";
 import { Context } from "@deepseek-ai/cordis";
-import z from "@deepseek-ai/schemastery";
 
 //#region src/compaction/config.ts
 /** Upstream `compaction-basic`'s own default: condense at 80% of the window. */
@@ -42,9 +42,9 @@ const inject = [];
 * `retainTokens` is composition-only (see {@link DEFAULT_RETAIN_TOKENS}) and
 * stays non-volatile — form writes never touch it, a patch file still can.
 */
-const Config = z.object({
-	thresholdRatio: z.number().step(.01).min(THRESHOLD_MIN_RATIO).max(THRESHOLD_MAX_RATIO).default(DEFAULT_THRESHOLD_RATIO).volatile(),
-	retainTokens: z.number().step(1).min(0).default(DEFAULT_RETAIN_TOKENS)
+const Config = Schema.object({
+	thresholdRatio: Schema.number().step(.01).min(THRESHOLD_MIN_RATIO).max(THRESHOLD_MAX_RATIO).default(DEFAULT_THRESHOLD_RATIO).volatile(),
+	retainTokens: Schema.number().step(1).min(0).default(DEFAULT_RETAIN_TOKENS)
 });
 /**
 * Keep the live compaction engine on the user's threshold preference.

package/lib/failover/index.d.ts

@@ -1,5 +1,5 @@
+import { t as Schema } from "../index-DTDXUe6m.js";
 import { Context, Volatile } from "@deepseek-ai/cordis";
-import z from "@deepseek-ai/schemastery";
 
 //#region src/failover/config.d.ts
 
@@ -27,7 +27,7 @@ declare const inject: string[];
  * profile-layer patch override on THIS row's entry, the runtime rewrites the
  * resolved refs in place, and every request re-reads them without a reload.
  */
-declare const Config: z<FailoverConfig>;
+declare const Config: Schema<FailoverConfig>;
 /**
  * The row config as cordis hands it over post-resolution: volatile fields are
  * live references, not plain strings.
@@ -52,7 +52,7 @@ declare function apply(ctx: Context, config: ResolvedFailoverConfig | undefined)
 declare const _default: {
   name: string;
   inject: string[];
-  Config: z<FailoverConfig>;
+  Config: Schema<FailoverConfig>;
   apply: typeof apply;
 };
 //#endregion

package/lib/failover/index.js

@@ -1,6 +1,6 @@
-import { Context } from "@deepseek-ai/cordis";
+import { t as Schema } from "../lib-C8_jXvwA.js";
 import { randomUUID } from "node:crypto";
-import z from "@deepseek-ai/schemastery";
+import { Context } from "@deepseek-ai/cordis";
 import { RetryId } from "@deepseek-ai/dsh-llm-retry";
 
 //#region src/failover/config.ts
@@ -48,9 +48,9 @@ const inject = [];
 * profile-layer patch override on THIS row's entry, the runtime rewrites the
 * resolved refs in place, and every request re-reads them without a reload.
 */
-const Config = z.object({
-	fallback1: z.string().default("").volatile(),
-	fallback2: z.string().default("").volatile()
+const Config = Schema.object({
+	fallback1: Schema.string().default("").volatile(),
+	fallback2: Schema.string().default("").volatile()
 });
 /** Read one field that may be a plain value (tests, defaults) or a live ref (composed row). */
 function readSlot(slot) {

package/lib/fs-aware/sandbox-plugin.js

@@ -1,7 +1,7 @@
-import { f as UrlSchemesError, t as buildFsLayerResolver } from "../wrap-Bzdimp4p.js";
-import { Context } from "@deepseek-ai/cordis";
-import { dirname, sep } from "node:path";
+import { f as UrlSchemesError, t as buildFsLayerResolver } from "../wrap-T4I0nfPM.js";
 import { stat } from "node:fs/promises";
+import { dirname, sep } from "node:path";
+import { Context } from "@deepseek-ai/cordis";
 import { LocalFileSystem } from "@deepseek-ai/dsh-fs-local";
 import { FsError } from "@deepseek-ai/dsh-fs";
 import { writableRoots } from "@deepseek-ai/dsh-sandbox";
@@ -18,19 +18,19 @@ function isMissing(error) {
 	const code = error.code;
 	return MISSING_CODES.has(code);
 }
-function comparablePath(path, caseSensitive) {
-	return caseSensitive ? path : path.toLowerCase();
+function comparablePath(path$1, caseSensitive) {
+	return caseSensitive ? path$1 : path$1.toLowerCase();
 }
-function isLexicallyUnder(path, root, caseSensitive) {
-	const comparableTarget = comparablePath(path, caseSensitive);
+function isLexicallyUnder(path$1, root, caseSensitive) {
+	const comparableTarget = comparablePath(path$1, caseSensitive);
 	const comparableRoot = comparablePath(root, caseSensitive);
 	if (comparableTarget === comparableRoot) return true;
 	const prefix = comparableRoot.endsWith(sep) ? comparableRoot : comparableRoot + sep;
 	return comparableTarget.startsWith(prefix);
 }
-async function statIfPresent(path) {
+async function statIfPresent(path$1) {
 	try {
-		return await stat(path, { bigint: true });
+		return await stat(path$1, { bigint: true });
 	} catch (error) {
 		/* v8 ignore else -- a non-missing stat failure requires a host permission or I/O fault after resolve reached this ancestor. */
 		if (isMissing(error)) return void 0;
@@ -53,11 +53,11 @@ function sameIdentity(left, right) {
 *   to the host filesystem convention used by supported platforms.
 * @returns whether the target is the root or a descendant of it.
 */
-async function isPathUnder(path, root, caseSensitive = process.platform !== "win32") {
-	if (isLexicallyUnder(path, root, caseSensitive)) return true;
+async function isPathUnder(path$1, root, caseSensitive = process.platform !== "win32") {
+	if (isLexicallyUnder(path$1, root, caseSensitive)) return true;
 	const rootInfo = await statIfPresent(root);
 	if (!rootInfo) return false;
-	let ancestor = path;
+	let ancestor = path$1;
 	while (true) {
 		const ancestorInfo = await statIfPresent(ancestor);
 		if (ancestorInfo && sameIdentity(ancestorInfo, rootInfo)) return true;
@@ -170,12 +170,12 @@ var SandboxedFileSystem = class extends LocalFileSystem {
 //#endregion
 //#region src/fs-aware/sandbox-plugin.ts
 /** Scheme prefix test — mirrors the resolver's own grammar. */
-function isSchemePath(path) {
-	return /^[a-z][a-z0-9]*:\/\//.test(path);
+function isSchemePath(path$1) {
+	return /^[a-z][a-z0-9]*:\/\//.test(path$1);
 }
 /** Session-layer schemes are excluded from FS-layer resolution (design D2). */
-function isSessionLayerScheme(path) {
-	return path.startsWith("ctx://") || path.startsWith("agent://") || path.startsWith("skill://");
+function isSessionLayerScheme(path$1) {
+	return path$1.startsWith("ctx://") || path$1.startsWith("agent://") || path$1.startsWith("skill://");
 }
 function sessionLayerError(url) {
 	if (url.startsWith("skill://")) return new UrlSchemesError("CTX_SESSION_LAYER", `${url}: session-layer scheme — skill discovery (which roots load, scan depth, layered scope merge) is the host skill provider's business logic and resolves only against a calling agent, which the filesystem layer does not have. Load skills with the native \`skill\` tool; grep/glob with path=skill://… keep working through the tool layer`);
@@ -213,13 +213,13 @@ var FsAwareSandboxFileSystem = class extends Base {
 			rawUrl: url
 		};
 	}
-	async resolve(path, opts) {
-		if (!this.schemeResolution || !isSchemePath(path)) return super.resolve(path, opts);
-		if (isSessionLayerScheme(path)) throw sessionLayerError(path);
-		await this.resolver.resolve(this.envFor(path), path);
+	async resolve(path$1, opts) {
+		if (!this.schemeResolution || !isSchemePath(path$1)) return super.resolve(path$1, opts);
+		if (isSessionLayerScheme(path$1)) throw sessionLayerError(path$1);
+		await this.resolver.resolve(this.envFor(path$1), path$1);
 		return {
-			targetKey: path,
-			displayPath: path
+			targetKey: path$1,
+			displayPath: path$1
 		};
 	}
 	async stat(target, signal) {

package/lib/hmr.d.ts

@@ -0,0 +1,32 @@
+import Hmr, { HmrConfig } from "@deepseek-ai/dsh-hmr";
+import { Context } from "@deepseek-ai/cordis";
+
+//#region src/hmr.d.ts
+
+/**
+ * Native runExclusive keeps a boolean in ALS. HTTP servers created while
+ * replacing webServer inherit that boolean after the transaction finishes,
+ * so subsequent native Plugin Manager requests are refused as nested.
+ *
+ * The public runExclusive/watchConfig APIs expose no selective context reset.
+ * AsyncLocalStorage.snapshot() also resets AgentRegistry initiator attribution
+ * and its teardown lineage, so it cannot safely repair this host transaction.
+ * This compatibility bridge reads the native TS-private `executing` storage
+ * after checking its runtime shape. It never replaces that storage or changes
+ * upstream files: only exit() clears its inherited value while the unchanged
+ * native method establishes the next transaction. Native queue, closing,
+ * exact watchers, module reload and disposal retain their original semantics.
+ *
+ * The mutable token rejects nesting only while its operation is still active;
+ * resources created by that operation can initiate later transactions.
+ * A native implementation change fails initialization explicitly instead of
+ * silently dropping queue or lifecycle guarantees.
+ */
+declare class BetterHmr extends Hmr {
+  private readonly nativeTransactions;
+  private readonly liveTransactions;
+  constructor(ctx: Context, config: HmrConfig);
+  runExclusive<T>(operation: () => Promise<T>): Promise<T>;
+}
+//#endregion
+export { BetterHmr as default };

package/lib/hmr.js

@@ -0,0 +1,49 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+import Hmr from "@deepseek-ai/dsh-hmr";
+
+//#region src/hmr.ts
+/**
+* Native runExclusive keeps a boolean in ALS. HTTP servers created while
+* replacing webServer inherit that boolean after the transaction finishes,
+* so subsequent native Plugin Manager requests are refused as nested.
+*
+* The public runExclusive/watchConfig APIs expose no selective context reset.
+* AsyncLocalStorage.snapshot() also resets AgentRegistry initiator attribution
+* and its teardown lineage, so it cannot safely repair this host transaction.
+* This compatibility bridge reads the native TS-private `executing` storage
+* after checking its runtime shape. It never replaces that storage or changes
+* upstream files: only exit() clears its inherited value while the unchanged
+* native method establishes the next transaction. Native queue, closing,
+* exact watchers, module reload and disposal retain their original semantics.
+*
+* The mutable token rejects nesting only while its operation is still active;
+* resources created by that operation can initiate later transactions.
+* A native implementation change fails initialization explicitly instead of
+* silently dropping queue or lifecycle guarantees.
+*/
+var BetterHmr = class extends Hmr {
+	nativeTransactions;
+	liveTransactions = new AsyncLocalStorage();
+	constructor(ctx, config) {
+		super(ctx, config);
+		const storage = this.executing;
+		if (!(storage instanceof AsyncLocalStorage) || typeof storage.getStore !== "function" || typeof storage.exit !== "function" || typeof storage.run !== "function") throw new Error("Better Dash HMR cannot reset this native HMR transaction context: expected executing AsyncLocalStorage");
+		this.nativeTransactions = storage;
+	}
+	runExclusive(operation) {
+		if (this.liveTransactions.getStore()?.active) return Promise.reject(/* @__PURE__ */ new Error("HMR transactions cannot be nested"));
+		return this.nativeTransactions.exit(() => super.runExclusive(() => {
+			const token = { active: true };
+			return this.liveTransactions.run(token, async () => {
+				try {
+					return await operation();
+				} finally {
+					token.active = false;
+				}
+			});
+		}));
+	}
+};
+
+//#endregion
+export { BetterHmr as default };