ardent-cli 0.0.43 → 0.0.45

package/dist/index.js

@@ -399,6 +399,16 @@ function findConnectorById(connectors, connectorId) {
   }
   return void 0;
 }
+var CurrentConnectorSelectionError = class extends Error {
+  code;
+  detailLines;
+  constructor(code, message, detailLines = []) {
+    super(message);
+    this.name = "CurrentConnectorSelectionError";
+    this.code = code;
+    this.detailLines = detailLines;
+  }
+};
 function reconcileSelectedConnector(connectors) {
   const currentConnectorId = getConfig("currentConnectorId");
   if (currentConnectorId) {
@@ -417,13 +427,27 @@ function reconcileSelectedConnector(connectors) {
   }
   return void 0;
 }
-async function requireCurrentConnectorId() {
+function printCurrentConnectorSelectionError(error) {
+  console.error(`\u2717 ${error.message}`);
+  for (const detailLine of error.detailLines) {
+    console.error(detailLine);
+  }
+}
+async function resolveCurrentConnectorId() {
   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);
+    throw new CurrentConnectorSelectionError(
+      "no_current_project",
+      "No current project set. Switch to a project first.",
+      ["  ardent project list", "  ardent project switch <name>"]
+    );
+  }
+  const token = getToken();
+  if (!token) {
+    throw new CurrentConnectorSelectionError(
+      "not_authenticated",
+      "Not authenticated. Run: ardent login"
+    );
   }
   const result = await api.get(
     `/v1/cli/connectors?project_id=${currentProjectId}`
@@ -437,15 +461,52 @@ async function requireCurrentConnectorId() {
     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>");
+    throw new CurrentConnectorSelectionError(
+      "no_connectors",
+      "No connectors found.",
+      ["  Create one with: ardent connector create postgresql <url>"]
+    );
+  }
+  throw new CurrentConnectorSelectionError(
+    "connector_unavailable",
+    "Previously selected connector is no longer available.",
+    [
+      "  Select one of your current connectors:",
+      "  ardent connector list",
+      "  ardent connector switch <name>"
+    ]
+  );
+}
+
+// src/lib/resource_name_validation.ts
+var RESERVED_SUFFIXES = ["pooler", "readonly", "direct"];
+var MAX_RESOURCE_NAME_LENGTH = 100;
+var ALLOWED_CHARS = /^[a-z0-9-]+$/;
+function validateResourceName(name) {
+  const length = name ? Array.from(name).length : 0;
+  if (!name || length > MAX_RESOURCE_NAME_LENGTH) {
+    throw new Error(
+      `Resource name must be 1-${MAX_RESOURCE_NAME_LENGTH} characters, got ${length}`
+    );
+  }
+  if (!ALLOWED_CHARS.test(name)) {
+    throw new Error(
+      `Resource name must contain only lowercase letters, digits, and hyphens: '${name}'`
+    );
+  }
+  if (name.startsWith("-") || name.endsWith("-")) {
+    throw new Error(`Resource name must not start or end with a hyphen: '${name}'`);
+  }
+  if (name.includes("--")) {
+    throw new Error(`Resource name must not contain consecutive hyphens: '${name}'`);
+  }
+  for (const suffix of RESERVED_SUFFIXES) {
+    if (name.endsWith(`-${suffix}`)) {
+      throw new Error(
+        `Resource name must not end with reserved suffix '-${suffix}': '${name}'`
+      );
+    }
   }
-  process.exit(1);
 }
 
 // src/lib/telemetry.ts
@@ -505,11 +566,115 @@ function identifyUser(userId, personProperties = {}) {
   }).finally(() => clearTimeout(timeout));
 }
 
