@saptools/bruno 0.3.1 → 0.3.3

package/dist/cli.js

@@ -1,202 +1,18 @@
 #!/usr/bin/env node
 
-// src/cli.ts
+// src/cli/main.ts
 import process2 from "process";
 import { confirm, select } from "@inquirer/prompts";
 import { Command, Option } from "commander";
 
-// src/app-search-prompt.ts
-import { search } from "@inquirer/prompts";
-var DEFAULT_PAGE_SIZE = 12;
-var NO_MATCHING_APP = "__saptools_no_matching_app__";
-function normalizeTerm(term) {
-  return term?.trim().toLowerCase() ?? "";
-}
-function scoreChoice(choice, normalizedTerm) {
-  const name = choice.name.toLowerCase();
-  const value = choice.value.toLowerCase();
-  if (name === normalizedTerm || value === normalizedTerm) {
-    return 0;
-  }
-  if (name.startsWith(normalizedTerm) || value.startsWith(normalizedTerm)) {
-    return 1;
-  }
-  if (name.includes(normalizedTerm) || value.includes(normalizedTerm)) {
-    return 2;
-  }
-  return Number.POSITIVE_INFINITY;
-}
-function noMatchChoice(term) {
-  const label = term?.trim() ?? "";
-  return {
-    value: NO_MATCHING_APP,
-    name: `No apps match "${label}"`,
-    disabled: "Type a different search term"
-  };
-}
-function buildAppSearchChoices(choices, term) {
-  const normalizedTerm = normalizeTerm(term);
-  if (normalizedTerm.length === 0) {
-    return [...choices];
-  }
-  const rankedMatches = choices.map((choice, index) => ({ choice, index, score: scoreChoice(choice, normalizedTerm) })).filter((item) => Number.isFinite(item.score)).sort((left, right) => left.score - right.score || left.index - right.index).map((item) => item.choice);
-  if (rankedMatches.length > 0) {
-    return rankedMatches;
-  }
-  return [noMatchChoice(term)];
-}
-async function promptForAppSelection(choices, deps = {}) {
-  const searchPrompt = deps.searchPrompt ?? search;
-  return await searchPrompt({
-    message: "Select app",
-    pageSize: DEFAULT_PAGE_SIZE,
-    source: (term) => Promise.resolve(buildAppSearchChoices(choices, term)),
-    validate: (value) => value === NO_MATCHING_APP ? "Select a real app." : true
-  });
-}
-
-// src/context.ts
-import { mkdir, readFile, writeFile } from "fs/promises";
-import { dirname } from "path";
-
-// src/paths.ts
-import { homedir } from "os";
-import { join } from "path";
-var SAPTOOLS_DIR_NAME = ".saptools";
-var BRUNO_CONTEXT_FILENAME = "bruno-context.json";
-var REGION_FOLDER_PREFIX = "region__";
-var ORG_FOLDER_PREFIX = "org__";
-var SPACE_FOLDER_PREFIX = "space__";
-var ENVIRONMENTS_DIR = "environments";
-function saptoolsDir() {
-  return join(homedir(), SAPTOOLS_DIR_NAME);
-}
-function brunoContextPath() {
-  return join(saptoolsDir(), BRUNO_CONTEXT_FILENAME);
-}
-function regionFolderName(key) {
-  return `${REGION_FOLDER_PREFIX}${key}`;
-}
-function orgFolderName(name) {
-  return `${ORG_FOLDER_PREFIX}${name}`;
-}
-function spaceFolderName(name) {
-  return `${SPACE_FOLDER_PREFIX}${name}`;
-}
-function parsePrefixedName(dirName, prefix) {
-  if (!dirName.startsWith(prefix)) {
-    return void 0;
-  }
-  return dirName.slice(prefix.length);
-}
-
-// src/context.ts
-async function readContext() {
-  try {
-    const raw = await readFile(brunoContextPath(), "utf8");
-    return JSON.parse(raw);
-  } catch (err) {
-    if (err.code === "ENOENT") {
-      return void 0;
-    }
-    throw err;
-  }
-}
-async function writeContext(ctx) {
-  const updated = { ...ctx, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
-  const path = brunoContextPath();
-  await mkdir(dirname(path), { recursive: true });
-  await writeFile(path, `${JSON.stringify(updated, null, 2)}
-`, "utf8");
-  return updated;
-}
-
-// 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 { basename, 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";
+// src/commands/run.ts
+import { spawn } from "child_process";
+import { readFile as readFile3, stat, writeFile as writeFile2 } from "fs/promises";
+import { createRequire } from "module";
+import { delimiter, dirname, isAbsolute, join as join3, relative, resolve, sep } from "path";
+import { getTokenCached as getTokenCachedApi } from "@saptools/cf-xsuaa";
 
-// src/bru-parser.ts
+// src/bruno/parser.ts
 var HEADER_REGEX = /(^|\n)[^\S\n]*([a-zA-Z][a-zA-Z0-9:_-]*)[^\S\n]*([{[])/g;
 function findMatchingClose(raw, open, openIdx) {
   const close = open === "{" ? "}" : "]";
@@ -284,7 +100,7 @@ function parseBruEnvFile(raw) {
   return { vars: { entries }, secrets };
 }
 
-// src/bru-writer.ts
+// src/bruno/writer.ts
 function formatVarsBlock(entries) {
   const lines = [];
   for (const [key, value] of entries) {
@@ -323,7 +139,8 @@ ${formatVarsBlock(existing)}
   return { content: `${before}${rebuilt}${after}`, changed: true };
 }
 
-// src/cf-meta.ts
+// src/cf/meta.ts
+import { readFile, writeFile } from "fs/promises";
 function readCfMetaFromVars(vars) {
   const region = vars.get("__cf_region");
   const org = vars.get("__cf_org");
@@ -351,287 +168,74 @@ function buildCfMetaUpdates(ref, baseUrl) {
   return updates;
 }
 async function readCfMetaFromFile(path) {
-  const raw = await readFile2(path, "utf8");
+  const raw = await readFile(path, "utf8");
   const parsed = parseBruEnvFile(raw);
   return readCfMetaFromVars(parsed.vars.entries);
 }
 async function writeCfMetaToFile(path, ref, baseUrl) {
-  const raw = await readFile2(path, "utf8");
+  const raw = await readFile(path, "utf8");
   const updates = buildCfMetaUpdates(ref, baseUrl);
   const { content, changed } = upsertVars(raw, updates);
   if (changed) {
-    await writeFile2(path, content, "utf8");
+    await writeFile(path, content, "utf8");
   }
   return changed;
 }
 
-// src/setup-app.ts
-var COMMON_ENVIRONMENTS = ["local", "dev", "staging", "prod"];
-var BRUNO_COLLECTION_CONFIG_FILENAME = "bruno.json";
-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.`
-    );
-  }
+// src/collection/folder-scan.ts
+import { readdir, readFile as readFile2 } from "fs/promises";
+import { join as join2 } from "path";
+
+// src/collection/paths.ts
+import { homedir } from "os";
+import { join } from "path";
+var SAPTOOLS_DIR_NAME = ".saptools";
+var BRUNO_CONTEXT_FILENAME = "bruno-context.json";
+var REGION_FOLDER_PREFIX = "region__";
+var ORG_FOLDER_PREFIX = "org__";
+var SPACE_FOLDER_PREFIX = "space__";
+var ENVIRONMENTS_DIR = "environments";
+function saptoolsDir() {
+  return join(homedir(), SAPTOOLS_DIR_NAME);
 }
-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");
+function brunoContextPath() {
+  return join(saptoolsDir(), BRUNO_CONTEXT_FILENAME);
 }
-function normalizeCollectionName(root) {
-  const candidate = basename(root).replace(/^\.+/, "").trim();
-  return candidate.length > 0 ? candidate : "bruno-collection";
+function regionFolderName(key) {
+  return `${REGION_FOLDER_PREFIX}${key}`;
 }
-function defaultBrunoConfig(root) {
-  return `${JSON.stringify(
-    {
-      version: "1",
-      name: normalizeCollectionName(root),
-      type: "collection",
-      ignore: ["node_modules", ".git"]
-    },
-    null,
-    2
-  )}
-`;
+function orgFolderName(name) {
+  return `${ORG_FOLDER_PREFIX}${name}`;
 }
-async function ensureCollectionConfig(root) {
-  const filePath = join2(root, BRUNO_COLLECTION_CONFIG_FILENAME);
+function spaceFolderName(name) {
+  return `${SPACE_FOLDER_PREFIX}${name}`;
+}
+function parsePrefixedName(dirName, prefix) {
+  if (!dirName.startsWith(prefix)) {
+    return void 0;
+  }
+  return dirName.slice(prefix.length);
+}
+
+// src/collection/folder-scan.ts
+async function safeReaddir(path) {
   try {
-    await writeFile3(filePath, defaultBrunoConfig(root), { encoding: "utf8", flag: "wx" });
-  } catch (err) {
-    if (err.code !== "EEXIST") {
-      throw err;
-    }
+    const entries = await readdir(path, { withFileTypes: true });
+    return entries.filter((e) => e.isDirectory()).map((e) => e.name);
+  } catch {
+    return [];
   }
 }
-async function ensureEnvFile(appPath, envName, ref) {
-  const envDir = join2(appPath, ENVIRONMENTS_DIR);
-  await mkdir2(envDir, { recursive: true });
-  const filePath = join2(envDir, `${envName}.bru`);
+async function listFiles(path) {
   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.");
-  }
-  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 region ${regionKey}\` or \`cf-sync sync\` first.`);
-  }
-  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 });
-  await ensureCollectionConfig(appPath);
-  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, writeFile as writeFile4 } 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 as readdir2, readFile as readFile3 } from "fs/promises";
-import { join as join3 } from "path";
-async function safeReaddir(path) {
-  try {
-    const entries = await readdir2(path, { withFileTypes: true });
-    return entries.filter((e) => e.isDirectory()).map((e) => e.name);
-  } catch {
-    return [];
-  }
-}
-async function listFiles(path) {
-  try {
-    const entries = await readdir2(path, { withFileTypes: true });
+    const entries = await readdir(path, { withFileTypes: true });
     return entries.filter((e) => e.isFile()).map((e) => e.name);
   } catch {
     return [];
   }
 }
 async function loadEnvFile(path, name) {
-  const raw = await readFile3(path, "utf8");
+  const raw = await readFile2(path, "utf8");
   const parsed = parseBruEnvFile(raw);
   return {
     path,
@@ -642,17 +246,17 @@ async function loadEnvFile(path, name) {
   };
 }
 async function scanAppEnvironments(appPath) {
-  const envDir = join3(appPath, ENVIRONMENTS_DIR);
+  const envDir = join2(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(join3(envDir, file), file));
+    loaded.push(await loadEnvFile(join2(envDir, file), file));
   }
   return loaded;
 }
 async function scanApp(spacePath, name) {
-  const appPath = join3(spacePath, name);
+  const appPath = join2(spacePath, name);
   const environments = await scanAppEnvironments(appPath);
   return { path: appPath, name, environments };
 }
