ardent-cli 0.0.5 → 0.0.8

package/dist/index.js

@@ -104,9 +104,10 @@ async function bootstrapCache() {
     "Content-Type": "application/json",
     "Authorization": `Bearer ${token}`
   };
-  const [connectorsRes, branchesRes] = await Promise.all([
+  const [connectorsRes, branchesRes, meRes] = await Promise.all([
     fetch(`${apiUrl}/v1/cli/connectors`, { headers }),
-    fetch(`${apiUrl}/v1/cli/branches`, { headers })
+    fetch(`${apiUrl}/v1/cli/branches`, { headers }),
+    fetch(`${apiUrl}/v1/cli/me`, { headers })
   ]);
   let connectorCount = 0;
   let branchCount = 0;
@@ -122,10 +123,22 @@ async function bootstrapCache() {
     setCacheEntry("branches", branches);
     branchCount = branches.length;
   }
+  if (meRes.ok) {
+    const user = await meRes.json();
+    setConfig("user", user);
+  }
   return { connectors: connectorCount, branches: branchCount };
 }
 
 // src/lib/api.ts
+function parseApiError(status, text) {
+  try {
+    const json = JSON.parse(text);
+    if (json.detail) return `API error ${status}: ${json.detail}`;
+  } catch {
+  }
+  return `API error ${status}: ${text}`;
+}
 var ApiClient = class {
   getHeaders() {
     const token = getToken();
@@ -148,7 +161,7 @@ var ApiClient = class {
     });
     if (!response.ok) {
       const text = await response.text();
-      throw new Error(`API error ${response.status}: ${text}`);
+      throw new Error(parseApiError(response.status, text));
     }
     return response.json();
   }
@@ -161,7 +174,7 @@ var ApiClient = class {
     });
     if (!response.ok) {
       const text = await response.text();
-      throw new Error(`API error ${response.status}: ${text}`);
+      throw new Error(parseApiError(response.status, text));
     }
     return response.json();
   }
@@ -174,7 +187,7 @@ var ApiClient = class {
     });
     if (!response.ok) {
       const text = await response.text();
-      throw new Error(`API error ${response.status}: ${text}`);
+      throw new Error(parseApiError(response.status, text));
     }
     return response.json();
   }
@@ -187,7 +200,7 @@ var ApiClient = class {
     });
     if (!response.ok) {
       const text = await response.text();
-      throw new Error(`API error ${response.status}: ${text}`);
+      throw new Error(parseApiError(response.status, text));
     }
     return response.json();
   }
@@ -205,7 +218,8 @@ function isNetworkError(err) {
 }
 function isPermissionError(err) {
   if (err instanceof Error) {
-    return err.message.includes("API error 403") || err.message.includes("API error 401");
+    const msg = err.message.toLowerCase();
+    return msg.includes("api error 403") || msg.includes("api error 401") || msg.includes("not authorized") || msg.includes("forbidden");
   }
   return false;
 }
@@ -766,43 +780,84 @@ async function createAction2(type, url, options) {
     console.error(`  Supported: ${supportedTypes.join(", ")}`);
     process.exit(1);
   }
