The previous 1px default was too thin for comfortable visibility.
This changes the default to 3px, which only affects new users who
haven't customized the setting. Also updates the preview component's
fallback to stay consistent with the new default.
Action buttons (revert, stage) in the Changes list now use absolute
positioning with a solid background overlay, so they appear on hover
without taking up space or shifting file names and status letters.
* feat: add copy remote URL to line number context menu
Add 'Copy Remote URL' option to the line number gutter right-click menu,
allowing users to quickly copy a shareable link to a file and line on
GitHub, GitLab, Bitbucket, or other hosted git providers.
- Install hosted-git-info to parse remote URLs and generate browse URLs
- Add getRemoteFileUrl() to resolve file URLs using default branch
- Wire up IPC handler, preload bridge, and renderer UI
- Use ExternalLink icon to distinguish from path copy options
* refactor: use @types/hosted-git-info instead of custom type declarations
Replace the custom hosted-git-info.d.ts with the @types package from
DefinitelyTyped. Use a targeted cast for browseFile() which the @types
package doesn't include yet (stuck on v3 API).
* refactor: revert to local type declarations for hosted-git-info
The @types/hosted-git-info package is stuck on the v3 API and lacks
browseFile(). A local .d.ts is cleaner than casting around stale types.
* fix: address review findings
- Add sandbox="allow-same-origin" to PDF iframes to prevent script execution
- Wrap atob() in try/catch to gracefully handle corrupt base64 data
- Reset imageError state on content change to allow re-rendering
- Add click overlay on PDF iframe so popup open works correctly
- Compact test mock resets to stay within max-lines lint rule
* fix: consolidate binary preview tests to stay within max-lines limit
- Reject worktree creation if the computed branch name already exists locally, on a remote, or in PR history. This prevents a fresh worktree from inheriting a stale/merged PR immediately after creation.
- Wrap getPRForBranch in try/catch so GitHub API failures don't block worktree creation
- Fix remote branch matching to compare full branch name after refs/remotes/<remote>/ prefix, preventing false positives
- Wrap updateWorktreeMeta in try/catch so meta-update failures don't leave the dialog in an error state for an already-created worktree
* feat: show ShieldAlert icon for conflict-review tabs
Display a distinct orange ShieldAlert icon for tabs opened in
conflict-review mode, differentiating them from regular diff tabs.
* fix: clear stale Rebasing/Merging badge on non-active worktrees
The git status polling only runs for the active worktree. When a
non-active worktree finishes rebasing, its conflict operation was
never updated to 'unknown', leaving the badge stuck.
Add a lightweight git:conflictOperation IPC (fs-only, no git subprocess)
and poll it for non-active worktrees that have a non-unknown operation.
Once the operation clears, the worktree drops out of the poll list.
Add a "Open file" button in the diff editor header that opens the
modified-side file in a regular edit tab — useful for accessing
markdown preview from a diff. The button is disabled when the diff
target is deleted.
Also refine tab bar styling: active tabs now use accent background
with bold text, and file explorer rows get consistent hover colors.
Enable --hidden flag for ripgrep so dotfiles users commonly edit
(.env, .github/*, .eslintrc, etc.) appear in quick-open results.
Use a blocklist of tool-generated hidden dirs instead of blocking
all dot-prefixed paths.
Key changes:
- Add --hidden to rg and filter via HIDDEN_DIR_BLOCKLIST
- Add second rg call with --no-ignore-vcs to surface .env* files
- Use fast string-slice prefix stripping with path.relative() fallback
- Guard against path traversal in the fallback path
- Handle Windows path separators via --path-separator and normalization
- Collect into shared Set to avoid duplicate array spread
Expose whether a worktree is the repo's main working tree (the first
entry from `git worktree list`). This lets consumers distinguish the
main worktree from linked worktrees created via `git worktree add`.
* fix: show correct keyboard shortcuts on Windows in terminal context menu
The terminal right-click menu was hardcoded to show macOS shortcuts
(⌘C, ⌘V, etc.) regardless of platform. Now detects the OS via
navigator.userAgent and shows Ctrl+ on Windows/Linux.
Follows the same pattern used in ShortcutsPane and WorktreeMetaDialog.
Fixes#230
* fix: use template literals for compound shortcuts to avoid JSX whitespace
Multi-line JSX expressions insert a space between modifier tokens
(e.g. "⌘ ⇧D" instead of "⌘⇧D"). Template literals avoid this.
---------
Co-authored-by: niklasmarderx <niklasmarderx@users.noreply.github.com>
Co-authored-by: Jinjing <6427696+AmethystLiang@users.noreply.github.com>
- fix: stay under max-lines lint limit after merge with main
Extract restoreScrollbackBuffers into layout-serialization.ts to reduce
use-terminal-pane-lifecycle.ts below the 300-line limit. Also filter
stale leaf IDs from persisted scrollback buffers and remove design doc.
- fix: polish worktree card controls
- feat: configurable worktree cards with property toggles
- Add PRConflictSummary type and derive conflict metadata (base ref,
commits behind, conflicting files) via local git merge-tree
- Fix parseUnmergedEntry to use space-separated parsing (porcelain v2
unmerged entries are not tab-separated)
- Enhance rebase detection by checking rebase-merge/ and rebase-apply/
directories in addition to REBASE_HEAD
- Show conflicting files list and commits-behind count in ChecksPanel
- Disable merge button with tooltip when PR has conflicts
- Add operation banners (merge/rebase/cherry-pick) in SourceControl
and WorktreeCard
- Reorder section list so unstaged changes appear above staged
- Extract conflict-summary, issues, and gh-utils into separate modules
- Add 10s timeout to git fetch in conflict summary derivation
- Fix test fixtures to match real porcelain v2 format
Wire up ImageViewer and ImageDiffViewer components by passing file path
through bufferToBlob/buildDiffResult and returning base64 content + MIME
type for recognized image formats (PNG, JPG, GIF, SVG, WebP, BMP, ICO).
* fix: restore list markers in markdown preview
The app-wide CSS reset removes list-style from all elements, which
strips bullet points and numbers from markdown preview content.
Add scoped overrides for .markdown-body to restore disc/circle/square
markers for unordered lists and decimal markers for ordered lists.
* fix: restore markdown preview list markers
The app-wide CSS reset removes list-style from all elements, which
strips bullet points and numbers from markdown preview content.
Add scoped overrides for .markdown-body to restore disc/circle/square
markers for unordered lists and decimal markers for ordered lists.
* fix: Windows compatibility — handle CRLF line endings and cross-drive path traversal
- Replace literal '\n' splits with /\r?\n/ regex across git output parsers
(status, worktree, hooks, file listing) to handle Windows CRLF line endings
- Fix path traversal security check in isDescendantOrEqual using isAbsolute()
instead of sep+sep prefix check, preventing cross-drive bypasses on Windows
- Strip trailing \r from ripgrep output in quick-open file listing
* fix(test): align updater test with user-initiated not-available behavior
The test expected 'idle' for a user-initiated check hitting a missing
latest-mac.yml, but the code correctly sends 'not-available' to give
the user explicit feedback that they're on the latest version.
During a mid-release (draft version on GitHub), clicking "Check for Updates"
would silently return to idle with no user feedback. Now shows "You're on the
latest version" when the fallback confirms no published update is available.
The ripgrep command used --hidden with positive re-inclusion globs
('.github', '.github/**') to keep .github files visible. However,
positive globs in ripgrep act as a whitelist — once present, only files
matching those positive patterns are returned, which excluded every
non-dotfile (including CLAUDE.md and all source files).
Drop --hidden entirely so rg uses its default behavior: skip hidden
dirs, respect .gitignore, and return all normal files.
The conditional render guard hid the results container when there was
no query and loading was complete, which prevented the default 50-file
list from appearing. Include filtered.length > 0 in the condition so
the initial results are visible.
Also removes the outer pb-2 so there is no empty space below the input
when no results are present, and reduces inner padding to pb-1.
* fix(ui): allow Cmd/Ctrl+P when terminal is focused
xterm.js uses a hidden <textarea class="xterm-helper-textarea"> for
keyboard capture. isEditableTarget() was treating it as a real editable
field, which suppressed all global shortcuts (Cmd+P, Cmd+N, etc.) when
the terminal had focus.
Exclude that element so app-level keybindings remain reachable.
* fix(ui): hide empty quick-open results area and reduce bottom padding
The results container was always rendered with pb-2, leaving visible
empty space below the search input when there were no results.
Conditionally render the results div only when there is content, and
reduce padding from pb-2 to pb-1.
Introduce sortEpoch to decouple sort recomputation from click-triggered
state changes (clearing isUnread, GitHub refresh). Use synchronous useMemo
instead of useEffect so the sort order is available before the first render.
Also fix timeout-killed ripgrep searches resolving with truncated: false,
which misled the UI into showing partial results as complete.
The previous bg-accent/80 was too subtle to distinguish the active
worktree at a glance. Use bg-black/[0.06] (light) and bg-white/[0.10]
(dark) for a more obvious selection highlight.
- Update flex and height classes in MarkdownPreview, EditorContent, DiffViewer, and CombinedDiffViewer to ensure min-h-0 and flex-1 bubble down properly.
- Apply `scrollbar-editor` class to MarkdownPreview to match Monaco's scrollbar style.
* Squashed commits
- refactor
- commit design doc
* docs: add why-comments to conflict resolution code and track conflicts on open
- Add explanatory comments throughout conflict resolution code covering
safety constraints, architectural boundaries, and compatibility choices
- Track unresolved conflicts in openConflictFile so Resolved locally
state works for conflict-safe entry point
- Add CLAUDE.md/AGENTS.md guideline for documenting the "why"
- Add test for conflict tracking through openConflictFile
Add file/folder deletion via right-click context menu using Electron's
shell.trashItem (moves to OS trash, not permanent delete). Includes a
confirmation dialog, reveal-in-explorer support, and refactors the file
explorer into smaller composable modules.
The generic "No changes on this branch" empty state was showing on both
tabs. Scope it to the All tab so only "No uncommitted changes" shows on
the Uncommitted tab.
Replace the colored badge with the same PR display style used in
WorktreeCard: state-colored PullRequestIcon, clickable PR number link,
and truncated title text.
Matheus NogueiraandClaude Opus 4.6
Jinjing
Colin ChambachanandClaude Opus 4.6
NeilandClaude Opus 4.6
Jinwoo HongandClaude Opus 4.6
Yax Patel