@loro-dev/streams-crdt 0.15.0 → 0.15.1

package/dist/flock.d.ts

@@ -1,4 +1,4 @@
-import { $ as WriteOnlyAppendResult, A as PayloadProtectionProviderConfig, B as StreamsAuthProvider, C as LocalSyncStats, D as PayloadProtectionOpenInput, E as PayloadProtectionKind, F as Result, G as TransportCreateStreamSuccess, H as StreamsCrdtShardUrlsOptions, I as SnapshotCodec, J as TransportJoinParams, K as TransportDeleteStreamSuccess, L as SnapshotTransformHook, M as PayloadProtectionSealInput, N as PayloadProtectionSealResult, O as PayloadProtectionOptions, P as PayloadProtectionWritePolicy, Q as TransportSyncSuccess, R as SnapshotUploadOptions, S as JsonValue, T as PayloadProtectionFailureReason, U as TransportCatchupParams, V as StreamsCrdtOptions, W as TransportCatchupSuccess, X as TransportSnapshotUploadSuccess, Y as TransportRoomStatus, Z as TransportSubscription, _ as EphemeralStreamCrdtOptions, a as StreamsCrdt, at as RemoteCursor, b as IsolatedCrdtAdapter, c as CrdtApplyReturn, ct as createInitialRemoteCursor, d as E2eeOptions, et as BeforeRemoteCursorSaveContext, f as E2eeProvider, g as EphemeralStreamAdaptor, h as E2eeWritePolicy, i as EphemeralStreamCrdt, it as IndexedDbRemoteCursorStoreOptions, j as PayloadProtectionReadPolicy, k as PayloadProtectionProvider, l as CrdtUnresolvedSpan, m as E2eeReadPolicy, n as PayloadProtectionError, nt as InMemoryRemoteCursorStore, o as CrdtAdapter, ot as RemoteCursorSaveSource, p as E2eeProviderConfig, q as TransportError, r as LocalAppendFailedError, rt as IndexedDbRemoteCursorStore, s as CrdtApplyOutcome, st as RemoteCursorStore, t as isValidRillId, tt as BeforeRemoteCursorSaveHook, u as CrdtUpdateBatch, v as EphemeralStreamJoinParams, w as PayloadProtectionContext, x as JsonObject, y as EphemeralStreamSubscription, z as StreamsAuthContext } from "./stream-id-CO65-58E.js";
+import { $ as WriteOnlyAppendResult, A as PayloadProtectionProviderConfig, B as StreamsAuthProvider, C as LocalSyncStats, D as PayloadProtectionOpenInput, E as PayloadProtectionKind, F as Result, G as TransportCreateStreamSuccess, H as StreamsCrdtShardUrlsOptions, I as SnapshotCodec, J as TransportJoinParams, K as TransportDeleteStreamSuccess, L as SnapshotTransformHook, M as PayloadProtectionSealInput, N as PayloadProtectionSealResult, O as PayloadProtectionOptions, P as PayloadProtectionWritePolicy, Q as TransportSyncSuccess, R as SnapshotUploadOptions, S as JsonValue, T as PayloadProtectionFailureReason, U as TransportCatchupParams, V as StreamsCrdtOptions, W as TransportCatchupSuccess, X as TransportSnapshotUploadSuccess, Y as TransportRoomStatus, Z as TransportSubscription, _ as EphemeralStreamCrdtOptions, a as StreamsCrdt, at as RemoteCursor, b as IsolatedCrdtAdapter, c as CrdtApplyReturn, ct as createInitialRemoteCursor, d as E2eeOptions, et as BeforeRemoteCursorSaveContext, f as E2eeProvider, g as EphemeralStreamAdaptor, h as E2eeWritePolicy, i as EphemeralStreamCrdt, it as IndexedDbRemoteCursorStoreOptions, j as PayloadProtectionReadPolicy, k as PayloadProtectionProvider, l as CrdtUnresolvedSpan, m as E2eeReadPolicy, n as PayloadProtectionError, nt as InMemoryRemoteCursorStore, o as CrdtAdapter, ot as RemoteCursorSaveSource, p as E2eeProviderConfig, q as TransportError, r as LocalAppendFailedError, rt as IndexedDbRemoteCursorStore, s as CrdtApplyOutcome, st as RemoteCursorStore, t as isValidRillId, tt as BeforeRemoteCursorSaveHook, u as CrdtUpdateBatch, v as EphemeralStreamJoinParams, w as PayloadProtectionContext, x as JsonObject, y as EphemeralStreamSubscription, z as StreamsAuthContext } from "./stream-id-CVCOLgSp.js";
 import { ExportBundle, Flock, VersionVector, VersionVector as VersionVector$1 } from "@loro-dev/flock-wasm";
 
 //#region src/flock.d.ts

