aurix-ai 2.7.2 → 2.7.4

package/dist/tools/Browser.js

@@ -1,8 +1,8 @@
 import { launchPersistentContext, ensureBinary } from 'cloakbrowser';
 import { homedir } from 'os';
 import { join } from 'path';
-import { readdirSync, readFileSync, unlinkSync } from 'fs';
 import { loadConfig } from '../agent/Config.js';
+import { visionClassify, readFileBase64, findGridTiles, humanClick, humanMove, humanHold, warmupBehavior, solveCaptchaGrid, autoSolveCaptcha, analyzeImageChallenge, _lastGridAnalyzeTime, bezierPoint, easeInOut, } from './captcha/index.js';
 function ok(msg, details) {
     const lines = [`[OK] ${msg}`];
     if (details)
@@ -33,318 +33,6 @@ async function autoScreenshot(p, label) {
     catch { }
     return path;
 }
-// ─── Vision-Based Captcha Auto-Solve ──────────────────────────────────────
-let _lastGridAnalyzeTime = 0;
-function readFileBase64(path) {
-    return readFileSync(path).toString('base64');
-}
-async function visionClassify(imageBase64, prompt) {
-    const config = loadConfig();
-    const visionModel = config.visionModel || config.model || 'gpt-4o';
-    const visionBaseUrl = config.visionBaseUrl || config.baseUrl;
-    const visionApiKey = config.visionApiKey || config.apiKey;
-    const body = {
-        model: visionModel,
-        messages: [{
-                role: 'user',
-                content: [
-                    { type: 'text', text: prompt },
-                    { type: 'image_url', image_url: { url: `data:image/png;base64,${imageBase64}` } },
-                ],
-            }],
-        max_tokens: 100,
-    };
-    const controller = new AbortController();
-    const fetchTimeout = setTimeout(() => controller.abort(), 15_000);
-    try {
-        const resp = await fetch(`${visionBaseUrl}/chat/completions`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                ...(visionApiKey ? { Authorization: `Bearer ${visionApiKey}` } : {}),
-            },
-            body: JSON.stringify(body),
-            signal: controller.signal,
-        });
-        if (!resp.ok)
-            throw new Error(`Vision API error: ${resp.status}`);
-        const text = await resp.text();
-        if (text.includes('data: ')) {
-            let content = '';
-            for (const line of text.split('\n')) {
-                if (line.startsWith('data: ') && line.trim() !== 'data: [DONE]') {
-                    try {
-                        const ev = JSON.parse(line.slice(6));
-                        const delta = ev.choices?.[0]?.delta;
-                        if (delta?.content)
-                            content += delta.content;
-                        if (delta?.text)
-                            content += delta.text;
-                        if (ev.choices?.[0]?.message?.content)
-                            content += ev.choices[0].message.content;
-                    }
-                    catch { }
-                }
-            }
-            return content.trim();
-        }
-        const json = JSON.parse(text);
-        return (json.choices?.[0]?.message?.content || '').trim();
-    }
-    finally {
-        clearTimeout(fetchTimeout);
-    }
-}
-async function solveCaptchaGrid(page, frame, provider) {
-    const results = [];
-    const isRecaptcha = provider === 'recaptcha';
-    let instruction = '';
-    try {
-        const instrEl = frame.locator('.rc-imageselect-instructions, .prompt-text, .prompt-text-h, .geetest_tip_content, .mtcaptcha-label');
-        if (await instrEl.count() > 0) {
-            instruction = (await instrEl.first().textContent() || '').trim();
-        }
-        if (!instruction) {
-            const strongText = frame.locator('strong').first();
-            if (await strongText.count() > 0)
-                instruction = (await strongText.textContent() || '').trim();
-        }
-    }
-    catch { }
-    if (!instruction) {
-        results.push('[WARN] Could not extract captcha instruction, cannot auto-solve');
-        return results.join('\n');
-    }
-    results.push(`Auto-solving: "${instruction}"`);
-    try {
-        const home = homedir();
-        for (const f of readdirSync(home)) {
-            if (/^\.aurix-tile-(\d+|after-\d+)\.png$/.test(f)) {
-                try {
-                    unlinkSync(join(home, f));
-                }
-                catch { }
-            }
-        }
-    }
-    catch { }
-    const tiles = await findGridTiles(frame, provider);
-    const gridScreenshotPath = join(homedir(), '.aurix-captcha-grid.png');
-    try {
-        const gridEl = frame.locator('.rc-imageselect-table-33, .rc-imageselect-table-44, .task, .challenge-view, table').first();
-        if (await gridEl.count() > 0)
-            await gridEl.screenshot({ path: gridScreenshotPath });
-        else
-            await frame.locator('body').screenshot({ path: gridScreenshotPath });
-    }
-    catch {
-        try {
-            await page.screenshot({ path: gridScreenshotPath });
-        }
-        catch { }
-    }
-    const classifyPrompt = `Look at this captcha grid image. The instruction is: "${instruction}". Which tile images match this instruction? Reply with ONLY the 0-based indices separated by commas (e.g. "0,3,5"). If none match, reply "none".`;
-    let matchedIndices = [];
-    try {
-        const gridBase64 = readFileBase64(gridScreenshotPath);
-        const response = await visionClassify(gridBase64, classifyPrompt);
-        results.push(`Vision model: "${response}"`);
-        if (response.toLowerCase().includes('none')) {
-            results.push('Vision: no matching tiles, clicking verify directly');
-        }
-        else {
-            matchedIndices = response.split(',')
-                .map(s => parseInt(s.trim()))
-                .filter(n => !isNaN(n) && n >= 0 && n < tiles.length);
-        }
-    }
-    catch (e) {
-        results.push(`[WARN] Vision model failed: ${e.message}`);
-        results.push('Auto-solve requires a vision-capable model. Falling back to manual mode.');
-        results.push('Use "captcha-grid" to see tiles and "click-tile" to select them manually.');
-        return results.join('\n');
-    }
-    if (matchedIndices.length === 0) {
-        results.push('No matching tiles found, attempting verify directly');
-    }
-    for (const idx of matchedIndices) {
-        try {
-            if (idx >= tiles.length)
-                continue;
-            await tiles[idx].click({ force: true, timeout: 3000 });
-            await page.waitForTimeout(200 + Math.random() * 200);
-            results.push(`  Clicked tile ${idx}`);
-        }
-        catch (e) {
-            try {
-                const currentTiles = await findGridTiles(frame, provider);
-                if (idx < currentTiles.length) {
-                    await currentTiles[idx].click({ force: true, timeout: 3000 });
-                    await page.waitForTimeout(200 + Math.random() * 200);
-                    results.push(`  Clicked tile ${idx} (re-fetched)`);
-                }
-            }
-            catch (e2) {
-                results.push(`  Failed to click tile ${idx}: ${e2.message}`);
-            }
-        }
-    }
-    if (isRecaptcha && matchedIndices.length > 0) {
-        await page.waitForTimeout(800 + Math.random() * 400);
-    }
-    results.push('Clicking verify...');
-    try {
-        let verifyBtn = frame.locator('#recaptcha-verify-button, .rc-button-submit, .button-submit, [id*="verify"]');
-        if (await verifyBtn.count() === 0) {
-            verifyBtn = frame.locator('button:has-text("Verify"), button:has-text("Next"), button:has-text("Submit")');
-        }
-        if (await verifyBtn.count() > 0) {
-            await verifyBtn.click({ force: true, timeout: 5000 });
-            await page.waitForTimeout(2000);
-            const errorText = await frame.locator('.rc-imageselect-incorrect-response, .error-message, .incorrect').count();
-            if (errorText > 0) {
-                results.push('Verification failed, challenge will retry');
-                return results.join('\n');
-            }
-            const newChallenge = await frame.locator('.rc-imageselect-instructions, .prompt-text').count();
-            if (newChallenge > 0) {
-                const newInstr = (await frame.locator('.rc-imageselect-instructions, .prompt-text').first().textContent() || '').trim();
-                if (newInstr !== instruction) {
-                    results.push(`New challenge appeared: "${newInstr}"`);
-                    return results.join('\n');
-                }
-                results.push('Same challenge still present');
-                return results.join('\n');
-            }
-            const verifyResultPath = join(homedir(), '.aurix-captcha-verify-result.png');
-            await page.screenshot({ path: verifyResultPath }).catch(() => { });
-            results.push(`[OK] Captcha solved! Screenshot: ${verifyResultPath}`);
-            return results.join('\n');
-        }
-        else {
-            results.push('[WARN] No verify button found');
-            return results.join('\n');
-        }
-    }
-    catch (e) {
-        results.push(`Verify failed: ${e.message}`);
-        return results.join('\n');
-    }
-}
-// ─── Human-Like Mouse Utilities ────────────────────────────────────────────
-function bezierPoint(t, points) {
-    if (points.length === 1)
-        return points[0];
-    const next = [];
-    for (let i = 0; i < points.length - 1; i++) {
-        next.push([
-            points[i][0] + (points[i + 1][0] - points[i][0]) * t,
-            points[i][1] + (points[i + 1][1] - points[i][1]) * t,
-        ]);
-    }
-    return bezierPoint(t, next);
-}
-function easeInOut(t) {
-    return t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t;
-}
-async function humanMove(x, y, page) {
-    const mouse = page.mouse;
-    const vp = page.viewportSize() || { width: 1280, height: 720 };
-    // Start from a random position if we don't know current pos
-    const startX = Math.random() * vp.width * 0.3;
-    const startY = Math.random() * vp.height * 0.3;
-    // Generate 2-4 control points for bezier curve
-    const numControls = 2 + Math.floor(Math.random() * 3);
-    const controlPoints = [[startX, startY]];
-    for (let i = 0; i < numControls; i++) {
-        const frac = (i + 1) / (numControls + 1);
-        const cx = startX + (x - startX) * frac + (Math.random() - 0.5) * 80;
-        const cy = startY + (y - startY) * frac + (Math.random() - 0.5) * 60;
-        controlPoints.push([cx, cy]);
-    }
-    controlPoints.push([x, y]);
-    // Step through the curve with eased timing
-    const totalSteps = 25 + Math.floor(Math.random() * 20);
-    for (let step = 0; step <= totalSteps; step++) {
-        const rawT = step / totalSteps;
-        const t = easeInOut(rawT);
-        const [px, py] = bezierPoint(t, controlPoints);
-        // Sine-wave micro-tremor (not uniform random)
-        const tremor = Math.sin(step * 0.3 + Math.random() * 0.5) * 0.4;
-        const tremorY = Math.cos(step * 0.25 + Math.random() * 0.5) * 0.3;
-        await mouse.move(px + tremor, py + tremorY);
-        // Variable step delay: faster in middle, slower at start/end
-        const speedFactor = 1 - Math.abs(rawT - 0.5) * 2;
-        const delay = 8 + Math.random() * 12 + speedFactor * 5;
-        await page.waitForTimeout(delay);
-    }
-    // Occasional overshoot + correction
-    if (Math.random() > 0.6) {
-        const overX = x + (Math.random() - 0.5) * 8;
-        const overY = y + (Math.random() - 0.5) * 8;
-        await mouse.move(overX, overY);
-        await page.waitForTimeout(30 + Math.random() * 40);
-        await mouse.move(x, y);
-        await page.waitForTimeout(20 + Math.random() * 30);
-    }
-}
-let lastWarmupTime = 0;
-async function warmupBehavior(page) {
-    const now = Date.now();
-    if (now - lastWarmupTime < 30000)
-        return;
-    lastWarmupTime = now;
-    const vp = page.viewportSize() || { width: 1280, height: 720 };
-    const spots = 1 + Math.floor(Math.random() * 2);
-    for (let i = 0; i < spots; i++) {
-        const rx = Math.random() * vp.width;
-        const ry = Math.random() * vp.height;
-        await humanMove(rx, ry, page);
-        await page.waitForTimeout(150 + Math.random() * 300);
-    }
-    if (Math.random() > 0.5) {
-        const scrollDelta = Math.floor(Math.random() * 150) - 75;
-        await page.mouse.wheel(0, scrollDelta);
-        await page.waitForTimeout(200 + Math.random() * 300);
-    }
-}
-async function humanHold(x, y, duration, page) {
-    const mouse = page.mouse;
-    const holdSteps = Math.floor(duration / 80);
-    const breathFreq = 0.15 + Math.random() * 0.1;
-    const breathAmpX = 0.3 + Math.random() * 0.4;
-    const breathAmpY = 0.2 + Math.random() * 0.3;
-    await mouse.down();
-    for (let i = 0; i < holdSteps; i++) {
-        // Sine-wave breathing movement (natural hand tremor)
-        const breathX = Math.sin(i * breathFreq) * breathAmpX;
-        const breathY = Math.cos(i * breathFreq * 0.7) * breathAmpY;
-        // Occasional micro-adjustment
-        const adjX = Math.random() > 0.95 ? (Math.random() - 0.5) * 2 : 0;
-        const adjY = Math.random() > 0.95 ? (Math.random() - 0.5) * 2 : 0;
-        await mouse.move(x + breathX + adjX, y + breathY + adjY);
-        await page.waitForTimeout(60 + Math.random() * 40);
-    }
-    // Release with slight upward drift
-    await mouse.move(x + (Math.random() - 0.5) * 3, y - 1 - Math.random() * 2);
-    await page.waitForTimeout(30 + Math.random() * 50);
-    await mouse.up();
-}
-async function humanClick(locator, page) {
-    const box = await locator.first().boundingBox();
-    if (box) {
-        const clickX = box.x + box.width * (0.3 + Math.random() * 0.4);
-        const clickY = box.y + box.height * (0.3 + Math.random() * 0.4);
-        await humanMove(clickX, clickY, page);
-        await page.waitForTimeout(60 + Math.random() * 100);
-        await page.mouse.down();
-        await page.waitForTimeout(50 + Math.random() * 80);
-        await page.mouse.up();
-    }
-    else {
-        await locator.first().click({ force: true });
-    }
-}
 const sessions = new Map();
 const sessionProxies = new Map();
 const MAX_BROWSER_SESSIONS = 3;
