@withone/cli 2.1.0 → 2.2.0

package/dist/index.js

@@ -1476,6 +1476,7 @@ var PORT_RANGE_START = 49152;
 var PORT_RANGE_END = 65535;
 var MAX_PORT_ATTEMPTS = 5;
 var MAX_KEY_NAME_LENGTH = 120;
+var MAX_GRANT_LENGTH = 4e3;
 var MAX_ERROR_LENGTH = 200;
 var CHECK_MARK = `<div style="width:48px;height:48px;border-radius:50%;background:rgba(34,197,94,0.1);display:flex;align-items:center;justify-content:center;margin:0 auto 16px">
 <svg width="24" height="24" fill="none" stroke="#22c55e" stroke-width="2" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="M5 13l4 4L19 7"/></svg>
@@ -1539,9 +1540,10 @@ function startCallbackServer(expectedState) {
             return;
           }
           const keyName = cleanParam(url.searchParams.get("name"), MAX_KEY_NAME_LENGTH);
+          const grant = cleanParam(url.searchParams.get("grant"), MAX_GRANT_LENGTH);
           res.writeHead(200, { "Content-Type": "text/html" });
           res.end(SUCCESS_HTML);
-          resolveResult({ kind: "key", apiKey, keyName });
+          resolveResult({ kind: "key", apiKey, keyName, grant });
           return;
         }
         const error2 = cleanParam(url.searchParams.get("error"), MAX_ERROR_LENGTH);
@@ -1593,6 +1595,9 @@ function noteWidth() {
   const usable = (typeof columns === "number" && columns > 0 ? columns : 80) - 8;
   return Math.max(usable, 40);
 }
+function grantNoteLines(grant, label) {
+  return grant ? wrapForNote(`${label} ${grant}`).split("\n") : [];
+}
 async function browserLogin(opts) {
   const state = crypto.randomUUID();
   const spin = createSpinner();
@@ -1650,7 +1655,7 @@ ${describeInstallContext(context)}`
     const apiBase = getApiBase();
     const api = new OneApi(outcome.apiKey, apiBase);
     const whoami = await api.whoami();
-    return { apiKey: outcome.apiKey, whoami, keyName: outcome.keyName };
+    return { apiKey: outcome.apiKey, whoami, keyName: outcome.keyName, grant: outcome.grant };
   } catch (err) {
     spin.stop("Authentication failed.");
     if (err instanceof Error && err.message === "timeout") {
@@ -1709,7 +1714,7 @@ async function loginCommand() {
   }
   const result = await browserLogin({ scope: targetScope });
   if (!result) return;
-  const { apiKey, whoami, keyName } = result;
+  const { apiKey, whoami, keyName, grant } = result;
   saveCredentials(apiKey, targetScope, { keyName, whoami });
   const pc16 = (await import("picocolors")).default;
   const env = getEnvFromApiKey(apiKey);
@@ -1724,6 +1729,7 @@ async function loginCommand() {
     `${whoami.user.name} ${pc16.dim(`(${whoami.user.email})`)}`
   ];
   if (keyName) infoLines.push(`${pc16.dim("Key:")} ${keyName}`);
+  infoLines.push(...grantNoteLines(grant, pc16.dim("Access:")));
   if (whoami.organization) infoLines.push(`${pc16.dim("Org:")} ${whoami.organization.name}`);
   if (whoami.project) infoLines.push(`${pc16.dim("Project:")} ${whoami.project.name}`);
   infoLines.push("");
@@ -1780,6 +1786,7 @@ async function nonInteractiveInit(options) {
   const scope = options.global ? "global" : options.project ? "project" : "global";
   let apiKey;
   let keyName;
+  let grant;
   let whoami;
   if (auth === "browser") {
     const result = await browserLogin({ scope });
@@ -1788,6 +1795,7 @@ async function nonInteractiveInit(options) {
     }
     apiKey = result.apiKey;
     keyName = result.keyName;
+    grant = result.grant;
     whoami = result.whoami;
   } else {
     const key = options.apiKey?.trim();
@@ -1834,6 +1842,7 @@ async function nonInteractiveInit(options) {
         env: getEnvFromApiKey(apiKey)
       },
       keyName,
+      grant,
       skillInstalled: installed,
       skillFailed: failed
     });
@@ -1851,6 +1860,7 @@ async function nonInteractiveInit(options) {
   console.log(`  ${pc4.dim("Account:")} ${scopeDisplay} ${pc4.dim("\xB7")} ${envLabel}`);
   console.log(`  ${pc4.dim("User:")}    ${whoami.user.name} ${pc4.dim(`(${whoami.user.email})`)}`);
   if (keyName) console.log(`  ${pc4.dim("Key:")}     ${keyName}`);
+  if (grant) console.log(`  ${pc4.dim("Access:")}  ${grant}`);
   console.log(`  ${pc4.dim("Config:")}  ${tildify(configPath)}`);
   if (installed.length > 0) {
     console.log(`  ${pc4.dim("Skill:")}   ${pc4.green("installed")} ${pc4.dim("\xB7 " + installed.join(", "))}`);
@@ -2046,6 +2056,7 @@ async function handleUpdateKey(statuses, scope) {
   }
   let newKey;
   let keyName;
+  let grant;
   let whoamiResult;
   if (authMethod === "browser") {
     const result = await browserLogin({ scope });
@@ -2055,6 +2066,7 @@ async function handleUpdateKey(statuses, scope) {
     }
     newKey = result.apiKey;
     keyName = result.keyName;
+    grant = result.grant;
     whoamiResult = result.whoami;
   } else {
     p3.note(`Get your API key at:
@@ -2108,7 +2120,8 @@ ${pc4.cyan(getApiKeyUrl())}`, `API Key ${scopeLabel(scope)}`);
     [
       `${scopeDisplay} ${pc4.dim("\xB7")} ${envLabel}`,
       `${whoamiResult.user.name} ${pc4.dim(`(${whoamiResult.user.email})`)}`,
-      ...keyName ? [`${pc4.dim("Key:")} ${keyName}`] : []
+      ...keyName ? [`${pc4.dim("Key:")} ${keyName}`] : [],
+      ...grantNoteLines(grant, pc4.dim("Access:"))
     ].join("\n"),
     "Account"
   );
@@ -2370,7 +2383,8 @@ async function freshSetup(scope, options) {
       [
         `${scopeDisplay} ${pc4.dim("\xB7")} ${envLabel}`,
         `${result.whoami.user.name} ${pc4.dim(`(${result.whoami.user.email})`)}`,
-        ...result.keyName ? [`${pc4.dim("Key:")} ${result.keyName}`] : []
+        ...result.keyName ? [`${pc4.dim("Key:")} ${result.keyName}`] : [],
+        ...grantNoteLines(result.grant, pc4.dim("Access:"))
       ].join("\n"),
       "Account"
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@withone/cli",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "CLI for managing One",
   "type": "module",
   "files": [