postgresai 0.17.0-dev.6 → 0.17.0-dev.8

package/dist/bin/postgres-ai.js

@@ -13533,7 +13533,7 @@ var {
 // package.json
 var package_default = {
   name: "postgresai",
-  version: "0.17.0-dev.6",
+  version: "0.17.0-dev.8",
   description: "postgres_ai CLI",
   license: "Apache-2.0",
   private: false,
@@ -16893,7 +16893,7 @@ var Result = import_lib.default.Result;
 var TypeOverrides = import_lib.default.TypeOverrides;
 var defaults = import_lib.default.defaults;
 // package.json
-var version = "0.17.0-dev.6";
+var version = "0.17.0-dev.8";
 var package_default2 = {
   name: "postgresai",
   version,
@@ -28142,18 +28142,19 @@ async function billingFor(q, name, opts, deps, show) {
   if (opts.coupon) {
     billing.coupon = q.promo?.valid ? { code: q.promo.code, valid: true, description: q.promo.discount_description } : { code: opts.coupon, valid: false, error: q.promo?.error ?? "not valid" };
   }
-  const billingPage = { ...billing, requires_payment_method: true, next: `Add a payment method at ${q.billing_url ?? deps.billingUrl(q.org_alias)}, then re-run` };
-  const stop = (next) => ({ billing, billingPage, accepted: false, stop: { ...billing, next } });
+  const billingUrl = q.billing_url ?? deps.billingUrl(q.org_alias);
+  const billingPage = { ...billing, requires_payment_method: true, next: `Add a payment method at ${billingUrl}, then re-run` };
+  const stop = (next) => ({ billing, billingPage, billingUrl, accepted: false, stop: { ...billing, next } });
   if (billing.coupon && !billing.coupon.valid) {
     return stop(`Promo code ${opts.coupon}: ${billing.coupon.error}. Nothing was changed: re-run with a valid code, or without ${opts.agent ? "coupon" : "--coupon"}`);
   }
   if (q.requires_payment_method)
-    return { billing, billingPage, accepted: false, stop: billingPage };
+    return { billing, billingPage, billingUrl, accepted: false, stop: billingPage };
   show(billing.price);
   if (q.billed && !opts.yes && !await deps.confirm(`Provision ${name}? (y/N): `)) {
     return stop(opts.agent ? `Call connect_database again with yes: true to accept ${billing.price}` : `Re-run with --yes to accept ${billing.price}`);
   }
-  return { billing, billingPage, accepted: q.billed };
+  return { billing, billingPage, billingUrl, accepted: q.billed };
 }
 async function connect(url, opts, deps) {
   const started = deps.now();
@@ -28183,6 +28184,8 @@ async function connect(url, opts, deps) {
   let billing = {};
   let billingPage;
   let accepted = false;
+  let billingUrl;
+  let undoRole;
   const findOrg = async () => {
     try {
       return await deps.clickhouseOrg(new URL(url).hostname, key.keyId, key.keySecret);
@@ -28244,7 +28247,7 @@ async function connect(url, opts, deps) {
       const b = await billingFor(await deps.quote(opts.coupon, clusterOf(url)), name, opts, deps, (price) => progress("billing", `Billing: ${price}`));
       if (b.stop)
         return { status: "action_required", provider, name, ...b.stop };
-      ({ billing, billingPage, accepted } = b);
+      ({ billing, billingPage, billingUrl, accepted } = b);
     }
     if (opts.resetPassword) {
       let lock;
@@ -28328,6 +28331,8 @@ async function connect(url, opts, deps) {
         await deps.resetUnlock(lockId).catch(() => {});
     }
     row = { id: created.id, name: created.name, provider, status: created.status, dashboard_url: null, host_metrics: !!ch };
+    const made = prepared;
+    undoRole = () => undo(made);
     if (prepared.storedPassword) {
       progress("checkup", `Express checkup skipped: it runs only as ${DEFAULT_MONITORING_USER}, whose password PostgresAI keeps for this server. The full checkup follows on the box.`);
     } else {
@@ -28338,6 +28343,18 @@ async function connect(url, opts, deps) {
   }
   let shown;
   for (const deadline = deps.now() + opts.waitMs;; ) {
+    if (undoRole && row.billing_error && disconnecting(row.status)) {
+      await undoRole();
+      return {
+        status: "action_required",
+        provider,
+        name,
+        id: row.id,
+        ...billing,
+        ...checkup ? { checkup } : {},
+        next: `The first charge failed (${row.billing_error}): the box was removed and nothing is billed. Update the payment method at ${billingUrl}, then re-run`
+      };
+    }
     const result = connectStatus(row, provider, fresh);
     const state = boxState(row);
     if (state !== shown && (shown !== undefined || result.status === "provisioning"))
@@ -28351,7 +28368,15 @@ async function connect(url, opts, deps) {
       return { ...rest, ...billing, ...checkup ? { checkup } : {}, next: next + note };
     }
     await deps.sleep(POLL_MS);
-    row = (await deps.list().catch(() => [])).find((d) => d.id === row.id) ?? row;
+    const listed = await deps.list().catch(() => {
+      return;
+    });
+    const now = listed?.find((d) => d.id === row.id);
+    if (listed && !now && undoRole) {
+      await undoRole();
+      return { status: "failed", provider, name, id: row.id, ...billing, next: "The monitoring box was removed before it became active: see pgai databases, then re-run pgai connect" };
+    }
+    row = now ?? row;
   }
 }
 async function openConnection(url, opts) {
@@ -36948,18 +36973,19 @@ async function billingFor2(q, name, opts, deps, show) {
   if (opts.coupon) {
     billing.coupon = q.promo?.valid ? { code: q.promo.code, valid: true, description: q.promo.discount_description } : { code: opts.coupon, valid: false, error: q.promo?.error ?? "not valid" };
   }
-  const billingPage = { ...billing, requires_payment_method: true, next: `Add a payment method at ${q.billing_url ?? deps.billingUrl(q.org_alias)}, then re-run` };
-  const stop = (next) => ({ billing, billingPage, accepted: false, stop: { ...billing, next } });
+  const billingUrl = q.billing_url ?? deps.billingUrl(q.org_alias);
+  const billingPage = { ...billing, requires_payment_method: true, next: `Add a payment method at ${billingUrl}, then re-run` };
+  const stop = (next) => ({ billing, billingPage, billingUrl, accepted: false, stop: { ...billing, next } });
   if (billing.coupon && !billing.coupon.valid) {
     return stop(`Promo code ${opts.coupon}: ${billing.coupon.error}. Nothing was changed: re-run with a valid code, or without ${opts.agent ? "coupon" : "--coupon"}`);
   }
   if (q.requires_payment_method)
-    return { billing, billingPage, accepted: false, stop: billingPage };
+    return { billing, billingPage, billingUrl, accepted: false, stop: billingPage };
   show(billing.price);
   if (q.billed && !opts.yes && !await deps.confirm(`Provision ${name}? (y/N): `)) {
     return stop(opts.agent ? `Call connect_database again with yes: true to accept ${billing.price}` : `Re-run with --yes to accept ${billing.price}`);
   }
-  return { billing, billingPage, accepted: q.billed };
+  return { billing, billingPage, billingUrl, accepted: q.billed };
 }
 async function connect2(url, opts, deps) {
   const started = deps.now();
@@ -36989,6 +37015,8 @@ async function connect2(url, opts, deps) {
   let billing = {};
   let billingPage;
   let accepted = false;
+  let billingUrl;
+  let undoRole;
   const findOrg = async () => {
     try {
       return await deps.clickhouseOrg(new URL(url).hostname, key.keyId, key.keySecret);
@@ -37050,7 +37078,7 @@ async function connect2(url, opts, deps) {
       const b = await billingFor2(await deps.quote(opts.coupon, clusterOf2(url)), name, opts, deps, (price) => progress("billing", `Billing: ${price}`));
       if (b.stop)
         return { status: "action_required", provider, name, ...b.stop };
-      ({ billing, billingPage, accepted } = b);
+      ({ billing, billingPage, billingUrl, accepted } = b);
     }
     if (opts.resetPassword) {
       let lock;
@@ -37134,6 +37162,8 @@ async function connect2(url, opts, deps) {
         await deps.resetUnlock(lockId).catch(() => {});
     }
     row = { id: created.id, name: created.name, provider, status: created.status, dashboard_url: null, host_metrics: !!ch };
+    const made = prepared;
+    undoRole = () => undo(made);
     if (prepared.storedPassword) {
       progress("checkup", `Express checkup skipped: it runs only as ${DEFAULT_MONITORING_USER}, whose password PostgresAI keeps for this server. The full checkup follows on the box.`);
     } else {
@@ -37144,6 +37174,18 @@ async function connect2(url, opts, deps) {
   }
   let shown;
   for (const deadline = deps.now() + opts.waitMs;; ) {
+    if (undoRole && row.billing_error && disconnecting2(row.status)) {
+      await undoRole();
+      return {
+        status: "action_required",
+        provider,
+        name,
+        id: row.id,
+        ...billing,
+        ...checkup ? { checkup } : {},
+        next: `The first charge failed (${row.billing_error}): the box was removed and nothing is billed. Update the payment method at ${billingUrl}, then re-run`
+      };
+    }
     const result = connectStatus2(row, provider, fresh);
     const state = boxState2(row);
     if (state !== shown && (shown !== undefined || result.status === "provisioning"))
@@ -37157,7 +37199,15 @@ async function connect2(url, opts, deps) {
       return { ...rest, ...billing, ...checkup ? { checkup } : {}, next: next + note };
     }
     await deps.sleep(POLL_MS2);
-    row = (await deps.list().catch(() => [])).find((d) => d.id === row.id) ?? row;
+    const listed = await deps.list().catch(() => {
+      return;
+    });
+    const now = listed?.find((d) => d.id === row.id);
+    if (listed && !now && undoRole) {
+      await undoRole();
+      return { status: "failed", provider, name, id: row.id, ...billing, next: "The monitoring box was removed before it became active: see pgai databases, then re-run pgai connect" };
+    }
+    row = now ?? row;
   }
 }
 async function openConnection2(url, opts) {
@@ -37376,8 +37426,13 @@ async function clickhouseOrgFor2(host, keyId, keySecret) {
 }
 function disconnectBilling(reply) {
   const r = reply ?? {};
+  if (r.billing?.subscription === "canceled" && r.billing.credited && r.billing_warning)
+    return `subscription canceled: no further charges; the refund failed (${r.billing_warning})`;
   if (r.billing_warning)
     return `not released (${r.billing_warning}): contact support`;
+  if (r.billing?.subscription === "canceled" && typeof r.billing.refunded === "number" && r.billing.refunded > 0) {
+    return `subscription canceled: no further charges; refunded ${money2(r.billing.refunded, r.billing.currency ?? "usd")} to your card`;
+  }
   if (r.billing?.subscription === "canceled")
     return "subscription canceled: no further charges; the unused part of this period is credited (prorated)";
   if (r.billing?.subscription === "active" && typeof r.billing.quantity === "number") {
@@ -46139,10 +46194,10 @@ function updatePgwatchConfig(configPath, updates) {
     console.error(`Warning: could not restrict permissions on ${configPath}: ${message}`);
   }
 }
-function applyApiKey(projectDir, apiKey) {
+function applyApiKey(projectDir, apiKey, opts) {
   const configPath = path9.resolve(projectDir, ".pgwatch-config");
   try {
-    updatePgwatchConfig(configPath, { api_key: apiKey });
+    updatePgwatchConfig(configPath, { api_key: apiKey, api_url: resolveBaseUrls2(opts).apiBaseUrl });
   } catch (err) {
     console.error(`\u2717 ${err instanceof Error ? err.message : String(err)}`);
     return false;
@@ -46760,7 +46815,7 @@ Use demo mode without API key: postgres-ai mon local-install --demo`);
     if (apiKey) {
       console.log("Using API key provided via --api-key parameter");
       writeConfig({ apiKey });
-      if (!applyApiKey(projectDir, apiKey)) {
+      if (!applyApiKey(projectDir, apiKey, globalOpts)) {
         process.exitCode = 1;
         return;
       }
@@ -46778,7 +46833,7 @@ Use demo mode without API key: postgres-ai mon local-install --demo`);
           const trimmedKey = inputApiKey.trim();
           if (trimmedKey) {
             writeConfig({ apiKey: trimmedKey });
-            if (!applyApiKey(projectDir, trimmedKey)) {
+            if (!applyApiKey(projectDir, trimmedKey, globalOpts)) {
               process.exitCode = 1;
               return;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postgresai",
-  "version": "0.17.0-dev.6",
+  "version": "0.17.0-dev.8",
   "description": "postgres_ai CLI",
   "license": "Apache-2.0",
   "private": false,