Merged
Conversation
Owner
forketyfork
commented
Jan 14, 2026
forketyfork
commented
- Worktree support 1
- feat: worktree picker modal Prompt: Okay, I have a hard one for you. This branch contains worktree support implementation, but I'm hitting my head on the UX. What I'd like to happen: when the user selects the worktree, the working directory of the terminal should switch to this worktree; I don't want to respawn the terminal, I only want to switch the working directory. The problem is that some process may run in the shell. If that's the case, then we shouldn't even show the T pill. But if we're in the shell without any processes running, then we should show the pill and cd to a worktree if the user selects one. Can we implement this? Solution: Switched worktree selection to in-shell cd with Cmd+T overlay hiding when a process runs; limited list to 9 plus Cmd+0 new-worktree modal styled like quit dialog with backdrop; modal creates git worktree under .architect/, cds into it; improved hover gradient and kept help pill labeled ⌘? while hotkey remains Cmd+/, docs updated.
Prompt: Okay, I have a hard one for you. This branch contains worktree support implementation, but I'm hitting my head on the UX. What I'd like to happen: when the user selects the worktree, the working directory of the terminal should switch to this worktree; I don't want to respawn the terminal, I only want to switch the working directory. The problem is that some process may run in the shell. If that's the case, then we shouldn't even show the T pill. But if we're in the shell without any processes running, then we should show the pill and cd to a worktree if the user selects one. Can we implement this? Solution: Switched worktree selection to in-shell cd with Cmd+T overlay hiding when a process runs; limited list to 9 plus Cmd+0 new-worktree modal styled like quit dialog with backdrop; modal creates git worktree under .architect/<name>, cds into it; improved hover gradient and kept help pill labeled ⌘? while hotkey remains Cmd+/, docs updated.
Resolved conflicts: - README.md: Combined worktree picker feature description with trackpad scroll improvements - src/ui/types.zig: Merged UiAction enum to include SwitchWorktree, CreateWorktree, and DespawnSession actions
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: dde3e5b542
ℹ️ 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".
Comment on lines
+999
to
+1003
| fn readTrimmedFile(self: *WorktreeOverlayComponent, path: []const u8) ![]const u8 { | ||
| const file = try std.fs.openFileAbsolute(path, .{}); | ||
| defer file.close(); | ||
| const contents = try file.readToEndAlloc(self.allocator, 4096); | ||
| return std.mem.trim(u8, contents, " \t\r\n"); |
There was a problem hiding this comment.
readTrimmedFile returns std.mem.trim(...) over the allocated buffer and callers later allocator.free that slice (e.g., in collectFromGitMetadata and findGitContext). trim can change both pointer and length, so freeing it is undefined and can corrupt the allocator or crash when the file contains the usual trailing newline. This is user-triggerable as soon as the worktree picker reads .git metadata. Consider returning an owned copy of the trimmed bytes (or trim in place and return the original allocation) so the slice handed to free matches the allocation.
Useful? React with 👍 / 👎.
- Add full-window backdrop to new worktree modal (matching quit dialog) - Fix ESC key handling to prevent leaking to terminal - Display "[repository root]" instead of "." for main worktree
- Implement dynamic vertical sizing for both overlays based on content - Fix diagonal animation (width and height expand proportionally) - Improve hover highlighting with accent color and edge fade-out - Add left-side text truncation with ellipsis for long worktree names - Validate worktree name input (alphanumeric, dash, underscore only) - Increase overlay background opacity for better visibility - Change placeholder text from "branch-name" to "name"
Adds a flowing, diffused blue line animation that highlights the currently active worktree in the overlay: - Multi-wave animation using 4 overlapping sine/cosine waves at different frequencies for organic, non-repetitive motion - 9-layer diffusion system for soft, glowing appearance - Uses accent color (blue) to match border aesthetic - Slow flow speed (0.5) for subtle, elegant animation - Animation lifecycle tied to overlay open/close state - Continuous 60fps rendering when overlay is open Also improves worktree list management: - Repository root always positioned first in the list - Remaining worktrees sorted alphabetically - List capped at 9 worktrees (10 total including "New worktree" entry) - Root + 8 sorted worktrees for consistent UX
Only show actual git worktree roots, not subdirectories within them. Removed the logic that was adding the current working directory as a worktree entry since we already collect all actual worktrees from git metadata.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.