Comment out debug prints

.gitignore

@@ -18,4 +18,5 @@ Thumbs.db
 log.txt
 Trash/
 
-nostr-login/
+nostr-login/
+nostr-tools/

deploy.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-rsync -avz --progress lite/{nostr-lite.js,nostr.bundle.js} ubuntu@laantungir.net:WWW/nostr-login-lite/
+rsync -avz --chmod=644 --progress lite/{nostr-lite.js,nostr.bundle.js} ubuntu@laantungir.net:WWW/nostr-login-lite/

examples/keytest.html

@@ -104,6 +104,18 @@
 
         }});
 
+      // Check for existing authentication state on page load
+      const authState = getAuthState();
+      if (authState && authState.method) {
+        console.log('Found existing authentication:', authState.method);
+        document.getElementById('status').textContent = `Authenticated with: ${authState.method}`;
+        document.getElementById('test-section').style.display = 'block';
+        
+        // Store some test data for encryption/decryption
+        window.testCiphertext = null;
+        window.testCiphertext44 = null;
+      }
+
       // Listen for authentication events
       window.addEventListener('nlMethodSelected', (event) => {
         console.log('User authenticated:', event.detail);

examples/login-and-profile.html

@@ -35,6 +35,15 @@
   <!-- Load NOSTR_LOGIN_LITE main library (now includes NIP-46 extension) -->
   <script src="../lite/nostr-lite.js"></script>
 
+    <!-- Load the official nostr-tools bundle first -->
+    <!-- <script src="./nostr.bundle.js"></script> -->
+    <script src="https://laantungir.net/nostr-login-lite/nostr.bundle.js"></script>
+
+    <!-- Load NOSTR_LOGIN_LITE main library -->
+    <script src="https://laantungir.net/nostr-login-lite/nostr-lite.js"></script>
+    <!-- <script src="./nostr-lite.js"></script> -->
+
+
   <script>
 
 

lite/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.8

lite/ui/modal.js

@@ -330,7 +330,7 @@ class Modal {
   }
 
   _handleOptionClick(type) {
-    console.log('Selected login type:', type);
+    // console.log('Selected login type:', type);
 
     // Handle different login types
     switch (type) {
@@ -362,16 +362,16 @@ class Modal {
     // Check if NostrLite instance has a preserved extension (real extension detected at init)
     if (window.NOSTR_LOGIN_LITE?._instance?.preservedExtension) {
       extension = window.NOSTR_LOGIN_LITE._instance.preservedExtension;
-      console.log('Modal: Using preserved extension:', extension.constructor?.name);
+      // console.log('Modal: Using preserved extension:', extension.constructor?.name);
     }
     // Otherwise check current window.nostr
     else if (window.nostr && this._isRealExtension(window.nostr)) {
       extension = window.nostr;
-      console.log('Modal: Using current window.nostr extension:', extension.constructor?.name);
+      // console.log('Modal: Using current window.nostr extension:', extension.constructor?.name);
     }
-    
+
     if (!extension) {
-      console.log('Modal: No extension detected yet, waiting for deferred detection...');
+      // console.log('Modal: No extension detected yet, waiting for deferred detection...');
       
       // DEFERRED EXTENSION CHECK: Extensions like nos2x might load after our library
       let attempts = 0;
@@ -382,24 +382,24 @@ class Modal {
         // Check again for preserved extension (might be set by deferred detection)
         if (window.NOSTR_LOGIN_LITE?._instance?.preservedExtension) {
           extension = window.NOSTR_LOGIN_LITE._instance.preservedExtension;
-          console.log('Modal: Found preserved extension after waiting:', extension.constructor?.name);
+          // console.log('Modal: Found preserved extension after waiting:', extension.constructor?.name);
           this._tryExtensionLogin(extension);
           return;
         }
-        
+
         // Check current window.nostr again
         if (window.nostr && this._isRealExtension(window.nostr)) {
           extension = window.nostr;
-          console.log('Modal: Found extension at window.nostr after waiting:', extension.constructor?.name);
+          // console.log('Modal: Found extension at window.nostr after waiting:', extension.constructor?.name);
           this._tryExtensionLogin(extension);
           return;
         }
-        
+
         // Keep trying or give up
         if (attempts < maxAttempts) {
           setTimeout(checkForExtension, 200);
         } else {
-          console.log('Modal: No browser extension found after waiting 2 seconds');
+          // console.log('Modal: No browser extension found after waiting 2 seconds');
           this._showExtensionRequired();
         }
       };
@@ -410,7 +410,7 @@ class Modal {
     }
     
     // Use the single detected extension directly - no choice UI
-    console.log('Modal: Single extension mode - using extension directly');
+    // console.log('Modal: Single extension mode - using extension directly');
     this._tryExtensionLogin(extension);
   }
 
@@ -434,9 +434,9 @@ class Modal {
     for (const location of locations) {
       try {
         const obj = location.getter();
-        
-        console.log(`Modal: Checking ${location.name}:`, !!obj, obj?.constructor?.name);
-        
+
+        // console.log(`Modal: Checking ${location.name}:`, !!obj, obj?.constructor?.name);
+
         if (obj && this._isRealExtension(obj) && !seenExtensions.has(obj)) {
           extensions.push({
             name: location.name,
@@ -445,26 +445,26 @@ class Modal {
             extension: obj
           });
           seenExtensions.add(obj);
-          console.log(`Modal: ✓ Detected extension at ${location.name} (${obj.constructor?.name})`);
+          // console.log(`Modal: ✓ Detected extension at ${location.name} (${obj.constructor?.name})`);
         } else if (obj) {
-          console.log(`Modal: ✗ Filtered out ${location.name} (${obj.constructor?.name})`);
+          // console.log(`Modal: ✗ Filtered out ${location.name} (${obj.constructor?.name})`);
         }
       } catch (e) {
         // Location doesn't exist or can't be accessed
-        console.log(`Modal: ${location.name} not accessible:`, e.message);
+        // console.log(`Modal: ${location.name} not accessible:`, e.message);
       }
     }
     
     // Also check window.nostr but be extra careful to avoid our library
-    console.log('Modal: Checking window.nostr:', !!window.nostr, window.nostr?.constructor?.name);
-    
+    // console.log('Modal: Checking window.nostr:', !!window.nostr, window.nostr?.constructor?.name);
+
     if (window.nostr) {
       // Check if window.nostr is our WindowNostr facade with a preserved extension
       if (window.nostr.constructor?.name === 'WindowNostr' && window.nostr.existingNostr) {
-        console.log('Modal: Found WindowNostr facade, checking existingNostr for preserved extension');
+        // console.log('Modal: Found WindowNostr facade, checking existingNostr for preserved extension');
         const preservedExtension = window.nostr.existingNostr;
-        console.log('Modal: Preserved extension:', !!preservedExtension, preservedExtension?.constructor?.name);
-        
+        // console.log('Modal: Preserved extension:', !!preservedExtension, preservedExtension?.constructor?.name);
+
         if (preservedExtension && this._isRealExtension(preservedExtension) && !seenExtensions.has(preservedExtension)) {
           extensions.push({
             name: 'window.nostr.existingNostr',
@@ -473,7 +473,7 @@ class Modal {
             extension: preservedExtension
           });
           seenExtensions.add(preservedExtension);
-          console.log(`Modal: ✓ Detected preserved extension: ${preservedExtension.constructor?.name}`);
+          // console.log(`Modal: ✓ Detected preserved extension: ${preservedExtension.constructor?.name}`);
         }
       }
       // Check if window.nostr is directly a real extension (not our facade)
@@ -485,9 +485,9 @@ class Modal {
           extension: window.nostr
         });
         seenExtensions.add(window.nostr);
-        console.log(`Modal: ✓ Detected extension at window.nostr: ${window.nostr.constructor?.name}`);
+        // console.log(`Modal: ✓ Detected extension at window.nostr: ${window.nostr.constructor?.name}`);
       } else {
-        console.log(`Modal: ✗ Filtered out window.nostr (${window.nostr.constructor?.name}) - not a real extension`);
+        // console.log(`Modal: ✗ Filtered out window.nostr (${window.nostr.constructor?.name}) - not a real extension`);
       }
     }
     
@@ -495,27 +495,27 @@ class Modal {
   }
 
   _isRealExtension(obj) {
-    console.log(`Modal: EXTENSIVE DEBUG - _isRealExtension called with:`, obj);
-    console.log(`Modal: Object type: ${typeof obj}`);
-    console.log(`Modal: Object truthy: ${!!obj}`);
-    
+    // console.log(`Modal: EXTENSIVE DEBUG - _isRealExtension called with:`, obj);
+    // console.log(`Modal: Object type: ${typeof obj}`);
+    // console.log(`Modal: Object truthy: ${!!obj}`);
+
     if (!obj || typeof obj !== 'object') {
-      console.log(`Modal: REJECT - Not an object`);
+      // console.log(`Modal: REJECT - Not an object`);
       return false;
     }
-    
-    console.log(`Modal: getPublicKey type: ${typeof obj.getPublicKey}`);
-    console.log(`Modal: signEvent type: ${typeof obj.signEvent}`);
-    
+
+    // console.log(`Modal: getPublicKey type: ${typeof obj.getPublicKey}`);
+    // console.log(`Modal: signEvent type: ${typeof obj.signEvent}`);
+
     // Must have required Nostr methods
     if (typeof obj.getPublicKey !== 'function' || typeof obj.signEvent !== 'function') {
-      console.log(`Modal: REJECT - Missing required methods`);
+      // console.log(`Modal: REJECT - Missing required methods`);
       return false;
     }
 
     // Exclude NostrTools library object
     if (obj === window.NostrTools) {
-      console.log(`Modal: REJECT - Is NostrTools object`);
+      // console.log(`Modal: REJECT - Is NostrTools object`);
       return false;
     }
 
@@ -523,10 +523,10 @@ class Modal {
     // This is the key fix - match the comprehensive test's successful detection logic
     const constructorName = obj.constructor?.name;
     const objectKeys = Object.keys(obj);
-    
-    console.log(`Modal: Constructor name: "${constructorName}"`);
-    console.log(`Modal: Object keys: [${objectKeys.join(', ')}]`);
-    
+
+    // console.log(`Modal: Constructor name: "${constructorName}"`);
+    // console.log(`Modal: Object keys: [${objectKeys.join(', ')}]`);
+
     // COMPREHENSIVE TEST LOGIC - Accept anything with required methods that's not our specific library classes
     const isRealExtension = (
       typeof obj.getPublicKey === 'function' &&
@@ -534,14 +534,14 @@ class Modal {
       constructorName !== 'WindowNostr' && // Our library class
       constructorName !== 'NostrLite' // Our main class
     );
-    
-    console.log(`Modal: Using comprehensive test logic:`);
-    console.log(`  Has getPublicKey: ${typeof obj.getPublicKey === 'function'}`);
-    console.log(`  Has signEvent: ${typeof obj.signEvent === 'function'}`);
-    console.log(`  Not WindowNostr: ${constructorName !== 'WindowNostr'}`);
-    console.log(`  Not NostrLite: ${constructorName !== 'NostrLite'}`);
-    console.log(`  Constructor: "${constructorName}"`);
-    
+
+    // console.log(`Modal: Using comprehensive test logic:`);
+    // console.log(`  Has getPublicKey: ${typeof obj.getPublicKey === 'function'}`);
+    // console.log(`  Has signEvent: ${typeof obj.signEvent === 'function'}`);
+    // console.log(`  Not WindowNostr: ${constructorName !== 'WindowNostr'}`);
+    // console.log(`  Not NostrLite: ${constructorName !== 'NostrLite'}`);
+    // console.log(`  Constructor: "${constructorName}"`);
+
     // Additional debugging for comparison
     const extensionPropChecks = {
       _isEnabled: !!obj._isEnabled,
@@ -555,27 +555,27 @@ class Modal {
       version: !!obj.version,
       description: !!obj.description
     };
-    
-    console.log(`Modal: Extension property analysis:`, extensionPropChecks);
-    
+
+    // console.log(`Modal: Extension property analysis:`, extensionPropChecks);
+
     const hasExtensionProps = !!(
       obj._isEnabled || obj.enabled || obj.kind ||
       obj._eventEmitter || obj._scope || obj._requests || obj._pubkey ||
       obj.name || obj.version || obj.description
     );
-    
+
     const underscoreKeys = objectKeys.filter(key => key.startsWith('_'));
     const hexToUint8Keys = objectKeys.filter(key => key.startsWith('_hex'));
-    console.log(`Modal: Underscore keys: [${underscoreKeys.join(', ')}]`);
-    console.log(`Modal: _hex* keys: [${hexToUint8Keys.join(', ')}]`);
-    
-    console.log(`Modal: Additional analysis:`);
-    console.log(`  hasExtensionProps: ${hasExtensionProps}`);
-    console.log(`  hasLibraryMethod (_hexToUint8Array): ${objectKeys.includes('_hexToUint8Array')}`);
-    
-    console.log(`Modal: COMPREHENSIVE TEST LOGIC RESULT: ${isRealExtension ? 'ACCEPT' : 'REJECT'}`);
-    console.log(`Modal: FINAL DECISION for ${constructorName}: ${isRealExtension ? 'ACCEPT' : 'REJECT'}`);
-    
+    // console.log(`Modal: Underscore keys: [${underscoreKeys.join(', ')}]`);
+    // console.log(`Modal: _hex* keys: [${hexToUint8Keys.join(', ')}]`);
+
+    // console.log(`Modal: Additional analysis:`);
+    // console.log(`  hasExtensionProps: ${hasExtensionProps}`);
+    // console.log(`  hasLibraryMethod (_hexToUint8Array): ${objectKeys.includes('_hexToUint8Array')}`);
+
+    // console.log(`Modal: COMPREHENSIVE TEST LOGIC RESULT: ${isRealExtension ? 'ACCEPT' : 'REJECT'}`);
+    // console.log(`Modal: FINAL DECISION for ${constructorName}: ${isRealExtension ? 'ACCEPT' : 'REJECT'}`);
+
     return isRealExtension;
   }
 
@@ -687,7 +687,7 @@ class Modal {
       // Get pubkey from extension
       const pubkey = await extensionObj.getPublicKey();
       console.log('Extension provided pubkey:', pubkey);
-      
+
       // Set extension method with the extension object
       this._setAuthMethod('extension', { pubkey, extension: extensionObj });
       
@@ -700,62 +700,8 @@ class Modal {
   _showLocalKeyScreen() {
     this.modalBody.innerHTML = '';
 
-    const title = document.createElement('h3');
-    title.textContent = 'Local Key';
-    title.style.cssText = 'margin: 0 0 20px 0; font-size: 18px; font-weight: 600;';
-
-    const createButton = document.createElement('button');
-    createButton.textContent = 'Create New Key';
-    createButton.onclick = () => this._createLocalKey();
-    createButton.style.cssText = this._getButtonStyle();
-
-    const importButton = document.createElement('button');
-    importButton.textContent = 'Import Existing Key';
-    importButton.onclick = () => this._showImportKeyForm();
-    importButton.style.cssText = this._getButtonStyle() + 'margin-top: 12px;';
-
-    const backButton = document.createElement('button');
-    backButton.textContent = 'Back';
-    backButton.onclick = () => this._renderLoginOptions();
-    backButton.style.cssText = `
-      display: block;
-      margin-top: 20px;
-      padding: 12px;
-      background: #6b7280;
-      color: white;
-      border: none;
-      border-radius: 6px;
-      cursor: pointer;
-    `;
-
-    this.modalBody.appendChild(title);
-    this.modalBody.appendChild(createButton);
-    this.modalBody.appendChild(importButton);
-    this.modalBody.appendChild(backButton);
-  }
-
-  _createLocalKey() {
-    try {
-      const sk = window.NostrTools.generateSecretKey();
-      const pk = window.NostrTools.getPublicKey(sk);
-      const nsec = window.NostrTools.nip19.nsecEncode(sk);
-      const npub = window.NostrTools.nip19.npubEncode(pk);
-
-      this._showKeyDisplay(pk, nsec, 'created');
-    } catch (error) {
-      this._showError('Failed to create key: ' + error.message);
-    }
-  }
-
-  _showImportKeyForm() {
-    this.modalBody.innerHTML = '';
-
-    const title = document.createElement('h3');
-    title.textContent = 'Import Local Key';
-    title.style.cssText = 'margin: 0 0 16px 0; font-size: 18px; font-weight: 600;';
-
     const description = document.createElement('p');
-    description.textContent = 'Enter your secret key in either nsec or hex format:';
+    description.innerHTML = 'Enter your secret key in nsec or hex format, or <span id="generate-new" style="text-decoration: underline; cursor: pointer; color: var(--nl-primary-color);">generate new</span>.';
     description.style.cssText = 'margin-bottom: 12px; color: #6b7280; font-size: 14px;';
 
     const textarea = document.createElement('textarea');
@@ -777,10 +723,40 @@ class Modal {
     const formatHint = document.createElement('div');
     formatHint.style.cssText = 'margin-bottom: 16px; font-size: 12px; color: #6b7280; min-height: 16px;';
     
+    const importButton = document.createElement('button');
+    importButton.textContent = 'Import Key';
+    importButton.disabled = true;
+    importButton.onclick = () => {
+      if (!importButton.disabled) {
+        this._importLocalKey(textarea.value);
+      }
+    };
+    
+    // Set initial disabled state
+    importButton.style.cssText = `
+      display: block;
+      width: 100%;
+      padding: 12px;
+      border: var(--nl-border-width) solid var(--nl-muted-color);
+      border-radius: var(--nl-border-radius);
+      font-size: 16px;
+      font-weight: 500;
+      cursor: not-allowed;
+      transition: all 0.2s;
+      font-family: var(--nl-font-family, 'Courier New', monospace);
+      background: var(--nl-secondary-color);
+      color: var(--nl-muted-color);
+    `;
+    
     textarea.oninput = () => {
       const value = textarea.value.trim();
       if (!value) {
         formatHint.textContent = '';
+        // Disable button
+        importButton.disabled = true;
+        importButton.style.borderColor = 'var(--nl-muted-color)';
+        importButton.style.color = 'var(--nl-muted-color)';
+        importButton.style.cursor = 'not-allowed';
         return;
       }
       
@@ -788,33 +764,94 @@ class Modal {
       if (format === 'nsec') {
         formatHint.textContent = '✅ Valid nsec format detected';
         formatHint.style.color = '#059669';
+        // Enable button
+        importButton.disabled = false;
+        importButton.style.borderColor = 'var(--nl-primary-color)';
+        importButton.style.color = 'var(--nl-primary-color)';
+        importButton.style.cursor = 'pointer';
       } else if (format === 'hex') {
         formatHint.textContent = '✅ Valid hex format detected';
         formatHint.style.color = '#059669';
+        // Enable button
+        importButton.disabled = false;
+        importButton.style.borderColor = 'var(--nl-primary-color)';
+        importButton.style.color = 'var(--nl-primary-color)';
+        importButton.style.cursor = 'pointer';
       } else {
         formatHint.textContent = '❌ Invalid key format - must be nsec1... or 64-character hex';
         formatHint.style.color = '#dc2626';
+        // Disable button
+        importButton.disabled = true;
+        importButton.style.borderColor = 'var(--nl-muted-color)';
+        importButton.style.color = 'var(--nl-muted-color)';
+        importButton.style.cursor = 'not-allowed';
       }
     };
 
-    const importButton = document.createElement('button');
-    importButton.textContent = 'Import Key';
-    importButton.onclick = () => this._importLocalKey(textarea.value);
-    importButton.style.cssText = this._getButtonStyle();
-
     const backButton = document.createElement('button');
     backButton.textContent = 'Back';
-    backButton.onclick = () => this._showLocalKeyScreen();
+    backButton.onclick = () => this._renderLoginOptions();
     backButton.style.cssText = this._getButtonStyle('secondary') + 'margin-top: 12px;';
 
-    this.modalBody.appendChild(title);
     this.modalBody.appendChild(description);
     this.modalBody.appendChild(textarea);
     this.modalBody.appendChild(formatHint);
     this.modalBody.appendChild(importButton);
     this.modalBody.appendChild(backButton);
+
+    // Add click handler for the "generate new" link
+    const generateLink = document.getElementById('generate-new');
+    if (generateLink) {
+      generateLink.addEventListener('mouseenter', () => {
+        generateLink.style.color = 'var(--nl-accent-color)';
+      });
+      generateLink.addEventListener('mouseleave', () => {
+        generateLink.style.color = 'var(--nl-primary-color)';
+      });
+      generateLink.addEventListener('click', () => {
+        this._generateNewLocalKey(textarea, formatHint);
+      });
+    }
   }
 
+  _generateNewLocalKey(textarea, formatHint) {
+    try {
+      // Generate a new secret key using NostrTools
+      const sk = window.NostrTools.generateSecretKey();
+      const nsec = window.NostrTools.nip19.nsecEncode(sk);
+      
+      // Set the generated key in the textarea
+      textarea.value = nsec;
+      
+      // Trigger the oninput event to properly validate and enable the button
+      if (textarea.oninput) {
+        textarea.oninput();
+      }
+      
+      // console.log('Generated new local secret key (nsec format)');
+
+    } catch (error) {
+      console.error('Failed to generate local key:', error);
+      formatHint.textContent = '❌ Failed to generate key - NostrTools not available';
+      formatHint.style.color = '#dc2626';
+    }
+  }
+
+  _createLocalKey() {
+    try {
+      const sk = window.NostrTools.generateSecretKey();
+      const pk = window.NostrTools.getPublicKey(sk);
+      const nsec = window.NostrTools.nip19.nsecEncode(sk);
+      const npub = window.NostrTools.nip19.npubEncode(pk);
+
+      this._showKeyDisplay(pk, nsec, 'created');
+    } catch (error) {
+      this._showError('Failed to create key: ' + error.message);
+    }
+  }
+
+  
+
   _detectKeyFormat(keyValue) {
     const trimmed = keyValue.trim();
     
@@ -1094,69 +1131,79 @@ class Modal {
   }
 
   _setAuthMethod(method, options = {}) {
-    // SINGLE-EXTENSION ARCHITECTURE: Handle method switching
-    console.log('Modal: _setAuthMethod called with:', method, options);
-    
+    // console.log('Modal: _setAuthMethod called with:', method, options);
+
     // CRITICAL: Never install facade for extension methods - leave window.nostr as the extension
     if (method === 'extension') {
-      console.log('Modal: Extension method - NOT installing facade, leaving window.nostr as extension');
-      
+      // console.log('Modal: Extension method - NOT installing facade, leaving window.nostr as extension');
+
       // Save extension authentication state using global setAuthState function
       if (typeof window.setAuthState === 'function') {
-        console.log('Modal: Saving extension auth state to storage');
+        // console.log('Modal: Saving extension auth state to storage');
         window.setAuthState({ method, ...options }, { isolateSession: this.options?.isolateSession });
       }
-      
+
       // Emit auth method selection directly for extension
       const event = new CustomEvent('nlMethodSelected', {
         detail: { method, ...options }
       });
       window.dispatchEvent(event);
-      
+
+      this.close();
+      return;
+    }
+
+    // FOR NON-EXTENSION METHODS: Force-install facade with resilience
+    // console.log('Modal: Non-extension method - FORCE-INSTALLING facade with resilience:', method);
+    
+    // Store the current extension if any (for potential restoration later)
+    const currentExtension = (window.nostr?.constructor?.name !== 'WindowNostr') ? window.nostr : null;
+    
+    // Get NostrLite instance for facade operations
+    const nostrLiteInstance = window.NOSTR_LOGIN_LITE?._instance;
+    if (!nostrLiteInstance || typeof nostrLiteInstance._installFacade !== 'function') {
+      console.error('Modal: Cannot access NostrLite instance or _installFacade method');
+      // Fallback: emit event anyway
+      const event = new CustomEvent('nlMethodSelected', {
+        detail: { method, ...options }
+      });
+      window.dispatchEvent(event);
       this.close();
       return;
     }
     
-    // For non-extension methods, we need to ensure WindowNostr facade is available
-    console.log('Modal: Non-extension method detected:', method);
+    // IMMEDIATE FACADE INSTALLATION
+    // console.log('Modal: Installing WindowNostr facade immediately for method:', method);
+    const preservedExtension = nostrLiteInstance.preservedExtension || currentExtension;
+    nostrLiteInstance._installFacade(preservedExtension, true);
+    // console.log('Modal: WindowNostr facade force-installed, current window.nostr:', window.nostr?.constructor?.name);
     
-    // Check if we have a preserved extension but no WindowNostr facade installed
-    const hasPreservedExtension = !!window.NOSTR_LOGIN_LITE?._instance?.preservedExtension;
-    const hasWindowNostrFacade = window.nostr?.constructor?.name === 'WindowNostr';
-    
-    console.log('Modal: Method switching check:');
-    console.log('  method:', method);
-    console.log('  hasPreservedExtension:', hasPreservedExtension);
-    console.log('  hasWindowNostrFacade:', hasWindowNostrFacade);
-    console.log('  current window.nostr constructor:', window.nostr?.constructor?.name);
-    
-    // If we have a preserved extension but no facade, install facade for method switching
-    if (hasPreservedExtension && !hasWindowNostrFacade) {
-      console.log('Modal: Installing WindowNostr facade for method switching (non-extension authentication)');
+    // DELAYED FACADE RESILIENCE - Reinstall after extension override attempts
+    const forceReinstallFacade = () => {
+      console.log('Modal: RESILIENCE CHECK - Current window.nostr after delay:', window.nostr?.constructor?.name);
       
-      // Get the NostrLite instance and install facade with preserved extension
-      const nostrLiteInstance = window.NOSTR_LOGIN_LITE?._instance;
-      if (nostrLiteInstance && typeof nostrLiteInstance._installFacade === 'function') {
-        const preservedExtension = nostrLiteInstance.preservedExtension;
-        console.log('Modal: Installing facade with preserved extension:', preservedExtension?.constructor?.name);
+      // If facade was overridden by extension, reinstall it
+      if (window.nostr?.constructor?.name !== 'WindowNostr') {
+        console.log('Modal: FACADE OVERRIDDEN! Force-reinstalling WindowNostr facade for user choice:', method);
+        nostrLiteInstance._installFacade(preservedExtension, true);
+        console.log('Modal: Resilient facade force-reinstall complete, window.nostr:', window.nostr?.constructor?.name);
         
-        nostrLiteInstance._installFacade(preservedExtension);
-        console.log('Modal: WindowNostr facade installed for method switching');
+        // Schedule another check in case of persistent extension override
+        setTimeout(() => {
+          if (window.nostr?.constructor?.name !== 'WindowNostr') {
+            console.log('Modal: PERSISTENT OVERRIDE! Final facade force-reinstall for method:', method);
+            nostrLiteInstance._installFacade(preservedExtension, true);
+          }
+        }, 1000);
       } else {
-        console.error('Modal: Cannot access NostrLite instance or _installFacade method');
+        console.log('Modal: Facade persistence verified - no override detected');
       }
-    }
+    };
     
-    // If no extension at all, ensure facade is installed for local/NIP-46/readonly methods
-    else if (!hasPreservedExtension && !hasWindowNostrFacade) {
-      console.log('Modal: Installing WindowNostr facade for non-extension methods (no extension detected)');
-      
-      const nostrLiteInstance = window.NOSTR_LOGIN_LITE?._instance;
-      if (nostrLiteInstance && typeof nostrLiteInstance._installFacade === 'function') {
-        nostrLiteInstance._installFacade();
-        console.log('Modal: WindowNostr facade installed for non-extension methods');
-      }
-    }
+    // Schedule resilience checks at multiple intervals
+    // setTimeout(forceReinstallFacade, 100);  // Quick check
+    // setTimeout(forceReinstallFacade, 500);  // Main check
+    // setTimeout(forceReinstallFacade, 1500); // Final check
     
     // Emit auth method selection
     const event = new CustomEvent('nlMethodSelected', {
@@ -1343,7 +1390,7 @@ class Modal {
       
       return false;
     } catch (error) {
-      console.log('Bunker key validation failed:', error.message);
+      // console.log('Bunker key validation failed:', error.message);
       return false;
     }
   }
@@ -1396,7 +1443,7 @@ class Modal {
 
   async _performNip46Connect(bunkerPubkey) {
     try {
-      console.log('Starting NIP-46 connection to bunker:', bunkerPubkey);
+      // console.log('Starting NIP-46 connection to bunker:', bunkerPubkey);
 
       // Check if nostr-tools NIP-46 is available
       if (!window.NostrTools?.nip46) {
@@ -1404,41 +1451,41 @@ class Modal {
       }
 
       // Use nostr-tools to parse bunker input - this handles all formats correctly
-      console.log('Parsing bunker input with nostr-tools...');
+      // console.log('Parsing bunker input with nostr-tools...');
       const bunkerPointer = await window.NostrTools.nip46.parseBunkerInput(bunkerPubkey);
 
       if (!bunkerPointer) {
         throw new Error('Unable to parse bunker connection string or resolve NIP-05 identifier');
       }
 
-      console.log('Parsed bunker pointer:', bunkerPointer);
+      // console.log('Parsed bunker pointer:', bunkerPointer);
 
       // Create local client keypair for this session
       const localSecretKey = window.NostrTools.generateSecretKey();
-      console.log('Generated local client keypair for NIP-46 session');
+      // console.log('Generated local client keypair for NIP-46 session');
 
       // Use nostr-tools BunkerSigner factory method (not constructor - it's private)
-      console.log('Creating nip46 BunkerSigner...');
+      // console.log('Creating nip46 BunkerSigner...');
       const signer = window.NostrTools.nip46.BunkerSigner.fromBunker(localSecretKey, bunkerPointer, {
         onauth: (url) => {
-          console.log('Received auth URL from bunker:', url);
+          // console.log('Received auth URL from bunker:', url);
           // Open auth URL in popup or redirect
           window.open(url, '_blank', 'width=600,height=800');
         }
       });
 
-      console.log('NIP-46 BunkerSigner created successfully');
+      // console.log('NIP-46 BunkerSigner created successfully');
 
       // Skip ping test - NIP-46 works through relays, not direct connection
       // Try to connect directly (this may trigger auth flow)
-      console.log('Attempting NIP-46 connect...');
+      // console.log('Attempting NIP-46 connect...');
       await signer.connect();
-      console.log('NIP-46 connect successful');
+      // console.log('NIP-46 connect successful');
 
       // Get the user's public key from the bunker
-      console.log('Getting public key from bunker...');
+      // console.log('Getting public key from bunker...');
       const userPubkey = await signer.getPublicKey();
-      console.log('NIP-46 user public key:', userPubkey);
+      // console.log('NIP-46 user public key:', userPubkey);
 
       // Store the NIP-46 authentication info
       const nip46Info = {
@@ -1452,7 +1499,7 @@ class Modal {
         }
       };
 
-      console.log('NOSTR_LOGIN_LITE NIP-46 connection established successfully!');
+      // console.log('NOSTR_LOGIN_LITE NIP-46 connection established successfully!');
 
       // Set as current auth method
       this._setAuthMethod('nip46', nip46Info);
@@ -1625,8 +1672,8 @@ class Modal {
         textarea.oninput();
       }
       
-      console.log('Generated new seed phrase:', mnemonic.split(/\s+/).length, 'words');
-      
+      // console.log('Generated new seed phrase:', mnemonic.split(/\s+/).length, 'words');
+
     } catch (error) {
       console.error('Failed to generate seed phrase:', error);
       formatHint.textContent = '❌ Failed to generate seed phrase - NIP-06 not available';
@@ -1643,7 +1690,7 @@ class Modal {
       }
 
       const words = mnemonic.trim().split(/\s+/);
-      
+
       // Must be 12 or 24 words
       if (words.length !== 12 && words.length !== 24) {
         return false;
@@ -1653,7 +1700,7 @@ class Modal {
       window.NostrTools.nip06.privateKeyFromSeedWords(mnemonic, '', 0);
       return true;
     } catch (error) {
-      console.log('Mnemonic validation failed:', error.message);
+      // console.log('Mnemonic validation failed:', error.message);
       return false;
     }
   }
@@ -1695,7 +1742,7 @@ class Modal {
         throw new Error('Failed to derive any accounts from seed phrase');
       }
 
-      console.log(`Successfully derived ${accounts.length} accounts from seed phrase`);
+      // console.log(`Successfully derived ${accounts.length} accounts from seed phrase`);
       this._showAccountSelection(accounts);
 
     } catch (error) {
@@ -1791,8 +1838,8 @@ class Modal {
   }
 
   _selectAccount(account) {
-    console.log('Selected account:', account.index, account.npub);
-    
+    // console.log('Selected account:', account.index, account.npub);
+
     // Use the same auth method as local keys, but with seedphrase identifier
     this._setAuthMethod('local', {
       secret: account.nsec,

nostr_login_lite.code-workspace

@@ -0,0 +1,10 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {
+		"liveServer.settings.port": 5501
+	}
+}