zames_pro 2.71.0 → 2.72.1

package/dist/browser.js

@@ -1,8 +1,10 @@
 import { chromium, } from 'playwright';
 import { extractAnswer, extractTokenUsage, dumpNetBody, isFinishedWithoutAnswer, } from './net-capture.js';
 import { rewriteFailedAttachments } from './commands.js';
-import { CHAT_URL, CHAT_ID_RE, chatUrl, HISTORY_MESSAGES_URL, BUTTON_CLASS_RE, INPUT_SELECTORS, SEND_SELECTORS, STOP_SELECTORS, STOP_NAME_RE, CONTINUE_NAME_RE, ANSWER_SELECTORS, THINK_CLASS_RE, MESSAGE_CONTAINER_SELECTORS, RESTORE_ANSWER_SELECTORS, ASSISTANT_CLASS_RE, ASSISTANT_SELECTOR, ANSWER_MARKDOWN_SELECTOR, MARKDOWN_SELECTOR, CHAT_SIGNAL_NODES_SELECTOR, NEW_CHAT_SELECTOR, NEW_CHAT_TEXT_RE, PASSWORD_SELECTORS, LOGIN_SELECTORS, LOGIN_SUBMIT_SELECTORS, LOGIN_BUTTON_SELECTOR, LOGIN_NAME_RE, LOGIN_FORM_SUBMIT_RE, SIDEBAR_TOGGLE_SELECTORS, TOGGLE_SELECTORS, DEEP_THINKING_RE, WEB_SEARCH_RE, ATTACH_SELECTORS, STATUS_RE, RATE_LIMIT_RE, SERVER_BUSY_RE, GENERATION_ERR_RE, INCOMPLETE_STATUS_RE, ANSWER_URL_RE, } from './deepseek-ui.js';
+import { parseHistoryMessages, extractChatMessages, scrapeChatList, scrapeChatMessages, } from './browser-chats.js';
+import { CHAT_URL, CHAT_ID_RE, chatUrl, HISTORY_MESSAGES_URL, BUTTON_CLASS_RE, INPUT_SELECTORS, SEND_SELECTORS, STOP_SELECTORS, STOP_NAME_RE, CONTINUE_NAME_RE, ANSWER_SELECTORS, THINK_CLASS_RE, MESSAGE_CONTAINER_SELECTORS, RESTORE_ANSWER_SELECTORS, ASSISTANT_CLASS_RE, ASSISTANT_SELECTOR, ANSWER_MARKDOWN_SELECTOR, MARKDOWN_SELECTOR, CHAT_SIGNAL_NODES_SELECTOR, NEW_CHAT_SELECTOR, NEW_CHAT_TEXT_RE, PASSWORD_SELECTORS, LOGIN_SELECTORS, LOGIN_SUBMIT_SELECTORS, LOGIN_BUTTON_SELECTOR, LOGIN_NAME_RE, LOGIN_FORM_SUBMIT_RE, SIDEBAR_TOGGLE_SELECTORS, TOGGLE_SELECTORS, DEEP_THINKING_RE, WEB_SEARCH_RE, ATTACH_SELECTORS, ANSWER_URL_RE, } from './deepseek-ui.js';
 import { probeUiHealth, } from './ui-health.js';
+import { readPageToastsInDom, readLoginErrorInDom, readLastAnswerInDom, chatSignalInDom, continueVisibleCheapInDom, stopButtonVisibleInDom, clickStopInDom, continueVisibleInDom, clickContinueInDom, readUserAgentInDom, findLoginInputIndexInDom, submitLoginFormInDom, setBusyTitleInDom, pasteTextIntoElement, readElementText, elementTagNameInDom, isElementEnabledInDom, readInputTrimmedTextInDom, dumpDomCountsInDom, } from './browser-dom.js';
 import path from 'path';
 import os from 'os';
 import fs from 'fs/promises';
@@ -13,234 +15,12 @@ import { translate, DEFAULT_LOCALE } from './i18n.js';
 // here preserves the existing public API (test/*.test.ts import them from
 // browser.ts).
 export { STOP_NAME_RE, CONTINUE_NAME_RE };
