@getmonoceros/workbench 1.37.2 → 1.37.7

package/dist/bin.js

@@ -472,6 +472,13 @@ function interpolate(value, vars) {
   });
   return { value: out, missing };
 }
+function expandEnvRefs(env) {
+  const out = {};
+  for (const [key, value] of Object.entries(env)) {
+    out[key] = interpolate(value, env).value;
+  }
+  return out;
+}
 function interpolateServices(services, vars) {
   const missing = [];
   const resolved = services.map((svc) => {
@@ -560,6 +567,31 @@ async function ensureEnvVars(envPath, name, vars) {
   }
   return { created: !exists, added };
 }
+async function setEnvVarRef(envPath, name, key, value) {
+  const exists = existsSync2(envPath);
+  const content = exists ? readFileSync(envPath, "utf8") : buildEnvStub(name);
+  const lines = content.split(/\r?\n/);
+  let replaced = false;
+  for (let i = 0; i < lines.length; i++) {
+    const m = ENV_LINE_RE.exec(lines[i]);
+    if (m && m[1] === key) {
+      if (m[2].trim().length > 0) return false;
+      lines[i] = `${key}=${value}`;
+      replaced = true;
+      break;
+    }
+  }
+  let next = replaced ? lines.join("\n") : content;
+  if (!replaced) {
+    if (next.length > 0 && !next.endsWith("\n")) next += "\n";
+    next += `${key}=${value}
+`;
+  }
+  if (next === content) return false;
+  await fsp.mkdir(path2.dirname(envPath), { recursive: true });
+  await fsp.writeFile(envPath, next);
+  return true;
+}
 function formatMissingVarsError(missing, envPathPretty) {
   const lines = missing.map((m) => `  - \${${m.name}} (${m.location})`);
   const uniqueNames = [...new Set(missing.map((m) => m.name))];
@@ -1334,6 +1366,13 @@ function resolveRepoTokens(config, catalog, envVars) {
   const hostTokens = /* @__PURE__ */ new Map();
   const used = [];
   const missing = [];
+  const ambiguous = [];
+  const providersWithRepo = /* @__PURE__ */ new Set();
+  const injectFeatureToken = (ref, token) => {
+    if (!ref) return;
+    const feature = features.find((f) => f.ref === ref);
+    if (feature) feature.options = { ...feature.options, apiToken: token };
+  };
   for (const repo of config.repos ?? []) {
     if (!repo.url.startsWith("https://")) continue;
     let host;
@@ -1344,6 +1383,7 @@ function resolveRepoTokens(config, catalog, envVars) {
     }
     const provider = resolveProvider(host, repo.provider);
     if (provider === "unknown") continue;
+    providersWithRepo.add(provider);
     const ref = catalog.get(provider)?.file.contributes.features?.[0]?.ref;
     const tried = tokenVarCandidates(provider, repo.url);
     const hit = tried.find((v) => (envVars[v] ?? "").trim().length > 0);
@@ -1353,17 +1393,47 @@ function resolveRepoTokens(config, catalog, envVars) {
     }
     const token = envVars[hit].trim();
     hostTokens.set(host, token);
-    used.push({ host, provider, varName: hit });
-    if (ref) {
-      const feature = features.find((f) => f.ref === ref);
-      if (feature) feature.options = { ...feature.options, apiToken: token };
+    used.push({ host, provider, varName: hit, source: "repo" });
+    injectFeatureToken(ref, token);
+  }
+  for (const provider of PROVIDER_VALUES) {
+    if (providersWithRepo.has(provider)) continue;
+    const ref = catalog.get(provider)?.file.contributes.features?.[0]?.ref;
+    if (!ref || !config.features.some((f) => f.ref === ref)) continue;
+    const p = provider.toUpperCase();
+    const host = CANONICAL_HOST[provider];
+    const direct = [`${p}_API_TOKEN`, `GIT_TOKEN__${p}`].find(
+      (v) => (envVars[v] ?? "").trim().length > 0
+    );
+    if (direct) {
+      const token = envVars[direct].trim();
+      hostTokens.set(host, token);
+      used.push({ host, provider, varName: direct, source: "feature" });
+      injectFeatureToken(ref, token);
+      continue;
+    }
+    const orgVars = Object.keys(envVars).filter((k) => k.startsWith(`GIT_TOKEN__${p}_`) && envVars[k].trim()).sort();
+    if (orgVars.length === 1) {
+      const token = envVars[orgVars[0]].trim();
+      hostTokens.set(host, token);
+      used.push({ host, provider, varName: orgVars[0], source: "feature" });
+      injectFeatureToken(ref, token);
+    } else if (orgVars.length > 1) {
+      ambiguous.push({ provider, featureRef: ref, host, candidates: orgVars });
+    } else {
+      missing.push({
+        host,
+        provider,
+        tried: [`${p}_API_TOKEN`, `GIT_TOKEN__${p}`]
+      });
     }
   }
   return {
     features,
     hostTokens,
     used,
-    missing
+    missing,
+    ambiguous
   };
 }
 async function resolveContainerRepoTokens(name, home, catalog) {
@@ -1376,7 +1446,7 @@ async function resolveContainerRepoTokens(name, home, catalog) {
   return resolveRepoTokens(config, catalog, envVars);
 }
 function formatTokenUse(use) {
-  return `${PROVIDER_LABEL[use.provider]} (${use.host}) \u2192 ${use.varName}`;
+  return use.source === "feature" ? `Using ${use.varName} for the ${PROVIDER_LABEL[use.provider]} CLI` : `Using ${use.varName} for ${use.host}`;
 }
 function formatUnauthenticatedRepos(missing, containerName2) {
   const lines = [
@@ -1407,6 +1477,7 @@ function formatUnauthenticatedRepos(missing, containerName2) {
   lines.push("", `   Details: ${cyan2(REPO_DOCS_URL)}`);
   return lines.join("\n");
 }
+var CANONICAL_HOST;
 var init_repo_token = __esm({
   "src/apply/repo-token.ts"() {
     "use strict";
@@ -1416,6 +1487,11 @@ var init_repo_token = __esm({
     init_paths();
     init_credentials();
     init_format();
+    CANONICAL_HOST = {
+      github: "github.com",
+      gitlab: "gitlab.com",
+      bitbucket: "bitbucket.org"
+    };
   }
 });
 
@@ -5439,7 +5515,6 @@ var init_yml = __esm({
 // src/modify/index.ts
 import { promises as fs11 } from "fs";
 import { consola as consola2 } from "consola";
-import { createPatch } from "diff";
 import path13 from "path";
 function runAddLanguage(input) {
   const spec = parseLanguageSpec(input.language);
@@ -5672,22 +5747,20 @@ async function tryCloneInRunningContainer(input, entry2) {
     );
     return;
   }
+  let noToken;
   try {
-    const { hostTokens } = await resolveContainerRepoTokens(
+    const { hostTokens, missing } = await resolveContainerRepoTokens(
       input.name,
       home,
       await loadComponentCatalog()
     );
-    if (hostTokens.get(urlHost)) {
+    noToken = missing.find((m) => m.host === urlHost);
+    if (!noToken) {
       await collectGitCredentials(root, [{ host: urlHost, provider }], {
         patByHost: hostTokens,
         logger: { info: () => {
         }, warn: (m) => logger.warn(m) }
       });
-    } else {
-      logger.warn(
-        `No access token set for ${urlHost} \u2014 cloning will fail if this repo is private. Set one (see ${REPO_DOCS_URL}) and re-run.`
-      );
     }
   } catch (err) {
     logger.warn(
@@ -5727,14 +5800,27 @@ async function tryCloneInRunningContainer(input, entry2) {
     return;
   }
   if (exit.exitCode !== 0) {
-    logger.warn(
-      `In-container clone for ${entry2.url} exited ${exit.exitCode}. The yml is updated; \`monoceros apply ${input.name}\` retries.`
-    );
+    if (noToken) {
+      process.stderr.write(
+        `
+${formatUnauthenticatedRepos([noToken], input.name)}
+`
+      );
+    } else {
+      logger.warn(
+        `In-container clone for ${entry2.url} exited ${exit.exitCode}. The yml is updated; \`monoceros apply ${input.name}\` retries.`
+      );
+    }
     return;
   }
   logger.info(
     `Cloned ${entry2.url} into /workspaces/${containerName2}/${targetRel} inside the running container.`
   );
+  if (noToken) {
+    logger.warn(
+      `No token set for ${urlHost}: the clone worked (public), but gh/glab aren't logged in and pushing needs a token. See ${REPO_DOCS_URL}.`
+    );
+  }
   void path13;
 }
 function shquote(value) {
@@ -5970,16 +6056,6 @@ async function mutate(opts, apply) {
   relocateLeakedSectionComments(parsed.doc);
   const newText = stringifyConfig(parsed.doc);
   parseConfig(newText, ymlPath);
-  const out = opts.output ?? ((line) => process.stdout.write(line + "\n"));
-  out(createPatch(ymlPath, oldText, newText, "before", "after"));
-  if (!opts.yes) {
-    const confirm = opts.confirm ?? defaultConfirm;
-    const ok = await confirm("Apply these changes to the yml?");
-    if (!ok) {
-      logger.warn("Aborted by user. The yml was not modified.");
-      return { status: "aborted" };
-    }
-  }
   await fs11.writeFile(ymlPath, newText, "utf8");
   logger.success(`Updated ${ymlPath}.`);
   logger.info(
@@ -6049,7 +6125,6 @@ ${lines.join("\n")}`);
     );
   }
 }
-var defaultConfirm;
 var init_modify = __esm({
   "src/modify/index.ts"() {
     "use strict";
@@ -6074,13 +6149,6 @@ var init_modify = __esm({
     init_transform();
     init_briefing();
     init_yml();
-    defaultConfirm = async (message) => {
-      const result = await consola2.prompt(message, {
-        type: "confirm",
-        initial: false
-      });
-      return result === true;
-    };
   }
 });
 
@@ -8199,15 +8267,42 @@ ${sectionLine(label)}
   warnOnDeprecatedFeatureRefs(parsed.config.features, globalConfig, logger);
   const envPath = containerEnvPath(opts.name, home);
   await ensureEnvGitignored(containerConfigsDir(home));
-  const envVars = {
+  const envVars = expandEnvRefs({
     ...readEnvFile(globalEnvPath(home)),
     ...readEnvFile(envPath),
     ...opts.env ?? {}
-  };
+  });
   const catalog = await loadComponentCatalog();
   const repoTokens = resolveRepoTokens(parsed.config, catalog, envVars);
+  const featureTokenPrompt = opts.featureTokenPrompt ?? defaultFeatureTokenPrompt;
+  for (const amb of repoTokens.ambiguous) {
+    const chosen = await featureTokenPrompt(amb);
+    if (!chosen) {
+      const p = amb.provider.toUpperCase();
+      repoTokens.missing.push({
+        host: amb.host,
+        provider: amb.provider,
+        tried: [`${p}_API_TOKEN`, `GIT_TOKEN__${p}`]
+      });
+      continue;
+    }
+    const token = (envVars[chosen] ?? "").trim();
+    repoTokens.hostTokens.set(amb.host, token);
+    const feature = repoTokens.features.find((f) => f.ref === amb.featureRef);
+    if (feature) feature.options = { ...feature.options, apiToken: token };
+    const featureVar = `${amb.provider.toUpperCase()}_API_TOKEN`;
+    const saved = await setEnvVarRef(
+      envPath,
+      opts.name,
+      featureVar,
+      `\${${chosen}}`
+    );
+    logger.info(
+      `Using ${chosen} for the ${PROVIDER_LABEL[amb.provider]} CLI` + (saved ? ` (saved as ${featureVar} in ${prettyPath(envPath)})` : ` (${featureVar} already set in ${prettyPath(envPath)})`)
+    );
+  }
   for (const use of repoTokens.used) {
-    logger.info(`Repo token: ${formatTokenUse(use)}`);
+    logger.info(formatTokenUse(use));
   }
   const resolvedFeatures = interpolateFeatureOptions(
     repoTokens.features,
@@ -8644,6 +8739,7 @@ async function persistPromptedIdentity(prompted, ymlPath, home, logger) {
     }
   }
 }
+var SKIP_FEATURE_TOKEN, defaultFeatureTokenPrompt;
 var init_apply = __esm({
   "src/apply/index.ts"() {
     "use strict";
@@ -8679,6 +8775,24 @@ var init_apply = __esm({
     init_global();
     init_yml();
     init_repo_token();
+    SKIP_FEATURE_TOKEN = "__skip__";
+    defaultFeatureTokenPrompt = async ({
+      provider,
+      host,
+      candidates
+    }) => {
+      const choice = await consola12.prompt(
+        `The ${PROVIDER_LABEL[provider]} CLI feature has no repo to pick a token from. Which token should authenticate ${host}?`,
+        {
+          type: "select",
+          options: [
+            ...candidates.map((v) => ({ label: v, value: v })),
+            { label: "Skip \u2014 leave unauthenticated", value: SKIP_FEATURE_TOKEN }
+          ]
+        }
+      );
+      return typeof choice === "string" && choice !== SKIP_FEATURE_TOKEN ? choice : null;
+    };
   }
 });
 
@@ -8853,7 +8967,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.37.2" : "dev";
+    CLI_VERSION = true ? "1.37.7" : "dev";
   }
 });