chore: cherry-pick 8 upstream PRs for review#1

Merged

bourgois merged 12 commits into

mainfrom

cherry-picks/upstream-features

May 30, 2026

Commits on May 30, 2026

fix(claude-sync): skip subagent JSONL files to prevent main session corruption

kamioj
authored and
bourgois
committed
fix(websocket): add 30s server-side heartbeat to prevent proxy idle disconnects

cvrysanek
authored and
bourgois
committed
fix(vite): proxy /plugin-ws WebSocket requests to the backend in dev

ehsanmim
authored and
bourgois
committed
fix(chat): re-anchor initial scroll across lazy content reflow

authored and
bourgois
committed
feat: add Codex permission env fallback

CoderLuii
authored and
bourgois
committed
fix: address Codex permission review feedback

CoderLuii
authored and
bourgois
committed
fix: prevent system context injection from rendering as user messages

authored and
bourgois
committed
fix: address CodeRabbit review findings

authored and
bourgois
committed
feat: add scroll navigation for chat messages

authored and
bourgois
committed
fix: address CodeRabbit review findings

authored and
bourgois
committed
feat: add file upload button with progress bar and improve terminal session limits

authored and
bourgois
committed
fix: address CodeRabbit review — security, performance, and concurrency

silingyuan0
authored and
bourgois
committed