dsh-update-status 0.4.0 → 0.4.2

package/lib/service-cli.js

@@ -1,6 +1,6 @@
-import { a as WINDOWS_TASK_NAME, c as parseSystemdMainPid, d as bootStampFile, f as countRecentRestarts, h as serviceLogDir, i as SYSTEMD_UNIT, l as parseWindowsTaskRunning, n as specFromArgs, s as parseLaunchdTrackedPid, t as planFor, u as RESTART_STORM_WINDOW_MS } from "./plan-BornHBEZ.js";
+import { _ as parseSystemdMainPid, a as planFor, b as bootStampFile, c as specFromArgs, d as servicePathOf, g as parseLaunchdTrackedPid, i as pathsFor, m as WINDOWS_TASK_NAME, n as nativeServiceCommandCandidates, o as servicePlatform, p as SYSTEMD_UNIT, r as nativeServiceCommandOf, s as serviceStateFileFromArgs, t as SERVICE_LABEL, u as normalizeServicePathExt, v as parseWindowsTaskRunning, w as serviceLogDir, x as countRecentRestarts, y as RESTART_STORM_WINDOW_MS } from "./plan-D9Ybaj-3.js";
 import { accessSync, constants, existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
-import { dirname } from "node:path";
+import { dirname, isAbsolute } from "node:path";
 import { spawnSync } from "node:child_process";
 import { createServer } from "node:net";
 async function observeServiceState(spec, run, uid) {
@@ -103,8 +103,15 @@ Options:
   --host <127.0.0.1|0.0.0.0>  Bind host (default: 127.0.0.1)
   --port <1..65535>      Web port (default: 3080)
   --node <path>          Absolute Node executable (default: current Node)
-  --dsh <path>           Absolute dsh executable (default: resolve from PATH)
+  --dsh <path>           Absolute dsh executable (default: resolve from profile)
   --log-dir <path>       Absolute log directory (default: $DSH_HOME/logs)
+  --path-source <mode>   Service PATH source: current (default), minimal, explicit
+  --service-path <value> Explicit PATH (implies --path-source explicit)
+  --service-pathext <v>  Windows PATHEXT override (for example .COM;.EXE;.CMD)
+
+current snapshots this command's PATH; it never executes your shell startup files.
+The final PATH, source, capture time and warnings are stored in the receipt and
+reused by preflight and every later service action.
 
 Workflow: plan --dry-run → install → stop the terminal-started DSH yourself → activate.
 
@@ -114,7 +121,7 @@ makes activate fail instead of reporting success.
 `;
 }
 function assertSafeText(value, description) {
-	if (/[\u0000\r\n]/.test(value)) throw new Error(`${description} must not contain NUL or line breaks`);
+	if (/[\u0000-\u0008\u000A-\u001F\u007F]/.test(value)) throw new Error(`${description} must not contain XML-illegal control characters or line breaks`);
 }
 function assertReadableRegular(path, description) {
 	assertSafeText(path, description);
@@ -135,20 +142,73 @@ function assertExecutable(path, description) {
 		throw new Error(`${description} is not executable: ${path}`);
 	}
 }
-function validateSpec(spec) {
+function envValue(env, key) {
+	return Object.entries(env).find(([name]) => name.toLowerCase() === key.toLowerCase())?.[1];
+}
+function validateSpec(spec, level = "launch", expectedPlatform, expectedHome, expectedSystemRoot) {
+	if (spec.schemaVersion !== 1) throw new Error("managed service receipt has an unsupported schema version");
+	if (spec.platform !== "darwin" && spec.platform !== "linux" && spec.platform !== "win32") throw new Error("managed service receipt has an invalid platform");
+	if (expectedPlatform !== void 0 && spec.platform !== expectedPlatform) throw new Error("managed service receipt belongs to a different platform");
+	if (spec.label !== SERVICE_LABEL || spec.supervisorMarker !== "dsh-update-status") throw new Error("managed service receipt has an unexpected service identity");
+	if (expectedHome !== void 0 && spec.home !== expectedHome) throw new Error("managed service receipt belongs to a different home directory");
 	for (const [description, value] of [
 		["profile", spec.profile],
 		["workspace", spec.workspace],
 		["home", spec.home],
 		["log directory", spec.logDir],
-		["host", spec.host]
-	]) assertSafeText(value, description);
+		["host", spec.host],
+		["Node executable", spec.nodePath],
+		["dsh executable", spec.dshPath]
+	]) {
+		if (typeof value !== "string") throw new Error(`managed service receipt has an invalid ${description}`);
+		assertSafeText(value, description);
+	}
+	for (const [description, value] of [
+		["workspace", spec.workspace],
+		["home", spec.home],
+		["log directory", spec.logDir],
+		["Node executable", spec.nodePath],
+		["dsh executable", spec.dshPath]
+	]) if (!isAbsolute(value)) throw new Error(`managed service receipt has a non-absolute ${description}`);
+	if (spec.dshHome !== void 0) {
+		if (typeof spec.dshHome !== "string") throw new Error("managed service receipt has an invalid DSH_HOME");
+		assertSafeText(spec.dshHome, "DSH_HOME");
+		if (!isAbsolute(spec.dshHome)) throw new Error("managed service receipt has a non-absolute DSH_HOME");
+	}
+	if (!Number.isInteger(spec.port) || spec.port < 1 || spec.port > 65535) throw new Error("managed service receipt has an invalid port");
+	if (spec.servicePath !== void 0 && typeof spec.servicePath !== "string") throw new Error("managed service receipt has an invalid service PATH");
+	if (spec.servicePathSource !== void 0 && spec.servicePathSource !== "current" && spec.servicePathSource !== "minimal" && spec.servicePathSource !== "explicit") throw new Error("managed service receipt has an invalid service PATH source");
+	if (spec.servicePathCapturedAt !== void 0 && (typeof spec.servicePathCapturedAt !== "string" || Number.isNaN(Date.parse(spec.servicePathCapturedAt)))) throw new Error("managed service receipt has an invalid service PATH capture time");
+	if (spec.servicePathExt !== void 0 && typeof spec.servicePathExt !== "string") throw new Error("managed service receipt has an invalid PATHEXT");
+	if (spec.servicePathWarnings !== void 0 && (!Array.isArray(spec.servicePathWarnings) || spec.servicePathWarnings.length > 256 || spec.servicePathWarnings.some((value) => typeof value !== "string"))) throw new Error("managed service receipt has invalid service PATH warnings");
+	if (spec.servicePath === void 0 && (spec.servicePathSource !== void 0 || spec.servicePathCapturedAt !== void 0 || spec.servicePathExt !== void 0 || spec.servicePathWarnings !== void 0)) throw new Error("managed service receipt has PATH metadata without a service PATH");
+	if (spec.servicePath !== void 0 && (spec.servicePathSource === void 0 || spec.servicePathCapturedAt === void 0)) throw new Error("managed service receipt has an incomplete service PATH record");
+	if (spec.platform === "win32" && spec.servicePath !== void 0 && spec.servicePathExt === void 0) throw new Error("managed Windows service receipt has no PATHEXT");
+	if (spec.platform !== "win32" && spec.servicePathExt !== void 0) throw new Error("managed non-Windows service receipt has PATHEXT");
+	if (spec.nativeServiceCommand !== void 0 && typeof spec.nativeServiceCommand !== "string") throw new Error("managed service receipt has an invalid native service command");
+	const servicePath = servicePathOf(spec);
+	assertSafeText(servicePath, "service PATH");
+	if (servicePath.length > 8192) throw new Error("managed service receipt has an overlong service PATH");
+	if (spec.servicePathExt !== void 0) {
+		assertSafeText(spec.servicePathExt, "PATHEXT");
+		if (spec.servicePathExt.length > 8192) throw new Error("managed service receipt has an overlong PATHEXT");
+		normalizeServicePathExt(spec.servicePathExt);
+	}
+	for (const warning of spec.servicePathWarnings ?? []) assertSafeText(warning, "service PATH warning");
+	const nativeCommand = nativeServiceCommandOf(spec);
+	assertSafeText(nativeCommand, "native service command");
+	if (!isAbsolute(nativeCommand)) throw new Error("managed service receipt has a non-absolute native service command");
+	const allowedNativeCommands = nativeServiceCommandCandidates(spec.platform, expectedSystemRoot);
+	const nativeKey = spec.platform === "win32" ? nativeCommand.toLowerCase() : nativeCommand;
+	if (!allowedNativeCommands.some((candidate) => (spec.platform === "win32" ? candidate.toLowerCase() : candidate) === nativeKey)) throw new Error("managed service receipt has an unexpected native service command");
 	if (spec.host !== "127.0.0.1" && spec.host !== "0.0.0.0") throw new Error("`--host` must be 127.0.0.1 or 0.0.0.0");
 	if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(spec.profile)) throw new Error("`--profile` must contain only letters, numbers, dot, underscore, or hyphen");
-	assertExecutable(spec.nodePath, "Node executable");
-	assertReadableRegular(spec.dshPath, "dsh executable");
-	assertSafeText(spec.workspace, "workspace");
-	if (!existsSync(spec.workspace) || !statSync(spec.workspace).isDirectory()) throw new Error(`workspace is not a directory: ${spec.workspace}`);
+	if (level === "launch") {
+		assertExecutable(spec.nodePath, "Node executable");
+		assertReadableRegular(spec.dshPath, "dsh executable");
+		assertExecutable(nativeCommand, "Native service command");
+		if (!existsSync(spec.workspace) || !statSync(spec.workspace).isDirectory()) throw new Error(`workspace is not a directory: ${spec.workspace}`);
+	}
 }
 function atomicWrite(path, content) {
 	mkdirSync(dirname(path), {
@@ -182,19 +242,31 @@ function ensureReplaceable(path, expected, managed) {
 }
 function receiptOwnsPath(previous, path) {
 	if (previous === void 0) return false;
-	return previous.paths.definitionFile === path || previous.paths.stateFile === path || previous.paths.wrapperFile === path;
+	const owned = pathsFor(previous.spec);
+	return owned.definitionFile === path || owned.stateFile === path || owned.wrapperFile === path;
 }
 function receiptTextOf(receipt) {
 	return JSON.stringify(receipt, null, 2) + "\n";
 }
-function readReceiptIfPresent(path) {
-	return existsSync(path) ? readReceipt(path) : void 0;
+function samePaths(left, right) {
+	return left.stateFile === right.stateFile && left.definitionFile === right.definitionFile && left.wrapperFile === right.wrapperFile && left.stdoutFile === right.stdoutFile && left.stderrFile === right.stderrFile;
+}
+function readReceiptIfPresent(path, env) {
+	return existsSync(path) ? readReceipt(path, env) : void 0;
 }
-function readReceipt(path) {
+function readReceipt(path, env) {
 	try {
 		const value = JSON.parse(readFileSync(path, "utf8"));
 		if (value.version !== RECEIPT_VERSION || value.managedBy !== "dsh-update-status" || value.spec === void 0 || value.paths === void 0) throw new Error("not a dsh-update-status service receipt");
-		return value;
+		validateSpec(value.spec, "structural", servicePlatform(env.platform), env.home, envValue(env.env, "SYSTEMROOT"));
+		const canonical = pathsFor(value.spec);
+		if (canonical.stateFile !== path || !samePaths(value.paths, canonical)) throw new Error("managed service receipt paths do not match its service spec");
+		return {
+			version: RECEIPT_VERSION,
+			managedBy: "dsh-update-status",
+			spec: value.spec,
+			paths: canonical
+		};
 	} catch (error) {
 		throw new Error(`cannot read managed service receipt ${path}: ${error instanceof Error ? error.message : String(error)}`);
 	}
@@ -207,6 +279,7 @@ async function portIsFree(host, port) {
 	});
 }
 function serialisePlan(plan) {
+	const inheritedWindowsPath = plan.spec.platform === "win32" && plan.spec.servicePath === void 0;
 	return JSON.stringify({
 		platform: plan.spec.platform,
 		label: plan.spec.label,
@@ -216,6 +289,14 @@ function serialisePlan(plan) {
 		workspace: plan.spec.workspace,
 		host: plan.spec.host,
 		port: plan.spec.port,
+		nativeServiceCommand: nativeServiceCommandOf(plan.spec),
+		servicePath: {
+			source: inheritedWindowsPath ? "inherited logon environment (legacy receipt)" : plan.spec.servicePathSource ?? "minimal (legacy receipt)",
+			value: inheritedWindowsPath ? null : servicePathOf(plan.spec),
+			...plan.spec.servicePathCapturedAt === void 0 ? {} : { capturedAt: plan.spec.servicePathCapturedAt },
+			...plan.spec.servicePathExt === void 0 ? {} : { pathExt: plan.spec.servicePathExt },
+			warnings: plan.spec.servicePathWarnings ?? []
+		},
 		definitionFile: plan.paths.definitionFile,
 		wrapperFile: plan.paths.wrapperFile,
 		stateFile: plan.paths.stateFile,
@@ -233,38 +314,9 @@ function serialisePlan(plan) {
 		}
 	}, null, 2) + "\n";
 }
-function commandsForActivate(plan, uid) {
-	if (plan.spec.platform === "darwin") return [[
-		"launchctl",
-		"bootstrap",
-		`gui/${uid}`,
-		plan.paths.definitionFile
-	]];
-	if (plan.spec.platform === "linux") return [[
-		"systemctl",
-		"--user",
-		"daemon-reload"
-	], [
-		"systemctl",
-		"--user",
-		"enable",
-		"--now",
-		"dsh-update-status-web.service"
-	]];
-	return [[
-		"schtasks.exe",
-		"/Create",
-		"/TN",
-		"DSH Update Status Web",
-		"/XML",
-		plan.paths.definitionFile,
-		"/F"
-	], [
-		"schtasks.exe",
-		"/Run",
-		"/TN",
-		"DSH Update Status Web"
-	]];
+function commandsForActivate(plan, _uid) {
+	if (plan.spec.platform === "darwin") return [plan.installCommand];
+	return [plan.installCommand, plan.startCommand];
 }
 function invoke(command, run) {
 	const [file, ...args] = command;
@@ -286,7 +338,8 @@ function preflight(spec) {
 		env: {
 			HOME: spec.home,
 			...spec.dshHome === void 0 ? {} : { DSH_HOME: spec.dshHome },
-			PATH: `${dirname(spec.nodePath)}${process.platform === "win32" ? ";" : ":"}${process.env.PATH ?? ""}`
+			PATH: servicePathOf(spec),
+			...spec.platform === "win32" && spec.servicePathExt !== void 0 ? { PATHEXT: spec.servicePathExt } : {}
 		}
 	});
 	if (result.status !== 0) {
@@ -294,6 +347,32 @@ function preflight(spec) {
 		throw new Error(`DSH boot-free preflight failed; no service definition was written: ${diagnostic}`);
 	}
 }
+const VALUE_OPTIONS = /* @__PURE__ */ new Set([
+	"--profile",
+	"--workspace",
+	"--dsh-home",
+	"--host",
+	"--port",
+	"--node",
+	"--dsh",
+	"--log-dir",
+	"--path-source",
+	"--service-path",
+	"--service-pathext"
+]);
+function assertKnownOptions(args) {
+	for (let index = 0; index < args.length; index += 1) {
+		const value = args[index];
+		if (value === "--dry-run") continue;
+		if (!VALUE_OPTIONS.has(value)) throw new Error(`unknown option: ${value}`);
+		const next = args[index + 1];
+		if (next === void 0 || next.startsWith("--")) throw new Error(`missing value after ${value}`);
+		index += 1;
+	}
+}
+function warnAboutPath(spec) {
+	for (const warning of spec.servicePathWarnings ?? []) process.stderr.write(`Warning: ${warning}\n`);
+}
 async function main(argv = process.argv.slice(2), env = environment(), run = runner, hooks = {}) {
 	const [action, ...rawArgs] = argv;
 	if (action === void 0 || action === "--help" || action === "-h") {
@@ -311,19 +390,27 @@ async function main(argv = process.argv.slice(2), env = environment(), run = run
 		process.stderr.write(`Unknown command: ${action}\n${usage()}`);
 		return 2;
 	}
+	try {
+		assertKnownOptions(rawArgs);
+	} catch (error) {
+		process.stderr.write(`dsh-update-status-service: ${error instanceof Error ? error.message : String(error)}\n`);
+		return 2;
+	}
 	const dryRun = rawArgs.includes("--dry-run") || action === "plan";
 	const args = rawArgs.filter((value) => value !== "--dry-run");
 	try {
-		const spec = specFromArgs(args, env);
-		validateSpec(spec);
-		const plan = planFor(spec, env.uid ?? 0);
-		if (dryRun) {
-			process.stdout.write(serialisePlan(plan));
-			return 0;
-		}
-		if (action === "install") {
+		if (dryRun || action === "install") {
+			const spec = specFromArgs(args, env);
+			validateSpec(spec, "launch", servicePlatform(env.platform), env.home, envValue(env.env, "SYSTEMROOT"));
+			const plan = planFor(spec, env.uid ?? 0);
+			if (dryRun) {
+				process.stdout.write(serialisePlan(plan));
+				return 0;
+			}
+			process.stdout.write(`Service PATH (${spec.servicePathSource ?? "minimal"}): ${servicePathOf(spec)}\n`);
+			warnAboutPath(spec);
 			(hooks.preflight ?? preflight)(spec);
-			const previous = readReceiptIfPresent(plan.paths.stateFile);
+			const previous = readReceiptIfPresent(plan.paths.stateFile, env);
 			ensureReplaceable(plan.paths.definitionFile, plan.definition, receiptOwnsPath(previous, plan.paths.definitionFile));
 			if (plan.wrapper !== void 0 && plan.paths.wrapperFile !== void 0) ensureReplaceable(plan.paths.wrapperFile, plan.wrapper, receiptOwnsPath(previous, plan.paths.wrapperFile));
 			const receiptText = receiptTextOf({
@@ -343,7 +430,9 @@ async function main(argv = process.argv.slice(2), env = environment(), run = run
 			process.stdout.write(`Staged user service definition: ${plan.paths.definitionFile}\nNo service has started. Stop your terminal-started DSH, then run activate.\n`);
 			return 0;
 		}
-		const receipt = readReceipt(plan.paths.stateFile);
+		const receipt = readReceipt(serviceStateFileFromArgs(args, env), env);
+		const plan = planFor(receipt.spec, env.uid ?? 0);
+		if (action === "activate") validateSpec(receipt.spec, "launch", servicePlatform(env.platform), env.home, envValue(env.env, "SYSTEMROOT"));
 		if (action === "activate") {
 			if (!await portIsFree(receipt.spec.host, receipt.spec.port)) throw new Error(`port ${receipt.spec.host}:${String(receipt.spec.port)} is in use; stop the existing DSH yourself before activate. Nothing was killed.`);
 			for (const command of commandsForActivate(plan, env.uid ?? 0)) invoke(command, run);
@@ -369,9 +458,9 @@ async function main(argv = process.argv.slice(2), env = environment(), run = run
 		}
 		const result = run(plan.uninstallCommand[0], plan.uninstallCommand.slice(1));
 		if (result.status !== 0) process.stderr.write(`Warning: ${result.stderr || result.stdout || "service was not loaded"}\n`);
-		rmSync(receipt.paths.definitionFile, { force: true });
-		if (receipt.paths.wrapperFile !== void 0) rmSync(receipt.paths.wrapperFile, { force: true });
-		rmSync(receipt.paths.stateFile, { force: true });
+		rmSync(plan.paths.definitionFile, { force: true });
+		if (plan.paths.wrapperFile !== void 0) rmSync(plan.paths.wrapperFile, { force: true });
+		rmSync(plan.paths.stateFile, { force: true });
 		process.stdout.write("Removed the managed user-service definition. Logs were preserved.\n");
 		return 0;
 	} catch (error) {
@@ -383,4 +472,4 @@ if (import.meta.url === new URL(process.argv[1] ?? "", "file:").href) main().the
 	process.exitCode = code;
 });
 //#endregion
-export { main };
+export { main, serialisePlan };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-update-status",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "DeepSeek Harness Web plugin for version status, copy-only upgrade guidance, and safe restart when an explicit user-level supervisor is installed.",
   "type": "module",
   "main": "lib/index.js",
@@ -71,7 +71,8 @@
         "0.1.7-rc.2": "compatible",
         "0.2.0-rc.1": "compatible",
         "0.2.0-rc.2": "compatible",
-        "0.2.1-alpha.1": "compatible"
+        "0.2.1-alpha.1": "compatible",
+        "0.2.1-alpha.3": "compatible"
       }
     }
   },