@trusty-squire/mcp 1.0.47 → 1.0.48-rc.2

package/dist/bot/google-login.d.ts

@@ -5,6 +5,7 @@ export interface LoginResult {
     detail?: string;
 }
 export declare function contextHasProviderSession(context: BrowserContext, provider: OAuthProviderId): Promise<boolean>;
+export declare function profileHasProviderCookies(profileDir: string, provider: OAuthProviderId): boolean;
 export declare function detectActiveProviderSessions(profileDir?: string): Promise<OAuthProviderId[]>;
 export type GoogleAuthState = "consent" | "needs_login" | "challenge" | "not_google";
 export declare function classifyGoogleAuthState(url: string, bodyText: string): GoogleAuthState;
@@ -26,6 +27,9 @@ export interface RunInBotChromeOpts {
     onSuccess?: (context: BrowserContext) => Promise<void>;
     apiBaseUrl?: string;
     heartbeatMessage?: string | (() => string);
+    plainProfileLogin?: boolean;
+    plainPollUntilDone?: (profileDir: string) => Promise<boolean>;
+    plainOnSuccess?: (profileDir: string) => Promise<void>;
 }
 export declare function runInBotChrome(opts: RunInBotChromeOpts): Promise<{
     status: "completed" | "preflight_satisfied" | "timeout";
@@ -41,7 +45,7 @@ export declare function ensureOAuthSession(opts?: {
 export declare function extractGoogleAccountEmail(pageText: string): string | null;
 export declare function openInstallConfirmInBotChrome(opts: {
     confirmUrl: string;
-    pollUntilClaimed: (context: BrowserContext) => Promise<boolean>;
+    pollUntilClaimed: (profileDir: string) => Promise<boolean>;
     profileDir?: string;
     timeoutMinutes?: number;
     apiBaseUrl?: string;

package/dist/bot/google-login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"google-login.d.ts","sourceRoot":"","sources":["../../src/bot/google-login.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"google-login.d.ts","sourceRoot":"","sources":["../../src/bot/google-login.ts"],"names":[],"mappings":"AAmDA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAsG5D,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,WAAW,GAAG,eAAe,GAAG,SAAS,GAAG,OAAO,CAAC;IAC5D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAeD,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,cAAc,EACvB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,OAAO,CAAC,CAElB;AAiBD,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAmBT;AA0CD,wBAAsB,4BAA4B,CAChD,UAAU,GAAE,MAA2B,GACtC,OAAO,CAAC,eAAe,EAAE,CAAC,CAqC5B;AAUD,MAAM,MAAM,eAAe,GACvB,SAAS,GACT,aAAa,GACb,WAAW,GACX,YAAY,CAAC;AAEjB,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,eAAe,CAwCtF;AA+BD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CA2BlE;AAMD,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAEjE;AAaD,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAiB/D;AAUD,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAiBpE;AAGD,wBAAgB,UAAU,IAAI,OAAO,CAsBpC;AAWD,wBAAgB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAe9C;AAmBD,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGjD;AAqBD,wBAAgB,WAAW,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAoB9D;AA2JD,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IAGjB,aAAa,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAG7D,WAAW,EAAE,MAAM,CAAC;IAIpB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAO1D,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAKvD,UAAU,CAAC,EAAE,MAAM,CAAC;IAGpB,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IAS3C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAG5B,kBAAkB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAG9D,cAAc,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC;IAAE,MAAM,EAAE,WAAW,GAAG,qBAAqB,GAAG,SAAS,CAAA;CAAE,CAAC,CAsBtE;AA2ZD,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,EAC7B,gBAAgB,GAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CACsD,GAC7F,OAAO,CAAC,OAAO,CAAC,CAelB;AAQD,wBAAsB,kBAAkB,CAAC,IAAI,CAAC,EAAE;IAC9C,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IAQpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,GAAG,OAAO,CAAC,WAAW,CAAC,CA8DvB;AAYD,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQzE;AASD,wBAAsB,6BAA6B,CAAC,IAAI,EAAE;IACxD,UAAU,EAAE,MAAM,CAAC;IAOnB,gBAAgB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IAIxB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;CAC5C,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiDxE"}

package/dist/bot/google-login.js

@@ -32,7 +32,8 @@ import boxen from "boxen";
 import chalk from "chalk";
 import { shortenVncUrl } from "../api-client.js";
 import { CHROME_PROFILE_DIR, launchWithProfileGate, ProfileBusyError, waitForProfileFree } from "./profile.js";
-import { markProviderLoggedIn, recordProviderEmail } from "./login-state.js";
+import { launchPlainLoginBrowser, launchSelfManagedLoginContext, resolveChannelBinary, selfLaunchEnabled, } from "./browser.js";
+import { markProviderLoggedIn } from "./login-state.js";
 import { randomBytes } from "node:crypto";
 const require = createRequire(import.meta.url);
 // Route the INTERACTIVE login through the same proxy the bot uses, so the
@@ -123,6 +124,43 @@ async function hasProviderSession(context, target) {
 export async function contextHasProviderSession(context, provider) {
     return hasProviderSession(context, LOGIN_TARGETS[provider]);
 }
+// Provider session cookie NAMES long/specific enough to detect by substring in
+// the raw on-disk Cookies DB. Bare short names (Google's "SID") are omitted —
+// they substring-collide with other cookie names.
+const PROVIDER_COOKIE_MARKERS = {
+    google: ["__Secure-1PSID", "SAPISID"],
+    github: ["user_session"],
+};
+// Read a PLAIN login browser's provider session straight off disk. The connect
+// claim's login browser never attaches CDP (see launchPlainLoginBrowser — a
+// CDP attach fails Google's OAuth "secure browser" check), so there is no live
+// context to query. Chrome stores cookie NAMES as plaintext in the Cookies
+// SQLite b-tree pages, so a raw byte search reliably answers "did this
+// session's cookie get written" — dependency-free and Node-version-agnostic
+// (engines >=20; node:sqlite is 22.5+). Presence-only; never decrypts values.
+export function profileHasProviderCookies(profileDir, provider) {
+    const markers = PROVIDER_COOKIE_MARKERS[provider];
+    // <profile>/Default/Cookies is the norm; a profile that never opened a window
+    // may only have <profile>/Cookies. Include the WAL sidecar — a just-written
+    // cookie may not be checkpointed into the main file yet.
+    const bases = [join(profileDir, "Default", "Cookies"), join(profileDir, "Cookies")];
+    for (const base of bases) {
+        for (const path of [base, `${base}-wal`]) {
+            if (!existsSync(path))
+                continue;
+            let text;
+            try {
+                text = readFileSync(path).toString("latin1");
+            }
+            catch {
+                continue;
+            }
+            if (markers.some((m) => text.includes(m)))
+                return true;
+        }
+    }
+    return false;
+}
 // VALIDATE a session instead of just spotting a cookie. A provider session that
 // expired server-side often leaves its `user_session` cookie sitting in the
 // profile, so name-presence false-positives ("the GitHub marker lies"). Here we
@@ -625,6 +663,45 @@ export async function runInBotChrome(opts) {
     return await runHeadlessChrome(opts);
 }
 async function runDisplayedChrome(opts) {
+    // PLAIN-BROWSER path (connect claim): launch plain Chrome, never attach CDP,
+    // detect completion off the API + on-disk cookie store. See
+    // launchPlainLoginBrowser / RunInBotChromeOpts.plainProfileLogin.
+    if (opts.plainProfileLogin === true) {
+        if (opts.plainPollUntilDone === undefined) {
+            throw new Error("plainProfileLogin set without plainPollUntilDone");
+        }
+        const binary = resolveChannelBinary("chrome");
+        if (binary === null) {
+            throw new Error("no Chrome binary found for the plain login browser");
+        }
+        const proxyOpt = loginProxyOption();
+        const browser = await launchPlainLoginBrowser({
+            binary,
+            profileDir: opts.profileDir,
+            url: opts.url,
+            window: { width: 1280, height: 800 },
+            env: process.env,
+            // Self-launch/--proxy-server can't carry proxy auth — drop a credentialed
+            // proxy (direct). Connect from the box is the point anyway.
+            proxyServer: proxyOpt !== undefined && proxyOpt.password === undefined ? proxyOpt.server : null,
+            extraArgs: ["--no-sandbox", "--disable-dev-shm-usage"],
+        });
+        try {
+            console.error(`\n[login] A Chrome window has opened. ${opts.bannerLabel}\n`);
+            console.error(`[connect-debug] launcher=plain_display chrome=${binary}`);
+            const ok = await pollUntil(opts.deadline, () => opts.plainPollUntilDone(opts.profileDir), opts.heartbeatMessage);
+            if (ok && opts.plainOnSuccess !== undefined) {
+                try {
+                    await opts.plainOnSuccess(opts.profileDir);
+                }
+                catch { /* swallow */ }
+            }
+            return { status: ok ? "completed" : "timeout" };
+        }
+        finally {
+            await browser.teardown();
+        }
+    }
     const chromium = resolveChromium();
     const context = await launchWithProfileGate(opts.profileDir, () => chromium.launchPersistentContext(opts.profileDir, {
         channel: "chrome",
@@ -696,6 +773,11 @@ async function runHeadlessChrome(opts) {
     // Playwright handle, closed via context.close(). Tracked here so the
     // signal handler can release the profile lock before exiting.
     let activeContext;
+    // Teardown for the login browser — for the self-launch path this ALSO kills
+    // the spawned Chrome child (a bare context.close() over CDP leaves it
+    // running), for the persistent fallback it's just context.close(). Tracked
+    // so the signal handler can release the profile lock before exiting.
+    let activeTeardown;
     // Ensure nothing is orphaned if the process dies mid-flow. `exit`
     // covers a normal return; SIGTERM/SIGINT cover an interrupted run —
     // once a signal listener is registered the default terminate is
@@ -706,13 +788,13 @@ async function runHeadlessChrome(opts) {
             teardown(rig);
             process.exit(130);
         };
-        if (activeContext !== undefined) {
-            // Close the browser to release the persistent-profile lock — but
-            // cap the wait: a wedged Chrome under Xvfb can hang close()
-            // indefinitely, and the rig MUST still be torn down. Whichever
-            // wins (clean close, or the 3s cap), `finish` runs.
+        if (activeTeardown !== undefined) {
+            // Tear down the browser to release the persistent-profile lock (and
+            // kill the self-launched Chrome) — but cap the wait: a wedged Chrome
+            // under Xvfb can hang indefinitely, and the rig MUST still be torn
+            // down. Whichever wins (clean teardown, or the 3s cap), `finish` runs.
             const capped = new Promise((r) => setTimeout(r, 3000));
-            Promise.race([activeContext.close().catch(() => undefined), capped]).then(finish, finish);
+            Promise.race([activeTeardown().catch(() => undefined), capped]).then(finish, finish);
         }
         else {
             finish();
@@ -726,41 +808,115 @@ async function runHeadlessChrome(opts) {
         rig.procs.push(spawnBg("Xvfb", [display, "-screen", "0", `${HEADLESS_W}x${HEADLESS_H}x24`, "-ac"]));
         await new Promise((r) => setTimeout(r, 1500));
         // 2. Chrome on that display, persistent profile, window filling the display.
-        const chromium = resolveChromium();
-        const context = await launchWithProfileGate(opts.profileDir, () => chromium.launchPersistentContext(opts.profileDir, {
-            channel: "chrome",
-            headless: false,
-            viewport: null, // use the real window size
-            env: { ...process.env, DISPLAY: display },
-            // Drop --enable-automation: kills the "controlled by automated test
-            // software" infobar and the matching automation fingerprint.
-            ignoreDefaultArgs: ["--enable-automation"],
-            ...(loginProxyOption() !== undefined ? { proxy: loginProxyOption() } : {}),
-            args: [
-                `--window-position=0,0`,
-                `--window-size=${HEADLESS_W},${HEADLESS_H}`,
-                // App mode strips the tabs, URL bar, and the "unsupported
-                // command-line flag" warning that otherwise eat the top
-                // third of a phone-shaped framebuffer when viewed through
-                // noVNC. The install page gets the full window.
-                `--app=${opts.url}`,
-                "--disable-blink-features=AutomationControlled",
-                // Suppresses the "You are using an unsupported command-line
-                // flag: --no-sandbox" yellow infobar that otherwise eats the
-                // top strip of the framebuffer once we hand it to noVNC.
-                // Standard automation-test flag; doesn't affect OAuth/cookies.
-                "--test-type",
-                "--no-sandbox",
-                "--disable-dev-shm-usage",
-            ],
-        }));
+        //    Self-launch + connectOverCDP is the STATE.md 2026-06-12 launcher fix:
+        //    a launchPersistentContext-driven Chrome carries the launch-time
+        //    instrumentation anti-bot (Cloudflare Turnstile, and — the bug this
+        //    ports the fix for — Google's sign-in device-prompt) reads as a bot,
+        //    while a self-launched Chrome attached over CDP does not. The signup
+        //    path (BrowserController) already migrated; the connect login was the
+        //    last consumer of the detectable launcher. Fall back to the old
+        //    launcher when self-launch is opted out (BOT_SELF_LAUNCH=0), Chrome
+        //    isn't resolvable as a real binary, or a credentialed proxy is set
+        //    (self-launch's --proxy-server can't carry proxy auth).
+        const proxyOpt = loginProxyOption();
+        const chromeBinary = resolveChannelBinary("chrome");
+        const useSelfLaunch = selfLaunchEnabled() &&
+            chromeBinary !== null &&
+            (proxyOpt === undefined || proxyOpt.password === undefined);
+        const sharedChromeArgs = [
+            "--disable-blink-features=AutomationControlled",
+            // --test-type suppresses the "unsupported command-line flag:
+            // --no-sandbox" yellow infobar that otherwise eats the top strip of the
+            // phone-shaped framebuffer once handed to noVNC. Standard automation
+            // flag; doesn't affect OAuth/cookies.
+            "--test-type",
+            "--no-sandbox",
+            "--disable-dev-shm-usage",
+        ];
+        // PLAIN-BROWSER mode (connect claim): NO CDP at all — a CDP-attached Chrome
+        // fails Google's OAuth "secure browser" check (STATE.md 2026-07-20, fully
+        // bisected). `context` stays undefined; completion is read via
+        // plainPollUntilDone (API + on-disk cookies), never a live context.
+        const plain = opts.plainProfileLogin === true;
+        let context;
+        let teardownContext;
+        let launcherMode;
+        if (plain) {
+            if (opts.plainPollUntilDone === undefined) {
+                throw new Error("plainProfileLogin set without plainPollUntilDone");
+            }
+            if (chromeBinary === null) {
+                throw new Error("no Chrome binary found for the plain login browser");
+            }
+            launcherMode = "plain";
+            const browser = await launchPlainLoginBrowser({
+                binary: chromeBinary,
+                profileDir: opts.profileDir,
+                url: opts.url,
+                window: { width: HEADLESS_W, height: HEADLESS_H },
+                env: { ...process.env, DISPLAY: display },
+                proxyServer: proxyOpt !== undefined && proxyOpt.password === undefined ? proxyOpt.server : null,
+                extraArgs: sharedChromeArgs,
+            });
+            teardownContext = browser.teardown;
+        }
+        else if (useSelfLaunch && chromeBinary !== null) {
+            launcherMode = "self_launch";
+            const launched = await launchSelfManagedLoginContext({
+                binary: chromeBinary,
+                profileDir: opts.profileDir,
+                // App mode (--app) strips tabs/URL bar so the install page gets the
+                // full phone-shaped framebuffer under noVNC.
+                initialUrl: opts.url,
+                appMode: true,
+                window: { width: HEADLESS_W, height: HEADLESS_H },
+                env: { ...process.env, DISPLAY: display },
+                proxyServer: proxyOpt?.server ?? null,
+                extraArgs: sharedChromeArgs,
+            });
+            context = launched.context;
+            teardownContext = launched.teardown;
+        }
+        else {
+            launcherMode = "persistent";
+            const chromium = resolveChromium();
+            const persistent = await launchWithProfileGate(opts.profileDir, () => chromium.launchPersistentContext(opts.profileDir, {
+                channel: "chrome",
+                headless: false,
+                viewport: null, // use the real window size
+                env: { ...process.env, DISPLAY: display },
+                // Drop --enable-automation: kills the "controlled by automated test
+                // software" infobar and the matching automation fingerprint.
+                ignoreDefaultArgs: ["--enable-automation"],
+                ...(proxyOpt !== undefined ? { proxy: proxyOpt } : {}),
+                args: [
+                    `--window-position=0,0`,
+                    `--window-size=${HEADLESS_W},${HEADLESS_H}`,
+                    `--app=${opts.url}`,
+                    ...sharedChromeArgs,
+                ],
+            }));
+            context = persistent;
+            teardownContext = async () => {
+                await persistent.close().catch(() => undefined);
+            };
+        }
         activeContext = context;
+        activeTeardown = teardownContext;
+        // Trace which launcher ran — survives the noVNC collapsing (stderr). The
+        // self-launch port is the fix under test for the Google device-prompt
+        // rejection; this line is how we confirm which path a real run took.
+        console.error(`[connect-debug] launcher=${launcherMode} chrome=${chromeBinary ?? "<none>"} display=${display}`);
         try {
-            if (opts.preflight !== undefined && await opts.preflight(context)) {
-                return { status: "preflight_satisfied" };
+            // CDP path only: preflight + drive the first page to the URL. The plain
+            // path has no context — plain Chrome's --app already opened opts.url.
+            if (context !== undefined) {
+                if (opts.preflight !== undefined && await opts.preflight(context)) {
+                    return { status: "preflight_satisfied" };
+                }
+                const page = context.pages()[0] ?? (await context.newPage());
+                await page.goto(opts.url, { waitUntil: "domcontentloaded" });
             }
-            const page = context.pages()[0] ?? (await context.newPage());
-            await page.goto(opts.url, { waitUntil: "domcontentloaded" });
             // 3. x11vnc on the display — localhost-only, password-gated, -noshm
             //    (the box's X server lacks the shared-memory extension).
             //    G14 — pass the password via a 0600 file, NOT `-passwd <plain>`
@@ -840,20 +996,36 @@ async function runHeadlessChrome(opts) {
             //    set — opening a second context after teardown is racy and
             //    silently fails on profile lock), then tear the whole stack
             //    down.
-            const ok = await pollUntil(opts.deadline, () => opts.pollUntilDone(context), opts.heartbeatMessage);
-            if (ok && opts.onSuccess !== undefined) {
-                try {
-                    await opts.onSuccess(context);
+            const ok = await pollUntil(opts.deadline, () => context !== undefined
+                ? opts.pollUntilDone(context)
+                : opts.plainPollUntilDone(opts.profileDir), opts.heartbeatMessage);
+            if (ok) {
+                if (context !== undefined) {
+                    if (opts.onSuccess !== undefined) {
+                        try {
+                            await opts.onSuccess(context);
+                        }
+                        catch { /* swallow */ }
+                    }
+                }
+                else if (opts.plainOnSuccess !== undefined) {
+                    try {
+                        await opts.plainOnSuccess(opts.profileDir);
+                    }
+                    catch { /* swallow */ }
                 }
-                catch { /* swallow */ }
             }
-            await context.close();
+            await teardownContext();
             return { status: ok ? "completed" : "timeout" };
         }
         finally {
-            await context.close().catch(() => undefined);
-            // Closed — the signal handler must not double-close it.
+            // Idempotent (self-launch teardown guards with a `torn` flag; the
+            // persistent fallback's close() is .catch-wrapped), so the success-path
+            // call above and this finally can both fire safely.
+            await teardownContext();
+            // Torn down — the signal handler must not double-tear it.
             activeContext = undefined;
+            activeTeardown = undefined;
         }
     }
     finally {
@@ -964,7 +1136,10 @@ export async function ensureOAuthSession(opts) {
 // "Google Account: Ada Lovelace (ada@example.com)" on every Google surface, so
 // prefer that anchored match; fall back to the first email-shaped token (the
 // myaccount.google.com page renders the address prominently). Pure + exported
-// for unit tests — the live navigation that feeds it is captureGoogleEmail.
+// for unit tests. (Eager capture-at-login was removed with the plain-login
+// switch — it needed a live CDP context to scrape myaccount.google.com, which
+// the plain connect browser no longer has; provision scrapes the email per-run
+// when the marker is unset, so this is now the only consumer besides tests.)
 const EMAIL_TOKEN_RE = /[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,}/i;
 export function extractGoogleAccountEmail(pageText) {
     const chip = /Google Account:[^()]*\(([^)]+)\)/i.exec(pageText);
@@ -976,29 +1151,6 @@ export function extractGoogleAccountEmail(pageText) {
     const any = EMAIL_TOKEN_RE.exec(pageText);
     return any !== null ? any[0].trim() : null;
 }
-// Capture-at-login: with the profile's live Google session, read the account's
-// email once and persist it to the profile marker so provision can fill it as
-// the signup email (user-owned accounts) without a per-run scrape. Best-effort:
-// any failure leaves the marker unset and provision proceeds without a pre-known
-// email. Only meaningful for google (the inbox identity); github has no inbox.
-async function captureGoogleEmail(context, profileDir) {
-    let page = null;
-    try {
-        page = await context.newPage();
-        await page.goto("https://myaccount.google.com/", { waitUntil: "domcontentloaded", timeout: 15_000 });
-        const text = await page.evaluate(() => document.body.innerText).catch(() => "");
-        const email = extractGoogleAccountEmail(text);
-        if (email !== null)
-            recordProviderEmail("google", email, profileDir);
-    }
-    catch {
-        /* best-effort — no pre-known email this run */
-    }
-    finally {
-        if (page !== null)
-            await page.close().catch(() => undefined);
-    }
-}
 // Public entry for the install flow: opens the trustysquire /install
 // confirm URL in the bot's persistent Chrome profile, runs the
 // user-supplied check until the install is claimed (or the deadline
@@ -1017,45 +1169,33 @@ export async function openInstallConfirmInBotChrome(opts) {
             deadline,
             bannerLabel: `You'll see a Chrome window with the Trusty Squire install page. ` +
                 `Sign in there to connect this machine — you only sign in once.`,
-            pollUntilDone: (context) => opts.pollUntilClaimed(context),
+            // PLAIN browser — no CDP. Google's OAuth flow (which this confirm page
+            // initiates) rejects a CDP-attached Chrome (STATE.md 2026-07-20). The
+            // context-taking pollUntilDone is never invoked in this mode; supply a
+            // stub to satisfy the (CDP-path) type.
+            plainProfileLogin: true,
+            pollUntilDone: () => Promise.resolve(false),
+            plainPollUntilDone: (dir) => opts.pollUntilClaimed(dir),
             ...(opts.apiBaseUrl !== undefined ? { apiBaseUrl: opts.apiBaseUrl } : {}),
             ...(opts.heartbeatMessage !== undefined
                 ? { heartbeatMessage: opts.heartbeatMessage }
                 : {}),
-            // The user's sign-in inside this Chrome leaves a provider session
-            // in the persistent profile. We don't know WHICH provider they
-            // used (Google or GitHub), so probe both cookie sets and mark
-            // whichever has live cookies. Runs while the context is still
-            // open — opening a second persistent context to the same profile
-            // right after teardown is racy and silently fails on profile-
-            // lock contention, which would leave the marker file empty and
-            // make the signup bot fall back to manual on every subsequent
-            // OAuth-only service.
-            onSuccess: async (context) => {
+            // The user's sign-in inside this Chrome leaves a provider session in the
+            // persistent profile. We don't know WHICH provider they used, so probe
+            // both cookie sets (from the on-disk store — no live context in plain
+            // mode) and mark whichever seeded.
+            plainOnSuccess: async (dir) => {
                 for (const provider of ["google", "github"]) {
-                    const target = LOGIN_TARGETS[provider];
-                    // Probe BOTH cookie origins — modern Google cookies are
-                    // `.google.com` domain so visible at www.google.com, but
-                    // some get set on accounts.google.com specifically. Checking
-                    // both catches the OAuth-redirect case (the user came
-                    // through accounts.google.com, never visited www.google.com).
-                    const origins = [target.cookieOrigin, "https://accounts.google.com"];
-                    let hit = false;
-                    for (const origin of origins) {
-                        const cookies = await context.cookies(origin);
-                        if (cookies.some((c) => target.cookies.includes(c.name))) {
-                            hit = true;
-                            break;
-                        }
-                    }
-                    if (hit) {
-                        markProviderLoggedIn(provider, profileDir);
-                        // Capture-at-login: store the Google email now (the one moment it's
-                        // certain) so provision fills it as the user-owned signup email.
-                        if (provider === "google")
-                            await captureGoogleEmail(context, profileDir);
+                    if (profileHasProviderCookies(dir, provider)) {
+                        markProviderLoggedIn(provider, dir);
                     }
                 }
+                // NB: eager Google-email capture (captureGoogleEmail) needed a live
+                // context to scrape myaccount.google.com; the plain login path has
+                // none. It was only an optimization ("provision proceeds without a
+                // pre-known email" otherwise) — provision scrapes the email per-run
+                // when unset, so dropping eager capture is safe and keeping CDP off
+                // the OAuth login is the whole point of the plain path.
             },
         });
         if (result.status === "completed") {