@q9labsai/chalk-client 5.2.2 → 5.2.4

package/dist/{chunk-XPW3OCPO.js → chunk-LDPC2JZB.js}

@@ -2,11 +2,11 @@ import {
   CloudflareSFUClient,
   createCloudflareSFUHTTPTransport,
   describeMediaCaptureError
-} from "./chunk-DWKTGBHR.js";
+} from "./chunk-3ASKGMD3.js";
 import {
   AccessGrantError,
   requireParsedAccessGrant
-} from "./chunk-GA3JDPFI.js";
+} from "./chunk-AZONR3Q3.js";
 import {
   ChatAttachmentMimeTypeSchema,
   ChatReactionSetFrameSchema,
@@ -20,7 +20,7 @@ import {
   formatSyncConnectDiagnostic,
   scheduleSyncDialDeadline,
   syncConnectFailureCode
-} from "./chunk-AIJ5Z6HA.js";
+} from "./chunk-5YPQNMJE.js";
 
 // src/access/manager.ts
 import { Clock, Context, Data, Effect, Layer, SynchronizedRef } from "effect";
@@ -59,7 +59,7 @@ var makeConnectionAccessLayer = (provider, refreshWindowMs = DEFAULT_REFRESH_WIN
         automaticMediaReplacementListeners.add(listener);
         return () => automaticMediaReplacementListeners.delete(listener);
       }),
-      requiresRefresh: millisecondsUntilRefresh.pipe(Effect.map((milliseconds) => milliseconds === null || milliseconds === 0)),
+      requiresRefresh: millisecondsUntilRefresh.pipe(Effect.map((milliseconds2) => milliseconds2 === null || milliseconds2 === 0)),
       millisecondsUntilRefresh,
       clear: SynchronizedRef.set(state, { access: null })
     };