-// Muted terminal input for passwords. We do NOT use readline here: readline
-// echoes the typed text through its own internal _writeToOutput, which cannot
-// be reliably overridden from outside (a real bug: the login prompt swallowed
-// the password step). Instead we read raw keystrokes from stdin and echo one
-// `*` per typed character. In a non-TTY (pipe/redirect) we fall back to a
-// plain line read.
-export function askPassword(question) {
-    return new Promise((resolve) => {
-        process.stdout.write(question);
-        // Non-interactive: read a single line from stdin as-is.
-        if (!process.stdin.isTTY) {
-            void import('readline').then(({ createInterface }) => {
-                const rl = createInterface({
-                    input: process.stdin,
-                    output: process.stdout,
-                });
-                rl.question('', (answer) => {
-                    rl.close();
-                    resolve(answer);
-                });
-            });
-            return;
-        }
-        const stdin = process.stdin;
-        const wasRaw = stdin.isRaw;
-        stdin.setRawMode(true);
-        stdin.resume();
-        let value = '';
-        const onData = (buf) => {
-            const s = buf.toString('utf8');
-            for (const ch of s) {
-                const code = ch.charCodeAt(0);
-                // Enter / Ctrl+J -> done.
-                if (ch === '\r' || ch === '\n') {
-                    done();
-                    return;
-                }
-                // Ctrl+C -> abort the whole process (same as elsewhere in the CLI).
-                if (code === 3) {
-                    cleanup();
-                    process.stdout.write('\n');
-                    process.exit(130);
-                }
-                // Ctrl+D -> finish with whatever we have.
-                if (code === 4) {
-                    done();
-                    return;
-                }
-                // Backspace (0x7f or 0x08): remove the last char and one star.
-                if (code === 127 || code === 8) {
-                    if (value.length > 0) {
-                        value = value.slice(0, -1);
-                        process.stdout.write('\b \b');
-                    }
-                    continue;
-                }
-                // Ignore other control characters (arrows, etc.).
-                if (code < 32)
-                    continue;
-                value += ch;
-                process.stdout.write('*');
-            }
-        };
-        const cleanup = () => {
-            stdin.removeListener('data', onData);
-            try {
-                stdin.setRawMode(wasRaw || false);
-            }
-            catch { }
-            stdin.pause();
-        };
-        const done = () => {
-            cleanup();
-            process.stdout.write('\n');
-            resolve(value);
-        };
-        stdin.on('data', onData);
-    });
-}
-const USER_DATA_DIR = path.join(os.homedir(), '.zames', 'profile');
-// Cache of the sanitized (non-Headless) User-Agent, keyed by the browser
-// engine path. On the FIRST headless run we detect the real UA, strip the
-// "Headless" marker and store it here; later runs pass it straight to
-// _launchOnce, so the browser starts with a good UA and the "launch → read UA →
-// relaunch" dance happens only once (it otherwise doubled every headless
-// start). Keying by the executable path means a Playwright update (new engine
-// path) invalidates the cache and we re-derive the UA once for the new build.
-const HEADLESS_UA_CACHE = path.join(os.homedir(), '.zames', 'headless-ua.json');
-// Pure: pick a reusable UA from the cache file's text for the given engine, or
-// null. Exported so the policy is unit-tested without touching ~/.zames.
-export function parseHeadlessUACache(raw, engine) {
-    try {
-        const j = JSON.parse(raw);
-        if (j &&
-            j.engine === engine &&
-            typeof j.ua === 'string' &&
-            j.ua &&
-            !/Headless/i.test(j.ua)) {
-            return j.ua;
-        }
-    }
-    catch { }
-    return null;
-}
-function headlessEngineKey() {
-    try {
-        return chromium.executablePath();
-    }
-    catch {
-        return '';
-    }
-}
-async function readCachedHeadlessUA(engine) {
-    if (!engine)
-        return null;
-    try {
-        const raw = await fs.readFile(HEADLESS_UA_CACHE, 'utf-8');
-        return parseHeadlessUACache(raw, engine);
-    }
-    catch {
-        return null;
-    }
-}
-async function writeCachedHeadlessUA(engine, ua) {
-    if (!engine || !ua)
-        return;
-    try {
-        await fs.mkdir(path.dirname(HEADLESS_UA_CACHE), { recursive: true });
-        await fs.writeFile(HEADLESS_UA_CACHE, JSON.stringify({ engine, ua }, null, 2), 'utf-8');
-    }
-    catch { }
-}
-// For /doctor: is a sanitized UA cached for the CURRENT engine build? A missing
-// cache only means the next headless start relaunches once (not an error), so
-// this is informational. Best-effort.
-export async function headlessUACacheReady() {
-    const ua = await readCachedHeadlessUA(headlessEngineKey());
-    return !!ua;
-}
-// A headless Chrome advertises "HeadlessChrome/..." in its User-Agent, and
-// DeepSeek's CDN (CloudFront/WAF) rejects that UA with a plain "403 ERROR"
-// page before the app is even served — so a headless login looked broken while
-// a headed one worked (headed Chrome sends "Chrome/..."). We keep the real
-// engine version and only drop the "Headless" marker. When the operator
-// explicitly set a UA in the config, that one wins (see _launchOnce).
-export function sanitizeHeadlessUA(ua) {
-    return String(ua || '').replace(/HeadlessChrome/g, 'Chrome');
-}
-// Written after a successful sign-in so the next launch knows a session was
-// stored in the persistent profile (used by /doctor and diagnostics).
-const AUTH_MARKER_FILE = path.join(os.homedir(), '.zames', 'auth.json');
-export function isGenerationIncompleteText(text) {
-    const t = String(text || '');
-    return GENERATION_ERR_RE.test(t) || INCOMPLETE_STATUS_RE.test(t);
-}
-export function isRateLimitText(text) {
-    return RATE_LIMIT_RE.test(String(text || ''));
-}
-export function isServerBusyText(text) {
-    const t = String(text || '');
-    // Rate limit takes priority (it needs the long wait).
-    if (RATE_LIMIT_RE.test(t))
-        return false;
-    return SERVER_BUSY_RE.test(t);
-}
-// Normalize text for comparison: collapse whitespace so that tiny DOM
-// differences (nbsp, trailing spaces) don't count as "a new answer".
-export function normText(s) {
-    return String(s || '')
-        .replace(/\u00a0/g, ' ')
-        .replace(/\s+/g, ' ')
-        .trim();
-}
-// The "too frequent" error: distinct from others so ask() waits a long time
-// (DeepSeek limits reset over minutes) and retries the send itself.
-export class RateLimitError extends Error {
-    constructor(detail) {
-        super('Messages too frequent. Try again later. ' + detail);
-        this.name = 'RateLimitError';
-    }
-}
-// DeepSeek transient server error (Server busy).
-export class ServerBusyError extends Error {
-    constructor(detail) {
-        super('Server busy. Try again later. ' + detail);
-        this.name = 'ServerBusyError';
-    }
-}
-// The generation was truncated by the server (`generation_err` / INCOMPLETE).
-// Distinct from ServerBusyError: the DeepSeek backend answered, but the turn
-// did not finish, and the UI offers a "Continue" button. The agent retries the
-// same send (a new message into the chat) instead of waiting for an answer
-// that will never arrive. This is what the operator hit with the reasoning
-// (deep thinking) mode on: the long THINK phase makes the truncation far more
-// likely, so with thinking off everything worked and with it on the turn kept
-// stopping and showing "Continue".
-export class GenerationIncompleteError extends Error {
-    constructor(detail) {
-        super('Generation incomplete (server truncated the answer). ' + detail);
-        this.name = 'GenerationIncompleteError';
-    }
-}
-// ---------- profile cleanup ----------
-async function cleanSingletonFiles() {
-    const names = ['SingletonLock', 'SingletonCookie', 'SingletonSocket'];
-    for (const name of names) {
-        const p = path.join(USER_DATA_DIR, name);
-        try {
-            await fs.unlink(p);
-        }
-        catch { }
-    }
-}
-async function profileLooksLocked() {
-    try {
-        await fs.access(path.join(USER_DATA_DIR, 'SingletonLock'));
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-async function nukeProfile() {
-    try {
-        await fs.rm(USER_DATA_DIR, { recursive: true, force: true });
-    }
-    catch { }
-}
+// The pure, state-free helpers live in browser-pure.ts (BACKLOG C3): they are
+// imported for the class below and RE-EXPORTED here, so the public API of this
+// module is unchanged (tests and other modules import these names from
+// './browser.js').
+import { askPassword, USER_DATA_DIR, parseHeadlessUACache, headlessEngineKey, readCachedHeadlessUA, writeCachedHeadlessUA, headlessUACacheReady, sanitizeHeadlessUA, AUTH_MARKER_FILE, isGenerationIncompleteText, isRateLimitText, isServerBusyText, normText, cleanAnswer, RateLimitError, ServerBusyError, GenerationIncompleteError, cleanSingletonFiles, profileLooksLocked, nukeProfile, } from './browser-pure.js';
+export { askPassword, parseHeadlessUACache, headlessUACacheReady, sanitizeHeadlessUA, isGenerationIncompleteText, isRateLimitText, isServerBusyText, normText, RateLimitError, ServerBusyError, GenerationIncompleteError, };
 export class DeepSeekBrowser {
     headless;
     debug;
@@ -478,19 +258,7 @@ export class DeepSeekBrowser {
     // the send loop.
     async _setBusyTitle(busy) {
         try {
-            await this.page.evaluate((on) => {
-                const w = window;
-                if (on) {
-                    if (typeof w.__zamesTitle !== 'string') {
-                        w.__zamesTitle = document.title.replace(/^⏳\s*/, '');
-                    }
-                    document.title = '⏳ ' + w.__zamesTitle;
-                }
-                else if (typeof w.__zamesTitle === 'string') {
-                    document.title = w.__zamesTitle;
-                    w.__zamesTitle = undefined;
-                }
-            }, busy);
+            await this.page.evaluate(setBusyTitleInDom, busy);
         }
         catch { }
     }
@@ -529,7 +297,7 @@ export class DeepSeekBrowser {
         if (!this.headless)
             return;
         try {
-            const ua = await this.page.evaluate(() => navigator.userAgent);
+            const ua = await this.page.evaluate(readUserAgentInDom);
             const fixed = sanitizeHeadlessUA(ua);
             if (fixed === ua)
                 return;
@@ -862,27 +630,7 @@ export class DeepSeekBrowser {
      */
     async _readLoginError() {
         try {
-            const txt = await this.page.evaluate(() => {
-                const sels = [
-                    '[role="alert"]',
-                    '[class*="error" i]',
-                    '[class*="toast" i]',
-                    '[class*="notification" i]',
-                ];
-                let out = '';
-                for (const s of sels) {
-                    for (const el of Array.from(document.querySelectorAll(s))) {
-                        const e = el;
-                        const st = getComputedStyle(e);
-                        if (st.display === 'none' || st.visibility === 'hidden')
-                            continue;
-                        const t = (e.innerText || '').trim();
-                        if (t)
-                            out += ' ' + t;
-                    }
-                }
-                return out.replace(/\s+/g, ' ').trim();
-            });
+            const txt = await this.page.evaluate(readLoginErrorInDom);
             return txt.slice(0, 200);
         }
         catch {
@@ -911,19 +659,7 @@ export class DeepSeekBrowser {
         if (!userInput) {
             // Find the index of the password input and use the closest preceding
             // text/email/tel input as the login field.
-            const idx = await this.page.evaluate((pwdSel) => {
-                const p = document.querySelector(pwdSel);
-                if (!p)
-                    return -1;
-                const inputs = Array.from(document.querySelectorAll('input'));
-                const pi = inputs.indexOf(p);
-                for (let i = pi - 1; i >= 0; i--) {
-                    const t = (inputs[i].type || 'text').toLowerCase();
-                    if (t === 'text' || t === 'email' || t === 'tel')
-                        return i;
-                }
-                return -1;
-            }, PASSWORD_SELECTORS[0]);
+            const idx = await this.page.evaluate(findLoginInputIndexInDom, PASSWORD_SELECTORS[0]);
             if (idx >= 0)
                 userInput = this.page.locator('input').nth(idx);
         }
@@ -977,33 +713,7 @@ export class DeepSeekBrowser {
         }
         // Button inside the same form as the password field.
         const formClicked = await this.page
-            .evaluate((opts) => {
-            const loginRe = new RegExp(opts.submitRe, 'i');
-            const p = document.querySelector(opts.pwdSel);
-            if (!p)
-                return false;
-            const form = p.closest('form');
-            const scope = form || document;
-            const btns = Array.from(scope.querySelectorAll('button[type="submit"], button, div[role="button"]'));
-            for (const b of btns) {
-                const txt = (b.textContent || '').trim().toLowerCase();
-                const aria = (b.getAttribute('aria-label') || '').toLowerCase();
-                if (loginRe.test(txt + ' ' + aria)) {
-                    b.click();
-                    return true;
-                }
-            }
-            // Fallback: the primary-looking button in the scope.
-            const primary = btns.find((b) => {
-                const cls = (b.className || '').toString();
-                return /primary|submit|ds-button--primary/i.test(cls);
-            });
-            if (primary) {
-                primary.click();
-                return true;
-            }
-            return false;
-        }, {
+            .evaluate(submitLoginFormInDom, {
             pwdSel: PASSWORD_SELECTORS[0],
             submitRe: LOGIN_FORM_SUBMIT_RE.source,
         })
@@ -1157,44 +867,10 @@ export class DeepSeekBrowser {
     // call". The DOM reader has no such self-comparison problem: before the
     // send the DOM shows the OLD answer, after it the NEW one.
     async _readLastAnswerTextDom() {
-        return await this.page.evaluate((opts) => {
-            const sels = opts.sels;
-            // DeepSeek stores the model's reasoning in think blocks (THINK_CLASS_RE).
-            // They are NOT the answer and must never be picked up as the answer
-            // (otherwise the terminal would show the long reasoning). We also
-            // prefer the first (most specific) selector with a hit.
-            const think = new RegExp(opts.thinkRe, 'i');
-            const inThink = (e) => {
-                let n = e;
-                while (n) {
-                    const cls = (n.className || '').toString();
-                    if (think.test(cls))
-                        return true;
-                    n = n.parentElement;
-                }
-                return false;
-            };
-            let el = null;
-            for (const s of sels) {
-                const list = document.querySelectorAll(s);
-                if (!list.length)
-                    continue;
-                for (let i = list.length - 1; i >= 0; i--) {
-                    const cand = list[i];
-                    if (inThink(cand))
-                        continue;
-                    el = cand;
-                    break;
-                }
-                if (el)
-                    break;
-            }
-            if (!el)
-                return '';
-            const out = el.innerText || el.textContent || '';
-            const NL = String.fromCharCode(10);
-            return out.replace(new RegExp(NL + '{3,}', 'g'), NL + NL).trim();
-        }, { sels: ANSWER_SELECTORS, thinkRe: THINK_CLASS_RE.source });
+        return await this.page.evaluate(readLastAnswerInDom, {
+            sels: ANSWER_SELECTORS,
+            thinkRe: THINK_CLASS_RE.source,
+        });
     }
     // We read ONLY visible toasts/notifications, not the whole page text.
     // Otherwise we catch "try again later" from service/hidden blocks and go
@@ -1203,26 +879,7 @@ export class DeepSeekBrowser {
     // text from the page and produced a FALSE rate limit (the agent stopped
     // while the chat had no error). Keep only real toast/alert containers.
     async _readPageText() {
-        return await this.page
-            .evaluate(() => {
-            const sels = [
-                '[role="alert"]',
-                '[class*="toast" i]',
-                '[class*="notification" i]',
-            ];
-            let out = '';
-            for (const s of sels) {
-                for (const el of Array.from(document.querySelectorAll(s))) {
-                    const e = el;
-                    const st = getComputedStyle(e);
-                    if (st.display === 'none' || st.visibility === 'hidden')
-                        continue;
-                    out += ' ' + (e.innerText || '');
-                }
-            }
-            return out;
-        })
-            .catch(() => '');
+        return await this.page.evaluate(readPageToastsInDom).catch(() => '');
     }
     // The "clean" filter, but read from the DOM only. Used by _askOnce for the
     // before/after comparison: the network capture must not be compared against
@@ -1231,16 +888,10 @@ export class DeepSeekBrowser {
         const raw = await this._readLastAnswerTextDom().catch(() => '');
         return this._cleanAnswer(raw);
     }
-    // Drop service placeholders ("Reading…", "Thinking…") so they are not
-    // mistaken for an answer; keep everything else as-is (including whitespace
-    // the tool-call relies on).
+    // The pure filter lives in browser-pure.ts (cleanAnswer); kept as a method
+    // for the existing `this._cleanAnswer(...)` call sites.
     _cleanAnswer(raw) {
-        const t = (raw || '').trim();
-        if (!t)
-            return '';
-        if (STATUS_RE.test(t))
-            return '';
-        return raw;
+        return cleanAnswer(raw);
     }
     // Find the Stop button in the DeepSeek UI. We can't rely on the class
     // alone: during generation the send button (the same circle button)
@@ -1250,27 +901,7 @@ export class DeepSeekBrowser {
         if (explicit)
             return true;
         return await this.page
-            .evaluate((btnRe) => {
-            const re = new RegExp(btnRe, 'i');
-            const btns = Array.from(document.querySelectorAll('div[role="button"], button'));
-            for (const b of btns) {
-                const cls = (b.className || '').toString();
-                if (!re.test(cls))
-                    continue;
-                const label = ((b.getAttribute('aria-label') || '') +
-                    ' ' +
-                    (b.getAttribute('title') || '') +
-                    ' ' +
-                    (b.textContent || '')).toLowerCase();
-                if (/stop|останов/.test(label))
-                    return true;
-                // A square icon = Stop button; an arrow (path without rect) = send.
-                const svg = b.querySelector('svg');
-                if (svg && svg.querySelector('rect'))
-                    return true;
-            }
-            return false;
-        }, BUTTON_CLASS_RE.source)
+            .evaluate(stopButtonVisibleInDom, BUTTON_CLASS_RE.source)
             .catch(() => false);
     }
     async _isGenerating() {
@@ -1284,16 +915,10 @@ export class DeepSeekBrowser {
     // all we need to tell "the page grew / a new answer is streaming".
     async _chatSignal() {
         return await this.page
-            .evaluate((opts) => {
-            const nodes = document.querySelectorAll(opts.nodesSel).length;
-            let lastLen = 0;
-            const answers = document.querySelectorAll(opts.mdSel);
-            if (answers.length) {
-                const lastEl = answers[answers.length - 1];
-                lastLen = (lastEl.innerText || '').length;
-            }
-            return { nodes, lastLen };
-        }, { nodesSel: CHAT_SIGNAL_NODES_SELECTOR, mdSel: MARKDOWN_SELECTOR })
+            .evaluate(chatSignalInDom, {
+            nodesSel: CHAT_SIGNAL_NODES_SELECTOR,
+            mdSel: MARKDOWN_SELECTOR,
+        })
             .catch(() => ({ nodes: 0, lastLen: 0 }));
     }
     // Cheap first probe for the Continue button. Runs ONE page.evaluate
@@ -1304,26 +929,7 @@ export class DeepSeekBrowser {
     // HITS do we run the full scan to get a clickable Locator.
     async _continueVisibleCheap() {
         return await this.page
-            .evaluate((nameRe) => {
-            const re = new RegExp(nameRe, 'i');
-            const cands = Array.from(document.querySelectorAll('div[role="button"], button'));
-            for (const e of cands) {
-                const label = ((e.textContent || '') +
-                    ' ' +
-                    (e.getAttribute('aria-label') || ''))
-                    .replace(/\s+/g, ' ')
-                    .trim();
-                if (!re.test(label))
-                    continue;
-                const st = getComputedStyle(e);
-                if (st.display === 'none' || st.visibility === 'hidden')
-                    continue;
-                const r = e.getBoundingClientRect();
-                if (r.width > 0 && r.height > 0)
-                    return true;
-            }
-            return false;
-        }, CONTINUE_NAME_RE.source)
+            .evaluate(continueVisibleCheapInDom, CONTINUE_NAME_RE.source)
             .catch(() => false);
     }
     // Is DeepSeek's "Continue" button currently visible? Used to BLOCK the
@@ -1349,26 +955,7 @@ export class DeepSeekBrowser {
         catch { }
         // Fallback: the raw DOM scan (older/newer DeepSeek builds where the role
         // is absent).
-        return this.page
-            .evaluate(() => {
-            const labelOf = (b) => ((b.textContent || '') + ' ' + (b.getAttribute('aria-label') || ''))
-                .replace(/\s+/g, ' ')
-                .trim();
-            const isExact = (t) => /^(?:continue|продолжить|продолжение)(?:\s+(?:think(?:ing)?|reason(?:ing)?|размышлени[ея]|генераци[юя]|ответ))?\s*[.!…]?$/i.test(t);
-            const cands = Array.from(document.querySelectorAll('div[role="button"], button'));
-            for (const e of cands) {
-                if (!isExact(labelOf(e)))
-                    continue;
-                const st = getComputedStyle(e);
-                if (st.display === 'none' || st.visibility === 'hidden')
-                    continue;
-                const r = e.getBoundingClientRect();
-                if (r.width > 0 && r.height > 0)
-                    return true;
-            }
-            return false;
-        })
-            .catch(() => false);
+        return this.page.evaluate(continueVisibleInDom).catch(() => false);
     }
     // Click the DeepSeek "Continue" button when it is visible (reasoning/answer
     // paused by the server). Returns true when a click happened.
@@ -1448,44 +1035,7 @@ export class DeepSeekBrowser {
         // 2) Fallback: raw DOM scan + full pointer/mouse event sequence (an older
         //    build without a proper role, or a click intercepted by an overlay).
         try {
-            const clicked = await this.page.evaluate(() => {
-                const labelOf = (b) => ((b.textContent || '') + ' ' + (b.getAttribute('aria-label') || ''))
-                    .replace(/\s+/g, ' ')
-                    .trim();
-                const isExact = (t) => /^(?:continue|продолжить|продолжение)(?:\s+(?:think(?:ing)?|reason(?:ing)?|размышлени[ея]|генераци[юя]|ответ))?\s*[.!…]?$/i.test(t);
-                const cands = Array.from(document.querySelectorAll('div[role="button"], button'));
-                for (const e of cands) {
-                    const t = labelOf(e);
-                    if (!isExact(t))
-                        continue;
-                    const st = getComputedStyle(e);
-                    if (st.display === 'none' || st.visibility === 'hidden')
-                        continue;
-                    const rect = e.getBoundingClientRect();
-                    if (rect.width === 0 || rect.height === 0)
-                        continue;
-                    const cx = rect.left + rect.width / 2;
-                    const cy = rect.top + rect.height / 2;
-                    const opts = {
-                        bubbles: true,
-                        cancelable: true,
-                        composed: true,
-                        clientX: cx,
-                        clientY: cy,
-                        button: 0,
-                    };
-                    try {
-                        e.dispatchEvent(new PointerEvent('pointerdown', opts));
-                        e.dispatchEvent(new MouseEvent('mousedown', opts));
-                        e.dispatchEvent(new PointerEvent('pointerup', opts));
-                        e.dispatchEvent(new MouseEvent('mouseup', opts));
-                    }
-                    catch { }
-                    e.click();
-                    return true;
-                }
-                return false;
-            });
+            const clicked = await this.page.evaluate(clickContinueInDom);
             if (clicked) {
                 this._lastContinueAt = Date.now();
                 this._notice(this._t('ds.continue_clicked'));
@@ -1606,30 +1156,7 @@ export class DeepSeekBrowser {
         // 3) Raw DOM scan + the full pointer/mouse sequence (older builds without
         //    a proper role, or a click intercepted by an overlay).
         const clicked = await this.page
-            .evaluate((btnRe) => {
-            const re = new RegExp(btnRe, 'i');
-            const btns = Array.from(document.querySelectorAll('div[role="button"], button'));
-            for (const b of btns) {
-                const cls = (b.className || '').toString();
-                if (!re.test(cls))
-                    continue;
-                const svg = b.querySelector('svg');
-                if (svg && svg.querySelector('rect')) {
-                    for (const type of [
-                        'pointerdown',
-                        'mousedown',
-                        'pointerup',
-                        'mouseup',
-                        'click',
-                    ]) {
-                        b.dispatchEvent(new MouseEvent(type, { bubbles: true, cancelable: true }));
-                    }
-                    b.click();
-                    return true;
-                }
-            }
-            return false;
-        }, BUTTON_CLASS_RE.source)
+            .evaluate(clickStopInDom, BUTTON_CLASS_RE.source)
             .catch(() => false);
         if (clicked)
             return true;
@@ -1799,7 +1326,7 @@ export class DeepSeekBrowser {
         this._askCancelled = true;
     }
     async _setInputText(input, text) {
-        const tag = await input.evaluate((el) => el.tagName.toLowerCase());
+        const tag = await input.evaluate(elementTagNameInDom);
         const isNative = tag === 'textarea' || tag === 'input';
         if (isNative) {
             try {
@@ -1811,28 +1338,11 @@ export class DeepSeekBrowser {
         await input.click();
         await this.page.keyboard.press('Control+A');
         await this.page.keyboard.press('Delete');
-        const ok = await input.evaluate((el, value) => {
-            el.focus();
-            const dt = new DataTransfer();
-            dt.setData('text/plain', value);
-            const ev = new ClipboardEvent('paste', {
-                clipboardData: dt,
-                bubbles: true,
-                cancelable: true,
-            });
-            el.dispatchEvent(ev);
-            return true;
-        }, text);
+        const ok = await input.evaluate(pasteTextIntoElement, text);
         if (!ok) {
             await this.page.keyboard.insertText(text);
         }
-        const got = await input.evaluate((el) => {
-            if (el.tagName.toLowerCase() === 'textarea' ||
-                el.tagName.toLowerCase() === 'input') {
-                return el.value;
-            }
-            return el.innerText || el.textContent || '';
-        });
+        const got = await input.evaluate(readElementText);
         const norm = (s) => (s || '')
             .replace(/\r\n/g, '\n')
             .replace(/\u00a0/g, ' ')
@@ -1846,12 +1356,7 @@ export class DeepSeekBrowser {
             await this.page.keyboard.press('Control+A');
             await this.page.keyboard.press('Delete');
             await this.page.keyboard.insertText(text);
-            const got2 = await input.evaluate((el) => {
-                if (el.tagName.toLowerCase() === 'textarea' ||
-                    el.tagName.toLowerCase() === 'input')
-                    return el.value;
-                return el.innerText || el.textContent || '';
-            });
+            const got2 = await input.evaluate(readElementText);
             if (norm(got2) !== norm(text)) {
                 throw new Error(this._t('ds.input_partial', {
                     got: norm(got2).length,
@@ -2141,14 +1646,7 @@ export class DeepSeekBrowser {
                     // attribute (and a disabled class) directly — during an upload the
                     // button is aria-disabled=true and a click is silently ignored.
                     const enabled = await btn
-                        .evaluate((el) => {
-                        if (el.getAttribute('aria-disabled') === 'true')
-                            return false;
-                        const cls = (el.className || '').toString();
-                        if (/disabled|is-disabled/.test(cls))
-                            return false;
-                        return true;
-                    })
+                        .evaluate(isElementEnabledInDom)
                         .catch(() => true);
                     if (!enabled)
                         continue;
@@ -2174,7 +1672,7 @@ export class DeepSeekBrowser {
         try {
             await this.page.waitForTimeout(300);
             const stillThere = await input
-                .evaluate((el) => (el.value || el.innerText || el.textContent || '').trim())
+                .evaluate(readInputTrimmedTextInDom)
                 .catch(() => '');
             if (stillThere) {
                 this._askDebug('SEND not cleared, pressing Enter again');
@@ -2554,19 +2052,7 @@ export class DeepSeekBrowser {
             throw new Error(this._t('ds.not_launched'));
         const html = await this.page.content();
         await fs.writeFile(filePath, html, 'utf-8');
-        const report = await this.page.evaluate((sels) => {
-            const result = { answers: {}, stops: {}, inputs: {} };
-            for (const s of sels.answers) {
-                result.answers[s] = document.querySelectorAll(s).length;
-            }
-            for (const s of sels.stops) {
-                result.stops[s] = document.querySelectorAll(s).length;
-            }
-            for (const s of sels.inputs) {
-                result.inputs[s] = document.querySelectorAll(s).length;
-            }
-            return result;
-        }, {
+        const report = await this.page.evaluate(dumpDomCountsInDom, {
             answers: ANSWER_SELECTORS,
             stops: STOP_SELECTORS,
             inputs: INPUT_SELECTORS,
@@ -2605,31 +2091,9 @@ export class DeepSeekBrowser {
     }
     async listChats(limit = 30) {
         await this._ensureSidebarOpen();
-        return await this.page.evaluate((lim) => {
-            const out = [];
-            const seen = new Set();
-            const anchors = document.querySelectorAll('a[href*="/chat/"]');
-            for (const a of anchors) {
-                const href = a.getAttribute('href') || '';
-                const m = href.match(/\/chat\/s\/([a-zA-Z0-9_-]+)/) ||
-                    href.match(/\/a\/chat\/s\/([a-zA-Z0-9_-]+)/);
-                if (!m)
-                    continue;
-                const id = m[1];
-                if (seen.has(id))
-                    continue;
-                seen.add(id);
-                const titleEl = a.querySelector('[class*="title"], [class*="text"]');
-                let title = (titleEl ? titleEl.textContent : a.textContent) || '';
-                title = title.trim().replace(/\s+/g, ' ');
-                if (!title)
-                    title = '(без названия)';
-                out.push({ id, title, href });
-                if (out.length >= lim)
-                    break;
-            }
-            return out;
-        }, limit);
+        // The scraper is a named export (browser-chats.ts) so the class stays thin
+        // and the scraping policy has one home; it runs inside the page.
+        return await this.page.evaluate(scrapeChatList, limit);
     }
     async openChat(id) {
         // Click the chat link and VERIFY the URL actually points at the
@@ -2696,6 +2160,11 @@ export class DeepSeekBrowser {
         }
         const auth = this._apiAuth;
         const pow = this._apiPow;
+        // The in-page fetch only RETURNS the raw chat_messages; the parsing happens
+        // OUTSIDE, in the pure parseHistoryMessages() (browser-chats.ts), so the
+        // in-page and the Playwright-request fallback paths share ONE parser and
+        // cannot drift. The in-page callback cannot call our helpers (it runs in
+        // the page context), so it must stay a plain data fetch.
         const res = await this.page
             .evaluate(async (opts) => {
             try {
@@ -2714,53 +2183,35 @@ export class DeepSeekBrowser {
                     headers,
                 });
                 if (!resp.ok)
-                    return { error: 'HTTP ' + resp.status, list: [] };
+                    return { error: 'HTTP ' + resp.status, messages: null };
                 const json = await resp.json();
                 const messages = json && json.data && json.data.biz_data
                     ? json.data.biz_data.chat_messages
                     : null;
                 if (!Array.isArray(messages)) {
-                    return { error: 'no chat_messages in response', list: [] };
+                    return { error: 'no chat_messages in response', messages: null };
                 }
-                const NL = String.fromCharCode(10);
-                const out = [];
-                // The context size: the LATEST accumulated_token_usage in the chat
-                // (each message carries the running counter).
-                let usage = null;
-                for (const m of messages) {
-                    if (m && typeof m.accumulated_token_usage === 'number') {
-                        usage = m.accumulated_token_usage;
-                    }
-                    const role = m && m.role === 'ASSISTANT' ? 'assistant' : 'user';
-                    const want = role === 'assistant' ? 'RESPONSE' : 'REQUEST';
-                    let text = '';
-                    for (const fr of (m && m.fragments) || []) {
-                        if (!fr || fr.type !== want)
-                            continue;
-                        if (typeof fr.content === 'string')
-                            text += fr.content;
-                    }
-                    text = text.replace(new RegExp(NL + '{3,}', 'g'), NL + NL).trim();
-                    if (text)
-                        out.push({ role, text });
-                }
-                return { error: '', list: out, usage };
+                return { error: '', messages };
             }
             catch (e) {
-                return { error: 'fetch failed: ' + e.message, list: [] };
+                return {
+                    error: 'fetch failed: ' + e.message,
+                    messages: null,
+                };
             }
         }, { chatId: id, auth, pow, historyUrl: HISTORY_MESSAGES_URL })
             .catch((e) => ({
             error: 'evaluate failed: ' + e.message,
-            list: [],
+            messages: null,
         }));
         this._lastHistoryError = res?.error || '';
+        // Parse the raw messages with the SAME pure parser the fallback uses.
+        const parsed = parseHistoryMessages(res?.messages);
         // Pick up the context size the history carries, so /resume (and /cost
         // right after it) shows a real number even before the first answer.
-        const usage = res?.usage;
-        if (typeof usage === 'number')
-            this._lastTokenUsage = usage;
-        const list = (res?.list || []);
+        if (typeof parsed.usage === 'number')
+            this._lastTokenUsage = parsed.usage;
+        const list = parsed.list;
         if (list.length || !res?.error)
             return list;
         // Fallback: Playwright's own request context (shares the browser cookies)
@@ -2770,31 +2221,17 @@ export class DeepSeekBrowser {
             const resp = await this.page.request.get(HISTORY_MESSAGES_URL + '?chat_session_id=' + encodeURIComponent(id), { headers: { accept: 'application/json' } });
             if (!resp.ok())
                 return list;
-            const json = (await resp.json());
-            const messages = json?.data?.biz_data?.chat_messages;
-            if (!Array.isArray(messages))
+            const json = await resp.json();
+            const messages = extractChatMessages(json);
+            if (!messages)
                 return list;
-            const NL = String.fromCharCode(10);
-            const out = [];
-            for (const m of messages) {
-                if (m && typeof m.accumulated_token_usage === 'number') {
-                    this._lastTokenUsage = m.accumulated_token_usage;
-                }
-                const role = m && m.role === 'ASSISTANT' ? 'assistant' : 'user';
-                const want = role === 'assistant' ? 'RESPONSE' : 'REQUEST';
-                let text = '';
-                for (const fr of (m && m.fragments) || []) {
-                    if (!fr || fr.type !== want)
-                        continue;
-                    if (typeof fr.content === 'string')
-                        text += fr.content;
-                }
-                text = text.replace(new RegExp(NL + '{3,}', 'g'), NL + NL).trim();
-                if (text)
-                    out.push({ role, text });
-            }
+            // Same pure parser as the in-page path (browser-chats.ts), so the two
+            // cannot drift.
+            const parsed = parseHistoryMessages(messages);
+            if (typeof parsed.usage === 'number')
+                this._lastTokenUsage = parsed.usage;
             this._lastHistoryError = '';
-            return out;
+            return parsed.list;
         }
         catch (e) {
             this._lastHistoryError = 'request failed: ' + e.message;
@@ -2810,92 +2247,17 @@ export class DeepSeekBrowser {
     // ds-assistant-message-* class; anything that is not an assistant block is
     // treated as a user message. The model's reasoning (.ds-think-content) is
     // skipped, exactly like in _readLastAnswerText.
+    // Read the WHOLE visible dialogue of the currently open chat, top to
+    // bottom. Used by /resume and /resume-id so the operator sees the restored
+    // context in the terminal instead of just "Chat opened.".
+    //
+    // The in-page scraper (scrapeChatMessages, browser-chats.ts) is a named
+    // export so the class body stays thin; it runs inside the page.
     async readChatMessages() {
         if (!this.page)
             return [];
         const raw = await this.page
-            .evaluate((opts) => {
-            const think = new RegExp(opts.thinkRe, 'i');
-            const assistantRe = new RegExp(opts.assistantRe, 'i');
-            const inThink = (e) => {
-                let n = e;
-                while (n) {
-                    const cls = (n.className || '').toString();
-                    if (think.test(cls))
-                        return true;
-                    n = n.parentElement;
-                }
-                return false;
-            };
-            const textOf = (e) => {
-                const h = e;
-                const t = h.innerText || h.textContent || '';
-                const NL = String.fromCharCode(10);
-                return t.replace(new RegExp(NL + '{3,}', 'g'), NL + NL).trim();
-            };
-            // A message block is "assistant" when it contains an answer markdown
-            // wrapper (ds-markdown / ds-assistant-message), otherwise it is a
-            // user bubble. DeepSeek's class names drift between builds, so the
-            // detection is content-based, not class-prefix-based.
-            const looksAssistant = (e) => {
-                const cls = (e.className || '').toString();
-                if (assistantRe.test(cls))
-                    return true;
-                if (e.querySelector(opts.assistantSel))
-                    return true;
-                // A user bubble has no rendered markdown; an answer does.
-                if (e.querySelector(opts.markdownSel))
-                    return true;
-                return false;
-            };
-            // Message-level containers first (broad), then the answer wrappers.
-            // See MESSAGE_CONTAINER_SELECTORS in deepseek-ui.ts.
-            let blocks = [];
-            for (const s of opts.containerSels) {
-                const found = Array.from(document.querySelectorAll(s)).filter((e) => !inThink(e) && textOf(e).length > 0);
-                if (found.length) {
-                    blocks = found;
-                    break;
-                }
-            }
-            // De-duplicate by node identity and drop a block that is NESTED
-            // inside another block. Some builds match both an outer message
-            // container and an inner one; without this the restored dialogue
-            // printed each turn twice. We keep only the OUTERMOST blocks.
-            if (blocks.length > 1) {
-                const unique = Array.from(new Set(blocks));
-                blocks = unique.filter((b) => !unique.some((other) => other !== b && other.contains(b)));
-            }
-            const out = [];
-            if (blocks.length) {
-                for (const b of blocks) {
-                    const t = textOf(b);
-                    if (!t)
-                        continue;
-                    out.push({
-                        role: looksAssistant(b) ? 'assistant' : 'user',
-                        text: t,
-                    });
-                }
-                if (out.length)
-                    return out;
-            }
-            // Last resort: assistant answers only (no user turns) — better than
-            // nothing when no message container matched.
-            // See RESTORE_ANSWER_SELECTORS in deepseek-ui.ts.
-            for (const s of opts.answerSels) {
-                const list = Array.from(document.querySelectorAll(s)).filter((e) => !inThink(e));
-                if (!list.length)
-                    continue;
-                for (const el of list) {
-                    const t = textOf(el);
-                    if (t)
-                        out.push({ role: 'assistant', text: t });
-                }
-                break;
-            }
-            return out;
-        }, {
+            .evaluate(scrapeChatMessages, {
             containerSels: MESSAGE_CONTAINER_SELECTORS,
             answerSels: RESTORE_ANSWER_SELECTORS,
             thinkRe: THINK_CLASS_RE.source,