@prisma/cli 3.0.0-beta.9 → 3.0.0-dev.102.1

package/dist/lib/app/build-settings.js

@@ -0,0 +1,93 @@
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { resolveBuildSettings, resolveConfiguredBuildSettings } from "@prisma/compute-sdk";
+//#region src/lib/app/build-settings.ts
+/** Legacy build-settings file: no longer read or written, only detected for migration. */
+const PRISMA_APP_CONFIG_FILENAME = "prisma.app.json";
+/**
+* Detects a leftover `prisma.app.json`. The file is no longer used: one that
+* matches the effective settings is reported for deletion, one with custom
+* values must be migrated to the compute config so builds never silently
+* change.
+*/
+async function detectLegacyBuildSettings(options) {
+	const configPath = path.join(options.appPath, PRISMA_APP_CONFIG_FILENAME);
+	let content;
+	try {
+		options.signal?.throwIfAborted();
+		content = await readFile(configPath, {
+			encoding: "utf8",
+			signal: options.signal
+		});
+	} catch (error) {
+		if (options.signal?.aborted) throw error;
+		return { kind: "absent" };
+	}
+	let legacy;
+	try {
+		const parsed = JSON.parse(content);
+		const buildCommand = parsed.buildCommand === null || typeof parsed.buildCommand === "string" ? typeof parsed.buildCommand === "string" ? parsed.buildCommand.trim() || null : null : void 0;
+		const outputDirectory = typeof parsed.outputDirectory === "string" ? normalizeRelativePath(parsed.outputDirectory) : void 0;
+		if (buildCommand === void 0 || !outputDirectory) return {
+			kind: "invalid",
+			configPath
+		};
+		legacy = {
+			buildCommand,
+			outputDirectory
+		};
+	} catch {
+		return {
+			kind: "invalid",
+			configPath
+		};
+	}
+	return legacy.buildCommand === options.effective.buildCommand && legacy.outputDirectory === options.effective.outputDirectory ? {
+		kind: "matching",
+		configPath
+	} : {
+		kind: "custom",
+		configPath,
+		...legacy
+	};
+}
+/** Resolves build settings purely from framework inference; nothing is read or written. */
+async function resolveInferredAppBuildSettings(options) {
+	return {
+		status: "inferred",
+		configPath: null,
+		relativeConfigPath: null,
+		settings: await resolveBuildSettings(options)
+	};
+}
+/**
+* Resolves build settings when the compute config owns them: configured
+* fields win, omitted fields fall back to framework defaults.
+*/
+async function resolveConfiguredAppBuildSettings(options) {
+	const configFilename = path.basename(options.configPath);
+	const settings = await resolveConfiguredBuildSettings({
+		appPath: options.appPath,
+		buildType: options.buildType,
+		configured: options.configured,
+		source: `set by ${configFilename}`,
+		signal: options.signal
+	});
+	return {
+		status: "config",
+		configPath: options.configPath,
+		relativeConfigPath: configFilename,
+		settings
+	};
+}
+function normalizeRelativePath(value) {
+	const raw = value.trim().replace(/\\/g, "/");
+	if (raw.length === 0 || raw.split("/").includes("..")) return;
+	if (/^[A-Za-z]:/.test(raw)) return;
+	const normalized = path.posix.normalize(raw);
+	const segments = normalized.split("/");
+	if (path.win32.isAbsolute(value) || path.posix.isAbsolute(normalized) || segments.includes("..")) return;
+	return normalized === "." ? "." : normalized;
+}
+//#endregion
+export { PRISMA_APP_CONFIG_FILENAME, detectLegacyBuildSettings, resolveConfiguredAppBuildSettings, resolveInferredAppBuildSettings };

package/dist/lib/app/build.js

