ardent-cli 0.0.39 → 0.0.40

package/dist/index.js

@@ -804,6 +804,126 @@ function printDegradedWarnings(warnings) {
   console.log("  Review this connector with: ardent connector list");
 }
 
+// src/lib/operation_stage_display.ts
+var STAGE_DISPLAY = {
+  // engine_setup_worker / postgres_engine_setup
+  "dispatched": "Starting",
+  "preparing": "Preparing",
+  "creating-neon-project": "Provisioning the branch target",
+  "preparing-target-databases": "Preparing target databases",
+  "deploying-pgstream": "Starting replication",
+  "applying-rls": "Applying RLS policies",
+  "storing-credentials": "Storing connection credentials",
+  "validating": "Validating the branch target",
+  // reset_worker / reset_connector
+  "resetting": "Resetting",
+  "deleting-pgstream": "Stopping replication",
+  "rediscovering-source": "Re-checking the source database",
+  "resetting-neon-main": "Resetting the branch target",
+  "creating-target-schemas": "Recreating target schemas",
+  "redeploying-pgstream": "Restarting replication",
+  // environment deploy_worker
+  "loading_config": "Loading environment configuration",
+  "deploying_infrastructure": "Provisioning environment infrastructure",
+  "recording_success": "Finalizing environment",
+  "cleaning_failed_deploy": "Cleaning up failed environment provisioning",
+  // environment destroy_worker
+  "deleting_private_links": "Removing private network links",
+  "destroying_infrastructure": "Tearing down environment infrastructure",
+  "recording_destroy_success": "Finalizing environment teardown",
+  // discovery_worker / run_discovery_crawl (ARD-1098)
+  "connecting": "Connecting to source",
+  "enumerating_databases": "Listing databases",
+  "scanning_database": "Scanning schema",
+  "writing_schema": "Saving discovered schema",
+  "merging_results": "Combining results"
+};
+function humanizeRawStage(_raw) {
+  return "Working";
+}
+function operationStageDisplay(stage) {
+  if (!stage) return "Working";
+  const colonIndex = stage.indexOf(":");
+  const base = colonIndex === -1 ? stage : stage.slice(0, colonIndex);
+  const suffix = colonIndex === -1 ? "" : stage.slice(colonIndex + 1);
+  const label = STAGE_DISPLAY[base] ?? humanizeRawStage(base);
+  return suffix ? `${label} (for ${suffix})` : label;
+}
+
+// src/lib/discover.ts
+var DiscoveryTimeoutError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "DiscoveryTimeoutError";
+  }
+};
+var DiscoveryOperationFailedError = class extends Error {
+  operationError;
+  constructor(operationError) {
+    super(
+      `Discovery failed: ${operationError ?? "unknown error"}. Inspect the connector with \`ardent connector list\`, fix the underlying issue, then re-run \`ardent connector create\` or \`ardent connector rediscover\`.`
+    );
+    this.name = "DiscoveryOperationFailedError";
+    this.operationError = operationError;
+  }
+};
+async function runDiscoveryWithPolling(connectorId, options) {
+  const maxWaitMs = options?.maxWaitMs ?? 10 * 60 * 1e3;
+  const pollIntervalMs = options?.pollIntervalMs ?? 3 * 1e3;
+  let dispatch;
+  try {
+    dispatch = await api.post(
+      `/v1/connectors/${connectorId}/discover`,
+      {}
+    );
+  } catch (err) {
+    if (isGatewayTimeoutError(err)) {
+      throw new Error(
+        "Backend dispatch timed out. The /discover endpoint is now async and should respond in under a few seconds; this may indicate a backend incident. Try again, or check `ardent connector list` to see if a discovery operation was created anyway."
+      );
+    }
+    throw err;
+  }
+  if (options?.onPrerequisites) {
+    options.onPrerequisites(dispatch.prerequisites, dispatch.source_metadata);
+  }
+  const operationId = dispatch.operation_id;
+  const startedAt = Date.now();
+  let lastStage = null;
+  while (Date.now() - startedAt < maxWaitMs) {
+    await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+    let op;
+    try {
+      op = await api.get(`/v1/operations/${operationId}`);
+    } catch (pollErr) {
+      if (isGatewayTimeoutError(pollErr)) continue;
+      throw pollErr;
+    }
+    if (op.stage && op.stage !== lastStage) {
+      const progressLabel = op.progress != null ? ` (${op.progress}%)` : "";
+      console.log(`  ${operationStageDisplay(op.stage)}${progressLabel}`);
+      lastStage = op.stage;
+    }
+    if (op.status === "completed") {
+      const result = op.result ?? {};
+      const schemaVersion = typeof result.schema_version === "number" ? result.schema_version : 0;
+      const databasesCount = typeof result.databases_count === "number" ? result.databases_count : 0;
+      return {
+        prerequisites: dispatch.prerequisites,
+        source_metadata: dispatch.source_metadata,
+        schema_version: schemaVersion,
+        databases_count: databasesCount
+      };
+    }
+    if (op.status === "failed") {
+      throw new DiscoveryOperationFailedError(op.error);
+    }
+  }
+  throw new DiscoveryTimeoutError(
+    `Discovery did not complete within ${Math.round(maxWaitMs / 6e4)} minutes. The catalog walk may still be running server-side \u2014 do NOT delete the connector. Check status with: ardent connector list. If you contact Ardent support, reference operation id ${operationId}.`
+  );
+}
+
 // src/lib/connector_status_display.ts
 var ENGINE_STATUS_DISPLAY = {
   healthy: "ready",
@@ -890,46 +1010,6 @@ function assertEngineSetupCompleted(operation, connectorName) {
   );
 }
 
