@getmonoceros/workbench 1.16.1 → 1.17.0

package/dist/bin.js

@@ -2191,6 +2191,12 @@ function normalizeOptions(opts) {
 function needsCompose(opts) {
   return opts.services.length > 0;
 }
+function featuresSourceRoot() {
+  const override2 = process.env.MONOCEROS_FEATURES_DIR_OVERRIDE?.trim();
+  if (override2 && override2.length > 0) return override2;
+  const checkout = workbenchCheckoutRoot();
+  return checkout ? path8.join(checkout, "images", "features") : null;
+}
 function resolveFeatures(opts) {
   const resolved = [];
   for (const langSpec of opts.languages) {
@@ -2223,20 +2229,28 @@ function resolveFeatures(opts) {
       const match = matchMonocerosFeature(rawRef);
       if (match) {
         const name = match.name;
-        const checkout = workbenchCheckoutRoot();
-        const localSourceDir = checkout ? path8.join(checkout, "images", "features", name) : null;
+        const sourceRoot = featuresSourceRoot();
+        const localSourceDir = sourceRoot ? path8.join(sourceRoot, 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,
@@ -2261,6 +2275,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(
@@ -6272,7 +6293,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.16.1" : "dev";
+    CLI_VERSION = true ? "1.17.0" : "dev";
   }
 });
 
@@ -8590,13 +8611,21 @@ async function runInContainer(opts) {
     { quiet: true }
   );
   if (upCode !== 0) return upCode;
+  const innerExec = opts.cwd ? [
+    "bash",
+    "-lc",
+    'cd -- "$1" && shift && exec "$@"',
+    "bash",
+    opts.cwd,
+    ...opts.command
+  ] : opts.command;
   return spawnFn(
     [
       "exec",
       "--workspace-folder",
       opts.root,
       "--mount-workspace-git-root=false",
-      ...opts.command
+      ...innerExec
     ],
     opts.root,
     { interactive: true }
@@ -8631,6 +8660,10 @@ var init_run2 = __esm({
           type: "positional",
           description: "Container name (yml in $MONOCEROS_HOME/container-configs/).",
           required: true
+        },
+        in: {
+          type: "string",
+          description: "Run the inner command in this directory inside the container (relative to the workspace folder, or absolute). The directory must already exist."
         }
       },
       async run({ args }) {
@@ -8644,7 +8677,8 @@ var init_run2 = __esm({
         try {
           const exitCode = await runInContainer({
             root: containerDir(args.name),
-            command
+            command,
+            ...args.in ? { cwd: args.in } : {}
           });
           process.exit(exitCode);
         } catch (err) {