@@ -0,0 +1,82 @@
+import "./build-settings.js";
+import { FRAMEWORKS } from "@prisma/compute-sdk/config";
+import "node:fs/promises";
+import "node:path";
+import { normalizeArtifactSymlinks, resolveBuildStrategy } from "@prisma/compute-sdk";
+//#region src/lib/app/build.ts
+const RESOLVED_APP_BUILD_TYPES = [...frameworkBuildTypesByLastOccurrence()];
+const APP_BUILD_TYPES = ["auto", ...RESOLVED_APP_BUILD_TYPES];
+const APP_BUILD_TYPE_LABELS = APP_BUILD_TYPES.join(", ");
+function frameworkBuildTypesByLastOccurrence() {
+	const buildTypes = /* @__PURE__ */ new Set();
+	for (const framework of FRAMEWORKS) {
+		if (buildTypes.has(framework.buildType)) buildTypes.delete(framework.buildType);
+		buildTypes.add(framework.buildType);
+	}
+	return buildTypes;
+}
+var AppBuildStrategy = class {
+	#appPath;
+	#entrypoint;
+	#buildType;
+	#signal;
+	#buildSettings;
+	constructor(options) {
+		this.#appPath = options.appPath;
+		this.#entrypoint = options.entrypoint;
+		this.#buildType = options.buildType ?? "auto";
+		this.#signal = options.signal;
+		this.#buildSettings = options.buildSettings;
+	}
+	async canBuild(signal = this.#signal) {
+		const { strategy } = await resolveAppBuildStrategy({
+			appPath: this.#appPath,
+			entrypoint: this.#entrypoint,
+			buildType: this.#buildType,
+			signal,
+			buildSettings: this.#buildSettings
+		});
+		return strategy.canBuild(signal);
+	}
+	async execute(signal = this.#signal) {
+		const { artifact } = await executeAppBuild({
+			appPath: this.#appPath,
+			entrypoint: this.#entrypoint,
+			buildType: this.#buildType,
+			signal,
+			buildSettings: this.#buildSettings
+		});
+		return artifact;
+	}
+};
+async function executeAppBuild(options) {
+	const { strategy, buildType } = await resolveAppBuildStrategy({
+		appPath: options.appPath,
+		entrypoint: options.entrypoint,
+		buildType: options.buildType ?? "auto",
+		signal: options.signal,
+		buildSettings: options.buildSettings
+	});
+	const artifact = await strategy.execute(options.signal);
+	try {
+		await normalizeArtifactSymlinks(artifact.directory, options.appPath, options.signal);
+		return {
+			artifact,
+			buildType
+		};
+	} catch (error) {
+		await artifact.cleanup?.().catch(() => void 0);
+		throw error;
+	}
+}
+async function resolveAppBuildStrategy(options) {
+	return resolveBuildStrategy({
+		appPath: options.appPath,
+		buildType: options.buildType,
+		entrypoint: options.entrypoint,
+		buildSettings: options.buildSettings,
+		signal: options.signal
+	});
+}
+//#endregion
+export { APP_BUILD_TYPES, APP_BUILD_TYPE_LABELS, AppBuildStrategy, RESOLVED_APP_BUILD_TYPES, executeAppBuild };

package/dist/lib/app/bun-project.js

