@arcblock/did-connect-service 4.1.61 → 4.1.63

package/dist/assets/{admin-core.bcfa7ce2.js → admin-core.bbd8d53c.js}

@@ -735,116 +735,514 @@ var __connectedAccounts = [];
 var __oauthProviders = [];
 var __accountMergeOAuthCleanup = null;
 var __mergePromptDid = "";
+var __mergePromptCandidates = [];
 var __providerIcons = {"passkey":"<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"18\" height=\"18\" viewBox=\"0 0 24 24\" fill=\"none\"><path fill=\"currentColor\" d=\"M3 20v-2.8q0-.85.438-1.562T4.6 14.55q1.55-.775 3.15-1.162T11 13q.5 0 1 .038t1 .112q-.1 1.45.525 2.738T15.35 18v2zm16 3l-1.5-1.5v-4.65q-1.1-.325-1.8-1.237T15 13.5q0-1.45 1.025-2.475T18.5 10t2.475 1.025T22 13.5q0 1.125-.638 2t-1.612 1.25L21 18l-1.5 1.5L21 21zm-8-11q-1.65 0-2.825-1.175T7 8t1.175-2.825T11 4t2.825 1.175T15 8t-1.175 2.825T11 12m7.5 2q.425 0 .713-.288T19.5 13t-.288-.712T18.5 12t-.712.288T17.5 13t.288.713t.712.287\"/></svg>","wallet":"<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"18\" height=\"18\" viewBox=\"0 0 24 24\" fill=\"none\"><rect x=\"2\" y=\"4\" width=\"20\" height=\"16\" rx=\"3\" fill=\"#4598FA\"/><rect x=\"3\" y=\"6\" width=\"18\" height=\"12\" rx=\"2\" fill=\"white\" opacity=\"0.9\"/><rect x=\"0\" y=\"14\" width=\"24\" height=\"10\" rx=\"0\" fill=\"url(#dw_g)\"/><path d=\"M5.5 9.5h4.5c.3 0 .5.2.5.5v2.5c0 .3-.2.5-.5.5H5.5c-.3 0-.5-.2-.5-.5V10c0-.3.2-.5.5-.5z\" fill=\"#4598FA\"/><defs><linearGradient id=\"dw_g\" x1=\"12\" y1=\"14\" x2=\"12\" y2=\"24\" gradientUnits=\"userSpaceOnUse\"><stop stop-color=\"#77B2F6\"/><stop offset=\"1\" stop-color=\"#4598FA\"/></linearGradient></defs></svg>","did-connect":"<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"18\" height=\"18\" viewBox=\"0 0 24 24\" fill=\"none\"><rect x=\"2\" y=\"4\" width=\"20\" height=\"16\" rx=\"3\" fill=\"#4598FA\"/><rect x=\"3\" y=\"6\" width=\"18\" height=\"12\" rx=\"2\" fill=\"white\" opacity=\"0.9\"/><rect x=\"0\" y=\"14\" width=\"24\" height=\"10\" rx=\"0\" fill=\"url(#dw_g)\"/><path d=\"M5.5 9.5h4.5c.3 0 .5.2.5.5v2.5c0 .3-.2.5-.5.5H5.5c-.3 0-.5-.2-.5-.5V10c0-.3.2-.5.5-.5z\" fill=\"#4598FA\"/><defs><linearGradient id=\"dw_g\" x1=\"12\" y1=\"14\" x2=\"12\" y2=\"24\" gradientUnits=\"userSpaceOnUse\"><stop stop-color=\"#77B2F6\"/><stop offset=\"1\" stop-color=\"#4598FA\"/></linearGradient></defs></svg>","email":"<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"18\" height=\"18\" viewBox=\"0 0 24 24\" fill=\"none\"><path fill=\"currentColor\" d=\"M22 7.535V17a3 3 0 0 1-2.824 2.995L19 20H5a3 3 0 0 1-2.995-2.824L2 17V7.535l9.445 6.297l.116.066a1 1 0 0 0 .878 0l.116-.066z\"/><path fill=\"currentColor\" d=\"M19 4c1.08 0 2.027.57 2.555 1.427L12 11.797l-9.555-6.37a2.999 2.999 0 0 1 2.354-1.42L5 4z\"/></svg>","google":"<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"18\" height=\"18\" viewBox=\"0 0 256 262\"><path fill=\"#4285F4\" d=\"M255.878 133.451c0-10.734-.871-18.567-2.756-26.69H130.55v48.448h71.947c-1.45 12.04-9.283 30.172-26.69 42.356l-.244 1.622l38.755 30.023l2.685.268c24.659-22.774 38.875-56.282 38.875-96.027\"/><path fill=\"#34A853\" d=\"M130.55 261.1c35.248 0 64.839-11.605 86.453-31.622l-41.196-31.913c-11.024 7.688-25.82 13.055-45.257 13.055c-34.523 0-63.824-22.773-74.269-54.25l-1.531.13l-40.298 31.187l-.527 1.465C35.393 231.798 79.49 261.1 130.55 261.1\"/><path fill=\"#FBBC05\" d=\"M56.281 156.37c-2.756-8.123-4.351-16.827-4.351-25.82c0-8.994 1.595-17.697 4.206-25.82l-.073-1.73L15.26 71.312l-1.335.635C5.077 89.644 0 109.517 0 130.55s5.077 40.905 13.925 58.602z\"/><path fill=\"#EB4335\" d=\"M130.55 50.479c24.514 0 41.05 10.589 50.479 19.438l36.844-35.974C195.245 12.91 165.798 0 130.55 0C79.49 0 35.393 29.301 13.925 71.947l42.211 32.783c10.59-31.477 39.891-54.251 74.414-54.251\"/></svg>","github":"<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"18\" height=\"18\" viewBox=\"0 0 256 250\" fill=\"currentColor\"><path d=\"M128.001 0C57.317 0 0 57.307 0 128.001c0 56.554 36.676 104.535 87.535 121.46c6.397 1.185 8.746-2.777 8.746-6.158c0-3.052-.12-13.135-.174-23.83c-35.61 7.742-43.124-15.103-43.124-15.103c-5.823-14.795-14.213-18.73-14.213-18.73c-11.613-7.944.876-7.78.876-7.78c12.853.902 19.621 13.19 19.621 13.19c11.417 19.568 29.945 13.911 37.249 10.64c1.149-8.272 4.466-13.92 8.127-17.116c-28.431-3.236-58.318-14.212-58.318-63.258c0-13.975 5-25.394 13.188-34.358c-1.329-3.224-5.71-16.242 1.24-33.874c0 0 10.749-3.44 35.21 13.121c10.21-2.836 21.16-4.258 32.038-4.307c10.878.049 21.837 1.47 32.066 4.307c24.431-16.56 35.165-13.12 35.165-13.12c6.967 17.63 2.584 30.65 1.255 33.873c8.207 8.964 13.173 20.383 13.173 34.358c0 49.163-29.944 59.988-58.447 63.157c4.591 3.972 8.682 11.762 8.682 23.704c0 17.126-.148 30.91-.148 35.126c0 3.407 2.304 7.398 8.792 6.14C219.37 232.5 256 184.537 256 128.002C256 57.307 198.691 0 128.001 0\"/></svg>","apple":"<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"18\" height=\"18\" viewBox=\"0 0 256 315\" fill=\"currentColor\"><path d=\"M213.803 167.03c.442 47.58 41.74 63.413 42.197 63.615c-.35 1.116-6.599 22.563-21.757 44.716c-13.104 19.153-26.705 38.235-48.13 38.63c-21.05.388-27.82-12.483-51.888-12.483c-24.061 0-31.582 12.088-51.51 12.871c-20.68.783-36.428-20.71-49.64-39.793c-27-39.033-47.633-110.3-19.928-158.406c13.763-23.89 38.36-39.017 65.056-39.405c20.307-.388 39.475 13.675 51.889 13.675c12.406 0 35.699-16.895 60.186-14.414c10.25.427 39.026 4.14 57.503 31.186c-1.49.923-34.335 20.044-33.978 59.808M174.24 50.199c10.98-13.29 18.369-31.79 16.353-50.199c-15.826.636-34.962 10.546-46.314 23.828c-10.173 11.763-19.082 30.589-16.678 48.633c17.64 1.365 35.66-8.964 46.639-22.262\"/></svg>","twitter":"<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"18\" height=\"18\" viewBox=\"0 0 256 256\" fill=\"currentColor\"><path d=\"M149.079 108.399L242.33 0h-22.098l-80.97 94.12L74.59 0H0l97.796 142.328L0 256h22.1l85.507-99.395L175.905 256h74.59L149.073 108.399zM118.81 143.58l-9.909-14.172l-78.84-112.773h33.943l63.625 91.011l9.909 14.173l82.705 118.3H186.3l-67.49-96.533z\"/></svg>","auth0":"<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"18\" height=\"18\" viewBox=\"0 0 256 256\"><path fill=\"#EB5424\" d=\"M203.97 200.38L167.47 88l-39.5 112.38h75.98zm0-144.76L167.47 168l75.97-26.16l19.76-60.82c6.64-20.4-1.94-42.72-21.18-52.76l-38.06 27.36zM52.03 55.62L88.54 168l39.5-112.38H52.02zM52.03 200.38L88.54 88L12.56 114.16l-5.92 18.2c-6.64 20.4 1.94 42.72 21.18 52.76l24.2-17.38l.01.01v-.01l-.01.01.01-.37z\"/></svg>"};
 var __hiddenProviders = ["facebook","auth0-legacy"];
 function toMergeConfirmViewModel(plan) {
-    const membershipChanges = plan?.membershipChanges ?? [];
-    const credentials = plan?.credentialsByProvider ?? [];
-    const skipped = plan?.skippedConflicts ?? [];
-    const hostCodes = plan?.hostWarningCodes ?? [];
+    const raw = plan ?? {};
+    function textOrEmpty(value) {
+        return typeof value === "string" ? value : "";
+    }
+    function normalizeProvider(provider) {
+        const name = textOrEmpty(provider).trim();
+        if (name === "did-connect")
+            return "wallet";
+        return name;
+    }
+    function readSide(value) {
+        const methods = [];
+        const seen = new Set();
+        const listed = Array.isArray(value?.methods) ? value.methods : [];
+        for (const provider of listed) {
+            const name = normalizeProvider(provider);
+            if (!name || seen.has(name))
+                continue;
+            seen.add(name);
+            methods.push(name);
+        }
+        return {
+            did: textOrEmpty(value?.did),
+            methods,
+            createdAt: textOrEmpty(value?.createdAt),
+            globalRole: textOrEmpty(value?.globalRole),
+            fullName: textOrEmpty(value?.fullName),
+            handle: textOrEmpty(value?.handle),
+        };
+    }
+    const movedMethods = [];
+    const seenMethods = new Set();
+    const credentials = Array.isArray(raw.credentialsByProvider) ? raw.credentialsByProvider : [];
+    for (const row of credentials) {
+        const name = normalizeProvider(row?.provider);
+        if (!name || seenMethods.has(name))
+            continue;
+        seenMethods.add(name);
+        movedMethods.push(name);
+    }
+    const roleChanges = [];
+    const membershipChanges = Array.isArray(raw.membershipChanges) ? raw.membershipChanges : [];
+    for (const row of membershipChanges) {
+        const intoRoleBefore = textOrEmpty(row?.intoRoleBefore);
+        const keptRole = textOrEmpty(row?.keptRole);
+        if (!keptRole || keptRole === intoRoleBefore)
+            continue;
+        roleChanges.push({
+            fromRole: textOrEmpty(row?.fromRole),
+            intoRoleBefore,
+            keptRole,
+            instanceName: textOrEmpty(row?.instanceName),
+        });
+    }
+    const movedMemberships = [];
+    const moved = Array.isArray(raw.movedMemberships) ? raw.movedMemberships : [];
+    for (const row of moved) {
+        const instanceName = textOrEmpty(row?.instanceName);
+        const role = textOrEmpty(row?.role);
+        if (!instanceName && !role)
+            continue;
+        movedMemberships.push({ instanceName, role });
+    }
+    const change = raw.globalRoleChange;
+    const before = textOrEmpty(change?.before);
+    const after = textOrEmpty(change?.after);
+    const globalRoleChange = before && after && before !== after ? { before, after } : null;
+    const count = raw.accessKeyCount;
+    const accessKeyCount = typeof count === "number" && Number.isFinite(count) && count > 0 ? count : 0;
+    const recommendedKeep = raw.recommendedKeep === "proved" ? "proved" : "session";
+    const reasons = Array.isArray(raw.recommendReasons) ? raw.recommendReasons : [];
     return {
-        tooLarge: Boolean(plan?.tooLarge),
-        survivingDid: plan?.intoDid ?? "",
-        mergedDid: plan?.fromDid ?? "",
-        credentialsByProvider: credentials.map((row) => row.provider),
-        skippedConflicts: skipped,
-        roleChanges: membershipChanges.filter((row) => row.keptRole !== row.intoRoleBefore),
-        accessKeyCount: plan?.accessKeyCount ?? 0,
-        didSpacePointer: plan?.didSpace?.pointer ?? "",
-        hostWarningCodes: hostCodes,
+        tooLarge: raw.tooLarge === true,
+        recommendedKeep,
+        fromDid: textOrEmpty(raw.fromDid),
+        intoDid: textOrEmpty(raw.intoDid),
+        session: readSide(raw.accounts?.session),
+        proved: readSide(raw.accounts?.proved),
+        recommendReasons: reasons.filter((code) => typeof code === "string"),
+        movedMethods,
+        roleChanges,
+        movedMemberships,
+        globalRoleChange,
+        accessKeyCount,
+        mergedHandle: textOrEmpty(raw.mergedHandle),
+        matchesCandidate: raw.matchesCandidate === true,
     };
 }
