Skip to content

Commit 4b527ae

Browse files
committed
fix(web): retain acknowledged contents for final-save retries
1 parent 9702a1b commit 4b527ae

4 files changed

Lines changed: 65 additions & 2 deletions

File tree

‎apps/server/src/workspace/WorkspaceFileSystem.test.ts‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import * as NodePath from "@effect/platform-node/NodePath";
66
import * as NodeServices from "@effect/platform-node/NodeServices";
77
import { it, describe, expect } from "@effect/vitest";
88
import * as Effect from "effect/Effect";
9+
import * as Deferred from "effect/Deferred";
10+
import * as Fiber from "effect/Fiber";
911
import * as FileSystem from "effect/FileSystem";
1012
import * as Layer from "effect/Layer";
1113
import * as Path from "effect/Path";
@@ -23,7 +25,7 @@ import { vi } from "vite-plus/test";
2325

2426
vi.mock("node:fs/promises", async (importOriginal) => {
2527
const actual = await importOriginal<typeof NodeFSP>();
26-
return { ...actual, realpath: vi.fn(actual.realpath) };
28+
return { ...actual, realpath: vi.fn(actual.realpath), writeFile: vi.fn(actual.writeFile) };
2729
});
2830

2931
const UNKNOWN_WORKSPACE_PREFIX = "t3code-unknown-workspace-";
@@ -371,6 +373,33 @@ it.layer(layerTest, { excludeTestServices: true })("WorkspaceFileSystemLive", (i
371373
});
372374

373375
describe("writeFile", () => {
376+
it.effect("waits for native writes to settle before cancellation releases the lease", () =>
377+
Effect.gen(function* () {
378+
const service = yield* WorkspaceFileSystem.WorkspaceFileSystem;
379+
const cwd = yield* makeTempDir;
380+
const started = yield* Deferred.make<void>();
381+
let finishWrite!: () => void;
382+
vi.mocked(NodeFSP.writeFile).mockImplementationOnce(
383+
() =>
384+
new Promise<void>((resolve) => {
385+
finishWrite = resolve;
386+
Deferred.doneUnsafe(started, Effect.void);
387+
}),
388+
);
389+
const write = yield* service
390+
.writeFile({ cwd, relativePath: "note.txt", contents: "retired" })
391+
.pipe(Effect.forkChild);
392+
yield* Deferred.await(started);
393+
const cancelling = yield* Fiber.interrupt(write).pipe(
394+
Effect.forkChild({ startImmediately: true }),
395+
);
396+
const releasedBeforeNativeWrite = cancelling.pollUnsafe() !== undefined;
397+
finishWrite();
398+
yield* Fiber.join(cancelling);
399+
expect(releasedBeforeNativeWrite).toBe(false);
400+
}),
401+
);
402+
374403
it.effect("refuses a retired save after another client has saved newer contents", () =>
375404
Effect.gen(function* () {
376405
const service = yield* WorkspaceFileSystem.WorkspaceFileSystem;

‎apps/server/src/workspace/WorkspaceFileSystem.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@ export const make = Effect.gen(function* () {
566566
);
567567
yield* Effect.tryPromise({
568568
// A symlink swapped in after the check is not followed. Windows lacks O_NOFOLLOW.
569+
// A zero-argument try keeps Effect waiting for native IO before cancellation releases the lease.
569570
try: () =>
570571
NodeFSP.writeFile(realTargetPath, input.contents, {
571572
flag:

‎apps/web/src/components/files/useFileSaveCoordinator.browser.test.tsx‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,39 @@ async function mount(props = defaultProps) {
7373
}
7474

7575
describe("file-save React lifecycle", () => {
76+
it("retries the final draft against its earlier acknowledged save, not the stale query", async () => {
77+
setup();
78+
using _timers = fakeTimers();
79+
await using screen = await mount();
80+
let finishFirst!: (result: ReturnType<typeof AsyncResult.success>) => void;
81+
writeFile
82+
.mockImplementationOnce(
83+
() =>
84+
new Promise((resolve) => {
85+
finishFirst = resolve;
86+
}),
87+
)
88+
.mockResolvedValueOnce(AsyncResult.failure(Cause.fail(new Error("unavailable"))));
89+
screen.changeHandler()("first");
90+
await vi.advanceTimersByTimeAsync(500);
91+
screen.changeHandler()("final");
92+
getUnsavedFile.mockReturnValue({ contents: "final" });
93+
confirmFile.mockReturnValueOnce(false);
94+
await screen.unmount();
95+
finishFirst(AsyncResult.success({ relativePath: "file.txt" }));
96+
await vi.runAllTimersAsync();
97+
expect(writeFile).toHaveBeenLastCalledWith({
98+
environmentId,
99+
input: {
100+
cwd: "/workspace",
101+
relativePath: "file.txt",
102+
contents: "final",
103+
expectedContents: "first",
104+
},
105+
});
106+
expect(onPendingChange).toHaveBeenLastCalledWith("file.txt", false);
107+
});
108+
76109
it("retains the draft and stops when the server refuses a stale retry", async () => {
77110
setup();
78111
using _timers = fakeTimers();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function createFileSaveSession({
9090
getUnsavedProjectFileQueryData(environmentId, cwd, relativePath)?.contents === contents,
9191
onPendingChange: (pending) => onPendingChange(relativePath, pending),
9292
persist: async (nextContents, retry) => {
93-
if (!retry) {
93+
if (!retry && expectedContents === undefined) {
9494
const base = getPersistedProjectFileQueryData(environmentId, cwd, relativePath);
9595
expectedContents =
9696
base?.supportsConditionalWrite && !base.truncated

0 commit comments

Comments
 (0)