update element selector

Author: MrBlankCoding

buildScripts/build-chrome.js

@@ -72,7 +72,7 @@ const manifest = {
   content_scripts: [
     {
       matches: ["http://*/*", "https://*/*"],
-      js: ["utils/elementSelector.js"],
+      js: ["elementSelector/main.js"],
       css: ["assets/styles/elementSelector.css"],
       run_at: "document_start",
     },
@@ -106,7 +106,7 @@ await build({
   entryPoints: [
     "src/background/background.js",
     "src/utils/content_bridge.js",
-    "src/utils/elementSelector.js",
+    "src/elementSelector/main.js",
     "src/GM/gm_core.js",
     "src/utils/greasyfork_interceptor.js",
     "src/utils/inject.js",

buildScripts/build-firefox.js

@@ -81,7 +81,7 @@ await build({
   entryPoints: [
     "src/background/background.js",
     "src/utils/content_bridge.js",
-    "src/utils/elementSelector.js",
+    "src/elementSelector/main.js",
     "src/GM/gm_core.js",
     "src/utils/greasyfork_interceptor.js",
     "src/utils/inject.js",

src/GM/gm_bridge.js

@@ -74,7 +74,9 @@ export class GMBridge {
     // Use direct chrome.runtime API if available (ISOLATED world)
     if (
       this.worldType === "ISOLATED" &&
-      typeof chrome?.runtime?.sendMessage === "function"
+      typeof chrome !== "undefined" &&
+      chrome.runtime &&
+      typeof chrome.runtime.sendMessage === "function"
     ) {
       return this.callIsolated(action, enrichedPayload);
     }
@@ -103,14 +105,30 @@ export class GMBridge {
 
   callIsolated(action, payload = {}) {
     return new Promise((resolve, reject) => {
+      // Defensive: ensure chrome.runtime.sendMessage still available
+      if (
+        !(
+          typeof chrome !== "undefined" &&
+          chrome.runtime &&
+          typeof chrome.runtime.sendMessage === "function"
+        )
+      ) {
+        reject(new Error("chrome.runtime.sendMessage is not available"));
+        return;
+      }
+
       try {
         chrome.runtime.sendMessage(
           {
             type: "GM_API_REQUEST",
             payload: { action, ...payload },
           },
           (response) => {
-            if (chrome.runtime.lastError) {
+            if (
+              typeof chrome !== "undefined" &&
+              chrome.runtime &&
+              chrome.runtime.lastError
+            ) {
               reject(new Error(chrome.runtime.lastError.message));
               return;
             }

src/GM/gm_core.js

@@ -229,35 +229,25 @@ if (window.GMBridge === undefined) {
       // Load external dependencies
       await loader.loadScripts(requireUrls);
 
-      // Wrap user code in IIFE with unsafeWindow
-      const wrappedCode = `(function() {
-  'use strict';
-  const unsafeWindow = this;
-  ${userCode}
-}).call(window);
-`;
-
-      // Create and inject script element
-      const scriptElement = document.createElement("script");
-      scriptElement.setAttribute("data-script-id", scriptId);
-
-      // Apply Trusted Types if available
       const policy = getTrustedTypesPolicy();
-      let trustedCode = wrappedCode;
-
       if (policy) {
-        try {
-          trustedCode = policy.createScript(wrappedCode);
-        } catch (error) {
-          console.error("[GMBridge] Failed to create trusted script:", error);
-        }
+        // With Trusted Types, we must use a script tag, which runs in the MAIN world.
+        // This is a known limitation for ISOLATED world scripts.
+        const wrappedCode = `(function() { 'use strict'; const unsafeWindow = this; ${userCode} }).call(window);`;
+        const scriptElement = document.createElement("script");
+        scriptElement.setAttribute("data-script-id", scriptId);
+        scriptElement.textContent = policy.createScript(wrappedCode);
+        (
+          document.head ||
+          document.documentElement ||
+          document.body
+        ).appendChild(scriptElement);
+        scriptElement.remove();
+      } else {
+        // No Trusted Types, we can execute in the current world's scope.
+        const run = new Function("unsafeWindow", userCode);
+        run.call(window, window);
       }
-
-      scriptElement.textContent = trustedCode;
-      (document.head || document.documentElement || document.body).appendChild(
-        scriptElement
-      );
-      scriptElement.remove();
     } catch (error) {
       console.error(
         `[GMBridge] Error executing user script ${scriptId}:`,

src/ai_dom_editor/editor/ai_dom_editor.js

@@ -43,6 +43,14 @@ class AIDOMEditor {
   async init() {
     applyTheme();
     await this.initializeAI();
+
+    chrome.runtime.onMessage.addListener((message) => {
+      if (message.action === "aiElementSelected") {
+        this.elements.userInput.value += ` ${message.selector} `;
+        this.elements.userInput.focus();
+        this.uiManager.deactivateElementSelector();
+      }
+    });
   }
 
   setCurrentScript(scriptName) {

src/ai_dom_editor/editor/helpers/ui_manager.js

@@ -288,7 +288,9 @@ export class UIManager {
     this.editor.elements.elementSelectorBtn.classList.add("active");
 
     chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
-      chrome.tabs.sendMessage(tabs[0].id, { action: "startSelection" });
+      if (tabs.length > 0) {
+        chrome.tabs.sendMessage(tabs[0].id, { action: "startAiSelection" });
+      }
     });
   }
 
@@ -297,7 +299,9 @@ export class UIManager {
     this.editor.elements.elementSelectorBtn.classList.remove("active");
 
     chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
-      chrome.tabs.sendMessage(tabs[0].id, { action: "stopSelection" });
+      if (tabs.length > 0) {
+        chrome.tabs.sendMessage(tabs[0].id, { action: "stopSelection" });
+      }
     });
   }