From 1e3db9c894509531a40de5ae18427f11c9e0a7cc Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Mon, 29 Dec 2025 16:50:27 -0500
Subject: [PATCH] Some web fixes.

---
 src/cthulhu/scripts/web/script.py           | 43 ++++++++++++++-------
 src/cthulhu/scripts/web/script_utilities.py | 10 ++++-
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/cthulhu/scripts/web/script.py b/src/cthulhu/scripts/web/script.py
index d526e98..d654447 100644
--- a/src/cthulhu/scripts/web/script.py
+++ b/src/cthulhu/scripts/web/script.py
@@ -131,7 +131,7 @@ class Script(default.Script):
 
         focus = cthulhu_state.locusOfFocus
         inApp = AXObject.get_application(focus) == self.app if focus else False
-        inDoc = self.utilities.inDocumentContent(focus)
+        inDoc = self._focusInDocumentContent()
         suspend = not (inDoc and inApp)
         reason = f"script activation, not in document content in this app: {suspend}"
 
@@ -179,6 +179,13 @@ class Script(default.Script):
         tokens = ["WEB: Navigation suspended:", suspend, reason]
         debug.printTokens(debug.LEVEL_INFO, tokens, True)
 
+    def _focusInDocumentContent(self):
+        focus = cthulhu_state.locusOfFocus
+        if not focus or AXObject.is_dead(focus):
+            return False
+
+        return self.utilities.getDocumentForObject(focus) is not None
+
     def getAppKeyBindings(self):
         """Returns the application-specific keybindings for this script."""
 
@@ -1211,13 +1218,18 @@ class Script(default.Script):
                 debug.printMessage(debug.LEVEL_INFO, msg, True)
             return False
 
-        if self._navSuspended:
-            if debugOutput:
-                msg = "WEB: Not using caret navigation: navigation suspended."
-                debug.printMessage(debug.LEVEL_INFO, msg, True)
-            return False
+        inDoc = self._focusInDocumentContent()
 
-        if not self.utilities.inDocumentContent():
+        if self._navSuspended:
+            if inDoc:
+                self._setNavigationSuspended(False, "focus confirmed in document content")
+            else:
+                if debugOutput:
+                    msg = "WEB: Not using caret navigation: navigation suspended."
+                    debug.printMessage(debug.LEVEL_INFO, msg, True)
+                return False
+
+        if not inDoc:
             if debugOutput:
                 tokens = ["WEB: Not using caret navigation: locusOfFocus",
                           cthulhu_state.locusOfFocus, "is not in document content."]
@@ -1251,13 +1263,18 @@ class Script(default.Script):
                 debug.printMessage(debug.LEVEL_INFO, msg, True)
             return False
 
-        if self._navSuspended:
-            if debugOutput:
-                msg = "WEB: Not using structural navigation: navigation suspended."
-                debug.printMessage(debug.LEVEL_INFO, msg, True)
-            return False
+        inDoc = self._focusInDocumentContent()
 
-        if not self.utilities.inDocumentContent():
+        if self._navSuspended:
+            if inDoc:
+                self._setNavigationSuspended(False, "focus confirmed in document content")
+            else:
+                if debugOutput:
+                    msg = "WEB: Not using structural navigation: navigation suspended."
+                    debug.printMessage(debug.LEVEL_INFO, msg, True)
+                return False
+
+        if not inDoc:
             if debugOutput:
                 tokens = ["WEB: Not using structural navigation: locusOfFocus",
                           cthulhu_state.locusOfFocus, "is not in document content."]
diff --git a/src/cthulhu/scripts/web/script_utilities.py b/src/cthulhu/scripts/web/script_utilities.py
index d1993f6..466b3d1 100644
--- a/src/cthulhu/scripts/web/script_utilities.py
+++ b/src/cthulhu/scripts/web/script_utilities.py
@@ -324,6 +324,10 @@ class Utilities(script_utilities.Utilities):
                 and AXDocument.get_uri(obj)
             )
 
+        focusDoc = self.getTopLevelDocumentForObject(cthulhu_state.locusOfFocus)
+        if focusDoc and AXObject.is_dead(focusDoc):
+            focusDoc = None
+
         if len(documents) == 1:
             document = documents[0]
             if documentHasUri(document):
@@ -335,12 +339,16 @@ class Utilities(script_utilities.Utilities):
                 debug.printTokens(debug.LEVEL_INFO, tokens, True)
                 return fallback
 
+            if focusDoc and documentHasUri(focusDoc):
+                tokens = ["WEB: Single showing document lacks URI, using focus-based document:", focusDoc]
+                debug.printTokens(debug.LEVEL_INFO, tokens, True)
+                return focusDoc
+
             return document
 
         # If multiple documents are showing (e.g., multi-tab browser), use the
         # locus of focus to determine which document is currently active.
         if documents:
-            focusDoc = self.getTopLevelDocumentForObject(cthulhu_state.locusOfFocus)
             if focusDoc in documents and documentHasUri(focusDoc):
                 tokens = ["WEB: Multiple showing documents, using focus-based document:", focusDoc]
                 debug.printTokens(debug.LEVEL_INFO, tokens, True)