chore(upstream): mark upstream/main through 47efa7305 as merged (-s ours)#164

Merged

MocA-Love merged 10 commits into

mainfrom

upstream-merge/mark-upstream-merged

Apr 14, 2026

Commits on Apr 13, 2026

fix(desktop): match VS Code terminal clipboard handling (#3415)
Kitenite
authored
[codex] fix v1 split pane startup sizing (#3416)
Kitenite
authored
feat(desktop): Cmd+Alt+Arrow moves focus between v2 panes (#3403)
saddlepaddle
authored
fix(desktop): make v2 right sidebar toggle reactive to open state (#3421)
saddlepaddle
authored
feat(desktop): v2 diff viewer opens in its own tab + collapsed tab/pane title resolution (#3420)
saddlepaddle
authored
fix(desktop): let app hotkeys fire inside CodeMirror (cmd+w in file editor) (#3418)
Kitenite
authored
feat(desktop/hotkeys): unbound defaults + restore prev/next tab & workspace (#3422)
saddlepaddle
authored
chore(desktop): bump version to 1.5.3 (#3419)
Kitenite
authored
fix(desktop): make pending workspace failure and update-required errors selectable (#3432)
Kitenite
authored

Commits on Apr 14, 2026

merge upstream/main through 47efa7305 (-s ours, all commits cherry-picked)
sakura-rip
committed