@dsh-electron/dsh-plugin-multi-root-workspace 0.1.5 → 0.1.6

package/lib/{command-DyOWujPo.js → command-CTdNvwt1.js}

@@ -1,5 +1,7 @@
-import { f as resolveRootRef, i as canonicalRoot, o as entryRootRef, r as availableRoots, t as RootValidationError } from "./roots-DasWEBJk.js";
+import { t as effectiveDirectory } from "./session-directory-BLOstut1.js";
+import { f as resolveRootRef, i as canonicalRoot, l as isCanonicallyUnder, o as entryRootRef, r as availableRoots, t as RootValidationError } from "./roots-DasWEBJk.js";
 import "@deepseek-ai/cordis";
+import { isAbsolute, resolve } from "node:path";
 import { canonicalPath } from "@deepseek-ai/dsh-sandbox";
 import { z } from "zod";
 //#region src/contract.ts
@@ -17,8 +19,9 @@ import { z } from "zod";
 * - **One shape per endpoint.** {@link PanelResponseMap} is the single mapping
 *   from endpoint to response type, so the panel cannot silently decode one
 *   endpoint's answer as another's. `reveal` answers with
-*   {@link RevealedView}; every other endpoint answers with a whole
-*   {@link RootsView}. The host builds those answers in `command.ts` and the
+*   {@link RevealedView}; root-management endpoints answer with
+*   {@link RootsView}, and browsing returns {@link FilesView} or {@link FilePreview}.
+*   The host builds those answers in `command.ts` and the
 *   panel parses them here — one definition, two consumers.
 * - **Runtime validation at the boundary.** The payload arrives from a browser
 *   and the answer arrives from the host; neither is trusted to match the
