apiblaze 0.12.1 → 0.14.0

package/dist/index.js

@@ -51,6 +51,14 @@ var init_types = __esm({
 });
 
 // src/lib/auth.ts
+var auth_exports = {};
+__export(auth_exports, {
+  clearCredentials: () => clearCredentials,
+  getAccessToken: () => getAccessToken,
+  getApiblazeDir: () => getApiblazeDir,
+  loadCredentials: () => loadCredentials,
+  saveCredentials: () => saveCredentials
+});
 function saveCredentials(creds) {
   fs.mkdirSync(APIBLAZE_DIR, { recursive: true });
   fs.writeFileSync(CREDENTIALS_PATH, JSON.stringify(creds, null, 2), "utf-8");
@@ -82,6 +90,9 @@ function getAccessToken() {
   }
   return creds.accessToken;
 }
+function getApiblazeDir() {
+  return APIBLAZE_DIR;
+}
 var fs, os, path, APIBLAZE_DIR, CREDENTIALS_PATH;
 var init_auth = __esm({
   "src/lib/auth.ts"() {
@@ -232,6 +243,65 @@ var init_api = __esm({
   }
 });
 
+// src/lib/team.ts
+var team_exports = {};
+__export(team_exports, {
+  resolveLinkedTeam: () => resolveLinkedTeam
+});
+async function resolveLinkedTeam(opts) {
+  let teams;
+  try {
+    teams = await getTeams();
+  } catch {
+    return opts.preferredId ? { teamId: opts.preferredId } : null;
+  }
+  if (teams.length === 0) return null;
+  const preferred = opts.preferredId ? teams.find((t) => t.teamId === opts.preferredId) : void 0;
+  if (preferred && !(opts.promptWhenMultiple && opts.interactive && teams.length > 1)) {
+    return { teamId: preferred.teamId, teamName: preferred.name };
+  }
+  if (preferred) {
+    const { default: inquirer3 } = await import("inquirer");
+    const { chosen: chosen2 } = await inquirer3.prompt([{
+      type: "list",
+      name: "chosen",
+      message: "Which team do you want to work in?",
+      default: preferred.teamId,
+      choices: teams.map((t) => ({ name: t.name, value: t.teamId }))
+    }]);
+    const picked2 = teams.find((t) => t.teamId === chosen2);
+    return { teamId: picked2.teamId, teamName: picked2.name };
+  }
+  if (opts.preferredId) {
+    console.log(import_chalk.default.yellow("\nYour previously linked team is no longer available."));
+  }
+  if (teams.length === 1) {
+    console.log(`${import_chalk.default.cyan("\u2192")} Linking to your team ${import_chalk.default.bold(teams[0].name)}.`);
+    return { teamId: teams[0].teamId, teamName: teams[0].name };
+  }
+  if (!opts.interactive) {
+    console.log(import_chalk.default.yellow(`Linking to "${teams[0].name}" \u2014 pass --team to choose another.`));
+    return { teamId: teams[0].teamId, teamName: teams[0].name };
+  }
+  const { default: inquirer2 } = await import("inquirer");
+  const { chosen } = await inquirer2.prompt([{
+    type: "list",
+    name: "chosen",
+    message: "Which team do you want to link to?",
+    choices: teams.map((t) => ({ name: t.name, value: t.teamId }))
+  }]);
+  const picked = teams.find((t) => t.teamId === chosen);
+  return { teamId: picked.teamId, teamName: picked.name };
+}
+var import_chalk;
+var init_team = __esm({
+  "src/lib/team.ts"() {
+    "use strict";
+    import_chalk = __toESM(require("chalk"));
+    init_api();
+  }
+});
+
 // src/lib/anon-cred.ts
 var anon_cred_exports = {};
 __export(anon_cred_exports, {
@@ -492,7 +562,7 @@ var import_commander = require("commander");
 var import_chalk34 = __toESM(require("chalk"));
 
 // package.json
-var version = "0.12.1";
+var version = "0.14.0";
 
 // src/index.ts
 init_types();
@@ -501,43 +571,7 @@ init_types();
 var import_chalk2 = __toESM(require("chalk"));
 var import_ora = __toESM(require("ora"));
 init_auth();
-
-// src/lib/team.ts
-var import_chalk = __toESM(require("chalk"));
-init_api();
-async function resolveLinkedTeam(opts) {
-  let teams;
-  try {
-    teams = await getTeams();
-  } catch {
-    return opts.preferredId ? { teamId: opts.preferredId } : null;
-  }
-  if (teams.length === 0) return null;
-  const preferred = opts.preferredId ? teams.find((t) => t.teamId === opts.preferredId) : void 0;
-  if (preferred) return { teamId: preferred.teamId, teamName: preferred.name };
-  if (opts.preferredId) {
-    console.log(import_chalk.default.yellow("\nYour previously linked team is no longer available."));
-  }
-  if (teams.length === 1) {
-    console.log(`${import_chalk.default.cyan("\u2192")} Linking to your team ${import_chalk.default.bold(teams[0].name)}.`);
-    return { teamId: teams[0].teamId, teamName: teams[0].name };
-  }
-  if (!opts.interactive) {
-    console.log(import_chalk.default.yellow(`Linking to "${teams[0].name}" \u2014 pass --team to choose another.`));
-    return { teamId: teams[0].teamId, teamName: teams[0].name };
-  }
-  const { default: inquirer2 } = await import("inquirer");
-  const { chosen } = await inquirer2.prompt([{
-    type: "list",
-    name: "chosen",
-    message: "Which team do you want to link to?",
-    choices: teams.map((t) => ({ name: t.name, value: t.teamId }))
-  }]);
-  const picked = teams.find((t) => t.teamId === chosen);
-  return { teamId: picked.teamId, teamName: picked.name };
-}
-
-// src/commands/login.ts
+init_team();
 var DASHBOARD_BASE2 = "https://dashboard.apiblaze.com";
 function openBrowser(url) {
   const { exec } = require("child_process");
@@ -613,7 +647,12 @@ async function runLogin() {
   }
   let teamId = defaultTeamId ?? void 0;
   let teamName;
-  const linked = await resolveLinkedTeam({ preferredId: defaultTeamId ?? void 0, interactive: !!process.stdin.isTTY });
+  const linked = await resolveLinkedTeam({
+    preferredId: defaultTeamId ?? void 0,
+    interactive: !!process.stdin.isTTY,
+    // >1 team → ASK (JWT default is just the cursor). One team → link silently.
+    promptWhenMultiple: true
+  });
   if (linked) {
     teamId = linked.teamId;
     teamName = linked.teamName;
@@ -838,6 +877,9 @@ function formatCapturedRequest(req, note) {
   ].join("\n");
 }
 
+// src/commands/dev.ts
+init_team();
+
 // src/lib/random-name.ts
 var ADJECTIVES = [
   "amber",
@@ -2858,13 +2900,28 @@ var trailingComma = /\s*,\s*/;
 var parseList = (s) => s.split(trailingComma).map((x) => x.trim()).filter(Boolean);
 async function runTenantManage(query, opts) {
   const { teamId } = await resolveTeam(opts.team);
-  const slug = opts.tenant ?? loadCredentialsTenant(query) ?? await pickTenant(teamId, { message: "Manage which tenant?", initialQuery: query, allowCreate: true });
+  const slug = opts.tenant ?? await validScopedTenant(teamId, query) ?? await pickTenant(teamId, { message: "Manage which tenant?", initialQuery: query, allowCreate: true });
   if (!slug) return;
   await tenantHome(teamId, slug);
 }
-function loadCredentialsTenant(query) {
+async function validScopedTenant(teamId, query) {
   if (query) return void 0;
-  return loadCredentials()?.activeTenant ?? void 0;
+  const creds = loadCredentials();
+  const scoped = creds?.activeTenant;
+  if (!scoped) return void 0;
+  const out = await admin({
+    method: "GET",
+    path: `/teams/${encodeURIComponent(teamId)}/tenants?q=${encodeURIComponent(scoped)}&limit=15`,
+    summary: `Verify tenant scope ${scoped}`
+  }).catch(() => null);
+  const names = (out?.tenants ?? []).map((t) => typeof t === "string" ? t : t.tenant_name);
+  if (names.includes(scoped)) return scoped;
+  const { saveCredentials: saveCredentials2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
+  const next = { ...creds };
+  delete next.activeTenant;
+  saveCredentials2(next);
+  console.log(import_chalk24.default.yellow(`Tenant scope "${scoped}" no longer exists in this team \u2014 cleared.`));
+  return void 0;
 }
 async function tenantHome(teamId, tenant2) {
   const { default: inquirer2 } = await import("inquirer");
@@ -5050,16 +5107,25 @@ async function opCall(call) {
 function printResidue(report, applied) {
   const up = report?.upstash ?? {};
   const fga = report?.fga ?? {};
+  const ghosts = report?.ghosts ?? {};
   console.log(import_chalk33.default.bold(applied ? "\nExternal-residue sweep" : "\nExternal residue (dry-run \u2014 nothing deleted)"));
   console.log(import_chalk33.default.bold("\n  Upstash"));
   const orphans = up.orphans ?? [];
   if (orphans.length === 0) console.log(import_chalk33.default.green("    no orphaned keys"));
   for (const o of orphans) console.log(`    ${import_chalk33.default.yellow(o.key)} ${import_chalk33.default.dim(`\u2014 ${o.reason}`)}`);
   console.log(import_chalk33.default.dim(`    kept (live principals): ${up.kept ?? 0} \xB7 anon wallets (untouched): ${up.anon_wallets ?? 0}`));
+  if (up.anon_wallet_detail) {
+    const d = up.anon_wallet_detail;
+    console.log(import_chalk33.default.dim(`    anon wallets: ${d.count} ($${(d.total_cents / 100).toFixed(2)}), ${d.no_ttl} with NO TTL${d.no_ttl ? " \u26A0" : " (all self-expire)"}`));
+  }
+  if (up.keyspace_census) {
+    const census = Object.entries(up.keyspace_census).map(([k, v]) => `${k}=${v}`).join(" \xB7 ");
+    console.log(import_chalk33.default.dim(`    keyspace: ${census}`));
+  }
   if (up.unknown?.length) console.log(import_chalk33.default.dim(`    unknown (never deleted): ${up.unknown.join(", ")}`));
   if (applied) console.log(`    ${import_chalk33.default.bold(String(up.deleted ?? 0))} key(s) deleted`);
   for (const e of up.errors ?? []) console.log(import_chalk33.default.red(`    error: ${e}`));
-  console.log(import_chalk33.default.bold("\n  OpenFGA / Neon"));
+  console.log(import_chalk33.default.bold("\n  OpenFGA / Neon \u2014 orphan stores"));
   if (applied) {
     const swept = fga?.swept ?? [];
     if (swept.length === 0) console.log(import_chalk33.default.green("    no orphaned stores"));
@@ -5069,6 +5135,8 @@ function printResidue(report, applied) {
       );
     }
     if (fga?.remaining) console.log(import_chalk33.default.yellow(`    ${fga.remaining} more orphan store(s) \u2014 re-run to drain`));
+    const st = fga?.side_tables;
+    if (st) console.log(import_chalk33.default.dim(`    Neon side-tables purged: ${st.soft_deleted_stores} store records, ${st.orphan_models} models, ${st.orphan_changelog} changelog rows${st.error ? ` (${st.error})` : ""}`));
   } else {
     const fgaOrphans = fga?.orphans ?? [];
     if (fgaOrphans.length === 0) console.log(import_chalk33.default.green("    no orphaned stores"));
@@ -5077,8 +5145,26 @@ function printResidue(report, applied) {
       console.log(`    ${import_chalk33.default.yellow(s.store_id)} ${import_chalk33.default.dim(`\u2014 ${src}${s.name ? ` (${s.name})` : ""}, ${s.neon_tuples} Neon tuple(s)`)}`);
     }
     console.log(import_chalk33.default.dim(`    kept stores: ${(fga?.kept_store_ids ?? []).length}`));
+    const st = fga?.side_tables;
+    if (st) console.log(import_chalk33.default.dim(`    Neon side-table residue: ${st.soft_deleted_stores} soft-deleted store records, ${st.orphan_models} orphan models, ${st.orphan_changelog} orphan changelog rows`));
   }
   for (const e of fga?.errors ?? []) console.log(import_chalk33.default.red(`    error: ${e}`));
+  console.log(import_chalk33.default.bold("\n  OpenFGA \u2014 ghost tuples in surviving stores"));
+  if (applied) {
+    if ((ghosts?.ghost_count ?? 0) === 0) console.log(import_chalk33.default.green("    no ghost tuples"));
+    else console.log(`    ${import_chalk33.default.bold(String(ghosts.deleted ?? 0))} ghost tuple(s) deleted ${import_chalk33.default.dim(`(of ${ghosts.ghost_count} found, ${ghosts.scanned_tuples} scanned across ${ghosts.live_stores} live stores)`)}`);
+  } else {
+    const n = ghosts?.ghost_count ?? 0;
+    if (n === 0) console.log(import_chalk33.default.green(`    no ghost tuples ${import_chalk33.default.dim(`(${ghosts.scanned_tuples ?? 0} scanned across ${ghosts.live_stores ?? 0} live stores)`)}`));
+    else {
+      console.log(import_chalk33.default.yellow(`    ${n} ghost tuple(s) referencing entities absent from D1:`));
+      for (const g of (ghosts.ghosts ?? []).slice(0, 20)) {
+        console.log(import_chalk33.default.dim(`      ${g.object_type}:${g.object_id} ${g.relation} ${g._user}`));
+      }
+      if (n > 20) console.log(import_chalk33.default.dim(`      \u2026 and ${n - 20} more`));
+    }
+  }
+  for (const e of ghosts?.errors ?? []) console.log(import_chalk33.default.red(`    error: ${e}`));
   console.log();
 }
 async function runOp(sub, opts = {}) {
@@ -5096,8 +5182,9 @@ async function runOp(sub, opts = {}) {
       console.log(import_chalk33.default.bold("\nOperator menu"));
       console.log(`  ${import_chalk33.default.cyan("apiblaze op residue")}        external-store residue report (Upstash + Neon/OpenFGA, dry-run)`);
       console.log(`  ${import_chalk33.default.cyan("apiblaze op sweep")}          delete the orphans the report shows (asks first; ${import_chalk33.default.dim("-y to skip")})`);
-      console.log(`  ${import_chalk33.default.cyan("apiblaze op credits")}        list credit wallets
-`);
+      console.log(`  ${import_chalk33.default.cyan("apiblaze op credits")}        list credit wallets`);
+      console.log(import_chalk33.default.dim(`  (to prune all non-CP data: run scripts/nuke-but-cp.sh --apply --sweep in the repo)
+`));
       return;
     }
     case "residue": {
@@ -5110,15 +5197,20 @@ async function runOp(sub, opts = {}) {
       const report = await opCall({ method: "GET", path: "/operator/external-residue", summary: "external residue report" });
       const nUp = report?.upstash?.orphans?.length ?? 0;
       const nFga = report?.fga?.orphans?.length ?? 0;
+      const nGhost = report?.ghosts?.ghost_count ?? 0;
+      const st = report?.fga?.side_tables ?? {};
+      const nSide = (st.soft_deleted_stores ?? 0) + (st.orphan_models ?? 0) + (st.orphan_changelog ?? 0);
       printResidue(report, false);
-      if (nUp + nFga === 0) {
+      if (nUp + nFga + nGhost + nSide === 0) {
         console.log(import_chalk33.default.green("Nothing to sweep."));
         return;
       }
       if (!opts.yes) {
         const readline2 = await import("readline/promises");
         const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
-        const answer = await rl.question(import_chalk33.default.red(`Delete ${nUp} Upstash key(s) + ${nFga} OpenFGA store(s)? Type 'sweep' to confirm: `));
+        const answer = await rl.question(
+          import_chalk33.default.red(`Delete ${nUp} Upstash key(s) + ${nFga} OpenFGA store(s) + ${nGhost} ghost tuple(s) + ${nSide} Neon side-table row(s)? Type 'sweep' to confirm: `)
+        );
         rl.close();
         if (answer.trim() !== "sweep") return void console.log(import_chalk33.default.dim("Aborted."));
       }
@@ -5145,6 +5237,7 @@ async function runOp(sub, opts = {}) {
 
 // src/index.ts
 init_trace();
+init_auth();
 var program = new import_commander.Command();
 program.name("apiblaze").description("APIblaze CLI \u2014 create & manage API proxies and run dev tunnels").version(version).option("-v, --verbose", "Print the exact series of API calls each command makes (curl-equivalent you could run yourself)");
 program.hook("preAction", () => {
@@ -5158,7 +5251,7 @@ function action(fn) {
       renderTrace();
     } catch (err) {
       renderTrace();
-      printError(err);
+      await printError(err);
       process.exit(1);
     }
   };
@@ -5167,7 +5260,7 @@ program.command("login").description("Authenticate with APIblaze").action(async
   try {
     await runLogin();
   } catch (err) {
-    printError(err);
+    await printError(err);
     process.exit(1);
   }
 });
@@ -5175,7 +5268,7 @@ program.command("create").description("Create a new API proxy (no login needed \
   try {
     await runCreate(opts);
   } catch (err) {
-    printError(err);
+    await printError(err);
     process.exit(1);
   }
 });
@@ -5200,7 +5293,7 @@ program.command("dev").description("Put your localhost behind a public URL (dev
     }
     await runDev({ port: resolved, captureFile: opts.captureFile });
   } catch (err) {
-    printError(err);
+    await printError(err);
     process.exit(1);
   }
 });
@@ -5213,7 +5306,7 @@ program.command("whoami").description("Show who you are \u2014 both API Producer
   try {
     await runWhoami(opts);
   } catch (err) {
-    printError(err);
+    await printError(err);
     process.exit(1);
   }
 });
@@ -5221,7 +5314,7 @@ program.command("claim").description("Claim your anonymous workspace into your a
   try {
     await runClaim(code, opts);
   } catch (err) {
-    printError(err);
+    await printError(err);
     process.exit(1);
   }
 });
@@ -5229,7 +5322,7 @@ program.command("team").description("Switch the active team").argument("[team]",
   try {
     await runTeam(team);
   } catch (err) {
-    printError(err);
+    await printError(err);
     process.exit(1);
   }
 });
@@ -5237,7 +5330,7 @@ program.command("projects").description("List the projects in your team").action
   try {
     await runProjects();
   } catch (err) {
-    printError(err);
+    await printError(err);
     process.exit(1);
   }
 });
@@ -5319,14 +5412,32 @@ Examples:
   $ npx apiblaze throttle myapi --rate 50 --verbose      # configure + show the API call
   $ npx apiblaze consumer login                          # act as a consumer of your API
 `);
-function printError(err) {
+async function recoverStaleTeam() {
+  try {
+    const creds = loadCredentials();
+    if (!creds?.teamId) return;
+    const { resolveLinkedTeam: resolveLinkedTeam2 } = await Promise.resolve().then(() => (init_team(), team_exports));
+    const linked = await resolveLinkedTeam2({ preferredId: creds.teamId, interactive: !!process.stdin.isTTY });
+    if (!linked) {
+      console.error(import_chalk34.default.yellow("Your account has no teams anymore (deleted?). Run `apiblaze login` or `apiblaze create` to get a workspace."));
+      return;
+    }
+    if (linked.teamId === creds.teamId) return;
+    const next = { ...creds, teamId: linked.teamId, teamName: linked.teamName };
+    delete next.activeTenant;
+    saveCredentials(next);
+    console.error(import_chalk34.default.yellow(`Your previous team no longer exists \u2014 relinked to ${import_chalk34.default.bold(linked.teamName ?? linked.teamId)}. Re-run your command.`));
+  } catch {
+  }
+}
+async function printError(err) {
   if (err instanceof ApiError) {
     const data = err.body;
     const extra = [data?.body?.reason, data?.body?.details, data?.details, data?.body?.error].find((x) => typeof x === "string" && x && x !== err.message);
     console.error(import_chalk34.default.red(`
 API error (${err.status}): ${err.message}${extra ? ` \u2014 ${extra}` : ""}`));
     if (err.status === 403 || err.status === 404) {
-      console.error(import_chalk34.default.dim("If your team/tenant was recently deleted or recreated, re-run `apiblaze login` or switch with `apiblaze team`."));
+      await recoverStaleTeam();
     }
   } else if (err instanceof Error) {
     console.error(import_chalk34.default.red(`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.12.1",
+  "version": "0.14.0",
   "description": "APIblaze CLI + sidecar — manage API proxies, run dev tunnels, and route a Next.js app's egress through APIblaze with one command",
   "keywords": [
     "apiblaze",