Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pingdotgg/t3code
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: pingdotgg/t3code
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fix/issue-8204
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 6 files changed
  • 2 contributors

Commits on Oct 22, 2026

  1. fix(server): a turn that switches branches diffs from the branch it s…

    …witched to
    
    After a turn checked out another branch, its diff compared against the previous
    checkpoint, so the left branch's work showed as deletions and edits to shared
    files showed the old branch's content as the removed side.
    
    Each checkpoint now records where HEAD's reflog ended. The next capture reads
    only the entries after that cursor, and for each `checkout: moving from` entry
    takes the files the switch changed from the branch it landed on. That baseline
    becomes the checkpoint's second parent, and the adjacent turn diff starts there.
    Resets, rebases, merges and branch renames are not checkouts, so their changes
    stay in the diff. A rewritten or missing reflog leaves no baseline.
    
    Co-Authored-By: Claude Opus 5.5 <[email protected]>
    juliusmarminge and claude committed Oct 22, 2026
    Configuration menu
    Copy the full SHA
    3a5784e View commit details
    Browse the repository at this point in the history
  2. fix(server): branch-switch baselines survive short reflog reads and n…

    …on-UTF-8 file names
    
    Co-Authored-By: Claude Opus 5.5 <[email protected]>
    juliusmarminge and claude committed Oct 22, 2026
    Configuration menu
    Copy the full SHA
    7e37d9c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    26511d7 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2026

  1. Merge remote-tracking branch 'origin/main' into fix/issue-8204

    # Conflicts:
    #	apps/server/src/checkpointing/CheckpointStore.test.ts
    juliusmarminge committed Nov 11, 2026
    Configuration menu
    Copy the full SHA
    be9516d View commit details
    Browse the repository at this point in the history
  2. fix(server): read the HEAD reflog path in checkpoint capture's single…

    … rev-parse
    
    Capture already resolves its repository paths in one rev-parse; ask it for
    logs/HEAD too so branch-switch tracking does not add a second call.
    
    AI-assisted; verified with the tests and tools listed above.
    juliusmarminge committed Nov 11, 2026
    Configuration menu
    Copy the full SHA
    0fdbe25 View commit details
    Browse the repository at this point in the history
  3. fix(server): branch-switch baselines keep local edits git switch -m c…

    …arried
    
    Replaying a switch replaced every changed path with the destination blob,
    so local edits that git switch -m merged forward showed up again as the
    new turn's work. Paths the baseline had edited relative to the switch's
    source commit now keep the baseline's content.
    
    AI-assisted; verified with the tests and tools listed above.
    juliusmarminge committed Nov 11, 2026
    Configuration menu
    Copy the full SHA
    232e596 View commit details
    Browse the repository at this point in the history
  4. fix(server): branch-switch replay ignores later commits and submodules

    The carried-edit filter compared the baseline with each switch's source
    commit, so a commit between two switches made the switch back look like
    a local edit and left branch content in the baseline. It now uses the
    previous checkpoint's own edits over its HEAD, computed once. Gitlinks
    are left out of the replay because a plain switch does not move a
    submodule.
    
    AI-assisted; verified with the tests and tools listed above.
    juliusmarminge committed Nov 11, 2026
    Configuration menu
    Copy the full SHA
    c1679eb View commit details
    Browse the repository at this point in the history
Loading