@@ -333,7 +333,8 @@ var WhiteboardV1ProtocolMetadata = {
   extensions: {
     presentation: {
       name: "presentation_v1",
-      exactFields: ["name"]
+      exactFields: ["name"],
+      presenterExactFields: ["name", "presenter"]
     },
     view: {
       name: "view_v1",
@@ -655,7 +656,7 @@ function isExtensions(value) {
   const drawPolicyLast = value.length > 0 && isExtension(value[value.length - 1], drawPolicy);
   const base = drawPolicyLast ? value.slice(0, -1) : value;
   if (base.length === 0) return drawPolicyLast;
-  return (base.length === 1 || base.length === 2) && isExtension(base[0], presentation) && (base.length === 1 || isExtension(base[1], view) || hasExactKeys(base[1], view.ownerExactFields) && base[1].name === view.name && base[1].origins === true && base[1].owner === true || hasExactKeys(base[1], view.extendedExactFields) && base[1].name === view.name && base[1].origins === true);
+  return (base.length === 1 || base.length === 2) && (isExtension(base[0], presentation) || hasExactKeys(base[0], presentation.presenterExactFields) && base[0].name === presentation.name && base[0].presenter === true) && (base.length === 1 || isExtension(base[1], view) || hasExactKeys(base[1], view.ownerExactFields) && base[1].name === view.name && base[1].origins === true && base[1].owner === true || hasExactKeys(base[1], view.extendedExactFields) && base[1].name === view.name && base[1].origins === true);
 }
 function isDrawPolicy(value) {
   return typeof value === "string" && WhiteboardV1ProtocolMetadata.drawPolicies.some((policy) => policy === value);
@@ -664,6 +665,10 @@ function isDrawGrant(value) {
   return hasExactKeys(value, WhiteboardV1ProtocolMetadata.frames.drawAccess.grantExactFields) && isUuid(value.participant_id) && typeof value.can_draw === "boolean";
 }
 function isWelcome(value) {
+  if ("presenter_id" in value) {
+    const { presenter_id, ...welcome } = value;
+    return (presenter_id === null || isUuid(presenter_id)) && isWelcome(welcome);
+  }
   if ("view_owner_id" in value) {
     const { view_owner_id, ...welcome } = value;
     return isUuid(view_owner_id) && isWelcome(welcome);
@@ -671,6 +676,13 @@ function isWelcome(value) {
   const exact = hasExactRecordKeys(value, WhiteboardV1ProtocolMetadata.frames.welcome.exactFields) || hasExactRecordKeys(value, WhiteboardV1ProtocolMetadata.frames.welcome.extendedExactFields) && typeof value.presenting === "boolean";
   return exact && value.protocol === "whiteboard-v1" && isUuid(value.participant_id) && Number.isSafeInteger(value.participant_generation) && Number(value.participant_generation) > 0 && isCapabilities(value.capabilities) && isCapabilities(value.participant_capabilities) && isUuid(value.scene_id) && isUnsignedDecimal(value.revision) && typeof value.can_draw === "boolean";
 }
+function isPresentationUpdated(value) {
+  if ("presenter_id" in value) {
+    const { presenter_id, ...frame } = value;
+    return (presenter_id === null || isUuid(presenter_id)) && isPresentationUpdated(frame);
+  }
+  return hasExactRecordKeys(value, WhiteboardV1ProtocolMetadata.frames.presentationUpdated.exactFields) && isUuid(value.scene_id) && isUnsignedDecimal(value.revision) && typeof value.presenting === "boolean";
+}
 function isServerFrame(value) {
   if (!isRecord2(value)) return false;
   switch (value.type) {
@@ -693,7 +705,7 @@ function isServerFrame(value) {
     case "draw_access":
       return hasExactKeys(value, WhiteboardV1ProtocolMetadata.frames.drawAccess.exactFields) && isDrawPolicy(value.policy) && typeof value.can_draw === "boolean" && isCapabilities(value.capabilities) && Array.isArray(value.grants) && value.grants.length <= WhiteboardV1ProtocolLimits.drawAccessMaxGrants && value.grants.every(isDrawGrant);
     case "presentation_updated":
-      return hasExactKeys(value, WhiteboardV1ProtocolMetadata.frames.presentationUpdated.exactFields) && isUuid(value.scene_id) && isUnsignedDecimal(value.revision) && typeof value.presenting === "boolean";
+      return isPresentationUpdated(value);
     case "reset_required":
       return hasExactKeys(value, WhiteboardV1ProtocolMetadata.frames.resetRequired.exactFields) && isUuid(value.scene_id) && typeof value.reason === "string" && WhiteboardV1ProtocolMetadata.resetReasons.some((reason) => reason === value.reason);
     case "operation_error":
@@ -1066,7 +1078,8 @@ var ChalkWhiteboardV1Client = class {
   #presentationSupported = false;
   #viewsSupported = false;
   #presenting = false;
-  #hello = "owner-view";
+  #presenterId = null;
+  #hello = "presenter-view";
   #viewSequence = 0;
   #viewOwnerId = null;
   #viewVersions = new ChalkWhiteboardViewVersions();
@@ -1119,7 +1132,7 @@ var ChalkWhiteboardV1Client = class {
     if (this.#started && this.#startPromise) return this.#startPromise;
     this.#started = true;
     globalThis.document?.addEventListener("visibilitychange", this.#visibilityChanged);
-    this.#hello = "owner-view";
+    this.#hello = "presenter-view";
     this.#rejectedHelloRetries = 0;
     this.#viewsSupported = false;
     this.#phase = "connecting";
@@ -1173,6 +1186,7 @@ var ChalkWhiteboardV1Client = class {
     this.#drawPolicy = null;
     this.#drawPermissions = [];
     this.#presenting = false;
+    this.#presenterId = null;
     this.#publishSummary("unsubscribed", null);
   }
   subscribe(listener) {
@@ -1489,6 +1503,7 @@ var ChalkWhiteboardV1Client = class {
         this.#sceneId = frame.scene_id;
         this.#revision = frame.revision;
         this.#presenting = frame.presenting;
+        this.#presenterId = frame.presenter_id ?? null;
         this.#publishSummary("ready", null);
         return;
       case "reset_required":
@@ -1561,7 +1576,13 @@ var ChalkWhiteboardV1Client = class {
     this.#drawPolicy = null;
     this.#drawPermissions = [];
     this.#presentationSupported = "presenting" in frame;
-    this.#presenting = "presenting" in frame ? frame.presenting : false;
+    if ("presenting" in frame) {
+      this.#presenting = frame.presenting;
+      this.#presenterId = frame.presenter_id ?? null;
+    } else {
+      this.#presenting = false;
+      this.#presenterId = null;
+    }
     const refused = !drawPolicyNegotiated(this.#hello) && this.#dropPolicyChanges();
     this.#publishSummary("loading", refused ? policyUnavailable() : null);
     this.#clearHeartbeat();
@@ -1865,7 +1886,7 @@ var ChalkWhiteboardV1Client = class {
     if (step === "fail") return false;
     if (step === "step-down") return this.#stepDownHello();
     if (step === "retry-hello") return this.#retryHello();
-    if (phase === "live") this.#hello = "owner-view";
+    if (phase === "live") this.#hello = "presenter-view";
     return true;
   }
   #stepDownHello() {
@@ -1989,6 +2010,7 @@ var ChalkWhiteboardV1Client = class {
       drawPolicy: this.#drawPolicy,
       drawPermissions: this.#drawPermissions,
       presenting: this.#presenting,
+      presenterId: this.#presenterId,
       error: this.#summaryError
     };
   }
@@ -2134,7 +2156,7 @@ var ChalkWhiteboardV1Client = class {
     return this.#options.clock ?? {
       now: Date.now,
       monotonicNow: () => globalThis.performance.now(),
-      setTimeout: (callback, milliseconds) => globalThis.setTimeout(callback, milliseconds),
+      setTimeout: (callback, milliseconds2) => globalThis.setTimeout(callback, milliseconds2),
       clearTimeout: (handle) => globalThis.clearTimeout(handle)
     };
   }
@@ -2193,19 +2215,20 @@ function operationName(frame) {
 function retryableOperationCode(code) {
   return code === "unavailable" || code === "overloaded" || code === "rate_limited" || code === "storage_unavailable";
 }
-var HELLO_LEVELS = ["owner-view", "draw-policy", "versioned-view", "view", "presentation", "legacy"];
+var HELLO_LEVELS = ["presenter-view", "owner-view", "draw-policy", "versioned-view", "view", "presentation", "legacy"];
 function viewsNegotiated(level) {
-  return level === "owner-view" || level === "draw-policy" || level === "versioned-view" || level === "view";
+  return level === "presenter-view" || level === "owner-view" || level === "draw-policy" || level === "versioned-view" || level === "view";
 }
 function viewOriginsNegotiated(level) {
-  return level === "owner-view" || level === "draw-policy" || level === "versioned-view";
+  return level === "presenter-view" || level === "owner-view" || level === "draw-policy" || level === "versioned-view";
 }
 function drawPolicyNegotiated(level) {
-  return level === "owner-view" || level === "draw-policy";
+  return level === "presenter-view" || level === "owner-view" || level === "draw-policy";
 }
 function helloFrame(level, token, cursor) {
   const hello = { type: "hello", protocol: "whiteboard-v1", token, cursor };
   if (level === "legacy") return hello;
+  if (level === "presenter-view") return { ...hello, extensions: [{ name: "presentation_v1", presenter: true }, { name: "view_v1", origins: true, owner: true }, { name: "draw_policy_v1" }] };
   if (level === "presentation") return { ...hello, extensions: [{ name: "presentation_v1" }] };
   if (level === "view") return { ...hello, extensions: [{ name: "presentation_v1" }, { name: "view_v1" }] };
   if (level === "versioned-view") return { ...hello, extensions: [{ name: "presentation_v1" }, { name: "view_v1", origins: true }] };
@@ -2265,6 +2288,124 @@ function createChalkWhiteboardV1Client(options) {
   });
 }
 
+// src/connection/report.ts
+var MAX_EVENTS = 64;
+var MAX_BYTES = 32768;
+var MAX_MS = 2147483647;
+var COOLDOWN_MS = 6e4;
+var participantCooldowns = /* @__PURE__ */ new Map();
+var milliseconds = (value) => Math.max(0, Math.min(MAX_MS, Math.round(Number.isFinite(value) ? value : 0)));
+var optionalMilliseconds = (value) => value == null ? void 0 : milliseconds(value);
+function reserveParticipantReport(access, now) {
+  const key = `${access.subject.tenantId}:${access.subject.participantId}`;
+  for (const [participant, until] of participantCooldowns) if (until <= now) participantCooldowns.delete(participant);
+  if (participantCooldowns.has(key)) return false;
+  if (participantCooldowns.size >= 128) participantCooldowns.delete(participantCooldowns.keys().next().value ?? "");
+  participantCooldowns.set(key, now + COOLDOWN_MS);
+  return true;
+}
+var ConnectionReporter = class {
+  #events = [];
+  #startedAt;
+  #options;
+  #pending = null;
+  #unsubscribe;
+  #controller = null;
+  #retryOnReconnect = false;
+  #disposed = false;
+  constructor(options) {
+    this.#options = options;
+    this.#startedAt = options.now();
+  }
+  recordDiagnostic(diagnostic) {
+    this.#record({
+      event: diagnostic.event,
+      elapsed_ms: this.#elapsed(),
+      state: diagnostic.state,
+      step: diagnostic.step,
+      outcome: diagnostic.outcome,
+      code: diagnostic.code,
+      attempt: optionalMilliseconds(diagnostic.attempt),
+      duration_ms: optionalMilliseconds(diagnostic.sync?.durationMs ?? diagnostic.durationMs),
+      close_code: diagnostic.sync?.closeCode ?? void 0,
+      heartbeat_gap_ms: optionalMilliseconds(diagnostic.recovery?.lastHeartbeatReplyAgoMs)
+    });
+    if (diagnostic.event === "recovery_exhausted") this.#report("recovery_exhausted");
+    else if (diagnostic.event === "connection_failed") this.#report(diagnostic.state === "joining" ? "join_failed" : "connection_lost");
+  }
+  recordTransport(event) {
+    this.#record({
+      event: event.event,
+      elapsed_ms: this.#elapsed(),
+      ...event.phase ? { phase: event.phase } : {},
+      ...event.attempt == null ? {} : { attempt: milliseconds(event.attempt) },
+      ...event.duration_ms == null ? {} : { duration_ms: milliseconds(event.duration_ms) },
+      ...event.heartbeat_gap_ms == null ? {} : { heartbeat_gap_ms: milliseconds(event.heartbeat_gap_ms) },
+      ...event.close_code == null ? {} : { close_code: event.close_code },
+      ...event.http_status == null ? {} : { http_status: event.http_status }
+    });
+  }
+  dispose() {
+    this.#disposed = true;
+    this.#controller?.abort();
+    this.#stopListening();
+    this.#pending = null;
+    this.#events.length = 0;
+  }
+  get traceparent() {
+    return this.#options.traceparent;
+  }
+  #elapsed() {
+    return milliseconds(this.#options.now() - this.#startedAt);
+  }
+  #record(event) {
+    if (this.#disposed) return;
+    this.#events.push(event);
+    if (this.#events.length > MAX_EVENTS) this.#events.shift();
+  }
+  #report(trigger) {
+    if (this.#disposed || this.#pending) return;
+    const access = this.#options.access();
+    if (!access) return;
+    if (!reserveParticipantReport(access, this.#options.now())) return;
+    const events = this.#events.slice();
+    const report = { version: 1, trigger, events };
+    while (events.length && new TextEncoder().encode(JSON.stringify(report)).byteLength > MAX_BYTES) events.shift();
+    if (!events.length) return;
+    this.#pending = { access, report, attempts: 0 };
+    this.#unsubscribe = this.#options.subscribeOnline(() => {
+      this.#retryOnReconnect = true;
+      void this.#flush();
+    });
+    void this.#flush();
+  }
+  async #flush() {
+    const pending = this.#pending;
+    if (!pending || this.#controller || this.#disposed || !this.#options.online()) return;
+    this.#retryOnReconnect = false;
+    const controller = new AbortController();
+    this.#controller = controller;
+    pending.attempts += 1;
+    const timer = globalThis.setTimeout(() => controller.abort(), 5e3);
+    try {
+      await this.#options.send(pending.access, pending.report, controller.signal, this.traceparent);
+      this.#pending = null;
+    } catch {
+      if (pending.attempts >= 2) this.#pending = null;
+    } finally {
+      globalThis.clearTimeout(timer);
+      this.#controller = null;
+      if (!this.#pending) this.#stopListening();
+      if (this.#retryOnReconnect) void this.#flush();
+    }
+  }
+  #stopListening() {
+    this.#unsubscribe?.();
+    this.#unsubscribe = void 0;
+    this.#retryOnReconnect = false;
+  }
+};
+
 // src/connection/types.ts
 var ConnectionError = class extends Error {
   code;
@@ -2336,9 +2477,34 @@ function createDefaultConnectionDependencies(options) {
   return {
     clock: {
       now: () => Date.now(),
-      setTimeout: (callback, milliseconds) => globalThis.setTimeout(callback, milliseconds),
+      setTimeout: (callback, milliseconds2) => globalThis.setTimeout(callback, milliseconds2),
       clearTimeout: (handle) => globalThis.clearTimeout(handle)
     },
+    createConnectionReporter: (access) => {
+      const random = globalThis.crypto;
+      if (!random?.randomUUID) return void 0;
+      return new ConnectionReporter({
+        traceparent: `00-${random.randomUUID().replaceAll("-", "")}-${random.randomUUID().replaceAll("-", "").slice(0, 16)}-01`,
+        now: () => performance.now(),
+        access,
+        online: () => globalThis.navigator?.onLine !== false,
+        subscribeOnline: (listener) => {
+          globalThis.window?.addEventListener("online", listener);
+          return () => globalThis.window?.removeEventListener("online", listener);
+        },
+        send: async (grant, report, signal, traceparent) => {
+          const response = await fetch(`${options.apiBaseURL.replace(/\/$/, "")}/v1/tenants/${encodeURIComponent(grant.subject.tenantId)}/connection-reports`, {
+            method: "POST",
+            headers: { Authorization: `Bearer ${grant.media.token}`, "Content-Type": "application/json", traceparent },
+            body: JSON.stringify(report),
+            signal,
+            keepalive: true,
+            credentials: "omit"
+          });
+          await response.body?.cancel();
+        }
+      });
+    },
     mediaDevices: createBrowserMediaDevices(),
     cancelPendingAdmission: async (access, signal) => {
       const { tenantId, spaceId, episodeId, participantId } = access.subject;
@@ -2403,6 +2569,8 @@ function createMediaClient(apiBaseURL, input) {
     transport: createCloudflareSFUHTTPTransport({
       apiBaseURL,
       credential: input.credential,
+      onDiagnostic: input.onTransportDiagnostic,
+      traceparent: input.traceparent,
       tenantId: subject.tenantId,
       spaceId: subject.spaceId,
       episodeId: subject.episodeId,
@@ -2444,6 +2612,8 @@ function bindConnectionMediaClient(client, restart) {
 function createSyncClient(syncURL, input) {
   return createV1SyncClient({
     url: syncURL,
+    onDiagnostic: input.onTransportDiagnostic,
+    traceparent: input.traceparent,
     token: input.token,
     mediaPlane: input.media,
     collaboration: { name: "collaboration_v2", chatCursor: { afterSequence: null, retainedFloorSequence: null } },
@@ -2475,7 +2645,7 @@ function whiteboardURL(syncURL) {
 }
 
 // src/foreground-deadline.ts
-function scheduleForegroundDeadline(clock, milliseconds, expired) {
+function scheduleForegroundDeadline(clock, milliseconds2, expired) {
   let timer;
   let cancelled = false;
   const arm = () => {
@@ -2483,9 +2653,9 @@ function scheduleForegroundDeadline(clock, milliseconds, expired) {
     timer = clock.setTimeout(() => {
       if (cancelled) return;
       const elapsed = clock.now() - started;
-      if (typeof document !== "undefined" && document.visibilityState === "hidden" || elapsed > milliseconds + 2e3 || elapsed < 0) arm();
+      if (typeof document !== "undefined" && document.visibilityState === "hidden" || elapsed > milliseconds2 + 2e3 || elapsed < 0) arm();
       else expired();
-    }, milliseconds);
+    }, milliseconds2);
   };
   arm();
   return () => {
@@ -2518,6 +2688,22 @@ var ConnectionDiagnostics = class {
     } catch {
     }
   }
+  recordRecoveryExhausted(input) {
+    const { state, epoch, code, attempts, transport } = input;
+    this.record({
+      event: "recovery_exhausted",
+      state,
+      epoch,
+      code,
+      recovery: {
+        reference: `connection.${code}`,
+        attempts,
+        transport,
+        lastHeartbeatReplyAgoMs: transport?.lastHeartbeatReplyAt == null ? null : Math.max(0, this.#now() - transport.lastHeartbeatReplyAt),
+        visibilityState: typeof document === "undefined" ? null : document.visibilityState
+      }
+    });
+  }
   snapshot() {
     return Object.freeze([...this.#events]);
   }
@@ -2555,6 +2741,7 @@ var MEDIA_RECOVERY_TIMEOUT_MS = 6e4;
 var START_TIMEOUT_MS = 3e4;
 var LEAVE_TIMEOUT_MS = 5e3;
 var RECOVERY_BUDGET_MS = 1e4;
+var SYNC_RECOVERY_BUDGET_MS = MEDIA_RECOVERY_TIMEOUT_MS;
 var MAX_RECOVERY_ATTEMPTS = 3;
 var REFRESH_RETRY_MS = 5e3;
 var RECONNECT_GRACE_MS = 250;
@@ -2595,7 +2782,16 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
     const clock = yield* Clock2.Clock;
     const context = yield* Effect2.context();
     const serviceScope = yield* Effect2.scope;
-    const diagnostics = new ConnectionDiagnostics({ now: () => clock.currentTimeMillisUnsafe(), ...options.diagnostics });
+    const reporter = platform.createConnectionReporter?.(access.currentUnsafe);
+    const diagnostics = new ConnectionDiagnostics({
+      now: () => clock.currentTimeMillisUnsafe(),
+      ...options.diagnostics,
+      onEvent: (event) => {
+        reporter?.recordDiagnostic(event);
+        options.diagnostics?.onEvent?.(event);
+      }
+    });
+    const onTransportDiagnostic = (event) => reporter?.recordTransport(event);
     const snapshotRef = yield* SubscriptionRef.make(idleSnapshot());
     const queue = yield* Queue.unbounded();
     const listeners = /* @__PURE__ */ new Set();
@@ -2638,10 +2834,10 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
     };
     const mediaAttempt = { expiresAt: null };
     const foreign7 = (operation, code = "internal_error", message = "A browser transport operation failed") => Effect2.tryPromise({ try: operation, catch: (cause) => accessRejected(cause) ? lifecycleFailure("invalid_access", false, "Access was rejected", cause) : lifecycleFailure(code, true, message, cause) });
-    const withinForegroundBudget = (effect, milliseconds, failure2) => Effect2.raceFirst(
+    const withinForegroundBudget = (effect, milliseconds2, failure2) => Effect2.raceFirst(
       effect,
       Effect2.callback((resume) => {
-        const cancel = scheduleForegroundDeadline(platform.clock, milliseconds, () => resume(Effect2.fail(typeof failure2 === "function" ? failure2() : failure2)));
+        const cancel = scheduleForegroundDeadline(platform.clock, milliseconds2, () => resume(Effect2.fail(typeof failure2 === "function" ? failure2() : failure2)));
         return Effect2.sync(cancel);
       })
     );
@@ -2702,10 +2898,10 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
     const scheduleRefresh = (delay) => Effect2.gen(function* () {
       yield* stopRefresh();
       if (!active(model)) return;
-      const milliseconds = delay ?? (yield* access.millisecondsUntilRefresh) ?? 0;
+      const milliseconds2 = delay ?? (yield* access.millisecondsUntilRefresh) ?? 0;
       const scope = model.activeScope;
       if (!scope) return;
-      model.refreshFiber = yield* Effect2.forkIn(Effect2.sleep(Math.max(0, milliseconds)).pipe(Effect2.andThen(enqueue(refreshAccess())), Effect2.ignore), scope);
+      model.refreshFiber = yield* Effect2.forkIn(Effect2.sleep(Math.max(0, milliseconds2)).pipe(Effect2.andThen(enqueue(refreshAccess())), Effect2.ignore), scope);
     });
     const refreshAccess = () => Effect2.gen(function* () {
       const scope = model.activeScope;
@@ -2884,6 +3080,8 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
                 if (media === model.media) mediaAttempt.expiresAt = platform.clock.now() + MEDIA_RECOVERY_TIMEOUT_MS;
                 return replacement.media;
               }),
+              onTransportDiagnostic,
+              traceparent: reporter?.traceparent,
               onFailure: () => enqueueBackground(handleMediaFailure()),
               onScreenEnded: () => enqueueBackground(notifyScreenEnded())
             }),
@@ -2894,7 +3092,7 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
         const sync = yield* trace(
           "create_sync_client",
           Effect2.try({
-            try: () => platform.createSyncClient({ access: grant, token: () => toPromise(access.getSyncToken()), media }),
+            try: () => platform.createSyncClient({ access: grant, token: () => toPromise(access.getSyncToken()), media, onTransportDiagnostic, traceparent: reporter?.traceparent }),
             catch: (cause) => accessRejected(cause) ? lifecycleFailure("invalid_access", false, "Access was rejected", cause) : lifecycleFailure("sync_start_failed", true, "The sync layer could not start", cause)
           })
         );
@@ -3049,7 +3247,8 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
           const syncAttempt = { client: null, expiresAt: null, started: true };
           while (model.epoch === epoch && active(model)) {
             const plan = yield* recoveryPlan(model.recoveryQueued ?? kind);
-            const outcome = yield* attemptRecovery(plan, mediaAttempt, syncAttempt).pipe(
+            let attempts = 0;
+            const outcome = yield* attemptRecovery(plan, mediaAttempt, syncAttempt, () => attempts++).pipe(
               Effect2.match({
                 onSuccess: (attempt) => ({ attempt, failure: null }),
                 onFailure: (failure2) => ({ attempt: null, failure: failure2 })
@@ -3067,9 +3266,18 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
             yield* enqueue(
               Effect2.gen(function* () {
                 if (model.epoch !== epoch || !active(model)) return;
+                if (plan.kind === "sync" && model.sync?.getSnapshot().connection.phase === "live") {
+                  model.recoveryQueued = "media";
+                  return;
+                }
                 const code = plan.kind === "media" ? "media_recovery_exhausted" : "sync_recovery_exhausted";
+                const transport = model.sync?.getSnapshot().connection.recoveryDiagnostic ?? null;
+                diagnostics.recordRecoveryExhausted({ state: model.state, epoch, code, attempts, transport });
+                if (plan.kind === "sync") {
+                  yield* failForSnapshot(lifecycleFailure(code, true, "Connection lost. Rejoin to continue."));
+                  return;
+                }
                 model.failure = toFailure(lifecycleFailure(code, true, "Connection interrupted. Reconnecting in the background."));
-                diagnostics.record({ event: "recovery_exhausted", state: model.state, epoch, code });
                 yield* publish();
               })
             );
@@ -3085,19 +3293,19 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
     const recoveryPlan = (kind) => Clock2.currentTimeMillis.pipe(
       Effect2.map((now) => ({
         kind,
-        deadline: now + boundedInteger(options.recovery?.budgetMs, RECOVERY_BUDGET_MS, 1, 6e4),
+        deadline: now + boundedInteger(options.recovery?.budgetMs, kind === "sync" ? SYNC_RECOVERY_BUDGET_MS : RECOVERY_BUDGET_MS, 1, 6e4),
         attempts: boundedInteger(options.recovery?.maxAttempts, MAX_RECOVERY_ATTEMPTS, 1, 10),
         delays: options.recovery?.backoffMs?.length ? options.recovery.backoffMs : [100, 250, 500]
       }))
     );
-    const attemptRecovery = (plan, mediaAttempt2, syncAttempt) => Effect2.gen(function* () {
+    const attemptRecovery = (plan, mediaAttempt2, syncAttempt, onAttempt) => Effect2.gen(function* () {
       for (let attempt = 1; attempt <= plan.attempts; attempt += 1) {
         const remaining = plan.deadline - (yield* Clock2.currentTimeMillis);
         if (remaining <= 0) return null;
+        onAttempt();
         diagnostics.record({ event: "recovery_attempt", state: model.state, epoch: model.epoch, attempt });
         const failure2 = yield* recoveryOperation(mediaAttempt2, syncAttempt).pipe(
-          Effect2.timeout(remaining),
-          Effect2.catchTag("TimeoutError", () => Effect2.fail(lifecycleFailure("sync_start_failed", true, "Connection recovery is still waiting for the transport"))),
+          (effect) => withinForegroundBudget(effect, remaining, lifecycleFailure("sync_start_failed", true, "Connection recovery is still waiting for the transport")),
           Effect2.match({ onSuccess: () => null, onFailure: (cause) => cause })
         );
         if (failure2 === null) return attempt;
@@ -3210,7 +3418,7 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
         attempt.expiresAt = now + MEDIA_RECOVERY_TIMEOUT_MS;
       }
       if ((attempt.started || snapshot.connection.phase !== "idle") && (yield* syncNeedsReplacement(snapshot))) return yield* restartSync(attempt);
-      yield* waitForSyncLive(sync, boundedInteger(options.recovery?.budgetMs, RECOVERY_BUDGET_MS, 1, 6e4));
+      yield* waitForSyncLive(sync, boundedInteger(options.recovery?.budgetMs, SYNC_RECOVERY_BUDGET_MS, 1, 6e4));
     });
     const restartSync = (attempt) => Effect2.gen(function* () {
       const epoch = model.epoch;
@@ -3224,7 +3432,7 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
           model.syncBindingCleanup?.();
           model.sync = null;
           const sync2 = yield* Effect2.try({
-            try: () => platform.createSyncClient({ access: grant, token: () => toPromise(access.getSyncToken()), media }),
+            try: () => platform.createSyncClient({ access: grant, token: () => toPromise(access.getSyncToken()), media, onTransportDiagnostic, traceparent: reporter?.traceparent }),
             catch: (cause) => lifecycleFailure("sync_start_failed", true, "The sync layer could not start", cause)
           });
           model.sync = sync2;
@@ -3241,7 +3449,7 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
           else if (attempt.client === sync) attempt.started = true;
         })
       ).pipe(
-        Effect2.andThen(waitForSyncLive(sync, boundedInteger(options.recovery?.budgetMs, RECOVERY_BUDGET_MS, 1, 6e4))),
+        Effect2.andThen(waitForSyncLive(sync, boundedInteger(options.recovery?.budgetMs, SYNC_RECOVERY_BUDGET_MS, 1, 6e4))),
         Effect2.andThen(Effect2.suspend(() => sync === model.sync && model.epoch === epoch && active(model) ? confirmSyncEntry(sync) : Effect2.fail(lifecycleFailure("invalid_state", false, "Sync recovery was superseded")))),
         Effect2.tapError(
           () => enqueue(
@@ -3292,6 +3500,7 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
       yield* transition("left");
     });
     const syncNeedsRecovery = (snapshot) => active(model) && (snapshot.connection.phase === "connecting" || snapshot.connection.phase === "recovering" || snapshot.connection.phase === "terminal");
+    const mediaNeedsRecovery = (snapshot) => active(model) && (snapshot.connection.phase === "recovering" || snapshot.connection.phase === "failed" && snapshot.failure?.recoverable === true);
     const recordFailure = (failure2) => Effect2.sync(() => {
       diagnostics.record({ event: "connection_failed", state: model.state, epoch: model.epoch, code: failure2.code, ...failure2.sync ? { sync: failure2.sync } : {} });
     });
@@ -3304,8 +3513,10 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
     const handleMediaSnapshot = (media, snapshot) => Effect2.gen(function* () {
       if (media !== model.media || media.getSnapshot() !== snapshot) return;
       if (snapshot === model.mediaSnapshot) return;
+      const phase = mediaDiagnosticPhase(snapshot);
+      if (phase !== mediaDiagnosticPhase(model.mediaSnapshot)) onTransportDiagnostic({ event: "media_state", phase });
       model.mediaSnapshot = snapshot;
-      if (active(model) && (snapshot.connection.phase === "recovering" || snapshot.connection.phase === "failed" && snapshot.failure?.recoverable)) yield* recover("media");
+      if (mediaNeedsRecovery(snapshot)) yield* recover("media");
       yield* publish();
     });
     const handleMediaFailure = () => model.media ? handleMediaSnapshot(model.media, model.media.getSnapshot()) : Effect2.void;
@@ -3369,6 +3580,7 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
     yield* Effect2.addFinalizer(
       () => Effect2.gen(function* () {
         model.closed = true;
+        reporter?.dispose();
         accessReplacementUnsubscribe();
         foregroundUnsubscribe?.();
         if (activeJoin) yield* Fiber.interrupt(activeJoin);
@@ -3442,7 +3654,7 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
       ),
       runPortCommand: (operation) => withFreshAccess(operation),
       nowUnsafe: () => clock.currentTimeMillisUnsafe(),
-      scheduleUnsafe: (callback, milliseconds) => platform.clock.setTimeout(callback, milliseconds),
+      scheduleUnsafe: (callback, milliseconds2) => platform.clock.setTimeout(callback, milliseconds2),
       cancelScheduleUnsafe: (handle) => platform.clock.clearTimeout(handle),
       createId: () => platform.createId?.() ?? `local-${++fallbackIdentifier}`
     };
@@ -3568,6 +3780,9 @@ function syncPhase(phase) {
   if (phase === "connecting") return "connecting";
   return "idle";
 }
+function mediaDiagnosticPhase(snapshot) {
+  return snapshot?.connection.peerConnectionState ?? snapshot?.connection.phase;
+}
 function mediaPhase(phase) {
   if (phase === "live") return "healthy";
   if (phase === "recovering") return "recovering";
@@ -6237,6 +6452,7 @@ var WhiteboardControllerRuntime = class {
       drawPolicy: summary.drawPolicy,
       drawPermissions: Object.freeze(summary.drawPermissions.map((permission) => Object.freeze({ ...permission }))),
       presenting: summary.presenting,
+      presenterId: summary.presenterId ?? null,
       error: summary.error ? Object.freeze({ ...summary.error }) : null
     });
     this.#publish();
@@ -6255,7 +6471,7 @@ var WhiteboardControllerRuntime = class {
   #publish() {
     const slice = Object.freeze({
       open: this.#summary.status !== "unsubscribed",
-      engine: Object.freeze({ status: this.#summary.status, sceneId: this.#summary.sceneId, revision: this.#summary.revision, presenting: this.#summary.presenting, error: this.#summary.error }),
+      engine: Object.freeze({ status: this.#summary.status, sceneId: this.#summary.sceneId, revision: this.#summary.revision, presenting: this.#summary.presenting, presenterId: this.#summary.presenterId ?? null, error: this.#summary.error }),
       access: Object.freeze({ canDraw: this.#summary.canDraw, policy: this.#summary.drawPolicy, permissions: this.#summary.drawPermissions })
     });
     const current = this.#store.getSnapshot().whiteboard;
@@ -6264,7 +6480,7 @@ var WhiteboardControllerRuntime = class {
   }
 };
 function sameWhiteboard(left, right) {
-  return left.open === right.open && left.engine.status === right.engine.status && left.engine.sceneId === right.engine.sceneId && left.engine.revision === right.engine.revision && left.engine.presenting === right.engine.presenting && sameError2(left.engine.error, right.engine.error) && sameAccess(left.access, right.access);
+  return left.open === right.open && left.engine.status === right.engine.status && left.engine.sceneId === right.engine.sceneId && left.engine.revision === right.engine.revision && left.engine.presenting === right.engine.presenting && left.engine.presenterId === right.engine.presenterId && sameError2(left.engine.error, right.engine.error) && sameAccess(left.access, right.access);
 }
 function sameAccess(left, right) {
   return left.canDraw === right.canDraw && left.policy === right.policy && left.permissions.length === right.permissions.length && left.permissions.every((permission, index) => permission.participantId === right.permissions[index]?.participantId && permission.canDraw === right.permissions[index]?.canDraw);
@@ -6359,7 +6575,9 @@ var makeSpaceClientCoreLayer = (options, platform = {}) => {
     diagnostics: {
       onEvent: (event) => {
         platform.onConnectionDiagnostic?.(event);
-        options.logger?.debug?.("SpaceClient connection event", { event: event.event, state: event.state, epoch: event.epoch, ...event.code ? { code: event.code } : {}, ...event.sync ? { sync: event.sync } : {} });
+        const attributes = { event: event.event, state: event.state, epoch: event.epoch, ...event.code ? { code: event.code } : {}, ...event.sync ? { sync: event.sync } : {}, ...event.recovery ? { recovery: event.recovery } : {} };
+        if (event.event === "recovery_exhausted") options.logger?.warn?.("SpaceClient connection event", attributes);
+        else options.logger?.debug?.("SpaceClient connection event", attributes);
       }
     }
   });

package/dist/{chunk-6LNRDKJF.js → chunk-SYUGRHZ5.js}

@@ -1,7 +1,7 @@
 import {
   createChalkEffectClient,
   parseAccessGrant
-} from "./chunk-GA3JDPFI.js";
+} from "./chunk-AZONR3Q3.js";
 
 // src/public-invites/client.ts
 import { Effect } from "effect";