@getmonoceros/workbench 1.21.0 → 1.21.2

package/dist/bin.js

@@ -5649,6 +5649,15 @@ async function findContainerIds(filters, exec = spawnDocker) {
   }
   return [...ids];
 }
+async function isWorkspaceRunning(root, exec = spawnDocker) {
+  const result = await exec([
+    "ps",
+    "-q",
+    "--filter",
+    `label=devcontainer.local_folder=${root}`
+  ]);
+  return result.exitCode === 0 && result.stdout.trim().length > 0;
+}
 async function cleanupDockerObjects(opts) {
   const exec = opts.exec ?? spawnDocker;
   const tag = opts.logTag ?? "cleanup";
@@ -6690,7 +6699,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.21.0" : "dev";
+    CLI_VERSION = true ? "1.21.2" : "dev";
   }
 });
 
@@ -7321,9 +7330,12 @@ function generateComposedYml(name, composed, lookupManifest, repoUrls = [], port
   lines.push("schemaVersion: 1");
   lines.push(`name: ${name}`);
   lines.push(
-    "# Pinned runtime image version. Reused on every apply; change it with"
+    "# Pinned runtime base image, reused on every apply (never auto-bumped)."
   );
-  lines.push("# `monoceros upgrade <name> [version]`.");
+  lines.push(
+    "# `monoceros upgrade <name>` refreshes the tooling and moves this to the"
+  );
+  lines.push("# latest runtime when a newer one exists.");
   lines.push(`runtimeVersion: ${DEFAULT_RUNTIME_VERSION}`);
   lines.push("");
   if (composed.languages.length > 0) {
@@ -7424,9 +7436,12 @@ function generateDocumentedYml(name, catalog, lookupManifest, repoUrls = [], por
   lines.push("schemaVersion: 1");
   lines.push(`name: ${name}`);
   lines.push(
-    "# Pinned runtime image version. Reused on every apply; change it with"
+    "# Pinned runtime base image, reused on every apply (never auto-bumped)."
   );
-  lines.push("# `monoceros upgrade <name> [version]`.");
+  lines.push(
+    "# `monoceros upgrade <name>` refreshes the tooling and moves this to the"
+  );
+  lines.push("# latest runtime when a newer one exists.");
   lines.push(`runtimeVersion: ${DEFAULT_RUNTIME_VERSION}`);
   lines.push("");
   if (byCategory.language.length > 0) {
@@ -10039,20 +10054,36 @@ async function runUpgrade(opts) {
       `No such config: ${containerConfigPath(opts.name, home)}. Run \`monoceros init <template> ${opts.name}\` first.`
     );
   }
-  const targets = opts.name ? [opts.name] : await listContainerNames2(home);
   const apply = opts.applyRunner ?? runApply;
+  const exec = opts.dockerExec ?? spawnDocker;
   const now = opts.now ?? /* @__PURE__ */ new Date();
+  let targets;
+  const skipped = [];
+  if (opts.name) {
+    targets = [opts.name];
+  } else {
+    targets = [];
+    for (const name of await listContainerNames2(home)) {
+      if (await isWorkspaceRunning(containerDir(name, home), exec)) {
+        targets.push(name);
+      } else {
+        skipped.push(name);
+      }
+    }
+  }
   const pruneAndStamp = async () => {
     const result = await pruneStaleImages({
       home,
       currentContainerNames: new Set(await listContainerNames2(home)),
-      ...opts.dockerExec ? { exec: opts.dockerExec } : {}
+      exec
     });
     await markUpgraded(now.toISOString(), home);
     return result;
   };
   if (targets.length === 0) {
-    logger.info("No containers to upgrade.");
+    logger.info(
+      opts.name ? "Nothing to upgrade." : skipped.length > 0 ? `No running containers to refresh (${skipped.length} not running: ${skipped.join(", ")}). Start one, or refresh it with \`monoceros upgrade <name>\`.` : "No running containers to refresh."
+    );
     await pruneAndStamp();
     return 0;
   }
@@ -10094,11 +10125,12 @@ async function runUpgrade(opts) {
   if (worstExit === 0) {
     const prune = await pruneAndStamp();
     logger.success(
-      `Upgraded ${opts.name ? `'${opts.name}'` : `${targets.length} container${targets.length === 1 ? "" : "s"}`}
+      `Upgraded ${opts.name ? `'${opts.name}'` : `${targets.length} running container${targets.length === 1 ? "" : "s"}`}
   tools     rebuilt \u2014 latest pulled
   base      ${pinVersion} ${bumped > 0 ? `(${bumped} bumped)` : "(already latest)"}
   pruned    ${formatPruneLine(prune)}
-  recorded  ${now.toISOString().slice(0, 16).replace("T", " ")} UTC`
+` + (skipped.length > 0 ? `  skipped   ${skipped.length} not running (${skipped.join(", ")})
+` : "") + `  recorded  ${now.toISOString().slice(0, 16).replace("T", " ")} UTC`
     );
   }
   return worstExit;
@@ -10127,6 +10159,7 @@ var init_upgrade = __esm({
     init_paths();
     init_machine_state();
     init_catalog();
+    init_compose();
     init_proxy();
     init_prune();
     init_apply();