fluncle 0.275.0 → 0.276.0

package/bin/fluncle.mjs

@@ -60,6 +60,43 @@ var __esm = (fn, res, err) => () => {
 };
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
+// src/output.ts
+import { writeSync } from "node:fs";
+function writeStdoutSync(text) {
+  const buf = Buffer.from(text, "utf8");
+  let offset = 0;
+  while (offset < buf.length) {
+    try {
+      offset += writeSync(1, buf, offset);
+    } catch (error) {
+      if (error.code === "EAGAIN") {
+        Atomics.wait(EAGAIN_WAIT, 0, 0, 1);
+        continue;
+      }
+      throw error;
+    }
+  }
+}
+function isJsonFailure(value) {
+  return typeof value === "object" && value !== null && typeof value.code === "string" && typeof value.message === "string";
+}
+function printJson(value) {
+  writeStdoutSync(JSON.stringify(value, null, 2) + `
+`);
+}
+var EAGAIN_WAIT, CliError;
+var init_output = __esm(() => {
+  EAGAIN_WAIT = new Int32Array(new SharedArrayBuffer(4));
+  CliError = class CliError extends Error {
+    code;
+    constructor(code, message) {
+      super(message);
+      this.name = "CliError";
+      this.code = code;
+    }
+  };
+});
+
 // ../../node_modules/dotenv/lib/main.js
 var require_main = __commonJS(function(exports, module) {
   var fs = __require("fs");
@@ -379,6 +416,42 @@ var require_main = __commonJS(function(exports, module) {
   module.exports = DotenvModule;
 });
 
+// src/deadline.ts
+function fireDeadlineNow() {
+  state2.fire?.();
+}
+function deadlineAt() {
+  return state2.at;
+}
+function deadlineSignal() {
+  return state2.controller.signal;
+}
+function remainingDeadlineMs(now = Date.now) {
+  return state2.at === null ? null : state2.at - now();
+}
+function assertBeforeDeadline(doing) {
+  const remaining = remainingDeadlineMs();
+  if (remaining !== null && remaining <= 0) {
+    fireDeadlineNow();
+    throw new CliError("timeout", `the deadline passed while ${doing}`);
+  }
+}
+function noteProgress(note) {
+  state2.note = note;
+}
+var state2;
+var init_deadline = __esm(() => {
+  init_output();
+  state2 = {
+    at: null,
+    cancel: null,
+    controller: new AbortController,
+    fire: null,
+    fired: false,
+    note: null
+  };
+});
+
 // src/env.ts
 var exports_env = {};
 __export(exports_env, {
@@ -422,15 +495,22 @@ function resolveTokenRef() {
   if (process.env.FLUNCLE_API_TOKEN !== undefined || !ref || false) {
     return;
   }
+  assertBeforeDeadline("reading FLUNCLE_API_TOKEN_REF with op");
+  const remaining = remainingDeadlineMs();
+  const timeout = remaining === null ? OP_READ_TIMEOUT_MS : Math.max(1, Math.min(OP_READ_TIMEOUT_MS, remaining));
   try {
     const secretRef = ref.startsWith("op://") ? ref : `op://${ref}`;
     process.env.FLUNCLE_API_TOKEN = execFileSync("op", ["read", "--no-newline", secretRef], {
       encoding: "utf8",
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["ignore", "pipe", "pipe"],
+      timeout
     });
-  } catch {
-    throw new Error(`Could not read FLUNCLE_API_TOKEN_REF (${ref}) with op.`);
+  } catch (error) {
+    assertBeforeDeadline("reading FLUNCLE_API_TOKEN_REF with op");
+    const timedOut = error.code === "ETIMEDOUT";
+    throw new Error(timedOut ? `op did not return FLUNCLE_API_TOKEN_REF (${ref}) within ${Math.ceil(timeout / 1000)} s; unlock 1Password or set FLUNCLE_API_TOKEN.` : `Could not read FLUNCLE_API_TOKEN_REF (${ref}) with op.`);
   }
+  assertBeforeDeadline("reading FLUNCLE_API_TOKEN_REF with op");
 }
 function loadConfig() {
   const profile = getEnvProfile();
@@ -451,8 +531,9 @@ function getEnvProfile() {
 function isEnvProfile2(value) {
   return envProfiles2.includes(value);
 }
-var import_dotenv2, envProfiles2, defaultEnvProfile = "production", loadedProfile;
+var import_dotenv2, envProfiles2, defaultEnvProfile = "production", OP_READ_TIMEOUT_MS = 20000, loadedProfile;
 var init_env = __esm(() => {
+  init_deadline();
   import_dotenv2 = __toESM(require_main(), 1);
   envProfiles2 = ["local", "production"];
 });
@@ -591,43 +672,6 @@ var init_util = __esm(() => {
   TIKTOK_DRAFT_STALE_MS = 24 * 60 * 60 * 1000;
 });
 
-// src/output.ts
-import { writeSync as writeSync2 } from "node:fs";
-function writeStdoutSync2(text) {
-  const buf = Buffer.from(text, "utf8");
-  let offset = 0;
-  while (offset < buf.length) {
-    try {
-      offset += writeSync2(1, buf, offset);
-    } catch (error) {
-      if (error.code === "EAGAIN") {
-        Atomics.wait(EAGAIN_WAIT2, 0, 0, 1);
-        continue;
-      }
-      throw error;
-    }
-  }
-}
-function isJsonFailure(value) {
-  return typeof value === "object" && value !== null && typeof value.code === "string" && typeof value.message === "string";
-}
-function printJson2(value) {
-  writeStdoutSync2(JSON.stringify(value, null, 2) + `
-`);
-}
-var EAGAIN_WAIT2, CliError2;
-var init_output = __esm(() => {
-  EAGAIN_WAIT2 = new Int32Array(new SharedArrayBuffer(4));
-  CliError2 = class CliError2 extends Error {
-    code;
-    constructor(code, message) {
-      super(message);
-      this.name = "CliError";
-      this.code = code;
-    }
-  };
-});
-
 // src/version.ts
 function normalizeVersion(version) {
   return version?.trim().replace(/^v/i, "");
@@ -651,7 +695,7 @@ function parseVersion(version) {
 var currentVersion;
 var init_version = __esm(() => {
   init_output();
-  currentVersion = "0.275.0".trim() ? "0.275.0".trim() : "0.1.0";
+  currentVersion = "0.276.0".trim() ? "0.276.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -9598,7 +9642,7 @@ async function userApiGet(path) {
 function userHeaders() {
   const stored = readUserToken();
   if (!stored) {
-    throw new CliError2("not_logged_in", "You're not signed in. Run `fluncle login` to link this device to your account.");
+    throw new CliError("not_logged_in", "You're not signed in. Run `fluncle login` to link this device to your account.");
   }
   return {
     Authorization: `Bearer ${stored.token}`
@@ -9672,11 +9716,15 @@ function adminHeaders() {
 }
 async function apiRequest(path, init = {}) {
   const url = `${getApiBaseUrl()}${path}`;
+  noteProgress(`waiting for the Fluncle API: ${init.method ?? "GET"} ${path}`);
   return runPromise2(gen2(function* () {
     const { response, text } = yield* tryPromise2({
       catch: (cause) => new ApiTransportError({ cause }),
       try: async (signal) => {
-        const response = await fetch(url, { ...init, signal });
+        const response = await fetch(url, {
+          ...init,
+          signal: AbortSignal.any([signal, deadlineSignal()])
+        });
         return { response, text: await response.text() };
       }
     });
@@ -9689,7 +9737,7 @@ async function apiRequest(path, init = {}) {
       });
     }
     return data;
-  }).pipe(mapError2((error) => error._tag === "ApiTransportError" ? error.cause : new CliError2(error.code, error.message))));
+  }).pipe(mapError2((error) => error._tag === "ApiTransportError" ? error.cause : new CliError(error.code, error.message))));
 }
 function parseJson2(text) {
   if (!text) {
@@ -9703,6 +9751,7 @@ function parseJson2(text) {
 var ApiTransportError, ApiResponseError;
 var init_api = __esm(() => {
   init_dist();
+  init_deadline();
   init_env();
   init_output();
   init_user_token();
@@ -9788,7 +9837,7 @@ async function freshCommand({
     if (showTracks) {
       payload.tracks = response.tracks;
     }
-    printJson2(payload);
+    printJson(payload);
     return;
   }
   const blocks = [];
@@ -9855,7 +9904,7 @@ async function albumsCommand({
   if (slug) {
     const response = await publicApiGet(`/api/v1/albums/${encodeURIComponent(slug)}`);
     if (json) {
-      printJson2(response);
+      printJson(response);
       return;
     }
     const { album } = response;
@@ -9869,7 +9918,7 @@ async function albumsCommand({
   }
   const response = await publicApiGet(`/api/v1/albums?page=${page}`);
   if (json) {
-    printJson2(response);
+    printJson(response);
     return;
   }
   printEntityIndex(response.albums, response, { plural: "albums", singular: "album" }, "albums");
@@ -9888,7 +9937,7 @@ async function artistsCommand({
   if (slug) {
     const response = await publicApiGet(`/api/v1/artists/${encodeURIComponent(slug)}`);
     if (json) {
-      printJson2(response);
+      printJson(response);
       return;
     }
     const { artist } = response;
@@ -9902,7 +9951,7 @@ async function artistsCommand({
   }
   const response = await publicApiGet(`/api/v1/artists?page=${page}`);
   if (json) {
-    printJson2(response);
+    printJson(response);
     return;
   }
   printEntityIndex(response.artists, response, { plural: "artists", singular: "artist" }, "artists");
@@ -9921,7 +9970,7 @@ async function labelsCommand({
   if (slug) {
     const response = await publicApiGet(`/api/v1/labels/${encodeURIComponent(slug)}`);
     if (json) {
-      printJson2(response);
+      printJson(response);
       return;
     }
     const { label } = response;
@@ -9938,7 +9987,7 @@ async function labelsCommand({
   }
   const response = await publicApiGet(`/api/v1/labels?page=${page}`);
   if (json) {
-    printJson2(response);
+    printJson(response);
     return;
   }
   printEntityIndex(response.labels, response, { plural: "labels", singular: "label" }, "labels");
@@ -9978,7 +10027,7 @@ async function searchCommand({
   }
   const response = await publicApiGet(`/api/v1/search/archive?${params.toString()}`);
   if (json) {
-    printJson2(response);
+    printJson(response);
     return;
   }
   const blocks = [];
@@ -10049,7 +10098,7 @@ async function mixtapeGetCommand(idOrLogId) {
   const mixtapes = await mixtapeListCommand();
   const match = mixtapes.find((mixtape) => mixtape.id === idOrLogId || mixtape.logId === idOrLogId);
   if (!match) {
-    throw new CliError2("mixtape_not_found", `No mixtape with id or log id ${idOrLogId}`);
+    throw new CliError("mixtape_not_found", `No mixtape with id or log id ${idOrLogId}`);
   }
   return match;
 }
@@ -10071,7 +10120,7 @@ async function distributeYoutube(mixtapeId, videoPath, onProgress) {
   while (videoId === undefined) {
     attempts += 1;
     if (attempts > MAX_UPLOAD_ATTEMPTS) {
-      throw new CliError2("youtube_upload_failed", `YouTube upload did not complete after ${MAX_UPLOAD_ATTEMPTS} attempts`);
+      throw new CliError("youtube_upload_failed", `YouTube upload did not complete after ${MAX_UPLOAD_ATTEMPTS} attempts`);
     }
     onProgress?.(offset > 0 ? `Resuming upload at ${formatBytes(offset)} / ${formatBytes(contentLength)}` : `Uploading video → YouTube`);
     const result = await putChunk({
@@ -10130,7 +10179,7 @@ async function putChunk(args) {
   if (response.status === 200 || response.status === 201) {
     const video = await response.json().catch(() => ({}));
     if (!video.id) {
-      throw new CliError2("youtube_no_video_id", "YouTube returned no video id on upload completion");
+      throw new CliError("youtube_no_video_id", "YouTube returned no video id on upload completion");
     }
     return { kind: "done", videoId: video.id };
   }
@@ -10144,7 +10193,7 @@ async function putChunk(args) {
     return { kind: "reinit" };
   }
   const detail = (await response.text().catch(() => "")).slice(0, 400);
-  throw new CliError2("youtube_put_failed", `YouTube upload PUT failed (${response.status} ${response.statusText})${detail ? `: ${detail}` : ""}`);
+  throw new CliError("youtube_put_failed", `YouTube upload PUT failed (${response.status} ${response.statusText})${detail ? `: ${detail}` : ""}`);
 }
 async function queryOffset(sessionUri, accessToken, contentLength) {
   const response = await fetch(sessionUri, {
@@ -10176,7 +10225,7 @@ function fileSize(path) {
   try {
     return statSync(path).size;
   } catch {
-    throw new CliError2("video_not_found", `Cannot read video file at ${path}`);
+    throw new CliError("video_not_found", `Cannot read video file at ${path}`);
   }
 }
 function formatBytes(bytes) {
@@ -10200,11 +10249,11 @@ async function distributeMixcloud(mixtapeId, audioPath, onProgress, unlisted = f
   const mixtape = await mixtapeGetCommand(mixtapeId);
   const logId = mixtape.logId;
   if (!logId) {
-    throw new CliError2("mixtape_no_log_id", "The mixtape has no Log ID; mint it before distributing");
+    throw new CliError("mixtape_no_log_id", "The mixtape has no Log ID; mint it before distributing");
   }
   const audio = Bun.file(audioPath);
   if (!await audio.exists()) {
-    throw new CliError2("audio_not_found", `Audio master not found: ${audioPath}`);
+    throw new CliError("audio_not_found", `Audio master not found: ${audioPath}`);
   }
   const form = new FormData;
   form.append("mp3", audio);
@@ -10241,7 +10290,7 @@ async function distributeMixcloud(mixtapeId, audioPath, onProgress, unlisted = f
   }
   const result = parseUploadResult(uploadText);
   if (!result.success || !result.key) {
-    throw new CliError2("mixcloud_upload_rejected", `Mixcloud rejected the upload: ${result.message ?? uploadText.slice(0, 300)}`);
+    throw new CliError("mixcloud_upload_rejected", `Mixcloud rejected the upload: ${result.message ?? uploadText.slice(0, 300)}`);
   }
   const externalId = result.key;
   const url = `https://www.mixcloud.com${result.key}`;
@@ -10279,7 +10328,7 @@ async function fetchMixcloudToken() {
     const response = await adminApiPost("/api/v1/admin/mixcloud/token");
     return response.accessToken;
   } catch {
-    throw new CliError2("mixcloud_not_connected", "Mixcloud is not connected. Run `fluncle admin auth mixcloud` to authorize it.");
+    throw new CliError("mixcloud_not_connected", "Mixcloud is not connected. Run `fluncle admin auth mixcloud` to authorize it.");
   }
 }
 async function fetchCover(logId) {
@@ -10309,9 +10358,9 @@ function parseUploadResult(body) {
 }
 function throwMixcloudError(status, body) {
   if (body.includes("An invalid access token was provided")) {
-    throw new CliError2("mixcloud_invalid_token", "Mixcloud rejected the access token. Re-auth with `fluncle admin auth mixcloud`.");
+    throw new CliError("mixcloud_invalid_token", "Mixcloud rejected the access token. Re-auth with `fluncle admin auth mixcloud`.");
   }
-  throw new CliError2("mixcloud_request_failed", `Mixcloud responded ${status}${body ? `: ${body.slice(0, 300)}` : ""}`);
+  throw new CliError("mixcloud_request_failed", `Mixcloud responded ${status}${body ? `: ${body.slice(0, 300)}` : ""}`);
 }
 var MIXCLOUD_API = "https://api.mixcloud.com", DESCRIPTION_MAX = 1000, PICTURE_MAX_BYTES, COVER_BASE = "https://www.fluncle.com/api/mixtape-cover";
 var init_mixtape_mixcloud = __esm(() => {
@@ -10333,21 +10382,21 @@ async function mixtapeUpdateCommand(id, options) {
 async function mixtapeDistributeCommand(idOrLogId, options, onProgress = () => {}) {
   const mixtape = await mixtapeGetCommand(idOrLogId);
   if (!mixtape.id) {
-    throw new CliError2("mixtape_not_found", `No mixtape with id or log id ${idOrLogId}`);
+    throw new CliError("mixtape_not_found", `No mixtape with id or log id ${idOrLogId}`);
   }
   const both = !options.youtube && !options.mixcloud;
   const doYoutube = both || Boolean(options.youtube);
   const doMixcloud = both || Boolean(options.mixcloud);
   if (doYoutube && !options.video) {
-    throw new CliError2("missing_video", "YouTube distribution needs --video <mp4>");
+    throw new CliError("missing_video", "YouTube distribution needs --video <mp4>");
   }
   if (doMixcloud && !options.audio) {
-    throw new CliError2("missing_audio", "Mixcloud distribution needs --audio <file>");
+    throw new CliError("missing_audio", "Mixcloud distribution needs --audio <file>");
   }
   const mixtapeId = mixtape.id;
   const logId = mixtape.logId;
   if (!logId) {
-    throw new CliError2("mixtape_not_promoted", `${mixtapeId} has no coordinate yet. Promote its recording first:
+    throw new CliError("mixtape_not_promoted", `${mixtapeId} has no coordinate yet. Promote its recording first:
 ` + "  fluncle admin recordings promote <recordingId>");
   }
   if (!mixtape.durationMs) {
@@ -10366,7 +10415,7 @@ async function mixtapeDistributeCommand(idOrLogId, options, onProgress = () => {
   const results = [];
   if (doYoutube) {
     if (!options.video) {
-      throw new CliError2("missing_video", "YouTube distribution needs --video <mp4>");
+      throw new CliError("missing_video", "YouTube distribution needs --video <mp4>");
     }
     onProgress("YouTube: uploading video…");
     await Promise.resolve().then(() => init_mixtape_youtube());
@@ -10376,7 +10425,7 @@ async function mixtapeDistributeCommand(idOrLogId, options, onProgress = () => {
   }
   if (doMixcloud) {
     if (!options.audio) {
-      throw new CliError2("missing_audio", "Mixcloud distribution needs --audio <file>");
+      throw new CliError("missing_audio", "Mixcloud distribution needs --audio <file>");
     }
     onProgress("Mixcloud: uploading audio…");
     await Promise.resolve().then(() => init_mixtape_mixcloud());
@@ -10389,10 +10438,10 @@ async function mixtapeDistributeCommand(idOrLogId, options, onProgress = () => {
 async function mixtapeResyncCommand(idOrLogId, options, onProgress = () => {}) {
   const mixtape = await mixtapeGetCommand(idOrLogId);
   if (!mixtape.id) {
-    throw new CliError2("mixtape_not_found", `No mixtape with id or log id ${idOrLogId}`);
+    throw new CliError("mixtape_not_found", `No mixtape with id or log id ${idOrLogId}`);
   }
   if (!mixtape.logId) {
-    throw new CliError2("mixtape_no_log_id", "The mixtape isn't published yet. Distribute it before re-syncing.");
+    throw new CliError("mixtape_no_log_id", "The mixtape isn't published yet. Distribute it before re-syncing.");
   }
   const mixtapeId = mixtape.id;
   const explicit = Boolean(options.youtube) || Boolean(options.mixcloud);
@@ -10404,7 +10453,7 @@ async function mixtapeResyncCommand(idOrLogId, options, onProgress = () => {}) {
     doYoutube = platforms.has("youtube");
     doMixcloud = platforms.has("mixcloud");
     if (!doYoutube && !doMixcloud) {
-      throw new CliError2("mixtape_not_distributed", "The mixtape has no YouTube or Mixcloud link to re-sync.");
+      throw new CliError("mixtape_not_distributed", "The mixtape has no YouTube or Mixcloud link to re-sync.");
     }
   }
   const results = [];
@@ -10449,7 +10498,7 @@ function buildBody(options) {
   if (options.durationMs !== undefined) {
     const parsed = parseDuration(options.durationMs);
     if (parsed === null) {
-      throw new CliError2("invalid_duration", "Duration must be mm:ss or h:mm:ss, or a millisecond count");
+      throw new CliError("invalid_duration", "Duration must be mm:ss or h:mm:ss, or a millisecond count");
     }
     body.durationMs = parsed;
   }
@@ -10478,7 +10527,7 @@ var init_format = __esm(() => {
 import { createInterface } from "node:readline/promises";
 async function promptLine(label, nonInteractiveMessage) {
   if (!process.stdin.isTTY || !process.stdout.isTTY) {
-    throw new CliError2("not_interactive", nonInteractiveMessage);
+    throw new CliError("not_interactive", nonInteractiveMessage);
   }
   const rl = createInterface({
     input: process.stdin,
@@ -10494,7 +10543,7 @@ async function selectWithKeyboard(items, options) {
   const stdin = options.input ?? process.stdin;
   const stdout = options.output ?? process.stdout;
   if (!stdin.isTTY || !stdout.isTTY) {
-    throw new CliError2("not_interactive", options.nonInteractiveMessage);
+    throw new CliError("not_interactive", options.nonInteractiveMessage);
   }
   let selectedIndex = 0;
   let renderedLines = 0;
@@ -10581,7 +10630,7 @@ async function openExternal(target) {
   const command = platformOpenCommand();
   if (!command) {
     console.log(target);
-    throw new CliError2("unsupported_platform", `Automatic opening is only supported on macOS and Linux. Open this manually: ${target}`);
+    throw new CliError("unsupported_platform", `Automatic opening is only supported on macOS and Linux. Open this manually: ${target}`);
   }
   const child = Bun.spawn([command, target], {
     stderr: "pipe",
@@ -10590,7 +10639,7 @@ async function openExternal(target) {
   const exitCode = await child.exited;
   if (exitCode !== 0) {
     const stderr = await new Response(child.stderr).text();
-    throw new CliError2("open_failed", stderr.trim() || `Could not open ${target} with ${command}`);
+    throw new CliError("open_failed", stderr.trim() || `Could not open ${target} with ${command}`);
   }
 }
 function platformOpenCommand() {
@@ -10665,7 +10714,7 @@ async function openRecentCommand(options) {
 function spotifyPlaylistUrlToAppUri(playlistUrl) {
   const playlistId = playlistUrl.match(/open\.spotify\.com\/playlist\/([^/?#]+)/)?.[1];
   if (!playlistId) {
-    throw new CliError2("invalid_playlist_url", `Could not parse Spotify playlist URL: ${playlistUrl}`);
+    throw new CliError("invalid_playlist_url", `Could not parse Spotify playlist URL: ${playlistUrl}`);
   }
   return `spotify:playlist:${playlistId}`;
 }
@@ -10714,13 +10763,13 @@ var init_random = __esm(() => {
 async function subscribeCommand(email, json) {
   const address = email?.trim() || await promptLine("Email: ", PROMPT_NON_INTERACTIVE_MESSAGE);
   if (!address) {
-    throw new CliError2("invalid_email", "Enter a valid email address.");
+    throw new CliError("invalid_email", "Enter a valid email address.");
   }
   await publicApiPost("/api/v1/newsletter", {
     email: address
   });
   if (json) {
-    printJson2({
+    printJson({
       ok: true
     });
     return;
@@ -10738,11 +10787,11 @@ var init_subscribe = __esm(() => {
 async function submitCommand(input) {
   const query = input?.trim() || await promptLine("Track or Spotify link: ", PROMPT_NON_INTERACTIVE_MESSAGE2);
   if (!query) {
-    throw new CliError2("missing_query", "Missing search input");
+    throw new CliError("missing_query", "Missing search input");
   }
   const response = await publicApiGet(`/api/v1/search?q=${encodeURIComponent(query)}`);
   if (response.results.length === 0) {
-    throw new CliError2("no_results", "Nothing came back for that search. Try the artist and the title.");
+    throw new CliError("no_results", "Nothing came back for that search. Try the artist and the title.");
   }
   const selected = await selectCandidate(response.results);
   if (!selected) {
@@ -10844,7 +10893,7 @@ async function requestDeviceCode(baseUrl) {
     return;
   });
   if (!response.ok || !data?.device_code || !data.user_code) {
-    throw new CliError2("device_code_failed", `Couldn't start the login flow (${response.status}). Try again in a moment.`);
+    throw new CliError("device_code_failed", `Couldn't start the login flow (${response.status}). Try again in a moment.`);
   }
   return data;
 }
@@ -10876,15 +10925,15 @@ async function pollForToken(baseUrl, device) {
         intervalMs += 5000;
         break;
       case "access_denied":
-        throw new CliError2("access_denied", "Sign-in was denied in the browser. Nothing linked.");
+        throw new CliError("access_denied", "Sign-in was denied in the browser. Nothing linked.");
       case "expired_token":
-        throw new CliError2("expired_token", "The login request timed out. Run `fluncle login` again.");
+        throw new CliError("expired_token", "The login request timed out. Run `fluncle login` again.");
       default:
-        throw new CliError2("device_token_failed", pending?.error_description ?? `Login failed (${response.status}).`);
+        throw new CliError("device_token_failed", pending?.error_description ?? `Login failed (${response.status}).`);
     }
     await sleep3(intervalMs);
   }
-  throw new CliError2("expired_token", "The login request timed out. Run `fluncle login` again.");
+  throw new CliError("expired_token", "The login request timed out. Run `fluncle login` again.");
 }
 async function fetchSessionUser(baseUrl, token) {
   const response = await fetch(`${baseUrl}/api/v1/me`, {
@@ -11020,7 +11069,7 @@ var init_about = __esm(() => {
 async function versionCommand(options) {
   const result = options.check ? await buildVersionCheck() : buildCurrentVersion();
   if (options.json) {
-    printJson2({
+    printJson({
       ok: true,
       ...result
     });
@@ -11086,7 +11135,7 @@ function parseVersion2(version) {
 var currentVersion2, latestReleaseUrl = "https://api.github.com/repos/mauricekleine/fluncle/releases/latest";
 var init_version2 = __esm(() => {
   init_output();
-  currentVersion2 = "0.275.0".trim() ? "0.275.0".trim() : "0.1.0";
+  currentVersion2 = "0.276.0".trim() ? "0.276.0".trim() : "0.1.0";
 });
 
 // ../../packages/registry/src/index.ts
@@ -12605,7 +12654,7 @@ var init_src = __esm(() => {
       ],
       kind: "cron",
       name: "cron.publish-advance",
-      operatorNotes: "every 30m. Pure HTTP trigger, zero LLM tokens. The last autonomy gap: render finishes → this pushes, with no operator beat between. Admin tier (needs the Worker's Postiz key, which the box never sees — the box only triggers; the `drip_clips` / `capture_post_urls` precedent). SHIPS DARK: the Worker's kill switch is DEFAULT-DENY (only an explicit `false` in the `publish_advance_paused` setting runs it), so the timer ticks and posts nothing until `fluncle admin publish resume`. The Worker reads the switch FIRST, then advances at most ONE ready finding — both masters finalized, 15m settled, the whole bundle served on R2, the (track, platform) row CLAIMED atomically before any Postiz call, a rolling-24h cap of 6 pushes. A failed push is left `failed` for the operator and never auto-retried. Source: docs/agents/hermes/scripts/publish-advance-sweep.sh. Probed on /status as cron.publish-advance.",
+      operatorNotes: "every 30m. Pure HTTP trigger, zero LLM tokens. The last autonomy gap: render finishes → this pushes, with no operator beat between. Admin tier (needs the Worker's Postiz key, which the box never sees — the box only triggers; the `drip_clips` / `capture_post_urls` precedent). SHIPS DARK: the Worker's kill switch is DEFAULT-DENY (only an explicit `false` in the `publish_advance_paused` setting runs it), so the timer ticks and posts nothing until `fluncle admin publish resume`. The Worker reads the switch FIRST, then advances at most ONE ready finding — both masters finalized, settled six hours, the whole bundle served on R2, the (track, platform) row CLAIMED atomically before any Postiz call, a rolling-24h cap of 4 pushes. A failed push is left `failed` for the operator and never auto-retried. Source: docs/agents/hermes/scripts/publish-advance-sweep.sh. Probed on /status as cron.publish-advance.",
       probeConfig: { cadenceMs: 30 * MINUTE_MS, cronName: "fluncle-publish-advance", kind: "cron" },
       statusDescription: "advances the publish queue on his own clock",
       title: "Publish advance",
@@ -12712,7 +12761,7 @@ var init_src = __esm(() => {
       ],
       kind: "cron",
       name: "cron.indexnow",
-      operatorNotes: "06:00 Europe/Amsterdam, after nightly hub reconciliation, with a 07:15 retry. Calls the agent-tier submit_indexnow walk, claim, and ack phases in bounded admitted windows. The box posts paced batches of 1,000, up to 10,000 URLs per daily run, with Yandex fallback on 429 and bounded Retry-After backoff. A complete walk within 12 hours skips the retry walk. HTTP 200/202 allow matching-version stamps; unaccepted versions stay due, partial rate limits remain resumable, and zero-acceptance rate limits or other rejections fail the run summary. Source: docs/agents/hermes/scripts/indexnow.* and docs/agents/hermes/indexnow-timer/.",
+      operatorNotes: "06:00 Europe/Amsterdam, after nightly hub reconciliation, with a 07:15 retry. Calls the agent-tier submit_indexnow walk, claim, and ack phases in bounded admitted windows. The box posts paced batches of 1,000, up to 2,000 URLs per daily run, with Yandex fallback on 429 and bounded Retry-After backoff. A complete walk within 12 hours skips the retry walk. HTTP 200/202 allow matching-version stamps; unaccepted versions stay due, partial rate limits remain resumable, and zero-acceptance rate limits or other rejections fail the run summary. Source: docs/agents/hermes/scripts/indexnow.* and docs/agents/hermes/indexnow-timer/.",
       operatorOnly: "Search-engine notification is plumbing, not a listener-facing automation.",
       probeConfig: {
         cadenceMs: 24 * 60 * MINUTE_MS,
@@ -12978,7 +13027,7 @@ function checkBundleCompleteness(files) {
 function validateBundleCompleteness(files, onProgress, options) {
   const completeness = checkBundleCompleteness(files);
   if (completeness.uploadingFootage && completeness.missingContract.length > 0 && !options.allowPartial) {
-    throw new CliError2("bundle_incomplete", `Refusing to upload a PARTIAL bundle: footage is being uploaded but the re-render contract is missing ${completeness.missingContract.join(", ")}. ` + `A footage-only upload leaves composition.tsx/props.json/render.json stale on R2 and desyncs the render.json from the DB ledger. ` + `Ship the complete bundle (re-run \`ship\` and upload with --dir), or pass --allow-partial for a deliberate partial refresh (e.g. poster-only).`);
+    throw new CliError("bundle_incomplete", `Refusing to upload a PARTIAL bundle: footage is being uploaded but the re-render contract is missing ${completeness.missingContract.join(", ")}. ` + `A footage-only upload leaves composition.tsx/props.json/render.json stale on R2 and desyncs the render.json from the DB ledger. ` + `Ship the complete bundle (re-run \`ship\` and upload with --dir), or pass --allow-partial for a deliberate partial refresh (e.g. poster-only).`);
   }
   if (completeness.uploadingFootage) {
     if (completeness.missingContract.length > 0) {
@@ -12999,7 +13048,7 @@ async function trackVideoCommand(idOrLogId, files, onProgress, options = {}) {
     path: files[spec.option]
   })).filter((spec) => Boolean(spec.path));
   if (present.length === 0) {
-    throw new CliError2("nothing_to_upload", "No bundle files resolved to upload (pass --dir <bundle> or explicit file flags).");
+    throw new CliError("nothing_to_upload", "No bundle files resolved to upload (pass --dir <bundle> or explicit file flags).");
   }
   const platesOnly = isPlatesOnlyUpload(files);
   const presign = await adminApiPost(`/api/v1/admin/tracks/${encodeURIComponent(idOrLogId)}/video/uploads`, { fields: present.map((spec) => spec.field) });
@@ -13009,7 +13058,7 @@ async function trackVideoCommand(idOrLogId, files, onProgress, options = {}) {
   for (const spec of present) {
     const upload = byField.get(spec.field);
     if (!upload) {
-      throw new CliError2("presign_missing", `Worker did not sign an upload for ${spec.field}`);
+      throw new CliError("presign_missing", `Worker did not sign an upload for ${spec.field}`);
     }
     onProgress?.(`Uploading ${spec.field} → ${upload.key}`);
     const file = Bun.file(spec.path);
@@ -13021,7 +13070,7 @@ async function trackVideoCommand(idOrLogId, files, onProgress, options = {}) {
     });
     if (!response.ok) {
       const detail = (await response.text().catch(() => "")).slice(0, 300);
-      throw new CliError2("r2_put_failed", `R2 rejected ${spec.field} with ${response.status} ${response.statusText}${detail ? `: ${detail}` : ""}`);
+      throw new CliError("r2_put_failed", `R2 rejected ${spec.field} with ${response.status} ${response.statusText}${detail ? `: ${detail}` : ""}`);
     }
     urls[spec.field] = `${FOUND_BASE}/${upload.key}`;
   }
@@ -26162,6 +26211,10 @@ var init_admin_tracks = __esm(() => {
     scope: TrackWorkScopeSchema.default("all")
   })).output(object({
     capabilities: TrackWorkCapabilitiesSchema.optional(),
+    catalogueCapture: object({
+      closedReason: _enum(["paused", "bytes_spent", "tracks_spent"]),
+      open: literal(false)
+    }).optional(),
     debtPending: boolean3().optional(),
     ok: literal(true),
     oldestQueuedCaptureOver24h: boolean3().optional(),
@@ -28970,7 +29023,7 @@ async function resolveMixtapeId(idOrLogId) {
   const response = await adminApiGet("/api/v1/admin/mixtapes");
   const match = response.mixtapes.find((mixtape) => mixtape.id === idOrLogId || mixtape.logId === idOrLogId);
   if (!match?.id) {
-    throw new CliError2("mixtape_not_found", `No mixtape with id or Log ID ${idOrLogId}`);
+    throw new CliError("mixtape_not_found", `No mixtape with id or Log ID ${idOrLogId}`);
   }
   return match.id;
 }
@@ -29085,7 +29138,7 @@ function renditionFfmpegArgs(inputPath, outputPath) {
 }
 async function uploadRenditionMultipart(masterPath, presignPath, onProgress = () => {}) {
   if (!existsSync(masterPath)) {
-    throw new CliError2("file_not_found", `Set-video master not found: ${masterPath}`);
+    throw new CliError("file_not_found", `Set-video master not found: ${masterPath}`);
   }
   await assertFfmpeg();
   const renditionPath = join4(tmpdir(), `fluncle-set-${randomUUID()}.mp4`);
@@ -29104,7 +29157,7 @@ async function uploadRenditionMultipart(masterPath, presignPath, onProgress = ()
       for (const part of plan.parts) {
         const url = urlByPart.get(part.partNumber);
         if (!url) {
-          throw new CliError2("presign_missing", `Worker did not sign part ${part.partNumber} of ${plan.partCount}`);
+          throw new CliError("presign_missing", `Worker did not sign part ${part.partNumber} of ${plan.partCount}`);
         }
         onProgress(`Set video: part ${part.partNumber}/${plan.partCount}`);
         const etag = await putPart(url, renditionPath, part, onProgress);
@@ -29126,11 +29179,11 @@ async function putPart(url, path, part, onProgress = () => {}) {
     try {
       return await putPartOnce(url, body, part);
     } catch (error) {
-      if (error instanceof CliError2) {
+      if (error instanceof CliError || deadlineSignal().aborted) {
         throw error;
       }
       if (attempt >= MAX_PART_ATTEMPTS) {
-        throw new CliError2("r2_part_failed", `Part ${part.partNumber} failed after ${MAX_PART_ATTEMPTS} attempts: ${error instanceof Error ? error.message : String(error)}`);
+        throw new CliError("r2_part_failed", `Part ${part.partNumber} failed after ${MAX_PART_ATTEMPTS} attempts: ${error instanceof Error ? error.message : String(error)}`);
       }
       const backoffMs = 500 * 2 ** (attempt - 1);
       onProgress(`Set video: part ${part.partNumber} dropped, retry ${attempt}/${MAX_PART_ATTEMPTS - 1} in ${backoffMs}ms…`);
@@ -29139,17 +29192,17 @@ async function putPart(url, path, part, onProgress = () => {}) {
   }
 }
 async function putPartOnce(url, body, part) {
-  const response = await fetch(url, { body, method: "PUT" });
+  const response = await fetch(url, { body, method: "PUT", signal: deadlineSignal() });
   if (!response.ok) {
     const detail = (await response.text().catch(() => "")).slice(0, 300);
     if (response.status < 500) {
-      throw new CliError2("r2_part_failed", `R2 rejected part ${part.partNumber} (${response.status} ${response.statusText})${detail ? `: ${detail}` : ""}`);
+      throw new CliError("r2_part_failed", `R2 rejected part ${part.partNumber} (${response.status} ${response.statusText})${detail ? `: ${detail}` : ""}`);
     }
     throw new Error(`R2 ${response.status} ${response.statusText} on part ${part.partNumber}${detail ? `: ${detail}` : ""}`);
   }
   const etag = response.headers.get("etag");
   if (!etag) {
-    throw new CliError2("r2_no_etag", `R2 returned no ETag for part ${part.partNumber}`);
+    throw new CliError("r2_no_etag", `R2 returned no ETag for part ${part.partNumber}`);
   }
   return etag;
 }
@@ -29157,15 +29210,16 @@ async function completeUpload(url, parts) {
   const response = await fetch(url, {
     body: buildCompleteXml(parts),
     headers: { "content-type": "application/xml" },
-    method: "POST"
+    method: "POST",
+    signal: deadlineSignal()
   });
   const text = await response.text().catch(() => "");
   if (!response.ok || text.includes("<Error>")) {
-    throw new CliError2("r2_complete_failed", `R2 CompleteMultipartUpload failed (${response.status} ${response.statusText})${text ? `: ${text.slice(0, 300)}` : ""}`);
+    throw new CliError("r2_complete_failed", `R2 CompleteMultipartUpload failed (${response.status} ${response.statusText})${text ? `: ${text.slice(0, 300)}` : ""}`);
   }
 }
 async function abortUpload(url) {
-  await fetch(url, { method: "DELETE" });
+  await fetch(url, { method: "DELETE", signal: AbortSignal.timeout(UPLOAD_ABORT_TIMEOUT_MS) });
 }
 async function assertFfmpeg() {
   try {
@@ -29175,7 +29229,7 @@ async function assertFfmpeg() {
       throw new Error("ffmpeg -version exited non-zero");
     }
   } catch {
-    throw new CliError2("ffmpeg_missing", "--set-video needs ffmpeg to derive the 1080p rendition. Install it (brew install ffmpeg).");
+    throw new CliError("ffmpeg_missing", "--set-video needs ffmpeg to derive the 1080p rendition. Install it (brew install ffmpeg).");
   }
 }
 async function deriveRendition(inputPath, outputPath) {
@@ -29186,13 +29240,14 @@ async function deriveRendition(inputPath, outputPath) {
   await proc.exited;
   if (proc.exitCode !== 0) {
     const detail = (await new Response(proc.stderr).text().catch(() => "")).slice(-400);
-    throw new CliError2("ffmpeg_failed", `ffmpeg failed to derive the set-video rendition${detail ? `: ${detail}` : ""}`);
+    throw new CliError("ffmpeg_failed", `ffmpeg failed to derive the set-video rendition${detail ? `: ${detail}` : ""}`);
   }
 }
-var FOUND_BASE2 = "https://found.fluncle.com", SET_VIDEO_RENDITION, MAX_PART_ATTEMPTS = 5;
+var FOUND_BASE2 = "https://found.fluncle.com", SET_VIDEO_RENDITION, MAX_PART_ATTEMPTS = 5, UPLOAD_ABORT_TIMEOUT_MS = 5000;
 var init_mixtape_set_video = __esm(() => {
   init_multipart();
   init_api();
+  init_deadline();
   init_output();
   SET_VIDEO_RENDITION = {
     audioBitrate: "192k",
@@ -29289,12 +29344,12 @@ async function clipDripPauseCommand(paused) {
 }
 async function resolveClipSource(clip) {
   if (!clip.recordingId) {
-    throw new CliError2("clip_unlinked", `Clip ${clip.id} is linked to no recording`);
+    throw new CliError("clip_unlinked", `Clip ${clip.id} is linked to no recording`);
   }
   await Promise.resolve().then(() => init_recordings());
   const recording = await recordingGet(clip.recordingId);
   if (!recording.r2Key) {
-    throw new CliError2("recording_not_staged", `Recording ${clip.recordingId} has no staged set video`);
+    throw new CliError("recording_not_staged", `Recording ${clip.recordingId} has no staged set video`);
   }
   return {
     setUrl: r2PublicUrl(FOUND_BASE3, recording.r2Key)
@@ -29304,7 +29359,7 @@ async function clipCutCommand(clipId, onProgress = () => {}) {
   const clips = await clipsListCommand();
   const clip = clips.find((candidate) => candidate.id === clipId);
   if (!clip) {
-    throw new CliError2("clip_not_found", `No clip with id ${clipId}`);
+    throw new CliError("clip_not_found", `No clip with id ${clipId}`);
   }
   const source = await resolveClipSource(clip);
   await assertFfmpeg2();
@@ -29320,7 +29375,7 @@ async function clipCutCommand(clipId, onProgress = () => {}) {
     });
     const sizeBytes = statSync3(outputPath).size;
     if (sizeBytes > MAX_CLIP_BYTES) {
-      throw new CliError2("clip_too_large", `The cut is ${(sizeBytes / 1e6).toFixed(1)} MB (> 100 MB Cloudflare MT ceiling). Shorten the window or lower the bitrate cap`);
+      throw new CliError("clip_too_large", `The cut is ${(sizeBytes / 1e6).toFixed(1)} MB (> 100 MB Cloudflare MT ceiling). Shorten the window or lower the bitrate cap`);
     }
     onProgress(`Clip ${clipId}: uploading ${(sizeBytes / 1e6).toFixed(1)} MB…`);
     const presign = await adminApiPost(`/api/v1/admin/clips/${encodeURIComponent(clipId)}/cut/presign`, { contentType: "video/mp4" });
@@ -29345,7 +29400,7 @@ async function putClip(url, contentType, path) {
   });
   if (!response.ok) {
     const detail = (await response.text().catch(() => "")).slice(0, 300);
-    throw new CliError2("r2_put_failed", `R2 rejected the clip upload (${response.status} ${response.statusText})${detail ? `: ${detail}` : ""}`);
+    throw new CliError("r2_put_failed", `R2 rejected the clip upload (${response.status} ${response.statusText})${detail ? `: ${detail}` : ""}`);
   }
 }
 async function assertFfmpeg2() {
@@ -29356,12 +29411,12 @@ async function assertFfmpeg2() {
       throw new Error("ffmpeg -version exited non-zero");
     }
   } catch {
-    throw new CliError2("ffmpeg_missing", "The clip cut needs ffmpeg. Install it on the box (apt-get install -y ffmpeg).");
+    throw new CliError("ffmpeg_missing", "The clip cut needs ffmpeg. Install it on the box (apt-get install -y ffmpeg).");
   }
 }
 async function runClipCut(options) {
   if (!options.setUrl) {
-    throw new CliError2("missing_set_url", "The clip cut needs the set rendition URL");
+    throw new CliError("missing_set_url", "The clip cut needs the set rendition URL");
   }
   const proc = Bun.spawn(["ffmpeg", ...clipCutFfmpegArgs(options)], {
     stderr: "pipe",
@@ -29370,7 +29425,7 @@ async function runClipCut(options) {
   await proc.exited;
   if (proc.exitCode !== 0) {
     const detail = (await new Response(proc.stderr).text().catch(() => "")).slice(-400);
-    throw new CliError2("ffmpeg_failed", `ffmpeg failed to cut the clip${detail ? `: ${detail}` : ""}`);
+    throw new CliError("ffmpeg_failed", `ffmpeg failed to cut the clip${detail ? `: ${detail}` : ""}`);
   }
 }
 var FOUND_BASE3 = "https://found.fluncle.com", CLIP_WIDTH = 1080, CLIP_HEIGHT = 1920, CLIP_CRF = 21, CLIP_MAXRATE = "10M", CLIP_BUFSIZE = "20M", CLIP_AUDIO_BITRATE = "192k", MAX_CLIP_BYTES;
@@ -29404,7 +29459,7 @@ async function recordingsListCommand(options = {}) {
   const suffix = query.toString() ? `?${query.toString()}` : "";
   const response = await adminApiGet(`/api/v1/admin/recordings${suffix}`);
   if (options.json) {
-    printJson2({ ok: true, recordings: response.recordings });
+    printJson({ ok: true, recordings: response.recordings });
     return;
   }
   if (response.recordings.length === 0) {
@@ -29416,11 +29471,11 @@ async function recordingsListCommand(options = {}) {
 }
 async function recordingGetCommand(id, options = {}) {
   if (!id) {
-    throw new CliError2("missing_id", "Missing recording id for: get");
+    throw new CliError("missing_id", "Missing recording id for: get");
   }
   const recording = await recordingGet2(id);
   if (options.json) {
-    printJson2({ ok: true, recording });
+    printJson({ ok: true, recording });
     return;
   }
   console.log(formatRecordingSummary(recording));
@@ -29438,7 +29493,7 @@ async function recordingCreateCommand(options = {}) {
     });
     const recording = created.recording;
     if (options.json) {
-      printJson2({ ok: true, recording });
+      printJson({ ok: true, recording });
       return;
     }
     console.log(`Plan ${recording.id} created, handle "${recording.title}"`);
@@ -29446,13 +29501,13 @@ async function recordingCreateCommand(options = {}) {
   }
   const title = options.title?.trim();
   if (!title) {
-    throw new CliError2("missing_title", "A recording needs a --title (or --plan for a videoless plan)");
+    throw new CliError("missing_title", "A recording needs a --title (or --plan for a videoless plan)");
   }
   if (!options.video) {
-    throw new CliError2("missing_video", "A recording needs a --video <file> to stage");
+    throw new CliError("missing_video", "A recording needs a --video <file> to stage");
   }
   if (!existsSync2(options.video)) {
-    throw new CliError2("file_not_found", `Set-video master not found: ${options.video}`);
+    throw new CliError("file_not_found", `Set-video master not found: ${options.video}`);
   }
   const created = await adminApiPost("/api/v1/admin/recordings", {
     recordedAt: options.recordedAt,
@@ -29467,14 +29522,14 @@ async function recordingCreateCommand(options = {}) {
   log(`Recording ${recording.id} created, staging the set video…`);
   const upload = await uploadRenditionMultipart(options.video, `/api/v1/admin/recordings/${encodeURIComponent(recording.id)}/set-video/presign`, log);
   if (options.json) {
-    printJson2({ key: upload.key, ok: true, recording, url: upload.url });
+    printJson({ key: upload.key, ok: true, recording, url: upload.url });
     return;
   }
   console.log(`Recording ${recording.id} staged → ${upload.url}`);
 }
 async function recordingUpdateCommand(id, options = {}) {
   if (!id) {
-    throw new CliError2("missing_id", "Missing recording id for: update");
+    throw new CliError("missing_id", "Missing recording id for: update");
   }
   const body = {};
   if (options.title !== undefined) {
@@ -29488,66 +29543,66 @@ async function recordingUpdateCommand(id, options = {}) {
   }
   if (options.tracklistFile !== undefined) {
     if (!existsSync2(options.tracklistFile)) {
-      throw new CliError2("file_not_found", `Tracklist file not found: ${options.tracklistFile}`);
+      throw new CliError("file_not_found", `Tracklist file not found: ${options.tracklistFile}`);
     }
     try {
       body.tracklistJson = JSON.parse(readFileSync2(options.tracklistFile, "utf8"));
     } catch {
-      throw new CliError2("invalid_tracklist", `Tracklist file is not valid JSON: ${options.tracklistFile}`);
+      throw new CliError("invalid_tracklist", `Tracklist file is not valid JSON: ${options.tracklistFile}`);
     }
   }
   if (Object.keys(body).length === 0) {
-    throw new CliError2("no_fields", "Nothing to update. Pass --title, --recorded-at, --parent-id, or --tracklist-file");
+    throw new CliError("no_fields", "Nothing to update. Pass --title, --recorded-at, --parent-id, or --tracklist-file");
   }
   const response = await adminApiPatch(`/api/v1/admin/recordings/${encodeURIComponent(id)}`, body);
   if (options.json) {
-    printJson2({ ok: true, recording: response.recording });
+    printJson({ ok: true, recording: response.recording });
     return;
   }
   console.log(`Updated ${formatRecordingSummary(response.recording)}`);
 }
 async function recordingDeleteCommand(id, options = {}) {
   if (!id) {
-    throw new CliError2("missing_id", "Missing recording id for: delete");
+    throw new CliError("missing_id", "Missing recording id for: delete");
   }
   await adminApiDelete(`/api/v1/admin/recordings/${encodeURIComponent(id)}`);
   if (options.json) {
-    printJson2({ ok: true });
+    printJson({ ok: true });
     return;
   }
   console.log(`Deleted recording ${id} (and its clips).`);
 }
 async function recordingPromoteCommand(id, options = {}) {
   if (!id) {
-    throw new CliError2("missing_id", "Missing recording id for: promote");
+    throw new CliError("missing_id", "Missing recording id for: promote");
   }
   const response = await adminApiPost(`/api/v1/admin/recordings/${encodeURIComponent(id)}/promote`);
   const recording = response.recording;
   if (options.json) {
-    printJson2({ ok: true, recording });
+    printJson({ ok: true, recording });
     return;
   }
   console.log(recording.logId ? `Promoted recording ${id} → mixtape fluncle://${recording.logId}` : `Promoted recording ${id}`);
 }
 async function recordingReplaceCuesCommand(id, options = {}) {
   if (!id) {
-    throw new CliError2("missing_id", "Missing recording id for: replace-cues");
+    throw new CliError("missing_id", "Missing recording id for: replace-cues");
   }
   if (!options.cuesFile) {
-    throw new CliError2("missing_cues_file", "replace-cues needs a --cues-file <file> (the ordered cue array)");
+    throw new CliError("missing_cues_file", "replace-cues needs a --cues-file <file> (the ordered cue array)");
   }
   if (!existsSync2(options.cuesFile)) {
-    throw new CliError2("file_not_found", `Cues file not found: ${options.cuesFile}`);
+    throw new CliError("file_not_found", `Cues file not found: ${options.cuesFile}`);
   }
   let cues;
   try {
     cues = JSON.parse(readFileSync2(options.cuesFile, "utf8"));
   } catch {
-    throw new CliError2("invalid_cues", `Cues file is not valid JSON: ${options.cuesFile}`);
+    throw new CliError("invalid_cues", `Cues file is not valid JSON: ${options.cuesFile}`);
   }
   const response = await adminApiPut(`/api/v1/admin/recordings/${encodeURIComponent(id)}/cues`, { cues });
   if (options.json) {
-    printJson2({ ok: true, recording: response.recording });
+    printJson({ ok: true, recording: response.recording });
     return;
   }
   console.log(`Replaced cues for ${formatRecordingSummary(response.recording)}`);
@@ -29565,7 +29620,7 @@ function buildBody2(options, { requireContent }) {
   if (options.contentFile !== undefined) {
     body.contentJson = readContentFile(options.contentFile);
   } else if (requireContent) {
-    throw new CliError2("missing_content", "A draft needs the structured content payload via --content-file <edition.json>");
+    throw new CliError("missing_content", "A draft needs the structured content payload via --content-file <edition.json>");
   }
   if (requireContent && typeof options.promptVersion === "number") {
     body.promptVersion = options.promptVersion;
@@ -29583,13 +29638,13 @@ function buildBody2(options, { requireContent }) {
 }
 function readContentFile(filePath) {
   if (!existsSync3(filePath)) {
-    throw new CliError2("file_not_found", `Edition payload file not found: ${filePath}`);
+    throw new CliError("file_not_found", `Edition payload file not found: ${filePath}`);
   }
   const text = readFileSync3(filePath, "utf-8");
   try {
     return JSON.parse(text);
   } catch (error) {
-    throw new CliError2("invalid_content_json", `Edition payload JSON parse failed: ${error instanceof Error ? error.message : String(error)}`);
+    throw new CliError("invalid_content_json", `Edition payload JSON parse failed: ${error instanceof Error ? error.message : String(error)}`);
   }
 }
 async function newsletterDraftCommand(options) {
@@ -29626,15 +29681,15 @@ function resolveBody(options) {
   }
   if (options.bodyFile !== undefined) {
     if (!existsSync4(options.bodyFile)) {
-      throw new CliError2("file_not_found", `Body file not found: ${options.bodyFile}`);
+      throw new CliError("file_not_found", `Body file not found: ${options.bodyFile}`);
     }
     return readFileSync4(options.bodyFile, "utf-8");
   }
-  throw new CliError2("missing_body", "An entry needs a body via --body <text> or --body-file <entry.md>");
+  throw new CliError("missing_body", "An entry needs a body via --body <text> or --body-file <entry.md>");
 }
 function requireTitle(options) {
   if (options.title === undefined || !options.title.trim()) {
-    throw new CliError2("missing_title", "An entry needs a title via --title <text>");
+    throw new CliError("missing_title", "An entry needs a title via --title <text>");
   }
   return options.title;
 }
@@ -29669,20 +29724,20 @@ async function promptDetailCommand(slug) {
   const prompts = await promptsListCommand();
   const detail = prompts.find((prompt) => prompt.slug === slug);
   if (!detail) {
-    throw new CliError2("unknown_prompt", `No prompt goes by "${slug}". The registered ones: ${prompts.map((prompt) => prompt.slug).join(", ")}`);
+    throw new CliError("unknown_prompt", `No prompt goes by "${slug}". The registered ones: ${prompts.map((prompt) => prompt.slug).join(", ")}`);
   }
   return detail;
 }
 function resolveBody2(options) {
   if (options.bodyFile === undefined) {
-    throw new CliError2("missing_body", "An edit needs a body via --body-file <prompt.txt>. Start from `fluncle admin prompts get <slug> --json | jq -r .body`.");
+    throw new CliError("missing_body", "An edit needs a body via --body-file <prompt.txt>. Start from `fluncle admin prompts get <slug> --json | jq -r .body`.");
   }
   if (!existsSync5(options.bodyFile)) {
-    throw new CliError2("file_not_found", `Body file not found: ${options.bodyFile}`);
+    throw new CliError("file_not_found", `Body file not found: ${options.bodyFile}`);
   }
   const body = readFileSync5(options.bodyFile, "utf-8");
   if (body.trim().length === 0) {
-    throw new CliError2("empty_body", "A prompt body cannot be empty. Nothing was appended.");
+    throw new CliError("empty_body", "A prompt body cannot be empty. Nothing was appended.");
   }
   return body;
 }
@@ -29697,7 +29752,7 @@ async function promptRollbackCommand(slug, version) {
   const target = detail.versions.find((candidate) => candidate.version === version);
   if (!target) {
     const known = detail.versions.map((candidate) => `v${candidate.version}`).join(", ");
-    throw new CliError2("unknown_version", known.length > 0 ? `${slug} has no v${version}. On file: ${known}. For the repo's baked default, run \`fluncle admin prompts reset ${slug}\`.` : `${slug} has no history yet: the repo's baked default is what runs. There is nothing to roll back to.`);
+    throw new CliError("unknown_version", known.length > 0 ? `${slug} has no v${version}. On file: ${known}. For the repo's baked default, run \`fluncle admin prompts reset ${slug}\`.` : `${slug} has no history yet: the repo's baked default is what runs. There is nothing to roll back to.`);
   }
   return restore(detail, { body: target.body, from: version, note: `rolled back to v${version}` });
 }
@@ -29722,7 +29777,7 @@ function parseAgainst(value) {
   }
   const version = parseVersion3(value);
   if (version === undefined) {
-    throw new CliError2("invalid_against", `--against takes a version (3, or v3) or the word default. Got "${value}".`);
+    throw new CliError("invalid_against", `--against takes a version (3, or v3) or the word default. Got "${value}".`);
   }
   return { kind: "version", version };
 }
@@ -29802,7 +29857,7 @@ function resolveAgainstVersion(detail, version) {
   const target = detail.versions.find((candidate) => candidate.version === version);
   if (!target) {
     const known = detail.versions.map((candidate) => `v${candidate.version}`).join(", ");
-    throw new CliError2("unknown_version", known.length > 0 ? `${detail.slug} has no v${version}. On file: ${known}.` : `${detail.slug} has no history yet. Diff against the repo's default instead: drop --against.`);
+    throw new CliError("unknown_version", known.length > 0 ? `${detail.slug} has no v${version}. On file: ${known}.` : `${detail.slug} has no history yet. Diff against the repo's default instead: drop --against.`);
   }
   return { body: target.body, label: `v${version}`, version };
 }
@@ -29853,7 +29908,7 @@ import { createInterface as createInterface2 } from "node:readline/promises";
 async function listSubmissionsCommand(options = {}) {
   const response = await adminApiGet("/api/v1/admin/submissions");
   if (options.json) {
-    printJson2({ ok: true, submissions: response.submissions });
+    printJson({ ok: true, submissions: response.submissions });
     return;
   }
   if (response.submissions.length === 0) {
@@ -29867,7 +29922,7 @@ async function listSubmissionsCommand(options = {}) {
 async function reviewSubmissionCommand(submissionId, options = {}) {
   const submission = await fetchSubmission(submissionId);
   if (options.json) {
-    printJson2({ ok: true, submission });
+    printJson({ ok: true, submission });
     return;
   }
   console.log(formatSubmissionDetail(submission));
@@ -29875,7 +29930,7 @@ async function reviewSubmissionCommand(submissionId, options = {}) {
 async function rejectSubmissionCommand(submissionId, options = {}) {
   const response = await adminApiPost(`/api/v1/admin/submissions/${encodeURIComponent(submissionId)}/reject`);
   if (options.json) {
-    printJson2({ ok: true, submission: response.submission });
+    printJson({ ok: true, submission: response.submission });
     return;
   }
   console.log(`Rejected ${formatTrackLine(response.submission)}.`);
@@ -29900,7 +29955,7 @@ async function approveSubmissionCommand(submissionId, options = {}) {
   });
   const response = await adminApiPost(`/api/v1/admin/submissions/${encodeURIComponent(submission.id)}/approve`);
   if (options.json) {
-    printJson2({ ok: true, submission: response.submission });
+    printJson({ ok: true, submission: response.submission });
     return;
   }
   console.log(`Approved ${formatTrackLine(submission)}.`);
@@ -29911,7 +29966,7 @@ async function triageSubmissionCommand(submissionId, verdict, options = {}) {
     verdict
   });
   if (options.json) {
-    printJson2({ ok: true, submission: response.submission });
+    printJson({ ok: true, submission: response.submission });
     return;
   }
   console.log(`Triaged ${formatTrackLine(response.submission)}: ${response.submission.triageVerdict ?? ""}`);
@@ -29922,7 +29977,7 @@ async function fetchSubmission(submissionId) {
 }
 async function confirm(label) {
   if (!process.stdin.isTTY || !process.stdout.isTTY) {
-    throw new CliError2("not_interactive", "Approving publishes a submission and needs a yes. Run this in a terminal, or pass --json to approve without the prompt.");
+    throw new CliError("not_interactive", "Approving publishes a submission and needs a yes. Run this in a terminal, or pass --json to approve without the prompt.");
   }
   const rl = createInterface2({
     input: process.stdin,
@@ -30508,9 +30563,11 @@ function createEvidenceHttp(overrides = {}) {
   return {
     cacheDir: defaultCacheDir(),
     cacheTtlMs: 7 * 24 * 60 * 60 * 1000,
+    deadline: null,
     fetch: (url, init) => globalThis.fetch(url, init),
     now: () => Date.now(),
     policies: SOURCE_POLICIES,
+    progress: noteProgress,
     random: Math.random,
     refresh: false,
     sleep: (ms) => runPromise2(sleep2(ms)),
@@ -30584,16 +30641,26 @@ async function readNextSlot(slotFile) {
   const value = Number(raw);
   return Number.isFinite(value) ? value : 0;
 }
+function seconds2(ms) {
+  return Math.ceil(ms / 1000);
+}
 async function reserveSlot(http, source) {
   const interval = http.policies[source].intervalMs;
   const slotAt = await withSlotLock(http, source, async (slotFile) => {
     const now = http.now();
     const slot = Math.max(now, await readNextSlot(slotFile));
+    if (http.deadline !== null && slot >= http.deadline) {
+      return new EvidenceFetchError("timeout", `${source} queue is ${seconds2(slot - now)} s long, past the deadline ${seconds2(http.deadline - now)} s away; fetched responses are cached, so a later run resumes`, 0);
+    }
     await writeFile2(slotFile, String(slot + interval));
     return slot;
   });
+  if (slotAt instanceof EvidenceFetchError) {
+    throw slotAt;
+  }
   const wait = slotAt - http.now();
   if (wait > 0) {
+    http.progress(`waiting ${seconds2(wait)} s for a ${source} slot behind other callers on this machine (${http.stats.requests} requests sent so far; fetched responses are cached, so a later run resumes)`);
     await http.sleep(wait);
   }
 }
@@ -30634,8 +30701,12 @@ async function fetchEvidenceText(http, source, cacheKey, perform, accept = () =>
   let attempt = 0;
   const request = gen2(function* () {
     attempt += 1;
-    yield* promise2(() => reserveSlot(http, source));
+    yield* tryPromise2({
+      catch: (error) => error instanceof EvidenceFetchError ? error : new EvidencePerformError({ cause: error }),
+      try: () => reserveSlot(http, source)
+    });
     http.stats.requests += 1;
+    http.progress(`${source} request ${http.stats.requests} in flight`);
     let returned = false;
     const response = yield* tryPromise2({
       catch: (error) => {
@@ -30705,7 +30776,7 @@ async function fetchEvidenceJson(http, source, url, headers = {}) {
   const { cached, text } = await fetchEvidenceText(http, source, `GET ${url}`, async (signal) => {
     const response = await http.fetch(url, {
       headers: { Accept: "application/json", "User-Agent": EVIDENCE_USER_AGENT, ...headers },
-      signal
+      signal: AbortSignal.any([signal, deadlineSignal()])
     });
     return { headers: response.headers, status: response.status, text: await response.text() };
   }, isJson2);
@@ -30714,6 +30785,7 @@ async function fetchEvidenceJson(http, source, url, headers = {}) {
 var SOURCE_POLICIES, EVIDENCE_USER_AGENT = "FluncleLabelTriage/1.0 ( https://www.fluncle.com )", EvidenceFetchError, EvidenceRetryable, EvidencePerformError, LOCK_STALE_MS = 1e4;
 var init_evidence_http = __esm(() => {
   init_dist();
+  init_deadline();
   SOURCE_POLICIES = {
     apple: { attempts: 3, intervalMs: 3000, maxBackoffMs: 30000, timeoutMs: 1e4 },
     beatport: { attempts: 2, intervalMs: 1000, maxBackoffMs: 30000, timeoutMs: 75000 },
@@ -31407,7 +31479,7 @@ async function labelEvidenceCommand(input, options) {
     Promise.resolve().then(() => (init_env(), exports_env)),
     Promise.resolve().then(() => (init_admin_labels3(), exports_admin_labels))
   ]);
-  const http = createEvidenceHttp({ refresh: options.refresh });
+  const http = createEvidenceHttp({ deadline: deadlineAt(), refresh: options.refresh });
   const discogsToken = readOptionalEnv("DISCOGS_USER_TOKEN");
   if (discogsToken) {
     http.policies = { ...http.policies, discogs: { ...http.policies.discogs, intervalMs: 1100 } };
@@ -31458,6 +31530,7 @@ function labelEvidenceLines(evidence) {
 }
 var MBID_PATTERN3, MB_ROOT = "https://musicbrainz.org/ws/2", DISCOGS_ROOT = "https://api.discogs.com", FIRECRAWL_SCRAPE_URL = "https://api.firecrawl.dev/v2/scrape", VARIOUS_ARTISTS_MBID = "89ad4ac3-39f7-470e-963a-56509c546377", RELEASE_SAMPLE = 12, FIRST_CREDIT_ARTISTS = 25, APPLE_LOOKUPS = 5, DISCOGS_RELEASE_SAMPLE = 8, DISCOGS_STYLE_TARGET = 10, DISCOGS_RELEASE_READS = 8, PROFILE_CHARS = 800, EVIDENCE_SOURCES, MAX_CENSUS_PAGES = 5;
 var init_admin_label_evidence = __esm(() => {
+  init_deadline();
   init_evidence_http();
   MBID_PATTERN3 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
   EVIDENCE_SOURCES = ["musicbrainz", "discogs", "beatport", "apple"];
@@ -31500,7 +31573,7 @@ async function paginateWithKeyboard(options) {
   const stdin = options.input ?? process.stdin;
   const stdout = options.output ?? process.stdout;
   if (!stdin.isTTY || !stdout.isTTY) {
-    throw new CliError2("not_interactive", options.nonInteractiveMessage);
+    throw new CliError("not_interactive", options.nonInteractiveMessage);
   }
   const first = await options.fetchPage(undefined);
   if (first.lines.length === 0) {
@@ -33728,8 +33801,96 @@ var fluncleAsciiLogo = `███████╗██╗     ██╗   ██
 ╚═╝     ╚══════╝ ╚═════╝ ╚═╝  ╚═══╝ ╚═════╝╚══════╝╚══════╝`;
 var fluncleTagline = "Drum & bass bangers from another dimension";
 
+// src/deadline.ts
+init_output();
+var DEFAULT_NON_INTERACTIVE_TIMEOUT_SECONDS = 240;
+var TIMEOUT_EXIT_CODE = 124;
+var TIMEOUT_ENV = "FLUNCLE_TIMEOUT";
+var CLEANUP_GRACE_MS = 1e4;
+var state = {
+  at: null,
+  cancel: null,
+  controller: new AbortController,
+  fire: null,
+  fired: false,
+  note: null
+};
+function parseTimeoutSeconds(value, source) {
+  if (value === undefined || value.trim() === "") {
+    return null;
+  }
+  const trimmed = value.trim();
+  if (["0", "off", "none"].includes(trimmed.toLowerCase())) {
+    return 0;
+  }
+  const seconds = Number(trimmed);
+  if (!Number.isFinite(seconds) || seconds <= 0) {
+    throw new CliError("invalid_timeout", `${source} must be a number of seconds (0 disables the deadline), not "${value}"`);
+  }
+  return seconds;
+}
+function resolveTimeoutSeconds(input) {
+  const flag = parseTimeoutSeconds(input.flag, "--timeout");
+  if (flag !== null) {
+    return flag;
+  }
+  const env = parseTimeoutSeconds(input.env, TIMEOUT_ENV);
+  if (env !== null) {
+    return env;
+  }
+  return input.interactive ? 0 : DEFAULT_NON_INTERACTIVE_TIMEOUT_SECONDS;
+}
+function timeoutMessage(command, seconds, note) {
+  const waiting = note ? `: ${note}` : "";
+  return `fluncle ${command} stopped after ${seconds} s${waiting}. Set --timeout or ${TIMEOUT_ENV} in seconds (0 disables the deadline).`;
+}
+function defaultSchedule(fire, ms) {
+  const timer = setTimeout(fire, ms);
+  timer.unref();
+  return () => clearTimeout(timer);
+}
+function armDeadline(seconds, options) {
+  disarmDeadline();
+  if (seconds <= 0) {
+    state.at = null;
+    return;
+  }
+  const now = options.now ?? Date.now;
+  const exit = options.exit ?? ((code) => process.exit(code));
+  const schedule = options.schedule ?? defaultSchedule;
+  const report = options.report ?? ((message) => {
+    if (options.json) {
+      printJson({ code: "timeout", message, ok: false });
+      return;
+    }
+    console.error(message);
+  });
+  state.at = now() + seconds * 1000;
+  state.fire = () => {
+    if (state.fired) {
+      return;
+    }
+    const message = timeoutMessage(options.command, seconds, state.note);
+    state.fired = true;
+    disarmDeadline();
+    report(message);
+    process.exitCode = TIMEOUT_EXIT_CODE;
+    state.controller.abort(new CliError("timeout", message));
+    schedule(() => exit(TIMEOUT_EXIT_CODE), options.graceMs ?? CLEANUP_GRACE_MS);
+  };
+  state.cancel = schedule(state.fire, seconds * 1000);
+}
+function disarmDeadline() {
+  state.cancel?.();
+  state.cancel = null;
+}
+function deadlineFired() {
+  return state.fired;
+}
+
 // src/env.ts
 var import_dotenv = __toESM(require_main(), 1);
+init_deadline();
 var envProfiles = ["local", "production"];
 function setEnvProfile(profile) {
   if (!profile) {
@@ -33803,24 +33964,24 @@ async function maybePrintLiveCallout(args) {
 }
 
 // src/output.ts
-import { writeSync } from "node:fs";
-var EAGAIN_WAIT = new Int32Array(new SharedArrayBuffer(4));
-function writeStdoutSync(text) {
+import { writeSync as writeSync2 } from "node:fs";
+var EAGAIN_WAIT2 = new Int32Array(new SharedArrayBuffer(4));
+function writeStdoutSync2(text) {
   const buf = Buffer.from(text, "utf8");
   let offset = 0;
   while (offset < buf.length) {
     try {
-      offset += writeSync(1, buf, offset);
+      offset += writeSync2(1, buf, offset);
     } catch (error) {
       if (error.code === "EAGAIN") {
-        Atomics.wait(EAGAIN_WAIT, 0, 0, 1);
+        Atomics.wait(EAGAIN_WAIT2, 0, 0, 1);
         continue;
       }
       throw error;
     }
   }
 }
-class CliError extends Error {
+class CliError2 extends Error {
   code;
   constructor(code, message) {
     super(message);
@@ -33828,12 +33989,12 @@ class CliError extends Error {
     this.code = code;
   }
 }
-function printJson(value) {
-  writeStdoutSync(JSON.stringify(value, null, 2) + `
+function printJson2(value) {
+  writeStdoutSync2(JSON.stringify(value, null, 2) + `
 `);
 }
 function toJsonFailure(error) {
-  if (error instanceof CliError) {
+  if (error instanceof CliError2) {
     return {
       code: error.code,
       message: error.message,
@@ -33915,9 +34076,17 @@ function artistRuleLines(rules) {
 }
 function createProgram() {
   const program = configureCommand(new Command);
-  program.name("fluncle").description(fluncleTagline).option("--env <local|production>", "Config profile to load (default: production)").showSuggestionAfterError(false).addHelpCommand("help [command]", "Display help for command").hook("preAction", (_thisCommand, actionCommand) => {
+  program.name("fluncle").description(fluncleTagline).option("--env <local|production>", "Config profile to load (default: production)").option("--timeout <seconds>", `Stop the command after this many seconds with exit code 124 (0 disables; default 240 when stdout is not a terminal, or ${TIMEOUT_ENV})`).showSuggestionAfterError(false).addHelpCommand("help [command]", "Display help for command").hook("preAction", (_thisCommand, actionCommand) => {
     const options = actionCommand.optsWithGlobals();
     setEnvProfile(options.env);
+    armDeadline(resolveTimeoutSeconds({
+      env: process.env[TIMEOUT_ENV],
+      flag: options.timeout,
+      interactive: Boolean(process.stdout.isTTY)
+    }), {
+      command: commandPath(actionCommand),
+      json: process.argv.includes("--json")
+    });
   }).addHelpText("before", `
 ${fluncleAsciiLogo}
 `).addHelpText("after", rootHelpSections);
@@ -33944,17 +34113,31 @@ async function main(args = process.argv.slice(2)) {
     if (isHelpDisplayed(error)) {
       return;
     }
+    if (deadlineFired()) {
+      process.exit(TIMEOUT_EXIT_CODE);
+    }
     const normalized = normalizeCommanderError(error);
     if (process.argv.includes("--json") || args.includes("--json")) {
-      printJson(toJsonFailure(normalized));
+      printJson2(toJsonFailure(normalized));
     } else {
       console.error(formatError(normalized));
     }
     process.exit(1);
   }
+  disarmDeadline();
+  if (deadlineFired()) {
+    process.exit(TIMEOUT_EXIT_CODE);
+  }
   await Promise.resolve().then(() => init_update_notifier());
   await notifyIfUpdateAvailable(args);
 }
+function commandPath(command) {
+  const names = [];
+  for (let current = command;current?.parent; current = current.parent) {
+    names.unshift(current.name());
+  }
+  return [...names, ...command.args.slice(0, 1)].join(" ");
+}
 function configureCommand(command) {
   return command.exitOverride().helpOption("-h, --help", "Display help for command").addHelpCommand(false).configureOutput({
     writeErr: () => {}
@@ -34109,7 +34292,7 @@ JSON field reference:
     const receipts = await Promise.resolve().then(() => (init_admin_operation_receipts2(), {}));
     const result = await getOperationReceiptCommand(operationKey);
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(operationReceiptLines(result.receipt).join(`
@@ -34123,7 +34306,7 @@ JSON field reference:
       requestDigest
     });
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(operationReceiptLines(result.receipt).join(`
@@ -34136,7 +34319,7 @@ JSON field reference:
       staleBefore: parseOperationReceiptFence(options.staleBefore)
     });
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     const noun = result.repaired === 1 ? "receipt" : "receipts";
@@ -34150,7 +34333,7 @@ JSON field reference:
     const projections = await Promise.resolve().then(() => (init_admin_projections2(), {}));
     const result = await getProjectionStatusCommand();
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(projectionStatusLines(result.status).join(`
@@ -34171,7 +34354,7 @@ JSON field reference:
       wallMs: options.wallMs === undefined ? undefined : parseProjectionWallMs(options.wallMs)
     });
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(`${result.target} ${result.action}: steps ${result.steps}, processed ${result.processed}, scheduled ${result.scheduled}, ${result.complete ? "complete" : result.wallStopped ? "wall budget spent, more work remains" : "more work remains"}.`);
@@ -34186,7 +34369,7 @@ JSON field reference:
       workKind: options.workKind
     });
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(dueWorkRekeyLine(result));
@@ -34198,7 +34381,7 @@ JSON field reference:
       target: parseProjectionCutover(options.target)
     });
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(`${result.target}: cutover ${result.enabled ? "open" : "dark"}.`);
@@ -34211,7 +34394,7 @@ JSON field reference:
     const vectors = await Promise.resolve().then(() => (init_admin_vectors2(), {}));
     const result = await getVectorServingCommand(parseVectorTarget(targetValue));
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(vectorServingStatusLines(result.status).join(`
@@ -34224,7 +34407,7 @@ JSON field reference:
       target: parseVectorTarget(targetValue)
     });
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(vectorServingStatusLines(result.status).join(`
@@ -34241,7 +34424,7 @@ JSON field reference:
       contracts: parseArtifactContracts(options.contract)
     });
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(`${result.consumer.consumerId}: rebuilding at snapshot seq ${result.consumer.snapshotSeq ?? 0}.`);
@@ -34250,7 +34433,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_artifacts2());
     const result = await getArtifactConsumerCommand(consumerId);
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(`${result.consumer.consumerId}: ${result.consumer.state}, head ${result.consumer.headSeq}, applied ${result.consumer.appliedThroughSeq ?? "none"}.`);
@@ -34266,7 +34449,7 @@ JSON field reference:
       streamVersion: parseArtifactInteger(options.streamVersion, "--stream-version")
     });
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(`${result.stream}@${result.streamVersion}/${result.formatVersion}: ${result.itemCount} item(s), snapshot seq ${result.snapshotSeq}, page ${result.pageDigest}.`);
@@ -34286,7 +34469,7 @@ JSON field reference:
       streamVersion: parseArtifactInteger(options.streamVersion, "--stream-version")
     });
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(`${result.checkpoint.stream}: ${result.checkpoint.state}, ${result.checkpoint.sourceItemCount} item(s) checkpointed.`);
@@ -34295,7 +34478,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_artifacts2());
     const result = await activateArtifactConsumerCommand(consumerId);
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(`${result.consumer.consumerId}: active at seq ${result.consumer.appliedThroughSeq ?? 0}.`);
@@ -34309,7 +34492,7 @@ JSON field reference:
       })
     });
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(`${result.events.length} event(s), seq ${result.fromSeq} through ${result.throughSeq}, head ${result.headSeq}, batch ${result.batchDigest}.`);
@@ -34328,7 +34511,7 @@ JSON field reference:
       })
     });
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(`${result.consumer.consumerId}: applied through seq ${result.consumer.appliedThroughSeq ?? 0}.`);
@@ -34337,7 +34520,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_artifacts2());
     const result = await inactivateArtifactConsumerCommand(consumerId);
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(`${result.consumer.consumerId}: inactive, bootstrap required before reuse.`);
@@ -34348,7 +34531,7 @@ JSON field reference:
       maximum: ARTIFACT_COMPACTION_API_MAX_LIMIT
     }));
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(result.deletedCount === 0 ? `Compaction: ${result.reason}.` : `Compaction: deleted ${result.deletedCount} event(s), seq ${result.deletedFromSeq ?? 0} through ${result.deletedThroughSeq ?? 0}.`);
@@ -34402,15 +34585,15 @@ JSON field reference:
   });
   adminTracks.command("prepare-captures").description("Freeze a batch of capture snapshots in one admitted phase").requiredOption("--file <path>", "JSON file holding the batch body ({ items: [...] })").option("--json", "Print JSON", false).action(async (options) => {
     await Promise.resolve().then(() => init_admin_tracks2());
-    printJson(await prepareTrackCapturesCommand(JSON.parse(readFileSync6(options.file, "utf8"))));
+    printJson2(await prepareTrackCapturesCommand(JSON.parse(readFileSync6(options.file, "utf8"))));
   });
   adminTracks.command("commit-captures").description("Commit a batch of prepared capture results in one admitted phase").requiredOption("--file <path>", "JSON file holding the batch body ({ items: [...] })").option("--json", "Print JSON", false).action(async (options) => {
     await Promise.resolve().then(() => init_admin_tracks2());
-    printJson(await commitTrackCapturesCommand(JSON.parse(readFileSync6(options.file, "utf8"))));
+    printJson2(await commitTrackCapturesCommand(JSON.parse(readFileSync6(options.file, "utf8"))));
   });
   adminTracks.command("update-embeddings").description("Write a batch of audio embeddings in one admitted phase").requiredOption("--file <path>", "JSON file holding the batch body ({ items: [...] })").option("--json", "Print JSON", false).action(async (options) => {
     await Promise.resolve().then(() => init_admin_tracks2());
-    printJson(await updateTrackEmbeddingsCommand(JSON.parse(readFileSync6(options.file, "utf8"))));
+    printJson2(await updateTrackEmbeddingsCommand(JSON.parse(readFileSync6(options.file, "utf8"))));
   });
   adminTracks.command("requeue-analysis").description("Re-queue findings whose BPM/key are preview-grade (dry-run; --apply to flip)").option("--apply", "Actually flip statuses (default is a dry-run preview)", false).option("--limit <limit>", "Cap the archive walk (default: the whole archive)").option("--json", "Print JSON", false).action(async (options) => {
     await Promise.resolve().then(() => init_admin_tracks2());
@@ -34546,7 +34729,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_digests());
     const paused = await getFollowDigestStateCommand();
     if (options.json) {
-      printJson({ ok: true, paused });
+      printJson2({ ok: true, paused });
     } else {
       console.log(paused ? "Follow digests are paused." : "Follow digests are running.");
     }
@@ -34559,7 +34742,7 @@ JSON field reference:
       await Promise.resolve().then(() => init_digests());
       const result = await setFollowDigestStateCommand(paused);
       if (options.json) {
-        printJson({ ok: true, paused: result });
+        printJson2({ ok: true, paused: result });
       } else {
         console.log(result ? "Follow digests are paused." : "Follow digests are running.");
       }
@@ -34573,7 +34756,7 @@ JSON field reference:
       limit: options.limit === undefined ? undefined : Number(options.limit)
     });
     if (options.json) {
-      printJson(result);
+      printJson2(result);
     } else if (result.windowClosed && !result.dryRun) {
       console.log("Follow digest sends open Friday at 17:00 Amsterdam.");
     } else {
@@ -34845,7 +35028,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_frontier2());
     const summary = await frontierRefreshCommand(options);
     if (options.json) {
-      printJson(summary);
+      printJson2(summary);
       return;
     }
     const counts = `${summary.refreshed} refreshed, ${summary.minted} minted, ${summary.editionOnly} edition-only, ${summary.unchanged} unchanged, ${summary.failed} failed`;
@@ -34859,7 +35042,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_frontier2());
     const state = await frontierStatusCommand();
     if (options.json) {
-      printJson(state);
+      printJson2(state);
       return;
     }
     console.log(state.open ? "Frontier minting is OPEN." : "Frontier minting is closed.");
@@ -34868,7 +35051,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_frontier2());
     const state = await frontierSetMintingCommand(true);
     if (options.json) {
-      printJson(state);
+      printJson2(state);
       return;
     }
     console.log("Frontier minting is OPEN.");
@@ -34877,7 +35060,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_frontier2());
     const state = await frontierSetMintingCommand(false);
     if (options.json) {
-      printJson(state);
+      printJson2(state);
       return;
     }
     console.log("Frontier minting is closed.");
@@ -34894,7 +35077,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_catalogue2());
     const summary = await catalogueDemandCommand();
     if (options.json) {
-      printJson({ ok: true, summary });
+      printJson2({ ok: true, summary });
       return;
     }
     if (!summary.configured) {
@@ -34911,7 +35094,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_catalogue2());
     const { cleared } = await clearWrongAudioCommand(trackId);
     if (options.json) {
-      printJson({ cleared, ok: true });
+      printJson2({ cleared, ok: true });
       return;
     }
     console.log(cleared ? `Kept ${trackId}. Its audio re-embeds and rejoins the ranking on the next sweep.` : `${trackId} was not quarantined \u2014 nothing to clear.`);
@@ -34920,7 +35103,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_catalogue2());
     const { paidCleared, requeued } = await requeueAnchorCommand(trackIds, options.clearPaid);
     if (options.json) {
-      printJson({ ok: true, paidCleared, requeued });
+      printJson2({ ok: true, paidCleared, requeued });
       return;
     }
     console.log(`Re-queued ${requeued} of ${trackIds.length} row(s) \u2014 the next anchor tick picks them up at their real priority.`);
@@ -34933,7 +35116,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_catalogue2());
     const state = await spotifyConsumerBudgetCommand();
     if (options.json || spotifyBudget.opts().json) {
-      printJson({
+      printJson2({
         consumerBudgets: state.consumerBudgets,
         ok: true,
         spotifyDailyCalls: state.spotifyDailyCalls
@@ -34957,7 +35140,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_catalogue2());
     await setSpotifyConsumerBudgetCommand(options.consumer, calls);
     if (options.json || spotifyBudget.opts().json) {
-      printJson({ calls, consumer: options.consumer, ok: true });
+      printJson2({ calls, consumer: options.consumer, ok: true });
       return;
     }
     console.log(`SPOTIFY BUDGET ${options.consumer} \u2014 ${calls} calls per day`);
@@ -34966,7 +35149,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_catalogue2());
     const state = await anchorBreakerCommand();
     if (options.json) {
-      printJson({ ...state, ok: true });
+      printJson2({ ...state, ok: true });
       return;
     }
     const minutes = Math.ceil(state.cooldownRemainingMs / 60000);
@@ -34997,7 +35180,7 @@ JSON field reference:
       since: options.since
     });
     if (options.json) {
-      printJson({ ok: true, ...result });
+      printJson2({ ok: true, ...result });
       return;
     }
     console.log(result.dryRun ? `DRY RUN \u2014 ${result.matched} row(s) stamped Deezer-empty since ${options.since}. Re-run with --apply to clear them.` : `Cleared ${result.requeued} of ${result.matched} row(s) \u2014 the next isrc-recovery tick asks them again.`);
@@ -35006,7 +35189,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_catalogue2());
     const { requeued, skippedVetoed } = await requeueUnmatchedCommand();
     if (options.json) {
-      printJson({ ok: true, requeued, skippedVetoed });
+      printJson2({ ok: true, requeued, skippedVetoed });
       return;
     }
     console.log(`Re-queued ${requeued} unmatched capture(s) for the upgraded search ladder; ${skippedVetoed} stay terminal under the duration vetoes.`);
@@ -35015,7 +35198,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_catalogue2());
     const { flagged } = await flagWrongAudioCommand(trackId);
     if (options.json) {
-      printJson({ flagged, ok: true });
+      printJson2({ flagged, ok: true });
       return;
     }
     console.log(flagged ? `Flagged ${trackId}. Its vector is out of the ranking and a fresh capture is queued (the bad bytes are hash-rejected).` : `${trackId} is not a captured finding \u2014 nothing to flag.`);
@@ -35024,7 +35207,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_catalogue2());
     const { forced } = await forceCaptureCommand(trackId);
     if (options.json) {
-      printJson({ forced, ok: true });
+      printJson2({ forced, ok: true });
       return;
     }
     console.log(forced ? `Forced ${trackId}. The duplicate veto is lifted; it re-ranks onto the capture ladder and the next open-budget tick buys it.` : `${trackId} was not vetoed as a duplicate \u2014 nothing to force.`);
@@ -35034,7 +35217,7 @@ JSON field reference:
     if (options.queue) {
       const { tracks } = await listUnverifiedCapturesCommand(options.limit ? { limit: options.limit } : {});
       if (options.json) {
-        printJson({ ok: true, tracks });
+        printJson2({ ok: true, tracks });
         return;
       }
       if (tracks.length === 0) {
@@ -35055,7 +35238,7 @@ JSON field reference:
     }
     const { action } = await verifyCaptureCommand(trackId, verdict);
     if (options.json) {
-      printJson({ action, ok: true });
+      printJson2({ action, ok: true });
       return;
     }
     console.log(`Recorded. ${trackId} \u2192 ${action}.`);
@@ -35064,7 +35247,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_catalogue2());
     const { logId } = await certifyTrackCommand(trackId, options.note);
     if (options.json) {
-      printJson({ logId, ok: true });
+      printJson2({ logId, ok: true });
       return;
     }
     console.log(`Logged ${trackId} \u2014 ${logId}. Enrichment is running; finish it in the admin.`);
@@ -35073,7 +35256,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_catalogue2());
     const { changed } = await setTrackDismissedCommand(trackId, true);
     if (options.json) {
-      printJson({ changed, ok: true });
+      printJson2({ changed, ok: true });
       return;
     }
     console.log(changed ? `Dismissed ${trackId}. It leaves the ranking and the capture ladder; restore it any time.` : `${trackId} was not a live catalogue row \u2014 nothing dismissed.`);
@@ -35082,7 +35265,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_catalogue2());
     const { changed } = await setTrackDismissedCommand(trackId, false);
     if (options.json) {
-      printJson({ changed, ok: true });
+      printJson2({ changed, ok: true });
       return;
     }
     console.log(changed ? `Restored ${trackId}. It re-enters the ranking on the next sweep.` : `${trackId} was not dismissed \u2014 nothing to restore.`);
@@ -35095,7 +35278,7 @@ JSON field reference:
       }
       const body = JSON.parse(readFileSync6(options.phaseFile, "utf8"));
       const result = await crawlCataloguePhaseCommand(body);
-      printJson(result);
+      printJson2(result);
       return;
     }
     await runCrawlCatalogue(options, crawlCatalogueCommand);
@@ -35103,7 +35286,7 @@ JSON field reference:
   catalogue.command("commit-nodes").description("Commit one claim's fetched crawl nodes in a single admitted phase").requiredOption("--file <path>", "JSON file holding the batch body ({ items: [...] })").option("--json", "Print JSON", false).action(async (options) => {
     await Promise.resolve().then(() => init_admin_catalogue2());
     const body = JSON.parse(readFileSync6(options.file, "utf8"));
-    printJson(await commitCrawlNodesCommand(body));
+    printJson2(await commitCrawlNodesCommand(body));
   });
   catalogue.command("status").description("The crawl frontier's state, the catalogue's size, and the seed set").option("--json", "Print JSON", false).action(async (options) => {
     await Promise.resolve().then(() => init_admin_catalogue2());
@@ -35117,7 +35300,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_reach2());
     const { collected, failed, inserted, skipped } = await reachCollectCommand();
     if (options.json) {
-      printJson({ collected, failed, inserted, ok: true, skipped });
+      printJson2({ collected, failed, inserted, ok: true, skipped });
       return;
     }
     const landed = collected.map((entry) => `${entry.platform} (${entry.metrics.join(", ")})`).join("; ");
@@ -35219,7 +35402,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_artists2());
     const rule = await addArtistRuleCommand(artistRuleInput(artistMbid, options.verdict, options.name));
     if (options.json) {
-      printJson({ ok: true, rule });
+      printJson2({ ok: true, rule });
       return;
     }
     console.log(artistRuleWriteLine(`Rule set for ${rule.resolvedName ?? rule.artistName}: ${rule.verdict.toUpperCase()}`, rule.verdict === "unlisted" ? UNLISTED_RULE_BOUNDARY : ARTIST_RULE_BOUNDARY));
@@ -35228,7 +35411,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_artists2());
     const rules = await listArtistRulesCommand();
     if (options.json) {
-      printJson({ ok: true, rules });
+      printJson2({ ok: true, rules });
       return;
     }
     console.log(artistRuleLines(rules).join(`
@@ -35238,7 +35421,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_artists2());
     const result = await removeArtistRuleCommand(id);
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     console.log(artistRuleWriteLine(`Rule removed: ${id}`));
@@ -35274,7 +35457,7 @@ JSON field reference:
     }
     const result = options.replace ? await replaceLabelArtistRulesCommand(slug, parseLabelArtistRulesJson(readFileSync6(options.rulesFile ?? "", "utf8"))) : await listLabelArtistRulesCommand(slug);
     if (options.json) {
-      printJson({ ok: true, rules: result.rules });
+      printJson2({ ok: true, rules: result.rules });
       return;
     }
     if (options.replace) {
@@ -35296,7 +35479,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_labels2());
     const label = await updateLabelCommand(slug, seedState, options.rewalk);
     if (options.json) {
-      printJson({ label, ok: true });
+      printJson2({ label, ok: true });
       return;
     }
     for (const line of labelUpdateLines(label, options)) {
@@ -35333,7 +35516,7 @@ JSON field reference:
       process.exitCode = 1;
     }
     if (options.json) {
-      printJson(evidence);
+      printJson2(evidence);
       return;
     }
     console.log(labelEvidenceLines(evidence).join(`
@@ -35362,7 +35545,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_labels2());
     const { label, outcome, takenOver } = await mintLabelCommand(mbid, seedState, takeOver);
     if (options.json) {
-      printJson({ label, ok: true, outcome, ...takenOver ? { takenOver } : {} });
+      printJson2({ label, ok: true, outcome, ...takenOver ? { takenOver } : {} });
       return;
     }
     console.log(labelMintLine(label, outcome, mbid, takenOver));
@@ -35371,7 +35554,7 @@ JSON field reference:
     await Promise.resolve().then(() => init_admin_labels2());
     const result = await mergeLabelCommand(losingSlug, canonicalSlug);
     if (options.json) {
-      printJson({ ok: true, result });
+      printJson2({ ok: true, result });
       return;
     }
     const {
@@ -35426,7 +35609,7 @@ async function runTrackPreviewArchive(idOrLogId, options, previewArchiveUploadCo
     source: options.source
   });
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(`Archived preview for ${result.logId}`);
@@ -35457,7 +35640,7 @@ async function runTrackObserve(idOrLogId, options, trackObserveCommand) {
     voiceId: options.voiceId
   });
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(`Recorded observation for ${result.logId}`);
@@ -35474,7 +35657,7 @@ async function runTrackContext(idOrLogId, options, trackContextCommand) {
     refresh: options.refresh
   });
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   if (result.skipped) {
@@ -35509,7 +35692,7 @@ async function runTrackNote(idOrLogId, options, trackNoteCommand) {
     promptVersion: parsePromptVersion(options.promptVersion)
   });
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   if (result.skipped) {
@@ -35540,7 +35723,7 @@ async function runEntityDescribe(kind, slug, options, describeCommand) {
     promptVersion: parsePromptVersion(options.promptVersion)
   });
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   if (result.skipped) {
@@ -35565,7 +35748,7 @@ async function runEntityBioQueue(kind, options, queueCommand) {
   const limit = options.limit ? Number.parseInt(options.limit, 10) : 50;
   const items = await queueCommand(Number.isFinite(limit) ? limit : 50);
   if (options.json) {
-    printJson(items);
+    printJson2(items);
     return;
   }
   if (items.length === 0) {
@@ -35581,7 +35764,7 @@ async function runEntityBioQueue(kind, options, queueCommand) {
 async function runEntityBioDraft(kind, slug, options, draftCommand) {
   const draft = await draftCommand(slug);
   if (options.json) {
-    printJson(draft);
+    printJson2(draft);
     return;
   }
   if (!draft.found) {
@@ -35597,7 +35780,7 @@ async function runTrackSimilar(idOrLogId, options, trackSimilarCommand) {
   const limit = options.limit ? Number.parseInt(options.limit, 10) : undefined;
   const result = await trackSimilarCommand(idOrLogId, limit !== undefined && Number.isFinite(limit) ? limit : undefined);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   if (result.findings.length === 0) {
@@ -35612,7 +35795,7 @@ async function runTrackSimilar(idOrLogId, options, trackSimilarCommand) {
   }
 }
 function printSweepJson(payload, failedCount) {
-  printJson({ ...payload, failedCount, ok: failedCount === 0 });
+  printJson2({ ...payload, failedCount, ok: failedCount === 0 });
   if (failedCount > 0) {
     process.exitCode = 1;
   }
@@ -35627,7 +35810,7 @@ async function runMigratePreviewArchive(options, migratePreviewArchiveCommand) {
   if (mode === "verify") {
     const result = await migratePreviewArchiveCommand({ dryRun: true, limit, mode });
     if (options.json) {
-      printJson({ mode, ok: true, remaining: result.remaining, sampleKeys: result.sampleKeys });
+      printJson2({ mode, ok: true, remaining: result.remaining, sampleKeys: result.sampleKeys });
       return;
     }
     console.log(`${result.remaining} object(s) remain under the public analysis/previews/ prefix.`);
@@ -35780,7 +35963,7 @@ async function runCrawlCatalogue(options, crawlCatalogueCommand) {
   const maxHop = Number.parseInt(options.maxHop ?? "2", 10);
   const result = await crawlCatalogueCommand(limit, Number.isInteger(maxHop) && maxHop >= 0 ? maxHop : 2, options.dryRun);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
   } else if (result.dryRun) {
     console.log(`Dry run: would seed ${result.seeded} enabled label(s); ${result.frontierPending} node(s) pending. Nothing written.`);
   } else {
@@ -35803,7 +35986,7 @@ async function runCrawlCatalogue(options, crawlCatalogueCommand) {
 async function runCrawlStatus(options, crawlStatusCommand) {
   const result = await crawlStatusCommand();
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   const { frontier, frontierByKind } = result;
@@ -35845,7 +36028,7 @@ async function runBackfillDiscogs(options, backfillDiscogsCommand) {
     cursor = result.nextCursor;
   }
   if (options.json) {
-    printJson({
+    printJson2({
       dryRun,
       ok: true,
       rateLimited: throttled,
@@ -36332,7 +36515,7 @@ async function runBackfillCoverMasters(options, backfillCoverMastersCommand) {
     cursor = result.nextCursor;
   }
   if (options.json) {
-    printJson({
+    printJson2({
       dryRun,
       failed,
       failedCount: failed.length,
@@ -36395,7 +36578,7 @@ async function runBackfillLabelLineage(options, backfillLabelLineageCommand) {
     cursor = result.nextCursor;
   }
   if (options.json) {
-    printJson({
+    printJson2({
       dryRun,
       failed,
       failedCount: failed.length,
@@ -36512,7 +36695,7 @@ async function runBackfillRecordingMbids(options, backfillRecordingMbidsCommand)
     cursor = result.nextCursor;
   }
   if (options.json) {
-    printJson({
+    printJson2({
       dryRun,
       failed,
       failedCount: failed.length,
@@ -36575,7 +36758,7 @@ async function runBackfillArtistEdges(options, backfillArtistEdgesCommand) {
     cursor = result.nextCursor;
   }
   if (options.json) {
-    printJson({
+    printJson2({
       dryRun,
       edgesWritten,
       fullyMatched,
@@ -36629,7 +36812,7 @@ async function runBackfillArtistCredits(options, backfillArtistCreditsCommand) {
     cursor = result.nextCursor;
   }
   if (options.json) {
-    printJson({
+    printJson2({
       adoptedArtists,
       dryRun,
       edgesWritten,
@@ -36649,7 +36832,7 @@ async function runArtistResolveQueue(options, listArtistsCommand) {
   const limit = parseListLimit(options.limit);
   const result = await listArtistsCommand(limit);
   if (options.json) {
-    printJson({ artists: result.artists, ok: true });
+    printJson2({ artists: result.artists, ok: true });
     return;
   }
   if (result.artists.length === 0) {
@@ -36668,7 +36851,7 @@ async function runArtistResolve(artistId, options, resolveArtistCommand) {
   }
   const result = await resolveArtistCommand(artistId);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   if (result.rateLimited) {
@@ -36732,7 +36915,7 @@ async function runTrackVideo(idOrLogId, options, trackVideoCommand) {
     allowPartial: options.allowPartial
   });
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(`Linked video to ${result.logId}`);
@@ -36747,7 +36930,7 @@ async function runTrackDraft(idOrLogId, options, trackDraftCommand) {
   const platform = options.platform ?? "tiktok";
   const result = await trackDraftCommand(idOrLogId, platform);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(`Pushed ${platform} draft for ${result.trackId} (post ${result.externalId})`);
@@ -36759,7 +36942,7 @@ async function runTrackSocial(idOrLogId, options, trackSocialShowCommand, trackS
   if (!options.status) {
     const result = await trackSocialShowCommand(idOrLogId);
     if (options.json) {
-      printJson(result);
+      printJson2(result);
       return;
     }
     if (result.posts.length === 0) {
@@ -36784,7 +36967,7 @@ async function runTrackSocial(idOrLogId, options, trackSocialShowCommand, trackS
     url: options.url
   });
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(`${platform} \u2192 ${options.status} for ${result.trackId}`);
@@ -36796,7 +36979,7 @@ async function runTrackSocialCapture(options, trackSocialCaptureCommand) {
   }
   const result = await trackSocialCaptureCommand(limit);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   if (result.captured.length === 0) {
@@ -36814,7 +36997,7 @@ async function runTrackGet(idOrLogId, options, trackGetCommand) {
   }
   const result = await trackGetCommand(idOrLogId);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   if ("mixtape" in result) {
@@ -36840,7 +37023,7 @@ async function runMixableOrder(logIds, options, mixableOrderCommand) {
   }
   const result = await mixableOrderCommand(logIds, options.seed);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(`Proposed mix \u2014 a smooth chain (${result.algorithm}), not an energy-shaped set. Copy into Rekordbox as advisory.
@@ -36858,7 +37041,7 @@ async function runTrackGetAdmin(idOrLogId, options, trackGetAdminCommand) {
   }
   const result = await trackGetAdminCommand(idOrLogId);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   const t = result.track;
@@ -36927,7 +37110,7 @@ async function runTrackUpdate(trackId, options, trackUpdateCommand) {
     videoUrl: options.videoUrl
   });
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(`Updated ${result.trackId}: ${result.fields.join(", ")}`);
@@ -36938,7 +37121,7 @@ async function runTrackRequeueVideo(idOrLogId, options, trackRequeueVideoCommand
   }
   const result = await trackRequeueVideoCommand(idOrLogId);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(result.alreadyClear ? `${result.logId} already had no video. Nothing to clear.` : `Cleared the video for ${result.logId}. It's back on the render queue (and off radio until re-rendered).`);
@@ -36962,7 +37145,7 @@ async function runTrackPinSource(idOrLogId, options, commands) {
     allowDurationMismatch: options.allowDurationMismatch
   });
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   const who = result.logId ?? result.trackId;
@@ -36975,7 +37158,7 @@ async function runTrackPurgeVideo(idOrLogId, options, trackPurgeVideoCommand) {
   }
   const result = await trackPurgeVideoCommand(idOrLogId);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(result.noVideo ? `${result.logId} has no video. Nothing to purge.` : `Purging the stale renditions for ${result.logId} from the edge. The next play picks up the fresh render.`);
@@ -36986,7 +37169,7 @@ async function runMixtapeUpdate(id, options, mixtapeUpdateCommand) {
   }
   const result = await mixtapeUpdateCommand(id, options);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(`Saved ${result.mixtape.id}.`);
@@ -36998,7 +37181,7 @@ async function runMixtapeDistribute(idOrLogId, options, mixtapeDistributeCommand
   const onProgress = options.json ? () => {} : (message) => console.log(message);
   const result = await mixtapeDistributeCommand(idOrLogId, options, onProgress);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   const links = result.results.map((r) => `  ${r.platform}: ${r.url}`).join(`
@@ -37012,7 +37195,7 @@ async function runMixtapePublishYoutube(idOrLogId, options, publishYoutubeComman
   }
   const result = await publishYoutubeCommand(idOrLogId);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(`YouTube video is now public: ${result.url}`);
@@ -37024,7 +37207,7 @@ async function runMixtapeResync(idOrLogId, options, mixtapeResyncCommand) {
   const onProgress = options.json ? () => {} : (message) => console.log(message);
   const result = await mixtapeResyncCommand(idOrLogId, options, onProgress);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   const links = result.results.map((r) => `  ${r.platform}: ${r.url}`).join(`
@@ -37035,7 +37218,7 @@ ${links}`);
 async function runMixtapeList(options, mixtapeListCommand) {
   const mixtapes = await mixtapeListCommand();
   if (options.json) {
-    printJson({ mixtapes, ok: true });
+    printJson2({ mixtapes, ok: true });
     return;
   }
   if (mixtapes.length === 0) {
@@ -37055,7 +37238,7 @@ async function runClipsList(options, clipsListCommand, clipPostsListCommand) {
   ]);
   const dripByClip = new Map(posts.map((post) => [post.clipId, post]));
   if (options.json) {
-    printJson({
+    printJson2({
       clips: clips.map((clip) => ({ ...clip, drip: dripByClip.get(clip.id) })),
       ok: true
     });
@@ -37079,7 +37262,7 @@ async function runClipsCut(clipId, options, clipCutCommand) {
   const onProgress = options.json ? () => {} : (message) => console.log(message);
   const result = await clipCutCommand(clipId, onProgress);
   if (options.json) {
-    printJson({ ok: true, ...result });
+    printJson2({ ok: true, ...result });
     return;
   }
   console.log(`Cut ${result.clipId} \u2192 ${result.url} (${(result.sizeBytes / 1e6).toFixed(1)} MB).`);
@@ -37090,7 +37273,7 @@ async function runClipsSchedule(clipId, options, clipScheduleCommand) {
   }
   const post = await clipScheduleCommand(clipId, options.at);
   if (options.json) {
-    printJson({ ok: true, post });
+    printJson2({ ok: true, post });
     return;
   }
   console.log(`Scheduled ${post.clipId} for ${post.scheduledFor}.`);
@@ -37098,7 +37281,7 @@ async function runClipsSchedule(clipId, options, clipScheduleCommand) {
 async function runClipsDripPause(paused, options, clipDripPauseCommand) {
   const result = await clipDripPauseCommand(paused);
   if (options.json) {
-    printJson({ ok: true, paused: result });
+    printJson2({ ok: true, paused: result });
     return;
   }
   console.log(result ? "The drip-feed is paused." : "The drip-feed is running.");
@@ -37106,7 +37289,7 @@ async function runClipsDripPause(paused, options, clipDripPauseCommand) {
 async function runPublishAdvance(options, publishAdvanceCommand) {
   const result = await publishAdvanceCommand();
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   if (result.paused) {
@@ -37130,7 +37313,7 @@ async function runPublishAdvance(options, publishAdvanceCommand) {
 }
 function printAnchorApifyBudget(state, options) {
   if (options.json) {
-    printJson({ ...state, ok: true });
+    printJson2({ ...state, ok: true });
     return;
   }
   console.log(state.spent ? `APIFY ROWS SPENT for ${state.day} \u2014 the paid anchor rung sends nothing more today.` : `APIFY ROWS OPEN for ${state.day} \u2014 the paid anchor rung may still be sent rows.`);
@@ -37151,7 +37334,7 @@ function printCaptureBudget(state) {
 async function runCaptureBudget(options, captureBudgetCommand) {
   const state = await captureBudgetCommand();
   if (options.json) {
-    printJson(state);
+    printJson2(state);
     return;
   }
   printCaptureBudget(state);
@@ -37159,7 +37342,7 @@ async function runCaptureBudget(options, captureBudgetCommand) {
 async function runSetCaptureBudget(input, options, setCaptureBudgetCommand) {
   const state = await setCaptureBudgetCommand(input);
   if (options.json) {
-    printJson(state);
+    printJson2(state);
     return;
   }
   printCaptureBudget(state);
@@ -37194,7 +37377,7 @@ async function runSetCaptureCaps(options, setCaptureBudgetCommand) {
 async function runPublishAdvancePause(paused, options, publishAdvancePauseCommand) {
   const result = await publishAdvancePauseCommand(paused);
   if (options.json) {
-    printJson({ ok: true, paused: result });
+    printJson2({ ok: true, paused: result });
     return;
   }
   console.log(result ? "The publish auto-advance is paused." : "The publish auto-advance is running.");
@@ -37205,7 +37388,7 @@ async function runMixtapeGet(idOrLogId, options, mixtapeGetCommand) {
   }
   const mixtape = await mixtapeGetCommand(idOrLogId);
   if (options.json) {
-    printJson(mixtape);
+    printJson2(mixtape);
     return;
   }
   const coordinate = mixtape.logId ?? "unminted";
@@ -37236,7 +37419,7 @@ function formatCue(ms) {
 async function runNewsletterDraft(options, newsletterDraftCommand) {
   const result = await newsletterDraftCommand(options);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(`Drafted edition ${result.edition.id}. It stays a draft until the operator sends it.`);
@@ -37247,7 +37430,7 @@ async function runNewsletterUpdate(id, options, newsletterUpdateCommand) {
   }
   const result = await newsletterUpdateCommand(id, options);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(`Saved draft ${result.edition.id}.`);
@@ -37258,7 +37441,7 @@ async function runNewsletterSend(id, options, newsletterSendCommand) {
   }
   const result = await newsletterSendCommand(id);
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   const number = result.edition.number;
@@ -37273,7 +37456,7 @@ async function runNewsletterDelete(id, options, newsletterDeleteCommand) {
   }
   const result = await newsletterDeleteCommand(id);
   if (options.json) {
-    printJson({ ...result, ok: true });
+    printJson2({ ...result, ok: true });
     return;
   }
   console.log(`Deleted edition ${result.id}. The send window reopens to cover its finds.`);
@@ -37281,7 +37464,7 @@ async function runNewsletterDelete(id, options, newsletterDeleteCommand) {
 async function runNewsletterList(options, newsletterListCommand) {
   const editions = await newsletterListCommand();
   if (options.json) {
-    printJson({ editions, ok: true });
+    printJson2({ editions, ok: true });
     return;
   }
   if (editions.length === 0) {
@@ -37298,7 +37481,7 @@ async function runLogbookGaps(options, logbookGapsCommand) {
   const limit = options.limit === undefined ? undefined : Number.parseInt(options.limit, 10);
   const { gaps, spent } = await logbookGapsCommand(limit !== undefined && Number.isFinite(limit) ? limit : undefined);
   if (options.json) {
-    printJson({ gaps, ok: true, spent });
+    printJson2({ gaps, ok: true, spent });
     return;
   }
   if (gaps.length === 0) {
@@ -37320,7 +37503,7 @@ async function runLogbookWrite(sector, options, writeCommand) {
     title: options.title
   });
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   const skipped = "skipped" in result && result.skipped;
@@ -37335,7 +37518,7 @@ function requirePromptSlug(slug) {
 async function runPromptsList(options, promptsListCommand) {
   const prompts = await promptsListCommand();
   if (options.json) {
-    printJson({ ok: true, prompts });
+    printJson2({ ok: true, prompts });
     return;
   }
   await Promise.resolve().then(() => init_admin_prompts2());
@@ -37346,7 +37529,7 @@ async function runPromptsList(options, promptsListCommand) {
 async function runPromptGet(slug, options, promptGetCommand) {
   const resolved = await promptGetCommand(requirePromptSlug(slug));
   if (options.json) {
-    printJson(resolved);
+    printJson2(resolved);
     return;
   }
   const live = resolved.source === "override" ? `v${resolved.version}, an operator edit` : "the repo's baked default (v0)";
@@ -37357,7 +37540,7 @@ async function runPromptGet(slug, options, promptGetCommand) {
 async function runPromptHistory(slug, options, promptDetailCommand) {
   const detail = await promptDetailCommand(requirePromptSlug(slug));
   if (options.json) {
-    printJson({
+    printJson2({
       activeVersion: detail.activeVersion,
       ok: true,
       slug: detail.slug,
@@ -37379,7 +37562,7 @@ async function runPromptDiff(slug, options, commands) {
   const against = commands.parseAgainst(options.against);
   const result = await commands.promptDiffCommand(requirePromptSlug(slug), against);
   if (options.json) {
-    printJson({ ok: true, ...result });
+    printJson2({ ok: true, ...result });
     return;
   }
   const live = result.live.source === "override" ? `v${result.live.version}` : "the repo's baked default";
@@ -37400,7 +37583,7 @@ async function runPromptUpdate(slug, options, promptUpdateCommand) {
     note: options.note
   });
   if (options.json) {
-    printJson({ ok: true, ...result });
+    printJson2({ ok: true, ...result });
     return;
   }
   console.log(`${result.slug}: v${result.version} is live. Nothing to deploy.`);
@@ -37416,7 +37599,7 @@ async function runPromptRollback(slug, version, options, commands) {
   }
   const result = await commands.promptRollbackCommand(promptSlug, parsed);
   if (options.json) {
-    printJson({ ok: true, ...result });
+    printJson2({ ok: true, ...result });
     return;
   }
   console.log(result.skipped ? `${result.slug}: v${result.from} is already the body running. Nothing appended.` : `${result.slug}: back on v${result.from}'s body, live as v${result.version}.`);
@@ -37424,7 +37607,7 @@ async function runPromptRollback(slug, version, options, commands) {
 async function runPromptReset(slug, options, promptResetCommand) {
   const result = await promptResetCommand(requirePromptSlug(slug));
   if (options.json) {
-    printJson({ ok: true, ...result });
+    printJson2({ ok: true, ...result });
     return;
   }
   console.log(result.skipped ? `${result.slug}: already running the repo's baked default. Nothing appended.` : `${result.slug}: back on the repo's baked default, live as v${result.version}.`);
@@ -37439,7 +37622,7 @@ async function runAdd(spotifyUrl, options, addCommand) {
     note: options.note
   });
   if (options.json) {
-    printJson({
+    printJson2({
       ok: true,
       ...result
     });
@@ -37467,7 +37650,7 @@ async function runRecent(options, recentCommand) {
   const limit = parseListLimit(options.limit);
   const tracks = await recentCommand(limit);
   if (options.json) {
-    printJson({
+    printJson2({
       ok: true,
       tracks
     });
@@ -37485,7 +37668,7 @@ async function runGalaxies(slug, options, commands) {
   if (slug) {
     const { findings, galaxy } = await commands.galaxyGetCommand(slug);
     if (options.json) {
-      printJson({ findings, galaxy, ok: true });
+      printJson2({ findings, galaxy, ok: true });
       return;
     }
     console.log(`${galaxy.name}  (${galaxy.slug})`);
@@ -37498,7 +37681,7 @@ async function runGalaxies(slug, options, commands) {
   }
   const galaxies = await commands.galaxiesListCommand();
   if (options.json) {
-    printJson({ galaxies, ok: true });
+    printJson2({ galaxies, ok: true });
     return;
   }
   if (galaxies.length === 0) {
@@ -37515,7 +37698,7 @@ async function runArtistsRank(options, rankArtistsCommand) {
     limit: options.limit
   });
   if (options.json) {
-    printJson({ ok: true, summary });
+    printJson2({ ok: true, summary });
     return;
   }
   const removed = summary.centroidsRemoved > 0 ? ` Purged ${summary.centroidsRemoved} orphan(s).` : "";
@@ -37527,7 +37710,7 @@ async function runCatalogueRank(options, catalogueRankCommand) {
     limit: options.limit
   });
   if (options.json) {
-    printJson({ ok: true, summary, telescope });
+    printJson2({ ok: true, summary, telescope });
     return;
   }
   const quarantine = summary.quarantined > 0 ? ` Quarantined ${summary.quarantined} as wrong audio.` : "";
@@ -37548,7 +37731,7 @@ async function runCatalogueList(options, catalogueListCommand) {
     limit: options.limit
   });
   if (options.json) {
-    printJson({ ok: true, summary, tracks });
+    printJson2({ ok: true, summary, tracks });
     return;
   }
   if (tracks.length === 0) {
@@ -37584,7 +37767,7 @@ async function runCatalogueList(options, catalogueListCommand) {
 async function runNoteHeld(options, noteHeldCommand) {
   const { gate, rejections } = await noteHeldCommand({ settled: options.settled === true });
   if (options.json) {
-    printJson({ gate, ok: true, rejections });
+    printJson2({ gate, ok: true, rejections });
     return;
   }
   if (rejections.length === 0) {
@@ -37614,7 +37797,7 @@ async function runNoteGate(options, noteGateCommand) {
     ...minPhraseWords === undefined ? {} : { minPhraseWords }
   });
   if (options.json) {
-    printJson({ gate, ok: true });
+    printJson2({ gate, ok: true });
     return;
   }
   console.log(`The echo gate: a lift is ${gate.minPhraseWords}+ shared words; an echo is ${Math.round(gate.maxOverlap * 100)}%+ of a neighbour's words.`);
@@ -37622,7 +37805,7 @@ async function runNoteGate(options, noteGateCommand) {
 async function runObservationHeld(options, observationHeldCommand) {
   const { gate, rejections } = await observationHeldCommand({ settled: options.settled === true });
   if (options.json) {
-    printJson({ gate, ok: true, rejections });
+    printJson2({ gate, ok: true, rejections });
     return;
   }
   if (rejections.length === 0) {
@@ -37652,7 +37835,7 @@ async function runObservationGate(options, observationGateCommand) {
     ...minPhraseWords === undefined ? {} : { minPhraseWords }
   });
   if (options.json) {
-    printJson({ gate, ok: true });
+    printJson2({ gate, ok: true });
     return;
   }
   console.log(`The observation echo gate: a lift is ${gate.minPhraseWords}+ shared words; an echo is ${Math.round(gate.maxOverlap * 100)}%+ of a neighbour's words.`);
@@ -37660,7 +37843,7 @@ async function runObservationGate(options, observationGateCommand) {
 async function runGalaxyMapRead(options, galaxyMapReadCommand) {
   const galaxies = await galaxyMapReadCommand();
   if (options.json) {
-    printJson({ galaxies, ok: true });
+    printJson2({ galaxies, ok: true });
     return;
   }
   if (galaxies.length === 0) {
@@ -37676,7 +37859,7 @@ async function runGalaxyMapRead(options, galaxyMapReadCommand) {
 async function runGalaxyEmbeddings(options, galaxyEmbeddingsCommand) {
   const result = await galaxyEmbeddingsCommand({ cursor: options.cursor, limit: options.limit });
   if (options.json) {
-    printJson(result);
+    printJson2(result);
     return;
   }
   console.log(`${result.embeddings.length} embedding(s)${result.nextCursor ? ` \xB7 nextCursor: ${result.nextCursor}` : " \xB7 end of corpus"}`);
@@ -37689,7 +37872,7 @@ async function runGalaxyMapWrite(options, galaxyMapWriteCommand) {
   }
   const galaxies = await galaxyMapWriteCommand(clusters);
   if (options.json) {
-    printJson({ galaxies, ok: true });
+    printJson2({ galaxies, ok: true });
     return;
   }
   console.log(`Wrote ${clusters.length} cluster(s); the map now holds ${galaxies.length} galaxy(ies).`);
@@ -37697,7 +37880,7 @@ async function runGalaxyMapWrite(options, galaxyMapWriteCommand) {
 async function runMixtapes(options, mixtapesCommand) {
   const mixtapes = await mixtapesCommand();
   if (options.json) {
-    printJson({ mixtapes, ok: true });
+    printJson2({ mixtapes, ok: true });
     return;
   }
   if (mixtapes.length === 0) {
@@ -37832,7 +38015,7 @@ async function runAdminTracksList(options, listCommand) {
   const hasKey = resolveHasKey(options);
   const tracks = await listCommand({ hasKey, limit, order });
   if (options.json) {
-    printJson({ ok: true, tracks });
+    printJson2({ ok: true, tracks });
     return;
   }
   if (tracks.length === 0) {
@@ -37850,7 +38033,7 @@ async function runAdminTracksList(options, listCommand) {
 async function runAdminAttention(options, attentionQueueCommand) {
   const queue = await attentionQueueCommand();
   if (options.json) {
-    printJson({ attention: queue, ok: true });
+    printJson2({ attention: queue, ok: true });
     return;
   }
   await Promise.resolve().then(() => init_admin_attention());
@@ -37881,7 +38064,7 @@ async function runAdminTelemetry(options, telemetryCommand) {
     until
   });
   if (options.json) {
-    printJson({ ok: true, ...page });
+    printJson2({ ok: true, ...page });
     return;
   }
   await Promise.resolve().then(() => init_admin_telemetry());
@@ -37894,7 +38077,7 @@ async function runAdminQueue(options, queueCommand) {
     hasObservation: options.hasObservation ? true : undefined
   });
   if (options.json) {
-    printJson({
+    printJson2({
       ok: true,
       tracks
     });
@@ -37919,7 +38102,7 @@ async function runQueueView({
   const limit = parseListLimit(options.limit);
   const tracks = await fetch2(limit);
   if (options.json) {
-    printJson({
+    printJson2({
       ok: true,
       tracks
     });
@@ -38007,7 +38190,7 @@ async function runAdminTrackWork(options, trackWorkCommand) {
     scope
   });
   if (options.json) {
-    printJson({ debtPending, ok: true, queued, tracks });
+    printJson2({ debtPending, ok: true, queued, tracks });
     return;
   }
   if (debtPending === true) {
@@ -38091,7 +38274,7 @@ async function runAdminVehicles(options, vehiclesCommand) {
   const limit = parseListLimit(options.limit);
   const vehicles = await vehiclesCommand(limit);
   if (options.json) {
-    printJson({
+    printJson2({
       ok: true,
       vehicles
     });
@@ -38137,7 +38320,7 @@ async function runOpen(target, extra, options, openCommands) {
 async function runRandom(options, randomCommand) {
   const track = await randomCommand();
   if (options.json) {
-    printJson({
+    printJson2({
       ok: true,
       track
     });
@@ -38157,7 +38340,7 @@ async function runRandom(options, randomCommand) {
 async function runStatus(options, statusCommand) {
   const snapshot = await statusCommand();
   if (options.json) {
-    printJson({
+    printJson2({
       ok: true,
       ...snapshot
     });
@@ -38170,7 +38353,7 @@ async function runStatus(options, statusCommand) {
 async function runMe(options, meCommand) {
   const me = await meCommand();
   if (options.json) {
-    printJson({ ok: true, ...me });
+    printJson2({ ok: true, ...me });
     return;
   }
   console.log(me.name);
@@ -38291,6 +38474,10 @@ function topLevelCommand(args) {
     if (arg.startsWith("--env=")) {
       continue;
     }
+    if (stringOptions.has(arg)) {
+      index += 1;
+      continue;
+    }
     if (!arg.startsWith("-")) {
       return arg;
     }
@@ -38311,6 +38498,7 @@ function normalizeCommanderError(error) {
   return new Error(message);
 }
 var stringOptions = new Set([
+  "--timeout",
   "--isrc-refresh-limit",
   "--action",
   "--against",