-  try {
-    const parsed = parsePostgresUrl(url);
-    if (!parsed.password) {
-      console.error("\u2717 Password required in connection URL");
-      console.error("  Example: postgresql://user:password@host:5432/db");
+  const isByoc = Boolean(options.byoc);
+  if (isByoc) {
+    if (!options.apiKey || !options.projectId) {
+      console.error("\u2717 --api-key and --project-id are required when using --byoc");
       process.exit(1);
     }
-    const connectionDetails = {
-      host: parsed.host,
-      port: parsed.port,
-      username: parsed.username,
-      password: parsed.password
-    };
-    const connectorName = options.name || "my-postgresql-connection";
-    console.log("Creating connector...");
-    const created = await api.post("/v1/connectors", {
-      name: connectorName,
-      service_name: "postgresql",
-      connection_details: connectionDetails
-    });
+    if (options.byoc !== "neon") {
+      console.error(`\u2717 Unsupported BYOC provider: ${options.byoc}`);
+      console.error("  Supported: neon");
+      process.exit(1);
+    }
+  } else if (!url) {
+    console.error("\u2717 Connection URL required");
+    console.error("  Example: ardent connector create postgresql postgresql://user:pass@host:5432/db");
+    process.exit(1);
+  }
+  try {
+    const connectorName = options.name || (isByoc ? "my-neon-connection" : "my-postgresql-connection");
+    let createPayload;
+    if (isByoc) {
+      console.log("Creating connector (BYOC Neon)...");
+      createPayload = {
+        name: connectorName,
+        service_name: "postgresql",
+        byoc: options.byoc,
+        neon_api_key: options.apiKey,
+        neon_project_id: options.projectId,
+        connection_details: {}
+      };
+    } else {
+      const parsed = parsePostgresUrl(url);
+      if (!parsed.password) {
+        console.error("\u2717 Password required in connection URL");
+        console.error("  Example: postgresql://user:password@host:5432/db");
+        process.exit(1);
+      }
+      console.log("Creating connector...");
+      createPayload = {
+        name: connectorName,
+        service_name: "postgresql",
+        connection_details: {
+          host: parsed.host,
+          port: parsed.port,
+          username: parsed.username,
+          password: parsed.password
+        }
+      };
+    }
+    const created = await api.post("/v1/connectors", createPayload);
     const connectorId = created.id;
-    console.log("Discovering schema...");
-    await api.post(`/v1/connectors/${connectorId}/discover`, {});
-    console.log("Setting selection...");
-    await api.post(`/v1/connectors/${connectorId}/selection`, {
-      selected_paths: ["*"]
-    });
-    const connector = await api.get(`/v1/connectors/${connectorId}`);
-    if (connector.branching_engine_status === "configuration_verified") {
+    if (isByoc) {
       console.log("Setting up branching engine...");
-      await api.post(`/v1/connectors/${connectorId}/engine-setup`, {});
+      try {
+        await api.post(`/v1/connectors/${connectorId}/engine-setup`, {});
+      } catch (setupErr) {
+        console.error("\u2717 Engine setup failed. To retry, delete and recreate:");
+        console.error(`  ardent connector delete ${connectorName}`);
+        throw setupErr;
+      }
+    } else {
+      console.log("Discovering schema...");
+      await api.post(`/v1/connectors/${connectorId}/discover`, {});
+      console.log("Setting selection...");
+      await api.post(`/v1/connectors/${connectorId}/selection`, {
+        selected_paths: ["*"]
+      });
+      const connector = await api.get(`/v1/connectors/${connectorId}`);
+      if (connector.branching_engine_status === "configuration_verified") {
+        console.log("Setting up branching engine...");
+        await api.post(`/v1/connectors/${connectorId}/engine-setup`, {});
+      }
     }
+    const finalConnector = await api.get(`/v1/connectors/${connectorId}`);
     const newConnector = {
       id: connectorId,
       name: connectorName,
       service_name: "postgresql",
-      status: connector.connection_status === "connected" ? "healthy" : "unknown"
+      status: finalConnector.branching_engine_status ?? finalConnector.connection_status ?? "pending"
     };
     const cached = getCacheEntry("connectors");
     const cachedConnectors = cached?.data || [];
@@ -924,7 +979,7 @@ async function deleteAction2(name) {
 
 // src/commands/connector/index.ts
 var connectorCommand = new Command2("connector").description("Manage database connectors");
-connectorCommand.command("create <type> <url>").description("Create a new connector").option("-n, --name <name>", "Connector name").action(createAction2);
+connectorCommand.command("create <type> [url]").description("Create a new connector").option("-n, --name <name>", "Connector name").option("--byoc <provider>", "Bring your own Neon project (e.g. neon)").option("--api-key <key>", "Neon API key (required with --byoc)").option("--project-id <id>", "Neon project ID (required with --byoc)").action(createAction2);
 connectorCommand.command("list").description("List your connectors").action(listAction2);
 connectorCommand.command("delete <name>").description("Delete a connector by name").action(deleteAction2);
 
@@ -1182,12 +1237,25 @@ function logoutAction() {
 // src/commands/auth/status.ts
 function statusAction() {
   const token = getConfig("token");
-  if (token) {
-    console.log("\u2713 Authenticated");
-    console.log(`  Token: ${token.slice(0, 8)}...${token.slice(-4)}`);
-  } else {
+  if (!token) {
     console.log("\u2717 Not authenticated");
     console.log("  Run: ardent login");
+    return;
+  }
+  const user = getConfig("user");
+  console.log("\u2713 Authenticated");
+  if (user?.full_name) {
+    console.log(`  Account: ${user.full_name}`);
+  }
+  if (user?.email) {
+    console.log(`  Email:   ${user.email}`);
+  }
+  if (user?.org_name) {
+    console.log(`  Org:     ${user.org_name}`);
+  }
+  if (!user) {
+    console.log(`  Token: ${token.slice(0, 8)}...${token.slice(-4)}`);
+    console.log("  Run: ardent login to refresh profile info");
   }
 }
 

package/package.json

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