Merge remote-tracking branch 'origin/main' into feat/build-logs-command

# Conflicts:
#	packages/cli/package.json
#	pnpm-lock.yaml

Author: kristof-siket

packages/cli/package.json

@@ -46,7 +46,7 @@
     "@clack/prompts": "^1.5.0",
     "@prisma/compute-sdk": "0.31.0",
     "@prisma/credentials-store": "^7.8.0",
-    "@prisma/management-api-sdk": "^1.45.0",
+    "@prisma/management-api-sdk": "^1.46.0",
     "better-result": "^2.9.2",
     "colorette": "^2.0.20",
     "commander": "^14.0.3",

packages/cli/src/controllers/app.ts

@@ -2288,7 +2288,7 @@ function toAppDomainSummary(domain: DomainRecord): AppDomainSummary {
     type: domain.type,
     url: domain.url,
     hostname: domain.hostname,
-    computeServiceId: domain.computeServiceId,
+    appId: domain.appId,
     status: domain.status,
     foundryStatus: domain.foundryStatus,
     failureReason: domain.failureReason,

packages/cli/src/lib/app/app-provider.ts

@@ -106,7 +106,7 @@ export interface DomainRecord {
   type: "custom-domain";
   url: string;
   hostname: string;
-  computeServiceId: string;
+  appId: string;
   status: DomainStatus;
   foundryStatus: string;
   failureReason: string | null;
@@ -791,7 +791,7 @@ interface RawDomainRecord {
   type: "custom-domain";
   url: string;
   hostname: string;
-  computeServiceId: string;
+  appId: string;
   status: DomainStatus;
   foundryStatus: string;
   failureReason: string | null;
@@ -926,12 +926,12 @@ async function listComputeServices(
 
 async function listComputeServiceDomains(
   client: ManagementApiClient,
-  computeServiceId: string,
+  appId: string,
   signal?: AbortSignal,
 ): Promise<DomainRecord[]> {
   const result = await client.GET("/v1/apps/{appId}/domains", {
     params: {
-      path: { appId: computeServiceId },
+      path: { appId: appId },
     },
     signal,
   });
@@ -953,7 +953,7 @@ function normalizeDomainRecord(domain: RawDomainRecord): DomainRecord {
     type: domain.type,
     url: domain.url,
     hostname: domain.hostname,
-    computeServiceId: domain.computeServiceId,
+    appId: domain.appId,
     status: domain.status,
     foundryStatus: domain.foundryStatus,
     failureReason: domain.failureReason,

packages/cli/src/types/app.ts

@@ -191,7 +191,7 @@ export interface AppDomainSummary {
   type: "custom-domain";
   url: string;
   hostname: string;
-  computeServiceId: string;
+  appId: string;
   status: AppDomainStatus;
   foundryStatus: string;
   failureReason: string | null;

packages/cli/tests/app-controller.test.ts

@@ -91,7 +91,7 @@ function createDomain(
   overrides: Partial<{
     id: string;
     hostname: string;
-    computeServiceId: string;
+    appId: string;
     status:
       | "pending_dns"
       | "verifying"
@@ -116,7 +116,7 @@ function createDomain(
     type: "custom-domain" as const,
     url: `https://api.prisma.io/v1/domains/${overrides.id ?? "dom_123"}`,
     hostname,
-    computeServiceId: overrides.computeServiceId ?? "app_1",
+    appId: overrides.appId ?? "app_1",
     status: overrides.status ?? "pending_dns",
     foundryStatus: overrides.status ?? "pending_dns",
     failureReason: overrides.failureReason ?? null,

packages/cli/tests/app-presenter.test.ts

@@ -25,7 +25,7 @@ function createDomain(
     type: "custom-domain",
     url: "https://api.prisma.io/v1/domains/dom_123",
     hostname: "shop.acme.com",
-    computeServiceId: "app_1",
+    appId: "app_1",
     status: "pending_dns",
     foundryStatus: "pending",
     failureReason: null,

packages/cli/tests/app-provider.test.ts

@@ -375,7 +375,7 @@ describe("preview app provider", () => {
                   type: "custom-domain",
                   url: "https://api.prisma.io/v1/domains/dom_123",
                   hostname: "shop.acme.com",
-                  computeServiceId: "app_1",
+                  appId: "app_1",
                   status: "active",
                   foundryStatus: "active",
                   failureReason: null,
@@ -465,7 +465,7 @@ describe("preview app provider", () => {
                   type: "custom-domain",
                   url: "https://api.prisma.io/v1/domains/dom_123",
                   hostname: "other.acme.com",
-                  computeServiceId: "app_1",
+                  appId: "app_1",
                   status: "active",
                   foundryStatus: "active",
                   failureReason: null,