@getmonoceros/workbench 1.24.1 → 1.25.0

package/bundled-components/services/mysql/component.yml

@@ -23,12 +23,12 @@ service:
     retries: 5
   vscodeExtensions: [cweijan.vscode-database-client2]
   connectionEnv:
-    MYSQL_HOST: ${host}
-    MYSQL_PORT: ${port}
-    MYSQL_USER: root
-    MYSQL_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-    MYSQL_DATABASE: ${MYSQL_DATABASE}
-    DATABASE_URL: mysql://root:${MYSQL_ROOT_PASSWORD}@${host}:${port}/${MYSQL_DATABASE}
+    URL: mysql://root:${MYSQL_ROOT_PASSWORD}@${host}:${port}/${MYSQL_DATABASE}
+    HOST: ${host}
+    PORT: ${port}
+    USER: root
+    PASSWORD: ${MYSQL_ROOT_PASSWORD}
+    DB: ${MYSQL_DATABASE}
 options:
   MYSQL_ROOT_PASSWORD:
     type: string

package/bundled-components/services/postgres/component.yml

@@ -13,12 +13,12 @@ service:
     retries: 5
   vscodeExtensions: [cweijan.vscode-database-client2]
   connectionEnv:
-    PGHOST: ${host}
-    PGPORT: ${port}
-    PGUSER: ${POSTGRES_USER}
-    PGPASSWORD: ${POSTGRES_PASSWORD}
-    PGDATABASE: ${POSTGRES_DB}
-    DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${host}:${port}/${POSTGRES_DB}
+    URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${host}:${port}/${POSTGRES_DB}
+    HOST: ${host}
+    PORT: ${port}
+    USER: ${POSTGRES_USER}
+    PASSWORD: ${POSTGRES_PASSWORD}
+    DB: ${POSTGRES_DB}
 options:
   POSTGRES_USER:
     type: string

package/bundled-components/services/redis/component.yml

@@ -13,4 +13,6 @@ service:
     retries: 5
   vscodeExtensions: [cweijan.vscode-database-client2]
   connectionEnv:
-    REDIS_URL: redis://${host}:${port}
+    URL: redis://${host}:${port}
+    HOST: ${host}
+    PORT: ${port}

package/dist/bin.js

@@ -203,7 +203,13 @@ var init_schema = __esm({
       ).optional(),
       healthcheck: ServiceHealthcheckSchema.optional(),
       restart: z.enum(SERVICE_RESTART_VALUES).optional(),
-      command: z.string().optional()
+      command: z.string().optional(),
+      // Connection-env templates keyed by logical SUFFIX (URL/HOST/PORT/USER/
+      // PASSWORD/DB). Baked in by `expandCuratedService`; emitted into the
+      // workspace as `<UPPER(name)>_<SUFFIX>` at apply (ADR 0021). `${host}`/
+      // `${port}`/`${<OPTION>}` are render tokens, NOT `.env` placeholders, and
+      // are left untouched by `interpolateServices`.
+      connectionEnv: z.record(z.string(), z.string()).optional()
     });
     ExternalServicesSchema = z.object({
       postgres: z.string().regex(
@@ -261,6 +267,18 @@ var init_schema = __esm({
       git: z.object({
         user: GitUserSchema.optional()
       }).optional()
+    }).superRefine((cfg, ctx) => {
+      const seen = /* @__PURE__ */ new Set();
+      cfg.services.forEach((svc, i) => {
+        if (seen.has(svc.name)) {
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["services", i, "name"],
+            message: `Duplicate service name '${svc.name}'. Service names must be unique (use \`add-service \u2026 --as <name>\` to add a second instance of the same image).`
+          });
+        }
+        seen.add(svc.name);
+      });
     });
   }
 });