@@ -41,7 +44,9 @@ const PANEL_ENDPOINTS = [
 	"remove",
 	"alias",
 	"move",
-	"reveal"
+	"reveal",
+	"files",
+	"readFile"
 ];
 /**
 * The request body on the wire. The endpoint travels as the RPC method, not as
@@ -92,10 +97,47 @@ const rootViewSchema = z.object({
 const rootsViewSchema = z.object({
 	primaryRoot: z.string(),
 	primaryName: z.string().optional(),
+	effectiveCwd: z.string().optional(),
 	roots: z.array(rootViewSchema),
 	unavailable: z.string().optional()
 });
 const revealedViewSchema = z.object({ revealed: z.string() });
+const filesViewSchema = z.object({
+	path: z.string(),
+	entries: z.array(z.object({
+		name: z.string().min(1).refine((name) => name !== "." && name !== ".." && !/[\\/]/.test(name) && !name.includes(String.fromCharCode(0))),
+		type: z.enum([
+			"file",
+			"directory",
+			"other"
+		])
+	})),
+	truncated: z.boolean()
+});
+const filePreviewSchema = z.object({
+	text: z.string(),
+	eof: z.boolean()
+});
+function parseFilesView(value) {
+	const parsed = filesViewSchema.safeParse(value);
+	return parsed.success ? {
+		ok: true,
+		value: parsed.data
+	} : {
+		ok: false,
+		message: firstIssue(parsed.error)
+	};
+}
+function parseFilePreview(value) {
+	const parsed = filePreviewSchema.safeParse(value);
+	return parsed.success ? {
+		ok: true,
+		value: parsed.data
+	} : {
+		ok: false,
+		message: firstIssue(parsed.error)
+	};
+}
 z.object({
 	code: z.string(),
 	message: z.string(),
@@ -139,6 +181,7 @@ function parseRootsView(value) {
 		value: {
 			primaryRoot: view.primaryRoot,
 			...view.primaryName === void 0 ? {} : { primaryName: view.primaryName },
+			...view.effectiveCwd === void 0 ? {} : { effectiveCwd: view.effectiveCwd },
 			roots: view.roots.map(narrowRootView),
 			...view.unavailable === void 0 ? {} : { unavailable: view.unavailable }
 		}
@@ -196,6 +239,56 @@ function firstIssue(error) {
 	return `${issue.path.length === 0 ? "" : `${issue.path.join(".")}: `}${issue.message}`;
 }
 //#endregion
+//#region src/panel-files.ts
+/** Additional-root file browsing through the plugin's existing Connection channel. */
+async function browseRoot(ctx, primaryRoot, request, signal) {
+	const roots = await ctx.multiRootRegistry.refresh(primaryRoot);
+	const ref = request.entry === void 0 ? request.id === void 0 ? void 0 : {
+		kind: "id",
+		id: request.id
+	} : {
+		kind: "entry",
+		...request.entry
+	};
+	if (ref === void 0) throw new RootValidationError("invalid-ref", "an exact root entry is required");
+	const root = resolveRootRef(roots, ref);
+	if (root.state !== "available") throw new RootValidationError("missing", "the additional root is not available");
+	const path = request.path ?? ".";
+	if (isAbsolute(path) || /^[a-z][a-z\d+.-]*:/iu.test(path) || path.includes("\0")) throw new RootValidationError("invalid-ref", "a root-relative path is required");
+	const absolute = canonicalPath(resolve(root.path, path));
+	if (!isCanonicallyUnder(absolute, root.path)) throw new RootValidationError("invalid-ref", "the path is outside the selected root");
+	const files = ctx.root.get("workspaceFiles");
+	if (files === void 0) throw new Error("workspace-files is not composed");
+	const scope = {
+		sessionId: request.sessionId,
+		workspaceRoot: root.path
+	};
+	let result;
+	if (request.endpoint === "files") {
+		const listing = await files.list(scope, absolute, signal);
+		result = {
+			path,
+			entries: listing.entries.map((entry) => ({
+				name: entry.name,
+				type: entry.type
+			})),
+			truncated: listing.truncated
+		};
+	} else {
+		const preview = await files.read(scope, absolute, {
+			offset: 1,
+			limit: 200
+		}, signal);
+		result = {
+			text: preview.text,
+			eof: preview.eof
+		};
+	}
+	const latest = resolveRootRef(await ctx.multiRootRegistry.refresh(primaryRoot), ref);
+	if (latest.state !== "available" || latest.path !== root.path || canonicalPath(resolve(root.path, path)) !== absolute) throw new RootValidationError("missing", "the additional root changed while reading");
+	return result;
+}
+//#endregion
 //#region src/command.ts
 /** Services this row needs before it may activate. */
 const inject = [
@@ -523,9 +616,12 @@ async function rootsViewOf(ctx, registry, primaryRoot, request) {
 	const statuses = await registry.refresh(primaryRoot);
 	const unavailable = registry.unavailable;
 	const primaryName = await primaryNameOf(ctx, primaryRoot, request);
+	const session = ctx.get("sessions")?.get(request.sessionId);
+	const effectiveCwd = session === void 0 ? void 0 : effectiveDirectory(ctx, session);
 	return {
 		primaryRoot: canonicalRoot(primaryRoot),
 		...primaryName === void 0 ? {} : { primaryName },
+		...effectiveCwd === void 0 ? {} : { effectiveCwd },
 		roots: statuses.map(toRootView),
 		...unavailable === void 0 ? {} : { unavailable }
 	};
@@ -539,7 +635,7 @@ async function rootsViewOf(ctx, registry, primaryRoot, request) {
 * A malformed request is reported as `panel/bad-request` rather than throwing
 * through the channel.
 */
-async function dispatchPanelRequest(ctx, endpoint, payload, _signal) {
+async function dispatchPanelRequest(ctx, endpoint, payload, signal) {
 	try {
 		const parsed = parsePanelCall(endpoint, payload);
 		if (!parsed.ok) return {
@@ -554,6 +650,11 @@ async function dispatchPanelRequest(ctx, endpoint, payload, _signal) {
 		const registry = ctx.multiRootRegistry;
 		const primaryRoot = resolvePanelPrimaryRoot(ctx, request.sessionId);
 		switch (request.endpoint) {
+			case "files":
+			case "readFile": return {
+				ok: true,
+				value: await browseRoot(ctx, primaryRoot, request, signal)
+			};
 			case "list": return {
 				ok: true,
 				value: await rootsViewOf(ctx, registry, primaryRoot, request)
@@ -687,4 +788,4 @@ async function revealRoot(ctx, path) {
 	if (outcome.exitCode !== 0) throw new RootValidationError("reveal-unavailable", `the file manager exited with ${String(outcome.exitCode)}`);
 }
 //#endregion
-export { renderRootsReport as a, PANEL_CHANNEL as c, parseRevealedView as d, parseRootsView as f, parseFoldersCommand as i, PANEL_ENDPOINTS as l, apply as n, resolvePanelPrimaryRoot as o, inject as r, revealArgv as s, COMMAND_NAME as t, parsePanelCall as u };
+export { renderRootsReport as a, PANEL_CHANNEL as c, parseFilesView as d, parsePanelCall as f, parseFoldersCommand as i, PANEL_ENDPOINTS as l, parseRootsView as m, apply as n, resolvePanelPrimaryRoot as o, parseRevealedView as p, inject as r, revealArgv as s, COMMAND_NAME as t, parseFilePreview as u };

package/lib/command.js

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

package/lib/{compat-82Y27Iom.js → compat-B6ZqbQBy.js}

@@ -40,7 +40,9 @@ const SUPPORTED_DSH_RELEASES = [
 	"0.1.7-rc.1",
 	"0.1.7-rc.2",
 	"0.2.0-rc.1",
-	"0.2.0-rc.2"
+	"0.2.0-rc.2",
+	"0.2.1-alpha.1",
+	"0.2.1-alpha.2"
 ];
 /**
 * Packages whose absence means this plugin cannot function at all: every one of
@@ -61,6 +63,13 @@ const REQUIRED_CORE_PACKAGES = [
 * that is the mixed-installation failure this contract exists to catch.
 */
 const OPTIONAL_CORE_PACKAGES = [
+	"@deepseek-ai/dsh-tools",
+	"@deepseek-ai/dsh-working-directory",
+	"@deepseek-ai/dsh-lsp",
+	"@deepseek-ai/dsh-lsp-stdio",
+	"@deepseek-ai/dsh-api-workspace-files",
+	"@deepseek-ai/dsh-typert-protocol",
+	"@deepseek-ai/dsh-sandbox-windows-acl",
 	"@deepseek-ai/dsh-agent",
 	"@deepseek-ai/dsh-agent-instructions",
 	"@deepseek-ai/dsh-client-connection",
@@ -72,6 +81,8 @@ const OPTIONAL_CORE_PACKAGES = [
 ];
 /** Every package the contract inspects, required first. */
 const CORE_PACKAGES = [...REQUIRED_CORE_PACKAGES, ...OPTIONAL_CORE_PACKAGES];
+/** Services looked up structurally; older runtimes never install these modules. */
+const HOST_RESOLVED_PACKAGES = ["@deepseek-ai/dsh-working-directory"];
 /** The environment variable that relaxes the gate. */
 const COMPAT_ENFORCEMENT_ENV = "DSH_MULTI_ROOT_COMPAT";
 /**
@@ -88,11 +99,18 @@ const COMPAT_ENFORCEMENT_ENV = "DSH_MULTI_ROOT_COMPAT";
 *   manifest cannot be resolved.
 */
 function readInstalledVersion(packageName) {
+	const require = createRequire(import.meta.url);
 	try {
-		const manifest = createRequire(import.meta.url)(`${packageName}/package.json`);
+		const manifest = require(`${packageName}/package.json`);
 		return typeof manifest.version === "string" ? manifest.version : void 0;
 	} catch {
-		return;
+		if (!HOST_RESOLVED_PACKAGES.includes(packageName)) return void 0;
+		try {
+			const manifest = createRequire(require.resolve("@deepseek-ai/dsh/package.json"))(`${packageName}/package.json`);
+			return typeof manifest.version === "string" ? manifest.version : void 0;
+		} catch {
+			return;
+		}
 	}
 }
 /**

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-82Y27Iom.js";
+import { a as inject, i as assertSupportedInstallation, n as MultiRootCompatService, r as apply, t as DshCompatUnsupportedError } from "./compat-B6ZqbQBy.js";
 export { DshCompatUnsupportedError, MultiRootCompatService, apply, assertSupportedInstallation, inject };

package/lib/index.js

@@ -1,11 +1,11 @@
-import { c as REQUIRED_CORE_PACKAGES, d as compatEnforcement, f as readInstalledVersion, i as assertSupportedInstallation, l as SUPPORTED_DSH_RELEASES, n as MultiRootCompatService, o as CORE_PACKAGES, s as OPTIONAL_CORE_PACKAGES, t as DshCompatUnsupportedError, u as classifyInstallation } from "./compat-82Y27Iom.js";
-import { a as composeInstructionMessage, c as createInstructionMessage, l as instructionsApi, r as PLUGIN_SOURCE, t as DEFAULT_MAX_BYTES, u as renderInstructions } from "./instructions-Cn1Jj5Xi.js";
-import { n as widenConfined, t as MultiRootSandboxProvider } from "./sandbox-D8Fw95FM.js";
+import { c as REQUIRED_CORE_PACKAGES, d as compatEnforcement, f as readInstalledVersion, i as assertSupportedInstallation, l as SUPPORTED_DSH_RELEASES, n as MultiRootCompatService, o as CORE_PACKAGES, s as OPTIONAL_CORE_PACKAGES, t as DshCompatUnsupportedError, u as classifyInstallation } from "./compat-B6ZqbQBy.js";
+import { a as composeInstructionMessage, c as createInstructionMessage, l as instructionsApi, r as PLUGIN_SOURCE, t as DEFAULT_MAX_BYTES, u as renderInstructions } from "./instructions-DfzN-wVf.js";
+import { n as widenConfined, t as MultiRootSandboxProvider } from "./sandbox-BRXl_FpF.js";
 import { a as classifyStoredRoots, c as indexedStatuses, f as resolveRootRef, i as canonicalRoot, l as isCanonicallyUnder, n as additionalRootId, p as validateRootCandidate, r as availableRoots, s as expandRootInput, t as RootValidationError, u as removeStatusAt } from "./roots-DasWEBJk.js";
 import { t as MultiRootFileSystem } from "./fs-D_Sw3o5z.js";
 import { MultiRootScopeService, renderWorkspaceRootsContext, sanitizeAdditionalRoots } from "./scope.js";
 import { c as RegistryLeaseContendedError, i as REGISTRY_CONTENDED_MESSAGE, n as MAX_ALIAS_LENGTH, o as multiRootDomainSpec, r as MultiRootRegistry, s as RegistryAuthorityLease, t as DOMAIN_NAME } from "./registry-DySMbjgW.js";
-import { a as renderRootsReport, c as PANEL_CHANNEL, d as parseRevealedView, f as parseRootsView, i as parseFoldersCommand, l as PANEL_ENDPOINTS, o as resolvePanelPrimaryRoot, s as revealArgv, t as COMMAND_NAME, u as parsePanelCall } from "./command-DyOWujPo.js";
+import { a as renderRootsReport, c as PANEL_CHANNEL, d as parseFilesView, f as parsePanelCall, i as parseFoldersCommand, l as PANEL_ENDPOINTS, m as parseRootsView, o as resolvePanelPrimaryRoot, p as parseRevealedView, s as revealArgv, t as COMMAND_NAME, u as parseFilePreview } from "./command-CTdNvwt1.js";
 //#region src/index.ts
 /**
 * Carrier plugin face for the bare-package-name loader row (see the module
@@ -16,4 +16,4 @@ import { a as renderRootsReport, c as PANEL_CHANNEL, d as parseRevealedView, f a
 const inject = [];
 function apply() {}
 //#endregion
-export { COMMAND_NAME, CORE_PACKAGES, DEFAULT_MAX_BYTES, DOMAIN_NAME, DshCompatUnsupportedError, MAX_ALIAS_LENGTH, MultiRootCompatService, MultiRootFileSystem, MultiRootRegistry, MultiRootSandboxProvider, MultiRootScopeService, OPTIONAL_CORE_PACKAGES, PANEL_CHANNEL, PANEL_ENDPOINTS, PLUGIN_SOURCE, REGISTRY_CONTENDED_MESSAGE, REQUIRED_CORE_PACKAGES, RegistryAuthorityLease, RegistryLeaseContendedError, RootValidationError, SUPPORTED_DSH_RELEASES, additionalRootId, apply, assertSupportedInstallation, availableRoots, canonicalRoot, classifyInstallation, classifyStoredRoots, compatEnforcement, composeInstructionMessage, createInstructionMessage, expandRootInput, indexedStatuses, inject, instructionsApi, isCanonicallyUnder, multiRootDomainSpec, parseFoldersCommand, parsePanelCall, parseRevealedView, parseRootsView, readInstalledVersion, removeStatusAt, renderInstructions, renderRootsReport, renderWorkspaceRootsContext, resolvePanelPrimaryRoot, resolveRootRef, revealArgv, sanitizeAdditionalRoots, validateRootCandidate, widenConfined };
+export { COMMAND_NAME, CORE_PACKAGES, DEFAULT_MAX_BYTES, DOMAIN_NAME, DshCompatUnsupportedError, MAX_ALIAS_LENGTH, MultiRootCompatService, MultiRootFileSystem, MultiRootRegistry, MultiRootSandboxProvider, MultiRootScopeService, OPTIONAL_CORE_PACKAGES, PANEL_CHANNEL, PANEL_ENDPOINTS, PLUGIN_SOURCE, REGISTRY_CONTENDED_MESSAGE, REQUIRED_CORE_PACKAGES, RegistryAuthorityLease, RegistryLeaseContendedError, RootValidationError, SUPPORTED_DSH_RELEASES, additionalRootId, apply, assertSupportedInstallation, availableRoots, canonicalRoot, classifyInstallation, classifyStoredRoots, compatEnforcement, composeInstructionMessage, createInstructionMessage, expandRootInput, indexedStatuses, inject, instructionsApi, isCanonicallyUnder, multiRootDomainSpec, parseFilePreview, parseFilesView, parseFoldersCommand, parsePanelCall, parseRevealedView, parseRootsView, readInstalledVersion, removeStatusAt, renderInstructions, renderRootsReport, renderWorkspaceRootsContext, resolvePanelPrimaryRoot, resolveRootRef, revealArgv, sanitizeAdditionalRoots, validateRootCandidate, widenConfined };

package/lib/{instructions-Cn1Jj5Xi.js → instructions-DfzN-wVf.js}

@@ -1,7 +1,10 @@
+import { t as effectiveDirectory } from "./session-directory-BLOstut1.js";
+import { t as aroundTool } from "./tool-context-CpgIFcCB.js";
 import { l as isCanonicallyUnder } from "./roots-DasWEBJk.js";
 import { createRequire } from "node:module";
 import "@deepseek-ai/cordis";
 import { createHash } from "node:crypto";
+import { AsyncLocalStorage } from "node:async_hooks";
 import { basename, dirname, isAbsolute, relative, resolve, sep } from "node:path";
 import { canonicalPath } from "@deepseek-ai/dsh-sandbox";
 //#region src/compat/agent-instructions.ts
@@ -221,6 +224,51 @@ function toolResultFailed(message) {
 	return block.isError === true;
 }
 //#endregion
+//#region src/compat/instruction-overlap.ts
+/** Recognize files already represented by the native instruction baseline in this step. */
+function nativeInstructionCopies(messages, cwd) {
+	const represented = /* @__PURE__ */ new Map();
+	const removed = /* @__PURE__ */ new Set();
+	let replacesBaseline = false;
+	for (const message of messages) {
+		const source = message.source;
+		if (source.kind !== "agent-instructions" || source.changes === void 0) continue;
+		if (source.baseline === true) {
+			replacesBaseline = true;
+			represented.clear();
+		}
+		for (const change of source.changes) {
+			if (change.action !== "remove") continue;
+			removed.add(change.path);
+			for (const [path, copy] of represented) if (copy.displayPath === change.path) represented.delete(path);
+		}
+		if (cwd === void 0 || source.baselineIdentity === void 0) continue;
+		let identity;
+		try {
+			identity = JSON.parse(source.baselineIdentity);
+		} catch {
+			continue;
+		}
+		if (typeof identity.projectRoot !== "string") continue;
+		const project = resolve(cwd, identity.projectRoot);
+		for (const change of source.changes) {
+			if (change.action === "remove" || typeof change.digest !== "string") continue;
+			if (/^(?:~|\$|user-global[\\/]|agents-global[\\/])/.test(change.path)) continue;
+			represented.set(resolve(project, change.path), {
+				digest: change.digest,
+				displayPath: change.path
+			});
+		}
+	}
+	return {
+		pathOf: (file) => {
+			const copy = represented.get(file.absolutePath);
+			return copy?.digest === createHash("sha1").update(file.content).digest("hex") ? copy.displayPath : void 0;
+		},
+		withdraws: (displayPath) => replacesBaseline || removed.has(displayPath)
+	};
+}
+//#endregion
 //#region src/instructions.ts
 /**
 * `multi-root-instructions`: the additional roots' own instruction files, made
@@ -342,16 +390,13 @@ function touchedPathOfToolCall(name, argumentsJson) {
 * The directory a touched path's instructions would live in.
 *
 * Tool arguments are the model's raw input, so a relative `file_path` is
-* resolved against the session cwd — the base the tool layer itself uses —
-* rather than against this process's cwd. Mac's `realpath` spelling is applied
-* here so the result compares against the canonical roots.
-* @param path - a touched path, absolute or relative to the session cwd.
-* @param session - the session the touch belongs to.
+* captured as an absolute path at the operation boundary. Mac's `realpath`
+* spelling is applied here so it compares against the canonical roots.
+* @param path - the absolute touched file path.
 * @returns the canonical parent directory, or `undefined` when it cannot be named.
 */
-function parentDirectoryOf(path, session) {
-	const cwd = session.header.cwd;
-	const absolute = isAbsolute(path) ? path : cwd === void 0 ? void 0 : resolve(cwd, path);
+function parentDirectoryOf(path) {
+	const absolute = isAbsolute(path) ? path : void 0;
 	if (absolute === void 0) return void 0;
 	try {
 		return canonicalPath(dirname(absolute));
@@ -407,6 +452,8 @@ function apply(ctx, config = {}) {
 	if (maxBytes <= 0 || !Number.isFinite(maxBytes)) return;
 	const states = /* @__PURE__ */ new WeakMap();
 	const callsBySession = /* @__PURE__ */ new WeakMap();
+	const executions = new AsyncLocalStorage();
+	aroundTool(ctx, (exec, next) => executions.run(exec, next));
 	const stateOf = (session) => {
 		const existing = states.get(session);
 		if (existing !== void 0) return existing;
@@ -427,7 +474,8 @@ function apply(ctx, config = {}) {
 			}
 			pendingCalls.set(event.data.callId, {
 				name: event.data.name,
-				arguments: event.data.arguments
+				arguments: event.data.arguments,
+				cwd: effectiveDirectory(ctx, session)
 			});
 			return;
 		}
@@ -437,17 +485,24 @@ function apply(ctx, config = {}) {
 		pendingCalls.delete(callId);
 		if (call === void 0) return;
 		if (event.data.error !== void 0 || toolResultFailed(event.data.message)) return;
-		const path = touchedPathOfToolCall(call.name, call.arguments);
+		const path = call.observedPath ?? touchedPathOfToolCall(call.name, call.arguments);
 		if (path === void 0) return;
 		const state = stateOf(session);
 		if (state.touched.size >= MAX_TOUCHED_PATHS) return;
-		state.touched.add(path);
+		if (isAbsolute(path)) state.touched.add(path);
+		else if (call.cwd !== void 0) state.touched.add(resolve(call.cwd, path));
 	});
 	ctx.inject(["fs"], (scope) => {
+		scope.on("fs/observed", (target, _observation, actor) => {
+			const exec = executions.getStore();
+			if (exec?.agent === void 0 || FILE_TOUCH_TOOL_NAMES[exec.name] !== true || actor !== exec) return;
+			const call = callsBySession.get(exec.agent.session)?.get(exec.callId);
+			if (call !== void 0) call.observedPath = scope.fs.processPath(target);
+		});
 		scope.on("agent/pre-step", async ({ agent, messages, signal }, next) => {
 			const decision = await next();
 			if (decision.kind !== "enter") return decision;
-			const seeded = await pending(scope, states, agent, config, maxBytes, signal);
+			const seeded = await pending(scope, states, agent, config, maxBytes, signal, decision.messages);
 			if (seeded === void 0) return decision;
 			signal.throwIfAborted();
 			const lastClaimed = decision.messages.findLastIndex((message) => messages.includes(message));
@@ -455,7 +510,7 @@ function apply(ctx, config = {}) {
 				...decision,
 				messages: decision.messages.toSpliced(lastClaimed + 1, 0, seeded)
 			};
-		});
+		}, { prepend: true });
 	});
 }
 /**
@@ -471,7 +526,7 @@ function apply(ctx, config = {}) {
 * @param signal - the turn's cancellation signal.
 * @returns the message to inject, or `undefined`.
 */
-async function pending(ctx, states, agent, config, maxBytes, signal) {
+async function pending(ctx, states, agent, config, maxBytes, signal, messages) {
 	const session = agent.session;
 	const state = states.get(session) ?? {
 		scopes: /* @__PURE__ */ new Map(),
@@ -481,9 +536,12 @@ async function pending(ctx, states, agent, config, maxBytes, signal) {
 	const evaluatedTouches = new Set(state.touched);
 	let retryTouches = false;
 	const scope = ctx.multiRootScope.resolve(ctx.sandboxPolicy.resolve({ session }));
-	const granted = new Set(scope.additionalRoots);
-	const revoked = [...new Set([...state.scopes.values()].map((entry) => entry.root))].filter((root) => !granted.has(root));
 	const rendered = [];
+	const nativeCopy = nativeInstructionCopies(messages, effectiveDirectory(ctx, session));
+	for (const [key, entry] of state.scopes) if (entry.nativePath !== void 0 && nativeCopy.withdraws(entry.nativePath)) state.scopes.set(key, {
+		...entry,
+		digest: void 0
+	});
 	const gone = [];
 	const updates = [];
 	if (scope.additionalRoots.length > 0) {
@@ -492,14 +550,29 @@ async function pending(ctx, states, agent, config, maxBytes, signal) {
 			let remaining = maxBytes;
 			for (const root of scope.additionalRoots) {
 				signal.throwIfAborted();
-				const plan = await planRoot(ctx, api, root, config, state, session, signal);
+				const plan = await planRoot(ctx, api, root, config, state, signal);
 				gone.push(...plan.gone);
 				if (plan.deliveries.length === 0) continue;
 				if (remaining <= 0) {
 					retryTouches = true;
 					continue;
 				}
-				const { text, omitted, truncated } = api.render(plan.deliveries.map((entry) => entry.file), { maxBytes: remaining });
+				const deliveries = plan.deliveries.filter((entry) => {
+					const nativePath = nativeCopy.pathOf(entry.file);
+					if (nativePath === void 0) return true;
+					updates.push({
+						key: entry.key,
+						scope: {
+							root,
+							path: entry.file.absolutePath,
+							digest: digestOf(entry.file.content),
+							nativePath
+						}
+					});
+					return false;
+				});
+				if (deliveries.length === 0) continue;
+				const { text, omitted, truncated } = api.render(deliveries.map((entry) => entry.file), { maxBytes: remaining });
 				const omittedPaths = new Set(omitted.map((file) => file.absolutePath));
 				const truncatedPaths = new Set(truncated.map((file) => file.displayPath));
 				if (omitted.length > 0 || truncated.length > 0 || text === "") retryTouches = true;
@@ -509,7 +582,7 @@ async function pending(ctx, states, agent, config, maxBytes, signal) {
 					root,
 					text
 				});
-				for (const entry of plan.deliveries) {
+				for (const entry of deliveries) {
 					if (omittedPaths.has(entry.file.absolutePath)) continue;
 					updates.push({
 						key: entry.key,
@@ -523,17 +596,20 @@ async function pending(ctx, states, agent, config, maxBytes, signal) {
 			}
 		}
 	}
-	const text = composeInstructionMessage(rendered, revoked, gone.map((entry) => entry.scope));
+	const current = new Set(ctx.multiRootScope.resolve(ctx.sandboxPolicy.resolve({ session })).additionalRoots);
+	const revoked = [...new Set([...state.scopes.values()].map((entry) => entry.root))].filter((root) => !current.has(root));
+	const liveUpdates = updates.filter((entry) => current.has(entry.scope.root));
+	const text = composeInstructionMessage(rendered.filter((entry) => current.has(entry.root)), revoked, gone.filter((entry) => current.has(entry.scope.root)).map((entry) => entry.scope));
 	const message = text === void 0 ? void 0 : await createInstructionMessage({
 		text,
 		plugin: PLUGIN_SOURCE
 	});
 	signal.throwIfAborted();
 	if (!retryTouches) for (const touch of evaluatedTouches) state.touched.delete(touch);
-	if (text !== void 0) {
+	if (text !== void 0 || liveUpdates.length > 0) {
 		for (const root of revoked) for (const [key, entry] of state.scopes) if (entry.root === root) state.scopes.delete(key);
 		for (const entry of gone) state.scopes.delete(entry.key);
-		for (const entry of updates) state.scopes.set(entry.key, entry.scope);
+		for (const entry of liveUpdates) state.scopes.set(entry.key, entry.scope);
 	}
 	return message;
 }
@@ -554,11 +630,10 @@ async function pending(ctx, states, agent, config, maxBytes, signal) {
 * @param root - the canonical additional root.
 * @param config - the row's configuration.
 * @param state - the session's delivery state.
-* @param session - the session, for the cwd a relative touch resolves against.
 * @param signal - the turn's cancellation signal.
 * @returns the files to send and the deliveries to withdraw.
 */
-async function planRoot(ctx, api, root, config, state, session, signal) {
+async function planRoot(ctx, api, root, config, state, signal) {
 	const delivered = /* @__PURE__ */ new Map();
 	for (const [key, entry] of state.scopes) if (entry.root === root) delivered.set(key, entry);
 	const dirs = /* @__PURE__ */ new Set([root]);
@@ -567,7 +642,7 @@ async function planRoot(ctx, api, root, config, state, session, signal) {
 		if (dir !== root) dirs.add(dir);
 	}
 	for (const touched of state.touched) {
-		const parent = parentDirectoryOf(touched, session);
+		const parent = parentDirectoryOf(touched);
 		if (parent === void 0 || !isCanonicallyUnder(parent, root)) continue;
 		let dir = parent;
 		for (;;) {
@@ -678,16 +753,21 @@ async function loadDirectory(fs, api, root, config, signal, cwd) {
 	}
 	const files = [];
 	for (const candidate of candidates) {
+		if (isAbsolute(candidate.displayPath) || resolve(root, candidate.displayPath) !== resolve(candidate.absolutePath)) continue;
 		if (!isCanonicallyUnder(canonicalPath(candidate.absolutePath), root)) continue;
 		try {
 			const target = await fs.resolve(candidate.absolutePath);
+			const path = fs.processPath(target);
+			if (!isCanonicallyUnder(path, root)) continue;
 			const info = await fs.stat(target, signal);
 			if (info === void 0 || info.type !== "file") continue;
 			if (info.size !== void 0 && info.size > maxSourceBytes) continue;
+			const content = await fs.readText(target, signal);
+			if (canonicalPath(candidate.absolutePath) !== path || !isCanonicallyUnder(path, root)) continue;
 			files.push({
 				...candidate,
 				displayPath: candidate.absolutePath,
-				content: await fs.readText(target, signal)
+				content
 			});
 		} catch {
 			continue;

package/lib/instructions.js

@@ -1,2 +1,2 @@
-import { a as composeInstructionMessage, i as apply, n as DEFAULT_MAX_SOURCE_BYTES, o as inject, r as PLUGIN_SOURCE, s as touchedPathOfToolCall, t as DEFAULT_MAX_BYTES } from "./instructions-Cn1Jj5Xi.js";
+import { a as composeInstructionMessage, i as apply, n as DEFAULT_MAX_SOURCE_BYTES, o as inject, r as PLUGIN_SOURCE, s as touchedPathOfToolCall, t as DEFAULT_MAX_BYTES } from "./instructions-DfzN-wVf.js";
 export { DEFAULT_MAX_BYTES, DEFAULT_MAX_SOURCE_BYTES, PLUGIN_SOURCE, apply, composeInstructionMessage, inject, touchedPathOfToolCall };

package/lib/lsp.js

@@ -0,0 +1,38 @@
+import { t as aroundTool } from "./tool-context-CpgIFcCB.js";
+import { n as routeWorkspacePath, t as wrapMethod } from "./method-wrapper-Zc-JlDP3.js";
+import { AsyncLocalStorage } from "node:async_hooks";
+//#region src/lsp.ts
+const inject = ["multiRootCompat", "multiRootScope"];
+function apply(ctx) {
+	const callers = new AsyncLocalStorage();
+	aroundTool(ctx, (exec, next) => exec.agent === void 0 ? next() : callers.run(exec.agent.session, next));
+	ctx.inject(["lsp", "fs"], (scope) => {
+		const service = scope.get("lsp");
+		scope.effect(() => wrapMethod(service, "query", (original) => async function(request, signal) {
+			const session = callers.getStore();
+			const primary = session === void 0 ? request.workspaceRoot : session.header.cwd ?? scope.get("sandboxPolicy")?.resolve({ session }).workspaceRoot;
+			if (primary === void 0) throw new Error("multi-root workspace: LSP caller has no session origin or deployment policy");
+			if (scope.multiRootScope.scopeOf(primary).length === 0 && session === void 0) return original.call(this, request, signal);
+			const route = await routeWorkspacePath(scope, primary, request.filePath, signal, request.workspaceRoot);
+			if (route === void 0) {
+				const target = await scope.fs.resolve(request.filePath, {
+					cwd: request.workspaceRoot,
+					...signal === void 0 ? {} : { signal }
+				});
+				return original.call(this, {
+					...request,
+					workspaceRoot: primary,
+					filePath: scope.fs.processPath(target)
+				}, signal);
+			}
+			if (session === void 0 && route.workspaceRoot === route.primaryRoot) return original.call(this, request, signal);
+			return original.call(this, {
+				...request,
+				workspaceRoot: route.workspaceRoot,
+				filePath: route.absolutePath
+			}, signal);
+		}), "multi-root:lsp routing");
+	});
+}
+//#endregion
+export { apply, inject };

package/lib/method-wrapper-Zc-JlDP3.js

@@ -0,0 +1,51 @@
+import { canonicalPath } from "@deepseek-ai/dsh-sandbox";
+//#region src/workspace-routing.ts
+/** Resolve relative paths against the primary cwd; never search other roots by basename. */
+async function routeWorkspacePath(ctx, primaryRoot, path, signal, cwd = primaryRoot) {
+	signal?.throwIfAborted();
+	const primary = canonicalPath(primaryRoot);
+	const roots = [primary, ...ctx.multiRootScope.scopeOf(primary)];
+	const target = await ctx.fs.resolve(path, {
+		cwd,
+		...signal === void 0 ? {} : { signal }
+	});
+	for (const root of roots) {
+		const rootTarget = await ctx.fs.resolve(root, signal === void 0 ? {} : { signal });
+		if (!ctx.fs.contains(rootTarget, target)) continue;
+		if (root !== primary && !ctx.multiRootScope.scopeOf(primary).includes(root)) return void 0;
+		signal?.throwIfAborted();
+		return {
+			primaryRoot: primary,
+			workspaceRoot: root,
+			target,
+			absolutePath: ctx.fs.processPath(target)
+		};
+	}
+}
+//#endregion
+//#region src/method-wrapper.ts
+/** Wrap a public method on a Cordis service without capturing a caller-context proxy. */
+function wrapMethod(target, key, wrap) {
+	const own = Object.getOwnPropertyDescriptor(target, key);
+	let prototype = target;
+	let descriptor;
+	while (prototype !== null && descriptor === void 0) {
+		descriptor = Object.getOwnPropertyDescriptor(prototype, key);
+		prototype = Object.getPrototypeOf(prototype);
+	}
+	if (typeof descriptor?.value !== "function") throw new Error(`multi-root: ${String(key)} is not a public method`);
+	const value = wrap(descriptor.value);
+	Object.defineProperty(target, key, {
+		configurable: true,
+		writable: true,
+		enumerable: own?.enumerable ?? false,
+		value
+	});
+	return () => {
+		if (Object.getOwnPropertyDescriptor(target, key)?.value !== value) return;
+		if (own === void 0) Reflect.deleteProperty(target, key);
+		else Object.defineProperty(target, key, own);
+	};
+}
+//#endregion
+export { routeWorkspacePath as n, wrapMethod as t };