better-dsh 0.3.1-b → 0.3.1-e

package/lib/remote/plugin.js

@@ -1,15 +1,15 @@
-import { t as Schema } from "../lib-C8_jXvwA.js";
+import { t as Schema } from "../lib.js";
 import { Context } from "@deepseek-ai/cordis";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
-import { constants, createReadStream, createWriteStream, mkdirSync, readFileSync, statSync } from "node:fs";
+import { constants, createReadStream, createWriteStream, existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
 import { dirname, isAbsolute, join, posix, resolve } from "node:path";
 import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { homedir, tmpdir } from "node:os";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { chmod, lstat, mkdir, mkdtemp, open, readFile, readdir, readlink, rename, rm, stat, symlink, writeFile } from "node:fs/promises";
-import { pipeline } from "node:stream/promises";
 import { Readable } from "node:stream";
+import { pipeline } from "node:stream/promises";
 import { createConnection, createServer } from "node:net";
 
 //#region src/remote/archive.ts
@@ -318,17 +318,18 @@ async function copyTree(request, source, destination, signal, scratchRoot = join
 	signal.throwIfAborted();
 	if (request.argv !== void 0 || request.pullArgv !== void 0 || request.pushArgv !== void 0) throw new Error("copy: argv/pullArgv/pushArgv are native CLI options; the Hub/local staged lane does not accept CLI options");
 	await mkdir(scratchRoot, { recursive: true });
-	signal.throwIfAborted();
-	const scratch = await mkdtemp(join(scratchRoot, "remote-copy-")), payload = join(scratch, "payload.bin");
 	const receipt = {
 		action: "copy",
+		route: "hub-staged",
 		src: request.src,
 		dst: request.dst,
-		verified: false,
+		ok: false,
+		verification: "not-applicable",
 		bytes: 0,
 		entries: 0,
 		scope: "transferred entries"
 	};
+	const scratch = await mkdtemp(join(scratchRoot, "remote-copy-")), payload = join(scratch, "payload.bin");
 	try {
 		await pipeline(await source.endpoint.exportTree(source.path, signal), createWriteStream(payload, {
 			flags: "wx",
@@ -352,24 +353,79 @@ async function copyTree(request, source, destination, signal, scratchRoot = join
 			const dest = await destination.endpoint.digest(destination.path, signal, selection);
 			receipt.destinationDigest = dest.sha256;
 			if (dest.sha256 !== receipt.sourceDigest) throw new Error("destination digest mismatch");
-			receipt.verified = true;
+			receipt.verification = "sha256";
 		}
 		signal.throwIfAborted();
 		await rm(scratch, {
 			recursive: true,
 			force: true
 		});
+		receipt.ok = true;
 		return receipt;
 	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		const reason = signal.aborted ? "aborted" : /mismatch/i.test(message) ? "digest-mismatch" : "staging-error";
 		throw new CopyError({
 			...receipt,
-			verified: false,
+			ok: false,
+			reason,
 			scratch,
-			error: error instanceof Error ? error.message : String(error)
+			error: message
 		});
 	}
 }
 
+//#endregion
+//#region src/remote/ssh-argv.ts
+/**
+* ONE identity-assembly policy for every SSH-speaking lane (user close-out
+* ruling 2026-10-17: "four builders necessarily mean four identity
+* semantics" — the structural root of F1).
+*
+* Assembly: explicit connection fields (byossh registrations; caller options
+* may override later by the CLI's own last-option-wins) in ONE order —
+* user, port, key, proxyJump — spoken in the target CLI's dialect.
+*
+* Resolution: config-side identity (aliases, config-only IdentityFile paths)
+* is read from the ORIGIN's own ssh config natively by every lane. The single
+* exception is the scp -3 temp config (ssh -F sees no user config), where
+* tempSshConfig inlines the `ssh -G`-resolved fields — paths only, never key
+* material (F1, 2026-10-14). That policy lives beside this builder in
+* native-copy.ts and must stay the only such inline site.
+*
+* Former duplicate builders now reduced here: sshArgv (execution/probes),
+* identityArgv (scp routes), rsyncRsh (RSYNC_RSH wiring), relaySsh
+* (dual-SSH relay). Behavior is byte-identical to each former site.
+*/
+/** Identity options ONLY for one connection, in the target CLI's dialect:
+* user, port, key, proxyJump — conditional, one order, NO base flags (each
+* lane's dialect base — BatchMode, -T, hardening — stays at its call site).
+* scp carries the user inside its user@host operand, so the scp dialect
+* never emits -l; its port flag is -P. */
+function sshIdentityArgv(connection, dialect) {
+	const args = [];
+	if (dialect === "ssh" && connection.user !== void 0) args.push("-l", connection.user);
+	if (connection.port !== void 0) args.push(dialect === "scp" ? "-P" : "-p", String(connection.port));
+	if (connection.key !== void 0) args.push("-i", connection.key);
+	if (connection.proxyJump !== void 0) args.push("-J", connection.proxyJump);
+	return args;
+}
+/** Full ssh invocation around the shared identity core. base and extra are
+* trusted internal argv (dialect flags incl. BatchMode, forwarding options)
+* — never a model-provided shell string. */
+function sshCommandArgv(connection, base, extra, command) {
+	const args = [
+		"ssh",
+		...base,
+		...sshIdentityArgv(connection, "ssh"),
+		...extra,
+		"--",
+		connection.host
+	];
+	if (command !== void 0) args.push(command);
+	return args;
+}
+
 //#endregion
 //#region src/remote/output-ring.ts
 const continuation = (byte) => (byte & 192) === 128;
@@ -675,15 +731,17 @@ function scpSpec(connection, path$1) {
 	const host = connection.host.includes(":") ? `[${connection.host}]` : connection.host;
 	return `${connection.user !== void 0 ? `${connection.user}@${host}` : host}:${path$1}`;
 }
-/** Connection identity as scp options (port, key), placed BEFORE caller argv so
-* an explicit caller -F/-i/-P/-J overrides the registered identity by scp's own
-* precedence (last option wins). */
+/** Connection identity as scp options, placed BEFORE caller argv so an
+* explicit caller -F/-i/-P/-J overrides the registered identity by scp's own
+* precedence (last option wins). Assembly itself lives in ssh-argv.ts
+* (the ONE identity policy — 2026-10-17 ruling); only the scp dialect
+* placement rule is local. */
 function identityArgv(connection) {
-	const options = ["-o", "BatchMode=yes"];
-	if (connection.port !== void 0) options.push("-P", String(connection.port));
-	if (connection.key !== void 0) options.push("-i", connection.key);
-	if (connection.proxyJump !== void 0) options.push("-J", connection.proxyJump);
-	return options;
+	return [
+		"-o",
+		"BatchMode=yes",
+		...sshIdentityArgv(connection, "scp")
+	];
 }
 function sshEndpoint(plan) {
 	if (plan.kind !== "ssh") throw new Error("remote: native copy endpoint is not an SSH target");
@@ -722,18 +780,23 @@ async function nativeCopy(request, endpoints, signal, options = {}) {
 		stdout: [],
 		stderr: [],
 		outputTruncated: false,
-		verified: false,
+		verification: "native-exit-only",
+		ok: true,
 		cleanup: "none-required"
 	};
-	const finish = (route, argvs, results) => {
+	const finish = (route, argvs, results, internal = []) => {
 		receipt.route = route;
-		receipt.argv = argvs;
+		receipt.argv = argvs.map((argv) => argv.map((token) => internal.find(([secret]) => secret === token)?.[1] ?? token));
 		receipt.exits = results.map((result) => result.exit);
 		receipt.stdout = results.map((result) => result.stdout);
 		receipt.stderr = results.map((result) => result.stderr);
 		receipt.outputTruncated = results.some((result) => result.outputTruncated);
+		receipt.ok = !signal.aborted && receipt.exits.every((exit) => exit === 0);
+		if (!receipt.ok) receipt.reason = signal.aborted ? "aborted" : "non-zero-exit";
 		return receipt;
 	};
+	if (request.mkdir !== false) await ensureDestinationDir(endpoints.dst, signal, options.execArgvFor, wrap, receipt);
+	else receipt.created = "n-a";
 	if (s === "local" && t === "ssh") {
 		rejectRemoteToRemoteScp(oneShot);
 		const connection = sshEndpoint(endpoints.dst.plan).connection;
@@ -786,7 +849,7 @@ async function nativeCopy(request, endpoints, signal, options = {}) {
 				srcSpec,
 				dstSpec
 			];
-			return finish("scp -3 (data through origin)", [argv], [await runNative(wrap(argv), signal)]);
+			return finish("scp-3", [argv], [await runNative(wrap(argv), signal)], config !== void 0 ? [[config.path, "<temp-ssh-config>"]] : []);
 		} catch (error) {
 			if (signal.aborted) unknown = true;
 			throw error;
@@ -807,7 +870,7 @@ async function nativeCopy(request, endpoints, signal, options = {}) {
 		];
 		const result = await runNative(wrap(argv), signal);
 		withSymlinkHint(result);
-		return finish("docker cp", [argv], [result]);
+		return finish("docker-cp", [argv], [result]);
 	}
 	if (s === "docker" && t === "local") {
 		const argv = [
@@ -819,7 +882,7 @@ async function nativeCopy(request, endpoints, signal, options = {}) {
 		];
 		const result = await runNative(wrap(argv), signal);
 		withSymlinkHint(result);
-		return finish("docker cp", [argv], [result]);
+		return finish("docker-cp", [argv], [result]);
 	}
 	if (s === "local" && t === "incus") {
 		const argv = [
@@ -831,7 +894,7 @@ async function nativeCopy(request, endpoints, signal, options = {}) {
 			endpoints.src.path,
 			`${containerOf(endpoints.dst.plan)}${endpoints.dst.path}`
 		];
-		return finish("incus file push", [argv], [await runNative(wrap(argv), signal)]);
+		return finish("incus-file-push", [argv], [await runNative(wrap(argv), signal)]);
 	}
 	if (s === "incus" && t === "local") {
 		const argv = [
@@ -842,7 +905,7 @@ async function nativeCopy(request, endpoints, signal, options = {}) {
 			`${containerOf(endpoints.src.plan)}${endpoints.src.path}`,
 			endpoints.dst.path
 		];
-		return finish("incus file pull", [argv], [await runNative(wrap(argv), signal)]);
+		return finish("incus-file-pull", [argv], [await runNative(wrap(argv), signal)]);
 	}
 	if (s === "local" || t === "local") throw new Error("remote: this endpoint pair is a single native command route; pullArgv/pushArgv apply to cross-endpoint pairs only");
 	const pullOptions = request.pullArgv !== void 0 ? pull : oneShot;
@@ -855,9 +918,12 @@ async function nativeCopy(request, endpoints, signal, options = {}) {
 		const pullArgv = segmentArgv(endpoints.src.plan, endpoints.src.path, staged, pullOptions, "pull");
 		const pushArgv = segmentArgv(endpoints.dst.plan, endpoints.dst.path, staged, pushOptions, "push");
 		const first = await runNative(wrap(pullArgv), signal);
-		if (first.exit !== 0) return finish("two native commands with origin staging (push not started: pull failed)", [pullArgv], [first]);
+		if (first.exit !== 0) {
+			receipt.note = "push not started: pull failed";
+			return finish("staged-pull-push", [pullArgv], [first], [[staged, "<staging>"]]);
+		}
 		const second = await runNative(wrap(pushArgv), signal);
-		return finish("two native commands with origin staging", [pullArgv, pushArgv], [first, second]);
+		return finish("staged-pull-push", [pullArgv, pushArgv], [first, second], [[staged, "<staging>"]]);
 	} finally {
 		receipt.cleanup = await rm(scratch, {
 			recursive: true,
@@ -918,6 +984,58 @@ function segmentArgv(plan, remote, staged, opts, leg) {
 		spec
 	];
 }
+/** D3 mkdir pre-hop: ensure the destination's PARENT directory exists before
+* the transfer (never the operand itself — see parent-only note below).
+* transfer. Local dst is node-side; remote dst runs ONE exec `mkdir -p` probe
+* whose stdout discloses created-vs-existed. Best-effort by contract: any
+* failure records created:'n-a' + note and lets the copy proceed so the native
+* CLI surfaces the real error (and stopped-container docker cp keeps working). */
+async function ensureDestinationDir(dst, signal, execArgvFor, wrap, receipt) {
+	const dir = dirname(dst.path);
+	if (dir === "/" || dir === ".") {
+		receipt.created = false;
+		return;
+	}
+	if (dst.plan.kind === "local") {
+		try {
+			if (existsSync(dir)) {
+				receipt.created = false;
+				return;
+			}
+			mkdirSync(dir, { recursive: true });
+			receipt.created = true;
+		} catch (error) {
+			receipt.created = "n-a";
+			receipt.note = `mkdir pre-hop failed: ${error instanceof Error ? error.message : String(error)}`;
+		}
+		return;
+	}
+	if (execArgvFor === void 0) {
+		receipt.created = "n-a";
+		return;
+	}
+	if (/[\r\n]/.test(dir)) {
+		receipt.created = "n-a";
+		receipt.note = "mkdir pre-hop skipped: newline-bearing destination path";
+		return;
+	}
+	const quoted = `'${dir.replaceAll("'", "'\\\\''")}'`;
+	const script = `if [ -d ${quoted} ]; then echo existed; else mkdir -p ${quoted} && echo created; fi`;
+	try {
+		const result = await runNative(wrap(execArgvFor(dst.plan, script)), signal);
+		const word = result.stdout.trim().split("\n").pop();
+		if (result.exit === 0 && word === "created") receipt.created = true;
+		else if (result.exit === 0 && word === "existed") receipt.created = false;
+		else {
+			receipt.created = "n-a";
+			const tail = result.stderr.trim().split("\n").filter((line) => line.length > 0).pop();
+			receipt.note = `mkdir pre-hop unavailable (exit ${result.exit})${tail !== void 0 ? `: ${tail}` : ""}`;
+		}
+	} catch (error) {
+		receipt.created = "n-a";
+		receipt.note = `mkdir pre-hop failed: ${error instanceof Error ? error.message : String(error)}`;
+	}
+}
 /** Distinguishing identities for scp -3: an origin-only temp config maps two
 * synthetic aliases; keys are referenced in place, never copied to any remote. */
 /** D8 (2026-10-14 user adoption, third acceptance round): a LOCAL directory source gets
@@ -1018,10 +1136,10 @@ async function resolveThroughOriginConfig(c, runNative$1) {
 //#endregion
 //#region src/remote/ssh-rsync-native-relay.ts
 /** ssh argv for the relay: batch, no agent, no multiplexing. `command` is the
-* remote command; forwarding options go before `--`, the host after it. */
+* remote command; forwarding options go before `--`, the host after it.
+* Identity core comes from ssh-argv.ts (the ONE policy — 2026-10-17 ruling). */
 function relaySsh(connection, extra, command) {
-	const args = [
-		"ssh",
+	return sshCommandArgv(connection, [
 		"-o",
 		"BatchMode=yes",
 		"-T",
@@ -1038,14 +1156,7 @@ function relaySsh(connection, extra, command) {
 		"ServerAliveInterval=5",
 		"-o",
 		"ServerAliveCountMax=2"
-	];
-	if (connection.user !== void 0) args.push("-l", connection.user);
-	if (connection.port !== void 0) args.push("-p", String(connection.port));
-	if (connection.key !== void 0) args.push("-i", connection.key);
-	if (connection.proxyJump !== void 0) args.push("-J", connection.proxyJump);
-	args.push(...extra, "--", connection.host);
-	if (command !== void 0) args.push(command);
-	return args;
+	], extra, command);
 }
 async function freePorts(count) {
 	const servers = [];
@@ -1328,14 +1439,7 @@ async function runRsync(request, source, destination, signal, options = {}) {
 	checkAbsolute(destination.path);
 	const argv = checkArgv("argv", request.argv);
 	if ("pullArgv" in request || "pushArgv" in request) throw new Error("remote: rsync takes argv only; pullArgv/pushArgv are copy-only fields");
-	for (const legacy of [
-		"dryRun",
-		"delete",
-		"excludes",
-		"preserve",
-		"verify",
-		"mkdir"
-	]) if (legacy in request) throw new Error(`remote: rsync field "${legacy}" was removed — pass native options through argv instead (e.g. "--dry-run", "--delete", "--exclude=<pattern>", "-a"/"-r"; verify/mkdir belong to the copy Hub/local lane)`);
+	for (const key of Object.keys(request)) if (key !== "src" && key !== "dst" && key !== "argv") throw new Error(`remote: rsync rejects unknown field "${key}" — native options go through argv (verify is a copy Hub-lane option; mkdir is copy-only; for destination parents pass --mkpath yourself)`);
 	if (!source.connection && !destination.connection) throw new Error("rsync requires at least one SSH endpoint; local-only is unsupported");
 	let result;
 	let route;
@@ -1383,6 +1487,9 @@ async function runRsync(request, source, destination, signal, options = {}) {
 		dst: request.dst,
 		argv,
 		route,
+		verification: "native-exit-only",
+		ok: result.exit === 0,
+		...result.exit === 0 ? {} : { reason: signal.aborted ? "aborted" : "non-zero-exit" },
 		command: `rsync ${argv.join(" ")}`,
 		...itemized.length > 0 || argv.includes("--itemize-changes") || argv.includes("-i") ? { itemizedChanges: itemized } : {},
 		...literalBytes === void 0 ? {} : { literalBytes },
@@ -1397,21 +1504,14 @@ async function runRsync(request, source, destination, signal, options = {}) {
 * placeholder host rsync appends and execs the canonical SSH argv. All tokens
 * are tool-built argv (identity options/aliases), never model text. */
 function rsyncRsh(connection, wrap) {
-	const args = [
-		"ssh",
-		"-o",
-		"BatchMode=yes",
-		"-T"
-	];
-	if (connection.user !== void 0) args.push("-l", connection.user);
-	if (connection.port !== void 0) args.push("-p", String(connection.port));
-	if (connection.key !== void 0) args.push("-i", connection.key);
-	if (connection.proxyJump !== void 0) args.push("-J", connection.proxyJump);
-	args.push("--", connection.host);
 	return [
 		"bash",
 		"-c",
-		`shift; exec ${wrap(args).map(rshQuote).join(" ")} "$@"`,
+		`shift; exec ${wrap(sshCommandArgv(connection, [
+			"-o",
+			"BatchMode=yes",
+			"-T"
+		], [])).map(rshQuote).join(" ")} "$@"`,
 		"rsync-rsh"
 	].map(rshQuote).join(" ");
 }
@@ -1507,26 +1607,19 @@ var SshTargets = class {
 	}
 };
 /** Shared by execution, probes and file/relay consumers. extraArgs is trusted
-* internal SSH argv (e.g. forwarding), never a model-provided shell string. */
+* internal SSH argv (e.g. forwarding), never a model-provided shell string.
+* Identity assembly lives in ssh-argv.ts (the ONE policy — 2026-10-17 ruling);
+* this wrapper only picks the tty/batch dialect base. */
 function sshArgv(connection, options = {}) {
-	const args = options.tty ? [
-		"ssh",
+	return sshCommandArgv(connection, options.tty ? [
 		"-tt",
 		"-o",
 		"BatchMode=yes"
 	] : [
-		"ssh",
 		"-o",
 		"BatchMode=yes",
 		"-T"
-	];
-	if (connection.user !== void 0) args.push("-l", connection.user);
-	if (connection.port !== void 0) args.push("-p", String(connection.port));
-	if (connection.key !== void 0) args.push("-i", connection.key);
-	if (connection.proxyJump !== void 0) args.push("-J", connection.proxyJump);
-	args.push(...options.extraArgs ?? [], "--", connection.host);
-	if (options.command !== void 0) args.push(options.command);
-	return args;
+	], options.extraArgs ?? [], options.command);
 }
 
 //#endregion
@@ -2688,13 +2781,18 @@ var RemoteDriver = class {
 				path: dst.path,
 				endpoint: localFileEndpoint()
 			}, combined);
-			if (request.verify !== void 0 || request.mkdir !== void 0) throw new Error("copy: verify/mkdir apply to the Hub/local staged lane only; native CLI routes do not verify or create parents (mirror the CLI's own behavior with argv like -r)");
+			if (request.verify !== void 0) throw new Error("copy: verify is a Hub/local staged lane option (independent SHA-256); native routes report exit-code-only verification — self-verify via oneshot digest commands when needed");
 			const planOf = (end) => end.kind === "cli" ? end.plan : end.kind === "local" ? { kind: "local" } : void 0;
 			const srcPlan = planOf(src), dstPlan = planOf(dst);
 			if (srcPlan === void 0 || dstPlan === void 0) throw new Error("copy: unreachable route resolution");
+			const execArgvFor = (plan, script) => {
+				const argv = helperShellArgv(plan, script);
+				return this.opts.nativeArgvFor ? this.opts.nativeArgvFor(argv) : argv;
+			};
 			return nativeCopy({
 				src: request.src,
 				dst: request.dst,
+				...request.mkdir === void 0 ? {} : { mkdir: request.mkdir },
 				...request.argv === void 0 ? {} : { argv: request.argv },
 				...request.pullArgv === void 0 ? {} : { pullArgv: request.pullArgv },
 				...request.pushArgv === void 0 ? {} : { pushArgv: request.pushArgv }
@@ -2707,7 +2805,10 @@ var RemoteDriver = class {
 					plan: dstPlan,
 					path: dst.path
 				}
-			}, combined, { wrapArgv: this.opts.nativeArgvFor });
+			}, combined, {
+				wrapArgv: this.opts.nativeArgvFor,
+				execArgvFor
+			});
 		})();
 		this.starting.add(work);
 		work.then(() => this.starting.delete(work), () => this.starting.delete(work));
@@ -3286,7 +3387,7 @@ Bare names resolve ssh config → docker → incus → live pty; unmatched goes
 
 oneshot: stateless bash -lc, stdout/stderr separate, exit code verbatim. Supervision prefers a pinned superd-run helper cached on the endpoint (~/.cache/superd/run; first call uploads it over the same exec lane) and falls back to a POSIX wrapper everywhere else — the result field "runner" says which ran. Helper or wrapper, backgrounded children are reaped on completion and the whole group is killed on timeout/cancel; the endpoint needs bash only (no Python).
 
-Files — {action:"copy" | "rsync", src:"[target:]abs", dst:"[target:]abs", argv:["-a"]}: argv tokens pass verbatim before src/dst — no whitelist, no forced defaults (dry run = pass "--dry-run" yourself); the CLI's own exit code and stderr come back in the receipt. copy: local↔SSH scp; SSH↔SSH scp -3 through the origin (identities stay local); docker cp; incus file push/pull; any other pair = two commands with origin staging (per-half options via pullArgv/pushArgv, exclusive with argv); scp -R (uppercase — scp's remote-client mode) is refused; copy of a directory from a LOCAL source auto-appends the route's recursive flag (-r, shown in the receipt argv); from a REMOTE source pass -r yourself or use rsync; success is NOT independently verified; verify/mkdir only on the Hub↔local lane. rsync: local↔SSH, or SSH↔SSH with one protocol conversation between the peers (real delta; forwarding denied → honest error, never full copy). rsync src trailing slash copies contents, no slash the directory itself.
+Files — {action:"copy" | "rsync", src:"[target:]abs", dst:"[target:]abs", argv:["-a"]}: argv tokens pass verbatim before src/dst — no whitelist, no forced defaults (dry run = pass "--dry-run" yourself); the CLI's own exit code and stderr come back in the receipt. copy: local↔SSH scp; SSH↔SSH scp -3 through the origin (identities stay local); docker cp; incus file push/pull; any other pair = two commands with origin staging (per-half options via pullArgv/pushArgv, exclusive with argv); scp -R (uppercase — scp's remote-client mode) is refused; copy of a directory from a LOCAL source auto-appends the route's recursive flag (-r, shown in the receipt argv); from a REMOTE source pass -r yourself or use rsync; mkdir defaults to ensuring the destination's PARENT directory first (one exec pre-hop, outcome in the receipt created field; the operand itself is never pre-created); receipts use stable route ids (scp / scp-3 / docker-cp / incus-file-push / incus-file-pull / staged-pull-push / hub-staged) with ok+reason, the verification tier actually performed (native-exit-only by default; sha256 on the Hub lane) and tool-owned temp paths in argv shown as placeholders. rsync: local↔SSH, or SSH↔SSH with one protocol conversation between the peers (real delta; forwarding denied → honest error, never full copy). rsync src trailing slash copies contents, no slash the directory itself.
 
 Output: pty tails at ~30k chars ("[truncated: …]" header) — redirect bulk output to a file. Hard retention 4,000,000 UTF-16 units per stream (Hub 4MiB bytes); outputStats reports the rest; restart cannot recover discarded output. stdin feeds the command; timeout (seconds) interrupts then kills. run_in_background:true (oneshot) → jobId for job_output/job_kill. Native transport errors pass through verbatim — self-correct from them.`;
 function createRemoteTool(driver, opts = {}) {
@@ -3325,11 +3426,11 @@ function createRemoteTool(driver, opts = {}) {
 			},
 			verify: {
 				type: "boolean",
-				description: "copy only, Hub↔local↔local staged lane only: independent SHA-256 verification (default true). Native CLI routes do not verify and report that fact."
+				description: "copy only. Receipts name the verification tier actually performed (D1=A): native CLI routes are \"native-exit-only\" (no independent check — self-verify via oneshot digest commands when needed); the Hub↔local staged lane computes independent SHA-256 digests by default and verify:false skips them (\"not-applicable\"). No hash tier exists on native routes."
 			},
 			mkdir: {
 				type: "boolean",
-				description: "copy only, Hub↔local↔local staged lane only: create missing destination parents (default true). Native CLI routes let the CLI decide."
+				description: "copy only, all routes. Default true: before transfer, one best-effort exec pre-hop ensures the destination's PARENT directory exists (the operand itself is never pre-created — each CLI's own layout semantics stay byte-identical). Receipt created field: true (parent created this call) / false (already existed) / \"n-a\" (skipped or pre-hop unavailable, e.g. docker exec on a stopped container — the native CLI then reports the real error itself). false skips the pre-hop."
 			},
 			run_in_background: {
 				type: "boolean",
@@ -3452,12 +3553,26 @@ function createRemoteTool(driver, opts = {}) {
 					args.timeout,
 					args.run_in_background
 				].some((value) => value !== void 0)) throw new Error(`${args.action} cannot be combined with execution/PTY/job arguments; register byossh separately first`);
-				for (const legacy of [
-					"dryRun",
-					"delete",
-					"excludes",
-					"preserve"
-				]) if (args[legacy] !== void 0) throw new Error(`${legacy} was removed: pass native options through argv instead (e.g. ${legacy === "dryRun" ? "\"--dry-run\"" : legacy === "delete" ? "\"--delete\"" : legacy === "excludes" ? "\"--exclude=<pattern>\"" : "\"-a\" / \"-r\""})`);
+				const KNOWN_PARAMS = new Set([
+					"action",
+					"src",
+					"dst",
+					"argv",
+					"pullArgv",
+					"pushArgv",
+					"verify",
+					"mkdir",
+					"run_in_background",
+					"target",
+					"ssh",
+					"spawn",
+					"cmd",
+					"script",
+					"mode",
+					"stdin",
+					"timeout"
+				]);
+				for (const key of Object.keys(args)) if (!KNOWN_PARAMS.has(key)) throw new Error(`remote: unknown parameter "${key}" — this surface has no legacy aliases (dryRun/delete/excludes/preserve are gone); pass native CLI options through argv instead`);
 				if (args.action === "rsync") {
 					if (args.pullArgv !== void 0 || args.pushArgv !== void 0) throw new Error("rsync takes argv only; pullArgv/pushArgv are copy-only fields");
 					if ([args.verify, args.mkdir].some((value) => value !== void 0)) throw new Error("rsync cannot be combined with copy verify/mkdir options; the Hub/local staged lane is copy-only");
@@ -3467,13 +3582,14 @@ function createRemoteTool(driver, opts = {}) {
 						dst: args.dst,
 						...args.argv === void 0 ? {} : { argv: args.argv }
 					}, exec.signal, { sessionKey: getSessionKey(exec) });
-					if (receipt$1.exit !== 0) throw new Error(JSON.stringify(receipt$1));
+					if (receipt$1.ok === false || receipt$1.exit !== 0) throw new Error(JSON.stringify(receipt$1));
+					const rsyncDuration = Date.now() - start;
 					return {
 						kind: "rsync",
-						text: JSON.stringify(receipt$1),
+						text: formatTransferLine("rsync", receipt$1, rsyncDuration),
 						receipt: receipt$1,
 						exit: receipt$1.exit,
-						durationMs: Date.now() - start
+						durationMs: rsyncDuration
 					};
 				}
 				const copyStart = Date.now();
@@ -3486,14 +3602,16 @@ function createRemoteTool(driver, opts = {}) {
 					...args.pullArgv === void 0 ? {} : { pullArgv: args.pullArgv },
 					...args.pushArgv === void 0 ? {} : { pushArgv: args.pushArgv }
 				}, exec.signal, { sessionKey: getSessionKey(exec) });
-				const exits = receipt.exits ?? [];
-				if (exits.some((code) => code !== 0)) throw new Error(JSON.stringify(receipt));
+				const asReceipt = receipt;
+				const exits = asReceipt.exits ?? [];
+				if (asReceipt.ok === false || exits.some((code) => code !== 0)) throw new Error(JSON.stringify(receipt));
+				const copyDuration = Date.now() - copyStart;
 				return {
 					kind: "copy",
-					text: JSON.stringify(receipt),
+					text: formatTransferLine("copy", receipt, copyDuration),
 					receipt,
 					exit: exits.length > 0 ? 0 : null,
-					durationMs: Date.now() - copyStart
+					durationMs: copyDuration
 				};
 			}
 			if ([
@@ -3590,6 +3708,26 @@ function createRemoteTool(driver, opts = {}) {
 	});
 	return tool;
 }
+/** S8 (2026-10-17): copy/rsync render as one formatted line; the full receipt
+* stays in the receipt field — raw-JSON dumps are gone from text. */
+function formatTransferLine(action, receipt, durationMs) {
+	const r = receipt;
+	const parts = [];
+	if (r.ok === false) parts.push(`✗ ${r.reason ?? "failed"}`);
+	parts.push(`${action} ${r.src} → ${r.dst}`);
+	if (r.route !== void 0 && r.route !== "") parts.push(`route ${r.route}`);
+	if (r.exits !== void 0) parts.push(`exits [${r.exits.join(",")}]`);
+	else if (r.exit !== void 0) parts.push(`exit ${r.exit}`);
+	if (r.verification !== void 0) parts.push(`verification ${r.verification}`);
+	if (r.created === true) parts.push("created yes");
+	else if (r.created === false) parts.push("created pre-existing");
+	else if (r.created === "n-a") parts.push("created n-a");
+	if (r.cleanup !== void 0 && r.cleanup !== "none-required") parts.push(`cleanup ${r.cleanup}`);
+	if (typeof r.bytes === "number") parts.push(`${r.bytes} bytes / ${r.entries} entries`);
+	parts.push(`${(durationMs / 1e3).toFixed(1)}s`);
+	if (r.note !== void 0 && r.note.length > 0) parts.push(`(${r.note})`);
+	return parts.join(" · ");
+}
 function renderValue(v) {
 	if (v.kind === "status" || v.kind === "roster" || v.kind === "job" || v.kind === "copy" || v.kind === "rsync") return v.text;
 	const parts = [];

package/lib/url-schemes/index.d.ts

@@ -1,4 +1,4 @@
-import { t as Schema } from "../index-DTDXUe6m.js";
+import { t as Schema } from "../index2.js";
 import { Context } from "@deepseek-ai/cordis";
 import { ToolDefinition } from "@deepseek-ai/dsh-tools";
 

package/lib/url-schemes/index.js

@@ -1,10 +1,10 @@
-import { r as __toESM, t as __commonJS } from "../chunk-DQxbwPpZ.js";
-import { t as Schema } from "../lib-C8_jXvwA.js";
-import { t as PACKAGE_ROOT } from "../kernel-env-x_WkG6Fr.js";
-import { n as captureNativeTools } from "../native-capture-BEByDXYM.js";
-import { a as createHttpHandler, c as listDvcDevices, d as UrlResolver, f as UrlSchemesError, h as SCHEME_NAMES, i as HTTP_SCHEMES, l as registerDvcDevice, m as parseUrl, n as wrapFsWithSchemes, o as createDvcHandler, p as applySelector, r as resolveDocsDir, s as dispatchDvcWrite, u as createDshHandler } from "../wrap-0VA0uFx8.js";
-import { n as Parser } from "../web-tree-sitter-CPrPD4J2.js";
-import { a as primaryServerForFile, c as serversForFile, n as findWorkspaceRoot, o as resolveCommandPath, r as installHintFor, s as serverByName } from "../lsp-server-registry-D4VLs1Sm.js";
+import { r as __toESM, t as __commonJS } from "../chunk.js";
+import { t as Schema } from "../lib.js";
+import { t as PACKAGE_ROOT } from "../kernel-env2.js";
+import { n as captureNativeTools } from "../native-capture.js";
+import { a as createHttpHandler, c as listDvcDevices, d as UrlResolver, f as UrlSchemesError, h as SCHEME_NAMES, i as HTTP_SCHEMES, l as registerDvcDevice, m as parseUrl, n as wrapFsWithSchemes, o as createDvcHandler, p as applySelector, r as resolveDocsDir, s as dispatchDvcWrite, u as createDshHandler } from "../wrap.js";
+import { n as Parser } from "../web-tree-sitter.js";
+import { a as primaryServerForFile, c as serversForFile, n as findWorkspaceRoot, o as resolveCommandPath, r as installHintFor, s as serverByName } from "../lsp-server-registry.js";
 import { createRequire } from "node:module";
 import { createHash, randomUUID } from "node:crypto";
 import { accessSync, constants, existsSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
@@ -133,7 +133,7 @@ function astEngine() {
 	return enginePromise;
 }
 async function boot() {
-	const bg = await import("../wasm_bg-CNXhHjVg.js");
+	const bg = await import("../wasm_bg.js");
 	const bytes = await readAsset(ASTGREP_WASM.file);
 	const { instance } = await WebAssemblyGlobal.instantiate(bytes, { "./wasm_bg.js": bg });
 	bg.__wbg_set_wasm(instance.exports);
@@ -1435,7 +1435,7 @@ const PUPPETEER_CORE_VERSION = "25.3.0";
 */
 async function loadPuppeteer() {
 	if (puppeteerModule === void 0) try {
-		puppeteerModule = await import("../puppeteer-core-C-4NyOpY.js");
+		puppeteerModule = await import("../puppeteer-core.js");
 	} catch {
 		try {
 			puppeteerModule = await import(pathToFileURL((await ensureVendored({
@@ -2500,7 +2500,7 @@ function ensureMustHave(gate, language) {
 	if (!MUST_HAVE.has(language) || gate.installTried.has(language)) return;
 	gate.installTried.add(language);
 	(async () => {
-		const registry = await import("../lsp-server-registry-BcdkHROD.js");
+		const registry = await import("../lsp-server-registry2.js");
 		const probePath = `/tmp/x.${language === "python" ? "py" : "ts"}`;
 		const primary = registry.primaryServerForFile(probePath);
 		if (primary === null) return;
@@ -3189,7 +3189,7 @@ async function lspDeviceRead(subpath, session) {
 	if (parsed === void 0) return `unknown read path dvc://lsp/${subpath} — reads: status | diagnostics?file=…[&all=1] | definition?file=&line=[&character=|&symbol=] | references?… | hover?…`;
 	if (parsed.action === "status") {
 		const availability = {};
-		const registry = await import("../lsp-server-registry-BcdkHROD.js");
+		const registry = await import("../lsp-server-registry2.js");
 		for (const language of [
 			"python",
 			"typescript",

package/lib/{wasm_bg-CNXhHjVg.js → wasm_bg.js}

@@ -1,4 +1,4 @@
-import { n as Parser, t as Language } from "./web-tree-sitter-CPrPD4J2.js";
+import { n as Parser, t as Language } from "./web-tree-sitter.js";
 
 //#region node_modules/@ast-grep/wasm/wasm_bg.js
 var Pos = class Pos {

package/lib/web-password.d.ts

@@ -1,4 +1,4 @@
-import { t as Schema } from "./index-DTDXUe6m.js";
+import { t as Schema } from "./index2.js";
 import { Context } from "@deepseek-ai/cordis";
 import { IncomingMessage } from "node:http";
 import { CredentialRecord } from "@deepseek-ai/dsh-credentials";

package/lib/web-password.js

@@ -1,4 +1,4 @@
-import { t as Schema } from "./lib-C8_jXvwA.js";
+import { t as Schema } from "./lib.js";
 import { createHash, createHmac, randomBytes, scrypt, timingSafeEqual } from "node:crypto";
 import { readFile } from "node:fs/promises";
 import { credentialKey } from "@deepseek-ai/dsh-credentials";

package/lib/web-trust.d.ts

@@ -1,3 +1,3 @@
-import "./index-DTDXUe6m.js";
-import { a as _default, c as buildTrustScript, d as name, i as TrustConfig, l as deriveDefaultPageAuthorities, n as Config, o as apply, r as MobileConfig, s as buildMobileScript, t as BootScriptRow, u as inject } from "./web-trust-Dej_RI2B.js";
+import "./index2.js";
+import { a as _default, c as buildTrustScript, d as name, i as TrustConfig, l as deriveDefaultPageAuthorities, n as Config, o as apply, r as MobileConfig, s as buildMobileScript, t as BootScriptRow, u as inject } from "./web-trust2.js";
 export { BootScriptRow, Config, MobileConfig, TrustConfig, apply, buildMobileScript, buildTrustScript, _default as default, deriveDefaultPageAuthorities, inject, name };