+// src/lib/branch_output.ts
+var BRANCH_JSON_SCHEMA_VERSION = 1;
+function buildBranchJson({
+  branch,
+  warning = null,
+  currentBranchName
+}) {
+  return {
+    schema_version: BRANCH_JSON_SCHEMA_VERSION,
+    id: branch.id,
+    name: branch.name,
+    connector_id: branch.connector_id,
+    service_type: branch.service_type,
+    status: branch.status,
+    branch_url: resolvePrintableUrl(branch),
+    created_at: branch.created_at,
+    last_branch_activity: branch.last_branch_activity ?? null,
+    current: currentBranchName !== void 0 && currentBranchName === branch.name,
+    warning
+  };
+}
+function renderBranchJson(payload) {
+  return JSON.stringify(payload) + "\n";
+}
+function renderBranchJsonError(code, message) {
+  const envelope = {
+    schema_version: BRANCH_JSON_SCHEMA_VERSION,
+    error: { code, message }
+  };
+  return JSON.stringify(envelope) + "\n";
+}
+function resolveOutputMode(options) {
+  const hasFormat = options.format !== void 0;
+  const hasPrintUrl = options.printUrl === true;
+  if (hasFormat && hasPrintUrl) {
+    return {
+      mode: "pretty",
+      error: "--format and --print-url are mutually exclusive"
+    };
+  }
+  if (hasFormat) {
+    if (options.format !== "json") {
+      return {
+        mode: "pretty",
+        error: `Unsupported --format value: ${options.format}. Supported: json`
+      };
+    }
+    return { mode: "json" };
+  }
+  if (hasPrintUrl) {
+    return { mode: "print-url" };
+  }
+  return { mode: "pretty" };
+}
+function resolvePrintableUrl(branch) {
+  if (!branch.branch_url) {
+    return null;
+  }
+  return branch.branch_url;
+}
+function isMachineReadableBranchInvocation(args2) {
+  let branchIndex = -1;
+  for (let index = 0; index < args2.length; index += 1) {
+    if (args2[index] === "branch") {
+      branchIndex = index;
+      break;
+    }
+  }
+  if (branchIndex === -1) {
+    return false;
+  }
+  const branchSubcommand = args2[branchIndex + 1];
+  if (branchSubcommand !== "create" && branchSubcommand !== "info") {
+    return false;
+  }
+  for (const arg of args2.slice(branchIndex + 2)) {
+    if (arg === "--print-url" || arg === "--format" || arg.startsWith("--format=")) {
+      return true;
+    }
+  }
+  return false;
+}
+
 // src/commands/branch/create.ts
 async function createAction(name, options) {
+  const modeResolution = resolveOutputMode(options);
+  if (modeResolution.error) {
+    console.error(`\u2717 ${modeResolution.error}`);
+    process.exit(2);
+  }
+  const mode = modeResolution.mode;
+  try {
+    validateResourceName(name);
+  } catch (validationError) {
+    const message = validationError instanceof Error ? validationError.message : String(validationError);
+    trackEvent("CLI: branch create failed", {
+      reason: "invalid_name",
+      output_mode: mode
+    });
+    if (mode === "json") {
+      process.stdout.write(renderBranchJsonError("invalid_name", message));
+      process.exit(1);
+    }
+    console.error(`\u2717 ${message}`);
+    process.exit(1);
+  }
   try {
     const startTime = performance.now();
-    const connectorId = await requireCurrentConnectorId();
+    const connectorId = await resolveCurrentConnectorId();
     const createResponse = await api.post(
       "/v1/branch/create",
       {
@@ -529,7 +694,18 @@ async function createAction(name, options) {
       }
     }
     if (!apiBranch) {
-      console.error("\u2717 Branch created but could not fetch details");
+      const message = "Branch created but could not fetch details";
+      trackEvent("CLI: branch create failed", {
+        reason: "create_succeeded_but_details_missing",
+        output_mode: mode
+      });
+      if (mode === "json") {
+        process.stdout.write(
+          renderBranchJsonError("create_succeeded_but_details_missing", message)
+        );
+        process.exit(1);
+      }
+      console.error(`\u2717 ${message}`);
       process.exit(1);
     }
     const branch = {
@@ -542,6 +718,20 @@ async function createAction(name, options) {
       created_at: apiBranch.created_at,
       last_branch_activity: apiBranch.last_branch_activity
     };
+    const url = resolvePrintableUrl(branch);
+    if (url === null) {
+      const message = `Branch '${name}' created but no URL returned`;
+      trackEvent("CLI: branch create failed", {
+        reason: "branch_url_missing",
+        output_mode: mode
+      });
+      if (mode === "json") {
+        process.stdout.write(renderBranchJsonError("branch_url_missing", message));
+        process.exit(1);
+      }
+      console.error(`\u2717 ${message}`);
+      process.exit(1);
+    }
     const cached = getCacheEntry("branches");
     const cachedBranches = cached?.data || [];
     cachedBranches.push(branch);
@@ -551,25 +741,57 @@ async function createAction(name, options) {
     trackEvent("CLI: branch create succeeded", {
       service_type: options.service,
       duration_seconds: parseFloat(elapsed),
-      warning_type: warning?.type
+      warning_type: warning?.type,
+      output_mode: mode
     });
-    console.log(`\u2713 Branch '${name}' created and checked out in ${elapsed}s`);
-    if (branch.branch_url) {
-      console.log(`
-${branch.branch_url}`);
+    if (mode === "json") {
+      const payload = buildBranchJson({
+        branch,
+        warning: warning ?? null,
+        currentBranchName: name
+      });
+      process.stdout.write(renderBranchJson(payload));
+      return;
+    }
+    if (mode === "print-url") {
+      process.stdout.write(url + "\n");
+      return;
     }
+    console.log(`\u2713 Branch '${name}' created and checked out in ${elapsed}s`);
+    console.log(`
+${url}`);
     if (warning) {
       console.log(`
 ! ${warning.message}`);
     }
   } catch (err) {
+    if (err instanceof CurrentConnectorSelectionError) {
+      trackEvent("CLI: branch create failed", { reason: err.code, output_mode: mode });
+      if (mode === "json") {
+        process.stdout.write(renderBranchJsonError(err.code, err.message));
+        process.exit(1);
+      }
+      printCurrentConnectorSelectionError(err);
+      process.exit(1);
+    }
     if (isNetworkError(err)) {
-      trackEvent("CLI: branch create failed", { reason: "offline" });
+      trackEvent("CLI: branch create failed", { reason: "offline", output_mode: mode });
+      if (mode === "json") {
+        process.stdout.write(
+          renderBranchJsonError("offline", "Cannot create branch while offline")
+        );
+        process.exit(1);
+      }
       console.error("\u2717 Cannot create branch while offline");
       process.exit(1);
     }
-    trackEvent("CLI: branch create failed", { reason: "api_error" });
-    console.error("\u2717 Failed:", err instanceof Error ? err.message : err);
+    trackEvent("CLI: branch create failed", { reason: "api_error", output_mode: mode });
+    const message = err instanceof Error ? err.message : String(err);
+    if (mode === "json") {
+      process.stdout.write(renderBranchJsonError("api_error", message));
+      process.exit(1);
+    }
+    console.error("\u2717 Failed:", message);
     process.exit(1);
   }
 }
@@ -650,9 +872,28 @@ async function listAction() {
 }
 
 // src/commands/branch/info.ts
-function infoAction(name) {
+function infoAction(name, options = {}) {
+  const modeResolution = resolveOutputMode(options);
+  if (modeResolution.error) {
+    console.error(`\u2717 ${modeResolution.error}`);
+    process.exit(2);
+  }
+  const mode = modeResolution.mode;
   const branchName = name || getCurrentBranch();
   if (!branchName) {
+    if (mode === "json") {
+      process.stdout.write(
+        renderBranchJsonError(
+          "no_current_branch",
+          "No branch specified and no current branch set"
+        )
+      );
+      process.exit(1);
+    }
+    if (mode === "print-url") {
+      console.error("\u2717 No branch specified and no current branch set");
+      process.exit(1);
+    }
     console.error("\u2717 No branch specified and no current branch set");
     console.log("  Run: ardent branch switch <name> or specify a branch name");
     return;
@@ -660,10 +901,52 @@ function infoAction(name) {
   const cached = getCacheEntry("branches");
   const branch = cached?.data.find((cachedBranch) => cachedBranch.name === branchName);
   if (!branch) {
-    console.error(`\u2717 Branch "${branchName}" not found`);
+    const message = `Branch "${branchName}" not found`;
+    if (mode === "json") {
+      process.stdout.write(renderBranchJsonError("not_found", message));
+      process.exit(1);
+    }
+    if (mode === "print-url") {
+      console.error(`\u2717 ${message}`);
+      process.exit(1);
+    }
+    console.error(`\u2717 ${message}`);
     console.log("  Run: ardent branch list");
     return;
   }
+  if (mode === "json" || mode === "print-url") {
+    const url = resolvePrintableUrl(branch);
+    if (url === null) {
+      const message = `No URL recorded for branch "${branch.name}"`;
+      trackEvent("CLI: branch info failed", {
+        reason: "branch_url_missing",
+        output_mode: mode
+      });
+      if (mode === "json") {
+        process.stdout.write(renderBranchJsonError("branch_url_missing", message));
+        process.exit(1);
+      }
+      console.error(`\u2717 ${message}`);
+      process.exit(1);
+    }
+  }
+  trackEvent("CLI: branch info", { output_mode: mode });
+  if (mode === "json") {
+    const payload = buildBranchJson({
+      branch,
+      currentBranchName: getCurrentBranch()
+    });
+    process.stdout.write(renderBranchJson(payload));
+    return;
+  }
+  if (mode === "print-url") {
+    const url = resolvePrintableUrl(branch);
+    if (url === null) {
+      throw new Error("Branch URL disappeared after validation");
+    }
+    process.stdout.write(url + "\n");
+    return;
+  }
   const current = getCurrentBranch();
   const marker = branch.name === current ? " (current)" : "";
   console.log(`Branch: ${branch.name}${marker}
@@ -675,7 +958,6 @@ function infoAction(name) {
     console.log(`
   URL: ${branch.branch_url}`);
   }
-  trackEvent("CLI: branch info");
 }
 
 // src/commands/branch/delete.ts
@@ -770,9 +1052,9 @@ ${yellow}To view the current state of a branch:${reset2} \`ardent branch info <n
 
 // 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("create <name>").description("Create a new database branch").option("-s, --service <type>", "Service type", "postgres").option("--format <format>", "Output format for CI/agents (currently: json)").option("--print-url", "Print only the branch URL (one line, no other output)").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("info [name]").description("Show branch details (defaults to current branch)").option("--format <format>", "Output format for CI/agents (currently: json)").option("--print-url", "Print only the branch URL (one line, no other output)").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 [name]", { hidden: true }).description("(removed) Show changes on a branch").action(diffAction);
@@ -4851,5 +5133,7 @@ if (args.length === 0) {
   program.help();
 }
 getAnonymousId();
-checkForUpdate(CLI_VERSION);
+if (!isMachineReadableBranchInvocation(args)) {
+  checkForUpdate(CLI_VERSION);
+}
 program.parse();

package/package.json

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