onboarding: reverse the QR flow. The empty extension now shows a QR (the phone scans it) instead of scanning the phone's QR. New START_ADOPTION_RECEIVER message in the background holds the rendezvous without needing a vault, and AdoptVaultView displays the result. UI-only — the phone-side reversal (sending the vault back over the existing channel) is a separate change. (v4.3.12)

@@ -1,7 +1,7 @@11 {22   "manifest_version": 3,33   "name": "Peach Password Manager",4-  "version": "4.3.11",4+  "version": "4.3.12",55   "description": "Zero-knowledge password manager",66   "browser_specific_settings": {77     "gecko": {

@@ -1,7 +1,7 @@11 {22   "manifest_version": 3,33   "name": "Peach Password Manager",4-  "version": "4.3.11",4+  "version": "4.3.12",55   "description": "Zero-knowledge password manager",66   "action": {77     "default_popup": "src/popup/index.html",

@@ -1,6 +1,6 @@11 {22   "name": "peach",3-  "version": "4.3.11",3+  "version": "4.3.12",44   "description": "Zero-knowledge password manager",55   "license": "GPL-3.0-only",66   "type": "module",

@@ -89,6 +89,7 @@8989 import {9090   cancelRelayAdoptionSource,9191   isRelayAdoptionSourceInFlight,92+  startRelayAdoptionReceiver,9293   startRelayAdoptionSource,9394 } from "./relay-adoption-source-bg";9495 import {@@ -1456,6 +1457,23 @@14561457           return {14571458             ok: false,14581459             error: error instanceof Error ? error.message : "adoption_source_failed",1460+          };1461+        }1462+      }1463+1464+      // Onboarding receiver — empty extension shows a QR, phone scans and1465+      // sends the vault. No vault is needed on this side; the invitation is1466+      // just a rendezvous point.1467+      case "START_ADOPTION_RECEIVER": {1468+        if (isRelayAdoptionSourceInFlight()) {1469+          return { ok: false, error: "adoption_receiver_in_progress" };1470+        }1471+        try {1472+          return { ok: true, data: await startRelayAdoptionReceiver() };1473+        } catch (error) {1474+          return {1475+            ok: false,1476+            error: error instanceof Error ? error.message : "adoption_receiver_failed",14591477           };14601478         }14611479       }

@@ -102,6 +102,39 @@102102   clearState();103103 }104104 105+/**106+ * Onboarding pairing request — the empty extension shows a QR and the populated107+ * phone scans it. The invitation is identical to the source-side one (relay108+ * URL + rendezvous token); the difference is the extension has no vault yet109+ * and will receive one from the phone over the established Noise channel.110+ *111+ * This is the UI-only side of the reversal. The "phone sends vault back" wire112+ * protocol still needs the phone-side counterpart before the connection can113+ * actually deliver a vault — until then, this generates a valid QR that the114+ * existing `relay-dial` flow can connect to.115+ */116+export async function startRelayAdoptionReceiver(): Promise<{ invitation: string }> {117+  if (inFlight) throw new Error("adoption_receiver_in_progress");118+  inFlight = true;119+  try {120+    const settings = await getSyncSettings();121+    const relayUrl = relayInForce(settings);122+    const token = generatePairingRendezvousToken();123+    const encoded = createPairingInvitation(relayUrl, token);124+    const invitation = parsePairingInvitation(encoded);125+    if (!invitation) throw new Error("invitation_generation_failed");126+    // Open the relay socket so the rendezvous token is reserved. Without a127+    // vault to send, this side does nothing on the Noise channel yet — it128+    // just holds the room open for the phone's scan.129+    const socket = await openRelayPairingSocket(pairingInvitationUrl(invitation));130+    activeSocket = socket;131+    return { invitation: encoded };132+  } catch (error) {133+    clearState();134+    throw error;135+  }136+}137+105138 async function runSourceSession(106139   socket: PairingSocket,107140   expectedToken: string,

@@ -76,9 +76,13 @@7676     const appSrc = src("../popup/App.tsx");7777     expect(appSrc).not.toContain("openPairingServer");7878     expect(appSrc).not.toContain("chirp-pair-capacitor");79-    // Adoption dials out like everything else now — over the relay only, since80-    // LAN transport is retired (docs/sync-lan-retirement.md).81-    expect(appSrc).toContain("dialRelayPairingChannel");79+    // Onboarding adoption now has the browser source a pairing-request QR80+    // (the phone scans it). The browser still doesn't dial — the phone does.81+    // The relay socket that holds the rendezvous is opened in the background82+    // via START_ADOPTION_RECEIVER, not in the popup itself.83+    expect(appSrc).not.toContain("dialRelayPairingChannel");84+    const sharedTypes = src("../shared/types.ts");85+    expect(sharedTypes).toContain("START_ADOPTION_RECEIVER");8286     expect(appSrc).not.toContain("openPairingSocket");8387   });8488 

@@ -121,15 +121,6 @@121121   }122122 }123123 124-function defaultAdoptionDeviceName(): string {125-  const ua = (typeof navigator !== "undefined" ? navigator.userAgent : "") || "";126-  if (/Firefox/i.test(ua)) return "Firefox";127-  if (/Edg\//i.test(ua)) return "Edge";128-  if (/Chrome/i.test(ua)) return "Chrome";129-  if (/Safari/i.test(ua)) return "Safari";130-  return "Peach";131-}132-133124 const ENTRY_TRANSITION_SETTLE_MS = 135;134125 135126 export default function App() {@@ -1249,83 +1240,6 @@12491240     void sendMessage({ type: "TRIGGER_SYNC", payload: { reason: "foreground" } });12501241   }12511242 1252-  /**1253-   * Join an existing vault from a brand-new install.1254-   *1255-   * This used to require the receiver to LISTEN for the other device (a1256-   * Capacitor pairing server), which a browser extension structurally cannot1257-   * do — so on every real browser build it threw before doing anything. Over a1258-   * pairing code the receiver is the DIALLER instead, which is the only shape1259-   * that works here: dial the code, confirm the SAS, then ask for the vault.1260-   *1261-   * The vault does not exist yet at dial time, so nothing in this path may1262-   * touch the vault before `createVaultFromRootKey` runs.1263-   */1264-  async function startVaultAdoption(args: {1265-    password: string;1266-    connection: { invitation: string };1267-    confirmSAS(sas: string): Promise<boolean>;1268-    createVault(rootKeyHex: string): Promise<{ vaultId: string }>;1269-  }) {1270-    const [{ dialRelayPairingChannel, openRelayPairingSocket }, { requestAdoption }] =1271-      await Promise.all([1272-        import("../shared/pairing-dial"),1273-        import("../shared/vault-adopt"),1274-      ]);1275-1276-    const dial = await dialRelayPairingChannel(args.connection.invitation, {1277-      openSocket: openRelayPairingSocket,1278-    });1279-    if (!dial.ok) throw new Error(dial.error);1280-    const { channel, sas, socket, relayUrl, rendezvousSecretHex } = dial.dialled;1281-1282-    try {1283-      const source = await requestAdoption(channel, {1284-        deviceName: defaultAdoptionDeviceName(),1285-        generateDeviceId: () => crypto.randomUUID(),1286-        // requestAdoption writes ADOPT_CONFIRM and refuses to read a root-key1287-        // grant until this local SAS decision is true.1288-        confirmSas: () => args.confirmSAS(sas),1289-        pairState: { rendezvousSecretHex, relayUrl },1290-        createVaultFromRootKey: args.createVault,1291-        deriveLocalIdentity: async () => {1292-          const res = await sendMessage({ type: "GET_LOCAL_IDENTITY" });1293-          const r = res as { ok: boolean; data?: unknown; error?: string };1294-          if (!r.ok || !r.data) throw new Error(r.error ?? "identity_unavailable");1295-          return r.data as Awaited<ReturnType<Parameters<typeof requestAdoption>[1]["deriveLocalIdentity"]>>;1296-        },1297-        upsertPairedDevice: async (paired) => {1298-          const res = await sendMessage({ type: "COMPLETE_PAIRING", payload: { paired } });1299-          const r = res as { ok: boolean; error?: string };1300-          if (!r.ok) throw new Error(r.error ?? "complete_pairing_failed");1301-        },1302-        applyLicense: async (license) => {1303-          const res = (await sendMessage({1304-            type: "ACTIVATE_LICENSE",1305-            payload: { key: license },1306-          })) as { ok: boolean; data?: { valid?: boolean; plan?: string } };1307-          if (res.ok && res.data?.valid && res.data?.plan === "pro") await refreshProStatus();1308-        },1309-        onError(error) {1310-          throw new Error(1311-            error === "ADOPT_SAS_REJECTED" ? "sas_rejected" : error,1312-          );1313-        },1314-      });1315-      if (!source) throw new Error("adoption_rejected");1316-      if (relayUrl) {1317-        // Adopt the source's relay so this device dials the same rendezvous.1318-        const setting = (await sendMessage({1319-          type: "SET_SYNC_SETTINGS",1320-          payload: { relayUrl },1321-        })) as { ok: boolean; error?: string };1322-        if (!setting.ok) throw new Error(setting.error ?? "relay_settings_failed");1323-      }1324-    } finally {1325-      socket.close();1326-    }1327-  }1328-13291243   async function handleApprovePendingPasskey() {13301244     const pending = pendingPasskey();13311245     if (!pending) return;@@ -1394,7 +1308,6 @@13941308                         setView("lock");13951309                       }}13961310                       onDone={handleAdoptionDone}1397-                      startAdoption={startVaultAdoption}13981311                     />13991312                   </Suspense>14001313                 }

@@ -3,18 +3,9 @@33 import type { JSX } from "solid-js";44 import { afterEach, describe, expect, it, vi } from "vitest";55 import { Onboarding } from "./Onboarding";6-import {7-  AdoptVaultView,8-  type AdoptVaultViewProps,9-} from "./AdoptVaultView";6+import { AdoptVaultView } from "./AdoptVaultView";107 import { flushView, inputText, renderView } from "./view-test-utils";11-import { createPairingInvitation } from "../../shared/pairing-invitation";128 13-const INVITATION = createPairingInvitation(14-  "wss://relay.peachpasswords.com",15-  "AAECAwQFBgcICQoLDA0ODw",16-);17-189 vi.mock("@zxcvbn-ts/core", () => ({1910   zxcvbn: (value: string) => ({ score: value.length >= 16 ? 4 : 1 }),2011   zxcvbnOptions: { setOptions: vi.fn() },@@ -36,16 +27,6 @@3627   return found as HTMLButtonElement;3728 }3829 39-async function enterInvitation(container: HTMLElement) {40-  button(container, "Enter invitation manually").click();41-  await flushView();42-  inputText(43-    container.querySelector("#adopt-relay-invitation") as HTMLTextAreaElement,44-    INVITATION,45-  );46-  await flushView();47-}48-4930 async function enterStrongPassword(container: HTMLElement) {5031   inputText(container.querySelector("#adopt-password") as HTMLInputElement, "9xQ!vZ2pLm74Tr#Ke8Wd5Bn");5132   inputText(container.querySelector("#adopt-confirm-password") as HTMLInputElement, "9xQ!vZ2pLm74Tr#Ke8Wd5Bn");@@ -88,7 +69,7 @@8869   });8970 9071   it("T-A22: password screen uses the same minimum-length gate as create-vault", () => {91-    const view = mounted(() => <AdoptVaultView onCancel={() => {}} onDone={() => {}} startAdoption={vi.fn()} />);72+    const view = mounted(() => <AdoptVaultView onCancel={() => {}} onDone={() => {}} />);9273     const continueButton = button(view.container, "Continue");9374     expect(continueButton.disabled).toBe(true);9475     inputText(view.container.querySelector("#adopt-password") as HTMLInputElement, "short");@@ -97,119 +78,18 @@9778     expect(continueButton.disabled).toBe(true);9879   });9980 100-  it("T-A26: relay adoption cannot start until a valid invitation is entered", async () => {101-    const startAdoption = vi.fn(102-      async (_args: Parameters<AdoptVaultViewProps["startAdoption"]>[0]) => {},103-    );104-    const view = mounted(() => <AdoptVaultView onCancel={() => {}} onDone={() => {}} startAdoption={startAdoption} />);81+  it("T-A28: pair phase shows the pairing-request QR after a strong password", async () => {82+    const view = mounted(() => <AdoptVaultView onCancel={() => {}} onDone={() => {}} />);10583     await enterStrongPassword(view.container);10684     button(view.container, "Continue").click();10785     await flushView();10886 109-    // No relay selector here: the code carries the relay, so this screen states110-    // it rather than offering a choice it would overwrite111-    // (docs/sync-relay-surfacing.md).112-    expect(view.container.textContent).toContain("This extension is empty");113-    expect(view.container.textContent).toContain("Public or Private relay");114-    expect(view.container.querySelector(".peach-sync-mode")).toBeNull();115-    expect(view.container.querySelector(".peach-sync-mode-summary")).toBeNull();116-    button(view.container, "Enter invitation manually").click();117-    await flushView();118-    expect(button(view.container, "Connect securely").disabled).toBe(true);119-    inputText(120-      view.container.querySelector("#adopt-relay-invitation") as HTMLTextAreaElement,121-      "peach-pair-v1:not-valid",122-    );123-    await flushView();124-    expect(button(view.container, "Connect securely").disabled).toBe(true);125-126-    inputText(127-      view.container.querySelector("#adopt-relay-invitation") as HTMLTextAreaElement,128-      INVITATION,129-    );130-    await flushView();131-    expect(button(view.container, "Connect securely").disabled).toBe(false);132-    expect(startAdoption).not.toHaveBeenCalled();133-  });134-135-  it("T-A27: the relay invitation is handed to the adoption transport", async () => {136-    const startAdoption = vi.fn(137-      async (_args: Parameters<AdoptVaultViewProps["startAdoption"]>[0]) => {},138-    );139-    const view = mounted(() => <AdoptVaultView onCancel={() => {}} onDone={() => {}} startAdoption={startAdoption} />);140-    await enterStrongPassword(view.container);141-    button(view.container, "Continue").click();142-    await enterInvitation(view.container);143-    button(view.container, "Connect securely").click();144-    await flushView();145-146-    expect(startAdoption).toHaveBeenCalledTimes(1);147-    expect(startAdoption.mock.calls[0][0]).toMatchObject({148-      connection: { invitation: INVITATION },149-    });150-  });151-152-  it("T-A23: adoption flow reaches the SAS screen", async () => {153-    const startAdoption = vi.fn(async ({ confirmSAS }: { confirmSAS(sas: string): Promise<boolean> }) => {154-      await confirmSAS("895245");155-    });156-    const view = mounted(() => <AdoptVaultView onCancel={() => {}} onDone={() => {}} startAdoption={startAdoption} />);157-    await enterStrongPassword(view.container);158-    button(view.container, "Continue").click();159-    await enterInvitation(view.container);160-    button(view.container, "Connect securely").click();161-    await flushView();162-163-    expect(view.container.textContent).toContain("Confirm this code matches");164-    expect(view.container.textContent).toContain("8 9 5 2 4 5");165-  });166-167-  it("T-A24: success leaves a vault and opens Peach", async () => {168-    const onDone = vi.fn();169-    const view = mounted(170-      () => (171-        <AdoptVaultView172-          onCancel={() => {}}173-          onDone={onDone}174-          startAdoption={vi.fn(async () => {})}175-        />176-      ),177-    );178-    await enterStrongPassword(view.container);179-    button(view.container, "Continue").click();180-    await enterInvitation(view.container);181-    button(view.container, "Connect securely").click();182-    await flushView();183-184-    expect(view.container.textContent).toContain("Joined your vault.");185-    button(view.container, "Open Peach").click();186-    expect(onDone).toHaveBeenCalledTimes(1);187-  });188-189-  it("T-A25: SAS cancel keeps receiver vault-less and returns to the password step", async () => {190-    const createVault = vi.fn();191-    const view = mounted(192-      () => (193-        <AdoptVaultView194-          onCancel={() => {}}195-          onDone={() => {}}196-          startAdoption={vi.fn(async ({ confirmSAS }) => {197-            const ok = await confirmSAS("895245");198-            if (ok) await createVault();199-            else throw new Error("sas_rejected");200-          })}201-        />202-      ),203-    );204-    await enterStrongPassword(view.container);205-    button(view.container, "Continue").click();206-    await enterInvitation(view.container);207-    button(view.container, "Connect securely").click();208-    await flushView();209-    button(view.container, "Cancel").click();210-    await flushView();211-212-    expect(createVault).not.toHaveBeenCalled();213-    expect(view.container.textContent).toContain("Set a password for this device.");87+    // The browser is the source of the QR now — the phone scans it.88+    // We assert the heading + copy; the actual QR is rendered by a background89+    // call that's out of scope for a jsdom test (chrome.runtime is undefined).90+    expect(view.container.textContent).toContain("Pair with your other device");91+    expect(view.container.textContent).toContain("Scan this code on the device that holds your vault");92+    // The scan button from the old flow is gone — the phone is the scanner now.93+    expect(view.container.textContent).not.toContain("Enter invitation manually");21494   });21595 });

@@ -2,49 +2,26 @@22   Match,33   Show,44   Switch,5+  createEffect,56   createMemo,67   createSignal,78   onCleanup,89 } from "solid-js";910 import { sendMessage } from "../App";1011 import { RuneBackground } from "../components/RuneBackground";11-import { parsePairingInvitation } from "../../shared/pairing-invitation";12+import { PairingQrCode } from "../components/PairingQrCode";1213 import { RELAY_DISCLOSURE } from "../components/SyncModeSelector";13-import type { PairingQrScannerHandle } from "../pairing-qr-scanner";1414 15-type AdoptPhase = "password" | "pair" | "sas" | "success" | "error";15+type AdoptPhase = "password" | "pair";1616 1717 export interface AdoptVaultViewProps {1818   onCancel(): void;1919   onDone(): void | Promise<void>;20-  startAdoption(args: {21-    password: string;22-    connection: { invitation: string };23-    confirmSAS(sas: string): Promise<boolean>;24-    createVault(rootKeyHex: string): Promise<{ vaultId: string }>;25-  }): Promise<void>;2620 }2721 2822 const MIN_LENGTH = 12;2923 const MIN_ZXCVBN_SCORE = 2;3024 31-/** Turn a dial/adoption failure into something a person can act on. */32-function adoptionErrorCopy(err: unknown): string {33-  const message = err instanceof Error ? err.message : String(err);34-  switch (message) {35-    case "invalid_code":36-      return "That code wasn't accepted — it may have expired. Get a fresh one from your other device.";37-    case "no_host_found":38-      return "Couldn't reach the relay. Check your connection and that the other device's pairing screen is still open.";39-    case "handshake_failed":40-      return "The secure connection failed. Try again with a fresh code.";41-    case "adoption_rejected":42-      return "Your other device declined the request.";43-    default:44-      return message;45-  }46-}47-4825 let zxcvbnLoader: ((password: string) => { score: number }) | null = null;4926 async function getZxcvbn() {5027   if (zxcvbnLoader) return zxcvbnLoader;@@ -67,22 +44,36 @@6744   const [password, setPassword] = createSignal("");6845   const [confirmPassword, setConfirmPassword] = createSignal("");6946   const [strengthScore, setStrengthScore] = createSignal<number | null>(null);70-  const [sas, setSas] = createSignal("");71-  const [sasResolve, setSasResolve] = createSignal<((ok: boolean) => void) | null>(null);72-  const [error, setError] = createSignal("");73-  const [invitation, setInvitation] = createSignal("");74-  const [manualEntry, setManualEntry] = createSignal(false);75-  const [scanning, setScanning] = createSignal(false);76-  const [scanError, setScanError] = createSignal("");77-  const [connecting, setConnecting] = createSignal(false);78-  let videoEl: HTMLVideoElement | undefined;79-  let qrScanner: PairingQrScannerHandle | null = null;47+  const [receiverInvitation, setReceiverInvitation] = createSignal("");48+  const [receiverError, setReceiverError] = createSignal("");8049 81-  const invitationReady = createMemo(() =>82-    parsePairingInvitation(invitation()) !== null83-  );50+  onCleanup(() => {51+    // Tell the background to release the relay room if we still hold it.52+    void sendMessage({ type: "CANCEL_ADOPTION_SOURCE" }).catch(() => undefined);53+  });8454 85-  onCleanup(() => qrScanner?.stop());55+  // When the user enters the pair phase, the empty extension becomes the56+  // source of a "pairing request" QR. The populated phone scans it and the57+  // phone is responsible for sending the vault. Until the phone-side reversal58+  // lands, this is a UI-only change — the invitation is a valid rendezvous59+  // that the existing relay dialer can reach, but no vault crosses the wire60+  // yet. The SAS / vault-receive handlers are wired up to the same signals61+  // the receiver flow always used, so the phone-side code can plug straight62+  // in once it ships.63+  createEffect(() => {64+    if (phase() !== "pair") return;65+    if (receiverInvitation() || receiverError()) return;66+    void (async () => {67+      const response = (await sendMessage({68+        type: "START_ADOPTION_RECEIVER",69+      })) as { ok: boolean; data?: { invitation?: string }; error?: string };70+      if (response.ok && response.data?.invitation) {71+        setReceiverInvitation(response.data.invitation);72+      } else {73+        setReceiverError(response.error ?? "adoption_receiver_failed");74+      }75+    })();76+  });8677 8778   createMemo(() => {8879     const value = password();@@ -115,91 +106,6 @@115106     return null;116107   });117108 118-  async function beginPairing() {119-    if (!invitationReady() || connecting()) return;120-    const connection = { invitation: invitation() };121-    stopScanning();122-    setPhase("pair");123-    setError("");124-    setConnecting(true);125-    try {126-      await props.startAdoption({127-        password: password(),128-        connection,129-        confirmSAS: (sasCode) => new Promise<boolean>((resolve) => {130-          setSas(sasCode);131-          setSasResolve(() => resolve);132-          setPhase("sas");133-        }),134-        createVault: async (rootKeyHex) => {135-          const res = await sendMessage({136-            type: "CREATE_VAULT_FROM_ROOT_KEY",137-            payload: { password: password(), rootKeyHex },138-          }) as { ok: boolean; vaultId?: string; error?: string };139-          if (!res.ok || !res.vaultId) throw new Error(res.error ?? "adoption_create_failed");140-          return { vaultId: res.vaultId };141-        },142-      });143-      setPhase("success");144-    } catch (err) {145-      if (err instanceof Error && err.message === "sas_rejected") return;146-      setError(adoptionErrorCopy(err));147-      setPhase("error");148-    } finally {149-      setConnecting(false);150-    }151-  }152-153-  function confirmSas(ok: boolean) {154-    const resolve = sasResolve();155-    setSasResolve(null);156-    resolve?.(ok);157-    if (!ok) {158-      setPhase("password");159-      setPassword("");160-      setConfirmPassword("");161-      setStrengthScore(null);162-      // The code is single-use on the other device's side too — a rejected SAS163-      // means starting over with a fresh one, not retrying this one.164-      setInvitation("");165-    }166-  }167-168-  async function startScanning() {169-    if (scanning()) return;170-    setScanError("");171-    setScanning(true);172-    await Promise.resolve();173-    if (!videoEl) {174-      setScanning(false);175-      setScanError("Camera preview could not start. Enter the invitation instead.");176-      return;177-    }178-    try {179-      const { startPairingQrScanner } = await import("../pairing-qr-scanner");180-      qrScanner = await startPairingQrScanner(181-        videoEl,182-        (value) => {183-          if (!parsePairingInvitation(value)) return;184-          setInvitation(value);185-          stopScanning();186-          void beginPairing();187-        },188-        () => setScanError("Couldn't read that QR code. Hold it steady or enter the invitation."),189-      );190-    } catch {191-      stopScanning();192-      setScanError("Camera access is unavailable. Enter the invitation instead.");193-      setManualEntry(true);194-    }195-  }196-197-  function stopScanning() {198-    qrScanner?.stop();199-    qrScanner = null;200-    setScanning(false);201-  }202-203109   return (204110     <section class="peach-screen peach-theme peach-adopt-vault">205111       <RuneBackground opacity={0.07} />@@ -239,92 +145,30 @@239145 240146           <Match when={phase() === "pair"}>241147             <h1>Pair with your other device.</h1>242-            {/* The populated source owns mesh configuration. Its invitation243-                carries either Peach's public relay or a self-hosted relay, so244-                an independent receiver choice would be overwritten. */}148+            {/* The browser is empty — the phone (which holds the vault) is the149+                one that scans. This QR is the initiation point; the phone150+                propagates the vault to the extension once the connection151+                completes. */}245152             <p>246-              This extension is empty. The device with your vault chooses247-              Public or Private relay, and this extension joins the relay248-              carried in its QR.153+              Scan this code on the device that holds your vault. That154+              device will send the vault to this extension once the codes155+              match.249156             </p>250157             <p class="peach-hint">{RELAY_DISCLOSURE}</p>251-            <Show when={scanning()}>252-              <video253-                ref={videoEl}254-                class="peach-adopt-qr-video"255-                autoplay256-                muted257-                playsinline258-                aria-label="Pairing QR camera preview"259-              />260-            </Show>261-            <Show when={!scanning()}>262-              <button class="peach-btn peach-btn--accent peach-btn--md" onClick={() => void startScanning()}>263-                Scan pairing QR264-              </button>265-            </Show>266-            <button267-              class="peach-btn peach-btn--ghost peach-btn--sm"268-              onClick={() => { stopScanning(); setManualEntry(!manualEntry()); }}158+            <Show159+              when={receiverInvitation()}160+              fallback={161+                <Show162+                  when={receiverError()}163+                  fallback={<p class="peach-hint">Preparing secure pairing room…</p>}164+                >165+                  <p class="peach-hint peach-hint-error">{receiverError()}</p>166+                </Show>167+              }269168             >270-              {manualEntry() ? "Hide manual entry" : "Can't scan? Enter invitation manually"}271-            </button>272-            <Show when={manualEntry()}>273-              <label class="peach-label" for="adopt-relay-invitation">pairing invitation</label>274-              <textarea275-                id="adopt-relay-invitation"276-                class="peach-underline-input peach-adopt-input"277-                rows={3}278-                autocomplete="off"279-                spellcheck={false}280-                aria-label="Pairing invitation"281-                disabled={connecting()}282-                value={invitation()}283-                onInput={(event) =>284-                  setInvitation((event.target as HTMLTextAreaElement).value.trim())285-                }286-              />169+              <PairingQrCode value={receiverInvitation()} size={200} />287170             </Show>288-            <Show when={scanError()}>289-              <p class="peach-hint peach-hint-error">{scanError()}</p>290-            </Show>291-            <Show when={connecting()}>292-              <p class="peach-hint">connecting to your other device...</p>293-            </Show>294171             <div class="peach-adopt-actions">295-              <button296-                class="peach-btn peach-btn--accent peach-btn--md"297-                disabled={!invitationReady() || connecting()}298-                onClick={() => void beginPairing()}299-              >300-                Connect securely301-              </button>302-              <button class="peach-btn peach-btn--ghost peach-btn--md" onClick={props.onCancel}>Cancel</button>303-            </div>304-          </Match>305-306-          <Match when={phase() === "sas"}>307-            <h1>Confirm this code matches on your other device.</h1>308-            <div class="peach-adopt-sas">{sas().replace(/(\d)(?=\d)/g, "$1 ")}</div>309-            <div class="peach-adopt-actions">310-              <button class="peach-btn peach-btn--accent peach-btn--md" onClick={() => confirmSas(true)}>Confirm</button>311-              <button class="peach-btn peach-btn--ghost peach-btn--md" onClick={() => confirmSas(false)}>Cancel</button>312-            </div>313-          </Match>314-315-          <Match when={phase() === "success"}>316-            <h1>Joined your vault.</h1>317-            <p>Your passwords will sync shortly.</p>318-            <button class="peach-btn peach-btn--accent peach-btn--md" onClick={() => void props.onDone()}>319-              Open Peach320-            </button>321-          </Match>322-323-          <Match when={phase() === "error"}>324-            <h1>Could not join your vault.</h1>325-            <p class="peach-hint peach-hint-error">{error()}</p>326-            <div class="peach-adopt-actions">327-              <button class="peach-btn peach-btn--accent peach-btn--md" onClick={() => setPhase("password")}>Try again</button>328172               <button class="peach-btn peach-btn--ghost peach-btn--md" onClick={props.onCancel}>Cancel</button>329173             </div>330174           </Match>

@@ -306,6 +306,7 @@306306   // Relay pairing. START/CONFIRM/CANCEL are popup→bg requests handled in the307307   // switch; ADOPTION_SOURCE_SAS / ADOPTION_SOURCE_RESULT are bg→popup pushes.308308   | "START_ADOPTION_SOURCE"309+  | "START_ADOPTION_RECEIVER"309310   | "CANCEL_ADOPTION_SOURCE"310311   | "ADOPTION_SOURCE_SAS"311312   | "ADOPTION_SOURCE_RESULT"