fix(web): make the diff layout toggle a persisted setting

[juliusmarminge]

Problem

The stacked/split diff toggle was ephemeral. The thread diff panel kept it in a zustand store, and the pull request Code tab kept it in plain component state that reset on every mount, so the two toggles disagreed and the PR one forgot its value constantly. Word wrap, whitespace handling, and the rest of the diff preferences already live in client settings.

Fix

Diff layout is now a client setting (diffLayout, default stacked, in packages/contracts). Both diff toolbars read it and write through useUpdateClientSettings, so one flip applies everywhere and survives reloads (on desktop it persists to disk through the same bridge as every other client setting). The old diffRenderMode field is removed from diffPanelStore, which is back to only per-thread scope selection.

It also gets a Diff layout select under Settings → General next to "Hide whitespace changes", wired into reset, customized tracking, restore-defaults, and settings search (split, side by side, unified, …).

Not migrated: a split value in the old t3code:diff-panel-state:v1 localStorage entry. Anyone who had it set there flips the toggle once more.

Verification

• vp test run on clientPersistenceStorage.test.ts (new round-trip test), diffPanelStore.test.ts, settingsSearch.test.ts, SettingsPanels.logic.test.ts, and desktop DesktopClientSettings.test.ts
• tsc --noEmit for packages/contracts and apps/web, lint on changed files

Claude Fable 5 via Claude Code.

🤖 Generated with Claude Code

---

Note

Low Risk
UI preference persistence with schema defaults; no auth, security, or server data-path changes. Minor UX regression for unmigrated old localStorage layout only.

Overview
Diff layout (stacked vs split) is now a shared client setting (diffLayout, default stacked) instead of ephemeral UI state.

The thread Diff panel and pull request Code tab both read and update it through useClientSettings / useUpdateClientSettings, so one toggle stays in sync everywhere and survives reloads (including desktop via the existing client-settings bridge). diffRenderMode is removed from diffPanelStore, which again only tracks per-thread diff scope.

Settings → General adds a Diff layout control (plus reset, customized tracking, restore defaults, and search). Tests cover browser persistence defaults and desktop settings fixtures.

Not migrated: a prior split choice stored only in t3code:diff-panel-state:v1 localStorage; users may need to pick split once more.

^{Reviewed by Cursor Bugbot for commit 3627b1e. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Persist diff layout toggle in client settings instead of component state

• Adds a DiffLayout contract (stacked/split, default stacked) to settings.ts and wires it into the client settings schema and patch type
• Removes DiffRenderMode from diffPanelStore.ts; DiffPanel.tsx and PullRequestCodeTab.tsx now read and write the layout through client settings
• Adds a searchable General settings row in SettingsPanels.tsx for choosing and resetting the layout, covered by settingsSearch.ts
• useSettingsRestore reports a non-default diff layout as changed and resets it
• Risk: existing persisted client settings without the diffLayout field decode to stacked; any out-of-tree readers expecting diffPanelStore to hold render-mode state will break since that field is removed

📊 Macroscope summarized 3627b1e. 6 files reviewed, 2 issues evaluated, 1 issue filtered, 1 comment posted

🗂️ Filtered Issues

apps/web/src/components/DiffPanel.tsx — 0 comments posted, 1 evaluated, 1 filtered

• line 775: updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well). [ Cross-file consolidated ]

[macroscopeapp]

🟡 MediumpullRequest/PullRequestCodeTab.tsx:1122

updateClientSettings({ diffLayout: next }) can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. hydrateClientSettings() later replaces the snapshot with its stale persistedSettings because persistClientSettings does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.

Also found in 1 other location(s)

apps/web/src/components/DiffPanel.tsx:775

updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file @apps/web/src/components/pullRequest/PullRequestCodeTab.tsx around line 1122:
`updateClientSettings({ diffLayout: next })` can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. `hydrateClientSettings()` later replaces the snapshot with its stale `persistedSettings` because `persistClientSettings` does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.
Also found in 1 other location(s):
- apps/web/src/components/DiffPanel.tsx:775 -- `updateClientSettings({ diffLayout: next })` can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, `useClientSettings` initially returns defaults while `hydrateClientSettings()` is still awaiting `getClientSettings()`; if the user changes the layout in that interval, `persistClientSettings` updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of `useSettings.ts` replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

[juliusmarminge]

