apiblaze 0.19.21 → 0.19.23

package/dist/index.js

@@ -932,7 +932,7 @@ var import_commander = require("commander");
 var import_chalk44 = __toESM(require("chalk"));
 
 // package.json
-var version = "0.19.21";
+var version = "0.19.23";
 
 // src/index.ts
 init_types();
@@ -6067,12 +6067,13 @@ async function dataPlaneAuth(p) {
   if (fresh.accessToken !== stored.accessToken) saveConsumer(fresh);
   return { Authorization: `Bearer ${fresh.accessToken}` };
 }
-async function ensureConsumerLogin(teamId, tenant2) {
+async function ensureConsumerLogin(teamId, tenant2, version2) {
+  const resource = `https://${tenant2}.portal.apiblaze.com/${version2}`;
   const existing = loadConsumer();
-  if (existing && existing.tenant === tenant2) {
+  if (existing && existing.tenant === tenant2 && existing.resource === resource) {
     const fresh = await validConsumerToken(existing);
     if (fresh) {
-      if (fresh.accessToken !== existing.accessToken) saveConsumer(fresh);
+      if (fresh.accessToken !== existing.accessToken) saveConsumer({ ...fresh, resource });
       console.log(import_chalk39.default.dim(`  Using your consumer session on ${import_chalk39.default.bold(tenant2)}${fresh.email ? ` (${fresh.email})` : ""}.`));
       return fresh;
     }
@@ -6099,7 +6100,7 @@ async function ensureConsumerLogin(teamId, tenant2) {
     console.log(`  Code: ${import_chalk39.default.bold(userCode)}
 `);
     console.log(import_chalk39.default.dim("  (opening your browser\u2026 waiting for you to finish)"));
-  }, `https://${tenant2}.portal.apiblaze.com/1.0.0`);
+  }, resource);
   const claims = result.idToken && decodeJwt2(result.idToken) || (decodeJwt2(result.accessToken) ?? {});
   const creds = {
     tenant: tenant2,
@@ -6110,7 +6111,8 @@ async function ensureConsumerLogin(teamId, tenant2) {
     expiresAt: Date.now() + (result.expiresIn ?? 3600) * 1e3,
     scope: result.scope,
     email: typeof claims.email === "string" ? claims.email : void 0,
-    obtainedAt: Date.now()
+    obtainedAt: Date.now(),
+    resource
   };
   saveConsumer(creds);
   console.log(`  ${import_chalk39.default.green("\u2714")} Signed in as${creds.email ? ` ${import_chalk39.default.bold(creds.email)}` : " a consumer"} on ${tenant2}.`);
@@ -6413,7 +6415,14 @@ async function replTurn(p, messages, userText) {
       return;
     }
     if (res.status === 401) {
-      console.log(import_chalk39.default.red("  The proxy rejected the API key (401). The key may have been revoked; re-run `apiblaze apichat` to re-provision."));
+      const reason = data && (data.error || data.message) || null;
+      const usingKey = !p.consumerAuth;
+      console.log(import_chalk39.default.red(`  The proxy rejected the request (401)${reason ? `: ${reason}` : "."}`));
+      console.log(
+        import_chalk39.default.dim(
+          usingKey ? "  Sent an API key. If the key was revoked, re-run `apiblaze apichat` to re-provision." : "  Sent your consumer OAuth token. Re-run `apiblaze apichat` to sign in again."
+        )
+      );
       return;
     }
     if (!res.ok || !data) {
@@ -6516,7 +6525,7 @@ async function mintDurableProxyKey(teamId, tenant2) {
   if (!out?.key) throw new Error("key mint returned no key");
   return out.key;
 }
-async function fetchAcceptedMethods(teamId, projectId, apiVersion) {
+async function fetchProxyDoor(teamId, projectId, apiVersion) {
   try {
     const listing = await admin({
       method: "GET",
@@ -6525,11 +6534,15 @@ async function fetchAcceptedMethods(teamId, projectId, apiVersion) {
     });
     const rows = listing?.projects ?? [];
     const row = rows.find((r) => r.project_id === projectId && r.api_version === apiVersion) ?? rows.find((r) => r.project_id === projectId);
+    const tenant2 = row?.config?.default_tenant ?? row?.config?.tenant ?? (typeof row?.urls?.portal === "string" ? row.urls.portal.replace(/^https?:\/\//, "").split(".")[0] : void 0);
     const policy = row?.config?.requests_policy;
-    if (!policy || policy.mode !== "authenticate") return null;
-    return Array.isArray(policy.methods) && policy.methods.length ? policy.methods : null;
+    if (!policy || policy.mode !== "authenticate") return { methods: null, tenant: tenant2 };
+    return {
+      methods: Array.isArray(policy.methods) && policy.methods.length ? policy.methods : null,
+      tenant: tenant2
+    };
   } catch {
-    return null;
+    return { methods: null };
   }
 }
 async function openServerProxy(project) {
@@ -6539,8 +6552,8 @@ async function openServerProxy(project) {
   const tenant2 = project.tenant || project.projectId;
   const me = loadCredentials()?.apiblazeUserId;
   const prior = loadApichats().find((a) => a.projectId === project.projectId);
-  const acceptedMethods = await fetchAcceptedMethods(project.teamId, project.projectId, project.apiVersion);
-  const acceptsApiKey = acceptedMethods === null || acceptedMethods.includes("api_key");
+  const door = await fetchProxyDoor(project.teamId, project.projectId, project.apiVersion);
+  const acceptsApiKey = door.methods === null || door.methods.includes("api_key");
   let dpKey = prior?.dpKey;
   let consumerAuth = false;
   if (acceptsApiKey) {
@@ -6552,7 +6565,7 @@ async function openServerProxy(project) {
   } else {
     consumerAuth = true;
     dpKey = void 0;
-    await ensureConsumerLogin(project.teamId, tenant2);
+    await ensureConsumerLogin(project.teamId, door.tenant ?? tenant2, version2);
   }
   const p = {
     projectId: project.projectId,
@@ -6571,14 +6584,14 @@ async function openServerProxy(project) {
     const raw = await admin({
       method: "GET",
       path: `/projects/${project.projectId}/${version2}/openapi`,
-      summary: "Fetch OpenAPI spec"
+      summary: "Check the proxy has a spec"
     }).catch(() => null);
     const spec2 = raw && (raw.spec ?? raw);
     spinner.stop();
-    if (spec2 && (spec2.paths || spec2.openapi)) {
-      await publishMcp(p, spec2);
-    } else {
+    if (!spec2 || !(spec2.paths || spec2.openapi)) {
       console.log(import_chalk39.default.yellow("  This proxy has no OpenAPI spec yet \u2014 chat will have no tools. Build one with `apiblaze agent openapi`."));
+    } else {
+      console.log(import_chalk39.default.dim("  Using the proxy's existing MCP catalogue (`apiblaze mcp` to rebuild it)."));
     }
   } catch (err) {
     spinner.fail("Could not open the proxy.");
@@ -6674,19 +6687,28 @@ async function noArgsMenu(opts) {
     }
     let savedKey = a.dpKey;
     let savedConsumerAuth = a.consumerAuth;
+    let savedTenant = a.tenant;
     const resumeTeamId = a.teamId ?? creds?.teamId;
     if (!a.anon && resumeTeamId) {
-      const methods = await fetchAcceptedMethods(resumeTeamId, a.projectId, a.version);
-      const acceptsApiKey = methods === null || methods.includes("api_key");
+      const door = await fetchProxyDoor(resumeTeamId, a.projectId, a.version);
+      const acceptsApiKey = door.methods === null || door.methods.includes("api_key");
       if (!acceptsApiKey) {
         savedConsumerAuth = true;
         savedKey = void 0;
-        await ensureConsumerLogin(resumeTeamId, a.tenant ?? a.projectId);
+        const loginTenant = door.tenant ?? a.tenant;
+        if (!loginTenant) {
+          fail4(
+            `Could not work out which tenant signs consumers in for "${a.projectId}".`,
+            'Re-open it from the "your proxy" list instead of Recent apichats.'
+          );
+        }
+        savedTenant = loginTenant;
+        await ensureConsumerLogin(resumeTeamId, loginTenant, a.version);
       } else if (savedConsumerAuth && !savedKey) {
         savedConsumerAuth = false;
       }
-      if (savedConsumerAuth !== a.consumerAuth || savedKey !== a.dpKey) {
-        upsertApichat({ ...a, teamId: resumeTeamId, dpKey: savedKey, consumerAuth: savedConsumerAuth });
+      if (savedConsumerAuth !== a.consumerAuth || savedKey !== a.dpKey || savedTenant !== a.tenant) {
+        upsertApichat({ ...a, teamId: resumeTeamId, tenant: savedTenant, dpKey: savedKey, consumerAuth: savedConsumerAuth });
       }
     }
     const p = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.19.21",
+  "version": "0.19.23",
   "description": "APIblaze CLI — Chat with your APIs, Manage your API keys, users and groups with the APIblaze serverless proxy",
   "keywords": [
     "apiblaze",