Keep the page's scroll position behind an embed when its body scrolls it

A page whose body carries the viewport's overflow (html and body at 100% height, body with overflow-x hidden) jumped to the top while an embed showed, and stayed there after: hiding the root's overflow made the body a scroller of its own. The lock now hides the overflow of whichever element the viewport uses, and restores a single-axis inline overflow.
Pad the page by the width its scrollbar gives back behind an embed
2026-11-13 20:12:57 -10:00 · 2026-11-08 14:01:59 -07:00 · 2026-11-08 13:40:45 -07:00 · 2026-11-08 13:37:29 -07:00 · 2026-11-08 13:35:40 -07:00 · 2026-11-08 13:12:20 -07:00
125 changed files with 11243 additions and 1017 deletions
@@ -53,7 +53,7 @@ jobs:
            # step above fails; the tests skip themselves without the key.
            - name: Run live realtime conversation tests
              if: ${{ !cancelled() }}
-              run: npm run setupExtensions && (cd src/puter-js && npm run build) && npx vitest run --config src/puter-js/tests/api/vitest.config.ts src/puter-js/tests/api/realtime/convoLive.test.ts
+              run: npm run setupExtensions && (cd src/puter-js && npm run build) && npx vitest run --config src/puter-js/tests/api/vitest.config.ts src/puter-js/tests/api/realtime/realtimeLive.test.ts
              env:
                  CI: 'true'
                  PUTER_TEST_AI_OPENAI_API_KEY: ${{ secrets.PUTER_TEST_AI_OPENAI_API_KEY }}
@@ -1 +1 @@
-FOLLOW ./AGENTS.md
+FOLLOW @AGENTS.md
@@ -14,11 +14,25 @@ to its normal sign-in. Apps that need the desktop (built-in and godmode apps,
 private apps the user can't open, or a failed token request) open `/app/<name>`
 on the GUI origin, cut off from the embed. Website shortcuts open their external
 destination with no opener.
+The embed follows the OS's light or dark setting. A host with a fixed theme adds
+`theme=dark` or `theme=light` to the fragment (`#user=<uuid>&theme=dark`), since
+Chromium doesn't pass an iframe's `color-scheme` on to the page inside it.
 Apps opened from the embed carry `utm_source=puter.com&utm_medium=referral&utm_campaign=app_browser_embed`;
 the desktop and dashboard send `utm_campaign=desktop` and `utm_campaign=dashboard`.

 ## Session and framing

+The embed shows the GUI session only to the user the host page is signed in as.
+The host names that user's `uuid` (from `puter.auth.getUser()`) in the iframe
+URL's fragment, as `/embed/apps#user=<uuid>`. The embed reads the session, asks
+`/whoami` which user it belongs to, and shows the signed-out view unless the two
+match. So a host that names no user, a malformed one, or a user other than the
+session's, gets the signed-out view, and so does a session the API refuses. A
+failed `/whoami` check shows the error state. The fragment never reaches the
+server and can only narrow what the embed shows: naming the session's own user
+gives the same view as a direct visit to the GUI. Changing the fragment of a
+loaded embed reloads it.
+
 The embed reads the existing GUI session from local storage on its own origin.
 If that storage holds no session, the embed gets the session from the GUI origin's session cookie through
 `/get-gui-token`. This matters in Safari, which gives a framed origin separate
@@ -29,7 +43,7 @@ does not create accounts, show a login dialog, or accept a token from its parent
 Being signed in on a subdomain alone does not create a session on the main GUI
 origin.

-Without a session, the embed shows the recommended apps (`RecommendedAppsService`)
+Without a session it can show, the embed shows the recommended apps (`RecommendedAppsService`)
 that the server put in the page, and nothing else: no installed apps, folders, or
 saved order, and no puter.js. Selecting one opens it at the same URL a signed-in
 launch uses, with no opener and no token on offer, so the app signs in on its own.
@@ -58,11 +72,18 @@ and popups to escape the sandbox.

 ## Host integration

+A first-party app that signs in with puter.js can place `<puter-user-menu>` from
+the SDK in its header instead (see `src/puter-js/src/ui/components.md`). It opens
+this embed with the signed-in user named and closes it when the app's sign-in
+changes. The rest of this section is for a host that builds the iframe itself.
+
 The iframe can be shown whether or not the user is signed in. Create it when
-“More apps” is opened, and remove it on close so reopening loads current apps
-and preferences. The host owns the modal and close control;
+“More apps” is opened, naming the signed-in user in its fragment, and remove it
+on close so reopening loads current apps and preferences. Remove it when the
+host's own sign-in changes too, such as on sign-out, so an open embed doesn't
+keep the previous user. The host owns the modal and close control;
 there is no parent messaging API and no app list or credential is sent to it.
-The app browser fills its iframe and responds to its size.
+The app browser fills its iframe and responds to its size. It shows a spinner until its apps load.

 This example assumes `puterOrigin` comes from the host app's deployment
 settings. Translate the button and frame labels using the host app's
@@ -84,10 +105,14 @@ localization system.
  const container = document.querySelector('#apps-frame');
  const trigger = document.querySelector('#more-apps');

-  trigger.addEventListener('click', () => {
+  trigger.addEventListener('click', async () => {
+    const url = new URL('/embed/apps', puterOrigin);
+    // Signed out, the embed shows the recommended apps.
+    const user = puter.auth.isSignedIn() ? await puter.auth.getUser().catch(() => null) : null;
+    if (user) url.hash = `user=${encodeURIComponent(user.uuid)}`;
    const frame = document.createElement('iframe');
    frame.title = 'Your apps';
-    frame.src = new URL('/embed/apps', puterOrigin).href;
+    frame.src = url.href;
    container.replaceChildren(frame);
    dialog.showModal();
  });
@@ -99,22 +124,149 @@ localization system.
 </script>
 ```

-## Implementation and checks
+## Implementation

 `createAppBrowser` in `src/gui/src/UI/Dashboard/AppBrowser.js` owns the shared UI
 and data behavior; its `guestApps` option is the signed-out list. `TabApps.js`
 injects desktop actions. `appsEmbed.js` supplies new-tab launching through
 `launchAppInTab` (signed in) and `guestAppLaunchUrl` (signed out) in
 `src/gui/src/helpers/appTabLaunch.js`, which build the same app URL as
-`launch_app`, and loads only the embed entry, its SDK, and shared styles.
-The normal GUI webpack build emits `bundle.min.js` and `apps-embed.min.js`.
+`launch_app`, and loads only the embed entry, its SDK, and shared styles. `embedHostUser` in
+`src/gui/src/helpers/embedHostUser.js` reads the host's user from the fragment, and
+`embedHostTheme.js` beside it applies the host's theme.
+The normal GUI webpack build emits `bundle.min.js`, `apps-embed.min.js`, and `feedback-embed.min.js`.
 The `/embed/apps` route puts the recommended list in the page's config as
 `guestApps`. No puter.js API or app-list endpoint changes are needed.

+## Feedback dialog
+
+`GET /embed/feedback` is the app feedback dialog (`puter.ui.showFeedbackDialog()`)
+for a first-party page, with the same framing rules, query redirect, and
+host-user binding as `/embed/apps`. It sends the feedback for the framing
+page's origin, which the server reads from the referrer and pins with
+`frame-ancestors`; opened top-level, it does nothing. Its page is transparent
+so the dialog's own scrim covers the host.
+
+puter.js uses it on a page one label under the GUI origin, other than the
+subdomains the server refuses, when the page is signed in, framing it in a
+modal `<dialog>` that stays hidden until the embed is ready. A session check that takes longer than 200ms shows a loading scrim
+with a spinner in its place; Escape or a click on it cancels. The embed posts `{ msg: 'feedbackEmbed', state }` to its parent
+(`loading`, then `ready` or `unavailable`) and finally
+`{ msg: 'feedbackDialogClosed', sent }`. It reports `unavailable` without the
+named user's session, or while that user's email still needs confirming, and
+puter.js then uses the `/action/send-feedback` popup, which can sign in. So does
+a frame that never answers, such as one the host's CSP blocks. `feedbackEmbed.js`
+is the entry, sharing `embedSession` in `src/gui/src/helpers/embedSession.js`
+with the app browser; `showFeedbackEmbed` in `src/puter-js/src/lib/guiEmbed.js`
+is the host side.
+
+## Sign-in and file pickers
+
+`GET /embed/sign-in`, `/embed/show-open-file-picker`, `/embed/show-save-file-picker`
+and `/embed/show-directory-picker` serve the same GUI popups as `/action/<action>`
+for a first-party page, with the same framing rules, query redirect, and
+`no-store` as `/embed/apps`. Any other spelling of the path (another case, a
+trailing slash) redirects to it, since the shell boots the desktop for it. They render the normal GUI shell, which names the
+framing page (read from the referrer, pinned with `frame-ancestors`) as
+`gui_params.embed_host_origin`. The GUI then runs the popup boot unchanged, with
+the framing page as `window.opener`, and `window.close()` asks the page to
+remove the frame (`src/gui/src/helpers/popupFrame.js`). Without a framing page
+to answer (opened top-level, or framed by a refused page) it does nothing. The
+popup's parameters come from the fragment instead of the query: `msg_id`,
+`options` and `request_auth`, plus `user` for a picker.
+
+The frame posts `{ msg: 'puterPopupFrame', state }` to its parent: `loading` as
+soon as the shell boots, `ready` once it shows a window or dialog, `unavailable`
+when the page has to use the popup, `provider` when the user picks a sign-in
+provider (below), and `closed` where a popup would close. Its
+answers (`puter.token`, `fileOpenPicked`, `directoryPicked`, `fileSaved`, the
+cancel messages, `sendMeFileData`) are the popup's.
+
+puter.js uses them on a page one label under the GUI origin, other than the
+subdomains the server refuses, unless the page is cross-origin isolated or in a
+frame of another site (which `frame-ancestors` refuses too).
+`showPopupFrame` in `src/puter-js/src/lib/guiEmbed.js` shows the frame in a box
+the size of the popup window, over a scrim, hidden until `ready` and behind the
+loading spinner after 200ms. Escape closes it, on the page or in the frame. One shows per popup, as each
+popup has its own window name: a second picker request of the same kind
+replaces the one showing, and a `signIn()` call made while a framed sign-in is
+open settles with it. On
+screens up to 600px wide the box fills the screen. A frame that is refused,
+never answers, or reports `unavailable` falls back to the popup, opened through
+a consent dialog when the click that asked for it has expired. A reload or navigation the frame
+starts itself (logging out, a sign-out in another tab) names the frame as its
+referrer, so the server refuses it; the page then shows its spinner and opens
+the frame again, once per `ready`.
+
+- **Sign-in** (`puter.auth.signIn()`) has no host-user binding: it is how the
+  page gets a user. The box has a close button, which rejects with
+  `auth_window_closed` as closing the popup does. Providers refuse to be
+  framed, so choosing one posts `{ state: 'provider', url }` with the
+  provider's start URL for this sign-in's `msg_id`, then `unavailable`. The
+  page opens the popup straight at that URL, once it checks the URL is the
+  GUI's `/auth/oidc/<provider>/start` for this `msg_id`, and the provider
+  returns it as this sign-in's popup. `attempt_temp_user_creation` keeps the popup, since
+  only the popup creates a temporary account.
+- **Pickers** frame only for a signed-in page. The GUI reports `unavailable`
+  unless its session belongs to the user named in `user`, and the page then uses
+  the popup, which can sign in and switch accounts. The token the GUI sends
+  before a picker's answer isn't adopted, since it is for the page's own user.
+  Dismissing the loading scrim settles the picker as cancelled.
+
+## Upgrade
+
+`GET /embed/upgrade` is the deployment's upgrade dialog for a first-party page,
+served like the popups above: the GUI shell with the same framing rules, query
+redirect, exact-path redirect and `no-store`, naming the framing page as
+`gui_params.embed_host_origin`. It runs only when framed by an allowed page.
+
+puter.js frames it on a signed-in first-party page (the same pages as the
+pickers) for `puter.ui.requestUpgrade(details)`, and for the Upgrade button of
+the usage limit dialog a refused call shows there. Elsewhere both keep their
+behavior: inside an app `requestUpgrade()` asks the desktop, and on any other
+page the usage limit dialog opens the dashboard's upgrade page in a new tab.
+
+The frame covers the page with no box or close button, and the GUI page is
+transparent (`html.popup-frame-transparent`) so the dialog's own scrim covers
+the host. The frame allows `payment` as well as `otp-credentials`. Escape on the
+page is left to the dialog, since one there shouldn't drop a payment in
+progress. Its fragment names `user` (the page's signed-in user) and, when the
+refusal gave them, `reason` (`funds`, `subscription` or `storage`) and `method`.
+
+The GUI reports `unavailable` unless its session belongs to `user`, the account
+has no verification or password change waiting (which the frame couldn't be
+closed from), and the deployment defines `window.UIUpgradeAccount` with
+`UIUpgradeAccount.embeddable === true`. Otherwise it runs:
+
+```js
+new UIUpgradeAccount({ attribution: { appUid, reason, method }, onClose }).open_as_window();
+```
+
+`appUid` is the app the framing page's origin resolves to, never one the
+fragment names. `open_as_window()` resolves once the dialog shows, and the GUI
+then posts `ready`. While the page still hides the frame, which Chromium and
+WebKit lay out at 0x0, the GUI posts `ready` first and opens the dialog once
+the frame has a viewport, so a window it opens doesn't center on 0x0.
+`onClose({ upgraded })` must run exactly once, when the
+dialog closes or when it declines to open for the account; the GUI then posts
+`{ msg: 'puterPopupFrame', state: 'closed', upgraded }` and the page removes
+the frame. If `open_as_window()` rejects, the GUI posts `unavailable` instead. `requestUpgrade()` resolves `{ upgraded }`. A call made while the
+frame shows settles with it rather than replacing it, and a call refused while
+it shows still rejects but opens no usage limit dialog over it.
+
+When the frame can't show the upgrade (refused, never ready, `unavailable`, or
+no user to name), puter.js opens the dashboard's upgrade page in a new tab with
+what was refused, through a consent dialog when the click has expired or the
+tab is blocked, and `requestUpgrade()` resolves `{ upgraded: false }`.
+
+## Checks
+
 Run the GUI component/browser tests (with the SDK bundle built and Playwright
 Chromium installed), and the backend route tests:

 ```sh
-npx vitest run --config src/gui/vitest.config.js src/gui/src/UI/Dashboard/AppBrowser
+npx vitest run --config src/gui/vitest.config.js src/gui/src/UI/Dashboard/AppBrowser src/feedbackEmbed
+npx vitest run src/puter-js/src/lib/guiEmbed.test.js src/puter-js/src/modules/UI.showFeedbackDialog.test.js src/puter-js/src/modules/Auth.signInFrame.test.js src/puter-js/src/modules/UI.pickerFrame.test.js src/puter-js/src/modules/UI.requestUpgrade.test.js src/puter-js/src/lib/upgradePrompt.test.js src/puter-js/src/modules/UsageLimitDialog.upgrade.test.js
+npx vitest run --config src/gui/vitest.config.js src/gui/src/helpers/popupFrame.test.js
 npx vitest run --config src/backend/vitest.config.ts src/backend/server.test.ts
 ```
@@ -15,7 +15,6 @@ export interface OidcLoginContinuation {
    embeddedInPopup: boolean;
    openerOrigin: string | null;
    messageId: string | null;
-    switchedToLogin: boolean;
 }

 interface OidcReturnDeps {
@@ -56,7 +55,6 @@ export function completeOidcLoginReturn(
        data.userUuid !== user.uuid ||
        typeof data.redirectUri !== 'string' ||
        typeof data.embeddedInPopup !== 'boolean' ||
-        typeof data.switchedToLogin !== 'boolean' ||
        (data.openerOrigin !== null && typeof data.openerOrigin !== 'string') ||
        (data.messageId !== null && typeof data.messageId !== 'string')
    ) {
@@ -91,6 +89,5 @@ export function completeOidcLoginReturn(
            ),
        );
    }
-    if (data.switchedToLogin) append('oidc_switched', 'login');
    return target;
 }
@@ -27,7 +27,7 @@ import type { Actor } from '../../core/actor.js';
 import { PuterRouter } from '../../core/http/PuterRouter.js';
 import { PuterServer } from '../../server.js';
 import { setupTestServer } from '../../testUtil.js';
-import { embedFrameAncestors } from './HomepageController.js';
+import { embedFrameAncestors, embedHostOrigin } from './HomepageController.js';

 // ── Test harness ────────────────────────────────────────────────────
 //
@@ -550,3 +550,26 @@ describe('embedFrameAncestors', () => {
        ).toBe("'self'");
    });
 });
+
+describe('embedHostOrigin', () => {
+    const config = {
+        origin: 'https://example.test',
+        domain: 'example.test',
+        api_base_url: 'https://backend.example.test',
+        static_hosting_domain: 'site.example.test',
+    };
+
+    it.each([
+        ['https://sheets.example.test/doc/1', 'https://sheets.example.test'],
+        ['https://backend.example.test/x', null],
+        ['https://api.example.test/', null],
+        ['https://someone.site.example.test/', null],
+        ['https://a.sheets.example.test/', null],
+        ['http://sheets.example.test/', null],
+        ['https://example.test/', null],
+        ['not a url', null],
+        [undefined, null],
+    ])('%s frames as %s', (referer, expected) => {
+        expect(embedHostOrigin(config, referer)).toBe(expected);
+    });
+});
@@ -31,8 +31,22 @@ import type {
    PuterHomepageService,
    PageMeta,
    LaunchOptions,
+    PopupFrame,
 } from '../../services/homepage/PuterHomepageService';

+/**
+ * GUI popups a first-party page can show in a frame at `/embed/<action>`,
+ * instead of opening `/action/<action>` in a window, and the upgrade dialog,
+ * which it would otherwise open in a dashboard tab.
+ */
+export const FRAMED_POPUP_ACTIONS = [
+    'sign-in',
+    'show-open-file-picker',
+    'show-save-file-picker',
+    'show-directory-picker',
+    'upgrade',
+] as const;
+
 /** Longest description/og:description/twitter:description on `/app/<name>`. */
 export const APP_META_DESCRIPTION_MAX = 150;

@@ -61,32 +75,34 @@ export function appMetaDescription(text: string): string {
    return `${cut.replace(/[\s,;:.!?…—-]+$/, '')}…`;
 }

+type EmbedFramingConfig = Pick<
+    IConfig,
+    | 'origin'
+    | 'domain'
+    | 'api_base_url'
+    | 'static_hosting_domain'
+    | 'static_hosting_domain_alt'
+    | 'private_app_hosting_domain'
+    | 'private_app_hosting_domain_alt'
+>;
+
 /**
- * `frame-ancestors` for the app browser embed. A wildcard over `*.<domain>`
+ * The origin of a first-party page that may frame an `/embed/*` page, named
+ * exactly from the request's referrer, or null. A wildcard over `*.<domain>`
 * would also admit user-hosted sites whenever the hosting domains sit under it,
- * so the embedding page is named exactly, from the request's referrer. Only a
- * single label under `<domain>` qualifies, and not one this server answers
- * itself (the API, WebDAV, SDK and native-app hosts).
+ * so only a single label under `<domain>` qualifies, and not one this server
+ * answers itself (the API, WebDAV, SDK and native-app hosts).
 */
-export function embedFrameAncestors(
-    config: Pick<
-        IConfig,
-        | 'origin'
-        | 'domain'
-        | 'api_base_url'
-        | 'static_hosting_domain'
-        | 'static_hosting_domain_alt'
-        | 'private_app_hosting_domain'
-        | 'private_app_hosting_domain_alt'
-    >,
+export function embedHostOrigin(
+    config: EmbedFramingConfig,
    referer: string | undefined,
-): string {
+): string | null {
    const gui = new URL(config.origin ?? `https://${config.domain}`);
    let parent: URL;
    try {
        parent = new URL(referer ?? '');
    } catch {
-        return "'self'";
+        return null;
    }
    const host = parent.hostname.toLowerCase();
    const label = subdomainLabelOf(host, config.domain);
@@ -105,7 +121,16 @@ export function embedFrameAncestors(
        !isReservedSubdomain(label) &&
        host !== new URL(config.api_base_url).hostname &&
        !hostingDomains.some((d) => host === d || host.endsWith(`.${d}`));
-    return allowed ? `'self' ${parent.origin}` : "'self'";
+    return allowed ? parent.origin : null;
+}
+
+/** `frame-ancestors` for an `/embed/*` page: the GUI and {@link embedHostOrigin}. */
+export function embedFrameAncestors(
+    config: EmbedFramingConfig,
+    referer: string | undefined,
+): string {
+    const host = embedHostOrigin(config, referer);
+    return host ? `'self' ${host}` : "'self'";
 }

 /**
@@ -142,6 +167,7 @@ export class HomepageController extends PuterController {
            res: express.Response,
            metaOverrides: Partial<PageMeta> = {},
            launch: LaunchOptions = {},
+            popupFrame?: PopupFrame,
        ) => {
            const meta = { ...defaultMeta(req), ...metaOverrides };
            const actor =
@@ -150,19 +176,27 @@ export class HomepageController extends PuterController {
                        actor?: Parameters<typeof homepage.send>[0]['actor'];
                    }
                ).actor ?? null;
-            await homepage.send({ req, res, actor }, meta, launch);
+            await homepage.send({ req, res, actor }, meta, launch, popupFrame);
        };

        // -- Root + path-aliased shell routes ------------------------

        router.get('/', {}, (req, res) => sendShell(req, res));

-        router.get('/embed/apps', {}, async (req, res) => {
-            // SDK bootstrap parameters must not change this page's account or API origin.
-            // Checked on the raw URL; `req.query` drops pairs past the parser's limit.
+        /**
+         * Headers shared by the `/embed/*` pages; false when the request was
+         * redirected instead. SDK bootstrap parameters must not change an
+         * embed's account or API origin, so a query string is dropped. Checked
+         * on the raw URL; `req.query` drops pairs past the parser's limit.
+         */
+        const prepareEmbed = (
+            req: express.Request,
+            res: express.Response,
+            path: string,
+        ): boolean => {
            if (req.originalUrl.includes('?')) {
-                res.redirect('/embed/apps');
-                return;
+                res.redirect(path);
+                return false;
            }
            res.removeHeader('X-Frame-Options');
            res.setHeader(
@@ -170,6 +204,11 @@ export class HomepageController extends PuterController {
                `frame-ancestors ${embedFrameAncestors(this.config, req.get('referer'))}`,
            );
            res.setHeader('Cache-Control', 'no-store');
+            return true;
+        };
+
+        router.get('/embed/apps', {}, async (req, res) => {
+            if (!prepareEmbed(req, res, '/embed/apps')) return;
            // Shown to visitors without a session; a signed-in embed fetches
            // its own list, so a failure here only costs signed-out visitors.
            const guestApps = await this.services.recommendedApps
@@ -178,6 +217,48 @@ export class HomepageController extends PuterController {
            res.send(homepage.renderAppBrowserEmbed({ guestApps }));
        });

+        router.get('/embed/feedback', {}, (req, res) => {
+            if (!prepareEmbed(req, res, '/embed/feedback')) return;
+            // The feedback is recorded against this origin, which
+            // frame-ancestors has just pinned to the actual framing page.
+            res.send(
+                homepage.renderFeedbackEmbed({
+                    hostOrigin: embedHostOrigin(
+                        this.config,
+                        req.get('referer'),
+                    ),
+                }),
+            );
+        });
+
+        // The GUI runs the popup's own boot, answering the framing page
+        // instead of an opener.
+        for (const action of FRAMED_POPUP_ACTIONS) {
+            const embedPath = `/embed/${action}`;
+            router.get(embedPath, {}, async (req, res) => {
+                // Routes match case-insensitively and with a trailing slash,
+                // and the shell boots the desktop for any other spelling, so
+                // only the exact one may be framed.
+                if (req.originalUrl !== embedPath) {
+                    res.redirect(embedPath);
+                    return;
+                }
+                if (!prepareEmbed(req, res, embedPath)) return;
+                await sendShell(
+                    req,
+                    res,
+                    {},
+                    {},
+                    {
+                        hostOrigin: embedHostOrigin(
+                            this.config,
+                            req.get('referer'),
+                        ),
+                    },
+                );
+            });
+        }
+
        router.get('/settings', {}, (req, res) => sendShell(req, res));
        router.get('/settings/*splat', {}, (req, res) => sendShell(req, res));

@@ -1620,7 +1620,7 @@ describe('OIDCController signup callback', () => {
        expect(captured.redirectUrl).toContain('action=signup');
    });

-    it('creates a fresh user without oidc_switched on first signup', async () => {
+    it('creates a fresh user on first signup', async () => {
        const state = oidc().signState({
            provider: 'custom',
            redirect_uri: TEST_ORIGIN + '/',
@@ -1646,11 +1646,9 @@ describe('OIDCController signup callback', () => {
        );
        expect(captured.cookies).toHaveLength(1);
        expect(captured.redirectUrl).toBe(TEST_ORIGIN + '/');
-        // Fresh creation — must NOT advertise "you've actually been signed in".
-        expect(captured.redirectUrl).not.toContain('oidc_switched=login');
    });

-    it('adds oidc_switched=login when signup hits an already-linked account', async () => {
+    it('signs in to an already-linked account on signup, returning as a login would', async () => {
        // Seed an account linked on (provider, sub) so the signup callback
        // resolves to `linked-sub` rather than creating a new user.
        const sub = `sub-${Math.random().toString(36).slice(2, 8)}`;
@@ -1686,7 +1684,7 @@ describe('OIDCController signup callback', () => {
            res,
        );
        expect(captured.cookies).toHaveLength(1);
-        expect(captured.redirectUrl).toContain('oidc_switched=login');
+        expect(captured.redirectUrl).toBe(TEST_ORIGIN + '/');
    });

    it('redirects to action=signup with auth_error when user resolution fails (unconfirmed email)', async () => {
@@ -688,14 +688,7 @@ export class OIDCController extends PuterController {
                );
            }

-            // If we landed on an existing account (either via the
-            // provider_sub or via email match), signal the GUI so it can
-            // render a "signed in" flow rather than "account created".
-            const extra =
-                resolved.origin === 'created'
-                    ? undefined
-                    : { oidc_switched: 'login' };
-            await this.#finishLogin(req, res, user, stateDecoded, extra);
+            await this.#finishLogin(req, res, user, stateDecoded);
        };
        router.get('/auth/oidc/callback/signup', cbOpts, signupCb);
        router.post('/auth/oidc/callback/signup', cbOpts, signupCb);
@@ -834,17 +827,14 @@ if (window.opener) {
        attempt = 0,
    ): Promise<
        | { error: string; code?: string; requestCode?: string }
-        | {
-              user: import('../../stores/user/UserStore.js').UserRow;
-              origin: 'linked-sub' | 'linked-email' | 'created';
-          }
+        | { user: import('../../stores/user/UserStore.js').UserRow }
    > {
        // 1. Existing provider/sub link.
        const linked = await this.services.oidc.findUserByProviderSub(
            provider,
            userinfo.sub,
        );
-        if (linked) return { user: linked, origin: 'linked-sub' };
+        if (linked) return { user: linked };

        // 2/3. Email match branch.
        const claimedEmail =
@@ -881,7 +871,7 @@ if (window.opener) {
                        error: outcome.error ?? 'Failed to link provider.',
                    };
                }
-                return { user: byEmail, origin: 'linked-email' };
+                return { user: byEmail };
            }
        }

@@ -911,7 +901,7 @@ if (window.opener) {
                requestCode: outcome.requestCode,
            };
        }
-        return { user: outcome.user, origin: 'created' };
+        return { user: outcome.user };
    }

    async #processCallback(
@@ -1000,7 +990,6 @@ if (window.opener) {
        res: Response,
        user: UserRow,
        stateDecoded: Record<string, unknown>,
-        extraQueryParams?: Record<string, string>,
    ): Promise<void> {
        const origin = (this.config.origin ?? '').replace(/\/$/, '');
        const continuation: OidcLoginContinuation = {
@@ -1018,7 +1007,6 @@ if (window.opener) {
                stateDecoded.msg_id == null
                    ? null
                    : String(stateDecoded.msg_id),
-            switchedToLogin: extraQueryParams?.oidc_switched === 'login',
        };
        if (user.otp_enabled) {
            const challenge = this.services.token.sign(
@@ -139,7 +139,7 @@ describe('OIDC account second-factor login', () => {
            expect(await response.json()).toMatchObject({
                proceed: true,
                next_step: 'complete',
-                redirectUrl: `${env.origin}/dashboard${flow === 'signup' ? '?oidc_switched=login' : ''}`,
+                redirectUrl: `${env.origin}/dashboard`,
            });
            expect(
                response.headers
@@ -187,9 +187,9 @@ describe('createUserSubdomainNotFound', () => {
    });

    it('passes through reserved subdomains (api, js, native apps, etc.)', () => {
-        // `api`, `js`, `dav`, `docs`, `developer`, `editor`, `pdf`,
+        // `api`, `js`, `dav`, `docs`, `developer`, `about`, `apps`,
        // `puter-app-icons`, etc. all pass through.
-        for (const sub of ['api', 'js', 'docs', 'editor', 'puter-app-icons']) {
+        for (const sub of ['api', 'js', 'docs', 'about', 'puter-app-icons']) {
            const { out, next } = run(
                createUserSubdomainNotFound(config),
                makeReq({
@@ -865,13 +865,13 @@ describe('createNativeAppStatic', () => {

    beforeAll(() => {
        root = mkdtempSync(nodePath.join(tmpdir(), 'native-apps-'));
-        mkdirSync(nodePath.join(root, 'editor', 'assets'), { recursive: true });
+        mkdirSync(nodePath.join(root, 'about', 'assets'), { recursive: true });
        writeFileSync(
-            nodePath.join(root, 'editor', 'index.html'),
-            '<h1>editor</h1>',
+            nodePath.join(root, 'about', 'index.html'),
+            '<h1>about</h1>',
        );
        writeFileSync(
-            nodePath.join(root, 'editor', 'assets', 'app.js'),
+            nodePath.join(root, 'about', 'assets', 'app.js'),
            'console.log(1);',
        );
        mkdirSync(nodePath.join(root, 'docs', 'dist'), { recursive: true });
@@ -893,7 +893,7 @@ describe('createNativeAppStatic', () => {

    it('leaves a native app name alone on a host outside our domains', async () => {
        const req = staticReq({
-            subdomains: ['com', 'example', 'editor'],
+            subdomains: ['com', 'example', 'about'],
            path: '/index.html',
        });
        (req as Request & { is_custom_domain?: boolean }).is_custom_domain =
@@ -907,7 +907,7 @@ describe('createNativeAppStatic', () => {
        const { out, next } = await runStatic(
            createNativeAppStatic(config),
            staticReq({
-                subdomains: ['localhost', 'puter', 'editor'],
+                subdomains: ['localhost', 'puter', 'about'],
                path: '/index.html',
            }),
        );
@@ -915,17 +915,24 @@ describe('createNativeAppStatic', () => {
        expect(next).toHaveBeenCalledTimes(1);
    });

-    it('passes through subdomains that are not native apps', async () => {
-        const { out, next } = await runStatic(
-            withRoot(),
-            staticReq({
-                subdomains: ['localhost', 'puter', 'api'],
-                path: '/index.html',
-            }),
-        );
-        expect(out.sent).toBeUndefined();
-        expect(next).toHaveBeenCalledTimes(1);
-    });
+    // `editor`, `markus` and `pdf` are web apps on standard host routing,
+    // even with a folder of their own under the native apps root.
+    it.each(['api', 'editor', 'markus', 'pdf'])(
+        'passes %s through, as it is not a native app',
+        async (sub) => {
+            mkdirSync(nodePath.join(root, sub), { recursive: true });
+            writeFileSync(nodePath.join(root, sub, 'index.html'), sub);
+            const { out, next } = await runStatic(
+                withRoot(),
+                staticReq({
+                    subdomains: ['localhost', 'puter', sub],
+                    path: '/index.html',
+                }),
+            );
+            expect(out.sent).toBeUndefined();
+            expect(next).toHaveBeenCalledTimes(1);
+        },
+    );

    it('passes through when there is no subdomain at all', async () => {
        const { next } = await runStatic(
@@ -939,13 +946,13 @@ describe('createNativeAppStatic', () => {
        const { out, next } = await runStatic(
            withRoot(),
            staticReq({
-                subdomains: ['localhost', 'puter', 'editor'],
+                subdomains: ['localhost', 'puter', 'about'],
                path: '/index.html',
            }),
        );
        expect(out.sent).toEqual({
            path: '/index.html',
-            root: nodePath.join(root, 'editor'),
+            root: nodePath.join(root, 'about'),
        });
        expect(next).not.toHaveBeenCalled();
    });
@@ -954,11 +961,11 @@ describe('createNativeAppStatic', () => {
        const { out } = await runStatic(
            withRoot(),
            staticReq({
-                subdomains: ['localhost', 'puter', 'EDITOR'],
+                subdomains: ['localhost', 'puter', 'ABOUT'],
                path: '/index.html',
            }),
        );
-        expect(out.sent?.root).toBe(nodePath.join(root, 'editor'));
+        expect(out.sent?.root).toBe(nodePath.join(root, 'about'));
    });

    it('serves docs out of its dist/ subdirectory, not the app root', async () => {
@@ -979,7 +986,7 @@ describe('createNativeAppStatic', () => {
        const { out, next } = await runStatic(
            withRoot(),
            staticReq({
-                subdomains: ['localhost', 'puter', 'editor'],
+                subdomains: ['localhost', 'puter', 'about'],
                path: '/assets',
                originalUrl: '/assets?v=2',
            }),
@@ -995,7 +1002,7 @@ describe('createNativeAppStatic', () => {
        const { out } = await runStatic(
            withRoot(),
            staticReq({
-                subdomains: ['localhost', 'puter', 'editor'],
+                subdomains: ['localhost', 'puter', 'about'],
                path: '/assets/',
            }),
        );
@@ -1007,7 +1014,7 @@ describe('createNativeAppStatic', () => {
        const { out, next } = await runStatic(
            withRoot(),
            staticReq({
-                subdomains: ['localhost', 'puter', 'editor'],
+                subdomains: ['localhost', 'puter', 'about'],
                path: '/nope.html',
            }),
        );
@@ -1019,7 +1026,7 @@ describe('createNativeAppStatic', () => {
        const { next } = await runStatic(
            withRoot(),
            staticReq({
-                subdomains: ['localhost', 'puter', 'editor'],
+                subdomains: ['localhost', 'puter', 'about'],
                path: '/index.html',
            }),
            new Error('send failed'),
@@ -1032,7 +1039,7 @@ describe('createNativeAppStatic', () => {
            runStatic(
                withRoot(),
                staticReq({
-                    subdomains: ['localhost', 'puter', 'editor'],
+                    subdomains: ['localhost', 'puter', 'about'],
                    path: '/../../etc/passwd',
                }),
            ),
@@ -368,12 +368,114 @@ describe('PuterServer host header validation', () => {
        expect(api.status).toBe(404);
    });

+    it('lets a deployment subdomain frame the feedback embed and names it', async () => {
+        const parent = `http://spreadsheet.puter.localhost:${port}`;
+        const res = await request('/embed/feedback', {
+            host: `puter.localhost:${port}`,
+            referer: `${parent}/sheet/1`,
+        });
+        expect(res.status).toBe(200);
+        expect(res.headers['x-frame-options']).toBeUndefined();
+        expect(res.headers['content-security-policy']).toBe(
+            `frame-ancestors 'self' ${parent}`,
+        );
+        expect(res.headers['cache-control']).toBe('no-store');
+        expect(res.body).toContain('/dist/feedback-embed.min.js');
+        expect(res.body).not.toContain('/dist/bundle.min.js');
+        const config = JSON.parse(
+            res.body.match(/id="feedback-embed-config">(.*?)<\/script>/)[1],
+        );
+        expect(config).toEqual({
+            apiOrigin: `http://api.puter.localhost:${port}`,
+            hostOrigin: parent,
+        });
+
+        const hosted = await request('/embed/feedback', {
+            host: `puter.localhost:${port}`,
+            referer: `http://someone.site.puter.localhost:${port}/`,
+        });
+        expect(hosted.headers['content-security-policy']).toBe("frame-ancestors 'self'");
+        expect(
+            JSON.parse(
+                hosted.body.match(/id="feedback-embed-config">(.*?)<\/script>/)[1],
+            ).hostOrigin,
+        ).toBeNull();
+
+        const redirected = await request('/embed/feedback?puter.api_origin=https://other.test', {
+            host: `puter.localhost:${port}`,
+        });
+        expect(redirected.status).toBe(302);
+        expect(redirected.headers.location).toBe('/embed/feedback');
+    });
+
+    it.each([
+        'sign-in',
+        'show-open-file-picker',
+        'show-save-file-picker',
+        'show-directory-picker',
+        'upgrade',
+    ])('lets a deployment subdomain frame the %s popup and names it to the GUI', async (action) => {
+        const parent = `http://spreadsheet.puter.localhost:${port}`;
+        const guiParams = (body: string) =>
+            JSON.parse(body.match(/gui\((\{.*\})\);/)[1]);
+        const res = await request(`/embed/${action}`, {
+            host: `puter.localhost:${port}`,
+            referer: `${parent}/sheet/1`,
+        });
+        expect(res.status).toBe(200);
+        expect(res.headers['x-frame-options']).toBeUndefined();
+        expect(res.headers['content-security-policy']).toBe(
+            `frame-ancestors 'self' ${parent}`,
+        );
+        expect(res.headers['cache-control']).toBe('no-store');
+        expect(guiParams(res.body).embed_host_origin).toBe(parent);
+
+        const hosted = await request(`/embed/${action}`, {
+            host: `puter.localhost:${port}`,
+            referer: `http://someone.site.puter.localhost:${port}/`,
+        });
+        expect(hosted.headers['content-security-policy']).toBe("frame-ancestors 'self'");
+        expect(guiParams(hosted.body).embed_host_origin).toBeNull();
+
+        const redirected = await request(`/embed/${action}?auth_token=x&embedded_in_popup=true`, {
+            host: `puter.localhost:${port}`,
+            referer: `${parent}/sheet/1`,
+        });
+        expect(redirected.status).toBe(302);
+        expect(redirected.headers.location).toBe(`/embed/${action}`);
+        expect(redirected.headers['x-frame-options']).toBe('SAMEORIGIN');
+    });
+
+    it.each(['/embed/SIGN-IN', '/embed/Show-Open-File-Picker', '/embed/sign-in/', '/embed/Upgrade', '/embed/upgrade/'])(
+        'lets a first-party page frame only the exact spelling of %s',
+        async (spelling) => {
+            const res = await request(spelling, {
+                host: `puter.localhost:${port}`,
+                referer: `http://spreadsheet.puter.localhost:${port}/`,
+            });
+            expect(res.status).toBe(302);
+            expect(res.headers.location).toBe(spelling.toLowerCase().replace(/\/$/, ''));
+            expect(res.headers['x-frame-options']).toBe('SAMEORIGIN');
+            expect(res.headers['content-security-policy']).toBeUndefined();
+        },
+    );
+
+    it('names no framing page to the popups it serves in a window', async () => {
+        const res = await request('/action/sign-in?embedded_in_popup=true', {
+            host: `puter.localhost:${port}`,
+            referer: `http://spreadsheet.puter.localhost:${port}/`,
+        });
+        expect(res.headers['x-frame-options']).toBe('SAMEORIGIN');
+        expect(res.headers['content-security-policy']).toBeUndefined();
+        expect(res.body).not.toContain('embed_host_origin');
+    });
+
    it.each([
        ['a user-hosted site', 'http://someone.site.puter.localhost:PORT/'],
        ['a private app host', 'http://someone.app.puter.localhost:PORT/'],
        ['the API host', 'http://api.puter.localhost:PORT/'],
        ['the WebDAV host', 'http://dav.puter.localhost:PORT/'],
-        ['a native app host', 'http://editor.puter.localhost:PORT/'],
+        ['a native app host', 'http://about.puter.localhost:PORT/'],
        ['a nested subdomain', 'http://a.spreadsheet.puter.localhost:PORT/'],
        ['another site', 'http://evil.test:PORT/'],
        ['another port', 'http://spreadsheet.puter.localhost:1/'],
@@ -107,6 +107,31 @@ describe('app browser embed shell', () => {
    });
 });

+describe('feedback embed shell', () => {
+    it('carries the framing page and API origin, and loads only its own script', () => {
+        const html = makeService({
+            api_base_url: 'https://api.deployment.test',
+            gui_bundle: '/static/bundle.min.js?v=42',
+        }).renderFeedbackEmbed({ hostOrigin: 'https://notes.deployment.test' });
+        const configJson = html.match(/id="feedback-embed-config">(.*?)<\/script>/)![1];
+        expect(JSON.parse(configJson)).toEqual({
+            apiOrigin: 'https://api.deployment.test',
+            hostOrigin: 'https://notes.deployment.test',
+        });
+        expect(html).toContain('<script defer src="/static/feedback-embed.min.js?v=42"></script>');
+        expect(html).toContain('<link rel="stylesheet" href="/css/feedback-embed.css">');
+        expect(html).toContain('<main id="feedback-embed"></main>');
+        expect(html).not.toContain('bundle.min.js');
+        expect(html).not.toContain('apps-embed');
+    });
+
+    it('carries no framing page when none is allowed', () => {
+        const html = makeService({}).renderFeedbackEmbed({ hostOrigin: null });
+        const configJson = html.match(/id="feedback-embed-config">(.*?)<\/script>/)![1];
+        expect(JSON.parse(configJson).hostOrigin).toBeNull();
+    });
+});
+
 /** Capture what the service sends, and return the rendered HTML. */
 const render = async (
    service: PuterHomepageService,
@@ -48,6 +48,15 @@ export interface LaunchOptions {
    on_initialized?: Array<Record<string, unknown>>;
 }

+/**
+ * A GUI popup a first-party page frames at `/embed/<action>`. `hostOrigin` is
+ * that page, read from the referrer and pinned with frame-ancestors; null when
+ * no allowed page frames it.
+ */
+export interface PopupFrame {
+    hostOrigin: string | null;
+}
+
 interface PuterGuiAddonsEvent {
    req: Request;
    path: string;
@@ -171,15 +180,50 @@ export class PuterHomepageService extends PuterService {
    renderAppBrowserEmbed({
        guestApps = [],
    }: { guestApps?: Array<Record<string, unknown>> } = {}): string {
-        const configJson = JSON.stringify({
-            apiOrigin: this.config.api_base_url,
-            sdkUrl:
-                this.config.env === 'dev'
-                    ? '/sdk/puter.dev.js'
-                    : (this.config.gui_puterjs_bundle ??
-                      'https://js.puter.com/v2/'),
-            guestApps,
-        }).replace(/</g, '\\u003c');
+        return this.#renderEmbed({
+            rootId: 'app-browser',
+            rootClass: 'dashboard',
+            stylesheet: 'apps-embed.css',
+            script: 'apps-embed.min.js',
+            config: {
+                apiOrigin: this.config.api_base_url,
+                sdkUrl:
+                    this.config.env === 'dev'
+                        ? '/sdk/puter.dev.js'
+                        : (this.config.gui_puterjs_bundle ??
+                          'https://js.puter.com/v2/'),
+                guestApps,
+            },
+        });
+    }
+
+    /**
+     * `hostOrigin` is the first-party page framing the dialog, which the
+     * feedback is sent for; null when no allowed page frames it.
+     */
+    renderFeedbackEmbed({ hostOrigin }: { hostOrigin: string | null }): string {
+        return this.#renderEmbed({
+            rootId: 'feedback-embed',
+            stylesheet: 'feedback-embed.css',
+            script: 'feedback-embed.min.js',
+            config: { apiOrigin: this.config.api_base_url, hostOrigin },
+        });
+    }
+
+    #renderEmbed({
+        rootId,
+        rootClass,
+        stylesheet,
+        script,
+        config,
+    }: {
+        rootId: string;
+        rootClass?: string;
+        stylesheet: string;
+        script: string;
+        config: Record<string, unknown>;
+    }): string {
+        const configJson = JSON.stringify(config).replace(/</g, '\\u003c');

        return `<!DOCTYPE html>
 <html lang="en">
@@ -190,27 +234,27 @@ export class PuterHomepageService extends PuterService {
    <title>${encode(String(this.config.gui_params?.title ?? 'Puter'))}</title>
    <link rel="stylesheet" href="/css/normalize.css">
    <link rel="stylesheet" href="/css/dashboard.css">
-    <link rel="stylesheet" href="/css/apps-embed.css">
+    <link rel="stylesheet" href="/css/${stylesheet}">
 </head>
 <body>
-    <main id="app-browser" class="dashboard"></main>
-    <script type="application/json" id="app-browser-config">${configJson}</script>
-    <script defer src="${encode(this.#appBrowserEmbedScript())}"></script>
+    <main id="${rootId}"${rootClass ? ` class="${rootClass}"` : ''}></main>
+    <script type="application/json" id="${rootId}-config">${configJson}</script>
+    <script defer src="${encode(this.#embedScript(script))}"></script>
 </body>
 </html>`;
    }

    /**
-     * The embed's script is built beside the GUI bundle, so it is served from
+     * Embed scripts are built beside the GUI bundle, so they are served from
     * wherever `gui_bundle` is (a CDN in production), with the same query.
     */
-    #appBrowserEmbedScript(): string {
+    #embedScript(name: string): string {
        const base = 'http://relative.invalid';
        const bundle = new URL(
            this.config.gui_bundle ?? '/dist/bundle.min.js',
            base,
        );
-        const script = new URL('apps-embed.min.js', bundle);
+        const script = new URL(name, bundle);
        script.search = bundle.search;
        return script.origin === base
            ? `${script.pathname}${script.search}`
@@ -268,6 +312,7 @@ export class PuterHomepageService extends PuterService {
        ctx: { req: Request; res: Response; actor?: Actor | null },
        meta: PageMeta,
        launchOptions: LaunchOptions = {},
+        popupFrame?: PopupFrame,
    ): Promise<void> {
        const { req, res, actor } = ctx;

@@ -292,6 +337,7 @@ export class PuterHomepageService extends PuterService {
            { req, actor: actor ?? null },
            meta,
            launchOptions,
+            popupFrame,
        );
        res.send(html);
    }
@@ -302,6 +348,7 @@ export class PuterHomepageService extends PuterService {
        ctx: { req: Request; actor: Actor | null },
        meta: PageMeta,
        launchOptions: LaunchOptions,
+        popupFrame?: PopupFrame,
    ): Promise<string> {
        const { req, actor } = ctx;
        const env = this.config.env ?? 'prod';
@@ -347,6 +394,8 @@ export class PuterHomepageService extends PuterService {
            eventsNotifications: notificationsFoldInEnabled(this.config),
            ...meta,
            launch_options: launchOptions,
+            // After `meta`, so nothing page-specific can name the opener.
+            ...(popupFrame ? { embed_host_origin: popupFrame.hostOrigin } : {}),
        };

        const event: PuterGuiAddonsEvent = {
@@ -1,11 +1,11 @@
 # OpenAI Realtime relay

 The relay serves `/puterai/openai/v1/realtime` on the API host. The SDK exposes
-it through [`puter.ai.convo()`](../../../docs/src/AI/convo.md).
+it through [`puter.ai.realtime()`](../../../docs/src/AI/realtime.md).

 **Beta:** This API is incomplete. Its methods, options, events, and behavior may change abruptly, including breaking changes without notice.

-Direct clients are documented in the [Realtime WebSocket API reference](../../../docs/src/AI/realtime.md).
+Direct clients are documented in the [Realtime WebSocket API reference](../../../docs/src/AI/realtime-websocket.md).

 ## Transport

@@ -27,7 +27,7 @@ The socket opens before authentication completes. Authentication and model
 failures arrive as OpenAI-shaped error events followed by a close frame.

 ```js
-const conversation = await puter.ai.convo({ output: ['text'] });
+const conversation = await puter.ai.realtime({ output: ['text'] });
 conversation.on('error', (event) => console.error(event));
 conversation.on('text', ({ delta }) => console.log(delta));
 conversation.on('turn.done', () => conversation.close());
@@ -1102,8 +1102,9 @@ interface IConfigOptional {
    /** Force the bundled GUI even in dev. Default: false. */
    use_bundled_gui: boolean;
    /**
-     * Override the GUI bundle JS path. Default: `/dist/bundle.min.js`. The app
-     * browser embed loads `apps-embed.min.js` from the same directory.
+     * Override the GUI bundle JS path. Default: `/dist/bundle.min.js`. The
+     * `/embed/*` pages load `apps-embed.min.js` and `feedback-embed.min.js`
+     * from the same directory.
     */
    gui_bundle: string;
    /** Override the GUI CSS path when bundled. Default: `/dist/bundle.min.css`. */
@@ -200,8 +200,8 @@ These AI features are supported out of the box when using Puter.js:
 - **[`puter.ai.img2txt()`](/AI/img2txt/)** - Extract text from images (OCR)
 - **[`puter.ai.txt2vid()`](/AI/txt2vid/)** - Generate short video clips from text or a reference image with Wan, Seedance, Veo, Kling, MiniMax H3 and other models, or edit a video you supply with Gemini Omni, FLUX 3 or Kling Omni
 - **[`puter.ai.speech2speech()`](/AI/speech2speech/)** - Convert speech in one voice to another voice
- **[`puter.ai.convo()`](/AI/convo/)** - Prepare a beta realtime conversation with optional text, microphone, playback, and interruption helpers
- **[Realtime WebSocket API](/AI/realtime/)** - Connect directly without puter.js. This API is in beta and may change abruptly.
+- **[`puter.ai.realtime()`](/AI/realtime/)** - Prepare a beta realtime conversation with optional text, microphone, playback, and interruption helpers
+- **[Realtime WebSocket API](/AI/realtime-websocket/)** - Connect directly without puter.js. This API is in beta and may change abruptly.
 - **[`puter.ai.listModels()`](/AI/listModels/)** - List available AI chat models (and providers) that Puter currently exposes.
 - **[`puter.ai.listModelProviders()`](/AI/listModelProviders/)** - List the AI providers that Puter currently exposes.
 - **[`puter.ai.txt2speech.listEngines()`](/AI/txt2speech.listEngines/)** - List available TTS engines/models
@@ -1,151 +0,0 @@
---
-title: puter.ai.convo()
-description: Prepare an OpenAI realtime conversation with optional audio and text helpers.
-platforms: [websites, apps, nodejs, workers]
---
-
-Prepares a realtime OpenAI conversation that your app can connect to when it's ready.
-
-Preparing the conversation verifies Puter sign-in. Realtime conversations require a paid Puter plan, and usage is billed to the signed-in user. Native OpenAI events and convenience methods use the same session. Microphone capture and speaker playback start when your app requests them.
-
-In Node.js, the SDK requires a global `WebSocket`, available in Node.js 22 or later.
-
-**Beta:** This API is incomplete. Its methods, options, events, and behavior may change abruptly, including breaking changes without notice.
-
-To connect without puter.js, see the [Realtime WebSocket API](/AI/realtime/).
-
-## Syntax
-
-```js
-const conversation = await puter.ai.convo(options = {});
-await conversation.connect();
-```
-
-## Parameters
-
-#### `options` (Object) (Optional)
-
-The options object accepts these fields.
-
-| Option | Type | Description |
-|--------|------|-------------|
-| `model` | `String` | The realtime model. Defaults to `gpt-realtime-2.1-mini`. Also accepts `gpt-realtime-2.1`, `gpt-realtime-2`, `gpt-realtime-1.5`, `gpt-realtime`, and `gpt-realtime-mini`. |
-| `instructions` | `String` | Session instructions, up to 8192 characters. Defaults to the provider's default. |
-| `output` | `Array<String>` | Accepts `['text']`, `['audio']`, or both. Defaults to `['audio']`. Audio includes a transcript. Requesting both uses audio output and emits transcript deltas through the `text` event. |
-| `voice` | `String` | OpenAI voice identifier, up to 128 characters. Defaults to the provider's default. |
-| `turnDetection` | `Boolean` | Whether the provider detects the end of spoken turns automatically. Defaults to `true`. Set to `false` for manual audio commits. |
-
-## Return value
-
-A Promise resolves to a prepared conversation after options and sign-in are checked. In a browser, preparation opens the Puter sign-in prompt if needed. Preparation opens no realtime connection and requests no microphone access.
-
-The conversation exposes these properties and methods.
-
-| Member | Behavior |
-| --- | --- |
-| `state` | `prepared`, `connecting`, `connected`, or `closed`. |
-| `model` | Resolved model name. |
-| `connect()` | Opens the connection and applies settings. Resolves after the provider acknowledges session configuration. Concurrent calls share one connection Promise, including bounded retries for transient setup failures. Calling it while connected opens no additional connection. During a reconnection, it resolves when the reconnection succeeds and rejects if the conversation closes instead. |
-| `configure(options)` | Updates the given session settings and resolves after the provider acknowledges this update. Settings it isn't given, including ones set through native events, are left alone. Accepts the factory options except `model`. One update can be pending at a time. Provider rules apply to changes such as switching a voice after audio has been generated. |
-| `sendText(text)` | Adds a user message and requests a response. Text must be nonempty and at most 8192 characters. |
-| `appendAudio(pcm)` | Appends an `Int16Array` containing PCM16, 24 kHz mono audio. A chunk contains at most 12000 samples. |
-| `commitAudio()` | Commits buffered audio and requests a response. Requires turn detection to be off, through `turnDetection: false` or a native session update. The provider requires at least 100 ms of buffered audio. |
-| `interrupt(position?)` | Stops built-in playback immediately and waits for cancellation and playback-history synchronization. A reply requested but not yet started is cancelled as soon as it starts. Custom players provide `{ itemId, contentIndex, playedMs }`. An idle call resolves immediately. Readiness failures reject the returned Promise with `session_not_ready` or `session_closed`. |
-| `send(event)` | Sends a native OpenAI JSON event. |
-| `on(type, handler)` | Registers a listener and returns an unsubscribe function. Use `'*'` to receive every native and convenience event. |
-| `off(type, handler)` | Removes a listener. |
-| `close()` | Closes the session, rejects pending operations, and releases SDK-owned capture and playback resources. Repeated calls have no additional effect. |
-
-Attach listeners before connecting to receive initial session events. Closing during connection rejects the pending attempt.
-
-If the connection drops because of network loss, a server restart or a provider error, the conversation reconnects on its own. Normal closes with code 1000 end the conversation. While it reconnects, `state` is `connecting`, a `reconnecting` event fires, and pending operations reject with `connection_lost`. The new session gets every setting the provider acknowledged, from the factory options, `configure()` and native `session.update` events. Then `ready` fires again with `reconnected: true`. Listeners, the microphone and the speaker carry over. Microphone audio captured while reconnecting is dropped.
-
-The conversation also restores recent context. Before `ready` fires, it adds back up to 40 of the most recent conversation items, 48 KiB in total. Restored items are user text, user speech that has a transcript, assistant replies as text, and function calls with their outputs. User speech has a transcript only when input transcription is configured through native session settings. An assistant reply that was interrupted, or still playing when the connection dropped, is cut to what the user saw or heard. The cut is estimated from how much of the audio played, so it can be off by a few words. Images, speech without a transcript, deleted items, and replies still generating when the connection dropped are left out. Restored items get new item IDs, don't fire item events, and count as input tokens on the next response. Item IDs from before the reconnect don't work in later events. Restoration uses a contiguous suffix of restorable items. An oversized newest item leaves that suffix empty. Older items left out to fit the window fire a `context_trimmed` event with the count in `omittedItems`; this is routine and not an error. A provider refusal or a failure to send the restored items fires one `error` event with code `context_restore_failed` per restoration. In both cases the conversation stays connected. Items are preserved without truncating text, function arguments or function results.
-
-When Puter knows ahead of time that the server a session runs on will restart, it sends a `puter.reconnect` event, which also reaches your listeners. Without that notice, a restart drops the connection and the conversation reconnects as above. Within a few seconds, the conversation opens a replacement session in the background while the current one keeps working. It switches once no reply is generating or playing, no user turn is being spoken or transcribed, no function call is waiting for its output, and nothing you sent is waiting on the provider. The switch goes through the same steps as a reconnect, and the `reconnecting` event has code 1012. If the replacement can't open yet, the conversation keeps the current session and tries again later. A refusal that retrying can't fix, such as `insufficient_funds`, stops the attempts. If the server closes the session first, the conversation switches to the replacement, or reconnects if none is open.
-
-The conversation makes up to ten attempts over about a minute. In a browser that reports being offline, it first waits up to two minutes for the connection to come back. If every attempt fails, or the server refuses with an error such as `insufficient_funds`, the conversation closes. A closed conversation cannot reconnect. To start another session, prepare a new one.
-
-Native event definitions are listed in the [OpenAI realtime reference](https://developers.openai.com/api/reference/resources/realtime/server-events). Native events retain their provider fields. Sending native events preserves direct control of the session. Puter refuses `conversation.item.retrieve` events and MCP tools (`"type": "mcp"`) in `session.update` and `response.create` events. Sending one fires an `error` event with code `invalid_event`, and the conversation closes with code 1008. Audio helpers expect the session to use PCM16 at 24 kHz.
-
-## Errors and limits
-
-Failures use objects containing `code` and `message`. Preparation can reject with `invalid_argument`, `model_not_found`, `auth_required`, `auth_canceled`, or `auth_failed`. Connection can reject with `subscription_required` or `insufficient_funds`, which also show the Puter upgrade prompt. Connection and asynchronous operations can reject with provider errors, `session_closed`, `connection_lost`, `operation_timeout`, or `operation_in_progress`. Sending before readiness, or while reconnecting, throws `session_not_ready`.
-
-Invalid input throws `invalid_argument`, `invalid_event`, or `input_too_large`. A full SDK send queue throws `queue_full`. Media helpers report `unsupported_environment`, `permission_denied`, `media_error`, `media_timeout`, or `queue_full`. Runtime media errors and `context_restore_failed` arrive through the `error` event. Provider errors also arrive as native `error` events with a nested `error` object.
-
-Each native event is capped at 64 KiB. The SDK bounds JSON traversal, outgoing queues, acknowledgment waits, microphone work, and playback. All numeric limits are listed on [rate limits and quotas](/rate-limits-and-quotas/).
-
-## Convenience events
-
-The conversation emits these events alongside native events.
-
-| Event | Fields |
-| --- | --- |
-| `ready` | `model`, `provider`, and `reconnected: true` after a reconnection |
-| `reconnecting` | `code`, `reason` of the dropped connection. After a `puter.reconnect` event, `code` is 1012. |
-| `context_trimmed` | `omittedItems`, the number of restorable items left out of the restored context after a reconnection. Fires before `ready`. |
-| `text` | `delta`, `responseId` |
-| `transcript` | `role`, `text`, `final`. Assistant deltas use `final: false`. Completed assistant and user transcripts use `final: true`. User transcripts require transcription to be configured through native session settings. |
-| `audio` | `pcm`, `sampleRate`, `responseId`, `itemId`, `contentIndex`. The PCM chunk is an `Int16Array`. |
-| `interrupted` | `source` (`manual` or `speech`), `responseId` |
-| `turn.done` | `responseId`, native provider `usage`, `status` |
-| `close` | `code`, `reason` |
-
-Each event includes its `type`. When the provider event leaves out an ID, `responseId` and `itemId` are empty strings and `contentIndex` is `0`. The `interrupted` event signals local interruption immediately. Its corresponding operation resolves after the provider acknowledges cancellation and any requested truncation. Late audio from a canceled response remains visible as native events and is excluded from convenience audio and built-in playback.
-
-## Browser media
-
-The optional microphone and speaker helpers require a browser with Web Audio support. Microphone capture also requires media permissions and a secure context. Start audio from a user action so the browser can allow playback.
-
-| Member | Behavior |
-| --- | --- |
-| `microphone.start()` | Requests microphone access and streams PCM16, resampled to 24 kHz, in 20 ms chunks through an AudioWorklet. If the page or network falls behind, chunks are dropped rather than stopping capture. |
-| `microphone.mute()` | Disables capture tracks and stops forwarding captured chunks. |
-| `microphone.unmute()` | Enables capture tracks and forwarding. |
-| `microphone.stop()` | Stops capture tracks and releases capture resources. A `start()` still waiting on the permission prompt rejects with `session_closed`. |
-| `speaker.start({ bargeIn: true })` | Starts playback. Barge-in defaults to `true`. With barge-in enabled, provider speech-start events interrupt playback and synchronize played audio with conversation history. Starting the speaker requests no microphone access. |
-| `speaker.stop()` | Clears playback and releases its audio context. |
-
-Both start methods require a connected session. Capture and playback are independent, so custom audio input can use the built-in speaker, and built-in capture can use custom playback.
-
-## Examples
-
-### Have a text conversation
-
-A text conversation uses convenience methods for input and streamed output.
-
-```js
-const conversation = await puter.ai.convo({
-    output: ['text'],
-    instructions: 'Keep replies short.',
-});
-
-conversation.on('text', ({ delta }) => console.log(delta));
-conversation.on('turn.done', () => conversation.close());
-conversation.on('error', (event) => console.error(event));
-
-await conversation.connect();
-conversation.sendText('Say hello in three words.');
-```
-
-### Have a voice conversation
-
-A voice conversation enables the microphone and speaker after connection.
-
-```js
-const conversation = await puter.ai.convo();
-conversation.on('transcript', ({ role, text }) => console.log(role, text));
-conversation.on('error', (event) => console.error(event));
-
-await conversation.connect();
-await conversation.speaker.start();
-await conversation.microphone.start();
-
-// To interrupt a response and submit a replacement text turn:
-await conversation.interrupt();
-conversation.sendText('Actually, make it Wednesday.');
-
-// When the user ends the conversation:
-conversation.close();
-```
@@ -0,0 +1,126 @@
+---
+title: Realtime WebSocket API (Beta)
+description: Connect to OpenAI realtime conversations through Puter without puter.js.
+platforms: [websites, apps, nodejs, workers]
+---
+
+The Realtime WebSocket API lets your client send and receive native OpenAI realtime JSON events through Puter.
+
+Puter authenticates the user and charges their account for usage.
+
+**Beta:** This API is incomplete. Its methods, options, events, and behavior may change abruptly, including breaking changes without notice.
+
+For optional text, microphone, playback, and interruption helpers, use [`puter.ai.realtime()`](/AI/realtime/).
+
+## Connection and authentication
+
+Connect to this URL on the Puter API host:
+
+```text
+wss://api.puter.com/puterai/openai/v1/realtime?model=gpt-realtime-2.1-mini
+```
+
+The `model` query parameter defaults to `gpt-realtime-2.1-mini`. The model is fixed for the connection. A session update that changes it is rejected. It also accepts `gpt-realtime-2.1`, `gpt-realtime-2`, `gpt-realtime-1.5`, `gpt-realtime`, and `gpt-realtime-mini`.
+
+Authenticate with a Puter session, app, or full-access API token. Puter supplies the provider credential. Server clients pass this header:
+
+```text
+Authorization: Bearer <PUTER_TOKEN>
+```
+
+Browser WebSocket clients pass `realtime` and `openai-insecure-api-key.<PUTER_TOKEN>` as subprotocols. The server echoes only `realtime`. The endpoint also accepts an `auth_token` query parameter. Prefer the authorization header where supported because URLs and subprotocols can appear in logs. Authentication takes precedence in this order, header, subprotocol, then query parameter.
+
+The socket can open before authentication and provider setup finish. Listen for errors and closure immediately. Wait for `session.created`, send your session settings, then wait for `session.updated` before submitting a turn.
+
+To open a replacement while another connection remains healthy, set the optional `purpose=handover` query parameter. These attempts share a smaller per-credential budget, checked before the general connection-attempt budget. Initial connections and dropped-connection recovery use the URL without this parameter. The limits are listed in [rate limits and quotas](/rate-limits-and-quotas/).
+
+## Text example
+
+Install the `ws` package and set `PUTER_TOKEN` to your Puter token. Run this example as a Node.js ES module:
+
+```js
+import WebSocket from 'ws';
+
+const socket = new WebSocket(
+    'wss://api.puter.com/puterai/openai/v1/realtime?model=gpt-realtime-2.1-mini',
+    { headers: { Authorization: `Bearer ${process.env.PUTER_TOKEN}` } },
+);
+const send = (event) => socket.send(JSON.stringify(event));
+
+socket.on('message', (data) => {
+    const event = JSON.parse(data.toString());
+
+    if (event.type === 'session.created') {
+        send({
+            type: 'session.update',
+            session: {
+                type: 'realtime',
+                output_modalities: ['text'],
+                instructions: 'Keep replies short.',
+            },
+        });
+    }
+    if (event.type === 'session.updated') {
+        send({
+            type: 'conversation.item.create',
+            item: {
+                type: 'message',
+                role: 'user',
+                content: [{ type: 'input_text', text: 'Hello!' }],
+            },
+        });
+        send({ type: 'response.create' });
+    }
+    if (event.type === 'response.output_text.delta')
+        process.stdout.write(event.delta);
+    if (event.type === 'error')
+        console.error(event.error);
+    if (event.type === 'response.done')
+        socket.close();
+});
+socket.on('error', console.error);
+socket.on('close', (code, reason) => console.log(code, reason.toString()));
+```
+
+## Events, audio, and interruption
+
+Each message contains one JSON object with a nonempty string `type` of at most 128 characters. Binary messages are rejected. Native events retain their provider fields. The endpoint doesn't deliver `rate_limits.updated`, which describes Puter's provider account rather than yours, and it removes provider organization IDs from error messages. The endpoint exposes the WebSocket event protocol. Your client manages capture, playback, acknowledgments, and timeouts.
+
+The endpoint refuses `conversation.item.retrieve` events and MCP tools (`"type": "mcp"`) in `session.update` and `response.create` events. A refused event isn't sent to the provider. The session gets an `invalid_event` error and closes with 1008.
+
+PCM16 audio configured at 24 kHz mono is sent as base64 chunks in `input_audio_buffer.append` events. Output arrives in `response.output_audio.delta` events. With manual turn detection, commit buffered input with `input_audio_buffer.commit`, then request a reply with `response.create`.
+
+To interrupt, stop local playback immediately and send `response.cancel` with the active `response_id`. If some generated audio was not played, send `conversation.item.truncate` with its `item_id`, `content_index`, and `audio_end_ms` set to the amount actually played. Wait for `response.done` and any requested `conversation.item.truncated` acknowledgment before submitting a replacement turn.
+
+Connection loss ends the session. Reconnecting creates a new conversation. Tool execution and automatic reconnection belong to your client.
+
+## Server restarts
+
+When Puter knows ahead of time that the server a session runs on will restart, it sends each open session this event, at most once a minute:
+
+```json
+{
+    "type": "puter.reconnect",
+    "event_id": "event_puter_1767225600000",
+    "reason": "server_restarting",
+    "close_in_ms": 90000
+}
+```
+
+The `reason` field is `server_restarting`. The `close_in_ms` field, when present, is about how long until the server closes the session itself. The session keeps working until then. Open a new connection after a short, randomized delay, and once it gets `session.created` and your client is idle, with no response generating and no user turn in progress, move to it and close the old one. A connection that reaches a server that is also restarting gets a `server_restarting` error and closes with 1012. In that case keep the old session and try again after a short, randomized delay. If the server closes the old session first, the close code is 1012, and your client reconnects the same way. A restart can also drop the connection without any notice, so treat an unexpected close the same way.
+
+A new connection starts an empty conversation. To keep context, add earlier items back with `conversation.item.create` before you request a response. Event types that start with `puter.` come from Puter, not the provider.
+
+## Errors, billing, and limits
+
+API errors arrive as `{ "type": "error", "error": { "code": "...", "message": "..." } }`. Handle socket errors and close frames too. Invalid, missing, or revoked credentials use `invalid_api_key`. If Puter can't check a credential or the account's plan, the error is `internal_error` and the session closes with 1011, so try again after a short, randomized delay. Other relay codes include `permission_denied`, `model_not_found`, `insufficient_funds`, `subscription_required`, `rate_limit_exceeded`, `invalid_event`, `connection_timeout`, `provider_unavailable`, `upstream_error`, and `server_restarting`.
+
+Policy failures generally close with 1008, oversized client messages with 1009, upstream or setup failures with 1011, server restarts with 1012, and temporary server overload with 1013. Reconnect after 1011, 1012, or 1013. Authentication and model failures can arrive after the WebSocket handshake succeeds.
+
+The endpoint requires a paid Puter plan. Usage is charged after completed responses and input transcriptions. While a response generates, part of your balance is held for it, so a session opens only if your balance covers one response. If the provider connection closes before a response reports its usage, the response is charged the full amount held for it. Each account can open 20 sessions at once by default. Each JSON message you send is limited to 64 KiB, including reassembled fragments. Messages from the provider can be up to 4 MiB. Stream audio in small chunks. All message rates, queue caps, timeouts, and other bounds are published in [rate limits and quotas](/rate-limits-and-quotas/).
+
+Input transcription holds a small amount of your balance per transcribed item, priced at the transcription model you select. Two items are reserved ahead of your audio and replenished as the provider commits them, so a session holds only its spare items plus the items still awaiting a transcript. Changing the transcription model reprices the spare items. If your balance can't cover another item, audio waits while earlier items settle; once none are left to settle, the session closes with `insufficient_funds`. Failed transcriptions, items without final usage, and audio whose commit the provider never acknowledges before the connection closes are each charged that model's fixed per-item amount. Unacknowledged audio is charged one item per started 160 seconds. With server turn detection, only detected speech counts, so silence is never charged. The amounts, timeout and audio limits are listed in [rate limits and quotas](/rate-limits-and-quotas/).
+
+Provider-reported realtime models must have a known price. A missing model uses the last known model. An explicitly unpriced model closes the connection with `upstream_error`.
+
+After recording usage, the connection can continue while settled credit is positive, including a fractional balance. Each new billable operation still needs its full reservation after accounting for other outstanding holds.
@@ -1,126 +1,151 @@
 ---
-title: Realtime WebSocket API (Beta)
-description: Connect to OpenAI realtime conversations through Puter without puter.js.
+title: puter.ai.realtime()
+description: Prepare an OpenAI realtime conversation with optional audio and text helpers.
 platforms: [websites, apps, nodejs, workers]
 ---

-The Realtime WebSocket API lets your client send and receive native OpenAI realtime JSON events through Puter.
+Prepares a realtime OpenAI conversation that your app can connect to when it's ready.

-Puter authenticates the user and charges their account for usage.
+Preparing the conversation verifies Puter sign-in. Realtime conversations require a paid Puter plan, and usage is billed to the signed-in user. Native OpenAI events and convenience methods use the same session. Microphone capture and speaker playback start when your app requests them.
+
+In Node.js, the SDK requires a global `WebSocket`, available in Node.js 22 or later.

 **Beta:** This API is incomplete. Its methods, options, events, and behavior may change abruptly, including breaking changes without notice.

-For optional text, microphone, playback, and interruption helpers, use [`puter.ai.convo()`](/AI/convo/).
+To connect without puter.js, see the [Realtime WebSocket API](/AI/realtime-websocket/).

-## Connection and authentication
-
-Connect to this URL on the Puter API host:
-
-```text
-wss://api.puter.com/puterai/openai/v1/realtime?model=gpt-realtime-2.1-mini
-```
-
-The `model` query parameter defaults to `gpt-realtime-2.1-mini`. The model is fixed for the connection. A session update that changes it is rejected. It also accepts `gpt-realtime-2.1`, `gpt-realtime-2`, `gpt-realtime-1.5`, `gpt-realtime`, and `gpt-realtime-mini`.
-
-Authenticate with a Puter session, app, or full-access API token. Puter supplies the provider credential. Server clients pass this header:
-
-```text
-Authorization: Bearer <PUTER_TOKEN>
-```
-
-Browser WebSocket clients pass `realtime` and `openai-insecure-api-key.<PUTER_TOKEN>` as subprotocols. The server echoes only `realtime`. The endpoint also accepts an `auth_token` query parameter. Prefer the authorization header where supported because URLs and subprotocols can appear in logs. Authentication takes precedence in this order, header, subprotocol, then query parameter.
-
-The socket can open before authentication and provider setup finish. Listen for errors and closure immediately. Wait for `session.created`, send your session settings, then wait for `session.updated` before submitting a turn.
-
-To open a replacement while another connection remains healthy, set the optional `purpose=handover` query parameter. These attempts share a smaller per-credential budget, checked before the general connection-attempt budget. Initial connections and dropped-connection recovery use the URL without this parameter. The limits are listed in [rate limits and quotas](/rate-limits-and-quotas/).
-
-## Text example
-
-Install the `ws` package and set `PUTER_TOKEN` to your Puter token. Run this example as a Node.js ES module:
+## Syntax

 ```js
-import WebSocket from 'ws';
+const conversation = await puter.ai.realtime(options = {});
+await conversation.connect();
+```

-const socket = new WebSocket(
-    'wss://api.puter.com/puterai/openai/v1/realtime?model=gpt-realtime-2.1-mini',
-    { headers: { Authorization: `Bearer ${process.env.PUTER_TOKEN}` } },
-);
-const send = (event) => socket.send(JSON.stringify(event));
+## Parameters

-socket.on('message', (data) => {
-    const event = JSON.parse(data.toString());
+#### `options` (Object) (Optional)

-    if (event.type === 'session.created') {
-        send({
-            type: 'session.update',
-            session: {
-                type: 'realtime',
-                output_modalities: ['text'],
-                instructions: 'Keep replies short.',
-            },
-        });
-    }
-    if (event.type === 'session.updated') {
-        send({
-            type: 'conversation.item.create',
-            item: {
-                type: 'message',
-                role: 'user',
-                content: [{ type: 'input_text', text: 'Hello!' }],
-            },
-        });
-        send({ type: 'response.create' });
-    }
-    if (event.type === 'response.output_text.delta')
-        process.stdout.write(event.delta);
-    if (event.type === 'error')
-        console.error(event.error);
-    if (event.type === 'response.done')
-        socket.close();
+The options object accepts these fields.
+
+| Option | Type | Description |
+|--------|------|-------------|
+| `model` | `String` | The realtime model. Defaults to `gpt-realtime-2.1-mini`. Also accepts `gpt-realtime-2.1`, `gpt-realtime-2`, `gpt-realtime-1.5`, `gpt-realtime`, and `gpt-realtime-mini`. |
+| `instructions` | `String` | Session instructions, up to 8192 characters. Defaults to the provider's default. |
+| `output` | `Array<String>` | Accepts `['text']`, `['audio']`, or both. Defaults to `['audio']`. Audio includes a transcript. Requesting both uses audio output and emits transcript deltas through the `text` event. |
+| `voice` | `String` | OpenAI voice identifier, up to 128 characters. Defaults to the provider's default. |
+| `turnDetection` | `Boolean` | Whether the provider detects the end of spoken turns automatically. Defaults to `true`. Set to `false` for manual audio commits. |
+
+## Return value
+
+A Promise resolves to a prepared conversation after options and sign-in are checked. In a browser, preparation opens the Puter sign-in prompt if needed. Preparation opens no realtime connection and requests no microphone access.
+
+The conversation exposes these properties and methods.
+
+| Member | Behavior |
+| --- | --- |
+| `state` | `prepared`, `connecting`, `connected`, or `closed`. |
+| `model` | Resolved model name. |
+| `connect()` | Opens the connection and applies settings. Resolves after the provider acknowledges session configuration. Concurrent calls share one connection Promise, including bounded retries for transient setup failures. Calling it while connected opens no additional connection. During a reconnection, it resolves when the reconnection succeeds and rejects if the conversation closes instead. |
+| `configure(options)` | Updates the given session settings and resolves after the provider acknowledges this update. Settings it isn't given, including ones set through native events, are left alone. Accepts the factory options except `model`. One update can be pending at a time. Provider rules apply to changes such as switching a voice after audio has been generated. |
+| `sendText(text)` | Adds a user message and requests a response. Text must be nonempty and at most 8192 characters. |
+| `appendAudio(pcm)` | Appends an `Int16Array` containing PCM16, 24 kHz mono audio. A chunk contains at most 12000 samples. |
+| `commitAudio()` | Commits buffered audio and requests a response. Requires turn detection to be off, through `turnDetection: false` or a native session update. The provider requires at least 100 ms of buffered audio. |
+| `interrupt(position?)` | Stops built-in playback immediately and waits for cancellation and playback-history synchronization. A reply requested but not yet started is cancelled as soon as it starts. Custom players provide `{ itemId, contentIndex, playedMs }`. An idle call resolves immediately. Readiness failures reject the returned Promise with `session_not_ready` or `session_closed`. |
+| `send(event)` | Sends a native OpenAI JSON event. |
+| `on(type, handler)` | Registers a listener and returns an unsubscribe function. Use `'*'` to receive every native and convenience event. |
+| `off(type, handler)` | Removes a listener. |
+| `close()` | Closes the session, rejects pending operations, and releases SDK-owned capture and playback resources. Repeated calls have no additional effect. |
+
+Attach listeners before connecting to receive initial session events. Closing during connection rejects the pending attempt.
+
+If the connection drops because of network loss, a server restart or a provider error, the conversation reconnects on its own. Normal closes with code 1000 end the conversation. While it reconnects, `state` is `connecting`, a `reconnecting` event fires, and pending operations reject with `connection_lost`. The new session gets every setting the provider acknowledged, from the factory options, `configure()` and native `session.update` events. Then `ready` fires again with `reconnected: true`. Listeners, the microphone and the speaker carry over. Microphone audio captured while reconnecting is dropped.
+
+The conversation also restores recent context. Before `ready` fires, it adds back up to 40 of the most recent conversation items, 48 KiB in total. Restored items are user text, user speech that has a transcript, assistant replies as text, and function calls with their outputs. User speech has a transcript only when input transcription is configured through native session settings. An assistant reply that was interrupted, or still playing when the connection dropped, is cut to what the user saw or heard. The cut is estimated from how much of the audio played, so it can be off by a few words. Images, speech without a transcript, deleted items, and replies still generating when the connection dropped are left out. Restored items get new item IDs, don't fire item events, and count as input tokens on the next response. Item IDs from before the reconnect don't work in later events. Restoration uses a contiguous suffix of restorable items. An oversized newest item leaves that suffix empty. Older items left out to fit the window fire a `context_trimmed` event with the count in `omittedItems`; this is routine and not an error. A provider refusal or a failure to send the restored items fires one `error` event with code `context_restore_failed` per restoration. In both cases the conversation stays connected. Items are preserved without truncating text, function arguments or function results.
+
+When Puter knows ahead of time that the server a session runs on will restart, it sends a `puter.reconnect` event, which also reaches your listeners. Without that notice, a restart drops the connection and the conversation reconnects as above. Within a few seconds, the conversation opens a replacement session in the background while the current one keeps working. It switches once no reply is generating or playing, no user turn is being spoken or transcribed, no function call is waiting for its output, and nothing you sent is waiting on the provider. The switch goes through the same steps as a reconnect, and the `reconnecting` event has code 1012. If the replacement can't open yet, the conversation keeps the current session and tries again later. A refusal that retrying can't fix, such as `insufficient_funds`, stops the attempts. If the server closes the session first, the conversation switches to the replacement, or reconnects if none is open.
+
+The conversation makes up to ten attempts over about a minute. In a browser that reports being offline, it first waits up to two minutes for the connection to come back. If every attempt fails, or the server refuses with an error such as `insufficient_funds`, the conversation closes. A closed conversation cannot reconnect. To start another session, prepare a new one.
+
+Native event definitions are listed in the [OpenAI realtime reference](https://developers.openai.com/api/reference/resources/realtime/server-events). Native events retain their provider fields. Sending native events preserves direct control of the session. Puter refuses `conversation.item.retrieve` events and MCP tools (`"type": "mcp"`) in `session.update` and `response.create` events. Sending one fires an `error` event with code `invalid_event`, and the conversation closes with code 1008. Audio helpers expect the session to use PCM16 at 24 kHz.
+
+## Errors and limits
+
+Failures use objects containing `code` and `message`. Preparation can reject with `invalid_argument`, `model_not_found`, `auth_required`, `auth_canceled`, or `auth_failed`. Connection can reject with `subscription_required` or `insufficient_funds`, which also show the Puter upgrade prompt. Connection and asynchronous operations can reject with provider errors, `session_closed`, `connection_lost`, `operation_timeout`, or `operation_in_progress`. Sending before readiness, or while reconnecting, throws `session_not_ready`.
+
+Invalid input throws `invalid_argument`, `invalid_event`, or `input_too_large`. A full SDK send queue throws `queue_full`. Media helpers report `unsupported_environment`, `permission_denied`, `media_error`, `media_timeout`, or `queue_full`. Runtime media errors and `context_restore_failed` arrive through the `error` event. Provider errors also arrive as native `error` events with a nested `error` object.
+
+Each native event is capped at 64 KiB. The SDK bounds JSON traversal, outgoing queues, acknowledgment waits, microphone work, and playback. All numeric limits are listed on [rate limits and quotas](/rate-limits-and-quotas/).
+
+## Convenience events
+
+The conversation emits these events alongside native events.
+
+| Event | Fields |
+| --- | --- |
+| `ready` | `model`, `provider`, and `reconnected: true` after a reconnection |
+| `reconnecting` | `code`, `reason` of the dropped connection. After a `puter.reconnect` event, `code` is 1012. |
+| `context_trimmed` | `omittedItems`, the number of restorable items left out of the restored context after a reconnection. Fires before `ready`. |
+| `text` | `delta`, `responseId` |
+| `transcript` | `role`, `text`, `final`. Assistant deltas use `final: false`. Completed assistant and user transcripts use `final: true`. User transcripts require transcription to be configured through native session settings. |
+| `audio` | `pcm`, `sampleRate`, `responseId`, `itemId`, `contentIndex`. The PCM chunk is an `Int16Array`. |
+| `interrupted` | `source` (`manual` or `speech`), `responseId` |
+| `turn.done` | `responseId`, native provider `usage`, `status` |
+| `close` | `code`, `reason` |
+
+Each event includes its `type`. When the provider event leaves out an ID, `responseId` and `itemId` are empty strings and `contentIndex` is `0`. The `interrupted` event signals local interruption immediately. Its corresponding operation resolves after the provider acknowledges cancellation and any requested truncation. Late audio from a canceled response remains visible as native events and is excluded from convenience audio and built-in playback.
+
+## Browser media
+
+The optional microphone and speaker helpers require a browser with Web Audio support. Microphone capture also requires media permissions and a secure context. Start audio from a user action so the browser can allow playback.
+
+| Member | Behavior |
+| --- | --- |
+| `microphone.start()` | Requests microphone access and streams PCM16, resampled to 24 kHz, in 20 ms chunks through an AudioWorklet. If the page or network falls behind, chunks are dropped rather than stopping capture. |
+| `microphone.mute()` | Disables capture tracks and stops forwarding captured chunks. |
+| `microphone.unmute()` | Enables capture tracks and forwarding. |
+| `microphone.stop()` | Stops capture tracks and releases capture resources. A `start()` still waiting on the permission prompt rejects with `session_closed`. |
+| `speaker.start({ bargeIn: true })` | Starts playback. Barge-in defaults to `true`. With barge-in enabled, provider speech-start events interrupt playback and synchronize played audio with conversation history. Starting the speaker requests no microphone access. |
+| `speaker.stop()` | Clears playback and releases its audio context. |
+
+Both start methods require a connected session. Capture and playback are independent, so custom audio input can use the built-in speaker, and built-in capture can use custom playback.
+
+## Examples
+
+### Have a text conversation
+
+A text conversation uses convenience methods for input and streamed output.
+
+```js
+const conversation = await puter.ai.realtime({
+    output: ['text'],
+    instructions: 'Keep replies short.',
 });
-socket.on('error', console.error);
-socket.on('close', (code, reason) => console.log(code, reason.toString()));
+
+conversation.on('text', ({ delta }) => console.log(delta));
+conversation.on('turn.done', () => conversation.close());
+conversation.on('error', (event) => console.error(event));
+
+await conversation.connect();
+conversation.sendText('Say hello in three words.');
 ```

-## Events, audio, and interruption
+### Have a voice conversation

-Each message contains one JSON object with a nonempty string `type` of at most 128 characters. Binary messages are rejected. Native events retain their provider fields. The endpoint doesn't deliver `rate_limits.updated`, which describes Puter's provider account rather than yours, and it removes provider organization IDs from error messages. The endpoint exposes the WebSocket event protocol. Your client manages capture, playback, acknowledgments, and timeouts.
+A voice conversation enables the microphone and speaker after connection.

-The endpoint refuses `conversation.item.retrieve` events and MCP tools (`"type": "mcp"`) in `session.update` and `response.create` events. A refused event isn't sent to the provider. The session gets an `invalid_event` error and closes with 1008.
+```js
+const conversation = await puter.ai.realtime();
+conversation.on('transcript', ({ role, text }) => console.log(role, text));
+conversation.on('error', (event) => console.error(event));

-PCM16 audio configured at 24 kHz mono is sent as base64 chunks in `input_audio_buffer.append` events. Output arrives in `response.output_audio.delta` events. With manual turn detection, commit buffered input with `input_audio_buffer.commit`, then request a reply with `response.create`.
+await conversation.connect();
+await conversation.speaker.start();
+await conversation.microphone.start();

-To interrupt, stop local playback immediately and send `response.cancel` with the active `response_id`. If some generated audio was not played, send `conversation.item.truncate` with its `item_id`, `content_index`, and `audio_end_ms` set to the amount actually played. Wait for `response.done` and any requested `conversation.item.truncated` acknowledgment before submitting a replacement turn.
+// To interrupt a response and submit a replacement text turn:
+await conversation.interrupt();
+conversation.sendText('Actually, make it Wednesday.');

-Connection loss ends the session. Reconnecting creates a new conversation. Tool execution and automatic reconnection belong to your client.
-
-## Server restarts
-
-When Puter knows ahead of time that the server a session runs on will restart, it sends each open session this event, at most once a minute:
-
-```json
-{
-    "type": "puter.reconnect",
-    "event_id": "event_puter_1767225600000",
-    "reason": "server_restarting",
-    "close_in_ms": 90000
-}
+// When the user ends the conversation:
+conversation.close();
 ```
-
-The `reason` field is `server_restarting`. The `close_in_ms` field, when present, is about how long until the server closes the session itself. The session keeps working until then. Open a new connection after a short, randomized delay, and once it gets `session.created` and your client is idle, with no response generating and no user turn in progress, move to it and close the old one. A connection that reaches a server that is also restarting gets a `server_restarting` error and closes with 1012. In that case keep the old session and try again after a short, randomized delay. If the server closes the old session first, the close code is 1012, and your client reconnects the same way. A restart can also drop the connection without any notice, so treat an unexpected close the same way.
-
-A new connection starts an empty conversation. To keep context, add earlier items back with `conversation.item.create` before you request a response. Event types that start with `puter.` come from Puter, not the provider.
-
-## Errors, billing, and limits
-
-API errors arrive as `{ "type": "error", "error": { "code": "...", "message": "..." } }`. Handle socket errors and close frames too. Invalid, missing, or revoked credentials use `invalid_api_key`. If Puter can't check a credential or the account's plan, the error is `internal_error` and the session closes with 1011, so try again after a short, randomized delay. Other relay codes include `permission_denied`, `model_not_found`, `insufficient_funds`, `subscription_required`, `rate_limit_exceeded`, `invalid_event`, `connection_timeout`, `provider_unavailable`, `upstream_error`, and `server_restarting`.
-
-Policy failures generally close with 1008, oversized client messages with 1009, upstream or setup failures with 1011, server restarts with 1012, and temporary server overload with 1013. Reconnect after 1011, 1012, or 1013. Authentication and model failures can arrive after the WebSocket handshake succeeds.
-
-The endpoint requires a paid Puter plan. Usage is charged after completed responses and input transcriptions. While a response generates, part of your balance is held for it, so a session opens only if your balance covers one response. If the provider connection closes before a response reports its usage, the response is charged the full amount held for it. Each account can open 20 sessions at once by default. Each JSON message you send is limited to 64 KiB, including reassembled fragments. Messages from the provider can be up to 4 MiB. Stream audio in small chunks. All message rates, queue caps, timeouts, and other bounds are published in [rate limits and quotas](/rate-limits-and-quotas/).
-
-Input transcription holds a small amount of your balance per transcribed item, priced at the transcription model you select. Two items are reserved ahead of your audio and replenished as the provider commits them, so a session holds only its spare items plus the items still awaiting a transcript. Changing the transcription model reprices the spare items. If your balance can't cover another item, audio waits while earlier items settle; once none are left to settle, the session closes with `insufficient_funds`. Failed transcriptions, items without final usage, and audio whose commit the provider never acknowledges before the connection closes are each charged that model's fixed per-item amount. Unacknowledged audio is charged one item per started 160 seconds. With server turn detection, only detected speech counts, so silence is never charged. The amounts, timeout and audio limits are listed in [rate limits and quotas](/rate-limits-and-quotas/).
-
-Provider-reported realtime models must have a known price. A missing model uses the last known model. An explicitly unpriced model closes the connection with `upstream_error`.
-
-After recording usage, the connection can continue while settled credit is positive, including a fractional balance. Each new billable operation still needs its full reservation after accounting for other outstanding holds.
@@ -6,7 +6,7 @@ platforms: [websites]

 Initiates the sign in process for the user.

-This will open a popup window with the appropriate authentication method. Puter automatically handles the authentication process and will resolve the promise when the user has signed in.
+This will open a popup window with the appropriate authentication method. Puter automatically handles the authentication process and will resolve the promise when the user has signed in. Puter's own apps on puter.com subdomains show the sign-in in a frame over the page instead, and open the popup when the user picks a sign-in provider such as Google.

 It is important to note that all essential methods in Puter handle authentication automatically. This method is only necessary if you want to handle authentication manually, for example if you want to build your own custom authentication flow.

@@ -8,7 +8,7 @@ Opens a dialog where the user can send you, the app's developer, feedback about

 The message is delivered by Puter: it is stored and emailed to the email address on your Puter account. The feedback never passes through your app's code, and the dialog tells the user what is shared with you: their username, plus their email address (as the email's reply-to, so you can respond) when their email is verified.

-Inside Puter, the dialog is rendered by the desktop environment. On a website, a puter.com popup hosts the dialog (signing the user in first if needed).
+Inside Puter, the dialog is rendered by the desktop environment. On a website, a puter.com popup hosts the dialog (signing the user in first if needed). Puter's own apps on puter.com subdomains show it in a frame over the page instead, when the user is signed in to both.

 **Feedback is opt-in.** Users can only send feedback if it's enabled for your app. Apps created in the Dev Center have feedback enabled at creation — you can turn it off with the "User Feedback" toggle in the app's settings. Apps created through `puter.apps.create` default to off; enable it by setting `feedbackEnabled`:

@@ -91,7 +91,7 @@ Gemini speech-to-text first counts the audio's tokens, which times out after 30

 The OpenAI- and Anthropic-compatible endpoints (`/puterai/openai/v1/*`, `/puterai/anthropic/v1/messages`) require a paid plan; a free account gets `402 subscription_required`. The same models are available to every account through `puter.ai.*` and `/drivers/call`, and the model catalogue endpoints are open to everyone.

-Realtime sessions ([`puter.ai.convo()`](/AI/convo/), `/puterai/openai/v1/realtime`) require a paid plan, like the other OpenAI-compatible endpoints, and are capped at 20 open at once per account. An account without a plan gets an `error` event with code `subscription_required`. A session over the cap gets `rate_limit_exceeded`. Both close with 1008.
+Realtime sessions ([`puter.ai.realtime()`](/AI/realtime/), `/puterai/openai/v1/realtime`) require a paid plan, like the other OpenAI-compatible endpoints, and are capped at 20 open at once per account. An account without a plan gets an `error` event with code `subscription_required`. A session over the cap gets `rate_limit_exceeded`. Both close with 1008.

 | Realtime transport limit | Value | Behavior at the limit |
 | --- | --- | --- |
@@ -131,7 +131,7 @@ Realtime sessions ([`puter.ai.convo()`](/AI/convo/), `/puterai/openai/v1/realtim

 Send audio as a stream of small chunks. The message cap applies to text, configuration, tool output, and audio alike.

-The [`puter.ai.convo()`](/AI/convo/) SDK also applies these limits before sending or retaining data.
+The [`puter.ai.realtime()`](/AI/realtime/) SDK also applies these limits before sending or retaining data.

 | Conversation SDK limit | Value | Behavior at the limit |
 | --- | --- | --- |
@@ -124,17 +124,17 @@ let sidebar = [
                path: '/AI/speech2speech',
            },
            {
-                title: '<code>convo()</code>',
-                page_title: '<code>puter.ai.convo()</code>',
-                title_tag: 'puter.ai.convo()',
+                title: '<code>realtime()</code>',
+                page_title: '<code>puter.ai.realtime()</code>',
+                title_tag: 'puter.ai.realtime()',
                icon: '/assets/img/function.svg',
-                source: '/AI/convo.md',
-                path: '/AI/convo',
+                source: '/AI/realtime.md',
+                path: '/AI/realtime',
            },
            {
                title: 'Realtime WebSocket API (Beta)',
-                source: '/AI/realtime.md',
-                path: '/AI/realtime',
+                source: '/AI/realtime-websocket.md',
+                path: '/AI/realtime-websocket',
            },
            {
                title: '<code>listModels()</code>',
@@ -84,7 +84,8 @@ export function pushAccountPickerScreen (flow) {
    const accounts = Array.isArray(window.logged_in_users) ? window.logged_in_users : [];

    let h = '<div class="dashboard-dialog-body auth-body">';
-    h += authHeadHtml(flow, i18n('sign_in_with_puter', [], false));
+    // Everyone here has signed in to Puter before; no need to explain it.
+    h += authHeadHtml(flow, i18n('sign_in_with_puter', [], false), { openerNotice: false });
    h += `<ul class="auth-accounts" aria-label="${i18n('sign_in_with_puter')}">`;
    h += accounts.map(accountRowHtml).join('');
    h += '</ul>';
@@ -104,7 +104,8 @@ export function pushLoginScreen (flow, options = {}) {
    const id = `auth-login-${window.uuidv4?.() ?? Date.now()}`;

    let h = '<div class="dashboard-dialog-body auth-body">';
-    h += authHeadHtml(flow, i18n('log_in', [], false));
+    // Logging in means already having a Puter account; no need to explain it.
+    h += authHeadHtml(flow, i18n('log_in', [], false), { openerNotice: false });
    h += '<form class="auth-form login-form" novalidate>';
    h += '<div class="dashboard-form-status" role="status" aria-live="polite"></div>';
    h += formFieldHtml({
@@ -152,6 +153,7 @@ export function pushLoginScreen (flow, options = {}) {

    renderProviderButtons($screen.find('.auth-provider-list'), {
        kind: 'login',
+        flow,
        referrer: () => flow.options.referrer ?? window.referrerStr ?? window.openerOrigin,
    }).then((offered) => {
        if ( offered ) $screen.find('.auth-providers').prop('hidden', false);
@@ -60,6 +60,14 @@ afterEach(() => {
 });

 describe('login screen', () => {
+    it('leaves out the opener notice in a sign-in popup', () => {
+        window.embedded_in_popup = true;
+        window.openerOrigin = 'https://builder.puter.com';
+        void UIAuthLogin({ reload_on_success: false });
+        expect(screen().find('.auth-title')).toHaveLength(1);
+        expect(screen().find('.auth-opener-notice')).toHaveLength(0);
+    });
+
    it('asks for each field before sending anything', () => {
        const calls = captureAjax();
        void UIAuthLogin({ reload_on_success: false });
@@ -217,6 +225,29 @@ describe('OIDC buttons on the login and signup screens', () => {
        window.location = original;
        expect(assign.mock.calls[0][0]).toBe('https://puter.test/auth/oidc/google/start?flow=login&referrer=ref');
    });
+
+    it('hands a framed sign-in to the popup instead of leaving for the provider', async () => {
+        asPopup('msg_id=1');
+        window.embedded_in_frame = true;
+        window.tell_popup_frame = vi.fn();
+        try {
+            void UIAuthLogin();
+            await vi.waitFor(() => expect($('.oidc-google-btn')).toHaveLength(1));
+            const href = window.location.href;
+            $('.oidc-google-btn').trigger('click');
+            expect(window.tell_popup_frame.mock.calls).toEqual([
+                ['provider', { url: expect.stringContaining('https://puter.test/auth/oidc/google/start?flow=login') }],
+                ['unavailable'],
+            ]);
+            const start = new URL(window.tell_popup_frame.mock.calls[0][1].url);
+            expect(start.searchParams.get('embedded_in_popup')).toBe('true');
+            expect(start.searchParams.get('msg_id')).toBe('1');
+            expect(window.location.href).toBe(href);
+        } finally {
+            delete window.embedded_in_frame;
+            delete window.tell_popup_frame;
+        }
+    });
 });

 describe('second factor', () => {
@@ -36,11 +36,13 @@ import openAuthFlow, {
    submitButtonHtml,
    wireAuthHead,
 } from './authFlow.js';
-import { renderProviderButtons } from './authProviders.js';
+import { mayOfferProviders, renderProviderButtons } from './authProviders.js';
 import { pushLoginScreen } from './UIAuthLogin.js';

 const SIGNUP_TIMEOUT_MS = 30000;
 const TURNSTILE_POLL_MS = 100;
+// How long the email form waits for the provider lookup before showing anyway.
+const PROVIDERS_WAIT_MS = 1500;

 /**
 * @typedef {object} SignupScreenOptions
@@ -187,6 +189,9 @@ export const signupRedirectUrl = (redirect_url) => {
 export function pushSignupScreen (flow, options = {}) {
    const id = `auth-signup-${window.uuidv4?.() ?? Date.now()}`;
    const turnstile_key = window.gui_params?.turnstileSiteKey;
+    // The email form stays hidden until the providers are known, so it
+    // doesn't show and then fold away behind "Sign up with email".
+    let awaiting_providers = mayOfferProviders() && ! options.username && ! options.email;

    let h = '<div class="dashboard-dialog-body auth-body">';
    h += authHeadHtml(flow, i18n('create_free_account', [], false));
@@ -200,7 +205,7 @@ export function pushSignupScreen (flow, options = {}) {
    h += '<div class="signup-with-email-wrapper" hidden>';
    h += `<button type="button" class="dashboard-dialog-btn auth-provider-btn signup-with-email-btn">${i18n('sign_up_with_email')}</button>`;
    h += '</div>';
-    h += '<form class="auth-form signup-form" novalidate>';
+    h += `<form class="auth-form signup-form" novalidate${awaiting_providers ? ' hidden' : ''}>`;
    h += formFieldHtml({
        name: 'username',
        label: i18n('username'),
@@ -307,11 +312,32 @@ export function pushSignupScreen (flow, options = {}) {
        })();
    }

+    // With focus on the card itself, nothing on the screen was focusable yet.
+    const focusWasParked = () => document.activeElement === flow.$dialog.get(0);
+    const stopAwaitingProviders = () => {
+        const was_awaiting = awaiting_providers;
+        awaiting_providers = false;
+        clearTimeout(form_fallback);
+        return was_awaiting;
+    };
+    const revealForm = () => {
+        if ( ! stopAwaitingProviders() || flow.isClosed() ) return;
+        showForm();
+        if ( focusWasParked() ) flow.focus();
+    };
+    const form_fallback = awaiting_providers ? setTimeout(revealForm, PROVIDERS_WAIT_MS) : undefined;
+
    renderProviderButtons($screen.find('.auth-provider-list'), {
        kind: 'signup',
+        flow,
        referrer: () => flow.options.referrer ?? window.referrerStr,
    }).then((offered) => {
-        if ( ! offered || flow.isClosed() ) return;
+        if ( ! offered ) {
+            revealForm();
+            return;
+        }
+        stopAwaitingProviders();
+        if ( flow.isClosed() ) return;
        offers_providers = true;
        $screen.find('.oidc-providers-wrapper').prop('hidden', false);
        if ( offered.signupOidcOnly ) {
@@ -327,7 +353,7 @@ export function pushSignupScreen (flow, options = {}) {
        const had_focus = $form.get(0).contains(document.activeElement);
        $form.prop('hidden', true);
        $screen.find('.signup-with-email-wrapper').prop('hidden', false);
-        if ( had_focus ) flow.focus();
+        if ( had_focus || focusWasParked() ) flow.focus();
    });

    $screen.find('.signup-with-email-btn').on('click', () => {
@@ -29,6 +29,7 @@ const { activeAuthFlow } = await import('./authFlow.js');
 const { default: UIAuthSignup, signupRedirectUrl } = await import('./UIAuthSignup.js');
 const { default: UIAuthAccountPicker } = await import('./UIAuthAccountPicker.js');
 const { default: UIAuthRecoverPassword } = await import('./UIAuthRecoverPassword.js');
+const { default: UIAuthLogin } = await import('./UIAuthLogin.js');

 const providers = (body) => {
    globalThis.fetch = vi.fn(async () => reply(200, body));
@@ -110,7 +111,12 @@ describe('signup when only OIDC signups are open', () => {
        globalThis.fetch = vi.fn(() => new Promise((resolve) => {
            answer = resolve;
        }));
+        vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });
        void UIAuthSignup();
+        // A slow lookup gives up the wait and shows the form.
+        vi.advanceTimersByTime(1500);
+        vi.useRealTimers();
+        expect($('.signup-form').prop('hidden')).toBe(false);
        $('[name="username"]').val('started');
        answer(reply(200, { providers: ['google'] }));
        await vi.waitFor(() => expect($('.oidc-google-btn')).toHaveLength(1));
@@ -118,6 +124,50 @@ describe('signup when only OIDC signups are open', () => {
    });
 });

+describe('signup while the providers are looked up', () => {
+    /** Lets promise callbacks run, but no timer, so nothing a paint could show in between. */
+    const settlePromises = async () => {
+        for ( let i = 0; i < 10; i++ ) await Promise.resolve();
+    };
+
+    it('keeps the email form hidden until the providers are known', async () => {
+        let answer;
+        globalThis.fetch = vi.fn(() => new Promise((resolve) => {
+            answer = resolve;
+        }));
+        void UIAuthSignup();
+        expect($('.signup-form').prop('hidden')).toBe(true);
+        answer(reply(200, { providers: ['google'] }));
+        await vi.waitFor(() => expect($('.oidc-google-btn')).toHaveLength(1));
+        expect($('.signup-form').prop('hidden')).toBe(true);
+        expect($('.signup-with-email-wrapper').prop('hidden')).toBe(false);
+    });
+
+    it('shows the email form when no providers are offered', async () => {
+        void UIAuthSignup();
+        await vi.waitFor(() => expect($('.signup-form').prop('hidden')).toBe(false));
+        expect($('.signup-with-email-wrapper').prop('hidden')).toBe(true);
+    });
+
+    it('shows a prefilled email form straight away', () => {
+        globalThis.fetch = vi.fn(() => new Promise(() => {}));
+        void UIAuthSignup({ email: '[email protected]' });
+        expect($('.signup-form').prop('hidden')).toBe(false);
+    });
+
+    it('reuses the login screen\'s lookup, drawing the providers before any paint', async () => {
+        providers({ providers: ['google'], signupOidcOnly: false });
+        void UIAuthLogin({ reload_on_success: false });
+        await vi.waitFor(() => expect(screen().find('.oidc-google-btn')).toHaveLength(1));
+        screen().find('.auth-to-signup').trigger('click');
+        await settlePromises();
+        expect(screen().attr('data-screen')).toBe('signup');
+        expect(screen().find('.oidc-google-btn')).toHaveLength(1);
+        expect(screen().find('.signup-with-email-wrapper').prop('hidden')).toBe(false);
+        expect(fetch).toHaveBeenCalledOnce();
+    });
+});
+
 describe('signup form', () => {
    it.each([
        [{}, 'username_required', 'username'],
@@ -191,9 +191,15 @@ export default function openAuthFlow ({ page = false, dismissable = ! page, clos
    /** @type {Array<AuthScreen & { $el: jQuery, el_return?: Element | null }>} */
    const stack = [];

+    // A frame's focus() calls do nothing until the framing page focuses it,
+    // so the screen takes focus then, unless something already has it.
+    const onFrameFocus = () => {
+        if ( ! document.activeElement || document.activeElement === document.body ) flow.focus();
+    };
    const teardown = () => {
        if ( torn_down ) return;
        torn_down = true;
+        window.removeEventListener('focus', onFrameFocus);
        if ( active_flow === flow ) active_flow = null;
        // Screens waiting on the user (the second factor) hear they won't get an answer.
        while ( stack.length ) stack.pop().onLeave?.();
@@ -352,8 +358,14 @@ export default function openAuthFlow ({ page = false, dismissable = ! page, clos
    $overlay.on('keydown keyup keypress', function (e) {
        e.stopPropagation();
        if ( e.type !== 'keydown' || e.key !== 'Escape' ) return;
+        // An Escape that cancels an IME conversion is the IME's; jQuery's
+        // event doesn't carry isComposing, the browser's does.
+        if ( e.originalEvent?.isComposing || e.keyCode === 229 ) return;
        e.preventDefault();
-        if ( dismissable && ! busy ) $dialog.find('.dashboard-dialog-close').trigger('click');
+        if ( busy ) return;
+        if ( dismissable ) $dialog.find('.dashboard-dialog-close').trigger('click');
+        // A framed sign-in's ✕ is the framing page's, which close() asks.
+        else if ( window.embedded_in_frame ) window.close();
    });
    // A press on the backdrop (or a page's background) would move focus to
    // the page, and with it the keys; it stays where it was.
@@ -361,6 +373,8 @@ export default function openAuthFlow ({ page = false, dismissable = ! page, clos
        if ( e.target === this ) e.preventDefault();
    });

+    if ( window.embedded_in_frame ) window.addEventListener('focus', onFrameFocus);
+
    active_flow = flow;
    return flow;
 }
@@ -387,9 +401,12 @@ export const joinAuthFlow = () => {
 *
 * @param {AuthFlow} flow
 * @param {string} title Plain text.
+ * @param {{ openerNotice?: boolean }} [opts] `openerNotice: false` leaves out
+ *   the line explaining that the site uses Puter, for screens shown to someone
+ *   who already has an account here.
 * @returns {string}
 */
-export const authHeadHtml = (flow, title) => {
+export const authHeadHtml = (flow, title, { openerNotice = true } = {}) => {
    const opener = window.embedded_in_popup && isAttestedOrigin(window.openerOrigin) ? window.openerOrigin : '';
    let h = '<div class="auth-head">';
    h += authLogoHeader({
@@ -399,7 +416,7 @@ export const authHeadHtml = (flow, title) => {
        openerFallbackSrc: window.icons['website.svg'],
    });
    h += `<h1 class="auth-title">${html_encode(title)}</h1>`;
-    if ( opener ) {
+    if ( opener && openerNotice ) {
        h += `<p class="auth-opener-notice">${i18n('popup_opener_uses_puter', [new URL(opener).hostname])}</p>`;
    }
    h += '</div>';
@@ -75,6 +75,56 @@ describe('openAuthFlow', () => {
        expect(flow.isClosed()).toBe(false);
    });

+    it('lets Escape ask the framing page to close a framed sign-in, unless busy', async () => {
+        window.embedded_in_frame = true;
+        const close = vi.spyOn(window, 'close').mockImplementation(() => {});
+        try {
+            const flow = openAuthFlow({ page: true });
+            flow.push({ name: 'a', html: '<input>' });
+            await tick();
+            flow.setBusy(true);
+            key($('.auth-dialog input').get(0), 'Escape');
+            expect(close).not.toHaveBeenCalled();
+            flow.setBusy(false);
+            // Escape that cancels an IME conversion is the IME's.
+            $('.auth-dialog input').get(0).dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', isComposing: true, bubbles: true }));
+            expect(close).not.toHaveBeenCalled();
+            key($('.auth-dialog input').get(0), 'Escape');
+            expect(close).toHaveBeenCalledTimes(1);
+            flow.finish(false);
+        } finally {
+            close.mockRestore();
+            delete window.embedded_in_frame;
+        }
+    });
+
+    it('focuses a framed screen once the framing page focuses the frame', async () => {
+        window.embedded_in_frame = true;
+        try {
+            const flow = openAuthFlow({ page: true });
+            flow.push({ name: 'a', html: '<input>' });
+            // What a frame's focus() amounts to before the page focuses it.
+            document.activeElement.blur();
+            window.dispatchEvent(new FocusEvent('focus'));
+            // jsdom lays nothing out, so the screen's fallback, the card, takes it.
+            expect($('.auth-dialog').get(0).contains(document.activeElement)).toBe(true);
+
+            // Focus the user moved elsewhere stays there.
+            const el_outside = $('<button class="outside">').appendTo('body').get(0);
+            el_outside.focus();
+            window.dispatchEvent(new FocusEvent('focus'));
+            expect(document.activeElement).toBe(el_outside);
+            el_outside.remove();
+
+            flow.finish(false);
+            document.activeElement.blur();
+            window.dispatchEvent(new FocusEvent('focus'));
+            expect(document.activeElement).toBe(document.body);
+        } finally {
+            delete window.embedded_in_frame;
+        }
+    });
+
    it('ignores the backdrop unless asked, so a stray click keeps typed credentials', async () => {
        const kept = openAuthFlow();
        kept.push({ name: 'a', html: '' });
@@ -250,6 +300,16 @@ describe('authHeadHtml', () => {
        expect($dialog_head.find('a')).toHaveLength(0);
        expect($dialog_head.find('.auth-logo').attr('alt')).toBe('');
    });
+
+    it('explains the opener in a sign-in popup unless told not to', () => {
+        window.embedded_in_popup = true;
+        window.openerOrigin = 'https://builder.puter.com';
+        const flow = openAuthFlow();
+        const $notice = $(authHeadHtml(flow, 'Log in')).find('.auth-opener-notice');
+        expect($notice).toHaveLength(1);
+        expect($notice.text()).toContain('builder.puter.com');
+        expect($(authHeadHtml(flow, 'Log in', { openerNotice: false })).find('.auth-opener-notice')).toHaveLength(0);
+    });
 });

 describe('authFlowOptions', () => {
@@ -75,27 +75,46 @@ export const providerStartUrl = (provider, kind, referrer) => {
    return url;
 };

+/** @type {WeakMap<import('./authFlow.js').AuthFlow, Promise<{ providers?: string[], signupOidcOnly?: boolean } | null>>} */
+const lookups = new WeakMap();
+
 /**
- * Fetches the configured providers and fills `$list` with a button for each.
- * A self-hosted instance's own provider gets a generic button.
+ * The configured providers, looked up once per auth flow so moving between
+ * its screens draws them straight away instead of after another round trip.
+ *
+ * @param {import('./authFlow.js').AuthFlow} flow
+ */
+const lookUpProviders = (flow) => {
+    let lookup = lookups.get(flow);
+    if ( ! lookup ) {
+        lookup = (async () => {
+            try {
+                const res = await fetch(`${window.api_origin}/auth/oidc/providers`);
+                return res.ok ? await res.json() : null;
+            } catch {
+                return null;
+            }
+        })();
+        lookups.set(flow, lookup);
+    }
+    return lookup;
+};
+
+/**
+ * Fills `$list` with a button for each configured provider. A self-hosted
+ * instance's own provider gets a generic button.
 *
 * @param {jQuery} $list Where the buttons go.
 * @param {object} opts
 * @param {'login'|'signup'} opts.kind
 * @param {() => string | undefined} opts.referrer Read when a button is pressed.
+ * @param {import('./authFlow.js').AuthFlow} opts.flow The flow showing `$list`.
 * @returns {Promise<{ providers: string[], signupOidcOnly: boolean } | null>}
 *   Null when none are offered here or the lookup failed.
 */
-export async function renderProviderButtons ($list, { kind, referrer }) {
+export async function renderProviderButtons ($list, { kind, referrer, flow }) {
    if ( ! mayOfferProviders() ) return null;
-    let data;
-    try {
-        const res = await fetch(`${window.api_origin}/auth/oidc/providers`);
-        if ( ! res.ok ) return null;
-        data = await res.json();
-    } catch {
-        return null;
-    }
+    const data = await lookUpProviders(flow);
    if ( ! Array.isArray(data?.providers) || ! data.providers.length ) return null;

    const ordered = [
@@ -115,7 +134,15 @@ export async function renderProviderButtons ($list, { kind, referrer }) {
    }
    $list.html(h);
    $list.on('click', '.auth-provider-btn', function () {
-        window.location.href = providerStartUrl($(this).attr('data-provider'), kind, referrer());
+        const url = providerStartUrl($(this).attr('data-provider'), kind, referrer());
+        // A provider won't load in a frame, so the framing page opens this
+        // in a popup instead. `unavailable` covers an SDK that can't.
+        if ( window.embedded_in_frame ) {
+            window.tell_popup_frame('provider', { url });
+            window.tell_popup_frame('unavailable');
+            return;
+        }
+        window.location.href = url;
    });
    return { providers: ordered, signupOidcOnly: data.signupOidcOnly === true };
 }
@@ -16,6 +16,8 @@ const requests = [];
 const guiRoot = fileURLToPath(new URL('../../../', import.meta.url));
 const sessionToken = 'app-browser-test-session';
 const sessionCookie = 'app-browser-test-cookie';
+const sessionUser = '0b1c9a52-3f0e-4c7a-9a65-2f6d1e8b7c40';
+const otherUser = '7d2e4f10-8a3b-4c5d-9e6f-0a1b2c3d4e5f';
 const appRows = Array.from({ length: 105 }, (_, i) => ({
    name: `app-${i}`, title: `App ${i}`, icon: null,
 }));
@@ -62,6 +64,25 @@ beforeAll(async () => {
        if ( ! req.headers.cookie?.includes(`puter_auth_token=${sessionCookie}`) ) return res.sendStatus(401);
        res.json({ token: sessionToken });
    });
+    // The GUI session's token and the tokens of apps signed in on a sibling subdomain.
+    const whoamiByToken = {
+        [sessionToken]: { uuid: sessionUser, username: 'session-user' },
+        'app-token-session-user': { uuid: sessionUser, username: 'session-user' },
+        'app-token-other-user': { uuid: otherUser, username: 'other-user' },
+    };
+    // The SDK on a sibling subdomain sends credentialed cross-origin requests.
+    app.use(['/whoami', '/profile', '/rao'], (req, res, next) => {
+        if ( req.headers.origin ) res.set('Access-Control-Allow-Origin', req.headers.origin);
+        res.set('Access-Control-Allow-Credentials', 'true');
+        res.set('Access-Control-Allow-Headers', 'Authorization, Content-Type');
+        if ( req.method === 'OPTIONS' ) return res.sendStatus(204);
+        next();
+    });
+    app.get('/whoami', (req, res) => {
+        const user = whoamiByToken[req.headers.authorization?.replace(/^Bearer /, '')];
+        if ( ! user ) return res.sendStatus(401);
+        res.json(user);
+    });
    app.get('/get-launch-apps', (_req, res) => res.json({ recommended: [{ name: 'removed', title: 'Removed' }] }));
    app.get('/cache/last-change-timestamp', (_req, res) => res.json({ timestamp: 0 }));
    app.post('/drivers/call', (req, res) => {
@@ -81,9 +102,15 @@ beforeAll(async () => {
    app.get('/index', (_req, res) => res.send(`<title>App</title>
        <script>window.PUTER_ORIGIN = '${origin}'; window.PUTER_API_ORIGIN = '${origin}';</script>
        <script src="/sdk.js"></script>`));
-    app.get('/host', (_req, res) => res.send(`<!DOCTYPE html><html><body style="margin:0">
-        <iframe title="More apps" src="${origin}/embed/apps" style="border:0;width:100vw;height:100vh"></iframe>
+    // The host page names its signed-in user as `?user=`, as puter.js does in the fragment.
+    app.get('/host', (req, res) => res.send(`<!DOCTYPE html><html><body style="margin:0">
+        <iframe title="More apps" src="${origin}/embed/apps${req.query.user ? `#user=${req.query.user}` : ''}" style="border:0;width:100vw;height:100vh"></iframe>
    </body></html>`));
+    // An app on a sibling subdomain, signed in with puter.js, with the SDK's user menu.
+    app.get('/menu-host', (_req, res) => res.send(`<!DOCTYPE html><html><head>
+        <script>window.PUTER_ORIGIN = '${origin}'; window.PUTER_API_ORIGIN = '${origin}';</script>
+        <script src="${origin}/sdk.js"></script></head>
+        <body><header><puter-user-menu></puter-user-menu></header></body></html>`));
    app.get('/embed/apps', (_req, res) => {
        res.setHeader('Content-Security-Policy', `frame-ancestors 'self' http://*.puter.localhost:${port}`);
        res.send(`<!DOCTYPE html><html><head><meta name="viewport" content="width=device-width, initial-scale=1">
@@ -122,7 +149,7 @@ describe('embedded app browser', () => {
            page.on('pageerror', error => errors.push(error.message));
            requests.length = 0;
            try {
-                const parentUrl = `http://spreadsheet.puter.localhost:${port}/host`;
+                const parentUrl = `http://spreadsheet.puter.localhost:${port}/host?user=${sessionUser}`;
                await page.goto(parentUrl);
                const frame = page.frameLocator('iframe');
                await frame.locator('.myapps-group-tile').waitFor();
@@ -182,7 +209,7 @@ describe('embedded app browser', () => {
        try {
            const page = await context.newPage();
            page.setDefaultTimeout(6000);
-            await page.goto(`http://spreadsheet.puter.localhost:${port}/host`);
+            await page.goto(`http://spreadsheet.puter.localhost:${port}/host?user=${sessionUser}`);
            const frame = page.frameLocator('iframe');
            await frame.locator('.myapps-group-tile').waitFor();
            expect(await frame.locator('[data-app-name="app-104"]').count()).toBe(1);
@@ -200,7 +227,7 @@ describe('embedded app browser', () => {
        try {
            const page = await context.newPage();
            page.setDefaultTimeout(6000);
-            await page.goto(`${origin}/embed/apps`);
+            await page.goto(`${origin}/embed/apps#user=${sessionUser}`);
            await page.locator('.myapps-search').fill('App 104');
            const popupPromise = context.waitForEvent('page');
            await page.locator('.myapps-tile').click();
@@ -275,7 +302,7 @@ describe('embedded app browser', () => {
            });
            const page = await context.newPage();
            page.setDefaultTimeout(6000);
-            await page.goto(`${origin}/embed/apps`);
+            await page.goto(`${origin}/embed/apps#user=${sessionUser}`);
            await page.locator('[data-app-name="notes"]').waitFor();
        } finally {
            guestApps = [];
@@ -290,7 +317,7 @@ describe('embedded app browser', () => {
            const page = await context.newPage();
            page.setDefaultTimeout(6000);
            await page.route('**/get-gui-token', route => route.fulfill({ status }));
-            await page.goto(`${origin}/embed/apps`);
+            await page.goto(`${origin}/embed/apps#user=${sessionUser}`);
            await page.getByRole('status').waitFor();
            expect(await page.getByRole('status').textContent()).toContain('Apps are unavailable');
            expect(await page.locator('.myapps-tile').count()).toBe(0);
@@ -300,6 +327,351 @@ describe('embedded app browser', () => {
        }
    });

+    describe('only shows the session to the host\'s own user', () => {
+        const notes = () => ({ name: 'notes', title: 'Notes', uuid: 'uid-notes', index_url: `http://notes.puter.localhost:${port}/index`, icon: null });
+        const signedInContext = () => browser.newContext({ storageState: {
+            cookies: [], origins: [{ origin, localStorage: [{ name: 'auth_token_v2', value: sessionToken }] }],
+        } });
+
+        it.each([
+            ['names no user', ''],
+            ['names another user', `?user=${otherUser}`],
+            ['names a malformed user', '?user=session-user'],
+        ])('shows the signed-out list when the host %s', async (_label, query) => {
+            guestApps = [notes()];
+            const context = await signedInContext();
+            requests.length = 0;
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                await page.goto(`http://spreadsheet.puter.localhost:${port}/host${query}`);
+                const frame = page.frameLocator('iframe');
+                await frame.locator('[data-app-name="notes"]').waitFor();
+                expect(await frame.locator('.myapps-tile').count()).toBe(1);
+                expect(requests.some(req => ['/sdk.js', '/installedApps', '/drivers/call'].includes(req.path))).toBe(false);
+
+                const popupPromise = context.waitForEvent('page');
+                await frame.locator('[data-app-name="notes"]').click();
+                const popup = await popupPromise;
+                await popup.waitForURL(/\/index\?/);
+                expect(await popup.evaluate(() => window.opener)).toBeNull();
+                expect(requests.some(req => ['/auth/get-user-app-token', '/rao'].includes(req.path))).toBe(false);
+            } finally {
+                guestApps = [];
+                await context.close();
+            }
+        });
+
+        it('shows the signed-out list when the API refuses the stored session', async () => {
+            guestApps = [notes()];
+            const context = await browser.newContext({ storageState: {
+                cookies: [], origins: [{ origin, localStorage: [{ name: 'auth_token_v2', value: 'revoked-session' }] }],
+            } });
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                await page.goto(`${origin}/embed/apps#user=${sessionUser}`);
+                await page.locator('[data-app-name="notes"]').waitFor();
+                expect(await page.locator('.myapps-tile').count()).toBe(1);
+            } finally {
+                guestApps = [];
+                await context.close();
+            }
+        });
+
+        it('shows a spinner while it checks the session', async () => {
+            const context = await signedInContext();
+            let respond;
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                await page.route('**/whoami', route => { respond = () => route.continue(); });
+                await page.goto(`${origin}/embed/apps#user=${sessionUser}`);
+                await expect.poll(() => typeof respond).toBe('function');
+                const spinner = () => page.locator('#app-browser').evaluate(root => getComputedStyle(root, '::after').animationName);
+                expect(await spinner()).not.toBe('none');
+                await respond();
+                await page.locator('[data-app-name="app-104"]').waitFor();
+                expect(await spinner()).toBe('none');
+            } finally {
+                await context.close();
+            }
+        });
+
+        it('shows an unavailable state when the session check fails', async () => {
+            guestApps = [notes()];
+            const context = await signedInContext();
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                await page.route('**/whoami', route => route.fulfill({ status: 503 }));
+                await page.goto(`${origin}/embed/apps#user=${sessionUser}`);
+                await page.getByRole('status').waitFor();
+                expect(await page.getByRole('status').textContent()).toContain('Apps are unavailable');
+                expect(await page.locator('.myapps-tile').count()).toBe(0);
+            } finally {
+                guestApps = [];
+                await context.close();
+            }
+        });
+
+        it('reloads for the user a changed fragment names', async () => {
+            guestApps = [notes()];
+            const context = await signedInContext();
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                await page.goto(`${origin}/embed/apps#user=${sessionUser}`);
+                await page.locator('[data-app-name="app-104"]').waitFor();
+                await page.evaluate(user => { window.location.hash = `user=${user}`; }, otherUser);
+                await page.locator('[data-app-name="notes"]').waitFor();
+                expect(await page.locator('[data-app-name="app-104"]').count()).toBe(0);
+            } finally {
+                guestApps = [];
+                await context.close();
+            }
+        });
+    });
+
+    describe('opened from the SDK\'s user menu', () => {
+        const menuContext = async (appToken, options = {}) => {
+            guestApps = [{ name: 'notes', title: 'Notes', uuid: 'uid-notes', index_url: `http://notes.puter.localhost:${port}/index`, icon: null }];
+            const host = `http://spreadsheet.puter.localhost:${port}`;
+            return browser.newContext({ ...options, storageState: {
+                cookies: [],
+                origins: [
+                    { origin, localStorage: [{ name: 'auth_token_v2', value: sessionToken }] },
+                    { origin: host, localStorage: appToken ? [
+                        { name: 'puter.auth.token.v2', value: appToken },
+                        { name: 'puter.auth.token.origin.v2', value: origin },
+                    ] : [] },
+                ],
+            } });
+        };
+
+        it('shows the user\'s apps to the same user and the signed-out list once the app signs out', async () => {
+            const context = await menuContext('app-token-session-user');
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                const errors = [];
+                page.on('pageerror', error => errors.push(error.message));
+                await page.goto(`http://spreadsheet.puter.localhost:${port}/menu-host`);
+                await page.locator('puter-user-menu .avatar').waitFor();
+                expect(await page.locator('puter-user-menu .avatar').textContent()).toBe('S');
+
+                await page.locator('puter-user-menu .apps-button').click();
+                const iframe = page.locator('puter-user-menu iframe');
+                expect(await iframe.getAttribute('src')).toBe(`${origin}/embed/apps#user=${sessionUser}`);
+                await page.frameLocator('puter-user-menu iframe').locator('[data-app-name="app-104"]').waitFor();
+
+                // The panel hangs under its button, inside the viewport.
+                const button = await page.locator('puter-user-menu .apps-button').boundingBox();
+                const panel = await page.locator('puter-user-menu .apps-panel').boundingBox();
+                const viewport = page.viewportSize();
+                expect(panel.y).toBeGreaterThan(button.y + button.height);
+                expect(panel.x).toBeGreaterThanOrEqual(0);
+                expect(panel.x + panel.width).toBeLessThanOrEqual(viewport.width);
+
+                // Closing keeps the embed, so reopening shows the same page.
+                const embed = page.frames().find(frame => frame.url().startsWith(`${origin}/embed/apps`));
+                await embed.evaluate(() => { window.keptAcrossOpens = true; });
+                await page.locator('puter-user-menu .apps-close').click();
+                await page.locator('puter-user-menu .apps-panel').waitFor({ state: 'hidden' });
+                await page.locator('puter-user-menu .apps-button').click();
+                expect(await embed.evaluate(() => window.keptAcrossOpens)).toBe(true);
+
+                await page.evaluate(() => puter.auth.signOut());
+                await iframe.waitFor({ state: 'detached' });
+                await page.locator('puter-user-menu .sign-in').waitFor();
+                await page.locator('puter-user-menu .apps-button').click();
+                expect(await iframe.getAttribute('src')).toBe(`${origin}/embed/apps`);
+                const frame = page.frameLocator('puter-user-menu iframe');
+                await frame.locator('[data-app-name="notes"]').waitFor();
+                expect(await frame.locator('[data-app-name="app-104"]').count()).toBe(0);
+                expect(errors).toEqual([]);
+            } finally {
+                guestApps = [];
+                await context.close();
+            }
+        });
+
+        it('shows the signed-out list to an app signed in as another user', async () => {
+            const context = await menuContext('app-token-other-user');
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                await page.goto(`http://spreadsheet.puter.localhost:${port}/menu-host`);
+                await page.locator('puter-user-menu .avatar').waitFor();
+                await page.locator('puter-user-menu .apps-button').click();
+                const frame = page.frameLocator('puter-user-menu iframe');
+                await frame.locator('[data-app-name="notes"]').waitFor();
+                expect(await frame.locator('[data-app-name="app-104"]').count()).toBe(0);
+            } finally {
+                guestApps = [];
+                await context.close();
+            }
+        });
+
+        it('closes the account menu when Tab leaves it', async () => {
+            const context = await menuContext('app-token-session-user');
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                await page.goto(`http://spreadsheet.puter.localhost:${port}/menu-host`);
+                await page.evaluate(() => document.body.insertAdjacentHTML('beforeend', '<button id="after">After</button>'));
+                const menu = page.locator('puter-user-menu .menu');
+                await page.locator('puter-user-menu .avatar').click();
+                await menu.waitFor();
+                await page.keyboard.press('Tab');
+                await menu.waitFor({ state: 'hidden' });
+                expect(await page.evaluate(() => document.activeElement.id)).toBe('after');
+
+                await page.locator('puter-user-menu .avatar').click();
+                await menu.waitFor();
+                await page.keyboard.press('Shift+Tab');
+                await menu.waitFor({ state: 'hidden' });
+                expect(await page.evaluate(() => document.activeElement.shadowRoot?.activeElement?.className)).toBe('apps-button');
+            } finally {
+                guestApps = [];
+                await context.close();
+            }
+        });
+
+        it('moves focus to Sign in after signing out from the keyboard', async () => {
+            const context = await menuContext('app-token-session-user');
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                await page.goto(`http://spreadsheet.puter.localhost:${port}/menu-host`);
+                await page.locator('puter-user-menu .avatar').focus();
+                await page.keyboard.press('Enter');
+                await page.locator('puter-user-menu .menu').waitFor();
+                await page.keyboard.press('Enter');
+                await page.locator('puter-user-menu .sign-in').waitFor();
+                await expect.poll(() => page.evaluate(() => document.activeElement.shadowRoot?.activeElement?.className)).toBe('sign-in');
+            } finally {
+                guestApps = [];
+                await context.close();
+            }
+        });
+
+        it('shows the app browser in a theme the page forces', async () => {
+            const context = await menuContext('app-token-session-user');
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                await page.emulateMedia({ colorScheme: 'light' });
+                await page.goto(`http://spreadsheet.puter.localhost:${port}/menu-host`);
+                const menu = page.locator('puter-user-menu');
+                await menu.evaluate(el => el.setAttribute('theme', 'dark'));
+                await page.locator('puter-user-menu .apps-button').click();
+                const frame = page.frameLocator('puter-user-menu iframe');
+                await frame.locator('[data-app-name="app-104"]').waitFor();
+                const background = () => frame.locator('body').evaluate(body => getComputedStyle(body).backgroundColor);
+                expect(await background()).toBe('rgb(30, 30, 30)');
+
+                await menu.evaluate(el => el.setAttribute('theme', 'light'));
+                await expect.poll(background).toBe('rgb(255, 255, 255)');
+                await frame.locator('[data-app-name="app-104"]').waitFor();
+                expect(await page.locator('puter-user-menu .apps-panel').isVisible()).toBe(true);
+            } finally {
+                guestApps = [];
+                await context.close();
+            }
+        });
+
+        it('leaves no hover shading on the Apps button once a tap closes it', async () => {
+            const context = await menuContext('app-token-session-user', {
+                viewport: { width: 390, height: 700 }, hasTouch: true, isMobile: true,
+            });
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                await page.goto(`http://spreadsheet.puter.localhost:${port}/menu-host`);
+                const button = page.locator('puter-user-menu .apps-button');
+                await button.tap();
+                await page.locator('puter-user-menu .apps-panel').waitFor();
+                await button.tap();
+                await page.locator('puter-user-menu .apps-panel').waitFor({ state: 'hidden' });
+                expect(await button.evaluate(el => getComputedStyle(el).backgroundColor)).toBe('rgba(0, 0, 0, 0)');
+            } finally {
+                guestApps = [];
+                await context.close();
+            }
+        });
+
+        it('shows Sign in pressed and the account hovered', async () => {
+            const context = await menuContext(null);
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                await page.goto(`http://spreadsheet.puter.localhost:${port}/menu-host`);
+                const signIn = page.locator('puter-user-menu .sign-in');
+                await signIn.hover();
+                await page.mouse.down();
+                expect(await signIn.evaluate(el => getComputedStyle(el).color)).toBe('rgb(190, 222, 245)');
+                await page.mouse.move(0, 0);
+                await page.mouse.up();
+
+                await page.evaluate(() => puter.setAuthToken('app-token-session-user'));
+                const avatar = page.locator('puter-user-menu .avatar');
+                await avatar.waitFor();
+                expect(await avatar.evaluate(el => getComputedStyle(el).boxShadow)).toBe('none');
+                await avatar.hover();
+                expect(await avatar.evaluate(el => getComputedStyle(el).boxShadow)).not.toBe('none');
+            } finally {
+                guestApps = [];
+                await context.close();
+            }
+        });
+
+        it('shows the account before its picture arrives', async () => {
+            const context = await menuContext('app-token-session-user');
+            let respond;
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                await page.route('**/profile', route => { respond = () => route.fulfill({
+                    status: 200,
+                    headers: { 'Access-Control-Allow-Origin': `http://spreadsheet.puter.localhost:${port}`, 'Access-Control-Allow-Credentials': 'true' },
+                    contentType: 'application/json',
+                    body: JSON.stringify({ picture: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==' }),
+                }); });
+                await page.goto(`http://spreadsheet.puter.localhost:${port}/menu-host`);
+                await page.locator('puter-user-menu .avatar').waitFor({ timeout: 2000 });
+                expect(await page.locator('puter-user-menu .avatar').textContent()).toBe('S');
+                expect(await page.locator('puter-user-menu .apps-button').isVisible()).toBe(true);
+                await expect.poll(() => typeof respond).toBe('function');
+                await respond();
+                await page.locator('puter-user-menu .avatar img').waitFor();
+            } finally {
+                guestApps = [];
+                await context.close();
+            }
+        });
+
+        it('names the user an app signs in as after loading', async () => {
+            const context = await menuContext(null);
+            try {
+                const page = await context.newPage();
+                page.setDefaultTimeout(6000);
+                await page.goto(`http://spreadsheet.puter.localhost:${port}/menu-host`);
+                await page.locator('puter-user-menu .sign-in').waitFor();
+                // What `puter.auth.signIn()` does with the token its popup hands back.
+                await page.evaluate(() => puter.setAuthToken('app-token-session-user'));
+                await page.locator('puter-user-menu .avatar').waitFor();
+                await expect.poll(() => page.locator('puter-user-menu .avatar').textContent()).toBe('S');
+                await page.locator('puter-user-menu .apps-button').click();
+                expect(await page.locator('puter-user-menu iframe').getAttribute('src')).toBe(`${origin}/embed/apps#user=${sessionUser}`);
+                await page.frameLocator('puter-user-menu iframe').locator('[data-app-name="app-104"]').waitFor();
+            } finally {
+                guestApps = [];
+                await context.close();
+            }
+        });
+    });
+
    it('shows an unavailable state if the SDK cannot load', async () => {
        const context = await browser.newContext({ storageState: {
            cookies: [], origins: [{ origin, localStorage: [{ name: 'auth_token_v2', value: sessionToken }] }],
@@ -307,7 +679,7 @@ describe('embedded app browser', () => {
        try {
            const page = await context.newPage();
            await page.route('**/sdk.js', route => route.abort());
-            await page.goto(`${origin}/embed/apps`);
+            await page.goto(`${origin}/embed/apps#user=${sessionUser}`);
            await page.getByRole('status').waitFor();
            expect(await page.getByRole('status').textContent()).toContain('Apps are unavailable');
        } finally {
@@ -383,7 +383,7 @@ export function createAppBrowser ({ editable = true, onLaunch, actions = {}, gue
    function trapModalTab ($overlay) {
        $overlay.on('keydown', function (e) {
            if ( e.key !== 'Tab' ) return;
-            const focusables = $overlay.find('button, textarea').toArray()
+            const focusables = $overlay.find('button, textarea, input:not([type="hidden"]), select, a[href]').toArray()
                .filter(el => ! el.disabled && el.offsetParent !== null);
            if ( focusables.length === 0 ) return;
            const first = focusables[0];
@@ -456,6 +456,12 @@ export function createAppBrowser ({ editable = true, onLaunch, actions = {}, gue
            // restores its position if it comes back.
            const deleteData = $overlay.find('.myapps-modal-delete-data').is(':checked');
            const removedIndex = self._apps.findIndex(a => a.name === appName);
+            // Uninstalled from inside an open folder: where focus goes after.
+            const fromGroupId = $el_window.find('.myapps-group-panel-grid .myapps-tile').toArray()
+                .some(el => el.dataset.appName === appName) ? self._openGroupId : null;
+            const groupMates = fromGroupId
+                ? (findGroupById(self._groups, fromGroupId)?.apps ?? []).filter(name => name !== appName)
+                : [];
            const removedApp = removedIndex === -1 ? null : self._apps[removedIndex];
            // A running instance would be stranded: the tile is a headless
            // app's only switcher, so once it's gone a minimized window could
@@ -463,6 +469,9 @@ export function createAppBrowser ({ editable = true, onLaunch, actions = {}, gue
            // also consumes the app's URL entry if it owns one).
            $(`.window[data-app="${html_encode(appName)}"]`).close();
            self._invalidateInFlightLoads();
+            // Until the revoke lands the server still lists the app as
+            // installed, so loads started meanwhile leave it out themselves.
+            self._pendingUninstalls.add(appName);
            self._setAppRemoved(appName, true);
            close({ restoreFocus: false });

@@ -494,9 +503,19 @@ export function createAppBrowser ({ editable = true, onLaunch, actions = {}, gue
                self.renderApps($el_window, { preservePage: true, instant: true });
                // The confirm button left with the modal; keep a keyboard user on
                // the grid, at the slot the app vacated.
-                if ( slot !== -1 && (! document.activeElement || document.activeElement === document.body) ) {
-                    const tiles = $el_window.find('.myapps-page .myapps-tile').toArray();
-                    tiles[Math.min(slot, tiles.length - 1)]?.focus({ preventScroll: true });
+                if ( ! document.activeElement || document.activeElement === document.body ) {
+                    if ( slot !== -1 ) {
+                        const tiles = $el_window.find('.myapps-page .myapps-tile').toArray();
+                        tiles[Math.min(slot, tiles.length - 1)]?.focus({ preventScroll: true });
+                    } else if ( fromGroupId ) {
+                        // The folder may still be open, closed, or dissolved
+                        // into the one app left in it.
+                        const target = $el_window.find('.myapps-group-panel-grid .myapps-tile')[0]
+                            ?? $el_window.find(`.myapps-group-tile[data-group-id="${CSS.escape(fromGroupId)}"]`)[0]
+                            ?? $el_window.find('.myapps-page .myapps-tile').toArray()
+                                .find(el => groupMates.includes(el.dataset.appName));
+                        target?.focus({ preventScroll: true });
+                    }
                }
                // FLIP the survivors from their old boxes into the new layout.
                const moved = [];
@@ -546,6 +565,9 @@ export function createAppBrowser ({ editable = true, onLaunch, actions = {}, gue
            puter.perms.revokeApp(appUid, '*', { deleteData }).then(async (result) => {
                // revokeApp resolves (never rejects) with `error` set on failure.
                if ( result?.error ) throw result;
+                // Loads started before now may have read the app as installed.
+                self._invalidateInFlightLoads();
+                self._pendingUninstalls.delete(appName);
                // Clearing the grants is only half of it. An app the user already
                // opened holds a token that authenticates against a session row,
                // and that row outlives the permission rows — so without this an
@@ -567,6 +589,7 @@ export function createAppBrowser ({ editable = true, onLaunch, actions = {}, gue
                }
            }).catch(async err => {
                console.error('Failed to uninstall app:', err);
+                self._pendingUninstalls.delete(appName);
                await removalSettled;
                self._invalidateInFlightLoads();
                // The uninstall didn't happen — take the name back off the
@@ -693,6 +716,8 @@ export function createAppBrowser ({ editable = true, onLaunch, actions = {}, gue
        $overlay.on('click', '.myapps-add-back', () => showPane('options'));
        $(document).on('keydown.add-app-modal', function (e) {
            if ( e.key !== 'Escape' ) return;
+            // Escape while composing (CJK input) cancels the composition only.
+            if ( e.originalEvent?.isComposing || e.keyCode === 229 ) return;
            // Escape steps back out of the form before it closes the modal, so a
            // half-written request survives a mis-hit key.
            if ( currentPane() === 'request' ) showPane('options');
@@ -917,6 +942,8 @@ export function createAppBrowser ({ editable = true, onLaunch, actions = {}, gue
        // The last uninstalled-apps list a read returned, for loads whose read fails.
        _lastRemovedApps: null,
        _launchingApps: new Set(),
+        // Apps whose uninstall was confirmed but hasn't landed on the server.
+        _pendingUninstalls: new Set(),
        // A deep-link install mid-arrival ({ name, $el_window }) — its tile is
        // parked invisible until the intro's arrival beat (see
        // _spliceDeepLinkApp); and the session's landing-installed apps, kept
@@ -1362,7 +1389,7 @@ export function createAppBrowser ({ editable = true, onLaunch, actions = {}, gue
                // account dialog, the touch action sheet, or the phone drawer.
                if ( $('.dashboard-notifications-panel.open, .dashboard-dialog-overlay, .context-menu-modal-backdrop, .dashboard-sidebar.open').length ) return;

-                const $panelGrid = $el_window.find('.myapps-group-panel-grid');
+                const $panelGrid = $el_window.find('.myapps-group-overlay:not([inert]) .myapps-group-panel-grid');
                const pageTiles = ($panelGrid.length
                    ? $panelGrid
                    : $el_window.find('.myapps-page').eq(self._page)
@@ -2237,6 +2264,8 @@ export function createAppBrowser ({ editable = true, onLaunch, actions = {}, gue
            // removal below, so the tile a user reaches for the instant a folder
            // shuts would do nothing.
            $overlay.css('pointer-events', 'none');
+            // Nor may its tiles take focus (Tab, the arrow keys) on the way out.
+            $overlay.attr('inert', '');

            // Back into the tile it grew out of; if that tile is gone (the folder
            // dissolved, the page flipped) the card simply recedes where it is.
@@ -2334,14 +2363,32 @@ export function createAppBrowser ({ editable = true, onLaunch, actions = {}, gue
            // boundary so their stale snapshot can't replay over it (see
            // _resolveGroups).
            this._groupsSavedAtSeq = this._loadSeq || 0;
-            try {
-                const p = puter.kv.set(APP_GROUPS_KV_KEY, JSON.stringify(groups));
-                if ( p && typeof p.catch === 'function' ) {
-                    p.catch(err => console.error('Failed to save app folders:', err));
+            this._persistLatest(APP_GROUPS_KV_KEY, JSON.stringify(groups), 'Failed to save app folders:');
+        },
+
+        // Saves `value` under `key` one write at a time, sending only the
+        // newest value once the write before it lands: two writes of a key in
+        // flight together (an eject's save, then the drop's) can land in
+        // either order, leaving the older layout stored.
+        _persistLatest (key, value, failureMessage) {
+            this._kvWrites ??= new Map();
+            let slot = this._kvWrites.get(key);
+            if ( ! slot ) this._kvWrites.set(key, slot = { pending: undefined, running: false });
+            slot.pending = value;
+            if ( slot.running ) return;
+            slot.running = true;
+            (async () => {
+                while ( slot.pending !== undefined ) {
+                    const next = slot.pending;
+                    slot.pending = undefined;
+                    try {
+                        await puter.kv.set(key, next);
+                    } catch ( err ) {
+                        console.error(failureMessage, err);
+                    }
                }
-            } catch ( err ) {
-                console.error('Failed to save app folders:', err);
-            }
+                slot.running = false;
+            })();
        },

        // -- Drag-to-reorder --
@@ -3269,14 +3316,7 @@ export function createAppBrowser ({ editable = true, onLaunch, actions = {}, gue
            // boundary so their stale snapshot can't replay over it (see
            // _resolveOrderNames).
            this._orderSavedAtSeq = this._loadSeq || 0;
-            try {
-                const p = puter.kv.set(APPS_ORDER_KV_KEY, JSON.stringify(names));
-                if ( p && typeof p.catch === 'function' ) {
-                    p.catch(err => console.error('Failed to save app order:', err));
-                }
-            } catch ( err ) {
-                console.error('Failed to save app order:', err);
-            }
+            this._persistLatest(APPS_ORDER_KV_KEY, JSON.stringify(names), 'Failed to save app order:');
        },

        loadApps ($el_window) {
@@ -3444,7 +3484,7 @@ export function createAppBrowser ({ editable = true, onLaunch, actions = {}, gue

                // Append installed apps that aren't already in the list
                for ( const app of installedApps ) {
-                    if ( seen.has(app.name) ) continue;
+                    if ( seen.has(app.name) || this._pendingUninstalls.has(app.name) ) continue;
                    seen.add(app.name);
                    merged.push(app);
                }
@@ -68,6 +68,86 @@ async function mount (options = {}) {
 }

 describe('shared app browser', () => {
+    it('keeps an app off the grid while its uninstall is still on its way to the server', async () => {
+        const actions = { showAlert: vi.fn(), revokeAppSessions: vi.fn(async () => {}) };
+        await mount({ editable: true, actions });
+        let finishRevoke;
+        puter.perms = { revokeApp: vi.fn(() => new Promise(resolve => { finishRevoke = resolve; })) };
+        // The app's windows are closed first; the test has none.
+        $.fn.close ??= function () { return this; };
+        window.matchMedia = () => ({ matches: true });
+        browser._setReorderMode($root, true);
+        $('.myapps-tile[data-app-name="editor"] .myapps-tile-remove').trigger('click');
+        $('.myapps-modal-confirm').trigger('click');
+        expect(puter.perms.revokeApp).toHaveBeenCalled();
+
+        // A refresh before the revoke lands still lists the app as installed.
+        await browser.loadApps($root);
+        expect(browser._apps.map(app => app.name)).not.toContain('editor');
+
+        installed = installed.filter(app => app.name !== 'editor');
+        finishRevoke({});
+        await vi.waitFor(() => expect(browser._pendingUninstalls.size).toBe(0));
+        await browser.loadApps($root);
+        expect(browser._apps.map(app => app.name)).not.toContain('editor');
+        expect(actions.showAlert).not.toHaveBeenCalled();
+    });
+
+    it('saves one layout at a time, sending only the newest once the last write lands', async () => {
+        await mount({ editable: true });
+        const writes = [];
+        puter.kv.set = vi.fn((key, value) => new Promise(resolve => writes.push({ key, value, resolve })));
+        const orderWrites = () => writes.filter(w => w.key === APPS_ORDER_KV_KEY);
+
+        browser._apps = [{ name: 'a' }, { name: 'b' }];
+        browser.saveOrder();
+        browser._apps = [{ name: 'b' }, { name: 'a' }];
+        browser.saveOrder();
+        browser._apps = [{ name: 'a' }, { name: 'b' }, { name: 'c' }];
+        browser.saveOrder();
+        expect(orderWrites()).toHaveLength(1);
+
+        orderWrites()[0].resolve();
+        await vi.waitFor(() => expect(orderWrites()).toHaveLength(2));
+        expect(orderWrites()[1].value).toBe(JSON.stringify(browser._savedOrderNames));
+        expect(orderWrites()[1].value).not.toBe(orderWrites()[0].value);
+        orderWrites()[1].resolve();
+        await new Promise(resolve => setTimeout(resolve, 0));
+        expect(orderWrites()).toHaveLength(2);
+    });
+
+    it('leaves the app request form open on an Escape that ends an IME composition', async () => {
+        await mount({ editable: true });
+        $('.myapps-add-tile').trigger('click');
+        $('.myapps-add-option[data-add-option="request"]').trigger('click');
+        const pane = () => $('.myapps-add-pane:not([hidden])').attr('data-pane');
+        expect(pane()).toBe('request');
+
+        $('.myapps-add-message')[0].dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', isComposing: true, bubbles: true }));
+        expect(pane()).toBe('request');
+        $('.myapps-add-message')[0].dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }));
+        expect(pane()).toBe('options');
+        $(document).off('keydown.add-app-modal');
+    });
+
+    it('lets Tab reach the delete-data option in the Uninstall dialog', async () => {
+        // jsdom lays nothing out; the focus trap skips elements with no offsetParent.
+        vi.spyOn(HTMLElement.prototype, 'offsetParent', 'get').mockReturnValue(document.body);
+        await mount({ editable: true });
+        browser._setReorderMode($root, true);
+        $('.myapps-tile[data-app-name="editor"] .myapps-tile-remove').trigger('click');
+        const $overlay = $('.myapps-modal-overlay');
+        expect(document.activeElement.classList.contains('myapps-modal-cancel')).toBe(true);
+
+        // Tab from the last control wraps to the first, the checkbox.
+        $overlay.find('.myapps-modal-confirm')[0].focus();
+        $overlay.trigger($.Event('keydown', { key: 'Tab', shiftKey: false }));
+        expect(document.activeElement.classList.contains('myapps-modal-delete-data')).toBe(true);
+        // Shift+Tab from it wraps back to the last.
+        $overlay.trigger($.Event('keydown', { key: 'Tab', shiftKey: true }));
+        expect(document.activeElement.classList.contains('myapps-modal-confirm')).toBe(true);
+    });
+
    it('uses saved order, folders, and removed recommendations in read-only mode', async () => {
        await mount();
        expect(browser._apps.map(app => app.name)).toEqual(['notes', 'sheet', 'editor']);
@@ -68,7 +68,7 @@ describe('TabApps.beginDeepLinkLaunch', () => {
 });

 describe('TabApps cancelling a drag out of a folder', () => {
-    it('puts the folder and the order back as they were', () => {
+    it('puts the folder and the order back as they were', async () => {
        document.body.innerHTML = '<div class="window"><div class="dashboard-section-apps active"><div class="myapps-container"><div class="myapps-page"><div class="myapps-tile" data-app-name="a"></div></div></div></div></div>';
        window.puter = { kv: { set: vi.fn(async () => {}), get: vi.fn(async () => null) } };
        TabApps._groupsLoaded = true;
@@ -91,7 +91,9 @@ describe('TabApps cancelling a drag out of a folder', () => {
        TabApps._endDrag(false);

        expect(TabApps._groups).toEqual([{ id: 'g1', name: 'Work', apps: ['a', 'b'] }]);
-        expect(JSON.parse(window.puter.kv.set.mock.calls.at(-2)[1])).toEqual([{ id: 'g1', name: 'Work', apps: ['a', 'b'] }]);
+        // The restore is written once the eject's own write lands.
+        const lastSaved = key => JSON.parse(window.puter.kv.set.mock.calls.filter(([k]) => k === key).at(-1)[1]);
+        await vi.waitFor(() => expect(lastSaved('dashboard_app_groups')).toEqual([{ id: 'g1', name: 'Work', apps: ['a', 'b'] }]));
        vi.restoreAllMocks();
    });
 });
@@ -37,6 +37,7 @@ import UIItemPropertiesModal from './UIItemPropertiesModal.js';
 import UIShareModal from './UIShareModal.js';
 import { openPublishWebsiteDialog, openPublishWorkerDialog } from './UIPublishDialogs.js';
 import { dedupedName } from '../../helpers/dedupedName.js';
+import { runLimited } from '../../helpers/runLimited.js';
 import { compareEntries, compareNames } from './sortEntries.js';
 import { middleTruncate } from './middleTruncate.js';
 import { resolveTypedPath } from './typedPath.js';
@@ -54,6 +55,14 @@ import { paintAvatars } from '../../helpers/profilePictures.js';

 const { html_encode, SelectionArea } = window;

+// Permanent deletes in flight at once: a browser's connections to one host.
+const DELETE_CONCURRENCY = 6;
+
+// The "New" menu's stand-ins for window.create_file, one per create in
+// flight (newest last), and the function they stand in for.
+const createFileInterceptors = [];
+let realCreateFile = null;
+
 /**
 * `p` with the folder `from` (itself, or anything under it) moved to `to`;
 * any other path, or a non-string, comes back as it was.
@@ -1242,8 +1251,9 @@ const TabFiles = {
                return false;
            }

-            // Arrow keys, Home/End and PageUp/PageDown - Navigate items
-            if ( e.which >= 33 && e.which <= 40 ) {
+            // Arrow keys, Home/End and PageUp/PageDown - Navigate items. Not
+            // with Alt or Cmd: those are the browser's (Alt+Left is Back).
+            if ( e.which >= 33 && e.which <= 40 && ! e.altKey && ! e.metaKey ) {
                e.preventDefault();
                e.stopPropagation();

@@ -1907,9 +1917,9 @@ const TabFiles = {
        if ( confirmed !== 'delete' ) return;
        // The phone selection bar acts on rows that are going away.
        this.$el_window.find('.files-selection-actions').removeClass('visible');
-        for ( const row of list ) {
-            await window.delete_item(row);
-        }
+        // A few at a time rather than one after another: a few hundred items
+        // took a round trip each. delete_item reports its own failures.
+        await runLimited(list, DELETE_CONCURRENCY, row => window.delete_item(row));
        await window.refresh_trash_state();
    },

@@ -2383,11 +2393,19 @@ const TabFiles = {
        };

        if ( isList ) {
-            for ( const el of names ) {
-                // 8px padding on each side; an auto-width column shows the
-                // full name, clipped by CSS.
-                write(el, nameWidth ? truncateFilenameToWidth(fullNameOf(el), nameWidth - 16, font) : fullNameOf(el));
-            }
+            // The name's padding (8px a side) takes room from a set width. An
+            // auto-width column fills the row, so its room is read off the
+            // name's wrapper, less the wrapper's padding: all reads before any
+            // write, so the writes don't force a layout each.
+            const paddingOf = s => (parseFloat(s.paddingLeft) || 0) + (parseFloat(s.paddingRight) || 0);
+            const padding = paddingOf(style);
+            const wrapperPadding = nameWidth ? 0 : paddingOf(getComputedStyle(names[0].parentElement));
+            const rooms = nameWidth ? null : names.map(el => el.parentElement.clientWidth - wrapperPadding);
+            names.forEach((el, i) => {
+                const room = (nameWidth || rooms[i]) - padding;
+                // A listing that isn't laid out yet (hidden tab) has no room to fit to.
+                write(el, room > 0 ? truncateFilenameToWidth(fullNameOf(el), room, font) : fullNameOf(el));
+            });
            return;
        }

@@ -3312,6 +3330,9 @@ const TabFiles = {
        // the directories sidebar is hidden — Home carries a row for each.
        this.renderPlaceRows();

+        // Something that ran while the listing loaded (a restore finishing,
+        // a failed mkdir) may have found the pane empty and said so.
+        $files.find('.files-empty-notice').remove();
        if ( directoryContents.length === 0 ) {
            this.renderEmptyPlaceholderIfNeeded();
            this.updateFooterStats();
@@ -4433,11 +4454,14 @@ const TabFiles = {
        const metadata = metadataStr ? JSON.parse(metadataStr) : {};

        // Only a direct child of Trash carries restore metadata.
+        const name = $(el_item).attr('data-name') || '';
        if ( path.dirname($(el_item).attr('data-path') || '') !== window.trash_path ) {
-            throw new Error('Cannot restore: only top-level Trash items can be restored');
+            throw new Error(i18n('restore_only_trash_items', { name }, false));
        }
+        // An item an app or the API moved into the Trash has no record of
+        // where it came from.
        if ( ! metadata.original_path ) {
-            throw new Error('Cannot restore: original path not found in metadata');
+            throw new Error(i18n('restore_location_unknown', { name }, false));
        }

        const destPath = path.dirname(metadata.original_path);
@@ -5370,10 +5394,14 @@ const TabFiles = {
                    return async () => {
                        $('.context-menu').remove();

+                        // Where the user was, so an upload that lands after
+                        // they've moved on neither pulls them back nor draws
+                        // its row into another folder's listing.
+                        const pathAtClick = _this.currentPath;
+
                        // Temporarily intercept create_file to capture the upload promise
                        let uploadPromise = null;
-                        const origCreateFile = window.create_file;
-                        window.create_file = (options) => {
+                        const createFile = (options) => {
                            // Counted from here, not from the click: Web Link
                            // waits on a prompt first, and other items added
                            // to the folder meanwhile must still show up.
@@ -5384,6 +5412,12 @@ const TabFiles = {
                            // a caller that awaits this.
                            return uploadPromise.catch(() => undefined);
                        };
+                        // Creates can overlap. Each one's interceptor stays
+                        // installed until it finishes, the newest on top, and
+                        // the real create_file comes back once none is left.
+                        if ( createFileInterceptors.length === 0 ) realCreateFile = window.create_file;
+                        createFileInterceptors.push(createFile);
+                        window.create_file = createFile;

                        try {
                            await originalOnClick();
@@ -5401,7 +5435,10 @@ const TabFiles = {
                                    operation: 'create_file',
                                    data: $('<div>').attr({ 'data-uid': result.uid, 'data-path': result.path }),
                                });
-                                if ( targetPath === _this.currentPath ) {
+                                // Not mid-way to another folder (currentPath
+                                // only moves once its listing arrives).
+                                const settled = ! _this.loadingFolder;
+                                if ( settled && targetPath === _this.currentPath ) {
                                    // Remove empty-directory placeholder if present
                                    _this.$el_window.find('.files-tab .files > div:not(.item):not(.place-row):not(.tabfiles-selection-area)').remove();
                                    // Add the new file incrementally
@@ -5412,11 +5449,15 @@ const TabFiles = {
                                        _this.applyColumnWidths();
                                        _this.updateFooterStats();
                                    }
-                                } else {
+                                } else if ( settled && _this.currentPath === pathAtClick ) {
                                    // Same navigate-to-target treatment as New
                                    // Folder above.
                                    _this.pushNavHistory(targetPath);
                                    await _this.renderDirectory(targetPath, { consistency: 'strong' });
+                                } else {
+                                    // The user went elsewhere meanwhile; the
+                                    // file is there when they come back.
+                                    return;
                                }
                                const $newRow = _this.$el_window.find(`.files-tab .files .item[data-uid='${result.uid}']`);
                                if ( $newRow.length > 0 ) {
@@ -5427,7 +5468,8 @@ const TabFiles = {
                        } catch ( err ) {
                            UIAlert(err?.message || i18n('error_unknown_cause', [], false));
                        } finally {
-                            window.create_file = origCreateFile;
+                            createFileInterceptors.splice(createFileInterceptors.indexOf(createFile), 1);
+                            window.create_file = createFileInterceptors.at(-1) ?? realCreateFile;
                            if ( uploadPromise ) _this.doneCreating();
                        }
                    };
@@ -116,6 +116,131 @@ describe('TabFiles emptying the Trash', () => {
    });
 });

+describe('TabFiles restoring from the Trash', () => {
+    beforeEach(() => {
+        window.trash_path = TRASH;
+        window.byte_format = bytes => `${bytes} B`;
+        window.refresh_trash_state = vi.fn(async () => {});
+        window.puter = { fs: { move: vi.fn(async () => ({})) } };
+    });
+
+    afterEach(() => vi.restoreAllMocks());
+
+    it('says in the user\'s language when an item has no record of where it came from', async () => {
+        const { default: UIAlert } = await import('../UIAlert.js');
+        UIAlert.mockClear();
+        mountListing(['uid-1']);
+        const row = $('.files .row')[0];
+        row.setAttribute('data-name', 'notes.txt');
+        row.setAttribute('data-uid', 'uid-1');
+
+        vi.spyOn(console, 'error').mockImplementation(() => {});
+        await TabFiles.restoreRows([row]);
+
+        expect(puter.fs.move).not.toHaveBeenCalled();
+        expect(UIAlert).toHaveBeenCalledWith('“notes.txt” can’t be restored because where it was deleted from isn’t known.');
+        expect($('.files .row')).toHaveLength(1);
+    });
+});
+
+describe('TabFiles New menu creates', () => {
+    const menuItem = (pattern, folder) => TabFiles.generateFolderContextMenu(folder)
+        .find(item => item && item.items).items.find(item => item && pattern.test(item.html));
+    let uploads;
+
+    beforeEach(() => {
+        mountListing([], '/alice/Documents');
+        window.user = { username: 'alice' };
+        window.trash_path = TRASH;
+        window.shared_path = '/alice/Shared';
+        window.file_templates = [];
+        window.sites = [];
+        window.actions_history = [];
+        window.activate_item_name_editor = vi.fn();
+        vi.spyOn(TabFiles, 'pushNavHistory').mockImplementation(() => {});
+        uploads = [];
+        window.puter = { fs: { upload: vi.fn((file, dirname) => new Promise(resolve => {
+            uploads.push(() => resolve({ uid: `u${uploads.length}`, name: file.name, path: `${dirname}/${file.name}` }));
+        })) } };
+        vi.spyOn(TabFiles, 'acceptsNewItemsHere').mockReturnValue(true);
+        vi.spyOn(TabFiles, 'acceptsNewItems').mockReturnValue(true);
+        vi.spyOn(TabFiles, 'renderItem').mockResolvedValue();
+        TabFiles.loadingFolder = false;
+        TabFiles._creatingItem = 0;
+        TabFiles.trashedNames ??= new Map();
+        TabFiles.deferredAdds ??= [];
+    });
+
+    afterEach(() => vi.restoreAllMocks());
+
+    it('puts the real create_file back when two overlap, whichever finishes first', async () => {
+        const real = vi.fn();
+        window.create_file = real;
+
+        const first = menuItem(/text_document|Text/).onClick();
+        const second = menuItem(/html_document|HTML/).onClick();
+        await new Promise(resolve => setTimeout(resolve, 0));
+        expect(uploads).toHaveLength(2);
+        uploads[0]();
+        await first;
+        uploads[1]();
+        await second;
+
+        expect(window.create_file).toBe(real);
+        expect(TabFiles._creatingItem).toBe(0);
+
+        const third = menuItem(/text_document|Text/).onClick();
+        const fourth = menuItem(/html_document|HTML/).onClick();
+        await new Promise(resolve => setTimeout(resolve, 0));
+        uploads[3]();
+        await fourth;
+        uploads[2]();
+        await third;
+
+        expect(window.create_file).toBe(real);
+        expect(TabFiles._creatingItem).toBe(0);
+    });
+
+    it('leaves a listing the user moved to alone when the upload lands after', async () => {
+        window.create_file = vi.fn();
+        vi.spyOn(TabFiles, 'renderDirectory').mockResolvedValue();
+        const created = menuItem(/text_document|Text/).onClick();
+        await new Promise(resolve => setTimeout(resolve, 0));
+
+        // The user opened Pictures; its listing is still loading.
+        TabFiles.loadingFolder = true;
+        uploads[0]();
+        await created;
+        expect(TabFiles.renderItem).not.toHaveBeenCalled();
+        expect(TabFiles.renderDirectory).not.toHaveBeenCalled();
+        expect(window.activate_item_name_editor).not.toHaveBeenCalled();
+    });
+
+    it('does not pull the user back once they are in another folder', async () => {
+        window.create_file = vi.fn();
+        vi.spyOn(TabFiles, 'renderDirectory').mockResolvedValue();
+        const created = menuItem(/text_document|Text/).onClick();
+        await new Promise(resolve => setTimeout(resolve, 0));
+
+        TabFiles.currentPath = '/alice/Pictures';
+        uploads[0]();
+        await created;
+        expect(TabFiles.renderDirectory).not.toHaveBeenCalled();
+        expect(TabFiles.renderItem).not.toHaveBeenCalled();
+    });
+
+    it('still goes to the folder whose menu made the file', async () => {
+        window.create_file = vi.fn();
+        vi.spyOn(TabFiles, 'renderDirectory').mockResolvedValue();
+        const created = menuItem(/text_document|Text/, '/alice/Videos').onClick();
+        await new Promise(resolve => setTimeout(resolve, 0));
+
+        uploads[0]();
+        await created;
+        expect(TabFiles.renderDirectory).toHaveBeenCalledWith('/alice/Videos', { consistency: 'strong' });
+    });
+});
+
 describe('failedUploadsMessage', () => {
    it('puts each failed item on its own line', () => {
        const message = failedUploadsMessage({ failedItems: [
@@ -1086,6 +1211,57 @@ describe('TabFiles names in a narrow listing', () => {
    });
 });

+describe('TabFiles names in an auto-width name column', () => {
+    const mountNames = (names) => {
+        document.body.innerHTML = `
+            <div class="window"><div class="files-tab">
+                <div class="header"><div class="columns"></div></div>
+                <div class="files files-list-view">${names.map(name => `
+                    <div class="row item" data-name="${name}">
+                        <div class="item-name-wrapper" style="padding: 0 40px 0 0"><pre class="item-name" style="padding: 0 8px"></pre></div>
+                    </div>`).join('')}
+                </div>
+            </div></div>`;
+        TabFiles.$el_window = $('.window');
+        TabFiles.currentView = 'list';
+        TabFiles.appliedColumnWidths = { name: null, sharedBy: 160, size: 60, modified: 80 };
+    };
+
+    beforeEach(() => {
+        // 10px a character; jsdom has no canvas.
+        vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockReturnValue({ measureText: text => ({ width: text.length * 10 }) });
+    });
+
+    afterEach(() => vi.restoreAllMocks());
+
+    it('cut a long name in the middle to the room its wrapper leaves, keeping the end', () => {
+        const long = `${'x'.repeat(60)} (1).txt`;
+        mountNames([long, 'short.txt']);
+        // 256px wrapper, less its 40px and the name's 16px of padding: 200px, 20 characters.
+        vi.spyOn(HTMLElement.prototype, 'clientWidth', 'get').mockReturnValue(256);
+
+        TabFiles.fitItemNames($('.files .item-name'));
+
+        const [$long, $short] = $('.files .item-name').toArray().map(el => $(el));
+        expect($long.text().length).toBeLessThanOrEqual(20);
+        expect($long.text().length).toBeGreaterThan(15);
+        expect($long.text()).toMatch(/^x+…x* \(1\)\.txt$/);
+        expect($long.attr('title')).toBe(long);
+        expect($short.text()).toBe('short.txt');
+        expect($short.attr('title') ?? '').toBe('');
+    });
+
+    it('show the full name while the listing has no width yet', () => {
+        const long = 'y'.repeat(80);
+        mountNames([long]);
+        vi.spyOn(HTMLElement.prototype, 'clientWidth', 'get').mockReturnValue(0);
+
+        TabFiles.fitItemNames($('.files .item-name'));
+
+        expect($('.files .item-name').text()).toBe(long);
+    });
+});
+
 describe('TabFiles uploads', () => {
    beforeEach(async () => {
        vi.restoreAllMocks();
@@ -1369,6 +1545,22 @@ describe('TabFiles keyboard', () => {
        expect(selected()).toEqual(['/alice/Documents/a.txt']);
    });

+    it('leaves Alt and Cmd arrows to the browser', () => {
+        mountKeyboard(['a.txt', 'b.txt']);
+        $('.files .row').first().addClass('selected');
+
+        const back = new KeyboardEvent('keydown', { key: 'ArrowLeft', which: 37, keyCode: 37, altKey: true, bubbles: true, cancelable: true });
+        document.body.dispatchEvent(back);
+        const down = new KeyboardEvent('keydown', { key: 'ArrowDown', which: 40, keyCode: 40, metaKey: true, bubbles: true, cancelable: true });
+        document.body.dispatchEvent(down);
+
+        expect(back.defaultPrevented).toBe(false);
+        expect(down.defaultPrevented).toBe(false);
+        expect(selected()).toEqual(['/alice/Documents/a.txt']);
+        press(document.body, 'ArrowDown', { which: 40, keyCode: 40 });
+        expect(selected()).toEqual(['/alice/Documents/b.txt']);
+    });
+
    it('takes a space typed into a name as part of it', () => {
        mountKeyboard(['my notes.txt', 'my zebra.txt']);
        for ( const key of ['m', 'y', ' ', 'z'] ) press(document.body, key, { which: key.toUpperCase().charCodeAt(0) });
@@ -168,15 +168,19 @@ function buildUsageHTML() {
 // what the badge carries: a date says when, only a countdown says how long
 // there is to decide. Returns null when the subscription carries no end date,
 // so callers fall back to unqualified "Free trial" wording.
-function formatTrialEnd(trialEndsAt) {
+export function formatTrialEnd(trialEndsAt, now = Date.now()) {
    if (!Number.isFinite(trialEndsAt)) return null;
    const date = new Date(trialEndsAt);
    if (Number.isNaN(date.getTime())) return null;
-    // Rounded up, so a trial with any time on it never reads "0 days left"
-    // before the day it actually converts.
+    // Calendar days in the user's time zone, so the countdown agrees with the
+    // date beside it: a trial ending this afternoon ends "today", and one
+    // ending tomorrow morning has one day left. Rounded, for the 23- and
+    // 25-hour days daylight saving makes.
+    const startOfDay = (d) =>
+        new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
    const days = Math.max(
        0,
-        Math.ceil((date.getTime() - Date.now()) / 86400000),
+        Math.round((startOfDay(date) - startOfDay(new Date(now))) / 86400000),
    );
    // In the dashboard's language, which the sentences around it are in.
    const locale = intlLocale(window.locale);
@@ -31,7 +31,7 @@ globalThis.i18n = key => key;
 window.icons = {};
 window.launch_apps = { recent: [] };

-const { default: TabHome } = await import('./TabHome.js');
+const { default: TabHome, formatTrialEnd } = await import('./TabHome.js');
 const { openAppInNewTab } = await import('../../helpers/dashboardAppLaunch.js');

 describe('TabHome recently used', () => {
@@ -96,3 +96,25 @@ describe('TabHome recent app clicks', () => {
        expect(openAppInNewTab).toHaveBeenCalledTimes(1);
    });
 });
+
+describe('formatTrialEnd', () => {
+    const at = (day, hour) => new Date(2026, 10, day, hour).getTime();
+
+    it('counts calendar days, so the countdown agrees with the date', () => {
+        // Ends at 3pm today: today, not "1 day left".
+        expect(formatTrialEnd(at(8, 15), at(8, 9)).days).toBe(0);
+        // Ends tomorrow at 11am: one day, not two.
+        expect(formatTrialEnd(at(9, 11), at(8, 9)).days).toBe(1);
+        expect(formatTrialEnd(at(9, 11), at(8, 23)).days).toBe(1);
+        expect(formatTrialEnd(at(15, 0), at(8, 23)).days).toBe(7);
+    });
+
+    it('reads an end that has passed as today', () => {
+        expect(formatTrialEnd(at(7, 12), at(8, 9)).days).toBe(0);
+    });
+
+    it('has nothing to say without an end date', () => {
+        expect(formatTrialEnd(undefined)).toBeNull();
+        expect(formatTrialEnd(NaN)).toBeNull();
+    });
+});
@@ -49,7 +49,9 @@ const ICONS = {
    puter: svg('<rect x="3" y="3" width="18" height="18" rx="4"/><path d="M8 12h8M12 8v8"/>'),
 };

-const PLATFORM_KEYS = { web: 'push_platform_web', ios: 'push_platform_ios', android: 'push_platform_android' };
+// `webpush` is Puter's own Web Push (see webPushClient.js); both are browsers.
+const PLATFORM_KEYS = { web: 'push_platform_web', webpush: 'push_platform_web', ios: 'push_platform_ios', android: 'push_platform_android' };
+const BROWSER_PLATFORMS = new Set(['web', 'webpush']);

 /** @param {{ pushEnabled?: boolean }|undefined} params - `window.gui_params` */
 export const notificationsTabEnabled = (params) => params?.pushEnabled === true;
@@ -106,7 +108,7 @@ export const deviceCardHtml = (device, now) => {
        ? i18n('push_device_last_seen', { time: formatRelativeTime(seenAt, now, locale) })
        : '';
    return card({
-        icon: device.platform === 'web' ? ICONS.laptop : ICONS.phone,
+        icon: BROWSER_PLATFORMS.has(device.platform) ? ICONS.laptop : ICONS.phone,
        title: html_encode(deviceName(device)),
        badge: device.current ? i18n('push_this_browser') : '',
        detail: [platform, seen].filter(Boolean).join(' · '),
@@ -230,11 +232,18 @@ const TabNotifications = {
                ? devices.map(device => deviceCardHtml(device, now)).join('')
                : emptyHtml('push_devices_empty'));
        };
+        // Only the newest listing draws, and a local removal outdates any
+        // listing still in flight: it may predate the removal.
+        let devicesSeq = 0;
        const refreshDevices = async () => {
+            const seq = ++devicesSeq;
            try {
-                devices = await listPushDevices();
+                const listed = await listPushDevices();
+                if ( seq !== devicesSeq ) return;
+                devices = listed;
                renderDevices();
            } catch ( e ) {
+                if ( seq !== devicesSeq ) return;
                console.warn('[push] device list failed', e);
                $section.find('.push-devices-list').html(emptyHtml(loadFailedKey(e)));
            }
@@ -245,11 +254,16 @@ const TabNotifications = {
                ? apps.map(appCardHtml).join('')
                : emptyHtml('push_apps_empty'));
        };
+        let appsSeq = 0;
        const refreshApps = async () => {
+            const seq = ++appsSeq;
            try {
-                apps = await listPushApps();
+                const listed = await listPushApps();
+                if ( seq !== appsSeq ) return;
+                apps = listed;
                renderApps();
            } catch ( e ) {
+                if ( seq !== appsSeq ) return;
                console.warn('[push] app list failed', e);
                $section.find('.push-apps-list').html(emptyHtml(loadFailedKey(e)));
            }
@@ -257,12 +271,15 @@ const TabNotifications = {

        const refreshPreference = async () => {
            const $toggle = $section.find('.push-puter-toggle');
+            const $hint = $section.find('.push-puter-card .dashboard-settings-card-info > span');
            try {
                $toggle.prop('checked', await getPuterPushPreference()).prop('disabled', false);
+                // A failed earlier read replaced the hint.
+                $hint.html(i18n('push_puter_notifications_hint'));
            } catch ( e ) {
                console.warn('[push] preference read failed', e);
                $toggle.prop('checked', false).prop('disabled', true);
-                $section.find('.push-puter-card .dashboard-settings-card-info > span').html(i18n(loadFailedKey(e)));
+                $hint.html(i18n(loadFailedKey(e)));
            }
        };

@@ -362,13 +379,21 @@ const TabNotifications = {
            if ( confirmed !== true ) return;
            // disable() drops the token and record; the DELETE covers a lost record.
            const client = device.current ? getPushClient() : null;
+            let disabled = false;
            try {
-                if ( client ) await client.disable();
+                if ( client ) {
+                    await client.disable();
+                    disabled = true;
+                    // Push is off here even if the DELETE fails; without the
+                    // opt-out the next load would turn it back on.
+                    setBrowserPushOptOut(window.user?.uuid, true);
+                }
                await removePushDevice(uid);
            } catch ( e ) {
                if ( e?.status !== 404 || e?.code === PUSH_UNAVAILABLE ) {
                    console.warn('[push] device removal failed', e);
                    showError('push_device_remove_failed', $el_window);
+                    if ( disabled ) refreshBrowser();
                    return;
                }
            }
@@ -377,6 +402,7 @@ const TabNotifications = {
                await Promise.all([refreshBrowser(), refreshDevices()]);
                return;
            }
+            devicesSeq++;
            devices = devices.filter(d => d.uid !== uid);
            renderDevices();
            if ( device.current ) refreshBrowser();
@@ -393,6 +419,7 @@ const TabNotifications = {
                showError('push_app_turn_off_failed', $el_window);
                return;
            }
+            appsSeq++;
            apps = apps.filter(app => app.uid !== appUid);
            renderApps();
        });
@@ -412,6 +412,26 @@ describe('Puter notifications', () => {
        expect($('.push-puter-card').text()).toContain('push_load_failed');
    });

+    it('puts the hint back once a later visit reads the preference', async () => {
+        serve({
+            'GET /push/devices': { devices: [] },
+            'GET /push/apps': { apps: [] },
+            'GET /push/preferences': () => reply(500, {}),
+        });
+        await open();
+        serve({
+            'GET /push/devices': { devices: [] },
+            'GET /push/apps': { apps: [] },
+            'GET /push/preferences': { puter: true },
+        });
+        await tab.onActivate($('.win'));
+        await settle();
+
+        expect($('.push-puter-toggle').prop('disabled')).toBe(false);
+        expect($('.push-puter-card').text()).toContain('push_puter_notifications_hint');
+        expect($('.push-puter-card').text()).not.toContain('push_load_failed');
+    });
+
    it('puts the switch back when the save fails', async () => {
        serve({
            'GET /push/devices': { devices: [] },
@@ -471,6 +491,21 @@ describe('your devices', () => {
        expect($cards.eq(2).find('strong').text()).toBe('push_device_unknown');
    });

+    it('labels a browser on Puter\'s own Web Push as a browser', async () => {
+        serve({
+            'GET /push/devices': { devices: [device({ uid: 'a', platform: 'webpush' }), device({ uid: 'b', platform: 'ios' })] },
+            'GET /push/apps': { apps: [] },
+            'GET /push/preferences': { puter: true },
+        });
+        await open();
+
+        const $cards = $('.push-device-card');
+        expect($cards.eq(0).find('.dashboard-settings-card-info > span').text()).toContain('push_platform_web');
+        // Laptop, not phone.
+        expect($cards.eq(0).find('svg rect').attr('width')).toBe('18');
+        expect($cards.eq(1).find('svg rect').attr('width')).toBe('12');
+    });
+
    it('removes a device once the user confirms', async () => {
        const remove = vi.fn(() => reply(200, { removed: true }));
        serve({
@@ -522,6 +557,30 @@ describe('your devices', () => {
        expect(pushClient.browserPushOptedOut('u-1')).toBe(true);
    });

+    it('keeps this browser opted out when its push is off but the server removal fails', async () => {
+        const client = fakeClient({ permission: 'granted', registered: true, deviceUid: 'a' });
+        pushClient.registerPushClient(client);
+        serve({
+            'GET /push/devices': { devices: [device({ uid: 'a', current: true })] },
+            'GET /push/apps': { apps: [] },
+            'GET /push/preferences': { puter: true },
+            'DELETE /push/devices/a': () => reply(500, {}),
+        });
+        await open();
+        client.disable.mockImplementation(async () => {
+            client.status.mockResolvedValue({ permission: 'granted', registered: false });
+        });
+
+        $('.push-remove-device[data-uid="a"]').trigger('click');
+        await settle();
+        dialogButton('push_device_remove').trigger('click');
+        await settle();
+
+        expect(dialog('.dashboard-dialog-message').text()).toContain('push_device_remove_failed');
+        expect(pushClient.browserPushOptedOut('u-1')).toBe(true);
+        expect(browserCard().hasClass('push-browser-off')).toBe(true);
+    });
+
    it('still removes this browser on the server when it has no local record', async () => {
        const client = fakeClient({ permission: 'granted', registered: false });
        pushClient.registerPushClient(client);
@@ -548,6 +607,36 @@ describe('your devices', () => {
        expect($('.push-device-card')).toHaveLength(0);
    });

+    it('does not bring back a removed device when an older listing lands after the removal', async () => {
+        const both = [device({ uid: 'a' }), device({ uid: 'b', label: 'Phone' })];
+        let releaseListing;
+        let deferred = false;
+        serve({
+            'GET /push/devices': () => (deferred
+                ? new Promise(resolve => { releaseListing = () => resolve(reply(200, { devices: both })); })
+                : reply(200, { devices: both })),
+            'GET /push/apps': { apps: [] },
+            'GET /push/preferences': { puter: true },
+            'DELETE /push/devices/b': () => reply(200, { removed: true }),
+        });
+        await open();
+        // Coming back to the tab starts a listing that is slow to answer.
+        deferred = true;
+        void tab.onActivate($('.win'));
+        await settle();
+
+        $('.push-remove-device[data-uid="b"]').trigger('click');
+        await settle();
+        dialogButton('push_device_remove').trigger('click');
+        await settle();
+        expect($('.push-remove-device[data-uid="b"]')).toHaveLength(0);
+
+        releaseListing();
+        await settle();
+        expect($('.push-remove-device[data-uid="b"]')).toHaveLength(0);
+        expect($('.push-device-card')).toHaveLength(1);
+    });
+
    it('removes another device with the server alone', async () => {
        const client = fakeClient({ permission: 'granted', registered: true, deviceUid: 'a' });
        pushClient.registerPushClient(client);
@@ -17,7 +17,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { formatCredits, formatDollarsFromMicrocents, usageIsCredits } from './credits.js';
+import { formatCount, formatCredits, formatDollarsFromMicrocents, usageIsCredits } from './credits.js';
 import { isOrgSeat } from './orgSeat.js';
 import { addonCreditsRemaining, meterPercent, monthlyUsageOrThrow, usageBudget } from './usageBudget.js';
 import { getMonthlyUsage, getStorageSpace } from './usageRequests.js';
@@ -281,7 +281,7 @@ function renderUsageTable () {
    for ( const row of rowsToShow ) {
        h += `
        <tr>
-            <td>${window.html_encode(row.resource.replaceAll('_dot_', '.'))}</td>
+            <td title="${window.html_encode(row.resource.replaceAll('_dot_', '.'))}">${window.html_encode(row.resource.replaceAll('_dot_', '.'))}</td>
            <td>${row.formattedUnits}</td>
            <td>${row.formattedCost}</td>
        </tr>`;
@@ -351,7 +351,7 @@ async function update_usage_details ($el_window) {
            if ( key.endsWith(':bytes') ) {
                formattedUnits = window.byte_format(rawUnits);
            } else {
-                formattedUnits = window.number_format(rawUnits, { decimals: 0, thousandSeparator: ',' });
+                formattedUnits = formatCount(rawUnits);
            }

            usageTableData.push({
@@ -24,10 +24,10 @@ import UIContextMenu from '../UIContextMenu.js';
 import UIAlert from '../UIAlert.js';
 import UIWindowSaveAccount from '../UIWindowSaveAccount.js';
 import UIAuthLogin from '../Auth/UIAuthLogin.js';
-import UIWindowFeedback from '../UIWindowFeedback.js';
 import apply_item_added_to_containers from '../../helpers/applyItemAddedToContainers.js';
 import { clear_shared_param } from '../../helpers/parseSharedPath.js';
 import UIDashboardNotifications from './UIDashboardNotifications.js';
+import UIDashboardContactDialog from './UIDashboardContactDialog.js';
 import {
    answerNotificationReceipts,
    notificationSocketAcks,
@@ -548,12 +548,13 @@ async function UIDashboard (options) {
        const filePath = route.path;
        notifications.close({ restoreFocus: false });
        // What was open over the tab being left goes with it, as on a
-        // sidebar click: the phone drawer, a menu, and Files' Share and
+        // sidebar click: the phone drawer, a menu, Files' Share and
        // Properties, which act on its rows (their changes are already saved),
-        // and its image preview.
+        // its image preview, and a dialog or the photo crop, each through its
+        // own close button.
        setMobileSidebar(false);
        $('.context-menu').remove();
-        $el_window.find('.share-modal-close, .item-props-close').trigger('click');
+        $el_window.find('.share-modal-close, .item-props-close, .dashboard-dialog-overlay .dashboard-dialog-close, .profile-crop-close').trigger('click');
        if ( tab !== 'files' && TabFiles.previewOpen ) TabFiles.closeImagePreview();

        // Switch to correct tab
@@ -900,16 +901,8 @@ async function UIDashboard (options) {
            // Contact Us
            {
                html: i18n('contact_us'),
-                onClick: async function () {
-                    UIWindowFeedback({
-                        window_options: {
-                            backdrop: true,
-                            close_on_backdrop_click: true,
-                            parent_center: true,
-                            stay_on_top: true,
-                            has_head: false,
-                        },
-                    });
+                onClick: function () {
+                    UIDashboardContactDialog({ $container: $el_window, returnFocusTo: $btn.get(0) });
                },
            },
            '-',
@@ -0,0 +1,277 @@
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+// The dashboard's Contact Us form: a dashboard form dialog with screenshots
+// and screen recordings attached by picking, dropping or pasting them. The
+// desktop keeps UIWindowFeedback.
+
+import {
+    ATTACHMENT_ACCEPT_ATTRIBUTE,
+    MAX_ATTACHMENTS,
+    MAX_ATTACHMENT_BYTES,
+    MAX_TOTAL_ATTACHMENT_BYTES,
+    checkAttachment,
+} from '../../helpers/contact_attachments.js';
+import { isTouchPrimaryDevice } from './ContextMenu/ContextMenu.js';
+import { ICONS, SVG } from './UIDashboardDialog.js';
+import UIDashboardFormDialog from './UIDashboardFormDialog.js';
+
+const MB = 1024 * 1024;
+
+// Keep in sync with SystemController on the backend.
+const MESSAGE_MAX_LENGTH = 100_000;
+
+// Numbers interpolated into each error message, taken from the enforced limits.
+const ERROR_VALUES = {
+    contact_us_attachment_too_many: [MAX_ATTACHMENTS],
+    contact_us_attachment_too_large: [MAX_ATTACHMENT_BYTES / MB],
+    contact_us_attachment_total_too_large: [MAX_TOTAL_ATTACHMENT_BYTES / MB],
+};
+
+const CONTACT_ICONS = {
+    attach: SVG('<path d="M21.4 11.1l-9.2 9.2a6 6 0 0 1-8.5-8.5l9.2-9.2a4 4 0 0 1 5.7 5.7l-9.2 9.2a2 2 0 0 1-2.8-2.8l8.5-8.5"/>'),
+    video: SVG('<rect x="2" y="5" width="14" height="14" rx="2"/><path d="M16 10l6-3.5v11L16 14"/>'),
+};
+
+const t = (key, values = []) => i18n(key, values, false);
+
+/**
+ * Whether a drag carries files, rather than text or a link from the page.
+ *
+ * @param {DragEvent} e
+ * @returns {boolean}
+ */
+const dragHasFiles = (e) => Array.from(e.originalEvent?.dataTransfer?.types ?? []).includes('Files');
+
+/**
+ * @param {File} file
+ * @returns {string}
+ */
+const attachmentHtml = (file) => {
+    const name = html_encode(file.name);
+    // The preview's URL is let go once it has drawn; the <img> keeps the pixels.
+    const thumb = file.type.startsWith('image/')
+        ? `<img src="${html_encode(URL.createObjectURL(file))}" alt="" draggable="false">`
+        : CONTACT_ICONS.video;
+    const remove = html_encode(t('contact_us_attachment_remove_named', [file.name]));
+    return '<li class="dashboard-contact-file">'
+        + `<span class="dashboard-contact-file-thumb" aria-hidden="true">${thumb}</span>`
+        + '<span class="dashboard-contact-file-text">'
+        + `<span class="dashboard-contact-file-name" title="${name}">${name}</span>`
+        + `<span class="dashboard-contact-file-size">${html_encode(window.byte_format(file.size))}</span>`
+        + '</span>'
+        + `<button type="button" class="dashboard-contact-file-remove" aria-label="${remove}" title="${i18n('contact_us_attachment_remove')}">${ICONS.close}</button>`
+        + '</li>';
+};
+
+/**
+ * Opens the Contact Us form; the message goes to support, with any
+ * attachments as multipart form data. The checks here only fail fast: the
+ * server enforces the limits.
+ *
+ * @param {object} [opts]
+ * @param {jQuery} [opts.$container] Where the overlay mounts.
+ * @param {HTMLElement} [opts.returnFocusTo] Where focus goes on close.
+ * @returns {import('./UIDashboardFormDialog.js').FormDialog}
+ */
+export default function UIDashboardContactDialog ({ $container, returnFocusTo } = {}) {
+    /** @type {File[]} */
+    const attachments = [];
+    let sending = false;
+    // Once sent, the form is gone and a drop or paste has nothing to join.
+    let sent = false;
+
+    const dialog = UIDashboardFormDialog({
+        $container,
+        returnFocusTo,
+        title: t('contact_us'),
+        intro: `<p>${i18n('feedback_c2a')}</p>`,
+        submitLabel: t('send'),
+        fields: [{
+            name: 'message',
+            type: 'textarea',
+            label: i18n('contact_us_message'),
+            placeholder: i18n('contact_us_message_placeholder'),
+            attrs: { rows: 6, maxlength: MESSAGE_MAX_LENGTH },
+        }],
+        async onSubmit () {
+            const { message } = dialog.values();
+            if ( ! message.trim() ) {
+                dialog.setStatus(t('contact_us_message_required'), { field: 'message' });
+                return;
+            }
+
+            setSending(true);
+            try {
+                const body = new FormData();
+                body.append('message', message);
+                for ( const file of attachments ) body.append('attachments', file, file.name);
+
+                // No Content-Type: the browser sets it with the boundary.
+                const resp = await fetch(`${window.api_origin}/contactUs`, {
+                    method: 'POST',
+                    headers: { Authorization: `Bearer ${window.auth_token}` },
+                    body,
+                });
+                if ( ! resp.ok ) {
+                    dialog.setStatus(t(resp.status === 429 ? 'contact_us_rate_limited' : 'contact_us_error'));
+                    return;
+                }
+                sent = true;
+                dialog.finish({ message: t('feedback_sent_confirmation') });
+            } catch ( err ) {
+                console.error('contact-us: submit failed', err);
+                dialog.setStatus(t('contact_us_error'));
+            } finally {
+                setSending(false);
+            }
+        },
+    });
+
+    const { $dialog } = dialog;
+    const $overlay = $dialog.parent();
+    const hint_id = `${$dialog.attr('aria-labelledby')}-attach-hint`;
+
+    let h = '<div class="dashboard-contact-attachments">';
+    h += `<input type="file" class="dashboard-contact-file-input" accept="${html_encode(ATTACHMENT_ACCEPT_ATTRIBUTE)}" multiple hidden tabindex="-1">`;
+    h += `<button type="button" class="dashboard-contact-dropzone" aria-describedby="${hint_id}">`;
+    h += `<span class="dashboard-contact-dropzone-icon" aria-hidden="true">${CONTACT_ICONS.attach}</span>`;
+    h += '<span class="dashboard-contact-dropzone-text">';
+    h += `<span class="dashboard-contact-dropzone-label">${i18n(isTouchPrimaryDevice() ? 'contact_us_attach' : 'contact_us_attach_or_drop')}</span>`;
+    h += `<span class="dashboard-contact-dropzone-drop" aria-hidden="true">${i18n('contact_us_drop_to_attach')}</span>`;
+    h += `<span class="dashboard-contact-dropzone-hint" id="${hint_id}">${i18n('contact_us_attach_hint', [MAX_ATTACHMENTS, MAX_ATTACHMENT_BYTES / MB])}</span>`;
+    h += '</span>';
+    h += '</button>';
+    h += `<ul class="dashboard-contact-files" aria-label="${i18n('contact_us_attachments')}" hidden></ul>`;
+    h += '</div>';
+    $dialog.addClass('dashboard-contact-dialog')
+        .find('.dashboard-form-field[data-field="message"]').after(h);
+
+    const $dropzone = $dialog.find('.dashboard-contact-dropzone');
+    const $fileInput = $dialog.find('.dashboard-contact-file-input');
+    const $list = $dialog.find('.dashboard-contact-files');
+
+    const syncControls = () => {
+        $list.prop('hidden', attachments.length === 0);
+        // Nothing left to add once the count cap is reached.
+        $dropzone.prop('disabled', sending || attachments.length >= MAX_ATTACHMENTS);
+        $list.find('.dashboard-contact-file-remove').prop('disabled', sending);
+    };
+
+    function setSending (value) {
+        sending = value;
+        $dialog.toggleClass('dashboard-contact-sending', value);
+        syncControls();
+    }
+
+    /** @param {File[]} files */
+    const addFiles = (files) => {
+        if ( sending || sent || ! files.length ) return;
+        let rejection = null;
+        for ( const file of files ) {
+            const verdict = checkAttachment(file, attachments);
+            if ( ! verdict.ok ) {
+                // Report the first rejection but keep the files that fit.
+                rejection = rejection ?? verdict.error;
+                continue;
+            }
+            attachments.push(file);
+            const $item = $(attachmentHtml(file));
+            $item.find('img').one('load error', function () {
+                URL.revokeObjectURL(this.src);
+            });
+            $list.append($item);
+        }
+        dialog.setStatus(rejection ? t(rejection, ERROR_VALUES[rejection] ?? []) : '');
+        syncControls();
+    };
+
+    $dropzone.on('click', () => $fileInput.trigger('click'));
+    $fileInput.on('change', function () {
+        addFiles(Array.from(this.files ?? []));
+        // Reset so re-picking the same file fires `change` again.
+        this.value = '';
+    });
+
+    $list.on('click', '.dashboard-contact-file-remove', function () {
+        if ( sending ) return;
+        const $item = $(this).closest('.dashboard-contact-file');
+        const index = $list.children().index($item);
+        attachments.splice(index, 1);
+        // Focus stays in the list rather than falling back to the page.
+        const $next = $item.next().length ? $item.next() : $item.prev();
+        $item.remove();
+        dialog.setStatus('');
+        syncControls();
+        ($next.length ? $next.find('.dashboard-contact-file-remove') : $dropzone).get(0)?.focus({ preventScroll: true });
+    });
+
+    // The whole overlay takes the drop, and keeps it from the window under it.
+    let drag_depth = 0;
+    const endDrag = () => {
+        drag_depth = 0;
+        $dialog.removeClass('dashboard-contact-dragging');
+    };
+    $overlay.on('dragenter', (e) => {
+        if ( ! dragHasFiles(e) ) return;
+        e.preventDefault();
+        e.stopPropagation();
+        drag_depth++;
+        if ( ! sending && ! sent ) $dialog.addClass('dashboard-contact-dragging');
+    });
+    $overlay.on('dragover', (e) => {
+        if ( ! dragHasFiles(e) ) return;
+        e.preventDefault();
+        e.stopPropagation();
+        e.originalEvent.dataTransfer.dropEffect = sending || sent ? 'none' : 'copy';
+    });
+    $overlay.on('dragleave', (e) => {
+        // Matched to the dragenters counted, whatever this one says it carries.
+        if ( drag_depth === 0 ) return;
+        e.stopPropagation();
+        if ( --drag_depth <= 0 ) endDrag();
+    });
+    $overlay.on('drop', (e) => {
+        if ( ! dragHasFiles(e) ) return;
+        e.preventDefault();
+        e.stopPropagation();
+        endDrag();
+        addFiles(Array.from(e.originalEvent.dataTransfer.files ?? []));
+    });
+
+    // A screenshot pasted into the message is attached to it.
+    $dialog.on('paste', '.dashboard-form-input[name="message"]', (e) => {
+        const clipboard = e.originalEvent?.clipboardData;
+        const files = Array.from(clipboard?.files ?? []);
+        if ( ! files.length ) return;
+        // Some apps put the image's name or markup alongside it; that text still pastes.
+        if ( ! clipboard.getData('text/plain') ) e.preventDefault();
+        addFiles(files);
+    });
+
+    // Enter alone is a new line in the message; with Cmd or Ctrl, it sends.
+    $dialog.on('keydown', '.dashboard-form-input[name="message"]', (e) => {
+        if ( e.key !== 'Enter' || ! (e.metaKey || e.ctrlKey) ) return;
+        e.preventDefault();
+        $dialog.trigger('submit');
+    });
+
+    syncControls();
+    return dialog;
+}
@@ -0,0 +1,255 @@
+// @vitest-environment jsdom
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import jQuery from '../../lib/jquery-3.6.1/jquery-3.6.1.min.js';
+import { MAX_ATTACHMENTS } from '../../helpers/contact_attachments.js';
+
+globalThis.$ = jQuery;
+globalThis.jQuery = jQuery;
+globalThis.i18n = (key, values = []) => [key, ...values].join(' ');
+globalThis.html_encode = (value) => String(value ?? '')
+    .replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+window.html_encode = globalThis.html_encode;
+window.requestAnimationFrame = (fn) => setTimeout(fn, 0);
+window.matchMedia = () => ({ matches: false });
+window.byte_format = (bytes) => `${bytes} B`;
+URL.createObjectURL = vi.fn(() => 'blob:preview');
+URL.revokeObjectURL = vi.fn();
+
+const { default: UIDashboardContactDialog } = await import('./UIDashboardContactDialog.js');
+
+const settle = async () => {
+    for ( let i = 0; i < 10; i++ ) await new Promise(resolve => setTimeout(resolve, 0));
+};
+const message = () => $('.dashboard-form-input[name="message"]');
+const status = () => $('.dashboard-form-status').text();
+const fileNames = () => $('.dashboard-contact-file-name').map((_, el) => el.textContent).get();
+const png = (name = 'shot.png', size = 1024) => new File([new Uint8Array(size)], name, { type: 'image/png' });
+const mp4 = (name = 'clip.mp4') => new File([new Uint8Array(2048)], name, { type: 'video/mp4' });
+
+/** Picks files through the hidden file input, as the system picker would. */
+const pick = (...files) => {
+    const input = $('.dashboard-contact-file-input').get(0);
+    Object.defineProperty(input, 'files', { value: files, configurable: true });
+    $(input).trigger('change');
+};
+
+/** A native-event stand-in for jQuery to wrap, carrying `fields`. */
+const nativeEvent = (fields) => ({ preventDefault () {}, stopPropagation () {}, ...fields });
+
+/** A file drag event carrying `files`, as the browser sends it. */
+const fileDrag = (type, files = []) => $.Event(type, {
+    originalEvent: nativeEvent({ dataTransfer: { types: ['Files'], files, dropEffect: 'none' } }),
+});
+
+const submit = async () => {
+    $('.dashboard-form-dialog').trigger('submit');
+    await settle();
+};
+
+beforeEach(() => {
+    document.body.innerHTML = '';
+    globalThis.fetch = vi.fn(async () => new Response('{}', { status: 200 }));
+    window.api_origin = 'https://api.puter.test';
+    window.auth_token = 'tok-1';
+});
+
+describe('Contact Us dialog', () => {
+    it('opens as a dashboard form dialog with no attachments listed', () => {
+        UIDashboardContactDialog();
+        expect($('.dashboard-dialog-overlay .dashboard-contact-dialog').length).toBe(1);
+        expect(message().length).toBe(1);
+        expect($('.dashboard-contact-files').prop('hidden')).toBe(true);
+    });
+
+    it('asks for a message before sending', async () => {
+        UIDashboardContactDialog();
+        message().val('   ');
+        await submit();
+        expect(fetch).not.toHaveBeenCalled();
+        expect(status()).toBe('contact_us_message_required');
+        expect(message().attr('aria-invalid')).toBe('true');
+    });
+
+    it('posts the message and attachments as multipart and confirms', async () => {
+        UIDashboardContactDialog();
+        pick(png(), mp4());
+        message().val('It broke');
+        await submit();
+
+        const [url, init] = fetch.mock.calls[0];
+        expect(url).toBe('https://api.puter.test/contactUs');
+        expect(init.headers).toEqual({ Authorization: 'Bearer tok-1' });
+        expect(init.body.get('message')).toBe('It broke');
+        expect(init.body.getAll('attachments').map(f => f.name)).toEqual(['shot.png', 'clip.mp4']);
+        expect($('.dashboard-form-done').text()).toContain('feedback_sent_confirmation');
+        expect($('.dashboard-contact-attachments').length).toBe(0);
+    });
+
+    it('says when the sender is rate limited and keeps the form', async () => {
+        fetch.mockResolvedValueOnce(new Response('{}', { status: 429 }));
+        UIDashboardContactDialog();
+        message().val('Hello');
+        await submit();
+        expect(status()).toBe('contact_us_rate_limited');
+        expect(message().val()).toBe('Hello');
+        expect(message().prop('disabled')).toBe(false);
+    });
+
+    it('shows a generic error when the request fails', async () => {
+        fetch.mockRejectedValueOnce(new TypeError('offline'));
+        vi.spyOn(console, 'error').mockImplementation(() => {});
+        UIDashboardContactDialog();
+        message().val('Hello');
+        await submit();
+        expect(status()).toBe('contact_us_error');
+    });
+
+    it('locks the attachments while sending', async () => {
+        let respond;
+        fetch.mockReturnValueOnce(new Promise(resolve => {
+            respond = resolve;
+        }));
+        UIDashboardContactDialog();
+        pick(png());
+        message().val('Hello');
+        $('.dashboard-form-dialog').trigger('submit');
+        await settle();
+
+        expect($('.dashboard-contact-dropzone').prop('disabled')).toBe(true);
+        expect($('.dashboard-contact-file-remove').prop('disabled')).toBe(true);
+        pick(png('late.png'));
+        expect(fileNames()).toEqual(['shot.png']);
+
+        respond(new Response('{}', { status: 500 }));
+        await settle();
+        expect($('.dashboard-contact-dropzone').prop('disabled')).toBe(false);
+        expect($('.dashboard-contact-file-remove').prop('disabled')).toBe(false);
+    });
+});
+
+describe('attachments', () => {
+    it('lists picked files with a preview for images', () => {
+        UIDashboardContactDialog();
+        pick(png('a.png'), mp4('b.mp4'));
+        expect(fileNames()).toEqual(['a.png', 'b.mp4']);
+        expect($('.dashboard-contact-files').prop('hidden')).toBe(false);
+        expect($('.dashboard-contact-file').eq(0).find('img').attr('src')).toBe('blob:preview');
+        expect($('.dashboard-contact-file').eq(1).find('img').length).toBe(0);
+        expect($('.dashboard-contact-file-remove').eq(0).attr('aria-label')).toBe('contact_us_attachment_remove_named a.png');
+    });
+
+    it('keeps the files that fit and reports the first rejection', () => {
+        UIDashboardContactDialog();
+        const text = new File(['x'], 'notes.txt', { type: 'text/plain' });
+        pick(png('a.png'), text, png('b.png'));
+        expect(fileNames()).toEqual(['a.png', 'b.png']);
+        expect(status()).toBe('contact_us_attachment_unsupported');
+    });
+
+    it('stops offering to attach once the count cap is reached', () => {
+        UIDashboardContactDialog();
+        pick(...Array.from({ length: MAX_ATTACHMENTS }, (_, i) => png(`${i}.png`)));
+        expect($('.dashboard-contact-dropzone').prop('disabled')).toBe(true);
+        pick(png('extra.png'));
+        expect(fileNames()).toHaveLength(MAX_ATTACHMENTS);
+        expect(status()).toBe(`contact_us_attachment_too_many ${MAX_ATTACHMENTS}`);
+    });
+
+    it('removes the file whose button is pressed and moves focus to the next one', async () => {
+        UIDashboardContactDialog();
+        pick(png('a.png'), png('b.png'), png('c.png'));
+        $('.dashboard-contact-file-remove').eq(1).trigger('click');
+        expect(fileNames()).toEqual(['a.png', 'c.png']);
+        expect(document.activeElement).toBe($('.dashboard-contact-file-remove').get(1));
+
+        message().val('Hello');
+        await submit();
+        expect(fetch.mock.calls[0][1].body.getAll('attachments').map(f => f.name)).toEqual(['a.png', 'c.png']);
+    });
+
+    it('returns focus to the attach button when the last file is removed', () => {
+        UIDashboardContactDialog();
+        pick(png());
+        $('.dashboard-contact-file-remove').trigger('click');
+        expect($('.dashboard-contact-files').prop('hidden')).toBe(true);
+        expect(document.activeElement).toBe($('.dashboard-contact-dropzone').get(0));
+    });
+
+    it('takes files dropped anywhere on the overlay, without letting the drop through', () => {
+        const onWindowDrop = vi.fn();
+        const $win = $('<div class="window"></div>').appendTo('body').on('drop', onWindowDrop);
+        UIDashboardContactDialog({ $container: $win });
+        const $overlay = $('.dashboard-dialog-overlay');
+
+        $overlay.trigger(fileDrag('dragenter'));
+        expect($('.dashboard-contact-dialog').hasClass('dashboard-contact-dragging')).toBe(true);
+        const drop = fileDrag('drop', [png('dropped.png')]);
+        $overlay.trigger(drop);
+
+        expect(drop.isDefaultPrevented()).toBe(true);
+        expect(onWindowDrop).not.toHaveBeenCalled();
+        expect(fileNames()).toEqual(['dropped.png']);
+        expect($('.dashboard-contact-dialog').hasClass('dashboard-contact-dragging')).toBe(false);
+    });
+
+    it('clears the drop highlight when the drag leaves', () => {
+        UIDashboardContactDialog();
+        const $overlay = $('.dashboard-dialog-overlay');
+        $overlay.trigger(fileDrag('dragenter'));
+        $overlay.find('.dashboard-contact-dropzone').trigger(fileDrag('dragenter'));
+        $overlay.find('.dashboard-contact-dropzone').trigger($.Event('dragleave', { originalEvent: nativeEvent({}) }));
+        expect($('.dashboard-contact-dialog').hasClass('dashboard-contact-dragging')).toBe(true);
+        $overlay.trigger($.Event('dragleave', { originalEvent: nativeEvent({}) }));
+        expect($('.dashboard-contact-dialog').hasClass('dashboard-contact-dragging')).toBe(false);
+    });
+
+    it('ignores drags that carry no files', () => {
+        UIDashboardContactDialog();
+        const drag = $.Event('dragenter', { originalEvent: nativeEvent({ dataTransfer: { types: ['text/plain'] } }) });
+        $('.dashboard-dialog-overlay').trigger(drag);
+        expect(drag.isDefaultPrevented()).toBe(false);
+        expect($('.dashboard-contact-dialog').hasClass('dashboard-contact-dragging')).toBe(false);
+    });
+
+    it('attaches an image pasted into the message', () => {
+        UIDashboardContactDialog();
+        const paste = $.Event('paste', {
+            originalEvent: nativeEvent({ clipboardData: { files: [png('pasted.png')], getData: () => '' } }),
+        });
+        message().trigger(paste);
+        expect(fileNames()).toEqual(['pasted.png']);
+        expect(paste.isDefaultPrevented()).toBe(true);
+    });
+});
+
+describe('keyboard', () => {
+    it('sends on Cmd/Ctrl+Enter but not on Enter alone', async () => {
+        UIDashboardContactDialog();
+        message().val('Hello');
+        message().trigger($.Event('keydown', { key: 'Enter' }));
+        await settle();
+        expect(fetch).not.toHaveBeenCalled();
+
+        message().trigger($.Event('keydown', { key: 'Enter', ctrlKey: true }));
+        await settle();
+        expect(fetch).toHaveBeenCalledTimes(1);
+    });
+});
@@ -33,6 +33,7 @@ import { startPushWorker } from '../../helpers/pushWorker.js';
 import { syncBrowserPush } from '../../helpers/pushSync.js';
 import { get_app_by_uid } from '../../helpers/getAppByUid.js';
 import launch_app from '../../helpers/launchApp.js';
+import { runLimited } from '../../helpers/runLimited.js';
 import {
    badgeLabel,
    glyphKey,
@@ -46,6 +47,7 @@ import {
    senderNameFor,
    setReadAt,
    takeMarksSince,
+    titleBadge,
    titleWithBadge,
    toEntry,
    unreadCount,
@@ -144,27 +146,6 @@ const whenFilesIdle = async (filesTab, timeoutMs = 4_000) => {
    }
 };

-/**
- * Run `task` over `items`, at most `limit` at a time. Resolves to the items
- * whose task rejected.
- */
-const runLimited = async (items, limit, task) => {
-    const failed = [];
-    let index = 0;
-    const worker = async () => {
-        while ( index < items.length ) {
-            const item = items[index++];
-            try {
-                await task(item);
-            } catch {
-                failed.push(item);
-            }
-        }
-    };
-    await Promise.all(Array.from({ length: Math.min(limit, items.length) }, worker));
-    return failed;
-};
-
 /**
 * The dashboard's notification center: a bell in the sidebar with the unread
 * count, a panel listing the most recent notifications read or not, and
@@ -360,7 +341,26 @@ export default function UIDashboardNotifications ({ $el_window, socket }) {
        target.focus({ preventScroll: true });
    };

+    // The badge last put in front of the title, the only prefix replaced.
+    let appliedBadge = '';
+    const applyTitleBadge = () => {
+        const count = unreadCount(entries);
+        const wanted = titleWithBadge(document.title, count, appliedBadge);
+        appliedBadge = titleBadge(count);
+        if ( document.title !== wanted ) document.title = wanted;
+    };
+
+    // Changes made in other tabs arrive one socket event per notification
+    // (Mark all read there sends one ack each), so they redraw once a beat.
+    // Not a frame: a hidden tab's title still carries the count.
+    let renderTimer = null;
+    const scheduleRender = () => {
+        renderTimer ??= setTimeout(render, 50);
+    };
+
    const render = () => {
+        clearTimeout(renderTimer);
+        renderTimer = null;
        const hadFocus = $panel[0].contains(document.activeElement);
        const count = unreadCount(entries);
        const label = badgeLabel(count);
@@ -373,7 +373,7 @@ export default function UIDashboardNotifications ({ $el_window, socket }) {
        $sidebarToggle.toggleClass('has-unread', count > 0);
        $count.text(label);
        $markAll.attr('hidden', count > 0 ? null : '');
-        document.title = titleWithBadge(document.title, count);
+        applyTitleBadge();

        const showLoading = ! loaded && loading !== null;
        const showError = ! loaded && loadFailed && loading === null;
@@ -582,9 +582,12 @@ export default function UIDashboardNotifications ({ $el_window, socket }) {
            timeout: TOAST_TIMEOUT_MS,
            // With nothing to open on the dashboard, a click only dismisses;
            // it mustn't send the apps the user is working in away.
+            // A regrouped notification rewrites the toast under the same uid,
+            // so a click acts on what it says now.
            click: () => {
-                if ( notificationTarget(notification) === null ) void markRead(entry.uid);
-                else void reveal_dashboard().then(() => actOn(entry));
+                const current = entries.find((e) => e.uid === entry.uid) ?? entry;
+                if ( notificationTarget(current.notification) === null ) void markRead(current.uid);
+                else void reveal_dashboard().then(() => actOn(current));
            },
            // The ✕ is a dismissal; timing out is not, so `close` alone acks.
            close: () => void markRead(entry.uid),
@@ -798,10 +801,8 @@ export default function UIDashboardNotifications ({ $el_window, socket }) {
    // same title again is a no-op, so this can't loop.
    const titleEl = document.querySelector('title');
    if ( titleEl ) {
-        new MutationObserver(() => {
-            const wanted = titleWithBadge(document.title, unreadCount(entries));
-            if ( document.title !== wanted ) document.title = wanted;
-        }).observe(titleEl, { childList: true, characterData: true, subtree: true });
+        new MutationObserver(applyTitleBadge)
+            .observe(titleEl, { childList: true, characterData: true, subtree: true });
    }

    // -- Arrivals -----------------------------------------------------------------
@@ -840,7 +841,7 @@ export default function UIDashboardNotifications ({ $el_window, socket }) {
        acked.set(uid, now);
        if ( ! entries.some((e) => e.uid === uid && isUnread(e)) ) return;
        entries = setReadAt(entries, uid, now);
-        render();
+        scheduleRender();
    });
    // Removed in another tab. Not gated, for the same reason as the ack.
    socket.on('notif.removed', ({ uid }) => {
@@ -848,7 +849,7 @@ export default function UIDashboardNotifications ({ $el_window, socket }) {
        removed.set(uid, Date.now());
        const listed = entries.some((e) => e.uid === uid);
        dropEntry(uid);
-        if ( listed ) render();
+        if ( listed ) scheduleRender();
    });
    // Every (re)connection: anything read elsewhere while this tab was
    // offline is marked so in the server's list, and anything new is in it.
@@ -291,10 +291,24 @@ export default function UIItemPropertiesModal ({ name, path: item_path, uid, $co
                const $link = $(this);
                if ( $link.prop('disabled') ) return;
                $link.prop('disabled', true);
-                puter.hosting.update($link.attr('data-subdomain'), null).then(() => {
+                const subdomain = $link.attr('data-subdomain');
+                puter.hosting.update(subdomain, null).then(() => {
                    const $entry = $link.closest('.item-props-website-entry');
                    const $row = $entry.closest('.item-props-row');
                    $entry.remove();
+                    // Rows inside the folder carry addresses under the site:
+                    // work them out again without it (another site may still
+                    // serve them).
+                    if ( Array.isArray(window.sites) ) {
+                        window.sites = window.sites.filter((site) => site.subdomain !== subdomain);
+                    }
+                    $('.item').each(function () {
+                        const path = this.dataset.path ?? '';
+                        if ( ! path.startsWith(`${item_path}/`) ) return;
+                        const url = window.determine_website_url?.(path) || '';
+                        $(this).attr('data-website_url', url)
+                            .find('.item-has-website-url-badge').css('display', url ? 'block' : 'none');
+                    });
                    // The focused button just left the DOM; keep focus in the dialog.
                    el_modal.focus({ preventScroll: true });
                    if ( $row.find('.item-props-website-entry').length > 0 ) return;
@@ -68,4 +68,40 @@ describe('UIItemPropertiesModal', () => {
        expect(window.update_sites_cache).toHaveBeenCalled();
        expect(puter._cache.del).toHaveBeenCalledWith('readdir:/alice');
    });
+
+    it('takes the site address off rows inside the folder, keeping one another site serves', async () => {
+        const fsentry = { uid: 'u1', name: 'site', path: '/alice/site', is_dir: true, has_website: true };
+        $('<div class="item" data-uid="u1" data-has_website="1"><img class="item-has-website-badge"></div>')
+            .data('fsentry', fsentry).appendTo('body');
+        const child = (path, url) => $(`<div class="item" data-path="${path}" data-website_url="${url}"><img class="item-has-website-url-badge" style="display:block"></div>`).appendTo('body');
+        const $inside = child('/alice/site/a.txt', 'https://mysite.puter.site/a.txt');
+        const $nested = child('/alice/site/docs/b.txt', 'https://docs.puter.site/b.txt');
+        const site = (subdomain, path) => ({ subdomain, root_dir: { path, subdomains: [{ subdomain, address: `https://${subdomain}.puter.site` }] } });
+        window.sites = [site('mysite', '/alice/site'), site('docs', '/alice/site/docs')];
+        window.determine_website_url = (path) => {
+            const match = window.sites.find((s) => path.startsWith(`${s.root_dir.path}/`));
+            return match ? `https://${match.subdomain}.puter.site${path.slice(match.root_dir.path.length)}` : null;
+        };
+        window.extractSubdomain = () => 'mysite';
+        window.update_sites_cache = vi.fn();
+        globalThis.puter = {
+            fs: { stat: vi.fn(({ success }) => {
+                success({ ...fsentry, id: 'u1', modified: 1700000000, created: 1700000000, subdomains: [{ uuid: 's1', address: 'https://mysite.puter.site' }] });
+                return Promise.resolve();
+            }) },
+            hosting: { update: vi.fn(async () => ({})) },
+            fsCacheKey: (kind, path) => `${kind}:${path}`,
+            _cache: { del: vi.fn() },
+        };
+
+        UIItemPropertiesModal({ name: 'site', path: '/alice/site', uid: 'u1' });
+        await tick();
+        $('.item-props-disassociate').trigger('click');
+        await tick();
+
+        expect($inside.attr('data-website_url')).toBe('');
+        expect($inside.find('.item-has-website-url-badge').css('display')).toBe('none');
+        expect($nested.attr('data-website_url')).toBe('https://docs.puter.site/b.txt');
+        expect($nested.find('.item-has-website-url-badge').css('display')).toBe('block');
+    });
 });
@@ -17,13 +17,14 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-// The Files tab's publish flows, a folder as a website and a .js file as a
-// worker: dashboard form dialogs rather than desktop windows.
+// The Files tab's publish flows, a folder as a website (optionally on a
+// custom domain) and a .js file as a worker: dashboard form dialogs rather
+// than desktop windows.

 import ensure_can_publish from '../../helpers/ensureCanPublish.js';
 import forget_parent_listing from '../../helpers/forgetParentListing.js';
-import { SVG } from './UIDashboardDialog.js';
 import UIDashboardFormDialog, { copyRowHtml } from './UIDashboardFormDialog.js';
+import { openLinkHtml, publishDomainFields, setupPublishDomain } from './publishDomain.js';
 import { finalizePublishName, normalizePublishName, PUBLISH_NAME_RULES } from './publishName.js';

 /**
@@ -36,8 +37,6 @@ import { finalizePublishName, normalizePublishName, PUBLISH_NAME_RULES } from '.

 const t = (key) => i18n(key, [], false);

-const OPEN_ICON = SVG('<path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"/><path d="M15 3h6v6"/><path d="M10 14L21 3"/>');
-
 /** Rows showing `path` or anything under it, on the dashboard or the desktop. */
 const each_item_at = (path, fn) => $('.item').each(function () {
    const item_path = this.dataset.path ?? '';
@@ -54,6 +53,8 @@ const KINDS = {
        nameErrors: new Set(['conflict', 'subdomain_reserved']),
        suffix: () => `.${window.hosting_domain}`,
        requiresVerification: () => !! window.require_email_verification_to_publish_website,
+        extraFields: publishDomainFields,
+        setup: setupPublishDomain,
        async publish (name, path) {
            const site = await puter.hosting.create(name, path);
            // The server's address carries the deployment's real scheme (a
@@ -136,6 +137,11 @@ const open_publish_dialog = async (kind_name, { name, path, ...opts }) => {
    }];
    fields.push(...(kind.extraFields?.() ?? []));

+    /** Set once the site is live; a retry for a step after it skips publishing. */
+    let published = null;
+    /** @type {import('./publishDomain.js').PublishDomain | undefined} */
+    let extra;
+
    const dialog = UIDashboardFormDialog({
        ...opts,
        title: t(kind.title),
@@ -144,30 +150,52 @@ const open_publish_dialog = async (kind_name, { name, path, ...opts }) => {
        fields,
        async onSubmit () {
            const values = dialog.values();
-            const subdomain = finalizePublishName(values.name, kind.rule);
-            dialog.field('name').val(subdomain);
-            if ( ! subdomain ) {
-                dialog.setStatus(t('publish_name_required'), { field: 'name' });
-                return;
+            const hostname = extra?.prepare(!! published) ?? null;
+            if ( hostname === false ) return;
+            if ( ! published ) {
+                const subdomain = finalizePublishName(values.name, kind.rule);
+                dialog.field('name').val(subdomain);
+                if ( ! subdomain ) {
+                    dialog.setStatus(t('publish_name_required'), { field: 'name' });
+                    return;
+                }
+                let url;
+                try {
+                    url = await kind.publish(subdomain, path, values);
+                } catch ( err ) {
+                    const code = err?.error?.code ?? err?.code;
+                    dialog.setStatus(error_message(err), kind.nameErrors.has(code) ? { field: 'name' } : undefined);
+                    return;
+                }
+                kind.markPublished(path, url);
+                published = { name: subdomain, url };
+                // The address is taken now; what's left to retry is the domain.
+                dialog.field('name').prop('readOnly', true).attr('aria-readonly', 'true');
+                update_submit_label();
            }
-            let url;
-            try {
-                url = await kind.publish(subdomain, path, values);
-            } catch ( err ) {
-                const code = err?.error?.code ?? err?.code;
-                dialog.setStatus(error_message(err), kind.nameErrors.has(code) ? { field: 'name' } : undefined);
-                return;
-            }
-            kind.markPublished(path, url);
-            const open_link = `<a class="dashboard-dialog-btn dashboard-dialog-btn-quiet dashboard-icon-btn dashboard-publish-open" href="${html_encode(url)}"`
-                + ` target="_blank" rel="noopener noreferrer" aria-label="${i18n('open_in_new_tab')}" title="${i18n('open_in_new_tab')}">${OPEN_ICON}</a>`;
+            const domain = hostname ? await extra.attach(hostname, published) : null;
+            if ( hostname && ! domain ) return;
            dialog.finish({
                message: t(kind.published),
-                html: copyRowHtml({ value: url, label: t('publish_address'), compact: true, after: open_link }),
+                html: copyRowHtml({ value: published.url, label: t('publish_address'), compact: true, after: openLinkHtml(published.url) })
+                    + (domain ? extra.doneHtml(domain) : ''),
+                // The DNS records are shown only here.
+                keepOnBackdrop: !! domain,
            });
        },
    });

+    // Before the site is live the button publishes; after, it adds the domain.
+    const update_submit_label = () => {
+        let key = 'publish';
+        if ( published ) {
+            if ( extra?.claiming() ) key = 'custom_domain_verify_and_add';
+            else key = extra?.addable() ? 'custom_domain_add' : 'done';
+        }
+        dialog.$dialog.find('.dashboard-form-submit-label').text(t(key));
+    };
+    extra = kind.setup?.(dialog, { onChange: update_submit_label });
+
    // Shape the name as it's typed, keeping the caret where it was.
    const el_name = dialog.field('name').get(0);
    if ( document.activeElement === el_name ) el_name.select();
@@ -35,13 +35,59 @@ const { openPublishWebsiteDialog, openPublishWorkerDialog } = await import('./UI
 const { default: ensure_can_publish } = await import('../../helpers/ensureCanPublish.js');

 const settle = () => new Promise(resolve => setTimeout(resolve, 0));
+const flush = async () => {
+    for ( let i = 0; i < 5; i++ ) await settle();
+};
 const nameField = () => $('.dashboard-form-input[name="name"]');
 const status = () => $('.dashboard-form-status').text();

 const submitWith = async (name) => {
    if ( name !== undefined ) nameField().val(name);
    $('.dashboard-form-dialog').trigger('submit');
-    for ( let i = 0; i < 5; i++ ) await settle();
+    await flush();
+};
+
+const json = (code, data) => new Response(JSON.stringify(data), {
+    status: code,
+    headers: { 'Content-Type': 'application/json' },
+});
+
+/**
+ * Stands in for the `/custom-domains` API. The list call answers with
+ * `list`; anything else with its entry in `routes` (keyed `METHOD /path`),
+ * or a 404.
+ */
+const serveDomains = ({ list = { items: [], canAdd: true, pricing: { amount: 0.5, currency: 'USD' } }, routes = {} } = {}) => {
+    globalThis.fetch = vi.fn(async (url, opts = {}) => {
+        const key = `${opts.method ?? 'GET'} ${String(url).split('/custom-domains')[1]}`;
+        if ( key === 'GET ' ) return json(200, typeof list === 'function' ? list() : list);
+        return routes[key]?.(opts.body ? JSON.parse(opts.body) : undefined) ?? json(404, {});
+    });
+};
+const requests = (method) => fetch.mock.calls
+    .filter(([, opts = {}]) => (opts.method ?? 'GET') === method)
+    .map(([url, opts]) => ({ path: String(url).split('/custom-domains')[1], body: opts.body ? JSON.parse(opts.body) : undefined }));
+
+const pendingDomain = (overrides = {}) => ({
+    uuid: 'd1',
+    hostname: 'www.example.com',
+    site: 'my-site',
+    status: 'pending',
+    isApex: false,
+    records: [{ type: 'CNAME', name: 'www', value: 'my-site.puter.site', purpose: 'routing', required: true }],
+    ...overrides,
+});
+
+const domainSwitch = () => $('.dashboard-form-input[name="useDomain"]');
+const domainField = () => $('.dashboard-form-input[name="domain"]');
+const shown = (name) => $(`.dashboard-form-field[data-field="${name}"]`).prop('hidden') === false;
+const submitLabel = () => $('.dashboard-form-submit-label').text();
+const turnOnDomain = () => domainSwitch().prop('checked', true).trigger('change');
+
+/** Opens the website dialog and waits for the custom domain list. */
+const openWebsite = async () => {
+    await openPublishWebsiteDialog({ name: 'Site', path: '/alice/Site' });
+    await flush();
 };

 const addRow = (path) => {
@@ -59,6 +105,10 @@ beforeEach(() => {
    window.generate_identifier = () => 'clever-idea-42';
    window.update_sites_cache = vi.fn();
    window.require_email_verification_to_publish_website = false;
+    window.api_origin = 'https://api.puter.test';
+    delete window.UIUpgradeAccount;
+    // A Puter without custom domains, unless a test serves them.
+    globalThis.fetch = vi.fn(async () => json(404, {}));
    globalThis.puter = {
        fsCacheKey: (kind, path) => `${kind}:${path}`,
        _cache: { del: vi.fn() },
@@ -126,7 +176,7 @@ describe('publish website', () => {
        expect(nameField().val()).toBe('cafe');
    });

-        it('asks for an address when nothing usable was typed', async () => {
+    it('asks for an address when nothing usable was typed', async () => {
        await openPublishWebsiteDialog({ name: 'Site', path: '/alice/Site' });
        await submitWith('---');
        expect(status()).toBe('publish_name_required');
@@ -164,6 +214,358 @@ describe('publish website', () => {
    });
 });

+describe('publish website on a custom domain', () => {
+    it('leaves the option out where the server has no custom domains', async () => {
+        await openWebsite();
+        expect(shown('useDomain')).toBe(false);
+        expect(shown('domain')).toBe(false);
+        await submitWith('my-site');
+        expect(puter.hosting.create).toHaveBeenCalledWith('my-site', '/alice/Site');
+        expect(requests('POST')).toEqual([]);
+    });
+
+    it('asks for the domain once the switch is on, with what it costs', async () => {
+        serveDomains();
+        await openWebsite();
+        expect(shown('useDomain')).toBe(true);
+        expect(shown('domain')).toBe(false);
+
+        turnOnDomain();
+
+        expect(shown('domain')).toBe(true);
+        expect(document.activeElement).toBe(domainField().get(0));
+        expect($('.dashboard-form-field[data-field="domain"] .dashboard-form-hint').text())
+            .toBe('publish_custom_domain_dns_hint custom_domain_price_note');
+        expect($('.dashboard-publish-upsell').prop('hidden')).toBe(true);
+    });
+
+    it('publishes the site, adds the domain, and shows the records to set', async () => {
+        serveDomains({ routes: { 'POST ': () => json(201, pendingDomain()) } });
+        await openWebsite();
+        turnOnDomain();
+        domainField().val('https://WWW.Example.com/about');
+
+        await submitWith('my-site');
+
+        expect(puter.hosting.create).toHaveBeenCalledWith('my-site', '/alice/Site');
+        expect(requests('POST')).toEqual([{ path: '', body: { site: 'my-site', hostname: 'www.example.com' } }]);
+        expect($('.dashboard-form-done p').text()).toBe('website_published');
+        expect($('.dashboard-copy-value').first().val()).toBe('https://my-site.puter.site');
+        expect($('.dashboard-publish-domain-host').text()).toBe('www.example.com');
+        expect($('.dashboard-publish-domain-badge').attr('data-status')).toBe('pending');
+        expect($('.dashboard-dns-record-type').text()).toBe('CNAME');
+        expect($('.dashboard-dns-record .dashboard-copy-value').map((_, el) => el.value).get())
+            .toEqual(['www', 'my-site.puter.site']);
+    });
+
+    it('keeps the records up through a stray click outside the card', async () => {
+        serveDomains({ routes: { 'POST ': () => json(201, pendingDomain()) } });
+        await openWebsite();
+        turnOnDomain();
+        domainField().val('www.example.com');
+        await submitWith('my-site');
+
+        const $backdrop = $('.dashboard-dialog-overlay');
+        $backdrop.trigger('mousedown').trigger('click');
+        await flush();
+        expect($backdrop.hasClass('dashboard-dialog-show')).toBe(true);
+        expect($('.dashboard-dns-record')).toHaveLength(1);
+    });
+
+    it('checks the domain again and shows its address once connected', async () => {
+        serveDomains({
+            routes: {
+                'POST ': () => json(201, pendingDomain()),
+                'GET /d1': () => json(200, pendingDomain({ status: 'active', records: [] })),
+            },
+        });
+        await openWebsite();
+        turnOnDomain();
+        domainField().val('www.example.com');
+        await submitWith('my-site');
+
+        $('.dashboard-publish-domain-check').trigger('click');
+        await flush();
+
+        expect(requests('GET').map((r) => r.path)).toContain('/d1');
+        expect($('.dashboard-publish-domain-badge').attr('data-status')).toBe('active');
+        expect($('.dashboard-publish-domain .dashboard-copy-value').val()).toBe('https://www.example.com');
+        expect($('.dashboard-publish-domain-status').text()).toBe('custom_domain_success_note');
+        expect($('.dashboard-publish-domain-check')).toHaveLength(0);
+    });
+
+    it('announces a check in the status region already on screen', async () => {
+        serveDomains({
+            routes: {
+                'POST ': () => json(201, pendingDomain()),
+                'GET /d1': () => json(200, pendingDomain()),
+            },
+        });
+        await openWebsite();
+        turnOnDomain();
+        domainField().val('www.example.com');
+        await submitWith('my-site');
+        const el_status = $('.dashboard-publish-domain-status').get(0);
+
+        $('.dashboard-publish-domain-check').trigger('click');
+        await flush();
+
+        expect($('.dashboard-publish-domain-status').get(0)).toBe(el_status);
+        expect(el_status.textContent).toBe('custom_domain_status_pending');
+        // The redrawn records are not read out again.
+        expect($('.dashboard-dns-record').closest('[aria-live]').attr('aria-live')).toBe('off');
+    });
+
+    it('runs one domain action at a time on the done screen', async () => {
+        let answer_check;
+        serveDomains({
+            routes: {
+                'POST ': () => json(201, pendingDomain({ hostname: 'example.com', isApex: true })),
+                'GET /d1': () => new Promise((resolve) => {
+                    answer_check = () => resolve(json(200, pendingDomain({ hostname: 'example.com', isApex: true })));
+                }),
+                'POST /d1/use-www': () => json(200, pendingDomain({ redirectFrom: 'example.com' })),
+            },
+        });
+        await openWebsite();
+        turnOnDomain();
+        domainField().val('example.com');
+        await submitWith('my-site');
+
+        $('.dashboard-publish-domain-check').trigger('click');
+        await flush();
+        expect($('.dashboard-publish-domain-www').prop('disabled')).toBe(true);
+        $('.dashboard-publish-domain-www').trigger('click');
+        await flush();
+        expect(requests('POST').map((r) => r.path)).not.toContain('/d1/use-www');
+
+        answer_check();
+        await flush();
+        expect($('.dashboard-publish-domain-www').prop('disabled')).toBe(false);
+    });
+
+    it('stops before publishing when the domain is not one', async () => {
+        serveDomains();
+        await openWebsite();
+        turnOnDomain();
+        domainField().val('localhost');
+
+        await submitWith('my-site');
+
+        expect(status()).toBe('custom_domain_error_invalid');
+        expect(domainField().attr('aria-invalid')).toBe('true');
+        expect(puter.hosting.create).not.toHaveBeenCalled();
+    });
+
+    it('keeps the live site and retries only the domain when adding it fails', async () => {
+        const add = vi.fn()
+            .mockReturnValueOnce(json(409, { code: 'custom_domain_taken', message: 'That hostname is already in use' }))
+            .mockReturnValueOnce(json(201, pendingDomain({ hostname: 'www.example.org' })));
+        serveDomains({ routes: { 'POST ': add } });
+        await openWebsite();
+        turnOnDomain();
+        domainField().val('www.example.com');
+
+        await submitWith('my-site');
+
+        expect(status()).toBe('publish_domain_failed\ncustom_domain_error_taken');
+        expect(domainField().attr('aria-invalid')).toBe('true');
+        expect(nameField().prop('readOnly')).toBe(true);
+        expect(submitLabel()).toBe('custom_domain_add');
+        // Published now, so the hint no longer speaks of "after publishing".
+        expect($('.dashboard-form-field[data-field="domain"] .dashboard-form-hint').text()).toBe('custom_domain_price_note');
+
+        domainField().val('www.example.org');
+        await submitWith();
+
+        expect(puter.hosting.create).toHaveBeenCalledTimes(1);
+        expect(add).toHaveBeenLastCalledWith({ site: 'my-site', hostname: 'www.example.org' });
+        expect($('.dashboard-publish-domain-host').text()).toBe('www.example.org');
+    });
+
+    it('finishes with just the site when the domain is turned off after a failure', async () => {
+        serveDomains({ routes: { 'POST ': () => json(409, { code: 'custom_domain_taken' }) } });
+        await openWebsite();
+        turnOnDomain();
+        domainField().val('www.example.com');
+        await submitWith('my-site');
+
+        domainSwitch().prop('checked', false).trigger('change');
+        expect(submitLabel()).toBe('done');
+        await submitWith();
+
+        expect(puter.hosting.create).toHaveBeenCalledTimes(1);
+        expect($('.dashboard-form-done p').text()).toBe('website_published');
+        expect($('.dashboard-publish-domain')).toHaveLength(0);
+    });
+
+    it('moves a domain already on the account instead of adding it again', async () => {
+        serveDomains({
+            list: { items: [pendingDomain({ site: 'old-site', status: 'active' })], canAdd: true },
+            routes: { 'PATCH /d1': () => json(200, pendingDomain({ status: 'active' })) },
+        });
+        await openWebsite();
+        turnOnDomain();
+        expect($(`#${domainField().attr('list')} option`).map((_, el) => el.value).get()).toEqual(['www.example.com']);
+        domainField().val('www.example.com').trigger('input');
+        expect($('.dashboard-form-field[data-field="domain"] .dashboard-form-hint').text()).toBe('publish_custom_domain_moves');
+
+        await submitWith('my-site');
+
+        expect(requests('POST')).toEqual([]);
+        expect(requests('PATCH')).toEqual([{ path: '/d1', body: { site: 'my-site' } }]);
+        expect($('.dashboard-publish-domain-badge').attr('data-status')).toBe('active');
+    });
+
+    it('says the www hostname serves the site and the root domain forwards to it', async () => {
+        serveDomains({
+            routes: {
+                'POST ': () => json(201, pendingDomain({
+                    redirectFrom: 'example.com',
+                    records: [
+                        { type: 'CNAME', name: 'www', value: 'my-site.puter.site', purpose: 'routing', required: true },
+                        { type: 'A', name: '@', value: '192.0.2.1', purpose: 'redirect', required: true },
+                    ],
+                })),
+            },
+        });
+        await openWebsite();
+        turnOnDomain();
+        domainField().val('www.example.com');
+        const i18n_stub = globalThis.i18n;
+        globalThis.i18n = (key, replacements) => (Array.isArray(replacements) && replacements.length ? `${key}:${replacements.join('|')}` : key);
+        try {
+            await submitWith('my-site');
+        } finally {
+            globalThis.i18n = i18n_stub;
+        }
+
+        expect($('.dashboard-publish-domain .dashboard-form-hint').last().text())
+            .toBe('custom_domain_redirect_note:www.example.com|example.com');
+    });
+
+    it('shows the ownership record for a domain held by another account', async () => {
+        const add = vi.fn(() => json(409, {
+            code: 'custom_domain_claim_required',
+            verification: { name: '_puter.www.example.com', value: 'token-1' },
+        }));
+        serveDomains({ routes: { 'POST ': add } });
+        await openWebsite();
+        turnOnDomain();
+        domainField().val('www.example.com');
+
+        await submitWith('my-site');
+
+        expect($('.dashboard-publish-claim').prop('hidden')).toBe(false);
+        expect($('.dashboard-publish-claim .dashboard-dns-record-type').text()).toBe('TXT');
+        expect($('.dashboard-publish-claim .dashboard-copy-value').map((_, el) => el.value).get())
+            .toEqual(['_puter.www.example.com', 'token-1']);
+        expect(submitLabel()).toBe('custom_domain_verify_and_add');
+        expect(status()).toBe('publish_site_live');
+
+        await submitWith();
+        expect(status()).toBe('publish_domain_failed\ncustom_domain_claim_not_found');
+
+        // A claim is for one hostname; editing it starts over.
+        domainField().val('www.example.net').trigger('input');
+        expect($('.dashboard-publish-claim').prop('hidden')).toBe(true);
+        expect(submitLabel()).toBe('custom_domain_add');
+
+        // Back to the claimed hostname, its record and the verify step return together.
+        domainField().val('www.example.com').trigger('input');
+        expect($('.dashboard-publish-claim').prop('hidden')).toBe(false);
+        expect(submitLabel()).toBe('custom_domain_verify_and_add');
+    });
+
+    describe('on a plan without custom domains', () => {
+        beforeEach(() => {
+            window.UIUpgradeAccount = vi.fn(function () {
+                this.open_as_window = vi.fn();
+            });
+        });
+
+        it('offers the upgrade in place of the field, leaving focus on the switch', async () => {
+            serveDomains({ list: { items: [], canAdd: false } });
+            await openWebsite();
+            domainSwitch().get(0).focus();
+            turnOnDomain();
+
+            expect(shown('domain')).toBe(false);
+            expect($('.dashboard-publish-upsell').prop('hidden')).toBe(false);
+            expect(document.activeElement).toBe(domainSwitch().get(0));
+            $('.dashboard-publish-upgrade').trigger('click');
+            expect(window.UIUpgradeAccount).toHaveBeenCalled();
+        });
+
+        it('does not publish while the switch asks for a domain it cannot add', async () => {
+            serveDomains({ list: { items: [], canAdd: false } });
+            await openWebsite();
+            turnOnDomain();
+            await submitWith('my-site');
+            expect(status()).toBe('publish_custom_domain_needs_plan');
+            expect(puter.hosting.create).not.toHaveBeenCalled();
+        });
+
+        it('unlocks the field once the upgrade goes through', async () => {
+            let can_add = false;
+            serveDomains({ list: () => ({ items: [], canAdd: can_add }) });
+            await openWebsite();
+            turnOnDomain();
+            $('.dashboard-publish-upgrade').trigger('click');
+
+            can_add = true;
+            window.dispatchEvent(new CustomEvent('puter:subscription:changed'));
+            await flush();
+
+            expect(shown('domain')).toBe(true);
+            expect($('.dashboard-publish-upsell').prop('hidden')).toBe(true);
+            expect(document.activeElement).toBe(domainField().get(0));
+        });
+
+        it('only listens for a plan change once it has offered the upgrade', async () => {
+            serveDomains({ list: { items: [], canAdd: false } });
+            const listen = vi.spyOn(window, 'addEventListener');
+            try {
+                await openWebsite();
+                turnOnDomain();
+                expect(listen.mock.calls.map(([type]) => type)).not.toContain('puter:subscription:changed');
+                $('.dashboard-publish-upgrade').trigger('click');
+                expect(listen.mock.calls.map(([type]) => type)).toContain('puter:subscription:changed');
+            } finally {
+                listen.mockRestore();
+            }
+        });
+
+        it('explains the plan without a button where there is no upgrade flow', async () => {
+            delete window.UIUpgradeAccount;
+            serveDomains({ list: { items: [], canAdd: false } });
+            await openWebsite();
+            turnOnDomain();
+            expect($('.dashboard-publish-upgrade')).toHaveLength(0);
+            await submitWith('my-site');
+            expect(status()).toBe('custom_domain_error_plan');
+        });
+
+        it('finishes with the live site when adding the domain turns out to need a plan', async () => {
+            serveDomains({ routes: { 'POST ': () => json(402, { code: 'subscription_required' }) } });
+            await openWebsite();
+            turnOnDomain();
+            domainField().val('www.example.com');
+            await submitWith('my-site');
+
+            expect(status()).toBe('publish_domain_failed\ncustom_domain_error_plan');
+            expect($('.dashboard-publish-upsell').prop('hidden')).toBe(false);
+            expect(submitLabel()).toBe('done');
+
+            await submitWith();
+            expect(puter.hosting.create).toHaveBeenCalledTimes(1);
+            expect(requests('POST')).toHaveLength(1);
+            expect($('.dashboard-form-done p').text()).toBe('website_published');
+            expect($('.dashboard-publish-domain')).toHaveLength(0);
+        });
+    });
+});
+
 describe('publish worker', () => {
    it('always needs a verified account', async () => {
        await openPublishWorkerDialog({ name: 'api.js', path: '/alice/api.js' });
@@ -651,17 +651,25 @@ export default function UIShareModal ({ items, path: item_path, name, owner, fse
    // One request per run of MAX_ITEMS_PER_REQUEST, in series so a large
    // selection can't burst through the share rate limit. Resolves with every
    // grant that landed, the way a single call would.
+    // A run that fails after others landed rejects with those grants on the
+    // error as `landed`.
    const grant_access = async (recipient, mode, paths) => {
        const created = [];
-        for ( const run of chunk(paths, MAX_ITEMS_PER_REQUEST) ) {
-            created.push(...(await with_verification_gate(
-                () => puter.fs.share({ paths: run, recipient, mode }),
-            ) ?? []));
-        }
-        // A selection too large to list again (see refresh) learns which rows
-        // are now shared from the grants themselves.
-        if ( total > MAX_ITEMS_PER_REQUEST ) {
-            for ( const share of created ) mark_item_shared(share.path, true);
+        try {
+            for ( const run of chunk(paths, MAX_ITEMS_PER_REQUEST) ) {
+                created.push(...(await with_verification_gate(
+                    () => puter.fs.share({ paths: run, recipient, mode }),
+                ) ?? []));
+            }
+        } catch (err) {
+            if ( created.length && err && typeof err === 'object' ) err.landed = created;
+            throw err;
+        } finally {
+            // A selection too large to list again (see refresh) learns which
+            // rows are now shared from the grants themselves.
+            if ( total > MAX_ITEMS_PER_REQUEST ) {
+                for ( const share of created ) mark_item_shared(share.path, true);
+            }
        }
        return created;
    };
@@ -848,8 +856,16 @@ export default function UIShareModal ({ items, path: item_path, name, owner, fse
            if ( ! focus_moved_on() ) $recipient.get(0)?.focus({ preventScroll: true });
        } catch (err) {
            sharing = false;
-            show_error(error_html(err));
+            // Runs that landed before the failure are shared all the same.
+            const landed = err?.landed?.length ?? 0;
+            show_error(landed
+                ? `${i18n('share_shared_with_partial', { recipient, count: landed, total })}. ${error_html(err)}`
+                : error_html(err));
            sync_add_actions();
+            if ( landed ) {
+                invalidate_shared_roots();
+                await refresh();
+            }
            // Disabling the clicked button dropped focus to <body>; put it
            // where the correction happens.
            $recipient.get(0)?.focus({ preventScroll: true });
@@ -226,4 +226,28 @@ describe('UIShareModal adding people', () => {
        await settle();
        expect($('.share-modal-submit').prop('disabled')).toBe(false);
    });
+
+    it('says how many items were shared when a later run fails, and badges those rows', async () => {
+        const selection = Array.from({ length: 60 }, (_, i) => ({ path: `/alice/f${i}.txt` }));
+        document.body.insertAdjacentHTML('beforeend', selection
+            .map(item => `<div class="item" data-path="${item.path}" data-is_shared="0"></div>`).join(''));
+        let call = 0;
+        puter.fs.share = vi.fn(async ({ paths }) => {
+            if ( ++call === 2 ) throw { message: 'Daily share limit reached', code: 'share_daily_limit_reached' };
+            return paths.map(p => ({ path: p }));
+        });
+        UIShareModal({ items: selection });
+        await settle();
+        picked.recipient = { value: 'bob', label: 'bob' };
+        picked.onChange();
+
+        $('.share-modal-add').trigger('submit');
+        await settle();
+
+        expect(puter.fs.share).toHaveBeenCalledTimes(2);
+        const status = $('.share-modal-status').text();
+        expect(status).toContain('Shared with bob on 50 of 60 items');
+        expect(status).toContain('Daily share limit reached');
+        expect($('.item[data-is_shared="1"]')).toHaveLength(50);
+    });
 });
@@ -36,6 +36,16 @@ const numberFormat = (options) => {
    }
 };

+/**
+ * A whole count (usage units) in the dashboard's language: "1,234,567" in
+ * English, "1.234.567" in German.
+ *
+ * @param {number} count
+ * @returns {string}
+ */
+export const formatCount = (count) =>
+    numberFormat({ maximumFractionDigits: 0 }).format(Number.isFinite(count) ? count : 0);
+
 /** Whether a `getMonthlyUsage()` response reports credits. */
 export const usageIsCredits = (allowanceInfo) =>
    allowanceInfo?.unit === 'credits';
@@ -19,6 +19,7 @@

 import { describe, expect, it, beforeEach, afterEach } from 'vitest';
 import {
+    formatCount,
    formatCredits,
    formatDollarsFromMicrocents,
    usageIsCredits,
@@ -86,6 +87,14 @@ describe('amounts in the dashboard\'s language', () => {
        expect(formatCredits(2.5)).toBe('2,5');
        expect(formatCredits(0.001)).toBe('<0,01');
        expect(formatDollarsFromMicrocents(123_450_000_000).replace(/\s/g, ' ')).toBe('1.234,50 $');
+        expect(formatCount(1234567)).toBe('1.234.567');
+    });
+
+    it('counts usage units in English by default', () => {
+        delete globalThis.window.locale;
+        expect(formatCount(1234567)).toBe('1,234,567');
+        expect(formatCount(12.6)).toBe('13');
+        expect(formatCount(undefined)).toBe('0');
    });

    it("reads Puter's codes that aren't BCP 47 tags", () => {
@@ -346,20 +346,26 @@ export const badgeLabel = (count) => {
    return count > 99 ? '99+' : String(count);
 };

-const TITLE_BADGE = /^\((\d+\+?)\) /;
+/** What the unread count puts in front of the title: "(3) ", or nothing. */
+export const titleBadge = (count) => {
+    const label = badgeLabel(count);
+    return label ? `(${label}) ` : '';
+};

 /**
- * The document title with the unread count in front, replacing any count
- * already there so repeated application never stacks prefixes.
+ * The document title with the unread count in front. Only `applied`, the
+ * badge this page last put there, is replaced, so repeated application never
+ * stacks prefixes and an app's own "(3) Inbox" title keeps its count.
 *
 * @param {string} title
 * @param {number} count
+ * @param {string} [applied]
 * @returns {string}
 */
-export const titleWithBadge = (title, count) => {
-    const base = String(title ?? '').replace(TITLE_BADGE, '');
-    const label = badgeLabel(count);
-    return label ? `(${label}) ${base}` : base;
+export const titleWithBadge = (title, count, applied = '') => {
+    let base = String(title ?? '');
+    if ( applied && base.startsWith(applied) ) base = base.slice(applied.length);
+    return titleBadge(count) + base;
 };

 /**
@@ -370,16 +376,17 @@ export const titleWithBadge = (title, count) => {
 export const MAX_BURST_TOASTS = 3;

 /**
- * Split a burst into the entries that get their own toast and the number
- * that don't.
+ * Split a burst into the entries that get their own toast, newest first, and
+ * the number that don't. Bursts arrive in either order (a catch-up listing is
+ * oldest first), and the newest are the ones worth a toast.
 *
- * @param {NotificationEntry[]} entries - Newest first
+ * @param {NotificationEntry[]} entries
 * @param {number} [max]
 * @returns {{ shown: NotificationEntry[], folded: number }}
 */
 export const planBurstToasts = (entries, max = MAX_BURST_TOASTS) => {
-    if ( entries.length <= max ) return { shown: entries, folded: 0 };
+    const newestFirst = sortEntries(entries);
    // One over the cap is no quieter shown as a summary than as a toast.
-    if ( entries.length === max + 1 ) return { shown: entries, folded: 0 };
-    return { shown: entries.slice(0, max), folded: entries.length - max };
+    if ( newestFirst.length <= max + 1 ) return { shown: newestFirst, folded: 0 };
+    return { shown: newestFirst.slice(0, max), folded: newestFirst.length - max };
 };
@@ -35,6 +35,7 @@ import {
    setReadAt,
    sortEntries,
    takeMarksSince,
+    titleBadge,
    titleWithBadge,
    toEntry,
    unreadCount,
@@ -424,16 +425,24 @@ describe('titleWithBadge', () => {
        expect(titleWithBadge('Puter', 3)).toBe('(3) Puter');
    });

-    it('replaces an existing count instead of stacking', () => {
-        expect(titleWithBadge('(2) Puter', 5)).toBe('(5) Puter');
-        expect(titleWithBadge('(99+) Puter', 1)).toBe('(1) Puter');
+    it('replaces the count it put there instead of stacking', () => {
+        expect(titleWithBadge('(2) Puter', 5, '(2) ')).toBe('(5) Puter');
+        expect(titleWithBadge('(99+) Puter', 1, '(99+) ')).toBe('(1) Puter');
    });

    it('clears the prefix at zero', () => {
-        expect(titleWithBadge('(2) Puter', 0)).toBe('Puter');
+        expect(titleWithBadge('(2) Puter', 0, '(2) ')).toBe('Puter');
        expect(titleWithBadge('Puter', 0)).toBe('Puter');
    });

+    it('leaves a count that is part of an app\'s own title alone', () => {
+        expect(titleWithBadge('(3) Inbox', 0)).toBe('(3) Inbox');
+        expect(titleWithBadge('(3) Inbox', 2)).toBe('(2) (3) Inbox');
+        // The app rewrote the title after the badge was applied.
+        expect(titleWithBadge('(3) Inbox', 2, '(2) ')).toBe('(2) (3) Inbox');
+        expect(titleWithBadge('(2) (3) Inbox', 0, '(2) ')).toBe('(3) Inbox');
+    });
+
    it('leaves a parenthesised title that is not a badge alone', () => {
        expect(titleWithBadge('(draft) Notes', 0)).toBe('(draft) Notes');
        expect(titleWithBadge('(draft) Notes', 2)).toBe('(2) (draft) Notes');
@@ -445,6 +454,14 @@ describe('titleWithBadge', () => {
    });
 });

+describe('titleBadge', () => {
+    it('is the prefix a count puts in front of the title', () => {
+        expect(titleBadge(3)).toBe('(3) ');
+        expect(titleBadge(120)).toBe('(99+) ');
+        expect(titleBadge(0)).toBe('');
+    });
+});
+
 describe('planBurstToasts', () => {
    const many = (n) => Array.from({ length: n }, (_, i) => entry(`n${i}`, NOW - i));

@@ -463,6 +480,12 @@ describe('planBurstToasts', () => {
        expect(shown.map((e) => e.uid)).toEqual(['n0', 'n1', 'n2']);
        expect(folded).toBe(9);
    });
+
+    it('toasts the newest of a burst that arrives oldest first', () => {
+        const { shown, folded } = planBurstToasts(many(6).reverse());
+        expect(shown.map((e) => e.uid)).toEqual(['n0', 'n1', 'n2']);
+        expect(folded).toBe(3);
+    });
 });

 describe('senderNameFor', () => {
@@ -0,0 +1,425 @@
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+// The custom domain part of the Publish Website dialog: a switch that asks
+// for a domain, an upgrade prompt where the plan doesn't include one, and,
+// once the site is live, the domain's DNS records with a status check.
+
+import { isPlausibleHostname, normalizeHostnameInput } from '../../helpers/customDomainHostname.js';
+import {
+    CUSTOM_DOMAIN_HOSTNAME_ERRORS,
+    customDomainErrorText,
+    customDomainsRequest,
+    customDomainStatus,
+    formatCustomDomainPrice,
+    mergeCustomDomainRefresh,
+} from '../../helpers/customDomains.js';
+import { has_upgrade_flow, open_upgrade_flow } from '../../helpers/planGate.js';
+import { SVG } from './UIDashboardDialog.js';
+import { copyRowHtml } from './UIDashboardFormDialog.js';
+
+/** @typedef {import('../../helpers/customDomains.js').CustomDomain} CustomDomain */
+/** @typedef {import('../../helpers/customDomains.js').CustomDomainRecord} CustomDomainRecord */
+/** @typedef {import('./UIDashboardFormDialog.js').FormDialog} FormDialog */
+/** @typedef {import('./UIDashboardFormDialog.js').FormDialogField} FormDialogField */
+
+const t = (key, args = []) => i18n(key, args, false);
+
+const ICONS = {
+    open: SVG('<path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"/><path d="M15 3h6v6"/><path d="M10 14L21 3"/>'),
+    globe: SVG('<circle cx="12" cy="12" r="9"/><path d="M3 12h18"/><path d="M12 3a14 14 0 0 1 0 18a14 14 0 0 1 0-18z"/>'),
+    sparkle: SVG('<path d="M12 3l1.9 5.1L19 10l-5.1 1.9L12 17l-1.9-5.1L5 10l5.1-1.9z"/><path d="M19 16l.8 2.2L22 19l-2.2.8L19 22l-.8-2.2L16 19l2.2-.8z"/>'),
+};
+
+const BADGE_KEYS = {
+    active: 'custom_domain_badge_active',
+    pending: 'custom_domain_badge_pending',
+    failed: 'custom_domain_badge_failed',
+};
+
+/**
+ * An icon link opening `url` in a new tab, beside a compact copy row.
+ *
+ * @param {string} url
+ * @returns {string}
+ */
+export const openLinkHtml = (url) =>
+    `<a class="dashboard-dialog-btn dashboard-dialog-btn-quiet dashboard-icon-btn dashboard-publish-open" href="${html_encode(url)}"`
+    + ` target="_blank" rel="noopener noreferrer" aria-label="${i18n('open_in_new_tab')}" title="${i18n('open_in_new_tab')}">${ICONS.open}</a>`;
+
+/**
+ * DNS records as cards: the type, then the name and value, each with a Copy
+ * button the form dialog wires.
+ *
+ * @param {CustomDomainRecord[]} records
+ * @param {{ isApex?: boolean }} [domain] A root domain's routing record can
+ *   be any of the record types that alias a root.
+ * @returns {string}
+ */
+export const dnsRecordsHtml = (records, { isApex = false } = {}) => records.map((record) => {
+    const type = isApex && record.purpose === 'routing' ? t('custom_domain_record_type_apex') : record.type;
+    const field = (labelKey, value) => '<div class="dashboard-dns-record-field">'
+        + `<span class="dashboard-dns-record-label">${i18n(labelKey)}</span>`
+        + copyRowHtml({ value, label: `${type} ${t(labelKey)}`, compact: true })
+        + '</div>';
+    return '<div class="dashboard-dns-record">'
+        + '<div class="dashboard-dns-record-head">'
+        + `<span class="dashboard-dns-record-type">${html_encode(type)}</span>`
+        + (record.required === false ? `<span class="dashboard-dns-record-optional">${i18n('custom_domain_optional')}</span>` : '')
+        + '</div>'
+        + field('name', record.name)
+        + field('custom_domain_record_value', record.value)
+        + '</div>';
+}).join('');
+
+/**
+ * The done screen's account of a domain: its status, and until it's
+ * connected, the records still to set.
+ *
+ * @param {CustomDomain} domain
+ * @returns {string}
+ */
+export const domainSummaryHtml = (domain) => {
+    const status = customDomainStatus(domain);
+    let h = '<div class="dashboard-publish-domain-head">'
+        + `<span class="dashboard-publish-domain-icon">${ICONS.globe}</span>`
+        + `<span class="dashboard-publish-domain-host">${html_encode(domain.hostname)}</span>`
+        + `<span class="dashboard-publish-domain-badge" data-status="${status}">${i18n(BADGE_KEYS[status])}</span>`
+        + '</div>';
+    if ( status === 'active' ) {
+        const url = `https://${domain.hostname}`;
+        h += copyRowHtml({ value: url, label: domain.hostname, compact: true, after: openLinkHtml(url) });
+    } else {
+        if ( status === 'failed' && domain.statusDetail ) {
+            h += `<p class="dashboard-publish-domain-detail">${html_encode(domain.statusDetail)}</p>`;
+        }
+        h += `<p class="dashboard-form-hint">${i18n('custom_domain_records_c2a')}</p>`;
+        h += `<div class="dashboard-dns-records">${dnsRecordsHtml(domain.records ?? [], domain)}</div>`;
+        if ( domain.isApex ) {
+            h += `<p class="dashboard-form-hint">${i18n('custom_domain_apex_hint')}</p>`;
+            h += `<button type="button" class="dashboard-publish-link-btn dashboard-publish-domain-www">${i18n('custom_domain_no_root_alias')}</button>`;
+        }
+    }
+    if ( domain.redirectFrom ) {
+        h += `<p class="dashboard-form-hint">${i18n('custom_domain_redirect_note', [domain.hostname, domain.redirectFrom])}</p>`;
+    }
+    if ( status !== 'active' ) {
+        h += '<div class="dashboard-publish-domain-actions">'
+            + '<button type="button" class="dashboard-dialog-btn dashboard-dialog-btn-quiet dashboard-publish-domain-check">'
+            + '<span class="dashboard-form-spinner" aria-hidden="true"></span>'
+            + `<span>${i18n('custom_domain_check_status')}</span>`
+            + '</button>'
+            + '</div>';
+    }
+    return h;
+};
+
+/**
+ * The switch and the domain field. Both start hidden: the switch shows once
+ * the server answers that it has custom domains.
+ *
+ * @returns {FormDialogField[]}
+ */
+export const publishDomainFields = () => [
+    {
+        name: 'useDomain',
+        type: 'switch',
+        label: i18n('publish_custom_domain'),
+        hint: i18n('publish_custom_domain_hint'),
+        hidden: true,
+    },
+    {
+        name: 'domain',
+        label: i18n('custom_domain_hostname_label'),
+        placeholder: 'www.example.com',
+        hint: i18n('publish_custom_domain_dns_hint'),
+        hidden: true,
+        attrs: {
+            inputmode: 'url',
+            enterkeyhint: 'go',
+            autocomplete: 'off',
+            autocapitalize: 'off',
+            autocorrect: 'off',
+            spellcheck: 'false',
+            'data-gramm_editor': 'false',
+        },
+    },
+];
+
+/**
+ * @typedef {object} PublishDomain
+ * @property {() => boolean} addable Whether the switch is on and the plan
+ *   lets a domain be added.
+ * @property {(live: boolean) => string | null | false} prepare Before each
+ *   submit: null when no domain is to be added (including when the site is
+ *   `live` and the plan can't add one), false when the form can't go ahead
+ *   (the dialog says why), else the hostname to add.
+ * @property {(hostname: string, site: { name: string, url: string }) => Promise<CustomDomain | null>} attach
+ *   Adds the hostname to the live site, or moves it there when it's already
+ *   on the account. Null when it didn't; the dialog says why.
+ * @property {(domain: CustomDomain) => string} doneHtml The done screen's domain part.
+ * @property {() => boolean} claiming Whether an ownership record for the
+ *   typed hostname is on screen, waiting to be verified.
+ */
+
+/**
+ * Wires the custom domain fields of a publish form dialog.
+ *
+ * @param {FormDialog} dialog
+ * @param {object} opts
+ * @param {() => void} opts.onChange Runs when what the submit button does may
+ *   have changed: the switch, the plan, or a claim to verify.
+ * @returns {PublishDomain}
+ */
+export const setupPublishDomain = (dialog, { onChange }) => {
+    const { $dialog } = dialog;
+    const $switch = dialog.field('useDomain');
+    const $input = dialog.field('domain');
+    const $field = $input.closest('.dashboard-form-field');
+    const $hint = $field.find('.dashboard-form-hint');
+    const id = $input.attr('id');
+
+    const upgradable = has_upgrade_flow();
+    $field.after(
+        `<div class="dashboard-publish-upsell" hidden>`
+        + `<span class="dashboard-publish-upsell-icon">${ICONS.sparkle}</span>`
+        + '<div class="dashboard-publish-upsell-text">'
+        + `<p class="dashboard-publish-upsell-title">${i18n('publish_custom_domain_upsell_title')}</p>`
+        + (upgradable ? `<p class="dashboard-form-hint">${i18n('publish_custom_domain_upsell_text')}</p>` : '')
+        + '</div>'
+        + (upgradable ? `<button type="button" class="dashboard-dialog-btn dashboard-dialog-btn-primary dashboard-publish-upgrade">${i18n('billing.upgrade')}</button>` : '')
+        + '</div>'
+        + '<div class="dashboard-publish-claim" hidden>'
+        + `<p class="dashboard-publish-claim-text">${i18n('custom_domain_claim_c2a')}</p>`
+        + '<div class="dashboard-dns-records"></div>'
+        + '</div>'
+        + `<datalist id="${id}-owned"></datalist>`,
+    );
+    const $upsell = $dialog.find('.dashboard-publish-upsell');
+    const $claim = $dialog.find('.dashboard-publish-claim');
+    const $owned = $dialog.find(`#${id}-owned`);
+    $input.attr('list', `${id}-owned`);
+
+    let available = false;
+    let can_add = true;
+    let price = null;
+    /** @type {CustomDomain[]} */
+    let owned = [];
+    /** The hostname whose ownership record is on screen. */
+    let claim_for = null;
+    /** @type {CustomDomain | null} */
+    let shown = null;
+    /** Whether the site is published, so the domain is all that's left. */
+    let live = false;
+
+    const typed = () => normalizeHostnameInput($input.val());
+    const owned_named = (hostname) => owned.find((domain) => domain.hostname === hostname);
+    const wanted = () => available && $switch.prop('checked');
+    const addable = () => wanted() && can_add;
+
+    const update_hint = () => {
+        const existing = owned_named(typed());
+        $hint.text(existing
+            ? t('publish_custom_domain_moves', [`${existing.site}.${window.hosting_domain}`])
+            : [! live && t('publish_custom_domain_dns_hint'), price && t('custom_domain_price_note', [price])].filter(Boolean).join(' '));
+    };
+
+    const sync = () => {
+        const on = wanted();
+        dialog.showField('domain', on && can_add);
+        $upsell.prop('hidden', ! on || can_add);
+        $claim.prop('hidden', ! on || ! can_add || claim_for !== typed());
+        update_hint();
+        onChange();
+    };
+
+    const load = async () => {
+        let res;
+        try {
+            res = await customDomainsRequest('GET');
+        } catch {
+            return;
+        }
+        // No custom domain API on this Puter, or none for this account:
+        // the option stays out of the way.
+        if ( ! res.ok || ! Array.isArray(res.data?.items) ) return;
+        owned = res.data.items;
+        can_add = res.data.canAdd !== false;
+        price = formatCustomDomainPrice(res.data.pricing);
+        $owned.html(owned.map((domain) => `<option value="${html_encode(domain.hostname)}"></option>`).join(''));
+        if ( ! available ) {
+            available = true;
+            dialog.showField('useDomain', true);
+        }
+        sync();
+    };
+    load();
+
+    // The field takes focus as the switch reveals it. The upgrade prompt
+    // doesn't: a second Space meant for the switch would open the upgrade.
+    $switch.on('change', () => {
+        sync();
+        if ( addable() ) $input.get(0)?.focus({ preventScroll: true });
+    });
+    // A claim's record shows only while its hostname is the one typed.
+    $input.on('input', sync);
+
+    // Once an upgrade lands, the field unlocks where the prompt was. The
+    // dialog is modal, so only its own prompt can change the plan meanwhile.
+    const on_plan_change = async () => {
+        if ( ! document.contains($dialog.get(0)) ) {
+            window.removeEventListener('puter:subscription:changed', on_plan_change);
+            return;
+        }
+        const had = can_add;
+        await load();
+        if ( ! had && addable() ) $input.get(0)?.focus({ preventScroll: true });
+    };
+    $dialog.on('click', '.dashboard-publish-upgrade', () => {
+        if ( ! open_upgrade_flow() ) return;
+        window.addEventListener('puter:subscription:changed', on_plan_change);
+    });
+
+    // -- Done screen --
+
+    /** Encoded HTML into the done screen's status line; empty clears it. */
+    const set_done_status = (html, error = false) => {
+        $dialog.find('.dashboard-publish-domain-status').html(html)
+            .toggleClass('dashboard-publish-domain-status-error', error);
+    };
+    const render_done = (focus_selector) => {
+        const $section = $dialog.find('.dashboard-publish-domain-summary');
+        $section.html(domainSummaryHtml(shown));
+        const el = $section.find(focus_selector).get(0)
+            ?? $section.find('.dashboard-copy-value').get(0)
+            ?? $dialog.find('.dashboard-form-done-btn').get(0);
+        el?.focus({ preventScroll: true });
+    };
+    const DONE_ACTIONS = '.dashboard-publish-domain-check, .dashboard-publish-domain-www';
+    let done_busy = false;
+    /**
+     * Runs a done-screen request with `$btn` busy and the other actions held,
+     * since each answer redraws the domain; resolves with the response, or null.
+     */
+    const done_request = async ($btn, method, path) => {
+        done_busy = true;
+        $dialog.find(DONE_ACTIONS).prop('disabled', true);
+        $btn.addClass('dashboard-form-busy').attr('aria-busy', 'true');
+        set_done_status('');
+        try {
+            const res = await customDomainsRequest(method, path);
+            if ( res.ok ) return res;
+            set_done_status(html_encode(customDomainErrorText(res)), true);
+        } catch {
+            set_done_status(i18n('custom_domain_error_generic'), true);
+        } finally {
+            done_busy = false;
+            $dialog.find(DONE_ACTIONS).prop('disabled', false);
+            $btn.removeClass('dashboard-form-busy').removeAttr('aria-busy');
+        }
+        return null;
+    };
+    $dialog.on('click', '.dashboard-publish-domain-check', async function () {
+        if ( ! shown || done_busy ) return;
+        const res = await done_request($(this), 'GET', `/${encodeURIComponent(shown.uuid)}`);
+        if ( ! res ) return;
+        shown = mergeCustomDomainRefresh(shown, res.data);
+        render_done('.dashboard-publish-domain-check');
+        const status = customDomainStatus(shown);
+        set_done_status(status === 'active'
+            ? i18n('custom_domain_success_note', [shown.hostname, `${shown.site}.${window.hosting_domain}`])
+            : i18n(status === 'failed' ? 'custom_domain_status_failed' : 'custom_domain_status_pending', [shown.hostname]));
+    });
+    // Same domain, so the month already paid covers the www hostname.
+    $dialog.on('click', '.dashboard-publish-domain-www', async function () {
+        if ( ! shown || done_busy ) return;
+        const res = await done_request($(this), 'POST', `/${encodeURIComponent(shown.uuid)}/use-www`);
+        if ( ! res ) return;
+        shown = res.data;
+        render_done('.dashboard-publish-domain-check');
+    });
+
+    return {
+        addable,
+        prepare (live) {
+            if ( ! wanted() || (live && ! can_add) ) return null;
+            if ( ! can_add ) {
+                dialog.setStatus(t(upgradable ? 'publish_custom_domain_needs_plan' : 'custom_domain_error_plan'));
+                return false;
+            }
+            const hostname = typed();
+            $input.val(hostname);
+            if ( ! isPlausibleHostname(hostname) ) {
+                dialog.setStatus(t('custom_domain_error_invalid'), { field: 'domain' });
+                return false;
+            }
+            return hostname;
+        },
+        async attach (hostname, site) {
+            if ( ! live ) {
+                live = true;
+                update_hint();
+            }
+            const existing = owned_named(hostname);
+            const failed = (reason, field) => {
+                dialog.setStatus(`${t('publish_domain_failed', [site.url])}\n${reason}`, field ? { field } : undefined);
+                return null;
+            };
+            let res;
+            try {
+                res = existing
+                    ? await customDomainsRequest('PATCH', `/${encodeURIComponent(existing.uuid)}`, { site: site.name })
+                    : await customDomainsRequest('POST', '', { site: site.name, hostname });
+            } catch {
+                return failed(t('custom_domain_error_generic'));
+            }
+            if ( res.ok ) {
+                claim_for = null;
+                return res.data;
+            }
+            // Held by another account: shown its ownership record the first
+            // time; a retry that still can't see the record says so.
+            const verification = res.data?.verification;
+            if ( res.data?.code === 'custom_domain_claim_required' && verification ) {
+                const retry = claim_for === hostname;
+                claim_for = hostname;
+                $claim.find('.dashboard-dns-records').html(dnsRecordsHtml([{ type: 'TXT', name: verification.name, value: verification.value }]));
+                sync();
+                if ( retry ) return failed(t('custom_domain_claim_not_found'));
+                dialog.setStatus(t('publish_site_live', [site.url]), { kind: 'info' });
+                return null;
+            }
+            if ( res.status === 402 && res.data?.code === 'subscription_required' ) {
+                can_add = false;
+                sync();
+            }
+            return failed(customDomainErrorText(res), CUSTOM_DOMAIN_HOSTNAME_ERRORS.has(res.data?.code) ? 'domain' : undefined);
+        },
+        doneHtml (domain) {
+            shown = domain;
+            // The summary is redrawn after each check; the status line stays,
+            // so screen readers announce what changed and not the records again.
+            return '<section class="dashboard-publish-domain">'
+                + `<div class="dashboard-publish-domain-summary" aria-live="off">${domainSummaryHtml(domain)}</div>`
+                + '<p class="dashboard-publish-domain-status" role="status" aria-live="polite"></p>'
+                + '</section>';
+        },
+        claiming: () => addable() && claim_for !== null && claim_for === typed(),
+    };
+};
@@ -666,22 +666,22 @@ const UIWindow2FASetup = async function UIWindow2FASetup () {
    h += '<div class="tfa-progress" style="display:none;">';
    h += '  <div class="tfa-progress-step">';
    h += '    <div class="tfa-progress-dot active" data-step="1">1</div>';
-    h += '    <span class="tfa-progress-label active">Scan</span>';
+    h += `    <span class="tfa-progress-label active">${i18n('setup2fa_step_scan')}</span>`;
    h += '  </div>';
    h += '  <div class="tfa-progress-line"><div class="tfa-progress-line-fill"></div></div>';
    h += '  <div class="tfa-progress-step">';
    h += '    <div class="tfa-progress-dot" data-step="2">2</div>';
-    h += '    <span class="tfa-progress-label">Backup</span>';
+    h += `    <span class="tfa-progress-label">${i18n('setup2fa_step_backup')}</span>`;
    h += '  </div>';
    h += '  <div class="tfa-progress-line"><div class="tfa-progress-line-fill"></div></div>';
    h += '  <div class="tfa-progress-step">';
    h += '    <div class="tfa-progress-dot" data-step="3">3</div>';
-    h += '    <span class="tfa-progress-label">Verify</span>';
+    h += `    <span class="tfa-progress-label">${i18n('setup2fa_step_verify')}</span>`;
    h += '  </div>';
    h += '  <div class="tfa-progress-line"><div class="tfa-progress-line-fill"></div></div>';
    h += '  <div class="tfa-progress-step">';
    h += `    <div class="tfa-progress-dot" data-step="4">${SVG_CHECK}</div>`;
-    h += '    <span class="tfa-progress-label">Done</span>';
+    h += `    <span class="tfa-progress-label">${i18n('done')}</span>`;
    h += '  </div>';
    h += '</div>';

@@ -703,7 +703,7 @@ const UIWindow2FASetup = async function UIWindow2FASetup () {
    // Manual secret key, filled in once setup returns it
    h += '<div class="tfa-secret-row" style="display:none;">';
    h += '  <span class="tfa-secret-key"></span>';
-    h += `  <button class="tfa-copy-secret" title="Copy secret key">${SVG_COPY}</button>`;
+    h += `  <button class="tfa-copy-secret" title="${i18n('setup2fa_copy_secret')}" aria-label="${i18n('setup2fa_copy_secret')}">${SVG_COPY}</button>`;
    h += '</div>';

    h += `<button class="tfa-btn tfa-btn-primary tfa-scan-continue-btn">${i18n('continue')}</button>`;
@@ -747,7 +747,7 @@ const UIWindow2FASetup = async function UIWindow2FASetup () {
    }
    h += '  </div>';
    h += '  <div class="tfa-code-error"></div>';
-    h += `  <div class="tfa-code-spinner"><div class="tfa-spinner-icon"></div><span>Enabling...</span></div>`;
+    h += `  <div class="tfa-code-spinner"><div class="tfa-spinner-icon"></div><span>${i18n('setup2fa_enabling')}</span></div>`;
    h += '</div>';
    h += '</div>'; // end screen 3

@@ -755,8 +755,8 @@ const UIWindow2FASetup = async function UIWindow2FASetup () {
    h += '<div class="tfa-screen" data-screen="4">';
    h += `<div class="tfa-success-icon">${SVG_SHIELD_CHECK}</div>`;
    h += `<div class="tfa-success-title">${i18n('two_factor_enabled')}</div>`;
-    h += '<p class="tfa-success-text">Your account is now protected with two-factor authentication. You\'ll be asked for a verification code each time you sign in.</p>';
-    h += `<button class="tfa-btn tfa-btn-success tfa-done-btn">Done</button>`;
+    h += `<p class="tfa-success-text">${i18n('setup2fa_success_text')}</p>`;
+    h += `<button class="tfa-btn tfa-btn-success tfa-done-btn">${i18n('done')}</button>`;
    h += '</div>'; // end screen 4

    h += '</div>'; // end tfa-setup
@@ -1019,7 +1019,7 @@ const UIWindow2FASetup = async function UIWindow2FASetup () {
        navigator.clipboard.writeText(setup_data.codes.join('\n'));
        const $span = $(this).find('span');
        const orig = $span.text();
-        $span.text('Copied!');
+        $span.text(i18n('copied', [], false));
        $(this).addClass('copied');
        setTimeout(() => {
            $span.text(orig);
@@ -1031,7 +1031,7 @@ const UIWindow2FASetup = async function UIWindow2FASetup () {
        const grid_html = $w.find('.tfa-codes-grid').get(0).outerHTML;
        const print_frame = $w.find('.tfa-print-frame').get(0);
        const style = '<style>body{font-family:monospace;padding:20px} .tfa-codes-grid{display:grid;grid-template-columns:1fr 1fr;gap:8px} .tfa-code-item{padding:8px;font-size:14px;display:flex;gap:8px} .tfa-code-item-idx{color:#999}</style>';
-        print_frame.contentWindow.document.body.innerHTML = style + '<h2>Recovery Codes</h2>' + grid_html;
+        print_frame.contentWindow.document.body.innerHTML = `${style}<h2>${i18n('setup2fa_recovery_codes')}</h2>${grid_html}`;
        print_frame.contentWindow.focus();
        print_frame.contentWindow.print();
    });
@@ -40,7 +40,9 @@ let feedback_modal_seq = 0;
 * server is the authority on the app's canonical title — then submits to
 * `POST /app-feedback`.
 *
- * @param {{ app?: string, origin?: string, source?: 'app' | 'web' }} options
+ * @param {{ app?: string, origin?: string, source?: 'app' | 'web', fullpage?: boolean }} options
+ *   `fullpage` fills the viewport instead of floating over it, for a popup
+ *   window that exists only to host this dialog.
 * @returns {Promise<boolean>} true iff feedback was submitted successfully.
 *   Resolves false on cancel/close/unavailable — never rejects, so IPC and
 *   popup callers can always report an answer.
@@ -54,7 +56,8 @@ async function UIWindowAppFeedback (options) {
        let sending = false;
        let closed = false;

-        const authToken = puter.authToken ?? window.auth_token;
+        // The feedback embed runs without puter.js.
+        const authToken = globalThis.puter?.authToken ?? window.auth_token;
        const target_params = options.app
            ? { app: options.app }
            : { origin: options.origin };
@@ -70,7 +73,7 @@ async function UIWindowAppFeedback (options) {

        const titleId = `${modal_id}-title`;
        const h = `
-            <div class="app-feedback-overlay" role="dialog" aria-modal="true" aria-labelledby="${titleId}">
+            <div class="app-feedback-overlay${options.fullpage ? ' app-feedback-fullpage' : ''}" role="dialog" aria-modal="true" aria-labelledby="${titleId}">
                <div class="app-feedback-modal" tabindex="-1">
                    <div class="app-feedback-head">
                        <h2 class="app-feedback-title" id="${titleId}">${i18n('app_feedback_title')}</h2>
@@ -79,16 +82,16 @@ async function UIWindowAppFeedback (options) {
                        </button>
                    </div>
                    <div class="app-feedback-body">
-                        <div class="app-feedback-loading">${i18n('loading')}…</div>
+                        <div class="app-feedback-pane app-feedback-loading">${i18n('loading')}…</div>

-                        <div class="app-feedback-unavailable" style="display:none;">
+                        <div class="app-feedback-pane app-feedback-unavailable" style="display:none;">
                            <p class="app-feedback-unavailable-message"></p>
                            <div class="app-feedback-actions">
                                <button type="button" class="app-feedback-btn app-feedback-btn-primary app-feedback-close-btn">${i18n('close')}</button>
                            </div>
                        </div>

-                        <div class="app-feedback-form" style="display:none;">
+                        <div class="app-feedback-pane app-feedback-form" style="display:none;">
                            <div class="app-feedback-target">
                                <div class="app-feedback-target-title"></div>
                                <div class="app-feedback-target-name"></div>
@@ -104,7 +107,7 @@ async function UIWindowAppFeedback (options) {
                            </div>
                        </div>

-                        <div class="app-feedback-success" style="display:none;">
+                        <div class="app-feedback-pane app-feedback-success" style="display:none;">
                            <div class="app-feedback-success-check" aria-hidden="true">
                                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round"><path d="M20 6 9 17l-5-5"/></svg>
                            </div>
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+// @vitest-environment jsdom
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import jQuery from '../lib/jquery-3.6.1/jquery-3.6.1.min.js';
+
+const { default: UIWindowAppFeedback } = await import('./UIWindowAppFeedback.js');
+
+const flush = () => new Promise((r) => setTimeout(r, 0));
+const $ = (sel) => jQuery(sel);
+const visiblePanes = () => $('.app-feedback-pane').filter((_, el) => el.style.display !== 'none');
+
+/** Opens the dialog against an app that accepts feedback and waits for the form. */
+const open = async (options) => {
+    globalThis.fetch = vi.fn(async () => new Response(JSON.stringify({
+        enabled: true,
+        app: { title: 'Build with AI', name: 'builder' },
+    }), { status: 200, headers: { 'Content-Type': 'application/json' } }));
+    UIWindowAppFeedback({ origin: 'https://builder.puter.test', source: 'web', ...options });
+    await flush();
+    await flush();
+};
+
+beforeEach(() => {
+    document.body.innerHTML = '';
+    globalThis.$ = jQuery;
+    globalThis.i18n = (key) => key;
+    globalThis.html_encode = (value) => jQuery('<div>').text(value).html();
+    window.api_origin = 'https://api.puter.test';
+    window.auth_token = 'token';
+});
+
+afterEach(() => {
+    $(document).off('keydown');
+});
+
+describe('UIWindowAppFeedback', () => {
+    it('floats over the page by default', async () => {
+        await open();
+        expect($('.app-feedback-overlay').hasClass('app-feedback-fullpage')).toBe(false);
+        expect(visiblePanes().hasClass('app-feedback-form')).toBe(true);
+    });
+
+    it('fills the page when hosted in its own popup', async () => {
+        await open({ fullpage: true });
+        expect($('.app-feedback-overlay').hasClass('app-feedback-fullpage')).toBe(true);
+        expect(visiblePanes()).toHaveLength(1);
+        expect(visiblePanes().hasClass('app-feedback-form')).toBe(true);
+        expect($('.app-feedback-target-title').text()).toBe('Build with AI');
+    });
+});
@@ -18,31 +18,25 @@
 */

 import { isPlausibleHostname, normalizeHostnameInput } from '../helpers/customDomainHostname.js';
+import {
+    customDomainErrorText,
+    customDomainsRequest,
+    customDomainStatus as statusOf,
+    formatCustomDomainPrice,
+    mergeCustomDomainRefresh,
+} from '../helpers/customDomains.js';

 let attach_modal_seq = 0;

 const SUCCESS_AUTOCLOSE_MS = 1800;
 const COPIED_RESET_MS = 1400;

-/** API error code → message key; anything unlisted gets the generic error. */
-const ERROR_KEYS = {
-    invalid_hostname: 'custom_domain_error_invalid',
-    custom_domain_taken: 'custom_domain_error_taken',
-    custom_domain_limit_reached: 'custom_domain_error_limit',
-    custom_domain_rejected: 'custom_domain_error_rejected',
-    site_not_found: 'custom_domain_error_site',
-    custom_domain_not_found: 'custom_domain_error_not_found',
-    custom_domains_not_enabled: 'custom_domain_not_enabled',
-    custom_domains_permission_required: 'custom_domain_error_generic',
-};
-
-/** Domain status → the badge shown for it; anything else reads as pending. */
+/** Domain status → the badge shown for it. */
 const STATUS_BADGE_KEYS = {
    active: 'custom_domain_badge_active',
    pending: 'custom_domain_badge_pending',
    failed: 'custom_domain_badge_failed',
 };
-const statusOf = (domain) => (domain?.status in STATUS_BADGE_KEYS ? domain.status : 'pending');

 const svg = (body, strokeWidth = 2) =>
    `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="${strokeWidth}" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">${body}</svg>`;
@@ -55,19 +49,6 @@ const ICON_ALERT = svg('<circle cx="12" cy="12" r="9"/><path d="M12 7.5v5"/><pat
 const ICON_PLUS = svg('<path d="M12 5v14M5 12h14"/>', 2.2);
 const ICON_X = svg('<line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/>', 2.2);

-const format_price = (pricing) => {
-    if ( ! pricing || typeof pricing.amount !== 'number' ) return null;
-    try {
-        return new Intl.NumberFormat(undefined, {
-            style: 'currency',
-            currency: pricing.currency || 'USD',
-            minimumFractionDigits: 2,
-        }).format(pricing.amount);
-    } catch {
-        return null;
-    }
-};
-
 /**
 * "Connect a custom domain to this site" modal, behind
 * `puter.hosting.attach()`. The user picks one of their domains (moving it
@@ -102,7 +83,7 @@ async function UIWindowAttachCustomDomain (options) {
        const titleId = `${modal_id}-title`;
        const closeLabel = html_encode(i18n('close'));
        const h = `
-            <div class="app-feedback-overlay custom-domain-overlay${options.fullpage ? ' custom-domain-fullpage' : ''}" role="dialog" aria-modal="true" aria-labelledby="${titleId}">
+            <div class="app-feedback-overlay custom-domain-overlay${options.fullpage ? ' app-feedback-fullpage' : ''}" role="dialog" aria-modal="true" aria-labelledby="${titleId}">
                <div class="app-feedback-modal custom-domain-modal" tabindex="-1">
                    <div class="app-feedback-head custom-domain-head">
                        <div class="custom-domain-head-icon">${ICON_GLOBE}</div>
@@ -114,13 +95,13 @@ async function UIWindowAttachCustomDomain (options) {
                        <button type="button" class="app-feedback-x" aria-label="${closeLabel}" title="${closeLabel}">${ICON_X}</button>
                    </div>
                    <div class="app-feedback-body custom-domain-body">
-                        <div class="custom-domain-pane" data-pane="loading" aria-busy="true">
+                        <div class="app-feedback-pane custom-domain-pane" data-pane="loading" aria-busy="true">
                            <span class="custom-domain-sr">${i18n('loading')}…</span>
                            <div class="custom-domain-skeleton"><span></span><span></span></div>
                            <div class="custom-domain-skeleton"><span></span><span></span></div>
                        </div>

-                        <div class="custom-domain-pane custom-domain-state" data-pane="unavailable" style="display:none;">
+                        <div class="app-feedback-pane custom-domain-pane custom-domain-state" data-pane="unavailable" style="display:none;">
                            <div class="custom-domain-state-icon">${ICON_ALERT}</div>
                            <p class="app-feedback-unavailable-message"></p>
                            <div class="app-feedback-actions">
@@ -128,7 +109,7 @@ async function UIWindowAttachCustomDomain (options) {
                            </div>
                        </div>

-                        <div class="custom-domain-pane" data-pane="list" style="display:none;">
+                        <div class="app-feedback-pane custom-domain-pane" data-pane="list" style="display:none;">
                            <ul class="custom-domain-list"></ul>
                            <div class="custom-domain-state custom-domain-empty" style="display:none;">
                                <div class="custom-domain-state-icon">${ICON_GLOBE}</div>
@@ -143,7 +124,7 @@ async function UIWindowAttachCustomDomain (options) {
                            </div>
                        </div>

-                        <form class="custom-domain-pane" data-pane="add" style="display:none;" novalidate>
+                        <form class="app-feedback-pane custom-domain-pane" data-pane="add" style="display:none;" novalidate>
                            <label class="custom-domain-label" for="${modal_id}-hostname">${i18n('custom_domain_hostname_label')}</label>
                            <div class="custom-domain-field">
                                ${ICON_GLOBE}
@@ -162,7 +143,7 @@ async function UIWindowAttachCustomDomain (options) {
                            </div>
                        </form>

-                        <div class="custom-domain-pane" data-pane="records" style="display:none;">
+                        <div class="app-feedback-pane custom-domain-pane" data-pane="records" style="display:none;">
                            <div class="custom-domain-status-card">
                                <div class="custom-domain-status-icon"></div>
                                <div class="custom-domain-status-main">
@@ -184,7 +165,7 @@ async function UIWindowAttachCustomDomain (options) {
                            </div>
                        </div>

-                        <div class="custom-domain-pane app-feedback-success custom-domain-success" data-pane="success" role="status" style="display:none;">
+                        <div class="app-feedback-pane custom-domain-pane app-feedback-success custom-domain-success" data-pane="success" role="status" style="display:none;">
                            <div class="app-feedback-success-check">${ICON_CHECK}</div>
                            <p class="app-feedback-success-text custom-domain-success-text"></p>
                            <p class="app-feedback-note custom-domain-success-note"></p>
@@ -254,35 +235,7 @@ async function UIWindowAttachCustomDomain (options) {
            focusedBeforeBusy = null;
        };

-        const api = async (method, path = '', body) => {
-            const res = await fetch(`${window.api_origin}/custom-domains${path}`, {
-                method,
-                headers: {
-                    'Authorization': `Bearer ${authToken}`,
-                    ...(body ? { 'Content-Type': 'application/json' } : {}),
-                },
-                body: body ? JSON.stringify(body) : undefined,
-            });
-            let data = null;
-            try {
-                data = await res.json();
-            } catch {
-                // Non-JSON body; callers go by the status.
-            }
-            return { status: res.status, ok: res.ok, data };
-        };
-        // A known code gets our wording; anything else shows what the server
-        // said, which beats a generic message when something is misconfigured.
-        const errorFor = (res) => {
-            if ( res.status === 402 ) return text('custom_domain_error_plan');
-            if ( res.status === 429 ) return text('custom_domain_error_rate_limited');
-            const key = ERROR_KEYS[res.data?.code];
-            if ( key ) return text(key);
-            if ( typeof res.data?.message === 'string' && res.data.message ) {
-                return res.data.message;
-            }
-            return `${text('custom_domain_error_generic')} (HTTP ${res.status})`;
-        };
+        const api = (method, path = '', body) => customDomainsRequest(method, path, body, authToken);

        // Escape backs out of a pending confirmation first. Escape, the
        // backdrop and the close buttons all dismiss, except while a request
@@ -503,7 +456,7 @@ async function UIWindowAttachCustomDomain (options) {
            try {
                const res = await api('PATCH', `/${encodeURIComponent(item.uuid)}`, { site: subdomain });
                if ( ! res.ok ) {
-                    showError('list', errorFor(res));
+                    showError('list', customDomainErrorText(res));
                    return;
                }
                settleOn(res.data);
@@ -524,7 +477,7 @@ async function UIWindowAttachCustomDomain (options) {
            try {
                const res = await api('DELETE', `/${encodeURIComponent(item.uuid)}`);
                if ( ! res.ok && res.status !== 404 ) {
-                    showError(pane, errorFor(res));
+                    showError(pane, customDomainErrorText(res));
                    return false;
                }
                // A removed domain is no answer to hand the caller.
@@ -611,7 +564,7 @@ async function UIWindowAttachCustomDomain (options) {
                    return;
                }
                if ( ! res.ok ) {
-                    showError('add', errorFor(res));
+                    showError('add', customDomainErrorText(res));
                    return;
                }
                hideClaim();
@@ -650,7 +603,7 @@ async function UIWindowAttachCustomDomain (options) {
                .toggle(!!domain.statusDetail && status !== 'active');
            const $redirect = $overlay.find('.custom-domain-redirect').toggle(!!domain.redirectFrom);
            if ( domain.redirectFrom ) {
-                $redirect.html(i18n('custom_domain_redirect_note', [domain.redirectFrom, domain.hostname]));
+                $redirect.html(i18n('custom_domain_redirect_note', [domain.hostname, domain.redirectFrom]));
            }
            $overlay.find('.custom-domain-apex').toggle(domain.isApex === true);
            $overlay.find('.custom-domain-use-www').toggle(domain.isApex === true && status !== 'active');
@@ -670,22 +623,10 @@ async function UIWindowAttachCustomDomain (options) {
            try {
                const res = await api('GET', `/${encodeURIComponent(chosen.uuid)}`);
                if ( ! res.ok ) {
-                    showError('records', errorFor(res));
+                    showError('records', customDomainErrorText(res));
                    return;
                }
-                // A domain that is no longer pending comes back with only its
-                // routing record, and a GET never repeats the provider or the
-                // redirect; keep what was shown when it was added.
-                const known = chosen.records ?? [];
-                const redirect = known.filter((r) => r.purpose === 'redirect');
-                const fresh = (res.data.records?.length > 1 ? res.data.records : known)
-                    .filter((r) => r.purpose !== 'redirect');
-                const next = {
-                    ...res.data,
-                    dnsProvider: chosen.dnsProvider,
-                    redirectFrom: chosen.redirectFrom,
-                    records: [...fresh.slice(0, 1), ...redirect, ...fresh.slice(1)],
-                };
+                const next = mergeCustomDomainRefresh(chosen, res.data);
                if ( statusOf(next) === 'active' ) {
                    showSuccess(next);
                    return;
@@ -706,7 +647,7 @@ async function UIWindowAttachCustomDomain (options) {
            try {
                const res = await api('POST', `/${encodeURIComponent(chosen.uuid)}/use-www`);
                if ( ! res.ok ) {
-                    showError('records', errorFor(res));
+                    showError('records', customDomainErrorText(res));
                    return;
                }
                chosen = res.data;
@@ -758,7 +699,7 @@ async function UIWindowAttachCustomDomain (options) {
                    return;
                }
                renderList(res.data?.items ?? []);
-                const price = format_price(res.data?.pricing);
+                const price = formatCustomDomainPrice(res.data?.pricing);
                if ( price ) {
                    $overlay.find('.custom-domain-price').text(text('custom_domain_price_note', [price])).show();
                }
@@ -24,6 +24,8 @@ import { createAppBrowser } from './UI/Dashboard/AppBrowser.js';
 import { appTileLink } from './UI/Dashboard/appLink.js';
 import { installAppIconFallback } from './helpers/appIcon.js';
 import { guestAppLaunchUrl, launchAppInTab } from './helpers/appTabLaunch.js';
+import { embedHostTheme, forceColorScheme } from './helpers/embedHostTheme.js';
+import { embedSession } from './helpers/embedSession.js';

 window.$ = window.jQuery = jQuery;
 window.html_encode = value => encode(String(value ?? ''), { mode: 'nonAsciiPrintable' });
@@ -45,6 +47,10 @@ try {
    window.locale = JSON.parse(localStorage.getItem('user_preferences') || '{}')?.language || 'en';
 } catch { /* Corrupt preferences must not prevent loading apps. */ }
 const localeReady = loadLocale(window.locale);
+// The host names its user and theme in the fragment, which can change without a reload.
+window.addEventListener('hashchange', () => window.location.reload());
+const hostTheme = embedHostTheme(window.location.hash);
+if ( hostTheme ) forceColorScheme(document, hostTheme);
 // Apps whose launch is still fetching; a second click would open a second tab.
 const launching = new Set();

@@ -98,31 +104,12 @@ function launchTile ({ appName, targetLink }) {
        .finally(() => launching.delete(appName));
 }

-/**
- * The GUI session, from local storage or else the session cookie. Safari keys a
- * frame's local storage by the top-level origin, so under a sibling subdomain
- * the GUI's stored token is out of reach while its cookie is still sent.
- */
-async function readSession () {
-    let stored = null;
-    try {
-        stored = localStorage.getItem('auth_token_v2');
-    } catch { /* Storage the browser refuses holds no session; the cookie may. */ }
-    if ( stored ) return stored;
-    const response = await fetch('/get-gui-token', { credentials: 'include' });
-    // Only a 401 means there is no session; a rate limit or server error
-    // must not pass a signed-in user off as signed out.
-    if ( response.status === 401 ) return null;
-    if ( ! response.ok ) throw new Error(`Session lookup responded ${response.status}`);
-    return (await response.json())?.token || null;
-}
-
 /**
 * Signed in, the user's own apps through the SDK. Without a session, the
 * recommended apps the page was rendered with, and no SDK.
 */
 async function mount () {
-    window.auth_token = await readSession();
+    window.auth_token = (await embedSession(config.apiOrigin, window.location.hash))?.token ?? null;
    const guestApps = window.auth_token ? undefined : config.guestApps;
    if ( !window.auth_token && !guestApps?.length ) throw new Error('No apps to show without a session');

@@ -15,6 +15,39 @@ body {
    height: 100%;
 }

+/* Empty until the session check and the SDK finish; matches <puter-user-menu>'s spinner. */
+#app-browser:empty {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+#app-browser:empty::after {
+    content: '';
+    width: 22px;
+    height: 22px;
+    box-sizing: border-box;
+    border: 2px solid rgba(0, 0, 0, .12);
+    border-top-color: #555;
+    border-radius: 50%;
+    animation: app-browser-spin .7s linear infinite;
+}
+
+@keyframes app-browser-spin {
+    to { transform: rotate(360deg); }
+}
+
+@media (prefers-reduced-motion: reduce) {
+    #app-browser:empty::after { animation-duration: 1.6s; }
+}
+
+@media (prefers-color-scheme: dark) {
+    #app-browser:empty::after {
+        border-color: rgba(255, 255, 255, .15);
+        border-top-color: #ccc;
+    }
+}
+
 #app-browser .dashboard-section-apps {
    width: 100%;
 }
@@ -2739,15 +2739,17 @@ input.myapps-group-name:focus {
    }
 }

-/* In a popup that exists only for this dialog, the dialog is the page: a
-   centered column, with the actions pinned to the bottom edge. */
-.custom-domain-fullpage {
-    --cd-column: min(552px, 100% - 48px);
+/* In a popup that exists only to host one of these dialogs, the dialog is the
+   page: a centered column, with the actions pinned to the bottom edge. */
+.app-feedback-fullpage {
+    --afb-column: min(552px, 100% - 48px);
    padding: 0;
    align-items: stretch;
    background: var(--afb-bg);
 }
-.custom-domain-fullpage .custom-domain-modal {
+.app-feedback-fullpage .app-feedback-modal {
+    display: flex;
+    flex-direction: column;
    width: 100%;
    height: 100dvh;
    max-height: none;
@@ -2758,39 +2760,39 @@ input.myapps-group-name:focus {
    padding-bottom: 0;
    overflow: hidden;
 }
-.custom-domain-fullpage .app-feedback-x {
+.app-feedback-fullpage .app-feedback-x {
    display: none;
 }
-.custom-domain-fullpage .custom-domain-head {
-    width: var(--cd-column);
+.app-feedback-fullpage .app-feedback-head {
+    width: var(--afb-column);
    margin: 0 auto;
    padding: 28px 0 4px;
 }
-.custom-domain-fullpage .custom-domain-body {
+.app-feedback-fullpage .app-feedback-body {
    flex: 1;
    display: flex;
    flex-direction: column;
    overflow-y: auto;
    padding: 20px 0 0;
 }
-.custom-domain-fullpage .custom-domain-pane {
+.app-feedback-fullpage .app-feedback-pane {
    flex: 1 0 auto;
    display: flex;
    flex-direction: column;
 }
-.custom-domain-fullpage .custom-domain-pane > :not(.app-feedback-actions, .app-feedback-success-check, .custom-domain-state-icon) {
+.app-feedback-fullpage .app-feedback-pane > :not(.app-feedback-actions, .app-feedback-success-check, .custom-domain-state-icon) {
    box-sizing: border-box;
-    width: var(--cd-column);
+    width: var(--afb-column);
    margin-left: auto;
    margin-right: auto;
 }
 /* Keeps the actions off the content when it fills the page. */
-.custom-domain-fullpage .custom-domain-pane::after {
+.app-feedback-fullpage .app-feedback-pane::after {
    content: '';
    flex: 1 0 20px;
    order: 1;
 }
-.custom-domain-fullpage .app-feedback-actions {
+.app-feedback-fullpage .app-feedback-actions {
    order: 2;
    position: sticky;
    bottom: 0;
@@ -2799,9 +2801,18 @@ input.myapps-group-name:focus {
    background: var(--afb-bg);
    border-top: 1px solid var(--afb-border);
 }
-.custom-domain-fullpage .custom-domain-state .app-feedback-actions {
+.app-feedback-fullpage .app-feedback-unavailable .app-feedback-actions,
+.app-feedback-fullpage .custom-domain-state .app-feedback-actions {
    justify-content: center;
 }
+/* The message box takes the spare height instead of the spacer. */
+.app-feedback-fullpage .app-feedback-form::after {
+    flex-grow: 0;
+}
+.app-feedback-fullpage .app-feedback-message {
+    flex: 1 0 160px;
+    resize: none;
+}

 /* Add-an-app chooser (see showAddAppModal): the three ways to get an app, as
   rows in the same modal shell. min-width gives the two-line rows room without
@@ -5246,7 +5257,9 @@ body.myapps-reordering .myapps-tile {
    min-height: 0;
    display: flex;
    flex-direction: column;
-    padding-bottom: 30px;
+    /* Ends above the footer, not under it, so a drop outline drawn on its
+       edge shows all the way round. */
+    margin-bottom: 30px;
    overflow-y: auto;
    touch-action: pan-y;
 }
@@ -7026,7 +7039,7 @@ body.myapps-reordering .myapps-tile {
    }

    .dashboard-section-files .files {
-        padding-bottom: calc(30px + env(safe-area-inset-bottom, 0px));
+        margin-bottom: calc(30px + env(safe-area-inset-bottom, 0px));
    }

    /* The grids keep their own padding and clear the footer with a margin,
@@ -10590,6 +10603,253 @@ body.dashboard-mode .notifications-close-all {
    overflow-wrap: anywhere;
 }

+/* Contact Us: a message with screenshots or recordings attached */
+.dashboard-dialog.dashboard-contact-dialog {
+    width: min(500px, 100%);
+}
+
+.dashboard-contact-dialog .dashboard-form-input[name='message'] {
+    min-height: 132px;
+}
+
+.dashboard-contact-attachments {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+}
+
+.dashboard-contact-dropzone {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    width: 100%;
+    margin: 0;
+    padding: 12px 14px;
+    border: 1px dashed var(--dashboard-border);
+    border-radius: 10px;
+    background: transparent;
+    color: var(--dashboard-text-primary);
+    font: inherit;
+    text-align: start;
+    cursor: pointer;
+    box-sizing: border-box;
+    transition: border-color 0.15s ease, background-color 0.15s ease, box-shadow 0.15s ease;
+}
+
+.dashboard-contact-dropzone-icon {
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 34px;
+    height: 34px;
+    border-radius: 50%;
+    background: var(--select-tint);
+    color: var(--select-color);
+}
+
+.dashboard-contact-dropzone-icon svg {
+    width: 17px;
+    height: 17px;
+}
+
+.dashboard-contact-dropzone-text {
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+    min-width: 0;
+}
+
+.dashboard-contact-dropzone-label,
+.dashboard-contact-dropzone-drop {
+    font-size: 13px;
+    font-weight: 600;
+}
+
+.dashboard-contact-dropzone-drop {
+    display: none;
+    color: var(--select-text);
+}
+
+.dashboard-contact-dropzone-hint {
+    font-size: 12px;
+    line-height: 1.4;
+    color: var(--dashboard-text-muted);
+}
+
+@media (hover: hover) {
+    .dashboard-contact-dropzone:hover:not(:disabled) {
+        border-color: var(--select-color);
+        background: var(--select-tint-weak);
+    }
+}
+
+.dashboard-contact-dropzone:focus-visible {
+    outline: none;
+    border-color: var(--select-color);
+    box-shadow: 0 0 0 3px var(--select-ring);
+}
+
+.dashboard-contact-dropzone:disabled {
+    cursor: default;
+    opacity: 0.6;
+}
+
+/* Files dragged anywhere over the dialog land here. */
+.dashboard-contact-dragging .dashboard-contact-dropzone {
+    border-style: solid;
+    border-color: var(--select-color);
+    background: var(--select-tint);
+    box-shadow: 0 0 0 3px var(--select-ring);
+}
+
+.dashboard-contact-dragging .dashboard-contact-dropzone-label {
+    display: none;
+}
+
+.dashboard-contact-dragging .dashboard-contact-dropzone-drop {
+    display: block;
+}
+
+.dashboard-contact-files {
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+.dashboard-contact-files[hidden] {
+    display: none;
+}
+
+.dashboard-contact-file {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    min-width: 0;
+    padding: 6px;
+    border: 1px solid var(--dashboard-border);
+    border-radius: 10px;
+    background: var(--dashboard-input-background);
+    animation: dashboard-contact-file-in 160ms ease;
+}
+
+@keyframes dashboard-contact-file-in {
+    from {
+        opacity: 0;
+        transform: translateY(-4px);
+    }
+}
+
+.dashboard-contact-file-thumb {
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 40px;
+    height: 40px;
+    border-radius: 7px;
+    overflow: hidden;
+    background: var(--dashboard-sidebar-background);
+    color: var(--dashboard-text-secondary);
+}
+
+.dashboard-contact-file-thumb img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+.dashboard-contact-file-thumb svg {
+    width: 20px;
+    height: 20px;
+}
+
+.dashboard-contact-file-text {
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: column;
+    gap: 1px;
+    min-width: 0;
+}
+
+.dashboard-contact-file-name {
+    overflow: hidden;
+    font-size: 13px;
+    font-weight: 500;
+    color: var(--dashboard-text-primary);
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.dashboard-contact-file-size {
+    font-size: 12px;
+    color: var(--dashboard-text-muted);
+    font-variant-numeric: tabular-nums;
+}
+
+.dashboard-contact-file-remove {
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 32px;
+    height: 32px;
+    padding: 0;
+    border: none;
+    border-radius: 8px;
+    background: transparent;
+    color: var(--dashboard-text-secondary);
+    cursor: pointer;
+    transition: background 0.15s, color 0.15s;
+}
+
+.dashboard-contact-file-remove svg {
+    width: 16px;
+    height: 16px;
+}
+
+@media (hover: hover) {
+    .dashboard-contact-file-remove:hover:not(:disabled) {
+        background: var(--dashboard-hover);
+        color: var(--dashboard-text-primary);
+    }
+}
+
+.dashboard-contact-file-remove:focus-visible {
+    outline: none;
+    box-shadow: 0 0 0 3px var(--select-ring);
+}
+
+.dashboard-contact-file-remove:disabled {
+    cursor: default;
+    opacity: 0.5;
+}
+
+/* Sending: the files are on their way and no longer up for change. */
+.dashboard-contact-sending .dashboard-contact-file {
+    opacity: 0.7;
+}
+
+@media (pointer: coarse) {
+    .dashboard-contact-dropzone {
+        min-height: 56px;
+    }
+
+    .dashboard-contact-file-remove {
+        width: 44px;
+        height: 44px;
+    }
+}
+
+@media (prefers-reduced-motion: reduce) {
+    .dashboard-contact-file {
+        animation: none;
+    }
+}
+
 /* API token, shown once */
 .dashboard-token-warning {
    padding: 10px 12px;
@@ -10681,6 +10941,287 @@ body.dashboard-mode .notifications-close-all {
    }
 }

+/* ======================================
+   Publish dialog: custom domain
+   ====================================== */
+
+/* The address, once the site is live under it, reads as settled. */
+.dashboard-form-affix:has([readonly]) {
+    background: var(--dashboard-sidebar-background);
+}
+
+.dashboard-form-affix:has([readonly]):focus-within {
+    border-color: var(--dashboard-border);
+    box-shadow: none;
+}
+
+.dashboard-publish-upsell {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    padding: 12px;
+    border: 1px solid var(--dashboard-border);
+    border-radius: 12px;
+    background: var(--select-tint-weak);
+}
+
+.dashboard-publish-upsell[hidden],
+.dashboard-publish-claim[hidden] {
+    display: none;
+}
+
+.dashboard-publish-upsell-icon {
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 32px;
+    height: 32px;
+    border-radius: 50%;
+    background: var(--select-tint);
+    color: var(--select-color);
+}
+
+.dashboard-publish-upsell-icon svg {
+    width: 16px;
+    height: 16px;
+}
+
+.dashboard-publish-upsell-text {
+    flex: 1 1 auto;
+    min-width: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+}
+
+.dashboard-publish-upsell-title {
+    margin: 0;
+    font-size: 13px;
+    font-weight: 600;
+    line-height: 1.4;
+    color: var(--dashboard-text-primary);
+}
+
+.dashboard-publish-upsell .dashboard-dialog-btn {
+    flex-shrink: 0;
+    min-width: 0;
+}
+
+@media (max-width: 600px) {
+    .dashboard-publish-upsell {
+        flex-wrap: wrap;
+    }
+
+    /* The text keeps to the icon's row; only the button takes its own. */
+    .dashboard-publish-upsell-text {
+        flex-basis: 0;
+    }
+
+    .dashboard-publish-upsell .dashboard-dialog-btn {
+        flex-basis: 100%;
+    }
+}
+
+.dashboard-publish-claim {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+}
+
+.dashboard-publish-claim-text {
+    margin: 0;
+    padding: 10px 12px;
+    border: 1px solid var(--dashboard-warning-border);
+    border-radius: 8px;
+    background: var(--dashboard-warning-background);
+    color: var(--dashboard-warning-text);
+    font-size: 13px;
+    line-height: 1.45;
+}
+
+/* DNS records: the type, then a copyable name and value. */
+.dashboard-dns-records {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+}
+
+/* One grid per card, so the label column fits the longest label and the
+   name and value line up. */
+.dashboard-dns-record {
+    display: grid;
+    grid-template-columns: minmax(44px, max-content) minmax(0, 1fr);
+    align-items: center;
+    gap: 8px;
+    padding: 10px;
+    border: 1px solid var(--dashboard-border);
+    border-radius: 10px;
+    background: var(--dashboard-sidebar-background);
+}
+
+.dashboard-dns-record-head {
+    grid-column: 1 / -1;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.dashboard-dns-record-type {
+    padding: 2px 7px;
+    border-radius: 6px;
+    background: var(--select-tint);
+    color: var(--select-color);
+    font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+    font-size: 11px;
+    font-weight: 600;
+}
+
+.dashboard-dns-record-optional {
+    font-size: 11px;
+    color: var(--dashboard-text-muted);
+}
+
+.dashboard-dns-record-field {
+    display: contents;
+}
+
+.dashboard-dns-record-label {
+    font-size: 12px;
+    font-weight: 600;
+    color: var(--dashboard-text-secondary);
+}
+
+/* The done screen's domain, under the live address. */
+.dashboard-publish-domain {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+    padding-top: 14px;
+    border-top: 1px solid var(--dashboard-border);
+}
+
+.dashboard-publish-domain-summary {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+}
+
+.dashboard-publish-domain-head {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    min-width: 0;
+}
+
+.dashboard-publish-domain-icon {
+    flex-shrink: 0;
+    display: flex;
+    color: var(--dashboard-text-muted);
+}
+
+.dashboard-publish-domain-icon svg {
+    width: 16px;
+    height: 16px;
+}
+
+.dashboard-publish-domain-host {
+    min-width: 0;
+    font-size: 14px;
+    font-weight: 600;
+    color: var(--dashboard-text-primary);
+    overflow-wrap: anywhere;
+}
+
+.dashboard-publish-domain-badge {
+    flex-shrink: 0;
+    display: inline-flex;
+    align-items: center;
+    gap: 5px;
+    margin-left: auto;
+    padding: 2px 8px;
+    border-radius: 999px;
+    background: var(--dashboard-warning-background);
+    color: var(--dashboard-warning-text);
+    font-size: 11px;
+    font-weight: 600;
+}
+
+.dashboard-publish-domain-badge::before {
+    content: '';
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    background: currentColor;
+}
+
+.dashboard-publish-domain-badge[data-status='active'] {
+    background: var(--dashboard-success-background);
+    color: var(--dashboard-success-text);
+}
+
+.dashboard-publish-domain-badge[data-status='failed'] {
+    background: var(--dashboard-danger-background);
+    color: var(--dashboard-danger-text);
+}
+
+.dashboard-publish-domain-detail {
+    margin: 0;
+    font-size: 13px;
+    line-height: 1.45;
+    color: var(--dashboard-danger-text);
+    overflow-wrap: anywhere;
+}
+
+.dashboard-publish-domain-actions {
+    display: flex;
+}
+
+.dashboard-publish-domain-status {
+    margin: 0;
+    font-size: 12px;
+    line-height: 1.45;
+    color: var(--dashboard-text-secondary);
+}
+
+/* Empty, it stays in the a11y tree and gives back the gap it would claim. */
+.dashboard-publish-domain-status:empty {
+    margin-top: -10px;
+}
+
+.dashboard-publish-domain-status-error {
+    color: var(--dashboard-danger-text);
+}
+
+.dashboard-publish-link-btn {
+    align-self: flex-start;
+    padding: 0;
+    border: none;
+    background: none;
+    color: var(--dashboard-link);
+    font: inherit;
+    font-size: 12px;
+    text-align: left;
+    cursor: pointer;
+}
+
+@media (hover: hover) {
+    .dashboard-publish-link-btn:hover:not(:disabled) {
+        text-decoration: underline;
+    }
+}
+
+.dashboard-publish-link-btn:disabled {
+    opacity: 0.6;
+    cursor: default;
+}
+
+.dashboard-publish-link-btn:focus-visible {
+    outline: none;
+    border-radius: 4px;
+    box-shadow: 0 0 0 3px var(--select-ring);
+}
+
 /* ======================================
   Auth dialog (login, signup, account picker, password recovery, 2FA)
   ====================================== */
@@ -11090,7 +11631,7 @@ body.dashboard-mode .notifications-close-all {

 .auth-dialog .signup-terms {
    margin: 18px 0 0;
-    font-size: 12px;
+    font-size: 11px;
    line-height: 1.5;
    color: var(--dashboard-text-muted);
    text-align: center;
@@ -0,0 +1,17 @@
+/* Transparent, so the dialog's own scrim covers the framing page. */
+html,
+body {
+    margin: 0;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    background: transparent;
+    font-family: "Inter", "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+/* A scroll over the scrim must not scroll the framing page behind it. */
+html {
+    overscroll-behavior: none;
+    /* Matches the frame's, so it stays transparent and follows the OS theme. */
+    color-scheme: light dark;
+}
@@ -140,6 +140,21 @@ body {
    background-color: #ccccccbe !important;
 }

+/* A popup framed over its whole page, such as the upgrade, shows the page
+   around its own dialog. The root's color scheme matches the frame's, or the
+   browser paints the frame opaque; the GUI inside keeps the light scheme it
+   has everywhere else, so its form fields don't turn dark. */
+html.popup-frame-transparent,
+html.popup-frame-transparent body {
+    background: transparent !important;
+}
+html.popup-frame-transparent {
+    color-scheme: light dark;
+}
+html.popup-frame-transparent body {
+    color-scheme: light;
+}
+
 .disable-user-select {
    cursor: default;
    -webkit-touch-callout: none !important;
@@ -181,6 +196,20 @@ input[type=text], input[type=password], input[type=email], select {
    font-size: 14px;
 }

+@media (prefers-color-scheme: dark) {
+    input[type=text], input[type=password], input[type=email], select {
+        background-color: #2d2d2d;
+        border: 1px solid #555;
+        color: #e6e6e6;
+    }
+
+    input[type=text]::placeholder,
+    input[type=password]::placeholder,
+    input[type=email]::placeholder {
+        color: #999;
+    }
+}
+
 /* to prevent auto-zoom on input focus in mobile */
 .device-phone input[type=text], .device-phone input[type=password], .device-phone input[type=email], .device-phone select {
    font-size: 17px;
@@ -1478,6 +1507,18 @@ span.header-sort-icon img {
    align-items: center;
 }

+/* The file name shrinks so the buttons stay on one line, on screen, in a narrow dialog. */
+.window-filedialog-prompt > div {
+    min-width: 0;
+    white-space: nowrap;
+}
+
+@media (max-width: 480px) {
+    .window-filedialog-prompt .button-small {
+        padding: 0 16px;
+    }
+}
+
 .savefiledialog-filename {
    float: left;
    margin-right: 10px;
@@ -1485,10 +1526,21 @@ span.header-sort-icon img {
    border-width: 1px !important;
    height: 31px;
    flex-grow: 1;
+    min-width: 0;
    width: initial !important;
 }

+/* In a narrow open dialog, the upload label gives way so its buttons stay whole. */
+.window-filedialog-upload-here + div {
+    flex-shrink: 0;
+}
+
 .window-filedialog-upload-here {
+    min-width: 0;
+    margin-right: 10px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
    -webkit-font-smoothing: antialiased;
    opacity: 0.7;
    font-size: 14px;
@@ -5169,11 +5221,16 @@ html.dark-mode .usage-table-fade-overlay {
 }

 /* On a phone, units and cost keep every digit; the resource name is the
-   column that gives way. */
+   column that gives way, wrapping rather than cut off, since a touch screen
+   has no hover to show the rest. */
@media (max-width: 480px) {
    .dashboard-section-usage .driver-usage-details-content-table td:not(:first-child) {
        max-width: none;
    }
+    .dashboard-section-usage .driver-usage-details-content-table td:first-child {
+        white-space: normal;
+        overflow-wrap: anywhere;
+    }
 }
 .version {
    font-size: 9px;
@@ -0,0 +1,252 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';
+import { chromium } from '@playwright/test';
+import express from 'express';
+import webpack from 'webpack';
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { inflateSync } from 'node:zlib';
+
+let browser;
+let server;
+let directory;
+let origin;
+let hostOrigin;
+let port;
+const requests = [];
+const guiRoot = fileURLToPath(new URL('../', import.meta.url));
+const sessionToken = 'feedback-embed-test-session';
+const unconfirmedToken = 'feedback-embed-test-unconfirmed';
+const sessionUser = '0b1c9a52-3f0e-4c7a-9a65-2f6d1e8b7c40';
+const unconfirmedUser = '1c2d3e4f-5a6b-4c7d-8e9f-0a1b2c3d4e5f';
+const otherUser = '7d2e4f10-8a3b-4c5d-9e6f-0a1b2c3d4e5f';
+
+beforeAll(async () => {
+    directory = await mkdtemp(path.join(tmpdir(), 'puter-feedback-embed-'));
+    await new Promise((resolve, reject) => {
+        const compiler = webpack({
+            mode: 'development',
+            entry: { 'feedback-embed': path.join(guiRoot, 'src/feedbackEmbed.js') },
+            output: { path: directory, filename: '[name].min.js' },
+            module: { rules: [{ test: /jquery-3\.6\.1\.min\.js$/, type: 'javascript/auto' }] },
+        });
+        compiler.run((error, stats) => compiler.close(closeError => {
+            if ( error || closeError ) return reject(error || closeError);
+            if ( stats.hasErrors() ) return reject(new Error(stats.toString()));
+            resolve();
+        }));
+    });
+    const app = express();
+    app.use(express.json());
+    app.use((req, res, next) => {
+        requests.push({ path: req.path, query: req.query, body: req.body, auth: req.headers.authorization });
+        next();
+    });
+    app.use('/dist', express.static(directory));
+    app.use('/css', express.static(path.join(guiRoot, 'src/css')));
+    app.get('/get-gui-token', (_req, res) => res.sendStatus(401));
+    const whoamiByToken = {
+        [sessionToken]: { uuid: sessionUser, username: 'session-user', email: '[email protected]', email_confirmed: true },
+        [unconfirmedToken]: {
+            uuid: unconfirmedUser, username: 'new-user', email_confirmed: false, requires_email_confirmation: true,
+        },
+    };
+    app.get('/whoami', (req, res) => {
+        const user = whoamiByToken[req.headers.authorization?.replace(/^Bearer /, '')];
+        if ( ! user ) return res.sendStatus(401);
+        res.json(user);
+    });
+    app.get('/app-feedback/target', (req, res) => {
+        if ( req.headers.authorization !== `Bearer ${sessionToken}` ) return res.sendStatus(401);
+        if ( req.query.origin !== hostOrigin ) return res.json({ enabled: false });
+        res.json({ enabled: true, app: { name: 'notes', title: 'Notes' } });
+    });
+    app.post('/app-feedback', (req, res) => {
+        if ( req.headers.authorization !== `Bearer ${sessionToken}` ) return res.sendStatus(401);
+        res.json({});
+    });
+    // A first-party page that frames the dialog as puter.js does, recording what the embed tells it.
+    app.get('/host', (req, res) => res.send(`<!DOCTYPE html><html><body style="margin:0;background:rgb(255,0,0)">
+        <script>
+            window.received = [];
+            addEventListener('message', (e) => {
+                if ( e.origin === '${origin}' ) window.received.push(e.data);
+            });
+        </script>
+        <iframe referrerpolicy="origin" title="Send feedback" src="${origin}/embed/feedback#user=${req.query.user ?? ''}"
+            style="display:block;border:0;width:100vw;height:100vh;color-scheme:light dark"></iframe>
+        <div style="height:3000px"></div>
+    </body></html>`));
+    app.get('/embed/feedback', (_req, res) => {
+        res.setHeader('Content-Security-Policy', `frame-ancestors 'self' ${hostOrigin}`);
+        res.send(`<!DOCTYPE html><html><head><meta name="viewport" content="width=device-width, initial-scale=1">
+            <link rel="stylesheet" href="/css/normalize.css"><link rel="stylesheet" href="/css/dashboard.css">
+            <link rel="stylesheet" href="/css/feedback-embed.css"></head><body>
+            <main id="feedback-embed"></main>
+            <script type="application/json" id="feedback-embed-config">${JSON.stringify({ apiOrigin: origin, hostOrigin })}</script>
+            <script defer src="/dist/feedback-embed.min.js"></script></body></html>`);
+    });
+    server = await new Promise(resolve => {
+        const listener = app.listen(0, '127.0.0.1', () => resolve(listener));
+    });
+    port = server.address().port;
+    origin = `http://puter.localhost:${port}`;
+    hostOrigin = `http://notes.puter.localhost:${port}`;
+    browser = await chromium.launch();
+}, 60000);
+
+afterAll(async () => {
+    await browser?.close();
+    if ( server ) await new Promise(resolve => server.close(resolve));
+    if ( directory ) await rm(directory, { recursive: true, force: true });
+});
+
+/** A browser whose GUI origin is signed in with `token`, if any. */
+const signedIn = (token, options = {}) => browser.newContext({ ...options, storageState: {
+    cookies: [],
+    origins: token ? [{ origin, localStorage: [{ name: 'auth_token_v2', value: token }] }] : [],
+} });
+
+const received = page => page.evaluate(() => window.received);
+
+/** The [r, g, b] of one pixel of the page, from a screenshot. */
+const pixel = async (page, x, y) => {
+    const png = await page.screenshot({ clip: { x, y, width: 1, height: 1 }, animations: 'disabled' });
+    const data = [];
+    for ( let at = 8; at < png.length; ) {
+        const length = png.readUInt32BE(at);
+        if ( png.toString('ascii', at + 4, at + 8) === 'IDAT' ) data.push(png.subarray(at + 8, at + 8 + length));
+        at += 12 + length;
+    }
+    // One pixel: a filter byte, then its channels unchanged.
+    return [...inflateSync(Buffer.concat(data)).subarray(1, 4)];
+};
+
+describe('feedback embed', () => {
+    it('sends feedback for the framing page as the user it names, then tells it', async () => {
+        const context = await signedIn(sessionToken);
+        try {
+            const page = await context.newPage();
+            page.setDefaultTimeout(6000);
+            const errors = [];
+            page.on('pageerror', error => errors.push(error.message));
+            requests.length = 0;
+            await page.goto(`${hostOrigin}/host?user=${sessionUser}`);
+            const frame = page.frameLocator('iframe');
+            await frame.locator('.app-feedback-form').waitFor();
+            expect(await frame.locator('.app-feedback-target-title').textContent()).toBe('Notes');
+            expect(await received(page)).toEqual([
+                { msg: 'feedbackEmbed', state: 'loading' },
+                { msg: 'feedbackEmbed', state: 'ready' },
+            ]);
+            // The page behind shows through around the dialog, under its scrim.
+            expect(await frame.locator('body').evaluate(el => getComputedStyle(el).backgroundColor)).toBe('rgba(0, 0, 0, 0)');
+            await page.screenshot({ path: path.join(tmpdir(), 'puter-feedback-embed.png'), animations: 'disabled' });
+
+            await frame.locator('.app-feedback-message').fill('Love the new editor');
+            await frame.locator('.app-feedback-send-btn').click();
+            await frame.locator('.app-feedback-success').waitFor();
+            await page.waitForFunction(() => window.received.some(m => m.msg === 'feedbackDialogClosed'));
+            expect((await received(page)).at(-1)).toEqual({ msg: 'feedbackDialogClosed', sent: true });
+            expect(await frame.locator('.app-feedback-overlay').count()).toBe(0);
+
+            const submit = requests.find(req => req.path === '/app-feedback');
+            expect(submit.body).toEqual({ origin: hostOrigin, message: 'Love the new editor', context: 'web' });
+            expect(submit.auth).toBe(`Bearer ${sessionToken}`);
+            expect(errors).toEqual([]);
+        } finally {
+            await context.close();
+        }
+    }, 30000);
+
+    it('answers not sent when the user dismisses it', async () => {
+        const context = await signedIn(sessionToken);
+        try {
+            const page = await context.newPage();
+            page.setDefaultTimeout(6000);
+            await page.goto(`${hostOrigin}/host?user=${sessionUser}`);
+            const frame = page.frameLocator('iframe');
+            await frame.locator('.app-feedback-form').waitFor();
+            await frame.locator('.app-feedback-message').press('Escape');
+            await page.waitForFunction(() => window.received.some(m => m.msg === 'feedbackDialogClosed'));
+            expect((await received(page)).at(-1)).toEqual({ msg: 'feedbackDialogClosed', sent: false });
+        } finally {
+            await context.close();
+        }
+    }, 30000);
+
+    it.each(['light', 'dark'])('lets the page show through under the scrim in %s mode', async (colorScheme) => {
+        const context = await signedIn(sessionToken, { colorScheme });
+        try {
+            const page = await context.newPage();
+            page.setDefaultTimeout(6000);
+            await page.goto(`${hostOrigin}/host?user=${sessionUser}`);
+            const frame = page.frameLocator('iframe');
+            await frame.locator('.app-feedback-form').waitFor();
+            expect(await frame.locator('body').evaluate(() => matchMedia('(prefers-color-scheme: dark)').matches))
+                .toBe(colorScheme === 'dark');
+            await page.waitForTimeout(300);
+            // The red page, dimmed by the scrim, rather than an opaque frame.
+            const [red, green, blue] = await pixel(page, 10, 10);
+            expect(red).toBeGreaterThan(green + 40);
+            expect(green).toBe(blue);
+        } finally {
+            await context.close();
+        }
+    }, 30000);
+
+    it('keeps the page behind from scrolling under the scrim', async () => {
+        const context = await signedIn(sessionToken);
+        try {
+            const page = await context.newPage();
+            page.setDefaultTimeout(6000);
+            await page.goto(`${hostOrigin}/host?user=${sessionUser}`);
+            await page.frameLocator('iframe').locator('.app-feedback-form').waitFor();
+            await page.mouse.move(10, 10);
+            await page.mouse.wheel(0, 600);
+            await page.waitForTimeout(300);
+            expect(await page.evaluate(() => window.scrollY)).toBe(0);
+        } finally {
+            await context.close();
+        }
+    }, 30000);
+
+    it.each([
+        ['no Puter session', null, sessionUser],
+        ['a session for another user', sessionToken, otherUser],
+        ['a host that names no user', sessionToken, ''],
+        ['an email still to confirm', unconfirmedToken, unconfirmedUser],
+    ])('tells the host it is unavailable with %s', async (_label, token, user) => {
+        const context = await signedIn(token);
+        try {
+            const page = await context.newPage();
+            page.setDefaultTimeout(6000);
+            requests.length = 0;
+            await page.goto(`${hostOrigin}/host?user=${user}`);
+            await page.waitForFunction(() => window.received.length >= 2);
+            expect(await received(page)).toEqual([
+                { msg: 'feedbackEmbed', state: 'loading' },
+                { msg: 'feedbackEmbed', state: 'unavailable' },
+            ]);
+            expect(await page.frameLocator('iframe').locator('.app-feedback-overlay').count()).toBe(0);
+            expect(requests.some(req => req.path.startsWith('/app-feedback'))).toBe(false);
+        } finally {
+            await context.close();
+        }
+    }, 30000);
+
+    it('does nothing when opened on its own', async () => {
+        const context = await signedIn(sessionToken);
+        try {
+            const page = await context.newPage();
+            requests.length = 0;
+            await page.goto(`${origin}/embed/feedback#user=${sessionUser}`);
+            await page.waitForLoadState('networkidle');
+            expect(await page.locator('.app-feedback-overlay').count()).toBe(0);
+            expect(requests.some(req => req.path === '/whoami')).toBe(false);
+        } finally {
+            await context.close();
+        }
+    }, 30000);
+});
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import jQuery from './lib/jquery-3.6.1/jquery-3.6.1.min.js';
+import { encode } from 'html-entities';
+import { loadLocale } from './i18n/embedI18n.js';
+import UIWindowAppFeedback from './UI/UIWindowAppFeedback.js';
+import { embedSession } from './helpers/embedSession.js';
+
+window.$ = window.jQuery = jQuery;
+window.html_encode = value => encode(String(value ?? ''), { mode: 'nonAsciiPrintable' });
+
+const config = JSON.parse(document.querySelector('#feedback-embed-config').textContent);
+window.api_origin = config.apiOrigin;
+window.locale = 'en';
+try {
+    window.locale = JSON.parse(localStorage.getItem('user_preferences') || '{}')?.language || 'en';
+} catch { /* Corrupt preferences must not prevent sending feedback. */ }
+const localeReady = loadLocale(window.locale);
+
+/** Answers only the page frame-ancestors pinned, which the feedback is for. */
+const tellHost = (data) => window.parent.postMessage(data, config.hostOrigin);
+
+/** Resolves once the dialog's overlay has left the page, after its success pane and exit. */
+const overlayGone = () => new Promise((resolve) => {
+    const gone = () => !document.querySelector('.app-feedback-overlay');
+    if ( gone() ) return resolve();
+    const observer = new MutationObserver(() => {
+        if ( ! gone() ) return;
+        observer.disconnect();
+        resolve();
+    });
+    observer.observe(document.body, { childList: true });
+});
+
+/**
+ * Shows the app feedback dialog for the framing page, as the signed-in user it
+ * names. Without that user's session, or with an email still to confirm, the
+ * host is told the embed is unavailable and uses the popup, which can sign in.
+ */
+async function run () {
+    tellHost({ msg: 'feedbackEmbed', state: 'loading' });
+    let session = null;
+    try {
+        session = await embedSession(config.apiOrigin, window.location.hash);
+    } catch (e) {
+        console.error('feedback embed: session check failed', e);
+    }
+    const user = session?.user;
+    if ( !user || (user.requires_email_confirmation && !user.email_confirmed) ) {
+        tellHost({ msg: 'feedbackEmbed', state: 'unavailable' });
+        return;
+    }
+    window.auth_token = session.token;
+    window.user = user;
+    await localeReady;
+
+    tellHost({ msg: 'feedbackEmbed', state: 'ready' });
+    let sent = false;
+    try {
+        sent = await UIWindowAppFeedback({ origin: config.hostOrigin, source: 'web' });
+        await overlayGone();
+    } catch (e) {
+        console.error('feedback embed: dialog failed', e);
+    }
+    tellHost({ msg: 'feedbackDialogClosed', sent: sent === true });
+}
+
+// Opened on its own, there is no page to send feedback for or answer.
+if ( config.hostOrigin && window.parent !== window ) run();
@@ -70,7 +70,7 @@ if ( window.logged_in_users.length === 0 && window.user !== null ) {
    let tuser = window.user;
    tuser.auth_token = window.auth_token;
    window.logged_in_users.push(tuser);
-    localStorage.setItem('logged_in_users', window.logged_in_users);
+    localStorage.setItem('logged_in_users', JSON.stringify(window.logged_in_users));
 }

 window.last_window_zindex = 1;
@@ -224,10 +224,11 @@ window.suggest_apps_for_fsentry = async (options) => {
 */
 window.byte_format = (bytes) => {
    const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB'];
-    if ( bytes === 0 ) return '0 Byte';
    let i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)));
-    if ( i < 0 ) i = 0;
+    if ( ! (i > 0) ) i = 0;
    if ( i >= sizes.length ) i = sizes.length - 1;
+    // Whole bytes have no fraction: "0 Bytes", "1 Byte", "512 Bytes".
+    if ( i === 0 ) return `${bytes} ${bytes === 1 ? 'Byte' : 'Bytes'}`;
    return `${(bytes / Math.pow(1024, i)).toFixed(2) } ${ sizes[i]}`;
 };

@@ -663,33 +664,20 @@ window.update_auth_data = async (auth_token, user) => {
        $('.user-email').html(html_encode(user.email));
    }

-    // ----------------------------------------------------
-    // load the user's profile
-    // ----------------------------------------------------
-    user.profile = {};
-    puter.auth.getProfile().then((profile) => {
-        window.user.profile.displayName = profile?.displayName ?? null;
-        window.user.profile.bio = profile?.bio ?? null;
-        if ( profile?.displayName ) {
-            $('.dashboard-profile-display-name').text(profile.displayName);
-        }
-        if ( profile?.picture ) {
-            window.user.profile.picture = html_encode(profile.picture);
-            $('.profile-pic').css('background-image', `url(${window.user.profile.picture})`);
-            // the account tab may have rendered before the profile arrived
-            $('.dashboard-profile-remove-picture').prop('hidden', false);
-        }
-    }).catch((error) => {
-        console.error('Error loading profile:', error);
-    });
-
-    // ----------------------------------------------------
+    // Keep this account's last known profile until the fresh one loads below;
+    // the account picker reads pictures from the stored copy.
+    const known_profile = window.logged_in_users.find(known => known.uuid === user.uuid)?.profile;
+    user.profile = { ...(known_profile ?? user.profile ?? {}) };

    const to_storable_user = user => {
        const storable_user = { ...user };
        delete storable_user.taskbar_items;
        return storable_user;
    };
+    const store_users = () => {
+        localStorage.setItem('user', JSON.stringify(to_storable_user(window.user)));
+        localStorage.setItem('logged_in_users', JSON.stringify(window.logged_in_users.map(to_storable_user)));
+    };

    // update this session's user data
    window.user = user;
@@ -715,10 +703,33 @@ window.update_auth_data = async (auth_token, user) => {
            userobj.auth_token = window.auth_token;
            window.logged_in_users.push(userobj);
        }
-        // update local storage
-        localStorage.setItem('logged_in_users', JSON.stringify(window.logged_in_users.map(to_storable_user)));
+        store_users();
    }

+    // Loaded only after puter.js holds this account's token, so it can't
+    // return the previous account's profile.
+    puter.auth.getProfile().then((profile) => {
+        // Another account may have signed in while this was loading.
+        if ( !profile || window.user !== user ) return;
+        const shown_picture = user.profile.picture ?? null;
+        user.profile = {
+            displayName: profile.displayName ?? null,
+            bio: profile.bio ?? null,
+            picture: profile.picture ? html_encode(profile.picture) : null,
+        };
+        store_users();
+        if ( profile.displayName ) {
+            $('.dashboard-profile-display-name').text(profile.displayName);
+        }
+        // the account tab may have rendered before the profile arrived
+        if ( user.profile.picture !== shown_picture ) {
+            $('.profile-pic').css('background-image', `url(${user.profile.picture || window.icons['profile.svg']})`);
+            $('.dashboard-profile-remove-picture').prop('hidden', !user.profile.picture);
+        }
+    }).catch((error) => {
+        console.error('Error loading profile:', error);
+    });
+
    window.desktop_path = `/${ window.user.username }/Desktop`;
    window.trash_path = `/${ window.user.username }/Trash`;
    window.appdata_path = `/${ window.user.username }/AppData`;
@@ -51,8 +51,16 @@ describe('update_auth_data', () => {
        window.logged_in_users = [];
        window.gui_origin = 'https://puter.test';
        window.available_templates = vi.fn();
+        window.icons = { 'profile.svg': '/profile.svg' };
+        globalThis.fetch = vi.fn(async () => ({ ok: true }));
+        puter.setAuthToken.mockClear();
+        puter.auth.getProfile.mockReset();
+        puter.auth.getProfile.mockResolvedValue({});
    });

+    const storedUsers = () => JSON.parse(localStorage.getItem('logged_in_users'));
+    const settle = () => new Promise(resolve => setTimeout(resolve));
+
    // Sign-in awaits this while its card is still up, over every ordinary window.
    it('raises a failed session-cookie sync above the sign-in card', async () => {
        globalThis.fetch = vi.fn(async () => {
@@ -62,4 +70,49 @@ describe('update_auth_data', () => {
        expect(UIAlert).toHaveBeenCalledOnce();
        expect(UIAlert.mock.calls[0][0]).toMatchObject({ stay_on_top: true });
    });
+
+    // The account picker shows pictures from the stored list, not from memory.
+    it('stores the loaded profile picture with the signed-in account', async () => {
+        puter.auth.getProfile.mockResolvedValue({ picture: 'data:image/png;base64,AAAA' });
+        await window.update_auth_data('token-a', { uuid: 'a', username: 'a' });
+        await settle();
+        expect(storedUsers()).toEqual([
+            expect.objectContaining({ uuid: 'a', profile: expect.objectContaining({ picture: 'data:image/png;base64,AAAA' }) }),
+        ]);
+    });
+
+    it('keeps the stored picture while a refreshed profile is loading', async () => {
+        window.logged_in_users = [{ uuid: 'a', username: 'a', profile: { picture: 'data:image/png;base64,AAAA' } }];
+        puter.auth.getProfile.mockReturnValue(new Promise(() => {}));
+        // a whoami refresh carries no profile
+        await window.update_auth_data('token-a', { uuid: 'a', username: 'a' });
+        expect(storedUsers()[0].profile.picture).toBe('data:image/png;base64,AAAA');
+    });
+
+    it('drops a stored picture the account no longer has', async () => {
+        window.logged_in_users = [{ uuid: 'a', username: 'a', profile: { picture: 'data:image/png;base64,AAAA' } }];
+        puter.auth.getProfile.mockResolvedValue({ picture: null });
+        await window.update_auth_data('token-a', { uuid: 'a', username: 'a' });
+        await settle();
+        expect(storedUsers()[0].profile.picture).toBeNull();
+    });
+
+    it('loads the profile with the new account\'s token', async () => {
+        await window.update_auth_data('token-b', { uuid: 'b', username: 'b' });
+        expect(puter.setAuthToken.mock.invocationCallOrder[0])
+            .toBeLessThan(puter.auth.getProfile.mock.invocationCallOrder[0]);
+    });
+
+    it('ignores a profile that arrives after another account signed in', async () => {
+        let resolveA;
+        puter.auth.getProfile.mockReturnValueOnce(new Promise(resolve => {
+            resolveA = resolve;
+        }));
+        await window.update_auth_data('token-a', { uuid: 'a', username: 'a' });
+        await window.update_auth_data('token-b', { uuid: 'b', username: 'b' });
+        resolveA({ picture: 'data:image/png;base64,AAAA' });
+        await settle();
+        expect(storedUsers().find(stored => stored.uuid === 'b').profile.picture).toBeNull();
+        expect(window.user.profile.picture).toBeNull();
+    });
 });
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+// The `/custom-domains` API as the GUI talks to it, with its own session:
+// the desktop's attach dialog and the dashboard's publish dialog share it.
+
+/**
+ * @typedef {object} CustomDomainRecord
+ * @property {string} type
+ * @property {string} name
+ * @property {string} value
+ * @property {'routing'|'redirect'|string} [purpose]
+ * @property {boolean} [required]
+ */
+
+/**
+ * @typedef {object} CustomDomain
+ * @property {string} uuid
+ * @property {string} hostname
+ * @property {string} site Subdomain of the website it serves.
+ * @property {'active'|'pending'|'failed'|string} status
+ * @property {string} [statusDetail]
+ * @property {boolean} [isApex]
+ * @property {string} [redirectFrom] The root domain forwarding to `hostname`.
+ * @property {string} [dnsProvider]
+ * @property {CustomDomainRecord[]} [records]
+ */
+
+/**
+ * @typedef {object} CustomDomainResponse
+ * @property {number} status
+ * @property {boolean} ok
+ * @property {any} data The parsed JSON body, or null.
+ */
+
+/** API error code → message key; anything unlisted gets the server's message. */
+const ERROR_KEYS = {
+    invalid_hostname: 'custom_domain_error_invalid',
+    custom_domain_taken: 'custom_domain_error_taken',
+    custom_domain_limit_reached: 'custom_domain_error_limit',
+    custom_domain_rejected: 'custom_domain_error_rejected',
+    site_not_found: 'custom_domain_error_site',
+    custom_domain_not_found: 'custom_domain_error_not_found',
+    custom_domains_not_enabled: 'custom_domain_not_enabled',
+    custom_domains_permission_required: 'custom_domain_error_generic',
+};
+
+/** Error codes that mean "try another hostname". */
+export const CUSTOM_DOMAIN_HOSTNAME_ERRORS = new Set([
+    'invalid_hostname',
+    'custom_domain_taken',
+    'custom_domain_rejected',
+]);
+
+const STATUSES = new Set(['active', 'pending', 'failed']);
+
+/**
+ * A domain's status as the GUI draws it; anything unknown reads as pending.
+ *
+ * @param {Partial<CustomDomain> | null | undefined} domain
+ * @returns {'active'|'pending'|'failed'}
+ */
+export const customDomainStatus = (domain) => (STATUSES.has(domain?.status) ? domain.status : 'pending');
+
+/**
+ * The monthly price the list call reports, in the user's locale.
+ *
+ * @param {{ amount?: number, currency?: string } | null | undefined} pricing
+ * @returns {string | null}
+ */
+export const formatCustomDomainPrice = (pricing) => {
+    if ( ! pricing || typeof pricing.amount !== 'number' ) return null;
+    try {
+        return new Intl.NumberFormat(undefined, {
+            style: 'currency',
+            currency: pricing.currency || 'USD',
+            minimumFractionDigits: 2,
+        }).format(pricing.amount);
+    } catch {
+        return null;
+    }
+};
+
+/**
+ * Calls `/custom-domains{path}`. Resolves with the status and parsed body,
+ * even for an error status; rejects only when the request itself fails.
+ *
+ * @param {'GET'|'POST'|'PATCH'|'DELETE'} method
+ * @param {string} [path] Starting with `/`, after `/custom-domains`.
+ * @param {object} [body]
+ * @param {string} [authToken] Defaults to the GUI's session.
+ * @returns {Promise<CustomDomainResponse>}
+ */
+export const customDomainsRequest = async (method, path = '', body, authToken = puter.authToken ?? window.auth_token) => {
+    const res = await fetch(`${window.api_origin}/custom-domains${path}`, {
+        method,
+        headers: {
+            'Authorization': `Bearer ${authToken}`,
+            ...(body ? { 'Content-Type': 'application/json' } : {}),
+        },
+        body: body ? JSON.stringify(body) : undefined,
+    });
+    let data = null;
+    try {
+        data = await res.json();
+    } catch {
+        // Non-JSON body; callers go by the status.
+    }
+    return { status: res.status, ok: res.ok, data };
+};
+
+/**
+ * Plain text for a failed response. A known code gets our wording; anything
+ * else shows what the server said, which beats a generic message when
+ * something is misconfigured.
+ *
+ * @param {CustomDomainResponse} res
+ * @returns {string}
+ */
+export const customDomainErrorText = (res) => {
+    const text = (key) => i18n(key, [], false);
+    if ( res.status === 402 ) return text('custom_domain_error_plan');
+    if ( res.status === 429 ) return text('custom_domain_error_rate_limited');
+    const key = ERROR_KEYS[res.data?.code];
+    if ( key ) return text(key);
+    if ( typeof res.data?.message === 'string' && res.data.message ) {
+        return res.data.message;
+    }
+    return `${text('custom_domain_error_generic')} (HTTP ${res.status})`;
+};
+
+/**
+ * What to show after a status check. A domain that is no longer pending
+ * comes back with only its routing record, and a GET never repeats the DNS
+ * provider or the redirect, so those are kept from what was shown before.
+ *
+ * @param {CustomDomain} known What the add (or the last check) returned.
+ * @param {CustomDomain} fresh What the GET returned.
+ * @returns {CustomDomain}
+ */
+export const mergeCustomDomainRefresh = (known, fresh) => {
+    const knownRecords = known.records ?? [];
+    const redirect = knownRecords.filter((r) => r.purpose === 'redirect');
+    const records = (fresh.records?.length > 1 ? fresh.records : knownRecords)
+        .filter((r) => r.purpose !== 'redirect');
+    return {
+        ...fresh,
+        dnsProvider: known.dnsProvider,
+        redirectFrom: known.redirectFrom,
+        records: [...records.slice(0, 1), ...redirect, ...records.slice(1)],
+    };
+};
@@ -0,0 +1,115 @@
+// @vitest-environment jsdom
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import {
+    customDomainErrorText,
+    customDomainsRequest,
+    customDomainStatus,
+    formatCustomDomainPrice,
+    mergeCustomDomainRefresh,
+} from './customDomains.js';
+
+beforeEach(() => {
+    globalThis.i18n = (key) => key;
+    globalThis.puter = { authToken: 'session-token' };
+    window.api_origin = 'https://api.puter.test';
+});
+
+describe('customDomainStatus', () => {
+    it('keeps a known status and reads anything else as pending', () => {
+        expect(customDomainStatus({ status: 'active' })).toBe('active');
+        expect(customDomainStatus({ status: 'failed' })).toBe('failed');
+        expect(customDomainStatus({ status: 'verifying' })).toBe('pending');
+        expect(customDomainStatus(null)).toBe('pending');
+    });
+});
+
+describe('formatCustomDomainPrice', () => {
+    it('formats the amount in its currency', () => {
+        expect(formatCustomDomainPrice({ amount: 0.5, currency: 'USD' })).toMatch(/0[.,]50/);
+    });
+
+    it('gives null without an amount or for a currency it cannot format', () => {
+        expect(formatCustomDomainPrice(null)).toBeNull();
+        expect(formatCustomDomainPrice({ currency: 'USD' })).toBeNull();
+        expect(formatCustomDomainPrice({ amount: 1, currency: 'not-a-currency' })).toBeNull();
+    });
+});
+
+describe('customDomainsRequest', () => {
+    it('sends the session token and a JSON body, and parses the reply', async () => {
+        globalThis.fetch = vi.fn(async () => new Response(JSON.stringify({ uuid: 'd1' }), { status: 201 }));
+        const res = await customDomainsRequest('POST', '', { site: 'my-site', hostname: 'www.example.com' });
+        expect(fetch).toHaveBeenCalledWith('https://api.puter.test/custom-domains', {
+            method: 'POST',
+            headers: { 'Authorization': 'Bearer session-token', 'Content-Type': 'application/json' },
+            body: '{"site":"my-site","hostname":"www.example.com"}',
+        });
+        expect(res).toEqual({ status: 201, ok: true, data: { uuid: 'd1' } });
+    });
+
+    it('resolves an error status with a null body when it is not JSON', async () => {
+        globalThis.fetch = vi.fn(async () => new Response('Not Found', { status: 404 }));
+        expect(await customDomainsRequest('GET', '/d1')).toEqual({ status: 404, ok: false, data: null });
+        expect(fetch.mock.calls[0][0]).toBe('https://api.puter.test/custom-domains/d1');
+        expect(fetch.mock.calls[0][1].headers).toEqual({ 'Authorization': 'Bearer session-token' });
+    });
+});
+
+describe('customDomainErrorText', () => {
+    it('words plan, rate limit and known codes itself', () => {
+        expect(customDomainErrorText({ status: 402, data: { code: 'subscription_required' } })).toBe('custom_domain_error_plan');
+        expect(customDomainErrorText({ status: 429, data: null })).toBe('custom_domain_error_rate_limited');
+        expect(customDomainErrorText({ status: 409, data: { code: 'custom_domain_taken', message: 'x' } })).toBe('custom_domain_error_taken');
+    });
+
+    it("falls back to the server's message, then to the status", () => {
+        expect(customDomainErrorText({ status: 502, data: { message: 'Provider down' } })).toBe('Provider down');
+        expect(customDomainErrorText({ status: 500, data: null })).toBe('custom_domain_error_generic (HTTP 500)');
+    });
+});
+
+describe('mergeCustomDomainRefresh', () => {
+    const routing = { type: 'CNAME', name: 'www', value: 'my-site.puter.site', purpose: 'routing' };
+    const redirect = { type: 'A', name: '@', value: '192.0.2.1', purpose: 'redirect' };
+    const ownership = { type: 'TXT', name: '_cf', value: 'abc', purpose: 'ownership' };
+    const known = {
+        uuid: 'd1',
+        status: 'pending',
+        dnsProvider: 'example-dns',
+        redirectFrom: 'example.com',
+        records: [routing, redirect, ownership],
+    };
+
+    it('keeps the records shown before when the check returns only routing', () => {
+        const merged = mergeCustomDomainRefresh(known, { uuid: 'd1', status: 'active', records: [routing] });
+        expect(merged.status).toBe('active');
+        expect(merged.records).toEqual([routing, redirect, ownership]);
+        expect(merged.dnsProvider).toBe('example-dns');
+        expect(merged.redirectFrom).toBe('example.com');
+    });
+
+    it('takes fresh records, with the redirect after the routing one', () => {
+        const fresh_ownership = { ...ownership, value: 'def' };
+        const merged = mergeCustomDomainRefresh(known, { uuid: 'd1', status: 'pending', records: [routing, fresh_ownership] });
+        expect(merged.records).toEqual([routing, redirect, fresh_ownership]);
+    });
+});
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+const COLOR_SCHEME_FEATURE = /\(\s*prefers-color-scheme\s*:\s*(dark|light)\s*\)/gi;
+
+/**
+ * The theme an embedding page forces, from its `#theme=dark|light` fragment.
+ * Null when it names none, so the embed follows the OS.
+ *
+ * @param {string} hash - `location.hash`
+ * @returns {'dark' | 'light' | null}
+ */
+export const embedHostTheme = (hash) => {
+    const value = new URLSearchParams(String(hash ?? '').replace(/^#/, '')).get('theme');
+    return value === 'dark' || value === 'light' ? value : null;
+};
+
+/**
+ * Makes the document's `prefers-color-scheme` rules match `theme` whatever
+ * the OS prefers. Chromium doesn't pass a frame's `color-scheme` on to the
+ * document inside it, so the host's forced theme has to be applied here.
+ *
+ * @param {Document} doc - with its stylesheets loaded
+ * @param {'dark' | 'light'} theme
+ */
+export const forceColorScheme = (doc, theme) => {
+    doc.documentElement.style.colorScheme = theme;
+    const force = (rules) => {
+        for ( const rule of rules ) {
+            const media = rule.media?.mediaText;
+            // Always true for the forced scheme, never for the other.
+            const forced = media?.replace(COLOR_SCHEME_FEATURE, (_, scheme) => (
+                scheme.toLowerCase() === theme ? '(min-width: 0px)' : '(max-width: -1px)'
+            ));
+            if ( forced !== media ) rule.media.mediaText = forced;
+            if ( rule.cssRules ) force(rule.cssRules);
+        }
+    };
+    for ( const sheet of doc.styleSheets ) {
+        let rules;
+        try {
+            rules = sheet.cssRules;
+        } catch { continue; /* Another origin's stylesheet can't be read. */ }
+        force(rules);
+    }
+};
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { describe, expect, it } from 'vitest';
+import { embedHostTheme } from './embedHostTheme.js';
+
+describe('embedHostTheme', () => {
+    it('reads a forced theme from the fragment', () => {
+        expect(embedHostTheme('#theme=dark')).toBe('dark');
+        expect(embedHostTheme('#user=0b1c9a52-3f0e-4c7a-9a65-2f6d1e8b7c40&theme=light')).toBe('light');
+    });
+
+    it.each(['', '#', '#theme=', '#theme=Dark', '#theme=auto', '#scheme=dark', undefined])(
+        'is null for %j', hash => {
+            expect(embedHostTheme(hash)).toBeNull();
+        },
+    );
+});
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+/**
+ * The uuid of the user an embedding page is signed in as, from its
+ * `#user=<uuid>` fragment, in lower case. Null without a well-formed one.
+ *
+ * @param {string} hash - `location.hash`
+ * @returns {string | null}
+ */
+export const embedHostUser = (hash) => {
+    const value = new URLSearchParams(String(hash ?? '').replace(/^#/, '')).get('user');
+    return value && UUID.test(value) ? value.toLowerCase() : null;
+};
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { describe, expect, it } from 'vitest';
+import { embedHostUser } from './embedHostUser.js';
+
+const UUID = '0b1c9a52-3f0e-4c7a-9a65-2f6d1e8b7c40';
+
+describe('embedHostUser', () => {
+    it('reads the user uuid from the fragment', () => {
+        expect(embedHostUser(`#user=${UUID}`)).toBe(UUID);
+        expect(embedHostUser(`#other=1&user=${UUID}`)).toBe(UUID);
+    });
+
+    it('lower-cases the uuid', () => {
+        expect(embedHostUser(`#user=${UUID.toUpperCase()}`)).toBe(UUID);
+    });
+
+    it.each(['', '#', '#user=', '#user=admin', `#user=${UUID}x`, `#user= ${UUID}`, `#uid=${UUID}`, undefined])(
+        'is null for %j', hash => {
+            expect(embedHostUser(hash)).toBeNull();
+        },
+    );
+});
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { embedHostUser } from './embedHostUser.js';
+
+/**
+ * @typedef {Object} EmbedSession
+ * @property {string} token - the GUI session's token
+ * @property {Record<string, unknown>} user - `/whoami` for that token
+ */
+
+/**
+ * The GUI session, from local storage or else the session cookie. Safari keys a
+ * frame's local storage by the top-level origin, so under a sibling subdomain
+ * the GUI's stored token is out of reach while its cookie is still sent.
+ *
+ * @returns {Promise<string | null>}
+ */
+async function readSession () {
+    let stored = null;
+    try {
+        stored = localStorage.getItem('auth_token_v2');
+    } catch { /* Storage the browser refuses holds no session; the cookie may. */ }
+    if ( stored ) return stored;
+    const response = await fetch('/get-gui-token', { credentials: 'include' });
+    // Only a 401 means there is no session; a rate limit or server error
+    // must not pass a signed-in user off as signed out.
+    if ( response.status === 401 ) return null;
+    if ( ! response.ok ) throw new Error(`Session lookup responded ${response.status}`);
+    return (await response.json())?.token || null;
+}
+
+/**
+ * `/whoami` for a GUI token, or null when the API refuses it.
+ *
+ * @param {string} token
+ * @param {string} apiOrigin
+ * @returns {Promise<Record<string, unknown> | null>}
+ */
+async function whoami (token, apiOrigin) {
+    const response = await fetch(new URL('/whoami', apiOrigin), {
+        headers: { Authorization: `Bearer ${token}` },
+    });
+    if ( response.status === 401 ) return null;
+    if ( ! response.ok ) throw new Error(`Session check responded ${response.status}`);
+    const user = await response.json();
+    return user && typeof user === 'object' ? user : null;
+}
+
+/**
+ * The GUI session, only when it belongs to the user the embedding page names
+ * in its `#user=<uuid>` fragment. A host signed out, or signed in as someone
+ * else, gets null. Rejects when the session can't be checked.
+ *
+ * @param {string} apiOrigin
+ * @param {string} hash - `location.hash`
+ * @returns {Promise<EmbedSession | null>}
+ */
+export async function embedSession (apiOrigin, hash) {
+    const hostUser = embedHostUser(hash);
+    if ( ! hostUser ) return null;
+    const token = await readSession();
+    if ( ! token ) return null;
+    const user = await whoami(token, apiOrigin);
+    const uuid = typeof user?.uuid === 'string' ? user.uuid.toLowerCase() : null;
+    return uuid === hostUser ? { token, user } : null;
+}
@@ -28,14 +28,21 @@ export const is_plan_gate_error = (error) =>
    Boolean(error && typeof error === 'object' && error.code === 'subscription_required');

 /**
- * Open the upgrade flow, where the deployment has one. Hosted puter.com
- * attaches `UIUpgradeAccount`; a self-hosted install has no plan to offer,
- * and the caller explains the refusal in its own words instead.
+ * Whether the deployment has an upgrade flow. Hosted puter.com attaches
+ * `UIUpgradeAccount`; a self-hosted install has no plan to offer.
+ *
+ * @returns {boolean}
+ */
+export const has_upgrade_flow = () => typeof window.UIUpgradeAccount === 'function';
+
+/**
+ * Open the upgrade flow, where the deployment has one. Without one, the
+ * caller explains the refusal in its own words instead.
 *
 * @returns {boolean} Whether the upgrade flow was opened.
 */
 export const open_upgrade_flow = () => {
-    if ( typeof window.UIUpgradeAccount !== 'function' ) return false;
+    if ( ! has_upgrade_flow() ) return false;
    (new window.UIUpgradeAccount()).open_as_window();
    return true;
 };
@@ -0,0 +1,354 @@
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * A GUI popup that a first-party page shows in a frame instead of a window,
+ * served at `/embed/<action>`. It runs the popup boot unchanged: the framing
+ * page stands in for `window.opener`, and closing asks it to remove the frame.
+ */
+
+/** Popup actions a first-party page can frame. */
+export const FRAMED_POPUP_ACTIONS = new Set([
+    'sign-in',
+    'show-open-file-picker',
+    'show-save-file-picker',
+    'show-directory-picker',
+    'upgrade',
+]);
+
+// Actions a frame shows only for the user the framing page is signed in as.
+const HOST_USER_ACTIONS = new Set([
+    'show-open-file-picker',
+    'show-save-file-picker',
+    'show-directory-picker',
+    'upgrade',
+]);
+
+// Actions framed over the whole page with no box, which their own dialog's
+// scrim covers.
+const TRANSPARENT_ACTIONS = new Set(['upgrade']);
+
+const UPGRADE_REASONS = new Set(['funds', 'subscription', 'storage']);
+const UPGRADE_METHOD_MAX = 200;
+
+// Modal UI the upgrade dialog and the GUI's windows show. Once some has shown
+// and all of it has been gone this long, the dialog closed without reporting
+// it, and the frame mustn't be left covering the page.
+const UPGRADE_MODAL_UI = '.window, [aria-modal="true"]';
+const UPGRADE_GONE_MS = 500;
+// How long a hidden frame waits for the page to show it before opening anyway.
+const FRAME_SIZE_TIMEOUT_MS = 1000;
+// A focus() the frame ignored is retried this often, this many times.
+const FOCUS_RETRY_MS = 50;
+const FOCUS_RETRIES = 20;
+
+/** Lifecycle messages to the framing page carry this as `msg`. */
+export const POPUP_FRAME_MSG = 'puterPopupFrame';
+
+// The popup's query parameters a framing page may pass, in the fragment.
+const FRAGMENT_PARAMS = ['msg_id', 'options', 'request_auth'];
+
+// The account checks a sign-in can show (email, phone, card), which are
+// windows rather than auth screens.
+const ACCOUNT_CHECK_WINDOWS = '.window-confirm-email-using-code, .window-confirm-phone-using-code, .window-card-verification';
+
+// What a framed popup shows first; until one is on the page the framing page
+// keeps the frame hidden behind its loading scrim.
+const VISIBLE_UI = '.window, .dashboard-dialog-overlay, .captcha-modal';
+
+/**
+ * The action a `/embed/<action>` path frames, or null for any other path.
+ *
+ * @param {string} pathname
+ * @returns {string | null}
+ */
+export const framedPopupAction = (pathname) => {
+    const match = /^\/embed\/([a-z-]+)\/?$/.exec(String(pathname ?? ''));
+    return match && FRAMED_POPUP_ACTIONS.has(match[1]) ? match[1] : null;
+};
+
+/**
+ * Whether a framed `action` serves only the framing page's own user, named in
+ * the fragment as `user`.
+ *
+ * @param {string | null | undefined} action
+ * @returns {boolean}
+ */
+export const framesHostUser = (action) => HOST_USER_ACTIONS.has(action);
+
+/**
+ * Whether a framed `action` lets the framing page show through around its
+ * dialog.
+ *
+ * @param {string | null | undefined} action
+ * @returns {boolean}
+ */
+export const isTransparentPopupFrame = (action) => TRANSPARENT_ACTIONS.has(action);
+
+/**
+ * The popup parameters the framing page put in the fragment, and no others.
+ * The route refuses a query string, so nothing else reaches the boot.
+ *
+ * @param {string} hash - `location.hash`
+ * @returns {URLSearchParams}
+ */
+export const framedPopupParams = (hash) => {
+    const given = new URLSearchParams(String(hash ?? '').replace(/^#/, ''));
+    const params = new URLSearchParams();
+    for ( const key of FRAGMENT_PARAMS ) {
+        if ( given.has(key) ) params.set(key, given.get(key));
+    }
+    return params;
+};
+
+/**
+ * Starts a framed popup in `win`: the framing page, at the origin the server
+ * pinned with frame-ancestors, becomes `opener`, `close()` asks it to remove
+ * the frame, and it hears `ready` once the popup shows something. Returns a
+ * function that sends it a lifecycle state, with any fields that go with it,
+ * or null when there is no framing page to answer (opened on its own, or
+ * framed by a page the server refused).
+ *
+ * @param {Window} win
+ * @param {string | null | undefined} hostOrigin - `gui_params.embed_host_origin`
+ * @returns {((state: 'loading' | 'ready' | 'unavailable' | 'closed' | 'provider', fields?: Record<string, unknown>) => void) | null}
+ */
+export const startPopupFrame = (win, hostOrigin) => {
+    if ( ! hostOrigin || win.parent === win ) return null;
+    const parent = win.parent;
+    if ( isTransparentPopupFrame(framedPopupAction(win.location?.pathname)) ) {
+        win.document.documentElement.classList.add('popup-frame-transparent');
+    }
+    const tell = (state, fields = {}) =>
+        parent.postMessage({ ...fields, msg: POPUP_FRAME_MSG, state }, hostOrigin);
+
+    win.opener = parent;
+    win.close = () => tell('closed');
+    // The popup closes with `window.open('', '_self').close()` as well, which
+    // must reach the `close` above rather than navigate the frame.
+    const open = win.open.bind(win);
+    win.open = (url, target, ...rest) =>
+        url === '' && target === '_self' ? win : open(url, target, ...rest);
+
+    const announceReady = () => {
+        if ( ! win.document.querySelector(VISIBLE_UI) ) return false;
+        tell('ready');
+        return true;
+    };
+    const observer = new win.MutationObserver(() => {
+        if ( announceReady() ) observer.disconnect();
+    });
+    observer.observe(win.document.body, { childList: true, subtree: true });
+
+    tell('loading');
+    return tell;
+};
+
+/**
+ * Gives a framed popup's latest focus() back whenever the frame gains focus
+ * with nothing focused, until the user presses a key or the pointer in it. A
+ * cross-origin frame can't take focus until the framing page focuses it, which
+ * also resets it, so a save picker's file name would start unfocused.
+ * Firefox and WebKit also ignore a focus() for a moment after the page shows
+ * the frame, without a `focus` event after it, so one that didn't take is
+ * retried for a while.
+ *
+ * @param {Window} win
+ */
+export const focusOnFrameFocus = (win) => {
+    const focus = win.HTMLElement.prototype.focus;
+    let latest = null;
+    let retryTimer = null;
+    let retries = 0;
+    // Whether the latest focus() still needs giving back.
+    const pending = () => {
+        const active = win.document.activeElement;
+        return !!latest?.el.isConnected && (!active || active === win.document.body);
+    };
+    const giveBack = () => {
+        if ( pending() ) focus.apply(latest.el, latest.args);
+    };
+    const retry = () => {
+        retryTimer = null;
+        giveBack();
+        if ( pending() && ++retries < FOCUS_RETRIES ) retryTimer = setTimeout(retry, FOCUS_RETRY_MS);
+    };
+    win.HTMLElement.prototype.focus = function (...args) {
+        latest = { el: this, args };
+        const result = focus.apply(this, args);
+        clearTimeout(retryTimer);
+        retryTimer = null;
+        retries = 0;
+        if ( pending() ) retryTimer = setTimeout(retry, FOCUS_RETRY_MS);
+        return result;
+    };
+    const forget = () => {
+        latest = null;
+        clearTimeout(retryTimer);
+        retryTimer = null;
+        win.HTMLElement.prototype.focus = focus;
+    };
+    win.addEventListener('pointerdown', forget, { capture: true, once: true });
+    win.addEventListener('keydown', forget, { capture: true, once: true });
+    win.addEventListener('focus', giveBack);
+};
+
+/**
+ * Closes a framed sign-in on Escape in one of its account checks, as Escape
+ * on its auth screens does. Those screens handle Escape themselves; the
+ * account checks are windows, which don't.
+ *
+ * @param {Window} win
+ */
+export const closeAccountChecksOnEscape = (win) => {
+    win.document.addEventListener('keydown', (e) => {
+        // Safari sends the Escape that ends an IME conversion as keyCode 229
+        // with isComposing false.
+        if ( e.key !== 'Escape' || e.defaultPrevented || e.isComposing || e.keyCode === 229 ) return;
+        const el = e.target === win.document.body ? win.document.querySelector('.window-active') : e.target;
+        if ( el?.closest?.(ACCOUNT_CHECK_WINDOWS) ) win.close();
+    });
+};
+
+/**
+ * Whether a framed upgrade can show for the GUI session `session` (its
+ * `/whoami`): the deployment has an upgrade dialog that reports when it
+ * closes, and no account check is waiting, which a frame couldn't be closed
+ * from.
+ *
+ * @param {Window} win
+ * @param {Record<string, unknown> | null} session
+ * @returns {boolean}
+ */
+export const canShowUpgradeFrame = (win, session) =>
+    win.UIUpgradeAccount?.embeddable === true &&
+    !!session &&
+    !session.requires_email_confirmation &&
+    !session.requires_phone_verification &&
+    !session.requires_card_verification &&
+    !session.requires_password_change;
+
+/**
+ * What prompted a framed upgrade, from its `reason` and `method` fragment
+ * parameters, keeping only well-formed values.
+ *
+ * @param {string} hash - `location.hash`
+ * @returns {{ reason?: string, method?: string }}
+ */
+export const framedUpgradeDetails = (hash) => {
+    const given = new URLSearchParams(String(hash ?? '').replace(/^#/, ''));
+    const details = {};
+    const reason = given.get('reason');
+    if ( UPGRADE_REASONS.has(reason) ) details.reason = reason;
+    const method = given.get('method');
+    if ( method && method.length <= UPGRADE_METHOD_MAX ) details.method = method;
+    return details;
+};
+
+/**
+ * Shows the deployment's upgrade dialog in a framed popup and tells the
+ * framing page it's ready once it's open, or before it opens when the page
+ * still hides the frame. Resolves whether the user upgraded,
+ * once the dialog closes, or false once every dialog and window it showed has
+ * gone without it reporting a close.
+ *
+ * @param {Window} win
+ * @param {{ appUid?: string, reason?: string, method?: string }} attribution - what prompted it;
+ *   an empty one is passed as null, so the dialog credits the prompt it remembers
+ * @param {(state: 'ready') => void} tell
+ * @returns {Promise<boolean>}
+ */
+export const showFramedUpgrade = (win, attribution, tell) => new Promise((resolve, reject) => {
+    let settled = false;
+    let seen = false;
+    let goneTimer = null;
+    const settle = (finish) => {
+        if ( settled ) return;
+        settled = true;
+        observer.disconnect();
+        clearTimeout(goneTimer);
+        finish();
+    };
+    const shown = () => !!win.document.querySelector(UPGRADE_MODAL_UI);
+    const check = () => {
+        if ( shown() ) {
+            seen = true;
+            clearTimeout(goneTimer);
+            goneTimer = null;
+        } else if ( seen && ! goneTimer ) {
+            goneTimer = setTimeout(() => {
+                goneTimer = null;
+                if ( ! shown() ) settle(() => resolve(false));
+            }, UPGRADE_GONE_MS);
+        }
+    };
+    const observer = new win.MutationObserver(check);
+    observer.observe(win.document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['aria-modal'] });
+
+    let toldReady = false;
+    const ready = () => {
+        if ( toldReady || settled ) return;
+        toldReady = true;
+        tell('ready');
+    };
+    const open = () => {
+        const dialog = new win.UIUpgradeAccount({
+            attribution: Object.keys(attribution).length ? attribution : null,
+            onClose: (result) => settle(() => resolve(result?.upgraded === true)),
+        });
+        return dialog.open_as_window();
+    };
+    whenFrameSized(win, ready)
+        .then(open)
+        .then(() => {
+            check();
+            ready();
+        }, (e) => settle(() => reject(e)));
+});
+
+/**
+ * Resolves once the frame has a viewport. The page keeps a loading frame
+ * hidden, which Chromium and WebKit lay out at 0x0, and a GUI window opened
+ * then (such as an alert) centers itself on that. Without one, `reveal` asks
+ * the page to show the frame first.
+ *
+ * @param {Window} win
+ * @param {() => void} reveal
+ * @returns {Promise<void>}
+ */
+const whenFrameSized = (win, reveal) => new Promise((resolve) => {
+    const sized = () => win.innerWidth > 0 && win.innerHeight > 0;
+    if ( sized() ) {
+        resolve();
+        return;
+    }
+    let timer = null;
+    const done = () => {
+        win.removeEventListener('resize', onResize);
+        clearTimeout(timer);
+        resolve();
+    };
+    const onResize = () => {
+        if ( sized() ) done();
+    };
+    win.addEventListener('resize', onResize);
+    // Opening on a 0x0 viewport is better than never opening.
+    timer = setTimeout(done, FRAME_SIZE_TIMEOUT_MS);
+    reveal();
+});
@@ -0,0 +1,514 @@
+// @vitest-environment jsdom
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import {
+    POPUP_FRAME_MSG,
+    canShowUpgradeFrame,
+    closeAccountChecksOnEscape,
+    focusOnFrameFocus,
+    framedPopupAction,
+    framedPopupParams,
+    framedUpgradeDetails,
+    framesHostUser,
+    showFramedUpgrade,
+    startPopupFrame,
+} from './popupFrame.js';
+
+const HOST = 'https://notes.puter.test';
+
+/** A stand-in for the frame's window, with its own parent to post to. */
+const frameWindow = () => {
+    const parent = { postMessage: vi.fn() };
+    const open = vi.fn(() => 'opened');
+    return {
+        parent,
+        open,
+        opener: null,
+        close: () => {},
+        document,
+        MutationObserver: window.MutationObserver,
+    };
+};
+
+const statesSent = (win) => win.parent.postMessage.mock.calls.map(([data, origin]) => {
+    expect(origin).toBe(HOST);
+    expect(data.msg).toBe(POPUP_FRAME_MSG);
+    return data.state;
+});
+
+afterEach(() => {
+    document.body.innerHTML = '';
+    document.documentElement.classList.remove('popup-frame-transparent');
+});
+
+describe('framedPopupAction', () => {
+    it.each([
+        ['/embed/sign-in', 'sign-in'],
+        ['/embed/sign-in/', 'sign-in'],
+        ['/embed/show-open-file-picker', 'show-open-file-picker'],
+        ['/embed/show-save-file-picker', 'show-save-file-picker'],
+        ['/embed/show-directory-picker', 'show-directory-picker'],
+        ['/embed/upgrade', 'upgrade'],
+        ['/embed/apps', null],
+        ['/embed/feedback', null],
+        ['/embed/request-permission', null],
+        ['/action/sign-in', null],
+        ['/embed/sign-in/extra', null],
+        ['/', null],
+        [undefined, null],
+    ])('%s frames %s', (pathname, expected) => {
+        expect(framedPopupAction(pathname)).toBe(expected);
+    });
+});
+
+describe('framedPopupParams', () => {
+    it('keeps only the popup parameters a framing page may pass', () => {
+        const params = framedPopupParams('#msg_id=7&options=%7B%22multiple%22%3Atrue%7D&request_auth=true&user=abc&auth_token=x&attempt_temp_user_creation=true&api_origin=https%3A%2F%2Fevil.test');
+        expect(Object.fromEntries(params)).toEqual({
+            msg_id: '7',
+            options: '{"multiple":true}',
+            request_auth: 'true',
+        });
+    });
+
+    it('is empty without a fragment', () => {
+        expect([...framedPopupParams('')]).toEqual([]);
+        expect([...framedPopupParams(undefined)]).toEqual([]);
+    });
+});
+
+describe('framesHostUser', () => {
+    it.each([
+        ['show-open-file-picker', true],
+        ['show-save-file-picker', true],
+        ['show-directory-picker', true],
+        ['upgrade', true],
+        ['sign-in', false],
+        [null, false],
+    ])('%s serves only the framing page\'s user: %s', (action, expected) => {
+        expect(framesHostUser(action)).toBe(expected);
+    });
+});
+
+describe('framedUpgradeDetails', () => {
+    it('keeps a known reason and the method', () => {
+        expect(framedUpgradeDetails('#user=abc&reason=storage&method=puter.fs.upload&appUid=app-x'))
+            .toEqual({ reason: 'storage', method: 'puter.fs.upload' });
+    });
+
+    it('drops an unknown reason and an overlong method', () => {
+        expect(framedUpgradeDetails(`#reason=free-money&method=${'m'.repeat(201)}`)).toEqual({});
+        expect(framedUpgradeDetails('')).toEqual({});
+        expect(framedUpgradeDetails(undefined)).toEqual({});
+    });
+});
+
+describe('canShowUpgradeFrame', () => {
+    const win = { UIUpgradeAccount: Object.assign(function () {}, { embeddable: true }) };
+    const session = { uuid: 'u-1' };
+
+    it('shows for a session with nothing to verify, when the dialog reports its close', () => {
+        expect(canShowUpgradeFrame(win, session)).toBe(true);
+    });
+
+    it('needs a dialog that reports its close', () => {
+        expect(canShowUpgradeFrame({}, session)).toBe(false);
+        expect(canShowUpgradeFrame({ UIUpgradeAccount: function () {} }, session)).toBe(false);
+    });
+
+    it.each([
+        'requires_email_confirmation',
+        'requires_phone_verification',
+        'requires_card_verification',
+        'requires_password_change',
+    ])('leaves an account with %s to the tab', (check) => {
+        expect(canShowUpgradeFrame(win, { ...session, [check]: true })).toBe(false);
+    });
+
+    it('needs a session', () => {
+        expect(canShowUpgradeFrame(win, null)).toBe(false);
+    });
+});
+
+describe('showFramedUpgrade', () => {
+    const upgradeWindow = (openAsWindow, { width = 1280, height = 800 } = {}) => {
+        const created = [];
+        const events = new EventTarget();
+        const win = {
+            document,
+            innerWidth: width,
+            innerHeight: height,
+            addEventListener: events.addEventListener.bind(events),
+            removeEventListener: events.removeEventListener.bind(events),
+            dispatchEvent: events.dispatchEvent.bind(events),
+            MutationObserver: window.MutationObserver,
+            UIUpgradeAccount: function (options) {
+                created.push(options);
+                this.open_as_window = () => openAsWindow(options);
+            },
+        };
+        return { win, created };
+    };
+    /** Stands in for the dialog's own modal root. */
+    const showModal = () => {
+        const root = document.createElement('div');
+        root.setAttribute('aria-modal', 'true');
+        document.body.append(root);
+        return root;
+    };
+
+    afterEach(() => {
+        vi.useRealTimers();
+    });
+
+    it('passes what prompted it, tells the page it is ready once open, and resolves the close', async () => {
+        const tell = vi.fn();
+        let options;
+        const { win, created } = upgradeWindow(async (o) => {
+            options = o;
+        });
+        const result = showFramedUpgrade(win, { appUid: 'app-1', reason: 'funds' }, tell);
+        await vi.waitFor(() => expect(tell).toHaveBeenCalledWith('ready'));
+        expect(created[0].attribution).toEqual({ appUid: 'app-1', reason: 'funds' });
+        expect(tell).toHaveBeenCalledTimes(1);
+
+        options.onClose({ upgraded: true });
+        await expect(result).resolves.toBe(true);
+    });
+
+    it('passes no attribution when nothing is known, so the dialog credits the prompt it remembers', async () => {
+        const { win, created } = upgradeWindow(async (o) => o.onClose());
+        await showFramedUpgrade(win, {}, vi.fn());
+        expect(created[0].attribution).toBeNull();
+    });
+
+    it('resolves false for a close without an upgrade, even one before it opened', async () => {
+        const { win } = upgradeWindow(async (o) => o.onClose({ upgraded: false }));
+        await expect(showFramedUpgrade(win, {}, vi.fn())).resolves.toBe(false);
+        const { win: bare } = upgradeWindow(async (o) => o.onClose());
+        await expect(showFramedUpgrade(bare, {}, vi.fn())).resolves.toBe(false);
+    });
+
+    it('resolves false once the dialog is gone without reporting a close', async () => {
+        vi.useFakeTimers();
+        const tell = vi.fn();
+        let root;
+        const { win } = upgradeWindow(async () => {
+            root = showModal();
+        });
+        const result = showFramedUpgrade(win, {}, tell);
+        await vi.advanceTimersByTimeAsync(0);
+        expect(tell).toHaveBeenCalledWith('ready');
+
+        root.remove();
+        await vi.advanceTimersByTimeAsync(499);
+        await expect(Promise.race([result, 'pending'])).resolves.toBe('pending');
+        await vi.advanceTimersByTimeAsync(1);
+        await expect(result).resolves.toBe(false);
+    });
+
+    it('keeps waiting while one window replaces another', async () => {
+        vi.useFakeTimers();
+        let options;
+        const { win } = upgradeWindow(async (o) => {
+            options = o;
+            // An alert, which is a GUI window, rather than the dialog itself.
+            document.body.append(Object.assign(document.createElement('div'), { className: 'window' }));
+        });
+        const result = showFramedUpgrade(win, {}, vi.fn());
+        await vi.advanceTimersByTimeAsync(0);
+        document.querySelector('.window').remove();
+        showModal();
+        await vi.advanceTimersByTimeAsync(2000);
+        await expect(Promise.race([result, 'pending'])).resolves.toBe('pending');
+
+        options.onClose({ upgraded: true });
+        await expect(result).resolves.toBe(true);
+    });
+
+    it('waits for the dialog to show before watching for it to go', async () => {
+        vi.useFakeTimers();
+        let options;
+        const { win } = upgradeWindow(async (o) => {
+            options = o;
+        });
+        const result = showFramedUpgrade(win, {}, vi.fn());
+        await vi.advanceTimersByTimeAsync(2000);
+        await expect(Promise.race([result, 'pending'])).resolves.toBe('pending');
+        options.onClose({ upgraded: false });
+        await expect(result).resolves.toBe(false);
+    });
+
+    it('has a hidden frame shown before opening the dialog, so it lays out on a real viewport', async () => {
+        vi.useFakeTimers();
+        const tell = vi.fn();
+        const sizes = [];
+        const { win, created } = upgradeWindow(async () => {
+            sizes.push([win.innerWidth, win.innerHeight]);
+        }, { width: 0, height: 0 });
+        const result = showFramedUpgrade(win, {}, tell);
+        await vi.advanceTimersByTimeAsync(0);
+        expect(tell).toHaveBeenCalledWith('ready');
+        expect(created).toHaveLength(0);
+
+        win.innerWidth = 1280;
+        win.innerHeight = 800;
+        win.dispatchEvent(new Event('resize'));
+        await vi.advanceTimersByTimeAsync(0);
+        expect(sizes).toEqual([[1280, 800]]);
+        // Told once, not again once it opens.
+        expect(tell).toHaveBeenCalledTimes(1);
+
+        created[0].onClose({ upgraded: false });
+        await expect(result).resolves.toBe(false);
+    });
+
+    it('opens the dialog anyway when a hidden frame never gets a viewport', async () => {
+        vi.useFakeTimers();
+        const { win, created } = upgradeWindow(async () => {}, { width: 0, height: 0 });
+        showFramedUpgrade(win, {}, vi.fn());
+        await vi.advanceTimersByTimeAsync(999);
+        expect(created).toHaveLength(0);
+        await vi.advanceTimersByTimeAsync(1);
+        expect(created).toHaveLength(1);
+    });
+
+    it('rejects when the dialog fails to open', async () => {
+        const { win } = upgradeWindow(async () => {
+            throw new Error('broken');
+        });
+        await expect(showFramedUpgrade(win, {}, vi.fn())).rejects.toThrow('broken');
+    });
+});
+
+describe('startPopupFrame', () => {
+    it('does nothing without a framing page to answer', () => {
+        const win = frameWindow();
+        expect(startPopupFrame(win, null)).toBeNull();
+        const top = frameWindow();
+        top.parent = top;
+        expect(startPopupFrame(top, HOST)).toBeNull();
+        expect(win.opener).toBeNull();
+    });
+
+    it('makes the framing page the opener and tells it the frame is loading', () => {
+        const win = frameWindow();
+        startPopupFrame(win, HOST);
+        expect(win.opener).toBe(win.parent);
+        expect(statesSent(win)).toEqual(['loading']);
+    });
+
+    it('asks the framing page to remove the frame on close, either way the popup closes', () => {
+        const win = frameWindow();
+        startPopupFrame(win, HOST);
+        win.close();
+        win.open('', '_self').close();
+        expect(statesSent(win)).toEqual(['loading', 'closed', 'closed']);
+    });
+
+    it('sends the fields that go with a state, without letting them rename it', () => {
+        const win = frameWindow();
+        const tell = startPopupFrame(win, HOST);
+        tell('provider', { url: 'https://puter.test/auth/oidc/google/start', msg: 'x', state: 'y' });
+        expect(win.parent.postMessage).toHaveBeenLastCalledWith(
+            { url: 'https://puter.test/auth/oidc/google/start', msg: POPUP_FRAME_MSG, state: 'provider' },
+            HOST,
+        );
+    });
+
+    it('lets the framing page show through an upgrade frame only', () => {
+        startPopupFrame({ ...frameWindow(), location: { pathname: '/embed/sign-in' } }, HOST);
+        expect(document.documentElement.classList.contains('popup-frame-transparent')).toBe(false);
+
+        startPopupFrame({ ...frameWindow(), location: { pathname: '/embed/upgrade' } }, HOST);
+        expect(document.documentElement.classList.contains('popup-frame-transparent')).toBe(true);
+    });
+
+    it('sends a boolean field with a state', () => {
+        const win = frameWindow();
+        const tell = startPopupFrame(win, HOST);
+        tell('closed', { upgraded: true });
+        expect(win.parent.postMessage).toHaveBeenLastCalledWith(
+            { upgraded: true, msg: POPUP_FRAME_MSG, state: 'closed' },
+            HOST,
+        );
+    });
+
+    it('leaves other window.open calls alone', () => {
+        const win = frameWindow();
+        const open = win.open;
+        startPopupFrame(win, HOST);
+        expect(win.open('https://puter.com/terms', '_blank')).toBe('opened');
+        expect(open).toHaveBeenCalledWith('https://puter.com/terms', '_blank');
+    });
+
+    it('tells the framing page it is ready once the popup shows something', async () => {
+        const win = frameWindow();
+        startPopupFrame(win, HOST);
+        document.body.append(Object.assign(document.createElement('div'), { className: 'busy' }));
+        await Promise.resolve();
+        expect(statesSent(win)).toEqual(['loading']);
+
+        const dialog = document.createElement('div');
+        dialog.className = 'dashboard-dialog-overlay auth-dialog-page';
+        document.body.append(dialog);
+        await Promise.resolve();
+        document.body.append(Object.assign(document.createElement('div'), { className: 'window' }));
+        await Promise.resolve();
+        expect(statesSent(win)).toEqual(['loading', 'ready']);
+    });
+});
+
+describe('focusOnFrameFocus', () => {
+    /** A window of its own, so patching its focus() leaves the test's alone. */
+    const ownWindow = () => {
+        const iframe = document.createElement('iframe');
+        document.body.append(iframe);
+        const win = iframe.contentWindow;
+        const input = win.document.createElement('input');
+        win.document.body.append(input);
+        return { win, input };
+    };
+    /** The frame losing its focus, then the framing page focusing it again. */
+    const refocusFrame = (win) => {
+        win.document.activeElement?.blur();
+        win.dispatchEvent(new win.FocusEvent('focus'));
+    };
+
+    it('gives the popup\'s latest focus back each time the frame gains focus with nothing focused', () => {
+        const { win, input } = ownWindow();
+        focusOnFrameFocus(win);
+        input.focus();
+        refocusFrame(win);
+        expect(win.document.activeElement).toBe(input);
+        refocusFrame(win);
+        expect(win.document.activeElement).toBe(input);
+    });
+
+    it('leaves focus to the user once they press a key or the pointer', () => {
+        for ( const type of ['keydown', 'pointerdown'] ) {
+            const { win, input } = ownWindow();
+            const focus = win.HTMLElement.prototype.focus;
+            focusOnFrameFocus(win);
+            input.focus();
+            win.document.body.dispatchEvent(new win.Event(type, { bubbles: true }));
+            refocusFrame(win);
+            expect(win.document.activeElement).toBe(win.document.body);
+            expect(win.HTMLElement.prototype.focus).toBe(focus);
+        }
+    });
+
+    /** A window whose focus() is ignored while `blocked`, as a frame just shown is. */
+    const blockableWindow = () => {
+        const { win, input } = ownWindow();
+        const nativeFocus = win.HTMLElement.prototype.focus;
+        const state = { blocked: true };
+        win.HTMLElement.prototype.focus = function (...args) {
+            if ( ! state.blocked ) nativeFocus.apply(this, args);
+        };
+        return { win, input, state };
+    };
+
+    it('retries a focus() the frame ignored until it takes', async () => {
+        vi.useFakeTimers();
+        try {
+            const { win, input, state } = blockableWindow();
+            focusOnFrameFocus(win);
+            input.focus();
+            expect(win.document.activeElement).toBe(win.document.body);
+            await vi.advanceTimersByTimeAsync(120);
+            expect(win.document.activeElement).toBe(win.document.body);
+            state.blocked = false;
+            await vi.advanceTimersByTimeAsync(50);
+            expect(win.document.activeElement).toBe(input);
+        } finally {
+            vi.useRealTimers();
+        }
+    });
+
+    it('stops retrying after a while, and once the user presses a key', async () => {
+        vi.useFakeTimers();
+        try {
+            const { win, input, state } = blockableWindow();
+            focusOnFrameFocus(win);
+            input.focus();
+            await vi.advanceTimersByTimeAsync(1000);
+            state.blocked = false;
+            await vi.advanceTimersByTimeAsync(1000);
+            expect(win.document.activeElement).toBe(win.document.body);
+
+            const other = blockableWindow();
+            focusOnFrameFocus(other.win);
+            other.input.focus();
+            other.win.document.body.dispatchEvent(new other.win.Event('keydown', { bubbles: true }));
+            other.state.blocked = false;
+            await vi.advanceTimersByTimeAsync(1000);
+            expect(other.win.document.activeElement).toBe(other.win.document.body);
+        } finally {
+            vi.useRealTimers();
+        }
+    });
+
+    it('leaves an element that has focus, and one that has left the page', () => {
+        const { win, input } = ownWindow();
+        const nativeFocus = win.HTMLElement.prototype.focus;
+        const other = win.document.createElement('button');
+        win.document.body.append(other);
+        focusOnFrameFocus(win);
+        input.focus();
+        nativeFocus.call(other);
+        win.dispatchEvent(new win.FocusEvent('focus'));
+        expect(win.document.activeElement).toBe(other);
+
+        input.remove();
+        refocusFrame(win);
+        expect(win.document.activeElement).toBe(win.document.body);
+    });
+});
+
+describe('closeAccountChecksOnEscape', () => {
+    /** A sign-in window with its own document, whose close() is spied on. */
+    const signInWindow = () => {
+        const win = { document: document.implementation.createHTMLDocument(), close: vi.fn() };
+        closeAccountChecksOnEscape(win);
+        return win;
+    };
+    const escapeOn = (el, init = {}) => {
+        el.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true, cancelable: true, ...init }));
+    };
+    const showWindow = (win, className = 'window window-active window-confirm-email-using-code') => {
+        const el = Object.assign(win.document.createElement('div'), { className });
+        el.innerHTML = '<input class="digit-input">';
+        win.document.body.append(el);
+        return el;
+    };
+
+    it.each([
+        'window-confirm-email-using-code',
+        'window-confirm-phone-using-code',
+        'window-card-verification',
+    ])('closes on Escape in the %s window', (cls) => {
+        const win = signInWindow();
+        escapeOn(showWindow(win, `window window-active ${cls}`).querySelector('input'));
+        expect(win.close).toHaveBeenCalledTimes(1);
+    });
+
+    it('closes on Escape with focus on the page behind an account check', () => {
+        const win = signInWindow();
+        showWindow(win);
+        escapeOn(win.document.body);
+        expect(win.close).toHaveBeenCalledTimes(1);
+    });
+
+    it('leaves Escape that something or an IME handled, other keys, and other windows alone', () => {
+        const win = signInWindow();
+        const input = showWindow(win).querySelector('input');
+        input.addEventListener('keydown', (e) => e.preventDefault(), { once: true });
+        escapeOn(input);
+        escapeOn(input, { key: 'Enter' });
+        escapeOn(input, { isComposing: true });
+        // Safari ends a conversion with keyCode 229 and isComposing false.
+        escapeOn(input, { keyCode: 229 });
+        escapeOn(showWindow(win, 'window window-alert').querySelector('input'));
+        expect(win.close).not.toHaveBeenCalled();
+    });
+});
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+/**
+ * Run `task` over `items`, at most `limit` at a time. Resolves to the items
+ * whose task rejected.
+ *
+ * @template T
+ * @param {T[]} items
+ * @param {number} limit
+ * @param {(item: T) => Promise<unknown>} task
+ * @returns {Promise<T[]>}
+ */
+export const runLimited = async (items, limit, task) => {
+    const failed = [];
+    let index = 0;
+    const worker = async () => {
+        while ( index < items.length ) {
+            const item = items[index++];
+            try {
+                await task(item);
+            } catch {
+                failed.push(item);
+            }
+        }
+    };
+    await Promise.all(Array.from({ length: Math.min(limit, items.length) }, worker));
+    return failed;
+};
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+import { describe, expect, it } from 'vitest';
+import { runLimited } from './runLimited.js';
+
+describe('runLimited', () => {
+    it('runs every item, never more than the limit at once', async () => {
+        let running = 0;
+        let peak = 0;
+        const done = [];
+        await runLimited([1, 2, 3, 4, 5, 6, 7], 3, async (n) => {
+            running++;
+            peak = Math.max(peak, running);
+            await new Promise(resolve => setTimeout(resolve, 5));
+            done.push(n);
+            running--;
+        });
+        expect(done.sort()).toEqual([1, 2, 3, 4, 5, 6, 7]);
+        expect(peak).toBe(3);
+    });
+
+    it('resolves to the items whose task rejected, after running the rest', async () => {
+        const failed = await runLimited(['a', 'b', 'c'], 2, async (item) => {
+            if ( item === 'b' ) throw new Error('no');
+        });
+        expect(failed).toEqual(['b']);
+    });
+
+    it('does nothing for no items', async () => {
+        expect(await runLimited([], 4, async () => {})).toEqual([]);
+    });
+});
@@ -27,7 +27,8 @@ const update_username_in_gui = function (new_username) {
    // ------------------------------------------------------------
    // Update all item/window/... paths, with the new username
    // ------------------------------------------------------------
-    $(':not([data-path=""]),:not([data-item-path=""])').each((i, el) => {
+    // With no earlier username there are no paths under it to rewrite.
+    if ( old_username ) $('[data-path], [data-item-path], [data-shortcut_to_path]').each((i, el) => {
        const $el = $(el);
        const attr_path = $el.attr('data-path');
        const attr_item_path = $el.attr('data-item-path');
@@ -91,11 +92,11 @@ const update_username_in_gui = function (new_username) {
                $el.attr('data-item-path', attr_item_path.replace(`/${ window.user.username }/`, `/${ new_username }/`));
            }
        }
-
-        // any element with username class
-        $('.username').text(new_username);
    });

+    // any element with username class
+    $('.username').text(new_username);
+
    // todo update all window paths
    $('.window').each((i, el) => {
    });
@@ -0,0 +1,63 @@
+// @vitest-environment jsdom
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import jQuery from '../lib/jquery-3.6.1/jquery-3.6.1.min.js';
+
+globalThis.$ = jQuery;
+globalThis.jQuery = jQuery;
+
+const { default: update_username_in_gui } = await import('./updateUsernameInGui.js');
+
+beforeEach(() => {
+    globalThis.puter = { _cache: { flushall: vi.fn() } };
+    document.body.innerHTML = `
+        <div class="item" data-path="/alice/Documents/a.txt"></div>
+        <div class="item" data-path="/alice"></div>
+        <div class="item" data-path="/alicex/b.txt"></div>
+        <div class="window" data-item-path="/alice/Pictures"></div>
+        <div class="shortcut" data-shortcut_to_path="/alice/Videos"></div>
+        <span class="username">alice</span>
+        <span class="username">alice</span>`;
+});
+
+describe('update_username_in_gui', () => {
+    it('rewrites the paths under the old username and every username label', () => {
+        window.user = { username: 'alice' };
+
+        update_username_in_gui('bob');
+
+        const paths = $('[data-path]').toArray().map(el => el.dataset.path);
+        expect(paths).toEqual(['/bob/Documents/a.txt', '/bob', '/alicex/b.txt']);
+        expect($('.window').attr('data-item-path')).toBe('/bob/Pictures');
+        expect($('.shortcut').attr('data-shortcut_to_path')).toBe('/bob/Videos');
+        expect($('.username').toArray().map(el => el.textContent)).toEqual(['bob', 'bob']);
+        expect(window.home_path).toBe('/bob');
+    });
+
+    it('only sets the labels while signing in, with no earlier username', () => {
+        window.user = undefined;
+
+        update_username_in_gui('bob');
+
+        expect($('.item').first().attr('data-path')).toBe('/alice/Documents/a.txt');
+        expect($('.username').first().text()).toBe('bob');
+    });
+});
@@ -623,7 +623,6 @@ const cs = {
        "window_title_open": "Otevřít",
        "window_title_change_password": "Změnit heslo",
        "login_email_username_required": "E-mail nebo uživatelské jméno je povinné",
-        "oidc_switched_to_login_message": "Byli jste přihlášeni ke stávajícímu účtu.",
        "sign_in_with_provider": "Přihlásit se pomocí %%",
        "sign_up_with_provider": "Zaregistrujte se pomocí %%",
        "welcome_description": "Ukládejte soubory, hrajte hry, najděte úžasné aplikace a mnoho dalšího! Vše na jednom místě, dostupné odkudkoli a kdykoli.",
@@ -129,13 +129,19 @@ const en = {
        choose_publishing_option: 'Choose how you want to publish your website:',
        contact_us: 'Contact Us',
        contact_us_attach: 'Attach Files',
+        contact_us_attach_or_drop: 'Attach files or drop them here',
        contact_us_attach_hint: 'Images and videos — up to %% files, %% MB each.',
        contact_us_attachment_remove: 'Remove attachment',
+        contact_us_attachment_remove_named: 'Remove %%',
        contact_us_attachment_too_large: 'That file is too large. Each attachment can be up to %% MB.',
        contact_us_attachment_too_many: 'You can attach up to %% files.',
        contact_us_attachment_total_too_large: 'Those files add up to more than %% MB. Try attaching fewer of them, or smaller ones.',
+        contact_us_attachments: 'Attachments',
        contact_us_attachment_unsupported: 'That file type is not supported. Attach an image (PNG, JPEG, GIF, WebP) or a video (MP4, MOV, WebM).',
+        contact_us_drop_to_attach: 'Drop to attach',
        contact_us_error: 'Something went wrong. Please try again.',
+        contact_us_message: 'Message',
+        contact_us_message_placeholder: 'How can we help? For a bug, the steps that lead to it help us most.',
        contact_us_message_required: 'Please write a message before sending.',
        contact_us_rate_limited: 'You have sent a lot of messages recently. Please try again later.',
        contact_us_verification_required: 'You must have a verified email address to use this.',
@@ -472,7 +478,16 @@ const en = {
        publish_as_website: 'Publish as website',
        publish_as_serverless_worker: 'Publish as Worker',
        publish_address: 'Address',
+        publish_custom_domain: 'Use a custom domain',
+        publish_custom_domain_dns_hint: 'After publishing, you\'ll get the DNS records to add at your domain provider.',
+        publish_custom_domain_hint: 'Serve this website from a domain you own.',
+        publish_custom_domain_moves: 'This domain is on your account. Publishing moves it here from %%, at no extra cost.',
+        publish_custom_domain_needs_plan: 'Upgrade to use a custom domain, or turn it off to publish without one.',
+        publish_custom_domain_upsell_text: 'Upgrade to serve this website from a domain you own.',
+        publish_custom_domain_upsell_title: 'Custom domains come with a paid plan',
+        publish_domain_failed: 'Your website is live at %%, but the domain wasn\'t added.',
        publish_name_required: 'Enter an address.',
+        publish_site_live: 'Your website is live at %%.',
        publish_website_intro: 'Serves %strong% at a public address anyone can visit.',
        publish_worker_intro: 'Runs %strong% at a public address anyone can call.',
        push_app_turn_off_failed: "Couldn't turn that off. Please try again.",
@@ -535,6 +550,8 @@ const en = {
        'Resources': 'Resources',
        restart_puter_confirm: 'Are you sure you want to restart Puter?',
        restore: 'Restore',
+        restore_location_unknown: '“{{name}}” can’t be restored because where it was deleted from isn’t known.',
+        restore_only_trash_items: '“{{name}}” is inside a folder in the Trash. Restore that folder instead.',
        retry: 'Retry',
        save: 'Save',
        saturation: 'Saturation',
@@ -872,6 +889,13 @@ const en = {
        setup2fa_5_button: 'Enable 2FA',
        setup2fa_password_instructions: 'Enter your password to set up 2FA.',
        setup2fa_code_expired: 'That code has expired. Enter the current code from your authenticator app to finish.',
+        setup2fa_step_scan: 'Scan',
+        setup2fa_step_backup: 'Backup',
+        setup2fa_step_verify: 'Verify',
+        setup2fa_enabling: 'Enabling…',
+        setup2fa_success_text: 'Your account is now protected with two-factor authentication. You’ll be asked for a verification code each time you sign in.',
+        setup2fa_copy_secret: 'Copy secret key',
+        setup2fa_recovery_codes: 'Recovery Codes',

        // === 2FA Login ===
        login2fa_otp_title: 'Enter 2FA Code',
@@ -996,9 +1020,8 @@ const en = {
        sign_in_with_provider: 'Sign in with %%',
        sign_up_with_provider: 'Sign up with %%',
        sign_up_with_email: 'Sign up using email',
-        popup_opener_uses_puter: '%strong% is powered by Puter for its AI and cloud features.\nUse your Puter account to continue.',
+        popup_opener_uses_puter: '%strong% is powered by Puter',
        popup_opener_origin_unsupported: 'Puter cannot sign you in to this page because the browser gives it no identifiable address. Pages opened straight from a file (file://) and iframes sandboxed without allow-same-origin are not supported — serve the page over http://localhost or a real domain and try again.',
-        oidc_switched_to_login_message: 'You have been logged in to an existing account.',

        // Login Window
        'login_email_username_required': 'Email or username is required',
@@ -60,6 +60,10 @@ window.gui = async (options) => {
    window.co_isolation_enabled = options.co_isolation_enabled;
    window.teams_ui = options.teams_ui ?? false;

+    // A popup a first-party page frames answers it before the SDK loads, so
+    // the page knows the frame wasn't refused.
+    window.start_popup_frame?.(options.embed_host_origin);
+
    // DEV: Load the initgui.js file if we are in development mode
    if ( !window.gui_env || window.gui_env === 'dev' ) {
        await window.loadScript('/sdk/puter.dev.js');
@@ -46,6 +46,18 @@ import UIAuthSignup from './UI/Auth/UIAuthSignup.js';
 import UIAuthRecoverPassword from './UI/Auth/UIAuthRecoverPassword.js';
 import { PROCESS_RUNNING } from './definitions.js';
 import { isAttestedOrigin } from './helpers/attestedOrigin.js';
+import { embedHostUser } from './helpers/embedHostUser.js';
+import {
+    canShowUpgradeFrame,
+    closeAccountChecksOnEscape,
+    focusOnFrameFocus,
+    framedPopupAction,
+    framedPopupParams,
+    framedUpgradeDetails,
+    framesHostUser,
+    showFramedUpgrade,
+    startPopupFrame,
+} from './helpers/popupFrame.js';
 import confirm_before_unload from './helpers/confirmBeforeUnload.js';
 import create_access_token from './helpers/createAccessToken.js';
 import create_gui_token from './helpers/createGuiToken.js';
@@ -566,6 +578,9 @@ const postAuthActions = async (action) => {
                msg,
                original_msg_id: msg_id,
            }, '*');
+            // Escape closes only the picker window, which would leave the
+            // page's frame open over an empty desktop.
+            if ( window.embedded_in_frame ) window.close();
        };

        if ( action === 'show-open-file-picker' ) {
@@ -632,12 +647,15 @@ const postAuthActions = async (action) => {
                msg: 'sendMeFileData',
            }, '*');

-            // listen for 'showSaveFilePickerPopup' event from parent
-            window.addEventListener('message', async (event) => {
-                if ( event.data.msg !== 'showSaveFilePickerPopup' )
+            // listen for 'showSaveFilePickerPopup' event from parent. Only the
+            // page that asked supplies the file, once; any other window that
+            // can reach this one (a sibling frame of the framing page) can't.
+            window.addEventListener('message', async function onFileData (event) {
+                if ( event.data?.msg !== 'showSaveFilePickerPopup' || event.source !== window.opener )
                {
                    return;
                }
+                window.removeEventListener('message', onFileData);

                // Open dialog
                UIWindow({
@@ -650,6 +668,7 @@ const postAuthActions = async (action) => {
                    title: 'Save',
                    is_dir: true,
                    is_saveFileDialog: true,
+                    saveFileDialog_default_filename: event.data.suggestedName ?? '',
                    is_resizable: false,
                    has_head: false,
                    cover_page: true,
@@ -709,7 +728,14 @@ const postAuthActions = async (action) => {
                            catch ( err ) {
                                // item with same name exists
                                if ( err.code === 'item_with_same_name_exists' ) {
-                                    const alert_resp = await UIAlert({
+                                    // Escape closes the alert without an answer,
+                                    // which counts as Cancel, so the picker isn't
+                                    // left behind its busy mask.
+                                    let alert_closed;
+                                    const alert_dismissed = new Promise((resolve) => {
+                                        alert_closed = () => resolve('cancel');
+                                    });
+                                    const alert_resp = await Promise.race([UIAlert({
                                        message: `<strong>${html_encode(err.entry_name)}</strong> already exists.`,
                                        buttons: [
                                            {
@@ -723,10 +749,11 @@ const postAuthActions = async (action) => {
                                            },
                                        ],
                                        parent_uuid: $(el_filedialog_window).attr('data-element_uuid'),
-                                    });
+                                        window_options: { on_close: alert_closed },
+                                    }), alert_dismissed]);
                                    if ( alert_resp === 'replace' ) {
                                        overwrite = true;
-                                    } else if ( alert_resp === 'cancel' ) {
+                                    } else {
                                        // enable parent window
                                        $(el_filedialog_window).find('.window-disable-mask, .busy-indicator').hide();
                                        return;
@@ -941,6 +968,7 @@ const postAuthActions = async (action) => {
            sent = await UIWindowAppFeedback({
                origin,
                source: 'web',
+                fullpage: window.embedded_in_popup === true,
            });
        } catch (e) {
            console.error('send-feedback action failed', e);
@@ -973,6 +1001,27 @@ const postAuthActions = async (action) => {
        }
    }

+    // -------------------------------------------------------------------------------------
+    // Action: upgrade — the deployment's upgrade dialog for the first-party page framing
+    // it, which hears whether the user upgraded once the dialog closes. The app it credits
+    // is the one the framing page's origin resolves to, never one the fragment names.
+    // -------------------------------------------------------------------------------------
+    if ( action === 'upgrade' && window.embedded_in_frame ) {
+        let upgraded;
+        try {
+            upgraded = await showFramedUpgrade(window, {
+                ...(window.host_app_uid ? { appUid: window.host_app_uid } : {}),
+                ...framedUpgradeDetails(window.location.hash),
+            }, window.tell_popup_frame);
+        } catch (e) {
+            // A dialog that failed to open leaves the page to open the upgrade in a tab.
+            console.error('upgrade action failed', e);
+            window.tell_popup_frame('unavailable');
+            return;
+        }
+        window.tell_popup_frame('closed', { upgraded });
+    }
+
    // -------------------------------------------------------------------------------------
    // Action: attach-custom-domain — puter.hosting.attach() on a website. Hosts the custom
    // domain dialog for `subdomain` and posts the chosen domain back to the opener.
@@ -1154,9 +1203,17 @@ if (jQuery) {
 {
    const pathname = window.location.pathname;
    const search_params = new URLSearchParams(window.location.search);
-    if (['true', '1'].includes(search_params.get('embedded_in_popup'))) {
+    // A popup a first-party page frames at `/embed/<action>` boots as one.
+    if (['true', '1'].includes(search_params.get('embedded_in_popup')) || framedPopupAction(pathname)) {
        window.embedded_in_popup = true;
    }
+    // Called by the bootstrap in index.js, which can't import.
+    window.start_popup_frame = (hostOrigin) => {
+        if (!framedPopupAction(pathname)) return;
+        window.tell_popup_frame = startPopupFrame(window, hostOrigin);
+        window.embedded_in_frame = !!window.tell_popup_frame;
+        if (window.embedded_in_frame) focusOnFrameFocus(window);
+    };
    // note: iframe detection is inlined because globals.js (window.is_embedded) loads after this module
    const in_iframe = window.location !== window.parent.location;
    const needs_desktop_at_root =
@@ -1411,8 +1468,16 @@ window.initgui = async function (options) {
    const url_paths = parse_url_paths(window.location.pathname);
    window.url_paths = url_paths;

-    // GET query params provided
-    window.url_query_params = new URLSearchParams(window.location.search);
+    // A framed popup without a framing page to answer (opened on its own, or
+    // framed by a page the server refused) has nothing to do.
+    const framed_action = framedPopupAction(window.location.pathname);
+    if (framed_action && !window.embedded_in_frame) return;
+
+    // GET query params provided. A framed popup takes the popup's parameters
+    // from its fragment; its route refuses a query string.
+    window.url_query_params = framed_action
+        ? framedPopupParams(window.location.hash)
+        : new URLSearchParams(window.location.search);
    window.signup_bonus_code = readSignupBonusCode(window.url_query_params);

    // Install device signal helpers; collection is lazy. The fingerprint is
@@ -1506,7 +1571,9 @@ window.initgui = async function (options) {
    // Extract 'action' from URL
    //--------------------------------------------------------------------------------------
    let action;
-    if (
+    if (framed_action) {
+        action = framed_action;
+    } else if (
        window.url_paths[0]?.toLocaleLowerCase() === 'action' &&
        window.url_paths[1]
    ) {
@@ -1520,6 +1587,8 @@ window.initgui = async function (options) {
    // action. See util/popupAuth.js.
    window.gui_action = action;

+    if (window.embedded_in_frame && action === 'sign-in') closeAccountChecksOnEscape(window);
+
    if (action === 'oidc-2fa') {
        const result = oidcChallenge?.token && await UIAuth2FA(oidcChallenge.token);
        if (result?.redirectUrl) {
@@ -1643,7 +1712,9 @@ window.initgui = async function (options) {
            action,
        );
        try {
-            window.openerOrigin = await resolveOpenerOrigin({
+            // A framed popup's opener is the page the server read from the
+            // referrer and pinned with frame-ancestors.
+            window.openerOrigin = window.embedded_in_frame ? window.gui_params.embed_host_origin : await resolveOpenerOrigin({
                relaysToken: relaysTokenAtBoot(
                    action,
                    window.url_query_params.get('cross_origin_isolated') ===
@@ -1700,6 +1771,31 @@ window.initgui = async function (options) {
        // this is the referrer in terms of user acquisition
        window.referrerStr = window.openerOrigin;

+        // A framed picker or upgrade shows only the Puter session of the user
+        // the framing page is signed in as; for anyone else the page uses the
+        // popup or tab, which can sign in and switch accounts.
+        if (window.embedded_in_frame && framesHostUser(action)) {
+            const host_user = embedHostUser(window.location.hash);
+            let session = null;
+            let session_user = null;
+            if (host_user && window.is_auth()) {
+                try {
+                    session = await puter.os.user({ query: 'icon_size=64' });
+                    session_user = String(session?.uuid ?? '').toLowerCase();
+                } catch (e) {
+                    session_user = null;
+                }
+            }
+            if (
+                !host_user ||
+                session_user !== host_user ||
+                (action === 'upgrade' && !canShowUpgradeFrame(window, session))
+            ) {
+                window.tell_popup_frame('unavailable');
+                return;
+            }
+        }
+
        // Tell a request-permission opener that this popup can reach it. Sent
        // here, before any sign-in gate, because the SDK reads its absence as
        // "the opener link was severed by COOP" — where a close means the
@@ -1826,25 +1922,6 @@ window.initgui = async function (options) {
        });
    }

-    //--------------------------------------------------------------------------------------
-    // Inform the user if they chose "signup" but were logged into an existing account
-    //--------------------------------------------------------------------------------------
-    if (
-        window.url_query_params.get('oidc_switched') === 'login' &&
-        window.is_auth()
-    ) {
-        await UIAlert({
-            message: i18n('oidc_switched_to_login_message'),
-        });
-        const params = new URLSearchParams(window.location.search);
-        params.delete('oidc_switched');
-        const cleanSearch = params.toString();
-        const cleanUrl = cleanSearch
-            ? `${window.location.pathname}?${cleanSearch}`
-            : window.location.pathname || '/';
-        window.history.replaceState(null, document.title, cleanUrl);
-    }
-
    //--------------------------------------------------------------------------------------
    // Early check for fullpage mode from app metadata
    // If the user navigated to /app/<app_name> and the app has fullpage_on_landing,
@@ -1951,8 +2028,11 @@ window.initgui = async function (options) {
        );
        window.userAppToken = response?.token;

+        // A framed picker or upgrade already holds the framing page's user,
+        // so it doesn't offer to switch.
        if (
            !picked_a_user_for_sdk_login &&
+            !(window.embedded_in_frame && framesHostUser(action)) &&
            window.logged_in_users.length > 1 &&
            (!window.userAppToken ||
                window.url_query_params.get('request_auth'))
@@ -0,0 +1,65 @@
+// @vitest-environment jsdom
+/*
+ * Copyright (C) 2024-present Puter Technologies Inc.
+ *
+ * This file is part of Puter.
+ *
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import jQuery from './lib/jquery-3.6.1/jquery-3.6.1.min.js';
+
+vi.mock('./UI/UIAlert.js', () => ({ default: vi.fn() }));
+vi.mock('./UI/UIWindowSearch.js', () => ({ default: vi.fn() }));
+vi.mock('./helpers/launchApp.js', () => ({ default: vi.fn() }));
+vi.mock('./helpers/openItem.js', () => ({ default: vi.fn() }));
+
+globalThis.$ = jQuery;
+globalThis.jQuery = jQuery;
+globalThis.i18n = key => key;
+globalThis.def = globalThis.def ?? (value => value);
+globalThis.use = globalThis.use ?? (() => class {});
+
+await import('./keyboard.js');
+
+const escape = () => document.body.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', keyCode: 27, which: 27, bubbles: true }));
+
+describe('Escape on a file dialog', () => {
+    const closed = [];
+
+    beforeEach(() => {
+        closed.length = 0;
+        jQuery.fn.close = function () {
+            closed.push(...this.toArray());
+            return this;
+        };
+        document.body.innerHTML = '<div class="window window-active window-filedialog"></div>';
+    });
+
+    it('closes the file dialog', () => {
+        escape();
+        expect(closed).toEqual([document.querySelector('.window-filedialog')]);
+    });
+
+    it('closes only a context menu open over it', () => {
+        document.body.insertAdjacentHTML('beforeend', '<div class="context-menu"></div>');
+        escape();
+        expect(document.querySelector('.context-menu')).toBeNull();
+        expect(closed).toEqual([]);
+
+        escape();
+        expect(closed).toEqual([document.querySelector('.window-filedialog')]);
+    });
+});
@@ -448,6 +448,8 @@ $(document).bind('keydown', async function (e) {
    else if (
        // escape key code
        e.which === 27 &&
+        // an open context menu takes the Escape (below) instead
+        $('.context-menu').length === 0 &&
        // active window must be a FileDialog or Alert
        ($('.window-active').hasClass('window-filedialog') || $('.window-active').hasClass('window-alert')) &&
        // either don't close if an input is focused or if the input is the filename input
@@ -93,6 +93,7 @@ module.exports = async (options = {}) => {
            ...entries,
        ],
        'apps-embed': './src/appsEmbed.js',
+        'feedback-embed': './src/feedbackEmbed.js',
    };
    config.output = {
        path: path.resolve(__dirname, '../dist'),
@@ -28,6 +28,7 @@ export type {
    ToolSchema,
    UpgradeReason,
    UpgradeRequestDetails,
+    UpgradeResult,
 } from './types/lib/types.js';
 export type { default as APICallLogger } from './types/lib/APICallLogger.js';

@@ -44,17 +45,17 @@ export type {
    ListTTSEnginesOptions,
    ListTTSVoicesOptions,
    OcrAnnotationFormat,
-    ConvoOptions,
-    ConvoTextEvent,
-    ConvoAudioEvent,
-    ConvoTranscriptEvent,
-    ConvoInterruptedEvent,
-    ConvoTurnDoneEvent,
-    ConvoErrorEvent,
-    ConvoEventMap,
-    ConvoSessionOptions,
-    ConvoPlaybackPosition,
-    ConvoSpeakerOptions,
+    RealtimeOptions,
+    RealtimeTextEvent,
+    RealtimeAudioEvent,
+    RealtimeTranscriptEvent,
+    RealtimeInterruptedEvent,
+    RealtimeTurnDoneEvent,
+    RealtimeErrorEvent,
+    RealtimeEventMap,
+    RealtimeSessionOptions,
+    RealtimePlaybackPosition,
+    RealtimeSpeakerOptions,
    RealtimeServerEvent,
    RealtimeClientEvent,
    Speech2SpeechOptions,
@@ -391,5 +392,5 @@ export type Teams = InstanceType<import('./types/modules/teams/index.js').TeamsC
 export type UI = InstanceType<import('./types/modules/UI.js').UIConstructor>;
 export type WorkersHandler = InstanceType<import('./types/modules/Workers.js').WorkersConstructor>;

-export type { Conversation, ConvoError } from './types/modules/ai/convo.js';
-export type { ConvoMicrophone, ConvoSpeaker } from './types/modules/ai/convoMedia.js';
+export type { Conversation, RealtimeError } from './types/modules/ai/realtime.js';
+export type { RealtimeMicrophone, RealtimeSpeaker } from './types/modules/ai/realtimeMedia.js';
@@ -0,0 +1,508 @@
+/**
+ * Puter GUI pages a first-party site can frame, under `/embed/*` on the GUI
+ * origin. The server lets only a page one label under that origin frame them.
+ */
+
+// After the frame loads, how long to wait for the embed's first message
+// before treating it as refused (a CSP that blocks it still fires `load`).
+const LOAD_GRACE_MS = 1000;
+// How long the embed may take to check the session before the popup is used.
+const READY_TIMEOUT_MS = 15_000;
+// A session check slower than this shows a loading scrim over the page.
+const LOADING_DELAY_MS = 200;
+
+// The loading scrim matches the feedback embed's own, which fades in over it
+// once ready. A popup frame keeps it as the scrim behind its box. Scrolling
+// over the dialog stays there rather than scrolling the page behind it.
+const embedStyle = (cls) => `
+dialog.${cls}{overscroll-behavior:contain}
+dialog.${cls}::backdrop{background:transparent}
+dialog.${cls}:focus{outline:none}
+.${cls}-loading{position:absolute;inset:0;display:flex;align-items:center;justify-content:center;background:rgba(0,0,0,.5);opacity:0;pointer-events:none;transition:opacity .16s ease-in-out}
+.${cls}.is-loading .${cls}-loading{opacity:1;pointer-events:auto}
+.${cls}.is-loading iframe{visibility:hidden}
+.${cls}-loading span{width:28px;height:28px;box-sizing:border-box;border:3px solid rgba(255,255,255,.3);border-top-color:#fff;border-radius:50%;animation:${cls}-spin .7s linear infinite}
+@keyframes ${cls}-spin{to{transform:rotate(360deg)}}
+@media (prefers-color-scheme:dark){.${cls}-loading{background:rgba(0,0,0,.66)}}
+@media (prefers-reduced-motion:reduce){.${cls}-loading{transition:none}.${cls}-loading span{animation-duration:1.6s}}
+`;
+
+// A popup frame sits in a box the size of the popup window it replaces, over
+// the scrim, and fills the screen on a phone as the popup's tab would. It's
+// centered by margins, which snap to device pixels where a translate can
+// leave its edge on a fraction of one. Its white backing stops 1px inside the
+// rounded edge, so in dark mode it doesn't show as a light fringe around the
+// frame. The close button starts from `all:unset` so the page's own button
+// styles don't reach it.
+const BOX_STYLE = `
+.puter-popup-frame .puter-popup-frame-loading{opacity:1;pointer-events:auto}
+.puter-popup-frame:not(.is-loading) .puter-popup-frame-loading span{display:none}
+.puter-popup-frame.is-loading .puter-popup-frame-box{visibility:hidden}
+.puter-popup-frame-box{position:absolute;inset:0;margin:auto;isolation:isolate;box-sizing:border-box;width:min(var(--puter-popup-frame-width),calc(100% - 32px));height:min(var(--puter-popup-frame-height),calc(100% - 32px));border-radius:12px;overflow:hidden;box-shadow:0 24px 64px rgba(0,0,0,.35)}
+.puter-popup-frame-box::before{content:"";position:absolute;inset:1px;z-index:-1;border-radius:11px;background:#fff}
+.puter-popup-frame-close{all:unset;box-sizing:border-box;position:absolute;top:10px;right:10px;width:32px;height:32px;display:flex;align-items:center;justify-content:center;padding:0;border:0;border-radius:50%;background:transparent;color:#6b7280;cursor:pointer}
+.puter-popup-frame-close:hover{background:rgba(127,127,127,.15)}
+.puter-popup-frame-close:focus-visible{outline:2px solid #3b82f6;outline-offset:1px}
+.puter-popup-frame-close svg{width:16px;height:16px}
+@media (prefers-color-scheme:dark){.puter-popup-frame-close{color:#9ca3af}}
+@media (max-width:600px){.puter-popup-frame-box{width:100%;height:100%;border-radius:0}.puter-popup-frame-box::before{inset:0;border-radius:0}}
+.puter-popup-frame[open] .puter-popup-frame-loading,.puter-popup-frame:not(.is-loading) .puter-popup-frame-box{animation:puter-popup-frame-in .16s ease-out}
+@keyframes puter-popup-frame-in{from{opacity:0}}
+@media (prefers-reduced-motion:reduce){.puter-popup-frame[open] .puter-popup-frame-loading,.puter-popup-frame:not(.is-loading) .puter-popup-frame-box{animation:none}}
+`;
+
+const CLOSE_ICON = '<svg viewBox="0 0 16 16" aria-hidden="true"><path d="M3.5 3.5l9 9m0-9l-9 9" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" fill="none"/></svg>';
+
+// Subdomains the server answers or reserves itself, which it never lets frame
+// an embed (the backend's `isReservedSubdomain`). Framing from one would wait
+// on a refused frame before falling back.
+const RESERVED_LABELS = new Set(['www', 'api', 'js', 'dav', 'about', 'developer', 'docs', 'apps', 'puter-app-icons']);
+
+// Dismisses the single-instance embed showing at each path.
+const showingEmbeds = new Map();
+
+// Embed dialogs showing over the page, and the page's own styles to put back
+// once none is.
+const scrollLockers = new Set();
+let pageStyle = null;
+
+/**
+ * The element whose overflow the page's viewport uses: the body's while the
+ * root's is `visible`. Hiding the root's then would make the body a scroller
+ * of its own, which starts at the top.
+ *
+ * @returns {HTMLElement}
+ */
+const viewportOverflowElement = () => {
+    const root = document.documentElement;
+    const body = document.body;
+    const visible = (el) => {
+        const style = getComputedStyle(el);
+        return style.overflowX === 'visible' && style.overflowY === 'visible';
+    };
+    return body && visible(root) && ! visible(body) ? body : root;
+};
+
+/**
+ * Stops the page scrolling behind `dialog` while it shows: Firefox and WebKit
+ * pass a scroll over the frame on to the page, whatever the dialog's
+ * `overscroll-behavior`. The root takes the width its scrollbar gave back as
+ * padding, so the page doesn't shift. Returns the function that lets it scroll again.
+ *
+ * @param {HTMLDialogElement} dialog
+ * @returns {() => void}
+ */
+const lockPageScroll = (dialog) => {
+    const root = document.documentElement;
+    const unlockPage = () => {
+        const { scroller, overflow, overflowX, overflowY } = pageStyle;
+        scroller.style.overflow = overflow;
+        // A shorthand reads empty when the page set only one axis.
+        if ( ! overflow ) {
+            scroller.style.overflowX = overflowX;
+            scroller.style.overflowY = overflowY;
+        }
+        root.style.paddingRight = pageStyle.paddingRight;
+        pageStyle = null;
+    };
+    // One the page removed itself never unlocks, so the page's own styles
+    // go back before they're read again.
+    for ( const shown of scrollLockers ) if ( ! shown.isConnected ) scrollLockers.delete(shown);
+    if ( scrollLockers.size === 0 && pageStyle ) unlockPage();
+    if ( scrollLockers.size === 0 ) {
+        const scroller = viewportOverflowElement();
+        pageStyle = {
+            scroller,
+            overflow: scroller.style.overflow,
+            overflowX: scroller.style.overflowX,
+            overflowY: scroller.style.overflowY,
+            paddingRight: root.style.paddingRight,
+        };
+        const hasScrollbar = window.innerWidth > root.clientWidth;
+        const width = hasScrollbar ? root.getBoundingClientRect().width : 0;
+        scroller.style.overflow = 'hidden';
+        // Measured, since a gutter the page keeps (`scrollbar-gutter: stable`)
+        // gives nothing back.
+        const released = hasScrollbar ? root.getBoundingClientRect().width - width : 0;
+        if ( released > 0 ) {
+            const padding = parseFloat(getComputedStyle(root).paddingRight) || 0;
+            root.style.paddingRight = `${padding + released}px`;
+        }
+    }
+    scrollLockers.add(dialog);
+    return () => {
+        if ( ! scrollLockers.delete(dialog) ) return;
+        for ( const shown of scrollLockers ) if ( ! shown.isConnected ) scrollLockers.delete(shown);
+        if ( scrollLockers.size === 0 && pageStyle ) unlockPage();
+    };
+};
+
+/**
+ * Whether a page at `pageUrl` may frame an embed served by `guiOrigin`:
+ * exactly one label under its host, on the same scheme and port, and not one
+ * of the GUI's reserved subdomains.
+ *
+ * @param {string | undefined} pageUrl
+ * @param {string} guiOrigin
+ * @returns {boolean}
+ */
+export const canFrameGuiEmbed = (pageUrl, guiOrigin) => {
+    let page;
+    let gui;
+    try {
+        page = new URL(pageUrl);
+        gui = new URL(guiOrigin);
+    } catch {
+        return false;
+    }
+    const host = page.hostname.replace(/\.$/, '').toLowerCase();
+    const suffix = `.${gui.hostname.toLowerCase()}`;
+    if ( page.protocol !== gui.protocol || page.port !== gui.port || !host.endsWith(suffix) ) return false;
+    const label = host.slice(0, -suffix.length);
+    return label.length > 0 && !label.includes('.') && !RESERVED_LABELS.has(label);
+};
+
+/**
+ * Whether every frame above `win` may frame an embed too. The server's
+ * frame-ancestors allows only the GUI and the page, so in a frame of any other
+ * site the embed is refused, and opening the popup straight away is faster.
+ *
+ * @param {Window} win - the page
+ * @param {string} guiOrigin
+ * @returns {boolean}
+ */
+export const ancestorsAllowGuiEmbed = (win, guiOrigin) => {
+    let gui;
+    try {
+        gui = new URL(guiOrigin).origin;
+    } catch {
+        return false;
+    }
+    const page = win.location.origin;
+    const ancestors = win.location.ancestorOrigins;
+    if ( ancestors ) return Array.from(ancestors).every((origin) => origin === page || origin === gui);
+    // Without ancestorOrigins (Firefox), only a same-origin ancestor can be named.
+    try {
+        for ( let w = win; w.parent !== w; w = w.parent ) {
+            if ( w.parent.location.origin !== page ) return false;
+        }
+        return true;
+    } catch {
+        return false;
+    }
+};
+
+/**
+ * Mounts `/embed/<path>` in a modal frame, hidden until the embed reports
+ * `ready` and behind a loading scrim once its start takes longer than
+ * LOADING_DELAY_MS. Resolves what `onMessage` finishes with, what `dismissed`
+ * returns when the user cancels, or null when the frame is refused, never
+ * answers, or reports itself unavailable. Never rejects.
+ *
+ * @template T
+ * @param {Object} opts
+ * @param {string} opts.guiOrigin
+ * @param {string} opts.path - under the GUI origin, such as `/embed/feedback`
+ * @param {Record<string, string>} opts.fragment - what the embed reads from its fragment
+ * @param {string} opts.className - the dialog's class, prefixing its parts'
+ * @param {string} opts.title - the frame's accessible name
+ * @param {string} opts.stateMsg - `msg` of the embed's loading, ready and unavailable messages
+ * @param {{ width: number, height: number }} [opts.box] - shows the frame in a box this size over a scrim; without it the frame covers the page and the embed draws its own scrim
+ * @param {string} [opts.closeLabel] - puts a close button on the box, which dismisses it
+ * @param {string} [opts.allow] - the frame's permissions policy, for features the embed uses
+ * @param {boolean} [opts.escapeDismisses] - Escape on the page dismisses a ready embed too, instead of handing it the keys
+ * @param {boolean} [opts.single] - a newer embed at this path dismisses this one, as a named popup window is reused
+ * @param {() => T} opts.dismissed - the result of a dismissal: Escape or a click on the loading scrim, or the close button
+ * @param {(data: Record<string, unknown>, finish: (result: T | null) => void) => void} opts.onMessage - every other message from the embed
+ * @param {(frame: Window) => void} [opts.onFrame] - the frame's window, once it exists
+ * @returns {Promise<T | null>}
+ */
+const mountGuiEmbed = ({ guiOrigin, path, fragment, className, title, stateMsg, box, closeLabel, allow, escapeDismisses = false, single = false, dismissed, onMessage, onFrame }) => new Promise((resolve) => {
+    let origin;
+    try {
+        origin = new URL(guiOrigin).origin;
+    } catch {
+        resolve(null);
+        return;
+    }
+    const url = new URL(path, origin);
+    url.hash = new URLSearchParams(fragment).toString();
+    // Before reading the focus this one restores, which the older one hands back.
+    if ( single ) showingEmbeds.get(path)?.();
+
+    const dialog = document.createElement('dialog');
+    dialog.className = className;
+    dialog.setAttribute('aria-label', title);
+    // Inline, so the page's own `dialog` and `iframe` styles can't move,
+    // round or shrink them.
+    dialog.style.cssText = 'position:fixed;inset:0;width:100%;height:100%;min-width:0;min-height:0;max-width:none;max-height:none;margin:0;padding:0;border:0;border-radius:0;box-shadow:none;transform:none;background:transparent;overflow:hidden;';
+    const style = document.createElement('style');
+    style.textContent = embedStyle(className) + (box ? BOX_STYLE : '');
+    const frame = document.createElement('iframe');
+    frame.title = title;
+    // The embed allows a framing page it can name from the referrer.
+    frame.setAttribute('referrerpolicy', 'origin');
+    if ( allow ) frame.setAttribute('allow', allow);
+    const frameBase = 'display:block;width:100%;height:100%;min-width:0;min-height:0;max-width:none;max-height:none;margin:0;padding:0;border:0;';
+    // A frame whose color-scheme differs from its document's is painted
+    // opaque, so this matches the embed's. WebKit also gives the frame this
+    // scheme as its preferred one, so it has to follow the OS.
+    frame.style.cssText = box
+        ? frameBase
+        : `${frameBase}background:transparent;color-scheme:light dark;`;
+    const loading = document.createElement('div');
+    loading.className = `${className}-loading`;
+    loading.setAttribute('role', 'status');
+    loading.setAttribute('aria-label', 'Loading');
+    loading.setAttribute('aria-hidden', 'true');
+    loading.append(document.createElement('span'));
+    dialog.append(style, loading);
+    if ( box ) {
+        const container = document.createElement('div');
+        container.className = `${className}-box`;
+        container.style.setProperty('--puter-popup-frame-width', `${box.width}px`);
+        container.style.setProperty('--puter-popup-frame-height', `${box.height}px`);
+        container.append(frame);
+        if ( closeLabel ) {
+            const close = document.createElement('button');
+            close.type = 'button';
+            close.className = `${className}-close`;
+            close.setAttribute('aria-label', closeLabel);
+            close.title = closeLabel;
+            close.innerHTML = CLOSE_ICON;
+            close.addEventListener('click', () => dismiss());
+            container.append(close);
+        }
+        dialog.append(container);
+    } else {
+        dialog.insertBefore(frame, loading);
+    }
+
+    let settled = false;
+    let heard = false;
+    let shown = false;
+    let ready = false;
+    let timer = null;
+    let loadingTimer = null;
+    // Each embed document posts `loading` once; these tell a document that
+    // never did (one the server refused) from one that did.
+    let loads = 0;
+    let boots = 0;
+    let wasReady = false;
+    let restarted = false;
+    let restartTimer = null;
+    let unlockScroll = null;
+    // A dialog the page removes itself, such as by re-rendering its body,
+    // counts as dismissed, so whoever awaits it isn't left waiting.
+    const removal = new MutationObserver(() => {
+        if ( ! dialog.isConnected ) dismiss();
+    });
+    const restoreFocus = document.activeElement;
+    const wait = (ms) => {
+        clearTimeout(timer);
+        timer = setTimeout(() => finish(null), ms);
+    };
+    const finish = (result) => {
+        if ( settled ) return;
+        settled = true;
+        clearTimeout(timer);
+        clearTimeout(loadingTimer);
+        clearTimeout(restartTimer);
+        removal.disconnect();
+        window.removeEventListener('message', onWindowMessage);
+        if ( showingEmbeds.get(path) === dismiss ) showingEmbeds.delete(path);
+        dialog.remove();
+        unlockScroll?.();
+        if ( shown ) restoreFocus?.focus?.({ preventScroll: true });
+        resolve(result);
+    };
+    const dismiss = () => finish(dismissed());
+    if ( single ) showingEmbeds.set(path, dismiss);
+    // The spinner is only faded out, so assistive tech hears it only while it shows.
+    const setLoading = (on) => {
+        dialog.classList.toggle('is-loading', on);
+        if ( on ) loading.removeAttribute('aria-hidden');
+        else loading.setAttribute('aria-hidden', 'true');
+    };
+    const show = () => {
+        if ( dialog.open ) return;
+        shown = true;
+        dialog.showModal();
+        unlockScroll = lockPageScroll(dialog);
+    };
+    const onWindowMessage = (event) => {
+        if ( event.origin !== origin || event.source !== frame.contentWindow ) return;
+        const data = event.data;
+        if ( !data || typeof data !== 'object' ) return;
+        if ( data.msg !== stateMsg || !['loading', 'ready', 'unavailable'].includes(data.state) ) {
+            onMessage(data, finish);
+        } else if ( data.state === 'loading' ) {
+            heard = true;
+            boots++;
+            wait(READY_TIMEOUT_MS);
+        } else if ( data.state === 'ready' ) {
+            heard = true;
+            ready = true;
+            wasReady = true;
+            restarted = false;
+            clearTimeout(timer);
+            clearTimeout(loadingTimer);
+            setLoading(false);
+            show();
+            frame.focus();
+        } else {
+            finish(null);
+        }
+    };
+    // A reload or navigation the embed starts itself names the embed, not
+    // this page, as its referrer, so the server refuses to let it frame. This
+    // page opens the embed again, once, which it allows.
+    const restart = () => {
+        if ( restarted ) {
+            finish(null);
+            return;
+        }
+        restarted = true;
+        ready = false;
+        loads = boots;
+        setLoading(true);
+        // As long as its first start may take, then the popup.
+        wait(READY_TIMEOUT_MS);
+        // WebKit takes the refused URL itself as a fragment navigation of its
+        // error page, which loads nothing. The server redirects a query away,
+        // and the fragment carries over the redirect.
+        const reopen = new URL(url);
+        reopen.search = 'reopen';
+        frame.src = reopen.href;
+    };
+    window.addEventListener('message', onWindowMessage);
+    frame.addEventListener('load', () => {
+        loads++;
+        if ( ! heard ) wait(LOAD_GRACE_MS);
+        if ( ! wasReady || boots >= loads ) return;
+        // Most likely refused: the spinner covers the error page meanwhile.
+        ready = false;
+        setLoading(true);
+        const expected = loads;
+        clearTimeout(restartTimer);
+        restartTimer = setTimeout(() => {
+            if ( boots < expected ) restart();
+        }, LOAD_GRACE_MS);
+    });
+    // Once ready, Escape outside the frame would close the dialog with the
+    // embed's own dialog still open inside it, so the embed owns dismissal
+    // unless it dismisses on Escape too.
+    dialog.addEventListener('cancel', (event) => {
+        event.preventDefault();
+        if ( ready && ! escapeDismisses ) frame.focus();
+        else dismiss();
+    });
+    loading.addEventListener('click', () => {
+        if ( ! ready ) dismiss();
+    });
+
+    try {
+        frame.src = url.href;
+        // Hidden at first, so a quickly refused session shows nothing.
+        document.body.append(dialog);
+        removal.observe(document.documentElement, { childList: true, subtree: true });
+        onFrame?.(frame.contentWindow);
+        wait(READY_TIMEOUT_MS);
+        loadingTimer = setTimeout(() => {
+            setLoading(true);
+            show();
+        }, LOADING_DELAY_MS);
+    } catch {
+        finish(null);
+    }
+});
+
+/**
+ * Shows the app feedback dialog from `/embed/feedback` in a modal frame over
+ * the page, as the user named, behind a loading scrim while a slow session
+ * check runs. Resolves `{ sent }` once the dialog closes or the user cancels
+ * the loading scrim, or null when the embed can't serve this user (no
+ * matching Puter session, an email to confirm, or a refused frame), so the
+ * caller can use the popup instead. Never rejects.
+ *
+ * @param {Object} opts
+ * @param {string} opts.guiOrigin
+ * @param {string} opts.userUuid - the page's signed-in user
+ * @returns {Promise<{ sent: boolean } | null>}
+ */
+export const showFeedbackEmbed = ({ guiOrigin, userUuid }) => mountGuiEmbed({
+    guiOrigin,
+    path: '/embed/feedback',
+    fragment: { user: userUuid },
+    className: 'puter-feedback-embed',
+    title: 'Send feedback',
+    stateMsg: 'feedbackEmbed',
+    dismissed: () => ({ sent: false }),
+    onMessage: ({ msg, sent }, finish) => {
+        if ( msg === 'feedbackDialogClosed' ) finish({ sent: sent === true });
+    },
+});
+
+/** Popup actions a first-party page shows framed, each in a box its popup window's size. */
+const POPUP_FRAME_BOXES = {
+    'sign-in': { width: 600, height: 700 },
+    'show-open-file-picker': { width: 700, height: 400 },
+    'show-save-file-picker': { width: 700, height: 400 },
+    'show-directory-picker': { width: 700, height: 400 },
+};
+
+// The upgrade has no box: it covers the page and its dialog draws its own
+// scrim. A payment in it may use the Payment Request API, which a frame can
+// use only when allowed, and Escape is left to the dialog, which doesn't close
+// mid-entry.
+const UNBOXED_POPUP_FRAMES = {
+    upgrade: { allow: 'payment; otp-credentials', escapeDismisses: false },
+};
+
+/**
+ * Shows the GUI popup for `action` in a frame over the page instead of a
+ * window, from `/embed/<action>`. The GUI runs the popup unchanged and posts
+ * its answers to this page as it would to an opener; `onMessage` sees each of
+ * them and finishes with the result. The frame closing on its own, as the
+ * popup would, finishes with `closed(data)`, `data` being its closing
+ * message, and the user dismissing it finishes with `closed()`. Resolves null
+ * when the frame can't serve the request (refused, never answering, or
+ * reporting itself unavailable), so the caller can open the popup instead.
+ * Never rejects.
+ *
+ * @template T
+ * @param {Object} opts
+ * @param {string} opts.guiOrigin
+ * @param {'sign-in' | 'show-open-file-picker' | 'show-save-file-picker' | 'show-directory-picker' | 'upgrade'} opts.action
+ * @param {Record<string, string>} opts.fragment - the popup's parameters, and `user` for a picker or the upgrade
+ * @param {string} opts.title - the frame's accessible name
+ * @param {string} [opts.closeLabel] - puts a close button on the frame
+ * @param {(data?: Record<string, unknown>) => T} opts.closed
+ * @param {(data: Record<string, unknown>, finish: (result: T) => void) => void} opts.onMessage
+ * @param {(frame: Window) => void} [opts.onFrame]
+ * @returns {Promise<T | null>}
+ */
+export const showPopupFrame = ({ guiOrigin, action, fragment, title, closeLabel, closed, onMessage, onFrame }) => mountGuiEmbed({
+    guiOrigin,
+    path: `/embed/${action}`,
+    fragment,
+    className: 'puter-popup-frame',
+    title,
+    stateMsg: 'puterPopupFrame',
+    box: POPUP_FRAME_BOXES[action],
+    closeLabel,
+    // Signup and the account checks fill in a texted code, as in the popup.
+    allow: 'otp-credentials',
+    // Escape inside the frame closes it as well.
+    escapeDismisses: true,
+    ...UNBOXED_POPUP_FRAMES[action],
+    // A second request for this popup, such as from a double click, replaces the
+    // first. Each popup has its own window name, so other popups stay open.
+    single: true,
+    dismissed: () => closed(),
+    onFrame,
+    onMessage: (data, finish) => {
+        if ( data.msg === 'puterPopupFrame' && data.state === 'closed' ) finish(closed(data));
+        else onMessage(data, finish);
+    },
+});
@@ -0,0 +1,622 @@
+// @vitest-environment jsdom
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { ancestorsAllowGuiEmbed, canFrameGuiEmbed, showFeedbackEmbed, showPopupFrame } from './guiEmbed.js';
+
+const GUI_ORIGIN = 'https://puter.test';
+const USER = '0b1c9a52-3f0e-4c7a-9a65-2f6d1e8b7c40';
+
+// jsdom has no top-layer dialogs.
+HTMLDialogElement.prototype.showModal = function () {
+    this.open = true;
+};
+
+const frame = () => document.querySelector('dialog.puter-feedback-embed iframe');
+
+/** A message from the embed, by default from its frame on the GUI origin. */
+const fromEmbed = (data, { origin = GUI_ORIGIN, source = frame().contentWindow } = {}) =>
+    window.dispatchEvent(new MessageEvent('message', { data, origin, source }));
+
+beforeEach(() => {
+    document.body.innerHTML = '';
+});
+
+afterEach(() => {
+    vi.useRealTimers();
+});
+
+describe('canFrameGuiEmbed', () => {
+    it.each([
+        ['https://notes.puter.com/a', 'https://puter.com', true],
+        ['https://NOTES.puter.com./a', 'https://puter.com', true],
+        ['http://notes.puter.localhost:4100/', 'http://puter.localhost:4100', true],
+        ['https://puter.com/', 'https://puter.com', false],
+        ['https://a.b.puter.com/', 'https://puter.com', false],
+        ['https://notputer.com/', 'https://puter.com', false],
+        ['https://notes.puter.com.evil.com/', 'https://puter.com', false],
+        ['http://notes.puter.com/', 'https://puter.com', false],
+        ['https://notes.puter.com:8443/', 'https://puter.com', false],
+        ['https://notes.puter.site/', 'https://puter.com', false],
+        ['https://docs.puter.com/playground/', 'https://puter.com', false],
+        ['https://api.puter.com/', 'https://puter.com', false],
+        ['https://www.puter.com/', 'https://puter.com', false],
+        ['http://apps.puter.localhost:4100/', 'http://puter.localhost:4100', false],
+        [undefined, 'https://puter.com', false],
+    ])('%s under %s is %s', (page, gui, expected) => {
+        expect(canFrameGuiEmbed(page, gui)).toBe(expected);
+    });
+});
+
+describe('ancestorsAllowGuiEmbed', () => {
+    const PAGE = 'https://notes.puter.test';
+    /** A window at `origin` under `parent`; a cross-origin parent throws on `location`, as in a browser. */
+    const fakeWindow = ({ origin = PAGE, ancestorOrigins, parent } = {}) => {
+        const win = { location: { origin, ancestorOrigins } };
+        win.parent = parent ?? win;
+        return win;
+    };
+    const crossOrigin = () => {
+        const win = {};
+        Object.defineProperty(win, 'location', { get: () => { throw new DOMException('Blocked', 'SecurityError'); } });
+        win.parent = win;
+        return win;
+    };
+
+    it.each([
+        ['a top-level page', [], true],
+        ['a frame of the same page', [PAGE], true],
+        ['a frame in the GUI', [PAGE, GUI_ORIGIN], true],
+        ['a frame of another site', ['https://other.test'], false],
+        ['a frame of the page inside another site', [PAGE, 'https://other.test'], false],
+    ])('reads ancestorOrigins for %s', (_, ancestorOrigins, expected) => {
+        expect(ancestorsAllowGuiEmbed(fakeWindow({ ancestorOrigins }), GUI_ORIGIN)).toBe(expected);
+    });
+
+    it('walks same-origin parents without ancestorOrigins', () => {
+        expect(ancestorsAllowGuiEmbed(fakeWindow(), GUI_ORIGIN)).toBe(true);
+        expect(ancestorsAllowGuiEmbed(fakeWindow({ parent: fakeWindow() }), GUI_ORIGIN)).toBe(true);
+        expect(ancestorsAllowGuiEmbed(fakeWindow({ parent: crossOrigin() }), GUI_ORIGIN)).toBe(false);
+    });
+});
+
+describe('showFeedbackEmbed', () => {
+    it('loads the embed for the named user, hidden until it is ready', () => {
+        showFeedbackEmbed({ guiOrigin: `${GUI_ORIGIN}/`, userUuid: USER });
+        const url = new URL(frame().src);
+        expect(url.origin + url.pathname).toBe(`${GUI_ORIGIN}/embed/feedback`);
+        expect(url.search).toBe('');
+        expect(new URLSearchParams(url.hash.slice(1)).get('user')).toBe(USER);
+        expect(frame().getAttribute('referrerpolicy')).toBe('origin');
+        // WebKit hands the frame this as its preferred scheme; it must follow the OS.
+        expect(frame().getAttribute('style')).toContain('color-scheme: light dark');
+        expect(frame().closest('dialog').open).toBe(false);
+    });
+
+    it('shows the dialog once ready and resolves what it reports, restoring focus', async () => {
+        const trigger = document.createElement('button');
+        document.body.append(trigger);
+        trigger.focus();
+        const result = showFeedbackEmbed({ guiOrigin: GUI_ORIGIN, userUuid: USER });
+        const dialog = frame().closest('dialog');
+
+        fromEmbed({ msg: 'feedbackEmbed', state: 'loading' });
+        expect(dialog.open).toBe(false);
+        fromEmbed({ msg: 'feedbackEmbed', state: 'ready' });
+        expect(dialog.open).toBe(true);
+        expect(document.activeElement).toBe(frame());
+
+        fromEmbed({ msg: 'feedbackDialogClosed', sent: true });
+        await expect(result).resolves.toEqual({ sent: true });
+        expect(dialog.isConnected).toBe(false);
+        expect(document.activeElement).toBe(trigger);
+    });
+
+    it('shows a loading scrim over the page while a slow session check runs, then the dialog', async () => {
+        vi.useFakeTimers();
+        const trigger = document.createElement('button');
+        document.body.append(trigger);
+        trigger.focus();
+        const result = showFeedbackEmbed({ guiOrigin: GUI_ORIGIN, userUuid: USER });
+        const dialog = frame().closest('dialog');
+        fromEmbed({ msg: 'feedbackEmbed', state: 'loading' });
+        await vi.advanceTimersByTimeAsync(199);
+        expect(dialog.open).toBe(false);
+        await vi.advanceTimersByTimeAsync(1);
+        expect(dialog.open).toBe(true);
+        expect(dialog.classList.contains('is-loading')).toBe(true);
+        expect(dialog.querySelector('[role="status"]').hasAttribute('aria-hidden')).toBe(false);
+
+        fromEmbed({ msg: 'feedbackEmbed', state: 'ready' });
+        expect(dialog.classList.contains('is-loading')).toBe(false);
+        expect(dialog.querySelector('[role="status"]').getAttribute('aria-hidden')).toBe('true');
+        expect(document.activeElement).toBe(frame());
+        fromEmbed({ msg: 'feedbackDialogClosed', sent: true });
+        await expect(result).resolves.toEqual({ sent: true });
+        expect(document.activeElement).toBe(trigger);
+    });
+
+    it('never shows the loading scrim when the embed is ready quickly', async () => {
+        vi.useFakeTimers();
+        showFeedbackEmbed({ guiOrigin: GUI_ORIGIN, userUuid: USER });
+        const dialog = frame().closest('dialog');
+        fromEmbed({ msg: 'feedbackEmbed', state: 'ready' });
+        await vi.advanceTimersByTimeAsync(1000);
+        expect(dialog.open).toBe(true);
+        expect(dialog.classList.contains('is-loading')).toBe(false);
+    });
+
+    it('takes the loading scrim down for the popup when the embed turns out unavailable', async () => {
+        vi.useFakeTimers();
+        const trigger = document.createElement('button');
+        document.body.append(trigger);
+        trigger.focus();
+        const result = showFeedbackEmbed({ guiOrigin: GUI_ORIGIN, userUuid: USER });
+        await vi.advanceTimersByTimeAsync(200);
+        fromEmbed({ msg: 'feedbackEmbed', state: 'unavailable' });
+        await expect(result).resolves.toBeNull();
+        expect(document.querySelector('dialog')).toBeNull();
+        expect(document.activeElement).toBe(trigger);
+    });
+
+    it.each([
+        ['Escape', (dialog) => dialog.dispatchEvent(new Event('cancel', { cancelable: true }))],
+        ['a click on the scrim', (dialog) => dialog.querySelector('[role="status"]').click()],
+    ])('lets %s cancel while loading, without falling back to the popup', async (_label, cancel) => {
+        vi.useFakeTimers();
+        const result = showFeedbackEmbed({ guiOrigin: GUI_ORIGIN, userUuid: USER });
+        await vi.advanceTimersByTimeAsync(200);
+        cancel(frame().closest('dialog'));
+        await expect(result).resolves.toEqual({ sent: false });
+        expect(document.querySelector('dialog')).toBeNull();
+    });
+
+    it('resolves null without showing anything when the embed is unavailable', async () => {
+        const result = showFeedbackEmbed({ guiOrigin: GUI_ORIGIN, userUuid: USER });
+        const dialog = frame().closest('dialog');
+        fromEmbed({ msg: 'feedbackEmbed', state: 'loading' });
+        fromEmbed({ msg: 'feedbackEmbed', state: 'unavailable' });
+        await expect(result).resolves.toBeNull();
+        expect(dialog.open).toBe(false);
+        expect(dialog.isConnected).toBe(false);
+    });
+
+    it('ignores messages from another origin or another window', async () => {
+        const result = showFeedbackEmbed({ guiOrigin: GUI_ORIGIN, userUuid: USER });
+        fromEmbed({ msg: 'feedbackDialogClosed', sent: true }, { origin: 'https://other.test' });
+        fromEmbed({ msg: 'feedbackDialogClosed', sent: true }, { source: window });
+        fromEmbed({ msg: 'feedbackEmbed', state: 'ready' }, { origin: 'https://notes.puter.test' });
+        expect(frame().closest('dialog').open).toBe(false);
+
+        fromEmbed({ msg: 'feedbackDialogClosed', sent: false });
+        await expect(result).resolves.toEqual({ sent: false });
+    });
+
+    it('resolves null when the frame loads without the embed answering', async () => {
+        vi.useFakeTimers();
+        const result = showFeedbackEmbed({ guiOrigin: GUI_ORIGIN, userUuid: USER });
+        frame().dispatchEvent(new Event('load'));
+        await vi.advanceTimersByTimeAsync(1000);
+        await expect(result).resolves.toBeNull();
+        expect(document.querySelector('dialog')).toBeNull();
+    });
+
+    it('gives a loading embed time to check the session, then gives up', async () => {
+        vi.useFakeTimers();
+        const result = showFeedbackEmbed({ guiOrigin: GUI_ORIGIN, userUuid: USER });
+        fromEmbed({ msg: 'feedbackEmbed', state: 'loading' });
+        frame().dispatchEvent(new Event('load'));
+        let settled = false;
+        result.then(() => {
+            settled = true;
+        });
+        await vi.advanceTimersByTimeAsync(5000);
+        expect(settled).toBe(false);
+        await vi.advanceTimersByTimeAsync(10_000);
+        await expect(result).resolves.toBeNull();
+    });
+
+    it('keeps the dialog open on Escape outside the frame, since the embed owns dismissal', () => {
+        showFeedbackEmbed({ guiOrigin: GUI_ORIGIN, userUuid: USER });
+        fromEmbed({ msg: 'feedbackEmbed', state: 'ready' });
+        const dialog = frame().closest('dialog');
+        const cancel = new Event('cancel', { cancelable: true });
+        dialog.dispatchEvent(cancel);
+        expect(cancel.defaultPrevented).toBe(true);
+        expect(dialog.isConnected).toBe(true);
+    });
+
+    it('resolves null for an unusable GUI origin', async () => {
+        await expect(showFeedbackEmbed({ guiOrigin: 'not a url', userUuid: USER })).resolves.toBeNull();
+        expect(document.querySelector('dialog')).toBeNull();
+    });
+});
+
+describe('showPopupFrame', () => {
+    const popupFrame = () => document.querySelector('dialog.puter-popup-frame iframe');
+    const fromPopup = (data, { origin = GUI_ORIGIN, source = popupFrame().contentWindow } = {}) =>
+        window.dispatchEvent(new MessageEvent('message', { data, origin, source }));
+    const show = (overrides = {}) => showPopupFrame({
+        guiOrigin: GUI_ORIGIN,
+        action: 'show-open-file-picker',
+        fragment: { msg_id: '3', user: USER },
+        title: 'Open file',
+        closed: () => 'closed',
+        onMessage: () => {},
+        ...overrides,
+    });
+
+    it('loads the popup action with its parameters in the fragment, hidden until ready', () => {
+        let framed;
+        show({ onFrame: (win) => {
+            framed = win;
+        } });
+        const url = new URL(popupFrame().src);
+        expect(url.origin + url.pathname).toBe(`${GUI_ORIGIN}/embed/show-open-file-picker`);
+        expect(url.search).toBe('');
+        expect(Object.fromEntries(new URLSearchParams(url.hash.slice(1)))).toEqual({ msg_id: '3', user: USER });
+        expect(popupFrame().getAttribute('referrerpolicy')).toBe('origin');
+        expect(popupFrame().closest('dialog').getAttribute('aria-label')).toBe('Open file');
+        expect(popupFrame().getAttribute('allow')).toBe('otp-credentials');
+        expect(framed).toBe(popupFrame().contentWindow);
+        expect(popupFrame().closest('dialog').open).toBe(false);
+    });
+
+    it('sizes the box like the popup window it replaces', () => {
+        show({ action: 'sign-in', fragment: { msg_id: 'a' } });
+        const box = document.querySelector('.puter-popup-frame-box');
+        expect(box.style.getPropertyValue('--puter-popup-frame-width')).toBe('600px');
+        expect(box.style.getPropertyValue('--puter-popup-frame-height')).toBe('700px');
+        expect(box.contains(popupFrame())).toBe(true);
+    });
+
+    it('shows once ready and hands every other message to the caller to finish with', async () => {
+        const seen = [];
+        const result = show({ onMessage: (data, finish) => {
+            seen.push(data.msg);
+            if ( data.msg === 'fileOpenPicked' ) finish('picked');
+        } });
+        const dialog = popupFrame().closest('dialog');
+        const status = dialog.querySelector('[role="status"]');
+        expect(status.getAttribute('aria-hidden')).toBe('true');
+        fromPopup({ msg: 'puterPopupFrame', state: 'loading' });
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+        expect(dialog.open).toBe(true);
+        expect(status.getAttribute('aria-hidden')).toBe('true');
+        expect(document.activeElement).toBe(popupFrame());
+        fromPopup({ msg: 'puter.token', success: true });
+        fromPopup({ msg: 'fileOpenPicked' });
+        await expect(result).resolves.toBe('picked');
+        expect(seen).toEqual(['puter.token', 'fileOpenPicked']);
+        expect(dialog.isConnected).toBe(false);
+    });
+
+    it('opens itself again when the embed reloads into a refused frame, once per ready', async () => {
+        vi.useFakeTimers();
+        const result = show();
+        const iframe = popupFrame();
+        const dialog = iframe.closest('dialog');
+        const srcSet = vi.spyOn(iframe, 'src', 'set');
+        const load = () => iframe.dispatchEvent(new Event('load'));
+        fromPopup({ msg: 'puterPopupFrame', state: 'loading' });
+        load();
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+
+        // A reload the embed starts itself loads a document that never posts.
+        load();
+        expect(dialog.classList.contains('is-loading')).toBe(true);
+        vi.advanceTimersByTime(1000);
+        expect(srcSet).toHaveBeenCalledTimes(1);
+        // Not just the refused URL again, which WebKit takes as a fragment
+        // navigation of the error page: the server redirects the query away.
+        const opened = new URL(iframe.src);
+        const reopened = new URL(srcSet.mock.calls[0][0]);
+        expect(reopened.search).not.toBe('');
+        expect(reopened.origin + reopened.pathname + reopened.hash).toBe(opened.origin + opened.pathname + opened.hash);
+        expect(dialog.classList.contains('is-loading')).toBe(true);
+
+        // The page's own reload boots, before or after its load event.
+        fromPopup({ msg: 'puterPopupFrame', state: 'loading' });
+        load();
+        vi.advanceTimersByTime(1000);
+        expect(srcSet).toHaveBeenCalledTimes(1);
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+        expect(dialog.classList.contains('is-loading')).toBe(false);
+
+        // Ready again, so a later refusal is retried too, but not twice running.
+        load();
+        vi.advanceTimersByTime(1000);
+        expect(srcSet).toHaveBeenCalledTimes(2);
+        load();
+        vi.advanceTimersByTime(1000);
+        await expect(result).resolves.toBeNull();
+        expect(srcSet).toHaveBeenCalledTimes(2);
+    });
+
+    it('falls back to the popup when the embed it opens again never loads', async () => {
+        vi.useFakeTimers();
+        const result = show();
+        const iframe = popupFrame();
+        const dialog = iframe.closest('dialog');
+        const load = () => iframe.dispatchEvent(new Event('load'));
+        fromPopup({ msg: 'puterPopupFrame', state: 'loading' });
+        load();
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+
+        // Refused after a reload of its own, then reopened on a stalled connection.
+        load();
+        vi.advanceTimersByTime(1000);
+        vi.advanceTimersByTime(14_999);
+        expect(dialog.isConnected).toBe(true);
+        vi.advanceTimersByTime(1);
+        await expect(result).resolves.toBeNull();
+        expect(dialog.isConnected).toBe(false);
+    });
+
+    it('keeps showing an embed that was ready before its load event fired', () => {
+        vi.useFakeTimers();
+        show();
+        const iframe = popupFrame();
+        const dialog = iframe.closest('dialog');
+        const srcSet = vi.spyOn(iframe, 'src', 'set');
+        const load = () => iframe.dispatchEvent(new Event('load'));
+        fromPopup({ msg: 'puterPopupFrame', state: 'loading' });
+        load();
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+        load();
+        vi.advanceTimersByTime(1000);
+        expect(srcSet).toHaveBeenCalledTimes(1);
+
+        // The page's reload shows its UI while a slow image still loads.
+        fromPopup({ msg: 'puterPopupFrame', state: 'loading' });
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+        load();
+        vi.advanceTimersByTime(5000);
+        expect(dialog.classList.contains('is-loading')).toBe(false);
+        expect(srcSet).toHaveBeenCalledTimes(1);
+        expect(dialog.isConnected).toBe(true);
+    });
+
+    it('closes on Escape outside the frame once ready, as Escape inside it does', async () => {
+        const result = show();
+        const dialog = popupFrame().closest('dialog');
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+        const cancel = new Event('cancel', { cancelable: true });
+        dialog.dispatchEvent(cancel);
+        expect(cancel.defaultPrevented).toBe(true);
+        await expect(result).resolves.toBe('closed');
+        expect(dialog.isConnected).toBe(false);
+    });
+
+    it('finishes as closed when the popup closes itself', async () => {
+        const result = show();
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+        fromPopup({ msg: 'puterPopupFrame', state: 'closed' });
+        await expect(result).resolves.toBe('closed');
+        expect(document.querySelector('dialog')).toBeNull();
+    });
+
+    it('offers a close button only when asked, which finishes as closed', async () => {
+        show();
+        expect(document.querySelector('.puter-popup-frame-close')).toBeNull();
+        document.body.innerHTML = '';
+
+        const result = show({ action: 'sign-in', closeLabel: 'Close' });
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+        const close = document.querySelector('.puter-popup-frame-close');
+        expect(close.getAttribute('aria-label')).toBe('Close');
+        close.click();
+        await expect(result).resolves.toBe('closed');
+    });
+
+    it('resolves null for the popup when the frame is unavailable or refused', async () => {
+        const unavailable = show();
+        fromPopup({ msg: 'puterPopupFrame', state: 'loading' });
+        fromPopup({ msg: 'puterPopupFrame', state: 'unavailable' });
+        await expect(unavailable).resolves.toBeNull();
+
+        vi.useFakeTimers();
+        const refused = show();
+        popupFrame().dispatchEvent(new Event('load'));
+        await vi.advanceTimersByTimeAsync(1000);
+        await expect(refused).resolves.toBeNull();
+    });
+
+    it('lets the user dismiss the loading scrim, finishing as closed', async () => {
+        vi.useFakeTimers();
+        const result = show();
+        await vi.advanceTimersByTimeAsync(200);
+        document.querySelector('.puter-popup-frame-loading').click();
+        await expect(result).resolves.toBe('closed');
+    });
+
+    it('replaces a popup frame that is showing, finishing it as closed', async () => {
+        const button = document.createElement('button');
+        document.body.append(button);
+        button.focus();
+        const first = show();
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+        const firstDialog = popupFrame().closest('dialog');
+        const second = show({ fragment: { msg_id: '4', user: USER } });
+        await expect(first).resolves.toBe('closed');
+        expect(firstDialog.isConnected).toBe(false);
+        expect(document.querySelectorAll('dialog.puter-popup-frame')).toHaveLength(1);
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+        fromPopup({ msg: 'puterPopupFrame', state: 'closed' });
+        await expect(second).resolves.toBe('closed');
+        expect(document.activeElement).toBe(button);
+    });
+
+    it('leaves a popup frame for another action showing, as its popup window would stay open', async () => {
+        const picker = show();
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+        const pickerFrame = popupFrame();
+        const signIn = show({ action: 'sign-in', fragment: { msg_id: 'a' } });
+        expect(document.querySelectorAll('dialog.puter-popup-frame')).toHaveLength(2);
+        const signInFrame = document.querySelectorAll('dialog.puter-popup-frame iframe')[1];
+        fromPopup({ msg: 'puterPopupFrame', state: 'closed' }, { source: signInFrame.contentWindow });
+        await expect(signIn).resolves.toBe('closed');
+        expect(pickerFrame.isConnected).toBe(true);
+        fromPopup({ msg: 'puterPopupFrame', state: 'closed' }, { source: pickerFrame.contentWindow });
+        await expect(picker).resolves.toBe('closed');
+    });
+
+    it('finishes as closed when the page removes it, letting the page scroll again', async () => {
+        const result = show({ action: 'upgrade', fragment: { user: USER } });
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+        expect(document.documentElement.style.overflow).toBe('hidden');
+        document.body.innerHTML = '<main>re-rendered</main>';
+        await expect(result).resolves.toBe('closed');
+        expect(document.documentElement.style.overflow).toBe('');
+    });
+
+    it('keeps the scrim behind a ready frame from dismissing it', () => {
+        show();
+        fromPopup({ msg: 'puterPopupFrame', state: 'ready' });
+        document.querySelector('.puter-popup-frame-loading').click();
+        expect(popupFrame().closest('dialog').isConnected).toBe(true);
+    });
+
+    it('ignores messages from another origin or another window', async () => {
+        const onMessage = vi.fn();
+        show({ onMessage });
+        fromPopup({ msg: 'puterPopupFrame', state: 'closed' }, { origin: 'https://other.test' });
+        fromPopup({ msg: 'fileOpenPicked' }, { source: window });
+        expect(onMessage).not.toHaveBeenCalled();
+        expect(popupFrame().closest('dialog').isConnected).toBe(true);
+    });
+});
+
+describe('page scroll behind an embed', () => {
+    const root = document.documentElement;
+    const popupFrame = (action) => document.querySelector(`dialog.puter-popup-frame iframe[src*="/embed/${action}"]`);
+    const show = (action, closed = () => 'closed') => showPopupFrame({
+        guiOrigin: GUI_ORIGIN,
+        action,
+        fragment: { user: USER },
+        title: action,
+        closed,
+        onMessage: () => {},
+    });
+    const tell = (action, state) => window.dispatchEvent(new MessageEvent('message', {
+        data: { msg: 'puterPopupFrame', state },
+        origin: GUI_ORIGIN,
+        source: popupFrame(action).contentWindow,
+    }));
+    /**
+     * Gives the page a classic scrollbar this wide, or none, whose space comes
+     * back once the root stops scrolling unless the page keeps its gutter.
+     */
+    const scrollbar = (width, { gutterKept = false } = {}) => {
+        vi.spyOn(root, 'clientWidth', 'get').mockReturnValue(window.innerWidth - width);
+        vi.spyOn(root, 'getBoundingClientRect').mockImplementation(() => ({
+            width: window.innerWidth - (root.style.overflow === 'hidden' && ! gutterKept ? 0 : width),
+        }));
+    };
+
+    // Earlier tests leave dialogs that never closed, which locked the page.
+    beforeEach(() => {
+        root.removeAttribute('style');
+    });
+
+    afterEach(() => {
+        vi.restoreAllMocks();
+        root.removeAttribute('style');
+        document.body.removeAttribute('style');
+    });
+
+    it('stops while the embed shows and comes back as the page had it once it closes', async () => {
+        scrollbar(0);
+        root.style.overflow = 'clip';
+        const result = show('upgrade');
+        tell('upgrade', 'loading');
+        expect(root.style.overflow).toBe('clip');
+
+        tell('upgrade', 'ready');
+        expect(root.style.overflow).toBe('hidden');
+        expect(root.style.paddingRight).toBe('');
+
+        tell('upgrade', 'closed');
+        await expect(result).resolves.toBe('closed');
+        expect(root.style.overflow).toBe('clip');
+    });
+
+    it('stops the body instead when the viewport scrolls by the body\'s overflow', async () => {
+        scrollbar(0);
+        root.style.overflow = 'visible';
+        document.body.style.overflowX = 'hidden';
+        const result = show('upgrade');
+        tell('upgrade', 'ready');
+        expect(document.body.style.overflow).toBe('hidden');
+        expect(root.style.overflow).toBe('visible');
+
+        tell('upgrade', 'closed');
+        await result;
+        expect(document.body.style.overflowX).toBe('hidden');
+        expect(document.body.style.overflowY).toBe('');
+    });
+
+    it('keeps the space of a classic scrollbar, so the page doesn\'t shift', async () => {
+        scrollbar(15);
+        root.style.paddingRight = '8px';
+        const result = show('upgrade');
+        tell('upgrade', 'ready');
+        expect(root.style.overflow).toBe('hidden');
+        expect(root.style.paddingRight).toBe('23px');
+        tell('upgrade', 'closed');
+        await result;
+        expect(root.style.paddingRight).toBe('8px');
+        expect(root.style.overflow).toBe('');
+    });
+
+    it('adds no space for a scrollbar whose gutter the page keeps', async () => {
+        scrollbar(15, { gutterKept: true });
+        const result = show('upgrade');
+        tell('upgrade', 'ready');
+        expect(root.style.overflow).toBe('hidden');
+        expect(root.style.paddingRight).toBe('');
+        tell('upgrade', 'closed');
+        await result;
+    });
+
+    it('stops behind the loading scrim too, and stays stopped until the last embed closes', async () => {
+        vi.useFakeTimers();
+        scrollbar(0);
+        const upgrade = show('upgrade');
+        await vi.advanceTimersByTimeAsync(200);
+        expect(root.style.overflow).toBe('hidden');
+        const signIn = show('sign-in');
+        tell('sign-in', 'ready');
+
+        tell('sign-in', 'closed');
+        await signIn;
+        expect(root.style.overflow).toBe('hidden');
+        tell('upgrade', 'closed');
+        await upgrade;
+        expect(root.style.overflow).toBe('');
+    });
+
+    it('gives the page its own styles back after an embed the page removed itself', async () => {
+        scrollbar(15);
+        root.style.paddingRight = '8px';
+        show('upgrade');
+        tell('upgrade', 'ready');
+        document.querySelector('dialog.puter-popup-frame').remove();
+
+        const signIn = show('sign-in');
+        tell('sign-in', 'ready');
+        expect(root.style.overflow).toBe('hidden');
+        expect(root.style.paddingRight).toBe('23px');
+        tell('sign-in', 'closed');
+        await signIn;
+
+        expect(root.style.overflow).toBe('');
+        expect(root.style.paddingRight).toBe('8px');
+    });
+
+    it('leaves the page alone for an embed that never showed', async () => {
+        scrollbar(0);
+        const result = show('upgrade');
+        tell('upgrade', 'unavailable');
+        await expect(result).resolves.toBeNull();
+        expect(root.style.overflow).toBe('');
+    });
+});
@@ -50,6 +50,15 @@
 * @property {string} [message] One sentence saying what was refused and why.
 */

+/**
+ * How a framed upgrade on a first-party page ended.
+ *
+ * @typedef {Object} UpgradeResult
+ * @property {boolean} upgraded `true` when the user subscribed to a plan or upgraded to a higher
+ * one before closing the dialog. `false` otherwise, including after a downgrade or cancellation,
+ * or when the upgrade opened in a new tab instead.
+ */
+
 /**
 * The legacy positional callbacks most methods accept alongside the promise
 * they return.
@@ -26,7 +26,7 @@ import { showUsageLimitDialog } from '../modules/UsageLimitDialog.js';
 *
 * @typedef {{
 *   env?: string,
- *   ui?: { requestUpgrade: Function },
+ *   ui?: { requestUpgrade: Function, canShowUpgradeFrame_?: () => boolean, upgradeFrameShowing_?: () => boolean },
 *   authToken?: string,
 *   appID?: string,
 *   getAppIDFromAuthToken?: (token: unknown) => string | null,
@@ -109,7 +109,8 @@ const messageFor = (reason, error, context) => {
 * Inside an app the desktop's upgrade flow is asked for (and not awaited: it
 * never answers). The SDK's own dialog covers storage refusals everywhere
 * else - the desktop leans on it for those - and funding / plan refusals on
- * third-party sites only. The error is not consumed; callers still reject.
+ * websites only. On a first-party page its Upgrade button shows the upgrade
+ * in a frame over the page. The error is not consumed; callers still reject.
 *
 * @param {unknown} error The rejection, in whatever shape it arrived.
 * @param {UpgradePromptContext} [context] Which SDK method was refused and,
@@ -127,11 +128,26 @@ export const promptIfUpgradeRequired = (error, context = {}, puter = globalThis.
    if ( puter?.env === 'app' ) {
        puter.ui.requestUpgrade({ reason, method, message });
    } else if ( puter?.env === 'web' || reason === 'storage' ) {
+        // The upgrade a first-party page already shows answers this refusal
+        // too, and a dialog over it would block it.
+        if ( puter.ui?.upgradeFrameShowing_?.() === true ) return;
+        // A first-party page shows the upgrade in a frame over itself
+        // instead of a dashboard tab.
+        const framed = puter?.env === 'web' && puter.ui?.canShowUpgradeFrame_?.() === true;
        showUsageLimitDialog(message, {
            title: TITLES[reason],
            method,
            reason,
            appID: appIDOf(puter),
+            ...(framed ? {
+                // The page may have stopped being able to frame it, such as
+                // by signing out, since the dialog opened.
+                onUpgrade: () => {
+                    if ( puter.ui.canShowUpgradeFrame_?.() !== true ) return false;
+                    puter.ui.requestUpgrade({ reason, method, message });
+                    return true;
+                },
+            } : {}),
        });
    }
 };
@@ -143,5 +159,5 @@ export const promptIfUpgradeRequired = (error, context = {}, puter = globalThis.
 * @param {PromptingSdk | undefined} puter
 * @returns {string | undefined}
 */
-const appIDOf = (puter) =>
+export const appIDOf = (puter) =>
    puter?.getAppIDFromAuthToken?.(puter.authToken) || puter?.appID || undefined;
@@ -179,6 +179,57 @@ describe('promptIfUpgradeRequired', () => {
        });
    });

+    describe('on a first-party page that can frame the upgrade', () => {
+        beforeEach(() => {
+            globalThis.puter = {
+                env: 'web',
+                ui: { requestUpgrade: vi.fn(), canShowUpgradeFrame_: () => true },
+            };
+        });
+
+        it('has the dialog ask for the framed upgrade instead of opening a tab', () => {
+            promptIfUpgradeRequired({ code: 'insufficient_funds', status: 402 }, { method: 'puter.ai.chat' });
+            expect(globalThis.puter.ui.requestUpgrade).not.toHaveBeenCalled();
+            const [message, options] = showUsageLimitDialog.mock.calls[0];
+            expect(message).toBe('Your account does not have enough funding to complete this request.');
+            expect(options).toMatchObject({ title: 'Low Balance', method: 'puter.ai.chat', reason: 'funds' });
+
+            expect(options.onUpgrade()).toBe(true);
+            expect(globalThis.puter.ui.requestUpgrade).toHaveBeenCalledWith({
+                reason: 'funds',
+                method: 'puter.ai.chat',
+                message: 'Your account does not have enough funding to complete this request.',
+            });
+        });
+
+        it('leaves the tab to the dialog when the page can no longer frame it by the click', () => {
+            promptIfUpgradeRequired({ code: 'insufficient_funds', status: 402 }, { method: 'puter.ai.chat' });
+            globalThis.puter.ui.canShowUpgradeFrame_ = () => false;
+            expect(showUsageLimitDialog.mock.calls[0][1].onUpgrade()).toBe(false);
+            expect(globalThis.puter.ui.requestUpgrade).not.toHaveBeenCalled();
+        });
+
+        it('shows no dialog over an upgrade the page already shows', () => {
+            globalThis.puter.ui.upgradeFrameShowing_ = () => true;
+            promptIfUpgradeRequired({ code: 'insufficient_funds', status: 402 }, { method: 'puter.ai.chat' });
+            promptIfUpgradeRequired({ code: 'storage_limit_reached' }, { method: 'puter.fs.upload' });
+            expect(showUsageLimitDialog).not.toHaveBeenCalled();
+            expect(globalThis.puter.ui.requestUpgrade).not.toHaveBeenCalled();
+        });
+
+        it('keeps the tab when the page cannot frame it', () => {
+            globalThis.puter.ui.canShowUpgradeFrame_ = () => false;
+            promptIfUpgradeRequired({ code: 'storage_limit_reached' }, { method: 'puter.fs.upload' });
+            expect(showUsageLimitDialog.mock.calls[0][1]).not.toHaveProperty('onUpgrade');
+        });
+
+        it('keeps the tab for a storage refusal outside a website', () => {
+            globalThis.puter.env = 'gui';
+            promptIfUpgradeRequired({ code: 'storage_limit_reached' }, { method: 'puter.fs.upload' });
+            expect(showUsageLimitDialog.mock.calls[0][1]).not.toHaveProperty('onUpgrade');
+        });
+    });
+
    it('does nothing for a rejection an upgrade would not clear', () => {
        promptIfUpgradeRequired({ status: 403 });
        promptIfUpgradeRequired(new Error('offline'));
@@ -3,6 +3,7 @@ import { fetchUrl } from '../lib/networkUtils.js';
 import { PuterModule } from '../lib/PuterModule.js';
 import PuterDialog from './PuterDialog.js';
 import { hasOpaqueOrigin } from '../lib/auth-popup.js';
+import { ancestorsAllowGuiEmbed, canFrameGuiEmbed, showPopupFrame } from '../lib/guiEmbed.js';

 /**
 * Puter user details, as returned by `getUser()`.
@@ -115,12 +116,19 @@ export class AuthModule extends PuterModule {
    /** @internal */
    pendingSignInMessageIds_ = new Set();

+    /** The framed sign-in in progress, which a repeated call joins. */
+    #framedSignIn = null;
+
    /**
     * Signs the user in, opening a popup with the appropriate authentication
     * method. Must be called from a user gesture (such as a click) — without
     * one, a consent dialog is shown first so the popup can be opened from the
     * user's click on it. Resolves once the user has signed in.
     *
+     * On a page one label under the Puter origin, the sign-in shows in a frame
+     * over the page instead, and continues in the popup when the user picks a
+     * federated provider or the frame can't be shown.
+     *
     * Rejects with `{ error: 'popup_blocked' }` if the browser blocked the
     * popup, `{ error: 'auth_window_closed' }` if the user closed it, `{ error:
     * 'not_available_in_app' }` when called from an app — an app's token comes
@@ -168,12 +176,128 @@ export class AuthModule extends PuterModule {
                    : this.signIn(options));
        }

+        if (this.#canSignInInFrame(options)) {
+            // A second call, such as from a double click or a `puter.*` call
+            // asking for implicit auth, waits on the first rather than
+            // replacing its frame, which would reject the first.
+            if (this.#framedSignIn) return this.#framedSignIn;
+            const promise = this.#signInInFrame(options).then((result) =>
+                result ?? this.#signInWithPopup(options));
+            const done = () => {
+                if (this.#framedSignIn === promise) this.#framedSignIn = null;
+            };
+            this.#framedSignIn = promise;
+            promise.then(done, done);
+            return promise;
+        }
+        return this.#signInWithPopup(options);
+    };
+
+    /**
+     * Whether this page can show the sign-in framed: a first-party page one
+     * label under the GUI origin, not in a frame of another site. Only the
+     * popup creates a temporary account, so a sign-in that asks for one keeps
+     * it.
+     */
+    #canSignInInFrame (options) {
+        return !options.attempt_temp_user_creation &&
+            !globalThis.crossOriginIsolated &&
+            !!globalThis.document?.body &&
+            canFrameGuiEmbed(globalThis.location?.href, puter.defaultGUIOrigin) &&
+            ancestorsAllowGuiEmbed(globalThis, puter.defaultGUIOrigin);
+    }
+
+    /** Runs `puter.onAuth`, if set, with the user just signed in. */
+    #notifyAuth () {
+        if (typeof puter.onAuth !== 'function') return;
+        void (async () => {
+            try {
+                const user = await puter.whoamiCache_;
+                puter.onAuth(user ?? (await puter.getUser()));
+            } catch (error) {
+                console.error(error);
+            }
+        })();
+    }
+
+    /**
+     * The sign-in in a frame over the page. Settles as the popup would, or
+     * resolves null when the popup has to take over.
+     *
+     * @returns {Promise<SignInResult | null>}
+     */
+    async #signInInFrame (options) {
+        const msg_id = crypto.randomUUID();
+        this.pendingSignInMessageIds_.add(msg_id);
+        const fragment = { msg_id };
+        if (options.request_auth) fragment.request_auth = 'true';
+        let outcome;
+        try {
+            outcome = await showPopupFrame({
+                guiOrigin: puter.defaultGUIOrigin,
+                action: 'sign-in',
+                fragment,
+                title: 'Sign in to Puter',
+                closeLabel: 'Close',
+                closed: () => ({ closed: true }),
+                onMessage: (data, finish) => {
+                    if (data.msg === 'puterPopupFrame' && data.state === 'provider') {
+                        if (this.#isProviderStart(data.url, msg_id)) finish({ providerUrl: data.url });
+                        return;
+                    }
+                    if (data.msg !== 'puter.token' || data.msg_id != msg_id) return;
+                    finish({ reply: data });
+                },
+            });
+        } finally {
+            this.pendingSignInMessageIds_.delete(msg_id);
+        }
+        if (!outcome) return null;
+        // A provider won't load in a frame, so its sign-in continues in the
+        // popup, which the provider returns as this attempt's sign-in popup.
+        if (outcome.providerUrl) {
+            return this.#signInWithPopup(options, { url: outcome.providerUrl, msgId: msg_id });
+        }
+        if (outcome.closed) {
+            throw {
+                error: 'auth_window_closed',
+                msg: 'Authentication window was closed by the user without completing the process.',
+            };
+        }
+        const { msg: _msg, msg_id: _msgId, ...result } = outcome.reply;
+        if (!result.success) throw result;
+        puter.setAuthToken(result.token);
+        this.#notifyAuth();
+        return result;
+    }
+
+    /**
+     * Whether `url` is the GUI's start of a provider sign-in that returns as
+     * the popup for sign-in `msgId`.
+     */
+    #isProviderStart (url, msgId) {
+        try {
+            const start = new URL(url);
+            return start.origin === new URL(puter.defaultGUIOrigin).origin &&
+                /^\/auth\/oidc\/[^/]+\/start$/.test(start.pathname) &&
+                start.searchParams.get('embedded_in_popup') === 'true' &&
+                start.searchParams.get('msg_id') === msgId;
+        } catch {
+            return false;
+        }
+    }
+
+    /**
+     * The sign-in in a popup window, opened at `start.url` for sign-in
+     * `start.msgId` when a framed sign-in hands one over.
+     */
+    #signInWithPopup (options, start = {}) {
        return new Promise((resolve, reject) => {
            const signinsession = crypto.randomUUID();
-            const msg_id = signinsession;
+            const msg_id = start.msgId ?? signinsession;
            this.pendingSignInMessageIds_.add(msg_id);
            const popupName = `Puter-sign-in-${signinsession}`;
-            const url = `${puter.defaultGUIOrigin}/action/sign-in?embedded_in_popup=true&msg_id=${msg_id}${window.crossOriginIsolated ? `&cross_origin_isolated=true&signin_session=${signinsession}` : ''}${options.attempt_temp_user_creation ? '&attempt_temp_user_creation=true' : ''}${options.request_auth ? '&request_auth=true' : ''}`;
+            const url = start.url ?? `${puter.defaultGUIOrigin}/action/sign-in?embedded_in_popup=true&msg_id=${msg_id}${window.crossOriginIsolated ? `&cross_origin_isolated=true&signin_session=${signinsession}` : ''}${options.attempt_temp_user_creation ? '&attempt_temp_user_creation=true' : ''}${options.request_auth ? '&request_auth=true' : ''}`;

            // Guards against settling the promise more than once across the
            // message, popup-closed, and dialog-cancel code paths.
@@ -196,17 +320,7 @@ export class AuthModule extends PuterModule {
                consentDialog = null;
            };

-            const notifyAuth = () => {
-                if (typeof puter.onAuth !== 'function') return;
-                void (async () => {
-                    try {
-                        const user = await puter.whoamiCache_;
-                        puter.onAuth(user ?? (await puter.getUser()));
-                    } catch (error) {
-                        console.error(error);
-                    }
-                })();
-            };
+            const notifyAuth = () => this.#notifyAuth();

            if (window.crossOriginIsolated) {
                (async () => {
@@ -366,7 +480,7 @@ export class AuthModule extends PuterModule {
                rejectBlocked();
            }
        });
-    };
+    }

    /**
     * Whether the user is currently signed in.
@@ -0,0 +1,235 @@
+// @vitest-environment jsdom
+// @vitest-environment-options {"url": "https://notes.puter.test/doc"}
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { AuthModule } from './Auth.js';
+
+// An isolated page polls the sign-in relay; nothing here answers it.
+vi.mock('../lib/networkUtils.js', () => ({ fetchUrl: vi.fn(() => new Promise(() => {})) }));
+
+const GUI_ORIGIN = 'https://puter.test';
+
+// jsdom has no top-layer dialogs.
+HTMLDialogElement.prototype.showModal = function () {
+    this.open = true;
+};
+HTMLDialogElement.prototype.close = function () {
+    this.open = false;
+};
+
+const signInFrame = () => document.querySelector('dialog.puter-popup-frame iframe');
+
+/** The framed sign-in's `msg_id`, from its fragment. */
+const frameMsgId = () => new URLSearchParams(new URL(signInFrame().src).hash.slice(1)).get('msg_id');
+
+const fromFrame = (data, source = signInFrame().contentWindow) =>
+    window.dispatchEvent(new MessageEvent('message', { data, origin: GUI_ORIGIN, source }));
+
+let auth;
+
+beforeEach(() => {
+    document.body.innerHTML = '';
+    vi.stubGlobal('puter', {
+        env: 'web',
+        defaultGUIOrigin: GUI_ORIGIN,
+        setAuthToken: vi.fn(),
+        trackOpenedWindow_: vi.fn(),
+    });
+    vi.spyOn(window, 'open').mockImplementation((url, name) => ({ name, url, closed: false }));
+    Object.defineProperty(navigator, 'userActivation', {
+        configurable: true,
+        value: { hasBeenActive: true, isActive: true },
+    });
+    auth = new AuthModule(puter);
+});
+
+afterEach(() => {
+    delete navigator.userActivation;
+    vi.restoreAllMocks();
+    vi.unstubAllGlobals();
+    vi.useRealTimers();
+});
+
+describe('auth.signIn on a first-party page', () => {
+    it('signs in through the frame instead of a popup', async () => {
+        const result = auth.signIn();
+        const url = new URL(signInFrame().src);
+        expect(url.origin + url.pathname).toBe(`${GUI_ORIGIN}/embed/sign-in`);
+        expect(url.search).toBe('');
+        expect(auth.pendingSignInMessageIds_.has(frameMsgId())).toBe(true);
+
+        fromFrame({ msg: 'puterPopupFrame', state: 'ready' });
+        fromFrame({ msg: 'puter.token', msg_id: frameMsgId(), success: true, token: 'tok', app_uid: 'app-1', username: 'alice' });
+
+        await expect(result).resolves.toEqual({ success: true, token: 'tok', app_uid: 'app-1', username: 'alice' });
+        expect(puter.setAuthToken).toHaveBeenCalledWith('tok');
+        expect(window.open).not.toHaveBeenCalled();
+        expect(signInFrame()).toBeNull();
+        expect(auth.pendingSignInMessageIds_.size).toBe(0);
+    });
+
+    it('passes request_auth on to the frame', () => {
+        auth.signIn({ request_auth: true }).catch(() => {});
+        expect(new URLSearchParams(new URL(signInFrame().src).hash.slice(1)).get('request_auth')).toBe('true');
+    });
+
+    it('ignores a token for another sign-in or from another window', async () => {
+        const result = auth.signIn();
+        let settled = false;
+        result.then(() => {
+            settled = true;
+        }, () => {
+            settled = true;
+        });
+        fromFrame({ msg: 'puter.token', msg_id: 'other', success: true, token: 'x' });
+        fromFrame({ msg: 'puter.token', msg_id: frameMsgId(), success: true, token: 'x' }, window);
+        await Promise.resolve();
+        expect(settled).toBe(false);
+        expect(puter.setAuthToken).not.toHaveBeenCalled();
+    });
+
+    it('rejects as a closed popup when the user closes the frame', async () => {
+        const result = auth.signIn();
+        fromFrame({ msg: 'puterPopupFrame', state: 'ready' });
+        document.querySelector('.puter-popup-frame-close').click();
+        await expect(result).rejects.toMatchObject({ error: 'auth_window_closed' });
+        expect(window.open).not.toHaveBeenCalled();
+    });
+
+    it('rejects as a closed popup when the frame closes without a token', async () => {
+        const result = auth.signIn();
+        fromFrame({ msg: 'puterPopupFrame', state: 'closed' });
+        await expect(result).rejects.toMatchObject({ error: 'auth_window_closed' });
+    });
+
+    it('shares one framed sign-in between calls made while it is open', async () => {
+        const first = auth.signIn();
+        const second = auth.signIn();
+        expect(document.querySelectorAll('dialog.puter-popup-frame')).toHaveLength(1);
+        fromFrame({ msg: 'puterPopupFrame', state: 'ready' });
+        fromFrame({ msg: 'puter.token', msg_id: frameMsgId(), success: true, token: 'tok' });
+        await expect(first).resolves.toEqual({ success: true, token: 'tok' });
+        await expect(second).resolves.toEqual({ success: true, token: 'tok' });
+
+        // Once it settles, the next call starts a new one.
+        const third = auth.signIn();
+        expect(signInFrame()).not.toBeNull();
+        fromFrame({ msg: 'puterPopupFrame', state: 'closed' });
+        await expect(third).rejects.toMatchObject({ error: 'auth_window_closed' });
+    });
+
+    it('shares the framed sign-in with a call that differs in request_auth', async () => {
+        // Implicit auth (a `puter.*` call without a token) asks with request_auth.
+        const implicit = auth.signIn({ request_auth: true });
+        const explicit = auth.signIn();
+        expect(document.querySelectorAll('dialog.puter-popup-frame')).toHaveLength(1);
+        fromFrame({ msg: 'puterPopupFrame', state: 'ready' });
+        fromFrame({ msg: 'puter.token', msg_id: frameMsgId(), success: true, token: 'tok' });
+        await expect(implicit).resolves.toEqual({ success: true, token: 'tok' });
+        await expect(explicit).resolves.toEqual({ success: true, token: 'tok' });
+    });
+
+    it('rejects with the reply a failed sign-in sends, as the popup does', async () => {
+        const result = auth.signIn();
+        fromFrame({ msg: 'puter.token', msg_id: frameMsgId(), success: false, token: null });
+        await expect(result).rejects.toEqual({ success: false, token: null });
+        expect(puter.setAuthToken).not.toHaveBeenCalled();
+    });
+
+    it('continues in the popup when the frame hands off, such as for a federated provider', async () => {
+        const result = auth.signIn();
+        fromFrame({ msg: 'puterPopupFrame', state: 'loading' });
+        fromFrame({ msg: 'puterPopupFrame', state: 'unavailable' });
+        await vi.waitFor(() => expect(window.open).toHaveBeenCalledTimes(1));
+        const [url] = window.open.mock.calls[0];
+        expect(url).toContain(`${GUI_ORIGIN}/action/sign-in?embedded_in_popup=true`);
+        expect(signInFrame()).toBeNull();
+
+        const popup = window.open.mock.results[0].value;
+        const msgId = new URL(url).searchParams.get('msg_id');
+        window.dispatchEvent(new MessageEvent('message', {
+            data: { msg: 'puter.token', msg_id: msgId, success: true, token: 'tok' },
+            origin: GUI_ORIGIN,
+            source: popup,
+        }));
+        await expect(result).resolves.toMatchObject({ success: true, token: 'tok' });
+    });
+
+    it('opens the provider the user picked in the frame straight in the popup', async () => {
+        const result = auth.signIn();
+        const msgId = frameMsgId();
+        const start = `${GUI_ORIGIN}/auth/oidc/google/start?flow=login&referrer=x&embedded_in_popup=true&msg_id=${msgId}&opener_origin=https%3A%2F%2Fnotes.puter.test`;
+        const frameWindow = signInFrame().contentWindow;
+        fromFrame({ msg: 'puterPopupFrame', state: 'ready' });
+        fromFrame({ msg: 'puterPopupFrame', state: 'provider', url: start });
+        fromFrame({ msg: 'puterPopupFrame', state: 'unavailable' }, frameWindow);
+        await vi.waitFor(() => expect(window.open).toHaveBeenCalledTimes(1));
+        expect(window.open.mock.calls[0][0]).toBe(start);
+        expect(signInFrame()).toBeNull();
+        expect(auth.pendingSignInMessageIds_.has(msgId)).toBe(true);
+
+        // The provider returns the popup as a sign-in popup for the same attempt.
+        window.dispatchEvent(new MessageEvent('message', {
+            data: { msg: 'puter.token', msg_id: msgId, success: true, token: 'tok' },
+            origin: GUI_ORIGIN,
+            source: window.open.mock.results[0].value,
+        }));
+        await expect(result).resolves.toMatchObject({ success: true, token: 'tok' });
+        expect(puter.setAuthToken).toHaveBeenCalledWith('tok');
+        expect(auth.pendingSignInMessageIds_.size).toBe(0);
+    });
+
+    it.each([
+        ['another origin', (id) => `https://evil.test/auth/oidc/google/start?embedded_in_popup=true&msg_id=${id}`],
+        ['another path', (id) => `${GUI_ORIGIN}/action/sign-in?embedded_in_popup=true&msg_id=${id}&auth_token=x`],
+        ['another sign-in', () => `${GUI_ORIGIN}/auth/oidc/google/start?embedded_in_popup=true&msg_id=other`],
+        ['no popup return', (id) => `${GUI_ORIGIN}/auth/oidc/google/start?msg_id=${id}`],
+        ['no URL', () => undefined],
+    ])('opens the sign-in popup instead of a provider URL to %s', async (_, url) => {
+        auth.signIn();
+        fromFrame({ msg: 'puterPopupFrame', state: 'provider', url: url(frameMsgId()) });
+        fromFrame({ msg: 'puterPopupFrame', state: 'unavailable' });
+        await vi.waitFor(() => expect(window.open).toHaveBeenCalledTimes(1));
+        expect(window.open.mock.calls[0][0]).toContain(`${GUI_ORIGIN}/action/sign-in?embedded_in_popup=true`);
+    });
+
+    it('continues in the popup when the frame is refused', async () => {
+        vi.useFakeTimers();
+        auth.signIn();
+        signInFrame().dispatchEvent(new Event('load'));
+        await vi.advanceTimersByTimeAsync(1000);
+        expect(window.open).toHaveBeenCalledTimes(1);
+        expect(signInFrame()).toBeNull();
+    });
+
+    it('keeps the popup for a temporary account', () => {
+        auth.signIn({ attempt_temp_user_creation: true });
+        expect(signInFrame()).toBeNull();
+        expect(window.open).toHaveBeenCalledTimes(1);
+        expect(window.open.mock.calls[0][0]).toContain('attempt_temp_user_creation=true');
+    });
+
+    it('keeps the popup for a page outside the Puter origin', () => {
+        puter.defaultGUIOrigin = 'https://puter.com';
+        auth.signIn();
+        expect(signInFrame()).toBeNull();
+        expect(window.open).toHaveBeenCalledTimes(1);
+    });
+
+    it('keeps the popup for a page in a frame of another site', () => {
+        Object.defineProperty(window.location, 'ancestorOrigins', { configurable: true, value: ['https://other.test'] });
+        try {
+            auth.signIn();
+            expect(signInFrame()).toBeNull();
+            expect(window.open).toHaveBeenCalledTimes(1);
+        } finally {
+            delete window.location.ancestorOrigins;
+        }
+    });
+
+    it('keeps the popup for a cross-origin isolated page', () => {
+        vi.stubGlobal('crossOriginIsolated', true);
+        auth.signIn().catch(() => {});
+        expect(signInFrame()).toBeNull();
+        expect(window.open).toHaveBeenCalledTimes(1);
+    });
+});