Pre-existing and out of scope here. hydrateClientSettings has never invalidated its in-flight read against later writes, and the same window applies to every other client-settings write (word wrap, whitespace, and the six existing useUpdateClientSettings callers). The window is a single localStorage read or desktop IPC round-trip at app boot, which resolves before a user can reach a diff toolbar. If we want to close it, that is a change to useSettings.ts on its own, not part of moving this one key.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	13.4 KiB	13.5 KiB	+7 B (+0.1%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.9 KiB	6.9 KiB	+6 B (+0.1%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.6 KiB	6.6 KiB	+1 B (+0.0%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	57.0 KiB	57.0 KiB	0 B (0.0%)	66.4 KiB	✅
Codex	Live turn messages	10	10	0 (0.0%)	21	✅
Claude	Total thread wire	13.4 KiB	13.3 KiB	−130 B (−0.9%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.9 KiB	6.9 KiB	+10 B (+0.1%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.6 KiB	6.4 KiB	−140 B (−2.1%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	57.8 KiB	56.4 KiB	−1.4 KiB (−2.5%)	66.4 KiB	✅
Claude	Live turn messages	10	10	0 (0.0%)	21	✅

Baseline: 85f2479 · PR result: 3627b1e · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a localized client-preference persistence change: existing diff layout controls now share a backward-compatible setting and retain the existing stacked default, with no production, security, billing, or deployment impact. An unresolved Medium-severity hydration race could briefly revert a newly selected layout and leave persistence stale.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[juliusmarminge]

Problem

The stacked/split diff toggle was ephemeral. The thread diff panel kept it in a zustand store, and the pull request Code tab kept it in plain component state that reset on every mount, so the two toggles disagreed and the PR one forgot its value constantly. Word wrap, whitespace handling, and the rest of the diff preferences already live in client settings.

Fix

Diff layout is now a client setting (diffLayout, default stacked, in packages/contracts). Both diff toolbars read it and write through useUpdateClientSettings, so one flip applies everywhere and survives reloads (on desktop it persists to disk through the same bridge as every other client setting). The old diffRenderMode field is removed from diffPanelStore, which is back to only per-thread scope selection.

It also gets a Diff layout select under Settings → General next to "Hide whitespace changes", wired into reset, customized tracking, restore-defaults, and settings search (split, side by side, unified, …).

Not migrated: a split value in the old t3code:diff-panel-state:v1 localStorage entry. Anyone who had it set there flips the toggle once more.

Verification

• vp test run on clientPersistenceStorage.test.ts (new round-trip test), diffPanelStore.test.ts, settingsSearch.test.ts, SettingsPanels.logic.test.ts, and desktop DesktopClientSettings.test.ts
• tsc --noEmit for packages/contracts and apps/web, lint on changed files

Claude Fable 5 via Claude Code.

🤖 Generated with Claude Code

---

Note

Low Risk
UI preference persistence with schema defaults; no auth, security, or server data-path changes. Minor UX regression for unmigrated old localStorage layout only.

Overview
Diff layout (stacked vs split) is now a shared client setting (diffLayout, default stacked) instead of ephemeral UI state.

The thread Diff panel and pull request Code tab both read and update it through useClientSettings / useUpdateClientSettings, so one toggle stays in sync everywhere and survives reloads (including desktop via the existing client-settings bridge). diffRenderMode is removed from diffPanelStore, which again only tracks per-thread diff scope.

Settings → General adds a Diff layout control (plus reset, customized tracking, restore defaults, and search). Tests cover browser persistence defaults and desktop settings fixtures.

Not migrated: a prior split choice stored only in t3code:diff-panel-state:v1 localStorage; users may need to pick split once more.

^{Reviewed by Cursor Bugbot for commit 3627b1e. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Persist diff layout toggle in client settings instead of component state

• Adds a DiffLayout contract (stacked/split, default stacked) to settings.ts and wires it into the client settings schema and patch type
• Removes DiffRenderMode from diffPanelStore.ts; DiffPanel.tsx and PullRequestCodeTab.tsx now read and write the layout through client settings
• Adds a searchable General settings row in SettingsPanels.tsx for choosing and resetting the layout, covered by settingsSearch.ts
• useSettingsRestore reports a non-default diff layout as changed and resets it
• Risk: existing persisted client settings without the diffLayout field decode to stacked; any out-of-tree readers expecting diffPanelStore to hold render-mode state will break since that field is removed

📊 Macroscope summarized 3627b1e. 6 files reviewed, 2 issues evaluated, 1 issue filtered, 1 comment posted

🗂️ Filtered Issues

apps/web/src/components/DiffPanel.tsx — 0 comments posted, 1 evaluated, 1 filtered

• line 775: updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well). [ Cross-file consolidated ]

[macroscopeapp]

🟡 MediumpullRequest/PullRequestCodeTab.tsx:1122

updateClientSettings({ diffLayout: next }) can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. hydrateClientSettings() later replaces the snapshot with its stale persistedSettings because persistClientSettings does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.

Also found in 1 other location(s)

apps/web/src/components/DiffPanel.tsx:775

updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file @apps/web/src/components/pullRequest/PullRequestCodeTab.tsx around line 1122:
`updateClientSettings({ diffLayout: next })` can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. `hydrateClientSettings()` later replaces the snapshot with its stale `persistedSettings` because `persistClientSettings` does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.
Also found in 1 other location(s):
- apps/web/src/components/DiffPanel.tsx:775 -- `updateClientSettings({ diffLayout: next })` can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, `useClientSettings` initially returns defaults while `hydrateClientSettings()` is still awaiting `getClientSettings()`; if the user changes the layout in that interval, `persistClientSettings` updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of `useSettings.ts` replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

[juliusmarminge]

Pre-existing and out of scope here. hydrateClientSettings has never invalidated its in-flight read against later writes, and the same window applies to every other client-settings write (word wrap, whitespace, and the six existing useUpdateClientSettings callers). The window is a single localStorage read or desktop IPC round-trip at app boot, which resolves before a user can reach a diff toolbar. If we want to close it, that is a change to useSettings.ts on its own, not part of moving this one key.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	13.4 KiB	13.5 KiB	+7 B (+0.1%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.9 KiB	6.9 KiB	+6 B (+0.1%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.6 KiB	6.6 KiB	+1 B (+0.0%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	57.0 KiB	57.0 KiB	0 B (0.0%)	66.4 KiB	✅
Codex	Live turn messages	10	10	0 (0.0%)	21	✅
Claude	Total thread wire	13.4 KiB	13.3 KiB	−130 B (−0.9%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.9 KiB	6.9 KiB	+10 B (+0.1%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.6 KiB	6.4 KiB	−140 B (−2.1%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	57.8 KiB	56.4 KiB	−1.4 KiB (−2.5%)	66.4 KiB	✅
Claude	Live turn messages	10	10	0 (0.0%)	21	✅

Baseline: 85f2479 · PR result: 3627b1e · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a localized client-preference persistence change: existing diff layout controls now share a backward-compatible setting and retain the existing stacked default, with no production, security, billing, or deployment impact. An unresolved Medium-severity hydration race could briefly revert a newly selected layout and leave persistence stale.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[juliusmarminge]

Problem

The stacked/split diff toggle was ephemeral. The thread diff panel kept it in a zustand store, and the pull request Code tab kept it in plain component state that reset on every mount, so the two toggles disagreed and the PR one forgot its value constantly. Word wrap, whitespace handling, and the rest of the diff preferences already live in client settings.

Fix

Diff layout is now a client setting (diffLayout, default stacked, in packages/contracts). Both diff toolbars read it and write through useUpdateClientSettings, so one flip applies everywhere and survives reloads (on desktop it persists to disk through the same bridge as every other client setting). The old diffRenderMode field is removed from diffPanelStore, which is back to only per-thread scope selection.

It also gets a Diff layout select under Settings → General next to "Hide whitespace changes", wired into reset, customized tracking, restore-defaults, and settings search (split, side by side, unified, …).

Not migrated: a split value in the old t3code:diff-panel-state:v1 localStorage entry. Anyone who had it set there flips the toggle once more.

Verification

• vp test run on clientPersistenceStorage.test.ts (new round-trip test), diffPanelStore.test.ts, settingsSearch.test.ts, SettingsPanels.logic.test.ts, and desktop DesktopClientSettings.test.ts
• tsc --noEmit for packages/contracts and apps/web, lint on changed files

Claude Fable 5 via Claude Code.

🤖 Generated with Claude Code

---

Note

Low Risk
UI preference persistence with schema defaults; no auth, security, or server data-path changes. Minor UX regression for unmigrated old localStorage layout only.

Overview
Diff layout (stacked vs split) is now a shared client setting (diffLayout, default stacked) instead of ephemeral UI state.

The thread Diff panel and pull request Code tab both read and update it through useClientSettings / useUpdateClientSettings, so one toggle stays in sync everywhere and survives reloads (including desktop via the existing client-settings bridge). diffRenderMode is removed from diffPanelStore, which again only tracks per-thread diff scope.

Settings → General adds a Diff layout control (plus reset, customized tracking, restore defaults, and search). Tests cover browser persistence defaults and desktop settings fixtures.

Not migrated: a prior split choice stored only in t3code:diff-panel-state:v1 localStorage; users may need to pick split once more.

^{Reviewed by Cursor Bugbot for commit 3627b1e. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Persist diff layout toggle in client settings instead of component state

• Adds a DiffLayout contract (stacked/split, default stacked) to settings.ts and wires it into the client settings schema and patch type
• Removes DiffRenderMode from diffPanelStore.ts; DiffPanel.tsx and PullRequestCodeTab.tsx now read and write the layout through client settings
• Adds a searchable General settings row in SettingsPanels.tsx for choosing and resetting the layout, covered by settingsSearch.ts
• useSettingsRestore reports a non-default diff layout as changed and resets it
• Risk: existing persisted client settings without the diffLayout field decode to stacked; any out-of-tree readers expecting diffPanelStore to hold render-mode state will break since that field is removed

📊 Macroscope summarized 3627b1e. 6 files reviewed, 2 issues evaluated, 1 issue filtered, 1 comment posted

🗂️ Filtered Issues

apps/web/src/components/DiffPanel.tsx — 0 comments posted, 1 evaluated, 1 filtered

• line 775: updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well). [ Cross-file consolidated ]

[macroscopeapp]

🟡 MediumpullRequest/PullRequestCodeTab.tsx:1122

updateClientSettings({ diffLayout: next }) can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. hydrateClientSettings() later replaces the snapshot with its stale persistedSettings because persistClientSettings does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.

Also found in 1 other location(s)

apps/web/src/components/DiffPanel.tsx:775

updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file @apps/web/src/components/pullRequest/PullRequestCodeTab.tsx around line 1122:
`updateClientSettings({ diffLayout: next })` can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. `hydrateClientSettings()` later replaces the snapshot with its stale `persistedSettings` because `persistClientSettings` does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.
Also found in 1 other location(s):
- apps/web/src/components/DiffPanel.tsx:775 -- `updateClientSettings({ diffLayout: next })` can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, `useClientSettings` initially returns defaults while `hydrateClientSettings()` is still awaiting `getClientSettings()`; if the user changes the layout in that interval, `persistClientSettings` updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of `useSettings.ts` replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

[juliusmarminge]

Pre-existing and out of scope here. hydrateClientSettings has never invalidated its in-flight read against later writes, and the same window applies to every other client-settings write (word wrap, whitespace, and the six existing useUpdateClientSettings callers). The window is a single localStorage read or desktop IPC round-trip at app boot, which resolves before a user can reach a diff toolbar. If we want to close it, that is a change to useSettings.ts on its own, not part of moving this one key.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	13.4 KiB	13.5 KiB	+7 B (+0.1%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.9 KiB	6.9 KiB	+6 B (+0.1%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.6 KiB	6.6 KiB	+1 B (+0.0%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	57.0 KiB	57.0 KiB	0 B (0.0%)	66.4 KiB	✅
Codex	Live turn messages	10	10	0 (0.0%)	21	✅
Claude	Total thread wire	13.4 KiB	13.3 KiB	−130 B (−0.9%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.9 KiB	6.9 KiB	+10 B (+0.1%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.6 KiB	6.4 KiB	−140 B (−2.1%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	57.8 KiB	56.4 KiB	−1.4 KiB (−2.5%)	66.4 KiB	✅
Claude	Live turn messages	10	10	0 (0.0%)	21	✅

Baseline: 85f2479 · PR result: 3627b1e · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a localized client-preference persistence change: existing diff layout controls now share a backward-compatible setting and retain the existing stacked default, with no production, security, billing, or deployment impact. An unresolved Medium-severity hydration race could briefly revert a newly selected layout and leave persistence stale.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[juliusmarminge]

Problem

The stacked/split diff toggle was ephemeral. The thread diff panel kept it in a zustand store, and the pull request Code tab kept it in plain component state that reset on every mount, so the two toggles disagreed and the PR one forgot its value constantly. Word wrap, whitespace handling, and the rest of the diff preferences already live in client settings.

Fix

Diff layout is now a client setting (diffLayout, default stacked, in packages/contracts). Both diff toolbars read it and write through useUpdateClientSettings, so one flip applies everywhere and survives reloads (on desktop it persists to disk through the same bridge as every other client setting). The old diffRenderMode field is removed from diffPanelStore, which is back to only per-thread scope selection.

It also gets a Diff layout select under Settings → General next to "Hide whitespace changes", wired into reset, customized tracking, restore-defaults, and settings search (split, side by side, unified, …).

Not migrated: a split value in the old t3code:diff-panel-state:v1 localStorage entry. Anyone who had it set there flips the toggle once more.

Verification

• vp test run on clientPersistenceStorage.test.ts (new round-trip test), diffPanelStore.test.ts, settingsSearch.test.ts, SettingsPanels.logic.test.ts, and desktop DesktopClientSettings.test.ts
• tsc --noEmit for packages/contracts and apps/web, lint on changed files

Claude Fable 5 via Claude Code.

🤖 Generated with Claude Code

---

Note

Low Risk
UI preference persistence with schema defaults; no auth, security, or server data-path changes. Minor UX regression for unmigrated old localStorage layout only.

Overview
Diff layout (stacked vs split) is now a shared client setting (diffLayout, default stacked) instead of ephemeral UI state.

The thread Diff panel and pull request Code tab both read and update it through useClientSettings / useUpdateClientSettings, so one toggle stays in sync everywhere and survives reloads (including desktop via the existing client-settings bridge). diffRenderMode is removed from diffPanelStore, which again only tracks per-thread diff scope.

Settings → General adds a Diff layout control (plus reset, customized tracking, restore defaults, and search). Tests cover browser persistence defaults and desktop settings fixtures.

Not migrated: a prior split choice stored only in t3code:diff-panel-state:v1 localStorage; users may need to pick split once more.

^{Reviewed by Cursor Bugbot for commit 3627b1e. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Persist diff layout toggle in client settings instead of component state

• Adds a DiffLayout contract (stacked/split, default stacked) to settings.ts and wires it into the client settings schema and patch type
• Removes DiffRenderMode from diffPanelStore.ts; DiffPanel.tsx and PullRequestCodeTab.tsx now read and write the layout through client settings
• Adds a searchable General settings row in SettingsPanels.tsx for choosing and resetting the layout, covered by settingsSearch.ts
• useSettingsRestore reports a non-default diff layout as changed and resets it
• Risk: existing persisted client settings without the diffLayout field decode to stacked; any out-of-tree readers expecting diffPanelStore to hold render-mode state will break since that field is removed

📊 Macroscope summarized 3627b1e. 6 files reviewed, 2 issues evaluated, 1 issue filtered, 1 comment posted

🗂️ Filtered Issues

apps/web/src/components/DiffPanel.tsx — 0 comments posted, 1 evaluated, 1 filtered

• line 775: updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well). [ Cross-file consolidated ]

[macroscopeapp]

🟡 MediumpullRequest/PullRequestCodeTab.tsx:1122

updateClientSettings({ diffLayout: next }) can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. hydrateClientSettings() later replaces the snapshot with its stale persistedSettings because persistClientSettings does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.

Also found in 1 other location(s)

apps/web/src/components/DiffPanel.tsx:775

updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file @apps/web/src/components/pullRequest/PullRequestCodeTab.tsx around line 1122:
`updateClientSettings({ diffLayout: next })` can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. `hydrateClientSettings()` later replaces the snapshot with its stale `persistedSettings` because `persistClientSettings` does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.
Also found in 1 other location(s):
- apps/web/src/components/DiffPanel.tsx:775 -- `updateClientSettings({ diffLayout: next })` can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, `useClientSettings` initially returns defaults while `hydrateClientSettings()` is still awaiting `getClientSettings()`; if the user changes the layout in that interval, `persistClientSettings` updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of `useSettings.ts` replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

[juliusmarminge]

Pre-existing and out of scope here. hydrateClientSettings has never invalidated its in-flight read against later writes, and the same window applies to every other client-settings write (word wrap, whitespace, and the six existing useUpdateClientSettings callers). The window is a single localStorage read or desktop IPC round-trip at app boot, which resolves before a user can reach a diff toolbar. If we want to close it, that is a change to useSettings.ts on its own, not part of moving this one key.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	13.4 KiB	13.5 KiB	+7 B (+0.1%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.9 KiB	6.9 KiB	+6 B (+0.1%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.6 KiB	6.6 KiB	+1 B (+0.0%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	57.0 KiB	57.0 KiB	0 B (0.0%)	66.4 KiB	✅
Codex	Live turn messages	10	10	0 (0.0%)	21	✅
Claude	Total thread wire	13.4 KiB	13.3 KiB	−130 B (−0.9%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.9 KiB	6.9 KiB	+10 B (+0.1%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.6 KiB	6.4 KiB	−140 B (−2.1%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	57.8 KiB	56.4 KiB	−1.4 KiB (−2.5%)	66.4 KiB	✅
Claude	Live turn messages	10	10	0 (0.0%)	21	✅

Baseline: 85f2479 · PR result: 3627b1e · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a localized client-preference persistence change: existing diff layout controls now share a backward-compatible setting and retain the existing stacked default, with no production, security, billing, or deployment impact. An unresolved Medium-severity hydration race could briefly revert a newly selected layout and leave persistence stale.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[juliusmarminge]

Problem

The stacked/split diff toggle was ephemeral. The thread diff panel kept it in a zustand store, and the pull request Code tab kept it in plain component state that reset on every mount, so the two toggles disagreed and the PR one forgot its value constantly. Word wrap, whitespace handling, and the rest of the diff preferences already live in client settings.

Fix

Diff layout is now a client setting (diffLayout, default stacked, in packages/contracts). Both diff toolbars read it and write through useUpdateClientSettings, so one flip applies everywhere and survives reloads (on desktop it persists to disk through the same bridge as every other client setting). The old diffRenderMode field is removed from diffPanelStore, which is back to only per-thread scope selection.

It also gets a Diff layout select under Settings → General next to "Hide whitespace changes", wired into reset, customized tracking, restore-defaults, and settings search (split, side by side, unified, …).

Not migrated: a split value in the old t3code:diff-panel-state:v1 localStorage entry. Anyone who had it set there flips the toggle once more.

Verification

• vp test run on clientPersistenceStorage.test.ts (new round-trip test), diffPanelStore.test.ts, settingsSearch.test.ts, SettingsPanels.logic.test.ts, and desktop DesktopClientSettings.test.ts
• tsc --noEmit for packages/contracts and apps/web, lint on changed files

Claude Fable 5 via Claude Code.

🤖 Generated with Claude Code

---

Note

Low Risk
UI preference persistence with schema defaults; no auth, security, or server data-path changes. Minor UX regression for unmigrated old localStorage layout only.

Overview
Diff layout (stacked vs split) is now a shared client setting (diffLayout, default stacked) instead of ephemeral UI state.

The thread Diff panel and pull request Code tab both read and update it through useClientSettings / useUpdateClientSettings, so one toggle stays in sync everywhere and survives reloads (including desktop via the existing client-settings bridge). diffRenderMode is removed from diffPanelStore, which again only tracks per-thread diff scope.

Settings → General adds a Diff layout control (plus reset, customized tracking, restore defaults, and search). Tests cover browser persistence defaults and desktop settings fixtures.

Not migrated: a prior split choice stored only in t3code:diff-panel-state:v1 localStorage; users may need to pick split once more.

^{Reviewed by Cursor Bugbot for commit 3627b1e. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Persist diff layout toggle in client settings instead of component state

• Adds a DiffLayout contract (stacked/split, default stacked) to settings.ts and wires it into the client settings schema and patch type
• Removes DiffRenderMode from diffPanelStore.ts; DiffPanel.tsx and PullRequestCodeTab.tsx now read and write the layout through client settings
• Adds a searchable General settings row in SettingsPanels.tsx for choosing and resetting the layout, covered by settingsSearch.ts
• useSettingsRestore reports a non-default diff layout as changed and resets it
• Risk: existing persisted client settings without the diffLayout field decode to stacked; any out-of-tree readers expecting diffPanelStore to hold render-mode state will break since that field is removed

📊 Macroscope summarized 3627b1e. 6 files reviewed, 2 issues evaluated, 1 issue filtered, 1 comment posted

🗂️ Filtered Issues

apps/web/src/components/DiffPanel.tsx — 0 comments posted, 1 evaluated, 1 filtered

• line 775: updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well). [ Cross-file consolidated ]

[macroscopeapp]

🟡 MediumpullRequest/PullRequestCodeTab.tsx:1122

updateClientSettings({ diffLayout: next }) can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. hydrateClientSettings() later replaces the snapshot with its stale persistedSettings because persistClientSettings does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.

Also found in 1 other location(s)

apps/web/src/components/DiffPanel.tsx:775

updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file @apps/web/src/components/pullRequest/PullRequestCodeTab.tsx around line 1122:
`updateClientSettings({ diffLayout: next })` can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. `hydrateClientSettings()` later replaces the snapshot with its stale `persistedSettings` because `persistClientSettings` does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.
Also found in 1 other location(s):
- apps/web/src/components/DiffPanel.tsx:775 -- `updateClientSettings({ diffLayout: next })` can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, `useClientSettings` initially returns defaults while `hydrateClientSettings()` is still awaiting `getClientSettings()`; if the user changes the layout in that interval, `persistClientSettings` updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of `useSettings.ts` replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

[juliusmarminge]

Pre-existing and out of scope here. hydrateClientSettings has never invalidated its in-flight read against later writes, and the same window applies to every other client-settings write (word wrap, whitespace, and the six existing useUpdateClientSettings callers). The window is a single localStorage read or desktop IPC round-trip at app boot, which resolves before a user can reach a diff toolbar. If we want to close it, that is a change to useSettings.ts on its own, not part of moving this one key.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	13.4 KiB	13.5 KiB	+7 B (+0.1%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.9 KiB	6.9 KiB	+6 B (+0.1%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.6 KiB	6.6 KiB	+1 B (+0.0%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	57.0 KiB	57.0 KiB	0 B (0.0%)	66.4 KiB	✅
Codex	Live turn messages	10	10	0 (0.0%)	21	✅
Claude	Total thread wire	13.4 KiB	13.3 KiB	−130 B (−0.9%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.9 KiB	6.9 KiB	+10 B (+0.1%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.6 KiB	6.4 KiB	−140 B (−2.1%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	57.8 KiB	56.4 KiB	−1.4 KiB (−2.5%)	66.4 KiB	✅
Claude	Live turn messages	10	10	0 (0.0%)	21	✅

Baseline: 85f2479 · PR result: 3627b1e · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a localized client-preference persistence change: existing diff layout controls now share a backward-compatible setting and retain the existing stacked default, with no production, security, billing, or deployment impact. An unresolved Medium-severity hydration race could briefly revert a newly selected layout and leave persistence stale.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[juliusmarminge]

Problem

The stacked/split diff toggle was ephemeral. The thread diff panel kept it in a zustand store, and the pull request Code tab kept it in plain component state that reset on every mount, so the two toggles disagreed and the PR one forgot its value constantly. Word wrap, whitespace handling, and the rest of the diff preferences already live in client settings.

Fix

Diff layout is now a client setting (diffLayout, default stacked, in packages/contracts). Both diff toolbars read it and write through useUpdateClientSettings, so one flip applies everywhere and survives reloads (on desktop it persists to disk through the same bridge as every other client setting). The old diffRenderMode field is removed from diffPanelStore, which is back to only per-thread scope selection.

It also gets a Diff layout select under Settings → General next to "Hide whitespace changes", wired into reset, customized tracking, restore-defaults, and settings search (split, side by side, unified, …).

Not migrated: a split value in the old t3code:diff-panel-state:v1 localStorage entry. Anyone who had it set there flips the toggle once more.

Verification

• vp test run on clientPersistenceStorage.test.ts (new round-trip test), diffPanelStore.test.ts, settingsSearch.test.ts, SettingsPanels.logic.test.ts, and desktop DesktopClientSettings.test.ts
• tsc --noEmit for packages/contracts and apps/web, lint on changed files

Claude Fable 5 via Claude Code.

🤖 Generated with Claude Code

---

Note

Low Risk
UI preference persistence with schema defaults; no auth, security, or server data-path changes. Minor UX regression for unmigrated old localStorage layout only.

Overview
Diff layout (stacked vs split) is now a shared client setting (diffLayout, default stacked) instead of ephemeral UI state.

The thread Diff panel and pull request Code tab both read and update it through useClientSettings / useUpdateClientSettings, so one toggle stays in sync everywhere and survives reloads (including desktop via the existing client-settings bridge). diffRenderMode is removed from diffPanelStore, which again only tracks per-thread diff scope.

Settings → General adds a Diff layout control (plus reset, customized tracking, restore defaults, and search). Tests cover browser persistence defaults and desktop settings fixtures.

Not migrated: a prior split choice stored only in t3code:diff-panel-state:v1 localStorage; users may need to pick split once more.

^{Reviewed by Cursor Bugbot for commit 3627b1e. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Persist diff layout toggle in client settings instead of component state

• Adds a DiffLayout contract (stacked/split, default stacked) to settings.ts and wires it into the client settings schema and patch type
• Removes DiffRenderMode from diffPanelStore.ts; DiffPanel.tsx and PullRequestCodeTab.tsx now read and write the layout through client settings
• Adds a searchable General settings row in SettingsPanels.tsx for choosing and resetting the layout, covered by settingsSearch.ts
• useSettingsRestore reports a non-default diff layout as changed and resets it
• Risk: existing persisted client settings without the diffLayout field decode to stacked; any out-of-tree readers expecting diffPanelStore to hold render-mode state will break since that field is removed

📊 Macroscope summarized 3627b1e. 6 files reviewed, 2 issues evaluated, 1 issue filtered, 1 comment posted

🗂️ Filtered Issues

apps/web/src/components/DiffPanel.tsx — 0 comments posted, 1 evaluated, 1 filtered

• line 775: updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well). [ Cross-file consolidated ]

[macroscopeapp]

🟡 MediumpullRequest/PullRequestCodeTab.tsx:1122

updateClientSettings({ diffLayout: next }) can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. hydrateClientSettings() later replaces the snapshot with its stale persistedSettings because persistClientSettings does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.

Also found in 1 other location(s)

apps/web/src/components/DiffPanel.tsx:775

updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file @apps/web/src/components/pullRequest/PullRequestCodeTab.tsx around line 1122:
`updateClientSettings({ diffLayout: next })` can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. `hydrateClientSettings()` later replaces the snapshot with its stale `persistedSettings` because `persistClientSettings` does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.
Also found in 1 other location(s):
- apps/web/src/components/DiffPanel.tsx:775 -- `updateClientSettings({ diffLayout: next })` can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, `useClientSettings` initially returns defaults while `hydrateClientSettings()` is still awaiting `getClientSettings()`; if the user changes the layout in that interval, `persistClientSettings` updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of `useSettings.ts` replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

[juliusmarminge]

Pre-existing and out of scope here. hydrateClientSettings has never invalidated its in-flight read against later writes, and the same window applies to every other client-settings write (word wrap, whitespace, and the six existing useUpdateClientSettings callers). The window is a single localStorage read or desktop IPC round-trip at app boot, which resolves before a user can reach a diff toolbar. If we want to close it, that is a change to useSettings.ts on its own, not part of moving this one key.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	13.4 KiB	13.5 KiB	+7 B (+0.1%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.9 KiB	6.9 KiB	+6 B (+0.1%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.6 KiB	6.6 KiB	+1 B (+0.0%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	57.0 KiB	57.0 KiB	0 B (0.0%)	66.4 KiB	✅
Codex	Live turn messages	10	10	0 (0.0%)	21	✅
Claude	Total thread wire	13.4 KiB	13.3 KiB	−130 B (−0.9%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.9 KiB	6.9 KiB	+10 B (+0.1%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.6 KiB	6.4 KiB	−140 B (−2.1%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	57.8 KiB	56.4 KiB	−1.4 KiB (−2.5%)	66.4 KiB	✅
Claude	Live turn messages	10	10	0 (0.0%)	21	✅

Baseline: 85f2479 · PR result: 3627b1e · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a localized client-preference persistence change: existing diff layout controls now share a backward-compatible setting and retain the existing stacked default, with no production, security, billing, or deployment impact. An unresolved Medium-severity hydration race could briefly revert a newly selected layout and leave persistence stale.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[juliusmarminge]

Problem

The stacked/split diff toggle was ephemeral. The thread diff panel kept it in a zustand store, and the pull request Code tab kept it in plain component state that reset on every mount, so the two toggles disagreed and the PR one forgot its value constantly. Word wrap, whitespace handling, and the rest of the diff preferences already live in client settings.

Fix

Diff layout is now a client setting (diffLayout, default stacked, in packages/contracts). Both diff toolbars read it and write through useUpdateClientSettings, so one flip applies everywhere and survives reloads (on desktop it persists to disk through the same bridge as every other client setting). The old diffRenderMode field is removed from diffPanelStore, which is back to only per-thread scope selection.

It also gets a Diff layout select under Settings → General next to "Hide whitespace changes", wired into reset, customized tracking, restore-defaults, and settings search (split, side by side, unified, …).

Not migrated: a split value in the old t3code:diff-panel-state:v1 localStorage entry. Anyone who had it set there flips the toggle once more.

Verification

• vp test run on clientPersistenceStorage.test.ts (new round-trip test), diffPanelStore.test.ts, settingsSearch.test.ts, SettingsPanels.logic.test.ts, and desktop DesktopClientSettings.test.ts
• tsc --noEmit for packages/contracts and apps/web, lint on changed files

Claude Fable 5 via Claude Code.

🤖 Generated with Claude Code

---

Note

Low Risk
UI preference persistence with schema defaults; no auth, security, or server data-path changes. Minor UX regression for unmigrated old localStorage layout only.

Overview
Diff layout (stacked vs split) is now a shared client setting (diffLayout, default stacked) instead of ephemeral UI state.

The thread Diff panel and pull request Code tab both read and update it through useClientSettings / useUpdateClientSettings, so one toggle stays in sync everywhere and survives reloads (including desktop via the existing client-settings bridge). diffRenderMode is removed from diffPanelStore, which again only tracks per-thread diff scope.

Settings → General adds a Diff layout control (plus reset, customized tracking, restore defaults, and search). Tests cover browser persistence defaults and desktop settings fixtures.

Not migrated: a prior split choice stored only in t3code:diff-panel-state:v1 localStorage; users may need to pick split once more.

^{Reviewed by Cursor Bugbot for commit 3627b1e. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Persist diff layout toggle in client settings instead of component state

• Adds a DiffLayout contract (stacked/split, default stacked) to settings.ts and wires it into the client settings schema and patch type
• Removes DiffRenderMode from diffPanelStore.ts; DiffPanel.tsx and PullRequestCodeTab.tsx now read and write the layout through client settings
• Adds a searchable General settings row in SettingsPanels.tsx for choosing and resetting the layout, covered by settingsSearch.ts
• useSettingsRestore reports a non-default diff layout as changed and resets it
• Risk: existing persisted client settings without the diffLayout field decode to stacked; any out-of-tree readers expecting diffPanelStore to hold render-mode state will break since that field is removed

📊 Macroscope summarized 3627b1e. 6 files reviewed, 2 issues evaluated, 1 issue filtered, 1 comment posted

🗂️ Filtered Issues

apps/web/src/components/DiffPanel.tsx — 0 comments posted, 1 evaluated, 1 filtered

• line 775: updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well). [ Cross-file consolidated ]

[macroscopeapp]

🟡 MediumpullRequest/PullRequestCodeTab.tsx:1122

updateClientSettings({ diffLayout: next }) can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. hydrateClientSettings() later replaces the snapshot with its stale persistedSettings because persistClientSettings does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.

Also found in 1 other location(s)

apps/web/src/components/DiffPanel.tsx:775

updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file @apps/web/src/components/pullRequest/PullRequestCodeTab.tsx around line 1122:
`updateClientSettings({ diffLayout: next })` can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. `hydrateClientSettings()` later replaces the snapshot with its stale `persistedSettings` because `persistClientSettings` does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.
Also found in 1 other location(s):
- apps/web/src/components/DiffPanel.tsx:775 -- `updateClientSettings({ diffLayout: next })` can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, `useClientSettings` initially returns defaults while `hydrateClientSettings()` is still awaiting `getClientSettings()`; if the user changes the layout in that interval, `persistClientSettings` updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of `useSettings.ts` replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

[juliusmarminge]

Pre-existing and out of scope here. hydrateClientSettings has never invalidated its in-flight read against later writes, and the same window applies to every other client-settings write (word wrap, whitespace, and the six existing useUpdateClientSettings callers). The window is a single localStorage read or desktop IPC round-trip at app boot, which resolves before a user can reach a diff toolbar. If we want to close it, that is a change to useSettings.ts on its own, not part of moving this one key.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	13.4 KiB	13.5 KiB	+7 B (+0.1%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.9 KiB	6.9 KiB	+6 B (+0.1%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.6 KiB	6.6 KiB	+1 B (+0.0%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	57.0 KiB	57.0 KiB	0 B (0.0%)	66.4 KiB	✅
Codex	Live turn messages	10	10	0 (0.0%)	21	✅
Claude	Total thread wire	13.4 KiB	13.3 KiB	−130 B (−0.9%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.9 KiB	6.9 KiB	+10 B (+0.1%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.6 KiB	6.4 KiB	−140 B (−2.1%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	57.8 KiB	56.4 KiB	−1.4 KiB (−2.5%)	66.4 KiB	✅
Claude	Live turn messages	10	10	0 (0.0%)	21	✅

Baseline: 85f2479 · PR result: 3627b1e · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a localized client-preference persistence change: existing diff layout controls now share a backward-compatible setting and retain the existing stacked default, with no production, security, billing, or deployment impact. An unresolved Medium-severity hydration race could briefly revert a newly selected layout and leave persistence stale.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[juliusmarminge]

Problem

The stacked/split diff toggle was ephemeral. The thread diff panel kept it in a zustand store, and the pull request Code tab kept it in plain component state that reset on every mount, so the two toggles disagreed and the PR one forgot its value constantly. Word wrap, whitespace handling, and the rest of the diff preferences already live in client settings.

Fix

Diff layout is now a client setting (diffLayout, default stacked, in packages/contracts). Both diff toolbars read it and write through useUpdateClientSettings, so one flip applies everywhere and survives reloads (on desktop it persists to disk through the same bridge as every other client setting). The old diffRenderMode field is removed from diffPanelStore, which is back to only per-thread scope selection.

It also gets a Diff layout select under Settings → General next to "Hide whitespace changes", wired into reset, customized tracking, restore-defaults, and settings search (split, side by side, unified, …).

Not migrated: a split value in the old t3code:diff-panel-state:v1 localStorage entry. Anyone who had it set there flips the toggle once more.

Verification

• vp test run on clientPersistenceStorage.test.ts (new round-trip test), diffPanelStore.test.ts, settingsSearch.test.ts, SettingsPanels.logic.test.ts, and desktop DesktopClientSettings.test.ts
• tsc --noEmit for packages/contracts and apps/web, lint on changed files

Claude Fable 5 via Claude Code.

🤖 Generated with Claude Code

---

Note

Low Risk
UI preference persistence with schema defaults; no auth, security, or server data-path changes. Minor UX regression for unmigrated old localStorage layout only.

Overview
Diff layout (stacked vs split) is now a shared client setting (diffLayout, default stacked) instead of ephemeral UI state.

The thread Diff panel and pull request Code tab both read and update it through useClientSettings / useUpdateClientSettings, so one toggle stays in sync everywhere and survives reloads (including desktop via the existing client-settings bridge). diffRenderMode is removed from diffPanelStore, which again only tracks per-thread diff scope.

Settings → General adds a Diff layout control (plus reset, customized tracking, restore defaults, and search). Tests cover browser persistence defaults and desktop settings fixtures.

Not migrated: a prior split choice stored only in t3code:diff-panel-state:v1 localStorage; users may need to pick split once more.

^{Reviewed by Cursor Bugbot for commit 3627b1e. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Persist diff layout toggle in client settings instead of component state

• Adds a DiffLayout contract (stacked/split, default stacked) to settings.ts and wires it into the client settings schema and patch type
• Removes DiffRenderMode from diffPanelStore.ts; DiffPanel.tsx and PullRequestCodeTab.tsx now read and write the layout through client settings
• Adds a searchable General settings row in SettingsPanels.tsx for choosing and resetting the layout, covered by settingsSearch.ts
• useSettingsRestore reports a non-default diff layout as changed and resets it
• Risk: existing persisted client settings without the diffLayout field decode to stacked; any out-of-tree readers expecting diffPanelStore to hold render-mode state will break since that field is removed

📊 Macroscope summarized 3627b1e. 6 files reviewed, 2 issues evaluated, 1 issue filtered, 1 comment posted

🗂️ Filtered Issues

apps/web/src/components/DiffPanel.tsx — 0 comments posted, 1 evaluated, 1 filtered

• line 775: updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well). [ Cross-file consolidated ]

[macroscopeapp]

🟡 MediumpullRequest/PullRequestCodeTab.tsx:1122

updateClientSettings({ diffLayout: next }) can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. hydrateClientSettings() later replaces the snapshot with its stale persistedSettings because persistClientSettings does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.

Also found in 1 other location(s)

apps/web/src/components/DiffPanel.tsx:775

updateClientSettings({ diffLayout: next }) can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, useClientSettings initially returns defaults while hydrateClientSettings() is still awaiting getClientSettings(); if the user changes the layout in that interval, persistClientSettings updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of useSettings.ts replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file @apps/web/src/components/pullRequest/PullRequestCodeTab.tsx around line 1122:
`updateClientSettings({ diffLayout: next })` can be overwritten during initial settings hydration, causing the toggle and diff to revert to the user's selection. `hydrateClientSettings()` later replaces the snapshot with its stale `persistedSettings` because `persistClientSettings` does not invalidate the in-flight read; guard hydration against newer writes so the latest client setting wins.
Also found in 1 other location(s):
- apps/web/src/components/DiffPanel.tsx:775 -- `updateClientSettings({ diffLayout: next })` can be overwritten by the initial asynchronous settings hydration. On a newly mounted panel, `useClientSettings` initially returns defaults while `hydrateClientSettings()` is still awaiting `getClientSettings()`; if the user changes the layout in that interval, `persistClientSettings` updates the snapshot but does not advance the hydration generation. When the pending read returns an older persisted layout, line 129 of `useSettings.ts` replaces the snapshot with it, so the toggle and diff revert to the stale value (and the concurrent persistence operations can leave storage stale as well).

[juliusmarminge]

Pre-existing and out of scope here. hydrateClientSettings has never invalidated its in-flight read against later writes, and the same window applies to every other client-settings write (word wrap, whitespace, and the six existing useUpdateClientSettings callers). The window is a single localStorage read or desktop IPC round-trip at app boot, which resolves before a user can reach a diff toolbar. If we want to close it, that is a change to useSettings.ts on its own, not part of moving this one key.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	13.4 KiB	13.5 KiB	+7 B (+0.1%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.9 KiB	6.9 KiB	+6 B (+0.1%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.6 KiB	6.6 KiB	+1 B (+0.0%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	57.0 KiB	57.0 KiB	0 B (0.0%)	66.4 KiB	✅
Codex	Live turn messages	10	10	0 (0.0%)	21	✅
Claude	Total thread wire	13.4 KiB	13.3 KiB	−130 B (−0.9%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.9 KiB	6.9 KiB	+10 B (+0.1%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.6 KiB	6.4 KiB	−140 B (−2.1%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	57.8 KiB	56.4 KiB	−1.4 KiB (−2.5%)	66.4 KiB	✅
Claude	Live turn messages	10	10	0 (0.0%)	21	✅

Baseline: 85f2479 · PR result: 3627b1e · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a localized client-preference persistence change: existing diff layout controls now share a backward-compatible setting and retain the existing stacked default, with no production, security, billing, or deployment impact. An unresolved Medium-severity hydration race could briefly revert a newly selected layout and leave persistence stale.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}