@@ -21,13 +21,12 @@ async function readBunPackageJson(appPath, signal) {
 	}
 }
 function readBunPackageEntrypoint(packageJson) {
-	if (typeof packageJson?.main === "string") return packageJson.main;
-	if (typeof packageJson?.module === "string") return packageJson.module;
+	return typeof packageJson?.main === "string" ? packageJson.main : void 0;
 }
 async function resolveBunEntrypoint(appPath, explicitEntrypoint, signal) {
 	const packageJson = await readBunPackageJson(appPath, signal);
 	const candidate = explicitEntrypoint ?? readBunPackageEntrypoint(packageJson);
-	if (!candidate) throw new Error("Entrypoint is required. Pass --entry or define package.json main or module.");
+	if (!candidate) throw new Error("Entrypoint is required. Pass --entry or define package.json main.");
 	if (path.isAbsolute(candidate)) throw new Error("Entrypoint must be a relative path.");
 	const normalized = path.normalize(candidate);
 	if (normalized.startsWith("..") || path.isAbsolute(normalized) || normalized.includes(`${path.sep}..${path.sep}`)) throw new Error("Entrypoint must not escape the app directory.");

package/dist/lib/app/compute-config.js

@@ -0,0 +1,147 @@
+import { CliError } from "../../shell/errors.js";
+import { COMPUTE_CONFIG_FILENAME, COMPUTE_CONFIG_FILENAME as COMPUTE_CONFIG_FILENAME$1, ComputeConfigTargetRequiredError, computeTargetAppDir, frameworkByKey, inferComputeTargetFromCwd, loadComputeConfig, selectComputeDeployTarget } from "@prisma/compute-sdk/config";
+import path from "node:path";
+import { matchError } from "better-result";
+//#region src/lib/app/compute-config.ts
+/**
+* Loads the nearest compute config, searching from `cwd` up to the source
+* root (repository or workspace boundary). Thin adapter over the SDK loader
+* keeping the CLI's positional-signal call shape.
+*/
+async function loadComputeConfig$1(cwd, signal) {
+	return loadComputeConfig(cwd, { signal });
+}
+/** Local build/run strategy implied by a configured framework. */
+function computeFrameworkToBuildType(framework) {
+	return frameworkByKey(framework).buildType;
+}
+function mergeComputeDeployInputs(options) {
+	const { cli, target, configFilename } = options;
+	const configAnnotation = `set by ${configFilename}`;
+	const framework = cli.framework ? {
+		value: cli.framework,
+		annotation: "set by --framework"
+	} : target?.framework ? {
+		value: target.framework,
+		annotation: configAnnotation
+	} : void 0;
+	const entrypoint = cli.entrypoint ? {
+		value: cli.entrypoint,
+		annotation: "set by --entry"
+	} : target?.entry ? {
+		value: target.entry,
+		annotation: configAnnotation
+	} : void 0;
+	const httpPort = cli.httpPort ? {
+		value: cli.httpPort,
+		annotation: "set by --http-port"
+	} : target?.httpPort ? {
+		value: String(target.httpPort),
+		annotation: configAnnotation
+	} : void 0;
+	const cliEnvInputs = cli.envInputs && cli.envInputs.length > 0 ? cli.envInputs : void 0;
+	const configEnvInputs = target && target.envInputs.length > 0 ? target.envInputs : void 0;
+	const envInputs = cliEnvInputs ?? configEnvInputs;
+	const configAppName = target?.name ? {
+		value: target.name,
+		annotation: configAnnotation
+	} : target?.key ? {
+		value: target.key,
+		annotation: configAnnotation
+	} : void 0;
+	return {
+		framework,
+		entrypoint,
+		httpPort,
+		envInputs,
+		envInputsFromConfig: !cliEnvInputs && configEnvInputs !== void 0,
+		configAppName,
+		appRoot: target?.root ?? void 0
+	};
+}
+/**
+* Merges CLI inputs for the local `app build` and `app run` commands with a
+* selected config target. Explicit flags win; `--build-type auto` is the
+* flag default and defers to the configured framework.
+*/
+function mergeComputeLocalInputs(options) {
+	const { cli, target } = options;
+	const cliBuildType = cli.buildType && cli.buildType !== "auto" ? cli.buildType : void 0;
+	const configBuildType = target?.framework ? computeFrameworkToBuildType(target.framework) : void 0;
+	return {
+		entrypoint: cli.entrypoint ?? target?.entry ?? void 0,
+		buildType: cliBuildType ?? configBuildType,
+		buildTypeFromConfig: !cliBuildType && configBuildType !== void 0,
+		port: cli.port ?? (target?.httpPort ? String(target.httpPort) : void 0),
+		appRoot: target?.root ?? void 0
+	};
+}
+function computeConfigErrorToCliError(error, commandName = "deploy") {
+	const command = `prisma-cli app ${commandName}`;
+	return matchError(error, {
+		ComputeConfigAmbiguousError: (ambiguous) => new CliError({
+			code: "COMPUTE_CONFIG_INVALID",
+			domain: "app",
+			summary: "Multiple compute config files found",
+			why: ambiguous.message,
+			fix: `Keep exactly one compute config file, preferably ${COMPUTE_CONFIG_FILENAME}.`,
+			meta: { configPaths: ambiguous.configPaths },
+			exitCode: 2,
+			nextSteps: [command]
+		}),
+		ComputeConfigLoadError: (load) => new CliError({
+			code: "COMPUTE_CONFIG_INVALID",
+			domain: "app",
+			summary: `Could not load ${path.basename(load.configPath)}`,
+			why: load.message,
+			fix: `Fix the error in ${path.basename(load.configPath)} and rerun the command.`,
+			where: load.configPath,
+			meta: { configPath: load.configPath },
+			exitCode: 2,
+			nextSteps: [command]
+		}),
+		ComputeConfigInvalidError: (invalid) => new CliError({
+			code: "COMPUTE_CONFIG_INVALID",
+			domain: "app",
+			summary: `Invalid ${path.basename(invalid.configPath)}`,
+			why: invalid.issues.join(" "),
+			fix: `Edit ${path.basename(invalid.configPath)} so it default-exports defineComputeConfig({ app }) or defineComputeConfig({ apps }).`,
+			where: invalid.configPath,
+			meta: {
+				configPath: invalid.configPath,
+				issues: invalid.issues
+			},
+			exitCode: 2,
+			nextSteps: [command]
+		}),
+		ComputeConfigTargetRequiredError: (required) => new CliError({
+			code: "COMPUTE_CONFIG_TARGET_REQUIRED",
+			domain: "app",
+			summary: "App target required",
+			why: required.message,
+			fix: `Pass the app target, for example ${command} <target>.`,
+			meta: {
+				configPath: required.configPath,
+				availableTargets: required.availableTargets
+			},
+			exitCode: 2,
+			nextSteps: required.availableTargets.map((target) => `${command} ${target}`)
+		}),
+		ComputeConfigTargetUnknownError: (unknown) => new CliError({
+			code: "COMPUTE_CONFIG_TARGET_UNKNOWN",
+			domain: "app",
+			summary: `Unknown app target "${unknown.requestedTarget}"`,
+			why: unknown.message,
+			fix: unknown.availableTargets.length > 0 ? `Pass one of the configured targets: ${unknown.availableTargets.join(", ")}.` : "Remove the target argument; this config defines a single app.",
+			meta: {
+				configPath: unknown.configPath,
+				requestedTarget: unknown.requestedTarget,
+				availableTargets: unknown.availableTargets
+			},
+			exitCode: 2,
+			nextSteps: unknown.availableTargets.length > 0 ? unknown.availableTargets.map((target) => `${command} ${target}`) : [command]
+		})
+	});
+}
+//#endregion
+export { COMPUTE_CONFIG_FILENAME$1 as COMPUTE_CONFIG_FILENAME, ComputeConfigTargetRequiredError, computeConfigErrorToCliError, computeFrameworkToBuildType, computeTargetAppDir, inferComputeTargetFromCwd, loadComputeConfig$1 as loadComputeConfig, mergeComputeDeployInputs, mergeComputeLocalInputs, selectComputeDeployTarget };

package/dist/lib/app/deploy-plan.js

@@ -0,0 +1,58 @@
+//#region src/lib/app/deploy-plan.ts
+/**
+* Decides whether a deploy covers one app or the whole system. A multi-app
+* config with no target named or inferred deploys every target in declaration
+* order; everything else (single-app config, an explicit/inferred target, or
+* no config at all) is a single deploy.
+*/
+function planAppDeploy(options) {
+	const { config, requestedTarget, hasCreateProject } = options;
+	if (!(config !== null && config.kind === "multi" && !requestedTarget && config.targets.length > 1)) return { mode: "single" };
+	const total = config.targets.length;
+	return {
+		mode: "all",
+		targets: config.targets.map((target, index) => ({
+			targetKey: target.key,
+			index,
+			total,
+			bindsCreateProject: index === 0 && hasCreateProject
+		}))
+	};
+}
+/**
+* Names the per-app inputs present in a deploy-all invocation, in the order
+* they should be reported. An empty list means the run is unambiguous; the
+* caller renders the usage error when it is not.
+*/
+function perAppInputsForDeployAll(inputs) {
+	return [
+		["--app", inputs.appName],
+		["--framework", inputs.framework],
+		["--entry", inputs.entrypoint],
+		["--http-port", inputs.httpPort],
+		["--env", inputs.envAssignments?.length ? inputs.envAssignments : void 0],
+		[inputs.appIdEnvVar.name, inputs.appIdEnvVar.value]
+	].filter(([, value]) => value !== void 0).map(([flag]) => flag);
+}
+/**
+* Describes a deploy-all run that stopped at the first failing target: which
+* targets already went live and which were never attempted, so the caller can
+* surface a converge path. Pure; the caller folds this into the CliError.
+*/
+function describeDeployAllFailure(options) {
+	const { targetKeys, failedIndex, completed } = options;
+	const failedTarget = targetKeys[failedIndex];
+	const notAttempted = targetKeys.slice(failedIndex + 1);
+	return {
+		failedTarget,
+		completed,
+		notAttempted,
+		contextLines: [
+			`Deploying all apps stopped at "${failedTarget}" (${failedIndex + 1}/${targetKeys.length}).`,
+			...completed.length > 0 ? [`Already live: ${completed.map((entry) => entry.target).join(", ")}.`] : [],
+			...notAttempted.length > 0 ? [`Not attempted: ${notAttempted.join(", ")}.`] : []
+		]
+	};
+}
+//#endregion
+export { describeDeployAllFailure, perAppInputsForDeployAll, planAppDeploy };

package/dist/lib/app/{preview-progress.js → deploy-progress.js}

@@ -1,19 +1,19 @@
 import { renderDeployOutputRows } from "./deploy-output.js";
-//#region src/lib/app/preview-progress.ts
-function createPreviewDeployProgressState() {
+//#region src/lib/app/deploy-progress.ts
+function createDeployProgressState() {
 	return {
 		buildStarted: false,
 		buildCompleted: false,
 		archiveReady: false,
 		uploadCompleted: false,
-		versionId: null,
+		deploymentId: null,
 		startRequested: false,
 		containerLive: false,
 		deploymentUrl: null,
 		promotedUrl: null
 	};
 }
-function createPreviewDeployProgress(output, ui, enabled, state = createPreviewDeployProgressState()) {
+function createDeployProgress(output, ui, enabled, state = createDeployProgressState()) {
 	const write = (line) => {
 		if (!enabled) return;
 		output.write(`${line}\n`);
@@ -39,8 +39,8 @@ function createPreviewDeployProgress(output, ui, enabled, state = createPreviewD
 		onUploadStart() {
 			write("Uploading...");
 		},
-		onVersionCreated(versionId) {
-			state.versionId = versionId;
+		onDeploymentCreated(deploymentId) {
+			state.deploymentId = deploymentId;
 		},
 		onUploadComplete() {
 			state.uploadCompleted = true;
@@ -63,22 +63,22 @@ function createPreviewDeployProgress(output, ui, enabled, state = createPreviewD
 function formatArtifactSize(byteLength) {
 	return `${(byteLength / 1024 / 1024).toFixed(1)} MB`;
 }
-function createPreviewPromoteProgress(output, enabled) {
+function createPromoteProgress(output, enabled) {
 	if (!enabled) return;
 	const write = (line) => {
 		output.write(`${line}\n`);
 	};
 	return {
-		onVersionStarting(versionId) {
-			write(`Starting deployment ${versionId}...`);
+		onDeploymentStarting(deploymentId) {
+			write(`Starting deployment ${deploymentId}...`);
 		},
-		onVersionStartRequested() {
+		onDeploymentStartRequested() {
 			write("Requesting deployment start...");
 		},
 		onStatusChange(status) {
 			write(`Status: ${status}`);
 		},
-		onVersionRunning() {
+		onDeploymentRunning() {
 			write("Deployment is running.");
 		},
 		onPromoteStart() {
@@ -97,4 +97,4 @@ function createPreviewPromoteProgress(output, enabled) {
 	};
 }
 //#endregion
-export { createPreviewDeployProgress, createPreviewDeployProgressState, createPreviewPromoteProgress };
+export { createDeployProgress, createDeployProgressState, createPromoteProgress };

package/dist/lib/app/local-dev.js

@@ -1,25 +1,9 @@
-import { readBunPackageEntrypoint, readBunPackageJson, resolveBunEntrypoint } from "./bun-project.js";
-import { access } from "node:fs/promises";
+import { resolveBunEntrypoint } from "./bun-project.js";
+import "node:fs/promises";
 import path from "node:path";
 import { spawn } from "node:child_process";
 //#region src/lib/app/local-dev.ts
-const NEXT_CONFIG_FILENAMES = [
-	"next.config.js",
-	"next.config.mjs",
-	"next.config.ts",
-	"next.config.mts"
-];
 const DEFAULT_LOCAL_DEV_PORT = 3e3;
-async function resolveLocalBuildType(appPath, buildType, signal) {
-	if (buildType === "bun" || buildType === "nextjs") return buildType;
-	if (buildType !== "auto") return null;
-	return detectLocalBuildType(appPath, signal);
-}
-async function detectLocalBuildType(appPath, signal) {
-	if (await isNextProject(appPath, signal)) return "nextjs";
-	if (await isBunProject(appPath, signal)) return "bun";
-	return null;
-}
 async function runLocalApp(options) {
 	const spawnImpl = options.spawnImpl ?? spawn;
 	if (options.buildType === "nextjs") {
@@ -92,47 +76,6 @@ async function runLocalApp(options) {
 		signal: command.signal
 	};
 }
-async function isNextProject(appPath, signal) {
-	for (const fileName of NEXT_CONFIG_FILENAMES) {
-		signal?.throwIfAborted();
-		try {
-			await access(path.join(appPath, fileName));
-			signal?.throwIfAborted();
-			return true;
-		} catch (error) {
-			if (signal?.aborted) throw error;
-		}
-	}
-	return hasDependency(await readBunPackageJson(appPath, signal), "next");
-}
-async function isBunProject(appPath, signal) {
-	signal?.throwIfAborted();
-	try {
-		await access(path.join(appPath, "bun.lock"));
-		signal?.throwIfAborted();
-		return true;
-	} catch (error) {
-		if (signal?.aborted) throw error;
-	}
-	signal?.throwIfAborted();
-	try {
-		await access(path.join(appPath, "bun.lockb"));
-		signal?.throwIfAborted();
-		return true;
-	} catch (error) {
-		if (signal?.aborted) throw error;
-	}
-	const packageJson = await readBunPackageJson(appPath, signal);
-	if (!packageJson) return false;
-	const hasEntrypoint = typeof readBunPackageEntrypoint(packageJson) === "string";
-	const hasBunDependency = hasDependency(packageJson, "@types/bun") || hasDependency(packageJson, "bun");
-	const usesBunScripts = (typeof packageJson.scripts === "object" && packageJson.scripts !== null ? Object.values(packageJson.scripts) : []).some((value) => typeof value === "string" && /\bbun\b/.test(value));
-	return hasEntrypoint && (hasBunDependency || usesBunScripts);
-}
-function hasDependency(packageJson, dependencyName) {
-	if (!packageJson) return false;
-	return [packageJson.dependencies, packageJson.devDependencies].some((group) => typeof group === "object" && group !== null && dependencyName in group);
-}
 async function runWithFallback(candidates, options, spawnImpl, missingCommandMessage) {
 	for (const candidate of candidates) try {
 		const result = await spawnCommand(candidate, options, spawnImpl);
@@ -163,4 +106,4 @@ function spawnCommand(candidate, options, spawnImpl) {
 	});
 }
 //#endregion
-export { DEFAULT_LOCAL_DEV_PORT, resolveLocalBuildType, runLocalApp };
+export { DEFAULT_LOCAL_DEV_PORT, runLocalApp };

package/dist/lib/app/production-deploy-gate.js

@@ -1,6 +1,6 @@
 import { CliError } from "../../shell/errors.js";
-import { canPrompt } from "../../shell/runtime.js";
 import { confirmPrompt } from "../../shell/prompt.js";
+import { canPrompt } from "../../shell/runtime.js";
 //#region src/lib/app/production-deploy-gate.ts
 async function enforceProductionDeployGate(context, provider, options) {
 	if (options.branchKind !== "production") return { firstProductionDeploy: false };
@@ -104,12 +104,12 @@ function productionDeployRequiresFlagError() {
 			"",
 			"Production deploys require explicit intent. Re-run with:",
 			"",
-			"  prisma app deploy --prod",
+			"  prisma-cli app deploy --prod",
 			"",
 			"Or deploy a preview from a feature branch:",
 			"",
 			"  git checkout -b <branch-name>",
-			"  prisma app deploy"
+			"  prisma-cli app deploy"
 		]
 	});
 }

package/dist/lib/app/read-branch.js

@@ -0,0 +1,30 @@
+//#region src/lib/app/read-branch.ts
+/**
+* Resolves the branch an app management command should read from, without ever
+* creating one. Returns the branch whose `gitName` matches `branchName`, else
+* the project's default branch, else null when the project has no branches.
+*/
+async function resolveReadBranch(client, options) {
+	const branches = [];
+	let cursor;
+	do {
+		const result = await client.GET("/v1/projects/{projectId}/branches", {
+			params: {
+				path: { projectId: options.projectId },
+				query: { cursor }
+			},
+			signal: options.signal
+		});
+		if (result.error || !result.data) throw new Error(`Failed to list branches for project ${options.projectId}: ${JSON.stringify(result.error)}`);
+		branches.push(...result.data.data);
+		cursor = result.data.pagination.hasMore ? result.data.pagination.nextCursor ?? void 0 : void 0;
+	} while (cursor);
+	const chosen = branches.find((branch) => branch.gitName === options.branchName) ?? branches.find((branch) => branch.isDefault) ?? null;
+	return chosen ? {
+		id: chosen.id,
+		name: chosen.gitName,
+		kind: chosen.role
+	} : null;
+}
+//#endregion
+export { resolveReadBranch };

package/dist/lib/auth/auth-ops.js

@@ -26,7 +26,7 @@ function workspaceIdFromClaims(claims) {
 }
 async function performLogin(env, signal) {
 	await login({
-		tokenStorage: new FileTokenStorage(env, signal),
+		tokenStorage: new FileTokenStorage(env, signal, { activateOnSetTokens: true }),
 		env,
 		signal
 	});
@@ -38,7 +38,8 @@ async function readAuthState(env, signal) {
 		if (serviceToken.length === 0) throw new Error(`${SERVICE_TOKEN_ENV_VAR} is set but empty. Provide a valid token or unset the variable.`);
 		return readServiceTokenAuthState(serviceToken, env, signal);
 	}
-	const tokens = await new FileTokenStorage(env, signal).getTokens();
+	const tokenStorage = new FileTokenStorage(env, signal);
+	const tokens = await tokenStorage.getTokens();
 	if (!tokens) return {
 		authenticated: false,
 		provider: null,
@@ -48,15 +49,20 @@ async function readAuthState(env, signal) {
 	};
 	const client = await requireComputeAuth(env, signal);
 	const currentPrincipal = await readCurrentPrincipalAuthState(client, signal);
-	if (currentPrincipal) return currentPrincipal;
+	if (currentPrincipal) {
+		if (currentPrincipal.authenticated && currentPrincipal.workspace) await tokenStorage.rememberWorkspace?.(tokens.workspaceId, currentPrincipal.workspace);
+		return currentPrincipal;
+	}
 	const claims = decodeJwtPayload(tokens.accessToken);
-	return buildAuthState({
+	const authState = await buildAuthState({
 		workspaceIdFromCredential: tokens.workspaceId,
 		claims,
 		env,
 		client,
 		signal
 	});
+	if (authState.authenticated && authState.workspace) await tokenStorage.rememberWorkspace?.(tokens.workspaceId, authState.workspace);
+	return authState;
 }
 async function readServiceTokenAuthState(token, env, signal) {
 	const client = await requireComputeAuth(env, signal);

package/dist/lib/auth/guard.js

@@ -22,7 +22,10 @@ async function requireComputeAuth(env = process.env, signal) {
 			token
 		});
 	}
-	const tokenStorage = new FileTokenStorage(env, signal);
+	const tokenStorage = new FileTokenStorage(env, signal, {
+		activateOnSetTokens: false,
+		lockSetTokens: false
+	});
 	if (!await tokenStorage.getTokens()) return null;
 	return createManagementApiSdk({
 		clientId: CLIENT_ID,