apiblaze 0.8.0 → 0.9.0

package/dist/index.js

@@ -99,7 +99,6 @@ var api_exports = {};
 __export(api_exports, {
   agentCall: () => agentCall,
   checkProxyName: () => checkProxyName,
-  claimProxy: () => claimProxy,
   claimTeam: () => claimTeam,
   createProxy: () => createProxy,
   createProxyAnonymous: () => createProxyAnonymous,
@@ -194,16 +193,10 @@ async function createProxy(payload) {
     body: JSON.stringify(payload)
   });
 }
-async function claimProxy(claimCode, teamId) {
-  return apiFetch("/api/cli/claim", {
-    method: "POST",
-    body: JSON.stringify({ claimCode, team_id: teamId })
-  });
-}
-async function claimTeam(code) {
+async function claimTeam(code, teamId) {
   return apiFetch("/api/cli/claim-team", {
     method: "POST",
-    body: JSON.stringify({ code })
+    body: JSON.stringify({ code, ...teamId ? { team_id: teamId } : {} })
   });
 }
 async function sidecarInitAnonymous() {
@@ -312,7 +305,7 @@ var import_commander = require("commander");
 var import_chalk30 = __toESM(require("chalk"));
 
 // package.json
-var version = "0.8.0";
+var version = "0.9.0";
 
 // src/index.ts
 init_types();
@@ -1530,7 +1523,7 @@ async function runAnonymousCreate(opts) {
     } else {
       result = await createProxyAnonymous(body);
       if (result.cp_key && result.team_id) {
-        saveAnonCred2(result.cp_key, result.team_id, result.team_claim_code);
+        saveAnonCred2(result.cp_key, result.team_id, result.claim_code);
       }
     }
     spinner?.succeed(import_chalk6.default.green("Proxy created!"));
@@ -1564,13 +1557,13 @@ async function runAnonymousCreate(opts) {
     console.log(import_chalk6.default.dim("\n  Save this now \u2014 send it as the X-API-Key header. It may not be shown again."));
   }
   if (prodEndpoint) printCurlExample(prodEndpoint, opts.auth || "api_key", apiKey, result.portal);
-  const claimCode = result.team_claim_code || cred?.claim_code;
+  const claimCode = result.claim_code || cred?.claim_code;
   if (claimCode) {
     console.log();
-    console.log(`  ${import_chalk6.default.yellow("\u26A0 Anonymous \u2014 claim within 30 days or it expires.")} All your anonymous proxies`);
-    console.log(`    on this machine share ONE workspace. To keep them all:`);
-    console.log(`      ${import_chalk6.default.cyan("apiblaze login")}   ${import_chalk6.default.dim("(prompts to claim them into your account)")}`);
-    console.log(import_chalk6.default.dim(`    From another machine: apiblaze claim ${claimCode}`));
+    console.log(`  ${import_chalk6.default.yellow("\u26A0 Anonymous \u2014 claim within 30 days or it expires.")} Everything you create`);
+    console.log(`    with the CP key shares ONE workspace. To keep it all in one shot:`);
+    console.log(`      ${import_chalk6.default.cyan("apiblaze login")}   ${import_chalk6.default.dim("(prompts to claim your workspace into your account)")}`);
+    console.log(import_chalk6.default.dim(`    From another machine: apiblaze claim ${claimCode}  (add --team <name> to merge into an existing team)`));
   } else if (result.claim_url) {
     console.log();
     console.log(`  ${import_chalk6.default.yellow("\u26A0 Anonymous proxy \u2014 claim it to your account within 30 days or it expires:")}`);
@@ -1591,100 +1584,55 @@ function fail2(message) {
 }
 async function runClaim(claimCodeArg, opts) {
   const creds = loadCredentials();
-  if (!creds) {
-    fail2("Not logged in. Run `apiblaze login` first, then claim.");
-  }
+  if (!creds) fail2("Not logged in. Run `apiblaze login` first, then claim.");
   let claimCode = (claimCodeArg ?? "").trim();
-  let fromLocalSession = false;
+  let fromLocal = false;
   if (!claimCode) {
-    const sess = loadAnonCred();
-    if (sess?.claim_code) {
-      claimCode = sess.claim_code;
-      fromLocalSession = true;
+    const c = loadAnonCred();
+    if (c?.claim_code) {
+      claimCode = c.claim_code;
+      fromLocal = true;
     }
   }
   if (!claimCode && process.stdin.isTTY) {
     const { default: inquirer2 } = await import("inquirer");
-    const { code } = await inquirer2.prompt([{
-      type: "input",
-      name: "code",
-      message: "Claim code (from the create output / claim URL):"
-    }]);
+    const { code } = await inquirer2.prompt([{ type: "input", name: "code", message: "Claim code:" }]);
     claimCode = (code ?? "").trim();
   }
-  if (!claimCode) {
-    fail2("Nothing to claim on this machine. Run `apiblaze claim <code>` with a code, or `apiblaze create`/`init` first.");
+  if (!claimCode) fail2("Nothing to claim on this machine. Run `apiblaze claim <code>`, or `apiblaze create`/`init` first.");
+  let targetTeamId;
+  if (opts.team) {
+    const teams = await getTeams().catch(() => []);
+    const match = teams.find((t) => t.teamId === opts.team || t.name.toLowerCase() === opts.team.toLowerCase());
+    if (!match) fail2(`Team "${opts.team}" not found. Available: ${teams.map((t) => t.name).join(", ") || "(none)"}.`);
+    targetTeamId = match.teamId;
   }
+  let res;
   try {
-    const t = await claimTeam(claimCode);
-    if (fromLocalSession) clearAnonCred();
-    if (opts.json) {
-      console.log(JSON.stringify(t, null, 2));
-      return;
-    }
-    console.log(import_chalk7.default.green(`
-\u2714 Claimed the whole team into your account.`));
-    console.log(`  Team: ${import_chalk7.default.bold(t.team_id)}`);
-    console.log(`  Its proxies + keys are now yours. Switch to it with ${import_chalk7.default.cyan(`apiblaze team ${t.team_id}`)}.`);
-    console.log(`
-  Manage it at ${import_chalk7.default.cyan("https://dashboard.apiblaze.com/dashboard")}`);
-    return;
+    res = await claimTeam(claimCode, targetTeamId);
   } catch (err) {
-    if (err instanceof ApiError && err.status !== 404) {
-      const code = typeof err.body === "object" && err.body ? err.body.error : void 0;
-      if (code === "already_claimed") fail2("That claim code has already been used.");
-      if (code === "expired") fail2("That claim code has expired. Create a fresh setup with `apiblaze init`.");
-      if (code === "not_claimable") fail2("That team can no longer be claimed (it already belongs to an account).");
+    if (err instanceof ApiError) {
+      const c = typeof err.body === "object" && err.body ? err.body.error : void 0;
+      if (c === "already_claimed") fail2("That claim code has already been used.");
+      if (c === "expired") fail2("That claim code has expired. Create a fresh setup with `apiblaze create`/`init`.");
+      if (c === "not_claimable") fail2("That workspace can no longer be claimed (it already belongs to an account).");
+      if (err.status === 404) fail2("That claim code isn't valid \u2014 check it and try again.");
+      if (err.status === 403) fail2(`You're not a member of team "${opts.team}".`);
       fail2(`Could not claim: ${err.message}`);
     }
-  }
-  const teams = await getTeams().catch(() => []);
-  if (teams.length === 0) {
-    fail2("No teams found for your account.");
-  }
-  let teamId;
-  if (opts.team) {
-    const match = teams.find(
-      (t) => t.teamId === opts.team || t.name.toLowerCase() === opts.team.toLowerCase()
-    );
-    if (!match) {
-      fail2(`Team "${opts.team}" not found. Available: ${teams.map((t) => t.name).join(", ")}.`);
-    }
-    teamId = match.teamId;
-  } else if (creds.teamId && teams.some((t) => t.teamId === creds.teamId)) {
-    teamId = creds.teamId;
-  } else if (teams.length === 1) {
-    teamId = teams[0].teamId;
-  } else if (process.stdin.isTTY) {
-    const { default: inquirer2 } = await import("inquirer");
-    const { picked } = await inquirer2.prompt([{
-      type: "list",
-      name: "picked",
-      message: "Claim into which team?",
-      choices: teams.map((t) => ({ name: t.name, value: t.teamId }))
-    }]);
-    teamId = picked;
-  } else {
-    fail2(`Specify a team: \`apiblaze claim ${claimCode} --team <name|id>\`. Available: ${teams.map((t) => t.name).join(", ")}.`);
-  }
-  const teamName = teams.find((t) => t.teamId === teamId)?.name ?? teamId;
-  let result;
-  try {
-    result = await claimProxy(claimCode, teamId);
-  } catch (err) {
-    if (err instanceof ApiError) fail2(`That claim code isn't valid \u2014 it may be mistyped, already claimed, or expired.`);
     throw err;
   }
+  if (fromLocal) clearAnonCred();
   if (opts.json) {
-    console.log(JSON.stringify(result, null, 2));
+    console.log(JSON.stringify(res, null, 2));
     return;
   }
-  console.log(import_chalk7.default.green(`
-\u2714 Claimed into ${import_chalk7.default.bold(teamName)}.`));
-  if (result.project_id) console.log(`  Project: ${import_chalk7.default.bold(result.project_id)}`);
-  if (result.endpoints?.length) {
-    console.log("  Endpoints:");
-    for (const e of result.endpoints) console.log(`    ${e}`);
+  console.log(import_chalk7.default.green("\n\u2714 Claimed your anonymous workspace into your account."));
+  if (res.merged) {
+    console.log(`  Merged ${import_chalk7.default.bold(String(res.proxy_count ?? ""))} prox${res.proxy_count === 1 ? "y" : "ies"} into team ${import_chalk7.default.bold(res.team_id)}.`);
+  } else {
+    console.log(`  It's now your team ${import_chalk7.default.bold(res.team_id)}. Switch to it with ${import_chalk7.default.cyan(`apiblaze team ${res.team_id}`)}.`);
+    console.log(import_chalk7.default.dim(`  (Tip: re-run with --team <name> to merge into an existing team instead.)`));
   }
   console.log(`
   Manage it at ${import_chalk7.default.cyan("https://dashboard.apiblaze.com/dashboard")}`);
@@ -3685,7 +3633,7 @@ program.command("whoami").description("Show who you are \u2014 both API Producer
     process.exit(1);
   }
 });
-program.command("claim").description("Claim an anonymously-created proxy into one of your teams (requires login)").argument("[code]", "Claim code from `create` output / claim URL (prompted if omitted)").option("--team <id|name>", "Team to claim into (defaults to your active team)").option("--json", "Output machine-readable JSON (non-interactive)").action(async (code, opts) => {
+program.command("claim").description("Claim your anonymous workspace into your account (requires login)").argument("[code]", "Claim code from `create`/`init` output (omit to claim this machine's workspace)").option("--team <id|name>", "Merge into this existing team (default: promote to a new team)").option("--json", "Output machine-readable JSON (non-interactive)").action(async (code, opts) => {
   try {
     await runClaim(code, opts);
   } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.8.0",
+  "version": "0.9.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",