Skip to content

Fix reopening existing Diff tab#3973

Merged
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
jakeleventhal:t3code/fix-diff-tab-selector
Jul 18, 2026
Merged

Fix reopening existing Diff tab#3973
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
jakeleventhal:t3code/fix-diff-tab-selector

Conversation

@jakeleventhal

@jakeleventhal jakeleventhal commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

Summary

  • dismiss the active Plan sidebar before selecting Diff from the panel surface menu
  • preserve and reactivate the existing singleton Diff surface instead of allowing Plan to immediately reclaim focus
  • add regression coverage for reopening an inactive singleton surface

Root cause

The Diff surface was activated in the right-panel store, but selecting it through the add-surface menu did not mark the auto-opened Plan sidebar as dismissed for the current turn. The Plan auto-open effect then immediately selected Plan again, making the Diff selection appear to be a no-op.

Validation

  • pnpm --filter @t3tools/web test -- rightPanelStore.test.ts (148 files, 1,281 tests passed)
  • pnpm exec vp check (passes with 9 pre-existing warnings in unrelated files)
  • pnpm exec vp run typecheck

Note

Low Risk
Small UI interaction fix in ChatView with a unit test; no auth, data, or store logic changes in the diff.

Overview
Fixes Diff appearing to do nothing when Plan is the active right-panel surface: opening Diff from the add-surface menu now calls dismissPlanSidebarForCurrentTurn when the plan panel is open, so the per-turn plan auto-open effect does not immediately switch focus back to Plan.

Adds regression coverage in rightPanelStore.test.ts that reopening an inactive diff singleton reactivates the existing surface (alongside plan) instead of leaving Plan selected.

Reviewed by Cursor Bugbot for commit dec8372. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix reopening an existing Diff tab in the right panel

  • Adds a test case in rightPanelStore.test.ts that verifies re-opening a diff singleton surface reactivates the existing surface rather than duplicating it.
  • When opening the diff surface in ChatView.tsx, the addDiffSurface callback now dismisses the plan sidebar if it is open before activating the diff panel.

Macroscope summarized dec8372.

@coderabbitai

coderabbitai Bot commented Jul 14, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 9c1ecbe4-d8c7-4ae2-82bd-065979bc082b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added size:S 10-29 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Jul 14, 2026
@jakeleventhal
jakeleventhal marked this pull request as ready for review July 14, 2026 19:00
@macroscopeapp

