dsh-browser-playwright-codex 0.7.8 → 0.8.1

package/lib/browser-lifecycle.js

@@ -9,6 +9,8 @@ import fs from 'node:fs';
 import { AUTO_CHANNELS, HUMANIZED_LAUNCH } from "./config.js";
 import { SNAPSHOT_SCRIPT } from "./injected.js";
 import { BrowserError, launchFailed } from "./errors.js";
+import { forgetOnBrowserClose, showWelcome } from "./swarm-intro.js";
+import { swarmBootScript } from "./swarm-curtain.js";
 /**
  * Ensure the shared persistent context is alive (persistent mode). A
  * profile-backed window is launched once and reused until closed by the
@@ -50,8 +52,16 @@ async function launchContext(provider) {
     const headless = provider.desiredHeadless();
     const headful = !headless;
     const attempts = [];
+    // launchPersistentContext waits forever by default (issue #5): a profile another
+    // process is holding, a stalled singleton handshake or a wedged GPU init hangs
+    // acquire() with no deadline at all. navigationTimeoutMs is the only time scale
+    // the user can tune, but it may legitimately be as low as 1s (navigation), which
+    // is far too short for a cold Chrome start — so the launch deadline never drops
+    // below 30s.
+    const launchTimeoutMs = Math.max(provider.config.launch.navigationTimeoutMs, 30_000);
     const baseOptions = {
         headless,
+        timeout: launchTimeoutMs,
         // Headful windows must render like a normal Chrome the user opened
         // by hand: the page viewport equals the real window size and the
         // system DPI scaling (e.g. 150%) is honoured. Playwright's default
@@ -87,7 +97,11 @@ async function launchContext(provider) {
             // A stale Chrome singleton lock from a dirty shutdown breaks a relaunch
             // into the same profile; clear the lock files and retry once before
             // surfacing the failure.
-            if (error instanceof Error && /user data directory|SingletonLock|ProcessSingleton/i.test(error.message)) {
+            // Playwright reports the same situation as a timeout ("browserType.launchPersistentContext:
+            // Timeout 30000ms exceeded") rather than as a lock message, so match both shapes
+            // or the retry never fires against the profile lock it was written for.
+            if (error instanceof Error &&
+                /user data directory|SingletonLock|ProcessSingleton|Timeout \d+ms exceeded/i.test(error.message)) {
                 await provider.clearChromeLocks();
                 provider.context = await chromium.launchPersistentContext(provider.profileDir, { ...baseOptions, ...extra });
                 provider.launchedHeadless = headless;
@@ -100,6 +114,8 @@ async function launchContext(provider) {
         // External close (user closed the window, crash): forget every
         // session handle bound to this context; the next acquire relaunches.
         void ctx.on('close', () => {
+            // 整个插件浏览器窗口关掉：默认忘掉这趟播过哪些站，下次重开全部重播。
+            forgetOnBrowserClose(ctx);
             if (provider.context !== ctx)
                 return;
             provider.context = undefined;
@@ -122,11 +138,21 @@ async function launchContext(provider) {
         // page cannot leave the list by itself (navigation-guard.ts).
         await provider.installHostGuard(ctx);
         await ctx.addInitScript(SNAPSHOT_SCRIPT);
+        // 共享窗口（persistent）这条路也要注册「同一个引擎」的提前启动脚本。
+        // 之前只加在 provider.ts 的 newContext 分支，用户实际用的是这里，
+        // 第一帧脚本根本没注册 —— 标记留在 window.name 里没被消费（2026-11-09 实测）。
+        await ctx.addInitScript({ content: swarmBootScript() });
         // The initial blank page predates addInitScript: reload so the
         // snapshot engine and restored localStorage apply on first use.
         for (const page of ctx.pages()) {
             await page.reload({ waitUntil: 'domcontentloaded' }).catch(() => { });
         }
+        // 刚开的窗口停在 about:blank —— 一张纯白占位页。换成启动卡片，并让光标把
+        // 它画一遍。只处理还没去任何网址的初始页，不动已恢复的标签。
+        const firstPage = ctx.pages()[0];
+        if (firstPage !== undefined && firstPage.url() === 'about:blank') {
+            await showWelcome(firstPage, provider.config);
+        }
         return ctx;
     };
     if (executablePath !== undefined) {

package/lib/challenge.d.ts

@@ -32,11 +32,14 @@ export declare function challengeNote(headless: boolean): string;
 export declare const CHALLENGE_NOTE = "[human verification] The page triggered an anti-bot challenge; it is NOT solvable by automation and must NOT be retried blindly. The browser window is open on the user's desktop \u2014 tell the user a verification appeared, wait for them to finish it (a few seconds), then call browser_snapshot again. The clearance cookie is saved to the profile automatically and keeps working for the session.";
 /**
  * Appended after an action that left the page byte-for-byte unchanged on a page
- * with almost nothing else to interact with. Worded as a guess, because that is
- * what it is: it is the shape an unrecognised wall has, and the whole point of
- * this tier is to cover the vendors we have no signature for.
+ * with almost nothing else to interact with. It states the observation and the
+ * recovery — re-snapshot in case the page is still rendering, then try another
+ * approach — and deliberately does NOT guess "anti-bot wall" or send the user to
+ * look at the window: a normal fill or checkbox toggle also lands here when the
+ * page state it changed is not in the compared subset, and scaring the user off
+ * on a successful action is worse than saying less.
  */
