Drop merged unified diffs from turn summaries

- Stop propagating `diff` when merging turn file changes in session logic - Update tests to assert required retry callbacks are functions before invoking - Replace fragile unifiedDiff key check with `not.toHaveProperty`

Julius Marminge committed 8 months ago

Commit c50b2161 parent 6a604d83 files · +16 −13Browse files

Unified · Split

3 files

apps/web/src/lib/providerReactQuery.test.ts +15 −9
apps/web/src/session-logic.test.ts +1 −1
apps/web/src/session-logic.ts +0 −3

apps/web/src/lib/providerReactQuery.test.ts+15−9

       cacheScope: "turn:abc",
     });
     const retry = options.retry;
+    expect(typeof retry).toBe("function");
+    if (typeof retry !== "function") {
+      throw new Error("Expected retry to be a function.");
+    }
-    expect(retry?.(1, new Error("Checkpoint turn count 2 exceeds current turn count 1."))).toBe(
+    expect(retry(1, new Error("Checkpoint turn count 2 exceeds current turn count 1."))).toBe(true);
-      true,
-    );
     expect(
-      retry?.(
+      retry(
         11,
         new Error("Filesystem checkpoint is unavailable for turn 2 in thread thread-1."),
       ),
     ).toBe(true);
     expect(
-      retry?.(
+      retry(
         12,
         new Error("Filesystem checkpoint is unavailable for turn 2 in thread thread-1."),
       ),
     ).toBe(false);
-    expect(retry?.(2, new Error("Something else failed."))).toBe(true);
+    expect(retry(2, new Error("Something else failed."))).toBe(true);
-    expect(retry?.(3, new Error("Something else failed."))).toBe(false);
+    expect(retry(3, new Error("Something else failed."))).toBe(false);
   });
   it("backs off longer for checkpoint-not-ready errors", () => {
       cacheScope: "turn:abc",
     });
     const retryDelay = options.retryDelay;
+    expect(typeof retryDelay).toBe("function");
+    if (typeof retryDelay !== "function") {
+      throw new Error("Expected retryDelay to be a function.");
+    }
-    const checkpointDelay = retryDelay?.(
+    const checkpointDelay = retryDelay(
       4,
       new Error("Checkpoint turn count 2 exceeds current turn count 1."),
     );
-    const genericDelay = retryDelay?.(4, new Error("Network failure"));
+    const genericDelay = retryDelay(4, new Error("Network failure"));
     expect(typeof checkpointDelay).toBe("number");
     expect(typeof genericDelay).toBe("number");

apps/web/src/session-logic.test.ts+1−1

@@ -497,7 +497,7 @@ describe("deriveTurnDiffSummaries", () => { · 496 unmodified lines
497	expect(summaries[0]?.files[0]?.kind).toBe("modified");	497	expect(summaries[0]?.files[0]?.kind).toBe("modified");
498	expect(summaries[0]?.files[0]?.additions).toBe(1);	498	expect(summaries[0]?.files[0]?.additions).toBe(1);
499	expect(summaries[0]?.files[0]?.deletions).toBe(1);	499	expect(summaries[0]?.files[0]?.deletions).toBe(1);
500	expect("unifiedDiff" in (summaries[0] as Record<string, unknown>)).toBe(false);	500	expect(summaries[0]).not.toHaveProperty("unifiedDiff");
501	});	501	});
502		502
503	it("includes completed turns even when no fileChange tool events were emitted", () => {	503	it("includes completed turns even when no fileChange tool events were emitted", () => {

apps/web/src/session-logic.ts+0−3

   if (existing.kind === undefined && incoming.kind !== undefined) {
     existing.kind = incoming.kind;
   }
-  if (existing.diff === undefined && incoming.diff !== undefined) {
-    existing.diff = incoming.diff;
-  }
   if (existing.additions === undefined && incoming.additions !== undefined) {
     existing.additions = incoming.additions;
   }