@oxvo/ai-live-assist 7.4.37 → 7.4.49

package/cjs/AiLiveAssist.js

@@ -558,10 +558,72 @@ const versionAtLeast = (current, minimum) => {
 };
 const resolveAiGuideProtocolVersion = (bootstrap) => bootstrap.experienceMode === "voice_presence" ||
     (bootstrap.minimumProtocolVersion ?? 1) >= 2 ||
-    bootstrap.protocol.min >= 2
+    bootstrap.protocol.min >= 2 ||
+    bootstrap.protocol.max >= 2
     ? 2
     : 1;
 exports.resolveAiGuideProtocolVersion = resolveAiGuideProtocolVersion;
+const resumeProtocolIsSupported = (record, bootstrap) => {
+    const experienceMode = bootstrap.experienceMode ?? "standard";
+    if (record.experienceMode !== experienceMode)
+        return false;
+    if (record.protocolVersion === (0, exports.resolveAiGuideProtocolVersion)(bootstrap)) {
+        return true;
+    }
+    // Prefer V2 for fresh standard launches without abandoning a V1 session
+    // while the published configuration and runtime still admit V1.
+    return (record.experienceMode === "standard" &&
+        record.protocolVersion === 1 &&
+        (bootstrap.minimumProtocolVersion ?? 1) <= 1 &&
+        bootstrap.protocol.min <= 1 &&
+        bootstrap.protocol.max >= 1);
+};
+const protocolVersionIsAdmitted = (protocolVersion, bootstrap) => protocolVersion >= (bootstrap.minimumProtocolVersion ?? 1) &&
+    protocolVersion >= bootstrap.protocol.min &&
+    protocolVersion <= bootstrap.protocol.max;
+const pendingLaunchIsBound = (pendingLaunch) => (pendingLaunch.protocolVersion === 1 ||
+    pendingLaunch.protocolVersion === 2) &&
+    (pendingLaunch.experienceMode === "standard" ||
+        pendingLaunch.experienceMode === "voice_presence");
+const bindPendingLaunchIntent = (pendingLaunch, bootstrap) => {
+    const effectiveExperienceMode = bootstrap.experienceMode ?? "standard";
+    let protocolVersion = pendingLaunch.protocolVersion;
+    let experienceMode = pendingLaunch.experienceMode;
+    const hasProtocolVersion = protocolVersion === 1 || protocolVersion === 2;
+    const hasExperienceMode = experienceMode === "standard" || experienceMode === "voice_presence";
+    if (hasProtocolVersion !== hasExperienceMode)
+        return null;
+    if (!hasProtocolVersion && !hasExperienceMode) {
+        // A legacy record does not preserve its original protocol body. Current
+        // configuration can never prove the historical request, even when the
+        // present experience is voice presence, so its idempotency key must not be
+        // replayed with inferred authority.
+        return null;
+    }
+    if ((protocolVersion !== 1 && protocolVersion !== 2) ||
+        (experienceMode !== "standard" && experienceMode !== "voice_presence") ||
+        experienceMode !== effectiveExperienceMode ||
+        !protocolVersionIsAdmitted(protocolVersion, bootstrap) ||
+        (protocolVersion === 1 && experienceMode !== "standard") ||
+        (experienceMode === "voice_presence" &&
+            (protocolVersion !== 2 || pendingLaunch.mode !== "voice"))) {
+        return null;
+    }
+    return {
+        mode: pendingLaunch.mode,
+        scopes: [...pendingLaunch.scopes],
+        idempotencyKey: pendingLaunch.idempotencyKey,
+        protocolVersion,
+        experienceMode,
+    };
+};
+const freshPendingLaunchIntent = (mode, scopes, idempotencyKey, bootstrap) => ({
+    mode,
+    scopes: [...scopes],
+    idempotencyKey,
+    protocolVersion: (0, exports.resolveAiGuideProtocolVersion)(bootstrap),
+    experienceMode: bootstrap.experienceMode ?? "standard",
+});
 const parseTerminalEndIntent = (value) => {
     if (!value || typeof value !== "object" || Array.isArray(value))
         return null;
@@ -596,9 +658,13 @@ const parseFreshAiReturnProvisional = (value) => {
     if (!value || typeof value !== "object" || Array.isArray(value))
         return null;
     const raw = value;
-    if (Object.keys(raw).sort().join(",") !==
-        "conversationDisplayId,expiresAt,launchIdempotencyKey,linkId,mode,phase,sessionId,v" ||
-        raw.v !== 1 ||
+    const recordVersion = raw.v === 1 || raw.v === 2 ? raw.v : null;
+    const scopes = Array.isArray(raw.scopes) ? raw.scopes : [];
+    const expectedKeys = recordVersion === 1
+        ? "conversationDisplayId,expiresAt,launchIdempotencyKey,linkId,mode,phase,sessionId,v"
+        : "conversationDisplayId,experienceMode,expiresAt,launchIdempotencyKey,linkId,mode,phase,protocolVersion,scopes,sessionId,v";
+    if (recordVersion === null ||
+        Object.keys(raw).sort().join(",") !== expectedKeys ||
         !PUBLIC_REQUEST_ID_PATTERN.test(raw.linkId ?? "") ||
         !/^[1-9]\d{0,18}$/.test(raw.conversationDisplayId ?? "") ||
         (raw.mode !== "text" && raw.mode !== "voice") ||
@@ -613,19 +679,42 @@ const parseFreshAiReturnProvisional = (value) => {
             (raw.launchIdempotencyKey === null || raw.sessionId !== null)) ||
         (raw.phase === "launched" &&
             (raw.launchIdempotencyKey === null || raw.sessionId === null)) ||
+        (recordVersion === 2 &&
+            raw.phase === "released" &&
+            (raw.protocolVersion !== null ||
+                raw.experienceMode !== null ||
+                raw.scopes !== null)) ||
+        (recordVersion === 2 &&
+            raw.phase !== "released" &&
+            ((raw.protocolVersion !== 1 && raw.protocolVersion !== 2) ||
+                (raw.experienceMode !== "standard" &&
+                    raw.experienceMode !== "voice_presence") ||
+                (raw.protocolVersion === 1 && raw.experienceMode !== "standard") ||
+                (raw.experienceMode === "voice_presence" &&
+                    (raw.protocolVersion !== 2 || raw.mode !== "voice")) ||
+                !Array.isArray(raw.scopes) ||
+                scopes.length > CONSENT_SCOPES.size ||
+                scopes.some((scope) => typeof scope !== "string" ||
+                    !CONSENT_SCOPES.has(scope)) ||
+                new Set(scopes).size !== scopes.length)) ||
         !Number.isSafeInteger(raw.expiresAt) ||
         (raw.expiresAt ?? 0) <= Date.now() ||
         (raw.expiresAt ?? 0) > Date.now() + STORAGE_TTL_MS) {
         return null;
     }
     return {
-        v: 1,
+        v: recordVersion,
         linkId: raw.linkId,
         conversationDisplayId: raw.conversationDisplayId,
         mode: raw.mode,
         phase: raw.phase,
         launchIdempotencyKey: raw.launchIdempotencyKey ?? null,
         sessionId: raw.sessionId ?? null,
+        protocolVersion: recordVersion === 2 ? (raw.protocolVersion ?? null) : null,
+        experienceMode: recordVersion === 2 ? (raw.experienceMode ?? null) : null,
+        scopes: recordVersion === 2 && raw.phase !== "released"
+            ? [...scopes]
+            : null,
         expiresAt: raw.expiresAt,
     };
 };
@@ -662,6 +751,16 @@ const parseResumeRecord = (value) => {
         const record = JSON.parse(value);
         const scopes = Array.isArray(record.scopes) ? record.scopes : [];
         const locale = typeof record.locale === "string" ? canonicalLocale(record.locale) : null;
+        const protocolFieldsAbsent = record.protocolVersion === undefined &&
+            record.experienceMode === undefined;
+        const protocolBindingValid = protocolFieldsAbsent ||
+            ((record.protocolVersion === 1 || record.protocolVersion === 2) &&
+                (record.experienceMode === "standard" ||
+                    record.experienceMode === "voice_presence") &&
+                (record.protocolVersion !== 1 ||
+                    record.experienceMode === "standard") &&
+                (record.experienceMode !== "voice_presence" ||
+                    (record.protocolVersion === 2 && record.mode === "voice")));
         if (!PUBLIC_REQUEST_ID_PATTERN.test(record.sessionId ?? "") ||
             !(0, client_js_1.isValidAssistSessionGrant)(record.resumeCredential) ||
             !["text", "voice"].includes(record.mode ?? "") ||
@@ -670,6 +769,7 @@ const parseResumeRecord = (value) => {
             scopes.some((scope) => typeof scope !== "string" ||
                 !CONSENT_SCOPES.has(scope)) ||
             new Set(scopes).size !== scopes.length ||
+            !protocolBindingValid ||
             !locale ||
             typeof record.expiresAt !== "number" ||
             !Number.isFinite(record.expiresAt) ||
@@ -903,10 +1003,10 @@ const parseResumeRecord = (value) => {
                 ? record.visualConsentGranted
                 : record.scopes.includes("visual_context"),
             manualTurn: record.manualTurn === true,
-            protocolVersion: record.protocolVersion === 2 ? 2 : 1,
-            experienceMode: record.experienceMode === "voice_presence"
-                ? "voice_presence"
-                : "standard",
+            protocolVersion: protocolFieldsAbsent ? 1 : record.protocolVersion,
+            experienceMode: protocolFieldsAbsent
+                ? "standard"
+                : record.experienceMode,
             fallbackIntent: record.fallbackIntent === "standard_assist" ||
                 record.fallbackIntent === "human_handoff"
                 ? record.fallbackIntent
@@ -985,11 +1085,62 @@ const parseTranscript = (value) => {
     }
     return entries;
 };
+const parsePendingLaunchIntent = (value, recordVersion) => {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return null;
+    const candidate = value;
+    const scopes = Array.isArray(candidate.scopes) ? candidate.scopes : [];
+    const expectedKeys = recordVersion === 1
+        ? ["idempotencyKey", "mode", "scopes"]
+        : [
+            "experienceMode",
+            "idempotencyKey",
+            "mode",
+            "protocolVersion",
+            "scopes",
+        ];
+    if (canonicalJson(Object.keys(candidate).sort()) !==
+        canonicalJson(expectedKeys) ||
+        (candidate.mode !== "text" && candidate.mode !== "voice") ||
+        !Array.isArray(candidate.scopes) ||
+        typeof candidate.idempotencyKey !== "string" ||
+        !PUBLIC_REQUEST_ID_PATTERN.test(candidate.idempotencyKey) ||
+        scopes.length > CONSENT_SCOPES.size ||
+        scopes.some((scope) => typeof scope !== "string" || !CONSENT_SCOPES.has(scope)) ||
+        new Set(scopes).size !== scopes.length) {
+        return null;
+    }
+    const base = {
+        mode: candidate.mode,
+        scopes: [...scopes],
+        idempotencyKey: candidate.idempotencyKey,
+    };
+    if (recordVersion === 1) {
+        return { ...base, protocolVersion: null, experienceMode: null };
+    }
+    const protocolVersion = candidate.protocolVersion;
+    const experienceMode = candidate.experienceMode;
+    if ((protocolVersion !== 1 && protocolVersion !== 2) ||
+        (experienceMode !== "standard" && experienceMode !== "voice_presence") ||
+        (protocolVersion === 1 && experienceMode !== "standard") ||
+        (experienceMode === "voice_presence" &&
+            (protocolVersion !== 2 || candidate.mode !== "voice"))) {
+        return null;
+    }
+    return { ...base, protocolVersion, experienceMode };
+};
 const parseFocusedHandoffPayload = (value) => {
     if (!value || typeof value !== "object" || Array.isArray(value))
         return null;
     const raw = value;
-    if (raw.v === 1) {
+    if (raw.v === 1 || raw.v === 2) {
+        const expectedKeys = ["resume", "transcript", "v"];
+        if (raw.pendingLaunch !== undefined)
+            expectedKeys.push("pendingLaunch");
+        if (canonicalJson(Object.keys(raw).sort()) !==
+            canonicalJson(expectedKeys.sort())) {
+            return null;
+        }
         const resume = raw.resume === null
             ? null
             : parseResumeRecord(JSON.stringify(raw.resume ?? null));
@@ -997,30 +1148,17 @@ const parseFocusedHandoffPayload = (value) => {
             return null;
         let pendingLaunch;
         if (raw.pendingLaunch !== undefined) {
-            if (!raw.pendingLaunch ||
-                typeof raw.pendingLaunch !== "object" ||
-                Array.isArray(raw.pendingLaunch)) {
+            pendingLaunch =
+                parsePendingLaunchIntent(raw.pendingLaunch, raw.v) ?? undefined;
+            if (resume || !pendingLaunch)
                 return null;
-            }
-            const candidate = raw.pendingLaunch;
-            const scopes = Array.isArray(candidate.scopes) ? candidate.scopes : [];
-            if (resume ||
-                (candidate.mode !== "text" && candidate.mode !== "voice") ||
-                !PUBLIC_REQUEST_ID_PATTERN.test(String(candidate.idempotencyKey ?? "")) ||
-                scopes.length > CONSENT_SCOPES.size ||
-                scopes.some((scope) => typeof scope !== "string" ||
-                    !CONSENT_SCOPES.has(scope)) ||
-                new Set(scopes).size !== scopes.length) {
-                return null;
-            }
-            pendingLaunch = {
-                mode: candidate.mode,
-                scopes: [...scopes],
-                idempotencyKey: candidate.idempotencyKey,
-            };
+        }
+        if (raw.v === 2 &&
+            (!pendingLaunch || !pendingLaunchIsBound(pendingLaunch))) {
+            return null;
         }
         return {
-            v: 1,
+            v: raw.v,
             resume,
             transcript: parseTranscript(raw.transcript),
             ...(pendingLaunch ? { pendingLaunch } : {}),
@@ -1068,19 +1206,15 @@ const parseStagedPendingLaunch = (value) => {
         const claimAuthority = raw.claimAuthority === null
             ? null
             : parseTransferAuthority(JSON.stringify(raw.claimAuthority ?? null));
+        const recordVersion = raw.v === 1 || raw.v === 2 ? raw.v : null;
         const payload = parseFocusedHandoffPayload({
-            v: 1,
+            v: recordVersion,
             resume: null,
             transcript: [],
             pendingLaunch: raw.pendingLaunch,
         });
         const expiresAt = raw.expiresAt;
         const topLevelKeys = Object.keys(raw).sort();
-        const pendingKeys = raw.pendingLaunch &&
-            typeof raw.pendingLaunch === "object" &&
-            !Array.isArray(raw.pendingLaunch)
-            ? Object.keys(raw.pendingLaunch).sort()
-            : [];
         const authorityKeys = raw.authority &&
             typeof raw.authority === "object" &&
             !Array.isArray(raw.authority)
@@ -1101,14 +1235,12 @@ const parseStagedPendingLaunch = (value) => {
                 "state",
                 "v",
             ]) ||
-            canonicalJson(pendingKeys) !==
-                canonicalJson(["idempotencyKey", "mode", "scopes"]) ||
             canonicalJson(authorityKeys) !==
                 canonicalJson(["ownerId", "revision", "term"]) ||
             (raw.claimAuthority !== null &&
                 canonicalJson(claimAuthorityKeys) !==
                     canonicalJson(["ownerId", "revision", "term"])) ||
-            raw.v !== 1 ||
+            recordVersion === null ||
             typeof raw.sourceOwnerId !== "string" ||
             !PUBLIC_REQUEST_ID_PATTERN.test(raw.sourceOwnerId) ||
             !authority ||
@@ -1132,7 +1264,7 @@ const parseStagedPendingLaunch = (value) => {
             return null;
         }
         return {
-            v: 1,
+            v: recordVersion,
             sourceOwnerId: raw.sourceOwnerId,
             authority,
             state: raw.state,
@@ -1525,10 +1657,12 @@ class AiLiveAssist {
         this.storageKey = `__oxvo_ai_live_assist_resume_${this.siteKey}`;
         this.transcriptStorageKey = `__oxvo_ai_live_assist_transcript_${this.siteKey}`;
         this.transferAuthorityStorageKey = `__oxvo_ai_live_assist_transfer_authority_${this.siteKey}`;
-        this.stagedPendingLaunchStorageKey = `__oxvo_ai_live_assist_pending_launch_${this.siteKey}`;
+        this.legacyStagedPendingLaunchStorageKey = `__oxvo_ai_live_assist_pending_launch_${this.siteKey}`;
+        this.stagedPendingLaunchStorageKey = `__oxvo_ai_live_assist_pending_launch_v2_${this.siteKey}`;
         this.terminalEndStorageKey = `__oxvo_ai_live_assist_terminal_end_${this.siteKey}`;
         this.messengerReturnEndStorageKey = `__oxvo_ai_live_assist_handoff_terminal_${this.siteKey}`;
-        this.freshAiReturnProvisionalStorageKey = `__oxvo_ai_live_assist_fresh_return_${this.siteKey}`;
+        this.legacyFreshAiReturnProvisionalStorageKey = `__oxvo_ai_live_assist_fresh_return_${this.siteKey}`;
+        this.freshAiReturnProvisionalStorageKey = `__oxvo_ai_live_assist_fresh_return_v2_${this.siteKey}`;
         this.pageAssistanceTrackerIdentityStorageKey = `__oxvo_ai_live_assist_page_assistance_tracker_${this.siteKey}`;
         this.transcript = this.readTranscript();
         this.visitorIdentity = this.resolveVisitorId();
@@ -1727,8 +1861,7 @@ class AiLiveAssist {
                     pendingLaunch &&
                     (!staged ||
                         (staged.state === "in_flight" &&
-                            staged.pendingLaunch.idempotencyKey ===
-                                pendingLaunch.idempotencyKey))
+                            this.pendingLaunchMatches(staged.pendingLaunch, pendingLaunch)))
                     ? { ...pendingLaunch, scopes: [...pendingLaunch.scopes] }
                     : null;
             const record = this.readResume();
@@ -1743,8 +1876,12 @@ class AiLiveAssist {
             this.persistTerminalEndIntent(intent);
             if (record)
                 this.storeTerminalResume(record, intent);
-            else if (this.result)
-                this.captureTerminalAuthorizedResult(this.result);
+            else if (this.result) {
+                const retainedResult = this.result;
+                if (!this.captureTerminalAuthorizedResult(retainedResult)) {
+                    this.rejectTerminalAuthorizedResult(retainedResult);
+                }
+            }
         }
         this.terminalRequestPending = true;
         if (!this.relinquishModeUpgradeForRecovery(false)) {
@@ -1908,8 +2045,7 @@ class AiLiveAssist {
             if (resume &&
                 !terminalIntent &&
                 !resumedFallback &&
-                (resume.experienceMode !== experienceMode ||
-                    resume.protocolVersion !== requestedProtocol ||
+                (!resumeProtocolIsSupported(resume, bootstrap) ||
                     resume.fallbackIntent !== null)) {
                 this.clearResume();
                 resume = null;
@@ -2633,9 +2769,6 @@ class AiLiveAssist {
                 !this.messengerSupportsConfirmedHandoff(messenger)) {
                 return false;
             }
-            bridgeActivationAttempted = true;
-            if (messenger.setAiGuideHandoffEnabled(true) !== true)
-                return false;
             if (messenger.ready) {
                 await this.withMessengerTimeout(messenger.ready(), MESSENGER_LOAD_TIMEOUT_MS);
             }
@@ -2645,6 +2778,9 @@ class AiLiveAssist {
                 this.resolveMessenger() !== messenger) {
                 return false;
             }
+            bridgeActivationAttempted = true;
+            if (messenger.setAiGuideHandoffEnabled(true) !== true)
+                return false;
             if (this.messengerInitialLauncherVisible === null) {
                 this.messengerInitialLauncherVisible =
                     messenger.launcherVisible !== false;
@@ -3873,13 +4009,16 @@ class AiLiveAssist {
         if (expiresAt <= Date.now())
             return null;
         return {
-            v: 1,
+            v: 2,
             linkId: companion.linkId,
             conversationDisplayId: conversationId,
             mode,
             phase: "released",
             launchIdempotencyKey: null,
             sessionId: null,
+            protocolVersion: null,
+            experienceMode: null,
+            scopes: null,
             expiresAt,
         };
     }
@@ -3896,8 +4035,12 @@ class AiLiveAssist {
         }
         this.persistFreshAiReturnProvisional({
             ...provisional,
+            v: 2,
             phase: "released",
             launchIdempotencyKey: null,
+            protocolVersion: null,
+            experienceMode: null,
+            scopes: null,
         });
     }
     quiesceProvisionalFreshAiReturn() {
@@ -3911,22 +4054,59 @@ class AiLiveAssist {
         this.view?.setPaused(true);
         this.cleanupTransport();
     }
+    boundFreshAiReturnProvisional(provisional) {
+        if (provisional.phase === "released" ||
+            provisional.launchIdempotencyKey === null ||
+            provisional.protocolVersion === null ||
+            provisional.experienceMode === null ||
+            provisional.scopes === null ||
+            !this.bootstrap) {
+            return null;
+        }
+        const pendingLaunch = {
+            mode: provisional.mode,
+            scopes: [...provisional.scopes],
+            idempotencyKey: provisional.launchIdempotencyKey,
+            protocolVersion: provisional.protocolVersion,
+            experienceMode: provisional.experienceMode,
+        };
+        const bound = bindPendingLaunchIntent(pendingLaunch, this.bootstrap);
+        return bound && this.pendingLaunchMatches(bound, pendingLaunch)
+            ? bound
+            : null;
+    }
+    resumeMatchesFreshAiReturn(resume, pendingLaunch) {
+        return (resume.protocolVersion === pendingLaunch.protocolVersion &&
+            resume.experienceMode === pendingLaunch.experienceMode &&
+            resume.mode === pendingLaunch.mode &&
+            canonicalJson(resume.scopes) === canonicalJson(pendingLaunch.scopes));
+    }
+    resultMatchesFreshAiReturn(result, pendingLaunch) {
+        return (result.schemaVersion === pendingLaunch.protocolVersion &&
+            result.protocolVersion === pendingLaunch.protocolVersion &&
+            result.experienceMode === pendingLaunch.experienceMode &&
+            (result.mode === undefined || result.mode === pendingLaunch.mode));
+    }
     async retireProvisionalFreshAiReturn(provisional) {
         if (provisional.phase === "released")
             return true;
+        const pendingLaunch = this.boundFreshAiReturnProvisional(provisional);
+        if (!pendingLaunch)
+            return false;
         const resume = this.readResume();
         const result = this.result;
         const sessionId = provisional.sessionId ?? resume?.sessionId ?? result?.sessionId ?? null;
         if (!sessionId)
             return false;
-        const authority = resume?.sessionId === sessionId
+        const authority = resume?.sessionId === sessionId &&
+            this.resumeMatchesFreshAiReturn(resume, pendingLaunch)
             ? {
                 resumeCredential: resume.resumeCredential,
                 protocolVersion: resume.protocolVersion,
             }
             : result?.sessionId === sessionId &&
                 typeof result.resumeCredential === "string" &&
-                (result.protocolVersion === 1 || result.protocolVersion === 2)
+                this.resultMatchesFreshAiReturn(result, pendingLaunch)
                 ? {
                     resumeCredential: result.resumeCredential,
                     protocolVersion: result.protocolVersion,
@@ -3984,9 +4164,13 @@ class AiLiveAssist {
             provisional.conversationDisplayId;
         const released = {
             ...provisional,
+            v: 2,
             phase: "released",
             launchIdempotencyKey: null,
             sessionId: null,
+            protocolVersion: null,
+            experienceMode: null,
+            scopes: null,
         };
         return this.persistFreshAiReturnProvisional(released);
     }
@@ -4007,6 +4191,46 @@ class AiLiveAssist {
             // interrupted must never be replaced by a second fresh operation.
             return provisional.phase === "launching" ? "launch" : "blocked";
         }
+        if (provisional.protocolVersion === null ||
+            provisional.experienceMode === null ||
+            provisional.scopes === null) {
+            if (provisional.launchIdempotencyKey === null ||
+                !resume ||
+                resume.sessionId !== sessionId) {
+                return "blocked";
+            }
+            const upgraded = {
+                ...provisional,
+                v: 2,
+                sessionId,
+                protocolVersion: resume.protocolVersion,
+                experienceMode: resume.experienceMode,
+                scopes: [...resume.scopes],
+            };
+            if (!this.boundFreshAiReturnProvisional(upgraded) ||
+                !this.persistFreshAiReturnProvisional(upgraded)) {
+                return "blocked";
+            }
+            provisional = upgraded;
+        }
+        const pendingLaunch = this.boundFreshAiReturnProvisional(provisional);
+        if (!pendingLaunch)
+            return "blocked";
+        let hasSessionAuthority = false;
+        if (resume?.sessionId === sessionId) {
+            if (!this.resumeMatchesFreshAiReturn(resume, pendingLaunch)) {
+                return "blocked";
+            }
+            hasSessionAuthority = true;
+        }
+        if (this.result?.sessionId === sessionId) {
+            if (!this.resultMatchesFreshAiReturn(this.result, pendingLaunch)) {
+                return "blocked";
+            }
+            hasSessionAuthority = true;
+        }
+        if (!hasSessionAuthority)
+            return "blocked";
         if (provisional.phase === "launching") {
             provisional = {
                 ...provisional,
@@ -4208,17 +4432,61 @@ class AiLiveAssist {
         const currentProvisional = this.freshAiReturnProvisionalFor(conversationId);
         if (!currentProvisional)
             return false;
+        if (currentProvisional.phase === "launching" &&
+            currentProvisional.mode !== mode) {
+            return false;
+        }
+        const persistedLaunchScopes = currentProvisional.phase === "launching"
+            ? currentProvisional.scopes
+            : null;
+        if (currentProvisional.phase === "launching" &&
+            (currentProvisional.protocolVersion === null ||
+                currentProvisional.experienceMode === null ||
+                persistedLaunchScopes === null)) {
+            // A legacy Fresh-return record does not contain the complete request
+            // body. Reusing its idempotency key with current bootstrap scopes or
+            // protocol negotiation would create a different operation.
+            return false;
+        }
         const launchIdempotencyKey = currentProvisional.phase === "launching"
             ? currentProvisional.launchIdempotencyKey
             : (0, client_js_1.idempotencyKey)("launch");
         if (!launchIdempotencyKey)
             return false;
+        const launchScopes = persistedLaunchScopes
+            ? [...persistedLaunchScopes]
+            : [...scopes];
+        const provisionalPendingLaunch = currentProvisional.protocolVersion !== null &&
+            currentProvisional.experienceMode !== null
+            ? {
+                mode: currentProvisional.mode,
+                scopes: launchScopes,
+                idempotencyKey: launchIdempotencyKey,
+                protocolVersion: currentProvisional.protocolVersion,
+                experienceMode: currentProvisional.experienceMode,
+            }
+            : {
+                mode: currentProvisional.mode,
+                scopes: launchScopes,
+                idempotencyKey: launchIdempotencyKey,
+                protocolVersion: null,
+                experienceMode: null,
+            };
+        const pendingLaunch = currentProvisional.phase === "launching"
+            ? bindPendingLaunchIntent(provisionalPendingLaunch, bootstrap)
+            : freshPendingLaunchIntent(mode, scopes, launchIdempotencyKey, bootstrap);
+        if (!pendingLaunch)
+            return false;
         const launching = {
             ...currentProvisional,
-            mode,
+            v: 2,
+            mode: pendingLaunch.mode,
             phase: "launching",
             launchIdempotencyKey,
             sessionId: null,
+            protocolVersion: pendingLaunch.protocolVersion,
+            experienceMode: pendingLaunch.experienceMode,
+            scopes: [...pendingLaunch.scopes],
         };
         if (!this.persistFreshAiReturnProvisional(launching))
             return false;
@@ -4234,7 +4502,7 @@ class AiLiveAssist {
                 inboxId: messengerDescriptor.inboxId,
                 linkId: this.companion.linkId,
                 launchIdempotencyKey,
-                mode,
+                mode: pendingLaunch.mode,
                 previousAiSessionId: this.companion.currentAiSessionId,
                 surface: this.messengerTransferredSurface,
             }
@@ -4242,10 +4510,11 @@ class AiLiveAssist {
         if (!messengerReturnAuthority)
             return false;
         this.messengerReturnRetryRemaining = 1;
-        await this.launch(mode, scopes, launchIdempotencyKey, {
-            startMuted: mode === "voice",
+        await this.launch(pendingLaunch.mode, pendingLaunch.scopes, launchIdempotencyKey, {
+            startMuted: pendingLaunch.mode === "voice",
             associateCompanion: false,
             messengerReturnAuthority,
+            pendingLaunch,
         });
         this.messengerReturnRetryRemaining = null;
         const sessionId = this.result?.sessionId;
@@ -4440,6 +4709,7 @@ class AiLiveAssist {
         if (this.pushActive)
             this.media?.beginPushToTalk();
         this.closeMessengerBeforeOpen();
+        await this.prepareMessengerIntegration();
         return true;
     }
     async associateFreshCompanionSession(mode, sessionId) {
@@ -4563,11 +4833,6 @@ class AiLiveAssist {
         const prepared = await this.withMessengerTimeout(messenger.openHandoffConversation(displayId, options), MESSENGER_LOAD_TIMEOUT_MS);
         if (!prepared || !surfaceCurrent())
             return;
-        const returnActivated = await this.createMessengerReturnActivationPromise(messenger, displayId);
-        if (!returnActivated || !surfaceCurrent()) {
-            this.closeMessengerBeforeOpen();
-            return;
-        }
         const switched = await this.requestCompanionSurface("messenger", mode, (0, client_js_1.idempotencyKey)("companion_switch"), result.sessionId);
         const switchedCurrent = () => generation === this.sessionEffectGeneration &&
             this.result === result &&
@@ -4635,6 +4900,11 @@ class AiLiveAssist {
             await this.restoreAiAfterFailedSupportSwitch(mode, result.sessionId, previousMuted, previousPushActive);
             return;
         }
+        const returnActivated = await this.createMessengerReturnActivationPromise(messenger, displayId);
+        if (!returnActivated || !switchedCurrent()) {
+            await this.restoreAiAfterFailedSupportSwitch(mode, result.sessionId, previousMuted, previousPushActive);
+            return;
+        }
         this.messenger = messenger;
         this.messengerSurfaceActive = true;
         this.messengerTransferredConversationId = displayId;
@@ -6197,9 +6467,27 @@ class AiLiveAssist {
             releaseMessengerReturnIfPreRuntime();
             return;
         }
-        const experienceMode = bootstrap.experienceMode ?? "standard";
+        const retryIntent = options.pendingLaunch;
+        if (retryIntent &&
+            canonicalJson({ mode, scopes, idempotencyKey: launchIdempotencyKey }) !==
+                canonicalJson({
+                    mode: retryIntent.mode,
+                    scopes: retryIntent.scopes,
+                    idempotencyKey: retryIntent.idempotencyKey,
+                })) {
+            releaseMessengerReturnIfPreRuntime();
+            return;
+        }
+        let durableLaunch = retryIntent
+            ? bindPendingLaunchIntent(retryIntent, bootstrap)
+            : freshPendingLaunchIntent(mode, scopes, launchIdempotencyKey, bootstrap);
+        if (!durableLaunch) {
+            this.view.showError(this.view.message("reconnectFailed"), false, false);
+            releaseMessengerReturnIfPreRuntime();
+            return;
+        }
+        const { experienceMode, protocolVersion } = durableLaunch;
         const voicePresence = experienceMode === "voice_presence";
-        const protocolVersion = (0, exports.resolveAiGuideProtocolVersion)(bootstrap);
         if (voicePresence && mode !== "voice") {
             this.view.showError("Voice assist requires microphone access.", false, false);
             releaseMessengerReturnIfPreRuntime();
@@ -6220,11 +6508,7 @@ class AiLiveAssist {
             this.visitorActiveTakeoverOnly = false;
         }
         if (this.visitorActiveTakeoverOnly) {
-            const pendingLaunch = {
-                mode,
-                scopes: [...scopes],
-                idempotencyKey: launchIdempotencyKey,
-            };
+            const pendingLaunch = durableLaunch;
             this.lastLaunch = pendingLaunch;
             this.view.showActiveElsewhere(false);
             this.view.showConnecting(true, mode);
@@ -6238,11 +6522,7 @@ class AiLiveAssist {
         }
         this.pageAssistanceAuthorityGeneration += 1;
         this.rotatePageAssistanceBindingGeneration();
-        this.lastLaunch = {
-            mode,
-            scopes: [...scopes],
-            idempotencyKey: launchIdempotencyKey,
-        };
+        this.lastLaunch = { ...durableLaunch, scopes: [...durableLaunch.scopes] };
         this.launchInFlight = true;
         if (!this.lock.acquire()) {
             this.view.showActiveElsewhere(false);
@@ -6300,7 +6580,8 @@ class AiLiveAssist {
                 if (voicePresence ||
                     mode !== "voice" ||
                     !bootstrap.capabilities?.text ||
-                    options.messengerReturnAuthority !== undefined) {
+                    options.messengerReturnAuthority !== undefined ||
+                    retryIntent !== undefined) {
                     throw error;
                 }
                 this.releaseMedia(media);
@@ -6330,22 +6611,20 @@ class AiLiveAssist {
             this.navigationConsentResetCandidate = null;
             this.navigationConsentReset = null;
             this.navigationConsentResetReady = null;
-            this.lastLaunch = {
-                mode: activeMode,
-                scopes: [...activeScopes],
-                idempotencyKey: launchIdempotencyKey,
-            };
+            if (!retryIntent) {
+                durableLaunch = {
+                    ...durableLaunch,
+                    mode: activeMode,
+                    scopes: [...activeScopes],
+                };
+            }
+            this.lastLaunch = { ...durableLaunch, scopes: [...durableLaunch.scopes] };
             this.visualConsentGranted = activeScopes.includes("visual_context");
             assertConnectionCurrent();
             if (this.lock.ownsLatestFocus?.() === false &&
                 this.relinquishForNewerFocus()) {
                 return;
             }
-            const durableLaunch = {
-                mode: activeMode,
-                scopes: [...activeScopes],
-                idempotencyKey: launchIdempotencyKey,
-            };
             if (!this.markStagedPendingLaunchInFlight(durableLaunch)) {
                 this.releaseMedia(media);
                 this.cleanupTransport();
@@ -6390,16 +6669,19 @@ class AiLiveAssist {
                     }
                 }
             }
+            if (result.schemaVersion !== protocolVersion ||
+                result.protocolVersion !== protocolVersion ||
+                result.experienceMode !== experienceMode) {
+                throw new client_js_1.RuntimeClientError("PROTOCOL_INVALID", "The voice assist runtime returned an incompatible session.", false, null, 502);
+            }
             if (this.terminalRequestPending) {
-                this.captureTerminalAuthorizedResult(result);
+                if (!this.captureTerminalAuthorizedResult(result)) {
+                    throw new client_js_1.RuntimeClientError("PROTOCOL_INVALID", "The voice assist runtime returned an incompatible session.", false, null, 502);
+                }
                 runtimeSessionCreated = true;
                 return;
             }
             assertConnectionCurrent();
-            if (result.experienceMode !== experienceMode ||
-                result.protocolVersion !== protocolVersion) {
-                throw new client_js_1.RuntimeClientError("PROTOCOL_INVALID", "The voice assist runtime returned an incompatible session.", false, null, 502);
-            }
             if (!this.commitAuthorizedRuntimePath(requestedLaunchPath, true)) {
                 throw new client_js_1.RuntimeClientError("PROTOCOL_INVALID", "The voice assist runtime authorized an invalid page path.", false, null, 502);
             }
@@ -6534,7 +6816,8 @@ class AiLiveAssist {
             this.terminalRequestPending ||
             this.ended ||
             this.destroyed ||
-            this.lastLaunch?.idempotencyKey !== pendingLaunch.idempotencyKey ||
+            !this.lastLaunch ||
+            !this.pendingLaunchMatches(this.lastLaunch, pendingLaunch) ||
             this.readResume()) {
             return;
         }
@@ -6566,7 +6849,8 @@ class AiLiveAssist {
         this.visitorActiveEligibilityRecheckKey = pendingLaunch.idempotencyKey;
         const pendingIntentIsCurrent = () => launchGeneration === this.launchGeneration &&
             this.visitorActiveEligibilityRecheckController === controller &&
-            this.lastLaunch?.idempotencyKey === pendingLaunch.idempotencyKey &&
+            Boolean(this.lastLaunch &&
+                this.pendingLaunchMatches(this.lastLaunch, pendingLaunch)) &&
             !this.terminalRequestPending &&
             !this.ended &&
             !this.destroyed &&
@@ -6626,7 +6910,7 @@ class AiLiveAssist {
                     this.visitorActiveTakeoverOnly = false;
                     this.lastLaunch = null;
                     this.view?.showActiveElsewhere(false);
-                    await this.launch(pendingLaunch.mode, pendingLaunch.scopes, pendingLaunch.idempotencyKey);
+                    await this.launch(pendingLaunch.mode, pendingLaunch.scopes, pendingLaunch.idempotencyKey, { pendingLaunch });
                     return;
                 }
                 if (status === "visitor_limited") {
@@ -6658,7 +6942,8 @@ class AiLiveAssist {
         this.visitorActiveEligibilityRecheck = operation;
     }
     finishVisitorActiveEligibilityRecheck(pendingLaunch, messageKey) {
-        if (this.lastLaunch?.idempotencyKey !== pendingLaunch.idempotencyKey) {
+        if (!this.lastLaunch ||
+            !this.pendingLaunchMatches(this.lastLaunch, pendingLaunch)) {
             return;
         }
         this.lastLaunch = null;
@@ -6815,8 +7100,15 @@ class AiLiveAssist {
                     }
                 }
             }
+            if (result.schemaVersion !== record.protocolVersion ||
+                result.protocolVersion !== record.protocolVersion ||
+                result.experienceMode !== record.experienceMode) {
+                throw new client_js_1.RuntimeClientError("PROTOCOL_INVALID", "The saved voice assist session is no longer compatible.", false, null, 409);
+            }
             if (this.terminalRequestPending) {
-                this.captureTerminalAuthorizedResult(result, record);
+                if (!this.captureTerminalAuthorizedResult(result, record)) {
+                    throw new client_js_1.RuntimeClientError("PROTOCOL_INVALID", "The saved voice assist session is no longer compatible.", false, null, 409);
+                }
                 if (modeUpgrade)
                     this.modeUpgradeTerminalResult = result;
                 attemptedCredentials.add(result.resumeCredential);
@@ -6826,8 +7118,6 @@ class AiLiveAssist {
                 return;
             assertConnectionCurrent();
             if (result.sessionId !== record.sessionId ||
-                result.protocolVersion !== record.protocolVersion ||
-                result.experienceMode !== record.experienceMode ||
                 (result.mode !== undefined &&
                     result.mode !== "text" &&
                     result.mode !== "voice") ||
@@ -13105,7 +13395,7 @@ class AiLiveAssist {
                 return;
             }
             this.messengerReturnRetryRemaining -= 1;
-            const retryAttempt = this.launch(this.lastLaunch.mode, this.lastLaunch.scopes, this.lastLaunch.idempotencyKey);
+            const retryAttempt = this.launch(this.lastLaunch.mode, this.lastLaunch.scopes, this.lastLaunch.idempotencyKey, { pendingLaunch: this.lastLaunch });
             return retryAttempt.finally(() => {
                 if (this.result && !this.ended) {
                     this.messengerReturnRetryRemaining = null;
@@ -13125,7 +13415,7 @@ class AiLiveAssist {
             return this.resume(resume);
         }
         if (this.lastLaunch) {
-            return this.launch(this.lastLaunch.mode, this.lastLaunch.scopes, this.lastLaunch.idempotencyKey);
+            return this.launch(this.lastLaunch.mode, this.lastLaunch.scopes, this.lastLaunch.idempotencyKey, { pendingLaunch: this.lastLaunch });
         }
     }
     scheduleReconnect(force = false) {
@@ -13455,6 +13745,18 @@ class AiLiveAssist {
             canonicalJson(left.messengerBinding) ===
                 canonicalJson(right.messengerBinding));
     }
+    sameResumeAuthorityIdentity(left, right) {
+        const credentialRotated = left.resumeCredential !== right.resumeCredential;
+        if (!credentialRotated && left.expiresAt !== right.expiresAt)
+            return false;
+        const { resumeCredential: _leftCredential, expiresAt: _leftCredentialExpiry, ...leftAuthority } = left;
+        const { resumeCredential: _rightCredential, expiresAt: _rightCredentialExpiry, ...rightAuthority } = right;
+        void _leftCredential;
+        void _rightCredential;
+        void _leftCredentialExpiry;
+        void _rightCredentialExpiry;
+        return canonicalJson(leftAuthority) === canonicalJson(rightAuthority);
+    }
     sameModeUpgradeIntent(left, right) {
         return (left?.requestId === right?.requestId &&
             left?.resumeIdempotencyKey === right?.resumeIdempotencyKey &&
@@ -13823,10 +14125,22 @@ class AiLiveAssist {
         this.state("ended");
     }
     captureTerminalAuthorizedResult(result, sourceRecord = null) {
-        if (sourceRecord &&
-            (result.sessionId !== sourceRecord.sessionId ||
-                result.protocolVersion !== sourceRecord.protocolVersion ||
-                result.experienceMode !== sourceRecord.experienceMode)) {
+        const pendingLaunch = this.terminalPendingLaunch &&
+            pendingLaunchIsBound(this.terminalPendingLaunch)
+            ? this.terminalPendingLaunch
+            : null;
+        const expectedProtocolVersion = sourceRecord?.protocolVersion ??
+            pendingLaunch?.protocolVersion ??
+            result.protocolVersion;
+        const expectedExperienceMode = sourceRecord?.experienceMode ??
+            pendingLaunch?.experienceMode ??
+            result.experienceMode;
+        if (result.schemaVersion !== expectedProtocolVersion ||
+            result.protocolVersion !== expectedProtocolVersion ||
+            result.experienceMode !== expectedExperienceMode ||
+            (sourceRecord &&
+                (result.sessionId !== sourceRecord.sessionId ||
+                    result.protocolVersion !== sourceRecord.protocolVersion))) {
             return false;
         }
         const currentIntent = this.terminalEndIntent;
@@ -13852,6 +14166,22 @@ class AiLiveAssist {
         }
         return true;
     }
+    retryRejectedTerminalAuthorizedResult(result) {
+        const error = this.rejectTerminalAuthorizedResult(result);
+        return this.retryTerminalEnd(error);
+    }
+    rejectTerminalAuthorizedResult(result) {
+        if (this.result === result)
+            this.result = null;
+        if (this.modeUpgradeTerminalResult === result) {
+            this.modeUpgradeTerminalResult = null;
+        }
+        this.terminalSessionAuthorization = null;
+        this.terminalSessionAuthorizationController = null;
+        const error = new client_js_1.RuntimeClientError("PROTOCOL_INVALID", "The assist runtime returned an incompatible terminal session.", false, null, 409);
+        this.terminalSessionAuthorizationFailure = error;
+        return error;
+    }
     completeRuntimeEnd() {
         if (this.ended)
             return Promise.resolve();
@@ -13882,8 +14212,9 @@ class AiLiveAssist {
         if (terminalAuthorization) {
             return this.waitForTerminalRequestDeadline(terminalAuthorization, this.terminalSessionAuthorizationController).then((authorized) => {
                 const result = authorized ?? this.result ?? this.modeUpgradeTerminalResult;
-                if (result) {
-                    this.captureTerminalAuthorizedResult(result, this.terminalResumeRecord);
+                if (result &&
+                    !this.captureTerminalAuthorizedResult(result, this.terminalResumeRecord)) {
+                    return this.retryRejectedTerminalAuthorizedResult(result);
                 }
                 return this.finishRuntimeEndAttempt(result);
             }, (error) => {
@@ -13900,7 +14231,9 @@ class AiLiveAssist {
                 }
                 if (this.terminalPendingLaunch) {
                     return this.requestTerminalPendingLaunch(this.terminalPendingLaunch).then((result) => {
-                        this.captureTerminalAuthorizedResult(result);
+                        if (!this.captureTerminalAuthorizedResult(result)) {
+                            return this.retryRejectedTerminalAuthorizedResult(result);
+                        }
                         return this.finishRuntimeEndAttempt(result);
                     }, (recoveryError) => this.retryTerminalEnd(recoveryError));
                 }
@@ -13927,7 +14260,9 @@ class AiLiveAssist {
             return this.finishRuntimeEndAttempt(null);
         if (this.terminalPendingLaunch) {
             return this.requestTerminalPendingLaunch(this.terminalPendingLaunch).then((result) => {
-                this.captureTerminalAuthorizedResult(result);
+                if (!this.captureTerminalAuthorizedResult(result)) {
+                    return this.retryRejectedTerminalAuthorizedResult(result);
+                }
                 return this.finishRuntimeEndAttempt(result);
             }, (error) => this.retryTerminalEnd(error));
         }
@@ -14084,13 +14419,21 @@ class AiLiveAssist {
     requestTerminalPendingLaunch(pendingLaunch) {
         const intent = this.terminalEndIntent;
         if (!intent ||
-            intent.launchIdempotencyKey !== pendingLaunch.idempotencyKey ||
-            !this.markStagedPendingLaunchInFlight(pendingLaunch)) {
+            intent.launchIdempotencyKey !== pendingLaunch.idempotencyKey) {
             return Promise.reject(new TerminalRequestDeferredError());
         }
         const controller = new AbortController();
         const request = (async () => {
             const bootstrap = await this.terminalPendingLaunchBootstrap(controller.signal);
+            const boundPendingLaunch = bindPendingLaunchIntent(pendingLaunch, bootstrap);
+            if (!boundPendingLaunch ||
+                !this.markStagedPendingLaunchInFlight(boundPendingLaunch)) {
+                throw new TerminalRequestDeferredError();
+            }
+            this.terminalPendingLaunch = {
+                ...boundPendingLaunch,
+                scopes: [...boundPendingLaunch.scopes],
+            };
             const replay = await this.replayReadiness.wait();
             if (this.destroyed ||
                 this.ended ||
@@ -14099,28 +14442,34 @@ class AiLiveAssist {
                 throw new TerminalRequestDeferredError();
             }
             this.replayReadiness.assertCurrent(replay);
-            return this.runtime.launch({
+            const result = await this.runtime.launch({
                 siteKey: this.siteKey,
                 configRevision: bootstrap.configRevision,
                 path: path(),
                 tabId: this.tabId,
-                mode: pendingLaunch.mode,
+                mode: boundPendingLaunch.mode,
                 anonymousId: this.visitorId(),
                 replay,
                 disclosureChecksum: bootstrap.consent.disclosureChecksum,
-                scopes: pendingLaunch.scopes,
+                scopes: boundPendingLaunch.scopes,
                 locale: this.locale,
-                microphone: pendingLaunch.mode === "voice",
+                microphone: boundPendingLaunch.mode === "voice",
                 reducedMotion: window.matchMedia("(prefers-reduced-motion: reduce)")
                     .matches,
-                protocolVersion: (0, exports.resolveAiGuideProtocolVersion)(bootstrap),
-                experienceMode: bootstrap.experienceMode ?? "standard",
+                protocolVersion: boundPendingLaunch.protocolVersion,
+                experienceMode: boundPendingLaunch.experienceMode,
                 ...(this.activeFallback
                     ? { fallbackIntent: this.activeFallback }
                     : {}),
                 lowPower: this.lowPowerMode(),
-                idempotencyKey: pendingLaunch.idempotencyKey,
+                idempotencyKey: boundPendingLaunch.idempotencyKey,
             }, controller.signal);
+            if (result.schemaVersion !== boundPendingLaunch.protocolVersion ||
+                result.protocolVersion !== boundPendingLaunch.protocolVersion ||
+                result.experienceMode !== boundPendingLaunch.experienceMode) {
+                throw new client_js_1.RuntimeClientError("PROTOCOL_INVALID", "The voice assist runtime returned an incompatible session.", false, null, 502);
+            }
+            return result;
         })();
         return this.waitForTerminalRequestDeadline(request, controller);
     }
@@ -14284,8 +14633,7 @@ class AiLiveAssist {
         const retainTerminalLaunch = Boolean(this.terminalSessionAuthorization &&
             this.terminalPendingLaunch &&
             staged?.state === "in_flight" &&
-            staged.pendingLaunch.idempotencyKey ===
-                this.terminalPendingLaunch.idempotencyKey);
+            this.pendingLaunchMatches(staged.pendingLaunch, this.terminalPendingLaunch));
         if (!retainTerminalLaunch)
             this.clearOwnedStagedPendingLaunch();
         this.lock?.cancelPendingHandoff?.();
@@ -14709,15 +15057,18 @@ class AiLiveAssist {
     focusedHandoffPayload() {
         this.transcript ?? (this.transcript = []);
         const resume = this.readResume();
+        const pendingLaunch = !resume && this.lastLaunch && this.bootstrap
+            ? bindPendingLaunchIntent(this.lastLaunch, this.bootstrap)
+            : null;
         return {
-            v: 1,
+            v: pendingLaunch ? 2 : 1,
             resume,
             transcript: this.transcript.map((entry) => ({ ...entry })),
-            ...(!resume && this.lastLaunch
+            ...(pendingLaunch
                 ? {
                     pendingLaunch: {
-                        ...this.lastLaunch,
-                        scopes: [...this.lastLaunch.scopes],
+                        ...pendingLaunch,
+                        scopes: [...pendingLaunch.scopes],
                     },
                 }
                 : {}),
@@ -14732,33 +15083,157 @@ class AiLiveAssist {
         }
     }
     readStagedPendingLaunch() {
-        let raw = null;
         try {
-            raw = localStorage.getItem(this.stagedPendingLaunchStorageKey);
-            const staged = parseStagedPendingLaunch(raw);
-            if (raw && !staged) {
+            const v2Raw = localStorage.getItem(this.stagedPendingLaunchStorageKey);
+            const parsedV2 = parseStagedPendingLaunch(v2Raw);
+            const v2 = parsedV2?.v === 2 ? parsedV2 : null;
+            if (v2Raw && !v2) {
                 localStorage.removeItem(this.stagedPendingLaunchStorageKey);
             }
-            return staged;
+            const legacyRaw = localStorage.getItem(this.legacyStagedPendingLaunchStorageKey);
+            const parsedLegacy = parseStagedPendingLaunch(legacyRaw);
+            const legacy = parsedLegacy?.v === 1 ? parsedLegacy : null;
+            if (legacyRaw && !legacy) {
+                localStorage.removeItem(this.legacyStagedPendingLaunchStorageKey);
+            }
+            if (!v2)
+                return legacy;
+            if (!legacy)
+                return v2;
+            const authorityOrder = compareTransferAuthority(v2.authority, legacy.authority);
+            if (authorityOrder !== 0)
+                return authorityOrder > 0 ? v2 : legacy;
+            if (v2.sourceOwnerId !== legacy.sourceOwnerId ||
+                !this.pendingLaunchBaseMatches(v2.pendingLaunch, legacy.pendingLaunch)) {
+                return null;
+            }
+            // A V2 record is the only copy that preserves the exact launch body.
+            // Prefer it for an equal authority; the legacy copy is cleaned only
+            // after a matching V2 write has been verified.
+            return v2;
         }
         catch {
             return null;
         }
     }
     persistStagedPendingLaunch(staged) {
+        let rollback = null;
         try {
-            localStorage.setItem(this.stagedPendingLaunchStorageKey, JSON.stringify(staged));
-            return (canonicalJson(this.readStagedPendingLaunch()) === canonicalJson(staged));
+            const serializedPendingLaunch = staged.v === 1
+                ? {
+                    mode: staged.pendingLaunch.mode,
+                    scopes: [...staged.pendingLaunch.scopes],
+                    idempotencyKey: staged.pendingLaunch.idempotencyKey,
+                }
+                : staged.pendingLaunch;
+            const storageKey = staged.v === 2
+                ? this.stagedPendingLaunchStorageKey
+                : this.legacyStagedPendingLaunchStorageKey;
+            const serialized = JSON.stringify({
+                ...staged,
+                pendingLaunch: serializedPendingLaunch,
+            });
+            const previousSerialized = localStorage.getItem(storageKey);
+            const previousLegacySerialized = localStorage.getItem(this.legacyStagedPendingLaunchStorageKey);
+            let removedMatchingLegacy = false;
+            rollback = () => {
+                if (localStorage.getItem(storageKey) === serialized) {
+                    if (previousSerialized === null)
+                        localStorage.removeItem(storageKey);
+                    else
+                        localStorage.setItem(storageKey, previousSerialized);
+                }
+                if (removedMatchingLegacy &&
+                    previousLegacySerialized !== null &&
+                    localStorage.getItem(this.legacyStagedPendingLaunchStorageKey) ===
+                        null) {
+                    localStorage.setItem(this.legacyStagedPendingLaunchStorageKey, previousLegacySerialized);
+                }
+            };
+            localStorage.setItem(storageKey, serialized);
+            const normalizedPendingLaunch = staged.v === 1
+                ? {
+                    ...serializedPendingLaunch,
+                    protocolVersion: null,
+                    experienceMode: null,
+                }
+                : staged.pendingLaunch;
+            const expected = {
+                ...staged,
+                pendingLaunch: normalizedPendingLaunch,
+            };
+            const directReadback = parseStagedPendingLaunch(localStorage.getItem(storageKey));
+            if (canonicalJson(directReadback) !== canonicalJson(expected)) {
+                rollback();
+                return false;
+            }
+            if (staged.v === 2) {
+                const legacySerialized = localStorage.getItem(this.legacyStagedPendingLaunchStorageKey);
+                const legacy = parseStagedPendingLaunch(legacySerialized);
+                const equalAuthority = legacy?.v === 1 &&
+                    compareTransferAuthority(legacy.authority, staged.authority) === 0;
+                if (equalAuthority &&
+                    (legacy.sourceOwnerId !== staged.sourceOwnerId ||
+                        !this.pendingLaunchBaseMatches(legacy.pendingLaunch, staged.pendingLaunch))) {
+                    rollback();
+                    return false;
+                }
+                if (legacy?.v === 1 &&
+                    legacy.sourceOwnerId === staged.sourceOwnerId &&
+                    equalAuthority &&
+                    this.pendingLaunchBaseMatches(legacy.pendingLaunch, staged.pendingLaunch) &&
+                    legacySerialized !== null &&
+                    localStorage.getItem(this.legacyStagedPendingLaunchStorageKey) ===
+                        legacySerialized) {
+                    localStorage.removeItem(this.legacyStagedPendingLaunchStorageKey);
+                    removedMatchingLegacy = true;
+                }
+            }
+            const persisted = canonicalJson(this.readStagedPendingLaunch()) ===
+                canonicalJson(expected);
+            if (!persisted)
+                rollback();
+            return persisted;
         }
         catch {
+            try {
+                rollback?.();
+            }
+            catch {
+                // Storage is already unavailable. Leave the launch unclaimed and
+                // fail closed rather than trusting a partially observed write.
+            }
             return false;
         }
     }
+    pendingLaunchBaseMatches(left, right) {
+        return (canonicalJson({
+            mode: left.mode,
+            scopes: left.scopes,
+            idempotencyKey: left.idempotencyKey,
+        }) ===
+            canonicalJson({
+                mode: right.mode,
+                scopes: right.scopes,
+                idempotencyKey: right.idempotencyKey,
+            }));
+    }
     pendingLaunchMatches(left, right) {
-        return canonicalJson(left) === canonicalJson(right);
+        const leftBound = pendingLaunchIsBound(left);
+        const rightBound = pendingLaunchIsBound(right);
+        if (leftBound !== rightBound)
+            return false;
+        if (leftBound && rightBound) {
+            return canonicalJson(left) === canonicalJson(right);
+        }
+        return this.pendingLaunchBaseMatches(left, right);
     }
     stagePendingLaunch(pendingLaunch, authority, sourceOwnerId) {
-        if (!PUBLIC_REQUEST_ID_PATTERN.test(sourceOwnerId) ||
+        const boundPendingLaunch = this.bootstrap
+            ? bindPendingLaunchIntent(pendingLaunch, this.bootstrap)
+            : null;
+        if (!boundPendingLaunch ||
+            !PUBLIC_REQUEST_ID_PATTERN.test(sourceOwnerId) ||
             sourceOwnerId === authority.ownerId) {
             return false;
         }
@@ -14769,35 +15244,82 @@ class AiLiveAssist {
         if (authorityOrder < 0 ||
             (authorityOrder === 0 &&
                 (existing?.sourceOwnerId !== sourceOwnerId ||
-                    !this.pendingLaunchMatches(existing.pendingLaunch, pendingLaunch) ||
+                    !this.pendingLaunchMatches(!pendingLaunchIsBound(existing.pendingLaunch) && this.bootstrap
+                        ? (bindPendingLaunchIntent(existing.pendingLaunch, this.bootstrap) ?? existing.pendingLaunch)
+                        : existing.pendingLaunch, boundPendingLaunch) ||
                     existing.state !== "prepared"))) {
             return false;
         }
         return this.persistStagedPendingLaunch({
-            v: 1,
+            v: 2,
             sourceOwnerId,
             authority: { ...authority },
             state: "prepared",
             claimAuthority: null,
             expiresAt: Date.now() + STAGED_PENDING_LAUNCH_TTL_MS,
             pendingLaunch: {
-                ...pendingLaunch,
-                scopes: [...pendingLaunch.scopes],
+                ...boundPendingLaunch,
+                scopes: [...boundPendingLaunch.scopes],
             },
         });
     }
     clearStagedPendingLaunch(pendingLaunch, authority) {
         const staged = this.readStagedPendingLaunch();
+        const comparablePending = this.bootstrap && !pendingLaunchIsBound(pendingLaunch)
+            ? bindPendingLaunchIntent(pendingLaunch, this.bootstrap)
+            : pendingLaunch;
+        const comparableStaged = this.bootstrap && staged && !pendingLaunchIsBound(staged.pendingLaunch)
+            ? bindPendingLaunchIntent(staged.pendingLaunch, this.bootstrap)
+            : staged?.pendingLaunch;
         if (!staged ||
+            !comparablePending ||
+            !comparableStaged ||
             compareTransferAuthority(staged.authority, authority) !== 0 ||
-            !this.pendingLaunchMatches(staged.pendingLaunch, pendingLaunch)) {
-            return;
+            !this.pendingLaunchMatches(comparableStaged, comparablePending)) {
+            return false;
         }
         try {
-            localStorage.removeItem(this.stagedPendingLaunchStorageKey);
+            const snapshots = [
+                {
+                    key: this.stagedPendingLaunchStorageKey,
+                    raw: localStorage.getItem(this.stagedPendingLaunchStorageKey),
+                    version: 2,
+                },
+                {
+                    key: this.legacyStagedPendingLaunchStorageKey,
+                    raw: localStorage.getItem(this.legacyStagedPendingLaunchStorageKey),
+                    version: 1,
+                },
+            ];
+            const removable = [];
+            for (const snapshot of snapshots) {
+                if (snapshot.raw === null)
+                    continue;
+                const shadow = parseStagedPendingLaunch(snapshot.raw);
+                if (!shadow || shadow.v !== snapshot.version)
+                    return false;
+                const authorityOrder = compareTransferAuthority(shadow.authority, staged.authority);
+                if (authorityOrder > 0)
+                    continue;
+                if (authorityOrder === 0 &&
+                    (shadow.sourceOwnerId !== staged.sourceOwnerId ||
+                        !this.pendingLaunchBaseMatches(shadow.pendingLaunch, staged.pendingLaunch))) {
+                    return false;
+                }
+                removable.push(snapshot);
+            }
+            if (removable.some((snapshot) => localStorage.getItem(snapshot.key) !== snapshot.raw)) {
+                return false;
+            }
+            for (const snapshot of removable) {
+                if (localStorage.getItem(snapshot.key) !== snapshot.raw)
+                    return false;
+                localStorage.removeItem(snapshot.key);
+            }
+            return removable.every((snapshot) => localStorage.getItem(snapshot.key) === null);
         }
         catch {
-            /* noop */
+            return false;
         }
     }
     clearOwnedStagedPendingLaunch() {
@@ -14814,7 +15336,7 @@ class AiLiveAssist {
         const staged = this.readStagedPendingLaunch();
         if (!pendingLaunch ||
             !staged ||
-            staged.pendingLaunch.idempotencyKey !== pendingLaunch.idempotencyKey ||
+            !this.pendingLaunchMatches(staged.pendingLaunch, pendingLaunch) ||
             this.terminalEndIntent?.launchIdempotencyKey !==
                 pendingLaunch.idempotencyKey) {
             return;
@@ -14825,11 +15347,15 @@ class AiLiveAssist {
         const pendingLaunch = parseFocusedHandoffPayload(value)?.pendingLaunch;
         if (!pendingLaunch)
             return true;
+        const boundPendingLaunch = this.bootstrap
+            ? bindPendingLaunchIntent(pendingLaunch, this.bootstrap)
+            : null;
         const staged = this.readStagedPendingLaunch();
-        if (!staged ||
+        if (!boundPendingLaunch ||
+            !staged ||
             staged.state !== "prepared" ||
             compareTransferAuthority(staged.authority, authority) !== 0 ||
-            !this.pendingLaunchMatches(staged.pendingLaunch, pendingLaunch)) {
+            !this.pendingLaunchMatches(staged.pendingLaunch, boundPendingLaunch)) {
             return false;
         }
         return this.persistStagedPendingLaunch({
@@ -14873,6 +15399,12 @@ class AiLiveAssist {
     }
     markStagedPendingLaunchInFlight(pendingLaunch) {
         const staged = this.readStagedPendingLaunch();
+        const boundPendingLaunch = pendingLaunchIsBound(pendingLaunch)
+            ? pendingLaunch
+            : this.bootstrap
+                ? bindPendingLaunchIntent(pendingLaunch, this.bootstrap)
+                : null;
+        const durablePendingLaunch = boundPendingLaunch ?? pendingLaunch;
         // AiLiveAssist always installs a TabActivityLock with durable authority.
         // Keep prototype-level test harnesses that intentionally omit the lock
         // implementation isolated from the persistence contract.
@@ -14884,40 +15416,54 @@ class AiLiveAssist {
         }
         if (!staged) {
             return this.persistStagedPendingLaunch({
-                v: 1,
+                v: boundPendingLaunch ? 2 : 1,
                 sourceOwnerId: randomId("launch_source"),
                 authority: { ...ownedAuthority },
                 state: "in_flight",
                 claimAuthority: { ...ownedAuthority },
                 expiresAt: Date.now() + STAGED_PENDING_LAUNCH_TTL_MS,
                 pendingLaunch: {
-                    ...pendingLaunch,
-                    scopes: [...pendingLaunch.scopes],
+                    ...durablePendingLaunch,
+                    scopes: [...durablePendingLaunch.scopes],
                 },
             });
         }
+        const comparableStagedPendingLaunch = pendingLaunchIsBound(staged.pendingLaunch)
+            ? staged.pendingLaunch
+            : this.bootstrap
+                ? bindPendingLaunchIntent(staged.pendingLaunch, this.bootstrap)
+                : null;
         if (staged.pendingLaunch.idempotencyKey !== pendingLaunch.idempotencyKey ||
             !staged.claimAuthority ||
             compareTransferAuthority(staged.claimAuthority, ownedAuthority) !== 0 ||
-            (staged.state !== "claimed" && staged.state !== "in_flight")) {
+            (staged.state !== "claimed" && staged.state !== "in_flight") ||
+            (boundPendingLaunch
+                ? !comparableStagedPendingLaunch ||
+                    !this.pendingLaunchMatches(comparableStagedPendingLaunch, boundPendingLaunch)
+                : !this.pendingLaunchMatches(staged.pendingLaunch, pendingLaunch))) {
             return false;
         }
-        if (staged.state === "in_flight")
+        if (staged.state === "in_flight" &&
+            staged.v === (boundPendingLaunch ? 2 : 1) &&
+            this.pendingLaunchMatches(staged.pendingLaunch, durablePendingLaunch)) {
             return true;
+        }
         return this.persistStagedPendingLaunch({
             ...staged,
+            v: boundPendingLaunch ? 2 : 1,
             state: "in_flight",
             pendingLaunch: {
-                ...pendingLaunch,
-                scopes: [...pendingLaunch.scopes],
+                ...durablePendingLaunch,
+                scopes: [...durablePendingLaunch.scopes],
             },
         });
     }
     acceptStagedPendingLaunch(pendingLaunch, result) {
         const staged = this.readStagedPendingLaunch();
-        if (!staged ||
-            !this.pendingLaunchMatches(staged.pendingLaunch, pendingLaunch)) {
+        if (!staged)
             return true;
+        if (!this.pendingLaunchMatches(staged.pendingLaunch, pendingLaunch)) {
+            return false;
         }
         const ownedAuthority = this.lock.ownedAuthority?.() ?? null;
         const stored = this.readResume();
@@ -14941,17 +15487,11 @@ class AiLiveAssist {
         })) {
             return false;
         }
-        try {
-            localStorage.removeItem(this.stagedPendingLaunchStorageKey);
-            return localStorage.getItem(this.stagedPendingLaunchStorageKey) === null;
-        }
-        catch {
-            return false;
-        }
+        return this.clearStagedPendingLaunch(staged.pendingLaunch, staged.authority);
     }
     hasStagedPendingLaunch(pendingLaunch) {
-        return (this.readStagedPendingLaunch()?.pendingLaunch.idempotencyKey ===
-            pendingLaunch.idempotencyKey);
+        const staged = this.readStagedPendingLaunch();
+        return Boolean(staged && this.pendingLaunchMatches(staged.pendingLaunch, pendingLaunch));
     }
     storeTransferAuthority(authority) {
         const current = this.readTransferAuthority();
@@ -15029,12 +15569,21 @@ class AiLiveAssist {
         if (!this.freshAiReturnProvisionalStorageKey)
             return null;
         try {
-            const serialized = sessionStorage.getItem(this.freshAiReturnProvisionalStorageKey);
-            const provisional = parseFreshAiReturnProvisional(serialized ? JSON.parse(serialized) : null);
-            if (serialized && !provisional) {
+            const v2Serialized = sessionStorage.getItem(this.freshAiReturnProvisionalStorageKey);
+            const parsedV2 = parseFreshAiReturnProvisional(v2Serialized ? JSON.parse(v2Serialized) : null);
+            const v2 = parsedV2?.v === 2 ? parsedV2 : null;
+            if (v2Serialized && !v2) {
                 sessionStorage.removeItem(this.freshAiReturnProvisionalStorageKey);
             }
-            return provisional;
+            if (v2)
+                return v2;
+            const legacySerialized = sessionStorage.getItem(this.legacyFreshAiReturnProvisionalStorageKey);
+            const parsedLegacy = parseFreshAiReturnProvisional(legacySerialized ? JSON.parse(legacySerialized) : null);
+            const legacy = parsedLegacy?.v === 1 ? parsedLegacy : null;
+            if (legacySerialized && !legacy) {
+                sessionStorage.removeItem(this.legacyFreshAiReturnProvisionalStorageKey);
+            }
+            return legacy;
         }
         catch {
             return null;
@@ -15044,9 +15593,54 @@ class AiLiveAssist {
         if (!this.freshAiReturnProvisionalStorageKey)
             return false;
         try {
-            sessionStorage.setItem(this.freshAiReturnProvisionalStorageKey, JSON.stringify(provisional));
+            const serialized = provisional.v === 1
+                ? {
+                    v: 1,
+                    linkId: provisional.linkId,
+                    conversationDisplayId: provisional.conversationDisplayId,
+                    mode: provisional.mode,
+                    phase: provisional.phase,
+                    launchIdempotencyKey: provisional.launchIdempotencyKey,
+                    sessionId: provisional.sessionId,
+                    expiresAt: provisional.expiresAt,
+                }
+                : provisional;
+            const storageKey = provisional.v === 2
+                ? this.freshAiReturnProvisionalStorageKey
+                : this.legacyFreshAiReturnProvisionalStorageKey;
+            sessionStorage.setItem(storageKey, JSON.stringify(serialized));
+            const normalized = provisional.v === 1
+                ? {
+                    ...provisional,
+                    protocolVersion: null,
+                    experienceMode: null,
+                    scopes: null,
+                }
+                : provisional;
+            const directReadback = parseFreshAiReturnProvisional(JSON.parse(sessionStorage.getItem(storageKey) ?? "null"));
+            if (canonicalJson(directReadback) !== canonicalJson(normalized)) {
+                return false;
+            }
+            if (provisional.v === 2) {
+                const legacySerialized = sessionStorage.getItem(this.legacyFreshAiReturnProvisionalStorageKey);
+                const legacy = parseFreshAiReturnProvisional(legacySerialized ? JSON.parse(legacySerialized) : null);
+                const sameReturnLineage = legacy?.v === 1 &&
+                    legacy.linkId === provisional.linkId &&
+                    legacy.conversationDisplayId === provisional.conversationDisplayId &&
+                    legacy.mode === provisional.mode &&
+                    legacy.expiresAt === provisional.expiresAt;
+                if (sameReturnLineage &&
+                    (legacy.phase === "released" ||
+                        provisional.phase === "released" ||
+                        (legacy.phase === provisional.phase &&
+                            legacy.launchIdempotencyKey ===
+                                provisional.launchIdempotencyKey &&
+                            legacy.sessionId === provisional.sessionId))) {
+                    sessionStorage.removeItem(this.legacyFreshAiReturnProvisionalStorageKey);
+                }
+            }
             return (canonicalJson(this.readFreshAiReturnProvisional()) ===
-                canonicalJson(provisional));
+                canonicalJson(normalized));
         }
         catch {
             return false;
@@ -15056,19 +15650,21 @@ class AiLiveAssist {
         if (!this.freshAiReturnProvisionalStorageKey)
             return;
         try {
-            const serialized = sessionStorage.getItem(this.freshAiReturnProvisionalStorageKey);
+            const storageKey = expected?.v === 1
+                ? this.legacyFreshAiReturnProvisionalStorageKey
+                : this.freshAiReturnProvisionalStorageKey;
+            const serialized = sessionStorage.getItem(storageKey);
             if (!serialized)
                 return;
             if (expected) {
                 const stored = parseFreshAiReturnProvisional(JSON.parse(serialized));
                 if (canonicalJson(stored) !== canonicalJson(expected))
                     return;
-                if (sessionStorage.getItem(this.freshAiReturnProvisionalStorageKey) !==
-                    serialized) {
+                if (sessionStorage.getItem(storageKey) !== serialized) {
                     return;
                 }
             }
-            sessionStorage.removeItem(this.freshAiReturnProvisionalStorageKey);
+            sessionStorage.removeItem(storageKey);
         }
         catch {
             /* noop */
@@ -15659,10 +16255,7 @@ class AiLiveAssist {
             !this.view ||
             (record &&
                 (!record.tabId ||
-                    record.protocolVersion !==
-                        (0, exports.resolveAiGuideProtocolVersion)(this.bootstrap) ||
-                    record.experienceMode !==
-                        (this.bootstrap.experienceMode ?? "standard"))) ||
+                    !resumeProtocolIsSupported(record, this.bootstrap))) ||
             (pendingLaunch &&
                 (this.visitorActiveTakeoverOnly ||
                     ((this.bootstrap.experienceMode ?? "standard") === "voice_presence" &&
@@ -15698,10 +16291,11 @@ class AiLiveAssist {
                 this.lock.release();
         };
         const preparedMatches = record
-            ? prepared?.resume?.sessionId === record.sessionId
+            ? Boolean(prepared?.resume &&
+                this.sameResumeAuthorityIdentity(prepared.resume, record))
             : Boolean(pendingLaunch &&
-                prepared?.pendingLaunch?.idempotencyKey ===
-                    pendingLaunch.idempotencyKey);
+                prepared?.pendingLaunch &&
+                this.pendingLaunchMatches(prepared.pendingLaunch, pendingLaunch));
         if (!payload ||
             (!record && !pendingLaunch) ||
             !this.bootstrap ||
@@ -15714,10 +16308,7 @@ class AiLiveAssist {
             !preparedMatches ||
             (record &&
                 (!record.tabId ||
-                    record.protocolVersion !==
-                        (0, exports.resolveAiGuideProtocolVersion)(this.bootstrap) ||
-                    record.experienceMode !==
-                        (this.bootstrap.experienceMode ?? "standard"))) ||
+                    !resumeProtocolIsSupported(record, this.bootstrap))) ||
             (pendingLaunch && this.visitorActiveTakeoverOnly)) {
             abandonUnusableCommit();
             return;
@@ -15729,7 +16320,7 @@ class AiLiveAssist {
                 return;
             }
             if (this.lastLaunch &&
-                this.lastLaunch.idempotencyKey !== stagedPending.idempotencyKey) {
+                !this.pendingLaunchMatches(this.lastLaunch, stagedPending)) {
                 this.clearStagedPendingLaunch(stagedPending, authority);
             }
             else {
@@ -15741,6 +16332,12 @@ class AiLiveAssist {
             return;
         }
         const storedResume = record ? this.readResume() : null;
+        if (record &&
+            storedResume?.sessionId === record.sessionId &&
+            !this.sameResumeAuthorityIdentity(record, storedResume)) {
+            abandonUnusableCommit();
+            return;
+        }
         const effectivePayload = record &&
             storedResume?.sessionId === record.sessionId &&
             storedResume.resumeCredential !== record.resumeCredential
@@ -15781,11 +16378,11 @@ class AiLiveAssist {
     completeFocusedTabRelinquish(value) {
         const payload = parseFocusedHandoffPayload(value);
         const sameResume = Boolean(payload?.resume &&
-            this.focusedHandoffInFlight?.resume?.sessionId ===
-                payload.resume.sessionId);
+            this.focusedHandoffInFlight?.resume &&
+            this.sameResumeAuthorityIdentity(this.focusedHandoffInFlight.resume, payload.resume));
         const samePendingLaunch = Boolean(payload?.pendingLaunch &&
-            this.focusedHandoffInFlight?.pendingLaunch?.idempotencyKey ===
-                payload.pendingLaunch.idempotencyKey);
+            this.focusedHandoffInFlight?.pendingLaunch &&
+            this.pendingLaunchMatches(this.focusedHandoffInFlight.pendingLaunch, payload.pendingLaunch));
         if (!payload || (!sameResume && !samePendingLaunch)) {
             return;
         }
@@ -15816,8 +16413,8 @@ class AiLiveAssist {
             this.clearStagedPendingLaunch(pendingLaunch, authority);
         }
         if (pendingLaunch &&
-            this.focusedHandoffInFlight?.pendingLaunch?.idempotencyKey ===
-                pendingLaunch.idempotencyKey) {
+            this.focusedHandoffInFlight?.pendingLaunch &&
+            this.pendingLaunchMatches(this.focusedHandoffInFlight.pendingLaunch, pendingLaunch)) {
             this.focusedHandoffInFlight = null;
             if (this.terminalRequestPending ||
                 this.ended ||
@@ -15839,7 +16436,7 @@ class AiLiveAssist {
             queueMicrotask(() => {
                 const retry = this.lastLaunch;
                 if (!retry ||
-                    retry.idempotencyKey !== pendingLaunch.idempotencyKey ||
+                    !this.pendingLaunchMatches(retry, pendingLaunch) ||
                     this.terminalRequestPending ||
                     this.ended ||
                     this.destroyed ||
@@ -15848,7 +16445,9 @@ class AiLiveAssist {
                     return;
                 }
                 this.lastLaunch = null;
-                void this.launch(retry.mode, retry.scopes, retry.idempotencyKey);
+                void this.launch(retry.mode, retry.scopes, retry.idempotencyKey, {
+                    pendingLaunch: retry,
+                });
             });
             return;
         }
@@ -15914,7 +16513,7 @@ class AiLiveAssist {
                 this.view &&
                 !this.visitorActiveTakeoverOnly) {
                 this.lastLaunch = null;
-                await this.launch(deferredLaunch.mode, deferredLaunch.scopes, deferredLaunch.idempotencyKey);
+                await this.launch(deferredLaunch.mode, deferredLaunch.scopes, deferredLaunch.idempotencyKey, { pendingLaunch: deferredLaunch });
                 return;
             }
             this.lock.release();