fix: honor diff snapshot -i flatten mode

Author: thymikee

src/daemon/__tests__/snapshot-diff.test.ts

@@ -75,3 +75,25 @@ test('buildSnapshotDiff preserves surrounding context ordering', () => {
   assert.equal(diff.lines[3]?.kind, 'added');
   assert.equal(diff.lines[4]?.kind, 'unchanged');
 });
+
+test('buildSnapshotDiff flatten option uses flat snapshot line shape', () => {
+  const previous = nodes([
+    { index: 0, depth: 0, type: 'XCUIElementTypeWindow' },
+    { index: 1, depth: 1, type: 'XCUIElementTypeOther', label: '335' },
+    { index: 2, depth: 2, type: 'XCUIElementTypeStaticText', label: '335' },
+  ]);
+  const current = nodes([
+    { index: 0, depth: 0, type: 'XCUIElementTypeWindow' },
+    { index: 1, depth: 1, type: 'XCUIElementTypeOther', label: '402' },
+    { index: 2, depth: 2, type: 'XCUIElementTypeStaticText', label: '402' },
+  ]);
+
+  const diff = buildSnapshotDiff(previous, current, { flatten: true });
+  assert.equal(diff.summary.additions, 2);
+  assert.equal(diff.summary.removals, 2);
+  const changed = diff.lines.filter((line) => line.kind !== 'unchanged');
+  assert.equal(changed.length, 4);
+  for (const line of changed) {
+    assert.equal(line.text.startsWith('  '), false);
+  }
+});

src/daemon/handlers/snapshot.ts

@@ -104,6 +104,7 @@ export async function handleSnapshotCommands(params: {
     }
     const resolvedScope = resolveSnapshotScope(req.flags?.snapshotScope, session);
     if (!resolvedScope.ok) return resolvedScope.response;
+    const flattenForDiff = req.flags?.snapshotInteractiveOnly === true;
 
     return await withSessionlessRunnerCleanup(session, device, async () => {
       const appBundleId = session?.appBundleId;
@@ -118,7 +119,7 @@ export async function handleSnapshotCommands(params: {
       const currentSnapshot = capture.snapshot;
 
       if (!session?.snapshot) {
-        const unchanged = countSnapshotComparableLines(currentSnapshot.nodes);
+        const unchanged = countSnapshotComparableLines(currentSnapshot.nodes, { flatten: flattenForDiff });
         const nextSession: SessionState = session
           ? { ...session, snapshot: currentSnapshot }
           : {
@@ -154,7 +155,7 @@ export async function handleSnapshotCommands(params: {
         };
       }
 
-      const diff = buildSnapshotDiff(session.snapshot.nodes, currentSnapshot.nodes);
+      const diff = buildSnapshotDiff(session.snapshot.nodes, currentSnapshot.nodes, { flatten: flattenForDiff });
       const nextSession: SessionState = { ...session, snapshot: currentSnapshot };
       recordIfSession(sessionStore, nextSession, req, {
         mode: 'snapshot',

src/daemon/snapshot-diff.ts

@@ -1,5 +1,5 @@
 import type { SnapshotNode } from '../utils/snapshot.ts';
-import { buildSnapshotDisplayLines, displayLabel, formatRole } from '../utils/snapshot-lines.ts';
+import { buildSnapshotDisplayLines, displayLabel, formatRole, formatSnapshotLine } from '../utils/snapshot-lines.ts';
 
 export type SnapshotDiffLine = {
   kind: 'added' | 'removed' | 'unchanged';
@@ -17,6 +17,10 @@ export type SnapshotDiffResult = {
   lines: SnapshotDiffLine[];
 };
 
+export type SnapshotDiffOptions = {
+  flatten?: boolean;
+};
+
 type SnapshotComparableLine = {
   text: string;
   comparable: string;
@@ -32,9 +36,13 @@ export function snapshotNodeToComparableLine(node: SnapshotNode, depthOverride?:
   return [depthPart, role, textPart, enabledPart, selectedPart, hittablePart].join('|');
 }
 
-export function buildSnapshotDiff(previousNodes: SnapshotNode[], currentNodes: SnapshotNode[]): SnapshotDiffResult {
-  const previous = snapshotNodesToLines(previousNodes);
-  const current = snapshotNodesToLines(currentNodes);
+export function buildSnapshotDiff(
+  previousNodes: SnapshotNode[],
+  currentNodes: SnapshotNode[],
+  options: SnapshotDiffOptions = {},
+): SnapshotDiffResult {
+  const previous = snapshotNodesToLines(previousNodes, options);
+  const current = snapshotNodesToLines(currentNodes, options);
   const lines = diffComparableLinesMyers(previous, current);
   const summary: SnapshotDiffSummary = { additions: 0, removals: 0, unchanged: 0 };
   for (const line of lines) {
@@ -45,11 +53,20 @@ export function buildSnapshotDiff(previousNodes: SnapshotNode[], currentNodes: S
   return { summary, lines };
 }
 
-export function countSnapshotComparableLines(nodes: SnapshotNode[]): number {
-  return snapshotNodesToLines(nodes).length;
+export function countSnapshotComparableLines(
+  nodes: SnapshotNode[],
+  options: SnapshotDiffOptions = {},
+): number {
+  return snapshotNodesToLines(nodes, options).length;
 }
 
-function snapshotNodesToLines(nodes: SnapshotNode[]): SnapshotComparableLine[] {
+function snapshotNodesToLines(nodes: SnapshotNode[], options: SnapshotDiffOptions): SnapshotComparableLine[] {
+  if (options.flatten) {
+    return nodes.map((node) => ({
+      text: formatSnapshotLine(node, 0, false),
+      comparable: snapshotNodeToComparableLine(node, 0),
+    }));
+  }
   return buildSnapshotDisplayLines(nodes).map((line) => ({
     text: line.text,
     comparable: snapshotNodeToComparableLine(line.node, line.depth),