@deeplake/hivemind 0.7.75 → 0.7.77

package/codex/bundle/session-start.js

@@ -112,6 +112,19 @@ function decodeJwtPayload(token) {
     return null;
   }
 }
+async function apiGet(path, token, apiUrl, orgId) {
+  const headers = {
+    Authorization: `Bearer ${token}`,
+    "Content-Type": "application/json",
+    ...deeplakeClientHeader()
+  };
+  if (orgId)
+    headers["X-Activeloop-Org-Id"] = orgId;
+  const resp = await fetch(`${apiUrl}${path}`, { headers });
+  if (!resp.ok)
+    throw new Error(`API ${resp.status}: ${await resp.text().catch(() => "")}`);
+  return resp.json();
+}
 async function apiPost(path, body, token, apiUrl, orgId) {
   const headers = {
     Authorization: `Bearer ${token}`,
@@ -125,6 +138,10 @@ async function apiPost(path, body, token, apiUrl, orgId) {
     throw new Error(`API ${resp.status}: ${await resp.text().catch(() => "")}`);
   return resp.json();
 }
+async function listOrgs(token, apiUrl = DEFAULT_API_URL) {
+  const data = await apiGet("/organizations", token, apiUrl);
+  return Array.isArray(data) ? data : [];
+}
 async function healDriftedOrgToken(creds, log6 = () => {
 }) {
   if (!creds.token || !creds.orgId)
@@ -143,6 +160,33 @@ async function healDriftedOrgToken(creds, log6 = () => {
       organization_id: creds.orgId
     }, creds.token, apiUrl);
     const healed = { ...creds, token: tokenData.token.token };
+    try {
+      const orgs = await listOrgs(healed.token, apiUrl);
+      const matchedOrg = orgs.find((o) => o.id === creds.orgId);
+      if (matchedOrg && matchedOrg.name !== creds.orgName) {
+        log6(`orgName realigned: ${creds.orgName ?? "(unset)"} -> ${matchedOrg.name}`);
+        healed.orgName = matchedOrg.name;
+      }
+    } catch (e) {
+      log6(`orgName realign skipped: ${e.message}`);
+    }
+    const currentWs = creds.workspaceId ?? "default";
+    if (currentWs !== "default") {
+      try {
+        const wsList = await listWorkspaces(healed.token, apiUrl, creds.orgId);
+        const lcWs = currentWs.toLowerCase();
+        const wsMatch = wsList.find((w) => w.id === currentWs || w.name && w.name.toLowerCase() === lcWs);
+        if (!wsMatch) {
+          log6(`workspace '${currentWs}' not in org ${creds.orgId} \u2014 reset to default`);
+          healed.workspaceId = "default";
+        } else if (wsMatch.id !== currentWs) {
+          log6(`workspace '${currentWs}' resolved to id '${wsMatch.id}'`);
+          healed.workspaceId = wsMatch.id;
+        }
+      } catch (e) {
+        log6(`workspace realign skipped: ${e.message}`);
+      }
+    }
     saveCredentials(healed);
     log6(`token re-minted for org=${creds.orgId}`);
     return healed;
@@ -151,6 +195,11 @@ async function healDriftedOrgToken(creds, log6 = () => {
     return creds;
   }
 }
+async function listWorkspaces(token, apiUrl = DEFAULT_API_URL, orgId) {
+  const raw = await apiGet("/workspaces", token, apiUrl, orgId);
+  const data = raw.data ?? raw;
+  return Array.isArray(data) ? data : [];
+}
 
 // dist/src/utils/stdin.js
 function readStdin() {