ardent-cli 0.0.44 → 0.0.46

package/dist/index.js

@@ -478,6 +478,37 @@ async function resolveCurrentConnectorId() {
   );
 }
 
+// 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}'`
+      );
+    }
+  }
+}
+
 // src/lib/telemetry.ts
 import { randomUUID } from "crypto";
 function getAnonymousId() {
@@ -626,6 +657,21 @@ async function createAction(name, options) {
     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 resolveCurrentConnectorId();
@@ -1865,12 +1911,85 @@ async function handleReplicaIdentityPreflight(connectorId, options, behavior = {
   return { submitted: true, preflight: refreshed };
 }
 
+// src/lib/connector_name.ts
+var SUFFIX_RESERVE = 5;
+var MAX_BASE_LENGTH = MAX_RESOURCE_NAME_LENGTH - SUFFIX_RESERVE;
+var MAX_COLLISION_SUFFIX = 1e3;
+function slugifyToResourceName(input) {
+  const slug = input.normalize("NFKD").replace(new RegExp("\\p{Mn}", "gu"), "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, MAX_BASE_LENGTH).replace(/-+$/g, "");
+  if (slug.length === 0) {
+    return null;
+  }
+  try {
+    validateResourceName(slug);
+  } catch {
+    return null;
+  }
+  return slug;
+}
+function deriveConnectorName(options) {
+  let base = null;
+  for (const source of options.sources) {
+    if (!source) {
+      continue;
+    }
+    const candidate = slugifyToResourceName(source);
+    if (candidate) {
+      base = candidate;
+      break;
+    }
+  }
+  if (base === null) {
+    base = slugifyToResourceName(options.fallbackBase);
+  }
+  if (base === null) {
+    throw new Error(
+      `Could not derive a connector name: fallback base '${options.fallbackBase}' is not a valid resource name`
+    );
+  }
+  const taken = new Set(options.existingNames);
+  if (!taken.has(base)) {
+    return base;
+  }
+  for (let suffix = 2; suffix <= MAX_COLLISION_SUFFIX; suffix++) {
+    const candidate = `${base}-${suffix}`;
+    if (!taken.has(candidate)) {
+      return candidate;
+    }
+  }
+  throw new Error(
+    `Could not derive a unique connector name from base '${base}' after ${MAX_COLLISION_SUFFIX} attempts; pass --name explicitly`
+  );
+}
+
 // src/commands/connector/create.ts
 function printEngineSetupRecoveryHint(connectorName) {
   console.error("\u2717 Engine setup did not complete for this connector.");
   console.error("  Inspect: ardent connector list");
   console.error(`  Retry:   ardent connector retry-setup ${connectorName}`);
 }
+async function deriveDefaultConnectorName(input) {
+  let existingNames;
+  try {
+    const existing = await api.get(
+      `/v1/cli/connectors?project_id=${input.projectId}`
+    );
+    existingNames = existing.connectors.map((connector) => connector.name);
+  } catch (listErr) {
+    if (isPermissionError(listErr)) {
+      throw listErr;
+    }
+    const detail = listErr instanceof Error ? listErr.message : String(listErr);
+    throw new Error(
+      `Could not look up existing connectors to choose a default name (${detail}). Re-run with --name <name>.`
+    );
+  }
+  return deriveConnectorName({
+    sources: [input.projectName, input.sourceDatabase, input.sourceHost],
+    existingNames,
+    fallbackBase: input.serviceType
+  });
+}
 async function promptForUnsupportedExtensions(connectorId, unsupported, alreadyPersisted) {
   function mergeAllowlist(newlyAccepted) {
     return Array.from(/* @__PURE__ */ new Set([...alreadyPersisted, ...newlyAccepted])).sort();
@@ -1981,7 +2100,16 @@ async function createAction2(type, url, options) {
     process.exit(1);
   }
   try {
-    const connectorName = options.name || (isByocNeon ? "my-neon-connection" : "my-postgresql-connection");
+    if (options.name) {
+      try {
+        validateResourceName(options.name);
+      } catch (validationError) {
+        const message = validationError instanceof Error ? validationError.message : String(validationError);
+        trackEvent("CLI: connector create failed", { reason: "invalid_name" });
+        console.error(`\u2717 ${message}`);
+        process.exit(1);
+      }
+    }
     const currentProjectId = getConfig("currentProjectId");
     if (!currentProjectId) {
       console.error("\u2717 No current project set. Switch to a project first:");
@@ -1989,6 +2117,22 @@ async function createAction2(type, url, options) {
       console.error("  ardent project switch <name>");
       process.exit(1);
     }
+    let parsedUrl;
+    if (!isByocNeon) {
+      parsedUrl = parsePostgresUrl(url);
+      if (!parsedUrl.password) {
+        console.error("\u2717 Password required in connection URL");
+        console.error("  Example: postgresql://user:password@host:5432/db");
+        process.exit(1);
+      }
+    }
+    const connectorName = options.name ? options.name : await deriveDefaultConnectorName({
+      projectId: currentProjectId,
+      projectName: getConfig("currentProjectName"),
+      sourceDatabase: parsedUrl?.database,
+      sourceHost: parsedUrl?.host,
+      serviceType: type.toLowerCase()
+    });
     let createPayload;
     if (isByocNeon) {
       console.log(
@@ -2004,12 +2148,7 @@ async function createAction2(type, url, options) {
         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);
-      }
+      const parsed = parsedUrl;
       console.log(
         `Creating connector${useByocEnvironment ? " (BYOC environment)" : ""}...`
       );
@@ -2166,6 +2305,7 @@ async function createAction2(type, url, options) {
     });
     if (isDegraded) {
       console.log("\u2713 Connector created");
+      console.log(`  Name: ${connectorName}`);
       console.log(`  ID: ${connectorId}`);
       console.log("");
       let warnings = [];
@@ -2179,6 +2319,7 @@ async function createAction2(type, url, options) {
       printDegradedWarnings(warnings);
     } else {
       console.log("\u2713 Connector created and ready");
+      console.log(`  Name: ${connectorName}`);
       console.log(`  ID: ${connectorId}`);
     }
     showNextStep();
@@ -2231,18 +2372,27 @@ function renderConnectorIcon(connector) {
 }
 
 // src/commands/connector/list.ts
+function printOtherProjectsHint(summary, currentProjectHasConnectors, dim2, reset2) {
+  if (!summary) return;
+  const connectorWord = summary.connectorCount === 1 ? "connector" : "connectors";
+  const projectWord = summary.projectCount === 1 ? "project" : "projects";
+  const countPhrase = currentProjectHasConnectors ? `${summary.connectorCount} more ${connectorWord}` : `${summary.connectorCount} ${connectorWord}`;
+  console.log(
+    `${dim2}more: ${countPhrase} across ${summary.projectCount} other ${projectWord} \u2014 switch with: ardent project switch <name>${reset2}`
+  );
+}
 async function listAction2() {
+  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);
+  }
   let connectors = [];
   let fromCache = false;
   let cacheTime = "";
   try {
-    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");
@@ -2267,26 +2417,47 @@ async function listAction2() {
       process.exit(1);
     }
   }
+  let otherProjectsSummary = null;
+  if (!fromCache) {
+    try {
+      const all = await api.get("/v1/cli/connectors");
+      const others = (all.connectors ?? []).filter(
+        (connector) => connector.project_id && connector.project_id !== currentProjectId
+      );
+      if (others.length > 0) {
+        otherProjectsSummary = {
+          connectorCount: others.length,
+          projectCount: new Set(others.map((connector) => connector.project_id)).size
+        };
+      }
+    } catch {
+      otherProjectsSummary = null;
+    }
+  }
   trackEvent("CLI: connector list succeeded", { connector_count: connectors.length, from_cache: fromCache });
   if (fromCache) {
     console.log(`\u26A0 Offline - showing cached data from ${cacheTime}
 `);
   }
-  if (connectors.length === 0) {
-    const green3 = "\x1B[32m";
-    const reset3 = "\x1B[0m";
-    console.log("No connectors found");
-    console.log(`${green3}  Create one with: ardent connector create postgresql <url>${reset3}`);
-    return;
-  }
-  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";
   const red = "\x1B[31m";
   const reset2 = "\x1B[0m";
-  console.log("Connectors:\n");
+  const projectLabel = getConfig("currentProjectName") ?? currentProjectId;
+  console.log(`Project: ${projectLabel}
+`);
+  if (connectors.length === 0) {
+    console.log("  No connectors in this project.");
+    console.log(`${green2}  Create one with: ardent connector create postgresql <url>${reset2}`);
+    if (otherProjectsSummary) {
+      console.log("");
+      printOtherProjectsHint(otherProjectsSummary, false, dim2, reset2);
+    }
+    return;
+  }
+  const selectedConnector = fromCache ? void 0 : reconcileSelectedConnector(connectors);
+  const currentConnectorId = selectedConnector?.id ?? getConfig("currentConnectorId");
   let enginePendingCount = 0;
   for (const connector of connectors) {
     const isCurrent = connector.id === currentConnectorId;
@@ -2322,6 +2493,7 @@ async function listAction2() {
       connector_count: connectors.length
     });
   }
+  printOtherProjectsHint(otherProjectsSummary, true, dim2, reset2);
 }
 
 // src/commands/connector/delete.ts

package/package.json

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