@vavio/cli 0.1.0 → 0.1.2

package/dist/vavio.mjs

@@ -10,7 +10,7 @@ import { Client, StreamableHTTPClientTransport } from "@modelcontextprotocol/cli
 
 // src/constants.ts
 var CLI_NAME = "@vavio/cli";
-var CLI_VERSION = "0.1.0";
+var CLI_VERSION = "0.1.2";
 var CONTRACT_VERSION = 1;
 var CONTRACT_HEADER = "Vavio-Contract";
 var CONTRACT_MIN_HEADER = "Vavio-Contract-Min";
@@ -606,10 +606,14 @@ var COMMANDS = {
     summary: "Remove this computer's sign-in and revoke it on Vavio.",
     details: ["Exit code 3 means the local sign-in is removed but Vavio could not revoke it from here: next.text says what to do."]
   },
-  whoami: { usage: "vavio whoami", summary: "Show the signed-in workspace. Same result as vavio account." },
+  status: {
+    usage: "vavio status",
+    summary: "Show your account: workspace, Hermes instances and their state, and open operations. Plain vavio does the same once signed in."
+  },
+  whoami: { usage: "vavio whoami", summary: "Show the signed-in workspace." },
   account: {
     usage: "vavio account",
-    summary: "Read the account: workspace, Hermes instances, offerings, included Hermes and open operations."
+    summary: "Read the account: workspace, Hermes instances, offerings, included Hermes and open operations. Same as vavio status."
   },
   "instances list": { usage: "vavio instances list", summary: "List the workspace's Hermes instances with their ids and access state." },
   "instance status": {
@@ -651,6 +655,8 @@ function mainHelp() {
     "",
     "Usage: vavio <command> [options]",
     "",
+    "Start: vavio login, then vavio status.",
+    "",
     "Commands:",
     ...lines,
     "",
@@ -722,21 +728,37 @@ function table(rows) {
   return rows.map((row) => row.map((cell, i) => i === row.length - 1 ? cell : cell.padEnd(widths[i])).join("  ")).join("\n");
 }
 var str = (value) => value === null || value === void 0 ? "-" : String(value);
+function priceText(price) {
+  if (!price) return null;
+  const amount = typeof price.amount === "number" ? price.amount.toFixed(2) : str(price.amount);
+  const currency = str(price.currency).toUpperCase();
+  return `${currency === "USD" ? `$${amount}` : `${amount} ${currency}`}/${str(price.interval)}`;
+}
+function orderText(o) {
+  return o.purchasable ? "available to order" : `not available to order yet${o.reason ? `: ${str(o.reason)}` : ""}`;
+}
+var indent = (text) => text.split("\n").map((line) => `  ${line}`).join("\n");
+function accountText(v) {
+  const ws = v.workspace ?? {};
+  const instances = v.instances ?? [];
+  const offerings = v.offerings ?? [];
+  const ent = v.entitlements?.hermes ?? {};
+  const lines = [`Workspace        ${ws.name ? `${str(ws.name)} (${str(ws.id)})` : str(ws.id)}`, `Role             ${str(v.role)}`];
+  if (instances.length) {
+    lines.push(`Hermes           ${instances.length === 1 ? "1 instance" : `${instances.length} instances`} (included ${str(ent.used)} of ${str(ent.granted)})`);
+    lines.push(indent(table([["ID", "ACCESS", "STATE", "ADDRESS"], ...instances.map((i) => [str(i.id), str(i.access), str(i.lifecycle_state), str(i.address)])])));
+  } else {
+    lines.push("Hermes           none yet");
+    for (const o of offerings) {
+      const price = priceText(o.price);
+      lines.push(`Hosting          ${str(o.title)}${price ? `, ${price}` : ""}: ${orderText(o)}`);
+    }
+  }
+  lines.push(`Open operations  ${str(v.open_operations)}`);
+  return lines.join("\n");
+}
 var FORMAT = {
-  account(v) {
-    const ws = v.workspace ?? {};
-    const instances = v.instances ?? [];
-    const offerings = v.offerings ?? [];
-    const ent = v.entitlements?.hermes ?? {};
-    return [
-      `Workspace  ${str(ws.name)} (${str(ws.id)})`,
-      `Role       ${str(v.role)}`,
-      `Hermes     ${instances.length} instance(s); included ${str(ent.used)} of ${str(ent.granted)}`,
-      ...instances.map((i) => `  ${str(i.id)}  ${str(i.access)}  ${str(i.address)}`),
-      `Offerings  ${offerings.map((o) => `${str(o.title)}: ${o.purchasable ? "for sale" : "not for sale yet"}`).join("; ") || "none"}`,
-      `Open operations  ${str(v.open_operations)}`
-    ].join("\n");
-  },
+  account: accountText,
   whoami(v) {
     const ws = v.workspace ?? {};
     return `Signed in as the ${str(v.role)} of workspace ${str(ws.name)} (${str(ws.id)}).`;
@@ -768,7 +790,7 @@ Older: vavio operations list --before ${str(v.next_before)}` : "";
   offerings(v) {
     const rows = (v.offerings ?? []).map((o) => {
       const price = o.price;
-      return [str(o.id), str(o.title), price ? `${str(price.amount)} ${str(price.currency)}/${str(price.interval)}` : "no price set", o.purchasable ? "for sale" : `not for sale${o.reason ? `: ${str(o.reason)}` : ""}`];
+      return [str(o.id), str(o.title), priceText(price) ?? "no price set", orderText(o)];
     });
     return rows.length ? table([["ID", "TITLE", "PRICE", "STATUS"], ...rows]) : "No offerings.";
   },
@@ -817,6 +839,18 @@ async function connect(ctx) {
   if (!await provider.signIn()) throw notSignedIn();
   return openSession({ url: ctx.url, fetchFn: ctx.fetch.fetchFn, seen: ctx.fetch.seen, era, auth: provider });
 }
+async function isSignedIn(ctx) {
+  if (accessTokenOf(ctx)) return true;
+  const provider = new CliOAuthProvider({
+    serverUrl: ctx.key,
+    config: ctx.config,
+    store: await storeFor(ctx),
+    redactor: ctx.redactor,
+    interactive: false,
+    redirectUri: loopbackRedirect(registeredPort(ctx.config.server(ctx.key).client))
+  });
+  return await provider.signIn() !== null;
+}
 async function withSession(ctx, work) {
   const session = await connect(ctx);
   try {
@@ -934,7 +968,9 @@ async function cmdLogin(ctx) {
   if (ctx.out.json) ctx.out.value(value);
   else {
     const where = store.kind === "file" ? "a private file" : store.kind === "keychain" ? "the macOS keychain" : "the Secret Service keyring";
-    ctx.out.out(`Signed in to Vavio${workspace ? `: workspace ${str(workspace.name)} (${str(workspace.id)})` : ""}. Saved in ${where}.`);
+    const raw = typeof workspace?.name === "string" ? workspace.name.replace(/\s+/g, " ").trim() : "";
+    const name = raw && !/^workspace [0-9a-f]{8}$/i.test(raw) ? raw.slice(0, 80) : null;
+    ctx.out.out(`Signed in to Vavio${name ? ` (workspace ${name})` : ""}. Saved in ${where}.`);
   }
   return EXIT.ok;
 }
@@ -1084,6 +1120,9 @@ function route(positionals) {
     case "account":
       exact(1);
       return { key: "account", run: (ctx) => callAndReport(ctx, "account_overview", {}, FORMAT.account) };
+    case "status":
+      exact(1);
+      return { key: "status", run: (ctx) => callAndReport(ctx, "account_overview", {}, FORMAT.account) };
     case "offerings":
       exact(1);
       return { key: "offerings", run: (ctx) => callAndReport(ctx, "list_offerings", {}, FORMAT.offerings) };
@@ -1150,13 +1189,15 @@ async function runCli(argv, io = {}) {
       else out().out(`${CLI_NAME} ${CLI_VERSION} (contract ${CONTRACT_VERSION})`);
       return EXIT.ok;
     }
-    if (flags.help || positionals.length === 0 || positionals[0] === "help") {
+    const showHelp = () => {
       const text = helpFor(positionals);
       if (json) out().value({ outcome: "ok", help: text });
       else out().out(text);
       return EXIT.ok;
-    }
-    const target = route(positionals);
+    };
+    if (flags.help || positionals[0] === "help") return showHelp();
+    const bare = positionals.length === 0;
+    const target = route(bare ? ["status"] : positionals);
     const allowed = /* @__PURE__ */ new Set([...GLOBAL_FLAGS, ...COMMANDS[target.key].flags ?? []]);
     for (const name of Object.keys(flags)) {
       if (!allowed.has(name)) throw usage(`--${name} does not apply to vavio ${target.key}. See vavio ${target.key.split(" ")[0]} --help.`);
@@ -1178,6 +1219,7 @@ async function runCli(argv, io = {}) {
       platform,
       fetch: contractFetch(io.fetch ?? globalThis.fetch, url)
     };
+    if (bare && !await isSignedIn(ctx)) return showHelp();
     return await target.run(ctx);
   } catch (error) {
     const failure = error instanceof CliError ? error : new CliError("failed", `Unexpected error: ${(error instanceof Error ? error.message : String(error)).slice(0, 200)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vavio/cli",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "vavio: operate your Vavio account and Hermes instances from a terminal or your own AI assistant, over Vavio's MCP server.",
   "license": "UNLICENSED",
   "homepage": "https://vavio.ai",