package/dist/flock.js

@@ -1,4 +1,4 @@
-import { a as createInitialRemoteCursor, c as PayloadProtectionError, i as IndexedDbRemoteCursorStore, n as StreamsCrdt, o as EphemeralStreamCrdt, r as InMemoryRemoteCursorStore, s as LocalAppendFailedError, t as isValidRillId } from "./stream-id-CggbAC6b.js";
+import { a as createInitialRemoteCursor, c as PayloadProtectionError, i as IndexedDbRemoteCursorStore, n as StreamsCrdt, o as EphemeralStreamCrdt, r as InMemoryRemoteCursorStore, s as LocalAppendFailedError, t as isValidRillId } from "./stream-id-BygPTNvQ.js";
 import { Flock } from "@loro-dev/flock-wasm";
 //#region src/flock.ts
 function isAfter(entry, current) {

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { $ as WriteOnlyAppendResult, A as PayloadProtectionProviderConfig, B as StreamsAuthProvider, C as LocalSyncStats, D as PayloadProtectionOpenInput, E as PayloadProtectionKind, F as Result, G as TransportCreateStreamSuccess, H as StreamsCrdtShardUrlsOptions, I as SnapshotCodec, J as TransportJoinParams, K as TransportDeleteStreamSuccess, L as SnapshotTransformHook, M as PayloadProtectionSealInput, N as PayloadProtectionSealResult, O as PayloadProtectionOptions, P as PayloadProtectionWritePolicy, Q as TransportSyncSuccess, R as SnapshotUploadOptions, S as JsonValue, T as PayloadProtectionFailureReason, U as TransportCatchupParams, V as StreamsCrdtOptions, W as TransportCatchupSuccess, X as TransportSnapshotUploadSuccess, Y as TransportRoomStatus, Z as TransportSubscription, _ as EphemeralStreamCrdtOptions, a as StreamsCrdt, at as RemoteCursor, b as IsolatedCrdtAdapter, c as CrdtApplyReturn, ct as createInitialRemoteCursor, d as E2eeOptions, et as BeforeRemoteCursorSaveContext, f as E2eeProvider, g as EphemeralStreamAdaptor, h as E2eeWritePolicy, i as EphemeralStreamCrdt, it as IndexedDbRemoteCursorStoreOptions, j as PayloadProtectionReadPolicy, k as PayloadProtectionProvider, l as CrdtUnresolvedSpan, m as E2eeReadPolicy, n as PayloadProtectionError, nt as InMemoryRemoteCursorStore, o as CrdtAdapter, ot as RemoteCursorSaveSource, p as E2eeProviderConfig, q as TransportError, r as LocalAppendFailedError, rt as IndexedDbRemoteCursorStore, s as CrdtApplyOutcome, st as RemoteCursorStore, t as isValidRillId, tt as BeforeRemoteCursorSaveHook, u as CrdtUpdateBatch, v as EphemeralStreamJoinParams, w as PayloadProtectionContext, x as JsonObject, y as EphemeralStreamSubscription, z as StreamsAuthContext } from "./stream-id-CO65-58E.js";
+import { $ as WriteOnlyAppendResult, A as PayloadProtectionProviderConfig, B as StreamsAuthProvider, C as LocalSyncStats, D as PayloadProtectionOpenInput, E as PayloadProtectionKind, F as Result, G as TransportCreateStreamSuccess, H as StreamsCrdtShardUrlsOptions, I as SnapshotCodec, J as TransportJoinParams, K as TransportDeleteStreamSuccess, L as SnapshotTransformHook, M as PayloadProtectionSealInput, N as PayloadProtectionSealResult, O as PayloadProtectionOptions, P as PayloadProtectionWritePolicy, Q as TransportSyncSuccess, R as SnapshotUploadOptions, S as JsonValue, T as PayloadProtectionFailureReason, U as TransportCatchupParams, V as StreamsCrdtOptions, W as TransportCatchupSuccess, X as TransportSnapshotUploadSuccess, Y as TransportRoomStatus, Z as TransportSubscription, _ as EphemeralStreamCrdtOptions, a as StreamsCrdt, at as RemoteCursor, b as IsolatedCrdtAdapter, c as CrdtApplyReturn, ct as createInitialRemoteCursor, d as E2eeOptions, et as BeforeRemoteCursorSaveContext, f as E2eeProvider, g as EphemeralStreamAdaptor, h as E2eeWritePolicy, i as EphemeralStreamCrdt, it as IndexedDbRemoteCursorStoreOptions, j as PayloadProtectionReadPolicy, k as PayloadProtectionProvider, l as CrdtUnresolvedSpan, m as E2eeReadPolicy, n as PayloadProtectionError, nt as InMemoryRemoteCursorStore, o as CrdtAdapter, ot as RemoteCursorSaveSource, p as E2eeProviderConfig, q as TransportError, r as LocalAppendFailedError, rt as IndexedDbRemoteCursorStore, s as CrdtApplyOutcome, st as RemoteCursorStore, t as isValidRillId, tt as BeforeRemoteCursorSaveHook, u as CrdtUpdateBatch, v as EphemeralStreamJoinParams, w as PayloadProtectionContext, x as JsonObject, y as EphemeralStreamSubscription, z as StreamsAuthContext } from "./stream-id-CVCOLgSp.js";
 export { BeforeRemoteCursorSaveContext, BeforeRemoteCursorSaveHook, CrdtAdapter, CrdtApplyOutcome, CrdtApplyReturn, CrdtUnresolvedSpan, CrdtUpdateBatch, PayloadProtectionError as E2eeError, PayloadProtectionError, E2eeOptions, E2eeProvider, E2eeProviderConfig, E2eeReadPolicy, E2eeWritePolicy, EphemeralStreamAdaptor, EphemeralStreamCrdt, EphemeralStreamCrdtOptions, EphemeralStreamJoinParams, EphemeralStreamSubscription, InMemoryRemoteCursorStore, IndexedDbRemoteCursorStore, IndexedDbRemoteCursorStoreOptions, IsolatedCrdtAdapter, JsonObject, JsonValue, LocalAppendFailedError, LocalSyncStats, PayloadProtectionContext, PayloadProtectionFailureReason, PayloadProtectionKind, PayloadProtectionOpenInput, PayloadProtectionOptions, PayloadProtectionProvider, PayloadProtectionProviderConfig, PayloadProtectionReadPolicy, PayloadProtectionSealInput, PayloadProtectionSealResult, PayloadProtectionWritePolicy, RemoteCursor, RemoteCursorSaveSource, RemoteCursorStore, Result, SnapshotCodec, SnapshotTransformHook, SnapshotUploadOptions, StreamsAuthContext, StreamsAuthProvider, StreamsCrdt, StreamsCrdtOptions, StreamsCrdtShardUrlsOptions, TransportCatchupParams, TransportCatchupSuccess, TransportCreateStreamSuccess, TransportDeleteStreamSuccess, TransportError, TransportJoinParams, TransportRoomStatus, TransportSnapshotUploadSuccess, TransportSubscription, TransportSyncSuccess, WriteOnlyAppendResult, createInitialRemoteCursor, isValidRillId };

package/dist/index.js

@@ -1,2 +1,2 @@
-import { a as createInitialRemoteCursor, c as PayloadProtectionError, i as IndexedDbRemoteCursorStore, n as StreamsCrdt, o as EphemeralStreamCrdt, r as InMemoryRemoteCursorStore, s as LocalAppendFailedError, t as isValidRillId } from "./stream-id-CggbAC6b.js";
+import { a as createInitialRemoteCursor, c as PayloadProtectionError, i as IndexedDbRemoteCursorStore, n as StreamsCrdt, o as EphemeralStreamCrdt, r as InMemoryRemoteCursorStore, s as LocalAppendFailedError, t as isValidRillId } from "./stream-id-BygPTNvQ.js";
 export { PayloadProtectionError as E2eeError, PayloadProtectionError, EphemeralStreamCrdt, InMemoryRemoteCursorStore, IndexedDbRemoteCursorStore, LocalAppendFailedError, StreamsCrdt, createInitialRemoteCursor, isValidRillId };

package/dist/loro.d.ts

@@ -1,4 +1,4 @@
-import { $ as WriteOnlyAppendResult, A as PayloadProtectionProviderConfig, B as StreamsAuthProvider, C as LocalSyncStats, D as PayloadProtectionOpenInput, E as PayloadProtectionKind, F as Result, G as TransportCreateStreamSuccess, H as StreamsCrdtShardUrlsOptions, I as SnapshotCodec, J as TransportJoinParams, K as TransportDeleteStreamSuccess, L as SnapshotTransformHook, M as PayloadProtectionSealInput, N as PayloadProtectionSealResult, O as PayloadProtectionOptions, P as PayloadProtectionWritePolicy, Q as TransportSyncSuccess, R as SnapshotUploadOptions, S as JsonValue, T as PayloadProtectionFailureReason, U as TransportCatchupParams, V as StreamsCrdtOptions, W as TransportCatchupSuccess, X as TransportSnapshotUploadSuccess, Y as TransportRoomStatus, Z as TransportSubscription, _ as EphemeralStreamCrdtOptions, a as StreamsCrdt, at as RemoteCursor, b as IsolatedCrdtAdapter, c as CrdtApplyReturn, ct as createInitialRemoteCursor, d as E2eeOptions, et as BeforeRemoteCursorSaveContext, f as E2eeProvider, g as EphemeralStreamAdaptor, h as E2eeWritePolicy, i as EphemeralStreamCrdt, it as IndexedDbRemoteCursorStoreOptions, j as PayloadProtectionReadPolicy, k as PayloadProtectionProvider, l as CrdtUnresolvedSpan, m as E2eeReadPolicy, n as PayloadProtectionError, nt as InMemoryRemoteCursorStore, o as CrdtAdapter, ot as RemoteCursorSaveSource, p as E2eeProviderConfig, q as TransportError, r as LocalAppendFailedError, rt as IndexedDbRemoteCursorStore, s as CrdtApplyOutcome, st as RemoteCursorStore, t as isValidRillId, tt as BeforeRemoteCursorSaveHook, u as CrdtUpdateBatch, v as EphemeralStreamJoinParams, w as PayloadProtectionContext, x as JsonObject, y as EphemeralStreamSubscription, z as StreamsAuthContext } from "./stream-id-CO65-58E.js";
+import { $ as WriteOnlyAppendResult, A as PayloadProtectionProviderConfig, B as StreamsAuthProvider, C as LocalSyncStats, D as PayloadProtectionOpenInput, E as PayloadProtectionKind, F as Result, G as TransportCreateStreamSuccess, H as StreamsCrdtShardUrlsOptions, I as SnapshotCodec, J as TransportJoinParams, K as TransportDeleteStreamSuccess, L as SnapshotTransformHook, M as PayloadProtectionSealInput, N as PayloadProtectionSealResult, O as PayloadProtectionOptions, P as PayloadProtectionWritePolicy, Q as TransportSyncSuccess, R as SnapshotUploadOptions, S as JsonValue, T as PayloadProtectionFailureReason, U as TransportCatchupParams, V as StreamsCrdtOptions, W as TransportCatchupSuccess, X as TransportSnapshotUploadSuccess, Y as TransportRoomStatus, Z as TransportSubscription, _ as EphemeralStreamCrdtOptions, a as StreamsCrdt, at as RemoteCursor, b as IsolatedCrdtAdapter, c as CrdtApplyReturn, ct as createInitialRemoteCursor, d as E2eeOptions, et as BeforeRemoteCursorSaveContext, f as E2eeProvider, g as EphemeralStreamAdaptor, h as E2eeWritePolicy, i as EphemeralStreamCrdt, it as IndexedDbRemoteCursorStoreOptions, j as PayloadProtectionReadPolicy, k as PayloadProtectionProvider, l as CrdtUnresolvedSpan, m as E2eeReadPolicy, n as PayloadProtectionError, nt as InMemoryRemoteCursorStore, o as CrdtAdapter, ot as RemoteCursorSaveSource, p as E2eeProviderConfig, q as TransportError, r as LocalAppendFailedError, rt as IndexedDbRemoteCursorStore, s as CrdtApplyOutcome, st as RemoteCursorStore, t as isValidRillId, tt as BeforeRemoteCursorSaveHook, u as CrdtUpdateBatch, v as EphemeralStreamJoinParams, w as PayloadProtectionContext, x as JsonObject, y as EphemeralStreamSubscription, z as StreamsAuthContext } from "./stream-id-CVCOLgSp.js";
 import { LoroDoc } from "loro-crdt";
 
 //#region src/loro.d.ts

package/dist/loro.js

@@ -1,4 +1,4 @@
-import { a as createInitialRemoteCursor, c as PayloadProtectionError, i as IndexedDbRemoteCursorStore, n as StreamsCrdt, o as EphemeralStreamCrdt, r as InMemoryRemoteCursorStore, s as LocalAppendFailedError, t as isValidRillId } from "./stream-id-CggbAC6b.js";
+import { a as createInitialRemoteCursor, c as PayloadProtectionError, i as IndexedDbRemoteCursorStore, n as StreamsCrdt, o as EphemeralStreamCrdt, r as InMemoryRemoteCursorStore, s as LocalAppendFailedError, t as isValidRillId } from "./stream-id-BygPTNvQ.js";
 import { LoroDoc, VersionVector, decodeImportBlobMeta } from "loro-crdt";
 //#region src/loro.ts
 function batchImportUpdates(doc, updates) {

package/dist/{stream-id-CggbAC6b.js → stream-id-BygPTNvQ.js}

@@ -2066,11 +2066,32 @@ function createInitialRemoteCursor(input) {
 }
 //#endregion
 //#region src/transport-cursor.ts
+const MAX_SPANS_IN_MESSAGE = 8;
+/**
+* Renders a bounded summary of unresolved spans for the error message, so a
+* caller's error log names the author(s) whose ops are missing from the
+* stream without the caller having to unwrap `error.unresolved` itself.
+*/
+function formatUnresolvedSpans(unresolved) {
+	if (unresolved.length === 0) return "";
+	const shown = unresolved.slice(0, MAX_SPANS_IN_MESSAGE).map((span) => `${span.peer}@[${span.start}..${span.end})`).join(", ");
+	const suffix = unresolved.length > MAX_SPANS_IN_MESSAGE ? `, +${unresolved.length - MAX_SPANS_IN_MESSAGE} more` : "";
+	return ` (missing deps for ${unresolved.length} span(s): ${shown}${suffix})`;
+}
 var CrdtApplyIncompleteError = class extends Error {
 	unresolved;
-	constructor(unresolved) {
-		super("CRDT apply incomplete: unresolved remote updates remain");
+	/**
+	* The volatile server version at the moment apply failed: everything the
+	* server delivered that the local doc actually applied (success spans
+	* only — pending spans never advance it). `exportUpdates(appliedVersion)`
+	* is therefore exactly "the ops this replica holds that the server does
+	* not", which is what the join-time salvage append publishes.
+	*/
+	appliedVersion;
+	constructor(unresolved, appliedVersion) {
+		super(`CRDT apply incomplete: unresolved remote updates remain${formatUnresolvedSpans(unresolved)}`);
 		this.unresolved = unresolved;
+		this.appliedVersion = appliedVersion;
 	}
 };
 function isApplyOutcome(value) {
@@ -2098,6 +2119,22 @@ var TransportCursorManager = class {
 	isCursorComplete(cursor) {
 		return !this.incompleteCursors.has(cursor);
 	}
+	/**
+	* Marks `cursor` incomplete without an apply.
+	*
+	* The `CrdtApplyIncompleteError` throw path discards its candidate cursor
+	* BEFORE the usual WeakMap marking, so a caller's retained cursor keeps
+	* whatever completeness it had. For a caught-up live room the first
+	* poisoned event typically arrives with `up_to_date=true`, so the retained
+	* cursor still reads "complete" for the whole wedge — leaving the degraded
+	* local flush unengaged and the snapshot-upload clean gate open, exactly
+	* the two consumers keyed on this marking. The read loop calls this when
+	* it catches the error so the room's incomplete state is visible on the
+	* cursor it actually holds.
+	*/
+	markCursorIncomplete(cursor, unresolved) {
+		this.incompleteCursors.set(cursor, unresolved);
+	}
 	async applyBootstrapPayload(cursor, snapshot, updates, nextOffset, upToDate = false) {
 		let nextVersion = cursor.serverLowerBoundVersion;
 		let complete = true;
@@ -2171,7 +2208,7 @@ var TransportCursorManager = class {
 	}
 	async finalizeCursor(cursor, source, complete, unresolved, upToDate) {
 		if (!complete) {
-			if (upToDate) throw new CrdtApplyIncompleteError(unresolved);
+			if (upToDate) throw new CrdtApplyIncompleteError(unresolved, cursor.serverLowerBoundVersion);
 			this.incompleteCursors.set(cursor, unresolved);
 			return cursor;
 		}
@@ -2326,6 +2363,7 @@ function createJoinState(cursor, liveMode = "sse") {
 		pendingLocal: new Deque(),
 		flushingLocal: false,
 		retryAttempt: 0,
+		incompleteRecoveryAttempt: 0,
 		retrySleepController: new AbortController(),
 		readLoopRunning: false,
 		readErrorRetryAttempt: 0,
@@ -2909,7 +2947,13 @@ var StreamsCrdt = class StreamsCrdt {
 	async startJoin(state) {
 		try {
 			state.requestController ??= new AbortController();
-			const joined = await this.performInitialJoinSync(state.liveMode, state.requestController?.signal);
+			let joined;
+			try {
+				joined = await this.performInitialJoinSync(state.liveMode, state.requestController?.signal);
+			} catch (error) {
+				if (!(error instanceof CrdtApplyIncompleteError) || state.closed || !await this.salvageLocalBacklogOnIncompleteInitialSync(state, error)) throw error;
+				joined = await this.performInitialJoinSync(state.liveMode, state.requestController?.signal);
+			}
 			state.cursor = joined.cursor;
 			state.streamCursor = joined.streamCursor;
 			state.liveMode = joined.liveMode;
@@ -2941,6 +2985,65 @@ var StreamsCrdt = class StreamsCrdt {
 			throw error;
 		}
 	}
+	/**
+	* Join-time salvage for a stream whose head cannot be fully applied
+	* (apply_incomplete at `up_to_date`, even after bootstrap): before the
+	* join surfaces the error, durably append everything this replica holds
+	* that the server does not.
+	*
+	* Why this exists: the dual-author wedge is usually two-sided — the stream
+	* is missing some author's ops, and a replica that HOLDS those ops (e.g.
+	* received out-of-band over a local data plane) may itself be unable to
+	* complete the join because of a second gap. The regular join-time export
+	* runs only AFTER a successful initial sync, so without this salvage such
+	* a replica can never publish the healing ops, and its own backlog from a
+	* previous process run stays local for as long as the stream stays
+	* poisoned.
+	*
+	* `error.appliedVersion` advances only from success spans, so
+	* `exportUpdates(appliedVersion)` is exactly "ops this replica holds that
+	* the server does not" — the failed initial sync already imported
+	* everything the server DOES have, so the delta cannot re-append
+	* server-known data. Cursor safety is untouched: the append is write-only
+	* style (producer-acked, no read catch-up, no durable-cursor save), and
+	* the retried initial sync re-derives its cursor from the server.
+	*
+	* Returns `true` when anything was durably appended; the caller then
+	* retries the initial sync once. Best-effort: a salvage failure logs and
+	* returns `false` so the original apply-incomplete error is what callers
+	* observe.
+	*/
+	async salvageLocalBacklogOnIncompleteInitialSync(state, error) {
+		const appliedVersion = error.appliedVersion;
+		if (appliedVersion == null) return false;
+		try {
+			const appended = await this.enqueueExclusive(async () => {
+				let didAppend = false;
+				const frozen = this.frozenLocalAppend;
+				if (frozen != null) {
+					const ack = await this.appendFrozenLocalBatchRemote(frozen);
+					this.commitProducerAck(ack.producerAck);
+					didAppend = true;
+				}
+				await this.adapter.flushLocalExports?.();
+				const localBatch = this.exportUpdates(appliedVersion);
+				if (localBatch.batch != null) {
+					const appendedBatch = await this.appendLocalBatchRemote({
+						...state.cursor,
+						serverLowerBoundVersion: appliedVersion
+					}, localBatch.batch, void 0, "direct");
+					this.commitProducerAck(appendedBatch.producerAck);
+					didAppend = true;
+				}
+				return didAppend;
+			});
+			if (appended) this.logDebug("join salvage appended local backlog", { streamUrl: this.streamUrl });
+			return appended;
+		} catch (salvageError) {
+			this.logError("join salvage append failed", salvageError, { streamUrl: this.streamUrl });
+			return false;
+		}
+	}
 	async syncOnce(operation, parentSignal) {
 		let cursor = (await this.finalizeDirectLocalAppendIfNeeded(await this.resolveInitialRemoteState(operation, parentSignal))).cursor;
 		const localBatch = this.exportUpdates(cursor.serverLowerBoundVersion);
@@ -2955,8 +3058,11 @@ var StreamsCrdt = class StreamsCrdt {
 		let liveMode = preferredLiveMode;
 		const exportedLocal = this.exportUpdates(localExportRefVersion);
 		localExportRefVersion = exportedLocal.nextRefVersion;
-		if (exportedLocal.batch != null) {
-			const committed = await this.appendLocalBatchDurably(cursor, exportedLocal.batch, void 0, "direct", streamCursor);
+		const exportedBatch = exportedLocal.batch;
+		if (exportedBatch != null) {
+			const appendCursor = cursor;
+			const appendStreamCursor = streamCursor;
+			const committed = await this.enqueueExclusive(() => this.appendLocalBatchDurably(appendCursor, exportedBatch, void 0, "direct", appendStreamCursor));
 			cursor = committed.cursor;
 			streamCursor = committed.streamCursor;
 		}
@@ -3116,7 +3222,8 @@ var StreamsCrdt = class StreamsCrdt {
 			};
 		}
 	}
-	async recoverLiveIncompleteRemoteApply(state) {
+	async recoverLiveIncompleteRemoteApply(state, error) {
+		this.cursorManager.markCursorIncomplete(state.cursor, error.unresolved);
 		try {
 			const bootstrapped = await this.bootstrapState({
 				...state.cursor,
@@ -3126,6 +3233,7 @@ var StreamsCrdt = class StreamsCrdt {
 			state.cursor = bootstrapped.cursor;
 			state.streamCursor = bootstrapped.streamCursor;
 			state.retryAttempt = 0;
+			state.incompleteRecoveryAttempt = 0;
 			state.lastError = void 0;
 			this.setReadSubStatus(state, "ok");
 			if (state.pendingLocal.length > 0) this.flushPendingLocal(state);
@@ -3137,7 +3245,10 @@ var StreamsCrdt = class StreamsCrdt {
 				code: classified.code
 			});
 			state.lastError = toTransportError(error);
+			if (state.pendingLocal.length > 0) this.flushPendingLocal(state);
 			if (classified.retriable && !isAuthOrProtocolError(error)) {
+				state.incompleteRecoveryAttempt += 1;
+				state.retryAttempt = Math.max(state.retryAttempt, state.incompleteRecoveryAttempt);
 				this.setReadSubStatus(state, "reconnecting");
 				return "retry";
 			}
@@ -3613,7 +3724,7 @@ var StreamsCrdt = class StreamsCrdt {
 				if (state.closed) return;
 				if (error instanceof CrdtApplyIncompleteError) {
 					if (capturedController?.signal.aborted && state.requestController === capturedController) state.requestController = new AbortController();
-					const recovery = await this.recoverLiveIncompleteRemoteApply(state);
+					const recovery = await this.recoverLiveIncompleteRemoteApply(state, error);
 					if (recovery === "recovered") continue;
 					if (recovery === "terminal") return;
 					if (await this.awaitReadRetryBackoff(state, error)) continue;
@@ -3647,7 +3758,7 @@ var StreamsCrdt = class StreamsCrdt {
 					const flushError = abortReason instanceof Error ? abortReason : error;
 					if (flushError instanceof CrdtApplyIncompleteError) {
 						if (state.requestController === capturedController) state.requestController = new AbortController();
-						const recovery = await this.recoverLiveIncompleteRemoteApply(state);
+						const recovery = await this.recoverLiveIncompleteRemoteApply(state, flushError);
 						if (recovery === "recovered") continue;
 						if (recovery === "terminal") return;
 						if (await this.awaitReadRetryBackoff(state, flushError)) continue;
@@ -3742,10 +3853,15 @@ var StreamsCrdt = class StreamsCrdt {
 	* `"error"` write status (with `lastWriteError` set) and then retries via
 	* this flush's own backoff timer (`maybeScheduleWriteRetry`) — it does not
 	* depend on a future local op to re-trigger the flush.
+	*
+	* While the cursor is incomplete (unresolved remote spans), the flush
+	* degrades to an append-only mode instead of pausing: batches still reach
+	* the server, but read progress, durable-cursor saves, and snapshot
+	* scheduling stay untouched. See the inline comment in the incomplete
+	* branch and specs/loro-pending.md "Local Append Rules".
 	*/
 	async flushPendingLocal(state) {
 		if (state.flushingLocal || state.closed) return;
-		if (!this.cursorManager.isCursorComplete(state.cursor)) return;
 		this.clearWriteRetryTimer(state);
 		state.flushingLocal = true;
 		try {
@@ -3754,16 +3870,23 @@ var StreamsCrdt = class StreamsCrdt {
 				if (drained == null) return;
 				let attempts = 0;
 				while (!state.closed) try {
-					state.cursor = await this.enqueueExclusive(async () => this.appendLocalBatch(state.cursor, drained.batch, drained.count, state.streamCursor));
-					const committedStreamCursor = this.consumeCommittedLocalStreamCursor();
-					if (committedStreamCursor != null) state.streamCursor = committedStreamCursor;
-					const committedCount = this.consumeCommittedPendingCount() ?? drained.count;
+					let committedCount;
+					if (this.cursorManager.isCursorComplete(state.cursor)) {
+						state.cursor = await this.enqueueExclusive(async () => this.appendLocalBatch(state.cursor, drained.batch, drained.count, state.streamCursor));
+						const committedStreamCursor = this.consumeCommittedLocalStreamCursor();
+						if (committedStreamCursor != null) state.streamCursor = committedStreamCursor;
+						committedCount = this.consumeCommittedPendingCount() ?? drained.count;
+						this.snapshotManager.schedule(state);
+					} else {
+						const appended = await this.enqueueExclusive(async () => this.appendLocalBatchRemote(state.cursor, drained.batch, drained.count, "pending"));
+						this.commitProducerAck(appended.producerAck);
+						committedCount = appended.pendingCount ?? drained.count;
+					}
 					for (let i = 0; i < committedCount; i += 1) state.pendingLocal.popFront();
 					this.notifySyncWaiters(state, committedCount);
 					state.flushHeadBatchOnly = false;
 					state.lastWriteError = void 0;
 					this.setWriteSubStatus(state, "ok");
-					this.snapshotManager.schedule(state);
 					break;
 				} catch (error) {
 					if (isPayloadTooLargeError(error) && drained.count > 1 && this.abandonPendingFrozenLocalAppend()) {
@@ -3857,12 +3980,15 @@ var StreamsCrdt = class StreamsCrdt {
 		for (const waiter of state.syncWaiters.splice(0)) waiter.reject(error);
 	}
 	async saveRemoteCursor(cursor, source) {
-		return await persistRemoteCursor({
+		const saved = await persistRemoteCursor({
 			remoteCursorStore: this.remoteCursorStore,
 			cursor,
 			source,
 			beforeRemoteCursorSave: this.beforeRemoteCursorSave
 		});
+		const state = this.joinState;
+		if (state != null && !state.closed) state.incompleteRecoveryAttempt = 0;
+		return saved;
 	}
 	setReadSubStatus(state, sub) {
 		if (sub === "ok") state.readErrorRetryAttempt = 0;
@@ -3945,4 +4071,4 @@ function isValidRillId(id) {
 //#endregion
 export { createInitialRemoteCursor as a, PayloadProtectionError as c, IndexedDbRemoteCursorStore as i, StreamsCrdt as n, EphemeralStreamCrdt as o, InMemoryRemoteCursorStore as r, LocalAppendFailedError as s, isValidRillId as t };
 
-//# sourceMappingURL=stream-id-CggbAC6b.js.map
+//# sourceMappingURL=stream-id-BygPTNvQ.js.map