@dotenvx/dotenvx-ops 0.37.4 → 0.37.5

package/CHANGELOG.md

@@ -2,7 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-[Unreleased](https://github.com/dotenvx/dotenvx-ops/compare/v0.37.4...main)
+[Unreleased](https://github.com/dotenvx/dotenvx-ops/compare/v0.37.5...main)
+
+## [0.37.5](https://github.com/dotenvx/dotenvx-ops/compare/v0.37.4...v0.37.5) (2026-04-08)
+
+### Changed
+
+* Better `login` and `logout` experience ([#33](https://github.com/dotenvx/dotenvx-ops/pull/33))
 
 ## [0.37.4](https://github.com/dotenvx/dotenvx-ops/compare/v0.37.3...v0.37.4) (2026-03-26)
 

package/package.json

@@ -1,7 +1,7 @@
 {
-  "version": "0.37.4",
+  "version": "0.37.5",
   "name": "@dotenvx/dotenvx-ops",
-  "description": "Secrets for developers–from the creator of `dotenv` and `dotenvx`",
+  "description": "Secrets for agents–from the creator of `dotenv` and `dotenvx`",
   "author": "@motdotla",
   "keywords": [
     "dotenv",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@clack/core": "^0.4.2",
-    "@dotenvx/dotenvx": "^1.54.1",
+    "@dotenvx/dotenvx": "^1.60.2",
     "@inquirer/prompts": "^7.10.1",
     "arch": "^2.1.1",
     "commander": "^11.1.0",
@@ -53,7 +53,8 @@
     "open": "^8.4.2",
     "playwright": "^1.57.0",
     "systeminformation": "^5.22.11",
-    "undici": "^7.11.0"
+    "undici": "^7.11.0",
+    "yocto-spinner": "^1.1.0"
   },
   "devDependencies": {
     "@yao-pkg/pkg": "^5.14.2",

package/src/cli/actions/backup.js

@@ -2,6 +2,7 @@ const fs = require('fs')
 const open = require('open')
 
 const { logger } = require('@dotenvx/dotenvx')
+const Session = require('./../../db/session')
 
 const { createSpinner } = require('./../../lib/helpers/createSpinner')
 const clipboardy = require('./../../lib/helpers/clipboardy')
@@ -20,7 +21,8 @@ async function backup () {
   // debug opts
   const options = this.opts()
 
-  const hostname = options.hostname
+  const sesh = new Session()
+  const hostname = options.hostname || sesh.hostname()
 
   try {
     logger.debug(`options: ${JSON.stringify(options)}`)

package/src/cli/actions/get.js

@@ -1,4 +1,5 @@
 const { logger } = require('@dotenvx/dotenvx')
+const Session = require('./../../db/session')
 
 const main = require('./../../lib/main')
 
@@ -7,7 +8,8 @@ async function get (uri) {
   const options = this.opts()
   logger.debug(`options: ${JSON.stringify(options)}`)
 
-  const hostname = options.hostname
+  const sesh = new Session()
+  const hostname = options.hostname || sesh.hostname()
   const token = options.token
 
   try {

package/src/cli/actions/keypair.js

@@ -1,4 +1,5 @@
 const { logger } = require('@dotenvx/dotenvx')
+const Session = require('./../../db/session')
 
 const main = require('./../../lib/main')
 
@@ -7,7 +8,8 @@ async function keypair (publicKey) {
   const options = this.opts()
   logger.debug(`options: ${JSON.stringify(options)}`)
 
-  const hostname = options.hostname
+  const sesh = new Session()
+  const hostname = options.hostname || sesh.hostname()
   const token = options.token
   try {
     const kp = await main.keypair(publicKey, { hostname, token })

package/src/cli/actions/login.js

@@ -1,22 +1,64 @@
 const open = require('open')
 const { logger } = require('@dotenvx/dotenvx')
+const Session = require('./../../db/session')
 
 const Login = require('./../../lib/services/login')
 const LoginPoll = require('./../../lib/services/loginPoll')
 
 const clipboardy = require('./../../lib/helpers/clipboardy')
-const { createSpinner } = require('./../../lib/helpers/createSpinner')
-const confirm = require('./../../lib/helpers/confirm')
-const truncate = require('./../../lib/helpers/truncate')
+const createSpinner2 = require('../../lib/helpers/createSpinner2')
 const formatCode = require('./../../lib/helpers/formatCode')
 
-const spinner = createSpinner('waiting on browser authorization')
+const FRAMES = ['◐', '◓', '◑', '◒']
+
+function listenForOpenKey (onOpen) {
+  const stdin = process.stdin
+  if (!stdin.isTTY) return () => {}
+
+  const canSetRawMode = typeof stdin.setRawMode === 'function'
+  const wasRawMode = Boolean(stdin.isRaw)
+
+  const cleanup = () => {
+    stdin.off('data', onData)
+    if (canSetRawMode) stdin.setRawMode(wasRawMode)
+    stdin.pause()
+  }
+
+  const onData = (chunk) => {
+    const key = String(chunk)
+    const lower = key.toLowerCase()
+
+    if (key === '\u0003') { // Ctrl+C
+      cleanup()
+      process.kill(process.pid, 'SIGINT')
+      return
+    }
+
+    if (key === '\r' || key === '\n' || lower === 'y') {
+      cleanup()
+      Promise.resolve(onOpen()).catch(() => {})
+      return
+    }
+
+    if (lower === 'n') cleanup()
+  }
+
+  if (canSetRawMode) stdin.setRawMode(true)
+  stdin.resume()
+  stdin.on('data', onData)
+
+  return cleanup
+}
 
 async function login () {
   const options = this.opts()
+  const spinner = await createSpinner2({ ...options, text: 'logging in', frames: FRAMES })
+
   logger.debug(`options: ${JSON.stringify(options)}`)
 
-  const hostname = options.hostname
+  const sesh = new Session()
+  const hostname = options.hostname || sesh.hostname()
+  let cleanupOpenKeyListener = () => {}
 
   try {
     const {
@@ -25,36 +67,32 @@ async function login () {
       verificationUri,
       verificationUriComplete,
       interval
-    } = await new Login(options.hostname).run()
+    } = await new Login(hostname).run()
 
-    try { clipboardy.writeSync(userCode) } catch (_e) {}
+    try { await clipboardy.write(userCode) } catch (_e) {}
+
+    const promptMessage = `◌ press Enter to open [${verificationUri}] and enter code [${formatCode(userCode)}]...`
 
     logger.debug(`POST ${hostname} with deviceCode ${deviceCode} at interval ${interval}`)
-    logger.info(`press Enter to open [${verificationUri}] and enter code [${formatCode(userCode)}]...`)
+    logger.info(promptMessage)
 
     // begin polling
     const pollPromise = new LoginPoll(hostname, deviceCode, interval).run()
-    spinner.start()
-
-    // optionally allow user to open browser
-    confirm({ message: `press Enter to open [${verificationUri}] and enter code [${formatCode(userCode)}]...` })
-      .then(answer => answer && open(verificationUriComplete))
-      .catch(() => {}) // ignore
-
+    cleanupOpenKeyListener = listenForOpenKey(() => open(verificationUriComplete))
     const data = await pollPromise
-    spinner.succeed(`logged in [${data.username}] to this device and activated token [${truncate(data.access_token, 11)}]`)
-    // logger.help('⮕ next run [dotenvx-ops backup]')
+
+    cleanupOpenKeyListener()
+    if (spinner) spinner.stop()
+    logger.success(`◉ logged in (${data.username})`)
     process.exit(0)
   } catch (error) {
-    spinner.stop()
+    cleanupOpenKeyListener()
+    if (spinner) spinner.stop()
     if (error.message) {
       logger.error(error.message)
     } else {
       logger.error(error)
     }
-    if (error.help) {
-      logger.help(error.help)
-    }
     if (error.stack) {
       logger.debug(error.stack)
     }

package/src/cli/actions/logout.js

@@ -1,27 +1,24 @@
 const { logger } = require('@dotenvx/dotenvx')
+const Session = require('./../../db/session')
 
-const { createSpinner } = require('./../../lib/helpers/createSpinner')
-const truncate = require('./../../lib/helpers/truncate')
+const createSpinner2 = require('../../lib/helpers/createSpinner2')
 const Logout = require('./../../lib/services/logout')
 
-const spinner = createSpinner('waiting on browser authorization')
+const FRAMES = ['◐', '◓', '◑', '◒']
 
 async function logout () {
   const options = this.opts()
+  const spinner = await createSpinner2({ ...options, text: 'logging out', frames: FRAMES })
+
   logger.debug(`options: ${JSON.stringify(options)}`)
 
-  const hostname = options.hostname
+  const sesh = new Session()
+  const hostname = options.hostname || sesh.hostname()
 
   try {
-    spinner.start()
-
-    const {
-      username,
-      accessToken
-    } = await new Logout(hostname).run()
-
-    spinner.succeed(`logged out [${username}] from this device and revoked token [${truncate(accessToken, 11)}]`)
-    // logger.help(`⮕ next visit [${settingsDevicesUrl}] to view your devices`)
+    const data = await new Logout(hostname).run()
+    spinner.stop()
+    logger.success(`◌ logged out (${data.username})`)
   } catch (error) {
     spinner.stop()
     if (error.message) {
@@ -29,9 +26,6 @@ async function logout () {
     } else {
       logger.error(error)
     }
-    if (error.help) {
-      logger.help(error.help)
-    }
     if (error.stack) {
       logger.debug(error.stack)
     }

package/src/cli/actions/observe.js

@@ -1,4 +1,5 @@
 const { logger } = require('@dotenvx/dotenvx')
+const Session = require('./../../db/session')
 
 const main = require('./../../lib/main')
 
@@ -9,7 +10,8 @@ async function observe (base64) {
   const options = this.opts()
   logger.debug(`options: ${JSON.stringify(options)}`)
 
-  const hostname = options.hostname
+  const sesh = new Session()
+  const hostname = options.hostname || sesh.hostname()
   const token = options.token
   const dotenvxProjectId = options.dotenvxProjectId
 

package/src/cli/actions/open.js

@@ -1,13 +1,15 @@
 const _open = require('open')
 
 const { logger } = require('@dotenvx/dotenvx')
+const Session = require('./../../db/session')
 
 const dotenvxProjectId = require('./../../lib/helpers/dotenvxProjectId')
 
 async function open () {
   // debug opts
   const options = this.opts()
-  const hostname = options.hostname
+  const sesh = new Session()
+  const hostname = options.hostname || sesh.hostname()
 
   try {
     const uid = dotenvxProjectId(this.cwd)

package/src/cli/actions/rotate/github/connect.js

@@ -13,7 +13,7 @@ async function connect () {
 
   try {
     const sesh = new Session()
-    const hostname = options.hostname
+    const hostname = options.hostname || sesh.hostname()
     const token = options.token || sesh.token()
     let org = options.org
     let username = options.username

package/src/cli/actions/rotate/npm/connect.js

@@ -13,7 +13,7 @@ async function connect () {
 
   try {
     const sesh = new Session()
-    const hostname = options.hostname
+    const hostname = options.hostname || sesh.hostname()
     const token = options.token || sesh.token()
     let org = options.org
     let username = options.username

package/src/cli/actions/rotate/openai/connect.js

@@ -13,7 +13,7 @@ async function connect () {
 
   try {
     const sesh = new Session()
-    const hostname = options.hostname
+    const hostname = options.hostname || sesh.hostname()
     const token = options.token || sesh.token()
     let org = options.org
     let username = options.username

package/src/cli/actions/rotate.js

@@ -13,7 +13,7 @@ async function rotate (uri) {
     spinner.start()
 
     const sesh = new Session()
-    const hostname = options.hostname
+    const hostname = options.hostname || sesh.hostname()
     const token = options.token || sesh.token()
 
     const { url, rotUid } = await new Rotate(hostname, token, uri).run()

package/src/cli/actions/set.js

@@ -1,4 +1,5 @@
 const { logger } = require('@dotenvx/dotenvx')
+const Session = require('./../../db/session')
 
 const main = require('./../../lib/main')
 
@@ -7,7 +8,8 @@ async function set (uri, value) {
   const options = this.opts()
   logger.debug(`options: ${JSON.stringify(options)}`)
 
-  const hostname = options.hostname
+  const sesh = new Session()
+  const hostname = options.hostname || sesh.hostname()
   const token = options.token
 
   try {

package/src/cli/actions/sync.js

@@ -1,6 +1,7 @@
 const fs = require('fs')
 
 const { logger } = require('@dotenvx/dotenvx')
+const Session = require('./../../db/session')
 
 const { createSpinner } = require('./../../lib/helpers/createSpinner')
 const pluralize = require('./../../lib/helpers/pluralize')
@@ -14,6 +15,8 @@ const spinner = createSpinner('syncing')
 async function sync () {
   // debug opts
   const options = this.opts()
+  const sesh = new Session()
+  const hostname = options.hostname || sesh.hostname()
 
   try {
     logger.debug(`options: ${JSON.stringify(options)}`)
@@ -23,7 +26,7 @@ async function sync () {
     const {
       projectUsernameName,
       files
-    } = await new Sync(options.hostname, options.force).run()
+    } = await new Sync(hostname, options.force).run()
     logger.debug(`files: ${JSON.stringify(files)}`)
 
     // write output files
@@ -66,7 +69,7 @@ async function sync () {
         spinner.start()
 
         const synchronizationId = error.meta.synchronization_id
-        const { conflictedFiles } = await new SyncConflict(options.hostname, synchronizationId).run()
+        const { conflictedFiles } = await new SyncConflict(hostname, synchronizationId).run()
 
         spinner.stop()
 

package/src/cli/commands/gateway.js

@@ -3,7 +3,7 @@ const { Command } = require('commander')
 const gateway = new Command('gateway')
 
 gateway
-  .description('[INTERNAL] 🛡️  gateway')
+  .description('[INTERNAL] ⛩ gateway')
   .allowUnknownOption()
 
 // dotenvx-ops gateway start

package/src/cli/commands/settings.js

@@ -3,7 +3,7 @@ const { Command } = require('commander')
 const settings = new Command('settings')
 
 settings
-  .description('⚙️  settings')
+  .description('settings')
   .allowUnknownOption()
 
 // dotenvx-ops settings username

package/src/cli/dotenvx-ops.js

@@ -7,8 +7,6 @@ const program = new Command()
 const { setLogLevel } = require('@dotenvx/dotenvx')
 
 const packageJson = require('./../lib/helpers/packageJson')
-const Session = require('./../db/session')
-const sesh = new Session()
 
 // global log levels
 program
@@ -34,9 +32,9 @@ program
 const backupAction = require('./actions/backup')
 program
   .command('backup')
-  .description('back up .env.keys')
+  .description('[INTERNAL] back up .env.keys')
   .option('--org <organizationSlug>')
-  .option('-h, --hostname <url>', 'set hostname', sesh.hostname())
+  .option('-h, --hostname <url>', 'set hostname')
   .action(backupAction)
 
 // dotenvx-ops open
@@ -44,7 +42,7 @@ const openAction = require('./actions/open')
 program
   .command('open')
   .description('[INTERNAL] open project')
-  .option('-h, --hostname <url>', 'set hostname', sesh.hostname())
+  .option('-h, --hostname <url>', 'set hostname')
   .action(openAction)
 
 // dotenvx-ops observe base64String
@@ -54,7 +52,7 @@ program.command('observe')
   .description('[INTERNAL] observe')
   .allowUnknownOption()
   .argument('BASE64', 'BASE64')
-  .option('--hostname <url>', 'set hostname', sesh.hostname())
+  .option('--hostname <url>', 'set hostname')
   .option('--token <token>', 'set token')
   .option('--dotenvxProjectId <identifier>', 'set DOTENVX_PROJECT_ID')
   .action(function (...args) {
@@ -65,8 +63,8 @@ program.command('observe')
 const syncAction = require('./actions/sync')
 program
   .command('sync')
-  .description('sync .env*')
-  .option('-h, --hostname <url>', 'set hostname', sesh.hostname())
+  .description('[INTERNAL] sync .env*')
+  .option('-h, --hostname <url>', 'set hostname')
   .option('--force', 'force changes')
   .action(syncAction)
 
@@ -76,7 +74,7 @@ program
   .command('get')
   .description('[INTERNAL] fetch secret')
   .argument('URI', 'URI')
-  .option('--hostname <url>', 'set hostname', sesh.hostname())
+  .option('--hostname <url>', 'set hostname')
   .option('--token <token>', 'set token')
   .action(getAction)
 
@@ -87,7 +85,7 @@ program
   .description('[INTERNAL] set secret')
   .argument('URI', 'URI')
   .argument('value', 'value')
-  .option('--hostname <url>', 'set hostname', sesh.hostname())
+  .option('--hostname <url>', 'set hostname')
   .option('--token <token>', 'set token')
   .action(setAction)
 
@@ -99,7 +97,7 @@ const loginAction = require('./actions/login')
 program
   .command('login')
   .description('log in')
-  .option('--hostname <url>', 'set hostname', sesh.hostname())
+  .option('--hostname <url>', 'set hostname')
   .action(loginAction)
 
 // dotenvx-ops logout
@@ -107,7 +105,7 @@ const logoutAction = require('./actions/logout')
 program
   .command('logout')
   .description('log out')
-  .option('--hostname <url>', 'set hostname', sesh.hostname())
+  .option('--hostname <url>', 'set hostname')
   .action(logoutAction)
 
 // dotenvx-ops status
@@ -121,9 +119,9 @@ program
 const keypairAction = require('./actions/keypair')
 program
   .command('keypair')
-  .description('[INTERNAL] generate keypair')
+  .description('generate keypair')
   .argument('[publicKey]', 'existing public key')
-  .option('-h, --hostname <url>', 'set hostname', sesh.hostname())
+  .option('-h, --hostname <url>', 'set hostname')
   .option('--token <token>', 'set token')
   .option('--pp, --pretty-print', 'pretty print output')
   .action(keypairAction)

package/src/lib/api/postLogout.js

@@ -1,5 +1,6 @@
 const { http } = require('../../lib/helpers/http')
 const buildApiError = require('../../lib/helpers/buildApiError')
+const normalizeToken = require('../../lib/helpers/normalizeToken')
 
 class PostLogout {
   constructor (hostname, token) {
@@ -8,7 +9,7 @@ class PostLogout {
   }
 
   async run () {
-    const token = this.token
+    const token = normalizeToken(this.token)
     const url = `${this.hostname}/api/logout`
 
     const resp = await http(url, {

package/src/lib/helpers/createSpinner2.js

@@ -0,0 +1,24 @@
+const FRAMES = ['◇', '⬖', '◆', '⬗']
+const FRAME_INTERVAL_MS = 80
+
+async function createSpinner2 (options = {}) {
+  const stream = process.stderr
+  const hasCursorControls = typeof stream.cursorTo === 'function' && typeof stream.clearLine === 'function'
+  const enabled = Boolean(stream.isTTY && hasCursorControls && !options.quiet && !options.verbose && !options.debug)
+  if (!enabled) return null
+
+  const text = options.text || 'thinking'
+  const frames = options.frames || FRAMES
+
+  const { default: yoctoSpinner } = await import('yocto-spinner')
+  return yoctoSpinner({
+    text,
+    spinner: {
+      frames,
+      interval: FRAME_INTERVAL_MS
+    },
+    stream
+  }).start()
+}
+
+module.exports = createSpinner2

package/src/lib/helpers/normalizeToken.js

@@ -0,0 +1,5 @@
+function normalizeToken (token) {
+  return token == null ? '' : token
+}
+
+module.exports = normalizeToken

package/src/lib/services/login.js

@@ -1,38 +1,26 @@
 const Session = require('./../../db/session')
 
-const dotenvxProjectId = require('./../../lib/helpers/dotenvxProjectId')
-
 // api calls
 const PostOauthDeviceCode = require('./../../lib/api/postOauthDeviceCode')
 
 class Login {
   constructor (hostname) {
     this.hostname = hostname
-    this.cwd = process.cwd()
   }
 
   async run () {
-    const hostname = this.hostname
-    const cwd = this.cwd
-
     const sesh = new Session()
     const devicePublicKey = sesh.devicePublicKey()
     const systemInformation = await sesh.systemInformation()
-    const _dotenvxProjectId = dotenvxProjectId(cwd, false)
-    const data = await new PostOauthDeviceCode(hostname, devicePublicKey, systemInformation, _dotenvxProjectId).run()
 
-    const deviceCode = data.device_code
-    const userCode = data.user_code
-    const verificationUri = data.verification_uri
-    const verificationUriComplete = data.verification_uri_complete
-    const interval = data.interval
+    const data = await new PostOauthDeviceCode(this.hostname, devicePublicKey, systemInformation).run()
 
     return {
-      deviceCode,
-      userCode,
-      verificationUri,
-      verificationUriComplete,
-      interval
+      deviceCode: data.device_code,
+      userCode: data.user_code,
+      verificationUri: data.verification_uri,
+      verificationUriComplete: data.verification_uri_complete,
+      interval: data.interval
     }
   }
 }