github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-21 07:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(browser): avoid ambiguous target selection after renderer swap

Browse Source
This commit is contained in:
Vincent Koc
2026-02-28 09:18:28 -08:00
parent 339a06c3c0
commit b33d8b8b40
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/browser/routes/agent.snapshot.ts
View File

@@ -54,26 +54,35 @@ export async function resolveTargetIdAfterNavigate(opts: {
navigatedUrl: string;
listTabs: () => Promise<Array<{ targetId: string; url: string }>>;
}): Promise<string> {
const pickUrlMatch = (tabs: Array<{ targetId: string; url: string }>) => {
const byUrl = tabs.filter((t) => t.url === opts.navigatedUrl);
const nonOld = byUrl.filter((t) => t.targetId !== opts.oldTargetId);
if (nonOld.length === 1) {
return { targetId: nonOld[0]?.targetId, ambiguous: false };
}
if (byUrl.length > 1) {
return { targetId: undefined, ambiguous: true };
}
return { targetId: byUrl[0]?.targetId, ambiguous: false };
};
let currentTargetId = opts.oldTargetId;
try {
const refreshed = await opts.listTabs();
if (!refreshed.some((t) => t.targetId === opts.oldTargetId)) {
// Renderer swap: old target gone, resolve the replacement.
// Prefer a URL match whose targetId differs from the old one
// to avoid picking a pre-existing tab when multiple share the URL.
const byUrl = refreshed.filter((t) => t.url === opts.navigatedUrl);
const replaced = byUrl.find((t) => t.targetId !== opts.oldTargetId) ?? byUrl[0];
if (replaced) {
currentTargetId = replaced.targetId;
const firstAttempt = pickUrlMatch(refreshed);
if (firstAttempt.targetId) {
currentTargetId = firstAttempt.targetId;
} else {
await new Promise((r) => setTimeout(r, 800));
const retried = await opts.listTabs();
const match =
retried.find((t) => t.url === opts.navigatedUrl && t.targetId !== opts.oldTargetId) ??
retried.find((t) => t.url === opts.navigatedUrl) ??
(retried.length === 1 ? retried[0] : null);
if (match) {
currentTargetId = match.targetId;
const secondAttempt = pickUrlMatch(retried);
if (secondAttempt.targetId) {
currentTargetId = secondAttempt.targetId;
} else if (!firstAttempt.ambiguous && !secondAttempt.ambiguous && retried.length === 1) {
// Extension relay can briefly expose a single tab without the final URL set yet.
currentTargetId = retried[0].targetId;
}
}
}