@getmonoceros/workbench 1.16.0 → 1.16.2

package/dist/bin.js

@@ -1831,6 +1831,8 @@ var init_port_check = __esm({
 });
 
 // src/create/catalog.ts
+import "fs";
+import "url";
 function resolveRuntimeImage(version) {
   const ov = process.env.MONOCEROS_BASE_IMAGE_OVERRIDE?.trim();
   if (ov && ov.length > 0) return ov;
@@ -1914,7 +1916,12 @@ var init_catalog = __esm({
     override = process.env.MONOCEROS_BASE_IMAGE_OVERRIDE?.trim();
     BASE_IMAGE = override && override.length > 0 ? override : DEFAULT_BASE_IMAGE;
     RUNTIME_IMAGE_REPO = "ghcr.io/getmonoceros/monoceros-runtime";
-    DEFAULT_RUNTIME_VERSION = "1.1.0";
+    DEFAULT_RUNTIME_VERSION = true ? "1.1.0" : readFileSync3(
+      fileURLToPath2(
+        new URL("../../../../images/runtime/VERSION", import.meta.url)
+      ),
+      "utf8"
+    ).trim();
     MIN_RUNTIME_FOR_IDE_VOLUMES = "1.1.0";
     BUILTIN_LANGUAGES = /* @__PURE__ */ new Set(["node"]);
     LANGUAGE_CATALOG = {
@@ -2057,7 +2064,7 @@ var init_service_doc = __esm({
 });
 
 // src/create/scaffold.ts
-import { existsSync as existsSync5, readFileSync as readFileSync3, promises as fs7 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync4, promises as fs7 } from "fs";
 import path8 from "path";
 function deriveRepoName(url) {
   const lastSep = Math.max(url.lastIndexOf("/"), url.lastIndexOf(":"));
@@ -2219,17 +2226,25 @@ function resolveFeatures(opts) {
         const checkout = workbenchCheckoutRoot();
         const localSourceDir = checkout ? path8.join(checkout, "images", "features", name) : null;
         if (localSourceDir && existsSync5(localSourceDir)) {
-          const { paths, files } = readPersistentHomeEntries(localSourceDir);
+          const { paths: paths2, files: files2 } = readPersistentHomeEntries(localSourceDir);
           resolved.push({
             devcontainerKey: `./features/${name}`,
             options,
             localSourceDir,
             localName: name,
-            persistentHomePaths: paths,
-            persistentHomeFiles: files
+            persistentHomePaths: paths2,
+            persistentHomeFiles: files2
           });
           continue;
         }
+        const { paths, files } = readBundledPersistentHomeEntries(name);
+        resolved.push({
+          devcontainerKey: rawRef,
+          options,
+          persistentHomePaths: paths,
+          persistentHomeFiles: files
+        });
+        continue;
       }
       resolved.push({
         devcontainerKey: rawRef,
@@ -2244,7 +2259,7 @@ function resolveFeatures(opts) {
 function readPersistentHomeEntries(localSourceDir) {
   const manifestPath = path8.join(localSourceDir, "devcontainer-feature.json");
   try {
-    const text = readFileSync3(manifestPath, "utf8");
+    const text = readFileSync4(manifestPath, "utf8");
     const parsed = JSON.parse(text);
     return {
       paths: filterSubpaths(parsed["x-monoceros"]?.persistentHomePaths),
@@ -2254,6 +2269,13 @@ function readPersistentHomeEntries(localSourceDir) {
     return { paths: [], files: [] };
   }
 }
+function readBundledPersistentHomeEntries(name) {
+  try {
+    return readPersistentHomeEntries(path8.join(bundledFeaturesDir(), name));
+  } catch {
+    return { paths: [], files: [] };
+  }
+}
 function filterSubpaths(raw) {
   if (!Array.isArray(raw)) return [];
   return raw.filter(
@@ -4598,12 +4620,22 @@ var init_apply_progress = __esm({
     FRAME_INTERVAL_MS = 80;
     TAIL_LINES = 15;
     PHASE_TRIGGERS = [
-      // Compose mode triggers a feature/layer build before the container
-      // is created — distinct phase, often the longest single step.
-      { pattern: /Start: Run: docker build/i, label: "building feature layers\u2026" },
-      // Image mode jumps straight from "preparing…" into the docker run
-      // that pulls (if needed) + creates + starts the container.
-      { pattern: /Start: Run: docker run/i, label: "starting container\u2026" },
+      // Feature/layer build — distinct phase, often the longest single
+      // step. Image mode runs `docker build`; compose mode runs
+      // `docker compose … build <services>`. We match the build *subcommand*
+      // (a space-delimited ` build`), NOT the substring — the compose `up`
+      // line below carries `-f …devcontainer.build-<n>.yml` and would
+      // otherwise false-match here and swallow the "starting" phase.
+      {
+        pattern: /Start: Run: docker (?:build\b|compose\b.* build\b)/i,
+        label: "building feature layers\u2026"
+      },
+      // Container create/start. Image mode: `docker run` (pulls if needed,
+      // creates, starts). Compose mode: `docker compose … up -d <services>`.
+      {
+        pattern: /Start: Run: docker (?:run\b|compose\b.* up\b)/i,
+        label: "starting container\u2026"
+      },
       { pattern: /Running the postCreateCommand/i, label: "running postCreate\u2026" }
     ];
   }
@@ -5311,13 +5343,13 @@ var init_runtime_pull_hint = __esm({
 
 // src/devcontainer/cli.ts
 import { spawn as spawn4 } from "child_process";
-import { readFileSync as readFileSync4 } from "fs";
+import { readFileSync as readFileSync5 } from "fs";
 import { createRequire } from "module";
 import path13 from "path";
 function devcontainerCliPath() {
   if (cachedBinaryPath) return cachedBinaryPath;
   const pkgJsonPath = require_.resolve("@devcontainers/cli/package.json");
-  const pkg = JSON.parse(readFileSync4(pkgJsonPath, "utf8"));
+  const pkg = JSON.parse(readFileSync5(pkgJsonPath, "utf8"));
   const binEntry = typeof pkg.bin === "string" ? pkg.bin : pkg.bin?.devcontainer ?? "";
   if (!binEntry) {
     throw new Error("Could not resolve @devcontainers/cli bin entry.");
@@ -6255,7 +6287,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.16.0" : "dev";
+    CLI_VERSION = true ? "1.16.2" : "dev";
   }
 });