@@ -661,7 +265,7 @@ async function scanSpace(orgPath, dirName) {
   if (name === void 0) {
     return void 0;
   }
-  const spacePath = join3(orgPath, dirName);
+  const spacePath = join2(orgPath, dirName);
   const appDirs = await safeReaddir(spacePath);
   const apps = [];
   for (const appDir of appDirs) {
@@ -674,7 +278,7 @@ async function scanOrg(regionPath, dirName) {
   if (name === void 0) {
     return void 0;
   }
-  const orgPath = join3(regionPath, dirName);
+  const orgPath = join2(regionPath, dirName);
   const spaceDirs = await safeReaddir(orgPath);
   const spaces = [];
   for (const spaceDir of spaceDirs) {
@@ -690,7 +294,7 @@ async function scanRegion(root, dirName) {
   if (key === void 0) {
     return void 0;
   }
-  const regionPath = join3(root, dirName);
+  const regionPath = join2(root, dirName);
   const orgDirs = await safeReaddir(regionPath);
   const orgs = [];
   for (const orgDir of orgDirs) {
@@ -731,7 +335,7 @@ function parseShorthandPath(shorthand) {
   return environment ? { region, org, space, app, environment, filePath } : { region, org, space, app, filePath };
 }
 
-// src/run.ts
+// src/commands/run.ts
 var require2 = createRequire(import.meta.url);
 function pathEntries(env) {
   const value = env["PATH"] ?? process.env["PATH"] ?? "";
@@ -748,7 +352,7 @@ async function findCommandOnPath(command, env) {
   const candidates = pathCandidates(command, env);
   for (const entry of pathEntries(env)) {
     for (const candidate of candidates) {
-      const fullPath = join4(entry, candidate);
+      const fullPath = join3(entry, candidate);
       if (await exists(fullPath)) {
         return fullPath;
       }
@@ -777,7 +381,7 @@ function defaultResolvePackageJsonPath() {
   return require2.resolve("@usebruno/cli/package.json");
 }
 async function defaultReadTextFile(path) {
-  return await readFile4(path, "utf8");
+  return await readFile3(path, "utf8");
 }
 async function resolveBundledBruBinPath(deps) {
   try {
@@ -787,7 +391,7 @@ async function resolveBundledBruBinPath(deps) {
     if (!binPath) {
       return void 0;
     }
-    return resolve(dirname2(packageJsonPath), binPath);
+    return resolve(dirname(packageJsonPath), binPath);
   } catch {
     return void 0;
   }
@@ -843,7 +447,7 @@ async function resolveTarget(root, target) {
     throw new Error(`Target not found: ${target}`);
   }
   const { region, org, space, app, filePath } = shorthand;
-  const appDir = join4(
+  const appDir = join3(
     root,
     regionFolderName(region),
     orgFolderName(org),
@@ -853,7 +457,7 @@ async function resolveTarget(root, target) {
   if (!filePath) {
     return { filePath: appDir, shorthand };
   }
-  const candidate = join4(appDir, filePath);
+  const candidate = join3(appDir, filePath);
   if (await exists(candidate)) {
     return { filePath: candidate, shorthand };
   }
@@ -865,7 +469,7 @@ async function resolveTarget(root, target) {
 }
 async function chooseEnvironmentFile(appDir, environment) {
   if (environment) {
-    const envFile = join4(appDir, ENVIRONMENTS_DIR, `${environment}.bru`);
+    const envFile = join3(appDir, ENVIRONMENTS_DIR, `${environment}.bru`);
     if (!await exists(envFile)) {
       throw new Error(`Environment file not found: ${envFile}`);
     }
@@ -897,13 +501,13 @@ function findAppDirFromFile(filePath, root) {
   if (!regionDir || !orgDir || !spaceDir || !appDir) {
     throw new Error(`File is not inside a CF-structured bruno collection: ${filePath}`);
   }
-  return join4(root, regionDir, orgDir, spaceDir, appDir);
+  return join3(root, regionDir, orgDir, spaceDir, appDir);
 }
 async function persistAccessToken(envFile, token) {
-  const raw = await readFile4(envFile, "utf8");
+  const raw = await readFile3(envFile, "utf8");
   const { content, changed } = upsertVars(raw, /* @__PURE__ */ new Map([["accessToken", token]]));
   if (changed) {
-    await writeFile4(envFile, content, "utf8");
+    await writeFile2(envFile, content, "utf8");
   }
 }
 async function buildRunPlan(options) {
@@ -955,20 +559,308 @@ async function runBruno(options) {
   return { ...plan, ...result };
 }
 
-// src/use.ts
-function parseContextShorthand(shorthand) {
-  const segs = shorthand.split("/").filter((s) => s.length > 0);
-  if (segs.length !== 4) {
+// src/commands/setup-app.ts
+import { mkdir, readdir as readdir2, writeFile as writeFile3 } from "fs/promises";
+import { basename, 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 [region, org, space, app] = segs;
-  if (!region || !org || !space || !app) {
+  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 };
 }
-async function useContext(options) {
-  const parsed = parseContextShorthand(options.shorthand);
+
+// src/commands/setup-app.ts
+var COMMON_ENVIRONMENTS = ["local", "dev", "staging", "prod"];
+var BRUNO_COLLECTION_CONFIG_FILENAME = "bruno.json";
+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");
+}
+function normalizeCollectionName(root) {
+  const candidate = basename(root).replace(/^\.+/, "").trim();
+  return candidate.length > 0 ? candidate : "bruno-collection";
+}
+function defaultBrunoConfig(root) {
+  return `${JSON.stringify(
+    {
+      version: "1",
+      name: normalizeCollectionName(root),
+      type: "collection",
+      ignore: ["node_modules", ".git"]
+    },
+    null,
+    2
+  )}
+`;
+}
+async function ensureCollectionConfig(root) {
+  const filePath = join4(root, BRUNO_COLLECTION_CONFIG_FILENAME);
+  try {
+    await writeFile3(filePath, defaultBrunoConfig(root), { encoding: "utf8", flag: "wx" });
+  } catch (err) {
+    if (err.code !== "EEXIST") {
+      throw err;
+    }
+  }
+}
+async function ensureEnvFile(appPath, envName, ref) {
+  const envDir = join4(appPath, ENVIRONMENTS_DIR);
+  await mkdir(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 selectRegion(prompts, deps) {
+  const regions = await listRegionsWithContent(deps);
+  if (regions.length === 0) {
+    throw new Error("No CF regions with orgs are cached. Run `cf-sync sync` first.");
+  }
+  const regionKey = await prompts.selectRegion(pickRegion(regions));
+  const regionView = await deps.readRegionView(regionKey);
+  if (!regionView) {
+    throw new Error(`Region ${regionKey} is not cached. Run \`cf-sync region ${regionKey}\` or \`cf-sync sync\` first.`);
+  }
+  const region = regionView.region;
+  if (region.orgs.length === 0) {
+    throw new Error(`Region ${regionKey} has no accessible orgs.`);
+  }
+  return { regionKey, region };
+}
+async function selectOrg(prompts, region, regionKey) {
+  const orgName = await 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.`);
+  }
+  return { orgName, org };
+}
+async function selectSpace(prompts, org, orgName) {
+  const spaceName = await 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.`);
+  }
+  return { spaceName, space };
+}
+async function selectCfAppRef(prompts, deps) {
+  const { regionKey, region } = await selectRegion(prompts, deps);
+  const { orgName, org } = await selectOrg(prompts, region, regionKey);
+  const { spaceName, space } = await selectSpace(prompts, org, orgName);
+  const appName = await prompts.selectApp(pickApp(space));
+  return { region: regionKey, org: orgName, space: spaceName, app: appName };
+}
+function appPathFor(root, ref) {
+  return join4(
+    root,
+    regionFolderName(ref.region),
+    orgFolderName(ref.org),
+    spaceFolderName(ref.space),
+    ref.app
+  );
+}
+function normalizeEnvironmentNames(selected) {
+  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.");
+  }
+  return merged;
+}
+async function selectEnvironmentNames(appPath, prompts) {
+  const existingEnvs = await listExistingEnvs(appPath);
+  const common = [...COMMON_ENVIRONMENTS];
+  const selected = await prompts.selectEnvironments({ common, existing: existingEnvs });
+  return normalizeEnvironmentNames(selected);
+}
+async function createEnvironmentFiles(appPath, envNames, ref, log) {
+  const created = [];
+  for (const envName of envNames) {
+    const path = await ensureEnvFile(appPath, envName, ref);
+    created.push(path);
+    log(`\u2022 ${path}`);
+  }
+  return created;
+}
+async function setupApp(options) {
+  const deps = options.deps ?? defaultCfInfoDeps;
+  const log = options.log ?? (() => void 0);
+  const ref = await selectCfAppRef(options.prompts, deps);
+  const appPath = appPathFor(options.root, ref);
+  const confirmed = await options.prompts.confirmCreate(appPath);
+  if (!confirmed) {
+    return { ref, appPath, environments: [], created: false };
+  }
+  await mkdir(appPath, { recursive: true });
+  await ensureCollectionConfig(appPath);
+  const envNames = await selectEnvironmentNames(appPath, options.prompts);
+  const created = await createEnvironmentFiles(appPath, envNames, ref, log);
+  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/state/context.ts
+import { mkdir as mkdir2, readFile as readFile4, writeFile as writeFile4 } from "fs/promises";
+import { dirname as dirname2 } from "path";
+async function readContext() {
+  try {
+    const raw = await readFile4(brunoContextPath(), "utf8");
+    return JSON.parse(raw);
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      return void 0;
+    }
+    throw err;
+  }
+}
+async function writeContext(ctx) {
+  const updated = { ...ctx, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
+  const path = brunoContextPath();
+  await mkdir2(dirname2(path), { recursive: true });
+  await writeFile4(path, `${JSON.stringify(updated, null, 2)}
+`, "utf8");
+  return updated;
+}
+
+// src/commands/use.ts
+function parseContextShorthand(shorthand) {
+  const segs = shorthand.split("/").filter((s) => s.length > 0);
+  if (segs.length !== 4) {
+    return void 0;
+  }
+  const [region, org, space, app] = segs;
+  if (!region || !org || !space || !app) {
+    return void 0;
+  }
+  return { region, org, space, app };
+}
+async function useContext(options) {
+  const parsed = parseContextShorthand(options.shorthand);
   if (!parsed) {
     throw new Error(
       `Invalid context shorthand: ${options.shorthand}. Expected <region>/<org>/<space>/<app>.`
@@ -988,7 +880,140 @@ async function useContext(options) {
   return await writeContext(parsed);
 }
 
-// src/cli.ts
+// src/prompts/app-search.ts
+import { search } from "@inquirer/prompts";
+var DEFAULT_PAGE_SIZE = 12;
+var NO_MATCHING_APP = "__saptools_no_matching_app__";
+function normalizeTerm(term) {
+  return term?.trim().toLowerCase() ?? "";
+}
+function scoreChoice(choice, normalizedTerm) {
+  const name = choice.name.toLowerCase();
+  const value = choice.value.toLowerCase();
+  if (name === normalizedTerm || value === normalizedTerm) {
+    return 0;
+  }
+  if (name.startsWith(normalizedTerm) || value.startsWith(normalizedTerm)) {
+    return 1;
+  }
+  if (name.includes(normalizedTerm) || value.includes(normalizedTerm)) {
+    return 2;
+  }
+  return Number.POSITIVE_INFINITY;
+}
+function noMatchChoice(term) {
+  const label = term?.trim() ?? "";
+  return {
+    value: NO_MATCHING_APP,
+    name: `No apps match "${label}"`,
+    disabled: "Type a different search term"
+  };
+}
+function buildAppSearchChoices(choices, term) {
+  const normalizedTerm = normalizeTerm(term);
+  if (normalizedTerm.length === 0) {
+    return [...choices];
+  }
+  const rankedMatches = choices.map((choice, index) => ({ choice, index, score: scoreChoice(choice, normalizedTerm) })).filter((item) => Number.isFinite(item.score)).sort((left, right) => left.score - right.score || left.index - right.index).map((item) => item.choice);
+  if (rankedMatches.length > 0) {
+    return rankedMatches;
+  }
+  return [noMatchChoice(term)];
+}
+async function promptForAppSelection(choices, deps = {}) {
+  const searchPrompt = deps.searchPrompt ?? search;
+  return await searchPrompt({
+    message: "Select app",
+    pageSize: DEFAULT_PAGE_SIZE,
+    source: (term) => Promise.resolve(buildAppSearchChoices(choices, term)),
+    validate: (value) => value === NO_MATCHING_APP ? "Select a real app." : true
+  });
+}
+
+// src/prompts/environment.ts
+import { Separator, checkbox, input } from "@inquirer/prompts";
+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/cli/main.ts
 function resolveCollectionDir(explicitCollection, explicitRoot) {
   if (explicitCollection) {
     return explicitCollection;
@@ -1004,16 +1029,18 @@ function resolveCollectionDir(explicitCollection, explicitRoot) {
   }
   return process2.cwd();
 }
-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").addOption(new Option("--collection <dir>", "Bruno collection directory (default: SAPTOOLS_BRUNO_COLLECTION or cwd)")).addOption(new Option("--root <dir>", "Legacy alias for --collection").hideHelp());
+function resolveProgramCollectionDir(program) {
+  const opts = program.opts();
+  return resolveCollectionDir(opts.collection, opts.root);
+}
+function writeLine(message) {
+  process2.stdout.write(`${message}
+`);
+}
+function registerSetupAppCommand(program) {
   program.command("setup-app").description("Interactively scaffold a bruno app folder and seed __cf_* variables").action(async () => {
-    const collectionDir = resolveCollectionDir(
-      program.opts().collection,
-      program.opts().root
-    );
     const result = await setupApp({
-      root: collectionDir,
+      root: resolveProgramCollectionDir(program),
       prompts: {
         selectRegion: async (choices) => await select({ message: "Select region", choices: [...choices] }),
         selectOrg: async (choices) => await select({ message: "Select org", choices: [...choices] }),
@@ -1022,46 +1049,41 @@ async function main(argv) {
         confirmCreate: async (path) => await confirm({ message: `Create ${path}?`, default: true }),
         selectEnvironments: async (opts) => await promptForEnvironments(opts)
       },
-      log: (msg) => {
-        process2.stdout.write(`${msg}
-`);
-      }
+      log: writeLine
     });
     if (!result.created) {
-      process2.stdout.write("Aborted.\n");
+      writeLine("Aborted.");
       return;
     }
-    process2.stdout.write(`\u2714 App folder ready at ${result.appPath}
-`);
+    writeLine(`\u2714 App folder ready at ${result.appPath}`);
   });
+}
+async function resolveRunTarget(target) {
+  if (target) {
+    return target;
+  }
+  const ctx = await readContext();
+  if (!ctx) {
+    throw new Error(
+      "No target specified and no default context is set. Run `saptools-bruno use <region/org/space/app>` first."
+    );
+  }
+  return `${ctx.region}/${ctx.org}/${ctx.space}/${ctx.app}`;
+}
+function registerRunCommand(program) {
   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 collectionDir = resolveCollectionDir(
-        program.opts().collection,
-        program.opts().root
-      );
-      let effectiveTarget = target;
-      if (!effectiveTarget) {
-        const ctx = await readContext();
-        if (!ctx) {
-          throw new Error(
-            "No target specified and no default context is set. Run `saptools-bruno use <region/org/space/app>` first."
-          );
-        }
-        effectiveTarget = `${ctx.region}/${ctx.org}/${ctx.space}/${ctx.app}`;
-      }
       const result = await runBruno({
-        root: collectionDir,
-        target: effectiveTarget,
+        root: resolveProgramCollectionDir(program),
+        target: await resolveRunTarget(target),
         ...opts.env ? { environment: opts.env } : {},
-        log: (msg) => {
-          process2.stdout.write(`${msg}
-`);
-        }
+        log: writeLine
       });
       process2.exit(result.code);
     }
   );
+}
+function registerUseCommand(program) {
   program.command("use").description("Set the default CF context (region/org/space/app) for future `run` calls").argument("<shorthand>", "region/org/space/app").option("--no-verify", "Skip verifying the context against the cached CF structure").action(async (shorthand, opts) => {
     const ctx = await useContext({
       shorthand,
@@ -1070,6 +1092,13 @@ async function main(argv) {
     process2.stdout.write(`\u2714 Default context set to ${ctx.region}/${ctx.org}/${ctx.space}/${ctx.app}
 `);
   });
+}
+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").addOption(new Option("--collection <dir>", "Bruno collection directory (default: SAPTOOLS_BRUNO_COLLECTION or cwd)")).addOption(new Option("--root <dir>", "Legacy alias for --collection").hideHelp());
+  registerSetupAppCommand(program);
+  registerRunCommand(program);
+  registerUseCommand(program);
   await program.parseAsync([...argv]);
 }
 try {