@@ -711,13 +729,15 @@ var init_descriptor = __esm({
       dataMount: z2.string().optional(),
       healthcheck: HealthcheckSchema.optional(),
       /**
-       * Connection env vars injected into the WORKSPACE container so the app /
-       * agent can reach this service without hardcoding anything. Keyed by env
-       * var name → a template value. Tokens: `${host}` (the service hostname),
-       * `${port}` (the service's port, falling back to `defaultPort`), and
-       * `${<OPTION>}` (any of the service's own option values, e.g.
-       * `${POSTGRES_USER}`). Example:
-       *   DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${host}:${port}/${POSTGRES_DB}
+       * Connection env injected into the WORKSPACE container so the app / agent
+       * can reach this service without hardcoding anything. Keyed by logical
+       * SUFFIX → template; emitted at apply as `<UPPER(name)>_<SUFFIX>` per
+       * service instance (ADR 0021), e.g. suffix `URL` on a service named
+       * `postgres` → `POSTGRES_URL`. Tokens: `${host}` (the service's instance
+       * name), `${port}` (its port, falling back to `defaultPort`), and
+       * `${<OPTION>}` (its own option values, e.g. `${POSTGRES_USER}`). Example:
+       *   URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${host}:${port}/${POSTGRES_DB}
+       *   HOST: ${host}
        */
       connectionEnv: z2.record(z2.string(), z2.string()).optional(),
       vscodeExtensions: z2.array(z2.string()).optional()
@@ -2149,7 +2169,8 @@ function resolveService(entry2) {
     volumes: entry2.volumes ? [...entry2.volumes] : [],
     ...entry2.healthcheck ? { healthcheck: entry2.healthcheck } : {},
     ...entry2.restart ? { restart: entry2.restart } : {},
-    ...entry2.command ? { command: entry2.command } : {}
+    ...entry2.command ? { command: entry2.command } : {},
+    ...entry2.connectionEnv ? { connectionEnv: { ...entry2.connectionEnv } } : {}
   };
 }
 function isCuratedService(name) {
@@ -2173,6 +2194,10 @@ function expandCuratedService(name) {
     } : {},
     ...def.dataMount ? { volumes: [`data:${def.dataMount}`] } : {},
     ...def.healthcheck ? { healthcheck: def.healthcheck } : {},
+    // Bake the connection-env templates into the yml (suffix → template) so
+    // they travel with the service: a renamed/duplicated instance keeps them,
+    // and `serviceConnectionEnv` prefixes by the instance's current name.
+    ...def.connectionEnv ? { connectionEnv: { ...def.connectionEnv } } : {},
     restart: "unless-stopped"
   };
 }
@@ -2183,17 +2208,18 @@ function curatedServiceEnvDefaults(name) {
 function serviceConnectionEnv(services) {
   const env = {};
   for (const svc of services) {
-    const def = SERVICE_CATALOG[svc.name];
-    if (!def?.connectionEnv) continue;
+    const conn = svc.connectionEnv;
+    if (!conn || Object.keys(conn).length === 0) continue;
+    const prefix = svc.name.replace(/[^A-Za-z0-9]+/g, "_").toUpperCase();
     const host = svc.name;
-    const port = String(svc.port ?? def.defaultPort);
+    const port = svc.port !== void 0 ? String(svc.port) : "";
     const fill = (template) => template.replace(/\$\{([A-Za-z0-9_]+)\}/g, (_, token) => {
       if (token === "host") return host;
       if (token === "port") return port;
       return svc.env[token] ?? "";
     });
-    for (const [key, template] of Object.entries(def.connectionEnv)) {
-      env[key] = fill(template);
+    for (const [suffix, template] of Object.entries(conn)) {
+      env[`${prefix}_${suffix}`] = fill(template);
     }
   }
   return env;
@@ -5405,29 +5431,30 @@ function generateAgentsMd(input) {
     }
     lines.push("");
     const connEnv = serviceConnectionEnv(input.services);
-    if (Object.keys(connEnv).length > 0) {
+    const connUrlKeys = Object.keys(connEnv).filter((k) => k.endsWith("_URL"));
+    if (connUrlKeys.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:"
+        "Connection details for the curated services above are set as",
+        "environment variables in this container \u2014 one set per service, prefixed",
+        "with the (uppercased) service name. Read them from the environment; do",
+        "not ask the user for credentials and do not hardcode them. The URLs:"
       );
       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.");
+      for (const k of connUrlKeys) {
+        lines.push(`- \`${k}\``);
       }
       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."
+        "Each service also exposes `<SERVICE>_HOST`, `<SERVICE>_PORT` and, for SQL",
+        "databases, `<SERVICE>_USER` / `<SERVICE>_PASSWORD` / `<SERVICE>_DB`. These",
+        "are dev-only defaults for the local container, fine to read directly."
+      );
+      lines.push("");
+      lines.push(
+        "There is deliberately **no** bare `DATABASE_URL` (multiple databases",
+        "would collide on it). If a framework or tool defaults to `DATABASE_URL`,",
+        "set it in the project's `.env` to the right service URL, e.g.",
+        "`DATABASE_URL=$POSTGRES_URL`."
       );
     }
     const hasCustom = input.services.some((s) => !isCuratedService(s.name));
@@ -7233,7 +7260,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.24.1" : "dev";
+    CLI_VERSION = true ? "1.25.0" : "dev";
   }
 });
 
