@getmonoceros/workbench 1.38.0 → 1.38.2

package/dist/bin.js

@@ -4593,75 +4593,87 @@ function generateAgentsMd(input) {
     "  DataGrip) to one of the services."
   );
   lines.push("");
-  if (input.ports.length > 0) {
-    lines.push("## Running a long-running server");
-    lines.push("");
-    lines.push(
-      "When you build something that serves on a port (a web app, an API),",
-      "it must keep running after this session ends. A plain `npm start` (or",
-      "any foreground start) dies the moment the user exits you or closes the",
-      `terminal, and then \`${input.containerName}.localhost${portSuffix}\` returns 502 Bad Gateway.`
-    );
-    lines.push("");
-    lines.push(
-      "Declare it in the app's own launch config at",
-      "`projects/<app>/.monoceros/launch.json`, then start it with",
-      "`monoceros-ctl`. Add or update an entry whenever you set up a",
-      "long-running server. The file travels with the app, so the human can",
-      "restart it later without knowing your start command:"
-    );
-    lines.push("");
-    lines.push("```json");
-    lines.push("{");
-    lines.push('  "configurations": [');
-    lines.push(
-      `    { "name": "web", "command": "<the project's start command>", "port": ${input.ports[0]}, "default": true }`
-    );
-    lines.push("  ]");
-    lines.push("}");
-    lines.push("```");
-    lines.push("");
+  const examplePort = input.ports.length > 0 ? String(input.ports[0]) : "<port>";
+  lines.push("## Running a long-running server");
+  lines.push("");
+  lines.push(
+    "When you build something that serves on a port (a web app, an API),",
+    "it must keep running after this session ends. A plain `npm start` (or",
+    "any foreground start) dies the moment the user exits you or closes the",
+    input.ports.length > 0 ? `terminal, and then \`${input.containerName}.localhost${portSuffix}\` returns 502 Bad Gateway.` : "terminal, and the app stops responding."
+  );
+  lines.push("");
+  if (input.ports.length === 0) {
     lines.push(
-      "Use whatever start command the project actually uses (`npm run dev`,",
-      "`./mvnw spring-boot:run`, `python manage.py runserver`, `go run .`, \u2026).",
-      "Do not force a language-specific one. `<app>` is the path under",
-      "`projects/`; `port` must be a port already exposed on the container."
+      "This container exposes **no ports yet**, so a server has nothing to be",
+      "reached on. Before serving one, ask the user to add a port on the host",
+      "and re-apply - you cannot do this from inside:"
     );
     lines.push("");
-    lines.push("Start it, stop it, tail its log:");
-    lines.push("");
     lines.push("```");
-    lines.push("monoceros-ctl start <app>");
-    lines.push("monoceros-ctl stop <app>");
-    lines.push("monoceros-ctl logs <app>");
+    lines.push(`monoceros add-port ${input.containerName} <port>`);
+    lines.push(`monoceros apply ${input.containerName}`);
     lines.push("```");
     lines.push("");
-    lines.push(
-      "`start` launches it detached (it survives your session) and, when a",
-      "`port` is set, waits until it actually listens before returning. The",
-      "human can do the same from the host with",
-      `\`monoceros start ${input.containerName} <app>\` / \`monoceros stop ${input.containerName} <app>\`,`,
-      `and follow output with \`monoceros logs ${input.containerName} <app>\`.`
-    );
-    lines.push("");
-    lines.push(
-      "An app can declare several servers (e.g. an API and a web frontend).",
-      'Mark every server that should come up together with `"default": true`;',
-      "`monoceros-ctl start <app>` (no `--target`) then starts the whole default",
-      "set in the order the entries appear in the file, waiting for each",
-      "server's `port` to listen before starting the next - so order an entry",
-      "before anything that depends on it. If one fails to come up, the rest are",
-      "not started. Pass `--target <name>` to start or stop a single one."
-    );
-    lines.push("");
-    lines.push(
-      "The server must listen on `0.0.0.0` (not `127.0.0.1`) on the exposed",
-      "port, or Traefik cannot reach it. You only have the ports already",
-      "declared on the container; if you need another, ask the human to add it",
-      `on the host (\`monoceros add-port ${input.containerName} <port>\`) and re-apply.`
-    );
-    lines.push("");
   }
+  lines.push(
+    "Declare the server in the app's own launch config at",
+    "`projects/<app>/.monoceros/launch.json`, then start it with",
+    "`monoceros-ctl`. Add or update an entry whenever you set up a",
+    "long-running server. The file travels with the app, so the human can",
+    "restart it later without knowing your start command:"
+  );
+  lines.push("");
+  lines.push("```json");
+  lines.push("{");
+  lines.push('  "configurations": [');
+  lines.push(
+    `    { "name": "web", "command": "<the project's start command>", "port": ${examplePort}, "default": true }`
+  );
+  lines.push("  ]");
+  lines.push("}");
+  lines.push("```");
+  lines.push("");
+  lines.push(
+    "Use whatever start command the project actually uses (`npm run dev`,",
+    "`./mvnw spring-boot:run`, `python manage.py runserver`, `go run .`, \u2026).",
+    "Do not force a language-specific one. `<app>` is the path under",
+    "`projects/`; `port` must be a port exposed on the container."
+  );
+  lines.push("");
+  lines.push("Start it, stop it, tail its log:");
+  lines.push("");
+  lines.push("```");
+  lines.push("monoceros-ctl start <app>");
+  lines.push("monoceros-ctl stop <app>");
+  lines.push("monoceros-ctl logs <app>");
+  lines.push("```");
+  lines.push("");
+  lines.push(
+    "`start` launches it detached (it survives your session) and, when a",
+    "`port` is set, waits until it actually listens before returning. The",
+    "human can do the same from the host with",
+    `\`monoceros start ${input.containerName} <app>\` / \`monoceros stop ${input.containerName} <app>\`,`,
+    `and follow output with \`monoceros logs ${input.containerName} <app>\`.`
+  );
+  lines.push("");
+  lines.push(
+    "An app can declare several servers (e.g. an API and a web frontend).",
+    'Mark every server that should come up together with `"default": true`;',
+    "`monoceros-ctl start <app>` (no `--target`) then starts the whole default",
+    "set in the order the entries appear in the file, waiting for each",
+    "server's `port` to listen before starting the next - so order an entry",
+    "before anything that depends on it. If one fails to come up, the rest are",
+    "not started. Pass `--target <name>` to start or stop a single one."
+  );
+  lines.push("");
+  lines.push(
+    "The server must listen on `0.0.0.0` (not `127.0.0.1`) on the exposed",
+    "port, or Traefik cannot reach it. You only have the ports already",
+    "declared on the container; if you need another, ask the human to add it",
+    `on the host (\`monoceros add-port ${input.containerName} <port>\`) and re-apply.`
+  );
+  lines.push("");
   lines.push("## Command reference");
   lines.push("");
   lines.push(
@@ -6169,7 +6181,7 @@ var init_add_apt_packages = __esm({
       meta: {
         name: "add-apt-packages",
         group: "edit",
-        description: "Add Debian/Ubuntu apt packages to the container config. Pass package names after `--` (e.g. `monoceros add-apt-packages sandbox -- make openssh-client jq`). Idempotent. No curated whitelist \u2014 invalid names surface as apt errors at container build time."
+        description: "Add Debian/Ubuntu apt packages to the container config. Pass package names as arguments (e.g. `monoceros add-apt-packages sandbox make openssh-client jq`). Idempotent. No curated whitelist \u2014 invalid names surface as apt errors at container build time."
       },
       args: {
         name: {
@@ -6177,6 +6189,11 @@ var init_add_apt_packages = __esm({
           description: "Container name (yml in $MONOCEROS_HOME/container-configs/).",
           required: true
         },
+        packages: {
+          type: "positional",
+          description: "One or more Debian/Ubuntu apt package names (e.g. `make jq`). At least one is required.",
+          required: false
+        },
         yes: {
           type: "boolean",
           description: "Skip the interactive confirmation and apply the diff.",
@@ -6185,10 +6202,10 @@ var init_add_apt_packages = __esm({
         }
       },
       async run({ args }) {
-        const packages = [...getInnerArgs()];
+        const packages = [...args._.slice(1).map(String), ...getInnerArgs()];
         if (packages.length === 0) {
           consola3.error(
-            "No package names given. Usage: `monoceros add-apt-packages <containername> [--yes] -- <pkg> [<pkg> \u2026]`."
+            "No package names given. Usage: `monoceros add-apt-packages <containername> [--yes] <pkg> [<pkg> \u2026]`."
           );
           process.exit(1);
         }
@@ -6504,7 +6521,7 @@ var init_add_port = __esm({
       meta: {
         name: "add-port",
         group: "edit",
-        description: "Add one or more ports to the container config so they become reachable from the host via Traefik (`<container>.localhost` / `<container>-<port>.localhost`). Pass port numbers after `--` (e.g. `monoceros add-port sandbox -- 3000 5173 6006`). Idempotent. Persisted in the yml so later `monoceros apply` runs restore the routes. Pass `--default` together with a single port to make it the bare `<container>.localhost` route \u2014 the port is inserted at position 0 (or moved there if it already exists)."
+        description: "Add one or more ports to the container config so they become reachable from the host via Traefik (`<container>.localhost` / `<container>-<port>.localhost`). Pass port numbers as arguments (e.g. `monoceros add-port sandbox 3000 5173 6006`). Idempotent. Persisted in the yml so later `monoceros apply` runs restore the routes. Pass `--default` together with a single port to make it the bare `<container>.localhost` route \u2014 the port is inserted at position 0 (or moved there if it already exists)."
       },
       args: {
         name: {
@@ -6512,6 +6529,11 @@ var init_add_port = __esm({
           description: "Container name (yml in $MONOCEROS_HOME/container-configs/).",
           required: true
         },
+        ports: {
+          type: "positional",
+          description: "One or more port numbers to expose (e.g. `3000 5173`). At least one is required.",
+          required: false
+        },
         yes: {
           type: "boolean",
           description: "Skip the interactive confirmation and apply the diff.",
@@ -6525,10 +6547,10 @@ var init_add_port = __esm({
         }
       },
       async run({ args }) {
-        const tokens = [...getInnerArgs()];
+        const tokens = [...args._.slice(1).map(String), ...getInnerArgs()];
         if (tokens.length === 0) {
           consola8.error(
-            "No ports given. Usage: `monoceros add-port <containername> [--yes] [--default] -- <port> [<port> \u2026]`."
+            "No ports given. Usage: `monoceros add-port <containername> [--default] [--yes] <port> [<port> \u2026]`."
           );
           process.exit(1);
         }
@@ -8974,7 +8996,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.38.0" : "dev";
+    CLI_VERSION = true ? "1.38.2" : "dev";
   }
 });
 
@@ -12372,6 +12394,7 @@ var init_run3 = __esm({
 
 // src/tls/ca.ts
 import { promises as fs21 } from "fs";
+import os3 from "os";
 import path33 from "path";
 import forge from "node-forge";
 function homeDir(monocerosHome2) {
@@ -12380,6 +12403,10 @@ function homeDir(monocerosHome2) {
 function randomSerial() {
   return "00" + forge.util.bytesToHex(forge.random.getBytesSync(16));
 }
+function caCommonName() {
+  const host = os3.hostname().replace(/\.local$/, "").trim();
+  return host ? `Monoceros Local CA (${host})` : "Monoceros Local CA";
+}
 async function fileExists(p) {
   try {
     await fs21.access(p);
@@ -12409,7 +12436,7 @@ async function loadOrCreateCa(monocerosHome2) {
   cert.validity.notAfter = new Date(
     cert.validity.notBefore.getTime() + CA_DAYS * 24 * 60 * 60 * 1e3
   );
-  const attrs = [{ name: "commonName", value: "Monoceros Local CA" }];
+  const attrs = [{ name: "commonName", value: caCommonName() }];
   cert.setSubject(attrs);
   cert.setIssuer(attrs);
   cert.setExtensions([
@@ -12571,14 +12598,14 @@ var init_caddy = __esm({
 });
 
 // src/share/run.ts
-import os3 from "os";
+import os4 from "os";
 import { spawnSync as spawnSync2 } from "child_process";
 import { consola as consola35 } from "consola";
 import { promises as fs22 } from "fs";
 import path34 from "path";
 function realHostAddresses() {
   let ip;
-  for (const list of Object.values(os3.networkInterfaces())) {
+  for (const list of Object.values(os4.networkInterfaces())) {
     for (const addr of list ?? []) {
       if (addr.family === "IPv4" && !addr.internal) {
         ip = addr.address;
@@ -12597,7 +12624,7 @@ function mdnsHostName() {
     const name = res.status === 0 ? res.stdout.trim() : "";
     if (name) return `${name}.local`;
   }
-  const hn = os3.hostname();
+  const hn = os4.hostname();
   return hn.endsWith(".local") ? hn : `${hn}.local`;
 }
 async function runShare(opts) {