@getmonoceros/workbench 1.21.1 → 1.21.3

package/dist/bin.js

@@ -4967,6 +4967,13 @@ function generateAgentsMd(input) {
       }
     }
     lines.push("");
+    lines.push(
+      "To show the user a running app, open it in their host browser with",
+      `\`xdg-open http://${input.containerName}.localhost\` \u2014 Monoceros relays`,
+      "browser-opens from the container to the host machine. Also tell the user",
+      "the URL, so they can open it themselves if no bridge is active."
+    );
+    lines.push("");
   }
   lines.push("## How to extend this container");
   lines.push("");
@@ -5649,6 +5656,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 +6706,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.21.1" : "dev";
+    CLI_VERSION = true ? "1.21.3" : "dev";
   }
 });
 
@@ -9002,6 +9018,10 @@ function parseCallbackTarget(authUrl) {
     return null;
   }
 }
+function nextRelayUrl(content, lastOpened) {
+  const url = content.trim();
+  return url && url !== lastOpened ? url : null;
+}
 function openInBrowser(url) {
   const platform = process.platform;
   const [cmd, args] = platform === "darwin" ? ["open", [url]] : platform === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
@@ -9032,7 +9052,7 @@ exit 0
   );
   await fsp4.chmod(relayScript, 493);
   const servers = [];
-  let handled = false;
+  let lastOpened = null;
   const onUrl = (url) => {
     openInBrowser(url);
     const target = parseCallbackTarget(url);
@@ -9063,16 +9083,17 @@ exit 0
     servers.push(server);
   };
   const poll = setInterval(() => {
-    if (handled || !existsSync14(urlFile)) return;
+    if (!existsSync14(urlFile)) return;
     let content = "";
     try {
       content = readFileSync6(urlFile, "utf8");
     } catch {
       return;
     }
-    if (!content.trim()) return;
-    handled = true;
-    onUrl(content.trim());
+    const url = nextRelayUrl(content, lastOpened);
+    if (!url) return;
+    lastOpened = url;
+    onUrl(url);
   }, 250);
   return {
     relayDirInContainer: `/workspaces/${opts.name}/${RELAY_DIRNAME}`,
@@ -10045,20 +10066,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;
   }
@@ -10100,11 +10137,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;
@@ -10133,6 +10171,7 @@ var init_upgrade = __esm({
     init_paths();
     init_machine_state();
     init_catalog();
+    init_compose();
     init_proxy();
     init_prune();
     init_apply();