The best way to control Claude Code, Codex and more from any computer or phone
fix(web): don't save retention age until committed (#22208)
Co-authored-by: macodev00 <macodev00@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
maco committed
Nov 11, 2026 at 12:28 UTC
fcddd737e2923f695d6b37b7577c7e653bcb49c0
2 files changed
+241
-26
apps/web/src/components/settings/StorageSettings.browser.test.tsx
+126
-2
@@ -1,13 +1,17 @@
1
-import { act, fakeTimers, render } from "../../../test/render";
1
+import { act, fakeTimers, render, type Screen } from "../../../test/render";
2
import { RegistryProvider } from "@effect/atom-react";
3
import { DEFAULT_SERVER_SETTINGS, type StorageCleanupReport } from "@t3tools/contracts";
4
import { type ReactNode } from "react";
5
import { expect, it, vi } from "vite-plus/test";
6
+import { userEvent } from "vite-plus/test/browser";
7
+
8
+import "~/index.css";
9
10
const state = vi.hoisted(() => ({
11
settings: {} as typeof DEFAULT_SERVER_SETTINGS,
12
targets: [] as Array<{ environmentId: string; settings: typeof DEFAULT_SERVER_SETTINGS }>,
13
run: vi.fn(),
14
+ update: vi.fn(),
15
report: null as StorageCleanupReport | null,
16
}));
17
@@ -62,7 +66,7 @@ vi.mock(import("./useScopedSettings"), async (original) => ({
66
...(await original()),
67
useScopedSettings: (() => state.settings) as never,
68
useScopedSettingsMixed: () => false,
65
- useUpdateScopedSettings: () => vi.fn(),
69
+ useUpdateScopedSettings: () => state.update,
70
useClearScopedSettings: () => vi.fn(),
71
}));
72
vi.mock(import("./settingsLayout"), async (original) => ({
@@ -113,6 +117,7 @@ function setup() {
117
}));
118
state.report = null;
119
state.run.mockReset();
120
+ state.update.mockReset();
121
}
122
123
function setRetentionValues(
@@ -154,6 +159,125 @@ it("keeps cleanup disabled when settled retention and all other rules are off",
159
expect(state.run).not.toHaveBeenCalled();
160
});
161
162
+const rule = "Delete old browser artifacts";
163
+const ruleSwitch = (screen: Screen) => screen.getByRole("switch", { name: rule });
164
+const daysInput = (screen: Screen) => screen.getByLabelText(`${rule} in days`);
165
+const saves = () => state.update.mock.calls.map(([patch]) => patch.storageCleanup);
166
+const failSave = (index: number) => act(() => state.update.mock.calls[index]?.[1]?.onFailed?.());
167
+const withSavedAge = (days: number) => {
168
+ state.settings = {
169
+ ...state.settings,
170
+ storageCleanup: { ...state.settings.storageCleanup, browserArtifactsAfterDays: days },
171
+ };
172
+};
173
+
174
+it("saves a newly enabled retention rule only once its age is committed", async () => {
175
+ setup();
176
+ await using screen = await render(panel());
177
+ await userEvent.click(ruleSwitch(screen));
178
+ expect(state.update).not.toHaveBeenCalled();
179
+ await expect.element(ruleSwitch(screen)).toBeChecked();
180
+ await expect.element(daysInput(screen)).toHaveFocus();
181
+
182
+ await userEvent.fill(daysInput(screen), "30");
183
+ await userEvent.keyboard("{Enter}");
184
+ expect(saves()).toEqual([{ browserArtifactsAfterDays: 30 }]);
185
+ await expect.element(ruleSwitch(screen)).toBeChecked();
186
+});
187
+
188
+it("discards a retention draft on Escape, on leaving it untouched, or when switched back off", async () => {
189
+ setup();
190
+ await using screen = await render(panel());
191
+ await userEvent.click(ruleSwitch(screen));
192
+ await expect.element(daysInput(screen)).toHaveFocus();
193
+ await userEvent.keyboard("{Escape}");
194
+ await expect.element(ruleSwitch(screen)).not.toBeChecked();
195
+
196
+ await userEvent.click(ruleSwitch(screen));
197
+ await expect.element(daysInput(screen)).toHaveFocus();
198
+ await userEvent.click(screen.getByRole("heading", { name: rule }));
199
+ await expect.element(ruleSwitch(screen)).not.toBeChecked();
200
+
201
+ await userEvent.click(ruleSwitch(screen));
202
+ await userEvent.fill(daysInput(screen), "30");
203
+ await userEvent.click(ruleSwitch(screen));
204
+ await expect.element(daysInput(screen)).not.toBeInTheDocument();
205
+ await expect.element(ruleSwitch(screen)).not.toBeChecked();
206
+ expect(state.update).not.toHaveBeenCalled();
207
+});
208
+
209
+it("saves an edited draft when focus leaves its row, not when it reaches the switch", async () => {
210
+ setup();
211
+ await using screen = await render(panel());
212
+ await userEvent.click(ruleSwitch(screen));
213
+ await userEvent.fill(daysInput(screen), "30");
214
+ await userEvent.tab();
215
+ await expect.element(ruleSwitch(screen)).toHaveFocus();
216
+ expect(state.update).not.toHaveBeenCalled();
217
+ await userEvent.tab();
218
+ expect(saves()).toEqual([{ browserArtifactsAfterDays: 30 }]);
219
+});
220
+
221
+it("saves a stepped first age only once it is committed", async () => {
222
+ setup();
223
+ await using screen = await render(panel());
224
+ await userEvent.click(ruleSwitch(screen));
225
+ await userEvent.click(screen.getByRole("button", { name: `Increase ${rule}` }));
226
+ await userEvent.keyboard("{ArrowUp}");
227
+ await expect.element(daysInput(screen)).toHaveValue("10");
228
+ expect(state.update).not.toHaveBeenCalled();
229
+ await userEvent.keyboard("{Enter}");
230
+ expect(saves()).toEqual([{ browserArtifactsAfterDays: 10 }]);
231
+});
232
+
233
+it("does not save the draft age when Enter is pressed on invalid text", async () => {
234
+ setup();
235
+ await using screen = await render(panel());
236
+ await userEvent.click(ruleSwitch(screen));
237
+ await userEvent.fill(daysInput(screen), "+");
238
+ await userEvent.keyboard("{Enter}");
239
+ expect(state.update).not.toHaveBeenCalled();
240
+});
241
+
242
+it("switching an edited saved rule off never saves its age afterwards", async () => {
243
+ setup();
244
+ withSavedAge(30);
245
+ await using screen = await render(panel());
246
+ await userEvent.click(daysInput(screen));
247
+ await userEvent.keyboard("{Control>}a{/Control}40");
248
+ await userEvent.click(ruleSwitch(screen));
249
+ await expect.element(ruleSwitch(screen)).not.toBeChecked();
250
+ await userEvent.click(screen.getByRole("heading", { name: rule }));
251
+ expect(saves()).toEqual([{ browserArtifactsAfterDays: null }]);
252
+});
253
+
254
+it("returns a newly enabled retention rule to off when its first save fails", async () => {
255
+ setup();
256
+ await using screen = await render(panel());
257
+ await userEvent.click(ruleSwitch(screen));
258
+ await expect.element(daysInput(screen)).toHaveFocus();
259
+ await userEvent.keyboard("{Enter}");
260
+ expect(saves()).toEqual([{ browserArtifactsAfterDays: 8 }]);
261
+
262
+ await failSave(0);
263
+ await expect.element(ruleSwitch(screen)).not.toBeChecked();
264
+});
265
+
266
+it("keeps a newer pending age open when an older first save fails", async () => {
267
+ setup();
268
+ await using screen = await render(panel());
269
+ await userEvent.click(ruleSwitch(screen));
270
+ for (const age of ["30", "60"]) {
271
+ await userEvent.fill(daysInput(screen), age);
272
+ await userEvent.keyboard("{Enter}");
273
+ }
274
+ expect(saves()).toHaveLength(2);
275
+
276
+ await failSave(0);
277
+ await expect.element(daysInput(screen)).toHaveValue("60");
278
+ await expect.element(ruleSwitch(screen)).toBeChecked();
279
+});
280
+
281
it("settles mixed retention statuses independently across selected machines", async () => {
282
setup();
283
using _timers = fakeTimers();
apps/web/src/components/settings/StorageSettings.tsx
+115
-24
@@ -109,6 +109,8 @@ export function WorktreesDirectoryRow() {
109
);
110
}
111
112
+type SaveOptions = Parameters<ReturnType<typeof useUpdateScopedSettings>>[1];
113
+
114
function RetentionControl({
115
label,
116
value,
@@ -117,19 +119,65 @@ function RetentionControl({
119
}: {
120
label: string;
121
value: number | null;
120
- onChange: (value: number | null) => void;
122
+ onChange: (value: number | null, onFailed: () => void) => void;
123
minimum?: number;
124
}) {
125
const [draft, setDraft] = useState(value);
126
const [savedValue, setSavedValue] = useState(value);
127
+ // Saving an age can start a cleanup sweep, so turning a rule on only opens a draft.
128
+ // While its first save is in flight this holds that submission.
129
+ const [enabling, setEnabling] = useState<"draft" | "edited" | { days: number } | null>(null);
130
+ // Holds an age until Enter or focus leaves the row: one edited before focus moved to the
131
+ // switch, so switching off never saves it first, or one stepped toward a rule's first age,
132
+ // so raising it from 8 never saves a shorter age on the way.
133
+ const [held, setHeld] = useState(false);
134
+ // Hides a saved rule's age once it is switched off, so no blur can save it after null.
135
+ const [switchedOff, setSwitchedOff] = useState(false);
136
if (savedValue !== value) {
137
setSavedValue(value);
138
setDraft(value);
139
+ setEnabling(null);
140
+ setHeld(false);
141
+ setSwitchedOff(false);
142
}
143
+ const pending = typeof enabling === "object" ? enabling : null;
144
+ const on = (value !== null && !switchedOff) || enabling !== null;
145
+ const row = useRef<HTMLDivElement>(null);
146
+
147
+ const commit = (next: number) => {
148
+ const days = Math.min(3650, Math.max(minimum, Math.round(next)));
149
+ setDraft(days);
150
+ setHeld(false);
151
+ if (days === pending?.days) return;
152
+ if (value !== null) {
153
+ onChange(days, () => {});
154
+ return;
155
+ }
156
+ const submission = { days };
157
+ setEnabling(submission);
158
+ onChange(days, () => setEnabling((current) => (current === submission ? null : current)));
159
+ };
160
+
161
+ const switchOff = () => {
162
+ setDraft(value);
163
+ setHeld(false);
164
+ setEnabling(null);
165
+ if (value === null && pending === null) return;
166
+ setSwitchedOff(true);
167
+ onChange(null, () => setSwitchedOff(false));
168
+ };
169
170
return (
131
- <div className="flex items-center gap-3">
132
- {value !== null ? (
171
+ <div
172
+ ref={row}
173
+ className="flex items-center gap-3"
174
+ onBlur={(event) => {
175
+ if (event.currentTarget.contains(event.relatedTarget)) return;
176
+ if (held && draft !== null) commit(draft);
177
+ else setEnabling((current) => (typeof current === "string" ? null : current));
178
+ }}
179
+ >
180
+ {on ? (
181
<NumberField
182
value={draft}
183
min={minimum}
@@ -137,22 +185,54 @@ function RetentionControl({
185
step={1}
186
size="sm"
187
className="w-auto"
140
- onValueChange={setDraft}
141
- onValueCommitted={(next) => {
188
+ onValueChange={(next) => {
189
+ setDraft(next);
190
+ setEnabling((current) => (current === "draft" ? "edited" : current));
191
+ }}
192
+ onValueCommitted={(next, { reason, event }) => {
193
if (next === null) setDraft(value);
143
- else {
144
- const days = Math.min(3650, Math.max(minimum, Math.round(next)));
145
- setDraft(days);
146
- onChange(days);
147
- }
194
+ else if (
195
+ reason === "input-blur"
196
+ ? event instanceof FocusEvent &&
197
+ event.relatedTarget instanceof Node &&
198
+ row.current?.contains(event.relatedTarget)
199
+ : value === null
200
+ ) {
201
+ setDraft(next);
202
+ setHeld(true);
203
+ } else commit(next);
204
}}
205
>
206
<NumberFieldGroup>
207
<NumberFieldDecrement aria-label={`Decrease ${label}`} />
208
<NumberFieldInput
209
aria-label={`${label} in days`}
210
+ autoFocus={value === null}
211
size={5}
212
className="w-auto grow-0 text-right"
213
+ // Any typed or pasted edit replaces a held age: NumberField commits it on blur itself,
214
+ // and text it cannot parse yet must not leave the held age to be saved.
215
+ onChange={() => setHeld(false)}
216
+ onPaste={() => setHeld(false)}
217
+ onKeyDown={(event) => {
218
+ if (event.nativeEvent.isComposing || event.keyCode === 229) return;
219
+ if (event.key === "Enter") {
220
+ // Blurring lets NumberField parse the visible text and commit it once. It
221
+ // skips an unedited value, so an untouched draft is committed here.
222
+ const input = event.currentTarget;
223
+ const shown =
224
+ draft !== null && input.value === new Intl.NumberFormat().format(draft);
225
+ if (enabling === "draft" && shown) commit(draft);
226
+ input.blur();
227
+ } else if (event.key === "Escape" && (held || typeof enabling === "string")) {
228
+ // An unhandled Escape closes the settings page.
229
+ event.preventDefault();
230
+ event.stopPropagation();
231
+ setDraft(pending?.days ?? value);
232
+ setHeld(false);
233
+ setEnabling((current) => (typeof current === "string" ? null : current));
234
+ }
235
+ }}
236
/>
237
<span aria-hidden="true" className="self-center pr-2 text-xs">
238
days
@@ -165,8 +245,15 @@ function RetentionControl({
245
)}
246
<Switch
247
aria-label={label}
168
- checked={value !== null}
169
- onCheckedChange={(enabled) => onChange(enabled ? 8 : null)}
248
+ checked={on}
249
+ // Keeps focus in the age field, so switching off never commits an edited age first.
250
+ onMouseDown={(event) => event.preventDefault()}
251
+ onCheckedChange={(enabled) => {
252
+ if (enabled) {
253
+ setDraft(8);
254
+ setEnabling("draft");
255
+ } else switchOff();
256
+ }}
257
/>
258
</div>
259
);
@@ -486,12 +573,12 @@ export function WorktreeCleanupSection() {
573
// A policy locks these through worktreeCleanup, which also reaches each project's own rules.
574
const lockablePath = (key: keyof WorktreeCleanupRules) =>
575
isProjectScope ? ["worktreeCleanup"] : ["worktreeCleanup", `storageCleanup.${key}`];
489
- const update = (patch: Partial<StorageCleanupSettings>) =>
490
- updateSettings({ storageCleanup: patch });
491
- const updateWorktree = (patch: Partial<WorktreeCleanupRules>) =>
576
+ const update = (patch: Partial<StorageCleanupSettings>, options?: SaveOptions) =>
577
+ updateSettings({ storageCleanup: patch }, options);
578
+ const updateWorktree = (patch: Partial<WorktreeCleanupRules>, options?: SaveOptions) =>
579
isProjectScope
493
- ? updateSettings({ worktreeCleanup: { mode: "custom", rules: patch } })
494
- : update(patch);
580
+ ? updateSettings({ worktreeCleanup: { mode: "custom", rules: patch } }, options)
581
+ : update(patch, options);
582
583
if (
584
isProjectScope &&
@@ -602,7 +689,9 @@ export function WorktreeCleanupSection() {
689
<RetentionControl
690
label="Delete inactive worktrees"
691
value={settings.worktreeAfterDays}
605
- onChange={(worktreeAfterDays) => updateWorktree({ worktreeAfterDays })}
692
+ onChange={(worktreeAfterDays, onFailed) =>
693
+ updateWorktree({ worktreeAfterDays }, { onFailed })
694
+ }
695
/>
696
}
697
/>
@@ -634,8 +723,8 @@ export function WorktreeCleanupSection() {
723
label="Delete settled worktrees"
724
value={settings.worktreeSettledAfterDays}
725
minimum={0}
637
- onChange={(worktreeSettledAfterDays) =>
638
- updateWorktree({ worktreeSettledAfterDays })
726
+ onChange={(worktreeSettledAfterDays, onFailed) =>
727
+ updateWorktree({ worktreeSettledAfterDays }, { onFailed })
728
}
729
/>
730
}
@@ -737,8 +826,8 @@ export function StorageCleanupSections() {
826
? "Mixed across selected machines"
827
: undefined;
828
if (scope.kind === "project" || scope.kind === "checkout") return null;
740
- const update = (patch: Partial<StorageCleanupSettings>) =>
741
- updateSettings({ storageCleanup: patch });
829
+ const update = (patch: Partial<StorageCleanupSettings>, options: SaveOptions) =>
830
+ updateSettings({ storageCleanup: patch }, options);
831
const databaseStorageNotice = (
832
<DatabaseStorageNotice
833
environments={connectedEnvironments.filter(
@@ -773,7 +862,9 @@ export function StorageCleanupSections() {
862
<RetentionControl
863
label="Delete old browser artifacts"
864
value={settings.browserArtifactsAfterDays}
776
- onChange={(browserArtifactsAfterDays) => update({ browserArtifactsAfterDays })}
865
+ onChange={(browserArtifactsAfterDays, onFailed) =>
866
+ update({ browserArtifactsAfterDays }, { onFailed })
867
+ }
868
/>
869
}
870
/>
@@ -789,7 +880,7 @@ export function StorageCleanupSections() {
880
<RetentionControl
881
label="Delete old rotated logs"
882
value={settings.logsAfterDays}
792
- onChange={(logsAfterDays) => update({ logsAfterDays })}
883
+ onChange={(logsAfterDays, onFailed) => update({ logsAfterDays }, { onFailed })}
884
/>
885
}
886
/>