better-dsh 0.2.3-e → 0.2.3-g

package/lib/{wrap-DC8O3SYz.js → wrap-JFjcWwZf.js}

@@ -259,6 +259,14 @@ function listDvcDevices() {
 * A leading `dvc://` is tolerated so callers may pass either the parsed path
 * (the write tool's contract) or the full URL.
 */
+/** Subpath after the device name (`status`, `diagnostics?file=…`), or undefined. */
+function subpathOf(path) {
+	const trimmed = (path.startsWith("dvc://") ? path.slice(6) : path).replace(/^\/+/, "");
+	const slash = trimmed.indexOf("/");
+	if (slash === -1) return void 0;
+	const sub = trimmed.slice(slash + 1);
+	return sub === "" ? void 0 : sub;
+}
 function deviceNameFromPath(path) {
 	const trimmed = (path.startsWith("dvc://") ? path.slice(6) : path).replace(/^\/+/, "");
 	const slash = trimmed.indexOf("/");
@@ -275,16 +283,31 @@ function messageOf(error) {
 * name keeps the `unknown device` placeholder text.
 */
 function createDvcHandler(_deps = {}) {
-	return { async resolve(_env, path) {
-		const name = deviceNameFromPath(path);
-		if (name === "") {
-			if (devices.size === 0) return "no devices mounted";
-			return [...devices].map(([n, device$1]) => `${n}\t${device$1.summary}`).join("\n");
+	return {
+		selectorAware: true,
+		async resolve(_env, path, selector) {
+			const name = deviceNameFromPath(path);
+			if (name === "") {
+				if (devices.size === 0) return "no devices mounted";
+				return applySelector([...devices].map(([n, device$1]) => `${n}\t${device$1.summary}`).join("\n"), selector ?? null);
+			}
+			const device = devices.get(name);
+			if (device === void 0) return `unknown device: ${name}`;
+			const subpath = subpathOf(path);
+			if (subpath !== void 0 && device.read !== void 0) {
+				const query = selector?.kind === "query" ? `?${selector.q}` : "";
+				let text;
+				try {
+					text = await device.read(`${subpath}${query}`, _env.agent?.id);
+				} catch (error) {
+					return `Error: ${error instanceof Error ? error.message : String(error)}`;
+				}
+				return selector !== void 0 && selector !== null && selector.kind !== "query" ? applySelector(text, selector) : text;
+			}
+			if (subpath !== void 0) return `unknown read path dvc://${name}/${subpath} (device serves doc only)`;
+			return applySelector(`${device.summary}\nusage: write dvc://${name} with a JSON args object to execute this device`, selector ?? null);
 		}
-		const device = devices.get(name);
-		if (device === void 0) return `unknown device: ${name}`;
-		return `${device.summary}\nusage: write dvc://${name} with a JSON args object to execute this device`;
-	} };
+	};
 }
 /**
 * Write dispatch for `dvc://` URLs — called by the write tool's URL branch.
@@ -296,7 +319,7 @@ function createDvcHandler(_deps = {}) {
 * contract — while a device-reported failure rejects the returned promise as
 * `DVC_DEVICE_ERROR` carrying the device name.
 */
-function dispatchDvcWrite(path, content) {
+function dispatchDvcWrite(path, content, session) {
 	if (devices.size === 0) throw new UrlSchemesError("DVC_NO_DEVICE", "dvc:// write dispatch: no devices mounted to route the write to");
 	const name = deviceNameFromPath(path);
 	const device = devices.get(name);
@@ -307,7 +330,8 @@ function dispatchDvcWrite(path, content) {
 	} catch (error) {
 		throw new UrlSchemesError("DVC_BAD_ARGS", `dvc:// write dispatch: device "${name}" requires a JSON args payload (${messageOf(error)})`);
 	}
-	return Promise.resolve().then(() => device.execute(args)).catch((error) => {
+	if (session !== void 0 && args !== null && typeof args === "object" && !Array.isArray(args)) args = { ...args };
+	return Promise.resolve().then(() => device.execute(args, { session })).catch((error) => {
 		throw new UrlSchemesError("DVC_DEVICE_ERROR", `dvc:// device "${name}" execute failed: ${messageOf(error)}`);
 	});
 }
@@ -317,10 +341,12 @@ function dispatchDvcWrite(path, content) {
 function resolveDocsDir() {
 	let dir = dirname(fileURLToPath(import.meta.url));
 	for (;;) {
-		const candidate = join(dir, "docs");
-		try {
-			if (statSync(candidate).isDirectory()) return candidate;
-		} catch {}
+		for (const name of ["dsh-docs", "docs"]) {
+			const candidate = join(dir, name);
+			try {
+				if (statSync(candidate).isDirectory()) return candidate;
+			} catch {}
+		}
 		const parent = dirname(dir);
 		if (parent === dir) return void 0;
 		dir = parent;
@@ -457,7 +483,7 @@ function createDshHandler(deps) {
 			const candidates = [];
 			if (docsDir !== void 0) candidates.push(docsDir);
 			const pkgRoot = dirname(dirname(dirname(dirname(fileURLToPath(import.meta.url)))));
-			candidates.push(join(pkgRoot, "docs"), join(pkgRoot, "..", "docs"));
+			candidates.push(join(pkgRoot, "dsh-docs"), join(pkgRoot, "docs"), join(pkgRoot, "..", "docs"));
 			for (const dir of candidates) try {
 				if ((await promises.stat(dir)).isDirectory()) return dir;
 			} catch {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-dsh",
-  "version": "0.2.3-e",
+  "version": "0.2.3-g",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -27,6 +27,7 @@
   "files": [
     "lib",
     "docs",
+    "dsh-docs",
     "cordis.patch.yml",
     "eval-description.md",
     "url-schemes-instruction.md",