@tinybirdco/sdk 0.0.3 → 0.0.6

package/dist/test/handlers.js

@@ -46,6 +46,47 @@ export function createNoChangesResponse() {
         result: "no_changes",
     };
 }
+/**
+ * Create deploy success response (for /v1/deploy endpoint)
+ * This returns a deployment object, not a build object
+ */
+export function createDeploySuccessResponse(options) {
+    return {
+        result: "success",
+        deployment: {
+            id: options?.deploymentId ?? "deploy-123",
+            status: options?.status ?? "pending",
+        },
+    };
+}
+/**
+ * Create deployment status response (for /v1/deployments/:id endpoint)
+ */
+export function createDeploymentStatusResponse(options) {
+    return {
+        result: "success",
+        deployment: {
+            id: options?.deploymentId ?? "deploy-123",
+            status: options?.status ?? "data_ready",
+        },
+    };
+}
+/**
+ * Create set-live success response (for /v1/deployments/:id/set-live endpoint)
+ */
+export function createSetLiveSuccessResponse() {
+    return {
+        result: "success",
+    };
+}
+/**
+ * Create deployments list response (for /v1/deployments endpoint)
+ */
+export function createDeploymentsListResponse(options) {
+    return {
+        deployments: options?.deployments ?? [],
+    };
+}
 /**
  * Default handlers for build and deploy endpoints
  */
@@ -58,5 +99,9 @@ export const handlers = [
     http.post(`${BASE_URL}/v1/deploy`, () => {
         return HttpResponse.json(createBuildSuccessResponse());
     }),
+    // Deployments list endpoint - empty list by default (no stale deployments)
+    http.get(`${BASE_URL}/v1/deployments`, () => {
+        return HttpResponse.json(createDeploymentsListResponse());
+    }),
 ];
 //# sourceMappingURL=handlers.js.map

