Skip to content

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

fix(guard): preserve negation across comma-delimited parentheticals

Emre Sokulluf57239884928
diff --git a/src/chrome/src/agent/message-recipient-guard.js b/src/chrome/src/agent/message-recipient-guard.js
index c5c57d3c3..d9b68958a 100644
--- a/src/chrome/src/agent/message-recipient-guard.js
+++ b/src/chrome/src/agent/message-recipient-guard.js
@@ -299,6 +299,27 @@ export function clarificationAuthorizesRecipientRole(clarifyContext, answer, can
return negationRe.test(str);
}
+ function prefixHasNegation(fullPrefix, prefix) {
+ if (hasNegation(prefix)) return true;
+ if (!fullPrefix) return false;
+ const boundaryRe = /[;\n\r|]|(?:\b(?:but|however|yet|instead\s+of|rather\s+than|whereas|while|whilst)\b)|(?:而不是|而非)/gi;
+ let lastBoundary = 0;
+ let m;
+ while ((m = boundaryRe.exec(fullPrefix)) !== null) {
+ lastBoundary = m.index + m[0].length;
+ }
+ const segment = fullPrefix.slice(lastBoundary);
+ const parts = segment.split(/[,,]/);
+ let relevantStart = 0;
+ for (let i = 0; i < parts.length - 1; i++) {
+ if (roleWordsRe.test(parts[i])) {
+ relevantStart = parts.slice(0, i + 1).join(',').length + 1;
+ }
+ }
+ const relevantPrefix = segment.slice(relevantStart);
+ return hasNegation(relevantPrefix);
+ }
+
function isPrecededByNegatedCoordGroup(fullPrefix) {
const coordTrailingRe = /(?:[,;,;和]|(?:\s+(?:\b(?:and|or)\b|以及|与|及)\s*))\s*$/i;
if (!coordTrailingRe.test(fullPrefix)) return false;
@@ -358,14 +379,14 @@ export function clarificationAuthorizesRecipientRole(clarifyContext, answer, can
const fullPrefix = answerText.slice(0, span.start);
if (prefixPatterns[roleToCheck].test(prefix)) {
- if (!hasNegation(prefix)) {
+ if (!prefixHasNegation(fullPrefix, prefix)) {
return true;
}
}
const suffixMatch = suffix.match(suffixPatterns[roleToCheck]);
if (suffixMatch) {
- if (!hasNegation(prefix) && !hasNegation(suffixMatch[0]) && !isPrecededByNegatedCoordGroup(fullPrefix)) {
+ if (!prefixHasNegation(fullPrefix, prefix) && !hasNegation(suffixMatch[0]) && !isPrecededByNegatedCoordGroup(fullPrefix)) {
return true;
}
}
@@ -377,7 +398,7 @@ export function clarificationAuthorizesRecipientRole(clarifyContext, answer, can
const intervening = fullSuffix.slice(0, coordMatch.index + coordMatch[0].length - coordMatch[1].length);
const rolePart = coordMatch[1];
if (!roleWordsRe.test(intervening) && suffixPatterns[roleToCheck].test(rolePart)) {
- if (!hasNegation(prefix) && !hasNegation(intervening) && !hasNegation(rolePart) && !isPrecededByNegatedCoordGroup(fullPrefix)) {
+ if (!prefixHasNegation(fullPrefix, prefix) && !hasNegation(intervening) && !hasNegation(rolePart) && !isPrecededByNegatedCoordGroup(fullPrefix)) {
return true;
}
}
@@ -390,7 +411,7 @@ export function clarificationAuthorizesRecipientRole(clarifyContext, answer, can
const intervening = prefixCoordMatch[0].slice(roleLeader.length);
if (!roleWordsRe.test(intervening) && prefixPatterns[roleToCheck].test(roleLeader)) {
const beforeLeader = fullPrefix.slice(0, fullPrefix.length - prefixCoordMatch[0].length);
- if (!hasNegation(beforeLeader) && !hasNegation(roleLeader) && !hasNegation(intervening)) {
+ if (!prefixHasNegation(beforeLeader, beforeLeader) && !hasNegation(roleLeader) && !hasNegation(intervening)) {
return true;
}
}
diff --git a/src/firefox/src/agent/message-recipient-guard.js b/src/firefox/src/agent/message-recipient-guard.js
index c5c57d3c3..d9b68958a 100644
--- a/src/firefox/src/agent/message-recipient-guard.js
+++ b/src/firefox/src/agent/message-recipient-guard.js
@@ -299,6 +299,27 @@ export function clarificationAuthorizesRecipientRole(clarifyContext, answer, can
return negationRe.test(str);
}
+ function prefixHasNegation(fullPrefix, prefix) {
+ if (hasNegation(prefix)) return true;
+ if (!fullPrefix) return false;
+ const boundaryRe = /[;\n\r|]|(?:\b(?:but|however|yet|instead\s+of|rather\s+than|whereas|while|whilst)\b)|(?:而不是|而非)/gi;
+ let lastBoundary = 0;
+ let m;
+ while ((m = boundaryRe.exec(fullPrefix)) !== null) {
+ lastBoundary = m.index + m[0].length;
+ }
+ const segment = fullPrefix.slice(lastBoundary);
+ const parts = segment.split(/[,,]/);
+ let relevantStart = 0;
+ for (let i = 0; i < parts.length - 1; i++) {
+ if (roleWordsRe.test(parts[i])) {
+ relevantStart = parts.slice(0, i + 1).join(',').length + 1;
+ }
+ }
+ const relevantPrefix = segment.slice(relevantStart);
+ return hasNegation(relevantPrefix);
+ }
+
function isPrecededByNegatedCoordGroup(fullPrefix) {
const coordTrailingRe = /(?:[,;,;和]|(?:\s+(?:\b(?:and|or)\b|以及|与|及)\s*))\s*$/i;
if (!coordTrailingRe.test(fullPrefix)) return false;
@@ -358,14 +379,14 @@ export function clarificationAuthorizesRecipientRole(clarifyContext, answer, can
const fullPrefix = answerText.slice(0, span.start);
if (prefixPatterns[roleToCheck].test(prefix)) {
- if (!hasNegation(prefix)) {
+ if (!prefixHasNegation(fullPrefix, prefix)) {
return true;
}
}
const suffixMatch = suffix.match(suffixPatterns[roleToCheck]);
if (suffixMatch) {
- if (!hasNegation(prefix) && !hasNegation(suffixMatch[0]) && !isPrecededByNegatedCoordGroup(fullPrefix)) {
+ if (!prefixHasNegation(fullPrefix, prefix) && !hasNegation(suffixMatch[0]) && !isPrecededByNegatedCoordGroup(fullPrefix)) {
return true;
}
}
@@ -377,7 +398,7 @@ export function clarificationAuthorizesRecipientRole(clarifyContext, answer, can
const intervening = fullSuffix.slice(0, coordMatch.index + coordMatch[0].length - coordMatch[1].length);
const rolePart = coordMatch[1];
if (!roleWordsRe.test(intervening) && suffixPatterns[roleToCheck].test(rolePart)) {
- if (!hasNegation(prefix) && !hasNegation(intervening) && !hasNegation(rolePart) && !isPrecededByNegatedCoordGroup(fullPrefix)) {
+ if (!prefixHasNegation(fullPrefix, prefix) && !hasNegation(intervening) && !hasNegation(rolePart) && !isPrecededByNegatedCoordGroup(fullPrefix)) {
return true;
}
}
@@ -390,7 +411,7 @@ export function clarificationAuthorizesRecipientRole(clarifyContext, answer, can
const intervening = prefixCoordMatch[0].slice(roleLeader.length);
if (!roleWordsRe.test(intervening) && prefixPatterns[roleToCheck].test(roleLeader)) {
const beforeLeader = fullPrefix.slice(0, fullPrefix.length - prefixCoordMatch[0].length);
- if (!hasNegation(beforeLeader) && !hasNegation(roleLeader) && !hasNegation(intervening)) {
+ if (!prefixHasNegation(beforeLeader, beforeLeader) && !hasNegation(roleLeader) && !hasNegation(intervening)) {
return true;
}
}
diff --git a/test/run.js b/test/run.js
index 6439bfcb3..ed0602d25 100644
--- a/test/run.js
+++ b/test/run.js
@@ -4991,6 +4991,11 @@ test('direct-message recipient guard uses structured intent and exact active ide
false,
'conflicting role phrase "To: Alice; actually BCC: Alice" must not authorize BCC for Alice',
);
+ assert.equal(
+ helper.clarificationAuthorizesRecipientRole(null, 'Do not, under any circumstances, put Alice in To', 'Alice', 'to'),
+ false,
+ 'emphasized denial across commas "Do not, under any circumstances, put Alice in To" must not authorize To for Alice',
+ );
assert.deepEqual(
helper.resolveClarifiedRecipients(
[