@edgehero/pi-dispatch 4.0.1 → 4.2.0

package/src/cli.mjs

@@ -52,6 +52,9 @@ const USAGE = `pi-dispatch — run pi coding-agent flows on your own folders
   pi-dispatch pause        stop taking new jobs (durable; survives worker restart)
   pi-dispatch resume       resume taking jobs
   pi-dispatch status       show paused state + job counts
+  pi-dispatch capacity [--since 24h|7d|30d] [--host <name>] [--json] [--valkey-url <url>]
+                           how busy each host was: busy and idle time, slots in use, memory and CPU
+                           promised and used, waits and projects, read from the run records (jobs only)
   pi-dispatch cancel <jobId>  stop one job: a queued or held job is removed (the line says whether it had
                            made attempts; cancel records nothing), a running one is aborted on whichever
                            host owns it (its record says operator-cancel)
@@ -235,6 +238,12 @@ export async function main(argv = process.argv.slice(2), env = process.env, { wr
 		return code;
 	}
 
+	if (cmd === "capacity") {
+		// Read-only, and on the kill switch's footing: the Valkey URL and the logs directory, never loadConfig (issue #599).
+		const { runCapacity } = await import("./capacity-cli.mjs");
+		return runCapacity(argv.slice(1), { env, write, valkeyRefusal, deploymentEnv: cliDeploymentEnv });
+	}
+
 	if (cmd === "cancel") {
 		// The kill switch's doctrine (issue #287): VALKEY_URL only, never loadConfig, so one misbehaving
 		// job can be stopped even when everything else about the deployment is misconfigured. On a shell/.env

package/src/config.mjs

@@ -19,6 +19,9 @@ import { jobSizeDefaults } from "./job-size.mjs";
 import { hostBudgetSettings } from "./host-budget.mjs";
 import { CONTAINER_ENV_NAMES, KEYLESS_ENV_NAME, RUNNER_ENV_NAMES } from "./reserved-env.mjs";
 import { modelListProblem } from "./model-ref.mjs";
+import { WORKER_NAME_RE } from "./worker-name.mjs";
+
+export { WORKER_NAME_RE };
 import { DOLLAR_ENV_NAMES, DOLLAR_WINDOW_KEYS, checkDollarInvariant, optionalUsdMicros } from "./money.mjs";
 
 /**
@@ -1146,26 +1149,7 @@ export function underOsTempDir(candidate, env = process.env, { realpath = realpa
 	return false;
 }
 
-/**
- * What a worker may call itself (issue #57). The CHARACTER CLASS is `sanitizeJobId`'s
- * (`[A-Za-z0-9._-]`), reused rather than invented so this project has one name-safe alphabet -- but that
- * function is a REPLACER, not a validator, so the three rules around the class are NEW and are claimed
- * as new here rather than borrowed:
- *
- *   - a leading alphanumeric, which is what refuses `..` and a leading `-` that reads as a flag;
- *   - a 64-character ceiling, because the name is a Valkey key segment and a log field on every line;
- *   - no `.json`/`.log` tail, which is not decoration. The class contains the dot, so `prod.json` is
- *     otherwise a legal name -- and a later slice writes a per-host marker file into `PI_LOGS_DIR`,
- *     where `<something>.json` is parsed as a run record by the admin and DELETED by the log reaper.
- *     A name is refused here rather than escaped there, because the escape would have to be remembered
- *     at every site that ever composes a filename from this value.
- *
- * The class is `:`-free, `,`-free and `#`-free, which is what lets the name be a Valkey key segment
- * UNHASHED. That is the point of validating instead of hashing (`scopeKeyPrefix` does the opposite for
- * a folder path, which was never chosen for key-safety and cannot be refused): the whole value of a host
- * registry is that `HGETALL host:h:mac-mini-1` is readable by a human.
- */
-export const WORKER_NAME_RE = /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/;
+// WORKER_NAME_RE lives in worker-name.mjs (a leaf, for the capacity report) and is re-exported above; its reasons are there.
 
 /** True when the name would collide with the run-history filename namespace. See WORKER_NAME_RE. */
 const RESERVED_NAME_TAIL = /\.(json|log)$/i;

package/src/connection.mjs

@@ -189,8 +189,10 @@ export function parseConnection(url, { failFast = false, servername = null, cont
  * `parseConnection`'s options, so it connects through `JudgedConnector` like every other client. `lazyConnect` and
  * `failFast` as ioredis and `parseConnection` read them.
  */
-export function makeRedisClient(url, { servername = null, context = null, failFast = false, lazyConnect = false, judge = null, withoutPassword = false } = {}) {
-	return new Redis({ ...parseConnection(url, { failFast, servername, context, judge, withoutPassword }), ...(lazyConnect ? { lazyConnect: true } : {}) });
+export function makeRedisClient(url, { servername = null, context = null, failFast = false, lazyConnect = false, judge = null, withoutPassword = false, disconnectTimeoutMs = null } = {}) {
+	// `disconnectTimeoutMs` (issue #599): how long ioredis's `disconnect()` waits for a socket to close before it destroys
+	// it (its default is 2 s, on a ref'd timer). A one-shot read that must not hold its process passes 0.
+	return new Redis({ ...parseConnection(url, { failFast, servername, context, judge, withoutPassword }), ...(lazyConnect ? { lazyConnect: true } : {}), ...(Number.isSafeInteger(disconnectTimeoutMs) && disconnectTimeoutMs >= 0 ? { disconnectTimeout: disconnectTimeoutMs } : {}) });
 }
 
 /**