package/dist/test/handlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"handlers.js","sourceRoot":"","sources":["../../src/test/handlers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAEzC,MAAM,CAAC,MAAM,QAAQ,GAAG,yBAAyB,CAAC;AAElD;;GAEG;AACH,MAAM,UAAU,0BAA0B,CAAC,OAQ1C;IACC,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,KAAK,EAAE;YACL,EAAE,EAAE,OAAO,EAAE,OAAO,IAAI,WAAW;YACnC,kBAAkB,EAAE,OAAO,EAAE,YAAY,IAAI,EAAE;YAC/C,cAAc,EAAE,OAAO,EAAE,QAAQ,IAAI,EAAE;YACvC,kBAAkB,EAAE,OAAO,EAAE,YAAY,IAAI,EAAE;YAC/C,wBAAwB,EAAE,OAAO,EAAE,kBAAkB,IAAI,EAAE;YAC3D,oBAAoB,EAAE,OAAO,EAAE,cAAc,IAAI,EAAE;YACnD,wBAAwB,EAAE,OAAO,EAAE,kBAAkB,IAAI,EAAE;SAC5D;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,0BAA0B,CAAC,KAAa;IACtD,OAAO;QACL,MAAM,EAAE,QAAQ;QAChB,KAAK;KACN,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iCAAiC,CAC/C,MAAmD;IAEnD,OAAO;QACL,MAAM,EAAE,QAAQ;QAChB,MAAM;KACP,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,uBAAuB;IACrC,OAAO;QACL,MAAM,EAAE,YAAY;KACrB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,sCAAsC;IACtC,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,WAAW,EAAE,GAAG,EAAE;QACrC,OAAO,YAAY,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC;IAEF,uCAAuC;IACvC,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,YAAY,EAAE,GAAG,EAAE;QACtC,OAAO,YAAY,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC;CACH,CAAC"}
+{"version":3,"file":"handlers.js","sourceRoot":"","sources":["../../src/test/handlers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAEzC,MAAM,CAAC,MAAM,QAAQ,GAAG,yBAAyB,CAAC;AAElD;;GAEG;AACH,MAAM,UAAU,0BAA0B,CAAC,OAQ1C;IACC,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,KAAK,EAAE;YACL,EAAE,EAAE,OAAO,EAAE,OAAO,IAAI,WAAW;YACnC,kBAAkB,EAAE,OAAO,EAAE,YAAY,IAAI,EAAE;YAC/C,cAAc,EAAE,OAAO,EAAE,QAAQ,IAAI,EAAE;YACvC,kBAAkB,EAAE,OAAO,EAAE,YAAY,IAAI,EAAE;YAC/C,wBAAwB,EAAE,OAAO,EAAE,kBAAkB,IAAI,EAAE;YAC3D,oBAAoB,EAAE,OAAO,EAAE,cAAc,IAAI,EAAE;YACnD,wBAAwB,EAAE,OAAO,EAAE,kBAAkB,IAAI,EAAE;SAC5D;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,0BAA0B,CAAC,KAAa;IACtD,OAAO;QACL,MAAM,EAAE,QAAQ;QAChB,KAAK;KACN,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iCAAiC,CAC/C,MAAmD;IAEnD,OAAO;QACL,MAAM,EAAE,QAAQ;QAChB,MAAM;KACP,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,uBAAuB;IACrC,OAAO;QACL,MAAM,EAAE,YAAY;KACrB,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,2BAA2B,CAAC,OAG3C;IACC,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,UAAU,EAAE;YACV,EAAE,EAAE,OAAO,EAAE,YAAY,IAAI,YAAY;YACzC,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,SAAS;SACrC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,8BAA8B,CAAC,OAG9C;IACC,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,UAAU,EAAE;YACV,EAAE,EAAE,OAAO,EAAE,YAAY,IAAI,YAAY;YACzC,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,YAAY;SACxC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,4BAA4B;IAC1C,OAAO;QACL,MAAM,EAAE,SAAS;KAClB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,6BAA6B,CAAC,OAE7C;IACC,OAAO;QACL,WAAW,EAAE,OAAO,EAAE,WAAW,IAAI,EAAE;KACxC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,sCAAsC;IACtC,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,WAAW,EAAE,GAAG,EAAE;QACrC,OAAO,YAAY,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC;IAEF,uCAAuC;IACvC,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,YAAY,EAAE,GAAG,EAAE;QACtC,OAAO,YAAY,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC;IAEF,2EAA2E;IAC3E,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,iBAAiB,EAAE,GAAG,EAAE;QAC1C,OAAO,YAAY,CAAC,IAAI,CAAC,6BAA6B,EAAE,CAAC,CAAC;IAC5D,CAAC,CAAC;CACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinybirdco/sdk",
-  "version": "0.0.3",
+  "version": "0.0.6",
   "description": "TypeScript SDK for Tinybird Forward - define datasources and pipes as TypeScript",
   "type": "module",
   "main": "./dist/index.js",
@@ -31,10 +31,12 @@
   "author": "Tinybird",
   "license": "MIT",
   "dependencies": {
+    "@clack/prompts": "^1.0.0",
     "chokidar": "^4.0.0",
     "commander": "^12.0.0",
     "dotenv": "^16.0.0",
-    "esbuild": "^0.24.0"
+    "esbuild": "^0.24.0",
+    "picocolors": "^1.1.1"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",

package/src/api/deploy.test.ts

@@ -1,20 +1,30 @@
-import { describe, it, expect, beforeAll, afterEach, afterAll } from "vitest";
+import { describe, it, expect, beforeAll, beforeEach, afterEach, afterAll } from "vitest";
 import { setupServer } from "msw/node";
 import { http, HttpResponse } from "msw";
 import { deployToMain } from "./deploy.js";
 import type { BuildConfig } from "./build.js";
 import {
   BASE_URL,
-  createBuildSuccessResponse,
+  createDeploySuccessResponse,
+  createDeploymentStatusResponse,
+  createSetLiveSuccessResponse,
   createBuildFailureResponse,
   createBuildMultipleErrorsResponse,
-  createNoChangesResponse,
+  createDeploymentsListResponse,
 } from "../test/handlers.js";
 import type { GeneratedResources } from "../generator/index.js";
 
 const server = setupServer();
 
 beforeAll(() => server.listen({ onUnhandledRequest: "error" }));
+beforeEach(() => {
+  // Set up default handler for deployments list (used by stale deployment cleanup)
+  server.use(
+    http.get(`${BASE_URL}/v1/deployments`, () => {
+      return HttpResponse.json(createDeploymentsListResponse());
+    })
+  );
+});
 afterEach(() => server.resetHandlers());
 afterAll(() => server.close());
 
@@ -34,42 +44,64 @@ describe("Deploy API", () => {
     connections: [],
   };
 
+  // Helper to set up successful deploy flow
+  function setupSuccessfulDeployFlow(deploymentId = "deploy-abc") {
+    server.use(
+      http.post(`${BASE_URL}/v1/deploy`, () => {
+        return HttpResponse.json(
+          createDeploySuccessResponse({ deploymentId, status: "pending" })
+        );
+      }),
+      http.get(`${BASE_URL}/v1/deployments/${deploymentId}`, () => {
+        return HttpResponse.json(
+          createDeploymentStatusResponse({ deploymentId, status: "data_ready" })
+        );
+      }),
+      http.post(`${BASE_URL}/v1/deployments/${deploymentId}/set-live`, () => {
+        return HttpResponse.json(createSetLiveSuccessResponse());
+      })
+    );
+  }
+
   describe("deployToMain", () => {
-    it("successfully deploys resources", async () => {
-      server.use(
-        http.post(`${BASE_URL}/v1/deploy`, () => {
-          return HttpResponse.json(
-            createBuildSuccessResponse({
-              buildId: "deploy-abc",
-              newPipes: ["top_events"],
-              newDatasources: ["events"],
-            })
-          );
-        })
-      );
+    it("successfully deploys resources with full flow", async () => {
+      setupSuccessfulDeployFlow("deploy-abc");
 
-      const result = await deployToMain(config, resources);
+      const result = await deployToMain(config, resources, { pollIntervalMs: 1 });
 
       expect(result.success).toBe(true);
       expect(result.result).toBe("success");
       expect(result.buildId).toBe("deploy-abc");
       expect(result.datasourceCount).toBe(1);
       expect(result.pipeCount).toBe(1);
-      expect(result.pipes?.created).toEqual(["top_events"]);
-      expect(result.datasources?.created).toEqual(["events"]);
     });
 
-    it("handles no changes response", async () => {
+    it("polls until deployment is ready", async () => {
+      let pollCount = 0;
+
       server.use(
         http.post(`${BASE_URL}/v1/deploy`, () => {
-          return HttpResponse.json(createNoChangesResponse());
+          return HttpResponse.json(
+            createDeploySuccessResponse({ deploymentId: "deploy-poll", status: "pending" })
+          );
+        }),
+        http.get(`${BASE_URL}/v1/deployments/deploy-poll`, () => {
+          pollCount++;
+          // Return pending for first 2 polls, then data_ready
+          const status = pollCount < 3 ? "pending" : "data_ready";
+          return HttpResponse.json(
+            createDeploymentStatusResponse({ deploymentId: "deploy-poll", status })
+          );
+        }),
+        http.post(`${BASE_URL}/v1/deployments/deploy-poll/set-live`, () => {
+          return HttpResponse.json(createSetLiveSuccessResponse());
         })
       );
 
-      const result = await deployToMain(config, resources);
+      const result = await deployToMain(config, resources, { pollIntervalMs: 1 });
 
       expect(result.success).toBe(true);
-      expect(result.result).toBe("no_changes");
+      expect(pollCount).toBe(3);
     });
 
     it("handles deploy failure with single error", async () => {
@@ -146,31 +178,66 @@ describe("Deploy API", () => {
       server.use(
         http.post(`${BASE_URL}/v1/deploy`, ({ request }) => {
           capturedUrl = request.url;
-          return HttpResponse.json(createBuildSuccessResponse());
+          return HttpResponse.json(
+            createDeploySuccessResponse({ deploymentId: "deploy-url-test" })
+          );
+        }),
+        http.get(`${BASE_URL}/v1/deployments/deploy-url-test`, () => {
+          return HttpResponse.json(
+            createDeploymentStatusResponse({ deploymentId: "deploy-url-test", status: "data_ready" })
+          );
+        }),
+        http.post(`${BASE_URL}/v1/deployments/deploy-url-test/set-live`, () => {
+          return HttpResponse.json(createSetLiveSuccessResponse());
         })
       );
 
-      await deployToMain(config, resources);
+      await deployToMain(config, resources, { pollIntervalMs: 1 });
 
       expect(capturedUrl).toBe(`${BASE_URL}/v1/deploy`);
     });
 
-    it("tracks changed and deleted resources", async () => {
+    it("handles failed deployment status", async () => {
       server.use(
         http.post(`${BASE_URL}/v1/deploy`, () => {
           return HttpResponse.json(
-            createBuildSuccessResponse({
-              changedPipes: ["top_events"],
-              deletedDatasources: ["old_ds"],
-            })
+            createDeploySuccessResponse({ deploymentId: "deploy-fail", status: "pending" })
+          );
+        }),
+        http.get(`${BASE_URL}/v1/deployments/deploy-fail`, () => {
+          return HttpResponse.json(
+            createDeploymentStatusResponse({ deploymentId: "deploy-fail", status: "failed" })
           );
         })
       );
 
-      const result = await deployToMain(config, resources);
+      const result = await deployToMain(config, resources, { pollIntervalMs: 1 });
 
-      expect(result.pipes?.changed).toEqual(["top_events"]);
-      expect(result.datasources?.deleted).toEqual(["old_ds"]);
+      expect(result.success).toBe(false);
+      expect(result.error).toContain("Deployment failed with status: failed");
+    });
+
+    it("handles set-live failure", async () => {
+      server.use(
+        http.post(`${BASE_URL}/v1/deploy`, () => {
+          return HttpResponse.json(
+            createDeploySuccessResponse({ deploymentId: "deploy-setlive-fail" })
+          );
+        }),
+        http.get(`${BASE_URL}/v1/deployments/deploy-setlive-fail`, () => {
+          return HttpResponse.json(
+            createDeploymentStatusResponse({ deploymentId: "deploy-setlive-fail", status: "data_ready" })
+          );
+        }),
+        http.post(`${BASE_URL}/v1/deployments/deploy-setlive-fail/set-live`, () => {
+          return HttpResponse.json({ error: "Set live failed" }, { status: 500 });
+        })
+      );
+
+      const result = await deployToMain(config, resources, { pollIntervalMs: 1 });
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain("Failed to set deployment as live");
     });
 
     it("normalizes baseUrl with trailing slash", async () => {
@@ -179,16 +246,50 @@ describe("Deploy API", () => {
       server.use(
         http.post(`${BASE_URL}/v1/deploy`, ({ request }) => {
           capturedUrl = request.url;
-          return HttpResponse.json(createBuildSuccessResponse());
+          return HttpResponse.json(
+            createDeploySuccessResponse({ deploymentId: "deploy-slash" })
+          );
+        }),
+        http.get(`${BASE_URL}/v1/deployments/deploy-slash`, () => {
+          return HttpResponse.json(
+            createDeploymentStatusResponse({ deploymentId: "deploy-slash", status: "data_ready" })
+          );
+        }),
+        http.post(`${BASE_URL}/v1/deployments/deploy-slash/set-live`, () => {
+          return HttpResponse.json(createSetLiveSuccessResponse());
         })
       );
 
       await deployToMain(
         { ...config, baseUrl: `${BASE_URL}/` },
-        resources
+        resources,
+        { pollIntervalMs: 1 }
       );
 
       expect(capturedUrl).toBe(`${BASE_URL}/v1/deploy`);
     });
+
+    it("times out when deployment never becomes ready", async () => {
+      server.use(
+        http.post(`${BASE_URL}/v1/deploy`, () => {
+          return HttpResponse.json(
+            createDeploySuccessResponse({ deploymentId: "deploy-timeout", status: "pending" })
+          );
+        }),
+        http.get(`${BASE_URL}/v1/deployments/deploy-timeout`, () => {
+          return HttpResponse.json(
+            createDeploymentStatusResponse({ deploymentId: "deploy-timeout", status: "pending" })
+          );
+        })
+      );
+
+      const result = await deployToMain(config, resources, {
+        pollIntervalMs: 1,
+        maxPollAttempts: 3,
+      });
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain("Deployment timed out");
+    });
   });
 });

package/src/api/deploy.ts

@@ -1,17 +1,54 @@
 /**
  * Deploy resources to Tinybird main workspace
- * Uses the /v1/deploy endpoint (same payload format as /v1/build)
+ * Uses the /v1/deploy endpoint to create a deployment, then sets it live
  */
 
 import type { GeneratedResources } from "../generator/index.js";
-import type { BuildConfig, BuildApiResult, BuildResponse } from "./build.js";
+import type { BuildConfig, BuildApiResult } from "./build.js";
+
+/**
+ * Deployment object returned by the /v1/deploy endpoint
+ */
+export interface Deployment {
+  id: string;
+  status: string;
+  live?: boolean;
+  created_at?: string;
+  updated_at?: string;
+}
+
+/**
+ * Response from /v1/deployments list endpoint
+ */
+export interface DeploymentsListResponse {
+  deployments: Deployment[];
+}
+
+/**
+ * Response from /v1/deploy endpoint
+ */
+export interface DeployResponse {
+  result: "success" | "failed";
+  deployment?: Deployment;
+  error?: string;
+  errors?: Array<{ filename?: string; error: string }>;
+}
+
+/**
+ * Response from /v1/deployments/{id} endpoint
+ */
+export interface DeploymentStatusResponse {
+  result: string;
+  deployment: Deployment;
+}
 
 /**
  * Deploy generated resources to Tinybird main workspace
  *
  * Uses the /v1/deploy endpoint which accepts all resources in a single
- * multipart form request. This is used for deploying to the main workspace
- * (not branches).
+ * multipart form request. After creating the deployment, this function:
+ * 1. Polls until the deployment is ready (status === 'data_ready')
+ * 2. Sets the deployment as live via /v1/deployments/{id}/set-live
  *
  * @param config - Build configuration with API URL and token
  * @param resources - Generated resources to deploy
@@ -38,9 +75,13 @@ import type { BuildConfig, BuildApiResult, BuildResponse } from "./build.js";
 export async function deployToMain(
   config: BuildConfig,
   resources: GeneratedResources,
-  options?: { debug?: boolean }
+  options?: { debug?: boolean; pollIntervalMs?: number; maxPollAttempts?: number }
 ): Promise<BuildApiResult> {
   const debug = options?.debug ?? !!process.env.TINYBIRD_DEBUG;
+  const pollIntervalMs = options?.pollIntervalMs ?? 1000;
+  const maxPollAttempts = options?.maxPollAttempts ?? 120; // 2 minutes max
+  const baseUrl = config.baseUrl.replace(/\/$/, "");
+
   const formData = new FormData();
 
   // Add datasources
@@ -73,14 +114,48 @@ export async function deployToMain(
     );
   }
 
-  // Make the request to /v1/deploy (instead of /v1/build)
-  const url = `${config.baseUrl.replace(/\/$/, "")}/v1/deploy`;
+  // Step 0: Clean up any stale non-live deployments that might block the new deployment
+  try {
+    const deploymentsUrl = `${baseUrl}/v1/deployments`;
+    const deploymentsResponse = await fetch(deploymentsUrl, {
+      headers: {
+        Authorization: `Bearer ${config.token}`,
+      },
+    });
+
+    if (deploymentsResponse.ok) {
+      const deploymentsBody = (await deploymentsResponse.json()) as DeploymentsListResponse;
+      const staleDeployments = deploymentsBody.deployments.filter(
+        (d) => !d.live && d.status !== "live"
+      );
+
+      for (const stale of staleDeployments) {
+        if (debug) {
+          console.log(`[debug] Cleaning up stale deployment: ${stale.id} (status: ${stale.status})`);
+        }
+        await fetch(`${baseUrl}/v1/deployments/${stale.id}`, {
+          method: "DELETE",
+          headers: {
+            Authorization: `Bearer ${config.token}`,
+          },
+        });
+      }
+    }
+  } catch (e) {
+    // Ignore errors during cleanup - we'll try to deploy anyway
+    if (debug) {
+      console.log(`[debug] Failed to clean up stale deployments: ${e}`);
+    }
+  }
+
+  // Step 1: Create deployment via /v1/deploy
+  const deployUrl = `${baseUrl}/v1/deploy`;
 
   if (debug) {
-    console.log(`[debug] POST ${url}`);
+    console.log(`[debug] POST ${deployUrl}`);
   }
 
-  const response = await fetch(url, {
+  const response = await fetch(deployUrl, {
     method: "POST",
     headers: {
       Authorization: `Bearer ${config.token}`,
@@ -89,7 +164,7 @@ export async function deployToMain(
   });
 
   // Parse response
-  let body: BuildResponse;
+  let body: DeployResponse;
   const rawBody = await response.text();
 
   if (debug) {
@@ -98,7 +173,7 @@ export async function deployToMain(
   }
 
   try {
-    body = JSON.parse(rawBody) as BuildResponse;
+    body = JSON.parse(rawBody) as DeployResponse;
   } catch {
     throw new Error(
       `Failed to parse response from Tinybird API: ${response.status} ${response.statusText}\nBody: ${rawBody}`
@@ -131,7 +206,7 @@ export async function deployToMain(
   }
 
   // Handle API result
-  if (body.result === "failed") {
+  if (body.result === "failed" || !body.deployment) {
     return {
       success: false,
       result: "failed",
@@ -142,25 +217,130 @@ export async function deployToMain(
     };
   }
 
+  const deploymentId = body.deployment.id;
+
+  if (debug) {
+    console.log(`[debug] Deployment created with ID: ${deploymentId}`);
+  }
+
+  // Step 2: Poll until deployment is ready
+  let deployment = body.deployment;
+  let attempts = 0;
+
+  while (deployment.status !== "data_ready" && attempts < maxPollAttempts) {
+    await sleep(pollIntervalMs);
+    attempts++;
+
+    if (debug) {
+      console.log(`[debug] Polling deployment status (attempt ${attempts})...`);
+    }
+
+    const statusUrl = `${baseUrl}/v1/deployments/${deploymentId}`;
+    const statusResponse = await fetch(statusUrl, {
+      headers: {
+        Authorization: `Bearer ${config.token}`,
+      },
+    });
+
+    if (!statusResponse.ok) {
+      return {
+        success: false,
+        result: "failed",
+        error: `Failed to check deployment status: ${statusResponse.status} ${statusResponse.statusText}`,
+        datasourceCount: resources.datasources.length,
+        pipeCount: resources.pipes.length,
+        connectionCount: resources.connections?.length ?? 0,
+        buildId: deploymentId,
+      };
+    }
+
+    const statusBody = (await statusResponse.json()) as DeploymentStatusResponse;
+    deployment = statusBody.deployment;
+
+    if (debug) {
+      console.log(`[debug] Deployment status: ${deployment.status}`);
+    }
+
+    // Check for failed status
+    if (deployment.status === "failed" || deployment.status === "error") {
+      return {
+        success: false,
+        result: "failed",
+        error: `Deployment failed with status: ${deployment.status}`,
+        datasourceCount: resources.datasources.length,
+        pipeCount: resources.pipes.length,
+        connectionCount: resources.connections?.length ?? 0,
+        buildId: deploymentId,
+      };
+    }
+  }
+
+  if (deployment.status !== "data_ready") {
+    return {
+      success: false,
+      result: "failed",
+      error: `Deployment timed out after ${maxPollAttempts} attempts. Last status: ${deployment.status}`,
+      datasourceCount: resources.datasources.length,
+      pipeCount: resources.pipes.length,
+      connectionCount: resources.connections?.length ?? 0,
+      buildId: deploymentId,
+    };
+  }
+
+  // Step 3: Set the deployment as live
+  const setLiveUrl = `${baseUrl}/v1/deployments/${deploymentId}/set-live`;
+
+  if (debug) {
+    console.log(`[debug] POST ${setLiveUrl}`);
+  }
+
+  const setLiveResponse = await fetch(setLiveUrl, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${config.token}`,
+    },
+  });
+
+  if (!setLiveResponse.ok) {
+    const setLiveBody = await setLiveResponse.text();
+    return {
+      success: false,
+      result: "failed",
+      error: `Failed to set deployment as live: ${setLiveResponse.status} ${setLiveResponse.statusText}\n${setLiveBody}`,
+      datasourceCount: resources.datasources.length,
+      pipeCount: resources.pipes.length,
+      connectionCount: resources.connections?.length ?? 0,
+      buildId: deploymentId,
+    };
+  }
+
+  if (debug) {
+    console.log(`[debug] Deployment ${deploymentId} is now live`);
+  }
+
   return {
     success: true,
-    result: body.result,
+    result: "success",
     datasourceCount: resources.datasources.length,
     pipeCount: resources.pipes.length,
     connectionCount: resources.connections?.length ?? 0,
-    buildId: body.build?.id,
+    buildId: deploymentId,
     pipes: {
-      changed: body.build?.changed_pipe_names ?? [],
-      created: body.build?.new_pipe_names ?? [],
-      deleted: body.build?.deleted_pipe_names ?? [],
+      changed: [],
+      created: [],
+      deleted: [],
     },
     datasources: {
-      changed: body.build?.changed_datasource_names ?? [],
-      created: body.build?.new_datasource_names ?? [],
-      deleted: body.build?.deleted_datasource_names ?? [],
+      changed: [],
+      created: [],
+      deleted: [],
     },
-    // Keep deprecated fields for backwards compatibility
-    changedPipeNames: body.build?.changed_pipe_names ?? [],
-    newPipeNames: body.build?.new_pipe_names ?? [],
   };
 }
+
+/**
+ * Helper function to sleep for a given number of milliseconds
+ */
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}