@plexus-ms/cli-ci 0.118.0 → 0.120.0

package/dist/plx-ci.js

@@ -5358,10 +5358,10 @@ var require_cst_scalar = __commonJS({
         case "|":
         case ">": {
           const he = source.indexOf("\n");
-          const head = source.substring(0, he);
+          const head2 = source.substring(0, he);
           const body2 = source.substring(he + 1) + "\n";
           const props = [
-            { type: "block-scalar-header", offset, indent: indent2, source: head }
+            { type: "block-scalar-header", offset, indent: indent2, source: head2 }
           ];
           if (!addEndtoBlockProps(props, end))
             props.push({ type: "newline", offset: -1, indent: indent2, source: "\n" });
@@ -5421,19 +5421,19 @@ var require_cst_scalar = __commonJS({
     }
     function setBlockScalarValue(token, source) {
       const he = source.indexOf("\n");
-      const head = source.substring(0, he);
+      const head2 = source.substring(0, he);
       const body2 = source.substring(he + 1) + "\n";
       if (token.type === "block-scalar") {
         const header = token.props[0];
         if (header.type !== "block-scalar-header")
           throw new Error("Invalid block scalar header");
-        header.source = head;
+        header.source = head2;
         token.source = body2;
       } else {
         const { offset } = token;
         const indent2 = "indent" in token ? token.indent : -1;
         const props = [
-          { type: "block-scalar-header", offset, indent: indent2, source: head }
+          { type: "block-scalar-header", offset, indent: indent2, source: head2 }
         ];
         if (!addEndtoBlockProps(props, "end" in token ? token.end : void 0))
           props.push({ type: "newline", offset: -1, indent: indent2, source: "\n" });
@@ -7389,6 +7389,15 @@ ${stderr.trimEnd()}` : ""}`);
     this.stderr = stderr;
   }
 };
+async function orAbsent(read, absent = () => true) {
+  try {
+    return await read;
+  } catch (error) {
+    if (error instanceof ExecError && absent(error))
+      return void 0;
+    throw error;
+  }
+}
 var isInteractive = () => process.stdin.isTTY === true && process.stderr.isTTY === true;
 function realIo(prompt) {
   return {
@@ -7462,22 +7471,20 @@ function body(step) {
   }
 }
 
-// ../lib/dist/train.js
-var PRIMITIVES = "primitives";
+// ../lib/dist/version.js
 var COMPENDIUM = "compendium";
-var TRAIN_REPOS = [
-  PRIMITIVES,
-  "preset-repo-turbo",
-  "preset-app-nextjs",
-  "preset-repo-operations",
+var VERSIONED_REPOS = [
+  "tooling",
+  "template-repo-turbo",
+  "template-app-nextjs",
+  "template-repo-operations",
   COMPENDIUM
 ];
-var PHASES = [[PRIMITIVES], TRAIN_REPOS.filter((r) => r !== PRIMITIVES)];
 var UsageError = class extends Error {
 };
 
 // ../lib/dist/consumers.js
-var PRESETS = TRAIN_REPOS.filter((r) => r.startsWith("preset-"));
+var TEMPLATES = VERSIONED_REPOS.filter((r) => r.startsWith("template-"));
 
 // ../lib/dist/context.js
 var Context = class {
@@ -7686,10 +7693,7 @@ async function readDeployTargets(ctx, inventory) {
 var DAY = 24 * 60 * 60 * 1e3;
 
 // ../lib/dist/update.js
-var TRAINS = `plexus-ms/${COMPENDIUM}`;
-
-// ../lib/dist/ship.js
-var DEFAULT_WAIT = { interval: 15e3, timeout: 20 * 6e4 };
+var RELEASES_REPO = `plexus-ms/${COMPENDIUM}`;
 
 // src/program.ts
 import { createRequire } from "node:module";
@@ -11383,66 +11387,50 @@ async function startSidecars(ctx, storage, owner, now = /* @__PURE__ */ new Date
   );
   return { current: buckets.current, previous: buckets.previous, previousAnswers };
 }
-async function manifestStatus(ctx, port, app, tag) {
+var curlNotFound = (error) => error.code === 22 && /\b404\b/.test(error.stderr);
+var craneNotFound = (error) => /MANIFEST_UNKNOWN|NAME_UNKNOWN|\b404\b/.test(error.stderr);
+async function lookUp(ctx, ref, command, args, absent) {
   try {
-    return (await ctx.read("curl", [
-      "-s",
-      "-o",
-      "/dev/null",
-      "-w",
-      "%{http_code}",
-      "-I",
-      "-H",
-      `Accept: ${ACCEPT}`,
-      `http://127.0.0.1:${port}/v2/${app}/manifests/${tag}`
-    ])).trim();
-  } catch {
-    return "000";
+    return await orAbsent(ctx.read(command, args), absent);
+  } catch (error) {
+    const why = error instanceof ExecError ? `could not look up ${ref}: ${error.message}` : `${command} could not run to look up ${ref}; is it installed in this job?`;
+    if (!ctx.dryRun) throw new Error(why, { cause: error });
+    ctx.say(`[dry-run] ${why.split("\n")[0]}; taken for absent`);
+    return void 0;
   }
 }
+var manifestUrl = (port, app, tag) => `http://127.0.0.1:${port}/v2/${app}/manifests/${tag}`;
+var head = (ctx, port, app, tag, absent = curlNotFound) => lookUp(
+  ctx,
+  `localhost:${port}/${app}:${tag}`,
+  "curl",
+  ["-fsS", "-I", "-H", `Accept: ${ACCEPT}`, manifestUrl(port, app, tag)],
+  absent
+);
 async function tagExists(ctx, app, tag) {
-  for (const port of [CURRENT_PORT, PREVIOUS_PORT]) {
-    if (await manifestStatus(ctx, port, app, tag) === "200") return port;
-  }
+  if (await head(ctx, CURRENT_PORT, app, tag) !== void 0) return CURRENT_PORT;
+  if (await head(ctx, PREVIOUS_PORT, app, tag, () => true) !== void 0) return PREVIOUS_PORT;
   return void 0;
 }
 async function digest(ctx, app, tag, port = CURRENT_PORT) {
-  try {
-    const head = await ctx.read("curl", [
-      "-fsS",
-      "-I",
-      "-H",
-      `Accept: ${ACCEPT}`,
-      `http://127.0.0.1:${port}/v2/${app}/manifests/${tag}`
-    ]);
-    return head.match(/^docker-content-digest:\s*(\S+)/im)?.[1];
-  } catch {
-    return void 0;
-  }
+  return (await head(ctx, port, app, tag))?.match(/^docker-content-digest:\s*(\S+)/im)?.[1];
 }
 async function layers(ctx, app, tag, port = CURRENT_PORT) {
-  try {
-    const body2 = await ctx.read("curl", [
-      "-fsS",
-      "-H",
-      `Accept: ${ACCEPT}`,
-      `http://127.0.0.1:${port}/v2/${app}/manifests/${tag}`
-    ]);
-    const data = JSON.parse(body2);
-    return (data.layers ?? []).map((l) => ({ digest: l.digest, size: l.size }));
-  } catch {
-    return void 0;
-  }
+  const manifest = await lookUp(
+    ctx,
+    `localhost:${port}/${app}:${tag}`,
+    "curl",
+    ["-fsS", "-H", `Accept: ${ACCEPT}`, manifestUrl(port, app, tag)],
+    curlNotFound
+  );
+  return manifest === void 0 ? void 0 : layersIn(manifest);
 }
+var layersIn = (manifest) => (JSON.parse(manifest).layers ?? []).map((l) => ({ digest: l.digest, size: l.size }));
 function candidateRef(registry, app, tag) {
   return registry.kind === "own" ? `localhost:${CURRENT_PORT}/${app}:${tag}` : `${imageName(registry.prefix, app)}:${tag}`;
 }
 async function craneDigest(ctx, ref) {
-  try {
-    return (await ctx.read("crane", ["digest", ref])).trim() || void 0;
-  } catch {
-    return void 0;
-  }
+  return (await lookUp(ctx, ref, "crane", ["digest", ref], craneNotFound))?.trim() || void 0;
 }
 async function findTag(ctx, registry, app, tag) {
   if (registry.kind === "own") {
@@ -11457,12 +11445,9 @@ function digestOf(ctx, registry, app, tag) {
 }
 async function layersOf(ctx, registry, app, tag) {
   if (registry.kind === "own") return layers(ctx, app, tag);
-  try {
-    const data = JSON.parse(await ctx.read("crane", ["manifest", candidateRef(registry, app, tag)]));
-    return (data.layers ?? []).map((l) => ({ digest: l.digest, size: l.size }));
-  } catch {
-    return void 0;
-  }
+  const ref = candidateRef(registry, app, tag);
+  const manifest = await lookUp(ctx, ref, "crane", ["manifest", ref], craneNotFound);
+  return manifest === void 0 ? void 0 : layersIn(manifest);
 }
 async function loggedIn(ctx, host, env = process.env) {
   const file = `${env.DOCKER_CONFIG || `${env.HOME}/.docker`}/config.json`;
@@ -12734,11 +12719,8 @@ function packageOf(prefix, app) {
 async function prune(ctx, packages, names, now = /* @__PURE__ */ new Date()) {
   const pruned = [];
   for (const name of names) {
-    let versions;
-    try {
-      versions = await packages.versions(name);
-    } catch (error) {
-      if (!(error instanceof ExecError)) throw error;
+    const versions = await orAbsent(packages.versions(name), curlNotFound);
+    if (versions === void 0) {
       ctx.say(`rotate: no package ${name} in ghcr.io/${packages.org}`);
       continue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plexus-ms/cli-ci",
-  "version": "0.118.0",
+  "version": "0.120.0",
   "description": "plx-ci, the CI verbs of Plexus: throwaway runners on a cloud, a registry on object storage, reproducible image builds, and their teardown",
   "license": "GPL-3.0-or-later",
   "type": "module",
@@ -12,7 +12,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/plexus-ms/primitives.git",
+    "url": "git+https://github.com/plexus-ms/tooling.git",
     "directory": "packages/cli-ci"
   },
   "publishConfig": {
@@ -23,7 +23,7 @@
     "node": ">=24.22.1"
   },
   "dependencies": {
-    "@plexus-ms/lib": "0.118.0",
+    "@plexus-ms/lib": "0.120.0",
     "commander": "^15.0.0",
     "yaml": "^2.9.1"
   },