Release claim after final visibility loss

Author: esokullu

src/chrome/src/ui/sidepanel.js

@@ -7104,6 +7104,20 @@ async function sendMessage(extraChatParams = {}) {
     return false;
   }
 
+  let renewedContextMenuClaim = false;
+  const releaseRenewedContextMenuClaim = async () => {
+    if (!renewedContextMenuClaim) return;
+    renewedContextMenuClaim = false;
+    try {
+      await sendToBackground('release_context_menu_prompt_claim', {
+        tabId,
+        promptId: contextMenuClaim.promptId,
+        claimantId: contextMenuClaim.claimantId,
+      });
+    } catch { /* the durable lease still expires if release fails */ }
+    onContextMenuClaimRejected?.({ reason: 'panel-hidden', retryAfterMs: 250 });
+  };
+
   if (contextMenuClaim?.promptId && contextMenuClaim?.claimantId) {
     let renewedClaim = null;
     try {
@@ -7115,18 +7129,12 @@ async function sendMessage(extraChatParams = {}) {
     } catch {
       renewedClaim = { claimed: false, reason: 'connection', retryAfterMs: 1_000 };
     }
+    renewedContextMenuClaim = renewedClaim?.claimed === true;
     const claimStillVisible = document.visibilityState !== 'hidden'
       && sameTabId(currentTabId, tabId)
       && sameTabId(renderedTabId, tabId);
-    if (renewedClaim?.claimed && !claimStillVisible) {
-      try {
-        await sendToBackground('release_context_menu_prompt_claim', {
-          tabId,
-          promptId: contextMenuClaim.promptId,
-          claimantId: contextMenuClaim.claimantId,
-        });
-      } catch { /* the durable lease still expires if release fails */ }
-      onContextMenuClaimRejected?.({ reason: 'panel-hidden', retryAfterMs: 250 });
+    if (renewedContextMenuClaim && !claimStillVisible) {
+      await releaseRenewedContextMenuClaim();
       setTabProcessing(tabId, false);
       setTabAbortRequested(tabId, false);
       if (sameTabId(currentTabId, tabId)) syncSendButtonState();
@@ -7148,6 +7156,7 @@ async function sendMessage(extraChatParams = {}) {
     && sameTabId(currentTabId, tabId)
     && sameTabId(renderedTabId, tabId);
   if (!renderToCurrentTab) {
+    await releaseRenewedContextMenuClaim();
     if (text) saveInputDraftForTab(tabId, text);
     setTabProcessing(tabId, false);
     setTabAbortRequested(tabId, false);

src/firefox/src/ui/sidepanel.js

@@ -6835,6 +6835,20 @@ async function sendMessage(extraChatParams = {}) {
     return false;
   }
 
+  let renewedContextMenuClaim = false;
+  const releaseRenewedContextMenuClaim = async () => {
+    if (!renewedContextMenuClaim) return;
+    renewedContextMenuClaim = false;
+    try {
+      await sendToBackground('release_context_menu_prompt_claim', {
+        tabId,
+        promptId: contextMenuClaim.promptId,
+        claimantId: contextMenuClaim.claimantId,
+      });
+    } catch { /* the durable lease still expires if release fails */ }
+    onContextMenuClaimRejected?.({ reason: 'panel-hidden', retryAfterMs: 250 });
+  };
+
   if (contextMenuClaim?.promptId && contextMenuClaim?.claimantId) {
     let renewedClaim = null;
     try {
@@ -6846,18 +6860,12 @@ async function sendMessage(extraChatParams = {}) {
     } catch {
       renewedClaim = { claimed: false, reason: 'connection', retryAfterMs: 1_000 };
     }
+    renewedContextMenuClaim = renewedClaim?.claimed === true;
     const claimStillVisible = document.visibilityState !== 'hidden'
       && sameTabId(currentTabId, tabId)
       && sameTabId(renderedTabId, tabId);
-    if (renewedClaim?.claimed && !claimStillVisible) {
-      try {
-        await sendToBackground('release_context_menu_prompt_claim', {
-          tabId,
-          promptId: contextMenuClaim.promptId,
-          claimantId: contextMenuClaim.claimantId,
-        });
-      } catch { /* the durable lease still expires if release fails */ }
-      onContextMenuClaimRejected?.({ reason: 'panel-hidden', retryAfterMs: 250 });
+    if (renewedContextMenuClaim && !claimStillVisible) {
+      await releaseRenewedContextMenuClaim();
       setTabProcessing(tabId, false);
       setTabAbortRequested(tabId, false);
       if (sameTabId(currentTabId, tabId)) syncSendButtonState();
@@ -6879,6 +6887,7 @@ async function sendMessage(extraChatParams = {}) {
     && sameTabId(currentTabId, tabId)
     && sameTabId(renderedTabId, tabId);
   if (!renderToCurrentTab) {
+    await releaseRenewedContextMenuClaim();
     if (text) saveInputDraftForTab(tabId, text);
     setTabProcessing(tabId, false);
     setTabAbortRequested(tabId, false);

test/run.js

@@ -21869,8 +21869,25 @@ test('context-menu ownership and stale-panel persistence guards are wired in bot
     );
     assert.match(
       panel,
-      /await prepareChatHistoryForTurn\(tabId, modeForSend\);[\s\S]*?renderToCurrentTab = document\.visibilityState !== 'hidden'[\s\S]*?sendToBackground\('claim_context_menu_prompt',[\s\S]*?const claimStillVisible = document\.visibilityState !== 'hidden'[\s\S]*?release_context_menu_prompt_claim[\s\S]*?let userEl = null;/,
-      `${label}: context-menu ownership should require visibility around renewal and be released before a hidden panel can start`,
+      /const releaseRenewedContextMenuClaim = async \(\) => \{[\s\S]*?renewedContextMenuClaim = false;[\s\S]*?release_context_menu_prompt_claim[\s\S]*?onContextMenuClaimRejected\?\.\(\{ reason: 'panel-hidden', retryAfterMs: 250 \}\);[\s\S]*?renewedContextMenuClaim = renewedClaim\?\.claimed === true;/,
+      `${label}: renewed ownership should have one idempotent release-and-retry path`,
+    );
+    const sendMessageStart = panel.indexOf('async function sendMessage(extraChatParams = {}) {');
+    const sendMessageEnd = panel.indexOf(
+      label === 'chrome' ? '\nfunction formatRecordTimer(' : '\nfunction ensureCurrentRunAssistant(',
+      sendMessageStart,
+    );
+    assert.notEqual(sendMessageEnd, -1, `${label}: sendMessage boundary should remain inspectable`);
+    const sendMessageBody = panel.slice(sendMessageStart, sendMessageEnd);
+    assert.equal(
+      (sendMessageBody.match(/await releaseRenewedContextMenuClaim\(\);/g) || []).length,
+      2,
+      `${label}: both visibility checks after renewal should release the claim and schedule retry`,
+    );
+    assert.match(
+      sendMessageBody,
+      /renewedContextMenuClaim = renewedClaim\?\.claimed === true;[\s\S]*?const claimStillVisible[\s\S]*?if \(renewedContextMenuClaim && !claimStillVisible\) \{[\s\S]*?await releaseRenewedContextMenuClaim\(\);[\s\S]*?renderToCurrentTab = document\.visibilityState !== 'hidden'[\s\S]*?if \(!renderToCurrentTab\) \{\s*await releaseRenewedContextMenuClaim\(\);/,
+      `${label}: the final post-renewal visibility failure should relinquish ownership before returning`,
     );
   }
 });