@@ -9610,6 +9637,24 @@ function nextRelayUrl(content, lastOpened) {
   const url = content.trim();
   return url && url !== lastOpened ? url : null;
 }
+function wrapExec(command, opts) {
+  const leading = [];
+  const stmts = [];
+  if (opts.pathPrepend) {
+    leading.push(opts.pathPrepend);
+    const i = leading.length;
+    stmts.push(`export PATH="$${i}:$PATH"`);
+    stmts.push(`export BROWSER="$${i}/xdg-open"`);
+  }
+  if (opts.cwd) {
+    leading.push(opts.cwd);
+    stmts.push(`cd -- "$${leading.length}"`);
+  }
+  if (leading.length === 0) return command;
+  const shift = leading.length === 1 ? "shift" : `shift ${leading.length}`;
+  const script = `${stmts.join(" && ")} && ${shift} && exec "$@"`;
+  return ["bash", "-lc", script, "bash", ...leading, ...command];
+}
 function openInBrowser(url) {
   const platform = process.platform;
   const [cmd, args] = platform === "darwin" ? ["open", [url]] : platform === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
@@ -9755,17 +9800,28 @@ async function runShell(opts) {
     { quiet: true }
   );
   if (upCode !== 0) return upCode;
-  return spawnFn(
-    [
-      "exec",
-      "--workspace-folder",
+  const name = opts.name ?? path26.basename(opts.root);
+  const isTty2 = opts.isTty ?? process.stdout.isTTY;
+  const bridge = isTty2 ? await startBrowserBridge({ name, root: opts.root, spawn: spawnFn }) : null;
+  try {
+    const innerExec = wrapExec(
+      ["bash"],
+      bridge ? { pathPrepend: bridge.relayDirInContainer } : {}
+    );
+    return await spawnFn(
+      [
+        "exec",
+        "--workspace-folder",
+        opts.root,
+        "--mount-workspace-git-root=false",
+        ...innerExec
+      ],
       opts.root,
-      "--mount-workspace-git-root=false",
-      "bash"
-    ],
-    opts.root,
-    { interactive: true }
-  );
+      { interactive: true }
+    );
+  } finally {
+    if (bridge) await bridge.dispose();
+  }
 }
 function assertContainerExists(root) {
   if (!existsSync17(path26.join(root, ".devcontainer"))) {
@@ -9777,29 +9833,12 @@ function assertContainerExists(root) {
 var init_shell = __esm({
   "src/devcontainer/shell.ts"() {
     "use strict";
+    init_browser_bridge();
     init_cli();
   }
 });
 
 // src/devcontainer/run.ts
-function wrapExec(command, opts) {
-  const leading = [];
-  const stmts = [];
-  if (opts.pathPrepend) {
-    leading.push(opts.pathPrepend);
-    const i = leading.length;
-    stmts.push(`export PATH="$${i}:$PATH"`);
-    stmts.push(`export BROWSER="$${i}/xdg-open"`);
-  }
-  if (opts.cwd) {
-    leading.push(opts.cwd);
-    stmts.push(`cd -- "$${leading.length}"`);
-  }
-  if (leading.length === 0) return command;
-  const shift = leading.length === 1 ? "shift" : `shift ${leading.length}`;
-  const script = `${stmts.join(" && ")} && ${shift} && exec "$@"`;
-  return ["bash", "-lc", script, "bash", ...leading, ...command];
-}
 async function runInContainer(opts) {
   if (opts.command.length === 0) {
     throw new Error(
@@ -9932,7 +9971,10 @@ var init_shell2 = __esm({
       },
       async run({ args }) {
         try {
-          const exitCode = await runShell({ root: containerDir(args.name) });
+          const exitCode = await runShell({
+            root: containerDir(args.name),
+            name: args.name
+          });
           process.exit(exitCode);
         } catch (err) {
           consola30.error(err instanceof Error ? err.message : String(err));