Reject expired context-menu reservations

Author: esokullu

src/chrome/src/context-menu-storage.js

@@ -261,7 +261,7 @@ export function createContextMenuStorage(getStore) {
     });
   }
 
-  async function reserve(tabId, promptId, claimantId, onReserve) {
+  async function reserve(tabId, promptId, claimantId, onReserve, now = Date.now()) {
     const normalizedPromptId = String(promptId || '');
     const normalizedClaimantId = String(claimantId || '');
     if (!normalizedPromptId || !normalizedClaimantId || typeof onReserve !== 'function') {
@@ -291,12 +291,14 @@ export function createContextMenuStorage(getStore) {
       }
       const samePrompt = String(activeClaim?.promptId || '') === normalizedPromptId;
       const sameClaimant = String(activeClaim?.claimantId || '') === normalizedClaimantId;
-      if (!samePrompt || !sameClaimant) {
+      const leaseExpiresAt = Number(activeClaim?.expiresAt || 0);
+      const activeLease = leaseExpiresAt > Number(now);
+      if (!samePrompt || !sameClaimant || !activeLease) {
         return {
           ok: true,
           reserved: false,
-          reason: activeClaim ? 'leased' : 'claim-lost',
-          leaseExpiresAt: Number(activeClaim?.expiresAt || 0) || undefined,
+          reason: activeClaim && activeLease ? 'leased' : 'claim-lost',
+          leaseExpiresAt: leaseExpiresAt || undefined,
         };
       }
 

src/firefox/src/context-menu-storage.js

@@ -261,7 +261,7 @@ export function createContextMenuStorage(getStore) {
     });
   }
 
-  async function reserve(tabId, promptId, claimantId, onReserve) {
+  async function reserve(tabId, promptId, claimantId, onReserve, now = Date.now()) {
     const normalizedPromptId = String(promptId || '');
     const normalizedClaimantId = String(claimantId || '');
     if (!normalizedPromptId || !normalizedClaimantId || typeof onReserve !== 'function') {
@@ -291,12 +291,14 @@ export function createContextMenuStorage(getStore) {
       }
       const samePrompt = String(activeClaim?.promptId || '') === normalizedPromptId;
       const sameClaimant = String(activeClaim?.claimantId || '') === normalizedClaimantId;
-      if (!samePrompt || !sameClaimant) {
+      const leaseExpiresAt = Number(activeClaim?.expiresAt || 0);
+      const activeLease = leaseExpiresAt > Number(now);
+      if (!samePrompt || !sameClaimant || !activeLease) {
         return {
           ok: true,
           reserved: false,
-          reason: activeClaim ? 'leased' : 'claim-lost',
-          leaseExpiresAt: Number(activeClaim?.expiresAt || 0) || undefined,
+          reason: activeClaim && activeLease ? 'leased' : 'claim-lost',
+          leaseExpiresAt: leaseExpiresAt || undefined,
         };
       }
 

test/run.js

@@ -21926,19 +21926,29 @@ test('context-menu prompt storage enforces a durable expiring lease', async () =
     assert.equal(data.get(storage.claimKey(prompt.tabId))?.claimantId, 'panel-b', `${label}: the durable claim should record the current owner`);
 
     let reservations = 0;
+    const reservationTime = takeover.leaseExpiresAt - 1;
     const staleOwner = await storage.reserve(prompt.tabId, prompt.id, 'panel-a', () => {
       reservations += 1;
       return { accepted: true };
-    });
+    }, reservationTime);
     const currentOwner = await storage.reserve(prompt.tabId, prompt.id, 'panel-b', () => {
       reservations += 1;
       return { accepted: true, requestId: 'reserved-run' };
-    });
+    }, reservationTime);
     assert.equal(staleOwner.reserved, false, `${label}: an expired prior owner must not reserve the run after takeover`);
     assert.equal(currentOwner.reserved, true, `${label}: the current claimant should reserve the run`);
     assert.equal(currentOwner.requestId, 'reserved-run', `${label}: reservation should return the detached-run acknowledgement`);
     assert.equal(reservations, 1, `${label}: ownership validation and the run reservation callback should be exactly once`);
 
+    const expiredOwner = await storage.reserve(prompt.tabId, prompt.id, 'panel-b', () => {
+      reservations += 1;
+      return { accepted: true };
+    }, takeover.leaseExpiresAt);
+    assert.equal(expiredOwner.reserved, false, `${label}: a claimant must not reserve at or after lease expiry`);
+    assert.equal(expiredOwner.reason, 'claim-lost', `${label}: expired ownership should require a fresh claim`);
+    assert.equal(expiredOwner.leaseExpiresAt, takeover.leaseExpiresAt, `${label}: expiry rejection should retain retry timing`);
+    assert.equal(reservations, 1, `${label}: an expired claimant must not invoke the run reservation callback`);
+
     const released = await storage.release(prompt.tabId, prompt.id, 'panel-b');
     assert.equal(released.released, true, `${label}: a panel that becomes hidden should relinquish its lease`);
     assert.equal(released.prompt?.id, prompt.id, `${label}: releasing ownership must retain the durable prompt`);