Skip to content

feat(sidebar): worktree indicator on session rows#3057

Merged
juliusmarminge merged 1 commit into
pingdotgg:mainfrom
TheIcarusWings:fix/sidebar-worktree-indicator
Jun 19, 2026
Merged

feat(sidebar): worktree indicator on session rows#3057
juliusmarminge merged 1 commit into
pingdotgg:mainfrom
TheIcarusWings:fix/sidebar-worktree-indicator

Conversation

@TheIcarusWings

@TheIcarusWings TheIcarusWings commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Sessions running in a git worktree now show a small FolderGit2 icon in the sidebar row, next to the terminal-status icon, with a tooltip giving the worktree folder and branch. This makes worktree sessions distinguishable from main-checkout sessions at a glance.

Detection uses the existing thread.worktreePath, no extra git calls. The indicator sits in the row's right-side cluster rather than inside the timestamp/meta span, because that span is pointer-events-none and fades on row hover, which makes tooltips there unreachable.

Before After
before after

Tooltip on hover:

tooltip showing worktree folder and branch

Verified in a live session with real worktree threads (screenshots above). vp check and typecheck pass.

🤖 Generated with Claude Code


Note

Low Risk
Small, read-only UI change driven by existing thread metadata; no new git calls or backend behavior.

Overview
Sidebar session rows now show a worktree indicator when thread.worktreePath is set, so worktree sessions are visually distinct from main-checkout sessions.

A new ThreadWorktreeIndicator renders a FolderGit2 icon with a tooltip (formatted folder via formatWorktreePathForDisplay, plus branch when present) and an accessible aria-label. It is placed in the row’s right-side icon cluster in SidebarThreadRow—alongside preview port and terminal status—rather than in the timestamp/meta area that uses pointer-events-none and fades on hover.

Coverage is added in ThreadStatusIndicators.test.tsx for the accessible label and for hiding the indicator when the worktree path is missing or whitespace-only.

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

Note

Add worktree indicator icon to sidebar session rows

Adds a new ThreadWorktreeIndicator component in ThreadStatusIndicators.tsx that renders a FolderGit2Icon with an accessible tooltip showing the formatted worktree path and branch. The indicator is inserted into the thread row actions area in Sidebar.tsx and renders nothing when worktreePath is absent or whitespace.

Macroscope summarized 25773fd.

@coderabbitai

coderabbitai Bot commented Jun 12, 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: c2429aa9-d7a9-4061-8412-73fc43132412

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 and usage tips.

@github-actions github-actions Bot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Jun 12, 2026

@cursor cursor Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 55144b2. Configure here.


rmSync(targetAppBundlePath, { recursive: true, force: true });
cpSync(sourceAppBundlePath, targetAppBundlePath, { recursive: true });
// verbatimSymlinks keeps the framework's relative symlinks intact

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cached bundle skips symlink fix

Medium Severity

buildMacLauncher now copies with verbatimSymlinks, but when an existing .electron-runtime bundle matches metadata.json, it returns that copy without rebuilding. Upgrades from a broken staged bundle keep the old absolute symlinks, so pnpm start:desktop on macOS can still hit ICU/GPU helper crashes until .electron-runtime is deleted manually.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 55144b2. Configure here.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This finding refers to the launcher change, which has been split out of this PR into #3058. It is addressed there: LAUNCHER_VERSION is bumped so previously staged bundles with rewritten symlinks are invalidated and re-copied instead of being reused by the metadata check. This PR is now sidebar-only.

@macroscopeapp

macroscopeapp Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Simple UI addition that displays a worktree indicator icon on sidebar session rows. The component is purely presentational with no business logic changes, and includes test coverage. The unresolved review comment references a file not modified by this PR.

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

@TheIcarusWings
TheIcarusWings force-pushed the fix/sidebar-worktree-indicator branch from 55144b2 to 53e6269 Compare June 12, 2026 13:49
@TheIcarusWings TheIcarusWings changed the title feat(sidebar): worktree indicator on session rows (+ fix mac start:desktop launcher) feat(sidebar): worktree indicator on session rows Jun 12, 2026
@github-actions github-actions Bot added size:S 10-29 changed lines (additions + deletions). and removed size:M 30-99 changed lines (additions + deletions). labels Jun 12, 2026
Sessions running in a git worktree show a FolderGit2 icon in the trailing status cluster, with the worktree folder and branch in an accessible tooltip label. Add focused render coverage for visible and absent worktree paths.

Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarminge force-pushed the fix/sidebar-worktree-indicator branch from 53e6269 to 25773fd Compare June 19, 2026 06:07
@github-actions github-actions Bot added size:M 30-99 changed lines (additions + deletions). and removed size:S 10-29 changed lines (additions + deletions). labels Jun 19, 2026
@juliusmarminge
juliusmarminge merged commit d9f59be into pingdotgg:main Jun 19, 2026
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M 30-99 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