@dsh-electron/dsh-plugin-multi-root-workspace 0.1.12 → 0.1.14

package/lib/{command-CmLekG1M.js → command-Dcz6nULo.js}

@@ -2,11 +2,33 @@ import { t as effectiveDirectory } from "./session-directory-BLOstut1.js";
 import { r as canonicalPath$1 } from "./windows-runner-contract-B5R2K3mM.js";
 import { i as canonicalRoot, o as entryRootRef, p as resolveRootRef, r as availableRoots, t as RootValidationError } from "./roots-Ca_W1S9n.js";
 import { c as skillsRequestSchema, i as parsePanelCall, r as effectiveRootAccess, s as SKILLS_ENDPOINTS, t as PANEL_CHANNEL } from "./contract-CStSEOcK.js";
-import { n as AuthorityRpcError } from "./protocol-4zdwV7u4.js";
+import { n as AuthorityRpcError } from "./protocol-CnR1KTXy.js";
 import { closeSync, lstatSync, openSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { isAbsolute, join } from "node:path";
 import "@deepseek-ai/cordis";
 import { canonicalPath } from "@deepseek-ai/dsh-sandbox";
+//#region src/compat/connection-rpc.ts
+/**
+* Newer Cordis keeps a service getter's definition site when tracing it, so
+* even reading Connection from the root can make its RPC getter capture the
+* provider's context (which does not inject webServer). Invoke the public
+* accessor with the actual consumer context instead. A data property is used
+* unchanged for simpler Connection implementations. The service is not
+* modified and the route remains owned by the injecting fiber.
+*/
+function connectionRpcFor(ctx, connection) {
+	for (let proto = connection; proto !== null; proto = Object.getPrototypeOf(proto)) {
+		const descriptor = Object.getOwnPropertyDescriptor(proto, "rpc");
+		if (descriptor === void 0) continue;
+		if (typeof descriptor.get !== "function") return connection.rpc;
+		const receiver = new Proxy(connection, { get(target, key, proxy) {
+			return key === "ctx" ? ctx : Reflect.get(target, key, proxy);
+		} });
+		return Reflect.apply(descriptor.get, receiver, []);
+	}
+	return connection.rpc;
+}
+//#endregion
 //#region src/profile-isolation.ts
 /**
 * Profile pnpm import isolation — the host-side maintenance behind
@@ -751,12 +773,12 @@ function apply(ctx, config = {}) {
 		handler: async (invocation) => await runCommand(ctx, invocation, config)
 	});
 	ctx.inject(["connection", "webServer"], (connectionCtx) => {
-		const connection = connectionCtx.root.get("connection");
+		const connection = connectionCtx.get("connection");
 		if (connection === void 0) {
 			ctx.logger.warn("multi-root: connection resolved without the service; the panel channel is not mounted");
 			return;
 		}
-		const dispose = connection.rpc.handle(PANEL_CHANNEL, async (endpoint, payload, signal) => await dispatchPanelRequest(ctx, endpoint, payload, signal));
+		const dispose = connectionRpcFor(connectionCtx, connection).handle(PANEL_CHANNEL, async (endpoint, payload, signal) => await dispatchPanelRequest(ctx, endpoint, payload, signal));
 		return () => {
 			dispose();
 		};

package/lib/command.js

@@ -1,2 +1,2 @@
-import { a as renderRootsReport, c as revealArgv, i as parseFoldersCommand, n as apply, o as resolvePanelPrimaryRoot, r as inject, s as revealAccepted, t as COMMAND_NAME } from "./command-CmLekG1M.js";
+import { a as renderRootsReport, c as revealArgv, i as parseFoldersCommand, n as apply, o as resolvePanelPrimaryRoot, r as inject, s as revealAccepted, t as COMMAND_NAME } from "./command-Dcz6nULo.js";
 export { COMMAND_NAME, apply, inject, parseFoldersCommand, renderRootsReport, resolvePanelPrimaryRoot, revealAccepted, revealArgv };

package/lib/{compat-Bg2HFVMX.js → compat-veDqCOoa.js}

@@ -54,7 +54,9 @@ const SUPPORTED_DSH_RELEASES = [
 	"0.2.1-rc.3",
 	"0.2.1-rc.4",
 	"0.2.1-rc.5",
-	"0.2.2-alpha.2"
+	"0.2.2-alpha.2",
+	"0.2.2-alpha.3",
+	"0.2.2-rc.1"
 ];
 /**
 * Packages whose absence means this plugin cannot function at all: every one of

package/lib/compat.js

@@ -1,2 +1,2 @@
-import { a as inject, i as assertSupportedInstallation, n as MultiRootCompatService, r as apply, t as DshCompatUnsupportedError } from "./compat-Bg2HFVMX.js";
+import { a as inject, i as assertSupportedInstallation, n as MultiRootCompatService, r as apply, t as DshCompatUnsupportedError } from "./compat-veDqCOoa.js";
 export { DshCompatUnsupportedError, MultiRootCompatService, apply, assertSupportedInstallation, inject };

package/lib/{fs-CfzJq2wd.js → fs-Uws0ZpmV.js}

@@ -5,6 +5,30 @@ import { canonicalPath, writableRoots } from "@deepseek-ai/dsh-sandbox";
 import { stat } from "node:fs/promises";
 import { FsError } from "@deepseek-ai/dsh-fs";
 import { LocalFileSystem } from "@deepseek-ai/dsh-fs-local";
+//#region src/compat/fs-patch.ts
+/**
+* Adapt the mutation methods introduced by newer filesystem backends.
+* Older supported backends do not expose these methods at all.
+*/
+/** Install only methods present on the actual backend, preserving the caller as `this`. */
+function installAdditionalMutations(prototype, fence) {
+	for (const method of [
+		"patchText",
+		"deleteFile",
+		"moveFile"
+	]) {
+		const inherited = Reflect.get(LocalFileSystem.prototype, method);
+		if (typeof inherited !== "function") continue;
+		Object.defineProperty(prototype, method, {
+			configurable: true,
+			writable: true,
+			value: function(...args) {
+				return fence(this, method, args, (next) => Reflect.apply(inherited, this, next));
+			}
+		});
+	}
+}
+//#endregion
 //#region src/containment.ts
 const MISSING_CODES = /* @__PURE__ */ new Set(["ENOENT", "ENOTDIR"]);
 function isMissing(error) {
@@ -67,6 +91,9 @@ async function isPathUnder(path, root, caseSensitive = process.platform !== "win
 */
 var MultiRootFileSystem = class extends LocalFileSystem {
 	static inject = ["sandboxPolicy", "multiRootScope"];
+	static {
+		installAdditionalMutations(this.prototype, (receiver, method, args, invoke) => receiver.additionalMutation(method, args, invoke));
+	}
 	defaultMode;
 	constructor(ctx, config) {
 		super(ctx, config);
@@ -107,6 +134,17 @@ var MultiRootFileSystem = class extends LocalFileSystem {
 		const policy = structuredClone(sandboxPolicy ?? this.ctx.sandboxPolicy.resolve());
 		return this.withOperation(policy, "fs-edit", async (scope) => super.editText(await this.checkedTarget(target, policy, scope), edit, expected, signal));
 	}
+	/** Fence every endpoint of a patch, delete, or move under one admission. */
+	async additionalMutation(method, args, invoke) {
+		const policyIndex = method === "deleteFile" ? 3 : 4;
+		const policy = structuredClone(args[policyIndex] ?? this.ctx.sandboxPolicy.resolve());
+		return this.withOperation(policy, method === "patchText" ? "fs-edit" : "fs-write", async (scope) => {
+			const checked = [...args];
+			checked[0] = await this.checkedTarget(args[0], policy, scope);
+			if (method === "moveFile") checked[1] = await this.checkedTarget(args[1], policy, scope);
+			return await invoke(checked);
+		});
+	}
 	/** The provider must also work without the gated registry (ADR-0009). */
 	async withOperation(policy, kind, body) {
 		const registry = this.ctx.get("multiRootRegistry");

package/lib/fs.js

@@ -1,3 +1,3 @@
 import "./providers.js";
-import { t as MultiRootFileSystem } from "./fs-CfzJq2wd.js";
+import { t as MultiRootFileSystem } from "./fs-Uws0ZpmV.js";
 export { MultiRootFileSystem, MultiRootFileSystem as default };

package/lib/index.js

@@ -1,15 +1,15 @@
 import { i as renderInstructions, n as instructionsApi, t as createInstructionMessage } from "./llm-message-fYORacvh.js";
 import { a as composeInstructionMessage, r as PLUGIN_SOURCE, t as DEFAULT_MAX_BYTES } from "./instructions-KsUwUFE0.js";
 import { a as classifyStoredRoots, c as indexedStatuses, i as canonicalRoot, l as isCanonicallyUnder, m as validateRootCandidate, n as additionalRootId, p as resolveRootRef, r as availableRoots, s as expandRootInput, t as RootValidationError, u as removeStatusAt } from "./roots-Ca_W1S9n.js";
-import { _ as classifyInstallation, c as agentPtyMarkerVerdict, d as HOST_SERVICE_PACKAGES, f as OPTIONAL_CORE_PACKAGES, g as SUPPORTED_DSH_RELEASES, h as RUNTIME_OPTIONAL_PACKAGES, i as assertSupportedInstallation, l as assertAgentPtyMarker, m as RUNNER_ANCHORED_PACKAGES, n as MultiRootCompatService, o as AGENT_PTY_MARKER, p as REQUIRED_CORE_PACKAGES, s as PtyMarkerContractError, t as DshCompatUnsupportedError, u as CORE_PACKAGES, v as compatEnforcement, y as readInstalledVersion } from "./compat-Bg2HFVMX.js";
+import { _ as classifyInstallation, c as agentPtyMarkerVerdict, d as HOST_SERVICE_PACKAGES, f as OPTIONAL_CORE_PACKAGES, g as SUPPORTED_DSH_RELEASES, h as RUNTIME_OPTIONAL_PACKAGES, i as assertSupportedInstallation, l as assertAgentPtyMarker, m as RUNNER_ANCHORED_PACKAGES, n as MultiRootCompatService, o as AGENT_PTY_MARKER, p as REQUIRED_CORE_PACKAGES, s as PtyMarkerContractError, t as DshCompatUnsupportedError, u as CORE_PACKAGES, v as compatEnforcement, y as readInstalledVersion } from "./compat-veDqCOoa.js";
 import { l as widenConfined } from "./dialects-Dr4rDR-H.js";
 import { MULTI_ROOT_PROVIDER_BRAND, MultiRootProviders, brandMultiRootProvider, isMultiRootProvider } from "./providers.js";
-import { t as MultiRootFileSystem } from "./fs-CfzJq2wd.js";
+import { t as MultiRootFileSystem } from "./fs-Uws0ZpmV.js";
 import { t as MultiRootSandboxProvider } from "./sandbox-C-vCJCp3.js";
 import { a as parseRevealedView, i as parsePanelCall, n as PANEL_ENDPOINTS, o as parseRootsView, t as PANEL_CHANNEL } from "./contract-CStSEOcK.js";
 import { MultiRootScopeService, renderWorkspaceRootsContext, sanitizeAdditionalRoots } from "./scope.js";
-import { a as MultiRootRegistry, c as multiRootDomainSpec, i as MAX_ALIAS_LENGTH, l as RegistryAuthorityLease, n as DOMAIN_NAME, o as REGISTRY_CONTENDED_MESSAGE, r as MAX_ADDITIONAL_ROOTS_CEILING, t as DEFAULT_MAX_ADDITIONAL_ROOTS, u as RegistryLeaseContendedError } from "./registry-YTUOjmVu.js";
-import { a as renderRootsReport, c as revealArgv, i as parseFoldersCommand, o as resolvePanelPrimaryRoot, t as COMMAND_NAME } from "./command-CmLekG1M.js";
+import { a as MultiRootRegistry, c as multiRootDomainSpec, i as MAX_ALIAS_LENGTH, l as RegistryAuthorityLease, n as DOMAIN_NAME, o as REGISTRY_CONTENDED_MESSAGE, r as MAX_ADDITIONAL_ROOTS_CEILING, t as DEFAULT_MAX_ADDITIONAL_ROOTS, u as RegistryLeaseContendedError } from "./registry-DR_sMuvS.js";
+import { a as renderRootsReport, c as revealArgv, i as parseFoldersCommand, o as resolvePanelPrimaryRoot, t as COMMAND_NAME } from "./command-Dcz6nULo.js";
 //#region src/index.ts
 /**
 * Carrier plugin face for the bare-package-name loader row (see the module

package/lib/{native-win32-2waCRkPI.js → native-win32-CRNXr11U.js}

@@ -1,10 +1,11 @@
+import { c as loadHostKoffi } from "./protocol-CnR1KTXy.js";
 import { EventEmitter } from "node:events";
 //#region src/authority/native-win32.ts
 /** Windows local pipes: tokens, never a caller-supplied PID or a bearer file. */
 var RestrictedRegistryPeerError = class extends Error {};
 let apiPromise;
 async function load() {
-	const koffi = (await import("koffi")).default;
+	const koffi = await loadHostKoffi();
 	const kernel = koffi.load("kernel32.dll"), advapi = koffi.load("advapi32.dll");
 	const k = (name, ret, args) => kernel.func("__stdcall", name, ret, args);
 	const a = (name, ret, args) => advapi.func("__stdcall", name, ret, args);

package/lib/{protocol-4zdwV7u4.js → protocol-CnR1KTXy.js}

@@ -1,8 +1,50 @@
+import { createRequire } from "node:module";
 import { closeSync, lstatSync, mkdirSync, readFileSync, realpathSync, statSync, unlinkSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
+import { pathToFileURL } from "node:url";
 import { z } from "zod";
 import { Socket } from "node:net";
+//#region src/compat/koffi.ts
+/**
+* Koffi must be the host's own copy, not this package's `dependencies` entry:
+* `dsh plugin add` installs a private koffi beside the one the host already
+* loaded, and two `koffi.node` images in one process SIGBUS on darwin-arm64
+* pointer authentication (packed-install smoke, 2026-11-01). `dsh-fs-local`
+* carries koffi on every supported release, so anchoring at it yields the
+* single binary the host itself loaded.
+*
+* Two ways to reach that same binary, in order:
+* 1. `require('koffi')` from the host anchor — the live CJS `module.exports`.
+*    The host occasionally exposes a partial `{}` exports object for koffi's
+*    CJS entry (mid-evaluation or an intercepted require in the addon loader),
+*    so the result is validated instead of trusted.
+* 2. The host koffi's own ESM entry (`index.js` beside the resolved CJS
+*    entry) — a separate module instance over the same `koffi.node`, immune
+*    to a broken CJS cache entry and never a second native image.
+* Only when no host tree resolves at all does the package-local copy load.
+*/
+const pick = (candidate) => {
+	let cur = candidate;
+	for (let i = 0; i < 3; i++) {
+		if (typeof cur?.load === "function") return cur;
+		cur = cur?.default;
+	}
+};
+async function loadHostKoffi() {
+	try {
+		const anchor = createRequire(import.meta.url).resolve("@deepseek-ai/dsh-fs-local/package.json");
+		const hostRequire = createRequire(anchor);
+		const cjs = pick(hostRequire("koffi"));
+		if (cjs !== void 0) return cjs;
+		const esm = pick(await import(pathToFileURL(join(dirname(hostRequire.resolve("koffi")), "index.js")).href));
+		if (esm !== void 0) return esm;
+	} catch {}
+	const own = pick(await import("koffi"));
+	if (own !== void 0) return own;
+	return (await import("koffi")).default;
+}
+//#endregion
 //#region src/authority/native.ts
 /** Kernel-authenticated local IPC. No credential file and no inherited capability. */
 function storeIdentity(root) {
@@ -34,7 +76,7 @@ function storeIdentity(root) {
 }
 let posixPromise;
 async function loadPosix() {
-	const koffi = (await import("koffi")).default;
+	const koffi = await loadHostKoffi();
 	const libc = koffi.load(process.platform === "darwin" ? "/usr/lib/libSystem.B.dylib" : "libc.so.6");
 	const bind = (name, ret, args) => libc.func(name, ret, args);
 	const socketpair = bind("socketpair", "int", [
@@ -170,7 +212,7 @@ function posix$1() {
 	return posixPromise ??= loadPosix();
 }
 async function connectNative(endpoint) {
-	if (process.platform === "win32") return (await import("./native-win32-2waCRkPI.js")).connectWindows(endpoint);
+	if (process.platform === "win32") return (await import("./native-win32-CRNXr11U.js")).connectWindows(endpoint);
 	const api = await posix$1(), address = api.address(endpoint), fd = api.open();
 	if (api.connect(fd, address, address.length) !== 0) {
 		closeSync(fd);
@@ -180,7 +222,7 @@ async function connectNative(endpoint) {
 }
 /** Called only by the kernel lease holder. Never removes another epoch's socket. */
 async function listenNative(endpoint, accepted) {
-	if (process.platform === "win32") return (await import("./native-win32-2waCRkPI.js")).listenWindows(endpoint, accepted);
+	if (process.platform === "win32") return (await import("./native-win32-CRNXr11U.js")).listenWindows(endpoint, accepted);
 	const api = await posix$1(), address = api.address(endpoint), fd = api.open();
 	try {
 		unlinkSync(endpoint);
@@ -222,14 +264,14 @@ async function listenNative(endpoint, accepted) {
 }
 /** Capability probe for native tests and diagnostics; not an authorization bypass. */
 async function nativeHostAvailability() {
-	if (process.platform === "win32") return (await import("./native-win32-2waCRkPI.js")).windowsHostAvailability();
+	if (process.platform === "win32") return (await import("./native-win32-CRNXr11U.js")).windowsHostAvailability();
 	if (process.platform === "linux") {
 		if (!/^NoNewPrivs:\s+0$/m.test(readFileSync("/proc/self/status", "utf8"))) return {
 			available: false,
 			reason: "the Host itself has NoNewPrivs; shared IPC refuses restricted peers"
 		};
 	} else if (process.platform === "darwin") {
-		if ((await import("koffi")).default.load("/usr/lib/libsandbox.dylib").func("int sandbox_check(int pid, const char *operation, int filter)")(process.pid, null, 0) !== 0) return {
+		if ((await loadHostKoffi()).load("/usr/lib/libsandbox.dylib").func("int sandbox_check(int pid, const char *operation, int filter)")(process.pid, null, 0) !== 0) return {
 			available: false,
 			reason: "the Host itself is sandboxed; shared IPC refuses sandboxed peers"
 		};
@@ -407,8 +449,16 @@ var AuthorityClient = class AuthorityClient {
 			else request.reject(new AuthorityRpcError(reply.code, reply.message));
 		});
 	}
-	static async connect(endpoint, store, limit, onChange, disconnected) {
-		const client = new AuthorityClient(await connectNative(endpoint), store, limit, onChange, disconnected);
+	static async connect(endpoint, store, limit, onChange, disconnected, signal) {
+		if (signal?.aborted) throw new AuthorityRpcError("authority-cancelled", "registry handshake was cancelled");
+		const channel = await connectNative(endpoint);
+		if (signal?.aborted) {
+			channel.destroy();
+			throw new AuthorityRpcError("authority-cancelled", "registry handshake was cancelled");
+		}
+		const client = new AuthorityClient(channel, store, limit, onChange, disconnected);
+		const onAbort = () => client.close();
+		signal?.addEventListener("abort", onAbort, { once: true });
 		try {
 			const hello = helloSchema.parse(await client.request("hello", [limit]));
 			if (hello.store !== store || hello.limit !== limit) throw new Error("registry configuration mismatch");
@@ -416,7 +466,10 @@ var AuthorityClient = class AuthorityClient {
 			return client;
 		} catch (error) {
 			client.close();
+			if (signal?.aborted) throw new AuthorityRpcError("authority-cancelled", "registry handshake was cancelled");
 			throw error;
+		} finally {
+			signal?.removeEventListener("abort", onAbort);
 		}
 	}
 	request(method, args) {
@@ -638,4 +691,4 @@ function parseArguments(method, args) {
 	return argumentSchemas[method].parse(args);
 }
 //#endregion
-export { snapshotSchema as a, parseArguments as i, AuthorityRpcError as n, nativeHostAvailability as o, AuthorityServer as r, storeIdentity as s, AuthorityClient as t };
+export { snapshotSchema as a, loadHostKoffi as c, parseArguments as i, AuthorityRpcError as n, nativeHostAvailability as o, AuthorityServer as r, storeIdentity as s, AuthorityClient as t };