ardent-cli 0.0.53 → 0.0.55

package/dist/index.js

@@ -568,6 +568,9 @@ function operationStageDisplay(stage) {
   const label = STAGE_DISPLAY[base] ?? humanizeRawStage(base);
   return suffix ? `${label} (for ${suffix})` : label;
 }
+function operationStageLabel(op) {
+  return op.stage_label ?? operationStageDisplay(op.stage);
+}
 
 // src/lib/resource_name_validation.ts
 var RESERVED_SUFFIXES = ["pooler", "readonly", "direct"];
@@ -978,7 +981,7 @@ async function pollBranchCreate(operationId, idempotencyScopeKey, mode) {
     consecutiveTransientFailures = 0;
     if (op.stage && op.stage !== lastStage && mode !== "json" && mode !== "print-url") {
       const progressLabel = op.progress != null ? ` (${op.progress}%)` : "";
-      console.log(`  ${operationStageDisplay(op.stage)}${progressLabel}`);
+      console.log(`  ${operationStageLabel(op)}${progressLabel}`);
       lastStage = op.stage;
     }
     if (op.status === "completed") {
@@ -1348,7 +1351,7 @@ async function runDiscoveryWithPolling(connectorId, options) {
     }
     if (op.stage && op.stage !== lastStage) {
       const progressLabel = op.progress != null ? ` (${op.progress}%)` : "";
-      console.log(`  ${operationStageDisplay(op.stage)}${progressLabel}`);
+      console.log(`  ${operationStageLabel(op)}${progressLabel}`);
       lastStage = op.stage;
     }
     if (op.status === "completed") {
@@ -1469,14 +1472,32 @@ var EngineSetupTimeoutError = class extends Error {
 };
 var EngineSetupOperationFailedError = class extends Error {
   operationError;
-  constructor(operationError, connectorName) {
+  connectorId;
+  connectorName;
+  operationId;
+  constructor(operationError, connectorIdOrName, connectorName, operationId) {
+    const recoveryHandle = connectorName && operationId ? `${engineSetupRecoveryHandle(connectorIdOrName, connectorName, operationId)} ` : "";
+    const retryName = connectorName ?? connectorIdOrName;
     super(
-      `Engine setup failed: ${operationError ?? "unknown error"}. Inspect connector state with \`ardent connector list\`, then retry with \`ardent connector retry-setup ${connectorName}\` once the underlying issue is resolved.`
+      `Engine setup failed: ${operationError ?? "unknown error"}. ` + recoveryHandle + `Inspect connector state with \`ardent connector list\`, then retry with \`ardent connector retry-setup ${retryName}\` once the underlying issue is resolved.`
     );
     this.name = "EngineSetupOperationFailedError";
     this.operationError = operationError;
+    this.connectorId = connectorName ? connectorIdOrName : null;
+    this.connectorName = connectorName ?? connectorIdOrName;
+    this.operationId = operationId ?? null;
   }
 };
+function engineSetupRecoveryHandle(connectorId, connectorName, operationId) {
+  return `For recovery, reference operation id ${operationId} for connector ${connectorId} (${connectorName}).`;
+}
+function formatNextEngineSetupPollAction(pollIntervalMs) {
+  if (pollIntervalMs <= 0) {
+    return "The next check runs immediately";
+  }
+  const nextPollSeconds = Math.ceil(pollIntervalMs / 1e3);
+  return `The next check runs in ${nextPollSeconds}s`;
+}
 async function runEngineSetupWithPolling(connectorId, connectorName, options = {}) {
   let dispatch;
   try {
@@ -1511,7 +1532,7 @@ async function runEngineSetupWithPolling(connectorId, connectorName, options = {
         consecutiveTransientFailures += 1;
         if (consecutiveTransientFailures % ENGINE_SETUP_TRANSIENT_WARN_EVERY === 0) {
           console.warn(
-            `  \u26A0 Status check has failed ${consecutiveTransientFailures} times in a row. Setup is still running server-side and the CLI will keep waiting \u2014 do NOT delete the connector.`
+            `  \u26A0 Status check has failed ${consecutiveTransientFailures} times in a row. ${engineSetupRecoveryHandle(connectorId, connectorName, operationId)} Setup is still running server-side and the CLI will keep waiting \u2014 do NOT delete the connector. ${formatNextEngineSetupPollAction(pollIntervalMs)}; if this continues, contact Ardent support with that operation id.`
           );
         }
         continue;
@@ -1521,7 +1542,7 @@ async function runEngineSetupWithPolling(connectorId, connectorName, options = {
     consecutiveTransientFailures = 0;
     if (op.stage && op.stage !== lastStage) {
       const progressLabel = op.progress != null ? ` (${op.progress}%)` : "";
-      console.log(`  ${operationStageDisplay(op.stage)}${progressLabel}`);
+      console.log(`  ${operationStageLabel(op)}${progressLabel}`);
       lastStage = op.stage;
     }
     if (op.status === "completed") {
@@ -1532,7 +1553,12 @@ async function runEngineSetupWithPolling(connectorId, connectorName, options = {
       return { dispatched: true };
     }
     if (op.status === "failed") {
-      throw new EngineSetupOperationFailedError(op.error, connectorName);
+      throw new EngineSetupOperationFailedError(
+        op.error,
+        connectorId,
+        connectorName,
+        operationId
+      );
     }
   }
   throw new EngineSetupTimeoutError(
@@ -2757,7 +2783,7 @@ async function waitForConnectorDelete(operationId) {
     consecutiveTransientFailures = 0;
     if (operation.stage && operation.stage !== lastStage) {
       const progressLabel = operation.progress != null ? ` (${operation.progress}%)` : "";
-      console.log(`  ${operationStageDisplay(operation.stage)}${progressLabel}`);
+      console.log(`  ${operationStageLabel(operation)}${progressLabel}`);
       lastStage = operation.stage;
     }
     if (operation.status === "completed") {
@@ -3277,7 +3303,7 @@ connectorCommand.command("update <name>").description("Update a connector's conf
 ).action(updateAction);
 connectorCommand.command("delete <name>").description("Delete a connector by name").option(
   "--force",
-  "Skip the in-flight WAL/Kafka drain wait. Any un-replicated changes are abandoned and recorded for operator triage."
+  "Skip the wait for in-flight changes to finish replicating. Any un-replicated changes are abandoned."
 ).action(deleteAction2);
 
 // src/commands/invite/index.ts

package/package.json

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