From e8cbe9f647bfeb7dbdf3e3aa1f9b72aebafc7506 Mon Sep 17 00:00:00 2001
From: Hikari <hikari@nhcarrigan.com>
Date: Wed, 25 Feb 2026 14:49:49 -0800
Subject: [PATCH] feat: expose org UUID from claude auth status

---
 src-tauri/src/commands.rs               | 8 ++++++++
 src/lib/components/ConfigSidebar.svelte | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
index 03b286e..30d81fd 100644
--- a/src-tauri/src/commands.rs
+++ b/src-tauri/src/commands.rs
@@ -1480,6 +1480,7 @@ pub async fn get_claude_version() -> Result<String, String> {
 pub struct ClaudeAuthStatus {
     pub is_logged_in: bool,
     pub email: Option<String>,
+    pub org_id: Option<String>,
     pub org_name: Option<String>,
     pub api_key_source: Option<String>,
     pub api_provider: Option<String>,
@@ -1510,6 +1511,11 @@ pub async fn get_auth_status() -> Result<ClaudeAuthStatus, String> {
             .and_then(|v| v.as_str())
             .map(String::from);
 
+        let org_id = json
+            .get("orgId")
+            .and_then(|v| v.as_str())
+            .map(String::from);
+
         let org_name = json
             .get("orgName")
             .and_then(|v| v.as_str())
@@ -1534,6 +1540,7 @@ pub async fn get_auth_status() -> Result<ClaudeAuthStatus, String> {
         Ok(ClaudeAuthStatus {
             is_logged_in,
             email,
+            org_id,
             org_name,
             api_key_source,
             api_provider,
@@ -1550,6 +1557,7 @@ pub async fn get_auth_status() -> Result<ClaudeAuthStatus, String> {
         Ok(ClaudeAuthStatus {
             is_logged_in,
             email: None,
+            org_id: None,
             org_name: None,
             api_key_source: None,
             api_provider: None,
diff --git a/src/lib/components/ConfigSidebar.svelte b/src/lib/components/ConfigSidebar.svelte
index d22896c..330cb85 100644
--- a/src/lib/components/ConfigSidebar.svelte
+++ b/src/lib/components/ConfigSidebar.svelte
@@ -63,6 +63,7 @@
   interface AuthStatus {
     is_logged_in: boolean;
     email: string | null;
+    org_id: string | null;
     org_name: string | null;
     api_key_source: string | null;
     api_provider: string | null;
@@ -320,6 +321,14 @@
                 <dd class="text-[var(--text-primary)]">{authStatus.org_name}</dd>
               </div>
             {/if}
+            {#if authStatus.org_id}
+              <div class="flex gap-2">
+                <dt class="text-[var(--text-tertiary)] w-20 flex-shrink-0">Org UUID</dt>
+                <dd class="text-[var(--text-secondary)] font-mono text-[10px] break-all">
+                  {authStatus.org_id}
+                </dd>
+              </div>
+            {/if}
             {#if authStatus.api_key_source}
               <div class="flex gap-2">
                 <dt class="text-[var(--text-tertiary)] w-20 flex-shrink-0">API key</dt>