-function renderMergeConfirmBodyHtml(plan, t, escapeHtml, providerLabel) {
+function renderMergeConfirmBodyHtml(plan, t, escapeHtml, providerLabel, options) {
     const view = toMergeConfirmViewModel(plan);
-    const roleLabel = (role) => {
+    const requested = options?.selectedKeep;
+    const picked = requested === "session" || requested === "proved" ? requested : view.recommendedKeep;
+    function plain(value) {
+        return String(value ?? "").replace(/[{}]/g, "");
+    }
+    function text(key, params) {
+        let safe;
+        if (params) {
+            safe = {};
+            for (const name of Object.keys(params))
+                safe[name] = plain(params[name]);
+        }
+        return escapeHtml(t(key, safe));
+    }
+    function shortOf(did) {
+        if (typeof options?.shortDid === "function")
+            return options.shortDid(did);
+        if (!did)
+            return "";
+        if (did.length <= 17)
+            return did;
+        return `${did.slice(0, 8)}...${did.slice(-6)}`;
+    }
+    function roleLabel(role) {
         const key = `common.${role}`;
         const translated = t(key);
         return translated === key ? role : translated;
-    };
-    const labelFor = (provider) => (providerLabel ? providerLabel(provider) : provider);
-    const skippedReason = (reason) => reason === "UNIQUE(provider,id)" ? t("profile.mergeConfirmSkippedReason") : reason;
-    const hostWarning = (code) => {
-        if (code === "blocklet-owner-clash")
-            return t("profile.mergeHostBlockletOwnerClash");
-        if (code === "external-token-rebind")
-            return t("profile.mergeHostExternalTokenRebind");
-        return code;
-    };
-    const wrapDid = (did) => `<code class="merge-confirm-did">${escapeHtml(did)}</code>`;
-    const credentialItems = view.credentialsByProvider
-        .map((provider) => `<li>${escapeHtml(labelFor(provider))}</li>`)
-        .join("");
-    const skippedItems = view.skippedConflicts
-        .map((row) => `<li>${escapeHtml(labelFor(row.provider))} — ${escapeHtml(skippedReason(row.reason))}</li>`)
-        .join("");
-    const roleItems = view.roleChanges
-        .map((row) => `<li>${escapeHtml(t("profile.mergeConfirmRoleChange", {
-        fromRole: roleLabel(row.fromRole),
-        intoRoleBefore: roleLabel(row.intoRoleBefore),
-        keptRole: roleLabel(row.keptRole),
-    }))}</li>`)
-        .join("");
-    const hostItems = view.hostWarningCodes
-        .map((code) => `<li>${escapeHtml(hostWarning(code))}</li>`)
-        .join("");
-    let html = `<p class="dialog-desc">${t("profile.mergeConfirmSurviving", {
-        intoDid: wrapDid(view.survivingDid),
-        fromDid: wrapDid(view.mergedDid),
-    })}</p>`;
-    html += `<p class="merge-confirm-keep-other">${t("profile.mergeConfirmKeepOther")}</p>`;
-    if (credentialItems) {
-        html += `<div class="merge-confirm-section"><h4>${escapeHtml(t("profile.mergeConfirmCredentials"))}</h4><ul class="merge-confirm-list">${credentialItems}</ul></div>`;
-    }
-    if (skippedItems) {
-        html += `<div class="merge-confirm-section"><h4>${escapeHtml(t("profile.mergeConfirmSkipped"))}</h4><ul class="merge-confirm-list">${skippedItems}</ul></div>`;
-    }
-    if (roleItems) {
-        html += `<div class="merge-confirm-section"><h4>${escapeHtml(t("profile.mergeConfirmRoles"))}</h4><ul class="merge-confirm-list">${roleItems}</ul></div>`;
-    }
-    if (view.accessKeyCount > 0) {
-        html += `<div class="merge-confirm-section"><h4>${escapeHtml(t("profile.mergeConfirmAccessKeysTitle"))}</h4><p class="merge-confirm-note">${escapeHtml(t("profile.mergeConfirmAccessKeys", { count: String(view.accessKeyCount) }))}</p></div>`;
-    }
-    html += `<div class="merge-confirm-section"><h4>${escapeHtml(t("profile.mergeConfirmDidSpaceTitle"))}</h4><p class="merge-confirm-note">${t("profile.mergeDidSpace", {
-        pointer: wrapDid(view.didSpacePointer),
-    })}</p></div>`;
-    if (hostItems) {
-        html += `<div class="merge-confirm-section"><h4>${escapeHtml(t("profile.mergeConfirmHostWarnings"))}</h4><ul class="merge-confirm-list">${hostItems}</ul></div>`;
-    }
-    html += `<p class="merge-confirm-irreversible">${escapeHtml(t("profile.mergeConfirmIrreversible"))}</p>`;
-    if (view.tooLarge) {
-        html += `<p class="merge-confirm-too-large">${escapeHtml(t("profile.mergeConfirmTooLarge"))}</p>`;
     }
-    return html;
-}
-function renderMergeMethodPickerHtml(options, t, escapeHtml, iconFor, labelFor) {
-    const buttons = (options || [])
-        .map((opt) => {
+    function methodLabels(methods) {
+        const labels = [];
+        for (const provider of methods) {
+            labels.push(typeof providerLabel === "function" ? providerLabel(provider) : provider);
+        }
+        return labels.join(t("profile.mergePromptMethodSep"));
+    }
+    function createdOn(iso) {
+        const match = /^(\d{4}-\d{2}-\d{2})/.exec(iso);
+        return match?.[1] ?? iso;
+    }
+    function accountCard(keep) {
+        const account = keep === "session" ? view.session : view.proved;
+        const lines = [];
+        const nameBits = [];
+        if (account.fullName)
+            nameBits.push(account.fullName);
+        if (account.handle)
+            nameBits.push(`@${account.handle}`);
+        if (nameBits.length > 0) {
+            lines.push(`<span class="merge-confirm-line">${escapeHtml(nameBits.join(" · "))}</span>`);
+        }
+        if (account.methods.length > 0) {
+            lines.push(`<span class="merge-confirm-line">${escapeHtml(methodLabels(account.methods))}</span>`);
+        }
+        const meta = [];
+        if (account.globalRole)
+            meta.push(roleLabel(account.globalRole));
+        if (account.createdAt)
+            meta.push(t("profile.mergeConfirmCreated", { date: plain(createdOn(account.createdAt)) }));
+        if (meta.length > 0)
+            lines.push(`<span class="merge-confirm-line">${escapeHtml(meta.join(" · "))}</span>`);
+        if (keep === "session") {
+            lines.push(`<span class="merge-confirm-current">${text("profile.mergeConfirmCurrent")}</span>`);
+        }
+        const copy = account.did
+            ? `<button type="button" class="merge-confirm-copy" data-copy-did="${escapeHtml(account.did)}">${text("common.copy")}</button>`
+            : "";
+        const badge = view.recommendedKeep === keep
+            ? `<span class="merge-confirm-badge">${text("profile.mergeConfirmRecommended")}</span>`
+            : "";
+        const selected = picked === keep ? " checked" : "";
+        const selectedClass = picked === keep ? " is-selected" : "";
+        return (`<label class="merge-confirm-card${selectedClass}" data-keep="${keep}">` +
+            `<input type="radio" name="merge-keep" value="${keep}"${selected}>` +
+            `<span class="merge-confirm-card-main">` +
+            `<span class="merge-confirm-card-head"><span class="merge-confirm-did">${escapeHtml(shortOf(account.did))}</span>${copy}${badge}</span>` +
+            lines.join("") +
+            `</span></label>`);
+    }
+    let banner = "";
+    if (options?.hasCandidate === true && view.matchesCandidate && options.candidateEmail) {
+        banner = `<p class="merge-confirm-match">${text("profile.mergeConfirmMatch", { email: options.candidateEmail })}</p>`;
+    }
+    else if (options?.hasCandidate === true && !view.matchesCandidate) {
+        banner = `<p class="merge-confirm-not-match">${text("profile.mergeConfirmNotMatch")}</p>`;
+    }
+    const primary = view.recommendedKeep === "proved" ? "proved" : "session";
+    const secondary = primary === "session" ? "proved" : "session";
+    const recommendedAccount = view.recommendedKeep === "proved" ? view.proved : view.session;
+    const reasonBits = [];
+    for (const code of view.recommendReasons) {
+        if (code === "global-role" || code === "instance-role")
+            reasonBits.push(t("profile.mergeConfirmReasonHigher"));
+        else if (code === "handle") {
+            reasonBits.push(t("profile.mergeConfirmReasonHandle", { handle: plain(recommendedAccount.handle) }));
+        }
+        else if (code === "wallet-did")
+            reasonBits.push(t("profile.mergeConfirmReasonWallet"));
+        else if (code === "older")
+            reasonBits.push(t("profile.mergeConfirmReasonOlder"));
+    }
+    const reason = reasonBits.length
+        ? text("profile.mergeConfirmReasonLead", {
+            did: shortOf(recommendedAccount.did),
+            reason: reasonBits.join(" "),
+        })
+        : text("profile.mergeConfirmReasonSimilar");
+    let changes = "";
+    if (options?.loading === true) {
+        changes =
+            `<div id="merge-confirm-changes" class="merge-confirm-section">` +
+                `<h4>${text("profile.mergeConfirmChanges")}</h4>` +
+                `<p class="merge-confirm-loading">${text("profile.mergeConfirmLoading")}</p>` +
+                `</div>`;
+    }
+    else {
+        const rows = [];
+        if (view.movedMethods.length > 0) {
+            rows.push(`<li>${text("profile.mergeConfirmMovedMethods", { methods: methodLabels(view.movedMethods) })}</li>`);
+        }
+        if (view.globalRoleChange) {
+            rows.push(`<li>${text("profile.mergeConfirmGlobalRole", {
+                before: roleLabel(view.globalRoleChange.before),
+                after: roleLabel(view.globalRoleChange.after),
+            })}</li>`);
+        }
+        for (const row of view.roleChanges) {
+            const before = roleLabel(row.intoRoleBefore);
+            const after = roleLabel(row.keptRole);
+            const line = row.instanceName
+                ? text("profile.mergeConfirmSpaceRole", { space: row.instanceName, before, after })
+                : text("profile.mergeConfirmSpaceRoleUnnamed", { before, after });
+            rows.push(`<li>${line}</li>`);
+        }
+        if (view.movedMemberships.length > 0) {
+            const parts = [];
+            for (const row of view.movedMemberships) {
+                const role = roleLabel(row.role);
+                parts.push(row.instanceName
+                    ? t("profile.mergeConfirmJoinedSpace", { space: plain(row.instanceName), role: plain(role) })
+                    : t("profile.mergeConfirmJoinedSpaceUnnamed", { role: plain(role) }));
+            }
+            rows.push(`<li>${text("profile.mergeConfirmJoinedSpaces", {
+                spaces: parts.join(t("profile.mergePromptMethodSep")),
+            })}</li>`);
+        }
+        if (view.accessKeyCount > 0) {
+            rows.push(`<li>${text("profile.mergeConfirmAccessKeys", { count: String(view.accessKeyCount) })}</li>`);
+        }
+        if (view.mergedHandle) {
+            rows.push(`<li>${text("profile.mergeConfirmHandleStays", {
+                handle: view.mergedHandle,
+                did: shortOf(view.fromDid),
+            })}</li>`);
+        }
+        rows.push(`<li>${text("profile.mergeConfirmNameAvatar", { did: shortOf(view.fromDid) })}</li>`);
+        rows.push(`<li>${text("profile.mergeConfirmDidSpaceNotCopied", { did: shortOf(view.fromDid) })}</li>`);
+        const tooLarge = view.tooLarge
+            ? `<p class="merge-confirm-too-large">${text("profile.mergeConfirmTooLarge")}</p>`
+            : "";
+        changes =
+            `<div id="merge-confirm-changes" class="merge-confirm-section">` +
+                `<h4>${text("profile.mergeConfirmChanges")}</h4>` +
+                `<ul class="merge-confirm-list">${rows.join("")}</ul>` +
+                `<p class="merge-confirm-host">${text("profile.mergeConfirmHostMaybe", { did: shortOf(view.fromDid) })}</p>` +
+                `<p class="merge-confirm-irreversible">${text("profile.mergeConfirmIrreversible")}</p>` +
+                tooLarge +
+                `</div>`;
+    }
+    return (banner +
+        `<p class="merge-confirm-choose">${text("profile.mergeConfirmChoose")}</p>` +
+        `<div class="merge-confirm-cards">${accountCard(primary)}${accountCard(secondary)}</div>` +
+        `<p class="merge-confirm-reason">${reason}</p>` +
+        `<p class="merge-confirm-alias">${text("profile.mergeConfirmAlias")}</p>` +
+        changes);
+}
+function renderMergeDoneBodyHtml(input, t, escapeHtml, providerLabel, shortDid) {
+    const data = input ?? {};
+    const did = typeof data.survivorDid === "string" ? data.survivorDid : "";
+    function plain(value) {
+        return String(value ?? "").replace(/[{}]/g, "");
+    }
+    function text(key, params) {
+        let safe;
+        if (params) {
+            safe = {};
+            for (const name of Object.keys(params))
+                safe[name] = plain(params[name]);
+        }
+        return escapeHtml(t(key, safe));
+    }
+    function shortOf(value) {
+        if (typeof shortDid === "function")
+            return shortDid(value);
+        if (!value)
+            return "";
+        if (value.length <= 17)
+            return value;
+        return `${value.slice(0, 8)}...${value.slice(-6)}`;
+    }
+    const seen = new Set();
+    const labels = [];
+    const methods = Array.isArray(data.survivorMethods) ? data.survivorMethods : [];
+    for (const provider of methods) {
+        if (typeof provider !== "string")
+            continue;
+        const name = provider.trim() === "did-connect" ? "wallet" : provider.trim();
+        if (!name || seen.has(name))
+            continue;
+        seen.add(name);
+        labels.push(typeof providerLabel === "function" ? providerLabel(name) : name);
+    }
+    const didLine = `<p class="merge-confirm-done-did">${text("profile.mergeDoneDid", { did: shortOf(did) })}</p>`;
+    if (labels.length === 0)
+        return didLine;
+    return (didLine +
+        `<p class="merge-confirm-done-methods">${text("profile.mergeDoneMethods", {
+            methods: labels.join(t("profile.mergePromptMethodSep")),
+        })}</p>`);
+}
+function renderMergeMethodPickerHtml(options, t, escapeHtml, iconFor, labelFor, errorText, guide) {
+    const button = (opt, primary) => {
+        const cls = primary ? "btn merge-method-btn" : "btn btn-secondary merge-method-btn";
         if (opt.method === "wallet") {
-            return (`<button type="button" class="btn btn-secondary merge-method-btn" data-merge-method="wallet">` +
+            return (`<button type="button" class="${cls}" data-merge-method="wallet">` +
                 `${iconFor("did-connect")} ${escapeHtml(t("profile.mergeProveWallet"))}</button>`);
         }
         if (opt.method === "passkey") {
-            return (`<button type="button" class="btn btn-secondary merge-method-btn" data-merge-method="passkey">` +
+            return (`<button type="button" class="${cls}" data-merge-method="passkey">` +
                 `${iconFor("passkey")} ${escapeHtml(t("profile.mergeProvePasskey"))}</button>`);
         }
         if (opt.method === "email") {
-            return (`<button type="button" class="btn btn-secondary merge-method-btn" data-merge-method="email">` +
-                `${iconFor("email")} ${escapeHtml(t("profile.mergeProveEmail"))}</button>`);
+            const label = opt.email ? t("profile.mergeProveEmailAddress", { email: opt.email }) : t("profile.mergeProveEmail");
+            const emailAttr = opt.email ? ` data-merge-email="${escapeHtml(opt.email)}"` : "";
+            return (`<button type="button" class="${cls}" data-merge-method="email"${emailAttr}>` +
+                `${iconFor("email")} ${escapeHtml(label)}</button>`);
         }
         const provider = opt.provider || "";
-        return (`<button type="button" class="btn btn-secondary merge-method-btn" data-merge-method="oauth" data-merge-provider="${escapeHtml(provider)}">` +
+        return (`<button type="button" class="${cls}" data-merge-method="oauth" data-merge-provider="${escapeHtml(provider)}">` +
             `${iconFor(provider)} ${escapeHtml(t("profile.mergeProveOAuth", { provider: labelFor(provider) }))}</button>`);
-    })
-        .join("");
+    };
+    const alert = errorText
+        ? `<p id="account-merge-method-error" class="dialog-desc" role="alert">${escapeHtml(errorText)}</p>`
+        : "";
+    const hintKey = guide ? "profile.mergeCandidateProveHint" : "profile.mergeAccountHint";
+    let listHtml = "";
+    if (guide) {
+        if (guide.unavailable) {
+            listHtml += `<p class="merge-method-unavailable">${escapeHtml(t("profile.mergePromptMethodsDisabled"))}</p>`;
+        }
+        else {
+            const recommended = (guide.recommended || []).map((opt) => button(opt, true)).join("");
+            listHtml +=
+                `<div class="merge-method-recommended">` +
+                    `<p class="merge-method-kicker">${escapeHtml(t("profile.mergePromptMethodsLabel"))}</p>` +
+                    `<div class="merge-method-list">${recommended}</div></div>`;
+        }
+        const others = guide.others || [];
+        if (others.length) {
+            const open = guide.othersOpen ? " open" : "";
+            listHtml +=
+                `<details class="merge-method-others"${open}>` +
+                    `<summary>${escapeHtml(t("profile.mergePromptOtherMethods"))}</summary>` +
+                    `<div class="merge-method-list">${others.map((opt) => button(opt, false)).join("")}</div></details>`;
+        }
+    }
+    else {
+        listHtml = `<div class="merge-method-list">${(options || []).map((opt) => button(opt, false)).join("")}</div>`;
+    }
     return (`<div class="dialog-content">` +
         `<h3>${escapeHtml(t("profile.mergeChooseMethod"))}</h3>` +
-        `<p class="dialog-desc">${escapeHtml(t("profile.mergeAccountHint"))}</p>` +
-        `<div class="merge-method-list">${buttons}</div>` +
+        `<p class="dialog-desc">${escapeHtml(t(hintKey))}</p>` +
+        alert +
+        listHtml +
         `</div>` +
         `<div class="dialog-actions">` +
         `<button type="button" class="btn btn-secondary" id="account-merge-method-cancel">${escapeHtml(t("common.cancel"))}</button>` +
         `</div>`);
 }
+function formatMergeCandidateWhen(iso, nowMs, lang, t) {
+    if (!iso)
+        return "";
+    const then = new Date(iso).getTime();
+    if (Number.isNaN(then))
+        return "";
+    const dayMs = 86400000;
+    let days = Math.floor((nowMs - then) / dayMs);
+    if (days < 0)
+        days = 0;
+    if (days >= 365) {
+        const locale = lang || "en";
+        try {
+            return new Intl.DateTimeFormat(locale, { year: "numeric", month: "long" }).format(new Date(then));
+        }
+        catch {
+            return new Intl.DateTimeFormat("en", { year: "numeric", month: "long" }).format(new Date(then));
+        }
+    }
+    if (days >= 30) {
+        const months = Math.max(1, Math.floor(days / 30));
+        return months === 1 ? t("profile.mergePromptMonthAgo") : t("profile.mergePromptMonthsAgo", { count: String(months) });
+    }
+    if (days === 0)
+        return t("profile.mergePromptToday");
+    if (days === 1)
+        return t("profile.mergePromptDayAgo");
+    return t("profile.mergePromptDaysAgo", { count: String(days) });
+}
+function partitionMergeMethods(candidate, enabled, hiddenProviders) {
+    const enabledList = enabled || [];
+    const hidden = hiddenProviders || [];
+    const methods = (candidate && candidate.methods) || [];
+    const emailLogin = !!(candidate && candidate.emailLogin === true);
+    const email = (candidate && typeof candidate.email === "string" && candidate.email) || "";
+    const recommended = [];
+    const used = {};
+    const isHidden = (name) => hidden.indexOf(name) !== -1;
+    const findEnabled = (method, provider) => {
+        for (let i = 0; i < enabledList.length; i++) {
+            const opt = enabledList[i];
+            if (!opt || opt.method !== method)
+                continue;
+            if (method === "oauth" && opt.provider !== provider)
+                continue;
+            return opt;
+        }
+        return null;
+    };
+    for (let m = 0; m < methods.length; m++) {
+        const name = methods[m];
+        if (!name || isHidden(name) || name === "email")
+            continue;
+        const method = name === "wallet" || name === "passkey" ? name : "oauth";
+        const provider = method === "oauth" ? name : "";
+        const hit = findEnabled(method, provider);
+        if (!hit)
+            continue;
+        const key = `${method}:${hit.provider || ""}`;
+        if (used[key])
+            continue;
+        used[key] = true;
+        if (method === "oauth")
+            recommended.push({ method: "oauth", provider: hit.provider || provider });
+        else if (method === "wallet")
+            recommended.push({ method: "wallet" });
+        else
+            recommended.push({ method: "passkey" });
+    }
+    if (emailLogin && email && findEnabled("email", "")) {
+        recommended.push({ method: "email", email });
+        used["email:"] = true;
+    }
+    const others = [];
+    for (let e = 0; e < enabledList.length; e++) {
+        const opt = enabledList[e];
+        if (!opt || opt.method === "email")
+            continue;
+        const key = `${opt.method}:${opt.provider || ""}`;
+        if (used[key])
+            continue;
+        others.push(opt.method === "oauth" ? { method: "oauth", provider: opt.provider || "" } : { method: opt.method });
+    }
+    const unavailable = recommended.length === 0;
+    return { recommended, others, othersOpen: unavailable, unavailable };
+}
+function renderMergePromptHtml(email, candidates, t, escapeHtml, iconFor, labelFor, formatWhen, hiddenProviders) {
+    const hidden = hiddenProviders || [];
+    const rows = candidates || [];
+    const many = rows.length > 1;
+    const title = many
+        ? t("profile.mergePromptTitleMany", { email, count: String(rows.length) })
+        : t("profile.mergePromptTitleOne", { email });
+    const body = many ? t("profile.mergePromptBodyMany") : t("profile.mergePromptBodyOne");
+    let html = `<div class="ca-merge-prompt-title">${escapeHtml(title)}</div>` +
+        `<p class="ca-merge-prompt-body">${escapeHtml(body)}</p>`;
+    for (let i = 0; i < rows.length; i++) {
+        const row = rows[i];
+        if (!row)
+            continue;
+        const methods = row.methods || [];
+        const icons = [];
+        const names = [];
+        for (let m = 0; m < methods.length; m++) {
+            const name = methods[m];
+            if (!name || hidden.indexOf(name) !== -1)
+                continue;
+            icons.push(`<span class="ca-merge-prompt-icon">${iconFor(name)}</span>`);
+            names.push(escapeHtml(labelFor(name)));
+        }
+        const bits = [];
+        if (names.length) {
+            bits.push(`<span class="ca-merge-prompt-methods">${icons.join("")}` +
+                `<span class="ca-merge-prompt-method-names">${names.join(escapeHtml(t("profile.mergePromptMethodSep")))}</span></span>`);
+        }
+        const created = row.createdAt ? formatWhen(row.createdAt) : "";
+        if (created)
+            bits.push(escapeHtml(t("profile.mergePromptCreated", { when: created })));
+        const last = row.lastLoginAt ? formatWhen(row.lastLoginAt) : "";
+        if (last)
+            bits.push(escapeHtml(t("profile.mergePromptLastLogin", { when: last })));
+        const ref = escapeHtml(row.ref || "");
+        html +=
+            `<div class="ca-merge-prompt-row">` +
+                `<div class="ca-merge-prompt-meta">${bits.join('<span class="ca-merge-prompt-dot"> · </span>')}</div>` +
+                `<div class="ca-merge-prompt-actions">` +
+                `<button type="button" class="btn" data-merge-ref="${ref}" onclick="startMergeCandidate(this)">${escapeHtml(t("profile.mergePromptMergeThis"))}</button>` +
+                `<button type="button" class="btn btn-secondary" data-merge-ref="${ref}" onclick="hideMergeCandidate(this)">${escapeHtml(t("profile.mergePromptNotMine"))}</button>` +
+                `</div></div>`;
+    }
+    html +=
+        `<div class="ca-merge-prompt-later">` +
+            `<button type="button" class="btn btn-secondary" id="merge-candidate-prompt-later" onclick="dismissMergePromptLater()">` +
+            `${escapeHtml(t("profile.mergePromptLater"))}</button></div>`;
+    return html;
+}
 
 async function loadConnectedAccounts() {
   var card = document.getElementById("connected-accounts-card");
@@ -979,7 +1377,7 @@ function renderConnectedAccounts() {
   html += '<div class="ca-section">';
   html += '<div class="ca-section-label">' + __t("profile.mergeAccount") + '</div>';
   html += '<p class="ca-merge-hint" style="margin:0 0 8px;color:var(--text-secondary);font-size:13px;">' + __t("profile.mergeAccountHint") + '</p>';
-  html += '<button class="btn btn-secondary" onclick="startAccountMerge()">' + __t("profile.mergeChooseMethod") + '</button>';
+  html += '<button class="btn btn-secondary" onclick="startAccountMerge()">' + __t("profile.mergeStart") + '</button>';
   html += '</div>';
 
   list.innerHTML = html;
@@ -1310,17 +1708,29 @@ function cleanupAccountMergeOAuth() {
   if (__accountMergeOAuthCleanup) __accountMergeOAuthCleanup();
 }
 
+function mergeChallengeLooksExpired(error) {
+  return error === "Invalid or expired merge challenge"
+    || error === "合并验证无效或已过期"
+    || error === "合併驗證無效或已過期"
+    || error === "統合チャレンジが無効か、期限切れです";
+}
+
+function emailCodeAlreadySent(error) {
+  return error === "Code already sent, please wait"
+    || error === "验证码已发送，请稍候"
+    || error === "驗證碼已寄出，請稍候"
+    || error === "確認コードは送信済みです。しばらくお待ちください";
+}
+
 async function proveAccountMergeWithWallet(mergeChallenge) {
   var tokenData;
   try {
-    tokenData = await api("GET", "/../did/merge-proof/token");
+    tokenData = await api("GET", "/../did/merge-proof/token", undefined, { silent: true });
   } catch (e) {
-    showToast(__t("profile.mergeFailed"), "error");
-    return null;
+    return { ok: false, error: __t("profile.mergeFailed") };
   }
   if (!tokenData || !tokenData.token) {
-    showToast(__t("profile.mergeFailed"), "error");
-    return null;
+    return { ok: false, error: (tokenData && tokenData.error) || __t("profile.mergeFailed") };
   }
 
   var token = tokenData.token;
@@ -1396,17 +1806,16 @@ async function proveAccountMergeWithWallet(mergeChallenge) {
           var proved = await api("POST", "/../did/connect/complete", {
             token: token,
             mergeChallenge: mergeChallenge,
-          });
+          }, { silent: true });
           if (!proved || !proved.mergeIntent) {
-            statusEl.textContent = (proved && proved.error) || __t("profile.mergeFailed");
-            polling = false;
+            finish(proved || { ok: false, error: __t("profile.mergeFailed") });
             return;
           }
           finish(proved);
         } else if (status.status === "error") {
           clearInterval(pollTimer);
           pollTimer = null;
-          statusEl.textContent = status.error || __t("profile.mergeFailed");
+          finish({ ok: false, error: status.error || __t("profile.mergeFailed") });
         }
       } catch (e) { /* ignore poll errors */ }
       polling = false;
@@ -1416,14 +1825,12 @@ async function proveAccountMergeWithWallet(mergeChallenge) {
 
 async function proveAccountMergeWithPasskey(mergeChallenge) {
   if (typeof PublicKeyCredential === "undefined" || !navigator.credentials || !navigator.credentials.get) {
-    showToast(__t("profile.mergePasskeyUnavailable"), "error");
-    return null;
+    return { ok: false, error: __t("profile.mergePasskeyUnavailable") };
   }
-  var opts = await api("GET", "/../passkey/auth");
+  var opts = await api("GET", "/../passkey/auth", undefined, { silent: true });
   var publicKey = opts.authentication || opts;
-  if (!opts.challengeId || !publicKey || !publicKey.challenge) {
-    showToast((opts && opts.error) || __t("profile.mergeFailed"), "error");
-    return null;
+  if (!opts || opts.ok === false || !opts.challengeId || !publicKey || !publicKey.challenge) {
+    return { ok: false, error: (opts && opts.error) || __t("profile.mergeFailed") };
   }
   publicKey.challenge = base64urlToBuffer(publicKey.challenge);
   if (publicKey.allowCredentials) {
@@ -1436,7 +1843,7 @@ async function proveAccountMergeWithPasskey(mergeChallenge) {
     credential = await navigator.credentials.get({ publicKey: publicKey });
   } catch (e) {
     if (!e || e.name !== "NotAllowedError") {
-      showToast((e && e.message) || __t("profile.mergeFailed"), "error");
+      return { ok: false, error: (e && e.message) || __t("profile.mergeFailed") };
     }
     return null;
   }
@@ -1456,7 +1863,7 @@ async function proveAccountMergeWithPasskey(mergeChallenge) {
       },
     },
     mergeChallenge: mergeChallenge,
-  });
+  }, { silent: true });
 }
 
 function proveAccountMergeWithOAuth(provider, mergeChallenge) {
@@ -1466,15 +1873,23 @@ function proveAccountMergeWithOAuth(provider, mergeChallenge) {
       return;
     }
     cleanupAccountMergeOAuth();
+    var mergeResultPrefix = "connect.mergeOAuthResult.";
+    try {
+      var staleKeys = [];
+      for (var s = 0; s < localStorage.length; s++) {
+        var staleKey = localStorage.key(s);
+        if (staleKey && staleKey.indexOf(mergeResultPrefix) === 0) staleKeys.push(staleKey);
+      }
+      for (var t = 0; t < staleKeys.length; t++) localStorage.removeItem(staleKeys[t]);
+    } catch (e0) {}
     var returnUrl = encodeURIComponent(window.location.href);
-    var url = window.__BASE_PATH + "/../oauth/" + encodeURIComponent(provider) + "/login?returnUrl=" + returnUrl;
+    var url = window.__BASE_PATH + "/../oauth/" + encodeURIComponent(provider) + "/login?returnUrl=" + returnUrl + "&mergeChallenge=" + encodeURIComponent(mergeChallenge);
     var redirectUri = location.origin + "/.well-known/service/oauth/callback/" + encodeURIComponent(provider);
     var w = 500, h = 600;
     var left = (screen.width - w) / 2, top = (screen.height - h) / 2;
     var popup = window.open(url, "oauth_merge", "width=" + w + ",height=" + h + ",left=" + left + ",top=" + top);
     if (!popup) {
-      showToast(__t("common.popupBlocked"), "error");
-      resolve(null);
+      resolve({ ok: false, error: __t("common.popupBlocked") });
       return;
     }
     var settled = false;
@@ -1485,6 +1900,7 @@ function proveAccountMergeWithOAuth(provider, mergeChallenge) {
     }, 5 * 60 * 1000);
     function cleanup() {
       window.removeEventListener("message", onMessage);
+      window.removeEventListener("storage", onStorage);
       clearTimeout(abandonTimer);
       if (__accountMergeOAuthCleanup === cancel) __accountMergeOAuthCleanup = null;
     }
@@ -1494,6 +1910,37 @@ function proveAccountMergeWithOAuth(provider, mergeChallenge) {
       cleanup();
       resolve(value);
     }
+    function parseMergeOAuthResult(raw) {
+      if (!raw) return null;
+      try {
+        var parsed = JSON.parse(raw);
+        if (!parsed || typeof parsed !== "object") return { ok: false, error: __t("profile.mergeFailed") };
+        return parsed;
+      } catch (e1) {
+        return { ok: false, error: __t("profile.mergeFailed") };
+      }
+    }
+    function readMergeOAuthResultOnce() {
+      try {
+        for (var i = 0; i < localStorage.length; i++) {
+          var key = localStorage.key(i);
+          if (!key || key.indexOf(mergeResultPrefix) !== 0) continue;
+          var raw = localStorage.getItem(key);
+          try { localStorage.removeItem(key); } catch (e2) {}
+          return parseMergeOAuthResult(raw);
+        }
+      } catch (e3) {}
+      return null;
+    }
+    function onStorage(event) {
+      if (settled || !event || !event.key || event.key.indexOf(mergeResultPrefix) !== 0) return;
+      var raw = event.newValue;
+      try { localStorage.removeItem(event.key); } catch (e4) {}
+      var payload = parseMergeOAuthResult(raw);
+      if (!payload) return;
+      try { popup.close(); } catch (e5) {}
+      finish(payload);
+    }
     async function onMessage(event) {
       if (event.origin !== location.origin) return;
       if (!event.data || event.data.type !== "authorization_response") return;
@@ -1511,23 +1958,28 @@ function proveAccountMergeWithOAuth(provider, mergeChallenge) {
           code: resp.code,
           redirectUri: redirectUri,
           mergeChallenge: mergeChallenge,
-        });
+        }, { silent: true });
         finish(proved);
       } catch (e) {
-        showToast((e && e.message) || __t("profile.mergeFailed"), "error");
-        finish(null);
+        finish({ ok: false, error: (e && e.message) || __t("profile.mergeFailed") });
       }
     }
     window.addEventListener("message", onMessage);
