Skip to content

Commit eb347cd

Browse files
fix(web): a recovered draft is no longer overwritten by a retired session's newer write
A replacement save session skipped a recovered draft whenever it matched the retired session's in-flight write. When the retired session also had a newer draft queued behind that write, the replacement dropped the recovered draft and the retired session's queued one landed last. The skip now compares against the draft the retired session will write last. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent baa5d68 commit eb347cd

3 files changed

Lines changed: 39 additions & 9 deletions

File tree

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ export class FileSaveCoordinator<A = unknown, E = unknown> {
2929
this.schedule(this.options.debounceMs);
3030
}
3131

32+
/** The newest contents not yet written, which is the last write this coordinator will make. */
33+
get unconfirmedContents(): string | null {
34+
return this.latestRevision === this.confirmedRevision ? null : this.latestContents;
35+
}
36+
3237
dispose(): void {
3338
this.disposed = true;
3439
this.clearTimer();

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,27 @@ describe("file save sessions", () => {
121121
expect(h.writes()).toEqual([[target, "draft"]]);
122122
});
123123

124+
it("queues a recovered draft that a retired session will overwrite with a newer one", async () => {
125+
using h = setup();
126+
let finishWrite = () => {};
127+
h.persist.mockImplementationOnce(
128+
() =>
129+
new Promise((resolve) => {
130+
finishWrite = () => resolve(AsyncResult.success(undefined));
131+
}),
132+
);
133+
const release = h.sessions.acquire(target, h.onPendingChange);
134+
h.sessions.change(target, "X");
135+
await vi.advanceTimersByTimeAsync(500);
136+
h.sessions.change(target, "Y");
137+
release();
138+
h.state.unsaved = "X";
139+
h.sessions.acquire(target, h.onPendingChange);
140+
finishWrite();
141+
await vi.runAllTimersAsync();
142+
expect(h.writes().at(-1)).toEqual([target, "X"]);
143+
});
144+
124145
it("stops notifying a surface's listener once it releases a shared session", async () => {
125146
using h = setup();
126147
const retiredListener = vi.fn();

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,15 @@ interface FileSaveSession {
4949
*/
5050
export function createFileSaveSessions(deps: FileSaveSessionDeps) {
5151
const sessions = new Map<string, FileSaveSession>();
52-
// A disposed session may still be writing its final flush; a replacement
53-
// session must not queue that same draft a second time.
54-
const inFlight = new Map<string, string>();
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>();
5556

5657
const recover = (key: string, target: FileSaveTarget, coordinator: FileSaveCoordinator) => {
5758
if (!deps.canPersist(target)) return;
5859
const unsaved = deps.readUnsaved(target);
59-
if (unsaved !== null && inFlight.get(key) !== unsaved) coordinator.change(unsaved);
60+
if (unsaved !== null && retiring.get(key) !== unsaved) coordinator.change(unsaved);
6061
};
6162

6263
const create = (key: string, target: FileSaveTarget): FileSaveSession => {
@@ -71,18 +72,19 @@ export function createFileSaveSessions(deps: FileSaveSessionDeps) {
7172
for (const listener of listeners.keys()) listener(target.relativePath, pending);
7273
},
7374
persist: async (contents) => {
74-
inFlight.set(key, contents);
7575
let succeeded = false;
7676
try {
7777
const result = await deps.persist(target, contents);
7878
succeeded = result._tag === "Success";
7979
return result;
8080
} finally {
81-
if (inFlight.get(key) === contents) inFlight.delete(key);
82-
// A replacement session skipped this draft while it was in flight,
83-
// and a disposed session never retries, so the live one picks it up.
8481
const live = sessions.get(key);
85-
if (!succeeded && live && live !== session) recover(key, target, live.coordinator);
82+
if (live !== session && retiring.get(key) === contents) {
83+
retiring.delete(key);
84+
// A replacement session skipped this draft, and a disposed session
85+
// never retries, so the live one picks it up.
86+
if (!succeeded && live) recover(key, target, live.coordinator);
87+
}
8688
}
8789
},
8890
onConfirmed: (contents) => deps.confirm(target, contents),
@@ -116,6 +118,8 @@ export function createFileSaveSessions(deps: FileSaveSessionDeps) {
116118
}
117119
sessions.delete(key);
118120
session.unsubscribeWritable();
121+
const last = session.coordinator.unconfirmedContents;
122+
if (last !== null && deps.canPersist(target)) retiring.set(key, last);
119123
session.coordinator.dispose();
120124
};
121125
};

0 commit comments

Comments
 (0)