Guard heartbeat prompt saves after load failures

Author: ibetitsmike

src/browser/features/Settings/Sections/HeartbeatSection.test.tsx

@@ -12,6 +12,10 @@ interface MockConfig {
   heartbeatDefaultIntervalMs?: number;
 }
 
+interface MockOptions {
+  getConfigError?: Error;
+}
+
 interface MockAPIClient {
   config: {
     getConfig: () => Promise<MockConfig>;
@@ -34,7 +38,7 @@ void mock.module("@/browser/contexts/API", () => ({
 
 import { HeartbeatSection } from "./HeartbeatSection";
 
-function createMockAPI(configOverrides: Partial<MockConfig> = {}) {
+function createMockAPI(configOverrides: Partial<MockConfig> = {}, options: MockOptions = {}) {
   const config: MockConfig = {
     ...configOverrides,
   };
@@ -55,7 +59,11 @@ function createMockAPI(configOverrides: Partial<MockConfig> = {}) {
   return {
     api: {
       config: {
-        getConfig: mock(() => Promise.resolve({ ...config })),
+        getConfig: mock(() =>
+          options.getConfigError
+            ? Promise.reject(options.getConfigError)
+            : Promise.resolve({ ...config })
+        ),
         updateHeartbeatDefaultPrompt: updateHeartbeatDefaultPromptMock,
         updateHeartbeatDefaultIntervalMs: updateHeartbeatDefaultIntervalMsMock,
       },
@@ -65,9 +73,12 @@ function createMockAPI(configOverrides: Partial<MockConfig> = {}) {
   };
 }
 
-function renderHeartbeatSection(configOverrides: Partial<MockConfig> = {}) {
+function renderHeartbeatSection(
+  configOverrides: Partial<MockConfig> = {},
+  options: MockOptions = {}
+) {
   const { api, updateHeartbeatDefaultPromptMock, updateHeartbeatDefaultIntervalMsMock } =
-    createMockAPI(configOverrides);
+    createMockAPI(configOverrides, options);
   mockApi = api;
 
   const view = render(
@@ -126,6 +137,42 @@ describe("HeartbeatSection", () => {
     });
   });
 
+  test("skips saving a stale prompt after config reload fails until the user edits", async () => {
+    const initialPrompt = "Review pending work before acting.";
+    const { view } = renderHeartbeatSection({
+      heartbeatDefaultPrompt: initialPrompt,
+    });
+
+    const promptField = (await waitFor(() =>
+      view.getByLabelText("Default heartbeat prompt")
+    )) as HTMLTextAreaElement;
+
+    await waitFor(() => {
+      expect(promptField.value).toBe(initialPrompt);
+    });
+
+    const failedReload = createMockAPI({}, { getConfigError: new Error("load failed") });
+    mockApi = failedReload.api;
+    view.rerender(
+      <ThemeProvider forcedTheme="dark">
+        <HeartbeatSection />
+      </ThemeProvider>
+    );
+
+    await waitFor(() => {
+      expect(promptField.value).toBe(initialPrompt);
+    });
+
+    const failedReloadPromptField = view.getByLabelText(
+      "Default heartbeat prompt"
+    ) as HTMLTextAreaElement;
+
+    fireEvent.blur(failedReloadPromptField);
+    await Promise.resolve();
+    await Promise.resolve();
+    expect(failedReload.updateHeartbeatDefaultPromptMock).not.toHaveBeenCalled();
+  });
+
   test("loads and saves the default heartbeat threshold", async () => {
     const initialIntervalMs = 45 * 60_000;
     const { view, updateHeartbeatDefaultIntervalMsMock } = renderHeartbeatSection({

src/browser/features/Settings/Sections/HeartbeatSection.tsx

@@ -69,6 +69,7 @@ export function HeartbeatSection() {
   const heartbeatDefaultIntervalLoadNonceRef = useRef(0);
   const heartbeatDefaultPromptUpdateChainRef = useRef<Promise<void>>(Promise.resolve());
   const heartbeatDefaultIntervalUpdateChainRef = useRef<Promise<void>>(Promise.resolve());
+  const heartbeatDefaultPromptEditedSinceLoadRef = useRef(false);
   const heartbeatDefaultIntervalEditedSinceLoadRef = useRef(false);
 
   useEffect(() => {
@@ -80,6 +81,7 @@ export function HeartbeatSection() {
     setHeartbeatDefaultPromptLoadedOk(false);
     setHeartbeatDefaultIntervalLoaded(false);
     setHeartbeatDefaultIntervalLoadedOk(false);
+    heartbeatDefaultPromptEditedSinceLoadRef.current = false;
     heartbeatDefaultIntervalEditedSinceLoadRef.current = false;
 
     const heartbeatDefaultPromptNonce = ++heartbeatDefaultPromptLoadNonceRef.current;
@@ -92,6 +94,7 @@ export function HeartbeatSection() {
           setHeartbeatDefaultPrompt(cfg.heartbeatDefaultPrompt ?? "");
           setHeartbeatDefaultPromptLoaded(true);
           setHeartbeatDefaultPromptLoadedOk(true);
+          heartbeatDefaultPromptEditedSinceLoadRef.current = false;
         }
 
         if (heartbeatDefaultIntervalNonce === heartbeatDefaultIntervalLoadNonceRef.current) {
@@ -122,7 +125,7 @@ export function HeartbeatSection() {
     }
 
     const trimmedDefaultPrompt = heartbeatDefaultPrompt.trim();
-    if (!heartbeatDefaultPromptLoadedOk && !trimmedDefaultPrompt) {
+    if (!heartbeatDefaultPromptLoadedOk && !heartbeatDefaultPromptEditedSinceLoadRef.current) {
       return;
     }
 
@@ -139,6 +142,7 @@ export function HeartbeatSection() {
       )
       .then(() => {
         setHeartbeatDefaultPromptLoadedOk(true);
+        heartbeatDefaultPromptEditedSinceLoadRef.current = false;
       })
       .catch(() => {
         // Best-effort persistence.
@@ -231,6 +235,7 @@ export function HeartbeatSection() {
           value={heartbeatDefaultPrompt}
           onChange={(event: React.ChangeEvent<HTMLTextAreaElement>) => {
             heartbeatDefaultPromptLoadNonceRef.current++;
+            heartbeatDefaultPromptEditedSinceLoadRef.current = true;
             setHeartbeatDefaultPromptLoaded(true);
             setHeartbeatDefaultPrompt(event.target.value);
           }}