Skip to content

Commit 24feba4

Browse files
fix(web): a draft a retired session gave up on is recovered once write access returns
A retired save session whose queued draft could not be written, because write access dropped, left its retiring entry behind, so a later recovery of that exact draft was skipped and the edit never reached the file. The replacement now skips a recovered draft only while the retired session is still writing it as its last draft. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent eb347cd commit 24feba4

3 files changed

Lines changed: 49 additions & 14 deletions

File tree

‎apps/web/src/components/files/fileSaveCoordinator.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ export class FileSaveCoordinator<A = unknown, E = unknown> {
3434
return this.latestRevision === this.confirmedRevision ? null : this.latestContents;
3535
}
3636

37+
get writing(): boolean {
38+
return this.saving;
39+
}
40+
3741
dispose(): void {
3842
this.disposed = true;
3943
this.clearTimer();

‎apps/web/src/components/files/fileSaveSessions.test.ts‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,34 @@ describe("file save sessions", () => {
142142
expect(h.writes().at(-1)).toEqual([target, "X"]);
143143
});
144144

145+
it("recovers a draft that a retired session gave up on when write access dropped", async () => {
146+
using h = setup();
147+
let finishWrite = () => {};
148+
h.persist.mockImplementationOnce(
149+
() =>
150+
new Promise((resolve) => {
151+
finishWrite = () => resolve(AsyncResult.success(undefined));
152+
}),
153+
);
154+
const release = h.sessions.acquire(target, h.onPendingChange);
155+
h.sessions.change(target, "X");
156+
await vi.advanceTimersByTimeAsync(500);
157+
h.sessions.change(target, "Y");
158+
release();
159+
h.state.writable = false;
160+
finishWrite();
161+
await vi.runAllTimersAsync();
162+
h.state.unsaved = "Y";
163+
h.sessions.acquire(target, h.onPendingChange);
164+
h.state.writable = true;
165+
for (const onWritable of h.state.onWritable) onWritable();
166+
await vi.runAllTimersAsync();
167+
expect(h.writes()).toEqual([
168+
[target, "X"],
169+
[target, "Y"],
170+
]);
171+
});
172+
145173
it("stops notifying a surface's listener once it releases a shared session", async () => {
146174
using h = setup();
147175
const retiredListener = vi.fn();

‎apps/web/src/components/files/fileSaveSessions.ts‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,24 @@ interface FileSaveSession {
4949
*/
5050
export function createFileSaveSessions(deps: FileSaveSessionDeps) {
5151
const sessions = new Map<string, FileSaveSession>();
52-
// The draft a disposed session will write last. A replacement session must
53-
// not queue that same draft a second time, but must queue any other draft:
54-
// the retired session would otherwise overwrite it.
55-
const retiring = new Map<string, string>();
52+
// A disposed session that was left with an unwritten draft. A replacement
53+
// skips a recovered draft only while that session is writing it and it is
54+
// the session's last draft; a disposed session that is not writing never
55+
// writes again, and any other draft would be overwritten by its last one.
56+
const retiring = new Map<string, FileSaveCoordinator>();
5657

5758
const recover = (key: string, target: FileSaveTarget, coordinator: FileSaveCoordinator) => {
5859
if (!deps.canPersist(target)) return;
5960
const unsaved = deps.readUnsaved(target);
60-
if (unsaved !== null && retiring.get(key) !== unsaved) coordinator.change(unsaved);
61+
if (unsaved === null) return;
62+
const retired = retiring.get(key);
63+
if (retired && !retired.writing) retiring.delete(key);
64+
else if (retired?.unconfirmedContents === unsaved) return;
65+
coordinator.change(unsaved);
6166
};
6267

6368
const create = (key: string, target: FileSaveTarget): FileSaveSession => {
6469
const listeners = new Map<FilePendingListener, number>();
65-
let session: FileSaveSession | undefined;
6670
const coordinator = new FileSaveCoordinator({
6771
debounceMs: deps.debounceMs,
6872
canPersist: () => deps.canPersist(target),
@@ -78,11 +82,12 @@ export function createFileSaveSessions(deps: FileSaveSessionDeps) {
7882
succeeded = result._tag === "Success";
7983
return result;
8084
} finally {
81-
const live = sessions.get(key);
82-
if (live !== session && retiring.get(key) === contents) {
85+
// This was the retired session's last draft. A replacement skipped
86+
// it, and a disposed session never retries, so the live one picks
87+
// it up.
88+
if (retiring.get(key) === coordinator && coordinator.unconfirmedContents === contents) {
8389
retiring.delete(key);
84-
// A replacement session skipped this draft, and a disposed session
85-
// never retries, so the live one picks it up.
90+
const live = sessions.get(key);
8691
if (!succeeded && live) recover(key, target, live.coordinator);
8792
}
8893
}
@@ -92,8 +97,7 @@ export function createFileSaveSessions(deps: FileSaveSessionDeps) {
9297
const unsubscribeWritable = deps.subscribeWritable(target, () =>
9398
recover(key, target, coordinator),
9499
);
95-
session = { coordinator, listeners, unsubscribeWritable, leases: 0 };
96-
return session;
100+
return { coordinator, listeners, unsubscribeWritable, leases: 0 };
97101
};
98102

99103
const acquire = (target: FileSaveTarget, onPendingChange: FilePendingListener): (() => void) => {
@@ -118,8 +122,7 @@ export function createFileSaveSessions(deps: FileSaveSessionDeps) {
118122
}
119123
sessions.delete(key);
120124
session.unsubscribeWritable();
121-
const last = session.coordinator.unconfirmedContents;
122-
if (last !== null && deps.canPersist(target)) retiring.set(key, last);
125+
if (session.coordinator.unconfirmedContents !== null) retiring.set(key, session.coordinator);
123126
session.coordinator.dispose();
124127
};
125128
};

0 commit comments

Comments
 (0)