@getmonoceros/workbench 1.18.0 → 1.19.1

package/dist/bin.js

@@ -1903,6 +1903,41 @@ function curatedServiceEnvDefaults(name) {
   const def = SERVICE_CATALOG[name];
   return def?.env ? { ...def.env } : {};
 }
+function serviceConnectionEnv(services) {
+  const env = {};
+  for (const svc of services) {
+    if (!isCuratedService(svc.name)) continue;
+    const host = svc.name;
+    if (svc.name === "postgres") {
+      const user = svc.env.POSTGRES_USER ?? "postgres";
+      const pass = svc.env.POSTGRES_PASSWORD ?? "";
+      const db = svc.env.POSTGRES_DB ?? user;
+      const port = svc.port ?? 5432;
+      env.PGHOST = host;
+      env.PGPORT = String(port);
+      env.PGUSER = user;
+      env.PGPASSWORD = pass;
+      env.PGDATABASE = db;
+      env.DATABASE_URL = `postgresql://${user}:${pass}@${host}:${port}/${db}`;
+    } else if (svc.name === "mysql") {
+      const pass = svc.env.MYSQL_ROOT_PASSWORD ?? "";
+      const db = svc.env.MYSQL_DATABASE ?? "";
+      const port = svc.port ?? 3306;
+      env.MYSQL_HOST = host;
+      env.MYSQL_PORT = String(port);
+      env.MYSQL_USER = "root";
+      env.MYSQL_PASSWORD = pass;
+      env.MYSQL_DATABASE = db;
+      if (env.DATABASE_URL === void 0) {
+        env.DATABASE_URL = `mysql://root:${pass}@${host}:${port}/${db}`;
+      }
+    } else if (svc.name === "redis") {
+      const port = svc.port ?? 6379;
+      env.REDIS_URL = `redis://${host}:${port}`;
+    }
+  }
+  return env;
+}
 function deriveServiceName(image) {
   const lastSegment = image.split("/").pop() ?? image;
   const noTag = lastSegment.split("@")[0].split(":")[0];
@@ -2438,6 +2473,14 @@ function buildComposeYaml(opts, dockerMode = "rootful") {
   for (const v of ideVolumes) {
     lines.push(`      - ${v.volume}:${v.target}`);
   }
+  const wsEnv = serviceConnectionEnv(opts.services);
+  const wsEnvKeys = Object.keys(wsEnv);
+  if (wsEnvKeys.length > 0) {
+    lines.push("    environment:");
+    for (const k of wsEnvKeys) {
+      lines.push(`      ${k}: ${composeScalar(wsEnv[k])}`);
+    }
+  }
   for (const svc of opts.services) {
     lines.push(`  ${svc.name}:`);
     lines.push(`    image: ${svc.image}`);
@@ -3216,8 +3259,8 @@ function removeRepoFromDoc(doc, urlOrPath) {
     if (!isMap2(item)) return false;
     const url = item.get("url");
     if (url === urlOrPath) return true;
-    const path23 = item.get("path");
-    const effectivePath = typeof path23 === "string" ? path23 : typeof url === "string" ? deriveRepoName(url) : void 0;
+    const path24 = item.get("path");
+    const effectivePath = typeof path24 === "string" ? path24 : typeof url === "string" ? deriveRepoName(url) : void 0;
     return effectivePath === urlOrPath;
   });
   if (idx < 0) return false;
@@ -3329,7 +3372,7 @@ async function runAddRepo(input) {
       "Missing repo URL. Usage: monoceros add-repo <containername> <url>."
     );
   }
-  const path23 = (input.path ?? deriveRepoName(url)).trim();
+  const path24 = (input.path ?? deriveRepoName(url)).trim();
   const hasName = typeof input.gitName === "string" && input.gitName.trim().length > 0;
   const hasEmail = typeof input.gitEmail === "string" && input.gitEmail.trim().length > 0;
   if (hasName !== hasEmail) {
@@ -3366,7 +3409,7 @@ async function runAddRepo(input) {
   const providerToWrite = !canonical && explicitProvider ? explicitProvider : void 0;
   const entry2 = {
     url,
-    path: path23,
+    path: path24,
     ...hasName && hasEmail ? {
       gitUser: {
         name: input.gitName.trim(),
@@ -4767,22 +4810,42 @@ function generateAgentsMd(input) {
       lines.push(formatServiceLine(svc));
     }
     lines.push("");
-    lines.push(
-      "Credentials for these services are intentionally not stored in this",
-      "file. If you need to connect from code or from the command line, ask",
-      "the user in the current chat; they will paste the values directly.",
-      "Do not commit credentials provided this way into any file in the",
-      "repo \u2014 they belong in the user's `.env` on the host, not in source",
-      "control."
-    );
+    const connEnv = serviceConnectionEnv(input.services);
+    if (Object.keys(connEnv).length > 0) {
+      lines.push(
+        "Connection details for the curated services above are already set as",
+        "environment variables in this container. Read them from the",
+        "environment \u2014 do not ask the user for credentials, and do not",
+        "hardcode them:"
+      );
+      lines.push("");
+      if (connEnv.DATABASE_URL !== void 0) {
+        lines.push(
+          "- `DATABASE_URL` \u2014 the SQL database. Engine-specific variables are",
+          "  set too (`PGHOST`/`PGPORT`/`PGUSER`/`PGPASSWORD`/`PGDATABASE` for",
+          "  Postgres, `MYSQL_*` for MySQL)."
+        );
+      }
+      if (connEnv.REDIS_URL !== void 0) {
+        lines.push("- `REDIS_URL` \u2014 Redis.");
+      }
+      lines.push("");
+      lines.push(
+        "These are dev-only defaults for the local container, fine to use",
+        "directly. Prefer reading the variable (e.g. `process.env.DATABASE_URL`)",
+        "over copying its value into code."
+      );
+    }
     const hasCustom = input.services.some((s) => !isCuratedService(s.name));
     if (hasCustom) {
       lines.push("");
       lines.push(
         "For custom-image services, Monoceros does not know the service's",
-        "configuration (env vars, ports beyond the primary one, required",
-        "volumes). Treat such a service as a black box reachable at the",
-        "listed address; if you need more, ask the user."
+        "configuration or credentials (env vars, ports beyond the primary one,",
+        "required volumes). Treat such a service as a black box reachable at",
+        "the listed address; if you need to connect, ask the user in the",
+        "current chat. Do not commit credentials into the repo \u2014 they belong",
+        "in the user's `.env` on the host."
       );
     }
     lines.push("");
@@ -4866,6 +4929,54 @@ 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),",
+      "start it as a **detached** background process so it keeps running after",
+      "this session ends. A plain `npm start` (or any foreground start) dies",
+      "the moment the user exits you or closes the terminal \u2014 and then",
+      `\`${input.containerName}.localhost\` returns 502 Bad Gateway.`
+    );
+    lines.push("");
+    lines.push(
+      "Launch it in a new session with `setsid`, using the project's own",
+      "start command, and record the process-group PID + log under the",
+      "container's logs directory:"
+    );
+    lines.push("");
+    lines.push("```");
+    lines.push(
+      `setsid sh -c 'echo $$ >/workspaces/${input.containerName}/logs/<app>.pid; \\`
+    );
+    lines.push(
+      `  exec <the project's start command> >/workspaces/${input.containerName}/logs/<app>.log 2>&1' </dev/null &`
+    );
+    lines.push("```");
+    lines.push("");
+    lines.push(
+      "Use whatever start command the project actually uses (`npm start`,",
+      "`./mvnw spring-boot:run`, `python app.py`, `go run .`, \u2026) \u2014 do not force",
+      "a language-specific one. `<app>` is a short name you choose."
+    );
+    lines.push("");
+    lines.push("To stop it, kill the whole process group (also stops children");
+    lines.push("like node under npm or java under maven):");
+    lines.push("");
+    lines.push("```");
+    lines.push(
+      `kill -TERM -$(cat /workspaces/${input.containerName}/logs/<app>.pid)`
+    );
+    lines.push("```");
+    lines.push("");
+    lines.push(
+      `The user can follow the output with \`monoceros logs ${input.containerName} <app>\``,
+      "on the host. The server must listen on `0.0.0.0` (not `127.0.0.1`) on",
+      "the exposed port, or Traefik cannot reach it."
+    );
+    lines.push("");
+  }
   lines.push("## Command reference");
   lines.push("");
   lines.push(
@@ -5373,10 +5484,12 @@ var init_cli = __esm({
     cachedBinaryPath = null;
     spawnDevcontainer = (args, cwd, options = {}) => {
       const binPath = devcontainerCliPath();
+      const env = { ...process.env, DOCKER_CLI_HINTS: "false" };
       return new Promise((resolve, reject) => {
         if (options.interactive) {
           const child2 = spawn4(process.execPath, [binPath, ...args], {
             cwd,
+            env,
             stdio: "inherit"
           });
           child2.on("error", reject);
@@ -5385,6 +5498,7 @@ var init_cli = __esm({
         }
         const child = spawn4(process.execPath, [binPath, ...args], {
           cwd,
+          env,
           stdio: ["ignore", "pipe", "pipe"]
         });
         if (options.quiet) {
@@ -6293,7 +6407,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.18.0" : "dev";
+    CLI_VERSION = true ? "1.19.1" : "dev";
   }
 });
 
@@ -7931,7 +8045,6 @@ exit 0
   const servers = [];
   let handledUrl = false;
   const onAuthUrl = (authUrl) => {
-    consola16.info("Opening the Claude sign-in page in your browser\u2026");
     openInBrowser(authUrl);
     const target = parseCallbackTarget(authUrl);
     if (!target) {
@@ -7977,9 +8090,7 @@ exit 0
     handledUrl = true;
     onAuthUrl(content.trim());
   }, 250);
-  consola16.info(
-    "Starting Claude login. Pick your account in Claude's menu \u2014 the browser opens for you, no copying."
-  );
+  consola16.info("Logging in to Claude \u2014 a browser window will open for you.");
   const child = spawn8(
     process.execPath,
     [
@@ -7990,9 +8101,13 @@ exit 0
       "--mount-workspace-git-root=false",
       "bash",
       "-lc",
-      `export PATH="/workspaces/${name}/${RELAY_DIRNAME}:$PATH"; exec claude`
+      `export PATH="/workspaces/${name}/${RELAY_DIRNAME}:$PATH"; exec claude auth login`
     ],
-    { cwd: root, stdio: "inherit" }
+    {
+      cwd: root,
+      env: { ...process.env, DOCKER_CLI_HINTS: "false" },
+      stdio: "inherit"
+    }
   );
   const code = await new Promise((resolve) => {
     child.on("error", () => resolve(1));
@@ -8064,7 +8179,18 @@ var init_login2 = __esm({
 });
 
 // src/commands/logs.ts
+import { spawn as spawn9 } from "child_process";
+import { existsSync as existsSync12 } from "fs";
+import path20 from "path";
 import { defineCommand as defineCommand14 } from "citty";
+function tailLogFile(file, follow) {
+  const [cmd, args] = follow ? ["tail", ["-F", file]] : ["cat", [file]];
+  return new Promise((resolve, reject) => {
+    const child = spawn9(cmd, args, { stdio: "inherit" });
+    child.on("error", reject);
+    child.on("exit", (code) => resolve(code ?? 0));
+  });
+}
 var logsCommand;
 var init_logs = __esm({
   "src/commands/logs.ts"() {
@@ -8076,7 +8202,7 @@ var init_logs = __esm({
       meta: {
         name: "logs",
         group: "run",
-        description: "Tail logs from the compose services of the named dev-container. Pass --no-follow for a one-shot dump."
+        description: "Tail logs from a compose service of the named dev-container, or from a long-running app started inside it (logs/<app>.log). Pass --no-follow for a one-shot dump."
       },
       args: {
         name: {
@@ -8086,7 +8212,7 @@ var init_logs = __esm({
         },
         service: {
           type: "string",
-          description: "Restrict to a single compose service (e.g. postgres). Defaults to all."
+          description: "A compose service (e.g. postgres) or an app whose log is at logs/<service>.log. Defaults to all compose services."
         },
         follow: {
           type: "boolean",
@@ -8096,10 +8222,17 @@ var init_logs = __esm({
         }
       },
       run({ args }) {
+        const service = typeof args.service === "string" ? args.service : void 0;
+        if (service) {
+          const logFile = path20.join(containerLogsDir(args.name), `${service}.log`);
+          if (existsSync12(logFile)) {
+            return dispatch(() => tailLogFile(logFile, args.follow));
+          }
+        }
         return dispatch(
           () => runLogs({
             root: containerDir(args.name),
-            ...typeof args.service === "string" ? { service: args.service } : {},
+            ...service ? { service } : {},
             follow: args.follow
           })
         );
@@ -8299,8 +8432,8 @@ var init_remove_feature = __esm({
 });
 
 // src/remove/index.ts
-import { existsSync as existsSync12, promises as fs15 } from "fs";
-import path20 from "path";
+import { existsSync as existsSync13, promises as fs15 } from "fs";
+import path21 from "path";
 import { consola as consola21 } from "consola";
 async function runRemove(opts) {
   const home = opts.monocerosHome ?? monocerosHome();
@@ -8317,9 +8450,9 @@ async function runRemove(opts) {
   const ymlPath = containerConfigPath(opts.name, home);
   const envPath = containerEnvPath(opts.name, home);
   const containerPath = containerDir(opts.name, home);
-  const hasYml = existsSync12(ymlPath);
-  const hasEnv = existsSync12(envPath);
-  const hasContainer = existsSync12(containerPath);
+  const hasYml = existsSync13(ymlPath);
+  const hasEnv = existsSync13(envPath);
+  const hasContainer = existsSync13(containerPath);
   if (!hasYml && !hasContainer) {
     throw new Error(
       `Nothing to remove for '${opts.name}': neither ${ymlPath} nor ${containerPath} exists.`
@@ -8345,16 +8478,16 @@ async function runRemove(opts) {
   let backupPath = null;
   if (!opts.noBackup && (hasYml || hasContainer)) {
     const ts = (opts.now ?? /* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-    backupPath = path20.join(home, "container-backups", `${opts.name}-${ts}`);
+    backupPath = path21.join(home, "container-backups", `${opts.name}-${ts}`);
     await fs15.mkdir(backupPath, { recursive: true });
     if (hasYml) {
-      await fs15.copyFile(ymlPath, path20.join(backupPath, `${opts.name}.yml`));
+      await fs15.copyFile(ymlPath, path21.join(backupPath, `${opts.name}.yml`));
     }
     if (hasEnv) {
-      await fs15.copyFile(envPath, path20.join(backupPath, `${opts.name}.env`));
+      await fs15.copyFile(envPath, path21.join(backupPath, `${opts.name}.env`));
     }
     if (hasContainer) {
-      await fs15.cp(containerPath, path20.join(backupPath, "container"), {
+      await fs15.cp(containerPath, path21.join(backupPath, "container"), {
         recursive: true
       });
     }
@@ -8514,8 +8647,8 @@ var init_remove2 = __esm({
 });
 
 // src/restore/index.ts
-import { existsSync as existsSync13, promises as fs16 } from "fs";
-import path21 from "path";
+import { existsSync as existsSync14, promises as fs16 } from "fs";
+import path22 from "path";
 import { consola as consola23 } from "consola";
 async function runRestore(opts) {
   const home = opts.monocerosHome ?? monocerosHome();
@@ -8523,8 +8656,8 @@ async function runRestore(opts) {
     info: (msg) => consola23.info(msg),
     success: (msg) => consola23.success(msg)
   };
-  const backup = path21.resolve(opts.backupPath);
-  if (!existsSync13(backup)) {
+  const backup = path22.resolve(opts.backupPath);
+  if (!existsSync14(backup)) {
     throw new Error(`Backup not found: ${backup}.`);
   }
   const stat = await fs16.stat(backup);
@@ -8545,24 +8678,24 @@ async function runRestore(opts) {
   }
   const ymlFile = ymlFiles[0];
   const name = ymlFile.replace(/\.yml$/, "");
-  const containerInBackup = path21.join(backup, "container");
-  const hasContainer = existsSync13(containerInBackup);
-  const envInBackup = path21.join(backup, `${name}.env`);
-  const hasEnv = existsSync13(envInBackup);
+  const containerInBackup = path22.join(backup, "container");
+  const hasContainer = existsSync14(containerInBackup);
+  const envInBackup = path22.join(backup, `${name}.env`);
+  const hasEnv = existsSync14(envInBackup);
   const destYml = containerConfigPath(name, home);
   const destContainer = containerDir(name, home);
-  if (existsSync13(destYml)) {
+  if (existsSync14(destYml)) {
     throw new Error(
       `Refusing to restore: ${destYml} already exists. Remove the current container first (\`monoceros remove ${name}\`) or rename the existing config.`
     );
   }
-  if (hasContainer && existsSync13(destContainer)) {
+  if (hasContainer && existsSync14(destContainer)) {
     throw new Error(
       `Refusing to restore: ${destContainer} already exists. Remove the current container first (\`monoceros remove ${name}\`).`
     );
   }
   await fs16.mkdir(containerConfigsDir(home), { recursive: true });
-  await fs16.copyFile(path21.join(backup, ymlFile), destYml);
+  await fs16.copyFile(path22.join(backup, ymlFile), destYml);
   if (hasEnv) {
     await fs16.copyFile(envInBackup, containerEnvPath(name, home));
   }
@@ -9143,11 +9276,11 @@ var init_stop = __esm({
 });
 
 // src/tunnel/resolve.ts
-import { existsSync as existsSync14 } from "fs";
-import path22 from "path";
+import { existsSync as existsSync15 } from "fs";
+import path23 from "path";
 async function resolveTunnelTarget(opts) {
   const ymlPath = containerConfigPath(opts.name, opts.monocerosHome);
-  if (!existsSync14(ymlPath)) {
+  if (!existsSync15(ymlPath)) {
     throw new Error(
       `No yml profile for '${opts.name}' at ${ymlPath}. Run \`monoceros init ${opts.name}\` first.`
     );
@@ -9155,13 +9288,13 @@ async function resolveTunnelTarget(opts) {
   const parsed = await readConfig(ymlPath);
   const config = parsed.config;
   const containerRoot = containerDir(opts.name, opts.monocerosHome);
-  if (!existsSync14(containerRoot)) {
+  if (!existsSync15(containerRoot)) {
     throw new Error(
       `Container '${opts.name}' is not materialised at ${containerRoot}. Run \`monoceros apply ${opts.name}\` first.`
     );
   }
-  const composePath = path22.join(containerRoot, ".devcontainer", "compose.yaml");
-  const isCompose = existsSync14(composePath);
+  const composePath = path23.join(containerRoot, ".devcontainer", "compose.yaml");
+  const isCompose = existsSync15(composePath);
   const parsedTarget = parseTargetArg(opts.target, config);
   const docker = opts.docker ?? defaultDockerExec;
   if (isCompose) {
@@ -9396,7 +9529,7 @@ var init_port_check2 = __esm({
 });
 
 // src/tunnel/run.ts
-import { spawn as spawn9 } from "child_process";
+import { spawn as spawn10 } from "child_process";
 import { consola as consola34 } from "consola";
 function signalNumber(signal) {
   switch (signal) {
@@ -9486,7 +9619,7 @@ var init_run3 = __esm({
     init_port_check2();
     SOCAT_IMAGE = "alpine/socat:1.8.0.3";
     defaultDockerSpawn = (args) => {
-      const child = spawn9("docker", args, {
+      const child = spawn10("docker", args, {
         stdio: "inherit"
       });
       const exited = new Promise((resolve, reject) => {
@@ -9580,7 +9713,7 @@ var init_tunnel = __esm({
 });
 
 // src/upgrade/index.ts
-import { existsSync as existsSync15, promises as fs17 } from "fs";
+import { existsSync as existsSync16, promises as fs17 } from "fs";
 import { consola as consola36 } from "consola";
 async function fetchRuntimeVersions() {
   const tokenUrl = `https://ghcr.io/token?service=ghcr.io&scope=repository:${RUNTIME_REPO}:pull`;
@@ -9639,7 +9772,7 @@ async function runUpgrade(opts) {
     );
   }
   const ymlPath = containerConfigPath(opts.name, home);
-  if (!existsSync15(ymlPath)) {
+  if (!existsSync16(ymlPath)) {
     throw new Error(
       `No such config: ${ymlPath}. Run \`monoceros init <template> ${opts.name}\` first.`
     );
@@ -10071,25 +10204,25 @@ function detectHelpRequest(argv, main2) {
   const separatorIdx = argv.indexOf("--");
   if (helpIdx === -1) return null;
   if (separatorIdx !== -1 && separatorIdx < helpIdx) return null;
-  const path23 = [];
+  const path24 = [];
   const tokens = argv.slice(
     0,
     separatorIdx === -1 ? argv.length : separatorIdx
   );
   let cursor = main2;
   const mainName = (main2.meta ?? {}).name ?? "monoceros";
-  path23.push(mainName);
+  path24.push(mainName);
   for (const tok of tokens) {
     if (tok.startsWith("-")) continue;
     const subs = cursor.subCommands ?? {};
     if (tok in subs) {
       cursor = subs[tok];
-      path23.push(tok);
+      path24.push(tok);
       continue;
     }
     break;
   }
-  return { path: path23, cmd: cursor };
+  return { path: path24, cmd: cursor };
 }
 async function maybeRenderHelp(argv, main2) {
   const hit = detectHelpRequest(argv, main2);