@openma/cli 0.1.0-beta.2 → 0.1.0-beta.4

package/dist/index.js

@@ -12,12 +12,39 @@ function credentialsPath() {
   const base = xdg && xdg.length > 0 ? xdg : join(homedir(), ".config");
   return join(base, "oma", "credentials.json");
 }
+function migrateV1ToV2(v1) {
+  return {
+    version: 2,
+    base_url: v1.base_url,
+    user: v1.user,
+    active_tenant_id: v1.tenant.id,
+    tenants: {
+      [v1.tenant.id]: {
+        name: v1.tenant.name,
+        role: v1.tenants.find((t) => t.id === v1.tenant.id)?.role ?? "owner",
+        token: v1.token,
+        key_id: v1.key_id,
+        created_at: v1.created_at
+      }
+    }
+  };
+}
 function readCredentials() {
   const path = credentialsPath();
   try {
     if (!existsSync(path)) return null;
     const raw = readFileSync(path, "utf8");
-    return JSON.parse(raw);
+    const parsed = JSON.parse(raw);
+    if (parsed.version === 2) return parsed;
+    if (parsed.version === 1) {
+      const v2 = migrateV1ToV2(parsed);
+      try {
+        writeCredentials(v2);
+      } catch {
+      }
+      return v2;
+    }
+    return null;
   } catch {
     return null;
   }
@@ -40,6 +67,7 @@ function clearCredentials() {
 function loadConfig() {
   const envBase = process.env.OMA_BASE_URL;
   const envKey = process.env.OMA_API_KEY;
+  const envTenant = process.env.OMA_TENANT_ID;
   const stored = readCredentials();
   if (envKey) {
     return {
@@ -50,9 +78,15 @@ function loadConfig() {
     };
   }
   if (stored) {
+    const activeId = envTenant || stored.active_tenant_id;
+    const profile = stored.tenants[activeId];
+    if (!profile) {
+      console.error(`Error: tenant ${activeId} not in credentials. Run: oma auth tenant ls`);
+      process.exit(1);
+    }
     return {
       baseUrl: envBase || stored.base_url,
-      apiKey: stored.token,
+      apiKey: profile.token,
       json: false,
       source: "stored"
     };
@@ -65,12 +99,17 @@ function loadConfig() {
 function loadConfigOptional() {
   const envBase = process.env.OMA_BASE_URL;
   const envKey = process.env.OMA_API_KEY;
+  const envTenant = process.env.OMA_TENANT_ID;
   const stored = readCredentials();
   if (envKey) {
     return { baseUrl: envBase || stored?.base_url || "https://openma.dev", apiKey: envKey, json: false, source: "env" };
   }
   if (stored) {
-    return { baseUrl: envBase || stored.base_url, apiKey: stored.token, json: false, source: "stored" };
+    const activeId = envTenant || stored.active_tenant_id;
+    const profile = stored.tenants[activeId];
+    if (profile) {
+      return { baseUrl: envBase || stored.base_url, apiKey: profile.token, json: false, source: "stored" };
+    }
   }
   return { baseUrl: envBase || "https://openma.dev", apiKey: "", json: false, source: "missing" };
 }
@@ -175,6 +214,9 @@ async function authLogin(baseUrl, requestedTenant) {
         res.writeHead(200, { "Content-Type": "text/html" }).end(approvalPage("Signed in", "You can close this tab and return to your terminal."));
         clearTimeout(timeout);
         server.close();
+        if (typeof server.closeAllConnections === "function") {
+          server.closeAllConnections();
+        }
         resolve({ token, tenant, user, key_id });
       } catch (err) {
         res.writeHead(500).end();
@@ -192,23 +234,42 @@ async function authLogin(baseUrl, requestedTenant) {
   });
   const tempConfig = { baseUrl, apiKey: result.token, json: false, source: "stored" };
   const me = await apiFetch(tempConfig, "/v1/me");
-  writeCredentials({
-    version: 1,
+  const existing = readCredentials();
+  const role = me.tenants.find((t) => t.id === me.tenant.id)?.role ?? "owner";
+  const updated = {
+    version: 2,
     base_url: baseUrl,
     user: me.user ?? { id: result.user, email: "", name: null },
-    tenant: me.tenant,
-    tenants: me.tenants,
-    token: result.token,
-    key_id: result.key_id,
-    created_at: (/* @__PURE__ */ new Date()).toISOString()
-  });
+    active_tenant_id: me.tenant.id,
+    tenants: {
+      ...existing && existing.user.id === (me.user?.id ?? result.user) ? existing.tenants : {},
+      [me.tenant.id]: {
+        name: me.tenant.name,
+        role,
+        token: result.token,
+        key_id: result.key_id,
+        created_at: (/* @__PURE__ */ new Date()).toISOString()
+      }
+    }
+  };
+  writeCredentials(updated);
   console.log(`\u2713 Signed in as ${me.user?.email ?? me.user?.id}`);
-  console.log(`  Tenant : ${me.tenant.name || me.tenant.id} (${me.tenant.id})`);
+  console.log(`  Tenant : ${displayTenantName(me.tenant)} (${me.tenant.id})`);
   console.log(`  Stored : ${credentialsPath()}`);
-  if (me.tenants.length > 1) {
-    console.log(`  ${me.tenants.length} tenants available \u2014 switch with: oma auth tenant use <id>`);
+  const knownCount = Object.keys(updated.tenants).length;
+  const totalAvailable = me.tenants.length;
+  if (totalAvailable > knownCount) {
+    const missing = totalAvailable - knownCount;
+    console.log(`  ${missing} more tenant${missing === 1 ? "" : "s"} available \u2014 add with: oma auth login --tenant <id>`);
+  } else if (knownCount > 1) {
+    console.log(`  ${knownCount} tenants stored \u2014 switch with: oma auth tenant use <id>`);
   }
 }
+function displayTenantName(t) {
+  const trimmed = (t.name ?? "").trim();
+  if (!trimmed || trimmed === "'s workspace" || trimmed.startsWith("'s ")) return t.id;
+  return trimmed;
+}
 function openBrowser(url) {
   try {
     const p = process.platform;
@@ -230,12 +291,13 @@ var commands = [
   {
     group: "Auth",
     match: ["auth", "login"],
-    usage: "oma auth login [--base-url <url>]",
-    desc: "Open browser to authenticate; stores ~/.config/oma/credentials.json",
+    usage: "oma auth login [--base-url <url>] [--tenant <id>]",
+    desc: "Open browser to authenticate; --tenant pre-picks a workspace",
     http: "POST   /v1/me/cli-tokens (browser handoff via /cli/login)",
     async run(_config, args) {
       const baseUrl = (flag(args, "--base-url") ?? process.env.OMA_BASE_URL ?? "https://openma.dev").replace(/\/+$/, "");
-      await authLogin(baseUrl);
+      const tenant = flag(args, "--tenant");
+      await authLogin(baseUrl, tenant);
     }
   },
   {
@@ -253,7 +315,7 @@ var commands = [
     group: "Auth",
     match: ["whoami"],
     usage: "oma whoami",
-    desc: "Show current user, tenant, and base URL",
+    desc: "Show current user, active tenant, and base URL",
     http: "GET    /v1/me",
     async run(config) {
       try {
@@ -265,9 +327,12 @@ var commands = [
         console.log(`Base URL : ${config.baseUrl}`);
         console.log(`Source   : ${config.source === "env" ? "OMA_API_KEY env var" : "stored credentials"}`);
         console.log(`User     : ${me.user?.email ?? me.user?.id ?? "(unknown \u2014 legacy key without user_id)"}`);
-        console.log(`Tenant   : ${me.tenant.name || me.tenant.id} (${me.tenant.id})`);
         if (me.tenants.length > 1) {
-          console.log(`Available: ${me.tenants.map((t) => t.id).join(", ")}`);
+          console.log(`Tenant   : ${displayTenantName(me.tenant)} (${me.tenant.id})`);
+          const others = me.tenants.filter((t) => t.id !== me.tenant.id);
+          if (others.length) {
+            console.log(`Available: ${others.map((t) => t.id).join(", ")} \u2014 switch with: oma auth tenant use <id>`);
+          }
         }
       } catch (err) {
         console.error(`whoami failed: ${err.message}`);
@@ -291,8 +356,20 @@ var commands = [
         return;
       }
       const stored = readCredentials();
-      const current = stored?.tenant.id;
-      table([["", "ID", "NAME", "ROLE"], ...data.map((t) => [t.id === current ? "*" : " ", t.id, t.name || "\u2014", t.role])]);
+      const active = stored?.active_tenant_id;
+      table([
+        ["", "ID", "NAME", "ROLE", "TOKEN"],
+        ...data.map((t) => [
+          t.id === active ? "*" : " ",
+          t.id,
+          t.name || "\u2014",
+          t.role,
+          stored?.tenants[t.id] ? "stored" : "\u2014"
+        ])
+      ]);
+      console.log(`
+* = active. "stored" = local token cached. To switch active: oma auth tenant use <id>`);
+      console.log(`To add a tenant the CLI hasn't seen yet: oma auth login --tenant <id>`);
     }
   },
   {
@@ -300,9 +377,9 @@ var commands = [
     match: ["auth", "tenant", "use"],
     needsArg: true,
     usage: "oma auth tenant use <tenant-id>",
-    desc: "Switch active tenant (mints a new CLI token for that tenant)",
-    http: "POST   /v1/me/cli-tokens {tenant_id}",
-    async run(config, args) {
+    desc: "Switch active tenant; if not yet authenticated for it, opens browser to mint",
+    http: "(local file update \u2014 or POST /v1/me/cli-tokens via browser if no cached token)",
+    async run(_config, args) {
       const tenantId = args[0];
       if (!tenantId) {
         console.error("Usage: oma auth tenant use <tenant-id>");
@@ -313,7 +390,14 @@ var commands = [
         console.error("No stored credentials. Run: oma auth login");
         process.exit(1);
       }
-      console.log(`Switching to tenant ${tenantId} \u2014 opening browser to confirm\u2026`);
+      if (stored.tenants[tenantId]) {
+        const updated = { ...stored, active_tenant_id: tenantId };
+        writeCredentials(updated);
+        const profile = stored.tenants[tenantId];
+        console.log(`\u2713 Active tenant: ${profile.name || tenantId} (${tenantId})`);
+        return;
+      }
+      console.log(`No cached token for ${tenantId}. Opening browser to authorize\u2026`);
       await authLogin(stored.base_url, tenantId);
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openma/cli",
-  "version": "0.1.0-beta.2",
+  "version": "0.1.0-beta.4",
   "description": "CLI for the openma managed agents platform",
   "type": "module",
   "bin": {