-// src/lib/operation_stage_display.ts
-var STAGE_DISPLAY = {
-  // engine_setup_worker / postgres_engine_setup
-  "dispatched": "Starting",
-  "preparing": "Preparing",
-  "creating-neon-project": "Provisioning the branch target",
-  "preparing-target-databases": "Preparing target databases",
-  "deploying-pgstream": "Starting replication",
-  "applying-rls": "Applying RLS policies",
-  "storing-credentials": "Storing connection credentials",
-  "validating": "Validating the branch target",
-  // reset_worker / reset_connector
-  "resetting": "Resetting",
-  "deleting-pgstream": "Stopping replication",
-  "rediscovering-source": "Re-checking the source database",
-  "resetting-neon-main": "Resetting the branch target",
-  "creating-target-schemas": "Recreating target schemas",
-  "redeploying-pgstream": "Restarting replication",
-  // environment deploy_worker
-  "loading_config": "Loading environment configuration",
-  "deploying_infrastructure": "Provisioning environment infrastructure",
-  "recording_success": "Finalizing environment",
-  "cleaning_failed_deploy": "Cleaning up failed environment provisioning",
-  // environment destroy_worker
-  "deleting_private_links": "Removing private network links",
-  "destroying_infrastructure": "Tearing down environment infrastructure",
-  "recording_destroy_success": "Finalizing environment teardown"
-};
-function humanizeRawStage(_raw) {
-  return "Working";
-}
-function operationStageDisplay(stage) {
-  if (!stage) return "Working";
-  const colonIndex = stage.indexOf(":");
-  const base = colonIndex === -1 ? stage : stage.slice(0, colonIndex);
-  const suffix = colonIndex === -1 ? "" : stage.slice(colonIndex + 1);
-  const label = STAGE_DISPLAY[base] ?? humanizeRawStage(base);
-  return suffix ? `${label} (for ${suffix})` : label;
-}
-
 // src/lib/engine_setup.ts
 var EngineSetupTimeoutError = class extends Error {
   constructor(message) {
@@ -1705,11 +1785,23 @@ async function createAction2(type, url, options) {
       }
     } else {
       console.log("Discovering schema...");
-      const discoverResult = await api.post(
-        `/v1/connectors/${connectorId}/discover`,
-        {}
-      );
-      const discoveryWarnings = discoverResult?.source_metadata?.warnings ?? [];
+      let discoverPollResult;
+      try {
+        discoverPollResult = await runDiscoveryWithPolling(connectorId, {
+          onPrerequisites: (prereqs) => {
+            if (prereqs.pass) {
+              console.log("Connected \u2713 \u2014 scanning your schema\u2026");
+            }
+          }
+        });
+      } catch (discoverErr) {
+        if (discoverErr instanceof DiscoveryTimeoutError || discoverErr instanceof DiscoveryOperationFailedError) {
+          console.error(`\u2717 ${discoverErr.message}`);
+          process.exit(1);
+        }
+        throw discoverErr;
+      }
+      const discoveryWarnings = discoverPollResult.source_metadata?.warnings ?? [];
       if (discoveryWarnings.length > 0) {
         const yellow = "\x1B[33m";
         const reset2 = "\x1B[0m";

package/package.json

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