@batadata/cli 0.2.15 → 0.2.16

package/dist/commands/db.d.ts

@@ -23,6 +23,17 @@ export declare function url(args?: string[]): Promise<void>;
 export declare function branches(args?: string[]): Promise<void>;
 export declare function branchCreate(args?: string[]): Promise<void>;
 export declare function branchDelete(args?: string[]): Promise<void>;
+/**
+ * `bata db branch reset <name-or-id> [--yes] [--wait] [--json]` (#38): reset a
+ * branch to its parent's CURRENT state (fresh data for a re-run) via
+ * POST /v1/branches/:id/reset-from-parent. The server answers with an
+ * operation id and `pending`; by default this exits 0 on accepted and prints
+ * the id, and `--wait` polls the operation to completion (exit 6 retryable on
+ * timeout, so a CI step can just re-run). A protected branch is refused by the
+ * server (400 BRANCH_PROTECTED); that surfaces as exit 5 with the server's own
+ * hint, never as a silent no-op.
+ */
+export declare function branchReset(args?: string[]): Promise<void>;
 /**
  * `bata db branch protect <name-or-id>` / `unprotect <name-or-id>` — flip a
  * branch's protection flag (PATCH /v1/branches/:id). A protected branch refuses

package/dist/commands/db.js

@@ -12,13 +12,20 @@ import { resolveProjectId, readLinkFile, findLinkFile, writeLinkFile } from "../
 import { classifyRestorePoint } from "./restore.js";
 // Same --project/positional resolution as projects info/delete (0.1.6 fix).
 import { resolveProjectArg } from "./projects.js";
-async function getConnectionInfo(projectId, token) {
+async function getConnectionInfo(projectId, token, branchId) {
     // 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" });
+    // branch_id narrows the server-side answer to one branch (#37); without it
+    // the primary wins, which is what `bata db url` always meant before.
+    const query = { reveal: "true" };
+    if (branchId)
+        query.branch_id = branchId;
+    const res = await api.get(`/v1/connection-info/${projectId}`, token, query);
     if (!res.ok)
         return null;
     const conns = res.data?.connections ?? [];
-    const c = conns.find((x) => x.is_primary) ?? conns[0];
+    const c = branchId
+        ? conns.find((x) => x.branch_id === branchId) ?? null
+        : conns.find((x) => x.is_primary) ?? conns[0];
     if (!c)
         return null;
     return {
@@ -183,15 +190,27 @@ export async function connect(args = []) {
 export async function url(args = []) {
     const token = requireToken();
     const config = loadConfig();
+    // `--branch <id-or-name>` (#37): the branch-per-PR actions had to curl the
+    // REST connection-info endpoint because `db url` only ever answered for the
+    // primary. Same resolution as `db query --branch`: id OR name.
+    const { ref: branchRef, rest } = parseBranchFlag(args);
     // Precedence: --project <id> / positional arg > .batadata link > config
     // default. `db url` used to IGNORE --project and silently serve the linked/
     // default project — the same flag-ignored class as the 0.1.6 projects
     // delete/info fix, and the root of the wrong-target benchmark incident.
-    const projectId = resolveProjectArg(args) ?? resolveProjectId().projectId;
+    const projectId = resolveProjectArg(rest) ?? resolveProjectId().projectId;
     if (!projectId) {
         emitError("NO_PROJECT", "No default project set.", "Set one with: bata projects info <id>");
     }
-    const conn = await getConnectionInfo(projectId, token);
+    let branchId;
+    if (branchRef) {
+        const branch = await resolveBranchRef(projectId, token, config.defaultTeam, branchRef);
+        if (!branch) {
+            emitError("BRANCH_NOT_FOUND", `Branch "${branchRef}" not found in this project.`, "List branches with: bata db branches --json");
+        }
+        branchId = branch.id;
+    }
+    const conn = await getConnectionInfo(projectId, token, branchId);
     if (!conn || !conn.connection_uri) {
         emitError("NOT_FOUND", "Could not fetch connection string.", "");
     }
@@ -410,6 +429,145 @@ export async function branchDelete(args = []) {
     log(`  ${colors.green(">")} Branch ${colors.cyan(branch.name)} deleted`);
     log();
 }
+/**
+ * Pull `--branch <ref>` (or `--branch=<ref>`) out of an arg list, returning the
+ * remaining args untouched so positional/--project parsing is order-independent.
+ */
+function parseBranchFlag(args) {
+    const rest = [];
+    let ref;
+    for (let i = 0; i < args.length; i++) {
+        const a = args[i];
+        if (a === "--branch") {
+            ref = args[i + 1];
+            i++;
+        }
+        else if (a.startsWith("--branch=")) {
+            ref = a.slice("--branch=".length);
+        }
+        else {
+            rest.push(a);
+        }
+    }
+    return { ref, rest };
+}
+/**
+ * `bata db branch reset <name-or-id> [--yes] [--wait] [--json]` (#38): reset a
+ * branch to its parent's CURRENT state (fresh data for a re-run) via
+ * POST /v1/branches/:id/reset-from-parent. The server answers with an
+ * operation id and `pending`; by default this exits 0 on accepted and prints
+ * the id, and `--wait` polls the operation to completion (exit 6 retryable on
+ * timeout, so a CI step can just re-run). A protected branch is refused by the
+ * server (400 BRANCH_PROTECTED); that surfaces as exit 5 with the server's own
+ * hint, never as a silent no-op.
+ */
+export async function branchReset(args = []) {
+    const jsonMode = isJsonMode();
+    const token = requireToken();
+    const config = loadConfig();
+    const wait = args.includes("--wait");
+    const { projectId: projectFlag, rest } = parseProjectFlag(args.filter((a) => a !== "--wait"));
+    const projectId = resolveProjectId(projectFlag).projectId;
+    const ref = rest[0];
+    if (!projectId) {
+        emitError("NO_PROJECT", "No default project set.", "Set one with: bata projects info <id>");
+    }
+    if (!ref) {
+        emitError("MISSING_ARG", "Branch name or id is required.", "Usage: bata db branch reset <name-or-id>");
+    }
+    // Destructive: the branch's own data is replaced by the parent's.
+    const ok = await confirmDestructive(`Reset branch ${colors.cyan(ref)} to its parent's current state? Its own changes are lost.`);
+    if (!ok) {
+        log("  Aborted.");
+        return;
+    }
+    const s = jsonMode ? null : spinner(`Resolving branch ${ref}`);
+    // Explicit fetch (not resolveBranchRef) so a 5xx stays API_UNAVAILABLE/exit 6:
+    // an agent must never read an outage as "branch doesn't exist".
+    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();
+        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.id === ref || b.name === ref);
+    if (!branch) {
+        s?.stop();
+        emitError("BRANCH_NOT_FOUND", `Branch "${ref}" not found in this project.`, "List branches with: bata db branches --json");
+    }
+    if (branch.isPrimary) {
+        s?.stop();
+        emitError("INVALID_FLAG", `Branch "${branch.name}" is the primary branch; it has no parent to reset from.`, "");
+    }
+    s?.update(`Resetting branch ${branch.name} from its parent`);
+    const res = await api.post(`/v1/branches/${branch.id}/reset-from-parent`, {}, token);
+    if (!res.ok) {
+        s?.stop();
+        // Exit-code contract: 5xx/0 is retryable (6); a 400/404 is the caller's
+        // input (5), e.g. BRANCH_PROTECTED, so an agent does not retry it forever.
+        const code = res.status >= 500 || res.status === 0
+            ? "API_UNAVAILABLE"
+            : res.status === 404
+                ? "NOT_FOUND"
+                : res.status === 400
+                    ? "INVALID_FLAG"
+                    : "CLI_ERROR";
+        emitError(code, apiError(res, "Failed to reset branch."), res.data && res.data.code === "BRANCH_PROTECTED"
+            ? `Unprotect it first: bata db branch unprotect ${branch.name}`
+            : "");
+    }
+    const operationId = res.data.operation_id;
+    let finalStatus = res.data.status ?? "pending";
+    if (wait && operationId) {
+        finalStatus = await waitForOperation(operationId, token, config.defaultTeam, (msg) => s?.update(msg));
+        s?.stop();
+        if (finalStatus === "failed") {
+            emitError("CLI_ERROR", `Reset of branch ${branch.name} failed (operation ${operationId}).`, "");
+        }
+        if (finalStatus !== "completed") {
+            emitError("API_UNAVAILABLE", `Reset of branch ${branch.name} is still ${finalStatus} after 2 minutes (operation ${operationId}).`, `Poll it: bata db branches --project ${projectId} --json`);
+        }
+    }
+    else {
+        s?.stop();
+    }
+    if (jsonMode) {
+        json({
+            branch: { id: branch.id, name: branch.name, project_id: projectId },
+            operation_id: operationId,
+            status: finalStatus,
+        });
+        return;
+    }
+    log();
+    log(`  ${colors.green(">")} Branch ${colors.cyan(branch.name)} reset ${finalStatus === "completed" ? "complete" : "accepted"}`);
+    if (operationId)
+        log(`    ${colors.dim(`operation ${operationId} (${finalStatus})`)}`);
+    log();
+}
+/** Poll an async operation until it settles or 2 minutes pass. Returns the last status seen. */
+async function waitForOperation(operationId, token, teamId, onProgress) {
+    const maxWait = 120_000;
+    const pollInterval = 2_000;
+    const start = Date.now();
+    let last = "pending";
+    while (Date.now() - start < maxWait) {
+        const query = {};
+        if (teamId)
+            query.team_id = teamId;
+        const res = await api.get(`/v1/operations/${operationId}`, token, query);
+        if (res.ok && res.data?.status) {
+            last = res.data.status;
+            if (last === "completed" || last === "failed")
+                return last;
+            onProgress(`Waiting for reset (${last})`);
+        }
+        await new Promise((r) => setTimeout(r, pollInterval));
+    }
+    return last;
+}
 /**
  * `bata db branch protect <name-or-id>` / `unprotect <name-or-id>` — flip a
  * branch's protection flag (PATCH /v1/branches/:id). A protected branch refuses
@@ -838,6 +996,7 @@ function dbHelp(sub) {
             log();
             usage("bata db branch create <name> [--project <id>] [--expires-in <2h|30m|7d>] [--purpose <text>]");
             usage("bata db branch delete <name-or-id> [--project <id>] [--yes]");
+            usage("bata db branch reset <name-or-id> [--project <id>] [--yes] [--wait]");
             usage("bata db branch checkout <name-or-id> [--project <id>]");
             usage("bata db branch protect <name-or-id> [--project <id>]");
             usage("bata db branch unprotect <name-or-id> [--project <id>]");
@@ -847,13 +1006,17 @@ function dbHelp(sub) {
             note("--purpose     Free-text note describing why the branch exists.");
             note("checkout pins the branch into .batadata/project.json so db query/url");
             note("target it without a --branch flag. Needs a linked project (bata link).");
+            note("reset replaces the branch's data with its parent's CURRENT state (async;");
+            note("prints an operation id, exit 0 on accepted; --wait polls to completion).");
             note("protect/unprotect lock a branch against delete/reset/rollback/auto-reap.");
             note("A protected branch cannot also carry a TTL (they're mutually exclusive).");
             break;
         case "url":
             log(`  ${colors.bold("bata db url")} — print the connection string`);
             log();
-            usage("bata db url [--project <id>] [--json]");
+            usage("bata db url [--project <id>] [--branch <id-or-name>] [--json]");
+            log();
+            note("--branch <id-or-name>  Connection string for a specific branch (default: primary).");
             break;
         case "connect":
             log(`  ${colors.bold("bata db connect")} — open an interactive psql session`);
@@ -870,10 +1033,11 @@ function dbHelp(sub) {
             log(`  ${colors.bold("bata db")} — database commands`);
             log();
             usage("bata db connect          Open psql to your database");
-            usage("bata db url              Print connection string");
+            usage("bata db url              Print connection string (--branch <id-or-name>)");
             usage("bata db branches         List branches + compute status");
             usage("bata db branch create    Create a new branch");
             usage("bata db branch delete    Delete a branch");
+            usage("bata db branch reset     Reset a branch to its parent's current state");
             usage("bata db branch checkout  Pin a branch into .batadata/project.json");
             usage("bata db branch protect   Lock a branch against destructive ops");
             usage("bata db branch unprotect Remove a branch's protection");
@@ -906,13 +1070,15 @@ export async function handleDb(args) {
                 return branchCreate(args.slice(2));
             if (action === "delete")
                 return branchDelete(args.slice(2));
+            if (action === "reset")
+                return branchReset(args.slice(2));
             if (action === "checkout")
                 return branchCheckout(args.slice(2));
             if (action === "protect")
                 return branchSetProtected(args.slice(2), true);
             if (action === "unprotect")
                 return branchSetProtected(args.slice(2), false);
-            emitError("INVALID_FLAG", `Unknown: db branch ${action || ""}`, "Available: create, delete, checkout, protect, unprotect");
+            emitError("INVALID_FLAG", `Unknown: db branch ${action || ""}`, "Available: create, delete, reset, checkout, protect, unprotect");
         }
         case "studio":
             return studio(args.slice(1));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batadata/cli",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "CLI for BataDB — serverless Postgres platform",
   "bin": {
     "bata": "./dist/index.js"
@@ -28,7 +28,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/zvndev/batadata.git",
+    "url": "https://github.com/ZVN-DEV/batadata.git",
     "directory": "packages/cli"
   },
   "keywords": [