v0.1.64 - use Claude auth status for account identity

Author: EcomCJ

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tally",
-  "version": "0.1.63",
+  "version": "0.1.64",
   "private": true,
   "scripts": {
     "tauri": "tauri",

package.json

@@ -1,6 +1,6 @@
 [package]
 name = "tally"
-version = "0.1.63"
+version = "0.1.64"
 edition = "2021"
 rust-version = "1.77"
 

src-tauri/Cargo.lock

@@ -3,6 +3,7 @@ use chrono::Utc;
 use serde::{Deserialize, Serialize};
 use std::fs::File;
 use std::path::{Path, PathBuf};
+use std::process::Command;
 
 use super::api::{live_limits_from_usage_response, UsageResponse};
 use super::cache::disk_cache_path;
@@ -17,6 +18,11 @@ const CLAUDE_OAUTH_TOKEN_URL: &str = "https://platform.claude.com/v1/oauth/token
 // Refresh proactively when within this many seconds of expiry so the next
 // HTTP call always carries a fresh token (no wasted 401 round-trip).
 const TOKEN_REFRESH_MARGIN_SECS: i64 = 60;
+#[cfg(windows)]
+const CREATE_NO_WINDOW: u32 = 0x08000000;
+
+#[cfg(windows)]
+use std::os::windows::process::CommandExt;
 
 #[derive(Debug, Deserialize)]
 struct ProfileResponse {
@@ -28,6 +34,16 @@ struct ProfileOrg {
     rate_limit_tier: Option<String>,
 }
 
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct AuthStatus {
+    logged_in: bool,
+    email: Option<String>,
+    org_id: Option<String>,
+    subscription_type: Option<String>,
+    auth_method: Option<String>,
+}
+
 #[derive(Debug, Clone, Deserialize, Serialize)]
 struct CredentialsFile {
     #[serde(rename = "claudeAiOauth")]
@@ -167,6 +183,9 @@ pub(crate) fn read_oauth_token() -> Result<String> {
 }
 
 pub(crate) fn active_account_identity() -> Option<AccountIdentity> {
+    if let Some(identity) = active_auth_status_identity() {
+        return Some(identity);
+    }
     let (_, creds) = read_credentials().ok()?;
     crate::account::token_identity(
         "claude",
@@ -175,6 +194,57 @@ pub(crate) fn active_account_identity() -> Option<AccountIdentity> {
     )
 }
 
+fn active_auth_status_identity() -> Option<AccountIdentity> {
+    let mut cmd = Command::new("claude");
+    #[cfg(windows)]
+    cmd.creation_flags(CREATE_NO_WINDOW);
+    let output = cmd.args(["auth", "status", "--json"]).output().ok()?;
+    if !output.status.success() {
+        return None;
+    }
+    let status: AuthStatus = serde_json::from_slice(&output.stdout).ok()?;
+    if !status.logged_in {
+        return None;
+    }
+    let mut parts = Vec::new();
+    if let Some(org_id) = status
+        .org_id
+        .as_deref()
+        .map(str::trim)
+        .filter(|s| !s.is_empty())
+    {
+        parts.push(format!("org:{org_id}"));
+    }
+    if let Some(email) = status
+        .email
+        .as_deref()
+        .map(str::trim)
+        .filter(|s| !s.is_empty())
+    {
+        parts.push(format!("email:{}", email.to_ascii_lowercase()));
+    }
+    if parts.is_empty() {
+        if let Some(method) = status
+            .auth_method
+            .as_deref()
+            .map(str::trim)
+            .filter(|s| !s.is_empty())
+        {
+            parts.push(format!("auth:{method}"));
+        }
+    }
+    if parts.is_empty() {
+        return None;
+    }
+    let raw = parts.join("|");
+    let source = status
+        .subscription_type
+        .as_deref()
+        .map(|sub| format!("claude-auth-status:{sub}"))
+        .unwrap_or_else(|| "claude-auth-status".to_string());
+    crate::account::explicit_identity("claude", &raw, &source)
+}
+
 /// Lightweight availability probe: does a parseable credentials file with an
 /// access token exist on disk? Does NOT hit the network — refresh logic lives
 /// in `read_oauth_token` / `ensure_fresh_access_token` and only runs when we

src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "TALLY - Ai Usage Monitor",
-  "version": "0.1.63",
+  "version": "0.1.64",
   "identifier": "com.cjmedia.tally",
   "build": {
     "frontendDist": "../src"