@prisma/cli 3.0.0-beta.1 → 3.0.0-beta.3

package/dist/controllers/project.js

@@ -19,8 +19,8 @@ const GITHUB_INSTALL_POLL_TIMEOUT_MS = 12e4;
 function isRealMode(context) {
 	return !context.runtime.fixturePath && !context.runtime.env.PRISMA_CLI_MOCK_FIXTURE_PATH;
 }
-async function readProjectListLocalBinding(cwd, workspace, projects) {
-	const pin = await readLocalResolutionPin(cwd);
+async function readProjectListLocalBinding(cwd, workspace, projects, signal) {
+	const pin = await readLocalResolutionPin(cwd, signal);
 	if (pin.kind === "present") return pin.pin.workspaceId === workspace.id && projects.some((project) => project.id === pin.pin.projectId) ? { status: "linked" } : { status: "invalid" };
 	if (pin.kind === "invalid") return { status: "invalid" };
 	return { status: "not-linked" };
@@ -30,10 +30,10 @@ async function runProjectList(context) {
 	const workspace = authState.workspace;
 	if (!workspace) throw workspaceRequiredError();
 	if (isRealMode(context)) {
-		const client = await requireComputeAuth(context.runtime.env);
+		const client = await requireComputeAuth(context.runtime.env, context.runtime.signal);
 		if (!client) throw authRequiredError();
-		const projects = sortProjects(await listRealWorkspaceProjects(client, workspace));
-		const localBinding = await readProjectListLocalBinding(context.runtime.cwd, workspace, projects);
+		const projects = sortProjects(await listRealWorkspaceProjects(client, workspace, context.runtime.signal));
+		const localBinding = await readProjectListLocalBinding(context.runtime.cwd, workspace, projects, context.runtime.signal);
 		const nextActions = buildProjectListNextActions(localBinding);
 		return {
 			command: "project.list",
@@ -48,7 +48,7 @@ async function runProjectList(context) {
 		};
 	}
 	const result = await createProjectUseCases(createCliUseCaseGateways(context)).list(authState);
-	const localBinding = await readProjectListLocalBinding(context.runtime.cwd, workspace, result.projects);
+	const localBinding = await readProjectListLocalBinding(context.runtime.cwd, workspace, result.projects, context.runtime.signal);
 	const nextActions = buildProjectListNextActions(localBinding);
 	return {
 		command: "project.list",
@@ -88,11 +88,14 @@ async function runProjectCreate(context, projectName) {
 	if (!workspace) throw workspaceRequiredError();
 	if (!isValidProjectSetupName(projectName)) throw projectSetupNameRequiredError("project create");
 	if (!isRealMode(context)) throw featureUnavailableError("Project create is not available in fixture mode", "Creating Projects requires live platform integration.", "Rerun without fixture mode enabled to create a Project.", ["prisma-cli auth login"], "project");
-	const client = await requireComputeAuth(context.runtime.env);
+	const client = await requireComputeAuth(context.runtime.env, context.runtime.signal);
 	if (!client) throw authRequiredError();
 	const provider = createPreviewAppProvider(client);
 	const name = projectName.trim();
-	const created = await provider.createProject({ name }).catch((error) => {
+	const created = await provider.createProject({
+		name,
+		signal: context.runtime.signal
+	}).catch((error) => {
 		throw projectCreateFailedError(error, name, workspace, {
 			nextSteps: ["prisma-cli project list", "prisma-cli project link <id-or-name>"],
 			permissionFix: "Grant the token permission to create Projects in this workspace, or link an existing Project.",
@@ -115,10 +118,10 @@ async function runProjectLink(context, projectRef) {
 	let provider = null;
 	let projects;
 	if (isRealMode(context)) {
-		const client = await requireComputeAuth(context.runtime.env);
+		const client = await requireComputeAuth(context.runtime.env, context.runtime.signal);
 		if (!client) throw authRequiredError();
 		provider = createPreviewAppProvider(client);
-		projects = await listRealWorkspaceProjects(client, workspace);
+		projects = await listRealWorkspaceProjects(client, workspace, context.runtime.signal);
 	} else projects = listFixtureWorkspaceProjects(context, workspace);
 	let result;
 	if (projectRef?.trim()) result = await bindProjectToDirectory(context, workspace, toProjectSummary(resolveProjectForSetup(projectRef.trim(), projects, workspace)), "linked");
@@ -137,7 +140,7 @@ async function resolveInteractiveProjectLinkSetup(context, workspace, projects,
 		projects,
 		createProject: (projectName) => {
 			if (!provider) throw featureUnavailableError("Project create is not available in fixture mode", "Creating Projects requires live platform integration.", "Rerun without fixture mode enabled to create a Project.", ["prisma-cli auth login"], "project");
-			return createProjectForLinkSetup(provider, projectName, workspace);
+			return createProjectForLinkSetup(provider, projectName, workspace, context.runtime.signal);
 		},
 		cancel: {
 			why: "Project link needs a Project before it can continue.",
@@ -147,8 +150,11 @@ async function resolveInteractiveProjectLinkSetup(context, workspace, projects,
 	});
 	return bindProjectToDirectory(context, workspace, setup.project, setup.action);
 }
-async function createProjectForLinkSetup(provider, projectName, workspace) {
-	const created = await provider.createProject({ name: projectName }).catch((error) => {
+async function createProjectForLinkSetup(provider, projectName, workspace, signal) {
+	const created = await provider.createProject({
+		name: projectName,
+		signal
+	}).catch((error) => {
 		throw projectCreateFailedError(error, projectName, workspace, {
 			nextSteps: [
 				"prisma-cli project list",
@@ -166,7 +172,7 @@ async function createProjectForLinkSetup(provider, projectName, workspace) {
 	};
 }
 async function projectLinkTargetRequiredError(context, projects) {
-	const suggestedName = await inferTargetName(context.runtime.cwd);
+	const suggestedName = await inferTargetName(context.runtime.cwd, context.runtime.signal);
 	const createCommand = `prisma-cli project create ${formatCommandArgument(suggestedName.name)}`;
 	const recoveryCommands = ["prisma-cli project link <id-or-name>", createCommand];
 	return new CliError({
@@ -194,12 +200,12 @@ async function runGitConnect(context, gitUrl, options = {}) {
 	const workspace = (await requireAuthenticatedAuthState(context)).workspace;
 	if (!workspace) throw workspaceRequiredError();
 	if (isRealMode(context)) {
-		const client = await requireComputeAuth(context.runtime.env);
+		const client = await requireComputeAuth(context.runtime.env, context.runtime.signal);
 		if (!client) throw authRequiredError();
 		const target = await resolveRequiredProjectInRealMode(context, workspace, options.project, "git connect");
 		const repository = await resolveRepositoryForConnect(context, gitUrl);
 		const api = client;
-		const existing = await readFirstSourceRepository(api, target.project.id);
+		const existing = await readFirstSourceRepository(api, target.project.id, context.runtime.signal);
 		if (existing) {
 			const existingConnection = toRepositoryConnection(existing);
 			if (repositoryFullNamesMatch(existingConnection.repository.fullName, repository.fullName)) return {
@@ -214,12 +220,15 @@ async function runGitConnect(context, gitUrl, options = {}) {
 			throw repoAlreadyConnectedError(existingConnection.repository.fullName);
 		}
 		const resolvedRepository = await resolveInstalledRepository(context, api, workspace.id, repository);
-		const { data, error, response } = await api.POST("/v1/source-repositories", { body: {
-			projectId: target.project.id,
-			provider: "github",
-			providerRepositoryId: resolvedRepository.repository.id,
-			installationId: resolvedRepository.installation.id
-		} });
+		const { data, error, response } = await api.POST("/v1/source-repositories", {
+			body: {
+				projectId: target.project.id,
+				provider: "github",
+				providerRepositoryId: resolvedRepository.repository.id,
+				installationId: resolvedRepository.installation.id
+			},
+			signal: context.runtime.signal
+		});
 		if (error || !data) throw repoConnectionApiError("Failed to connect GitHub repository", response, error);
 		return {
 			command: "git.connect",
@@ -262,13 +271,16 @@ async function runGitDisconnect(context, options = {}) {
 	const workspace = (await requireAuthenticatedAuthState(context)).workspace;
 	if (!workspace) throw workspaceRequiredError();
 	if (isRealMode(context)) {
-		const client = await requireComputeAuth(context.runtime.env);
+		const client = await requireComputeAuth(context.runtime.env, context.runtime.signal);
 		if (!client) throw authRequiredError();
 		const target = await resolveRequiredProjectInRealMode(context, workspace, options.project, "git disconnect");
 		const api = client;
-		const existing = await readFirstSourceRepository(api, target.project.id);
+		const existing = await readFirstSourceRepository(api, target.project.id, context.runtime.signal);
 		if (!existing) throw repoNotConnectedError();
-		const { error, response } = await api.DELETE("/v1/source-repositories/{id}", { params: { path: { id: existing.id } } });
+		const { error, response } = await api.DELETE("/v1/source-repositories/{id}", {
+			params: { path: { id: existing.id } },
+			signal: context.runtime.signal
+		});
 		if (error) throw repoConnectionApiError("Failed to disconnect GitHub repository", response, error);
 		return {
 			command: "git.disconnect",
@@ -295,24 +307,24 @@ async function runGitDisconnect(context, options = {}) {
 	};
 }
 async function resolveProjectShowInRealMode(context, workspace, explicitProject) {
-	const client = await requireComputeAuth(context.runtime.env);
+	const client = await requireComputeAuth(context.runtime.env, context.runtime.signal);
 	if (!client) throw authRequiredError();
 	return inspectProjectBinding({
 		context,
 		workspace,
 		explicitProject,
-		listProjects: () => listRealWorkspaceProjects(client, workspace),
+		listProjects: () => listRealWorkspaceProjects(client, workspace, context.runtime.signal),
 		commandName: "project show"
 	});
 }
 async function resolveRequiredProjectInRealMode(context, workspace, explicitProject, commandName) {
-	const client = await requireComputeAuth(context.runtime.env);
+	const client = await requireComputeAuth(context.runtime.env, context.runtime.signal);
 	if (!client) throw authRequiredError();
 	return resolveProjectTarget({
 		context,
 		workspace,
 		explicitProject,
-		listProjects: () => listRealWorkspaceProjects(client, workspace),
+		listProjects: () => listRealWorkspaceProjects(client, workspace, context.runtime.signal),
 		commandName
 	});
 }
@@ -334,11 +346,12 @@ async function resolveRequiredProjectInFixtureMode(context, workspace, explicitP
 		commandName
 	});
 }
-async function listRealWorkspaceProjects(client, workspace) {
-	const { data } = await client.GET("/v1/projects", {});
+async function listRealWorkspaceProjects(client, workspace, signal) {
+	const { data } = await client.GET("/v1/projects", { signal });
 	return sortProjects((data?.data ?? []).filter((project) => project.workspace.id === workspace.id).map((project) => ({
 		id: project.id,
 		name: project.name,
+		..."url" in project && typeof project.url === "string" ? { url: project.url } : {},
 		slug: "slug" in project && typeof project.slug === "string" ? project.slug : null,
 		workspace: {
 			id: project.workspace.id,
@@ -350,21 +363,22 @@ function listFixtureWorkspaceProjects(context, workspace) {
 	return sortProjects(context.api.listProjectsForWorkspace(workspace.id).map((project) => ({
 		id: project.id,
 		name: project.name,
+		...project.url ? { url: project.url } : {},
 		slug: project.slug,
 		workspace
 	})));
 }
 async function resolveRepositoryForConnect(context, gitUrl) {
-	const remoteUrl = gitUrl ?? await readGitOriginRemote(context.runtime.cwd);
+	const remoteUrl = gitUrl ?? await readGitOriginRemote(context.runtime.cwd, context.runtime.signal);
 	if (!remoteUrl) throw usageError("Repository connection requires a GitHub repository URL", "No git-url was provided and the local repo does not have an origin remote.", "Pass a GitHub repository URL, or add a GitHub origin remote and rerun prisma-cli git connect.", ["prisma-cli git connect git@github.com:prisma/prisma-cli.git"], "project");
 	const repository = parseGitHubRepositoryUrl(remoteUrl);
 	if (!repository) throw unsupportedRepositoryProviderError();
 	return repository;
 }
 async function resolveInstalledRepository(context, api, workspaceId, repository) {
-	const lookup = await findRepositoryInInstallations(api, await listScmInstallations(api, workspaceId), repository);
+	const lookup = await findRepositoryInInstallations(api, await listScmInstallations(api, workspaceId, context.runtime.signal), repository, context.runtime.signal);
 	if (lookup.match) return lookup.match;
-	const installUrl = await createGitHubInstallIntent(api, workspaceId);
+	const installUrl = await createGitHubInstallIntent(api, workspaceId, context.runtime.signal);
 	const canWait = canPrompt(context);
 	const opened = await openInstallUrlIfInteractive(context, installUrl);
 	if (!canWait) {
@@ -377,11 +391,11 @@ async function resolveInstalledRepository(context, api, workspaceId, repository)
 	if (result.inspectableInstallationCount > 0) throw repoNotAccessibleError(repository, installUrl, opened);
 	throw repoInstallationRequiredError(repository, installUrl, opened);
 }
-async function findRepositoryInInstallations(api, installations, repository) {
+async function findRepositoryInInstallations(api, installations, repository, signal) {
 	let inspectableInstallationCount = 0;
 	for (const installation of installations) {
 		if (installation.provider !== "github" || installation.suspended) continue;
-		const matchedRepository = await findRepositoryInInstallationIfAvailable(api, installation.id, repository);
+		const matchedRepository = await findRepositoryInInstallationIfAvailable(api, installation.id, repository, signal);
 		if (matchedRepository === "unavailable") continue;
 		inspectableInstallationCount += 1;
 		if (matchedRepository) return {
@@ -403,7 +417,8 @@ async function waitForInstalledRepository(context, api, workspaceId, repository)
 	const deadline = Date.now() + timeoutMs;
 	let inspectableInstallationCount = 0;
 	while (Date.now() <= deadline) {
-		const lookup = await findRepositoryInInstallations(api, await listScmInstallations(api, workspaceId), repository);
+		context.runtime.signal.throwIfAborted();
+		const lookup = await findRepositoryInInstallations(api, await listScmInstallations(api, workspaceId, context.runtime.signal), repository, context.runtime.signal);
 		inspectableInstallationCount = lookup.inspectableInstallationCount;
 		if (lookup.match) return {
 			match: lookup.match,
@@ -411,7 +426,7 @@ async function waitForInstalledRepository(context, api, workspaceId, repository)
 		};
 		const remainingMs = deadline - Date.now();
 		if (remainingMs <= 0) break;
-		await sleep(Math.min(intervalMs, remainingMs));
+		await sleep(Math.min(intervalMs, remainingMs), context.runtime.signal);
 	}
 	return {
 		match: null,
@@ -429,37 +444,54 @@ function writeInstallWaitStatus(context, opened, installUrl) {
 	if (!opened) lines.push(installUrl);
 	context.output.stderr.write(`${lines.join("\n")}\n`);
 }
-function sleep(ms) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
+function sleep(ms, signal) {
+	signal.throwIfAborted();
+	return new Promise((resolve, reject) => {
+		const onAbort = () => {
+			clearTimeout(timeout);
+			reject(signal.reason);
+		};
+		const timeout = setTimeout(() => {
+			signal.removeEventListener("abort", onAbort);
+			resolve();
+		}, ms);
+		signal.addEventListener("abort", onAbort, { once: true });
+	});
 }
-async function listScmInstallations(api, workspaceId) {
+async function listScmInstallations(api, workspaceId, signal) {
 	const installations = [];
 	let cursor;
 	const seenCursors = /* @__PURE__ */ new Set();
 	do {
-		const { data, error, response } = await api.GET("/v1/scm-installations", { params: { query: {
-			workspaceId,
-			limit: 100,
-			...cursor ? { cursor } : {}
-		} } });
+		const { data, error, response } = await api.GET("/v1/scm-installations", {
+			params: { query: {
+				workspaceId,
+				limit: 100,
+				...cursor ? { cursor } : {}
+			} },
+			signal
+		});
 		if (error || !data) throw repoConnectionApiError("Failed to inspect GitHub App installations", response, error);
 		installations.push(...data.data);
 		cursor = readNextPaginationCursor(data.pagination, seenCursors, "Failed to inspect GitHub App installations", response);
 	} while (cursor);
 	return installations;
 }
-async function findRepositoryInInstallation(api, installationId, repository) {
+async function findRepositoryInInstallation(api, installationId, repository, signal) {
 	const expectedFullName = repository.fullName.toLowerCase();
 	let cursor;
 	const seenCursors = /* @__PURE__ */ new Set();
 	do {
-		const { data, error, response } = await api.GET("/v1/scm-installations/{installationId}/repositories", { params: {
-			path: { installationId },
-			query: {
-				limit: 100,
-				...cursor ? { cursor } : {}
-			}
-		} });
+		const { data, error, response } = await api.GET("/v1/scm-installations/{installationId}/repositories", {
+			params: {
+				path: { installationId },
+				query: {
+					limit: 100,
+					...cursor ? { cursor } : {}
+				}
+			},
+			signal
+		});
 		if (error || !data) throw repoConnectionApiError("Failed to inspect GitHub repositories", response, error);
 		const matchedRepository = data.data.find((candidate) => candidate.fullName.toLowerCase() === expectedFullName);
 		if (matchedRepository) return matchedRepository;
@@ -474,10 +506,11 @@ function readNextPaginationCursor(pagination, seenCursors, summary, response) {
 	seenCursors.add(nextCursor);
 	return nextCursor;
 }
-async function findRepositoryInInstallationIfAvailable(api, installationId, repository) {
+async function findRepositoryInInstallationIfAvailable(api, installationId, repository, signal) {
 	try {
-		return await findRepositoryInInstallation(api, installationId, repository);
+		return await findRepositoryInInstallation(api, installationId, repository, signal);
 	} catch (error) {
+		if (signal.aborted) throw error;
 		if (isUnavailableScmInstallationError(error)) return "unavailable";
 		throw error;
 	}
@@ -486,28 +519,37 @@ function isUnavailableScmInstallationError(error) {
 	if (!(error instanceof CliError) || error.code !== "REPO_CONNECTION_FAILED") return false;
 	return error.meta.status === 404 || error.meta.status === 422;
 }
-async function createGitHubInstallIntent(api, workspaceId) {
-	const { data, error, response } = await api.POST("/v1/scm-installations/install-intents", { body: {
-		provider: "github",
-		workspaceId
-	} });
+async function createGitHubInstallIntent(api, workspaceId, signal) {
+	const { data, error, response } = await api.POST("/v1/scm-installations/install-intents", {
+		body: {
+			provider: "github",
+			workspaceId
+		},
+		signal
+	});
 	if (error || !data) throw repoConnectionApiError("Failed to create GitHub App installation link", response, error);
 	return data.data.installUrl;
 }
 async function openInstallUrlIfInteractive(context, installUrl) {
 	if (!canPrompt(context)) return false;
 	try {
+		context.runtime.signal.throwIfAborted();
 		await open(installUrl);
+		context.runtime.signal.throwIfAborted();
 		return true;
-	} catch {
+	} catch (error) {
+		if (context.runtime.signal.aborted) throw error;
 		return false;
 	}
 }
-async function readFirstSourceRepository(api, projectId) {
-	const { data, error, response } = await api.GET("/v1/source-repositories", { params: { query: {
-		projectId,
-		limit: 1
-	} } });
+async function readFirstSourceRepository(api, projectId, signal) {
+	const { data, error, response } = await api.GET("/v1/source-repositories", {
+		params: { query: {
+			projectId,
+			limit: 1
+		} },
+		signal
+	});
 	if (error || !data) throw repoConnectionApiError("Failed to inspect GitHub repository connection", response, error);
 	return data.data[0] ?? null;
 }

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

@@ -1,11 +1,15 @@
 import { access, readFile } from "node:fs/promises";
 import path from "node:path";
 //#region src/lib/app/bun-project.ts
-async function readBunPackageJson(appPath) {
+async function readBunPackageJson(appPath, signal) {
 	const packageJsonPath = path.join(appPath, "package.json");
 	let content;
+	signal?.throwIfAborted();
 	try {
-		content = await readFile(packageJsonPath, "utf8");
+		content = await readFile(packageJsonPath, {
+			encoding: "utf8",
+			signal
+		});
 	} catch (error) {
 		if (error.code === "ENOENT") return null;
 		throw new Error(`Failed to read ${packageJsonPath}: ${error instanceof Error ? error.message : String(error)}`);
@@ -20,17 +24,20 @@ function readBunPackageEntrypoint(packageJson) {
 	if (typeof packageJson?.main === "string") return packageJson.main;
 	if (typeof packageJson?.module === "string") return packageJson.module;
 }
-async function resolveBunEntrypoint(appPath, explicitEntrypoint) {
-	const packageJson = await readBunPackageJson(appPath);
+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 (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.");
 	const entrypointPath = path.join(appPath, normalized);
+	signal?.throwIfAborted();
 	try {
 		await access(entrypointPath);
-	} catch {
+		signal?.throwIfAborted();
+	} catch (error) {
+		if (signal?.aborted) throw error;
 		throw new Error(`Entrypoint file does not exist: ${entrypointPath}`);
 	}
 	return normalized.split(path.sep).join("/");

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

@@ -2,6 +2,7 @@ import { padDisplay } from "../../shell/ui.js";
 //#region src/lib/app/deploy-output.ts
 const DEPLOY_OUTPUT_MIN_LABEL_WIDTH = 9;
 const DEPLOY_OUTPUT_MIN_VALUE_WIDTH = 9;
+const DEPLOY_SETTINGS_MIN_KEY_WIDTH = 10;
 function renderDeployOutputRows(ui, rows) {
 	if (rows.length === 0) return [];
 	const labelWidth = Math.max(DEPLOY_OUTPUT_MIN_LABEL_WIDTH, ...rows.map((row) => row.label.length));
@@ -11,5 +12,13 @@ function renderDeployOutputRows(ui, rows) {
 		return `  ${padDisplay(row.label, labelWidth)}  ${padDisplay(ui.strong(row.value), valueWidth)}${row.origin ? `  ${ui.dim(`· ${row.origin}`)}` : ""}`.trimEnd();
 	});
 }
+function renderDeploySettingsPreview(ui, rows) {
+	if (rows.length === 0) return [];
+	const keyWidth = Math.max(DEPLOY_SETTINGS_MIN_KEY_WIDTH, ...rows.map((row) => `${row.key}:`.length));
+	const rail = ui.dim("│");
+	return rows.map((row) => {
+		return `${rail}  ${ui.accent(padDisplay(`${row.key}:`, keyWidth))}  ${ui.strong(row.value)}`;
+	});
+}
 //#endregion
-export { renderDeployOutputRows };
+export { renderDeployOutputRows, renderDeploySettingsPreview };

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

@@ -10,14 +10,14 @@ const NEXT_CONFIG_FILENAMES = [
 	"next.config.mts"
 ];
 const DEFAULT_LOCAL_DEV_PORT = 3e3;
-async function resolveLocalBuildType(appPath, buildType) {
+async function resolveLocalBuildType(appPath, buildType, signal) {
 	if (buildType === "bun" || buildType === "nextjs") return buildType;
 	if (buildType !== "auto") return null;
-	return detectLocalBuildType(appPath);
+	return detectLocalBuildType(appPath, signal);
 }
-async function detectLocalBuildType(appPath) {
-	if (await isNextProject(appPath)) return "nextjs";
-	if (await isBunProject(appPath)) return "bun";
+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) {
@@ -58,7 +58,8 @@ async function runLocalApp(options) {
 			env: {
 				...options.env,
 				PORT: String(options.port)
-			}
+			},
+			signal: options.signal
 		}, spawnImpl, "Could not find the Next.js CLI. Install it with `npm install next` or ensure npx/bunx is available.");
 		return {
 			framework: "nextjs",
@@ -69,7 +70,7 @@ async function runLocalApp(options) {
 			signal: command.signal
 		};
 	}
-	const entrypoint = await resolveBunEntrypoint(options.appPath, options.entrypoint);
+	const entrypoint = await resolveBunEntrypoint(options.appPath, options.entrypoint, options.signal);
 	const command = await runWithFallback([{
 		command: "bun",
 		args: ["--watch", entrypoint],
@@ -79,7 +80,8 @@ async function runLocalApp(options) {
 		env: {
 			...options.env,
 			PORT: String(options.port)
-		}
+		},
+		signal: options.signal
 	}, spawnImpl, "Bun is required to run this app locally. Install it from https://bun.sh.");
 	return {
 		framework: "bun",
@@ -90,23 +92,37 @@ async function runLocalApp(options) {
 		signal: command.signal
 	};
 }
-async function isNextProject(appPath) {
-	for (const fileName of NEXT_CONFIG_FILENAMES) try {
-		await access(path.join(appPath, fileName));
-		return true;
-	} catch {}
-	return hasDependency(await readBunPackageJson(appPath), "next");
+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) {
+async function isBunProject(appPath, signal) {
+	signal?.throwIfAborted();
 	try {
 		await access(path.join(appPath, "bun.lock"));
+		signal?.throwIfAborted();
 		return true;
-	} catch {}
+	} catch (error) {
+		if (signal?.aborted) throw error;
+	}
+	signal?.throwIfAborted();
 	try {
 		await access(path.join(appPath, "bun.lockb"));
+		signal?.throwIfAborted();
 		return true;
-	} catch {}
-	const packageJson = await readBunPackageJson(appPath);
+	} 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");