upstream取り込み: コンフリクト解決10コミット (terminal/host-service/desktop)#391

Closed

MocA-Love wants to merge 39 commits into

mainfrom

upstream/batch-2-conflicts

Commits on Apr 23, 2026

feat(chat): add Opus 4.7 model option (#3579)

Kitenite
authored and
MocA-Love
committed
fix(electric-proxy): re-enable Workers observability (logs + traces) (#3565)

AviPeltz
authored and
MocA-Love
committed
docs(readme): add caddy trust step to setup (#3595)

Kitenite
authored and
MocA-Love
committed
fix(cli): match host service PORT env var name in spawn (#3640)

authored and
MocA-Love
committed
fix(relay): terminal WS URL prefix + pin to one fly machine (#3599)

saddlepaddle
authored and
MocA-Love
committed
docs(relay): hardening + horizontal scale-out plan (#3636)

saddlepaddle
authored and
MocA-Love
committed
docs: consolidated weekly changelog — 2026-04-20 (#3564)

Kitenite
authored and
MocA-Love
committed
chore(ci): drop Fly.io Electric deploys (use Electric Cloud) (#3590)

saddlepaddle
authored and
MocA-Love
committed
chore(ci): pin third-party GitHub Actions to commit SHAs (#3631)

saddlepaddle
authored and
MocA-Love
committed
chore(api): remove legacy Vercel electric proxy (#3637)

saddlepaddle
authored and
MocA-Love
committed
security: bump drizzle-orm and better-auth to patch CVEs (#3560)

AviPeltz
authored and
MocA-Love
committed
feat(cli,trpc): organization override via header, no session mutation (#3638)

saddlepaddle
authored and
MocA-Love
committed
fix(chat): cut display polling to 4fps and restore query cache defaults (#3562)

Kitenite
authored and
MocA-Love
committed
feat(desktop): render mermaid diagrams in markdown pane (#3642)

AviPeltz
authored and
MocA-Love
committed
fix(desktop): recover terminal from non-monospace font crash (#3513) (#3554)

Kitenite
authored and
MocA-Love
committed
fix(desktop): restore terminal buffer after Unicode 11 activation (#3581)

Kitenite
authored and
MocA-Love
committed
fix(desktop): terminal paste auto-submits first line without bracketed paste (#3582)

Kitenite
authored and
MocA-Love
committed
feat(desktop): ⌘⇧L opens diff viewer in v2 workspace (#3556)

saddlepaddle
authored and
MocA-Love
committed
fix(desktop): new v2 workspaces appear at top of their project in sidebar (#3619)

saddlepaddle
authored and
MocA-Love
committed
fix(desktop): render pending workspaces at top of sidebar (#3655)

Kitenite
authored and
MocA-Love
committed
feat(desktop): add Copy Branch Name to v1 and v2 sidebar context menus (#3635)

AviPeltz
authored and
MocA-Love
committed
feat(desktop): redesign v2-workspaces as a sortable table (#3660)

Kitenite
authored and
MocA-Love
committed
handle local/remote/offline state on sidebar workspace icons (#3649)

Kitenite
authored and
MocA-Love
committed
fix(desktop): refresh v2 terminal link tooltip editor + nudge plain clicks (#3552)

saddlepaddle
authored and
MocA-Love
committed
fix(desktop): allowlist URL schemes before shell.openExternal (#3650)

authored and
MocA-Love
committed
fix(desktop): unbreak safe-url test on bun by splitting pure helpers (#3659)

Kitenite
authored and
MocA-Love
committed
fix(desktop): tray shows correct org name for each host-service (#3629)

Kitenite
authored and
MocA-Love
committed
fix(desktop): unblock AI branch/workspace naming for OAuth-only users + dev placeholders (#3580)

AviPeltz
authored and
MocA-Love
committed
fix: fall back to FETCH_HEAD when gh pr checkout fails for branch names with / (#3232)

authored and
MocA-Love
committed
fix(desktop): unblock v1 terminal user input during shell init (#3478) (#3550)
MocA-Love
committed
fix(desktop): stop excessive lsof spawning from port scanner (#3372) (#3547)
MocA-Love
committed
fix(host-service): stop misattributing cross-fork PRs to local workspaces (#3625)
MocA-Love
committed
fix(host-service): v2 workspace git correctness — upstream, 3-dot, numstat (#3543)
MocA-Love
committed
fix(desktop): resolve GitHub status for branch workspaces (#3295)
MocA-Love
committed
fix(desktop): backfill legacy permissions for canary users exposed to #3546 (#3615)

saddlepaddle
authored and
MocA-Love
committed
fix(desktop): hide v2 workspace rows while destroy is in flight (#3621)

Kitenite
authored and
MocA-Love
committed
feat(desktop): v1 review comments open in a pane like v2 (#3596)

AviPeltz
authored and
MocA-Love
committed
fix(desktop): dedupe DevicePicker in new-workspace modal and match ProjectPickerPill styling (#3593)

Kitenite
authored and
MocA-Love
committed
fix(desktop): stop spurious folder picker on settings → dashboard nav (#3602)

Kitenite
authored and
MocA-Love
committed