@openma/cli 0.1.0-beta.4 → 0.2.0-beta.1

package/dist/index.js

@@ -113,9 +113,22 @@ function loadConfigOptional() {
   }
   return { baseUrl: envBase || "https://openma.dev", apiKey: "", json: false, source: "missing" };
 }
+async function fetchWithRetry(url, init, maxRetries = 3) {
+  let attempt = 0;
+  while (true) {
+    const res = await fetch(url, init);
+    if (res.ok || res.status !== 503) return res;
+    const retryAfter = res.headers.get("retry-after");
+    if (!retryAfter || attempt >= maxRetries) return res;
+    const seconds = Math.min(Math.max(parseInt(retryAfter, 10) || 0, 1), 30);
+    await res.body?.cancel().catch(() => void 0);
+    await new Promise((r) => setTimeout(r, seconds * 1e3));
+    attempt += 1;
+  }
+}
 async function apiFetch(config, path, init) {
   const url = `${config.baseUrl}${path}`;
-  const res = await fetch(url, {
+  const res = await fetchWithRetry(url, {
     ...init,
     headers: {
       "x-api-key": config.apiKey,
@@ -134,6 +147,120 @@ async function apiFetch(config, path, init) {
   }
   return res.json();
 }
+async function rawStream(config, path, init) {
+  const res = await fetchWithRetry(`${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;
@@ -185,39 +312,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);
@@ -232,37 +386,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");
   const existing = readCredentials();
-  const role = me.tenants.find((t) => t.id === me.tenant.id)?.role ?? "owner";
+  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 },
-    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()
-      }
-    }
+    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()}`);
-  const knownCount = Object.keys(updated.tenants).length;
+  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 > 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>`);
+  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) {
@@ -503,7 +664,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(" ");
@@ -511,6 +672,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",
@@ -1576,7 +1779,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.4",
+  "version": "0.2.0-beta.1",
   "description": "CLI for the openma managed agents platform",
   "type": "module",
   "bin": {