@prisma/cli 3.0.0-beta.2 → 3.0.0-beta.21

package/dist/lib/agent/setup-status.js

@@ -0,0 +1,83 @@
+import { PRISMA_SKILLS_LOCK_FILENAME } from "./constants.js";
+import path from "node:path";
+import { readFile, stat } from "node:fs/promises";
+import { findComputeConfigDir } from "@prisma/compute-sdk/config";
+//#region src/lib/agent/setup-status.ts
+async function readPrismaAgentSetupStatus(options) {
+	const setupCwd = await resolvePrismaAgentSetupCwd(options);
+	const skillsLockPath = path.join(setupCwd, PRISMA_SKILLS_LOCK_FILENAME);
+	const [skillsInstalled, promptDismissedAt] = await Promise.all([hasPrismaSkillsLock(skillsLockPath, options.signal, options.requiredSkill), options.stateStore?.readAgentSetupPromptDismissedAt() ?? null]);
+	return {
+		skillsLockPath: path.basename(skillsLockPath),
+		skillsInstalled,
+		promptDismissedAt
+	};
+}
+async function resolvePrismaAgentSetupCwd(options) {
+	options.signal.throwIfAborted();
+	const configDir = await findComputeConfigDir(options.cwd, options.signal);
+	options.signal.throwIfAborted();
+	return configDir ?? options.cwd;
+}
+function isPrismaAgentSetupComplete(status) {
+	return status.skillsInstalled;
+}
+function shouldOfferPrismaAgentSetup(status) {
+	return !isPrismaAgentSetupComplete(status) && !status.promptDismissedAt;
+}
+async function isLikelyProjectDirectory(options) {
+	return (await Promise.all([
+		"package.json",
+		"prisma.compute.ts",
+		"prisma.config.ts",
+		".git"
+	].map((fileName) => pathExists(path.join(options.cwd, fileName), options.signal)))).some(Boolean);
+}
+async function hasPrismaSkillsLock(filePath, signal, requiredSkill) {
+	try {
+		const raw = await readFile(filePath, {
+			encoding: "utf8",
+			signal
+		});
+		return hasPrismaSkillsLockEntry(JSON.parse(raw), requiredSkill);
+	} catch (error) {
+		if (isNotFoundError(error) || error instanceof SyntaxError) return false;
+		throw error;
+	}
+}
+function hasPrismaSkillsLockEntry(value, requiredSkill) {
+	if (!isRecord(value)) return false;
+	if (requiredSkill) return skillLockEntryUsesPrismaSource(readSkillLockEntries(value)[requiredSkill]);
+	if (readLegacySources(value).includes("prisma/skills")) return true;
+	return Object.values(readSkillLockEntries(value)).some(skillLockEntryUsesPrismaSource);
+}
+function readLegacySources(value) {
+	return Array.isArray(value.sources) ? value.sources.filter((source) => typeof source === "string") : [];
+}
+function readSkillLockEntries(value) {
+	return isRecord(value.skills) ? value.skills : {};
+}
+function skillLockEntryUsesPrismaSource(value) {
+	return isRecord(value) && value.source === "prisma/skills";
+}
+function isRecord(value) {
+	return typeof value === "object" && value !== null;
+}
+async function pathExists(filePath, signal) {
+	signal.throwIfAborted();
+	try {
+		await stat(filePath);
+		signal.throwIfAborted();
+		return true;
+	} catch (error) {
+		if (signal.aborted) throw error;
+		if (isNotFoundError(error)) return false;
+		throw error;
+	}
+}
+function isNotFoundError(error) {
+	const code = error.code;
+	return code === "ENOENT" || code === "ENOTDIR";
+}
+//#endregion
+export { isLikelyProjectDirectory, readPrismaAgentSetupStatus, resolvePrismaAgentSetupCwd, shouldOfferPrismaAgentSetup };

package/dist/lib/app/app-interaction.js

@@ -0,0 +1,5 @@
+import "../../shell/prompt.js";
+//#region src/lib/app/app-interaction.ts
+const DEFAULT_REGION = "eu-central-1";
+//#endregion
+export { DEFAULT_REGION };

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

