@batadata/cli 0.2.6 → 0.2.7

package/dist/commands/db.d.ts

@@ -18,18 +18,18 @@ export declare function parseBranchCreateArgs(args: string[]): {
     expiresIn?: string;
     purpose?: string;
 };
-export declare function connect(): Promise<void>;
+export declare function connect(args?: string[]): Promise<void>;
 export declare function url(args?: string[]): Promise<void>;
-export declare function branches(): Promise<void>;
+export declare function branches(args?: string[]): Promise<void>;
 export declare function branchCreate(args?: string[]): Promise<void>;
-export declare function branchDelete(name?: string): Promise<void>;
+export declare function branchDelete(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
  * delete/reset/rollback/reap — the safety rail for headless/agent ops. The ref
  * is resolved by name OR id, like the other branch commands.
  */
-export declare function branchSetProtected(ref: string | undefined, wantProtected: boolean): Promise<void>;
+export declare function branchSetProtected(args: string[], wantProtected: boolean): Promise<void>;
 /**
  * `bata db branch checkout <name-or-id>` — pin a branch into the directory's
  * `.batadata/project.json` so later `db query` / `db url` target it with no
@@ -37,7 +37,7 @@ export declare function branchSetProtected(ref: string | undefined, wantProtecte
  * branch ref is resolved by name OR id, just like `db query --branch`.
  */
 export declare function branchCheckout(args: string[]): Promise<void>;
-export declare function studio(): Promise<void>;
+export declare function studio(args?: string[]): Promise<void>;
 /**
  * Pull `--branch <ref>` / `--at <ISO-timestamp|LSN>` flags (and their `=` forms)
  * out of the query args and return them plus the remaining args, which join into

package/dist/commands/db.js

@@ -6,7 +6,7 @@ import { colors, log, json, error, success, spinner, table, heading, info as log
 import { prompt, confirmDestructive } from "../utils/prompts.js";
 import { openBrowser } from "../utils/open.js";
 import { emitError, isRetryable } from "../utils/errors.js";
-import { resolveProjectId, resolveBranchId, findLinkFile, writeLinkFile } from "../link.js";
+import { resolveProjectId, readLinkFile, findLinkFile, writeLinkFile } from "../link.js";
 // Share the exact LSN/timestamp discriminator `bata restore` uses so `db query
 // --at` classifies a restore point identically.
 import { classifyRestorePoint } from "./restore.js";
@@ -140,7 +140,7 @@ async function resolveBranchRef(projectId, token, teamId, ref) {
         return null;
     return result.branches.find((b) => b.id === ref || b.name === ref) ?? null;
 }
-export async function connect() {
+export async function connect(args = []) {
     // 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) {
@@ -148,7 +148,8 @@ export async function connect() {
     }
     const token = requireToken();
     const config = loadConfig();
-    const projectId = resolveProjectId().projectId;
+    const { projectId: projectFlag } = parseProjectFlag(args);
+    const projectId = resolveProjectId(projectFlag).projectId;
     if (!projectId) {
         emitError("NO_PROJECT", "No default project.", "Run bata projects create or set one with bata projects info <id>.");
     }
@@ -215,11 +216,15 @@ export async function url(args = []) {
         "\n");
     process.stdout.write(conn.connection_uri + "\n");
 }
-export async function branches() {
+export async function branches(args = []) {
     const token = requireToken();
     const config = loadConfig();
     const jsonMode = isJsonMode();
-    const projectId = resolveProjectId().projectId;
+    // `db branches` used to take NO args, so an explicit `--project <id>` was
+    // SILENTLY IGNORED and the default/linked project answered — the wrong-target
+    // class the 0.1.6 projects fix closed for projects info/delete.
+    const { projectId: projectFlag } = parseProjectFlag(args);
+    const projectId = resolveProjectId(projectFlag).projectId;
     if (!projectId) {
         emitError("NO_PROJECT", "No default project set.", "Set one with: bata projects info <id>");
     }
@@ -278,11 +283,16 @@ export async function branchCreate(args = []) {
     const jsonMode = isJsonMode();
     const token = requireToken();
     const config = loadConfig();
-    const projectId = resolveProjectId().projectId;
+    // Strip --project BEFORE the positional parse. Pre-fix, `--project <id>` was
+    // both ignored (branch landed on the default project) AND its VALUE bled into
+    // the positional name when it led the args (`db branch create --project X dev`
+    // created a branch literally named "X" — on the wrong project).
+    const { projectId: projectFlag, rest } = parseProjectFlag(args);
+    const projectId = resolveProjectId(projectFlag).projectId;
     if (!projectId) {
         emitError("NO_PROJECT", "No default project set.", "Set one with: bata projects info <id>");
     }
-    const { name, expiresIn, purpose } = parseBranchCreateArgs(args);
+    const { name, expiresIn, purpose } = parseBranchCreateArgs(rest);
     // A relative TTL (--expires-in 2h) becomes an absolute expires_at the server
     // enforces. Parse it up front so a bad duration fails fast, before any call.
     let expiresAt;
@@ -330,9 +340,11 @@ export async function branchCreate(args = []) {
                 purpose: res.data.purpose ?? purpose ?? null,
             },
             // The branch row exists immediately, but its compute may still be
-            // provisioning — poll `db branches` for status before connecting.
+            // provisioning — poll `db branches` for status before connecting. The
+            // poll command carries the resolved project explicitly so following it
+            // verbatim can never land on a different linked/default project.
             ready: false,
-            poll: "bata db branches --json",
+            poll: `bata db branches --project ${projectId} --json`,
         });
         return;
     }
@@ -341,29 +353,35 @@ export async function branchCreate(args = []) {
     if (expiresAt) {
         log(`  ${colors.dim("Expires")} ${formatDate(expiresAt)} ${colors.dim("(auto-deleted)")}`);
     }
-    log(`  ${colors.dim("Poll readiness with")} ${colors.cyan("bata db branches")}`);
+    log(`  ${colors.dim("Poll readiness with")} ${colors.cyan(`bata db branches --project ${projectId}`)}`);
     log();
 }
-export async function branchDelete(name) {
+export async function branchDelete(args = []) {
     const jsonMode = isJsonMode();
     const token = requireToken();
     const config = loadConfig();
-    const projectId = resolveProjectId().projectId;
+    // --project used to be silently ignored here (the delete hit the default/
+    // linked project's branch list) — same wrong-target class as `db branches`.
+    const { projectId: projectFlag, rest } = parseProjectFlag(args);
+    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 (!name) {
-        emitError("MISSING_ARG", "Branch name is required.", "Usage: bata db branch delete <name>");
+    if (!ref) {
+        emitError("MISSING_ARG", "Branch name or id is required.", "Usage: bata db branch delete <name-or-id>");
     }
     // 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)}?`);
+    const ok = await confirmDestructive(`Delete branch ${colors.cyan(ref)}?`);
     if (!ok) {
         log("  Aborted.");
         return;
     }
-    const s = jsonMode ? null : spinner(`Deleting branch ${name}`);
-    // We need to find the branch ID first
+    const s = jsonMode ? null : spinner(`Deleting branch ${ref}`);
+    // Fetch the branch list explicitly (not via resolveBranchRef, which folds an
+    // API outage into null) so a 5xx stays API_UNAVAILABLE/exit 6 — an agent must
+    // never read a retryable outage as "branch doesn't exist".
     const query = {};
     if (config.defaultTeam)
         query.team_id = config.defaultTeam;
@@ -372,10 +390,12 @@ export async function branchDelete(name) {
         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);
+    // Match by name OR id, like checkout/protect/query — delete used to match
+    // by name only, so a real branch id got "not found".
+    const branch = projRes.data.branches.find((b) => b.id === ref || b.name === ref);
     if (!branch) {
         s?.stop();
-        emitError("BRANCH_NOT_FOUND", `Branch "${name}" not found.`, "List branches with: bata db branches --json");
+        emitError("BRANCH_NOT_FOUND", `Branch "${ref}" not found in this project.`, "List branches with: bata db branches --json");
     }
     const res = await api.del(`/v1/branches/${branch.id}`, token, query);
     s?.stop();
@@ -383,11 +403,11 @@ export async function branchDelete(name) {
         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 });
+        json({ branch: { id: branch.id, name: branch.name, project_id: projectId }, deleted: true });
         return;
     }
     log();
-    log(`  ${colors.green(">")} Branch ${colors.cyan(name)} deleted`);
+    log(`  ${colors.green(">")} Branch ${colors.cyan(branch.name)} deleted`);
     log();
 }
 /**
@@ -396,11 +416,13 @@ export async function branchDelete(name) {
  * delete/reset/rollback/reap — the safety rail for headless/agent ops. The ref
  * is resolved by name OR id, like the other branch commands.
  */
-export async function branchSetProtected(ref, wantProtected) {
+export async function branchSetProtected(args, wantProtected) {
     const jsonMode = isJsonMode();
     const token = requireToken();
     const config = loadConfig();
-    const projectId = resolveProjectId().projectId;
+    const { projectId: projectFlag, rest } = parseProjectFlag(args);
+    const projectId = resolveProjectId(projectFlag).projectId;
+    const ref = rest[0];
     const verb = wantProtected ? "protect" : "unprotect";
     if (!projectId) {
         emitError("NO_PROJECT", "No default project set.", "Set one with: bata projects info <id>");
@@ -505,8 +527,9 @@ export async function branchCheckout(args) {
     log(`  ${colors.dim("Link file:")} ${colors.dim(linkFile)}`);
     log();
 }
-export async function studio() {
-    const projectId = resolveProjectId().projectId;
+export async function studio(args = []) {
+    const { projectId: projectFlag } = parseProjectFlag(args);
+    const projectId = resolveProjectId(projectFlag).projectId;
     const studioUrl = projectId
         ? `https://bench-app-one.vercel.app/studio?project=${projectId}`
         : "https://bench-app-one.vercel.app/studio";
@@ -652,9 +675,6 @@ async function runTimeTravelQuery(opts) {
 export async function query(args = []) {
     const jsonMode = isJsonMode();
     const { branchId: branchFlag, at, projectId: projectFlag, rest } = parseQueryFlags(args);
-    // Branch precedence: an explicit --branch wins, else the branch pinned by
-    // `bata db branch checkout` in .batadata/project.json, else the primary.
-    const branchId = resolveBranchId(branchFlag).branchId;
     const sql = rest.join(" ").trim();
     if (!sql) {
         emitError("MISSING_ARG", "SQL query is required.", 'Usage: bata db query "SELECT 1"');
@@ -663,6 +683,14 @@ export async function query(args = []) {
     const config = loadConfig();
     // Project precedence: --project flag > .batadata link > config default.
     const projectId = resolveProjectId(projectFlag).projectId;
+    // Branch precedence: an explicit --branch wins, else the branch pinned by
+    // `bata db branch checkout` in .batadata/project.json — but ONLY when the
+    // query targets the linked project. A pinned branch from project A must never
+    // resolve against an explicit `--project B` (it misses → BRANCH_NOT_FOUND, or
+    // worse, a name collision silently targets the wrong branch).
+    const link = readLinkFile()?.link;
+    const pinnedBranch = link && link.projectId === projectId ? link.branchId ?? undefined : undefined;
+    const branchId = branchFlag ?? pinnedBranch;
     if (!projectId) {
         emitError("NO_PROJECT", "No project for db query.", "Pass --project <id>, or run `bata link <project>` to set a default.");
     }
@@ -786,8 +814,9 @@ function dbHelp(sub) {
             log(`  ${colors.bold("bata db query")} — run a SQL query against a branch`);
             log();
             usage('bata db query "SELECT 1"');
-            usage("bata db query <sql> [--branch <id-or-name>] [--at <timestamp|LSN>] [--json]");
+            usage("bata db query <sql> [--project <id>] [--branch <id-or-name>] [--at <timestamp|LSN>] [--json]");
             log();
+            note("--project <id>         Target a specific project (default: linked/default project)");
             note("--branch <id-or-name>  Target a specific branch by id OR name (default: the project's primary)");
             note("--at <timestamp|LSN>   Time-travel: run the query AS OF a past point (ISO-8601");
             note("                       timestamp e.g. 2026-07-04T12:00:00Z, or an LSN e.g. 0/15994B0).");
@@ -799,7 +828,7 @@ function dbHelp(sub) {
         case "branches":
             log(`  ${colors.bold("bata db branches")} — list branches and their compute status`);
             log();
-            usage("bata db branches [--json]");
+            usage("bata db branches [--project <id>] [--json]");
             log();
             note("STATUS shows the live compute state; a ✓ means ready to query.");
             note("--json includes computeStatus + ready — poll these after create/cold start.");
@@ -807,12 +836,13 @@ function dbHelp(sub) {
         case "branch":
             log(`  ${colors.bold("bata db branch")} — create, delete, or check out a branch`);
             log();
-            usage("bata db branch create <name> [--expires-in <2h|30m|7d>] [--purpose <text>]");
-            usage("bata db branch delete <name> [--yes]");
+            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 checkout <name-or-id> [--project <id>]");
-            usage("bata db branch protect <name-or-id>");
-            usage("bata db branch unprotect <name-or-id>");
+            usage("bata db branch protect <name-or-id> [--project <id>]");
+            usage("bata db branch unprotect <name-or-id> [--project <id>]");
             log();
+            note("--project     Target a specific project (default: linked/default project).");
             note("--expires-in  Auto-delete the branch after this long (units: s/m/h/d/w).");
             note("--purpose     Free-text note describing why the branch exists.");
             note("checkout pins the branch into .batadata/project.json so db query/url");
@@ -823,12 +853,12 @@ function dbHelp(sub) {
         case "url":
             log(`  ${colors.bold("bata db url")} — print the connection string`);
             log();
-            usage("bata db url [--json]");
+            usage("bata db url [--project <id>] [--json]");
             break;
         case "connect":
             log(`  ${colors.bold("bata db connect")} — open an interactive psql session`);
             log();
-            usage("bata db connect");
+            usage("bata db connect [--project <id>]");
             note("Interactive only — use `bata db query` / `bata db url` headlessly.");
             break;
         case "studio":
@@ -865,27 +895,27 @@ export async function handleDb(args) {
     }
     switch (sub) {
         case "connect":
-            return connect();
+            return connect(args.slice(1));
         case "url":
             return url(args.slice(1));
         case "branches":
-            return branches();
+            return branches(args.slice(1));
         case "branch": {
             const action = args[1];
             if (action === "create")
                 return branchCreate(args.slice(2));
             if (action === "delete")
-                return branchDelete(args[2]);
+                return branchDelete(args.slice(2));
             if (action === "checkout")
                 return branchCheckout(args.slice(2));
             if (action === "protect")
-                return branchSetProtected(args[2], true);
+                return branchSetProtected(args.slice(2), true);
             if (action === "unprotect")
-                return branchSetProtected(args[2], false);
+                return branchSetProtected(args.slice(2), false);
             emitError("INVALID_FLAG", `Unknown: db branch ${action || ""}`, "Available: create, delete, checkout, protect, unprotect");
         }
         case "studio":
-            return studio();
+            return studio(args.slice(1));
         case "query":
             return query(args.slice(1));
         default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batadata/cli",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "CLI for BataDB — serverless Postgres platform",
   "bin": {
     "bata": "./dist/index.js"