ardent-cli 0.0.23 → 0.0.25

package/dist/index.js

@@ -1,19 +1,80 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { readFileSync as readFileSync5 } from "fs";
 import { Command as Command8 } from "commander";
 
 // src/commands/branch/index.ts
 import { Command } from "commander";
 
-// src/lib/api.ts
-import { readFileSync as readFileSync2 } from "fs";
-
 // src/lib/config.ts
-import { existsSync, mkdirSync, readFileSync, writeFileSync, unlinkSync } from "fs";
+import { existsSync, mkdirSync, readFileSync as readFileSync2, writeFileSync, unlinkSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
+
+// src/lib/api_errors.ts
+function formatErrorDetail(detail) {
+  if (typeof detail === "string") return detail;
+  if (Array.isArray(detail)) {
+    return detail.map((entry) => {
+      const location = Array.isArray(entry.loc) ? entry.loc.join(" \u2192 ") : "";
+      const message = entry.msg ?? "unknown error";
+      return location ? `${location}: ${message}` : String(message);
+    }).join("; ");
+  }
+  return JSON.stringify(detail);
+}
+function formatUpgradeRequiredMessage(text) {
+  try {
+    const json = JSON.parse(text);
+    if (json.detail) {
+      return `${formatErrorDetail(json.detail)}
+
+  npm install -g ardent-cli@latest`;
+    }
+  } catch {
+  }
+  return "Your CLI is outdated. Please update:\n\n  npm install -g ardent-cli@latest";
+}
+function parseApiError(status, text) {
+  if (status === 426) {
+    return formatUpgradeRequiredMessage(text);
+  }
+  try {
+    const json = JSON.parse(text);
+    if (json.detail) return `API error ${status}: ${formatErrorDetail(json.detail)}`;
+  } catch {
+  }
+  return `API error ${status}: ${text}`;
+}
+function exitWithUpgradeRequiredMessage(text) {
+  console.error(`
+\u2717 ${formatUpgradeRequiredMessage(text)}
+`);
+  process.exit(1);
+}
+async function exitIfUpgradeRequired(response) {
+  if (response.status !== 426) {
+    return;
+  }
+  const text = await response.text();
+  exitWithUpgradeRequiredMessage(text);
+}
+
+// src/lib/cli_version.ts
+import { readFileSync } from "fs";
+function getCliVersion() {
+  try {
+    const packageUrl = new URL("../package.json", import.meta.url);
+    const raw = readFileSync(packageUrl, "utf-8");
+    const parsed = JSON.parse(raw);
+    return parsed.version ?? "unknown";
+  } catch {
+    return "unknown";
+  }
+}
+var CLI_VERSION = getCliVersion();
+
+// src/lib/config.ts
 var CONFIG_DIR = join(homedir(), ".ardent");
 var CONFIG_FILE = join(CONFIG_DIR, "config.json");
 function ensureConfigDir() {
@@ -24,7 +85,7 @@ function ensureConfigDir() {
 function loadConfig() {
   try {
     if (existsSync(CONFIG_FILE)) {
-      return JSON.parse(readFileSync(CONFIG_FILE, "utf-8"));
+      return JSON.parse(readFileSync2(CONFIG_FILE, "utf-8"));
     }
   } catch {
   }
@@ -144,9 +205,11 @@ async function bootstrapCache() {
   const apiUrl = getApiUrl();
   const headers = {
     "Content-Type": "application/json",
-    "Authorization": `Bearer ${token}`
+    "Authorization": `Bearer ${token}`,
+    "X-CLI-Version": CLI_VERSION
   };
   const userInfoResponse = await fetch(`${apiUrl}/v1/cli/me`, { headers });
+  await exitIfUpgradeRequired(userInfoResponse);
   if (!userInfoResponse.ok) {
     throw new Error("Failed to fetch user info");
   }
@@ -157,6 +220,7 @@ async function bootstrapCache() {
     return bootstrap;
   }
   const projectsResponse = await fetch(`${apiUrl}/v1/projects?org_id=${user.org_id}`, { headers });
+  await exitIfUpgradeRequired(projectsResponse);
   if (projectsResponse.ok) {
     const projectsPayload = await projectsResponse.json();
     if (!Array.isArray(projectsPayload.projects)) {
@@ -176,6 +240,7 @@ async function bootstrapCache() {
       `${apiUrl}/v1/cli/connectors?project_id=${currentProjectId}`,
       { headers }
     );
+    await exitIfUpgradeRequired(connectorsResponse);
     if (connectorsResponse.ok) {
       const connectorsPayload = await connectorsResponse.json();
       if (!Array.isArray(connectorsPayload.connectors)) {
@@ -196,6 +261,7 @@ async function bootstrapCache() {
       `${apiUrl}/v1/cli/branches?connector_id=${currentConnectorId}`,
       { headers }
     );
+    await exitIfUpgradeRequired(branchesResponse);
     if (branchesResponse.ok) {
       const branchesPayload = await branchesResponse.json();
       if (!Array.isArray(branchesPayload.branches)) {
@@ -209,49 +275,8 @@ async function bootstrapCache() {
 }
 
 // src/lib/api.ts
-function getCliVersion() {
-  try {
-    const packageUrl = new URL("../package.json", import.meta.url);
-    const raw = readFileSync2(packageUrl, "utf-8");
-    const parsed = JSON.parse(raw);
-    return parsed.version ?? "unknown";
-  } catch {
-    return "unknown";
-  }
-}
-var CLI_VERSION = getCliVersion();
-function formatErrorDetail(detail) {
-  if (typeof detail === "string") return detail;
-  if (Array.isArray(detail)) {
-    return detail.map((entry) => {
-      const location = Array.isArray(entry.loc) ? entry.loc.join(" \u2192 ") : "";
-      const message = entry.msg ?? "unknown error";
-      return location ? `${location}: ${message}` : String(message);
-    }).join("; ");
-  }
-  return JSON.stringify(detail);
-}
-function parseApiError(status, text) {
-  try {
-    const json = JSON.parse(text);
-    if (json.detail) return `API error ${status}: ${formatErrorDetail(json.detail)}`;
-  } catch {
-  }
-  return `API error ${status}: ${text}`;
-}
 function handleUpgradeRequired(text) {
-  try {
-    const json = JSON.parse(text);
-    if (json.detail) {
-      console.error(`
-\u2717 ${json.detail}
-`);
-    }
-  } catch {
-    console.error("\n\u2717 Your CLI is outdated. Please update:\n");
-  }
-  console.error("  npm install -g ardent-cli@latest\n");
-  process.exit(1);
+  exitWithUpgradeRequiredMessage(text);
 }
 var ApiClient = class {
   getHeaders() {
@@ -347,6 +372,69 @@ function isGatewayTimeoutError(err) {
   return isNetworkError(err);
 }
 
+// src/lib/connector_selection.ts
+function clearSelectedConnector() {
+  setConfig("currentConnectorId", void 0);
+  setConfig("currentConnectorName", void 0);
+  clearCurrentBranch();
+}
+function findConnectorById(connectors, connectorId) {
+  for (const connector of connectors) {
+    if (connector.id === connectorId) {
+      return connector;
+    }
+  }
+  return void 0;
+}
+function reconcileSelectedConnector(connectors) {
+  const currentConnectorId = getConfig("currentConnectorId");
+  if (currentConnectorId) {
+    const selectedConnector = findConnectorById(connectors, currentConnectorId);
+    if (selectedConnector) {
+      setConfig("currentConnectorName", selectedConnector.name);
+      return selectedConnector;
+    }
+  }
+  clearSelectedConnector();
+  if (connectors.length === 1) {
+    const onlyConnector = connectors[0];
+    setConfig("currentConnectorId", onlyConnector.id);
+    setConfig("currentConnectorName", onlyConnector.name);
+    return onlyConnector;
+  }
+  return void 0;
+}
+async function requireCurrentConnectorId() {
+  const currentProjectId = getConfig("currentProjectId");
+  if (!currentProjectId) {
+    console.error("\u2717 No current project set. Switch to a project first:");
+    console.error("  ardent project list");
+    console.error("  ardent project switch <name>");
+    process.exit(1);
+  }
+  const result = await api.get(
+    `/v1/cli/connectors?project_id=${currentProjectId}`
+  );
+  if (!result.connectors) {
+    throw new Error("API returned invalid response: missing connectors array");
+  }
+  setCacheEntry("connectors", result.connectors);
+  const selectedConnector = reconcileSelectedConnector(result.connectors);
+  if (selectedConnector) {
+    return selectedConnector.id;
+  }
+  if (result.connectors.length === 0) {
+    console.error("\u2717 No connectors found.");
+    console.error("  Create one with: ardent connector create postgresql <url>");
+  } else {
+    console.error("\u2717 Previously selected connector is no longer available.");
+    console.error("  Select one of your current connectors:");
+    console.error("  ardent connector list");
+    console.error("  ardent connector switch <name>");
+  }
+  process.exit(1);
+}
+
 // src/lib/telemetry.ts
 import { randomUUID } from "crypto";
 function getAnonymousId() {
@@ -400,11 +488,7 @@ function identifyUser(userId, personProperties = {}) {
 async function createAction(name, options) {
   try {
     const startTime = performance.now();
-    const connectorId = getConfig("currentConnectorId");
-    if (!connectorId) {
-      console.error("\u2717 No connector selected. Run 'ardent connector switch' first.");
-      process.exit(1);
-    }
+    const connectorId = await requireCurrentConnectorId();
     await api.post("/v1/branch/create", {
       connector_id: connectorId,
       service_type: options.service,
@@ -665,6 +749,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
@@ -782,43 +895,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) {
@@ -1065,7 +1189,8 @@ async function listAction2() {
     console.log(`${green3}  Create one with: ardent connector create postgresql <url>${reset3}`);
     return;
   }
-  const currentConnectorId = getConfig("currentConnectorId");
+  const selectedConnector = fromCache ? void 0 : reconcileSelectedConnector(connectors);
+  const currentConnectorId = selectedConnector?.id ?? getConfig("currentConnectorId");
   const green2 = "\x1B[32m";
   const dim2 = "\x1B[2m";
   const yellow = "\x1B[33m";
@@ -1956,8 +2081,9 @@ async function loginAction(options) {
   try {
     const initResponse = await fetch(`${getApiUrl()}/v1/cli/auth/init`, {
       method: "POST",
-      headers: { "Content-Type": "application/json" }
+      headers: { "Content-Type": "application/json", "X-CLI-Version": CLI_VERSION }
     });
+    await exitIfUpgradeRequired(initResponse);
     if (!initResponse.ok) {
       const error = await initResponse.text();
       trackEvent("CLI: login failed", { method: "browser", reason: "init_failed" });
@@ -1974,8 +2100,10 @@ async function loginAction(options) {
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       await new Promise((resolve) => setTimeout(resolve, pollInterval));
       const pollResponse = await fetch(
-        `${getApiUrl()}/v1/cli/auth/poll?session=${session_id}`
+        `${getApiUrl()}/v1/cli/auth/poll?session=${session_id}`,
+        { headers: { "X-CLI-Version": CLI_VERSION } }
       );
+      await exitIfUpgradeRequired(pollResponse);
       if (!pollResponse.ok) {
         trackEvent("CLI: login failed", { method: "browser", reason: "poll_failed" });
         console.error("\u2717 Poll failed");
@@ -2184,19 +2312,8 @@ EXAMPLES
   ardent branch switch my-feature
   ardent org members
 `;
-var CLI_VERSION2 = getCliVersion2();
 var program = new Command8();
-function getCliVersion2() {
-  try {
-    const packageUrl = new URL("../package.json", import.meta.url);
-    const raw = readFileSync5(packageUrl, "utf-8");
-    const parsed = JSON.parse(raw);
-    return parsed.version ?? "unknown";
-  } catch {
-    return "unknown";
-  }
-}
-program.name("ardent").description("CLI for Ardent database branching").version(CLI_VERSION2).configureHelp({
+program.name("ardent").description("CLI for Ardent database branching").version(CLI_VERSION).configureHelp({
   formatHelp: () => BANNER + HELP_TEXT
 });
 program.addCommand(loginCommand);
@@ -2228,5 +2345,5 @@ if (args.length === 0) {
   program.help();
 }
 getAnonymousId();
-checkForUpdate(CLI_VERSION2);
+checkForUpdate(CLI_VERSION);
 program.parse();

package/package.json

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