@saptools/bruno 0.2.4 → 0.2.6

package/dist/cli.js

@@ -2,8 +2,8 @@
 
 // src/cli.ts
 import process2 from "process";
-import { checkbox, confirm, input, select } from "@inquirer/prompts";
-import { Command } from "commander";
+import { confirm, select } from "@inquirer/prompts";
+import { Command, Option } from "commander";
 
 // src/context.ts
 import { mkdir, readFile, writeFile } from "fs/promises";
@@ -61,12 +61,87 @@ async function writeContext(ctx) {
   return updated;
 }
 
-// src/run.ts
-import { spawn } from "child_process";
-import { readFile as readFile4, stat } from "fs/promises";
-import { createRequire } from "module";
-import { delimiter, dirname as dirname2, isAbsolute, join as join3, relative, resolve, sep } from "path";
-import { getTokenCached as getTokenCachedApi } from "@saptools/cf-xsuaa";
+// src/environment-prompt.ts
+import { Separator, checkbox, input } from "@inquirer/prompts";
+
+// src/setup-app.ts
+import { mkdir as mkdir2, readdir, writeFile as writeFile3 } from "fs/promises";
+import { join as join2 } from "path";
+
+// src/cf-info.ts
+import {
+  getRegionView as getRegionViewApi,
+  readRegionsView,
+  readRegionView,
+  readStructureView,
+  REGION_KEYS
+} from "@saptools/cf-sync";
+var defaultCfInfoDeps = {
+  readStructureView,
+  readRegionsView,
+  readRegionView,
+  getRegionView: getRegionViewApi
+};
+function isValidRegionKey(value) {
+  return REGION_KEYS.includes(value);
+}
+async function getStructureSnapshot(deps = defaultCfInfoDeps) {
+  const view = await deps.readStructureView();
+  if (!view) {
+    return {
+      source: "empty",
+      structure: void 0,
+      stale: true,
+      message: "No CF structure cached. Run `cf-sync sync` first."
+    };
+  }
+  const stale = view.source === "runtime" && view.metadata?.status === "running";
+  return {
+    source: view.source,
+    structure: view.structure,
+    stale,
+    message: stale ? "A CF sync is still running \u2014 showing partial data." : void 0
+  };
+}
+async function listRegionsWithContent(deps = defaultCfInfoDeps) {
+  const snapshot = await getStructureSnapshot(deps);
+  if (!snapshot.structure) {
+    return [];
+  }
+  return snapshot.structure.regions.filter((r) => r.accessible && r.orgs.length > 0).map((r) => ({ key: r.key, label: r.label, orgCount: r.orgs.length }));
+}
+async function getRegion(key, deps = defaultCfInfoDeps) {
+  const view = await deps.readRegionView(key);
+  return view?.region;
+}
+function findOrg(region, orgName) {
+  return region.orgs.find((o) => o.name === orgName);
+}
+function findSpace(org, spaceName) {
+  return org.spaces.find((s) => s.name === spaceName);
+}
+function findApp(space, appName) {
+  return space.apps.find((a) => a.name === appName);
+}
+async function resolveRef(ref, deps = defaultCfInfoDeps) {
+  const region = await getRegion(ref.region, deps);
+  if (!region) {
+    return void 0;
+  }
+  const org = findOrg(region, ref.org);
+  if (!org) {
+    return void 0;
+  }
+  const space = findSpace(org, ref.space);
+  if (!space) {
+    return void 0;
+  }
+  const app = findApp(space, ref.app);
+  if (!app) {
+    return void 0;
+  }
+  return { region, org, space, app };
+}
 
 // src/cf-meta.ts
 import { readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
@@ -240,12 +315,231 @@ async function writeCfMetaToFile(path, ref, baseUrl) {
   return changed;
 }
 
+// src/setup-app.ts
+var COMMON_ENVIRONMENTS = ["local", "dev", "staging", "prod"];
+var ENV_NAME_PATTERN = /^[A-Za-z0-9._-]+$/;
+function assertValidEnvName(name) {
+  if (!ENV_NAME_PATTERN.test(name)) {
+    throw new Error(
+      `Invalid environment name '${name}': only letters, digits, dot, underscore, and dash are allowed.`
+    );
+  }
+}
+function emptyEnvContent(envName, ref) {
+  const lines = [
+    "vars {",
+    `  __cf_region: ${ref.region}`,
+    `  __cf_org: ${ref.org}`,
+    `  __cf_space: ${ref.space}`,
+    `  __cf_app: ${ref.app}`,
+    `  environment: ${envName}`,
+    "  baseUrl: ",
+    "}",
+    ""
+  ];
+  return lines.join("\n");
+}
+async function ensureEnvFile(appPath, envName, ref) {
+  const envDir = join2(appPath, ENVIRONMENTS_DIR);
+  await mkdir2(envDir, { recursive: true });
+  const filePath = join2(envDir, `${envName}.bru`);
+  try {
+    await writeFile3(filePath, emptyEnvContent(envName, ref), { encoding: "utf8", flag: "wx" });
+  } catch (err) {
+    if (err.code !== "EEXIST") {
+      throw err;
+    }
+    await writeCfMetaToFile(filePath, ref);
+  }
+  return filePath;
+}
+function pickRegion(regions) {
+  return regions.map((r) => ({ value: r.key, name: `${r.key} \u2014 ${r.label} (${r.orgCount.toString()} org${r.orgCount === 1 ? "" : "s"})` }));
+}
+function pickOrg(region) {
+  return region.orgs.map((o) => ({ value: o.name, name: `${o.name} (${o.spaces.length.toString()} space${o.spaces.length === 1 ? "" : "s"})` }));
+}
+function pickSpace(org) {
+  return org.spaces.map((s) => ({ value: s.name, name: `${s.name} (${s.apps.length.toString()} app${s.apps.length === 1 ? "" : "s"})` }));
+}
+function pickApp(space) {
+  return space.apps.map((a) => ({ value: a.name, name: a.name }));
+}
+async function setupApp(options) {
+  const deps = options.deps ?? defaultCfInfoDeps;
+  const log = options.log ?? (() => void 0);
+  const regions = await listRegionsWithContent(deps);
+  if (regions.length === 0) {
+    throw new Error(
+      "No CF regions with orgs are cached. Run `cf-sync sync` first, or pass SAP_EMAIL/SAP_PASSWORD to refresh."
+    );
+  }
+  const regionKey = await options.prompts.selectRegion(pickRegion(regions));
+  const regionView = await deps.readRegionView(regionKey);
+  if (!regionView) {
+    throw new Error(`Region ${regionKey} is not cached. Run \`cf-sync sync\` or \`cf-sync region ${regionKey}\`.`);
+  }
+  const region = regionView.region;
+  if (region.orgs.length === 0) {
+    throw new Error(`Region ${regionKey} has no accessible orgs.`);
+  }
+  const orgName = await options.prompts.selectOrg(pickOrg(region));
+  const org = region.orgs.find((o) => o.name === orgName);
+  if (!org) {
+    throw new Error(`Org ${orgName} not found in region ${regionKey}`);
+  }
+  if (org.spaces.length === 0) {
+    throw new Error(`Org ${orgName} has no spaces.`);
+  }
+  const spaceName = await options.prompts.selectSpace(pickSpace(org));
+  const space = org.spaces.find((s) => s.name === spaceName);
+  if (!space) {
+    throw new Error(`Space ${spaceName} not found in org ${orgName}`);
+  }
+  if (space.apps.length === 0) {
+    throw new Error(`Space ${spaceName} has no apps.`);
+  }
+  const appName = await options.prompts.selectApp(pickApp(space));
+  const ref = { region: regionKey, org: orgName, space: spaceName, app: appName };
+  const appPath = join2(
+    options.root,
+    regionFolderName(regionKey),
+    orgFolderName(orgName),
+    spaceFolderName(spaceName),
+    appName
+  );
+  const confirmed = await options.prompts.confirmCreate(appPath);
+  if (!confirmed) {
+    return { ref, appPath, environments: [], created: false };
+  }
+  await mkdir2(appPath, { recursive: true });
+  const existingEnvs = await listExistingEnvs(appPath);
+  const common = [...COMMON_ENVIRONMENTS];
+  const selected = await options.prompts.selectEnvironments({ common, existing: existingEnvs });
+  const merged = [];
+  for (const name of selected) {
+    const trimmed = name.trim();
+    if (trimmed.length === 0 || merged.includes(trimmed)) {
+      continue;
+    }
+    assertValidEnvName(trimmed);
+    merged.push(trimmed);
+  }
+  if (merged.length === 0) {
+    throw new Error("At least one environment is required.");
+  }
+  const created = [];
+  for (const envName of merged) {
+    const path = await ensureEnvFile(appPath, envName, ref);
+    created.push(path);
+    log(`\u2022 ${path}`);
+  }
+  return { ref, appPath, environments: created, created: true };
+}
+async function listExistingEnvs(appPath) {
+  try {
+    const entries = await readdir(join2(appPath, ENVIRONMENTS_DIR), { withFileTypes: true });
+    return entries.filter((e) => e.isFile() && e.name.endsWith(".bru")).map((e) => e.name.replace(/\.bru$/, ""));
+  } catch {
+    return [];
+  }
+}
+
+// src/environment-prompt.ts
+var ADD_CUSTOM_ENVIRONMENT = "__saptools_add_custom_environment__";
+function uniqueNames(names) {
+  const merged = [];
+  for (const name of names) {
+    if (!merged.includes(name)) {
+      merged.push(name);
+    }
+  }
+  return merged;
+}
+function validateEnvironmentSelection(choices) {
+  const selected = choices.map((choice) => choice.value);
+  const hasEnvironment = selected.some((value) => value !== ADD_CUSTOM_ENVIRONMENT);
+  if (hasEnvironment || selected.includes(ADD_CUSTOM_ENVIRONMENT)) {
+    return true;
+  }
+  return 'Select at least one environment, or choose "Add custom environment".';
+}
+function buildEnvironmentChoices(names, selected) {
+  return [
+    ...names.map((name) => ({
+      value: name,
+      name,
+      checked: selected.has(name)
+    })),
+    new Separator(),
+    {
+      value: ADD_CUSTOM_ENVIRONMENT,
+      name: "Add custom environment",
+      description: "Create another environment name and return to this menu"
+    }
+  ];
+}
+function validateCustomEnvironmentName(value) {
+  const trimmed = value.trim();
+  if (trimmed.length === 0) {
+    return true;
+  }
+  try {
+    assertValidEnvName(trimmed);
+    return true;
+  } catch (err) {
+    return err instanceof Error ? err.message : String(err);
+  }
+}
+async function promptForEnvironments(opts, deps = {}) {
+  const checkboxPrompt = deps.checkboxPrompt ?? checkbox;
+  const inputPrompt = deps.inputPrompt ?? input;
+  const selected = new Set(opts.existing);
+  const customNames = [];
+  for (; ; ) {
+    const names = uniqueNames([...opts.common, ...opts.existing, ...customNames]);
+    const answers = await checkboxPrompt({
+      message: "Environments to create (space to toggle, enter to continue)",
+      choices: buildEnvironmentChoices(names, selected),
+      validate: validateEnvironmentSelection
+    });
+    selected.clear();
+    for (const name of answers) {
+      if (name !== ADD_CUSTOM_ENVIRONMENT) {
+        selected.add(name);
+      }
+    }
+    if (!answers.includes(ADD_CUSTOM_ENVIRONMENT)) {
+      return [...selected];
+    }
+    const custom = (await inputPrompt({
+      message: "Custom environment name (leave empty to go back)",
+      default: "",
+      validate: validateCustomEnvironmentName
+    })).trim();
+    if (custom.length === 0) {
+      continue;
+    }
+    if (!customNames.includes(custom) && !names.includes(custom)) {
+      customNames.push(custom);
+    }
+    selected.add(custom);
+  }
+}
+
+// src/run.ts
+import { spawn } from "child_process";
+import { readFile as readFile4, stat } from "fs/promises";
+import { createRequire } from "module";
+import { delimiter, dirname as dirname2, isAbsolute, join as join4, relative, resolve, sep } from "path";
+import { getTokenCached as getTokenCachedApi } from "@saptools/cf-xsuaa";
+
 // src/folder-scan.ts
-import { readdir, readFile as readFile3 } from "fs/promises";
-import { join as join2 } from "path";
+import { readdir as readdir2, readFile as readFile3 } from "fs/promises";
+import { join as join3 } from "path";
 async function safeReaddir(path) {
   try {
-    const entries = await readdir(path, { withFileTypes: true });
+    const entries = await readdir2(path, { withFileTypes: true });
     return entries.filter((e) => e.isDirectory()).map((e) => e.name);
   } catch {
     return [];
@@ -253,7 +547,7 @@ async function safeReaddir(path) {
 }
 async function listFiles(path) {
   try {
-    const entries = await readdir(path, { withFileTypes: true });
+    const entries = await readdir2(path, { withFileTypes: true });
     return entries.filter((e) => e.isFile()).map((e) => e.name);
   } catch {
     return [];
@@ -271,17 +565,17 @@ async function loadEnvFile(path, name) {
   };
 }
 async function scanAppEnvironments(appPath) {
-  const envDir = join2(appPath, ENVIRONMENTS_DIR);
+  const envDir = join3(appPath, ENVIRONMENTS_DIR);
   const files = await listFiles(envDir);
   const bruFiles = files.filter((f) => f.endsWith(".bru"));
   const loaded = [];
   for (const file of bruFiles) {
-    loaded.push(await loadEnvFile(join2(envDir, file), file));
+    loaded.push(await loadEnvFile(join3(envDir, file), file));
   }
   return loaded;
 }
 async function scanApp(spacePath, name) {
-  const appPath = join2(spacePath, name);
+  const appPath = join3(spacePath, name);
   const environments = await scanAppEnvironments(appPath);
   return { path: appPath, name, environments };
 }
@@ -290,7 +584,7 @@ async function scanSpace(orgPath, dirName) {
   if (name === void 0) {
     return void 0;
   }
-  const spacePath = join2(orgPath, dirName);
+  const spacePath = join3(orgPath, dirName);
   const appDirs = await safeReaddir(spacePath);
   const apps = [];
   for (const appDir of appDirs) {
@@ -303,7 +597,7 @@ async function scanOrg(regionPath, dirName) {
   if (name === void 0) {
     return void 0;
   }
-  const orgPath = join2(regionPath, dirName);
+  const orgPath = join3(regionPath, dirName);
   const spaceDirs = await safeReaddir(orgPath);
   const spaces = [];
   for (const spaceDir of spaceDirs) {
@@ -319,7 +613,7 @@ async function scanRegion(root, dirName) {
   if (key === void 0) {
     return void 0;
   }
-  const regionPath = join2(root, dirName);
+  const regionPath = join3(root, dirName);
   const orgDirs = await safeReaddir(regionPath);
   const orgs = [];
   for (const orgDir of orgDirs) {
@@ -377,7 +671,7 @@ async function findCommandOnPath(command, env) {
   const candidates = pathCandidates(command, env);
   for (const entry of pathEntries(env)) {
     for (const candidate of candidates) {
-      const fullPath = join3(entry, candidate);
+      const fullPath = join4(entry, candidate);
       if (await exists(fullPath)) {
         return fullPath;
       }
@@ -472,7 +766,7 @@ async function resolveTarget(root, target) {
     throw new Error(`Target not found: ${target}`);
   }
   const { region, org, space, app, filePath } = shorthand;
-  const appDir = join3(
+  const appDir = join4(
     root,
     regionFolderName(region),
     orgFolderName(org),
@@ -482,7 +776,7 @@ async function resolveTarget(root, target) {
   if (!filePath) {
     return { filePath: appDir, shorthand };
   }
-  const candidate = join3(appDir, filePath);
+  const candidate = join4(appDir, filePath);
   if (await exists(candidate)) {
     return { filePath: candidate, shorthand };
   }
@@ -494,7 +788,7 @@ async function resolveTarget(root, target) {
 }
 async function chooseEnvironmentFile(appDir, environment) {
   if (environment) {
-    const envFile = join3(appDir, ENVIRONMENTS_DIR, `${environment}.bru`);
+    const envFile = join4(appDir, ENVIRONMENTS_DIR, `${environment}.bru`);
     if (!await exists(envFile)) {
       throw new Error(`Environment file not found: ${envFile}`);
     }
@@ -526,7 +820,7 @@ function findAppDirFromFile(filePath, root) {
   if (!regionDir || !orgDir || !spaceDir || !appDir) {
     throw new Error(`File is not inside a CF-structured bruno collection: ${filePath}`);
   }
-  return join3(root, regionDir, orgDir, spaceDir, appDir);
+  return join4(root, regionDir, orgDir, spaceDir, appDir);
 }
 async function buildRunPlan(options) {
   const { filePath } = await resolveTarget(options.root, options.target);
@@ -576,216 +870,6 @@ async function runBruno(options) {
   return { ...plan, ...result };
 }
 
-// src/setup-app.ts
-import { mkdir as mkdir2, readdir as readdir2, writeFile as writeFile3 } from "fs/promises";
-import { join as join4 } from "path";
-
-// src/cf-info.ts
-import {
-  getRegionView as getRegionViewApi,
-  readRegionsView,
-  readRegionView,
-  readStructureView,
-  REGION_KEYS
-} from "@saptools/cf-sync";
-var defaultCfInfoDeps = {
-  readStructureView,
-  readRegionsView,
-  readRegionView,
-  getRegionView: getRegionViewApi
-};
-function isValidRegionKey(value) {
-  return REGION_KEYS.includes(value);
-}
-async function getStructureSnapshot(deps = defaultCfInfoDeps) {
-  const view = await deps.readStructureView();
-  if (!view) {
-    return {
-      source: "empty",
-      structure: void 0,
-      stale: true,
-      message: "No CF structure cached. Run `cf-sync sync` first."
-    };
-  }
-  const stale = view.source === "runtime" && view.metadata?.status === "running";
-  return {
-    source: view.source,
-    structure: view.structure,
-    stale,
-    message: stale ? "A CF sync is still running \u2014 showing partial data." : void 0
-  };
-}
-async function listRegionsWithContent(deps = defaultCfInfoDeps) {
-  const snapshot = await getStructureSnapshot(deps);
-  if (!snapshot.structure) {
-    return [];
-  }
-  return snapshot.structure.regions.filter((r) => r.accessible && r.orgs.length > 0).map((r) => ({ key: r.key, label: r.label, orgCount: r.orgs.length }));
-}
-async function getRegion(key, deps = defaultCfInfoDeps) {
-  const view = await deps.readRegionView(key);
-  return view?.region;
-}
-function findOrg(region, orgName) {
-  return region.orgs.find((o) => o.name === orgName);
-}
-function findSpace(org, spaceName) {
-  return org.spaces.find((s) => s.name === spaceName);
-}
-function findApp(space, appName) {
-  return space.apps.find((a) => a.name === appName);
-}
-async function resolveRef(ref, deps = defaultCfInfoDeps) {
-  const region = await getRegion(ref.region, deps);
-  if (!region) {
-    return void 0;
-  }
-  const org = findOrg(region, ref.org);
-  if (!org) {
-    return void 0;
-  }
-  const space = findSpace(org, ref.space);
-  if (!space) {
-    return void 0;
-  }
-  const app = findApp(space, ref.app);
-  if (!app) {
-    return void 0;
-  }
-  return { region, org, space, app };
-}
-
-// src/setup-app.ts
-var COMMON_ENVIRONMENTS = ["local", "dev", "staging", "prod"];
-var ENV_NAME_PATTERN = /^[A-Za-z0-9._-]+$/;
-function assertValidEnvName(name) {
-  if (!ENV_NAME_PATTERN.test(name)) {
-    throw new Error(
-      `Invalid environment name '${name}': only letters, digits, dot, underscore, and dash are allowed.`
-    );
-  }
-}
-function emptyEnvContent(envName, ref) {
-  const lines = [
-    "vars {",
-    `  __cf_region: ${ref.region}`,
-    `  __cf_org: ${ref.org}`,
-    `  __cf_space: ${ref.space}`,
-    `  __cf_app: ${ref.app}`,
-    `  environment: ${envName}`,
-    "  baseUrl: ",
-    "}",
-    ""
-  ];
-  return lines.join("\n");
-}
-async function ensureEnvFile(appPath, envName, ref) {
-  const envDir = join4(appPath, ENVIRONMENTS_DIR);
-  await mkdir2(envDir, { recursive: true });
-  const filePath = join4(envDir, `${envName}.bru`);
-  try {
-    await writeFile3(filePath, emptyEnvContent(envName, ref), { encoding: "utf8", flag: "wx" });
-  } catch (err) {
-    if (err.code !== "EEXIST") {
-      throw err;
-    }
-    await writeCfMetaToFile(filePath, ref);
-  }
-  return filePath;
-}
-function pickRegion(regions) {
-  return regions.map((r) => ({ value: r.key, name: `${r.key} \u2014 ${r.label} (${r.orgCount.toString()} org${r.orgCount === 1 ? "" : "s"})` }));
-}
-function pickOrg(region) {
-  return region.orgs.map((o) => ({ value: o.name, name: `${o.name} (${o.spaces.length.toString()} space${o.spaces.length === 1 ? "" : "s"})` }));
-}
-function pickSpace(org) {
-  return org.spaces.map((s) => ({ value: s.name, name: `${s.name} (${s.apps.length.toString()} app${s.apps.length === 1 ? "" : "s"})` }));
-}
-function pickApp(space) {
-  return space.apps.map((a) => ({ value: a.name, name: a.name }));
-}
-async function setupApp(options) {
-  const deps = options.deps ?? defaultCfInfoDeps;
-  const log = options.log ?? (() => void 0);
-  const regions = await listRegionsWithContent(deps);
-  if (regions.length === 0) {
-    throw new Error(
-      "No CF regions with orgs are cached. Run `cf-sync sync` first, or pass SAP_EMAIL/SAP_PASSWORD to refresh."
-    );
-  }
-  const regionKey = await options.prompts.selectRegion(pickRegion(regions));
-  const regionView = await deps.readRegionView(regionKey);
-  if (!regionView) {
-    throw new Error(`Region ${regionKey} is not cached. Run \`cf-sync sync\` or \`cf-sync region ${regionKey}\`.`);
-  }
-  const region = regionView.region;
-  if (region.orgs.length === 0) {
-    throw new Error(`Region ${regionKey} has no accessible orgs.`);
-  }
-  const orgName = await options.prompts.selectOrg(pickOrg(region));
-  const org = region.orgs.find((o) => o.name === orgName);
-  if (!org) {
-    throw new Error(`Org ${orgName} not found in region ${regionKey}`);
-  }
-  if (org.spaces.length === 0) {
-    throw new Error(`Org ${orgName} has no spaces.`);
-  }
-  const spaceName = await options.prompts.selectSpace(pickSpace(org));
-  const space = org.spaces.find((s) => s.name === spaceName);
-  if (!space) {
-    throw new Error(`Space ${spaceName} not found in org ${orgName}`);
-  }
-  if (space.apps.length === 0) {
-    throw new Error(`Space ${spaceName} has no apps.`);
-  }
-  const appName = await options.prompts.selectApp(pickApp(space));
-  const ref = { region: regionKey, org: orgName, space: spaceName, app: appName };
-  const appPath = join4(
-    options.root,
-    regionFolderName(regionKey),
-    orgFolderName(orgName),
-    spaceFolderName(spaceName),
-    appName
-  );
-  const confirmed = await options.prompts.confirmCreate(appPath);
-  if (!confirmed) {
-    return { ref, appPath, environments: [], created: false };
-  }
-  await mkdir2(appPath, { recursive: true });
-  const existingEnvs = await listExistingEnvs(appPath);
-  const common = [...COMMON_ENVIRONMENTS];
-  const selected = await options.prompts.selectEnvironments({ common, existing: existingEnvs });
-  const custom = await options.prompts.inputCustomEnvName();
-  const merged = [];
-  for (const name of [...selected, ...custom ? [custom] : []]) {
-    const trimmed = name.trim();
-    if (trimmed.length === 0 || merged.includes(trimmed)) {
-      continue;
-    }
-    assertValidEnvName(trimmed);
-    merged.push(trimmed);
-  }
-  if (merged.length === 0) {
-    throw new Error("At least one environment is required.");
-  }
-  const created = [];
-  for (const envName of merged) {
-    const path = await ensureEnvFile(appPath, envName, ref);
-    created.push(path);
-    log(`\u2022 ${path}`);
-  }
-  return { ref, appPath, environments: created, created: true };
-}
-async function listExistingEnvs(appPath) {
-  try {
-    const entries = await readdir2(join4(appPath, ENVIRONMENTS_DIR), { withFileTypes: true });
-    return entries.filter((e) => e.isFile() && e.name.endsWith(".bru")).map((e) => e.name.replace(/\.bru$/, ""));
-  } catch {
-    return [];
-  }
-}
-
 // src/use.ts
 function parseContextShorthand(shorthand) {
   const segs = shorthand.split("/").filter((s) => s.length > 0);
@@ -820,9 +904,15 @@ async function useContext(options) {
 }
 
 // src/cli.ts
-function resolveRoot(explicit) {
-  if (explicit) {
-    return explicit;
+function resolveCollectionDir(explicitCollection, explicitRoot) {
+  if (explicitCollection) {
+    return explicitCollection;
+  }
+  if (explicitRoot) {
+    return explicitRoot;
+  }
+  if (process2.env["SAPTOOLS_BRUNO_COLLECTION"]) {
+    return process2.env["SAPTOOLS_BRUNO_COLLECTION"];
   }
   if (process2.env["SAPTOOLS_BRUNO_ROOT"]) {
     return process2.env["SAPTOOLS_BRUNO_ROOT"];
@@ -831,50 +921,21 @@ function resolveRoot(explicit) {
 }
 async function main(argv) {
   const program = new Command();
-  program.name("saptools-bruno").description("Smart runner for Bruno with CF-aware env metadata and automatic token injection").option("--root <dir>", "Root directory of the bruno collection (default: cwd)");
+  program.name("saptools-bruno").description("Smart runner for Bruno with CF-aware env metadata and automatic token injection").addOption(new Option("--collection <dir>", "Bruno collection directory (default: SAPTOOLS_BRUNO_COLLECTION or cwd)")).addOption(new Option("--root <dir>", "Legacy alias for --collection").hideHelp());
   program.command("setup-app").description("Interactively scaffold a bruno app folder and seed __cf_* variables").action(async () => {
-    const root = resolveRoot(program.opts().root);
+    const collectionDir = resolveCollectionDir(
+      program.opts().collection,
+      program.opts().root
+    );
     const result = await setupApp({
-      root,
+      root: collectionDir,
       prompts: {
         selectRegion: async (choices) => await select({ message: "Select region", choices: [...choices] }),
         selectOrg: async (choices) => await select({ message: "Select org", choices: [...choices] }),
         selectSpace: async (choices) => await select({ message: "Select space", choices: [...choices] }),
         selectApp: async (choices) => await select({ message: "Select app", choices: [...choices] }),
         confirmCreate: async (path) => await confirm({ message: `Create ${path}?`, default: true }),
-        selectEnvironments: async ({ common, existing }) => {
-          const seen = /* @__PURE__ */ new Set();
-          const all = [...common, ...existing].filter((name) => {
-            if (seen.has(name)) {
-              return false;
-            }
-            seen.add(name);
-            return true;
-          });
-          return await checkbox({
-            message: "Environments to create (space to toggle, enter to confirm)",
-            choices: all.map((name) => ({
-              name,
-              value: name,
-              checked: existing.includes(name)
-            }))
-          });
-        },
-        inputCustomEnvName: async () => {
-          const raw = await input({
-            message: "Custom environment name (leave empty to skip)",
-            default: "",
-            validate: (v) => {
-              const t = v.trim();
-              if (t.length === 0) {
-                return true;
-              }
-              return /^[A-Za-z0-9._-]+$/.test(t) ? true : "Only letters, digits, dot, underscore, and dash are allowed.";
-            }
-          });
-          const trimmed = raw.trim();
-          return trimmed.length > 0 ? trimmed : null;
-        }
+        selectEnvironments: async (opts) => await promptForEnvironments(opts)
       },
       log: (msg) => {
         process2.stdout.write(`${msg}
@@ -890,7 +951,10 @@ async function main(argv) {
   });
   program.command("run").description("Run a bruno request or folder, auto-injecting an XSUAA token").argument("[target]", "Shorthand path (region/org/space/app[/folder/file.bru]) or real path").option("-e, --env <name>", "Environment name (default: context or first)").action(
     async (target, opts) => {
-      const root = resolveRoot(program.opts().root);
+      const collectionDir = resolveCollectionDir(
+        program.opts().collection,
+        program.opts().root
+      );
       let effectiveTarget = target;
       if (!effectiveTarget) {
         const ctx = await readContext();
@@ -902,7 +966,7 @@ async function main(argv) {
         effectiveTarget = `${ctx.region}/${ctx.org}/${ctx.space}/${ctx.app}`;
       }
       const result = await runBruno({
-        root,
+        root: collectionDir,
         target: effectiveTarget,
         ...opts.env ? { environment: opts.env } : {},
         log: (msg) => {