@mnemonik/cli 7.102.0 → 7.102.1

package/dist/auth/credentials.js

@@ -6502,6 +6502,15 @@ async function withLock(path, waitMs, work) {
           throw error;
       }).then(() => rmdir(dir)).then(() => callback(), callback);
     },
+    rmdirSync: (dir) => {
+      try {
+        fs2.unlinkSync(join3(dir, "owner"));
+      } catch (error) {
+        if (!codeIs(error, "ENOENT"))
+          throw error;
+      }
+      fs2.rmdirSync(dir);
+    },
     stat: (file, callback) => {
       void (acquired ? assertOwned() : Promise.resolve()).then(() => fs2.stat(file, callback), () => callback(Object.assign(new Error("lock_lost"), { code: "ENOENT" })));
     }

package/dist/auth/device.d.ts

@@ -9,12 +9,13 @@ export interface DeviceOptions {
     clientId: string;
     deviceName: string;
     print: (line: string) => void;
+    openBrowser?: (url: string) => Promise<void>;
     fetch?: typeof fetch;
     sleep?: (milliseconds: number) => Promise<void>;
     now?: () => number;
 }
 /** Shown with every device code, byte for byte, as required by the OAuth contract. */
-export declare const DEVICE_WARNING = "Approve only a request you just started on a device you control. Compare this code with the one in that device's terminal. If you received this code or link from someone else, deny it.";
+export declare const DEVICE_WARNING = "Approve only a request on a device you control.";
 export interface DeviceResult {
     clientId: string;
     tokens: CliTokenResponse;

package/dist/auth/device.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/auth/device.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAI9D,MAAM,WAAW,aAAa;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,sFAAsF;AACtF,eAAO,MAAM,cAAc,6LACiK,CAAC;AAE7L,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,gBAAgB,CAAC;CAC1B;AAgCD,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CA6GjF"}
+{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/auth/device.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAI9D,MAAM,WAAW,aAAa;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,sFAAsF;AACtF,eAAO,MAAM,cAAc,oDAAoD,CAAC;AAEhF,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,gBAAgB,CAAC;CAC1B;AAgCD,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CA8HjF"}

package/dist/auth/device.js

@@ -3,7 +3,7 @@ import { createRequire as __createRequire } from "node:module"; const require =
 // packages/cli/src/auth/device.ts
 import { URL, URLSearchParams } from "node:url";
 import { OAuthProtocolError } from "./pkce.js";
-var DEVICE_WARNING = "Approve only a request you just started on a device you control. Compare this code with the one in that device's terminal. If you received this code or link from someone else, deny it.";
+var DEVICE_WARNING = "Approve only a request on a device you control.";
 var wait = (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds));
 function validVerificationUris(issuer, userCode, verificationUri, completeUri) {
   try {
@@ -21,84 +21,97 @@ async function runDeviceFlow(options) {
   const fetchImpl = options.fetch ?? fetch;
   const sleep = options.sleep ?? wait;
   const now = options.now ?? Date.now;
-  const started = now();
-  const response = await fetchImpl(`${issuer}/oauth/device_authorization`, {
-    method: "POST",
-    headers: { "content-type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      client_id: options.clientId,
-      scope: options.scopes.join(" "),
-      resource: options.resource,
-      ...options.scannerRoots ? { scanner_roots: options.scannerRoots } : {},
-      ...options.deviceInstallationIds?.length ? { device_installation_ids: JSON.stringify(options.deviceInstallationIds) } : {},
-      ...options.deviceInstallationId ? { device_installation_id: options.deviceInstallationId } : {},
-      device_name: options.deviceName
-    })
-  });
-  const issued = await response.json().catch(() => ({}));
-  if (!response.ok)
-    throw new OAuthProtocolError(
-      typeof issued.error === "string" ? issued.error : "device_authorization_failed"
-    );
-  if (typeof issued.device_code !== "string" || typeof issued.user_code !== "string" || !/^[BCDFGHJKLMNPQRSTVWXZ]{4}-[BCDFGHJKLMNPQRSTVWXZ]{4}$/u.test(issued.user_code) || typeof issued.verification_uri !== "string" || typeof issued.verification_uri_complete !== "string" || typeof issued.expires_in !== "number" || !Number.isSafeInteger(issued.expires_in) || issued.expires_in <= 0 || issued.expires_in > 600 || typeof issued.interval !== "number" || !Number.isSafeInteger(issued.interval) || issued.interval < 5 || !validVerificationUris(
-    issuer,
-    issued.user_code,
-    issued.verification_uri,
-    issued.verification_uri_complete
-  ))
-    throw new OAuthProtocolError("invalid_device_response");
-  options.print(`Code: ${issued.user_code}`);
-  options.print(`Verification URI: ${issued.verification_uri}`);
-  options.print(`Complete URI: ${issued.verification_uri_complete}`);
-  options.print(DEVICE_WARNING);
-  let interval = issued.interval;
-  let transportBackoff = 0;
-  const deadline = started + issued.expires_in * 1e3;
-  while (now() < deadline) {
-    await sleep((transportBackoff || interval) * 1e3);
-    if (now() >= deadline) break;
-    let poll;
-    try {
-      poll = await fetchImpl(`${issuer}/oauth/token`, {
-        method: "POST",
-        headers: { "content-type": "application/x-www-form-urlencoded" },
-        body: new URLSearchParams({
-          grant_type: "urn:ietf:params:oauth:grant-type:device_code",
-          client_id: options.clientId,
-          device_code: issued.device_code,
-          resource: options.resource
-        })
-      });
-    } catch {
-      transportBackoff = Math.min(Math.max(interval, transportBackoff || interval) * 2, 60);
-      continue;
+  for (let attempt = 0; attempt < 2; attempt++) {
+    const response = await fetchImpl(`${issuer}/oauth/device_authorization`, {
+      method: "POST",
+      headers: { "content-type": "application/x-www-form-urlencoded" },
+      body: new URLSearchParams({
+        client_id: options.clientId,
+        scope: options.scopes.join(" "),
+        resource: options.resource,
+        ...options.scannerRoots ? { scanner_roots: options.scannerRoots } : {},
+        ...options.deviceInstallationIds?.length ? { device_installation_ids: JSON.stringify(options.deviceInstallationIds) } : {},
+        ...options.deviceInstallationId ? { device_installation_id: options.deviceInstallationId } : {},
+        device_name: options.deviceName
+      })
+    });
+    const issued = await response.json().catch(() => ({}));
+    if (!response.ok)
+      throw new OAuthProtocolError(
+        typeof issued.error === "string" ? issued.error : "device_authorization_failed"
+      );
+    if (typeof issued.device_code !== "string" || typeof issued.user_code !== "string" || !/^[BCDFGHJKLMNPQRSTVWXZ]{4}-[BCDFGHJKLMNPQRSTVWXZ]{4}$/u.test(issued.user_code) || typeof issued.verification_uri !== "string" || typeof issued.verification_uri_complete !== "string" || typeof issued.expires_in !== "number" || !Number.isSafeInteger(issued.expires_in) || issued.expires_in <= 0 || issued.expires_in > 600 || typeof issued.interval !== "number" || !Number.isSafeInteger(issued.interval) || issued.interval < 5 || !validVerificationUris(
+      issuer,
+      issued.user_code,
+      issued.verification_uri,
+      issued.verification_uri_complete
+    ))
+      throw new OAuthProtocolError("invalid_device_response");
+    const completeUri = issued.verification_uri_complete;
+    options.print(completeUri);
+    options.print(DEVICE_WARNING);
+    void Promise.resolve().then(() => options.openBrowser?.(completeUri)).catch(() => void 0);
+    let interval = issued.interval;
+    let transportBackoff = 0;
+    const deadline = now() + issued.expires_in * 1e3;
+    let dead = "expired_token";
+    while (now() < deadline) {
+      await sleep((transportBackoff || interval) * 1e3);
+      if (now() >= deadline) break;
+      let poll;
+      try {
+        poll = await fetchImpl(`${issuer}/oauth/token`, {
+          method: "POST",
+          headers: { "content-type": "application/x-www-form-urlencoded" },
+          body: new URLSearchParams({
+            grant_type: "urn:ietf:params:oauth:grant-type:device_code",
+            client_id: options.clientId,
+            device_code: issued.device_code,
+            resource: options.resource
+          })
+        });
+      } catch {
+        transportBackoff = Math.min(Math.max(interval, transportBackoff || interval) * 2, 60);
+        continue;
+      }
+      transportBackoff = 0;
+      const body = await poll.json().catch(() => ({}));
+      if (poll.ok) {
+        if (typeof body.access_token !== "string" || typeof body.refresh_token !== "string" || typeof body.expires_in !== "number" || typeof body.scope !== "string")
+          throw new OAuthProtocolError("invalid_token_response");
+        return {
+          clientId: options.clientId,
+          tokens: {
+            access_token: body.access_token,
+            refresh_token: body.refresh_token,
+            token_type: "Bearer",
+            expires_in: body.expires_in,
+            scope: body.scope
+          }
+        };
+      }
+      const error = typeof body.error === "string" ? body.error : "device_poll_failed";
+      if (error === "authorization_pending") continue;
+      if (error === "slow_down") {
+        interval += 5;
+        continue;
+      }
+      if (error !== "access_denied" && error !== "expired_token")
+        throw new OAuthProtocolError(error);
+      dead = error;
+      break;
     }
-    transportBackoff = 0;
-    const body = await poll.json().catch(() => ({}));
-    if (poll.ok) {
-      if (typeof body.access_token !== "string" || typeof body.refresh_token !== "string" || typeof body.expires_in !== "number" || typeof body.scope !== "string")
-        throw new OAuthProtocolError("invalid_token_response");
-      return {
-        clientId: options.clientId,
-        tokens: {
-          access_token: body.access_token,
-          refresh_token: body.refresh_token,
-          token_type: "Bearer",
-          expires_in: body.expires_in,
-          scope: body.scope
-        }
-      };
-    }
-    const error = typeof body.error === "string" ? body.error : "device_poll_failed";
-    if (error === "authorization_pending") continue;
-    if (error === "slow_down") {
-      interval += 5;
+    const refused = dead === "access_denied";
+    if (attempt === 0) {
+      options.print(
+        refused ? "That approval request was refused. Starting a new one." : "That approval request expired. Starting a new one."
+      );
       continue;
     }
-    if (error === "access_denied")
-      throw new OAuthProtocolError(error, "denied on the other device");
-    if (error === "expired_token") throw new OAuthProtocolError(error, "expired");
-    throw new OAuthProtocolError(error);
+    options.print(
+      refused ? "The new approval request was refused." : "The new approval request expired."
+    );
+    throw new OAuthProtocolError(dead, refused ? "denied on the other device" : "expired");
   }
   throw new OAuthProtocolError("expired_token", "expired");
 }

package/dist/auth/device.js.map

@@ -1 +1 @@
-{"version":3,"file":"device.js","sourceRoot":"","sources":["../../src/auth/device.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"device.js","sourceRoot":"","sources":["../../src/auth/device.ts"],"names":[],"mappings":"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"}

package/dist/auth/index.d.ts

@@ -1,5 +1,4 @@
 import { type createCredentialAdapter, type CliOAuthCredential, type CredentialAdapterOptions } from '@mnemonik/credentials';
-import { type PkceOptions } from './pkce.js';
 export declare const CLI_SCOPES: readonly ['account:read', 'install:manage', 'components:manage', 'projects:manage', 'offline_access'];
 export interface CliAuthOptions {
     stateDir?: string;
@@ -13,7 +12,7 @@ export interface CliAuthOptions {
     deviceName?: string;
     print?: (line: string) => void;
     fetch?: typeof fetch;
-    openBrowser?: PkceOptions['openBrowser'];
+    openBrowser?: (url: string) => Promise<void>;
     sleep?: (milliseconds: number) => Promise<void>;
     now?: () => number;
     credentials?: ReturnType<typeof createCredentialAdapter>;

package/dist/auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,uBAAuB,EAE5B,KAAK,kBAAkB,EAEvB,KAAK,wBAAwB,EAE9B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAwD,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAEnG,eAAO,MAAM,UAAU,YACrB,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,CACR,CAAC;AAIX,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACzC,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC;IACzD,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;CAC9C;AAED,wBAAgB,kBAAkB,CAChC,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAET;AAkBD,wBAAgB,aAAa,CAAC,OAAO,GAAE,cAAmB;kBA2E/B,OAAO,CAAC,kBAAkB,CAAC;wBAyErB,OAAO,CAAC,MAAM,GAAG;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;2BAW/C,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC;kBAgBnC,OAAO,CAAC,IAAI,CAAC;EAiBvC;AAED,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,uBAAuB,EAE5B,KAAK,kBAAkB,EAEvB,KAAK,wBAAwB,EAE9B,MAAM,uBAAuB,CAAC;AAI/B,eAAO,MAAM,UAAU,YACrB,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,CACR,CAAC;AAIX,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC;IACzD,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;CAC9C;AAED,wBAAgB,kBAAkB,CAChC,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAMT;AAkBD,wBAAgB,aAAa,CAAC,OAAO,GAAE,cAAmB;kBAiE/B,OAAO,CAAC,kBAAkB,CAAC;wBAsErB,OAAO,CAAC,MAAM,GAAG;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;2BAW/C,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC;kBAgBnC,OAAO,CAAC,IAAI,CAAC;EAiBvC;AAED,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC"}

package/dist/auth/index.js

@@ -4842,7 +4842,7 @@ public class MnemonikCredential {
 
 // packages/cli/src/auth/index.ts
 import { runDeviceFlow } from "./device.js";
-import { BrowserUnavailableError, OAuthProtocolError, runPkce } from "./pkce.js";
+import { open, OAuthProtocolError } from "./pkce.js";
 export * from "./device.js";
 export * from "./pkce.js";
 var CLI_SCOPES = [
@@ -4854,7 +4854,7 @@ var CLI_SCOPES = [
 ];
 var CLI_VERSION = createRequire(import.meta.url)("../../package.json").version;
 function noBrowserAvailable(platform = process.platform, env = process.env) {
-  return platform === "linux" && !env.DISPLAY && !env.WAYLAND_DISPLAY;
+  return !!env.SSH_CONNECTION || !!env.SSH_TTY || platform === "linux" && !env.DISPLAY && !env.WAYLAND_DISPLAY;
 }
 var clientMetadata = (redirectUris) => ({
   client_name: "Mnemonik CLI",
@@ -4896,23 +4896,7 @@ function createCliAuth(options = {}) {
       );
     return body2.client_id;
   }
-  async function browser(clientId, registerFirst = false) {
-    return runPkce({
-      issuer,
-      resource,
-      scopes: CLI_SCOPES,
-      scannerRoots: options.scannerRoots,
-      deviceInstallationId,
-      deviceInstallationIds,
-      deviceName: options.deviceName ?? hostname(),
-      clientId: registerFirst ? (redirectUri) => register([redirectUri]) : clientId,
-      print,
-      fetch: fetchImpl,
-      openBrowser: options.openBrowser,
-      platform: options.platform
-    });
-  }
-  async function device(clientId) {
+  async function device(clientId, openBrowser) {
     return runDeviceFlow({
       issuer,
       resource,
@@ -4923,17 +4907,21 @@ function createCliAuth(options = {}) {
       clientId,
       deviceName: options.deviceName ?? hostname(),
       print,
+      openBrowser,
       fetch: fetchImpl,
       sleep: options.sleep,
       now
     });
   }
-  async function deviceWithRegistration(clientId) {
+  async function deviceWithRegistration(clientId, openBrowser) {
     try {
-      return await device(clientId);
+      return await device(clientId, openBrowser);
     } catch (error) {
       if (!(error instanceof OAuthProtocolError) || error.code !== "invalid_client") throw error;
-      return device(await register(["http://127.0.0.1/callback", "http://[::1]/callback"]));
+      return device(
+        await register(["http://127.0.0.1/callback", "http://[::1]/callback"]),
+        openBrowser
+      );
     }
   }
   async function signIn() {
@@ -4950,17 +4938,11 @@ function createCliAuth(options = {}) {
       throw error;
     });
     const clientId = saved?.clientId ?? cimdClientId;
-    const useDevice = options.noBrowser || noBrowserAvailable(options.platform, options.env);
-    let result;
-    try {
-      result = useDevice ? await deviceWithRegistration(clientId) : await browser(clientId);
-    } catch (error) {
-      if (!useDevice && error instanceof BrowserUnavailableError)
-        result = await deviceWithRegistration(clientId);
-      else if (error instanceof OAuthProtocolError && error.code === "invalid_client")
-        result = await browser(clientId, true);
-      else throw error;
-    }
+    const browserUnavailable = options.noBrowser || noBrowserAvailable(options.platform, options.env);
+    const result = await deviceWithRegistration(
+      clientId,
+      browserUnavailable ? void 0 : options.openBrowser ?? ((url) => open(url, options.platform ?? process.platform))
+    );
     const rotatedAt = now();
     const localFamilyKey = createHash("sha256").update(`${issuer}\0${result.clientId}`).digest("hex");
     await credentials.putCliOAuth(

package/dist/auth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"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"}