@@ -1,25 +1,29 @@
+import { createBranchDatabase, createEnvironmentVariable, deleteBranchDatabase, deleteEnvironmentVariable, listEnvironmentVariables, updateEnvironmentVariable } from "./branch-database-api.js";
+import { AppBuildStrategy } from "./build.js";
 import { envVarNames } from "./env-vars.js";
-import { PreviewBuildStrategy } from "./preview-build.js";
 import path from "node:path";
 import { ApiError, CancelledError, ComputeClient, streamLogs } from "@prisma/compute-sdk";
-//#region src/lib/app/preview-provider.ts
-var PreviewDomainApiError = class extends Error {
+//#region src/lib/app/app-provider.ts
+var DomainApiError = class extends Error {
 	status;
 	code;
 	hint;
 	constructor(options) {
 		super(`${options.summary}: ${options.message}${options.hint ? ` ${options.hint}` : ""}`);
-		this.name = "PreviewDomainApiError";
+		this.name = "DomainApiError";
 		this.status = options.status;
 		this.code = options.code ?? null;
 		this.hint = options.hint ?? null;
 	}
 };
-function createPreviewAppProvider(client, options) {
+function createAppProvider(client, options) {
 	const sdk = new ComputeClient(client);
 	return {
 		async createProject(options) {
-			const projectResult = await sdk.createProject({ name: options.name });
+			const projectResult = await sdk.createProject({
+				name: options.name,
+				signal: options.signal
+			});
 			if (projectResult.isErr()) throw new Error(projectResult.error.message);
 			return {
 				id: projectResult.value.id,
@@ -29,17 +33,52 @@ function createPreviewAppProvider(client, options) {
 		async listApps(projectId, options) {
 			return listComputeServices(client, {
 				projectId,
-				branchGitName: options?.branchName
+				branchGitName: options?.branchName,
+				signal: options?.signal
+			});
+		},
+		async resolveBranch(projectId, options) {
+			const branch = await resolveOrCreateBranch(client, {
+				projectId,
+				gitName: options.branchName,
+				signal: options.signal
 			});
+			return {
+				id: branch.id,
+				name: branch.gitName,
+				role: branch.role
+			};
+		},
+		async createBranchDatabase(options) {
+			return createBranchDatabase(client, options);
+		},
+		async deleteBranchDatabase(options) {
+			return deleteBranchDatabase(client, options);
+		},
+		async listEnvironmentVariables(options) {
+			return listEnvironmentVariables(client, options);
+		},
+		async createEnvironmentVariable(options) {
+			return createEnvironmentVariable(client, options);
+		},
+		async updateEnvironmentVariable(options) {
+			return updateEnvironmentVariable(client, options);
+		},
+		async deleteEnvironmentVariable(options) {
+			return deleteEnvironmentVariable(client, options);
 		},
-		async removeApp(appId) {
-			const appResult = await sdk.showService({ serviceId: appId });
+		async removeApp(appId, options) {
+			const appResult = await sdk.showApp({
+				appId,
+				signal: options?.signal
+			});
 			if (appResult.isErr()) throw new Error(appResult.error.message);
-			const destroyResult = await sdk.destroyService({
-				serviceId: appId,
-				keepService: false,
+			const destroyResult = await sdk.destroyApp({
+				appId,
+				keepApp: false,
 				timeoutSeconds: 120,
-				pollIntervalMs: 2e3
+				pollIntervalMs: 2e3,
+				signal: options?.signal
 			});
 			if (destroyResult.isErr()) throw new Error(destroyResult.error.message);
 			return {
@@ -47,17 +86,18 @@ function createPreviewAppProvider(client, options) {
 				name: appResult.value.name
 			};
 		},
-		async listDomains(appId) {
-			return listComputeServiceDomains(client, appId);
+		async listDomains(appId, options) {
+			return listComputeServiceDomains(client, appId, options?.signal);
 		},
 		async addDomain(options) {
-			const result = await client.POST("/v1/compute-services/{computeServiceId}/domains", {
-				params: { path: { computeServiceId: options.appId } },
-				body: { hostname: options.hostname }
+			const result = await client.POST("/v1/apps/{appId}/domains", {
+				params: { path: { appId: options.appId } },
+				body: { hostname: options.hostname },
+				signal: options.signal
 			});
 			if (result.error || !result.data) {
 				if (result.response.status === 409) {
-					const existing = (await listComputeServiceDomains(client, options.appId)).find((domain) => sameHostname(domain.hostname, options.hostname));
+					const existing = (await listComputeServiceDomains(client, options.appId, options.signal)).find((domain) => sameHostname(domain.hostname, options.hostname));
 					if (existing) return {
 						domain: existing,
 						existing: true
@@ -70,26 +110,36 @@ function createPreviewAppProvider(client, options) {
 				existing: false
 			};
 		},
-		async showDomain(domainId) {
-			const result = await client.GET("/v1/domains/{domainId}", { params: { path: { domainId } } });
+		async showDomain(domainId, options) {
+			const result = await client.GET("/v1/domains/{domainId}", {
+				params: { path: { domainId } },
+				signal: options?.signal
+			});
 			if (result.error || !result.data) throw domainApiCallError("Failed to show custom domain", result.response, result.error);
 			return normalizeDomainRecord(result.data.data);
 		},
-		async removeDomain(domainId) {
-			const result = await client.DELETE("/v1/domains/{domainId}", { params: { path: { domainId } } });
+		async removeDomain(domainId, options) {
+			const result = await client.DELETE("/v1/domains/{domainId}", {
+				params: { path: { domainId } },
+				signal: options?.signal
+			});
 			if (result.error) throw domainApiCallError("Failed to remove custom domain", result.response, result.error);
 		},
-		async retryDomain(domainId) {
-			const result = await client.POST("/v1/domains/{domainId}/retry", { params: { path: { domainId } } });
+		async retryDomain(domainId, options) {
+			const result = await client.POST("/v1/domains/{domainId}/retry", {
+				params: { path: { domainId } },
+				signal: options?.signal
+			});
 			if (result.error || !result.data) throw domainApiCallError("Failed to retry custom domain", result.response, result.error);
 			return normalizeDomainRecord(result.data.data);
 		},
 		async promoteDeployment(options) {
 			const promoteResult = await sdk.promote({
-				serviceId: options.appId,
-				versionId: options.deploymentId,
+				appId: options.appId,
+				deploymentId: options.deploymentId,
 				timeoutSeconds: 120,
 				pollIntervalMs: 2e3,
+				signal: options.signal,
 				progress: options.progress
 			});
 			if (promoteResult.isErr()) throw new Error(promoteResult.error.message);
@@ -103,27 +153,32 @@ function createPreviewAppProvider(client, options) {
 				projectId: options.projectId,
 				branchName: options.branchName,
 				appName: options.appName,
-				region: options.region
+				region: options.region,
+				signal: options.signal
 			}) : {
 				appId: void 0,
 				appName: options.appName,
 				region: options.region
 			};
 			const deployResult = await sdk.deploy({
-				strategy: new PreviewBuildStrategy({
+				strategy: new AppBuildStrategy({
 					appPath: path.resolve(options.cwd),
 					entrypoint: options.entrypoint,
-					buildType: options.buildType
+					buildType: options.buildType,
+					signal: options.signal,
+					buildSettings: options.buildSettings
 				}),
 				projectId: options.projectId,
-				serviceId: resolvedApp.appId,
-				serviceName: resolvedApp.appName,
+				appId: resolvedApp.appId,
+				appName: resolvedApp.appName,
 				region: resolvedApp.region,
 				portMapping: options.portMapping,
 				envVars: options.envVars,
+				skipPromote: options.skipPromote,
 				timeoutSeconds: 120,
 				pollIntervalMs: 2e3,
 				interaction: options.interaction,
+				signal: options.signal,
 				progress: options.progress
 			});
 			if (deployResult.isErr()) throw new Error(deployResult.error.message);
@@ -131,37 +186,47 @@ function createPreviewAppProvider(client, options) {
 			return {
 				projectId: deployed.projectId,
 				app: {
-					id: deployed.serviceId,
-					name: deployed.serviceName,
+					id: deployed.appId,
+					name: deployed.appName,
 					region: deployed.region ?? null,
-					liveDeploymentId: deployed.versionId,
-					liveUrl: toAbsoluteUrl(deployed.serviceEndpointDomain ?? null)
+					liveDeploymentId: deployed.promoted ? deployed.deploymentId : deployed.previousDeploymentId,
+					liveUrl: toAbsoluteUrl(deployed.appEndpointDomain ?? null)
 				},
 				deployment: {
-					id: deployed.versionId,
+					id: deployed.deploymentId,
 					status: "running",
-					url: toAbsoluteUrl(deployed.serviceEndpointDomain ?? deployed.versionEndpointDomain ?? null)
-				}
+					url: toAbsoluteUrl(deployed.appEndpointDomain ?? deployed.deploymentEndpointDomain ?? null),
+					live: deployed.promoted
+				},
+				promoted: deployed.promoted
 			};
 		},
 		async updateAppEnv(options) {
 			const updateResult = await sdk.updateEnv({
-				serviceId: options.appId,
+				appId: options.appId,
 				envVars: options.envVars,
 				timeoutSeconds: 120,
 				pollIntervalMs: 2e3,
+				signal: options.signal,
 				progress: options.progress
 			});
 			if (updateResult.isErr()) throw new Error(updateResult.error.message);
 			const promoteResult = await sdk.promote({
-				serviceId: options.appId,
-				versionId: updateResult.value.versionId,
+				appId: options.appId,
+				deploymentId: updateResult.value.deploymentId,
 				timeoutSeconds: 120,
 				pollIntervalMs: 2e3,
+				signal: options.signal,
 				progress: options.promoteProgress
 			});
 			if (promoteResult.isErr()) throw new Error(promoteResult.error.message);
-			const [serviceResult, versionResult] = await Promise.all([sdk.showService({ serviceId: options.appId }), sdk.showVersion({ versionId: updateResult.value.versionId })]);
+			const [serviceResult, versionResult] = await Promise.all([sdk.showApp({
+				appId: options.appId,
+				signal: options.signal
+			}), sdk.showDeployment({
+				deploymentId: updateResult.value.deploymentId,
+				signal: options.signal
+			})]);
 			if (serviceResult.isErr()) throw new Error(serviceResult.error.message);
 			if (versionResult.isErr()) throw new Error(versionResult.error.message);
 			return {
@@ -170,21 +235,27 @@ function createPreviewAppProvider(client, options) {
 					id: serviceResult.value.id,
 					name: serviceResult.value.name,
 					region: serviceResult.value.region ?? null,
-					liveDeploymentId: serviceResult.value.latestVersionId ?? null,
-					liveUrl: toAbsoluteUrl(serviceResult.value.serviceEndpointDomain ?? null)
+					liveDeploymentId: serviceResult.value.latestDeploymentId ?? null,
+					liveUrl: toAbsoluteUrl(serviceResult.value.appEndpointDomain ?? null)
 				},
 				deployment: {
 					id: versionResult.value.id,
 					status: versionResult.value.status,
 					createdAt: versionResult.value.createdAt,
-					url: toAbsoluteUrl(serviceResult.value.serviceEndpointDomain ?? versionResult.value.previewDomain ?? null),
+					url: toAbsoluteUrl(serviceResult.value.appEndpointDomain ?? versionResult.value.previewDomain ?? null),
 					live: true
 				},
 				variables: envVarNames(versionResult.value.envVars)
 			};
 		},
 		async listAppEnvNames(options) {
-			const [serviceResult, versionResult] = await Promise.all([sdk.showService({ serviceId: options.appId }), sdk.showVersion({ versionId: options.deploymentId })]);
+			const [serviceResult, versionResult] = await Promise.all([sdk.showApp({
+				appId: options.appId,
+				signal: options.signal
+			}), sdk.showDeployment({
+				deploymentId: options.deploymentId,
+				signal: options.signal
+			})]);
 			if (serviceResult.isErr()) throw new Error(serviceResult.error.message);
 			if (versionResult.isErr()) throw new Error(versionResult.error.message);
 			return {
@@ -193,21 +264,27 @@ function createPreviewAppProvider(client, options) {
 					id: serviceResult.value.id,
 					name: serviceResult.value.name,
 					region: serviceResult.value.region ?? null,
-					liveDeploymentId: serviceResult.value.latestVersionId ?? null,
-					liveUrl: toAbsoluteUrl(serviceResult.value.serviceEndpointDomain ?? null)
+					liveDeploymentId: serviceResult.value.latestDeploymentId ?? null,
+					liveUrl: toAbsoluteUrl(serviceResult.value.appEndpointDomain ?? null)
 				},
 				deployment: {
 					id: versionResult.value.id,
 					status: versionResult.value.status,
 					createdAt: versionResult.value.createdAt,
 					url: toAbsoluteUrl(versionResult.value.previewDomain ?? null),
-					live: serviceResult.value.latestVersionId === versionResult.value.id
+					live: serviceResult.value.latestDeploymentId === versionResult.value.id
 				},
 				variables: envVarNames(versionResult.value.envVars)
 			};
 		},
-		async listDeployments(appId) {
-			const [appResult, versionsResult] = await Promise.all([sdk.showService({ serviceId: appId }), sdk.listVersions({ serviceId: appId })]);
+		async listDeployments(appId, options) {
+			const [appResult, versionsResult] = await Promise.all([sdk.showApp({
+				appId,
+				signal: options?.signal
+			}), sdk.listDeployments({
+				appId,
+				signal: options?.signal
+			})]);
 			if (appResult.isErr()) throw new Error(appResult.error.message);
 			if (versionsResult.isErr()) throw new Error(versionsResult.error.message);
 			return {
@@ -215,8 +292,8 @@ function createPreviewAppProvider(client, options) {
 					id: appResult.value.id,
 					name: appResult.value.name,
 					region: appResult.value.region ?? null,
-					liveDeploymentId: appResult.value.latestVersionId ?? null,
-					liveUrl: toAbsoluteUrl(appResult.value.serviceEndpointDomain ?? null)
+					liveDeploymentId: appResult.value.latestDeploymentId ?? null,
+					liveUrl: toAbsoluteUrl(appResult.value.appEndpointDomain ?? null)
 				},
 				deployments: versionsResult.value.slice().sort((left, right) => {
 					const byDate = right.createdAt.localeCompare(left.createdAt);
@@ -230,14 +307,17 @@ function createPreviewAppProvider(client, options) {
 				}))
 			};
 		},
-		async showDeployment(deploymentId) {
-			const deploymentResult = await sdk.showVersion({ versionId: deploymentId });
+		async showDeployment(deploymentId, options) {
+			const deploymentResult = await sdk.showDeployment({
+				deploymentId,
+				signal: options?.signal
+			});
 			if (deploymentResult.isErr()) {
 				if (ApiError.is(deploymentResult.error) && deploymentResult.error.statusCode === 404) return null;
 				throw new Error(deploymentResult.error.message);
 			}
 			return {
-				app: await findAppForDeployment(sdk, deploymentId),
+				app: await findAppForDeployment(sdk, deploymentId, options?.signal),
 				deployment: {
 					id: deploymentResult.value.id,
 					status: deploymentResult.value.status,
@@ -252,7 +332,7 @@ function createPreviewAppProvider(client, options) {
 			const result = await streamLogs({
 				baseUrl: options.baseUrl,
 				token: await options.getToken(),
-				versionId: streamOptions.deploymentId,
+				deploymentId: streamOptions.deploymentId,
 				signal: streamOptions.signal
 			}, streamOptions.onRecord);
 			if (result.isErr()) {
@@ -263,22 +343,28 @@ function createPreviewAppProvider(client, options) {
 	};
 }
 async function listBranches(client, options) {
-	const result = await client.GET("/v1/projects/{projectId}/branches", { params: {
-		path: { projectId: options.projectId },
-		query: { gitName: options.gitName }
-	} });
+	const result = await client.GET("/v1/projects/{projectId}/branches", {
+		params: {
+			path: { projectId: options.projectId },
+			query: { gitName: options.gitName }
+		},
+		signal: options.signal
+	});
 	if (result.error || !result.data) throw apiCallError("Failed to list branches", result.response, result.error);
-	return result.data.data;
+	return result.data.data.map((branch) => ({
+		id: branch.id,
+		gitName: branch.gitName,
+		isDefault: branch.isDefault,
+		role: branch.role
+	}));
 }
 async function resolveOrCreateBranch(client, options) {
 	const existing = (await listBranches(client, options))[0];
 	if (existing) return existing;
 	const result = await client.POST("/v1/projects/{projectId}/branches", {
 		params: { path: { projectId: options.projectId } },
-		body: {
-			gitName: options.gitName,
-			isDefault: options.gitName === "main"
-		}
+		body: { gitName: options.gitName },
+		signal: options.signal
 	});
 	if (result.error || !result.data) {
 		if (result.response.status === 409) {
@@ -287,17 +373,26 @@ async function resolveOrCreateBranch(client, options) {
 		}
 		throw apiCallError(`Failed to create branch "${options.gitName}"`, result.response, result.error);
 	}
-	return result.data.data;
+	const branch = result.data.data;
+	return {
+		id: branch.id,
+		gitName: branch.gitName,
+		isDefault: branch.isDefault,
+		role: branch.role
+	};
 }
 async function listComputeServices(client, options) {
 	const services = [];
 	let cursor;
 	while (true) {
-		const result = await client.GET("/v1/compute-services", { params: { query: {
-			projectId: options.projectId,
-			branchGitName: options.branchGitName,
-			cursor
-		} } });
+		const result = await client.GET("/v1/apps", {
+			params: { query: {
+				projectId: options.projectId,
+				branchGitName: options.branchGitName,
+				cursor
+			} },
+			signal: options.signal
+		});
 		if (result.error || !result.data) throw apiCallError("Failed to list apps", result.response, result.error);
 		services.push(...result.data.data);
 		if (!result.data.pagination.hasMore || !result.data.pagination.nextCursor) break;
@@ -308,12 +403,15 @@ async function listComputeServices(client, options) {
 		name: service.name,
 		region: service.region.id ?? null,
 		branchId: service.branchId,
-		liveDeploymentId: service.latestVersionId ?? null,
-		liveUrl: toAbsoluteUrl(service.serviceEndpointDomain ?? null)
+		liveDeploymentId: service.latestDeploymentId ?? null,
+		liveUrl: toAbsoluteUrl(service.appEndpointDomain ?? null)
 	}));
 }
-async function listComputeServiceDomains(client, computeServiceId) {
-	const result = await client.GET("/v1/compute-services/{computeServiceId}/domains", { params: { path: { computeServiceId } } });
+async function listComputeServiceDomains(client, appId, signal) {
+	const result = await client.GET("/v1/apps/{appId}/domains", {
+		params: { path: { appId } },
+		signal
+	});
 	if (result.error || !result.data) throw domainApiCallError("Failed to list custom domains", result.response, result.error);
 	return result.data.data.map((domain) => normalizeDomainRecord(domain));
 }
@@ -323,7 +421,7 @@ function normalizeDomainRecord(domain) {
 		type: domain.type,
 		url: domain.url,
 		hostname: domain.hostname,
-		computeServiceId: domain.computeServiceId,
+		appId: domain.appId,
 		status: domain.status,
 		foundryStatus: domain.foundryStatus,
 		failureReason: domain.failureReason,
@@ -355,19 +453,24 @@ function normalizeHostnameForComparison(hostname) {
 async function createBranchApp(client, options) {
 	const branch = await resolveOrCreateBranch(client, {
 		projectId: options.projectId,
-		gitName: options.branchName
+		gitName: options.branchName,
+		signal: options.signal
+	});
+	const result = await client.POST("/v1/apps", {
+		body: {
+			projectId: options.projectId,
+			branchId: branch.id,
+			displayName: options.appName,
+			...options.region ? { regionId: options.region } : {}
+		},
+		signal: options.signal
 	});
-	const result = await client.POST("/v1/compute-services", { body: {
-		projectId: options.projectId,
-		branchId: branch.id,
-		displayName: options.appName,
-		...options.region ? { regionId: options.region } : {}
-	} });
 	if (result.error || !result.data) {
 		if (result.response.status === 409) {
 			const matched = (await listComputeServices(client, {
 				projectId: options.projectId,
-				branchGitName: options.branchName
+				branchGitName: options.branchName,
+				signal: options.signal
 			})).find((app) => app.name === options.appName);
 			if (matched) return {
 				appId: matched.id,
@@ -391,7 +494,7 @@ function apiCallError(summary, response, error) {
 	return /* @__PURE__ */ new Error(`${summary}: ${message}${hint}`);
 }
 function domainApiCallError(summary, response, error) {
-	return new PreviewDomainApiError({
+	return new DomainApiError({
 		summary,
 		status: response.status,
 		code: error.error?.code ?? null,
@@ -399,33 +502,46 @@ function domainApiCallError(summary, response, error) {
 		hint: error.error?.hint ?? null
 	});
 }
-async function findAppForDeployment(sdk, deploymentId) {
-	const projectsResult = await sdk.listProjects();
+async function findAppForDeployment(sdk, deploymentId, signal) {
+	const projectsResult = await sdk.listProjects({ signal });
 	if (projectsResult.isErr()) throw new Error(projectsResult.error.message);
 	for (const project of projectsResult.value) {
-		const servicesResult = await sdk.listServices({ projectId: project.id });
+		const servicesResult = await sdk.listApps({
+			projectId: project.id,
+			signal
+		});
 		if (servicesResult.isErr()) throw new Error(servicesResult.error.message);
 		for (const service of servicesResult.value) {
-			const detailResult = await sdk.showService({ serviceId: service.id });
-			if (detailResult.isErr()) throw new Error(detailResult.error.message);
-			const app = {
-				id: detailResult.value.id,
-				name: detailResult.value.name,
-				region: detailResult.value.region ?? null,
-				liveDeploymentId: detailResult.value.latestVersionId ?? null,
-				liveUrl: toAbsoluteUrl(detailResult.value.serviceEndpointDomain ?? null)
-			};
-			if (app.liveDeploymentId === deploymentId) return app;
-			const versionsResult = await sdk.listVersions({ serviceId: service.id });
-			if (versionsResult.isErr()) throw new Error(versionsResult.error.message);
-			if (versionsResult.value.some((version) => version.id === deploymentId)) return app;
+			const app = await findServiceAppForDeployment(sdk, service.id, deploymentId, signal);
+			if (app) return app;
 		}
 	}
 	return null;
 }
+async function findServiceAppForDeployment(sdk, serviceId, deploymentId, signal) {
+	const detailResult = await sdk.showApp({
+		appId: serviceId,
+		signal
+	});
+	if (detailResult.isErr()) throw new Error(detailResult.error.message);
+	const app = {
+		id: detailResult.value.id,
+		name: detailResult.value.name,
+		region: detailResult.value.region ?? null,
+		liveDeploymentId: detailResult.value.latestDeploymentId ?? null,
+		liveUrl: toAbsoluteUrl(detailResult.value.appEndpointDomain ?? null)
+	};
+	if (app.liveDeploymentId === deploymentId) return app;
+	const versionsResult = await sdk.listDeployments({
+		appId: serviceId,
+		signal
+	});
+	if (versionsResult.isErr()) throw new Error(versionsResult.error.message);
+	return versionsResult.value.some((version) => version.id === deploymentId) ? app : null;
+}
 function toAbsoluteUrl(url) {
 	if (!url) return null;
 	return url.startsWith("https://") || url.startsWith("http://") ? url : `https://${url}`;
 }
 //#endregion
-export { PreviewDomainApiError, createPreviewAppProvider };
+export { DomainApiError, createAppProvider };