Skip to content

trunk-merge/pr-3222/4896d886-f4de-42c2-aec5-65838abd2772#3282

Closed
trunk-io[bot] wants to merge 5 commits into
mainfrom
trunk-merge/pr-3222/4896d886-f4de-42c2-aec5-65838abd2772
Closed

trunk-merge/pr-3222/4896d886-f4de-42c2-aec5-65838abd2772#3282
trunk-io[bot] wants to merge 5 commits into
mainfrom
trunk-merge/pr-3222/4896d886-f4de-42c2-aec5-65838abd2772

Conversation

@trunk-io

@trunk-io trunk-io Bot commented Jul 8, 2026

Copy link
Copy Markdown
Trunk Merge Pull Request Banner

This pull request was created and is being managed by Trunk Merge.

This pull request is based on the main branch at SHA 5376e464a1724eaa32fa9744eea7e582bcc9da45.

See more details here.

When CI completes, this pull request will be closed automatically.

Pull Requests Being Tested

This pull request is testing the changes from pull request 3222.

webjunkie and others added 5 commits July 7, 2026 13:56
…ix group new-task prefill

Registered folders now expose mainRepoPath (detected from the linked
worktree's .git file, no git spawn). Sidebar groups resolve to the main
clone for their label/tooltip/new-task target instead of whichever
folder was added first; tasks running in a worktree get a fork chip
with the checkout name (full path on hover); the task-detail mode badge
tooltip includes the checkout path. The group "+" prefill now issues a
fresh request id per click so re-picking the same group always
re-selects its directory.

Generated-By: PostHog Code
Task-Id: 783b5974-b3ee-4b5e-9ff6-fbc93a6794c5
The BranchSelector popover gets a context row ("Branch in <folder>" in
local mode, "Base branch for <folder>" in worktree mode, full path on
hover) and the trigger tooltip gains the checkout path, so switching a
branch with multiple checkouts of the same repo is unambiguous. Uses
the existing cross-platform getFileName helper, and switches the
sidebar worktree chip's name derivation to it as well (fixes full-path
chip labels on Windows).

Generated-By: PostHog Code
Task-Id: 783b5974-b3ee-4b5e-9ff6-fbc93a6794c5
Addresses Greptile review feedback on #3222 — the four cases share
fixtures and shape, matching the repo's it.each convention.

Generated-By: PostHog Code
Task-Id: 783b5974-b3ee-4b5e-9ff6-fbc93a6794c5
…ut branches

The folder picker now treats "recent" as the repo family: a recent
checkout pulls in its main clone and all registered worktrees, main
first with worktrees indented, and each row shows the folder's current
branch. The branch dropdown marks branches already checked out in
another checkout of the same repo ("in <folder>") via a new
workspace.listRepoCheckouts procedure — plain `git worktree list`
scope, unlike listGitWorktrees which only covers app-managed worktrees.

Generated-By: PostHog Code
Task-Id: 783b5974-b3ee-4b5e-9ff6-fbc93a6794c5
@github-actions

github-actions Bot commented Jul 8, 2026

Copy link
Copy Markdown

React Doctor found 2 issues in 1 file · 2 warnings.

2 warnings

src/features/folder-picker/FolderPicker.tsx

Reviewed by React Doctor for commit deea161.

@trunk-io trunk-io Bot closed this Jul 8, 2026
@trunk-io trunk-io Bot deleted the trunk-merge/pr-3222/4896d886-f4de-42c2-aec5-65838abd2772 branch July 8, 2026 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant