Sync upstream into develop (conflicts resolved)#3

Merged

hifisaputra merged 307 commits into

sync/upstream-main

Jun 24, 2026

hifisaputra commented Jun 23, 2026

Owner

Replaces #2 (which had 31 merge conflicts and could not be merged from the GitHub UI).

This branch is develop with all 306 upstream commits merged in and conflicts resolved. Typecheck passes across all 15 packages.

Kept (cleanly compatible with upstream)

Default to Claude Opus for auto-bootstrapped model selection
Treat --tailscale-serve bind as remotely reachable (+ docs)
Bound thread-detail snapshot to recent messages/activities

Dropped in this merge

Upstream rewrote the client connection architecture (pingdotgg#2978), the settings hooks, and the right-panel system. These develop features were built on that replaced foundation and were dropped here — to be re-added later on the new architecture. Upstream ships its own file browser, so that capability is retained via upstream's implementation.

Web push notifications
Develop's custom file browser (upstream's is used instead)
Terminal minimize-to-restore-bar
Full-width conversation toggle
Dev-server preview launcher in the chat header
Base-branch picker / remove-auto-PR quick action

🤖 Generated with Claude Code

D3OXY and others added 30 commits

June 18, 2026 20:41


          fix(server): use bound host for MCP endpoint (pingdotgg#3114)

0651af9


          fix(ssh): fix support for remotes that use fnm (pingdotgg#2641)

804d44c

Co-authored-by: Cursor <cursoragent@cursor.com>


          Avoid repeated theme DOM sync during startup (pingdotgg#2779)

20f37f3

Co-authored-by: Julius Marminge <jmarminge@gmail.com>


          Migrate desktop auth to Clerk bridge (pingdotgg#3092)

3e01c4b

Co-authored-by: codex <codex@users.noreply.github.com>


          feat: allow disabling provider update checks (pingdotgg#3130)

5d4e2fa

Co-authored-by: codex <codex@users.noreply.github.com>


          Use idiomatic Effect options for server secret reads (pingdotgg#3110)

13917df

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <juliusmarminge@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] fix: show nightly badge from primary web server version (ping…

7dc1823

…dotgg#3103)

Co-authored-by: codex <codex@users.noreply.github.com>


          feat(composer): clickable PR pill next to branch selector (pingdotgg#…

494350c

…3065)

Co-authored-by: codex <codex@users.noreply.github.com>


          Improve idiomatic Effect usage in config and Tailscale paths (pingdot…

a4446e2

…gg#3073)

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <juliusmarminge@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>


          feat(sidebar): worktree indicator on session rows (pingdotgg#3057)

d9f59be

Co-authored-by: codex <codex@users.noreply.github.com>


          Use Effect schema decoders for JSON parsing (pingdotgg#3060)

c08b968

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <juliusmarminge@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>


          Only show enabled providers in picker sidebar (pingdotgg#3168)

fbf6263

Co-authored-by: Julius Marminge <julius@mac.lan>


          Share thread state idle TTL across client atoms (pingdotgg#3163)

cdaba7f


          Unify mobile typography tokens across the app (pingdotgg#3162)

e29ad76

Co-authored-by: codex <codex@users.noreply.github.com>


          Harden preview ownership and option-based secret handling (pingdotgg#…

753bc46

…3172)


          [codex] Inline contracts request-context service shapes (pingdotgg#3204)

ab0baaa

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Refactor desktop app Effect services (pingdotgg#3185)

60b16d1

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] align relay foundation Effect services (pingdotgg#3182)

53d0107

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Normalize server core Effect service modules (pingdotgg#3187)

1cf3647

Co-authored-by: codex <codex@users.noreply.github.com>


          Add diff scope switching and provider update settings (pingdotgg#3169)

d2c0a6a


          [codex] Refactor primary HTTP Effect service (pingdotgg#3205)

3b56dc1

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Normalize Desktop IPC Effect service (pingdotgg#3203)

938b19a

Co-authored-by: codex <codex@users.noreply.github.com>


          chore: run eas only when labelled (pingdotgg#3208)

9544e72


          [codex] Refactor review and text generation services (pingdotgg#3196)

b630278

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Use namespace imports for desktop core services (pingdotgg#3207)

8bfdacf

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] normalize server process and preview Effect services (pingdot…

5c1ac92

…gg#3191)

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Standardize Effect protocol adapter services (pingdotgg#3201)

742dd7a

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] align relay agent activity Effect services (pingdotgg#3179)

d5a72d5

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] align persistence Effect service modules (pingdotgg#3184)

df1540f

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Refactor desktop window and update Effect services (pingdotgg…

93fd972

…#3202)

Co-authored-by: codex <codex@users.noreply.github.com>

juliusmarminge and others added 25 commits

June 20, 2026 19:20


          [codex] Preserve child process termination context (pingdotgg#3469)

cebbe6f

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Structure VCS process boundary errors (pingdotgg#3476)

3c246f5

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Preserve APNs delivery failure context (pingdotgg#3475)

e3970e7

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Preserve VCS project config error causes (pingdotgg#3474)

6155f5c

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Preserve desktop update state causes (pingdotgg#3473)

90074e3

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Structure OpenCode text generation failures (pingdotgg#3472)

8c1605b

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Structure primary auth validation failures (pingdotgg#3471)

2a29de7

Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Structure thread archive blocked error (pingdotgg#3451)

0debeba


          [codex] Enforce Effect error handling conventions (pingdotgg#3380)

61f8d46


          [codex] add session context to credential errors (pingdotgg#3349)

82a9bcc


          chore: remove AnnotatableFileDiff leftovers, rename file (pingdotgg…

28107e8

…#3488)


          [codex] fix: guard trace ID clipboard copy (pingdotgg#3505)

ea52bb1

Co-authored-by: Codex <codex@openai.com>


          [codex] fix: restore pending input keyboard activation (pingdotgg#3501)

8b993bc

Co-authored-by: Codex <codex@openai.com>


          [codex] fix: preserve localhost preview hosts (pingdotgg#3499)

c1e2408

Co-authored-by: Codex <codex@openai.com>


          [codex] Reject unsupported remote pairing protocols (pingdotgg#3498)

8919ae7

Co-authored-by: Codex <codex@openai.com>


          Persist mobile composer selectors across drafts (pingdotgg#3496)

37ac970

Co-authored-by: codex <codex@users.noreply.github.com>


          Stabilize composer provider state while typing (pingdotgg#3507)

f5f98cf

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <juliusmarminge@users.noreply.github.com>


          feat: add persistent word-wrap setting for chat code blocks and tables (

fb10345

pingdotgg#3480)

Co-authored-by: Julius Marminge <jmarminge@gmail.com>


          Add main sidebar toggle (pingdotgg#3497)

b2d17b7

Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: codex <codex@users.noreply.github.com>


          [codex] Restore T3 Connect account controls (pingdotgg#3492)

8cc9a6f

Co-authored-by: Julius Marminge <julius@mac.lan>


          [codex] fix: guard DPoP fallback URL construction (pingdotgg#3503)

92e54fb

Co-authored-by: Codex <codex@openai.com>
Co-authored-by: Julius Marminge <jmarminge@gmail.com>


          Bump Clerk packages and refresh lockfile (pingdotgg#3511)

6672a1d


          [codex] fix: clarify Cursor CLI setup error (pingdotgg#3519)

3083d71

Co-authored-by: Codex <codex@openai.com>


          [codex] fix: ignore stale shell reducer events (pingdotgg#3517)

4abf8b4

Co-authored-by: Codex <codex@openai.com>


          Merge upstream main into develop (resolve conflicts)

e6ae723

Sync 306 upstream commits into develop. Upstream rewrote the client
connection architecture (pingdotgg#2978), the settings hooks, and the right-panel
system, which several develop-only features were built on.

Kept (cleanly compatible with upstream):
- Default to Claude Opus for auto-bootstrapped model selection
- Treat --tailscale-serve bind as remotely reachable (+ docs)
- Bound thread-detail snapshot to recent messages/activities

Dropped in this merge (built on architecture upstream replaced; re-add
later on the new foundations). Upstream already ships its own file
browser, so that capability is retained via upstream's implementation:
- Web push notifications
- Develop's custom file browser (upstream's is used instead)
- Terminal minimize-to-restore-bar
- Full-width conversation toggle
- Dev-server preview launcher in the chat header
- Base-branch picker / remove-auto-PR quick action

Conflict resolution: took upstream for the rewritten client/settings/panel
layers and the workspace dir flattening; preserved the kept features above.
Typecheck passes across all 15 packages.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

coderabbitai Bot commented Jun 23, 2026

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 67284221-d576-4c67-ada3-c21a5a41b697

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch sync/upstream-main

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

hifisaputra mentioned this pull request

Sync upstream changes into develop #2

Closed

github-actions Bot added size:XXL vouch:trusted labels

hifisaputra merged commit 01f1b7d into develop

7 of 11 checks passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL vouch:trusted