@getmonoceros/workbench 1.38.18 → 1.38.20

package/README.md

@@ -18,12 +18,12 @@ this up front and print platform-specific guidance.
 
 ```sh
 # macOS / Linux
-curl -fsSL https://raw.githubusercontent.com/getmonoceros/workbench/main/install.sh | bash
+curl -fsSL https://raw.githubusercontent.com/getmonoceros/workbench/main/installer/install.sh | bash
 ```
 
 ```powershell
 # Windows (PowerShell)
-iwr -useb https://raw.githubusercontent.com/getmonoceros/workbench/main/install.ps1 | iex
+irm https://raw.githubusercontent.com/getmonoceros/workbench/main/installer/install.ps1 | iex
 ```
 
 The script checks Docker + Node, installs the package globally via

package/dist/bin.js

@@ -479,6 +479,18 @@ function expandEnvRefs(env) {
   }
   return out;
 }
+function mergeEnvLayers(...layers) {
+  const out = {};
+  for (const layer of layers) {
+    for (const [key, value] of Object.entries(layer)) {
+      const incomingEmpty = value.trim() === "";
+      const haveNonEmpty = out[key] !== void 0 && out[key].trim() !== "";
+      if (incomingEmpty && haveNonEmpty) continue;
+      out[key] = value;
+    }
+  }
+  return out;
+}
 function interpolateServices(services, vars) {
   const missing = [];
   const resolved = services.map((svc) => {
@@ -1439,10 +1451,10 @@ function resolveRepoTokens(config, catalog, envVars) {
 async function resolveContainerRepoTokens(name, home, catalog) {
   const ymlPath = containerConfigPath(name, home);
   const { config } = parseConfig(await fs4.readFile(ymlPath, "utf8"), ymlPath);
-  const envVars = {
-    ...readEnvFile(globalEnvPath(home)),
-    ...readEnvFile(containerEnvPath(name, home))
-  };
+  const envVars = mergeEnvLayers(
+    readEnvFile(globalEnvPath(home)),
+    readEnvFile(containerEnvPath(name, home))
+  );
   return resolveRepoTokens(config, catalog, envVars);
 }
 function formatTokenUse(use) {
@@ -4452,6 +4464,9 @@ function generateAgentsMd(input) {
           lines.push(sub ? `  ${sub}` : "");
         }
       }
+      for (const mountLine of formatServiceMounts(svc)) {
+        lines.push(mountLine);
+      }
     }
     lines.push("");
     const connEnv = serviceConnectionEnv(input.services);
@@ -4630,6 +4645,7 @@ function generateAgentsMd(input) {
   );
   lines.push("");
   const examplePort = input.ports.length > 0 ? String(input.ports[0]) : "<port>";
+  const secondPort = input.ports.length > 1 ? String(input.ports[1]) : "<port>";
   lines.push("## Running a long-running server");
   lines.push("");
   lines.push(
@@ -4664,7 +4680,10 @@ function generateAgentsMd(input) {
   lines.push("{");
   lines.push('  "targets": [');
   lines.push(
-    `    { "name": "web", "command": "<the project's start command>", "port": ${examplePort}, "default": true }`
+    `    { "name": "api", "command": "<the API's start command>", "port": ${examplePort}, "default": true },`
+  );
+  lines.push(
+    `    { "name": "web", "command": "<the web start command>", "port": ${secondPort}, "default": true }`
   );
   lines.push("  ]");
   lines.push("}");
@@ -4703,6 +4722,17 @@ function generateAgentsMd(input) {
     "not started. Pass `--target <name>` to start or stop a single one."
   );
   lines.push("");
+  lines.push(
+    "When you add a server in a later session, revisit the existing",
+    "`launch.json` instead of assuming its current `default` set is complete.",
+    "If the new server belongs to the app that should come up together (a",
+    "backend the frontend calls, a worker the app relies on), give it",
+    '`"default": true` too and place its entry before whatever depends on it.',
+    "A single pre-existing default entry does not mean later servers should",
+    "stay non-default - most servers that make up the running app belong in",
+    "the default set."
+  );
+  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",
@@ -4740,6 +4770,42 @@ function formatServiceLine(svc) {
   }
   return `- **${svc.name}** (custom image \`${svc.image}\`) \u2014 reachable at \`${reach}\``;
 }
+function formatServiceMounts(svc) {
+  const byProject = /* @__PURE__ */ new Map();
+  for (const spec of svc.volumes) {
+    const mount = parseBindMount(spec);
+    if (!mount) continue;
+    const project = projectOf(mount.source);
+    if (!project) continue;
+    const readOnly = mount.mode === "ro" ? " (read-only)" : "";
+    const bucket = byProject.get(project) ?? [];
+    bucket.push(`    - \`${mount.source}\` \u2192 \`${mount.target}\`${readOnly}`);
+    byProject.set(project, bucket);
+  }
+  if (byProject.size === 0) return [];
+  const out = ["  Workspace mounts (edit these on the host, then re-apply):"];
+  for (const [project, entries] of byProject) {
+    out.push(`  - ${project}:`);
+    out.push(...entries);
+  }
+  return out;
+}
+function parseBindMount(spec) {
+  const parts = spec.split(":");
+  if (parts.length < 2) return null;
+  const source = parts[0];
+  let mode;
+  const last = parts[parts.length - 1];
+  if (parts.length >= 3 && !last.includes("/")) {
+    mode = parts.pop();
+  }
+  return { source, target: parts.slice(1).join(":"), mode };
+}
+function projectOf(source) {
+  const segments = source.split("/");
+  if (segments[0] !== "projects" || segments.length < 2) return null;
+  return segments[1] ?? null;
+}
 function agentsMdInputFromCreateOptions(opts, featureDisplayMap2, manifestLoader, hostPort = 80) {
   const features = [];
   for (const [ref, userOptions] of Object.entries(opts.features ?? {})) {
@@ -8355,11 +8421,13 @@ ${sectionLine(label)}
   warnOnDeprecatedFeatureRefs(parsed.config.features, globalConfig, logger);
   const envPath = containerEnvPath(opts.name, home);
   await ensureEnvGitignored(containerConfigsDir(home));
-  const envVars = expandEnvRefs({
-    ...readEnvFile(globalEnvPath(home)),
-    ...readEnvFile(envPath),
-    ...opts.env ?? {}
-  });
+  const envVars = expandEnvRefs(
+    mergeEnvLayers(
+      readEnvFile(globalEnvPath(home)),
+      readEnvFile(envPath),
+      opts.env ?? {}
+    )
+  );
   const catalog = await loadComponentCatalog();
   const repoTokens = resolveRepoTokens(parsed.config, catalog, envVars);
   const featureTokenPrompt = opts.featureTokenPrompt ?? defaultFeatureTokenPrompt;
@@ -9070,7 +9138,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.38.18" : "dev";
+    CLI_VERSION = true ? "1.38.20" : "dev";
   }
 });
 
@@ -12815,7 +12883,7 @@ async function runShare(opts) {
   if (addresses.length === 0) addresses.push("<host-ip>");
   const caPath = await caTrustDisplayPath(tls.caCertPath, home);
   const banner = [
-    `Sharing ${opts.name}/${opts.app} on the local network (Ctrl+C to stop):`
+    `Sharing ${opts.name}/${opts.app} on the local network:`
   ];
   for (const t of ported) {
     banner.push("", `    ${cyan2(t.name)}`);
@@ -12826,7 +12894,9 @@ async function runShare(opts) {
   banner.push(
     "",
     dim("    Trust the local CA once (first device) for warning-free HTTPS:"),
-    dim(`      ${caPath}`)
+    dim(`      ${caPath}`),
+    "",
+    "Press Ctrl+C to stop sharing."
   );
   log.info(banner.join("\n"));
   const dockerSpawn = opts.dockerSpawn ?? defaultDockerSpawn;