osborn 0.8.10 → 0.8.11

package/dist/claude-auth.d.ts

@@ -53,6 +53,12 @@ export declare function runClaudeAuthFlow(callbacks: ClaudeAuthCallbacks): {
  *   2. ~/.claude/.credentials.json file
  *   3. `claude auth status --json`
  *   4. Interactive OAuth flow (setup-token)
+ *
+ * Concurrency: if a previous call is still running its OAuth flow, new
+ * callers attach to the existing flow rather than spawning a second pty.
+ * This prevents the situation where LiveKit reconnects (e.g. after a
+ * microphone-permission error) retrigger ensureClaudeAuth and the user
+ * sees two different URLs / two different code_challenges racing.
  */
 export declare function ensureClaudeAuth(sendToFrontend: (type: string, payload: unknown) => void): Promise<{
     submitCode?: (code: string) => void;

package/dist/claude-auth.js

@@ -354,9 +354,7 @@ export function runClaudeAuthFlow(callbacks) {
     });
     return { handle, done };
 }
-// ─────────────────────────────────────────
-// Startup Gate
-// ─────────────────────────────────────────
+let inFlightAuth = null;
 /**
  * Ensure Claude is authenticated before proceeding.
  *
@@ -365,8 +363,33 @@ export function runClaudeAuthFlow(callbacks) {
  *   2. ~/.claude/.credentials.json file
  *   3. `claude auth status --json`
  *   4. Interactive OAuth flow (setup-token)
+ *
+ * Concurrency: if a previous call is still running its OAuth flow, new
+ * callers attach to the existing flow rather than spawning a second pty.
+ * This prevents the situation where LiveKit reconnects (e.g. after a
+ * microphone-permission error) retrigger ensureClaudeAuth and the user
+ * sees two different URLs / two different code_challenges racing.
  */
 export async function ensureClaudeAuth(sendToFrontend) {
+    // If an auth flow is already running, attach to it and replay any
+    // state we've already captured (the URL, any waiting_code prompt).
+    if (inFlightAuth) {
+        console.log('🔑 ensureClaudeAuth called while a flow is in-flight — attaching new subscriber');
+        inFlightAuth.subscribers.push(sendToFrontend);
+        // Replay the state the frontend needs to render the modal correctly.
+        sendToFrontend('claude_auth_required', {
+            message: 'Claude authentication required. A login URL will appear shortly.',
+        });
+        if (inFlightAuth.lastUrl) {
+            sendToFrontend('claude_auth_url', { url: inFlightAuth.lastUrl });
+        }
+        if (inFlightAuth.lastStatus === 'waiting_code') {
+            sendToFrontend('claude_auth_waiting_code', {
+                message: 'Paste the authentication code from the browser.',
+            });
+        }
+        return { submitCode: inFlightAuth.submitCode, done: inFlightAuth.done };
+    }
     // Check 0: Restore token from volume if previously persisted
     if (!hasOAuthTokenEnv()) {
         try {
@@ -399,28 +422,62 @@ export async function ensureClaudeAuth(sendToFrontend) {
     }
     // Check 4: Need interactive OAuth flow
     console.log('🔑 Claude not authenticated — starting OAuth flow');
-    sendToFrontend('claude_auth_required', {
+    // Create the in-flight record BEFORE spawning, and fan-out every
+    // callback to all current subscribers. New subscribers that attach
+    // later get replay of lastUrl / lastStatus from the deduped path
+    // at the top of this function.
+    const subscribers = [sendToFrontend];
+    const fanout = (type, payload) => {
+        for (const sub of subscribers) {
+            try {
+                sub(type, payload);
+            }
+            catch (err) {
+                console.warn('🔑 subscriber failed:', err);
+            }
+        }
+    };
+    fanout('claude_auth_required', {
         message: 'Claude authentication required. A login URL will appear shortly.',
     });
     const { handle, done } = runClaudeAuthFlow({
         onUrl: (url) => {
-            console.log('📤 Sending Claude auth URL to frontend');
-            sendToFrontend('claude_auth_url', { url });
+            console.log(`📤 Sending Claude auth URL to frontend (${url.length} chars)`);
+            if (inFlightAuth) {
+                inFlightAuth.lastUrl = url;
+                inFlightAuth.lastStatus = 'waiting';
+            }
+            fanout('claude_auth_url', { url });
         },
         onWaitingForCode: () => {
             console.log('📤 Sending code prompt to frontend');
-            sendToFrontend('claude_auth_waiting_code', {
+            if (inFlightAuth)
+                inFlightAuth.lastStatus = 'waiting_code';
+            fanout('claude_auth_waiting_code', {
                 message: 'Paste the authentication code from the browser.',
             });
         },
         onComplete: () => {
-            sendToFrontend('claude_auth_complete', {
+            fanout('claude_auth_complete', {
                 message: 'Claude authenticated successfully. Starting voice session...',
             });
         },
         onError: (message) => {
-            sendToFrontend('claude_auth_error', { message });
+            fanout('claude_auth_error', { message });
         },
     });
+    // Publish the in-flight record so concurrent callers attach to it.
+    inFlightAuth = {
+        submitCode: handle.submitCode,
+        done,
+        lastUrl: null,
+        lastStatus: null,
+        subscribers,
+    };
+    // Clear the in-flight record once the flow settles, success or failure.
+    done.finally(() => {
+        console.log('🔑 OAuth flow settled — clearing in-flight guard');
+        inFlightAuth = null;
+    });
     return { submitCode: handle.submitCode, done };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "osborn",
-  "version": "0.8.10",
+  "version": "0.8.11",
   "description": "Voice AI coding assistant - local agent that connects to Osborn frontend",
   "type": "module",
   "bin": {