ardent-cli 0.0.18 → 0.0.20

package/dist/index.js

@@ -59,7 +59,9 @@ function getToken() {
 }
 function setCacheEntry(key, data) {
   const config = loadConfig();
-  if (!config.cache) config.cache = {};
+  if (!config.cache) {
+    config.cache = {};
+  }
   config.cache[key] = {
     data,
     updated_at: (/* @__PURE__ */ new Date()).toISOString()
@@ -75,10 +77,16 @@ function formatCacheTime(isoString) {
   const now = /* @__PURE__ */ new Date();
   const diffMs = now.getTime() - date.getTime();
   const diffMins = Math.floor(diffMs / 6e4);
-  if (diffMins < 1) return "just now";
-  if (diffMins < 60) return `${diffMins}m ago`;
+  if (diffMins < 1) {
+    return "just now";
+  }
+  if (diffMins < 60) {
+    return `${diffMins}m ago`;
+  }
   const diffHours = Math.floor(diffMins / 60);
-  if (diffHours < 24) return `${diffHours}h ago`;
+  if (diffHours < 24) {
+    return `${diffHours}h ago`;
+  }
   return date.toLocaleDateString();
 }
 function getCurrentBranch() {
@@ -94,42 +102,84 @@ function clearCurrentBranch() {
 }
 async function bootstrapCache() {
   const token = getToken();
-  if (!token) throw new Error("Not authenticated");
+  if (!token) {
+    throw new Error("Not authenticated");
+  }
+  const staleConfig = loadConfig();
+  delete staleConfig.user;
+  delete staleConfig.userId;
+  delete staleConfig.currentProjectId;
+  delete staleConfig.currentProjectName;
+  delete staleConfig.currentConnectorId;
+  delete staleConfig.currentConnectorName;
+  delete staleConfig.currentBranch;
+  delete staleConfig.cache;
+  saveConfig(staleConfig);
   const apiUrl = getApiUrl();
   const headers = {
     "Content-Type": "application/json",
     "Authorization": `Bearer ${token}`
   };
-  const [connectorsRes, meRes] = await Promise.all([
-    fetch(`${apiUrl}/v1/cli/connectors`, { headers }),
-    fetch(`${apiUrl}/v1/cli/me`, { headers })
-  ]);
-  let connectorCount = 0;
-  let branchCount = 0;
-  if (connectorsRes.ok) {
-    const data = await connectorsRes.json();
-    const connectors = data.connectors || [];
-    setCacheEntry("connectors", connectors);
-    connectorCount = connectors.length;
+  const userInfoResponse = await fetch(`${apiUrl}/v1/cli/me`, { headers });
+  if (!userInfoResponse.ok) {
+    throw new Error("Failed to fetch user info");
+  }
+  const user = await userInfoResponse.json();
+  setConfig("user", user);
+  const bootstrap = { projects: [], connectors: [], branches: [] };
+  if (!user.org_id) {
+    return bootstrap;
+  }
+  const projectsResponse = await fetch(`${apiUrl}/v1/projects?org_id=${user.org_id}`, { headers });
+  if (projectsResponse.ok) {
+    const projectsPayload = await projectsResponse.json();
+    if (!Array.isArray(projectsPayload.projects)) {
+      throw new Error("API returned invalid response: missing projects array");
+    }
+    bootstrap.projects = projectsPayload.projects;
+    setCacheEntry("projects", bootstrap.projects);
+  }
+  if (bootstrap.projects.length === 1) {
+    const project = bootstrap.projects[0];
+    setConfig("currentProjectId", project.id);
+    setConfig("currentProjectName", project.name);
   }
-  if (meRes.ok) {
-    const user = await meRes.json();
-    setConfig("user", user);
+  const currentProjectId = getConfig("currentProjectId");
+  if (currentProjectId) {
+    const connectorsResponse = await fetch(
+      `${apiUrl}/v1/cli/connectors?project_id=${currentProjectId}`,
+      { headers }
+    );
+    if (connectorsResponse.ok) {
+      const connectorsPayload = await connectorsResponse.json();
+      if (!Array.isArray(connectorsPayload.connectors)) {
+        throw new Error("API returned invalid response: missing connectors array");
+      }
+      bootstrap.connectors = connectorsPayload.connectors;
+      setCacheEntry("connectors", bootstrap.connectors);
+    }
+    if (bootstrap.connectors.length === 1) {
+      const connector = bootstrap.connectors[0];
+      setConfig("currentConnectorId", connector.id);
+      setConfig("currentConnectorName", connector.name);
+    }
   }
   const currentConnectorId = getConfig("currentConnectorId");
   if (currentConnectorId) {
-    const branchesRes = await fetch(
+    const branchesResponse = await fetch(
       `${apiUrl}/v1/cli/branches?connector_id=${currentConnectorId}`,
       { headers }
     );
-    if (branchesRes.ok) {
-      const data = await branchesRes.json();
-      const branches = data.branches || [];
-      setCacheEntry("branches", branches);
-      branchCount = branches.length;
+    if (branchesResponse.ok) {
+      const branchesPayload = await branchesResponse.json();
+      if (!Array.isArray(branchesPayload.branches)) {
+        throw new Error("API returned invalid response: missing branches array");
+      }
+      bootstrap.branches = branchesPayload.branches;
+      setCacheEntry("branches", bootstrap.branches);
     }
   }
-  return { connectors: connectorCount, branches: branchCount };
+  return bootstrap;
 }
 
 // src/lib/api.ts
@@ -712,6 +762,7 @@ async function createAction2(type, url, options) {
     if (!options.awsRoleArn) missing.push("--aws-role-arn");
     if (!options.awsExternalId) missing.push("--aws-external-id");
     if (!options.awsRegion) missing.push("--aws-region");
+    if (!options.awsClusterName) missing.push("--aws-cluster-name");
     if (missing.length > 0) {
       console.error(
         `\u2717 ${missing.join(", ")} required when --deployment-model=customer-cloud`
@@ -719,10 +770,10 @@ async function createAction2(type, url, options) {
       process.exit(1);
     }
   } else {
-    const stray = options.awsRoleArn || options.awsExternalId || options.awsRegion;
+    const stray = options.awsRoleArn || options.awsExternalId || options.awsRegion || options.awsClusterName;
     if (stray) {
       console.error(
-        "\u2717 --aws-role-arn / --aws-external-id / --aws-region require --deployment-model=customer-cloud"
+        "\u2717 --aws-role-arn / --aws-external-id / --aws-region / --aws-cluster-name require --deployment-model=customer-cloud"
       );
       process.exit(1);
     }
@@ -793,7 +844,8 @@ async function createAction2(type, url, options) {
       createPayload.byoc_access_credentials = {
         role_arn: options.awsRoleArn,
         external_id: options.awsExternalId,
-        region: options.awsRegion
+        region: options.awsRegion,
+        cluster_name: options.awsClusterName
       };
     }
     const created = await api.post("/v1/connectors", createPayload);
@@ -913,8 +965,10 @@ async function listAction2() {
 `);
   }
   if (connectors.length === 0) {
+    const green3 = "\x1B[32m";
+    const reset3 = "\x1B[0m";
     console.log("No connectors found");
-    console.log("  Create one with: ardent connector create postgresql <url>");
+    console.log(`${green3}  Create one with: ardent connector create postgresql <url>${reset3}`);
     return;
   }
   const currentConnectorId = getConfig("currentConnectorId");
@@ -1064,6 +1118,9 @@ connectorCommand.command("create <type> [url]").description("Create a new connec
 ).option(
   "--aws-region <region>",
   "AWS region of the customer data plane (required with --deployment-model=customer-cloud)"
+).option(
+  "--aws-cluster-name <name>",
+  "EKS cluster name in the customer account where pgstream pods run (required with --deployment-model=customer-cloud)"
 ).action(createAction2);
 connectorCommand.command("list").description("List your connectors").action(listAction2);
 connectorCommand.command("switch <name>").description("Switch to a different connector").action(switchAction2);
@@ -1285,9 +1342,11 @@ async function createAction3(name) {
     setCacheEntry("projects", cachedProjects);
     setConfig("currentProjectId", project.id);
     setConfig("currentProjectName", project.name);
+    setConfig("currentConnectorId", void 0);
+    setConfig("currentConnectorName", void 0);
+    clearCurrentBranch();
     trackEvent("CLI: project create succeeded");
     console.log(`\u2713 Project '${name}' created`);
-    console.log(`  ID: ${project.id}`);
   } catch (err) {
     if (isNetworkError(err)) {
       trackEvent("CLI: project create failed", { reason: "offline" });
@@ -1363,10 +1422,8 @@ async function listAction4() {
     const isCurrent = project.id === currentProjectId;
     if (isCurrent) {
       console.log(`${green2}* ${project.name}${reset2}`);
-      console.log(`${green2}    ${project.id}${reset2}`);
     } else {
       console.log(`  ${project.name}`);
-      console.log(`${dim2}    ${project.id}${reset2}`);
     }
     console.log();
   }
@@ -1429,9 +1486,114 @@ async function switchAction3(name) {
   } else {
     console.log(`Switched to project '${name}'`);
   }
+  try {
+    const result = await api.get(`/v1/cli/connectors?project_id=${project.id}`);
+    if (!Array.isArray(result.connectors)) {
+      throw new Error("API returned invalid response: missing connectors array");
+    }
+    const connectors = result.connectors;
+    setCacheEntry("connectors", connectors);
+    if (connectors.length === 1) {
+      const connector = connectors[0];
+      setConfig("currentConnectorId", connector.id);
+      setConfig("currentConnectorName", connector.name);
+      console.log("");
+      console.log(`  Auto-selected connector '${connector.name}'`);
+      console.log("");
+    } else if (connectors.length === 0) {
+      const green2 = "\x1B[32m";
+      const reset2 = "\x1B[0m";
+      console.log("");
+      console.log("  No connectors found.");
+      console.log(`${green2}  Create one with: ardent connector create postgresql <url>${reset2}`);
+      console.log("");
+    }
+  } catch (err) {
+    let reason;
+    if (isNetworkError(err)) {
+      reason = "offline";
+      console.error("  \u26A0 Couldn't fetch connectors (offline). Run 'ardent connector list' when online.");
+    } else if (isPermissionError(err)) {
+      reason = "permission_denied";
+      console.error("  \u26A0 No permission to list connectors in this project.");
+    } else {
+      reason = "api_error";
+      console.error("  \u26A0 Couldn't fetch connectors:", err instanceof Error ? err.message : err);
+    }
+    trackEvent("CLI: project switch autoselect failed", { reason });
+  }
   trackEvent("CLI: project switch");
 }
 
+// src/commands/project/delete.ts
+async function deleteAction4(name) {
+  const user = getConfig("user");
+  if (!user?.org_id) {
+    console.error("\u2717 No organization found. Run: ardent login");
+    process.exit(1);
+  }
+  const cached = getCacheEntry("projects");
+  let project = cached?.data.find((p) => p.name === name);
+  if (!project) {
+    try {
+      const result = await api.get(`/v1/projects?org_id=${user.org_id}`);
+      if (!Array.isArray(result.projects)) {
+        throw new Error("API returned invalid response: missing projects array");
+      }
+      project = result.projects.find((p) => p.name === name);
+    } catch (err) {
+      if (isNetworkError(err)) {
+        console.error(`\u2717 Project "${name}" not found in cache (offline)`);
+        console.error("  Run 'ardent project list' when online to refresh");
+        process.exit(1);
+      }
+      console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
+      process.exit(1);
+    }
+  }
+  if (!project) {
+    console.error(`\u2717 Project "${name}" not found`);
+    console.error("  Run: ardent project list");
+    process.exit(1);
+  }
+  const projectId = project.id;
+  const projectName = project.name;
+  try {
+    console.log("Deleting project...");
+    await api.delete(`/v1/projects/${projectId}`);
+    const cachedAfter = getCacheEntry("projects");
+    if (cachedAfter?.data) {
+      const remaining = cachedAfter.data.filter((p) => p.id !== projectId);
+      setCacheEntry("projects", remaining);
+    }
+    const currentId = getConfig("currentProjectId");
+    if (currentId === projectId) {
+      setConfig("currentProjectId", void 0);
+      setConfig("currentProjectName", void 0);
+      setConfig("currentConnectorId", void 0);
+      setConfig("currentConnectorName", void 0);
+      clearCurrentBranch();
+    }
+    trackEvent("CLI: project delete succeeded");
+    console.log("\u2713 Project deleted");
+    console.log(`  Name: ${projectName}`);
+  } catch (err) {
+    if (isNetworkError(err)) {
+      trackEvent("CLI: project delete failed", { reason: "offline" });
+      console.error("\u2717 Cannot delete project while offline");
+      process.exit(1);
+    }
+    if (isPermissionError(err)) {
+      trackEvent("CLI: project delete failed", { reason: "permission_denied" });
+      console.error("\u2717 You don't have permission to delete this project.");
+      process.exit(1);
+    }
+    trackEvent("CLI: project delete failed", { reason: "api_error" });
+    console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
+    process.exit(1);
+  }
+}
+
 // src/commands/project/index.ts
 var projectCommand = new Command5("project").description(
   "Manage projects"
@@ -1439,6 +1601,7 @@ var projectCommand = new Command5("project").description(
 projectCommand.command("create <name>").description("Create a new project").action(createAction3);
 projectCommand.command("list").description("List your projects").action(listAction4);
 projectCommand.command("switch <name>").description("Switch to a different project").action(switchAction3);
+projectCommand.command("delete <name>").description("Delete a project by name").action(deleteAction4);
 
 // src/commands/settings/index.ts
 import { Command as Command6 } from "commander";
@@ -1609,26 +1772,82 @@ settingsCommand.command("remove <key>").description("Remove a setting. Keys: def
 import { Command as Command7 } from "commander";
 
 // src/commands/auth/login.ts
+function identifyAndTrack(userId) {
+  const user = getConfig("user");
+  const personProperties = {};
+  if (user?.email) {
+    personProperties.email = user.email;
+  }
+  if (user?.full_name) {
+    personProperties.$name = user.full_name;
+  }
+  if (user?.org_name) {
+    personProperties.org_name = user.org_name;
+  }
+  const resolvedUserId = userId || user?.user_id;
+  if (resolvedUserId) {
+    identifyUser(resolvedUserId, personProperties);
+  }
+}
+function printBootstrapFailureGuidance() {
+  console.log("\n  Couldn't load your projects. Try:");
+  console.log("    ardent project list");
+}
+function printAutoSelection(bootstrap) {
+  const { projects, connectors } = bootstrap;
+  const green2 = "\x1B[32m";
+  const reset2 = "\x1B[0m";
+  if (projects.length === 0) {
+    console.log(`
+  ${green2}No projects found. Create one:${reset2}`);
+    console.log(`${green2}    ardent project create <name>${reset2}`);
+    return;
+  }
+  if (projects.length === 1) {
+    console.log(`  Auto-selected project '${projects[0].name}'`);
+  } else {
+    console.log(`
+  ${projects.length} projects found.`);
+    console.log("");
+    console.log(`${green2}    Next step: select a project: ardent project switch <name>${reset2}`);
+    console.log("");
+    console.log(`    List your projects: ardent project list`);
+    console.log("");
+    return;
+  }
+  if (connectors.length === 0) {
+    console.log(`
+  ${green2}No connectors found. Create one:${reset2}`);
+    console.log(`${green2}    ardent connector create postgresql <url>${reset2}`);
+    return;
+  }
+  if (connectors.length === 1) {
+    console.log(`  Auto-selected connector '${connectors[0].name}'`);
+    console.log(`
+  ${green2}Ready to branch:${reset2}`);
+    console.log(`${green2}    ardent branch create <name>${reset2}`);
+  } else {
+    console.log(`
+  ${connectors.length} connectors found.`);
+    console.log("");
+    console.log(`${green2}    Next step: select a connector: ardent connector switch <name>${reset2}`);
+    console.log("");
+    console.log(`    List your connectors: ardent connector list`);
+    console.log("");
+  }
+}
 async function loginAction(options) {
   if (options.token) {
     setConfig("token", options.token);
     console.log("\u2713 Logged in successfully");
     trackEvent("CLI: login succeeded", { method: "token" });
     try {
-      await bootstrapCache();
-      const user = getConfig("user");
-      if (user) {
-        const tokenPersonProperties = {};
-        if (user.email) tokenPersonProperties.email = user.email;
-        if (user.full_name) tokenPersonProperties.$name = user.full_name;
-        if (user.org_name) tokenPersonProperties.org_name = user.org_name;
-        if (user.user_id) {
-          identifyUser(user.user_id, tokenPersonProperties);
-        }
-      }
+      const bootstrap = await bootstrapCache();
+      identifyAndTrack(null);
+      printAutoSelection(bootstrap);
     } catch {
+      printBootstrapFailureGuidance();
     }
-    showNextStep();
     return;
   }
   console.log("Opening browser for authentication...");
@@ -1660,34 +1879,28 @@ async function loginAction(options) {
         console.error("\u2717 Poll failed");
         process.exit(1);
       }
-      const result = await pollResponse.json();
-      if (result.status === "completed") {
-        setConfig("token", result.token);
+      const pollResult = await pollResponse.json();
+      if (pollResult.status === "completed") {
+        setConfig("token", pollResult.token);
         console.log("\n\u2713 Logged in successfully");
         trackEvent("CLI: login succeeded", { method: "browser" });
         try {
-          await bootstrapCache();
+          const bootstrap = await bootstrapCache();
+          identifyAndTrack(pollResult.user_id);
+          printAutoSelection(bootstrap);
         } catch {
+          printBootstrapFailureGuidance();
         }
-        const user = getConfig("user");
-        const personProperties = {};
-        if (user?.email) personProperties.email = user.email;
-        if (user?.full_name) personProperties.$name = user.full_name;
-        if (user?.org_name) personProperties.org_name = user.org_name;
-        if (result.user_id) {
-          identifyUser(result.user_id, personProperties);
-        }
-        showNextStep();
         return;
       }
-      if (result.status === "expired") {
+      if (pollResult.status === "expired") {
         trackEvent("CLI: login failed", { method: "browser", reason: "expired" });
         console.error("\n\u2717 Session expired. Please try again.");
         process.exit(1);
       }
-      if (result.status === "error") {
+      if (pollResult.status === "error") {
         trackEvent("CLI: login failed", { method: "browser", reason: "error" });
-        console.error("\n\u2717 Error:", result.message);
+        console.error("\n\u2717 Error:", pollResult.message);
         process.exit(1);
       }
       process.stdout.write(".");
@@ -1830,6 +2043,7 @@ PROJECTS
   project create         Create a new project
   project list           List your projects (* = current)
   project switch         Switch to a different project
+  project delete         Delete a project by name
 
 CONNECTORS
   connector create       Connect a database (postgresql, snowflake, etc.)

package/package.json

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