@getmonoceros/workbench 1.9.3 → 1.9.5

package/dist/bin.js

@@ -2453,8 +2453,9 @@ function addInstallUrlToDoc(doc, url) {
   seq.add(url);
   return true;
 }
-function addFeatureToDoc(doc, ref, options = {}) {
+function addFeatureToDoc(doc, ref, options = {}, displayName) {
   const seq = ensureSeq(doc, "features");
+  const label = displayName ?? ref;
   for (const item of seq.items) {
     if (!isMap2(item)) continue;
     const itemRef = item.get("ref");
@@ -2465,7 +2466,7 @@ function addFeatureToDoc(doc, ref, options = {}) {
       return false;
     }
     throw new Error(
-      `Feature ${ref} is already configured with different options. Remove it first (\`monoceros remove-feature ${ref}\`) before re-adding.`
+      `Feature ${label} is already configured with different options. Remove it first (\`monoceros remove-feature ${label}\`) before re-adding.`
     );
   }
   const entry2 = new YAMLMap2();
@@ -2511,7 +2512,6 @@ function addRepoToDoc(doc, repo) {
     } else {
       item.delete("provider");
     }
-    relocateLeakedSectionComments(doc);
     return true;
   }
   const entry2 = new YAMLMap2();
@@ -2544,7 +2544,6 @@ function addRepoToDoc(doc, repo) {
     entry2.comment = hintLines.join("\n");
   }
   seq.add(entry2);
-  relocateLeakedSectionComments(doc);
   return true;
 }
 function removeLanguageFromDoc(doc, lang) {
@@ -2855,7 +2854,10 @@ async function runAddFeature(input) {
     ...resolved.defaultOptions,
     ...input.options ?? {}
   };
-  return mutate(input, (doc) => addFeatureToDoc(doc, resolved.ref, merged));
+  return mutate(
+    input,
+    (doc) => addFeatureToDoc(doc, resolved.ref, merged, raw)
+  );
 }
 async function resolveFeatureRefOrShortname(input) {
   if (REGEX.featureRef.test(input)) {
@@ -2908,14 +2910,15 @@ function runRemoveAptPackages(input) {
   }
   return mutate(input, (doc) => removeAptPackagesFromDoc(doc, input.packages));
 }
-function runRemoveFeature(input) {
-  const ref = input.ref.trim();
-  if (ref.length === 0) {
+async function runRemoveFeature(input) {
+  const raw = input.ref.trim();
+  if (raw.length === 0) {
     throw new Error(
-      "Missing feature ref. Usage: monoceros remove-feature <containername> <ref>."
+      "Missing feature ref. Usage: monoceros remove-feature <containername> <feature>."
     );
   }
-  return mutate(input, (doc) => removeFeatureFromDoc(doc, ref));
+  const resolved = await resolveFeatureRefOrShortname(raw);
+  return mutate(input, (doc) => removeFeatureFromDoc(doc, resolved.ref));
 }
 function runRemoveFromUrl(input) {
   const url = input.url.trim();
@@ -2971,6 +2974,7 @@ async function mutate(opts, apply) {
     logger.info("No changes \u2014 yml is already in the desired state.");
     return { status: "no-change" };
   }
+  relocateLeakedSectionComments(parsed.doc);
   const newText = stringifyConfig(parsed.doc);
   parseConfig(newText, ymlPath);
   const out = opts.output ?? ((line) => process.stdout.write(line + "\n"));
@@ -4428,7 +4432,7 @@ async function persistPromptedIdentity(prompted, ymlPath, home, logger) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "1.9.3" : "dev";
+var CLI_VERSION = true ? "1.9.5" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola12 } from "consola";
@@ -5947,7 +5951,7 @@ var removeFeatureCommand = defineCommand16({
   meta: {
     name: "remove-feature",
     group: "edit",
-    description: "Remove a devcontainer feature from the container config (by its OCI ref). Idempotent, prints a diff before writing."
+    description: "Remove a devcontainer feature from the container config. Accepts either a Monoceros catalog short-name (e.g. `atlassian`, `claude`) or a full OCI ref. Idempotent, prints a diff before writing."
   },
   args: {
     name: {
@@ -5957,7 +5961,7 @@ var removeFeatureCommand = defineCommand16({
     },
     ref: {
       type: "positional",
-      description: "Feature ref (e.g. ghcr.io/devcontainers/features/docker-in-docker:2).",
+      description: "Feature to remove. Either a Monoceros catalog short-name (e.g. `atlassian`, `atlassian/twg`, `claude` \u2014 see `monoceros list-components`) or a full OCI feature ref (e.g. `ghcr.io/devcontainers/features/docker-in-docker:2`).",
       required: true
     },
     yes: {