@openma/cli 0.1.0-beta.3 → 0.2.0-beta.0

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" };
 }
@@ -95,6 +134,120 @@ async function apiFetch(config, path, init) {
   }
   return res.json();
 }
+async function rawStream(config, path, init) {
+  const res = await fetch(`${config.baseUrl}${path}`, {
+    ...init,
+    headers: {
+      "x-api-key": config.apiKey,
+      "user-agent": "Mozilla/5.0 (compatible; OpenManagedAgents-CLI/0.1; +https://openma.dev)",
+      ...init?.headers
+    }
+  });
+  if (!res.ok) {
+    const body = await res.text();
+    throw new Error(`${res.status} ${res.statusText}: ${body}`);
+  }
+  return res;
+}
+async function* parseSSE(res) {
+  const reader = res.body.getReader();
+  const dec = new TextDecoder();
+  let buf = "";
+  for (; ; ) {
+    const { done, value } = await reader.read();
+    if (done) return;
+    buf += dec.decode(value, { stream: true });
+    let i;
+    while ((i = buf.indexOf("\n\n")) !== -1) {
+      const chunk = buf.slice(0, i);
+      buf = buf.slice(i + 2);
+      const line = chunk.split("\n").find((l) => l.startsWith("data: "));
+      if (!line) continue;
+      try {
+        yield JSON.parse(line.slice(6));
+      } catch {
+      }
+    }
+  }
+}
+var tty = !!process.stdout.isTTY;
+var dim = (s) => tty ? `\x1B[2m${s}\x1B[0m` : s;
+var cyan = (s) => tty ? `\x1B[36m${s}\x1B[0m` : s;
+var yellow = (s) => tty ? `\x1B[33m${s}\x1B[0m` : s;
+async function streamChat(config, sessionId, text) {
+  const res = await rawStream(config, `/v1/sessions/${sessionId}/messages`, {
+    method: "POST",
+    headers: { "content-type": "application/json", accept: "text/event-stream" },
+    body: JSON.stringify({ content: text })
+  });
+  let textOpen = false;
+  let thinkOpen = false;
+  for await (const ev of parseSSE(res)) {
+    const t = ev.type;
+    switch (t) {
+      case "agent.message_chunk":
+        process.stdout.write(String(ev.delta ?? ""));
+        textOpen = true;
+        break;
+      case "agent.message_stream_end":
+      case "agent.message":
+        if (textOpen) {
+          process.stdout.write("\n");
+          textOpen = false;
+        }
+        break;
+      case "agent.thinking_chunk":
+        if (!thinkOpen) {
+          process.stderr.write(dim("\u{1F4AD} "));
+          thinkOpen = true;
+        }
+        process.stderr.write(dim(String(ev.delta ?? "")));
+        break;
+      case "agent.thinking_stream_end":
+      case "agent.thinking":
+        if (thinkOpen) {
+          process.stderr.write("\n");
+          thinkOpen = false;
+        }
+        break;
+      case "agent.tool_use_input_stream_start":
+        process.stdout.write(cyan(`\u2192 tool: ${ev.tool_name ?? "?"}`) + dim(" preparing\u2026\n"));
+        break;
+      case "agent.tool_use":
+      case "agent.mcp_tool_use":
+      case "agent.custom_tool_use":
+        process.stdout.write(cyan(`\u2192 tool: ${ev.name}`) + " " + dim(JSON.stringify(ev.input ?? {})) + "\n");
+        break;
+      case "agent.tool_result":
+      case "agent.mcp_tool_result": {
+        const out = typeof ev.content === "string" ? ev.content : JSON.stringify(ev.content ?? "");
+        const trimmed = out.length > 280 ? out.slice(0, 280) + "\u2026" : out;
+        process.stdout.write(dim("\u2190 ") + trimmed + "\n");
+        break;
+      }
+      case "session.warning":
+        process.stderr.write(yellow(`\u26A0 ${ev.source}: ${ev.message}`) + "\n");
+        break;
+      case "session.error":
+        process.stderr.write(yellow(`\u2717 error: ${ev.error}`) + "\n");
+        break;
+      case "session.status_idle":
+        if (textOpen) {
+          process.stdout.write("\n");
+          textOpen = false;
+        }
+        return;
+    }
+  }
+}
+async function tailSession(config, sessionId) {
+  const res = await rawStream(config, `/v1/sessions/${sessionId}/events/stream`, {
+    headers: { accept: "text/event-stream" }
+  });
+  for await (const ev of parseSSE(res)) {
+    process.stdout.write(JSON.stringify(ev) + "\n");
+  }
+}
 function flag(args, name) {
   const idx = args.indexOf(name);
   return idx !== -1 ? args[idx + 1] : void 0;
@@ -146,39 +299,66 @@ async function authLogin(baseUrl, requestedTenant) {
           return;
         }
         const got = u.searchParams;
-        if (got.get("error")) {
-          const err = String(got.get("error"));
-          res.writeHead(400, { "Content-Type": "text/html" }).end(approvalPage("Cancelled", `Login was cancelled: ${err}. You can close this tab.`));
+        const finish = (statusCode, page, action) => {
+          res.writeHead(statusCode, { "Content-Type": "text/html" }).end(page);
           clearTimeout(timeout);
           server.close();
-          reject(new Error(`Login cancelled: ${err}`));
-          return;
+          if (typeof server.closeAllConnections === "function") {
+            server.closeAllConnections();
+          }
+          action();
+        };
+        if (got.get("error")) {
+          const err = String(got.get("error"));
+          return finish(
+            400,
+            approvalPage("Cancelled", `Login was cancelled: ${err}.`),
+            () => reject(new Error(`Login cancelled: ${err}`))
+          );
         }
         if (got.get("state") !== state) {
-          res.writeHead(400, { "Content-Type": "text/html" }).end(approvalPage("State mismatch", "The login response didn't match what this CLI session expected. Please try again."));
-          clearTimeout(timeout);
-          server.close();
-          reject(new Error("State mismatch \u2014 refusing the callback"));
-          return;
+          return finish(
+            400,
+            approvalPage("State mismatch", "The login response didn't match what this CLI session expected. Please try again."),
+            () => reject(new Error("State mismatch \u2014 refusing the callback"))
+          );
         }
-        const token = got.get("token");
-        const tenant = got.get("tenant");
-        const user = got.get("user");
-        const key_id = got.get("key_id");
-        if (!token || !tenant || !user || !key_id) {
-          res.writeHead(400, { "Content-Type": "text/html" }).end(approvalPage("Incomplete callback", "The browser handoff is missing required fields."));
-          clearTimeout(timeout);
-          server.close();
-          reject(new Error("Callback missing required fields"));
-          return;
+        const tokensB64 = got.get("tokens");
+        const userId = got.get("user") ?? "";
+        let tokens = [];
+        if (tokensB64) {
+          try {
+            const json = Buffer.from(tokensB64, "base64").toString("utf8");
+            tokens = JSON.parse(json);
+          } catch {
+            return finish(
+              400,
+              approvalPage("Bad payload", "The browser handoff payload was unreadable."),
+              () => reject(new Error("Failed to decode tokens from callback"))
+            );
+          }
+        } else {
+          const token = got.get("token");
+          const tenant = got.get("tenant");
+          const key_id = got.get("key_id");
+          if (token && tenant && key_id) {
+            tokens = [
+              { tenant_id: tenant, tenant_name: "", role: "owner", token, key_id }
+            ];
+          }
         }
-        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();
+        if (tokens.length === 0) {
+          return finish(
+            400,
+            approvalPage("Incomplete callback", "The browser handoff is missing required fields."),
+            () => reject(new Error("Callback missing required fields"))
+          );
         }
-        resolve({ token, tenant, user, key_id });
+        return finish(
+          200,
+          approvalPage("Signed in", "You can close this tab and return to your terminal."),
+          () => resolve({ tokens, user: userId })
+        );
       } catch (err) {
         res.writeHead(500).end();
         clearTimeout(timeout);
@@ -193,23 +373,44 @@ async function authLogin(baseUrl, requestedTenant) {
     console.log(`(If the browser doesn't open, copy the URL above into one manually.)`);
     openBrowser(loginUrl);
   });
-  const tempConfig = { baseUrl, apiKey: result.token, json: false, source: "stored" };
+  const firstToken = result.tokens[0];
+  const tempConfig = { baseUrl, apiKey: firstToken.token, json: false, source: "stored" };
   const me = await apiFetch(tempConfig, "/v1/me");
-  writeCredentials({
-    version: 1,
+  const existing = readCredentials();
+  const sameUser = existing && existing.user.id === (me.user?.id ?? result.user);
+  const tenantsMap = sameUser ? { ...existing.tenants } : {};
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  for (const t of result.tokens) {
+    const membership = me.tenants.find((m) => m.id === t.tenant_id);
+    tenantsMap[t.tenant_id] = {
+      name: membership?.name ?? t.tenant_name ?? "",
+      role: membership?.role ?? t.role ?? "owner",
+      token: t.token,
+      key_id: t.key_id,
+      created_at: now
+    };
+  }
+  const newActive = requestedTenant && tenantsMap[requestedTenant] && requestedTenant || (sameUser && existing.tenants[existing.active_tenant_id] ? existing.active_tenant_id : "") || result.tokens[0].tenant_id;
+  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: newActive,
+    tenants: tenantsMap
+  };
+  writeCredentials(updated);
+  const activeProfile = updated.tenants[updated.active_tenant_id];
   console.log(`\u2713 Signed in as ${me.user?.email ?? me.user?.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>`);
+  console.log(`  Active tenant : ${activeProfile.name || updated.active_tenant_id} (${updated.active_tenant_id})`);
+  console.log(`  Stored        : ${credentialsPath()}`);
+  const totalStored = Object.keys(tenantsMap).length;
+  if (totalStored > 1) {
+    console.log(`  Authorized for ${totalStored} workspaces \u2014 switch with: oma auth tenant use <id>`);
+  }
+  const totalAvailable = me.tenants.length;
+  if (totalAvailable > totalStored) {
+    const missing = totalAvailable - totalStored;
+    console.log(`  ${missing} more workspace${missing === 1 ? "" : "s"} unauthorized \u2014 add with: oma auth login --tenant <id>`);
   }
 }
 function displayTenantName(t) {
@@ -238,12 +439,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);
     }
   },
   {
@@ -261,7 +463,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 {
@@ -273,9 +475,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   : ${displayTenantName(me.tenant)} (${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}`);
@@ -299,8 +504,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>`);
     }
   },
   {
@@ -308,9 +525,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>");
@@ -321,7 +538,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);
     }
   },
