@devdogsuga/devtools 0.1.41 → 0.1.43

package/README.md

@@ -74,6 +74,24 @@ rather than a table here. Its first screen lists every interactive command
 under a plain-English title ("Restart local Supabase") with the command to
 type beside it (`restart-stack`).
 
+## Which repo it runs in
+
+Both CLIs run from a DevDogsUGA checkout or from Backstage's (`package.json`
+name `devdogs-monorepo` or `backstage`; the layout code is
+`packages/cli-core/src/repo/layout.ts`). From Backstage, DevDogsUGA is
+`<root>/devdogsuga`: a gitignored symlink to the sibling clone locally
+(`pnpm devdogsuga`), a real checkout at the pinned SHA in CI.
+
+| What                                                                                                  | Where                                                                                                                                                                                                                              |
+| ----------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `supabase/` (CLI cwd, config, migrations, seeds, avatars, env manifest), `database.types.ts`, `docs/` | DevDogsUGA's root (`devdogsuga/` from Backstage)                                                                                                                                                                                   |
+| `workers.json`, `.github/`                                                                            | the repo you are in; DevDogsUGA without one manages no Workers                                                                                                                                                                     |
+| apps (`cron`, `run`, `deploy <app>`, env manifests)                                                   | the repo you are in plus DevDogsUGA's `apps/`; on a name clash the repo you are in wins                                                                                                                                            |
+| `.env`, `.env.<tier>`, `.env.generated`                                                               | the root of the repo you are in; `deploy write-env` and the local stack's `.env.generated` also write DevDogsUGA's root, because schedule-builder reads its own repo root. `env pull\|push\|reset` touch only the root you are in. |
+
+`pnpm exec supabase` and `wrangler` run inside DevDogsUGA's workspace, so
+`devdogsuga/` needs its own `pnpm install` before the commands that use them.
+
 ## Telemetry disclosure
 
 This CLI reports its own crashes to Sentry (see `src/telemetry.ts`), on by

package/dist/{cli-CeCAuSJd.js → cli-B_AiECh4.js}

@@ -1,11 +1,11 @@
-import { a as cliName, d as positionals, u as flagValue } from "./failure-log-B5GG_8T1.js";
-import { C as helpPath, S as catalog, T as renderHelp, _ as bail, a as recordEnteredTier, b as explainError, c as describeEnvironment, d as resolveDbConnection, f as sessionIsLocal, i as beginInvocation, l as probeEnvironment, n as bareGroupStartPath, o as recordResolved, p as sessionLabel, r as runMenu, s as reproducibleCommand, t as bareGroupStartFlags, u as nonEmpty, v as errorMessage, w as renderCommandList, x as unwrap, y as explain } from "./menu-Craj11Sn.js";
-import { _ as dryRunKind, c as reportRuns, f as supabase, g as runInGroup, h as reportRan, l as run$1, s as dbPush, u as runWithStderr, v as isDryRun, x as wouldRunLine } from "./supabase-project-Bw8sBFcE.js";
-import { a as ownVersion, n as discoverRepoRoot, r as findRepoRoot } from "./root-C2OmZDwD.js";
-import { i as loadEnvSession, n as loadEnv, r as loadEnvLoad, t as getEnvSync } from "./peers-RBplwovA.js";
-import { d as hasYes, f as isNonInteractive, n as captureDevtoolsError, o as initDevtoolsTelemetry, r as devtoolsEnvironment, t as captureDevtoolsDeprecation } from "./telemetry-Do13RFhc.js";
-import { n as assertRegistryLoaded, r as loadRegistry, t as scopedProcessEnv } from "./local-env-hH4encfD.js";
-import { t as runStackCommand } from "./stack-7PuRcaI2.js";
+import { a as cliName, d as positionals, u as flagValue } from "./failure-log-DOt6E3hS.js";
+import { C as helpPath, S as catalog, T as renderHelp, _ as bail, a as recordEnteredTier, b as explainError, c as describeEnvironment, d as resolveDbConnection, f as sessionIsLocal, i as beginInvocation, l as probeEnvironment, n as bareGroupStartPath, o as recordResolved, p as sessionLabel, r as runMenu, s as reproducibleCommand, t as bareGroupStartFlags, u as nonEmpty, v as errorMessage, w as renderCommandList, x as unwrap, y as explain } from "./menu-DYQ-Dd-O.js";
+import { S as wouldRunLine, _ as runInGroup, c as reportRuns, f as supabase, g as reportRan, l as run$1, m as supabaseRoot, s as dbPush, u as runWithStderr, v as dryRunKind, y as isDryRun } from "./supabase-project-C93xRFkN.js";
+import { a as ownVersion, n as discoverRepoRoot, r as findRepoRoot } from "./root-CjPWNkBu.js";
+import { c as devdogsugaRootOrNull, d as listApps, f as resolveAppPath, i as loadEnvSession, l as findApp, n as loadEnv, p as resolveLayout, r as loadEnvLoad, s as appWorkspaceRoot, t as getEnvSync, u as layoutAt } from "./peers-DvUH5VxX.js";
+import { d as hasYes, f as isNonInteractive, n as captureDevtoolsError, o as initDevtoolsTelemetry, r as devtoolsEnvironment, t as captureDevtoolsDeprecation } from "./telemetry-C07-ioHm.js";
+import { n as assertRegistryLoaded, r as loadRegistry, t as scopedProcessEnv } from "./local-env-BuHU5Ckd.js";
+import { t as runStackCommand } from "./stack-C_50FafG.js";
 import { cancel, confirm, intro, isCancel, log, multiselect, note, outro, password, select, spinner, text } from "@clack/prompts";
 import { existsSync, mkdirSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
 import { chmod, readFile, writeFile } from "node:fs/promises";
@@ -112,6 +112,19 @@ async function checkEnv(root) {
 		]
 	];
 	for (const [label, actual, expected] of pins) if (JSON.stringify(actual) !== JSON.stringify(expected)) problems.push(`The ${label} set is [${actual.join(", ")}]; expected exactly [${expected.join(", ")}]. A change here re-routes a credential: update this pin deliberately.`);
