Skip to content

Open-source AI browser agent for Chrome and Firefox (monorepo) 🧠

fix: preserve timeout guard across safe-first clarifications

Emre Sokullu7c138a76fbd7
diff --git a/src/chrome/src/agent/agent.js b/src/chrome/src/agent/agent.js
index 4be56520e..ad9720fad 100644
--- a/src/chrome/src/agent/agent.js
+++ b/src/chrome/src/agent/agent.js
@@ -16721,13 +16721,14 @@ Rules: no prose intro, no conclusion, no "this screenshot shows...", no layout d
async _recordClarificationAuthorization(tabId, source, safeFirst = false) {
const normalizedSource = source === 'timeout' ? 'timeout' : (source === 'auto' ? 'auto' : 'user');
- const timedOutAffirmative = normalizedSource === 'timeout' && safeFirst === true;
+ const conversationId = this.conversationIds.get(tabId) || null;
+ const previous = this._clarificationAuthorizationGuards.get(tabId);
+ const priorTimeoutGuard = previous?.source === 'timeout'
+ && previous?.authorized === false
+ && previous?.conversationId === conversationId;
+ const timedOutAffirmative = normalizedSource === 'timeout' && safeFirst === true && !priorTimeoutGuard;
if (normalizedSource === 'timeout' && !timedOutAffirmative) {
- const conversationId = this.conversationIds.get(tabId) || null;
- const previous = this._clarificationAuthorizationGuards.get(tabId);
- const blockedAttempts = previous?.source === 'timeout'
- && previous?.authorized === false
- && previous?.conversationId === conversationId
+ const blockedAttempts = priorTimeoutGuard
? Math.max(0, Number(previous.blockedAttempts) || 0)
: 0;
this._clarificationAuthorizationGuards.set(tabId, {
@@ -16750,10 +16751,6 @@ Rules: no prose intro, no conclusion, no "this screenshot shows...", no layout d
return normalizedSource !== 'timeout' || timedOutAffirmative;
}
- _clarificationTimeoutAuthorized(source, safeFirst = false) {
- return source !== 'timeout' || safeFirst === true;
- }
-
_prepareClarificationAuthorizationForRun(tabId) {
const guard = this._clarificationAuthorizationGuards.get(tabId);
if (!guard) return;
diff --git a/src/firefox/src/agent/agent.js b/src/firefox/src/agent/agent.js
index 2062498a6..1d058b692 100644
--- a/src/firefox/src/agent/agent.js
+++ b/src/firefox/src/agent/agent.js
@@ -14489,13 +14489,14 @@ Rules: no prose intro, no conclusion, no "this screenshot shows...", no layout d
async _recordClarificationAuthorization(tabId, source, safeFirst = false) {
const normalizedSource = source === 'timeout' ? 'timeout' : (source === 'auto' ? 'auto' : 'user');
- const timedOutAffirmative = normalizedSource === 'timeout' && safeFirst === true;
+ const conversationId = this.conversationIds.get(tabId) || null;
+ const previous = this._clarificationAuthorizationGuards.get(tabId);
+ const priorTimeoutGuard = previous?.source === 'timeout'
+ && previous?.authorized === false
+ && previous?.conversationId === conversationId;
+ const timedOutAffirmative = normalizedSource === 'timeout' && safeFirst === true && !priorTimeoutGuard;
if (normalizedSource === 'timeout' && !timedOutAffirmative) {
- const conversationId = this.conversationIds.get(tabId) || null;
- const previous = this._clarificationAuthorizationGuards.get(tabId);
- const blockedAttempts = previous?.source === 'timeout'
- && previous?.authorized === false
- && previous?.conversationId === conversationId
+ const blockedAttempts = priorTimeoutGuard
? Math.max(0, Number(previous.blockedAttempts) || 0)
: 0;
this._clarificationAuthorizationGuards.set(tabId, {
@@ -14518,10 +14519,6 @@ Rules: no prose intro, no conclusion, no "this screenshot shows...", no layout d
return normalizedSource !== 'timeout' || timedOutAffirmative;
}
- _clarificationTimeoutAuthorized(source, safeFirst = false) {
- return source !== 'timeout' || safeFirst === true;
- }
-
_prepareClarificationAuthorizationForRun(tabId) {
const guard = this._clarificationAuthorizationGuards.get(tabId);
if (!guard) return;
diff --git a/test/run.js b/test/run.js
index 39892166d..02569d02d 100644
--- a/test/run.js
+++ b/test/run.js
@@ -48775,6 +48775,29 @@ test('clarify result distinguishes waited timeout from user and Instant authoriz
assert.equal(waitedTimeout.requiresExplicitConfirmation, true, `${AgentClass.name}: timeout did not require an explicit answer`);
assert.equal(agent._clarificationAuthorizationGuards.get(tabId)?.authorized, false, `${AgentClass.name}: timeout guard was not armed`);
+ const guardedSafeFirst = await agent.executeTool(
+ tabId,
+ 'clarify',
+ { question: 'Continue browsing?', options: ['Continue browsing', 'Stop'], safe_first: true },
+ (type, data) => {
+ if (type === 'clarify') agent.submitClarifyResponse(tabId, data.clarifyId, 'Continue browsing', 'timeout');
+ },
+ );
+ assert.equal(guardedSafeFirst.authorized, false, `${AgentClass.name}: later safe_first timeout cleared an existing guard`);
+ assert.equal(agent._clarificationAuthorizationGuards.get(tabId)?.authorized, false, `${AgentClass.name}: later safe_first timeout removed an existing guard`);
+
+ const userReply = await agent.executeTool(
+ tabId,
+ 'clarify',
+ { question: 'Which record?', options: ['First', 'Second'] },
+ (type, data) => {
+ if (type === 'clarify') agent.submitClarifyResponse(tabId, data.clarifyId, 'Second', 'user');
+ },
+ );
+ assert.equal(userReply.authorized, true, `${AgentClass.name}: direct user reply was not authorized`);
+ assert.equal(userReply.requiresExplicitConfirmation, false, `${AgentClass.name}: direct reply kept the timeout warning`);
+ assert.equal(agent._clarificationAuthorizationGuards.has(tabId), false, `${AgentClass.name}: direct reply did not clear the timeout guard`);
+
const affirmativeTimeout = await agent.executeTool(
tabId,
'clarify',
@@ -48809,18 +48832,6 @@ test('clarify result distinguishes waited timeout from user and Instant authoriz
);
assert.equal(emptyOptionsTimeout.authorized, false, `${AgentClass.name}: safe_first without options was accepted`);
- const userReply = await agent.executeTool(
- tabId,
- 'clarify',
- { question: 'Which record?', options: ['First', 'Second'] },
- (type, data) => {
- if (type === 'clarify') agent.submitClarifyResponse(tabId, data.clarifyId, 'Second', 'user');
- },
- );
- assert.equal(userReply.authorized, true, `${AgentClass.name}: direct user reply was not authorized`);
- assert.equal(userReply.requiresExplicitConfirmation, false, `${AgentClass.name}: direct reply kept the timeout warning`);
- assert.equal(agent._clarificationAuthorizationGuards.has(tabId), false, `${AgentClass.name}: direct reply did not clear the timeout guard`);
-
agent.clarifyTimeoutSec = 0;
const instant = await agent.executeTool(
tabId,