@abloatai/cli 0.54.0 → 0.56.0

package/dist/cli.cjs

@@ -3970,7 +3970,7 @@ var init_observeCliError = __esm({
     import_errorObservation = require("@abloatai/transaction/errorObservation");
     import_errors5 = require("@abloatai/transaction/errors");
     dsn = process.env.ABLO_CLI_SENTRY_DSN ?? "https://1ac154bff10b06836e1ea9de9e0d92f0@o4510928209772544.ingest.de.sentry.io/4511660691423312" ?? "";
-    release = process.env.ABLO_CLI_RELEASE ?? "@abloatai/cli@0.54.0";
+    release = process.env.ABLO_CLI_RELEASE ?? "@abloatai/cli@0.56.0";
     initialized = false;
     nativeProcessExit = process.exit.bind(process);
     exitBoundaryInstalled = false;
@@ -4297,7 +4297,7 @@ var init_src2 = __esm({
 
 // src/cliEnvironment.ts
 function cliVersion() {
-  return "0.54.0";
+  return "0.56.0";
 }
 function cliOs() {
   const value = (0, import_node_os.platform)();
@@ -5968,6 +5968,28 @@ async function fetchPushedSchema(apiUrl3, apiKey) {
     clearTimeout(t);
   }
 }
+async function fetchDeliveryState(apiUrl3, apiKey, timeoutMs = 4e3) {
+  if (!apiKey) return { kind: "unknown", detail: "no key" };
+  const ctrl = new AbortController();
+  const t = setTimeout(() => {
+    ctrl.abort();
+  }, timeoutMs);
+  try {
+    const res = await fetch(`${apiUrl3}/api/v1/logs/delivery`, {
+      headers: { authorization: `Bearer ${apiKey}` },
+      signal: ctrl.signal
+    });
+    if (!res.ok) return { kind: "unknown", detail: `HTTP ${res.status}` };
+    const parsed = import_wire5.logDeliveryResponseSchema.safeParse(await res.json());
+    if (!parsed.success) return { kind: "unknown", detail: "unrecognized response" };
+    const { window_seconds, recorded, unroutable, sample } = parsed.data;
+    return { kind: "known", window_seconds, recorded, unroutable, sample: sample ?? null };
+  } catch {
+    return { kind: "unknown", detail: "unreachable" };
+  } finally {
+    clearTimeout(t);
+  }
+}
 async function fetchDataSourceState(apiUrl3, apiKey, timeoutMs = 4e3) {
   if (!apiKey) return { kind: "unknown", detail: "no key" };
   const ctrl = new AbortController();
@@ -6069,7 +6091,7 @@ function blockers(input) {
   }
   return found;
 }
-var import_wire5, import_schema4;
+var import_wire5, import_schema4, WRITE_READY_VERDICT;
 var init_readiness = __esm({
   "src/readiness.ts"() {
     "use strict";
@@ -6079,6 +6101,7 @@ var init_readiness = __esm({
     init_dbProvider();
     init_remoteValidation();
     import_schema4 = require("@abloatai/transaction/schema");
+    WRITE_READY_VERDICT = "write infrastructure is ready. Your database constraints and row-level policies still apply.";
   }
 });
 
@@ -284769,21 +284792,14 @@ function classifyKey(apiKey) {
     reason: `${import_picocolors16.default.bold("ABLO_API_KEY")} is not a secret Ablo key. Expected a branch-bound ${import_picocolors16.default.bold("sk_\u2026")} credential. Run ${import_picocolors16.default.bold("npx ablo dev")} to prepare a development branch.`
   };
 }
-function wireEnvLocal(apiKey, cwd = process.cwd(), projectId, branchId) {
+function wireEnvLocal(apiKey, cwd = process.cwd()) {
   const envPath = (0, import_path5.resolve)(cwd, ".env.local");
   const line = `ABLO_API_KEY=${apiKey}`;
-  const projectLine = projectId ? `ABLO_PROJECT_ID=${projectId}` : null;
-  const branchLine = branchId ? `ABLO_BRANCH_ID=${branchId}` : null;
   let action;
+  let removedPins = [];
   if (!(0, import_fs7.existsSync)(envPath)) {
-    (0, import_fs7.writeFileSync)(
-      envPath,
-      `${line}
-${projectLine ? `${projectLine}
-` : ""}${branchLine ? `${branchLine}
-` : ""}`,
-      { mode: 384 }
-    );
+    (0, import_fs7.writeFileSync)(envPath, `${line}
+`, { mode: 384 });
     action = `Created ${import_picocolors16.default.bold(".env.local")} with ${import_picocolors16.default.bold("ABLO_API_KEY")}`;
   } else {
     const content = (0, import_fs7.readFileSync)(envPath, "utf8");
@@ -284799,25 +284815,16 @@ ${projectLine ? `${projectLine}
       (0, import_fs7.writeFileSync)(envPath, content.replace(/^ABLO_API_KEY=.*$/m, line));
       action = `Updated ${import_picocolors16.default.bold("ABLO_API_KEY")} in ${import_picocolors16.default.bold(".env.local")} ${import_picocolors16.default.dim(`(was ${existing.slice(0, 12)}\u2026)`)}`;
     }
-    if (projectLine) {
-      const next = (0, import_fs7.readFileSync)(envPath, "utf8");
-      if (/^ABLO_PROJECT_ID=.*$/m.test(next)) {
-        (0, import_fs7.writeFileSync)(envPath, next.replace(/^ABLO_PROJECT_ID=.*$/m, projectLine));
-      } else {
-        (0, import_fs7.appendFileSync)(envPath, `${next.endsWith("\n") || next.length === 0 ? "" : "\n"}${projectLine}
-`);
-      }
-    }
-    if (branchLine) {
-      const next = (0, import_fs7.readFileSync)(envPath, "utf8");
-      if (/^ABLO_BRANCH_ID=.*$/m.test(next)) {
-        (0, import_fs7.writeFileSync)(envPath, next.replace(/^ABLO_BRANCH_ID=.*$/m, branchLine));
-      } else {
-        (0, import_fs7.appendFileSync)(envPath, `${next.endsWith("\n") || next.length === 0 ? "" : "\n"}${branchLine}
-`);
-      }
+    const before = (0, import_fs7.readFileSync)(envPath, "utf8");
+    const after = before.replace(/^ABLO_(?:PROJECT|BRANCH)_ID=.*\n?/gm, "");
+    if (after !== before) {
+      removedPins = ["ABLO_PROJECT_ID", "ABLO_BRANCH_ID"].filter(
+        (key) => new RegExp(`^${key}=`, "m").test(before)
+      );
+      (0, import_fs7.writeFileSync)(envPath, after);
     }
   }
+  const pinNote = removedPins.length ? ` Removed ${removedPins.map((key) => import_picocolors16.default.bold(key)).join(" and ")}; the key names its own project and branch.` : "";
   const gitignorePath = (0, import_path5.resolve)(cwd, ".gitignore");
   const gitignore = (0, import_fs7.existsSync)(gitignorePath) ? (0, import_fs7.readFileSync)(gitignorePath, "utf8") : "";
   const ignored = /^(\.env\.local|\.env\*|\.env\.\*|\.env.*)$/m.test(gitignore);
@@ -284831,7 +284838,7 @@ ${projectLine ? `${projectLine}
     );
     gitignoreNote = ` Added ${import_picocolors16.default.bold(".env.local")} to ${import_picocolors16.default.bold(".gitignore")} so the key can't be committed.`;
   }
-  return `${action}.${gitignoreNote}`;
+  return `${action}.${pinNote}${gitignoreNote}`;
 }
 async function runPush(schema, args) {
   const { ok, status: status2, body, bodyText } = await pushSchema(schema, {
@@ -284992,7 +284999,7 @@ async function dev(argv, runtime = {}) {
   if (runtime.branch) {
     console.log(
       `
-  ${import_picocolors16.default.green("\u2713")} ${wireEnvLocal(args.apiKey, process.cwd(), runtime.branch.projectId, runtime.branch.id)}`
+  ${import_picocolors16.default.green("\u2713")} ${wireEnvLocal(args.apiKey, process.cwd())}`
     );
     console.log(
       `  ${import_picocolors16.default.dim(`Temporary branch credential expires ${runtime.branch.expiresAt}; rerun ablo dev to rotate it.`)}`
@@ -285423,6 +285430,10 @@ init_controlPlane();
 init_config();
 init_target();
 init_readiness();
+function doctorVerdict(counts) {
+  if (counts.blockers > 0 || counts.failed > 0) return "blocked";
+  return counts.skipped > 0 ? "unverified" : "ready";
+}
 function render(check2) {
   const mark = check2.state === "ok" ? import_picocolors18.default.green("\u2713") : check2.state === "fail" ? import_picocolors18.default.red("\u2717") : import_picocolors18.default.dim("\u2013");
   console.log(
@@ -285430,6 +285441,14 @@ function render(check2) {
   );
   if (check2.fix) console.log(`    ${" ".repeat(11)}${import_picocolors18.default.dim(`\u2192 ${check2.fix}`)}`);
 }
+function windowWords(seconds) {
+  if (seconds % 3600 === 0) {
+    const hours = seconds / 3600;
+    return hours === 1 ? "the last hour" : `the last ${hours} hours`;
+  }
+  const minutes = Math.max(1, Math.round(seconds / 60));
+  return minutes === 1 ? "the last minute" : `the last ${minutes} minutes`;
+}
 async function ping(apiUrl3) {
   const ctrl = new AbortController();
   const t = setTimeout(() => {
@@ -285572,6 +285591,32 @@ async function inspectDoctor(options = {}) {
   } else {
     checks.push({ label: "database", state: "skip", detail: "nothing connected to check" });
   }
+  const delivery = reachable ? await fetchDeliveryState(apiUrl3, runtimeKey.key) : { kind: "unknown", detail: "unreachable" };
+  if (delivery.kind === "known") {
+    const when = windowWords(delivery.window_seconds);
+    checks.push(
+      delivery.unroutable > 0 ? delivery.unroutable === delivery.recorded ? {
+        // Nothing at all was routable. One bad row does not look like
+        // this, so the cause is the plane rather than the rows: reporting
+        // it as "N of N" would send the reader hunting for the N.
+        label: "delivery",
+        state: "fail",
+        detail: `no change reached anyone (${delivery.recorded} in ${when})`,
+        fix: "run `ablo check`. When nothing routes, the tenancy value is usually missing for the whole plane rather than for particular rows."
+      } : {
+        label: "delivery",
+        state: "fail",
+        detail: `${delivery.unroutable} of ${delivery.recorded} change${delivery.recorded === 1 ? "" : "s"} in ${when} reached nobody` + (delivery.sample ? ` (e.g. ${delivery.sample.model}/${delivery.sample.id})` : ""),
+        fix: "run `ablo check`. Rows written to Postgres outside Ablo carry no tenancy value, so nothing can route the change."
+      } : {
+        label: "delivery",
+        state: "ok",
+        detail: delivery.recorded === 0 ? `no changes in ${when}` : `${delivery.recorded} change${delivery.recorded === 1 ? "" : "s"} in ${when}, all deliverable`
+      }
+    );
+  } else {
+    checks.push({ label: "delivery", state: "skip", detail: `not determined (${delivery.detail})` });
+  }
   const blocking = blockers({
     reachable,
     hasKey: Boolean(runtimeKey.key),
@@ -285592,7 +285637,9 @@ async function inspectDoctor(options = {}) {
     target,
     dataSource,
     pushedSchema: pushed,
-    schemaDrift: drift
+    schemaDrift: drift,
+    delivery,
+    verdict: doctorVerdict({ blockers: blocking.length, failed, skipped })
   };
 }
 function renderDoctorReport(report) {
@@ -285610,19 +285657,35 @@ function renderDoctorReport(report) {
     );
   } else if (report.skipped > 0) {
     console.log(
-      `  ${import_picocolors18.default.yellow("?")} ${import_picocolors18.default.dim(`nothing is blocking a write, but ${report.skipped} check${report.skipped === 1 ? "" : "s"} could not be run`)}`
+      `  ${import_picocolors18.default.yellow("?")} ${import_picocolors18.default.dim(`nothing found a problem, but ${report.skipped} check${report.skipped === 1 ? "" : "s"} could not be run. This is not a clean bill of health.`)}`
     );
   } else {
     console.log(
-      `  ${import_picocolors18.default.green("\u2713")} ${import_picocolors18.default.dim("write infrastructure is ready \u2014 your database constraints and row-level policies still apply")}`
+      `  ${import_picocolors18.default.green("\u2713")} ${import_picocolors18.default.dim(WRITE_READY_VERDICT)}`
     );
   }
   console.log();
 }
-async function doctor() {
+function doctorReportAsJson(report) {
+  return JSON.stringify(
+    {
+      object: "doctor_report",
+      verdict: report.verdict,
+      checks: report.checks,
+      blockers: report.blockers
+    },
+    null,
+    2
+  );
+}
+async function doctor(argv = []) {
   const report = await inspectDoctor();
-  renderDoctorReport(report);
-  if (!report.ready) process.exitCode = 1;
+  if (argv.includes("--json") || process.env.ABLO_JSON === "1") {
+    console.log(doctorReportAsJson(report));
+  } else {
+    renderDoctorReport(report);
+  }
+  if (report.verdict !== "ready") process.exitCode = 1;
 }
 
 // src/setup/contracts.ts
@@ -287458,7 +287521,10 @@ var COMMANDS = [
     core: { group: "Every day", does: "Check the whole setup at once and list everything that would block a write" },
     full: {
       group: "See what's happening",
-      rows: [{ run: "doctor", does: "Every setup check at once \u2014 exits non-zero when a write would fail" }]
+      rows: [
+        { run: "doctor", does: "Every setup check at once. Exits non-zero when a write would fail, or when a check could not be run" },
+        { run: "doctor --json", does: "The same verdict as data, for a script or an agent" }
+      ]
     }
   },
   {
@@ -288136,7 +288202,7 @@ async function status(args = []) {
     );
   } else {
     console.log(
-      `  ${import_picocolors22.default.green("\u2713")} ${import_picocolors22.default.dim("write infrastructure is ready \u2014 database constraints and row-level policies still apply")}`
+      `  ${import_picocolors22.default.green("\u2713")} ${import_picocolors22.default.dim(WRITE_READY_VERDICT)}`
     );
   }
   console.log();
@@ -288623,6 +288689,24 @@ function parseCheckArgs(argv) {
   }
   return { schemaPath, exportName, appSchema };
 }
+function quoteIdent2(raw) {
+  return `"${raw.replace(/"/g, '""')}"`;
+}
+var UNSTAMPED_CAP = 500;
+async function countUnstamped(sql, appSchema, table, column) {
+  try {
+    const rows = await sql.unsafe(
+      `SELECT count(*)::int AS n FROM (
+         SELECT 1 FROM ${quoteIdent2(appSchema)}.${quoteIdent2(table)}
+         WHERE ${quoteIdent2(column)} IS NULL
+         LIMIT ${UNSTAMPED_CAP + 1}
+       ) s`
+    );
+    return rows[0]?.n ?? 0;
+  } catch {
+    return null;
+  }
+}
 function hostOf(connectionString) {
   try {
     return new URL(connectionString).hostname || null;
@@ -288700,7 +288784,6 @@ async function check(argv) {
     await sql.end({ timeout: 2 });
     process.exit(1);
   }
-  await sql.end({ timeout: 2 });
   const colsByTable = /* @__PURE__ */ new Map();
   for (const r2 of rows) {
     let set = colsByTable.get(r2.table_name);
@@ -288739,6 +288822,15 @@ async function check(argv) {
       if (BASE_COLUMNS.has(col) || col === orgCol) continue;
       if (!present.has(col)) problems.push(`missing column "${col}" (field ${fieldName})`);
     }
+    if (orgCol && present.has(orgCol)) {
+      const unstamped = await countUnstamped(sql, args.appSchema, table, orgCol);
+      if (unstamped !== null && unstamped > 0) {
+        const count = unstamped > UNSTAMPED_CAP ? `${UNSTAMPED_CAP}+ rows` : `${unstamped} row${unstamped === 1 ? "" : "s"}`;
+        problems.push(
+          `${count} have no "${orgCol}", so nothing can route them. Ablo stamps it on writes it makes; an insert straight into Postgres does not. Backfill the value, then run \`ablo connect resnapshot\`.`
+        );
+      }
+    }
     if (problems.length > 0) {
       console.log(`  ${import_picocolors25.default.red("\u2717")} ${import_picocolors25.default.bold(key)} ${import_picocolors25.default.dim("\u2192")} ${table}`);
       for (const p2 of problems) console.log(`      ${import_picocolors25.default.red("\u2022")} ${p2}`);
@@ -288752,6 +288844,7 @@ async function check(argv) {
       console.log(`  ${import_picocolors25.default.green("\u2713")} ${import_picocolors25.default.bold(key)} ${import_picocolors25.default.dim(`\u2192 ${table} (id, ${orgCol ?? "no org"} ok)`)}`);
     }
   }
+  await sql.end({ timeout: 2 });
   const modelCount = Object.keys(schemaJson.models).length;
   const ignored = [...colsByTable.keys()].filter((t) => !declaredTables.has(t)).length;
   console.log(
@@ -289736,8 +289829,6 @@ import { schema } from './schema';
 // via the session route and never touches the key.
 export const sync = Ablo({
   apiKey: process.env.ABLO_API_KEY,${authLine}
-  workspaceId: process.env.ABLO_PROJECT_ID,
-  branchId: process.env.ABLO_BRANCH_ID,
   schema,
 });
 
@@ -289763,7 +289854,7 @@ function generateEnv(storage, opts = {}) {
   const { includeApiKey = true } = opts;
   const databaseBlock = storage === "replication" ? "# Used by `npx ablo connect` to set up + register logical replication \u2014 the\n# DIRECT (un-pooled) endpoint. Ablo TAILS your WAL from here; it never writes.\n# The client never sees it; the browser never sees it. Your DB stays yours.\nDATABASE_URL=postgres://user:password@host:5432/db\n" : "# Used by ablo/data-source.ts (your DB endpoint) + `ablo migrate` \u2014 NOT the client.\n# Ablo never sees it; the browser never sees it. Your DB stays in your app.\nDATABASE_URL=postgres://user:password@host:5432/db\n";
   const webhookBlock = storage === "endpoint" ? "# Signing secret for the webhook receiver (app/api/ablo/webhooks/route.ts).\n# Ablo mints this when you register the endpoint's URL (POST /v1/webhook_endpoints\n# or the dashboard) and returns it once \u2014 paste it here.\nABLO_WEBHOOK_SECRET=whsec_your_endpoint_secret_here\n" : "";
-  const apiKeyBlock = includeApiKey ? "# Ablo: a branch-bound sk_ key (`npx ablo dev` wires both values for you).\n# Project + branch are assertions: the SDK rejects a key for another app or environment.\nABLO_API_KEY=sk_your_key_here\nABLO_PROJECT_ID=proj_your_project_id\nABLO_BRANCH_ID=br_your_branch_id\n" : "";
+  const apiKeyBlock = includeApiKey ? "# Ablo: a branch-bound sk_ key (`npx ablo dev` writes it for you).\n# The key names its own project and branch, so nothing else is needed here.\nABLO_API_KEY=sk_your_key_here\n" : "";
   return `${apiKeyBlock}${webhookBlock}${databaseBlock}`;
 }
 function generateDataSource(orm) {
@@ -290454,7 +290545,7 @@ var HANDLERS = {
   branch: (argv) => branches([...argv]),
   status: (argv) => status([...argv]),
   whoami: (argv) => whoami([...argv]),
-  doctor: () => doctor(),
+  doctor: (argv) => doctor([...argv]),
   logs: (argv) => logs([...argv]),
   webhooks: (argv) => webhooks([...argv]),
   check: (argv) => check([...argv]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abloatai/cli",
-  "version": "0.54.0",
+  "version": "0.56.0",
   "description": "The ablo command line: set up Ablo, connect your database, and push your schema from the terminal.",
   "license": "Apache-2.0",
   "type": "module",
@@ -35,10 +35,10 @@
   },
   "dependencies": {
     "@sentry/node": "^10.18.0",
-    "@abloatai/transaction": "^0.54.0",
+    "@abloatai/transaction": "^0.56.0",
     "jiti": "^2.7.0",
     "zod": "^4.4.3",
-    "@abloatai/humans": "^0.54.0"
+    "@abloatai/humans": "^0.56.0"
   },
   "devDependencies": {
     "@ablo/product-analytics": "file:../product-analytics",