@batadata/cli 0.1.0 → 0.1.2

package/dist/commands/db.js

@@ -2,8 +2,9 @@ import { execSync, spawn } from "node:child_process";
 import { api, apiError } from "../api.js";
 import { requireToken, loadConfig, isJsonMode } from "../config.js";
 import { colors, log, json, error, spinner, table, heading, info as logInfo } from "../utils/logger.js";
-import { prompt, confirm } from "../utils/prompts.js";
+import { prompt, confirmDestructive } from "../utils/prompts.js";
 import { openBrowser } from "../utils/open.js";
+import { emitError } from "../utils/errors.js";
 async function getConnectionInfo(projectId, token) {
     // reveal=true so the returned string is actually usable (the owner is asking).
     const res = await api.get(`/v1/connection-info/${projectId}`, token, { reveal: "true" });
@@ -29,20 +30,39 @@ function formatDate(iso) {
     const d = new Date(iso);
     return d.toLocaleDateString("en-US", { month: "short", day: "numeric", year: "numeric" });
 }
+/**
+ * Resolve a project's primary branch (the one to run a query against). Lists
+ * branches the same way `db branches` does (GET /v1/projects/:id) and returns
+ * the primary, falling back to the first branch. Returns null if the project
+ * has no branches or the lookup failed.
+ */
+async function getPrimaryBranch(projectId, token, teamId) {
+    const query = {};
+    if (teamId)
+        query.team_id = teamId;
+    const res = await api.get(`/v1/projects/${projectId}`, token, query);
+    if (!res.ok)
+        return null;
+    const list = res.data.branches ?? [];
+    return list.find((b) => b.is_primary) ?? list[0] ?? null;
+}
 export async function connect() {
+    // psql is an interactive session — there's no headless equivalent. Don't spawn
+    // it in --json or non-TTY contexts; point agents at the headless surfaces.
+    if (isJsonMode() || !process.stdin.isTTY) {
+        emitError("INTERACTIVE_ONLY", "bata db connect opens an interactive psql session and can't run headlessly.", "Use `bata db url` for a connection string or `bata db query <sql>` for headless execution.");
+    }
     const token = requireToken();
     const config = loadConfig();
     const projectId = config.defaultProject;
     if (!projectId) {
-        error("No default project. Run bata projects create or set one with bata projects info <id>.");
-        process.exit(1);
+        emitError("NO_PROJECT", "No default project.", "Run bata projects create or set one with bata projects info <id>.");
     }
     const s = spinner("Fetching connection info");
     const conn = await getConnectionInfo(projectId, token);
     s.stop();
     if (!conn || !conn.connection_uri) {
-        error("Could not fetch connection string for this project.");
-        process.exit(1);
+        emitError("NOT_FOUND", "Could not fetch connection string for this project.", "");
     }
     log();
     logInfo(`Connecting to project ${colors.cyan(projectId)}`);
@@ -70,17 +90,11 @@ export async function url() {
     const config = loadConfig();
     const projectId = config.defaultProject;
     if (!projectId) {
-        error("No default project set.");
-        process.exit(1);
+        emitError("NO_PROJECT", "No default project set.", "Set one with: bata projects info <id>");
     }
     const conn = await getConnectionInfo(projectId, token);
     if (!conn || !conn.connection_uri) {
-        const msg = "Could not fetch connection string.";
-        if (isJsonMode())
-            json({ error: msg });
-        else
-            error(msg);
-        process.exit(1);
+        emitError("NOT_FOUND", "Could not fetch connection string.", "");
     }
     if (isJsonMode()) {
         json({ direct: conn.connection_uri, pooled: conn.pooled_uri ?? null });
@@ -95,12 +109,7 @@ export async function branches() {
     const jsonMode = isJsonMode();
     const projectId = config.defaultProject;
     if (!projectId) {
-        const msg = "No default project set.";
-        if (jsonMode)
-            json({ error: msg });
-        else
-            error(msg);
-        process.exit(1);
+        emitError("NO_PROJECT", "No default project set.", "Set one with: bata projects info <id>");
     }
     const s = jsonMode ? null : spinner("Fetching branches");
     const query = {};
@@ -109,11 +118,10 @@ export async function branches() {
     const res = await api.get(`/v1/projects/${projectId}`, token, query);
     s?.stop();
     if (!res.ok) {
-        if (jsonMode)
-            json({ error: apiError(res, "Failed to fetch branches") });
-        else
-            error(apiError(res, "Failed to fetch project branches"));
-        process.exit(1);
+        emitError(res.status === 401 || res.status === 403 ? "INVALID_KEY"
+            : res.status === 404 ? "NO_PROJECT"
+                : res.status >= 500 || res.status === 0 ? "API_UNAVAILABLE"
+                    : "CLI_ERROR", apiError(res, "Failed to fetch branches"), "");
     }
     const branchList = res.data.branches || [];
     if (jsonMode) {
@@ -146,19 +154,25 @@ export async function branches() {
     log();
 }
 export async function branchCreate(name) {
+    const jsonMode = isJsonMode();
     const token = requireToken();
     const config = loadConfig();
     const projectId = config.defaultProject;
     if (!projectId) {
-        error("No default project set.");
-        process.exit(1);
+        emitError("NO_PROJECT", "No default project set.", "Set one with: bata projects info <id>");
     }
-    const branchName = name || (await prompt("Branch name"));
+    // Don't block on an interactive prompt headlessly.
+    let branchName = name;
     if (!branchName) {
-        error("Branch name is required.");
-        process.exit(1);
+        if (jsonMode || !process.stdin.isTTY) {
+            emitError("MISSING_ARG", "Branch name is required.", "Usage: bata db branch create <name>");
+        }
+        branchName = await prompt("Branch name");
+    }
+    if (!branchName) {
+        emitError("MISSING_ARG", "Branch name is required.", "Usage: bata db branch create <name>");
     }
-    const s = spinner(`Creating branch ${colors.cyan(branchName)}`);
+    const s = jsonMode ? null : spinner(`Creating branch ${colors.cyan(branchName)}`);
     const body = {
         name: branchName,
         project_id: projectId,
@@ -166,54 +180,66 @@ export async function branchCreate(name) {
     if (config.defaultTeam)
         body.team_id = config.defaultTeam;
     const res = await api.post("/v1/branches", body, token);
-    s.stop();
+    s?.stop();
     if (!res.ok) {
-        error(apiError(res, "Failed to create branch"));
-        process.exit(1);
+        emitError(res.status >= 500 || res.status === 0 ? "API_UNAVAILABLE" : "CLI_ERROR", apiError(res, "Failed to create branch"), "");
+    }
+    if (jsonMode) {
+        json({
+            branch: { id: res.data.id, name: res.data.name ?? branchName, project_id: projectId },
+            // The branch row exists immediately, but its compute may still be
+            // provisioning — poll `db branches` for status before connecting.
+            ready: false,
+            poll: "bata db branches --json",
+        });
+        return;
     }
     log();
     log(`  ${colors.green(">")} Branch ${colors.cyan(branchName)} created`);
+    log(`  ${colors.dim("Poll readiness with")} ${colors.cyan("bata db branches")}`);
     log();
 }
 export async function branchDelete(name) {
+    const jsonMode = isJsonMode();
     const token = requireToken();
     const config = loadConfig();
     const projectId = config.defaultProject;
     if (!projectId) {
-        error("No default project set.");
-        process.exit(1);
+        emitError("NO_PROJECT", "No default project set.", "Set one with: bata projects info <id>");
     }
     if (!name) {
-        error("Branch name is required. Usage: bata db branch delete <name>");
-        process.exit(1);
+        emitError("MISSING_ARG", "Branch name is required.", "Usage: bata db branch delete <name>");
     }
-    const ok = await confirm(`Delete branch ${colors.cyan(name)}?`, false);
+    // Skip the prompt headlessly (--yes / --json / no TTY) so agents and CI can
+    // actually delete — and never report success without deleting.
+    const ok = await confirmDestructive(`Delete branch ${colors.cyan(name)}?`);
     if (!ok) {
         log("  Aborted.");
         return;
     }
-    const s = spinner(`Deleting branch ${name}`);
+    const s = jsonMode ? null : spinner(`Deleting branch ${name}`);
     // We need to find the branch ID first
     const query = {};
     if (config.defaultTeam)
         query.team_id = config.defaultTeam;
     const projRes = await api.get(`/v1/projects/${projectId}`, token, query);
     if (!projRes.ok || !projRes.data.branches) {
-        s.stop();
-        error("Failed to fetch branches.");
-        process.exit(1);
+        s?.stop();
+        emitError(projRes.status >= 500 || projRes.status === 0 ? "API_UNAVAILABLE" : "CLI_ERROR", apiError(projRes, "Failed to fetch branches."), "");
     }
     const branch = projRes.data.branches.find((b) => b.name === name);
     if (!branch) {
-        s.stop();
-        error(`Branch "${name}" not found.`);
-        process.exit(1);
+        s?.stop();
+        emitError("BRANCH_NOT_FOUND", `Branch "${name}" not found.`, "List branches with: bata db branches --json");
     }
     const res = await api.del(`/v1/branches/${branch.id}`, token, query);
-    s.stop();
+    s?.stop();
     if (!res.ok) {
-        error("Failed to delete branch.");
-        process.exit(1);
+        emitError(res.status >= 500 || res.status === 0 ? "API_UNAVAILABLE" : "CLI_ERROR", apiError(res, "Failed to delete branch."), "");
+    }
+    if (jsonMode) {
+        json({ branch: { id: branch.id, name, project_id: projectId }, deleted: true });
+        return;
     }
     log();
     log(`  ${colors.green(">")} Branch ${colors.cyan(name)} deleted`);
@@ -234,55 +260,76 @@ export async function studio() {
 export async function query(sql) {
     const jsonMode = isJsonMode();
     if (!sql) {
-        const msg = 'SQL query is required. Usage: bata db query "SELECT 1"';
-        if (jsonMode)
-            json({ error: msg });
-        else
-            error(msg);
-        process.exit(1);
+        emitError("MISSING_ARG", "SQL query is required.", 'Usage: bata db query "SELECT 1"');
     }
     const token = requireToken();
     const config = loadConfig();
     const projectId = config.defaultProject;
     if (!projectId) {
-        const msg = "No default project set.";
-        if (jsonMode)
-            json({ error: msg });
-        else
-            error(msg);
-        process.exit(1);
+        emitError("NO_PROJECT", "No default project set.", "Set one with: bata projects info <id>");
     }
     const s = jsonMode ? null : spinner("Running query");
-    const res = await api.post(`/v1/query/${projectId}`, { sql }, token);
+    // Resolve the primary branch — /v1/sql/execute is keyed on branch_id, not
+    // project. (The old code POSTed to /v1/query/:projectId, which 404s.)
+    const branch = await getPrimaryBranch(projectId, token, config.defaultTeam);
+    if (!branch) {
+        s?.stop();
+        emitError("BRANCH_NOT_FOUND", "No branch found for this project to run the query against.", "Check the project with: bata db branches --json");
+    }
+    const res = await api.post("/v1/sql/execute", { branch_id: branch.id, query: sql }, token);
     s?.stop();
     if (!res.ok) {
-        if (jsonMode)
-            json({ error: apiError(res, "Query failed") });
-        else
-            error(apiError(res, "Query failed"));
-        process.exit(1);
+        const code = res.status === 401 || res.status === 403 ? "INVALID_KEY"
+            : res.status >= 500 || res.status === 0 ? "API_UNAVAILABLE"
+                : "CLI_ERROR";
+        emitError(code, apiError(res, "Query failed"), "");
     }
-    const { columns, rows, rowCount } = res.data;
+    // The endpoint returns 200 even when the SQL itself errored (it executed and
+    // failed). Treat that as a real error, not a silent success.
+    if (res.data.error) {
+        emitError("CLI_ERROR", res.data.error, "");
+    }
+    const columns = res.data.columns ?? [];
+    const rows = res.data.rows ?? [];
+    const rowCount = res.data.rowCount ?? rows.length;
     if (jsonMode) {
         json({
-            columns: columns ?? [],
-            rows: rows ?? [],
-            row_count: rowCount ?? rows?.length ?? 0,
+            columns,
+            rows, // column-keyed objects, exactly as the server returned them
+            row_count: rowCount,
+            command: res.data.command ?? null,
         });
         return;
     }
-    if (columns && rows) {
+    if (columns.length && rows.length) {
         log();
-        table(columns.map((c) => c.toUpperCase()), rows.map((r) => r.map(String)));
+        table(columns.map((c) => c.toUpperCase()), rows.map((r) => columns.map((col) => fmtCell(r[col]))));
         log();
-        log(`  ${colors.dim(`${rowCount ?? rows.length} row(s)`)}`);
+        log(`  ${colors.dim(`${rowCount} row(s)`)}`);
+    }
+    else if (rows.length) {
+        // Rows with no field metadata (rare) — render whatever keys came back.
+        const keys = Object.keys(rows[0]);
+        log();
+        table(keys.map((k) => k.toUpperCase()), rows.map((r) => keys.map((k) => fmtCell(r[k]))));
+        log();
+        log(`  ${colors.dim(`${rowCount} row(s)`)}`);
     }
     else {
         log();
-        log(`  ${colors.dim("Query executed successfully.")}`);
+        const cmd = res.data.command ? `${res.data.command} ` : "";
+        log(`  ${colors.dim(`${cmd}OK — ${rowCount} row(s) affected.`)}`);
     }
     log();
 }
+/** Render a column-keyed value for the table (null → empty, objects → JSON). */
+function fmtCell(v) {
+    if (v === null || v === undefined)
+        return "";
+    if (typeof v === "object")
+        return JSON.stringify(v);
+    return String(v);
+}
 export async function handleDb(args) {
     const sub = args[0];
     switch (sub) {
@@ -298,19 +345,13 @@ export async function handleDb(args) {
                 return branchCreate(args[2]);
             if (action === "delete")
                 return branchDelete(args[2]);
-            error(`Unknown: db branch ${action || ""}`);
-            log(`  ${colors.dim("Available:")} create, delete`);
-            process.exit(1);
-            break;
+            emitError("INVALID_FLAG", `Unknown: db branch ${action || ""}`, "Available: create, delete");
         }
         case "studio":
             return studio();
         case "query":
             return query(args.slice(1).join(" "));
         default:
-            error(`Unknown subcommand: db ${sub || ""}`);
-            log(`  ${colors.dim("Available:")} connect, url, branches, branch, studio, query`);
-            process.exit(1);
+            emitError("INVALID_FLAG", `Unknown subcommand: db ${sub || ""}`, "Available: connect, url, branches, branch, studio, query");
     }
 }
-//# sourceMappingURL=db.js.map

package/dist/commands/dev.js

@@ -25,4 +25,3 @@ export async function dev() {
     log(`    ${colors.cyan("bata generate -w")}    Watch mode for type generation`);
     log();
 }
-//# sourceMappingURL=dev.js.map

package/dist/commands/generate.js

@@ -80,4 +80,3 @@ export async function generate(args) {
         }
     });
 }
-//# sourceMappingURL=generate.js.map

package/dist/commands/migrate.js

@@ -1,38 +1,37 @@
-import { colors, log, heading } from "../utils/logger.js";
-function comingSoon(cmd) {
-    heading(`Migrate: ${cmd}`);
-    log(`  ${colors.yellow("!")} ${colors.dim("Coming soon.")} Migrations are not yet implemented.`);
-    log();
-    log(`  ${colors.dim("Track progress at")} ${colors.cyan("https://github.com/zvndev")}`);
-    log();
+import { colors, log } from "../utils/logger.js";
+import { emitError } from "../utils/errors.js";
+const NOT_IMPLEMENTED_HINT = "Use `bata schema check <file.sql> --fail-on breaking` to gate migrations today.";
+/**
+ * Unimplemented migrate subcommand. Never exits 0 for a no-op: emits the
+ * NOT_IMPLEMENTED envelope (exit 3) so agents/CI see a real failure, with a
+ * hint pointing at the migration-gating capability that exists today.
+ */
+function notImplemented(cmd) {
+    emitError("NOT_IMPLEMENTED", `Migrate ${cmd} is not yet implemented.`, NOT_IMPLEMENTED_HINT);
 }
 export async function handleMigrate(args) {
     const sub = args[0];
     switch (sub) {
         case "create":
-            comingSoon("create");
-            break;
+            notImplemented("create");
         case "deploy":
-            comingSoon("deploy");
-            break;
+            notImplemented("deploy");
         case "status":
-            comingSoon("status");
-            break;
+            notImplemented("status");
         case "reset":
-            comingSoon("reset");
-            break;
+            notImplemented("reset");
         default:
             log();
             log(`  ${colors.bold("bata migrate")} ${colors.dim("— database migration management")}`);
             log();
             log(`  ${colors.dim("Commands:")}`);
-            log(`    ${colors.cyan("create")}   Create a new migration`);
-            log(`    ${colors.cyan("deploy")}   Deploy pending migrations`);
-            log(`    ${colors.cyan("status")}   Show migration status`);
-            log(`    ${colors.cyan("reset")}    Reset database (dangerous)`);
+            log(`    ${colors.cyan("create")}   Create a new migration ${colors.dim("(not implemented)")}`);
+            log(`    ${colors.cyan("deploy")}   Deploy pending migrations ${colors.dim("(not implemented)")}`);
+            log(`    ${colors.cyan("status")}   Show migration status ${colors.dim("(not implemented)")}`);
+            log(`    ${colors.cyan("reset")}    Reset database ${colors.dim("(not implemented)")}`);
             log();
-            log(`  ${colors.yellow("!")} ${colors.dim("All migration commands are coming soon.")}`);
+            log(`  ${colors.yellow("!")} ${colors.dim("Migration commands are not yet implemented. To gate a migration today:")}`);
+            log(`    ${colors.cyan("bata schema check <file.sql> --fail-on breaking")}`);
             log();
     }
 }
-//# sourceMappingURL=migrate.js.map

package/dist/commands/projects.js

@@ -1,7 +1,8 @@
 import { api, apiError, resolveTeamId, asList } from "../api.js";
 import { requireToken, loadConfig, saveConfig, isJsonMode } from "../config.js";
-import { colors, log, json, success, error, spinner, table, kvList, heading } from "../utils/logger.js";
-import { prompt, confirm, select } from "../utils/prompts.js";
+import { colors, log, json, success, spinner, table, kvList, heading } from "../utils/logger.js";
+import { prompt, confirmDestructive, select } from "../utils/prompts.js";
+import { emitError } from "../utils/errors.js";
 function projectCreatedAt(p) {
     return p.created_at ?? p.createdAt ?? "";
 }
@@ -38,18 +39,19 @@ export async function list() {
     const config = loadConfig();
     const jsonMode = isJsonMode();
     const s = jsonMode ? null : spinner("Fetching projects");
+    // GET /v1/projects requires a team_id — resolve it identically to `create`
+    // (falls back to the user's first team) so the API-key path doesn't 400.
     const teamId = await resolveTeamId(token);
-    const query = {};
-    if (teamId)
-        query.team_id = teamId;
-    const res = await api.get("/v1/projects", token, query);
+    if (!teamId) {
+        s?.stop();
+        emitError("NO_TEAM", "No team found for this credential.", "This API key isn't attached to a team. Run `bata login` or check `bata whoami`.");
+    }
+    const res = await api.get("/v1/projects", token, { team_id: teamId });
     if (!res.ok) {
         s?.stop();
-        if (jsonMode)
-            json({ error: apiError(res, "Failed to fetch projects") });
-        else
-            error(apiError(res, "Failed to fetch projects"));
-        process.exit(1);
+        emitError(res.status === 401 || res.status === 403 ? "INVALID_KEY"
+            : res.status >= 500 || res.status === 0 ? "API_UNAVAILABLE"
+                : "CLI_ERROR", apiError(res, "Failed to fetch projects"), "");
     }
     s?.stop();
     const projects = asList(res.data);
@@ -88,8 +90,7 @@ export async function create() {
     heading("Create a new project");
     const name = await prompt("Project name");
     if (!name) {
-        error("Project name is required.");
-        process.exit(1);
+        emitError("MISSING_ARG", "Project name is required.", "");
     }
     const region = await select("Select a region", REGIONS);
     const s = spinner("Creating project");
@@ -101,8 +102,9 @@ export async function create() {
     const res = await api.post("/v1/projects", body, token);
     if (!res.ok) {
         s.stop();
-        error(apiError(res, "Failed to create project"));
-        process.exit(1);
+        emitError(res.status === 401 || res.status === 403 ? "INVALID_KEY"
+            : res.status >= 500 || res.status === 0 ? "API_UNAVAILABLE"
+                : "CLI_ERROR", apiError(res, "Failed to create project"), "");
     }
     s.stop();
     const project = res.data;
@@ -126,12 +128,7 @@ export async function info(projectId) {
     const jsonMode = isJsonMode();
     const id = projectId || config.defaultProject;
     if (!id) {
-        const msg = "No project specified. Pass a project ID or set a default with bata projects create.";
-        if (jsonMode)
-            json({ error: msg });
-        else
-            error(msg);
-        process.exit(1);
+        emitError("NO_PROJECT", "No project specified.", "Pass a project ID or set a default with bata projects create.");
     }
     const s = jsonMode ? null : spinner("Fetching project details");
     const teamId = await resolveTeamId(token);
@@ -141,11 +138,10 @@ export async function info(projectId) {
     const res = await api.get(`/v1/projects/${id}`, token, query);
     if (!res.ok) {
         s?.stop();
-        if (jsonMode)
-            json({ error: apiError(res, "Project not found") });
-        else
-            error(apiError(res, "Project not found"));
-        process.exit(1);
+        emitError(res.status === 404 ? "NOT_FOUND"
+            : res.status === 401 || res.status === 403 ? "INVALID_KEY"
+                : res.status >= 500 || res.status === 0 ? "API_UNAVAILABLE"
+                    : "CLI_ERROR", apiError(res, "Project not found"), "");
     }
     // Also fetch connection info
     const connRes = await api.get(`/v1/connection-info/${id}`, token);
@@ -204,36 +200,44 @@ export async function info(projectId) {
     log();
 }
 export async function deleteProject(projectId) {
+    const jsonMode = isJsonMode();
     const token = requireToken();
     const config = loadConfig();
     const id = projectId || config.defaultProject;
     if (!id) {
-        error("No project specified.");
-        process.exit(1);
+        emitError("NO_PROJECT", "No project specified.", "Pass a project ID: bata projects delete <id>");
     }
-    const ok = await confirm(`Delete project ${colors.cyan(id)}? This cannot be undone.`, false);
+    // Skip the prompt headlessly (--yes / --json / no TTY) so agents and CI can
+    // actually delete — and never report success without deleting.
+    const ok = await confirmDestructive(`Delete project ${colors.cyan(id)}? This cannot be undone.`);
     if (!ok) {
         log();
         log("  Aborted.");
         log();
         return;
     }
-    const s = spinner("Deleting project");
+    const s = jsonMode ? null : spinner("Deleting project");
     const teamId = await resolveTeamId(token);
     const query = {};
     if (teamId)
         query.team_id = teamId;
     const res = await api.del(`/v1/projects/${id}`, token, query);
     if (!res.ok) {
-        s.stop();
-        error(apiError(res, "Failed to delete project"));
-        process.exit(1);
+        s?.stop();
+        emitError(res.status === 404 ? "NOT_FOUND"
+            : res.status === 401 || res.status === 403 ? "INVALID_KEY"
+                : res.status >= 500 || res.status === 0 ? "API_UNAVAILABLE"
+                    : "CLI_ERROR", apiError(res, "Failed to delete project"), "");
     }
     // Clear default project if it was this one
     if (config.defaultProject === id) {
         saveConfig({ defaultProject: undefined });
     }
-    s.stop();
+    s?.stop();
+    if (jsonMode) {
+        json({ project: { id }, deleted: true });
+        return;
+    }
     log();
     success(`Project ${id} deleted.`);
     log();
@@ -251,9 +255,6 @@ export async function handleProjects(args) {
         case undefined:
             return list();
         default:
-            error(`Unknown subcommand: projects ${sub}`);
-            log(`  ${colors.dim("Available:")} list, create, info, delete`);
-            process.exit(1);
+            emitError("INVALID_FLAG", `Unknown subcommand: projects ${sub}`, "Available: list, create, info, delete");
     }
 }
-//# sourceMappingURL=projects.js.map