@@ -692,283 +380,6 @@ async function resolveLocator(p, target) {
     }
     return locator;
 }
-async function autoSolveCaptcha(p) {
-    const results = [];
-    const frames = p.frames();
-    let recaptchaAnchor = null;
-    let recaptchaBframe = null;
-    let geetestSlider = null;
-    let turnstileFrame = null;
-    for (const frame of frames) {
-        const url = frame.url();
-        if (url.includes('/recaptcha/') && url.includes('/anchor'))
-            recaptchaAnchor = frame;
-        if (url.includes('/recaptcha/') && url.includes('/bframe'))
-            recaptchaBframe = frame;
-        if (url.includes('geetest.com') || url.includes('captcha.com')) {
-            const hasSlider = await frame.locator('.geetest_slider_button, .geetest_slider').count();
-            if (hasSlider > 0)
-                geetestSlider = frame;
-        }
-        if (url.includes('challenges.cloudflare') || url.includes('turnstile'))
-            turnstileFrame = frame;
-    }
-    if (turnstileFrame) {
-        try {
-            const checkbox = turnstileFrame.locator('input[type="checkbox"], .cf-turnstile, [role="checkbox"]').first();
-            if (await checkbox.count() > 0) {
-                await checkbox.click({ timeout: 5000 });
-                await p.waitForTimeout(3000);
-                // Don't claim "solved" — verify the widget actually reported success.
-                const tsOk = await turnstileFrame.locator('input[type="hidden"][name="cf-turnstile-response"], [data-state="success"], .success').count().catch(() => 0);
-                const tsError = await turnstileFrame.locator('.error, [data-state="error"], [data-state="failed"]').count().catch(() => 0);
-                if (tsOk > 0)
-                    results.push('Turnstile: checkbox clicked, widget reports success');
-                else if (tsError > 0)
-                    results.push('Turnstile: checkbox clicked but widget shows an error — may need a screenshot to inspect');
-                else
-                    results.push('Turnstile: checkbox clicked, outcome unconfirmed — take a screenshot to verify the page advanced before submitting');
-            }
-        }
-        catch (e) {
-            results.push(`Turnstile: auto-click attempted (${e.message?.slice(0, 80)})`);
-        }
-    }
-    if (recaptchaAnchor && !recaptchaBframe) {
-        try {
-            const checkbox = recaptchaAnchor.locator('#recaptcha-anchor, .recaptcha-checkbox-border, .rc-anchor-checkbox').first();
-            if (await checkbox.count() > 0) {
-                await checkbox.click({ timeout: 5000 });
-                await p.waitForTimeout(2000);
-                // The checkbox click may pass instantly OR pop an image challenge.
-                // Report which actually happened instead of claiming success.
-                const checked = await recaptchaAnchor.locator('.recaptcha-checkbox-checked, .rc-anchor-checkbox-checked').count().catch(() => 0);
-                const challengeOpened = p.frames().some((f) => f.url().includes('/recaptcha/') && f.url().includes('/bframe'));
-                if (checked > 0)
-                    results.push('reCAPTCHA: checkbox verified (checked) — no image challenge');
-                else if (challengeOpened)
-                    results.push('reCAPTCHA: checkbox clicked, image challenge appeared — use captcha-grid to solve it');
-                else
-                    results.push('reCAPTCHA: checkbox clicked, outcome unconfirmed — take a screenshot to verify before submitting');
-            }
-        }
-        catch (e) {
-            results.push(`reCAPTCHA checkbox: auto-click attempted (${e.message?.slice(0, 80)})`);
-        }
-    }
-    if (geetestSlider) {
-        try {
-            const sliderInfo = await geetestSlider.evaluate(() => {
-                const info = {};
-                const cut = document.querySelector('.geetest_cut, .geetest_piece_bg, [class*="geetest_cut"], [class*="slider_cut"]');
-                if (cut) {
-                    const cutRect = cut.getBoundingClientRect();
-                    const style = window.getComputedStyle(cut);
-                    info.cut = { left: cutRect.left, width: cutRect.width, styleLeft: parseFloat(style.left) || null, transform: style.transform || null };
-                }
-                const bg = document.querySelector('.geetest_canvas_bg, .geetest_bg, [class*="geetest_canvas"], canvas[class*="bg"]');
-                if (bg)
-                    info.bg = { left: bg.getBoundingClientRect().left, width: bg.getBoundingClientRect().width };
-                const piece = document.querySelector('.geetest_piece, [class*="slider_piece"]');
-                if (piece)
-                    info.piece = { width: piece.getBoundingClientRect().width };
-                const slider = document.querySelector('.geetest_slider_button, [class*="slider_button"]');
-                if (slider) {
-                    const r = slider.getBoundingClientRect();
-                    info.slider = { left: r.left, width: r.width, centerX: r.left + r.width / 2, centerY: r.top + r.height / 2 };
-                }
-                return info;
-            });
-            let gapOffset = null;
-            if (sliderInfo.cut && sliderInfo.bg) {
-                if (sliderInfo.cut.styleLeft && sliderInfo.cut.styleLeft > 0)
-                    gapOffset = Math.round(sliderInfo.cut.styleLeft);
-                else
-                    gapOffset = Math.round(sliderInfo.cut.left - sliderInfo.bg.left);
-            }
-            if (gapOffset === null && sliderInfo.cut?.transform && sliderInfo.cut.transform !== 'none') {
-                const match = sliderInfo.cut.transform.match(/matrix\(.*?,\s*([\d.]+)/);
-                if (match)
-                    gapOffset = Math.round(parseFloat(match[1]));
-            }
-            if (gapOffset !== null && sliderInfo.slider) {
-                const pieceHalf = Math.round((sliderInfo.piece?.width || 44) / 2);
-                const dragDistance = gapOffset - pieceHalf;
-                const startX = sliderInfo.slider.centerX;
-                const startY = sliderInfo.slider.centerY;
-                const endX = startX + dragDistance;
-                await p.mouse.move(startX, startY);
-                await p.waitForTimeout(150);
-                await p.mouse.down();
-                await p.waitForTimeout(200);
-                const steps = 18 + Math.floor(Math.random() * 8);
-                for (let i = 1; i <= steps; i++) {
-                    const progress = i / steps;
-                    const eased = progress < 0.5 ? 2 * progress * progress : 1 - Math.pow(-2 * progress + 2, 2) / 2;
-                    const x = startX + dragDistance * eased + (Math.random() - 0.5) * 2;
-                    const y = startY + (Math.random() - 0.5) * 2;
-                    await p.mouse.move(x, y);
-                    await p.waitForTimeout(10 + Math.random() * 20);
-                }
-                await p.mouse.move(endX, startY);
-                await p.waitForTimeout(150);
-                await p.mouse.up();
-                await p.waitForTimeout(2000);
-                results.push(`GeeTest: slider dragged ${dragDistance}px — outcome unconfirmed, take a screenshot to verify the gap was matched`);
-            }
-            else {
-                results.push('GeeTest slider detected but gap position could not be auto-detected');
-            }
-        }
-        catch (e) {
-            results.push(`GeeTest slider: auto-solve attempted (${e.message?.slice(0, 80)})`);
-        }
-    }
-    if (recaptchaBframe) {
-        const gridResult = await analyzeImageChallenge(p, recaptchaBframe, 'recaptcha');
-        results.push('reCAPTCHA image challenge detected — grid analysis:');
-        results.push(gridResult);
-    }
-    const funcaptchaFrame = frames.find(f => f.url().includes('funcaptcha') || f.url().includes('arkoselabs'));
-    if (funcaptchaFrame) {
-        results.push('FunCaptcha detected — screenshotting puzzle...');
-        try {
-            const fcScreenshotPath = join(homedir(), '.aurix-funcaptcha-puzzle.png');
-            await funcaptchaFrame.locator('body').screenshot({ path: fcScreenshotPath }).catch(() => p.screenshot({ path: fcScreenshotPath }));
-            results.push(`Puzzle screenshot: ${fcScreenshotPath}`);
-            results.push('Analyze the puzzle image and determine the correct answer, then use click/evaluate to solve it.');
-        }
-        catch {
-            results.push('REQUIRES_VISION: FunCaptcha detected — needs image analysis to solve');
-        }
-    }
-    return results;
-}
-async function findGridTiles(frame, provider) {
-    switch (provider) {
-        case 'recaptcha': {
-            const tiles33 = frame.locator('.rc-imageselect-table-33 td, .rc-image-tile-33 td');
-            if (await tiles33.count() > 0)
-                return tiles33.all();
-            const tiles44 = frame.locator('.rc-imageselect-table-44 td, .rc-image-tile-44 td');
-            if (await tiles44.count() > 0)
-                return tiles44.all();
-            const generic = frame.locator('table td');
-            if (await generic.count() > 0)
-                return generic.all();
-            return [];
-        }
-        case 'hcaptcha': {
-            const tiles = frame.locator('.task-image, .image, .task .answer');
-            if (await tiles.count() > 0)
-                return tiles.all();
-            return [];
-        }
-        case 'mtcaptcha':
-        case 'geetest': {
-            const items = frame.locator('.geetest_item_wrap, .geetest_ques_tips img, .mtcaptcha-item');
-            if (await items.count() > 0)
-                return items.all();
-            return [];
-        }
-        default: {
-            const tiles = frame.locator('.task-image, .rc-imageselect-table-33 td, .rc-imageselect-table-44 td, table td');
-            if (await tiles.count() > 0)
-                return tiles.all();
-            return [];
-        }
-    }
-}
-async function analyzeImageChallenge(page, frame, provider) {
-    const results = [];
-    let instruction = '';
-    try {
-        const instrEl = frame.locator('.rc-imageselect-instructions, .prompt-text, .prompt-text-h, .geetest_tip_content, .mtcaptcha-label');
-        if (await instrEl.count() > 0) {
-            instruction = (await instrEl.first().textContent()) || '';
-            instruction = instruction.trim();
-        }
-        if (!instruction) {
-            const strongText = frame.locator('strong').first();
-            if (await strongText.count() > 0) {
-                instruction = (await strongText.textContent()) || '';
-            }
-        }
-    }
-    catch { }
-    if (instruction) {
-        results.push(`Instruction: "${instruction}"`);
-    }
-    else {
-        results.push('Instruction: (could not extract — check screenshot)');
-    }
-    const tiles = await findGridTiles(frame, provider);
-    const gridSize = tiles.length <= 9 ? '3x3' : tiles.length <= 16 ? '4x4' : `${tiles.length}-tile`;
-    results.push(`Grid: ${gridSize} (${tiles.length} tiles found, valid indices: 0-${tiles.length - 1})`);
-    _lastGridAnalyzeTime = Date.now();
-    // Clear stale tile screenshots from a previous challenge so the model never
-    // reads an old .aurix-tile-N.png that no longer matches the current grid.
-    try {
-        const home = homedir();
-        for (const f of readdirSync(home)) {
-            if (/^\.aurix-tile-(\d+|after-\d+)\.png$/.test(f)) {
-                try {
-                    unlinkSync(join(home, f));
-                }
-                catch { }
-            }
-        }
-    }
-    catch { }
-    const screenshotPath = join(homedir(), '.aurix-captcha-grid.png');
-    try {
-        const gridEl = frame.locator('.rc-imageselect-table-33, .rc-imageselect-table-44, .task, .challenge-view, .geetest_panel, table').first();
-        if (await gridEl.count() > 0) {
-            await gridEl.screenshot({ path: screenshotPath });
-        }
-        else {
-            await frame.locator('body').screenshot({ path: screenshotPath });
-        }
-    }
-    catch {
-        try {
-            await page.screenshot({ path: screenshotPath });
-        }
-        catch { }
-    }
-    results.push(`Grid screenshot: ${screenshotPath}`);
-    for (let i = 0; i < tiles.length; i++) {
-        const tilePath = join(homedir(), `.aurix-tile-${i}.png`);
-        try {
-            await tiles[i].screenshot({ path: tilePath });
-            results.push(`  Tile ${i}: ${tilePath}`);
-        }
-        catch {
-            results.push(`  Tile ${i}: (screenshot failed)`);
-        }
-    }
-    const isRecaptcha = provider === 'recaptcha';
-    const selectedClass = isRecaptcha ? '.rc-imageselect-dynamic-selected' : '.task-image.selected, .task .selected';
-    const selectedCount = await frame.locator(selectedClass).count();
-    if (selectedCount > 0) {
-        results.push(`Already selected: ${selectedCount} tile(s)`);
-    }
-    results.push('');
-    results.push('=== IMAGE SELECTION STEPS ===');
-    results.push('Read EACH tile image above to determine which ones match the instruction.');
-    results.push('Then execute these actions IN ORDER:');
-    results.push('');
-    results.push('Step 1: For each matching tile, call: browser action="click-tile" value="<index>"');
-    results.push('  Example: if tiles 0, 3, and 5 match → click-tile 0, then click-tile 3, then click-tile 5');
-    if (provider === 'recaptcha') {
-        results.push('  IMPORTANT: After clicking a tile, a NEW tile replaces it. Read the new tile screenshot to check if it also matches.');
-    }
-    results.push('Step 2: After clicking ALL matching tiles, call: browser action="captcha-verify"');
-    results.push('Step 3: If the grid refreshes with new tiles, call captcha-grid again and repeat from Step 1');
-    results.push('');
-    results.push('Do NOT skip any step. Start by reading the tile images now.');
-    return results.join('\n');
-}
 export const browserTool = {
     name: 'browser',
     description: `Persistent Chromium browser. Profile: ~/.aurix-browser-profile.
@@ -1533,7 +944,7 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                 case 'solve-captcha': {
                     const p = await ensureBrowser();
                     const results = [];
-                    const _solveTimeout = 60_000;
+                    const _solveTimeout = 120_000;
                     const _solveLogic = async () => {
                         const frames = p.frames();
                         let captchaType = 'unknown';
@@ -1585,14 +996,14 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                             try {
                                 if (recaptchaBframe) {
                                     results.push('Image challenge already visible. Auto-solving...');
-                                    const maxRetries = 2;
+                                    const maxRetries = 5;
                                     let solved = false;
                                     for (let attempt = 0; attempt < maxRetries; attempt++) {
                                         if (attempt > 0)
                                             results.push(`\nRetry attempt ${attempt}/${maxRetries - 1}...`);
                                         const solveResult = await solveCaptchaGrid(p, recaptchaBframe, 'recaptcha');
                                         results.push(solveResult);
-                                        if (solveResult.includes('Captcha solved!')) {
+                                        if (solveResult.includes('CAPTCHA SOLVED')) {
                                             solved = true;
                                             break;
                                         }
@@ -1606,6 +1017,7 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                                             solved = true;
                                             break;
                                         }
+                                        recaptchaBframe = newChallenge;
                                     }
                                     if (!solved && !results.some(r => r.includes('Falling back'))) {
                                         results.push(`\nAuto-solve exhausted after ${maxRetries} attempts. Use "captcha-grid" and "click-tile" for manual solving.`);
@@ -1629,17 +1041,17 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                                             await humanClick(checkbox, p);
                                             await p.waitForTimeout(3000);
                                             const updatedFrames = p.frames();
-                                            const challengeFrame = updatedFrames.find(f => f.url().includes('/recaptcha/') && f.url().includes('/bframe'));
+                                            let challengeFrame = updatedFrames.find(f => f.url().includes('/recaptcha/') && f.url().includes('/bframe'));
                                             if (challengeFrame) {
                                                 results.push('Image challenge appeared. Auto-solving...');
-                                                const maxRetries = 2;
+                                                const maxRetries = 5;
                                                 let solved = false;
                                                 for (let attempt = 0; attempt < maxRetries; attempt++) {
                                                     if (attempt > 0)
                                                         results.push(`\nRetry attempt ${attempt}/${maxRetries - 1}...`);
                                                     const solveResult = await solveCaptchaGrid(p, challengeFrame, 'recaptcha');
                                                     results.push(solveResult);
-                                                    if (solveResult.includes('Captcha solved!')) {
+                                                    if (solveResult.includes('CAPTCHA SOLVED')) {
                                                         solved = true;
                                                         break;
                                                     }
@@ -1654,6 +1066,7 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                                                         solved = true;
                                                         break;
                                                     }
+                                                    challengeFrame = newChallenge;
                                                 }
                                                 if (!solved && !results.some(r => r.includes('Falling back'))) {
                                                     results.push(`\nAuto-solve exhausted after ${maxRetries} attempts. Use "captcha-grid" and "click-tile" for manual solving.`);
@@ -1684,14 +1097,14 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                                             }
                                             if (challengeFrame) {
                                                 results.push('Image challenge appeared after clicking anchor. Auto-solving...');
-                                                const maxRetries = 2;
+                                                const maxRetries = 5;
                                                 let solved = false;
                                                 for (let attempt = 0; attempt < maxRetries; attempt++) {
                                                     if (attempt > 0)
                                                         results.push(`\nRetry attempt ${attempt}/${maxRetries - 1}...`);
                                                     const solveResult = await solveCaptchaGrid(p, challengeFrame, 'recaptcha');
                                                     results.push(solveResult);
-                                                    if (solveResult.includes('Captcha solved!')) {
+                                                    if (solveResult.includes('CAPTCHA SOLVED')) {
                                                         solved = true;
                                                         break;
                                                     }
@@ -1705,6 +1118,7 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                                                         solved = true;
                                                         break;
                                                     }
+                                                    challengeFrame = newChallenge;
                                                 }
                                                 if (!solved && !results.some(r => r.includes('Falling back'))) {
                                                     results.push(`\nAuto-solve exhausted after ${maxRetries} attempts. Use "captcha-grid" and "click-tile" for manual solving.`);
@@ -1744,17 +1158,17 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                                         await humanClick(checkbox, p);
                                         await p.waitForTimeout(3000);
                                         const updatedFrames = p.frames();
-                                        const challengeFrame = updatedFrames.find((f) => f.url().includes('hcaptcha') && f.url().includes('challenge'));
+                                        let challengeFrame = updatedFrames.find((f) => f.url().includes('hcaptcha') && f.url().includes('challenge'));
                                         if (challengeFrame) {
                                             results.push('Image challenge appeared. Auto-solving...');
-                                            const maxRetries = 2;
+                                            const maxRetries = 5;
                                             let solved = false;
                                             for (let attempt = 0; attempt < maxRetries; attempt++) {
                                                 if (attempt > 0)
                                                     results.push(`\nRetry attempt ${attempt}/${maxRetries - 1}...`);
                                                 const solveResult = await solveCaptchaGrid(p, challengeFrame, 'hcaptcha');
                                                 results.push(solveResult);
-                                                if (solveResult.includes('Captcha solved!')) {
+                                                if (solveResult.includes('CAPTCHA SOLVED')) {
                                                     solved = true;
                                                     break;
                                                 }
@@ -1769,6 +1183,7 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                                                     solved = true;
                                                     break;
                                                 }
+                                                challengeFrame = newChallenge;
                                             }
                                             if (!solved && !results.some(r => r.includes('Falling back'))) {
                                                 results.push(`\nAuto-solve exhausted after ${maxRetries} attempts. Use "captcha-grid" and "click-tile" for manual solving.`);
@@ -2163,7 +1578,7 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                     try {
                         return await Promise.race([
                             _solveLogic(),
-                            new Promise((_, rej) => setTimeout(() => rej(new Error('solve-captcha timed out (60s)')), _solveTimeout)),
+                            new Promise((_, rej) => setTimeout(() => rej(new Error('solve-captcha timed out (120s)')), _solveTimeout)),
                         ]);
                     }
                     catch (e) {
@@ -2269,27 +1684,23 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                     results.push(`Clicking ${tileIndices.length} tile(s): [${tileIndices.join(', ')}]`);
                     for (const tileIndex of tileIndices) {
                         try {
-                            const currentTiles = await findGridTiles(challengeFrame, provider);
-                            if (tileIndex >= currentTiles.length) {
-                                results.push(`  Tile ${tileIndex}: out of range (${currentTiles.length} tiles now), skipping`);
+                            if (tileIndex >= initialTiles.length) {
+                                results.push(`  Tile ${tileIndex}: out of range (${initialTiles.length} tiles), skipping`);
                                 continue;
                             }
-                            const tile = currentTiles[tileIndex];
+                            const tile = initialTiles[tileIndex];
                             const selectedBefore = await challengeFrame.locator(selectedClass).count().catch(() => 0);
-                            const tileBox = await tile.boundingBox();
-                            if (tileBox) {
-                                const clickX = tileBox.x + tileBox.width * (0.3 + Math.random() * 0.4);
-                                const clickY = tileBox.y + tileBox.height * (0.3 + Math.random() * 0.4);
-                                await humanMove(clickX, clickY, p);
-                                await p.waitForTimeout(80 + Math.random() * 120);
-                                await p.mouse.down();
-                                await p.waitForTimeout(60 + Math.random() * 100);
-                                await p.mouse.up();
+                            try {
+                                await challengeFrame.evaluate((idx) => {
+                                    const tds = document.querySelectorAll('table td');
+                                    if (tds[idx])
+                                        tds[idx].click();
+                                }, tileIndex);
                             }
-                            else {
-                                await tile.click({ force: true });
+                            catch {
+                                await tile.click({ force: true, timeout: 3000 });
                             }
-                            await p.waitForTimeout(500 + Math.random() * 400);
+                            await p.waitForTimeout(300 + Math.random() * 300);
                             const selectedCount = await challengeFrame.locator(selectedClass).count().catch(() => 0);
                             const clickStatus = selectedCount !== selectedBefore
                                 ? `selected (${selectedBefore} → ${selectedCount})`
@@ -2359,16 +1770,26 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                         if (await verifyBtn.count() === 0) {
                             return err('No verify button found', 'Use "captcha-grid" to analyze the challenge first');
                         }
-                        await humanClick(verifyBtn, p);
+                        try {
+                            await challengeFrame.evaluate(() => {
+                                const btn = document.querySelector('#recaptcha-verify-button, .rc-button-submit, .button-submit, [id*="verify"]');
+                                if (btn)
+                                    btn.click();
+                            });
+                        }
+                        catch {
+                            await humanClick(verifyBtn, p);
+                        }
                         await p.waitForTimeout(3000);
                         const screenshotPath = join(homedir(), '.aurix-captcha-verify-result.png');
-                        const errorText = await challengeFrame.locator('.rc-imageselect-incorrect-response, .error-message, .incorrect').count();
-                        if (errorText > 0) {
+                        const errorEl2 = challengeFrame.locator('.rc-imageselect-incorrect-response, .error-message, .incorrect').first();
+                        const errorVisible2 = await errorEl2.count() > 0 && await errorEl2.isVisible().catch(() => false);
+                        if (errorVisible2) {
                             const errorMsg = await challengeFrame.locator('.rc-imageselect-incorrect-response, .error-message').first().textContent().catch(() => 'Incorrect answer');
                             await p.screenshot({ path: screenshotPath });
                             const results = [];
                             results.push(`Verification failed: "${errorMsg}". Auto-retrying...`);
-                            const maxRetries = 2;
+                            const maxRetries = 3;
                             for (let attempt = 0; attempt < maxRetries; attempt++) {
                                 results.push(`\nRetry ${attempt + 1}/${maxRetries}...`);
                                 await p.waitForTimeout(2000);
@@ -2386,7 +1807,7 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                                 const retryProvider = retryFrame.url().includes('hcaptcha') ? 'hcaptcha' : 'recaptcha';
                                 const solveResult = await solveCaptchaGrid(p, retryFrame, retryProvider);
                                 results.push(solveResult);
-                                if (solveResult.includes('Captcha solved!')) {
+                                if (solveResult.includes('CAPTCHA SOLVED')) {
                                     return results.join('\n');
                                 }
                             }
@@ -2399,7 +1820,7 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                             await p.screenshot({ path: screenshotPath });
                             const results = [];
                             results.push(`New challenge appeared: "${instruction}". Auto-solving...`);
-                            const maxRetries = 2;
+                            const maxRetries = 3;
                             for (let attempt = 0; attempt < maxRetries; attempt++) {
                                 if (attempt > 0)
                                     results.push(`\nRetry ${attempt}/${maxRetries - 1}...`);
@@ -2416,7 +1837,7 @@ Sessions: session="a"/"b"/"c" for parallel browsers. proxy="host:port:user:pass"
                                 const retryProvider = retryFrame.url().includes('hcaptcha') ? 'hcaptcha' : 'recaptcha';
                                 const solveResult = await solveCaptchaGrid(p, retryFrame, retryProvider);
                                 results.push(solveResult);
-                                if (solveResult.includes('Captcha solved!'))
+                                if (solveResult.includes('CAPTCHA SOLVED'))
                                     return results.join('\n');
                                 await p.waitForTimeout(2000);
                             }