+    window.addEventListener("storage", onStorage);
     function cancel() {
       try { popup.close(); } catch (e) {}
       finish(null);
     }
     __accountMergeOAuthCleanup = cancel;
+    var existing = readMergeOAuthResultOnce();
+    if (existing) {
+      try { popup.close(); } catch (e6) {}
+      finish(existing);
+    }
   });
 }
 
-async function proveAccountMergeWithEmail(mergeChallenge) {
+async function proveAccountMergeWithEmail(mergeChallenge, prefillEmail) {
   return new Promise(function(resolve) {
     var d = document.getElementById("email-merge-dialog");
     if (!d) {
@@ -1544,6 +1996,7 @@ async function proveAccountMergeWithEmail(mergeChallenge) {
       + '</div></div>'
       + '<div class="dialog-actions">'
       + '<button type="button" class="btn btn-secondary" id="email-merge-cancel">' + __t("common.cancel") + '</button>'
+      + '<button type="button" class="btn btn-secondary" id="email-merge-switch">' + __t("profile.mergeEmailSwitchMethod") + '</button>'
       + '<button type="button" class="btn btn-secondary" id="email-merge-send">' + __t("profile.mergeEmailSendCode") + '</button>'
       + '<button type="button" class="btn" id="email-merge-ok" disabled>' + __t("common.confirm") + '</button>'
       + '</div>';
@@ -1555,31 +2008,86 @@ async function proveAccountMergeWithEmail(mergeChallenge) {
     var okBtn = document.getElementById("email-merge-ok");
     var verifyId = null;
     var settled = false;
+    var activeChallenge = mergeChallenge;
+    var sentAt = 0;
+    var cooldownTimer = null;
+    var lastError = "";
     function finish(value) {
       if (settled) return;
       settled = true;
+      if (cooldownTimer) clearInterval(cooldownTimer);
+      cooldownTimer = null;
       if (d.open) d.close();
       resolve(value);
     }
+    function secondsLeft() {
+      if (!sentAt) return 0;
+      var left = 60000 - (Date.now() - sentAt);
+      if (left <= 0) return 0;
+      return Math.ceil(left / 1000);
+    }
+    function paintSendButton() {
+      var left = secondsLeft();
+      if (left > 0) {
+        sendBtn.disabled = true;
+        sendBtn.textContent = __t("profile.mergeEmailResendWait", { seconds: String(left) });
+        return;
+      }
+      sendBtn.disabled = false;
+      sendBtn.textContent = sentAt ? __t("profile.mergeEmailResend") : __t("profile.mergeEmailSendCode");
+    }
+    function startCooldown() {
+      if (cooldownTimer) clearInterval(cooldownTimer);
+      paintSendButton();
+      cooldownTimer = setInterval(function() {
+        paintSendButton();
+        if (secondsLeft() <= 0 && cooldownTimer) {
+          clearInterval(cooldownTimer);
+          cooldownTimer = null;
+        }
+      }, 1000);
+    }
+    function markCodeConsumed(message) {
+      codeEl.value = "";
+      codeEl.disabled = true;
+      okBtn.disabled = true;
+      lastError = message || "";
+      statusEl.textContent = lastError
+        ? lastError + " " + __t("profile.mergeEmailRequestNewCode")
+        : __t("profile.mergeEmailRequestNewCode");
+      if (secondsLeft() > 0) startCooldown();
+      else paintSendButton();
+    }
     document.getElementById("email-merge-cancel").onclick = function() { finish(null); };
+    document.getElementById("email-merge-switch").onclick = function() {
+      finish({ switchMethod: true, error: lastError, challenge: activeChallenge });
+    };
     d.onclose = function() { finish(null); };
     sendBtn.onclick = async function() {
       var email = (emailEl.value || "").trim();
       if (!email || email.indexOf("@") === -1) return;
       sendBtn.disabled = true;
       statusEl.textContent = __t("profile.emailSending");
-      var sent = await api("POST", "/../email/sendCode", { email: email });
+      var sent = await api("POST", "/../email/sendCode", { email: email }, { silent: true });
       if (!sent || sent.id == null) {
-        statusEl.textContent = (sent && sent.error) || __t("profile.emailSendFailed");
-        sendBtn.disabled = false;
+        var sendError = (sent && sent.error) || __t("profile.emailSendFailed");
+        statusEl.textContent = sendError;
+        if (emailCodeAlreadySent(sendError)) {
+          if (!sentAt) sentAt = Date.now();
+          startCooldown();
+        } else {
+          sendBtn.disabled = false;
+        }
         return;
       }
       verifyId = sent.id;
+      sentAt = Date.now();
+      codeEl.value = "";
       codeEl.disabled = false;
       okBtn.disabled = false;
       codeEl.focus();
       statusEl.textContent = __t("profile.emailCodeSent");
-      sendBtn.disabled = false;
+      startCooldown();
     };
     okBtn.onclick = async function() {
       var code = (codeEl.value || "").trim();
@@ -1588,39 +2096,58 @@ async function proveAccountMergeWithEmail(mergeChallenge) {
       var proved = await api("POST", "/../email/login", {
         code: code,
         id: verifyId,
-        mergeChallenge: mergeChallenge,
-      });
-      if (!proved || !proved.mergeIntent) {
-        statusEl.textContent = (proved && proved.error) || __t("profile.mergeFailed");
-        okBtn.disabled = false;
+        mergeChallenge: activeChallenge,
+      }, { silent: true });
+      if (proved && proved.mergeIntent) {
+        finish(proved);
         return;
       }
-      finish(proved);
+      var err = (proved && proved.error) || __t("profile.mergeFailed");
+      if (mergeChallengeLooksExpired(err)) {
+        var restarted = await api("POST", "/../account/merge/start", {}, { silent: true });
+        if (restarted && restarted.challenge) activeChallenge = restarted.challenge;
+      }
+      markCodeConsumed(err);
     };
+    if (typeof prefillEmail === "string" && prefillEmail) emailEl.value = prefillEmail;
     d.showModal();
     emailEl.focus();
   });
 }
 
-async function finalizeAccountMerge(proved) {
+async function finalizeAccountMerge(proved, candidate) {
   if (!proved || !proved.mergeIntent) {
     showToast((proved && proved.error) || __t("profile.mergeFailed"), "error");
     return false;
   }
   var plan = await api("POST", "/../account/merge/dry-run", { mergeIntent: proved.mergeIntent });
-  var ok = await confirmMergePlan(plan);
-  if (!ok) {
+  if (!plan || plan.ok === false || !plan.accounts) return false;
+  // Server omits keep → session. The first paint must match recommendedKeep.
+  if ((plan.recommendedKeep === "session" || plan.recommendedKeep === "proved") && plan.keep !== plan.recommendedKeep) {
+    var next = plan.recommendedKeep;
+    var aligned = await api("POST", "/../account/merge/dry-run", { mergeIntent: proved.mergeIntent, keep: next }, { silent: true });
+    if (aligned && aligned.ok !== false && aligned.accounts) plan = aligned;
+    else showToast((aligned && aligned.error) || __t("profile.mergeFailed"), "error");
+  }
+  var candidateEmail = candidate && typeof candidate.email === "string" ? candidate.email : "";
+  plan.__hasCandidate = !!(candidate && typeof candidate === "object");
+  var confirmed = await confirmMergePlan(plan, proved.mergeIntent, candidateEmail);
+  if (!confirmed) {
     showToast(__t("profile.mergeCancelled"), "error");
     return false;
   }
-  var committed = await api("POST", "/../account/merge/commit", { mergeIntent: proved.mergeIntent });
-  if (committed && committed.ok) {
-    showToast(__t("profile.mergeSuccess"), "success");
-    loadConnectedAccounts();
-    return true;
-  }
-  showToast((committed && committed.error) || __t("profile.mergeFailed"), "error");
-  return false;
+  return true;
+}
+
+function mergeCandidateWhenLabel(iso) {
+  var lang = (document.documentElement && document.documentElement.lang) || "en";
+  return formatMergeCandidateWhen(iso, Date.now(), lang, __t);
+}
+
+function mergePromptIcon(provider) {
+  if (provider && __providerIcons[provider]) return getProviderIconSvg(provider);
+  var ch = provider ? provider.charAt(0).toUpperCase() : "?";
+  return '<span class="ca-merge-prompt-fallback">' + escapeHtml(ch) + '</span>';
 }
 
 function hideMergePrompt() {
@@ -1631,10 +2158,48 @@ function hideMergePrompt() {
   el.innerHTML = "";
 }
 
-function dismissMergePrompt() {
+function paintMergePrompt(rows, hiddenProviders) {
+  var el = document.getElementById("merge-candidate-prompt");
+  if (!el) return;
+  if (!rows || !rows.length) {
+    hideMergePrompt();
+    return;
+  }
+  el.innerHTML = renderMergePromptHtml(rows[0].email || "", rows, __t, escapeHtml, mergePromptIcon, getProviderLabel, mergeCandidateWhenLabel, hiddenProviders || __hiddenProviders);
+  el.hidden = false;
+  el.style.display = "";
+}
+
+function startMergeCandidate(btn) {
+  var ref = btn && btn.getAttribute ? btn.getAttribute("data-merge-ref") : "";
+  var list = __mergePromptCandidates || [];
+  for (var i = 0; i < list.length; i++) {
+    if (list[i].ref === ref) {
+      startAccountMerge(list[i]);
+      return;
+    }
+  }
+}
+
+function hideMergeCandidate(btn) {
+  var ref = btn && btn.getAttribute ? btn.getAttribute("data-merge-ref") : "";
+  var did = __mergePromptDid || "";
+  if (did && ref) {
+    try { localStorage["connect.mergePrompt.notMine." + did + "." + ref] = "1"; } catch (e) {}
+  }
+  var next = [];
+  var list = __mergePromptCandidates || [];
+  for (var i = 0; i < list.length; i++) {
+    if (list[i].ref !== ref) next.push(list[i]);
+  }
+  __mergePromptCandidates = next;
+  paintMergePrompt(next, __hiddenProviders);
+}
+
+function dismissMergePromptLater() {
   var did = __mergePromptDid || "";
   if (did) {
-    try { localStorage["connect.mergePrompt.dismissed." + did] = "1"; } catch (e) {}
+    try { sessionStorage["connect.mergePrompt.later." + did] = "1"; } catch (e) {}
   }
   hideMergePrompt();
 }
@@ -1642,74 +2207,117 @@ function dismissMergePrompt() {
 async function maybeShowMergePrompt(did) {
   hideMergePrompt();
   __mergePromptDid = did || "";
+  __mergePromptCandidates = [];
   if (!did) return;
   try {
-    if (localStorage["connect.mergePrompt.dismissed." + did] === "1") return;
+    if (sessionStorage["connect.mergePrompt.later." + did] === "1") return;
   } catch (e) {}
   var data = await api("GET", "/../account/merge/candidate", undefined, { silent: true });
-  if (!data || data.mergeCandidate !== true) return;
+  if (!data || data.mergeCandidate !== true || !data.candidates || !data.candidates.length) return;
   try {
-    if (localStorage["connect.mergePrompt.dismissed." + did] === "1") return;
-  } catch (e) {}
+    if (sessionStorage["connect.mergePrompt.later." + did] === "1") return;
+  } catch (e2) {}
+  var email = typeof data.email === "string" ? data.email : "";
+  if (!email) return;
+  var visible = [];
+  for (var i = 0; i < data.candidates.length && visible.length < 5; i++) {
+    var c = data.candidates[i];
+    if (!c || typeof c.ref !== "string" || !c.ref) continue;
+    try {
+      if (localStorage["connect.mergePrompt.notMine." + did + "." + c.ref] === "1") continue;
+    } catch (e3) {}
+    visible.push({
+      ref: c.ref,
+      methods: Array.isArray(c.methods) ? c.methods : [],
+      emailLogin: c.emailLogin === true,
+      email: email,
+      createdAt: typeof c.createdAt === "string" ? c.createdAt : "",
+      lastLoginAt: typeof c.lastLoginAt === "string" ? c.lastLoginAt : "",
+    });
+  }
+  if (!visible.length) return;
   var el = document.getElementById("merge-candidate-prompt");
   if (!el) return;
-  el.innerHTML = '<div class="ca-merge-prompt-title">' + escapeHtml(__t("profile.mergePromptTitle")) + '</div>'
-    + '<p class="ca-merge-prompt-body">' + escapeHtml(__t("profile.mergePromptBody")) + '</p>'
-    + '<div class="ca-merge-prompt-actions">'
-    + '<button type="button" class="btn" id="merge-candidate-prompt-action" onclick="startAccountMerge()">' + escapeHtml(__t("profile.mergePromptAction")) + '</button>'
-    + '<button type="button" class="btn btn-secondary" id="merge-candidate-prompt-dismiss" onclick="dismissMergePrompt()">' + escapeHtml(__t("profile.mergePromptDismiss")) + '</button>'
-    + '</div>';
-  el.hidden = false;
-  el.style.display = "";
+  __mergePromptCandidates = visible;
+  paintMergePrompt(visible, __hiddenProviders);
 }
 
-async function startAccountMerge() {
+async function startAccountMerge(candidate) {
   cleanupAccountMergeOAuth();
-  var start;
-  try {
-    start = await api("POST", "/../account/merge/start", {});
-  } catch (e) {
-    showToast((e && e.message) || __t("profile.mergeFailed"), "error");
-    return;
+  var guided = null;
+  if (candidate && typeof candidate.ref === "string" && candidate.ref) {
+    guided = partitionMergeMethods(candidate, listMergeMethods(), __hiddenProviders);
   }
-  if (!start || !start.challenge) {
-    showToast(__t("profile.mergeFailed"), "error");
-    return;
-  }
-
   var d = document.getElementById("account-merge-method-dialog");
   if (!d) {
     d = document.createElement("dialog");
     d.id = "account-merge-method-dialog";
     document.body.appendChild(d);
   }
-  d.innerHTML = renderMergeMethodPickerHtml(listMergeMethods(), __t, escapeHtml, getProviderIconSvg, getProviderLabel);
-  document.getElementById("account-merge-method-cancel").onclick = function() { d.close(); };
-  var buttons = d.querySelectorAll("[data-merge-method]");
-  for (var b = 0; b < buttons.length; b++) {
-    buttons[b].onclick = async function(event) {
-      var button = event.currentTarget;
-      var method = button.getAttribute("data-merge-method");
-      var selectedProvider = button.getAttribute("data-merge-provider");
-      d.close();
-      try {
-        var proved = null;
-        if (method === "wallet") proved = await proveAccountMergeWithWallet(start.challenge);
-        else if (method === "passkey") proved = await proveAccountMergeWithPasskey(start.challenge);
-        else if (method === "oauth") proved = await proveAccountMergeWithOAuth(selectedProvider, start.challenge);
-        else if (method === "email") proved = await proveAccountMergeWithEmail(start.challenge);
-        if (proved) await finalizeAccountMerge(proved);
-      } catch (e) {
-        if (!e || e.name !== "NotAllowedError") {
-          showToast((e && e.message) || __t("profile.mergeFailed"), "error");
+  var challenge = null;
+  function paint(errorText) {
+    d.innerHTML = renderMergeMethodPickerHtml(guided ? [] : listMergeMethods(), __t, escapeHtml, getProviderIconSvg, getProviderLabel, errorText || "", guided);
+    var cancel = document.getElementById("account-merge-method-cancel");
+    if (cancel) cancel.onclick = function() { d.close(); };
+    var buttons = d.querySelectorAll("[data-merge-method]");
+    for (var b = 0; b < buttons.length; b++) {
+      buttons[b].onclick = onPick;
+    }
+  }
+  paint("");
+  d.showModal();
+
+  async function ensureChallenge(force) {
+    if (challenge && !force) return challenge;
+    var start = await api("POST", "/../account/merge/start", {}, { silent: true });
+    if (!start || !start.challenge) {
+      paint((start && start.error) || __t("profile.mergeFailed"));
+      return null;
+    }
+    challenge = start.challenge;
+    return challenge;
+  }
+
+  async function onPick(event) {
+    var button = event.currentTarget;
+    var method = button.getAttribute("data-merge-method");
+    var selectedProvider = button.getAttribute("data-merge-provider");
+    paint("");
+    var active = await ensureChallenge(false);
+    if (!active) return;
+    try {
+      var proved = null;
+      if (method === "wallet") proved = await proveAccountMergeWithWallet(active);
+      else if (method === "passkey") proved = await proveAccountMergeWithPasskey(active);
+      else if (method === "oauth") proved = await proveAccountMergeWithOAuth(selectedProvider, active);
+      else if (method === "email") proved = await proveAccountMergeWithEmail(active, button.getAttribute("data-merge-email") || "");
+      if (proved && proved.switchMethod) {
+        if (typeof proved.challenge === "string" && proved.challenge) challenge = proved.challenge;
+        paint(proved.error || "");
+        return;
+      }
+      if (proved && proved.mergeIntent) {
+        if (d.open) d.close();
+        await finalizeAccountMerge(proved, candidate);
+        return;
+      }
+      if (proved && proved.error) {
+        if (mergeChallengeLooksExpired(proved.error)) {
+          challenge = null;
+          await ensureChallenge(true);
         }
+        paint(proved.error);
+        return;
       }
-    };
+    } catch (e) {
+      if (!e || e.name !== "NotAllowedError") {
+        paint((e && e.message) || __t("profile.mergeFailed"));
+      }
+    }
   }
-  d.showModal();
 }
 
-function confirmMergePlan(plan) {
+function confirmMergePlan(plan, mergeIntent, candidateEmail) {
   return new Promise(function(resolve) {
     var d = document.getElementById("merge-confirm-dialog");
     if (!d) {
@@ -1718,32 +2326,193 @@ function confirmMergePlan(plan) {
       d.className = "merge-confirm-dialog";
       document.body.appendChild(d);
     }
-    d.innerHTML = '<div class="dialog-content">'
-      + '<h3>' + escapeHtml(__t("profile.mergeConfirmTitle")) + '</h3>'
-      + renderMergeConfirmBodyHtml(plan, __t, escapeHtml, getProviderLabel)
-      + '</div>'
-      + '<div class="dialog-actions">'
-      + '<button class="btn btn-secondary" id="merge-confirm-cancel">' + escapeHtml(__t("common.cancel")) + '</button>'
-      + '<button class="btn btn-danger" id="merge-confirm-ok">' + escapeHtml(__t("common.confirm")) + '</button>'
-      + '</div>';
+    var current = plan || {};
+    var selectedKeep = current.keep === "proved" || current.keep === "session" ? current.keep : "session";
+    // accounts.session.did stays the signed-in DID. intoDid follows keep.
+    var sessionAccount = current.accounts && current.accounts.session;
+    var sessionDid = sessionAccount && typeof sessionAccount.did === "string" ? sessionAccount.did : "";
+    var hasCandidate = current.__hasCandidate === true;
+    var loading = false;
+    var generation = 0;
+    var phase = "preview";
+    var settled = false;
+    var resultPayload = null;
 
-    var okBtn = document.getElementById("merge-confirm-ok");
-    var cancelBtn = document.getElementById("merge-confirm-cancel");
-    if (plan && plan.tooLarge) okBtn.disabled = true;
+    function keptDid() {
+      var side = selectedKeep === "proved" ? current.accounts && current.accounts.proved : current.accounts && current.accounts.session;
+      if (side && typeof side.did === "string" && side.did) return side.did;
+      return typeof current.intoDid === "string" ? current.intoDid : "";
+    }
+
+    function submitLabel() {
+      if (selectedKeep === "session") return __t("profile.mergeConfirmSubmitKeep");
+      return __t("profile.mergeConfirmSubmitSwitch", { did: truncateDid(keptDid()) });
+    }
+
+    function paint() {
+      d.innerHTML = '<div class="dialog-content">'
+        + '<h3 id="merge-confirm-title">' + escapeHtml(__t("profile.mergeConfirmTitle")) + '</h3>'
+        + renderMergeConfirmBodyHtml(current, __t, escapeHtml, getProviderLabel, {
+          selectedKeep: selectedKeep,
+          hasCandidate: hasCandidate,
+          candidateEmail: candidateEmail || "",
+          shortDid: truncateDid,
+          loading: loading
+        })
+        + '</div>'
+        + '<div class="dialog-actions">'
+        + '<button type="button" class="btn btn-secondary" id="merge-confirm-cancel">' + escapeHtml(__t("common.cancel")) + '</button>'
+        + '<button type="button" class="btn btn-danger" id="merge-confirm-ok">' + escapeHtml(submitLabel()) + '</button>'
+        + '</div>';
+      var okBtn = document.getElementById("merge-confirm-ok");
+      var cancelBtn = document.getElementById("merge-confirm-cancel");
+      if (loading || current.tooLarge || phase !== "preview") okBtn.disabled = true;
+      cancelBtn.onclick = function() { finish(false); };
+      okBtn.onclick = onOk;
+      var radios = d.querySelectorAll('input[name="merge-keep"]');
+      for (var i = 0; i < radios.length; i++) radios[i].onchange = onKeepChange;
+      var copies = d.querySelectorAll("[data-copy-did]");
+      for (var c = 0; c < copies.length; c++) copies[c].onclick = onCopy;
+    }
+
+    function onCopy(event) {
+      if (event) {
+        if (event.preventDefault) event.preventDefault();
+        if (event.stopPropagation) event.stopPropagation();
+      }
+      var btn = event && event.currentTarget;
+      var full = btn && btn.getAttribute ? btn.getAttribute("data-copy-did") : "";
+      if (full) copyToClipboard(full);
+    }
+
+    function onKeepChange(event) {
+      if (phase !== "preview") return;
+      var input = event && event.currentTarget;
+      var next = input && input.value;
+      if (next !== "session" && next !== "proved") return;
+      if (next === selectedKeep) return;
+      selectedKeep = next;
+      loading = true;
+      var token = ++generation;
+      var okBtn = document.getElementById("merge-confirm-ok");
+      if (okBtn) okBtn.disabled = true;
+      setTimeout(function() {
+        if (token !== generation || !loading || phase !== "preview") return;
+        paint();
+      }, 0);
+      refreshKeep(next, token);
+    }
+
+    async function refreshKeep(next, token) {
+      var refreshed = await api("POST", "/../account/merge/dry-run", { mergeIntent: mergeIntent, keep: next }, { silent: true });
+      if (token !== generation) return;
+      loading = false;
+      if (!refreshed || refreshed.ok === false || !refreshed.accounts) {
+        showToast((refreshed && refreshed.error) || __t("profile.mergeFailed"), "error");
+        selectedKeep = current.keep === "proved" || current.keep === "session" ? current.keep : "session";
+        paint();
+        return;
+      }
+      current = refreshed;
+      selectedKeep = current.keep === "proved" || current.keep === "session" ? current.keep : next;
+      paint();
+    }
+
+    async function onOk() {
+      if (phase !== "preview" || loading || current.tooLarge) return;
+      var okBtn = document.getElementById("merge-confirm-ok");
+      if (!okBtn || okBtn.disabled) return;
+      okBtn.disabled = true;
+      phase = "committing";
+      generation += 1;
+      var committed = await api("POST", "/../account/merge/commit", { mergeIntent: mergeIntent, keep: selectedKeep });
+      if (settled) return;
+      if (!committed || committed.ok === false || !committed.survivorDid) {
+        phase = "preview";
+        if (!d.open) {
+          try { d.showModal(); } catch (err) {}
+        }
+        paint();
+        return;
+      }
+      phase = "done";
+      resultPayload = committed;
+      showDone(committed);
+    }
+
+    function showDone(committed) {
+      var survivorDid = committed && typeof committed.survivorDid === "string" ? committed.survivorDid : "";
+      d.innerHTML = '<div class="dialog-content">'
+        + '<h3 id="merge-confirm-title">' + escapeHtml(__t("profile.mergeDoneTitle")) + '</h3>'
+        + renderMergeDoneBodyHtml({
+          survivorDid: survivorDid,
+          survivorMethods: current.survivorMethods
+        }, __t, escapeHtml, getProviderLabel, truncateDid)
+        + '</div>'
+        + '<div class="dialog-actions">'
+        + '<button type="button" class="btn" id="merge-confirm-finish">' + escapeHtml(__t("profile.mergeDoneFinish")) + '</button>'
+        + '</div>';
+      var finishBtn = document.getElementById("merge-confirm-finish");
+      finishBtn.onclick = function() { finishDone(survivorDid); };
+      if (!d.open) {
+        try { d.showModal(); } catch (err) {}
+      }
+    }
+
+    function finishDone(survivorDid) {
+      if (settled) return;
+      settled = true;
+      d.oncancel = null;
+      d.onclose = null;
+      if (d.open) d.close();
+      if (survivorDid && sessionDid && survivorDid !== sessionDid) location.reload();
+      else loadConnectedAccounts();
+      resolve(true);
+    }
 
-    var settled = false;
     function finish(result) {
       if (settled) return;
+      if (phase === "done") {
+        finishDone(resultPayload && resultPayload.survivorDid ? resultPayload.survivorDid : "");
+        return;
+      }
+      if (phase === "committing") {
+        if (!d.open) {
+          try { d.showModal(); } catch (err) {}
+        }
+        return;
+      }
       settled = true;
-      okBtn.onclick = null;
-      cancelBtn.onclick = null;
+      d.oncancel = null;
       d.onclose = null;
-      d.close();
+      if (d.open) d.close();
       resolve(result);
     }
-    okBtn.onclick = function() { if (okBtn.disabled) return; finish(true); };
-    cancelBtn.onclick = function() { finish(false); };
-    d.onclose = function() { finish(false); };
+
+    d.oncancel = function(event) {
+      if (event && event.preventDefault) event.preventDefault();
+      if (phase === "committing") return;
+      if (phase === "done") {
+        finishDone(resultPayload && resultPayload.survivorDid ? resultPayload.survivorDid : "");
+        return;
+      }
+      finish(false);
+    };
+    d.onclose = function() {
+      if (settled) return;
+      if (phase === "committing") {
+        if (!d.open) {
+          try { d.showModal(); } catch (err) {}
+        }
+        return;
+      }
+      if (phase === "done") {
+        finishDone(resultPayload && resultPayload.survivorDid ? resultPayload.survivorDid : "");
+        return;
+      }
+      finish(false);
+    };
+    paint();
     d.showModal();
   });
 }