Git integration: branch picker + worktrees#3

merged32
main
juliusmarminge/git-integration
openedFeb 9, 2026byJJulius Marminge
View on GitHubTwo-way sync enabledPR last imported 4d ago
32 commits

Filter out stale worktree paths from branch listing

Julius Marminge committed Feb 11, 2026

9442019

Fix flash of 'Initialize git' when switching branch/worktree

Julius Marminge committed Feb 11, 2026

cf66f53

Fix worktree→local branch switch causing 'already used by worktree' error

Julius Marminge committed Feb 11, 2026

d6ecf15

Fix session not restarting when switching to a worktree branch

Julius Marminge committed Feb 11, 2026

5b7af7b

Enrich branches with worktree paths, fix toolbar display, and improve HMR config

Julius Marminge committed Feb 11, 2026

8324949

Add react-query, refactor BranchToolbar async state, and fix stale deps

Julius Marminge committed Feb 11, 2026

807e3d1

Fix envMode reset bug and use shell-free git spawn

Julius Marminge committed Feb 11, 2026

198cc58

Merge remote-tracking branch 'origin/main' into juliusmarminge/git-integration

Julius Marminge committed Feb 11, 2026

6e3726e

Polish turbo task graph and dev scripts

Julius Marminge committed Feb 11, 2026

7e5cd01

Suppress tsdown inlineOnly warning for server build

Julius Marminge committed Feb 11, 2026

01c3e82

Fix server build: add zod to noExternal to prevent tsdown error

Julius Marminge committed Feb 11, 2026

ca356d0

fix

Julius Marminge committed Feb 11, 2026

ceceba2

Fix dev:desktop task graph to match main's env var patterns

Julius Marminge committed Feb 11, 2026

e2052b8

Fix CI typecheck: build contracts before typechecking dependents

Julius Marminge committed Feb 11, 2026

4ab095f

Fix CI typecheck: point contracts types to source and remove dead code

Julius Marminge committed Feb 11, 2026

74f6ce8

Move toolbar below chat input, fix electron preload bundling, and update build configs

Julius Marminge committed Feb 11, 2026

d6437a7

plans

Julius Marminge committed Feb 11, 2026

9fc5ad2

eh

Julius Marminge committed Feb 11, 2026

79ac59f

Restore git toolbar via websocket backend

Julius Marminge committed Feb 11, 2026

c13e9f8

Polish git worktree helpers after rebase

Julius Marminge committed Feb 11, 2026

d1ecacd

Add test for listGitBranches from worktree cwd

Julius Marminge committed Feb 11, 2026

6474490

Fix branch query cwd for worktree threads and error banner light mode

Julius Marminge committed Feb 11, 2026

6ce773f

Fix "Open in editor" to respect worktree path

Julius Marminge committed Feb 11, 2026

c5cbe15

kewl

Julius Marminge committed Feb 11, 2026

2a610f9

resource management

Julius Marminge committed Feb 11, 2026

7e20148

Extract git functions and add integration tests

Julius Marminge committed Feb 11, 2026

f47dc3c

Add light mode support for git branch picker and default branch label

Julius Marminge committed Feb 11, 2026

e9cfe37

Add branch/worktreePath to persistence test expectation

Julius Marminge committed Feb 11, 2026

8225352

Fix typecheck errors for branch/worktree fields

Julius Marminge committed Feb 11, 2026

69e38a2

Add git checkout support and clear errors on success

Julius Marminge committed Feb 11, 2026

5944859

Add branch/env picker toolbar and create branch flow

Julius Marminge committed Feb 11, 2026

3047974

Add git integration: branch picker + worktrees

Julius Marminge committed Feb 11, 2026

d64f78a