ardent-cli 0.0.22 → 0.0.24

package/dist/index.js

@@ -72,6 +72,32 @@ function getCacheEntry(key) {
   const config = loadConfig();
   return config.cache?.[key];
 }
+function formatIdle(lastActivityIso) {
+  if (!lastActivityIso) {
+    return "unknown";
+  }
+  const last = new Date(lastActivityIso).getTime();
+  if (Number.isNaN(last)) {
+    return "unknown";
+  }
+  const diffMs = Date.now() - last;
+  const diffSec = Math.floor(diffMs / 1e3);
+  if (diffSec < 60) {
+    return "just now";
+  }
+  const minutes = Math.floor(diffSec / 60);
+  if (minutes < 60) {
+    return `${minutes}m`;
+  }
+  const hours = Math.floor(minutes / 60);
+  if (hours < 24) {
+    const remMinutes = minutes - hours * 60;
+    return `${hours}h ${remMinutes}m`;
+  }
+  const days = Math.floor(hours / 24);
+  const remHours = hours - days * 24;
+  return `${days}d ${remHours}h`;
+}
 function formatCacheTime(isoString) {
   const date = new Date(isoString);
   const now = /* @__PURE__ */ new Date();
@@ -404,7 +430,8 @@ async function createAction(name, options) {
       service_type: apiBranch.service_type,
       branch_url: apiBranch.branch_url || "",
       status: apiBranch.status,
-      created_at: apiBranch.created_at
+      created_at: apiBranch.created_at,
+      last_branch_activity: apiBranch.last_branch_activity
     };
     const cached = getCacheEntry("branches");
     const cachedBranches = cached?.data || [];
@@ -431,6 +458,9 @@ ${branch.branch_url}`);
 }
 
 // src/commands/branch/list.ts
+function formatCreatedDate(createdAtIso) {
+  return new Date(createdAtIso).toISOString().slice(0, 10);
+}
 async function listAction() {
   let branches = [];
   let fromCache = false;
@@ -484,13 +514,16 @@ async function listAction() {
   for (const branch of branches) {
     const isCurrent = branch.name === current;
     const icon = branch.status === "active" ? "\u25CF" : "\u25CB";
+    const metadataLine = `${branch.service_type} \xB7 created ${formatCreatedDate(branch.created_at)} \xB7 idle ${formatIdle(branch.last_branch_activity)} (${branch.status})`;
     if (isCurrent) {
       console.log(`${green2}* ${icon} ${branch.name}${reset2}`);
+      console.log(`${green2}      ${metadataLine}${reset2}`);
       if (branch.branch_url) {
         console.log(`${green2}      ${branch.branch_url}${reset2}`);
       }
     } else {
       console.log(`  ${icon} ${branch.name}`);
+      console.log(`${dim2}      ${metadataLine}${reset2}`);
       if (branch.branch_url) {
         console.log(`${dim2}      ${branch.branch_url}${reset2}`);
       }
@@ -632,6 +665,35 @@ branchCommand.command("diff [name]", { hidden: true }).description("(removed) Sh
 // src/commands/connector/index.ts
 import { Command as Command2 } from "commander";
 
+// src/lib/engine_setup_result.ts
+var SUCCESS_ENGINE_STATUSES = /* @__PURE__ */ new Set(["healthy", "degraded"]);
+var RETRYABLE_ENGINE_STATUSES = /* @__PURE__ */ new Set(["configuration_verified"]);
+var FAILED_ENGINE_STATUSES = /* @__PURE__ */ new Set(["configuration_failed", "failed_validation"]);
+function assertEngineSetupCompleted(operation) {
+  const result = operation.result;
+  if (!result) {
+    throw new Error("Engine setup completed without a result payload.");
+  }
+  const engineStatus = result.branching_engine_status;
+  if (typeof engineStatus !== "string" || engineStatus.length === 0) {
+    throw new Error("Engine setup completed without branching_engine_status in the result.");
+  }
+  if (SUCCESS_ENGINE_STATUSES.has(engineStatus)) {
+    return;
+  }
+  if (RETRYABLE_ENGINE_STATUSES.has(engineStatus)) {
+    throw new Error(
+      `Engine setup needs retry (status: ${engineStatus}). Run \`ardent connector list\` to inspect connector state, then retry engine setup.`
+    );
+  }
+  if (FAILED_ENGINE_STATUSES.has(engineStatus)) {
+    throw new Error(
+      `Engine setup failed (status: ${engineStatus}). Run \`ardent connector list\` to inspect connector state.`
+    );
+  }
+  throw new Error(`Engine setup completed with unexpected status: ${engineStatus}.`);
+}
+
 // src/lib/onboarding.ts
 var BANNER = `
 \u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510
@@ -749,43 +811,54 @@ var EngineSetupTimeoutError = class extends Error {
   }
 };
 async function runEngineSetupWithPolling(connectorId) {
+  let dispatch;
   try {
-    await api.post(`/v1/connectors/${connectorId}/engine-setup`, {});
-    return;
+    dispatch = await api.post(
+      `/v1/connectors/${connectorId}/engine-setup`,
+      {}
+    );
   } catch (err) {
-    if (!isGatewayTimeoutError(err)) {
-      throw err;
+    if (isGatewayTimeoutError(err)) {
+      throw new Error(
+        "Backend dispatch timed out. The engine-setup endpoint is now async and should respond in under a second; this may indicate a backend incident. Try again, or check `ardent connector list` to see if an operation was created anyway."
+      );
     }
-    console.log(
-      "  Backend engine setup is long-running; the gateway dropped the request but the work continues server-side. Polling for completion..."
-    );
+    throw err;
+  }
+  const operationId = dispatch?.operation_id;
+  if (!operationId) {
+    return;
   }
   const startedAt = Date.now();
   const maxWaitMs = 20 * 60 * 1e3;
-  const pollIntervalMs = 30 * 1e3;
+  const pollIntervalMs = 5 * 1e3;
+  let lastStage = null;
   while (Date.now() - startedAt < maxWaitMs) {
     await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
-    let status;
+    let op;
     try {
-      status = await api.get(`/v1/connectors/${connectorId}`);
+      op = await api.get(`/v1/operations/${operationId}`);
     } catch (pollErr) {
       if (isGatewayTimeoutError(pollErr)) continue;
       throw pollErr;
     }
-    const engineStatus = status.branching_engine_status;
-    if (engineStatus === "healthy" || engineStatus === "degraded") {
+    if (op.stage && op.stage !== lastStage) {
+      const progressLabel = op.progress != null ? ` (${op.progress}%)` : "";
+      console.log(`  ${op.stage}${progressLabel}`);
+      lastStage = op.stage;
+    }
+    if (op.status === "completed") {
+      assertEngineSetupCompleted({ status: op.status, result: op.result });
       return;
     }
-    if (engineStatus === "configuration_failed" || engineStatus === "failed_validation") {
+    if (op.status === "failed") {
       throw new Error(
-        `Engine setup failed (status: ${engineStatus}). Check connector status: ardent connector list`
+        `Engine setup failed: ${op.error ?? "unknown error"}. Run \`ardent connector list\` to inspect connector state, or re-trigger setup once the underlying issue is resolved.`
       );
     }
-    const elapsedSec = Math.round((Date.now() - startedAt) / 1e3);
-    console.log(`  Still setting up... (${elapsedSec}s elapsed, status=${engineStatus ?? "unknown"})`);
   }
   throw new EngineSetupTimeoutError(
-    `Engine setup did not complete within ${maxWaitMs / 6e4} minutes. Setup may still be running server-side \u2014 do NOT delete the connector. Check status with: ardent connector list`
+    `Engine setup did not complete within ${maxWaitMs / 6e4} minutes. Setup may still be running server-side \u2014 do NOT delete the connector. Check status with: ardent connector list (operation ${operationId})`
   );
 }
 function parsePostgresUrl(url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ardent-cli",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "Git for Data infrastructure",
   "type": "module",
   "bin": {