Skip to content

fix(web): show worktree icon in sidebar v2 - #5909

Merged
maria-rcks merged 1 commit into
pingdotgg:mainfrom
tris203:t3code/sidebar-branch-type-icon
Aug 10, 2026
Merged

fix(web): show worktree icon in sidebar v2#5909
maria-rcks merged 1 commit into
pingdotgg:mainfrom
tris203:t3code/sidebar-branch-type-icon

Conversation

@tris203

@tris203 tris203 commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

Problem

Sidebar v2 shows the branch name without Sidebar v1’s worktree indicator, so users cannot tell whether a thread targets a worktree or a plain ref.

Fix

Reuse the existing worktree indicator beside the Sidebar v2 branch label. Worktree threads now show the folder/git icon and its existing accessible tooltip; ref-only threads remain text-only.

Before / after

Before After
Sidebar v2 before — no worktree indicator Sidebar v2 after — worktree indicator beside branch
.

Verification

  • Web typecheck
  • Web unit tests (1,995 tests)
  • Formatter and diff checks
  • Integrated web pass with ref-only and worktree fixtures

Implemented with GPT-5.6-sol via the Codex harness.


Note

Low Risk
Small UI parity change reusing an existing component with no auth, data, or API impact.

Overview
Sidebar v2 now matches v1 for worktree threads: the shared ThreadWorktreeIndicator is rendered next to the branch label on card rows when a branch is present.

Worktree threads get the existing folder/git icon and tooltip; ref-only threads stay unchanged (the indicator renders nothing without worktreePath).

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

Note

Show worktree indicator before branch label in sidebar thread rows

Adds ThreadWorktreeIndicator before the branch name in each sidebar thread row when a branch exists. The branch display changes from a single <span> to a fragment containing the indicator and the branch span.

Macroscope summarized 97c128f.

@coderabbitai

coderabbitai Bot commented Aug 9, 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 Plus

Run ID: 0459c8c0-76a9-4ec7-8582-cd584200188c

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.

@github-actions github-actions Bot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:XS 0-9 changed lines (additions + deletions). labels Aug 9, 2026
@macroscopeapp

macroscopeapp Bot commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved 97c128f

Simple UI change that imports and displays an existing ThreadWorktreeIndicator component next to branch names in the sidebar. No new logic or runtime behavior changes introduced.

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

@maria-rcks
maria-rcks merged commit 0ca9fb3 into pingdotgg:main Aug 10, 2026
17 checks passed
github-actions Bot added a commit to omarcresp/t3code-flake that referenced this pull request Aug 10, 2026
## What's Changed
* Move project settings to contextual project routes by @juliusmarminge in pingdotgg/t3code#5923
* Retain thread sidebar data when navigating to /settings so back navigation is instant by @juliusmarminge in pingdotgg/t3code#5930
* Automate production mobile EAS releases by @juliusmarminge in pingdotgg/t3code#5609
* Add settings and usage breadcrumbs by @juliusmarminge in pingdotgg/t3code#5929
* fix(web): correct model picker trigger padding by @Chrono-byte in pingdotgg/t3code#5935
* fix(web): show worktree icon in sidebar v2 by @tris203 in pingdotgg/t3code#5909
* fix(web): enable restore defaults after theme mix changes by @Lucenx9 in pingdotgg/t3code#5928
* fix(web): trait menu closes after you pick a level by @t3dotgg in pingdotgg/t3code#5879
* fix(web): align project name with headline by @carterwsmith in pingdotgg/t3code#5864
* fix(web): update pills use readable theme foregrounds by @chrisdeeming in pingdotgg/t3code#5938

## New Contributors
* @carterwsmith made their first contribution in pingdotgg/t3code#5864

**Full Changelog**: pingdotgg/t3code@v0.0.33-nightly.20260810.1054...v0.0.33-nightly.20260810.1055

Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.0.33-nightly.20260810.1055
@tris203
tris203 deleted the t3code/sidebar-branch-type-icon branch August 10, 2026 06:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS 0-9 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