-export declare const NO_PROGRESS_NOTE = "[no visible change] that action left the page identical \u2014 same URL, same title, same elements \u2014 and the page offers almost nothing else to click. This is a guess, not a diagnosis: it is what an unrecognised anti-bot wall looks like. Take one browser_snapshot to confirm; if the page still looks unchanged, stop and tell the user what you were trying to do and ask them to look at the open window, instead of retrying the same action.";
+export declare const NO_PROGRESS_NOTE = "[no visible change] this action did not produce a visible change. If what you just did was a submit, a search or a navigation, the page may still be rendering \u2014 take one more browser_snapshot to confirm. If it still looks the same, try a different approach (for example another entry point on the page).";
 /** A page with at most this many actionable elements counts as "nearly empty". */
 export declare const NO_PROGRESS_MAX_REFS = 3;
 /**

package/lib/challenge.js

@@ -40,11 +40,27 @@ function scan(nodes, depth, maxDepth, out, cap) {
             return;
         const name = node.name ?? '';
         if (name !== '')
-            out.push({ role: (node.role ?? '').toLowerCase(), name });
+            out.push({ role: (node.role ?? '').toLowerCase(), name, state: stateOf(node) });
         if (depth < maxDepth)
             scan(node.children, depth + 1, maxDepth, out, cap);
     }
 }
+/**
+ * Compact interactive-state signature of one node. A fill or a toggle changes
+ * this without changing the role or name, so the no-progress fingerprint has to
+ * include it — otherwise a normal fill or checkbox toggle looks like "no visible
+ * change" and trips the anti-bot guess.
+ */
+function stateOf(node) {
+    const parts = [];
+    if (node.checked !== undefined)
+        parts.push(node.checked ? 'checked' : 'unchecked');
+    if (node.selected !== undefined)
+        parts.push(node.selected ? 'selected' : 'unselected');
+    if (node.value !== undefined && node.value !== '')
+        parts.push('v=' + node.value);
+    return parts.join(',');
+}
 /** Evidence string when one header rule holds, else null. */
 function headerEvidence(rule, headers) {
     if (headers === undefined)
@@ -232,11 +248,14 @@ export function challengeNote(headless) {
 export const CHALLENGE_NOTE = "[human verification] The page triggered an anti-bot challenge; it is NOT solvable by automation and must NOT be retried blindly. The browser window is open on the user's desktop — tell the user a verification appeared, wait for them to finish it (a few seconds), then call browser_snapshot again. The clearance cookie is saved to the profile automatically and keeps working for the session.";
 /**
  * Appended after an action that left the page byte-for-byte unchanged on a page
- * with almost nothing else to interact with. Worded as a guess, because that is
- * what it is: it is the shape an unrecognised wall has, and the whole point of
- * this tier is to cover the vendors we have no signature for.
+ * with almost nothing else to interact with. It states the observation and the
+ * recovery — re-snapshot in case the page is still rendering, then try another
+ * approach — and deliberately does NOT guess "anti-bot wall" or send the user to
+ * look at the window: a normal fill or checkbox toggle also lands here when the
+ * page state it changed is not in the compared subset, and scaring the user off
+ * on a successful action is worse than saying less.
  */
-export const NO_PROGRESS_NOTE = '[no visible change] that action left the page identical — same URL, same title, same elements — and the page offers almost nothing else to click. This is a guess, not a diagnosis: it is what an unrecognised anti-bot wall looks like. Take one browser_snapshot to confirm; if the page still looks unchanged, stop and tell the user what you were trying to do and ask them to look at the open window, instead of retrying the same action.';
+export const NO_PROGRESS_NOTE = '[no visible change] this action did not produce a visible change. If what you just did was a submit, a search or a navigation, the page may still be rendering — take one more browser_snapshot to confirm. If it still looks the same, try a different approach (for example another entry point on the page).';
 /** A page with at most this many actionable elements counts as "nearly empty". */
 export const NO_PROGRESS_MAX_REFS = 3;
 /** Cheap, order-stable hash (djb2) so a fingerprint costs no prompt budget. */
@@ -261,7 +280,10 @@ export function snapshotFingerprint(input) {
         input.url ?? '',
         input.title ?? '',
         String(input.refs ?? 0),
-        names.map((node) => node.role + '=' + node.name).join('\u0001'),
+        // Include interactive state (checked/selected/value) so a fill or a toggle
+        // registers as change — otherwise a normal fill looks like "no visible
+        // change" and trips the anti-bot guess.
+        names.map((node) => node.role + '=' + node.name + (node.state ? '[' + node.state + ']' : '')).join('\u0001'),
     ].join('\u0000');
     return hash(material);
 }