From a792948faaf59f80144750da8617ccc9b8da4037 Mon Sep 17 00:00:00 2001
From: redanthrax <gary@4c.gg>
Date: Thu, 20 Nov 2025 14:00:35 -0800
Subject: [PATCH 1/2] fix: debug logging setting, content script read from
 background worker instead of local storage

---
 options/options.html              |  7 +------
 options/options.js                | 11 ++++-------
 scripts/content.js                | 13 ++++++++++---
 scripts/modules/config-manager.js |  6 ++++++
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/options/options.html b/options/options.html
index b5c08329..c187a190 100644
--- a/options/options.html
+++ b/options/options.html
@@ -299,15 +299,10 @@ <h3>Rule Playground (Beta)</h3>
             <section id="logs-section" class="settings-section">
                 <div class="logs-controls">
                     <div class="logs-filters">
-                        <label class="setting-label">
-                            <input type="checkbox" id="enableDebugLogging" class="setting-checkbox">
-                            <span class="checkbox-custom"></span>
-                            Enable Debug Logging
-                        </label>
                         <label class="setting-label">
                             <input type="checkbox" id="enableDeveloperConsoleLogging" class="setting-checkbox">
                             <span class="checkbox-custom"></span>
-                            Developer Mode
+                            Developer Mode (enables debug logging)
                         </label>
                         <label class="setting-label">
                             <input type="checkbox" id="simulateEnterpriseMode" class="setting-checkbox">
diff --git a/options/options.js b/options/options.js
index 66278280..a465b614 100644
--- a/options/options.js
+++ b/options/options.js
@@ -76,9 +76,6 @@ class CheckOptions {
     this.elements.clearPlaygroundBtn = document.getElementById("clearPlaygroundBtn");
     this.elements.loadCurrentRulesBtn = document.getElementById("loadCurrentRulesBtn");
 
-    // Logging settings (moved from privacy section)
-    this.elements.enableDebugLogging =
-      document.getElementById("enableDebugLogging");
     this.elements.enableDeveloperConsoleLogging = document.getElementById(
       "enableDeveloperConsoleLogging"
     );
@@ -949,8 +946,6 @@ class CheckOptions {
     }
 
     // Logging settings
-    this.elements.enableDebugLogging.checked =
-      this.config.enableDebugLogging || false;
     this.elements.enableDeveloperConsoleLogging.checked =
       this.config.enableDeveloperConsoleLogging || false;
 
@@ -1162,10 +1157,12 @@ class CheckOptions {
         ? this.elements.urlAllowlist.value.split('\n').filter(line => line.trim())
         : [],
 
-      // Debug logging setting
-      enableDebugLogging: this.elements.enableDebugLogging?.checked || false,
+      // Developer mode (debug logging auto-enabled when this is true)
       enableDeveloperConsoleLogging:
         this.elements.enableDeveloperConsoleLogging?.checked || false,
+      // Auto-enable debug logging when developer mode is enabled
+      enableDebugLogging:
+        this.elements.enableDeveloperConsoleLogging?.checked || false,
     };
 
     // If in managed mode, filter out settings that are managed by policy
diff --git a/scripts/content.js b/scripts/content.js
index 0dfeaea8..a3263283 100644
--- a/scripts/content.js
+++ b/scripts/content.js
@@ -2431,10 +2431,17 @@ if (window.checkExtensionLoaded) {
         logger.log("⚠️ Page is in an iframe");
       }
 
-      // Load configuration to check protection settings and URL allowlist
+      // Load configuration from background (includes merged enterprise policies)
       const config = await new Promise((resolve) => {
-        chrome.storage.local.get(["config"], (result) => {
-          resolve(result.config || {});
+        chrome.runtime.sendMessage({ type: "GET_CONFIG" }, (response) => {
+          if (response && response.success && response.config) {
+            resolve(response.config);
+          } else {
+            // Fallback to local storage if background not available
+            chrome.storage.local.get(["config"], (result) => {
+              resolve(result.config || {});
+            });
+          }
         });
       });
 
diff --git a/scripts/modules/config-manager.js b/scripts/modules/config-manager.js
index f1d1a910..9fb816f6 100644
--- a/scripts/modules/config-manager.js
+++ b/scripts/modules/config-manager.js
@@ -233,6 +233,12 @@ export class ConfigManager {
     if (merged.customBranding) {
       delete merged.customBranding;
     }
+    
+    // Auto-enable debug logging when developer console logging is enabled
+    if (merged.enableDeveloperConsoleLogging === true && merged.enableDebugLogging !== true) {
+      merged.enableDebugLogging = true;
+      logger.log("Check: Auto-enabled debug logging (developer console logging is enabled)");
+    }
 
     // Ensure enterprise policies cannot be overridden
     if (enterpriseConfig.enforcedPolicies) {

From a87d6117cc356ab0a43fbc2302e555b2ceca1c44 Mon Sep 17 00:00:00 2001
From: John Duprey <jwd@johnwduprey.com>
Date: Thu, 20 Nov 2025 17:43:22 -0500
Subject: [PATCH 2/2] Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: John Duprey <jwd@johnwduprey.com>
---
 scripts/content.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/content.js b/scripts/content.js
index a3263283..0106735f 100644
--- a/scripts/content.js
+++ b/scripts/content.js
@@ -2434,13 +2434,17 @@ if (window.checkExtensionLoaded) {
       // Load configuration from background (includes merged enterprise policies)
       const config = await new Promise((resolve) => {
         chrome.runtime.sendMessage({ type: "GET_CONFIG" }, (response) => {
-          if (response && response.success && response.config) {
-            resolve(response.config);
-          } else {
-            // Fallback to local storage if background not available
+          if (chrome.runtime.lastError || !response || !response.success || !response.config) {
+            // Optionally log the error for debugging
+            if (chrome.runtime.lastError) {
+              logger.log(`[M365-Protection] Error getting config from background: ${chrome.runtime.lastError.message}`);
+            }
+            // Fallback to local storage if background not available or response invalid
             chrome.storage.local.get(["config"], (result) => {
               resolve(result.config || {});
             });
+          } else {
+            resolve(response.config);
           }
         });
       });