sync: port upstream server VCS, keybindings, images, terminal, persistence (#3998–#4104) - #166

Merged

aaditagrawal merged 9 commits into

mainfrom

sync/20260718-server-core-stack

Jul 18, 2026

Commits on Jul 18, 2026

fix(git): treat selected commit paths literally (#3998)

EricTsai83
authored and
aaditagrawal
committed
00f5e92
fix(server): stabilize non-repository Git diagnostics (#4077)

EricTsai83
authored and
aaditagrawal
committed
be445a8
Fix duplicate keybinding rule when replacing with an existing rule (#3969)

authored and
aaditagrawal
committed
bad6071
fix(server): image upload crashed dispatchCommand with a stack overflow (#3952)

authored and
aaditagrawal
committed
bc0f395
fix(terminal): strip AppImage runtime env from spawned terminals (#3108)

authored and
aaditagrawal
committed
d0965f8
fix(server): skip undecodable provider runtime rows when listing sessions (#3951)

authored and
aaditagrawal
committed
0cbc9fa
Share MCP OAuth locks across Codex shadow homes (#4104)

juliusmarminge
authored and
aaditagrawal
committed
161f02d
fix: address CodeRabbit review on image MIME and runtime list decode
aaditagrawal
committed
5c087ea
fix(terminal): scrub AppImage env before per-terminal overrides
aaditagrawal
committed
6320e7f