sync: port upstream sidebar v2 default, Stop button, and late polish (#5554–#5677) by aaditagrawal · Pull Request #220 · aaditagrawal/t3code

aaditagrawal · 2026-08-08T07:24:41Z

Summary

Layer 6 of the 2026-08-08 upstream sync stack. Ports Stop-while-pending, Legacy features fold (pingdotgg#5664), sidebar v2 as the default sidebar (pingdotgg#5672), GitHub PR-status rate-limit fix, delayed reconnect warnings, simple typography terminal sizing, and background-subagent reaper safety (pingdotgg#5677).

Stacked on #219 (codex/sync-20260808-l5-mobile-pins-a13c).

Fork adapts

#5672: delete SidebarV2.tsx / promote upstream renamed Sidebar.tsx, but keep fork title-regeneration failure toasts + context-menu failure labels.
#5664: bridge fork-only apps/web/src/appSettings.ts local enableAssistantStreaming ↔ unified enableLegacyTokenStreaming.
Preserve ChatView rate-limit panel through ChatView merges.

Test plan

vp check + vp run typecheck green
Default sidebar is v2; legacy sidebar still available via setting
Title regeneration failure still toasts / labels in context menu
Rate-limit panel still present in ChatView
Stop button shows while input is pending

Stack

sync: port upstream server settle, tunnel/update safety, and early web polish (#5482–#5486) #215 L1 → main
sync: port upstream pagination, reconnect settle, and Claude subagent safety (#5556–#5573) #216 L2 → L1
sync: port upstream plan fold and per-device provider settings (#5558–#5580) #217 L3 → L2
sync: port upstream theme library, Done/Woke, and runtime mode (#5226–#5440) #218 L4 → L3
sync: port upstream mobile UX, pin ordering, browser history, and sidebar polish (#5415–#5633) #219 L5 → L4
This PR L6 → L5
L7 (ours-merge ancestry) → L6

coderabbitai · 2026-08-08T07:24:47Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

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: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: 492510ae-dbba-4e01-90be-c251913346d5

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

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.}

(cherry picked from commit 33a03c8)

…pingdotgg#5582) (cherry picked from commit bd422fd)

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

(cherry picked from commit bfc69e4) Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>

… tooltip (pingdotgg#5594)

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>

…gdotgg#5270)

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>

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

…ngdotgg#5633)

Keep the MOBILE_APP_VERSION helper; only the fallback default changes. Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>

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

This reverts commit 83f7f8e.

CI frozen-lockfile install failed because apps/web still resolved @clerk/clerk-js@6.25.12 after the catalog moved to 6.25.13. Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>

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

…res (pingdotgg#5664) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

…ngdotgg#5673) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>

…bagents (pingdotgg#5677) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ad7de883b6

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-08-08T07:48:50Z

  if (pendingAction) {
    return (
      <div className={cn("flex items-center justify-end", compact ? "gap-1.5" : "gap-2")}>
+        {isRunning ? renderStopGenerationButton(true) : null}


Pass the running state to mobile pending actions

In the mobile web pending-input layouts, ChatComposer.tsx renders this component with isRunning={false} at lines 2747–2750 and 3030–3033, while the normal footer is hidden or omitted. Consequently, this new branch never renders the Stop button on a phone when an active turn is waiting for user input, leaving the user unable to interrupt the generation from that surface. Pass phase === "running" through those specialized mobile call sites as well.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-08-08T07:48:51Z

+        if (details.upstreamRef === null && (yield* isUnpublishedBranch(cwd, headContext))) {
+          return { latest: null, headContext };
+        }


Keep looking up PRs after remote refs are pruned

When a merged or closed PR's head branch is deleted remotely and a fetch prunes the corresponding tracking ref, this condition misclassifies the local branch as never published and returns latest: null without querying the provider. git fetch -h documents --prune as “prune remote-tracking branches no longer on remote,” so these refs are not durable evidence that a branch never reached the host. The successful null result also replaces the last-known PR state, causing the merged/closed badge and its sidebar lifecycle signal to disappear after pruning.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-08-08T07:48:51Z

-export const Route = createFileRoute("/settings/beta")({
-  component: SettingsBetaRoute,


Redirect the retired beta settings URL

Deleting this route without retaining a redirect breaks existing bookmarks, browser-history entries, and externally shared links to /settings/beta, even though the settings themselves still exist under /settings/general. Those users now land on the router's unmatched-route state instead of the relocated controls; keep a lightweight route that redirects the old path to /settings/general.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-08-08T07:48:51Z

        />
      </SettingsSection>
+
+      <LegacyFeaturesSection />


Include all legacy toggles in Restore defaults

Now that LegacyFeaturesSection is part of the General page, its controls are covered by the page-level Restore defaults action, but useSettingsRestore neither detects nor resets planModeEnabled or legacySidebarEnabled. If either is the only non-default preference, the Restore defaults button is disabled; if other preferences are also changed, restoration reports success while these two toggles remain enabled. Add both fields to changedSettingLabels, its dependencies, and the reset patch.

Useful? React with 👍 / 👎.

cursor Bot force-pushed the codex/sync-20260808-l6-sidebar-default-a13c branch from 234380d to 7093c2d Compare August 8, 2026 07:24

aaditagrawal mentioned this pull request Aug 8, 2026

sync: record upstream/main ancestry for 2026-08-08 #221

Merged

github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL 1,000+ effective changed lines (test files excluded in mixed PRs). labels Aug 8, 2026

cursor Bot force-pushed the codex/sync-20260808-l6-sidebar-default-a13c branch 4 times, most recently from 83ca7ab to 42375ff Compare August 8, 2026 07:33

StoneCotton and others added 21 commits August 8, 2026 07:38

fix(mobile): pad scroll views above Android nav bar (pingdotgg#5415)

f1148c4

(cherry picked from commit 33a03c8)

fix(mobile): keep Android chat text from showing through the composer (…

6114dbe

…pingdotgg#5582) (cherry picked from commit bd422fd)

fix(mobile): repair Clerk auth navigation headers (pingdotgg#5140)

9ebdd5d

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

Bump mobile app version to 1.0.2 (pingdotgg#5588)

ace29a4

(cherry picked from commit bfc69e4) Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>

feat(web): click the pin icon to unpin a thread (pingdotgg#5578)

ec3b66c

fix(web): show the correctly matching shortcut in new thread button's…

a20506b

… tooltip (pingdotgg#5594)

fix(mobile): reconnects no longer shift the thread list (pingdotgg#5372)

01269ed

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>

feat(web): drag pinned threads into your own order (pingdotgg#5581)

ba7ea41

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

chore(ci): vouch StiensWout (pingdotgg#5637)

ee3e216

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>

feat(desktop): remember recently used sites in the Browser panel (pin…

529913a

…gdotgg#5270)

chore: vouch chrisdeeming (pingdotgg#5641)

071dfdf

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>

feat(web): make sidebar artwork theme-aware (pingdotgg#5636)

2b8266d

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

fix(web): reconnect the composer seam for remote non-Git projects (pi…

2935704

…ngdotgg#5633)

fix(mobile): bump APP_VERSION default to 1.0.2 for pingdotgg#5588

b572da2

Keep the MOBILE_APP_VERSION helper; only the fallback default changes. Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>

fix(mobile): format app.config.ts version field

a204a7c

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

fix: adapt upstream pingdotgg#5140 to fork

c508cab

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

fix: format mobile composer route transition css

e5e7b92

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

Revert "fix: adapt upstream pingdotgg#5140 to fork"

733c9dd

This reverts commit 83f7f8e.

fix(deps): refresh lockfile for Clerk catalog bump (pingdotgg#5140)

b807d0c

CI frozen-lockfile install failed because apps/web still resolved @clerk/clerk-js@6.25.12 after the catalog moved to 6.25.13. Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>

fix(web): format index.css for vp check

041e872

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

fix(web): show Stop button while input is pending (pingdotgg#5554)

c6e3b31

t3dotgg and others added 7 commits August 8, 2026 07:39

feat(web): fold plan mode and token-by-token output into Legacy featu…

dce29b8

…res (pingdotgg#5664) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

feat: sidebar v2 is now the default sidebar (pingdotgg#5672)

63ecbd8

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

fix(server): stop PR status lookups amplifying GitHub rate limits (pi…

c882442

…ngdotgg#5673) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>

fix(web): delay transient reconnect warnings (pingdotgg#5670)

d9d816b

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>

fix(web): inherit terminal size in simple typography (pingdotgg#5628)

a31a9f4

fix(server): stop the reaper from silently killing live background su…

77affc9

…bagents (pingdotgg#5677) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

fix: adapt upstream pingdotgg#5672 to fork

ad7de88

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

cursor Bot force-pushed the codex/sync-20260808-l5-mobile-pins-a13c branch from b00ad89 to 041e872 Compare August 8, 2026 07:39

cursor Bot force-pushed the codex/sync-20260808-l6-sidebar-default-a13c branch from 42375ff to ad7de88 Compare August 8, 2026 07:39

aaditagrawal marked this pull request as ready for review August 8, 2026 07:40

chatgpt-codex-connector Bot reviewed Aug 8, 2026

View reviewed changes

cursor Bot changed the base branch from codex/sync-20260808-l5-mobile-pins-a13c to main August 8, 2026 07:49

cursor Bot merged commit d3a7415 into main Aug 8, 2026
16 of 17 checks passed

Navigation Menu

sync: port upstream sidebar v2 default, Stop button, and late polish (#5554–#5677) - #220

sync: port upstream sidebar v2 default, Stop button, and late polish (#5554–#5677)#220
cursor[bot] merged 28 commits into
mainfrom
codex/sync-20260808-l6-sidebar-default-a13c

aaditagrawal commented Aug 8, 2026

Uh oh!

coderabbitai Bot commented Aug 8, 2026 •

edited

Loading

Review skipped

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

chatgpt-codex-connector Bot Aug 8, 2026

Uh oh!

chatgpt-codex-connector Bot Aug 8, 2026

Uh oh!

chatgpt-codex-connector Bot Aug 8, 2026

Uh oh!

chatgpt-codex-connector Bot Aug 8, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

		export const Route = createFileRoute("/settings/beta")({
		component: SettingsBetaRoute,

Conversation

aaditagrawal commented Aug 8, 2026

Summary

Fork adapts

Test plan

Stack

Uh oh!

coderabbitai Bot commented Aug 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Aug 8, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Aug 8, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Aug 8, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Aug 8, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

coderabbitai Bot commented Aug 8, 2026 •

edited

Loading