clauddy 1.21.0 → 1.21.2

package/auth.js

@@ -35,12 +35,25 @@ function setDataDir(dir) {
   tokens = null
   profile = null
   pending = null
+  unreadable = false
 }
 
+// Set when the file itself could not be read for a reason other than "it is not
+// there" — a disk still waking up, say. That must not read as a logout, or the
+// widget asks for a login it doesn't need and every account looks gone. A file
+// we did read but cannot parse is a different matter: that one really is dead.
+let unreadable = false
 function load() {
   if (tokens) return tokens
+  let raw = null
   try {
-    tokens = JSON.parse(fs.readFileSync(tokenPath, 'utf8'))
+    raw = fs.readFileSync(tokenPath, 'utf8')
+    unreadable = false
+  } catch (e) {
+    unreadable = e?.code !== 'ENOENT'
+  }
+  try {
+    tokens = raw == null ? null : JSON.parse(raw)
   } catch {
     tokens = null
   }
@@ -56,12 +69,15 @@ function save(t) {
 function clear() {
   tokens = null
   profile = null
+  unreadable = false
   try {
     fs.unlinkSync(tokenPath)
   } catch {}
 }
 function isConnected() {
-  return !!load()
+  // a token we merely failed to read still counts: the account is connected,
+  // we just couldn't see it this instant
+  return !!load() || unreadable
 }
 
 // Step 1: build the authorize URL (opens in the browser)
@@ -152,7 +168,13 @@ async function refresh() {
 
 async function validToken() {
   const t = load()
-  if (!t) throw Object.assign(new Error('not connected'), { status: 401 })
+  // status 0 is "try again later", not "log in again": only a token that is
+  // genuinely absent should send the user back through the browser
+  if (!t) {
+    throw Object.assign(new Error(unreadable ? 'token unreadable' : 'not connected'), {
+      status: unreadable ? 0 : 401,
+    })
+  }
   if (!t.expires_at || t.expires_at - Date.now() < 60000) await refresh()
   return load().access_token
 }

package/main.js

@@ -8,6 +8,7 @@ const {
   Tray,
   Menu,
   nativeImage,
+  powerMonitor,
 } = require('electron')
 const path = require('node:path')
 const fs = require('node:fs')
@@ -336,6 +337,7 @@ function createWindow() {
   for (const a of accounts.list()) pruneEmpty(a.id)
   accounts.pruneOrphans() // folders those slots left behind
   applyAccount(accounts.active())
+  powerMonitor?.on?.('resume', onResume)
   const { workAreaSize } = screen.getPrimaryDisplay()
   const H = 480
 
@@ -648,6 +650,7 @@ function watchDebug() {
 // ---- real usage via OAuth (authoritative %), polled slowly with 429 backoff ----
 let usageTimer = null
 let usageBackoff = 5 * 60 * 1000
+let authFails = 0 // consecutive 401s — see pollUsage
 function scheduleUsagePoll() {
   clearTimeout(usageTimer)
   if (auth.isConnected()) usageTimer = setTimeout(pollUsage, usageBackoff)
@@ -656,11 +659,21 @@ async function pollUsage() {
   try {
     const u = await auth.fetchUsage()
     usageBackoff = 5 * 60 * 1000
+    authFails = 0
     pushRealUsage(u)
   } catch (e) {
     if (e && e.status === 429) {
       usageBackoff = Math.min(usageBackoff * 2, 30 * 60 * 1000)
     } else if (e && e.status === 401) {
+      // Refreshing rotates the refresh token, so a request that raced the one
+      // that rotated it comes back rejected while the session is perfectly
+      // alive. Clearing on that first answer throws away a good login, so the
+      // second rejection in a row is what counts.
+      if (++authFails < 2) {
+        usageBackoff = 60 * 1000
+        scheduleUsagePoll()
+        return
+      }
       auth.clear()
       pushRealUsage(null)
       sendAccounts()
@@ -674,20 +687,50 @@ async function pollUsage() {
   scheduleUsagePoll()
 }
 function startUsagePoll() {
+  authFails = 0
   if (auth.isConnected()) pollUsage()
 }
 
+// Waking up: the poll timer was frozen through the sleep, so the numbers on
+// screen are as old as the nap. Re-state what we know — a read that failed on
+// the way down would otherwise leave a stale "log in" panel up — and poll
+// again, after a beat, since the network is rarely back the instant we are.
+function onResume() {
+  if (!auth.isConnected()) return
+  if (win && !win.isDestroyed()) win.webContents.send('auth-state', { connected: true })
+  clearTimeout(usageTimer)
+  usageBackoff = 5 * 60 * 1000
+  usageTimer = setTimeout(pollUsage, 5000)
+  sendProfile()
+}
+
 // push the logged-in account's identity (email + plan) to the renderer
-async function sendProfile() {
+let profileTimer = null
+async function sendProfile(tries = 0) {
+  clearTimeout(profileTimer)
   if (!auth.isConnected()) return
+  // whose profile this is, decided *before* the await: a switch during the
+  // fetch would otherwise label the new account with the old one's email
+  const id = accounts.activeId()
   try {
     const p = await auth.fetchProfile()
+    if (id !== accounts.activeId()) return // switched under us — this is stale
     if (p?.email) {
-      accounts.label(accounts.activeId(), p.email) // a better name than "acct-xyz"
+      accounts.label(id, p.email) // a better name than "acct-xyz"
       sendAccounts()
     }
     if (win && !win.isDestroyed()) win.webContents.send('profile', p)
-  } catch {} // non-fatal: the chip just stays hidden
+  } catch {
+    // a rate limit or a blip would otherwise hide the chip — and with it the
+    // account switcher — until the app is restarted, so keep trying for a while
+    if (tries >= 4) return
+    profileTimer = setTimeout(
+      () => {
+        if (id === accounts.activeId()) sendProfile(tries + 1)
+      },
+      30 * 1000 * 2 ** tries,
+    )
+  }
 }
 
 // begin() has to run *after* any account switch: switching resets the pending

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "clauddy",
   "desktopName": "clauddy.desktop",
-  "version": "1.21.0",
+  "version": "1.21.2",
   "description": "A cute desktop pet that tracks your Claude Code usage",
   "main": "main.js",
   "bin": {

package/renderer/pet.js

@@ -700,26 +700,38 @@ window.api.onAuthState((s) => {
 })
 
 // logged-in account chip (email + plan) shown top-left when connected
+let lastProfile = null
 function showProfile(p) {
+  lastProfile = p
+  paintChip()
+}
+
+// The chip is also the account switcher, so it must not vanish just because the
+// profile fetch failed — that would strand the user on one account until a
+// restart. The label main stored for the active account is the same email, so
+// it stands in until the profile lands.
+function paintChip() {
+  const p = lastProfile
+  const a = lastAccounts
+  const active = (a?.accounts || []).find((x) => x.id === a?.active)
+  const email = p?.email || (active?.connected ? active.label : null)
   // the settings line says who is connected, not just that someone is
-  el('acc-ok').textContent = p?.email
-    ? `● ${p.email}${p.plan ? ` · ${p.plan}` : ''}`
-    : '● Connected'
+  el('acc-ok').textContent = email ? `● ${email}${p?.plan ? ` · ${p.plan}` : ''}` : '● Connected'
   const chip = el('account-chip')
   const mini = el('mini-acct')
-  if (!p?.email) {
+  if (!email) {
     chip.hidden = true
     mini.hidden = true
     return
   }
   // expanded: full email chip in the top bar
-  el('ac-email').textContent = p.email
-  chip.title = p.name ? `${p.name} · ${p.email}` : p.email
-  setPlan(el('ac-plan'), p.plan)
+  el('ac-email').textContent = email
+  chip.title = p?.name ? `${p.name} · ${email}` : email
+  setPlan(el('ac-plan'), p?.plan)
   chip.hidden = false
   // collapsed: short name + plan in the mini block (email won't fit at 116px)
-  el('mini-acct-name').textContent = p.name || p.email.split('@')[0]
-  setPlan(el('mini-acct-plan'), p.plan)
+  el('mini-acct-name').textContent = p?.name || email.split('@')[0]
+  setPlan(el('mini-acct-plan'), p?.plan)
   mini.hidden = false
 }
 function setPlan(node, plan) {
@@ -765,6 +777,8 @@ function accountRow(acc, a) {
 function renderAccounts(a) {
   lastAccounts = a
   document.body.classList.toggle('one-account', (a?.accounts || []).length < 2)
+  paintChip() // the label may be all the chip has to go on
+
   if (el('acc-menu').hidden) return
   // the switch is done: the chip now names the account the menu was pointing at
   if (switching && !a?.busy) closeAccountMenu()