@@ -427,7 +651,7 @@ Version: v${a.version}`);
     match: ["sessions", "message"],
     needsArg: true,
     usage: "oma sessions message <id> <text>",
-    desc: "Send message to session",
+    desc: "Fire-and-forget user message (no streaming back)",
     http: 'POST   /v1/sessions/:id/events {events:[{type:"user.message",content:[{type:"text",text:"..."}]}]}',
     async run(config, args) {
       const text = args.slice(1).join(" ");
@@ -435,6 +659,48 @@ Version: v${a.version}`);
       console.log("Message sent.");
     }
   },
+  {
+    group: "Sessions",
+    match: ["sessions", "chat"],
+    needsArg: true,
+    usage: "oma sessions chat <id> <text>",
+    desc: "Send a turn AND stream the reply token-by-token",
+    http: 'POST   /v1/sessions/:id/messages {content:"..."}  (text/event-stream)',
+    async run(config, args) {
+      const text = args.slice(1).join(" ");
+      if (!text) {
+        console.error("Usage: oma sessions chat <id> <text>");
+        process.exit(1);
+      }
+      await streamChat(config, args[0], text);
+    }
+  },
+  {
+    group: "Sessions",
+    match: ["sessions", "tail"],
+    needsArg: true,
+    usage: "oma sessions tail <id>",
+    desc: "Tail a session's full event stream (never closes)",
+    http: "GET    /v1/sessions/:id/events/stream  (text/event-stream)",
+    async run(config, args) {
+      await tailSession(config, args[0]);
+    }
+  },
+  {
+    group: "Sessions",
+    match: ["sessions", "logs"],
+    needsArg: true,
+    usage: "oma sessions logs <id>",
+    desc: "Dump the full persisted event log as JSON",
+    http: "GET    /v1/sessions/:id/events?limit=1000",
+    async run(config, args) {
+      const { data } = await apiFetch(
+        config,
+        `/v1/sessions/${args[0]}/events?limit=1000&order=asc`
+      );
+      for (const e of data) console.log(JSON.stringify(e));
+    }
+  },
   // Environments
   {
     group: "Environments",
@@ -1500,7 +1766,8 @@ var extraEndpoints = [
   { group: "Agents", http: "POST   /v1/agents/:id/archive                  Archive agent" },
   { group: "Sessions", http: "GET    /v1/sessions/:id                        Get session (status, usage)" },
   { group: "Sessions", http: "GET    /v1/sessions/:id/events?limit=N         Get events (JSON)" },
-  { group: "Sessions", http: "GET    /v1/sessions/:id/stream                 Stream events (SSE)" },
+  { group: "Sessions", http: "GET    /v1/sessions/:id/events/stream          Tail events (SSE; never closes)" },
+  { group: "Sessions", http: "POST   /v1/sessions/:id/messages               Chat one-shot: post turn + stream reply (SSE; closes on idle)" },
   { group: "Sessions", http: "POST   /v1/sessions/:id/archive                Archive session" },
   { group: "Sessions", http: "DELETE /v1/sessions/:id                        Delete session" },
   { group: "Sessions", http: "POST   /v1/sessions/:id/files                  Promote sandbox file {path}" },

package/package.json

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