ardent-cli 0.0.48 → 0.0.50

package/dist/index.js

@@ -6,6 +6,9 @@ import { Command as Command8 } from "commander";
 // src/commands/branch/index.ts
 import { Command } from "commander";
 
+// src/commands/branch/create.ts
+import { randomUUID as randomUUID2 } from "crypto";
+
 // src/lib/config.ts
 import { existsSync, mkdirSync, readFileSync as readFileSync2, writeFileSync, unlinkSync } from "fs";
 import { homedir } from "os";
@@ -137,6 +140,24 @@ function getCacheEntry(key) {
   const config = loadConfig();
   return config.cache?.[key];
 }
+function getPendingBranchCreateKey(scopeKey) {
+  return getConfig("pendingBranchCreateKeys")?.[scopeKey];
+}
+function setPendingBranchCreateKey(scopeKey, idempotencyKey) {
+  const config = loadConfig();
+  if (!config.pendingBranchCreateKeys) {
+    config.pendingBranchCreateKeys = {};
+  }
+  config.pendingBranchCreateKeys[scopeKey] = idempotencyKey;
+  saveConfig(config);
+}
+function clearPendingBranchCreateKey(scopeKey) {
+  const config = loadConfig();
+  if (config.pendingBranchCreateKeys && scopeKey in config.pendingBranchCreateKeys) {
+    delete config.pendingBranchCreateKeys[scopeKey];
+    saveConfig(config);
+  }
+}
 function formatIdle(lastActivityIso) {
   if (!lastActivityIso) {
     return "unknown";
@@ -316,11 +337,14 @@ var ApiClient = class {
     });
     return this.handleResponse(response);
   }
-  async post(path, body) {
+  async post(path, body, extraHeaders = {}) {
     const url = `${getApiUrl()}${path}`;
     const response = await fetch(url, {
       method: "POST",
-      headers: this.getHeaders(),
+      headers: {
+        ...this.getHeaders(),
+        ...extraHeaders
+      },
       body: JSON.stringify(body)
     });
     return this.handleResponse(response);
@@ -384,6 +408,15 @@ function isGatewayTimeoutError(err) {
   }
   return isNetworkError(err);
 }
+function isTransientOperationPollError(err) {
+  if (isGatewayTimeoutError(err)) {
+    return true;
+  }
+  if (!(err instanceof Error)) {
+    return false;
+  }
+  return err.message.trim().toLowerCase() === "api error 500: internal server error";
+}
 
 // src/lib/connector_selection.ts
 function clearSelectedConnector() {
@@ -672,16 +705,24 @@ async function createAction(name, options) {
     console.error(`\u2717 ${message}`);
     process.exit(1);
   }
+  let idempotencyScopeKey;
   try {
     const startTime = performance.now();
     const connectorId = await resolveCurrentConnectorId();
+    idempotencyScopeKey = `${connectorId}:${options.service}:${name}`;
+    let idempotencyKey = getPendingBranchCreateKey(idempotencyScopeKey);
+    if (!idempotencyKey) {
+      idempotencyKey = randomUUID2();
+      setPendingBranchCreateKey(idempotencyScopeKey, idempotencyKey);
+    }
     const createResponse = await api.post(
       "/v1/branch/create",
       {
         connector_id: connectorId,
         service_type: options.service,
         name
-      }
+      },
+      { "X-Idempotency-Key": idempotencyKey }
     );
     const warning = createResponse?.warning;
     const response = await api.get(`/v1/cli/branches?connector_id=${connectorId}`);
@@ -737,6 +778,7 @@ async function createAction(name, options) {
     cachedBranches.push(branch);
     setCacheEntry("branches", cachedBranches);
     setCurrentBranch(name);
+    clearPendingBranchCreateKey(idempotencyScopeKey);
     const elapsed = ((performance.now() - startTime) / 1e3).toFixed(1);
     trackEvent("CLI: branch create succeeded", {
       service_type: options.service,
@@ -785,6 +827,9 @@ ${url}`);
       console.error("\u2717 Cannot create branch while offline");
       process.exit(1);
     }
+    if (idempotencyScopeKey) {
+      clearPendingBranchCreateKey(idempotencyScopeKey);
+    }
     trackEvent("CLI: branch create failed", { reason: "api_error", output_mode: mode });
     const message = err instanceof Error ? err.message : String(err);
     if (mode === "json") {
@@ -1306,6 +1351,9 @@ function assertEngineSetupCompleted(operation, connectorName) {
 }
 
 // src/lib/engine_setup.ts
+var ENGINE_SETUP_MAX_WAIT_MS = 60 * 60 * 1e3;
+var ENGINE_SETUP_POLL_INTERVAL_MS = 5 * 1e3;
+var ENGINE_SETUP_TRANSIENT_WARN_EVERY = 6;
 var EngineSetupTimeoutError = class extends Error {
   constructor(message) {
     super(message);
@@ -1322,7 +1370,7 @@ var EngineSetupOperationFailedError = class extends Error {
     this.operationError = operationError;
   }
 };
-async function runEngineSetupWithPolling(connectorId, connectorName) {
+async function runEngineSetupWithPolling(connectorId, connectorName, options = {}) {
   let dispatch;
   try {
     dispatch = await api.post(
@@ -1342,18 +1390,28 @@ async function runEngineSetupWithPolling(connectorId, connectorName) {
     return { dispatched: false };
   }
   const startedAt = Date.now();
-  const maxWaitMs = 20 * 60 * 1e3;
-  const pollIntervalMs = 5 * 1e3;
+  const maxWaitMs = options.maxWaitMs ?? ENGINE_SETUP_MAX_WAIT_MS;
+  const pollIntervalMs = options.pollIntervalMs ?? ENGINE_SETUP_POLL_INTERVAL_MS;
   let lastStage = null;
+  let consecutiveTransientFailures = 0;
   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;
+      if (isTransientOperationPollError(pollErr)) {
+        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.`
+          );
+        }
+        continue;
+      }
       throw pollErr;
     }
+    consecutiveTransientFailures = 0;
     if (op.stage && op.stage !== lastStage) {
       const progressLabel = op.progress != null ? ` (${op.progress}%)` : "";
       console.log(`  ${operationStageDisplay(op.stage)}${progressLabel}`);

package/package.json

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