@edgehero/pi-dispatch 5.0.0 → 5.2.0

package/src/pause-windows.mjs

@@ -83,8 +83,13 @@ export function pauseWindowsVersionRefusal(doc, { supported = PAUSE_WINDOWS_VERS
 export function heldPauseWindows(text, path) {
 	if ((text ?? "").trim() === "") return { doc: null, windows: [] };
 	const { value, problem } = heldDocument(text, "windows");
-	const refused = problem ?? (findDuplicateKey(text) ? "has a key written twice" : null);
-	if (refused) return { doc: value ?? null, problem: `the pause-windows file ${path} ${refused}, so its windows cannot be kept` };
+	// Whenever the text parsed, a problem with its shape included (`"windows": {}`), as the loader judges the duplicate first.
+	const doubled = value !== undefined && findDuplicateKey(text) !== null;
+	const refused = doubled ? "has a key written twice" : problem ?? null;
+	// A key written twice hands back no document (issue #846): the callers ask the document whether a newer release wrote
+	// it before they read `problem`, and `{"version":1,"version":2}` would send the operator to upgrade to a release that
+	// refuses the file too. Broken, never newer, as the loader reads it and as the triggers writer does.
+	if (refused) return { doc: doubled ? null : value ?? null, problem: `the pause-windows file ${path} ${refused}, so its windows cannot be kept` };
 	return { doc: value, windows: Array.isArray(value.windows) ? value.windows : [] };
 }
 
@@ -158,7 +163,7 @@ function validateTz(tz, at, path) {
  * (unknown fields dropped; `fromMin`/`toMin` precomputed). Throws `configError` (fail-loud) on any malformed
  * entry. `path` is for messages only.
  *
- * The file's `version` is judged FIRST, before the windows (issue #761): a newer file's windows may use a shape this
+ * The file's `version` is judged right after the duplicate-key check (issue #846) and before the windows (issue #761): a newer file's windows may use a shape this
  * build would call malformed, and the true message is "upgrade". A newer file throws a configError with
  * `.newer === true` (the worker defers jobs rather than misread a pause); a broken `version`, or a window using a field
  * or a value that needs a higher version than the file declares, throws the ordinary configError. `supported`, `table`
@@ -171,6 +176,17 @@ export function parsePauseWindows(text, path, { supported = PAUSE_WINDOWS_VERSIO
 	} catch (error) {
 		throw configError(`pause-windows file is not valid JSON: ${path} (${error.message})`);
 	}
+	// Issue #846: a key written twice is REFUSED, after the parse and before anything else, as the triggers loader refuses
+	// one (`triggers.mjs`, issue #313). `JSON.parse` keeps the LAST value, so `{"windows":[...],"windows":[]}` loaded no
+	// window while a person reading the file sees two, and a reload swapped a live list down to none with nothing said:
+	// quiet hours stopped applying, which costs money in exactly the hours someone believes are paused. Refused, the boot
+	// does not start and a reload keeps the last good windows and logs why (`reloadPauseWindows`). The writers have
+	// refused such a file since #841 (`heldPauseWindows`), so only a hand edit makes one. BEFORE the version, the triggers
+	// loader's order: a doubled `version` is broken, never newer, and a newer release refuses the duplicate as well.
+	const duplicate = findDuplicateKey(text);
+	if (duplicate) {
+		throw configError(`pause-windows file has a duplicate key ${JSON.stringify(duplicate.key)} at ${duplicate.at}: JSON keeps the LAST value, so the file a person reads and the file that applies are not the same: ${path}`);
+	}
 	const problem = pauseWindowsVersionRefusal(parsed, { supported });
 	if (problem) {
 		const error = configError(`${problem.message}: ${path}`);

package/src/setup-host-entry.mjs

@@ -4,7 +4,10 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
 export function setupCachePath(path) {
-	return /(?:^|[/\\])(?:_npx|_cacache|npm-cache|\.cache)(?:[/\\]|$)/.test(String(path));
+	// pnpm's, yarn's and bun's temporary stores are as disposable as npm's own. Matched by their whole shape, because a folder someone named
+	// `dlx` is an ordinary folder.
+	const text = String(path);
+	return /(?:^|[/\\])(?:_npx|_cacache|npm-cache|\.cache)(?:[/\\]|$)/.test(text) || /(?:^|[/\\])pnpm[/\\]dlx(?:[/\\]|$)/.test(text) || /(?:^|[/\\])xfs-[^/\\]+[/\\]dlx-\d+(?:[/\\]|$)/.test(text) || /(?:^|[/\\])bunx-\d+-[^/\\]+(?:[/\\]|$)/.test(text) || /(?:^|[/\\])\.yarn[/\\]berry[/\\]cache(?:[/\\]|$)/.test(text);
 }
 export function trustedSetupFile(entry, { uid = process.geteuid?.(), realpath = realpathSync, stat = statSync } = {}) {
 	try {

package/src/up.mjs

@@ -1155,7 +1155,9 @@ export async function runUp(argv = [], deps = {}) {
 	for (const [name, note] of summary) {
 		out(`  ${name.padEnd(21)} ${note}\n`);
 	}
-	out(`
+	// `up --console` goes on to /setup, whose checklist is the next step, and these bare commands are not on a local install's PATH.
+	const nextOut = deps.skipNextSteps ? () => {} : out;
+	nextOut(`
 Next:
   edit ${envPath}
       set ANTHROPIC_API_KEY (or your provider's key) — already logged into pi? leave it blank
@@ -1167,7 +1169,7 @@ Next:
 	// A worker run BY HAND reads only its shell, so on the podman venue it needs the list exported; the service reads
 	// `.env` itself. Printed only there, so every other deployment's closing text is unchanged.
 	if (venues.podmanUsed) {
-		out("  (podman venue: a worker started by hand reads only its shell, so export the same PI_BACKENDS there first, or run it as a service with `pi-dispatch service install`, which reads .env)\n");
+		nextOut("  (podman venue: a worker started by hand reads only its shell, so export the same PI_BACKENDS there first, or run it as a service with `pi-dispatch service install`, which reads .env)\n");
 	}
 	// Issue #708: the console as a service, offered only where it could start (an operator token exists): without one,
 	// `service install --console` refuses, and a "Next:" line that leads to a refusal is not a next step.
@@ -1175,10 +1177,10 @@ Next:
 	try {
 		consoleReady = consoleOperators(cwd) > 0 && !consoleUnitInstalled(cwd);
 	} catch {}
-	if (consoleReady) out("  pi-dispatch service install --console\n      keep the operator console running as a service (open it with /dispatch console)\n");
+	if (consoleReady) nextOut("  pi-dispatch service install --console\n      keep the operator console running as a service (open it with /dispatch console)\n");
 	// Issue #707: the openshell venues' own next step, said only where one is blessed.
 	if (openshell.used) {
-		out(`  pi-dispatch service install\n      the worker as a ${platform === "darwin" ? "LaunchAgent (the gateway runs in this login session: `brew services start openshell`, the service of OpenShell's release formula, keeps it there)" : `user service that pulls in the gateway's own unit (${OPENSHELL_GATEWAY_UNIT})`}; then \`pi-dispatch doctor\` reads the gateway, its engine and the image back. A worker started by hand reads only its shell, so export the same PI_BACKENDS (and PI_OPENSHELL_ENGINE) there first\n`);
+		nextOut(`  pi-dispatch service install\n      the worker as a ${platform === "darwin" ? "LaunchAgent (the gateway runs in this login session: `brew services start openshell`, the service of OpenShell's release formula, keeps it there)" : `user service that pulls in the gateway's own unit (${OPENSHELL_GATEWAY_UNIT})`}; then \`pi-dispatch doctor\` reads the gateway, its engine and the image back. A worker started by hand reads only its shell, so export the same PI_BACKENDS (and PI_OPENSHELL_ENGINE) there first\n`);
 	}
 	// Issue #464: a Valkey this pass refused (another account's, or one no one could name) is a failed `up` whatever doctor
 	// says: a worker started now would take that queue's jobs, and an exit 0 read by a script or the wizard says ready.