ardent-cli 0.0.3 → 0.0.7

package/dist/index.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { Command as Command7 } from "commander";
+import { readFileSync as readFileSync2 } from "fs";
+import { Command as Command6 } from "commander";
 
-// src/commands/branch.ts
+// src/commands/branch/index.ts
 import { Command } from "commander";
 
 // src/lib/config.ts
@@ -95,13 +96,51 @@ function clearCurrentBranch() {
   delete config.currentBranch;
   saveConfig(config);
 }
+async function bootstrapCache() {
+  const token = getToken();
+  if (!token) throw new Error("Not authenticated");
+  const apiUrl = getApiUrl();
+  const headers = {
+    "Content-Type": "application/json",
+    "Authorization": `Bearer ${token}`
+  };
+  const [connectorsRes, branchesRes] = await Promise.all([
+    fetch(`${apiUrl}/v1/cli/connectors`, { headers }),
+    fetch(`${apiUrl}/v1/cli/branches`, { 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;
+  }
+  if (branchesRes.ok) {
+    const data = await branchesRes.json();
+    const branches = data.branches || [];
+    setCacheEntry("branches", branches);
+    branchCount = branches.length;
+  }
+  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();
     if (!token) {
-      console.error("\u2717 Not authenticated. Run: ardent login");
+      const green3 = "\x1B[32m";
+      const reset3 = "\x1B[0m";
+      console.error(`\u2717 Not authenticated. Run: ${green3}ardent login${reset3}`);
       process.exit(1);
     }
     return {
@@ -117,7 +156,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();
   }
@@ -130,7 +169,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();
   }
@@ -143,7 +182,20 @@ 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();
+  }
+  async patch(path, body) {
+    const url = `${getApiUrl()}${path}`;
+    const response = await fetch(url, {
+      method: "PATCH",
+      headers: this.getHeaders(),
+      body: JSON.stringify(body)
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(parseApiError(response.status, text));
     }
     return response.json();
   }
@@ -159,10 +211,16 @@ function isNetworkError(err) {
   }
   return false;
 }
+function isPermissionError(err) {
+  if (err instanceof Error) {
+    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;
+}
 
-// src/commands/branch.ts
-var branchCommand = new Command("branch").description("Manage database branches");
-branchCommand.command("create <name>").description("Create a new database branch (e.g., ardent branch create my-feature)").option("-s, --service <type>", "Service type", "postgres").action(async (name, options) => {
+// src/commands/branch/create.ts
+async function createAction(name, options) {
   try {
     const job = await api.post("/v1/cli/jobs/create", {
       name
@@ -204,8 +262,10 @@ ${branch.branch_url}`);
     console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
     process.exit(1);
   }
-});
-branchCommand.command("list").description("List your branches").action(async () => {
+}
+
+// src/commands/branch/list.ts
+async function listAction() {
   let branches = [];
   let fromCache = false;
   let cacheTime = "";
@@ -242,32 +302,34 @@ branchCommand.command("list").description("List your branches").action(async ()
     return;
   }
   const current = getCurrentBranch();
-  const green2 = "\x1B[32m";
-  const dim2 = "\x1B[2m";
-  const reset2 = "\x1B[0m";
+  const green3 = "\x1B[32m";
+  const dim3 = "\x1B[2m";
+  const reset3 = "\x1B[0m";
   console.log("Branches:\n");
   for (const branch of branches) {
     const isCurrent = branch.name === current;
     const icon = branch.status === "active" || branch.status === "active_degraded" ? "\u25CF" : "\u25CB";
     if (isCurrent) {
-      console.log(`${green2}* ${icon} ${branch.name}${reset2}`);
+      console.log(`${green3}* ${icon} ${branch.name}${reset3}`);
       if (branch.branch_url) {
-        console.log(`${green2}      ${branch.branch_url}${reset2}`);
+        console.log(`${green3}      ${branch.branch_url}${reset3}`);
       }
     } else {
       console.log(`  ${icon} ${branch.name}`);
       if (branch.branch_url) {
-        console.log(`${dim2}      ${branch.branch_url}${reset2}`);
+        console.log(`${dim3}      ${branch.branch_url}${reset3}`);
       }
     }
     console.log();
   }
-});
-branchCommand.command("info [name]").description("Show branch details (defaults to current branch)").action((name) => {
+}
+
+// src/commands/branch/info.ts
+function infoAction(name) {
   const branchName = name || getCurrentBranch();
   if (!branchName) {
     console.error("\u2717 No branch specified and no current branch set");
-    console.log("  Run: ardent switch <name> or specify a branch name");
+    console.log("  Run: ardent branch switch <name> or specify a branch name");
     return;
   }
   const cached = getCacheEntry("branches");
@@ -288,8 +350,10 @@ branchCommand.command("info [name]").description("Show branch details (defaults
     console.log(`
   URL: ${branch.branch_url}`);
   }
-});
-branchCommand.command("delete <name>").description("Delete a branch (e.g., ardent branch delete my-feature)").action(async (name) => {
+}
+
+// src/commands/branch/delete.ts
+async function deleteAction(name) {
   const cached = getCacheEntry("branches");
   const branch = cached?.data.find((cachedBranch) => cachedBranch.name === name);
   if (!branch) {
@@ -313,118 +377,52 @@ branchCommand.command("delete <name>").description("Delete a branch (e.g., arden
     console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
     process.exit(1);
   }
-});
-
-// src/commands/connector.ts
-import { Command as Command2 } from "commander";
-function parsePostgresUrl(url) {
-  const atIndex = url.lastIndexOf("@");
-  const credentialsPart = atIndex > 0 ? url.substring(0, atIndex) : url;
-  const hostPart = atIndex > 0 ? url.substring(atIndex) : "";
-  const cleanedUrl = credentialsPart.replace(/\\!/g, "!") + hostPart;
-  const parsed = new URL(cleanedUrl);
-  const host = parsed.hostname;
-  const port = parsed.port || "5432";
-  const username = decodeURIComponent(parsed.username);
-  const password = parsed.password ? decodeURIComponent(parsed.password) : "";
-  if (!host) throw new Error("Host required in connection URL");
-  if (!username) throw new Error("Username required in connection URL");
-  return { host, port, username, password };
 }
-var connectorCommand = new Command2("connector").description("Manage database connectors");
-connectorCommand.command("create <type> <url>").description("Create a new connector (e.g., ardent connector create postgresql postgresql://user:pass@host/db)").option("-n, --name <name>", "Connector name").action(async (type, url, options) => {
-  const supportedTypes = ["postgresql"];
-  if (!supportedTypes.includes(type.toLowerCase())) {
-    console.error(`\u2717 Unsupported type: ${type}`);
-    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");
-      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
-    });
-    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") {
-      console.log("Setting up branching engine...");
-      await api.post(`/v1/connectors/${connectorId}/engine-setup`, {});
+
+// src/commands/branch/switch.ts
+async function switchAction(name) {
+  let cached = getCacheEntry("branches");
+  let branch = cached?.data.find((cachedBranch) => cachedBranch.name === name);
+  if (!branch) {
+    try {
+      const result = await api.get("/v1/cli/branches");
+      if (!result.branches) {
+        throw new Error("API returned invalid response: missing branches array");
+      }
+      setCacheEntry("branches", result.branches);
+      branch = result.branches.find((remoteBranch) => remoteBranch.name === name);
+    } catch (err) {
+      if (isNetworkError(err)) {
+        if (!branch) {
+          console.error(`\u2717 Branch "${name}" not found in cache`);
+          console.log("  Run 'ardent branch list' when online to refresh");
+          process.exit(1);
+        }
+      } else {
+        console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
+        process.exit(1);
+      }
     }
-    console.log("\u2713 Connector created and ready");
-    console.log(`  ID: ${connectorId}`);
-  } catch (err) {
-    console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
-    process.exit(1);
   }
-});
-connectorCommand.command("list").description("List your connectors").action(async () => {
-  try {
-    const result = await api.get("/v1/cli/connectors");
-    if (!result.connectors) {
-      throw new Error("API returned invalid response: missing connectors array");
-    }
-    const connectors = result.connectors;
-    if (connectors.length === 0) {
-      console.log("No connectors found");
-      console.log("  Create one with: ardent connector create postgresql <url>");
-      return;
-    }
-    console.log("Connectors:\n");
-    for (const connector of connectors) {
-      const icon = connector.status === "healthy" ? "\u25CF" : "\u25CB";
-      console.log(`  ${icon} ${connector.name} (${connector.service_name})`);
-      console.log(`    ID: ${connector.id}`);
-      console.log();
-    }
-  } catch (err) {
-    console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
+  if (!branch) {
+    console.error(`\u2717 Branch "${name}" not found`);
+    console.log("  Run: ardent branch list");
     process.exit(1);
   }
-});
-connectorCommand.command("delete <name>").description("Delete a connector by name (e.g., ardent connector delete 'My PostgreSQL Connection')").action(async (name) => {
-  try {
-    const result = await api.get("/v1/cli/connectors");
-    if (!result.connectors) {
-      throw new Error("API returned invalid response: missing connectors array");
-    }
-    const connector = result.connectors.find((existingConnector) => existingConnector.name === name);
-    if (!connector) {
-      console.error(`\u2717 Connector "${name}" not found`);
-      console.log("  Run: ardent connector list");
-      process.exit(1);
-    }
-    console.log("Deleting connector...");
-    await api.delete(`/v1/connectors/${connector.id}`);
-    console.log("\u2713 Connector deleted");
-  } catch (err) {
-    console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
-    process.exit(1);
+  const previous = getCurrentBranch();
+  setCurrentBranch(name);
+  if (previous && previous !== name) {
+    console.log(`Switched from '${previous}' to '${name}'`);
+  } else {
+    console.log(`Switched to branch '${name}'`);
   }
-});
+  if (branch.branch_url) {
+    console.log(`
+${branch.branch_url}`);
+  }
+}
 
-// src/commands/diff.ts
-import { Command as Command3 } from "commander";
+// src/commands/branch/diff.ts
 var green = "\x1B[32m";
 var red = "\x1B[31m";
 var yellow = "\x1B[33m";
@@ -449,7 +447,7 @@ function parseDiffRow(raw) {
     last_data: raw.final_values ? JSON.parse(raw.final_values) : null
   };
 }
-var diffCommand = new Command3("diff").description("Show CDC changes on current branch").option("-b, --branch <name>", "Branch name (defaults to current)").option("--sql", "Output as replay SQL").action(async (options) => {
+async function diffAction(options) {
   let branch;
   if (options.branch) {
     branch = getBranchByName(options.branch);
@@ -466,7 +464,7 @@ var diffCommand = new Command3("diff").description("Show CDC changes on current
       console.log("  Run: ardent branch list");
     } else {
       console.error("\u2717 No current branch set");
-      console.log("  Run: ardent switch <name> or ardent branch create <name>");
+      console.log("  Run: ardent branch switch <name> or ardent branch create <name>");
     }
     return;
   }
@@ -632,13 +630,361 @@ var diffCommand = new Command3("diff").description("Show CDC changes on current
     console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
     process.exit(1);
   }
-});
+}
 
-// src/commands/invite.ts
-import { Command as Command4 } from "commander";
-async function sendInvite(email, role) {
+// src/commands/branch/index.ts
+var branchCommand = new Command("branch").description("Manage database branches");
+branchCommand.command("create <name>").description("Create a new database branch").option("-s, --service <type>", "Service type", "postgres").action(createAction);
+branchCommand.command("list").description("List your branches").action(listAction);
+branchCommand.command("info [name]").description("Show branch details (defaults to current branch)").action(infoAction);
+branchCommand.command("delete <name>").description("Delete a branch").action(deleteAction);
+branchCommand.command("switch <name>").description("Switch to a different branch").action(switchAction);
+branchCommand.command("diff").description("Show all changes since branch creation").option("-b, --branch <name>", "Branch name (defaults to current)").option("--sql", "Output as replay SQL").action(diffAction);
+
+// src/commands/connector/index.ts
+import { Command as Command2 } from "commander";
+
+// 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
+\u2502                                                         \u2502
+\u2502     \u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2557   \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2502
+\u2502    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2551\u255A\u2550\u2550\u2588\u2588\u2554\u2550\u2550\u255D  \u2502
+\u2502    \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2554\u2588\u2588\u2557 \u2588\u2588\u2551   \u2588\u2588\u2551     \u2502
+\u2502    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u255D  \u2588\u2588\u2551\u255A\u2588\u2588\u2557\u2588\u2588\u2551   \u2588\u2588\u2551     \u2502
+\u2502    \u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2551 \u255A\u2588\u2588\u2588\u2588\u2551   \u2588\u2588\u2551     \u2502
+\u2502    \u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u2550\u2550\u255D   \u255A\u2550\u255D     \u2502
+\u2502                                                         \u2502
+\u2502              Git for your data infrastructure           \u2502
+\u2502                                                         \u2502
+\u2514\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\u2518
+`;
+function getOnboardingState() {
+  const token = getToken();
+  if (!token) {
+    return { state: "not_logged_in", connectorCount: 0, branchCount: 0, currentBranch: void 0 };
+  }
+  const connectors = getCacheEntry("connectors");
+  const connectorCount = connectors?.data?.length || 0;
+  if (connectorCount === 0) {
+    return { state: "no_connectors", connectorCount: 0, branchCount: 0, currentBranch: void 0 };
+  }
+  const branches = getCacheEntry("branches");
+  const branchCount = branches?.data?.length || 0;
+  const currentBranch = getCurrentBranch();
+  if (branchCount === 0) {
+    return { state: "no_branches", connectorCount, branchCount: 0, currentBranch: void 0 };
+  }
+  return { state: "ready", connectorCount, branchCount, currentBranch };
+}
+var dim2 = "\x1B[2m";
+var reset2 = "\x1B[0m";
+var green2 = "\x1B[32m";
+function showOnboarding() {
+  const { state, connectorCount, branchCount, currentBranch } = getOnboardingState();
+  switch (state) {
+    case "not_logged_in":
+      console.log(BANNER);
+      console.log(`To get started, log in with your GitHub account:
+
+  ${green2}ardent login${reset2}
+
+Run ${dim2}ardent --help${reset2} to see all commands.
+`);
+      break;
+    case "no_connectors":
+      console.log(`
+${green2}\u2713${reset2} Logged in
+
+Next step \u2014 connect your first database:
+
+  ${green2}ardent connector create <type> <connection-url>${reset2}
+
+Example:
+  ${dim2}ardent connector create postgresql postgresql://user:password@host:5432/database${reset2}
+
+Run ${dim2}ardent --help${reset2} to see all commands.
+`);
+      break;
+    case "no_branches":
+      console.log(`
+${green2}\u2713${reset2} Logged in  ${green2}\u2713${reset2} ${connectorCount} connector${connectorCount !== 1 ? "s" : ""}
+
+You're all set! Create your first branch:
+
+  ${green2}ardent branch create <name>${reset2}
+
+Example:
+  ${dim2}ardent branch create my-feature${reset2}
+
+Run ${dim2}ardent --help${reset2} to see all commands.
+`);
+      return true;
+    case "ready":
+      return false;
+  }
+  return true;
+}
+function showNextStep() {
+  const { state } = getOnboardingState();
+  switch (state) {
+    case "no_connectors":
+      console.log(`
+Next step \u2014 connect your first database:
+
+  ${green2}ardent connector create <type> <connection-url>${reset2}
+
+Example:
+  ${dim2}ardent connector create postgresql postgresql://user:password@host:5432/database${reset2}
+`);
+      break;
+    case "no_branches":
+      console.log(`
+Next step \u2014 create your first branch:
+
+  ${green2}ardent branch create <name>${reset2}
+
+Example:
+  ${dim2}ardent branch create my-feature${reset2}
+`);
+      break;
+    case "ready":
+      break;
+  }
+}
+
+// src/commands/connector/create.ts
+function parsePostgresUrl(url) {
+  const atIndex = url.lastIndexOf("@");
+  const credentialsPart = atIndex > 0 ? url.substring(0, atIndex) : url;
+  const hostPart = atIndex > 0 ? url.substring(atIndex) : "";
+  const cleanedUrl = credentialsPart.replace(/\\!/g, "!") + hostPart;
+  const parsed = new URL(cleanedUrl);
+  const host = parsed.hostname;
+  const port = parsed.port || "5432";
+  const username = decodeURIComponent(parsed.username);
+  const password = parsed.password ? decodeURIComponent(parsed.password) : "";
+  if (!host) throw new Error("Host required in connection URL");
+  if (!username) throw new Error("Username required in connection URL");
+  return { host, port, username, password };
+}
+async function createAction2(type, url, options) {
+  const supportedTypes = ["postgresql"];
+  if (!supportedTypes.includes(type.toLowerCase())) {
+    console.error(`\u2717 Unsupported type: ${type}`);
+    console.error(`  Supported: ${supportedTypes.join(", ")}`);
+    process.exit(1);
+  }
+  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);
+    }
+    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;
+    if (isByoc) {
+      console.log("Setting up branching engine...");
+      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: finalConnector.branching_engine_status ?? finalConnector.connection_status ?? "pending"
+    };
+    const cached = getCacheEntry("connectors");
+    const cachedConnectors = cached?.data || [];
+    cachedConnectors.push(newConnector);
+    setCacheEntry("connectors", cachedConnectors);
+    console.log("\u2713 Connector created and ready");
+    console.log(`  ID: ${connectorId}`);
+    showNextStep();
+  } catch (err) {
+    if (isPermissionError(err)) {
+      console.error("\u2717 You don't have permission to create connectors.");
+      console.error("");
+      console.error("  Ask your organization admin to either:");
+      console.error("  \u2022 Create the connector for you, or");
+      console.error("  \u2022 Upgrade your role to Admin");
+      process.exit(1);
+    }
+    console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
+    process.exit(1);
+  }
+}
+
+// src/commands/connector/list.ts
+async function listAction2() {
+  let connectors = [];
+  let fromCache = false;
+  let cacheTime = "";
+  try {
+    const result = await api.get("/v1/cli/connectors");
+    if (!result.connectors) {
+      throw new Error("API returned invalid response: missing connectors array");
+    }
+    connectors = result.connectors;
+    setCacheEntry("connectors", connectors);
+  } catch (err) {
+    if (isNetworkError(err)) {
+      const cached = getCacheEntry("connectors");
+      if (cached) {
+        connectors = cached.data;
+        fromCache = true;
+        cacheTime = formatCacheTime(cached.updated_at);
+      } else {
+        console.error("\u2717 Offline and no cached data available");
+        process.exit(1);
+      }
+    } else {
+      console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
+      process.exit(1);
+    }
+  }
+  if (fromCache) {
+    console.log(`\u26A0 Offline - showing cached data from ${cacheTime}
+`);
+  }
+  if (connectors.length === 0) {
+    console.log("No connectors found");
+    console.log("  Create one with: ardent connector create postgresql <url>");
+    return;
+  }
+  console.log("Connectors:\n");
+  for (const connector of connectors) {
+    const icon = connector.status === "healthy" ? "\u25CF" : "\u25CB";
+    console.log(`  ${icon} ${connector.service_name}`);
+    console.log(`    Name: ${connector.name}`);
+    console.log();
+  }
+}
+
+// src/commands/connector/delete.ts
+async function deleteAction2(name) {
+  const cached = getCacheEntry("connectors");
+  let connector = cached?.data.find((c) => c.name === name);
+  if (!connector) {
+    try {
+      const result = await api.get("/v1/cli/connectors");
+      if (result.connectors) {
+        setCacheEntry("connectors", result.connectors);
+        connector = result.connectors.find((c) => c.name === name);
+      }
+    } catch (err) {
+      if (isNetworkError(err)) {
+        console.error("\u2717 Connector not found in cache and offline");
+        process.exit(1);
+      }
+      throw err;
+    }
+  }
+  if (!connector) {
+    console.error(`\u2717 Connector "${name}" not found`);
+    console.log("  Run: ardent connector list");
+    process.exit(1);
+  }
+  try {
+    console.log("Deleting connector...");
+    await api.delete(`/v1/connectors/${connector.id}`);
+    const currentCache = getCacheEntry("connectors");
+    if (currentCache?.data) {
+      const updatedConnectors = currentCache.data.filter((c) => c.id !== connector.id);
+      setCacheEntry("connectors", updatedConnectors);
+    }
+    console.log("\u2713 Connector deleted");
+  } catch (err) {
+    if (isNetworkError(err)) {
+      console.error("\u2717 Cannot delete connector while offline");
+      process.exit(1);
+    }
+    if (isPermissionError(err)) {
+      console.error("\u2717 You don't have permission to delete connectors.");
+      console.error("");
+      console.error("  Ask your organization admin to either:");
+      console.error("  \u2022 Delete the connector for you, or");
+      console.error("  \u2022 Upgrade your role to Admin");
+      process.exit(1);
+    }
+    console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
+    process.exit(1);
+  }
+}
+
+// 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").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);
+
+// src/commands/invite/index.ts
+import { Command as Command3 } from "commander";
+
+// src/commands/invite/send.ts
+async function sendAction(email, role) {
   const validRoles = ["owner", "admin", "member", "viewer"];
-  if (!validRoles.includes(role)) {
+  if (!validRoles.includes(role.toLowerCase())) {
     console.error(`\u2717 Invalid role: ${role}`);
     console.error(`  Valid roles: ${validRoles.join(", ")}`);
     process.exit(1);
@@ -646,30 +992,31 @@ async function sendInvite(email, role) {
   try {
     const result = await api.post("/v1/cli/invite", {
       email,
-      role
+      role: role.toLowerCase()
     });
-    console.log(`\u2713 Invitation sent to ${result.email}`);
+    console.log(`\u2713 Invite sent to ${result.email}`);
     console.log(`  Role: ${result.role}`);
     console.log(`  Org: ${result.org_name}`);
-    console.log();
-    console.log("They'll receive an email with a link to join.");
   } catch (err) {
     if (isNetworkError(err)) {
       console.error("\u2717 Cannot send invite while offline");
       process.exit(1);
     }
+    if (isPermissionError(err)) {
+      console.error("\u2717 You don't have permission to invite users.");
+      console.error("");
+      console.error("  Ask your organization admin to either:");
+      console.error("  \u2022 Send the invite for you, or");
+      console.error("  \u2022 Upgrade your role to Admin");
+      process.exit(1);
+    }
     console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
     process.exit(1);
   }
 }
-var inviteCommand = new Command4("invite").description("Invite a user to your organization").argument("[email]", "Email address to invite").argument("[role]", "Role to assign (owner/admin/member/viewer)", "member").action(async (email, role) => {
-  if (!email) {
-    inviteCommand.help();
-    return;
-  }
-  await sendInvite(email, role);
-});
-inviteCommand.command("list").description("List pending invites").action(async () => {
+
+// src/commands/invite/list.ts
+async function listAction3() {
   try {
     const result = await api.get("/v1/cli/invites");
     if (!result.invites) {
@@ -695,8 +1042,10 @@ inviteCommand.command("list").description("List pending invites").action(async (
     console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
     process.exit(1);
   }
-});
-inviteCommand.command("delete <email>").description("Revoke a pending invite").action(async (email) => {
+}
+
+// src/commands/invite/delete.ts
+async function deleteAction3(email) {
   try {
     await api.delete("/v1/cli/invites", { email });
     console.log(`\u2713 Invite for ${email} deleted`);
@@ -708,58 +1057,114 @@ inviteCommand.command("delete <email>").description("Revoke a pending invite").a
     console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
     process.exit(1);
   }
+}
+
+// src/commands/invite/index.ts
+var inviteCommand = new Command3("invite").description("Invite a user to your organization").argument("[email]", "Email address to invite").argument("[role]", "Role to assign (owner/admin/member/viewer)", "member").action(async (email, role) => {
+  if (!email) {
+    inviteCommand.help();
+    return;
+  }
+  await sendAction(email, role);
 });
+inviteCommand.command("list").description("List pending invites").action(listAction3);
+inviteCommand.command("delete <email>").description("Revoke a pending invite").action(deleteAction3);
 
-// src/commands/switch.ts
-import { Command as Command5 } from "commander";
-var switchCommand = new Command5("switch").description("Switch to a different branch").argument("<name>", "Branch name to switch to").action(async (name) => {
-  let cached = getCacheEntry("branches");
-  let branch = cached?.data.find((cachedBranch) => cachedBranch.name === name);
-  if (!branch) {
-    try {
-      const result = await api.get("/v1/cli/branches");
-      if (!result.branches) {
-        throw new Error("API returned invalid response: missing branches array");
-      }
-      setCacheEntry("branches", result.branches);
-      branch = result.branches.find((remoteBranch) => remoteBranch.name === name);
-    } catch (err) {
-      if (isNetworkError(err)) {
-        if (!branch) {
-          console.error(`\u2717 Branch "${name}" not found in cache`);
-          console.log("  Run 'ardent branch list' when online to refresh");
-          process.exit(1);
-        }
-      } else {
-        console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
-        process.exit(1);
-      }
+// src/commands/org/index.ts
+import { Command as Command4 } from "commander";
+
+// src/commands/org/members.ts
+async function membersAction() {
+  try {
+    const result = await api.get("/v1/cli/members");
+    if (!result.members || result.members.length === 0) {
+      console.log("No members found");
+      return;
+    }
+    console.log("Organization members:\n");
+    for (const member of result.members) {
+      const name = member.name ? ` (${member.name})` : "";
+      console.log(`  ${member.email}${name}`);
+      console.log(`    Role: ${member.role}`);
+      console.log();
+    }
+  } catch (err) {
+    if (isNetworkError(err)) {
+      console.error("\u2717 Cannot list members while offline");
+      process.exit(1);
     }
+    console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
+    process.exit(1);
   }
-  if (!branch) {
-    console.error(`\u2717 Branch "${name}" not found`);
-    console.log("  Run: ardent branch list");
+}
+
+// src/commands/org/set-role.ts
+async function setRoleAction(email, role) {
+  const validRoles = ["owner", "admin", "member", "viewer"];
+  if (!validRoles.includes(role)) {
+    console.error(`\u2717 Invalid role: ${role}`);
+    console.error(`  Valid roles: ${validRoles.join(", ")}`);
     process.exit(1);
   }
-  const previous = getCurrentBranch();
-  setCurrentBranch(name);
-  if (previous && previous !== name) {
-    console.log(`Switched from '${previous}' to '${name}'`);
-  } else {
-    console.log(`Switched to branch '${name}'`);
+  try {
+    const result = await api.patch("/v1/cli/members/role", { email, role });
+    console.log(`\u2713 Updated ${result.email} to ${result.new_role}`);
+  } catch (err) {
+    if (isNetworkError(err)) {
+      console.error("\u2717 Cannot update role while offline");
+      process.exit(1);
+    }
+    if (isPermissionError(err)) {
+      console.error("\u2717 You don't have permission to update member roles.");
+      console.error("");
+      console.error("  Only org admins and owners can change roles.");
+      process.exit(1);
+    }
+    console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
+    process.exit(1);
   }
-  if (branch.branch_url) {
-    console.log(`
-${branch.branch_url}`);
+}
+
+// src/commands/org/remove.ts
+async function removeAction(email) {
+  try {
+    await api.delete("/v1/cli/members", { email });
+    console.log(`\u2713 Removed ${email} from organization`);
+  } catch (err) {
+    if (isNetworkError(err)) {
+      console.error("\u2717 Cannot remove member while offline");
+      process.exit(1);
+    }
+    if (isPermissionError(err)) {
+      console.error("\u2717 You don't have permission to remove members.");
+      console.error("");
+      console.error("  Only org admins and owners can remove members.");
+      process.exit(1);
+    }
+    console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
+    process.exit(1);
   }
-});
+}
 
-// src/commands/auth.ts
-import { Command as Command6 } from "commander";
-var loginCommand = new Command6("login").description("Login to Ardent").option("-t, --token <token>", "API token (skip browser login)").action(async (options) => {
+// src/commands/org/index.ts
+var orgCommand = new Command4("org").description("Manage organization members");
+orgCommand.command("members").description("List organization members").action(membersAction);
+orgCommand.command("set-role <email> <role>").description("Update a member's role (owner/admin/member/viewer)").action(setRoleAction);
+orgCommand.command("remove <email>").description("Remove a member from the organization").action(removeAction);
+
+// src/commands/auth/index.ts
+import { Command as Command5 } from "commander";
+
+// src/commands/auth/login.ts
+async function loginAction(options) {
   if (options.token) {
     setConfig("token", options.token);
     console.log("\u2713 Logged in successfully");
+    try {
+      await bootstrapCache();
+    } catch {
+    }
+    showNextStep();
     return;
   }
   console.log("Opening browser for authentication...");
@@ -793,6 +1198,11 @@ var loginCommand = new Command6("login").description("Login to Ardent").option("
       if (result.status === "completed") {
         setConfig("token", result.token);
         console.log("\n\u2713 Logged in successfully");
+        try {
+          await bootstrapCache();
+        } catch {
+        }
+        showNextStep();
         return;
       }
       if (result.status === "expired") {
@@ -811,12 +1221,16 @@ var loginCommand = new Command6("login").description("Login to Ardent").option("
     console.error("\u2717 Login failed:", error instanceof Error ? error.message : error);
     process.exit(1);
   }
-});
-var logoutCommand = new Command6("logout").description("Logout from Ardent").action(() => {
+}
+
+// src/commands/auth/logout.ts
+function logoutAction() {
   clearConfig();
   console.log("\u2713 Logged out");
-});
-var statusCommand = new Command6("status").description("Show status").action(() => {
+}
+
+// src/commands/auth/status.ts
+function statusAction() {
   const token = getConfig("token");
   if (token) {
     console.log("\u2713 Authenticated");
@@ -825,60 +1239,68 @@ var statusCommand = new Command6("status").description("Show status").action(()
     console.log("\u2717 Not authenticated");
     console.log("  Run: ardent login");
   }
-});
+}
+
+// src/commands/auth/index.ts
+var loginCommand = new Command5("login").description("Login to Ardent").option("-t, --token <token>", "API token (skip browser login)").action(loginAction);
+var logoutCommand = new Command5("logout").description("Logout from Ardent").action(logoutAction);
+var statusCommand = new Command5("status").description("Show status").action(statusAction);
 
 // src/index.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
-\u2502                                                         \u2502
-\u2502     \u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2557   \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2502
-\u2502    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2551\u255A\u2550\u2550\u2588\u2588\u2554\u2550\u2550\u255D  \u2502
-\u2502    \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2554\u2588\u2588\u2557 \u2588\u2588\u2551   \u2588\u2588\u2551     \u2502
-\u2502    \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u255D  \u2588\u2588\u2551\u255A\u2588\u2588\u2557\u2588\u2588\u2551   \u2588\u2588\u2551     \u2502
-\u2502    \u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2551 \u255A\u2588\u2588\u2588\u2588\u2551   \u2588\u2588\u2551     \u2502
-\u2502    \u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u2550\u2550\u255D   \u255A\u2550\u255D     \u2502
-\u2502                                                         \u2502
-\u2502              Git for your data infrastructure           \u2502
-\u2502                                                         \u2502
-\u2514\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\u2518
-`;
 var HELP_TEXT = `
 USAGE
   ardent <command> [options]
 
-COMMANDS
-  login              Login via browser (GitHub OAuth)
-  logout             Clear stored credentials
-  status             Check authentication status
-  connector create   Connect a database (postgres, snowflake, etc.)
-  connector list     List your connectors
-  connector delete   Delete a connector
-  branch create      Create a new database branch (auto-switches to it)
-  branch list        List your branches (* = current)
-  branch info        Show branch details (URL, status, etc.)
-  branch delete      Delete a branch
-  switch <name>      Switch to a different branch
-  diff               Show CDC changes on a branch
-  invite <email>     Invite a user to your organization
-  invite list        List pending invites
-  invite delete      Revoke a pending invite
+AUTHENTICATION
+  login                  Login via browser (GitHub OAuth)
+  logout                 Clear stored credentials
+  status                 Check authentication status
+
+CONNECTORS
+  connector create       Connect a database (postgresql, snowflake, etc.)
+  connector list         List your connectors
+  connector delete       Delete a connector
+
+BRANCHES
+  branch create          Create a new database branch (auto-switches to it)
+  branch list            List your branches (* = current)
+  branch info            Show branch details (URL, status, etc.)
+  branch delete          Delete a branch
+  branch switch          Switch to a different branch
+  branch diff            Show all changes since branch creation
+
+TEAM
+  invite <email>         Invite a user to your organization
+  invite list            List pending invites
+  invite delete          Revoke a pending invite
+  org members            List organization members
+  org set-role           Update a member's role
+  org remove             Remove a member from the organization
 
 OPTIONS
-  --help             Show help for any command
-  --version          Show CLI version
+  --help                 Show help for any command
+  --version              Show CLI version
 
 EXAMPLES
   ardent login
-  ardent connector create postgresql postgresql://user:pass@host:5432/db
+  ardent connector create postgresql postgresql://user:password@your-db-host.com:5432/database
   ardent branch create my-feature
-  ardent branch list
-  ardent invite teammate@company.com
-  ardent invite teammate@company.com admin
-
-For more help, visit https://docs.tryardent.com/cli
+  ardent branch switch my-feature
+  ardent org members
 `;
-var program = new Command7();
-program.name("ardent").description("CLI for Ardent database branching").version("0.0.1").configureHelp({
+var CLI_VERSION = getCliVersion();
+var program = new Command6();
+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";
+  }
+}
+program.name("ardent").description("CLI for Ardent database branching").version(CLI_VERSION).configureHelp({
   formatHelp: () => BANNER + HELP_TEXT
 });
 program.addCommand(loginCommand);
@@ -886,7 +1308,28 @@ program.addCommand(logoutCommand);
 program.addCommand(statusCommand);
 program.addCommand(connectorCommand);
 program.addCommand(branchCommand);
-program.addCommand(switchCommand);
-program.addCommand(diffCommand);
 program.addCommand(inviteCommand);
+program.addCommand(orgCommand);
+program.on("command:*", (operands) => {
+  const unknown = operands[0];
+  console.error(`Unknown command: ${unknown}
+`);
+  if (unknown === "switch") {
+    console.error(`  Did you mean: ardent branch switch <name>
+`);
+  } else if (unknown === "diff") {
+    console.error(`  Did you mean: ardent branch diff
+`);
+  }
+  console.error(`Run ardent --help for available commands.`);
+  process.exit(1);
+});
+var args = process.argv.slice(2);
+if (args.length === 0) {
+  const showedOnboarding = showOnboarding();
+  if (showedOnboarding) {
+    process.exit(0);
+  }
+  program.help();
+}
 program.parse();

package/package.json

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