+	if (typeof env.buildKeys === "function") {
+		const build = env.buildKeys();
+		const expectedBuild = [
+			"API_URL",
+			"BASE_URL",
+			"NEXT_PUBLIC_TURNSTILE_SITE_KEY",
+			"PLATFORM_SENTRY_DSN",
+			"PUBLISHABLE_KEY",
+			"SCHEDULE_BUILDER_SENTRY_DSN"
+		];
+		if (JSON.stringify(build) !== JSON.stringify(expectedBuild)) problems.push(`The build set is [${build.join(", ")}]; expected exactly [${expectedBuild.join(", ")}]. A change here changes what the build workflows read from \`<tier>-build\`: update both deliberately.`);
+		for (const key of build) if (!variableSet.has(key)) problems.push(`${key} is build: true but is not in variableKeys(), so push cannot write it to the build environment.`);
+	}
 	for (const key of narrowed) for (const entry of registry.get(key) ?? []) if (entry.meta.scope !== "environment") problems.push(`${key} is narrowed with scope "${entry.meta.scope}".`);
 	let routed = 0;
 	for (const [key, entries] of registry) {
@@ -245,7 +258,7 @@ function checkMigrationOrder(root, baseRef) {
 //#endregion
 //#region ../cli-core/src/workers.ts
 /**
-* The one list of Worker apps, read from root `workers.json`.
+* The one list of Worker apps, read from `workers.json` at the root of the repo you are in.
 *
 * Six call sites across `devtools` and `env` used to carry their own copy of
 * `["platform", "sandbox", "schedule-builder"]` — a CLI's app-choice list, a
@@ -270,11 +283,27 @@ function parseWorkerEntries(json) {
 		throw new Error(`workers.json entry ${index} must be a path string or an object with a "path".`);
 	});
 }
-/** Every entry in root `workers.json`. */
+/**
+* Every entry in `workers.json` at the root of the repo you are in. DevDogsUGA
+* after the platform moved to Backstage has no such file: no Worker apps are
+* managed there, so the list is empty rather than an error. A Backstage
+* checkout always has one, so a missing file there is still an error.
+*/
 function workerEntries() {
-	cachedWorkerEntries ??= parseWorkerEntries(JSON.parse(readFileSync(join(findRepoRoot(), "workers.json"), "utf8")));
+	if (cachedWorkerEntries === void 0) {
+		const layout = resolveLayout();
+		const file = join(layout.root, "workers.json");
+		cachedWorkerEntries = layout.kind === "devdogsuga" && !existsSync(file) ? [] : parseWorkerEntries(JSON.parse(readFileSync(file, "utf8")));
+	}
 	return cachedWorkerEntries;
 }
+/**
+* The directory of a Worker app by its `workers.json` path: under the repo
+* you are in, else under DevDogsUGA's (schedule-builder, from Backstage).
+*/
+function workerAppDir(entryPath) {
+	return resolveAppPath(entryPath);
+}
 /** Workspace-relative paths, exactly as listed in root `workers.json`. */
 function workerPaths() {
 	return workerEntries().map((entry) => entry.path);
@@ -353,17 +382,37 @@ function deployMatrixApps(yamlText) {
 function sameSet(a, b) {
 	return a.length === b.length && a.every((item) => b.includes(item));
 }
-/** Every drift between `workers.json`, the workspace and the deploy matrix,
-* as one readable line each. Empty means in step. */
-function checkWorkers(root) {
+/**
+* Every drift between `workers.json`, the workspace and the deploy matrix,
+* as one readable line each. Empty means in step.
+*
+* `workers.json` lives at the root of the repo being checked. DevDogsUGA
+* without one manages no Worker apps (the platform moved to Backstage), so
+* there is nothing to check. From a Backstage checkout the apps are looked up
+* in both repos, since schedule-builder is deployed from Backstage but stays in
+* DevDogsUGA's `apps/`.
+*/
+function checkWorkers(root, layout = layoutAt(root)) {
 	const problems = [];
-	const paths = parseWorkerEntries(JSON.parse(readFileSync(join(root, "workers.json"), "utf8"))).map((entry) => entry.path);
+	const workersFile = join(root, "workers.json");
+	if (!existsSync(workersFile)) {
+		if (layout.kind === "devdogsuga") return [];
+		return ["workers.json does not exist."];
+	}
+	const paths = parseWorkerEntries(JSON.parse(readFileSync(workersFile, "utf8"))).map((entry) => entry.path);
 	const apps = paths.map((path) => basename(path));
-	const withWrangler = expandWorkspacePackages(root, workspaceGlobs(readFileSync(join(root, "pnpm-workspace.yaml"), "utf8"))).filter((relative) => existsSync(join(root, relative, "wrangler.jsonc")));
+	const roots = [root];
+	if (layout.kind === "backstage" && layout.hasDevdogsuga) roots.push(layout.devdogsugaRoot);
+	const scanned = [...new Set(roots.flatMap((dir) => {
+		const workspace = join(dir, "pnpm-workspace.yaml");
+		return existsSync(workspace) ? expandWorkspacePackages(dir, workspaceGlobs(readFileSync(workspace, "utf8"))) : [];
+	}))];
+	const dirOf = (relative) => join(roots.find((dir) => existsSync(join(dir, relative))) ?? root, relative);
+	const withWrangler = scanned.filter((relative) => existsSync(join(dirOf(relative), "wrangler.jsonc")));
 	for (const path of withWrangler.filter((p) => !paths.includes(p))) problems.push(`${path} has a wrangler.jsonc but is not in workers.json.`);
 	for (const path of paths.filter((p) => !withWrangler.includes(p))) problems.push(`workers.json lists ${path}, which has no wrangler.jsonc.`);
 	for (const path of paths) {
-		const manifest = join(root, path, "package.json");
+		const manifest = join(dirOf(path), "package.json");
 		if (!existsSync(manifest)) continue;
 		const name = JSON.parse(readFileSync(manifest, "utf8")).name;
 		const slug = path.split("/").pop();
@@ -371,6 +420,7 @@ function checkWorkers(root) {
 	}
 	const deployApp = join(root, ".github", "workflows", "deploy-app.yaml");
 	if (!existsSync(deployApp)) {
+		if (layout.kind === "backstage") return problems;
 		problems.push(".github/workflows/deploy-app.yaml does not exist.");
 		return problems;
 	}
@@ -511,7 +561,7 @@ function report(name, problems, ok) {
 }
 function migrations(rest) {
 	const base = flagValue(rest, "--base") ?? DEFAULT_BASE;
-	const { baseLatest, violations } = checkMigrationOrder(findRepoRoot(), base);
+	const { baseLatest, violations } = checkMigrationOrder(resolveLayout().devdogsugaRoot, base);
 	return report("migrations", violations.map((v) => `${v.filename} (${v.timestamp}) sorts before ${base}'s newest migration (${baseLatest}). Recreate it with a fresh timestamp (\`devtools new-migration\`) and regenerate types.`), `in order (${base}'s newest: ${baseLatest ?? "none"}).`);
 }
 async function run(rest) {
@@ -1201,10 +1251,11 @@ async function runEnvironmentDoctor(opts) {
 			fix: machine.stack === "no" && machine.docker === "yes" ? "Start it with `pnpm devtools supabase start`." : void 0
 		});
 	}
-	if (repoRoot) checks.push(typesFreshness(repoRoot));
+	const supabaseRoot = repoRoot ? devdogsugaRootOrNull(layoutAt(repoRoot)) : null;
+	if (supabaseRoot) checks.push(typesFreshness(supabaseRoot));
 	const sessionDbUrl = process.env.DB_URL;
-	if (repoRoot && sessionDbUrl) try {
-		checks.push(...databaseChecks(await probeDatabase(sessionDbUrl), readDeclaredBuckets(repoRoot)));
+	if (supabaseRoot && sessionDbUrl) try {
+		checks.push(...databaseChecks(await probeDatabase(sessionDbUrl), readDeclaredBuckets(supabaseRoot)));
 	} catch (err) {
 		checks.push({
 			id: "database-unreachable",
@@ -1931,7 +1982,7 @@ function targetHeader(target, count) {
 		"#",
 		...comment(`The ${count} key${count === 1 ? "" : "s"} a \`pnpm devtools env push --target ${target}\` routes, and nothing else. The committed defaults and the per-developer values go nowhere, and a minted credential is signed at deploy time rather than stored, so none of the three has a line here to fill in.`),
 		"#",
-		...comment(target === "production" ? "The apply-tier credential IS here — SUPABASE_ACCESS_TOKEN reaches the production-apply GitHub environment, and no other target carries it." : `The apply-tier credential is NOT here. It exists to reshape production, so a copy in ${target} would be a second write-capable token to rotate for no benefit — and \`env push\` skips it outside production anyway.`),
+		...comment(target === "production" ? "The apply-tier credential IS here — SUPABASE_ACCESS_TOKEN reaches the production GitHub environment, and no other target carries it." : `The apply-tier credential is NOT here. It exists to reshape production, so a copy in ${target} would be a second write-capable token to rotate for no benefit — and \`env push\` skips it outside production anyway.`),
 		"#",
 		...comment(`Fill the values in, or run \`pnpm devtools env pull --target ${target}\` to fetch what Bitwarden already holds. Nothing is commented out: push reads assignments, and a commented line is not one — a value typed on it would be silently skipped.`),
 		"#",
@@ -2328,9 +2379,8 @@ function workflowsForTier(config, tier) {
 }
 /** Every app that actually carries a Wrangler configuration. */
 function discoverWranglerConfigs() {
-	const appsRoot = join(findRepoRoot(), "apps");
-	return readdirSync(appsRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory()).flatMap((entry) => {
-		const path = join(appsRoot, entry.name, "wrangler.jsonc");
+	return listApps().flatMap((entry) => {
+		const path = join(entry.dir, "wrangler.jsonc");
 		return existsSync(path) ? [{
 			app: entry.name,
 			path,
@@ -2347,7 +2397,7 @@ function discoverWranglerConfigs() {
 async function discoverCronMaps() {
 	const results = [];
 	for (const { app } of discoverWranglerConfigs()) {
-		const scheduledPath = join(findRepoRoot(), "apps", app, "cloudflare", "scheduled.ts");
+		const scheduledPath = join(findApp(app) ?? join(findRepoRoot(), "apps", app), "cloudflare", "scheduled.ts");
 		if (!existsSync(scheduledPath)) continue;
 		const mod = await import(pathToFileURL(scheduledPath).href);
 		const parsed = CronRoutes.safeParse(mod.CRON_ROUTES);
@@ -2560,7 +2610,7 @@ function readEnvFile(path) {
 /** Resolve the selected app's origin without assuming every app uses port 3000. */
 function resolveBaseUrl(app, tier, config, tierEnv) {
 	if (tier === "development" && app) {
-		const appRoot = join(findRepoRoot(), "apps", app);
+		const appRoot = findApp(app) ?? join(findRepoRoot(), "apps", app);
 		const local = {
 			...readEnvFile(join(appRoot, ".dev.vars.example")),
 			...readEnvFile(join(appRoot, ".dev.vars"))
@@ -2630,7 +2680,7 @@ function workspaceDepsBuildCommand(app) {
 /** Build only `app`'s workspace dependencies — all `vinext dev` needs, since
 * it compiles the app itself on demand. */
 function buildWorkspaceDeps(app) {
-	return run$1(workspaceDepsBuildCommand(app));
+	return run$1(workspaceDepsBuildCommand(app), void 0, appWorkspaceRoot(app));
 }
 //#endregion
 //#region src/workflows/commands.ts
@@ -2770,7 +2820,7 @@ function pidIsAlive(pid) {
 }
 function appDir(app) {
 	const path = workerPaths().find((candidate) => basename(candidate) === app);
-	return path === void 0 ? void 0 : join(findRepoRoot(), path);
+	return path === void 0 ? void 0 : workerAppDir(path);
 }
 /** Probe Wrangler's Workflow explorer API, rather than merely checking a port. */
 async function isWranglerDevRunning(port, timeoutMs = 1e3, fetcher = fetch) {
@@ -2853,7 +2903,7 @@ async function startTemporaryWrangler(app, requestedPort) {
 		return null;
 	}
 	const child = spawn("pnpm", vinextDevArgs(app, port), {
-		cwd: findRepoRoot(),
+		cwd: appWorkspaceRoot(app),
 		stdio: "inherit",
 		detached: process.platform !== "win32",
 		env: await scopedProcessEnv(app, loaded.env, "development")
@@ -3060,7 +3110,7 @@ async function runWorkflowsRun(argv) {
 	if (givenPort === void 0 && options.port && options.port !== "8787") recordResolved("--port", options.port);
 	process.stdout.write(`→ ${choice.name} (${choice.app}, ${tier})\n`);
 	try {
-		const result = await runWithStderr(workflowTriggerArgs(choice, options), triggerEnv);
+		const result = await runWithStderr(workflowTriggerArgs(choice, options), triggerEnv, appWorkspaceRoot(choice.app));
 		if (result.code !== 0 && tier === "development" && isWranglerDevConnectionFailure(result.stderr)) process.stderr.write(wranglerDevConnectionHint(choice.app, options.port ?? "8787"));
 		if (result.code === 0 && tier === "development" && options.instanceId) try {
 			return await waitForLocalWorkflow(choice.name, options.instanceId, options.port ?? "8787");
@@ -3980,6 +4030,11 @@ function runStatus(argv, cwd) {
 * reasons that have nothing to do with Supabase.
 */
 function detectLocalSupabase(cwd) {
+	const repoRoot = discoverRepoRoot(cwd);
+	if (repoRoot !== null) {
+		const layout = layoutAt(repoRoot);
+		if (layout.kind === "backstage" && layout.hasDevdogsuga) cwd = layout.devdogsugaRoot;
+	}
 	let output;
 	try {
 		output = runStatus([
@@ -5408,7 +5463,7 @@ async function runSupabaseRaw(args) {
 		"supabase",
 		...args
 	];
-	const result = await runInGroup("pnpm", full, { cwd: findRepoRoot() });
+	const result = await runInGroup("pnpm", full, { cwd: supabaseRoot() });
 	reportRan("pnpm", full, result);
 	return result.code;
 }
@@ -5482,7 +5537,7 @@ async function regenerateTypes() {
 		"run",
 		"types:db"
 	];
-	const result = await runInGroup("pnpm", args, { cwd: findRepoRoot() });
+	const result = await runInGroup("pnpm", args, { cwd: supabaseRoot() });
 	reportRan("pnpm", args, result);
 	return result.code;
 }
@@ -5710,6 +5765,28 @@ const NEEDS_DEPS_BUILT = /* @__PURE__ */ new Set([
 	"lint:fix",
 	"test"
 ]);
+/** The workspace root an app lives in: `<root>/apps/<name>` gives `<root>`. */
+function workspaceRootOfApp(dir) {
+	return dirname(dirname(dir));
+}
+/**
+* Splits `filters` by the workspace that holds the app each one names. From a
+* Backstage checkout `schedule-builder` belongs to DevDogsUGA's workspace, and
+* a `pnpm --filter` run from Backstage's root would match nothing. A filter
+* naming no known app (a glob, a path) stays with the repo you are in. No
+* filters means the whole workspace of the repo you are in.
+*/
+function groupFiltersByRoot(filters, apps = appsWith(), repoRoot = findRepoRoot()) {
+	const groups = /* @__PURE__ */ new Map([[repoRoot, []]]);
+	for (const filter of filters) {
+		const root = apps.find((app) => app.name === filter)?.root ?? repoRoot;
+		const group = groups.get(root) ?? [];
+		group.push(filter);
+		groups.set(root, group);
+	}
+	if (filters.length > 0 && groups.get(repoRoot)?.length === 0) groups.delete(repoRoot);
+	return groups;
+}
 /**
 * Runs one `pnpm` invocation to completion, reporting its own exit the way
 * `passthroughApps` needs to: it returns to keep going, and exits the process
@@ -5727,9 +5804,9 @@ const NEEDS_DEPS_BUILT = /* @__PURE__ */ new Set([
 * `packages/devtools`, and a `pnpm -r`/`--filter` invoked there would scope
 * itself relative to that one package rather than the workspace root.
 */
-async function runOne(args, extraEnv, { final }) {
+async function runOne({ args, cwd }, extraEnv, { final }) {
 	const result = await runInGroup("pnpm", args, {
-		cwd: findRepoRoot(),
+		cwd,
 		env: {
 			...process.env,
 			...extraEnv,
@@ -5749,7 +5826,7 @@ async function runOne(args, extraEnv, { final }) {
 * Never returns: `runOne` exits on a failure and on the final command.
 */
 async function passthrough(commands, extraEnv) {
-	for (const [index, args] of commands.entries()) await runOne(args, extraEnv, { final: index === commands.length - 1 });
+	for (const [index, command] of commands.entries()) await runOne(command, extraEnv, { final: index === commands.length - 1 });
 	process.exit(1);
 }
 /**
@@ -5820,19 +5897,31 @@ function extractFilters(args) {
 * `packages/*`/`docs` package is reachable from at least one app's
 * dependency graph, and no app depends on another app).
 */
-function allAppNames() {
-	const dir = join(findRepoRoot(), "apps");
-	if (!existsSync(dir)) return [];
+function allAppNames(root = findRepoRoot()) {
 	const names = [];
-	for (const entry of readdirSync(dir)) {
-		const manifest = join(dir, entry, "package.json");
+	for (const app of appManifests(root)) if (app.pkg.name) names.push(app.pkg.name);
+	return names;
+}
+/**
+* The parsed `package.json` of every app in the repo you are in, plus DevDogsUGA's
+* from a Backstage checkout (`repo/layout.ts`). With `root`, only that
+* workspace's. An unparsable manifest is one we cannot use, so it is skipped.
+*/
+function appManifests(root) {
+	const found = [];
+	for (const app of listApps(resolveLayout())) {
+		const appRoot = workspaceRootOfApp(app.dir);
+		if (root !== void 0 && appRoot !== root) continue;
+		const manifest = join(app.dir, "package.json");
 		if (!existsSync(manifest)) continue;
 		try {
-			const pkg = JSON.parse(readFileSync(manifest, "utf8"));
-			if (pkg.name) names.push(pkg.name);
+			found.push({
+				root: appRoot,
+				pkg: JSON.parse(readFileSync(manifest, "utf8"))
+			});
 		} catch {}
 	}
-	return names;
+	return found;
 }
 /**
 * Builds the `pnpm run <task>` invocation(s) for a set of package filters (or
@@ -5885,27 +5974,35 @@ function allAppNames() {
 */
 async function passthroughApps(task, filters, rest, extraEnv) {
 	const commands = [];
-	if (NEEDS_DEPS_BUILT.has(task) && (task !== "build" || filters.length > 0)) {
-		const depsFilters = (filters.length > 0 ? filters : allAppNames()).flatMap((f) => ["--filter", `${f}^...`]);
-		commands.push([
-			"-r",
-			"--if-present",
-			...depsFilters,
-			"run",
-			"build"
-		]);
+	for (const [cwd, groupFilters] of groupFiltersByRoot(filters)) {
+		if (NEEDS_DEPS_BUILT.has(task) && (task !== "build" || filters.length > 0)) {
+			const depsFilters = (groupFilters.length > 0 ? groupFilters : allAppNames(cwd)).flatMap((f) => ["--filter", `${f}^...`]);
+			commands.push({
+				args: [
+					"-r",
+					"--if-present",
+					...depsFilters,
+					"run",
+					"build"
+				],
+				cwd
+			});
+		}
+		const ownFilters = groupFilters.flatMap((f) => ["--filter", f]);
+		const parallel = task === "dev" ? ["--parallel"] : [];
+		commands.push({
+			args: [
+				"-r",
+				"--if-present",
+				...parallel,
+				...ownFilters,
+				"run",
+				task,
+				...rest
+			],
+			cwd
+		});
 	}
-	const ownFilters = filters.flatMap((f) => ["--filter", f]);
-	const parallel = task === "dev" ? ["--parallel"] : [];
-	commands.push([
-		"-r",
-		"--if-present",
-		...parallel,
-		...ownFilters,
-		"run",
-		task,
-		...rest
-	]);
 	return passthrough(commands, extraEnv);
 }
 /** A `dev` script that starts `vinext dev` (platform's `with-env vinext dev`). */
@@ -5954,15 +6051,18 @@ function planDev(apps, filters, rest) {
 * The env is the session's: `launch.ts` has already entered the tier into
 * `process.env` (or `--tier` loaded one into `tierEnv`).
 */
-async function runDev(plan, filters, rest, tierEnv) {
-	await runOne([
-		"-r",
-		"--if-present",
-		...(filters.length > 0 ? filters : allAppNames()).flatMap((f) => ["--filter", `${f}^...`]),
-		"run",
-		"build"
-	], tierEnv, { final: false });
-	const { scopedProcessEnv } = await import("./local-env-CR3McKHZ.js");
+async function runDev(plan, filters, rest, tierEnv, root) {
+	await runOne({
+		args: [
+			"-r",
+			"--if-present",
+			...(filters.length > 0 ? filters : allAppNames(root)).flatMap((f) => ["--filter", `${f}^...`]),
+			"run",
+			"build"
+		],
+		cwd: root
+	}, tierEnv, { final: false });
+	const { scopedProcessEnv } = await import("./local-env-MqH18s-N.js");
 	const environment = {
 		...process.env,
 		...tierEnv
@@ -5986,7 +6086,7 @@ async function runDev(plan, filters, rest, tierEnv) {
 	let first;
 	const runs = children.map(async ({ args, env }) => {
 		const result = await runInGroup("pnpm", args, {
-			cwd: findRepoRoot(),
+			cwd: root,
 			env: {
 				...env,
 				DEVDOGS_PICK: "0"
@@ -6004,8 +6104,14 @@ async function runDev(plan, filters, rest, tierEnv) {
 * `runDev`. */
 async function dispatch$1(task, filters, rest, tierEnv) {
 	if (task === "dev") {
-		const plan = planDev(appsWith("dev"), filters, rest);
-		if (plan.vinext.length > 0) return runDev(plan, filters, rest, tierEnv);
+		const groups = groupFiltersByRoot(filters);
+		if (groups.size > 1) {
+			process.stderr.write("devtools run: dev servers from DevDogsUGA and Backstage cannot be started together; start them from their own checkouts.\n");
+			process.exit(1);
+		}
+		const root = [...groups.keys()][0];
+		const plan = planDev(appsWith("dev", root), filters, rest);
+		if (plan.vinext.length > 0) return runDev(plan, filters, rest, tierEnv, root);
 	}
 	return passthroughApps(task, filters, rest, tierEnv);
 }
@@ -6053,21 +6159,15 @@ function parseTierArg(args) {
 * out to a dry-run equivalent, which costs about a second before the first
 * question.
 */
-function appsWith(task) {
-	const dir = join(findRepoRoot(), "apps");
-	if (!existsSync(dir)) return [];
+function appsWith(task, root) {
 	const found = [];
-	for (const entry of readdirSync(dir)) {
-		const manifest = join(dir, entry, "package.json");
-		if (!existsSync(manifest)) continue;
-		try {
-			const pkg = JSON.parse(readFileSync(manifest, "utf8"));
-			const script = pkg.scripts?.[task];
-			if (pkg.name && script) found.push({
-				name: pkg.name,
-				script
-			});
-		} catch {}
+	for (const app of appManifests(root)) {
+		const script = task === void 0 ? "" : app.pkg.scripts?.[task];
+		if (app.pkg.name && (task === void 0 || script)) found.push({
+			name: app.pkg.name,
+			script: script ?? "",
+			root: app.root
+		});
 	}
 	return found;
 }

package/dist/{failure-log-B5GG_8T1.js → failure-log-DOt6E3hS.js}

@@ -1,4 +1,4 @@
-import { a as ownVersion } from "./root-C2OmZDwD.js";
+import { a as ownVersion } from "./root-CjPWNkBu.js";
 import { mkdirSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { homedir, platform, release } from "node:os";

package/dist/launch.js

@@ -1,9 +1,9 @@
-import { a as cliName, t as installFailureLog } from "./failure-log-B5GG_8T1.js";
-import { C as helpPath, S as catalog, _ as bail, g as setMenuEnvHook, h as realEnvEntryDeps, m as enterSessionEnvironment, n as bareGroupStartPath, u as nonEmpty, v as errorMessage, x as unwrap } from "./menu-Craj11Sn.js";
-import { b as setDryRun, m as formatCommand, v as isDryRun, y as resolveDryRun } from "./supabase-project-Bw8sBFcE.js";
-import { n as discoverRepoRoot, r as findRepoRoot, t as RepoNotFoundError } from "./root-C2OmZDwD.js";
-import { i as loadEnvSession, r as loadEnvLoad } from "./peers-RBplwovA.js";
-import { d as hasYes, f as isNonInteractive, m as stripTierFlag, n as captureDevtoolsError, o as initDevtoolsTelemetry, p as stripNoEnvFlag, s as lastSentryEventId } from "./telemetry-Do13RFhc.js";
+import { a as cliName, t as installFailureLog } from "./failure-log-DOt6E3hS.js";
+import { C as helpPath, S as catalog, _ as bail, g as setMenuEnvHook, h as realEnvEntryDeps, m as enterSessionEnvironment, n as bareGroupStartPath, u as nonEmpty, v as errorMessage, x as unwrap } from "./menu-DYQ-Dd-O.js";
+import { b as resolveDryRun, h as formatCommand, x as setDryRun, y as isDryRun } from "./supabase-project-C93xRFkN.js";
+import { n as discoverRepoRoot, r as findRepoRoot, t as RepoNotFoundError } from "./root-CjPWNkBu.js";
+import { i as loadEnvSession, r as loadEnvLoad } from "./peers-DvUH5VxX.js";
+import { d as hasYes, f as isNonInteractive, m as stripTierFlag, n as captureDevtoolsError, o as initDevtoolsTelemetry, p as stripNoEnvFlag, s as lastSentryEventId } from "./telemetry-C07-ioHm.js";
 import { confirm, select } from "@clack/prompts";
 //#region ../cli-core/src/session.ts
 /**
@@ -155,7 +155,7 @@ function skipsEnvEntry(rest) {
 /** The offer's stack start (`env-entry.ts` holds the TTY prompt, this holds
 * the lifecycle command), imported lazily like the rest of the commands. */
 async function startStack() {
-	const { runStackCommand } = await import("./stack-B5UHASY2.js");
+	const { runStackCommand } = await import("./stack-o1Kml3V0.js");
 	return runStackCommand("start");
 }
 /**
@@ -166,7 +166,7 @@ async function startStack() {
 * post-tier-resolution path.
 */
 async function dispatch(argv) {
-	const { main } = await import("./cli-CeCAuSJd.js");
+	const { main } = await import("./cli-B_AiECh4.js");
 	try {
 		await main(argv);
 	} catch (err) {