macroscopeapp Bot commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Straightforward bug fix coordinating sidebar state when opening the Diff tab. The change is small (dismissing plan sidebar when diff opens), self-contained, and includes test coverage.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarminge merged commit 31caa56 into pingdotgg:main Jul 18, 2026
14 checks passed
adamfgr pushed a commit to agriffiths-bots/t3code that referenced this pull request Jul 19, 2026
* Fix dropped events during initial thread snapshot (pingdotgg#4079)

* [codex] fix mobile composer Enter behavior (pingdotgg#3930)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>

* feat: draft hero landing on the index route (pingdotgg#4055)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>

* feat: file explorer mention actions and zoom-aware context menus (pingdotgg#4054)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>

* fix(web): avoid duplicate mention text on paste

Co-authored-by: codex <codex@users.noreply.github.com>

* fix(mobile): restore iOS home screen branding (pingdotgg#4025)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

* perf(client): defer active thread cache writes (pingdotgg#4006)

* Default diffs to working changes (pingdotgg#3974)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

* Add Grok to marketing site provider list (pingdotgg#3484)

* Fix reopening existing Diff tab (pingdotgg#3973)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

* Fix sending messages during active turns (pingdotgg#3919)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

* [codex] Route OpenCode missing-session errors through Effect (pingdotgg#3608)

Co-authored-by: Codex <codex@openai.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>

* [fix/feat:ui] Show default option badge (pingdotgg#3232)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

* [fix/feat:ui] Preserve open-in editor brand colors (pingdotgg#3225)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

* fix(web): handle macOS Home and End in composer (pingdotgg#2508)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

* Allow failed remote environments to be removed (pingdotgg#4084)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

* [codex] canonicalize client timestamps (pingdotgg#4112)

* [fix/feat:ui] Make selected menu checks blue (pingdotgg#3234)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>

* fix(desktop): Validate WSL node version against engine range after probe success (pingdotgg#3621)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

* Refresh splash screen and favicon branding (pingdotgg#4120)

* Add terminal selection copy action (pingdotgg#2904)

* fix(sync): reconcile upstream changes with fork-local behaviour

Two merge-introduced incompatibilities from the 20260719 upstream sync:

- Normalizer: upstream's client-timestamp canonicalization (da3c203)
  rewrote bootstrap.createThread.createdAt, which BootstrapTurnStartDispatcher
  uses to fingerprint a replayed bootstrap turn against the thread it already
  created. Every retry would miss that check and create a duplicate thread.
  Keep the client's bootstrap timestamp as the stable identity; the turn-level
  createdAt is still canonicalized.

- ThreadTerminalDrawer: upstream's terminal selection copy action (1735e27)
  passed a Terminal to writeSystemMessage, which this fork narrowed to accept
  a TerminalWriteQueue. Use terminalWriterRef, matching the other call sites.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

---------

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Ishan <ishansachu1@gmail.com>
Co-authored-by: Maxwell Young <maxtheyoung@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Alex <me@pixp.cc>
Co-authored-by: Chris Michael Guzman <67719167+Chrrxs@users.noreply.github.com>
Co-authored-by: Jake Leventhal <jakeleventhal@me.com>
Co-authored-by: Aditya Mer <101453576+Aditya190803@users.noreply.github.com>
Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
Co-authored-by: Codex <codex@openai.com>
Co-authored-by: ss <69873514+sandersonstabo@users.noreply.github.com>
Co-authored-by: Guilherme Vieira <46866023+GuilhermeVieiraDev@users.noreply.github.com>
Co-authored-by: Noah Zepner <noah@zepner.dev>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
Co-authored-by: Taras <Taras.Fomin@gmail.com>
Co-authored-by: wizzoapp[bot] <254688279+wizzoapp[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
bcotrim pushed a commit to bcotrim/mognet that referenced this pull request Jul 19, 2026
Co-authored-by: Julius Marminge <julius0216@outlook.com>
cursor Bot pushed a commit to aaditagrawal/t3code that referenced this pull request Jul 20, 2026
Co-authored-by: Julius Marminge <julius0216@outlook.com>
(cherry picked from commit 31caa56)
cursor Bot pushed a commit to aaditagrawal/t3code that referenced this pull request Jul 20, 2026
…ngdotgg#4055pingdotgg#4164) (#175)

* feat: draft hero landing on the index route (pingdotgg#4055)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
(cherry picked from commit 1bd2fa2)

* feat: file explorer mention actions and zoom-aware context menus (pingdotgg#4054)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
(cherry picked from commit 4cfec8c)

* fix(web): avoid duplicate mention text on paste

Co-authored-by: codex <codex@users.noreply.github.com>
(cherry picked from commit 2318e00)

* Default diffs to working changes (pingdotgg#3974)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
(cherry picked from commit 38e0bb0)

* Fix reopening existing Diff tab (pingdotgg#3973)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
(cherry picked from commit 31caa56)

* Fix sending messages during active turns (pingdotgg#3919)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
(cherry picked from commit d8b12ae)

* [fix/feat:ui] Show default option badge (pingdotgg#3232)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
(cherry picked from commit c0e161a)

* [fix/feat:ui] Preserve open-in editor brand colors (pingdotgg#3225)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
(cherry picked from commit e63403f)

* fix(web): handle macOS Home and End in composer (pingdotgg#2508)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
(cherry picked from commit b859a57)

* Allow failed remote environments to be removed (pingdotgg#4084)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
(cherry picked from commit 0506508)

* [fix/feat:ui] Make selected menu checks blue (pingdotgg#3234)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
(cherry picked from commit 5c66110)

* Add terminal selection copy action (pingdotgg#2904)

(cherry picked from commit 1735e27)

* fix(web): improve dev sidebar backdrop contrast & remove version pills (pingdotgg#4166)

(cherry picked from commit b511227)

* Fix draft banner stack overlap (pingdotgg#4164)

Co-authored-by: codex <codex@users.noreply.github.com>
(cherry picked from commit 7e1a0d5)

---------

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Jake Leventhal <jakeleventhal@me.com>
Co-authored-by: ss <69873514+sandersonstabo@users.noreply.github.com>
Co-authored-by: Guilherme Vieira <46866023+GuilhermeVieiraDev@users.noreply.github.com>
Co-authored-by: Noah Zepner <noah@zepner.dev>
Co-authored-by: Taras <Taras.Fomin@gmail.com>
Co-authored-by: maria <maria@kuuro.net>
cursor Bot pushed a commit to aaditagrawal/t3code that referenced this pull request Jul 20, 2026
…ngdotgg#4055pingdotgg#4164) (#175) (#177)

* feat: draft hero landing on the index route (pingdotgg#4055)




(cherry picked from commit 1bd2fa2)

* feat: file explorer mention actions and zoom-aware context menus (pingdotgg#4054)



(cherry picked from commit 4cfec8c)

* fix(web): avoid duplicate mention text on paste


(cherry picked from commit 2318e00)

* Default diffs to working changes (pingdotgg#3974)


(cherry picked from commit 38e0bb0)

* Fix reopening existing Diff tab (pingdotgg#3973)


(cherry picked from commit 31caa56)

* Fix sending messages during active turns (pingdotgg#3919)


(cherry picked from commit d8b12ae)

* [fix/feat:ui] Show default option badge (pingdotgg#3232)


(cherry picked from commit c0e161a)

* [fix/feat:ui] Preserve open-in editor brand colors (pingdotgg#3225)


(cherry picked from commit e63403f)

* fix(web): handle macOS Home and End in composer (pingdotgg#2508)


(cherry picked from commit b859a57)

* Allow failed remote environments to be removed (pingdotgg#4084)


(cherry picked from commit 0506508)

* [fix/feat:ui] Make selected menu checks blue (pingdotgg#3234)



(cherry picked from commit 5c66110)

* Add terminal selection copy action (pingdotgg#2904)

(cherry picked from commit 1735e27)

* fix(web): improve dev sidebar backdrop contrast & remove version pills (pingdotgg#4166)

(cherry picked from commit b511227)

* Fix draft banner stack overlap (pingdotgg#4164)


(cherry picked from commit 7e1a0d5)

---------

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Jake Leventhal <jakeleventhal@me.com>
Co-authored-by: ss <69873514+sandersonstabo@users.noreply.github.com>
Co-authored-by: Guilherme Vieira <46866023+GuilhermeVieiraDev@users.noreply.github.com>
Co-authored-by: Noah Zepner <noah@zepner.dev>
Co-authored-by: Taras <Taras.Fomin@gmail.com>
Co-authored-by: maria <maria@kuuro.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:S 10-29 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants