merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut - #42

Merged
DanielGGordon merged 130 commits into
mainfrom
t3code/upstream-sidebar-change
Jul 24, 2026
Merged

merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut#42
DanielGGordon merged 130 commits into
mainfrom
t3code/upstream-sidebar-change

Conversation

@DanielGGordon

@DanielGGordonDanielGGordon commented Jul 23, 2026

Copy link
Copy Markdown
Owner

Summary

True merge of ~130 upstream commits (last sync base dad0889, 2026-07-07 → upstream 6f34ad3e8, 2026-07-21). The cut point deliberately stops before the churny 7/22+ wave: Sidebar v2 beta (+ DB migration 033), the glass UI redesign, and the mobile thread-sync overhaul — those are planned as a follow-up merge once upstream stabilizes.

This is a strategy change from per-commit cherry-picks to a real merge; see the new dated entry in UPSTREAM_DIVERGENCE.md for full rationale, superseded skip-decisions, and per-file conflict notes.

Highlights pulled in

  • Headless t3 connect for SSH hosts; lightweight connection probe; faster new-chat propagation and offline catch-up; localhost preview URL resolution for remote environments
  • Claude: handle all SDK stream messages (no more spurious work-log warning rows), capability probe isolated from user MCP servers, CLAUDE_CONFIG_DIR respected, Bedrock auth recognized
  • New defaults: Claude 1M context, Codex gpt-5.6, worktrees from origin main
  • Codex launch-arguments setting; regenerated Codex protocol bindings
  • Drag files from explorer into composer; archive threads from context menu; diffs default to working changes; image-upload crash fix; stale-active-turn cleanup
  • Clerk stack upgrade, desktop packaging fixes (previously deferred — now along for the ride)

Notable resolutions

  • Mobile: resolved wholesale to upstream's official Android implementation (supersedes our hand-rolled Android commits, per the standing no-mobile-investment policy). Kept fork-only: self-signed-TLS trust plugin + APK publish script.
  • Shell resume: our fix(sync): stop the shell thread list from wedging on a stale cache #40 stale-cache fix retired in favor of upstream's rework (c14a5ca49/db4b2d8a0), which covers both failure modes with tests.
  • Unions: dotfiles toggle + root input (FileBrowserPanel), Solarized theme layer + file-viewer worker pool (FilePreviewPanel/index.css), ThemeToggle — all preserved alongside upstream's new composer file links, workspace image preview, and sidebar width work.
  • .claude/skills → upstream's .agents/skills symlink layout; /redeploy skill moved accordingly.

Verification

  • Typecheck clean: apps/server, apps/web, packages/client-runtime
  • Tests: shell-sync.test.ts + shell.test.ts (5/5), server.test.ts -t subscribeShell (7/7)

🤖 Generated with Claude Code

juliusmarmingeand others added 30 commits July 7, 2026 22:49
@juliusmarminge@cursoragent
Use rounded depth logo for production splash screen (pingdotgg#3780)
7778a1c
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge@cursoragent
fix(release): stage pnpm 11 allowBuilds for desktop installs (pingdot…
03ac1f0
…gg#3781)
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge
Upgrade Clerk toolchain to latest versions (pingdotgg#3785)
e775bc6
@avocardow
fix(release): bump electron-builder so pnpm 11 deduped deps land in t…
0c66565
…he asar (pingdotgg#3790)
@Prgm-code
Fix desktop native optional dependency packaging (pingdotgg#3816)
18a4138
@juliusmarminge@codex
[codex] Upgrade Clerk stack (pingdotgg#3821)
e912765
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Preserve worktree metadata during branch sync (pingdotgg#3822)
3201e00
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarmingeJulius Marminge@codex
feat(client): persist offline environment data and mobile preferences (…
2250e3e
…pingdotgg#3795)
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Label max and ultra reasoning (pingdotgg#3824)
ca1e08b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
fix(mobile): embed fonts and render project favicons reliably (pingdo…
843cf17
…tgg#3823)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Show compact PR number badges in mobile thread rows (pingdotgg#3827)
8619ef2
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Expose mobile PR indicator labels to accessibility (pingdotgg#3828)
f61fa94
Co-authored-by: codex <codex@users.noreply.github.com>
@jakeleventhal
Fix truncated chat error alert layout (pingdotgg#3899)
ef943a2
@VedankPurohit
fix(marketing): show platform-appropriate commit shortcut on the webs…
619b0ec
…ite (pingdotgg#3644)
@juliusmarminge@HorusGoul
@claude@maria-rcks@shivamhwp@bmdavis419@PixPMusic@codexJulius Marminge
[codex] Add Android mobile support (pingdotgg#3579)
c1ec191
Co-authored-by: Horus Lugo <horusgoul@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Ben Davis <45952064+bmdavis419@users.noreply.github.com>
Co-authored-by: Alex <me@pixp.cc>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@mac.lan>
@juliusmarminge
Use client-side fallbacks for missing project favicons (pingdotgg#3959)
8de254a
@juliusmarminge
Skip stale working-task notifications (pingdotgg#3961)
735240f
@juliusmarminge
Prepare Android beta branding and review diff UI (pingdotgg#3967)
3513fa0
@t3dotgg
perf(web): duty-cycle status animations and remove fixed noise overlay (
2fdc704
pingdotgg#3978)
@kridaydave
fix(docs): correct CI task-runner commands in ci.md (pingdotgg#3990)
7b928d5
@kridaydave
fix(docs): repair broken source links in architecture overview (pingd…
c69120f
…otgg#3991)
@kridaydave
fix(docs): replace stale codething-mvp absolute paths with repo-relat…
4624426
…ive links (pingdotgg#3992)
@juliusmarminge@codex
docs: Add T3 Code Legal Docs (pingdotgg#3972)
d359789
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Fix Legal modal header crash (pingdotgg#4000)
ecb35f7
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Fix onboarding connection status (pingdotgg#4001)
b982337
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
Isolate native diff highlight grammar state (pingdotgg#4029)
5e8b2c8
@D3OXY
Fix macOS fullscreen titlebar spacing (pingdotgg#4019)
0418301
@juliusmarminge@codex
Prevent duplicate project workspace roots (pingdotgg#3829)
d114e27
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Normalize over-indented markdown list items (pingdotgg#4020)
54f167e
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Resolve localhost preview URLs for remote environments (pingdotgg#4011)
bde0a4c
Co-authored-by: codex <codex@users.noreply.github.com>
Andrew-Forsterand others added 21 commits July 20, 2026 11:04
@Andrew-Forster@juliusmarminge
[orchestration] Clear stale active turn when session becomes inactive (…
501ce27
…pingdotgg#3159)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Regenerate Codex reset credit protocol bindings (pingdotgg#4173)
08993a5
Co-authored-by: codex <codex@users.noreply.github.com>
@Chrrxs@juliusmarminge@codex
fix(preview): preserve direct localhost navigation (pingdotgg#3939)
2fae0d0
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Synchronize mobile threads with authoritative shell snapshots (pingdo…
8e3467f
…tgg#4163)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Gate iOS glass layout on native support (pingdotgg#4032)
b6d9ce3
Co-authored-by: codex <codex@users.noreply.github.com>
@vdmkotai@codex
fix(opencode): resume the OpenCode session on follow-ups instead of s…
f4da4f3
…tarting an empty one (pingdotgg#3617)
Co-authored-by: codex <codex@users.noreply.github.com>
@UtkarshUsername
fix(server): use CLI for OpenCode health check instead of spawning se…
0ca3240
…rver (pingdotgg#4153)
@xxashxx-svg@claude
fix(web): scope timeline minimap hover target to the side gutter (pin…
946b867
…gdotgg#3869)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@maxwellyoung
[codex] show complete approval details (pingdotgg#4111)
a135f2c
@yordis
fix(web): paint text selection over composer chips (pingdotgg#4139)
c710167
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@maxwellyoung
[codex] preserve custom model slugs (pingdotgg#4168)
fa69f05
@Rhiz3K@juliusmarminge
fix(web): preview workspace images in the file panel (pingdotgg#3996)
0936fd2
Co-authored-by: Rhiz3K <rhiz3k@protonmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@yordis@juliusmarminge
feat(web): drag files from the explorer into the chat composer (pingd…
8ca4eec
…otgg#4140)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@anirudhsama@juliusmarminge@codex
fix(desktop): preserve main window bounds (pingdotgg#3851)
2c199aa
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@RusiruSadathana@codex@juliusmarminge
perf(orchestration): speed up new-chat propagation and offline catch-…
db4b2d8
…up (pingdotgg#4177)
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@sandersonstabo@juliusmarminge
Finale: upgrade changed files card to fix various UI issues (pingdotg…
c8a04bd
…g#4113)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Pass CLI OAuth config to hosted web deploy (pingdotgg#4186)
5d34f9f
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): always show environment chip for remote projects (pingdotgg…
c0bb237
…#4217)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(web): keep composer editable while disconnected (pingdotgg#4241)
23c18fd
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix: better defaults — Claude 1M context, Codex gpt-5.6, worktrees fr…
62cf461
…om origin main (pingdotgg#4240)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(claude): handle all SDK stream messages; stop spurious work-log w…
6f34ad3
…arning rows (pingdotgg#4244)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@github-actionsgithub-actionsBot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Jul 23, 2026
@DanielGGordon@claude
merge: upstream through6f34ad3(2026-07-21) — pre-Sidebar-v2 cut
d963ff7
True merge replacing per-commit cherry-picks; see UPSTREAM_DIVERGENCE.md
2026-07-23 entry for strategy, superseded decisions, and conflict notes.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@DanielGGordon
DanielGGordonforce-pushed the t3code/upstream-sidebar-change branch from 26828c3 to d963ff7CompareJuly 23, 2026 22:13
@DanielGGordon

DanielGGordon commented Jul 23, 2026

Copy link
Copy Markdown
OwnerAuthor

Test deployment (degraded / tunnel mode)

This branch is running on a local test instance, but the external HTTPS
port is not reachable yet (Caddy not bootstrapped or OVH port closed), so
there is no public URL. Reach it over an SSH tunnel:

# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser

Slot: external 7446 ⇄ loopback 3776.

1 similar comment
@DanielGGordon

DanielGGordon commented Jul 23, 2026

Copy link
Copy Markdown
OwnerAuthor

Test deployment (degraded / tunnel mode)

This branch is running on a local test instance, but the external HTTPS
port is not reachable yet (Caddy not bootstrapped or OVH port closed), so
there is no public URL. Reach it over an SSH tunnel:

# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser

Slot: external 7446 ⇄ loopback 3776.

@DanielGGordon

DanielGGordon commented Jul 23, 2026

Copy link
Copy Markdown
OwnerAuthor

Test deployment (degraded / tunnel mode)

This branch is running on a local test instance, but the external HTTPS
port is not reachable yet (Caddy not bootstrapped or OVH port closed), so
there is no public URL. Reach it over an SSH tunnel:

# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3777 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7447 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser

Slot: external 7447 ⇄ loopback 3777.

@DanielGGordon
DanielGGordon merged commit 8dc98e8 into mainJul 24, 2026
6 of 10 checks passed
@DanielGGordonDanielGGordon mentioned this pull request Jul 27, 2026
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

size:XXLvouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

19 participants

@DanielGGordon@juliusmarminge@avocardow@Prgm-code@jakeleventhal@VedankPurohit@t3dotgg@kridaydave@D3OXY@dmstoykov@HugoVizcainoSantana@EricTsai83@AmoonPod@BunnyGamezsc@olivoil@Fazalkadivar21@maxwellyoung@nateEc@jamesx0416
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut - #42
Merged
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Jul 24, 2026
Merged
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut#42
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Conversation
@DanielGGordon
@DanielGGordonDanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

Owner
Summary
True merge of ~130 upstream commits (last sync base dad0889, 2026-07-07 → upstream 6f34ad3e8, 2026-07-21). The cut point deliberately stops before the churny 7/22+ wave: Sidebar v2 beta (+ DB migration 033), the glass UI redesign, and the mobile thread-sync overhaul — those are planned as a follow-up merge once upstream stabilizes.
This is a strategy change from per-commit cherry-picks to a real merge; see the new dated entry in UPSTREAM_DIVERGENCE.md for full rationale, superseded skip-decisions, and per-file conflict notes.
Highlights pulled in
  • Headless t3 connect for SSH hosts; lightweight connection probe; faster new-chat propagation and offline catch-up; localhost preview URL resolution for remote environments
  • Claude: handle all SDK stream messages (no more spurious work-log warning rows), capability probe isolated from user MCP servers, CLAUDE_CONFIG_DIR respected, Bedrock auth recognized
  • New defaults: Claude 1M context, Codex gpt-5.6, worktrees from origin main
  • Codex launch-arguments setting; regenerated Codex protocol bindings
  • Drag files from explorer into composer; archive threads from context menu; diffs default to working changes; image-upload crash fix; stale-active-turn cleanup
  • Clerk stack upgrade, desktop packaging fixes (previously deferred — now along for the ride)
Notable resolutions
  • Mobile: resolved wholesale to upstream's official Android implementation (supersedes our hand-rolled Android commits, per the standing no-mobile-investment policy). Kept fork-only: self-signed-TLS trust plugin + APK publish script.
  • Shell resume: our fix(sync): stop the shell thread list from wedging on a stale cache #40 stale-cache fix retired in favor of upstream's rework (c14a5ca49/db4b2d8a0), which covers both failure modes with tests.
  • Unions: dotfiles toggle + root input (FileBrowserPanel), Solarized theme layer + file-viewer worker pool (FilePreviewPanel/index.css), ThemeToggle — all preserved alongside upstream's new composer file links, workspace image preview, and sidebar width work.
  • .claude/skills → upstream's .agents/skills symlink layout; /redeploy skill moved accordingly.
Verification
  • Typecheck clean: apps/server, apps/web, packages/client-runtime
  • Tests: shell-sync.test.ts + shell.test.ts (5/5), server.test.ts -t subscribeShell (7/7)
🤖 Generated with Claude Code
juliusmarmingeand others
added 30 commits
July 7, 2026 22:49
@juliusmarminge@cursoragent
Use rounded depth logo for production splash screen (pingdotgg#3780)
7778a1c
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge@cursoragent
fix(release): stage pnpm 11 allowBuilds for desktop installs (pingdot…
03ac1f0
…gg#3781)
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge
Upgrade Clerk toolchain to latest versions (pingdotgg#3785)
e775bc6
@avocardow
fix(release): bump electron-builder so pnpm 11 deduped deps land in t…
0c66565
…he asar (pingdotgg#3790)
@Prgm-code
Fix desktop native optional dependency packaging (pingdotgg#3816)
18a4138
@juliusmarminge@codex
[codex] Upgrade Clerk stack (pingdotgg#3821)
e912765
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Preserve worktree metadata during branch sync (pingdotgg#3822)
3201e00
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarmingeJulius Marminge@codex
feat(client): persist offline environment data and mobile preferences (…
2250e3e
…pingdotgg#3795)
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Label max and ultra reasoning (pingdotgg#3824)
ca1e08b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
fix(mobile): embed fonts and render project favicons reliably (pingdo…
843cf17
…tgg#3823)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Show compact PR number badges in mobile thread rows (pingdotgg#3827)
8619ef2
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Expose mobile PR indicator labels to accessibility (pingdotgg#3828)
f61fa94
Co-authored-by: codex <codex@users.noreply.github.com>
@jakeleventhal
Fix truncated chat error alert layout (pingdotgg#3899)
ef943a2
@VedankPurohit
fix(marketing): show platform-appropriate commit shortcut on the webs…
619b0ec
…ite (pingdotgg#3644)
@juliusmarminge@HorusGoul
@claude@maria-rcks@shivamhwp@bmdavis419@PixPMusic@codexJulius Marminge
[codex] Add Android mobile support (pingdotgg#3579)
c1ec191
Co-authored-by: Horus Lugo <horusgoul@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Ben Davis <45952064+bmdavis419@users.noreply.github.com>
Co-authored-by: Alex <me@pixp.cc>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@mac.lan>
@juliusmarminge
Use client-side fallbacks for missing project favicons (pingdotgg#3959)
8de254a
@juliusmarminge
Skip stale working-task notifications (pingdotgg#3961)
735240f
@juliusmarminge
Prepare Android beta branding and review diff UI (pingdotgg#3967)
3513fa0
@t3dotgg
perf(web): duty-cycle status animations and remove fixed noise overlay (
2fdc704
pingdotgg#3978)
@kridaydave
fix(docs): correct CI task-runner commands in ci.md (pingdotgg#3990)
7b928d5
@kridaydave
fix(docs): repair broken source links in architecture overview (pingd…
c69120f
…otgg#3991)
@kridaydave
fix(docs): replace stale codething-mvp absolute paths with repo-relat…
4624426
…ive links (pingdotgg#3992)
@juliusmarminge@codex
docs: Add T3 Code Legal Docs (pingdotgg#3972)
d359789
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Fix Legal modal header crash (pingdotgg#4000)
ecb35f7
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Fix onboarding connection status (pingdotgg#4001)
b982337
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
Isolate native diff highlight grammar state (pingdotgg#4029)
5e8b2c8
@D3OXY
Fix macOS fullscreen titlebar spacing (pingdotgg#4019)
0418301
@juliusmarminge@codex
Prevent duplicate project workspace roots (pingdotgg#3829)
d114e27
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Normalize over-indented markdown list items (pingdotgg#4020)
54f167e
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Resolve localhost preview URLs for remote environments (pingdotgg#4011)
bde0a4c
Co-authored-by: codex <codex@users.noreply.github.com>
Andrew-Forsterand others
added 21 commits
July 20, 2026 11:04
@Andrew-Forster@juliusmarminge
[orchestration] Clear stale active turn when session becomes inactive (…
501ce27
…pingdotgg#3159)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Regenerate Codex reset credit protocol bindings (pingdotgg#4173)
08993a5
Co-authored-by: codex <codex@users.noreply.github.com>
@Chrrxs@juliusmarminge@codex
fix(preview): preserve direct localhost navigation (pingdotgg#3939)
2fae0d0
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Synchronize mobile threads with authoritative shell snapshots (pingdo…
8e3467f
…tgg#4163)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Gate iOS glass layout on native support (pingdotgg#4032)
b6d9ce3
Co-authored-by: codex <codex@users.noreply.github.com>
@vdmkotai@codex
fix(opencode): resume the OpenCode session on follow-ups instead of s…
f4da4f3
…tarting an empty one (pingdotgg#3617)
Co-authored-by: codex <codex@users.noreply.github.com>
@UtkarshUsername
fix(server): use CLI for OpenCode health check instead of spawning se…
0ca3240
…rver (pingdotgg#4153)
@xxashxx-svg@claude
fix(web): scope timeline minimap hover target to the side gutter (pin…
946b867
…gdotgg#3869)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@maxwellyoung
[codex] show complete approval details (pingdotgg#4111)
a135f2c
@yordis
fix(web): paint text selection over composer chips (pingdotgg#4139)
c710167
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@maxwellyoung
[codex] preserve custom model slugs (pingdotgg#4168)
fa69f05
@Rhiz3K@juliusmarminge
fix(web): preview workspace images in the file panel (pingdotgg#3996)
0936fd2
Co-authored-by: Rhiz3K <rhiz3k@protonmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@yordis@juliusmarminge
feat(web): drag files from the explorer into the chat composer (pingd…
8ca4eec
…otgg#4140)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@anirudhsama@juliusmarminge@codex
fix(desktop): preserve main window bounds (pingdotgg#3851)
2c199aa
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@RusiruSadathana@codex@juliusmarminge
perf(orchestration): speed up new-chat propagation and offline catch-…
db4b2d8
…up (pingdotgg#4177)
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@sandersonstabo@juliusmarminge
Finale: upgrade changed files card to fix various UI issues (pingdotg…
c8a04bd
…g#4113)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Pass CLI OAuth config to hosted web deploy (pingdotgg#4186)
5d34f9f
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): always show environment chip for remote projects (pingdotgg…
c0bb237
…#4217)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(web): keep composer editable while disconnected (pingdotgg#4241)
23c18fd
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix: better defaults — Claude 1M context, Codex gpt-5.6, worktrees fr…
62cf461
…om origin main (pingdotgg#4240)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(claude): handle all SDK stream messages; stop spurious work-log w…
6f34ad3
…arning rows (pingdotgg#4244)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL

labels
Jul 23, 2026
@DanielGGordon@claude
merge: upstream through6f34ad3(2026-07-21) — pre-Sidebar-v2 cut
d963ff7
True merge replacing per-commit cherry-picks; see UPSTREAM_DIVERGENCE.md
2026-07-23 entry for strategy, superseded decisions, and conflict notes.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@DanielGGordon
DanielGGordonforce-pushed
the
t3code/upstream-sidebar-change
branch
from
26828c3 to
d963ff7CompareJuly 23, 2026 22:13
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.

1 similar comment

@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3777 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7447 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7447 ⇄ loopback 3777.
@DanielGGordon
DanielGGordon
merged commit 8dc98e8
into
mainJul 24, 2026

6 of 10 checks passed

@DanielGGordonDanielGGordon
mentioned this pull request
Jul 27, 2026
 Merged

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

Reviewers


No reviews


Assignees


No one assigned


Labels

size:XXLvouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

19 participants

@DanielGGordon@juliusmarminge@avocardow@Prgm-code@jakeleventhal@VedankPurohit@t3dotgg@kridaydave@D3OXY@dmstoykov@HugoVizcainoSantana@EricTsai83@AmoonPod@BunnyGamezsc@olivoil@Fazalkadivar21@maxwellyoung@nateEc@jamesx0416

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut - #42
Merged
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Jul 24, 2026
Merged
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut#42
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Conversation
@DanielGGordon
@DanielGGordonDanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

Owner
Summary
True merge of ~130 upstream commits (last sync base dad0889, 2026-07-07 → upstream 6f34ad3e8, 2026-07-21). The cut point deliberately stops before the churny 7/22+ wave: Sidebar v2 beta (+ DB migration 033), the glass UI redesign, and the mobile thread-sync overhaul — those are planned as a follow-up merge once upstream stabilizes.
This is a strategy change from per-commit cherry-picks to a real merge; see the new dated entry in UPSTREAM_DIVERGENCE.md for full rationale, superseded skip-decisions, and per-file conflict notes.
Highlights pulled in
  • Headless t3 connect for SSH hosts; lightweight connection probe; faster new-chat propagation and offline catch-up; localhost preview URL resolution for remote environments
  • Claude: handle all SDK stream messages (no more spurious work-log warning rows), capability probe isolated from user MCP servers, CLAUDE_CONFIG_DIR respected, Bedrock auth recognized
  • New defaults: Claude 1M context, Codex gpt-5.6, worktrees from origin main
  • Codex launch-arguments setting; regenerated Codex protocol bindings
  • Drag files from explorer into composer; archive threads from context menu; diffs default to working changes; image-upload crash fix; stale-active-turn cleanup
  • Clerk stack upgrade, desktop packaging fixes (previously deferred — now along for the ride)
Notable resolutions
  • Mobile: resolved wholesale to upstream's official Android implementation (supersedes our hand-rolled Android commits, per the standing no-mobile-investment policy). Kept fork-only: self-signed-TLS trust plugin + APK publish script.
  • Shell resume: our fix(sync): stop the shell thread list from wedging on a stale cache #40 stale-cache fix retired in favor of upstream's rework (c14a5ca49/db4b2d8a0), which covers both failure modes with tests.
  • Unions: dotfiles toggle + root input (FileBrowserPanel), Solarized theme layer + file-viewer worker pool (FilePreviewPanel/index.css), ThemeToggle — all preserved alongside upstream's new composer file links, workspace image preview, and sidebar width work.
  • .claude/skills → upstream's .agents/skills symlink layout; /redeploy skill moved accordingly.
Verification
  • Typecheck clean: apps/server, apps/web, packages/client-runtime
  • Tests: shell-sync.test.ts + shell.test.ts (5/5), server.test.ts -t subscribeShell (7/7)
🤖 Generated with Claude Code
juliusmarmingeand others
added 30 commits
July 7, 2026 22:49
@juliusmarminge@cursoragent
Use rounded depth logo for production splash screen (pingdotgg#3780)
7778a1c
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge@cursoragent
fix(release): stage pnpm 11 allowBuilds for desktop installs (pingdot…
03ac1f0
…gg#3781)
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge
Upgrade Clerk toolchain to latest versions (pingdotgg#3785)
e775bc6
@avocardow
fix(release): bump electron-builder so pnpm 11 deduped deps land in t…
0c66565
…he asar (pingdotgg#3790)
@Prgm-code
Fix desktop native optional dependency packaging (pingdotgg#3816)
18a4138
@juliusmarminge@codex
[codex] Upgrade Clerk stack (pingdotgg#3821)
e912765
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Preserve worktree metadata during branch sync (pingdotgg#3822)
3201e00
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarmingeJulius Marminge@codex
feat(client): persist offline environment data and mobile preferences (…
2250e3e
…pingdotgg#3795)
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Label max and ultra reasoning (pingdotgg#3824)
ca1e08b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
fix(mobile): embed fonts and render project favicons reliably (pingdo…
843cf17
…tgg#3823)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Show compact PR number badges in mobile thread rows (pingdotgg#3827)
8619ef2
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Expose mobile PR indicator labels to accessibility (pingdotgg#3828)
f61fa94
Co-authored-by: codex <codex@users.noreply.github.com>
@jakeleventhal
Fix truncated chat error alert layout (pingdotgg#3899)
ef943a2
@VedankPurohit
fix(marketing): show platform-appropriate commit shortcut on the webs…
619b0ec
…ite (pingdotgg#3644)
@juliusmarminge@HorusGoul
@claude@maria-rcks@shivamhwp@bmdavis419@PixPMusic@codexJulius Marminge
[codex] Add Android mobile support (pingdotgg#3579)
c1ec191
Co-authored-by: Horus Lugo <horusgoul@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Ben Davis <45952064+bmdavis419@users.noreply.github.com>
Co-authored-by: Alex <me@pixp.cc>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@mac.lan>
@juliusmarminge
Use client-side fallbacks for missing project favicons (pingdotgg#3959)
8de254a
@juliusmarminge
Skip stale working-task notifications (pingdotgg#3961)
735240f
@juliusmarminge
Prepare Android beta branding and review diff UI (pingdotgg#3967)
3513fa0
@t3dotgg
perf(web): duty-cycle status animations and remove fixed noise overlay (
2fdc704
pingdotgg#3978)
@kridaydave
fix(docs): correct CI task-runner commands in ci.md (pingdotgg#3990)
7b928d5
@kridaydave
fix(docs): repair broken source links in architecture overview (pingd…
c69120f
…otgg#3991)
@kridaydave
fix(docs): replace stale codething-mvp absolute paths with repo-relat…
4624426
…ive links (pingdotgg#3992)
@juliusmarminge@codex
docs: Add T3 Code Legal Docs (pingdotgg#3972)
d359789
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Fix Legal modal header crash (pingdotgg#4000)
ecb35f7
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Fix onboarding connection status (pingdotgg#4001)
b982337
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
Isolate native diff highlight grammar state (pingdotgg#4029)
5e8b2c8
@D3OXY
Fix macOS fullscreen titlebar spacing (pingdotgg#4019)
0418301
@juliusmarminge@codex
Prevent duplicate project workspace roots (pingdotgg#3829)
d114e27
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Normalize over-indented markdown list items (pingdotgg#4020)
54f167e
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Resolve localhost preview URLs for remote environments (pingdotgg#4011)
bde0a4c
Co-authored-by: codex <codex@users.noreply.github.com>
Andrew-Forsterand others
added 21 commits
July 20, 2026 11:04
@Andrew-Forster@juliusmarminge
[orchestration] Clear stale active turn when session becomes inactive (…
501ce27
…pingdotgg#3159)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Regenerate Codex reset credit protocol bindings (pingdotgg#4173)
08993a5
Co-authored-by: codex <codex@users.noreply.github.com>
@Chrrxs@juliusmarminge@codex
fix(preview): preserve direct localhost navigation (pingdotgg#3939)
2fae0d0
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Synchronize mobile threads with authoritative shell snapshots (pingdo…
8e3467f
…tgg#4163)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Gate iOS glass layout on native support (pingdotgg#4032)
b6d9ce3
Co-authored-by: codex <codex@users.noreply.github.com>
@vdmkotai@codex
fix(opencode): resume the OpenCode session on follow-ups instead of s…
f4da4f3
…tarting an empty one (pingdotgg#3617)
Co-authored-by: codex <codex@users.noreply.github.com>
@UtkarshUsername
fix(server): use CLI for OpenCode health check instead of spawning se…
0ca3240
…rver (pingdotgg#4153)
@xxashxx-svg@claude
fix(web): scope timeline minimap hover target to the side gutter (pin…
946b867
…gdotgg#3869)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@maxwellyoung
[codex] show complete approval details (pingdotgg#4111)
a135f2c
@yordis
fix(web): paint text selection over composer chips (pingdotgg#4139)
c710167
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@maxwellyoung
[codex] preserve custom model slugs (pingdotgg#4168)
fa69f05
@Rhiz3K@juliusmarminge
fix(web): preview workspace images in the file panel (pingdotgg#3996)
0936fd2
Co-authored-by: Rhiz3K <rhiz3k@protonmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@yordis@juliusmarminge
feat(web): drag files from the explorer into the chat composer (pingd…
8ca4eec
…otgg#4140)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@anirudhsama@juliusmarminge@codex
fix(desktop): preserve main window bounds (pingdotgg#3851)
2c199aa
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@RusiruSadathana@codex@juliusmarminge
perf(orchestration): speed up new-chat propagation and offline catch-…
db4b2d8
…up (pingdotgg#4177)
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@sandersonstabo@juliusmarminge
Finale: upgrade changed files card to fix various UI issues (pingdotg…
c8a04bd
…g#4113)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Pass CLI OAuth config to hosted web deploy (pingdotgg#4186)
5d34f9f
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): always show environment chip for remote projects (pingdotgg…
c0bb237
…#4217)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(web): keep composer editable while disconnected (pingdotgg#4241)
23c18fd
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix: better defaults — Claude 1M context, Codex gpt-5.6, worktrees fr…
62cf461
…om origin main (pingdotgg#4240)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(claude): handle all SDK stream messages; stop spurious work-log w…
6f34ad3
…arning rows (pingdotgg#4244)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL

labels
Jul 23, 2026
@DanielGGordon@claude
merge: upstream through6f34ad3(2026-07-21) — pre-Sidebar-v2 cut
d963ff7
True merge replacing per-commit cherry-picks; see UPSTREAM_DIVERGENCE.md
2026-07-23 entry for strategy, superseded decisions, and conflict notes.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@DanielGGordon
DanielGGordonforce-pushed
the
t3code/upstream-sidebar-change
branch
from
26828c3 to
d963ff7CompareJuly 23, 2026 22:13
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.

1 similar comment

@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3777 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7447 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7447 ⇄ loopback 3777.
@DanielGGordon
DanielGGordon
merged commit 8dc98e8
into
mainJul 24, 2026

6 of 10 checks passed

@DanielGGordonDanielGGordon
mentioned this pull request
Jul 27, 2026
 Merged

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

Reviewers


No reviews


Assignees


No one assigned


Labels

size:XXLvouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

19 participants

@DanielGGordon@juliusmarminge@avocardow@Prgm-code@jakeleventhal@VedankPurohit@t3dotgg@kridaydave@D3OXY@dmstoykov@HugoVizcainoSantana@EricTsai83@AmoonPod@BunnyGamezsc@olivoil@Fazalkadivar21@maxwellyoung@nateEc@jamesx0416

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut - #42
Merged
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Jul 24, 2026
Merged
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut#42
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Conversation
@DanielGGordon
@DanielGGordonDanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

Owner
Summary
True merge of ~130 upstream commits (last sync base dad0889, 2026-07-07 → upstream 6f34ad3e8, 2026-07-21). The cut point deliberately stops before the churny 7/22+ wave: Sidebar v2 beta (+ DB migration 033), the glass UI redesign, and the mobile thread-sync overhaul — those are planned as a follow-up merge once upstream stabilizes.
This is a strategy change from per-commit cherry-picks to a real merge; see the new dated entry in UPSTREAM_DIVERGENCE.md for full rationale, superseded skip-decisions, and per-file conflict notes.
Highlights pulled in
  • Headless t3 connect for SSH hosts; lightweight connection probe; faster new-chat propagation and offline catch-up; localhost preview URL resolution for remote environments
  • Claude: handle all SDK stream messages (no more spurious work-log warning rows), capability probe isolated from user MCP servers, CLAUDE_CONFIG_DIR respected, Bedrock auth recognized
  • New defaults: Claude 1M context, Codex gpt-5.6, worktrees from origin main
  • Codex launch-arguments setting; regenerated Codex protocol bindings
  • Drag files from explorer into composer; archive threads from context menu; diffs default to working changes; image-upload crash fix; stale-active-turn cleanup
  • Clerk stack upgrade, desktop packaging fixes (previously deferred — now along for the ride)
Notable resolutions
  • Mobile: resolved wholesale to upstream's official Android implementation (supersedes our hand-rolled Android commits, per the standing no-mobile-investment policy). Kept fork-only: self-signed-TLS trust plugin + APK publish script.
  • Shell resume: our fix(sync): stop the shell thread list from wedging on a stale cache #40 stale-cache fix retired in favor of upstream's rework (c14a5ca49/db4b2d8a0), which covers both failure modes with tests.
  • Unions: dotfiles toggle + root input (FileBrowserPanel), Solarized theme layer + file-viewer worker pool (FilePreviewPanel/index.css), ThemeToggle — all preserved alongside upstream's new composer file links, workspace image preview, and sidebar width work.
  • .claude/skills → upstream's .agents/skills symlink layout; /redeploy skill moved accordingly.
Verification
  • Typecheck clean: apps/server, apps/web, packages/client-runtime
  • Tests: shell-sync.test.ts + shell.test.ts (5/5), server.test.ts -t subscribeShell (7/7)
🤖 Generated with Claude Code
juliusmarmingeand others
added 30 commits
July 7, 2026 22:49
@juliusmarminge@cursoragent
Use rounded depth logo for production splash screen (pingdotgg#3780)
7778a1c
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge@cursoragent
fix(release): stage pnpm 11 allowBuilds for desktop installs (pingdot…
03ac1f0
…gg#3781)
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge
Upgrade Clerk toolchain to latest versions (pingdotgg#3785)
e775bc6
@avocardow
fix(release): bump electron-builder so pnpm 11 deduped deps land in t…
0c66565
…he asar (pingdotgg#3790)
@Prgm-code
Fix desktop native optional dependency packaging (pingdotgg#3816)
18a4138
@juliusmarminge@codex
[codex] Upgrade Clerk stack (pingdotgg#3821)
e912765
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Preserve worktree metadata during branch sync (pingdotgg#3822)
3201e00
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarmingeJulius Marminge@codex
feat(client): persist offline environment data and mobile preferences (…
2250e3e
…pingdotgg#3795)
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Label max and ultra reasoning (pingdotgg#3824)
ca1e08b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
fix(mobile): embed fonts and render project favicons reliably (pingdo…
843cf17
…tgg#3823)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Show compact PR number badges in mobile thread rows (pingdotgg#3827)
8619ef2
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Expose mobile PR indicator labels to accessibility (pingdotgg#3828)
f61fa94
Co-authored-by: codex <codex@users.noreply.github.com>
@jakeleventhal
Fix truncated chat error alert layout (pingdotgg#3899)
ef943a2
@VedankPurohit
fix(marketing): show platform-appropriate commit shortcut on the webs…
619b0ec
…ite (pingdotgg#3644)
@juliusmarminge@HorusGoul
@claude@maria-rcks@shivamhwp@bmdavis419@PixPMusic@codexJulius Marminge
[codex] Add Android mobile support (pingdotgg#3579)
c1ec191
Co-authored-by: Horus Lugo <horusgoul@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Ben Davis <45952064+bmdavis419@users.noreply.github.com>
Co-authored-by: Alex <me@pixp.cc>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@mac.lan>
@juliusmarminge
Use client-side fallbacks for missing project favicons (pingdotgg#3959)
8de254a
@juliusmarminge
Skip stale working-task notifications (pingdotgg#3961)
735240f
@juliusmarminge
Prepare Android beta branding and review diff UI (pingdotgg#3967)
3513fa0
@t3dotgg
perf(web): duty-cycle status animations and remove fixed noise overlay (
2fdc704
pingdotgg#3978)
@kridaydave
fix(docs): correct CI task-runner commands in ci.md (pingdotgg#3990)
7b928d5
@kridaydave
fix(docs): repair broken source links in architecture overview (pingd…
c69120f
…otgg#3991)
@kridaydave
fix(docs): replace stale codething-mvp absolute paths with repo-relat…
4624426
…ive links (pingdotgg#3992)
@juliusmarminge@codex
docs: Add T3 Code Legal Docs (pingdotgg#3972)
d359789
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Fix Legal modal header crash (pingdotgg#4000)
ecb35f7
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Fix onboarding connection status (pingdotgg#4001)
b982337
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
Isolate native diff highlight grammar state (pingdotgg#4029)
5e8b2c8
@D3OXY
Fix macOS fullscreen titlebar spacing (pingdotgg#4019)
0418301
@juliusmarminge@codex
Prevent duplicate project workspace roots (pingdotgg#3829)
d114e27
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Normalize over-indented markdown list items (pingdotgg#4020)
54f167e
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Resolve localhost preview URLs for remote environments (pingdotgg#4011)
bde0a4c
Co-authored-by: codex <codex@users.noreply.github.com>
Andrew-Forsterand others
added 21 commits
July 20, 2026 11:04
@Andrew-Forster@juliusmarminge
[orchestration] Clear stale active turn when session becomes inactive (…
501ce27
…pingdotgg#3159)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Regenerate Codex reset credit protocol bindings (pingdotgg#4173)
08993a5
Co-authored-by: codex <codex@users.noreply.github.com>
@Chrrxs@juliusmarminge@codex
fix(preview): preserve direct localhost navigation (pingdotgg#3939)
2fae0d0
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Synchronize mobile threads with authoritative shell snapshots (pingdo…
8e3467f
…tgg#4163)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Gate iOS glass layout on native support (pingdotgg#4032)
b6d9ce3
Co-authored-by: codex <codex@users.noreply.github.com>
@vdmkotai@codex
fix(opencode): resume the OpenCode session on follow-ups instead of s…
f4da4f3
…tarting an empty one (pingdotgg#3617)
Co-authored-by: codex <codex@users.noreply.github.com>
@UtkarshUsername
fix(server): use CLI for OpenCode health check instead of spawning se…
0ca3240
…rver (pingdotgg#4153)
@xxashxx-svg@claude
fix(web): scope timeline minimap hover target to the side gutter (pin…
946b867
…gdotgg#3869)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@maxwellyoung
[codex] show complete approval details (pingdotgg#4111)
a135f2c
@yordis
fix(web): paint text selection over composer chips (pingdotgg#4139)
c710167
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@maxwellyoung
[codex] preserve custom model slugs (pingdotgg#4168)
fa69f05
@Rhiz3K@juliusmarminge
fix(web): preview workspace images in the file panel (pingdotgg#3996)
0936fd2
Co-authored-by: Rhiz3K <rhiz3k@protonmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@yordis@juliusmarminge
feat(web): drag files from the explorer into the chat composer (pingd…
8ca4eec
…otgg#4140)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@anirudhsama@juliusmarminge@codex
fix(desktop): preserve main window bounds (pingdotgg#3851)
2c199aa
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@RusiruSadathana@codex@juliusmarminge
perf(orchestration): speed up new-chat propagation and offline catch-…
db4b2d8
…up (pingdotgg#4177)
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@sandersonstabo@juliusmarminge
Finale: upgrade changed files card to fix various UI issues (pingdotg…
c8a04bd
…g#4113)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Pass CLI OAuth config to hosted web deploy (pingdotgg#4186)
5d34f9f
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): always show environment chip for remote projects (pingdotgg…
c0bb237
…#4217)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(web): keep composer editable while disconnected (pingdotgg#4241)
23c18fd
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix: better defaults — Claude 1M context, Codex gpt-5.6, worktrees fr…
62cf461
…om origin main (pingdotgg#4240)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(claude): handle all SDK stream messages; stop spurious work-log w…
6f34ad3
…arning rows (pingdotgg#4244)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL

labels
Jul 23, 2026
@DanielGGordon@claude
merge: upstream through6f34ad3(2026-07-21) — pre-Sidebar-v2 cut
d963ff7
True merge replacing per-commit cherry-picks; see UPSTREAM_DIVERGENCE.md
2026-07-23 entry for strategy, superseded decisions, and conflict notes.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@DanielGGordon
DanielGGordonforce-pushed
the
t3code/upstream-sidebar-change
branch
from
26828c3 to
d963ff7CompareJuly 23, 2026 22:13
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.

1 similar comment

@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3777 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7447 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7447 ⇄ loopback 3777.
@DanielGGordon
DanielGGordon
merged commit 8dc98e8
into
mainJul 24, 2026

6 of 10 checks passed

@DanielGGordonDanielGGordon
mentioned this pull request
Jul 27, 2026
 Merged

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

Reviewers


No reviews


Assignees


No one assigned


Labels

size:XXLvouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

19 participants

@DanielGGordon@juliusmarminge@avocardow@Prgm-code@jakeleventhal@VedankPurohit@t3dotgg@kridaydave@D3OXY@dmstoykov@HugoVizcainoSantana@EricTsai83@AmoonPod@BunnyGamezsc@olivoil@Fazalkadivar21@maxwellyoung@nateEc@jamesx0416

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut - #42
Merged
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Jul 24, 2026
Merged
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut#42
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Conversation
@DanielGGordon
@DanielGGordonDanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

Owner
Summary
True merge of ~130 upstream commits (last sync base dad0889, 2026-07-07 → upstream 6f34ad3e8, 2026-07-21). The cut point deliberately stops before the churny 7/22+ wave: Sidebar v2 beta (+ DB migration 033), the glass UI redesign, and the mobile thread-sync overhaul — those are planned as a follow-up merge once upstream stabilizes.
This is a strategy change from per-commit cherry-picks to a real merge; see the new dated entry in UPSTREAM_DIVERGENCE.md for full rationale, superseded skip-decisions, and per-file conflict notes.
Highlights pulled in
  • Headless t3 connect for SSH hosts; lightweight connection probe; faster new-chat propagation and offline catch-up; localhost preview URL resolution for remote environments
  • Claude: handle all SDK stream messages (no more spurious work-log warning rows), capability probe isolated from user MCP servers, CLAUDE_CONFIG_DIR respected, Bedrock auth recognized
  • New defaults: Claude 1M context, Codex gpt-5.6, worktrees from origin main
  • Codex launch-arguments setting; regenerated Codex protocol bindings
  • Drag files from explorer into composer; archive threads from context menu; diffs default to working changes; image-upload crash fix; stale-active-turn cleanup
  • Clerk stack upgrade, desktop packaging fixes (previously deferred — now along for the ride)
Notable resolutions
  • Mobile: resolved wholesale to upstream's official Android implementation (supersedes our hand-rolled Android commits, per the standing no-mobile-investment policy). Kept fork-only: self-signed-TLS trust plugin + APK publish script.
  • Shell resume: our fix(sync): stop the shell thread list from wedging on a stale cache #40 stale-cache fix retired in favor of upstream's rework (c14a5ca49/db4b2d8a0), which covers both failure modes with tests.
  • Unions: dotfiles toggle + root input (FileBrowserPanel), Solarized theme layer + file-viewer worker pool (FilePreviewPanel/index.css), ThemeToggle — all preserved alongside upstream's new composer file links, workspace image preview, and sidebar width work.
  • .claude/skills → upstream's .agents/skills symlink layout; /redeploy skill moved accordingly.
Verification
  • Typecheck clean: apps/server, apps/web, packages/client-runtime
  • Tests: shell-sync.test.ts + shell.test.ts (5/5), server.test.ts -t subscribeShell (7/7)
🤖 Generated with Claude Code
juliusmarmingeand others
added 30 commits
July 7, 2026 22:49
@juliusmarminge@cursoragent
Use rounded depth logo for production splash screen (pingdotgg#3780)
7778a1c
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge@cursoragent
fix(release): stage pnpm 11 allowBuilds for desktop installs (pingdot…
03ac1f0
…gg#3781)
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge
Upgrade Clerk toolchain to latest versions (pingdotgg#3785)
e775bc6
@avocardow
fix(release): bump electron-builder so pnpm 11 deduped deps land in t…
0c66565
…he asar (pingdotgg#3790)
@Prgm-code
Fix desktop native optional dependency packaging (pingdotgg#3816)
18a4138
@juliusmarminge@codex
[codex] Upgrade Clerk stack (pingdotgg#3821)
e912765
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Preserve worktree metadata during branch sync (pingdotgg#3822)
3201e00
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarmingeJulius Marminge@codex
feat(client): persist offline environment data and mobile preferences (…
2250e3e
…pingdotgg#3795)
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Label max and ultra reasoning (pingdotgg#3824)
ca1e08b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
fix(mobile): embed fonts and render project favicons reliably (pingdo…
843cf17
…tgg#3823)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Show compact PR number badges in mobile thread rows (pingdotgg#3827)
8619ef2
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Expose mobile PR indicator labels to accessibility (pingdotgg#3828)
f61fa94
Co-authored-by: codex <codex@users.noreply.github.com>
@jakeleventhal
Fix truncated chat error alert layout (pingdotgg#3899)
ef943a2
@VedankPurohit
fix(marketing): show platform-appropriate commit shortcut on the webs…
619b0ec
…ite (pingdotgg#3644)
@juliusmarminge@HorusGoul
@claude@maria-rcks@shivamhwp@bmdavis419@PixPMusic@codexJulius Marminge
[codex] Add Android mobile support (pingdotgg#3579)
c1ec191
Co-authored-by: Horus Lugo <horusgoul@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Ben Davis <45952064+bmdavis419@users.noreply.github.com>
Co-authored-by: Alex <me@pixp.cc>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@mac.lan>
@juliusmarminge
Use client-side fallbacks for missing project favicons (pingdotgg#3959)
8de254a
@juliusmarminge
Skip stale working-task notifications (pingdotgg#3961)
735240f
@juliusmarminge
Prepare Android beta branding and review diff UI (pingdotgg#3967)
3513fa0
@t3dotgg
perf(web): duty-cycle status animations and remove fixed noise overlay (
2fdc704
pingdotgg#3978)
@kridaydave
fix(docs): correct CI task-runner commands in ci.md (pingdotgg#3990)
7b928d5
@kridaydave
fix(docs): repair broken source links in architecture overview (pingd…
c69120f
…otgg#3991)
@kridaydave
fix(docs): replace stale codething-mvp absolute paths with repo-relat…
4624426
…ive links (pingdotgg#3992)
@juliusmarminge@codex
docs: Add T3 Code Legal Docs (pingdotgg#3972)
d359789
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Fix Legal modal header crash (pingdotgg#4000)
ecb35f7
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Fix onboarding connection status (pingdotgg#4001)
b982337
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
Isolate native diff highlight grammar state (pingdotgg#4029)
5e8b2c8
@D3OXY
Fix macOS fullscreen titlebar spacing (pingdotgg#4019)
0418301
@juliusmarminge@codex
Prevent duplicate project workspace roots (pingdotgg#3829)
d114e27
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Normalize over-indented markdown list items (pingdotgg#4020)
54f167e
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Resolve localhost preview URLs for remote environments (pingdotgg#4011)
bde0a4c
Co-authored-by: codex <codex@users.noreply.github.com>
Andrew-Forsterand others
added 21 commits
July 20, 2026 11:04
@Andrew-Forster@juliusmarminge
[orchestration] Clear stale active turn when session becomes inactive (…
501ce27
…pingdotgg#3159)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Regenerate Codex reset credit protocol bindings (pingdotgg#4173)
08993a5
Co-authored-by: codex <codex@users.noreply.github.com>
@Chrrxs@juliusmarminge@codex
fix(preview): preserve direct localhost navigation (pingdotgg#3939)
2fae0d0
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Synchronize mobile threads with authoritative shell snapshots (pingdo…
8e3467f
…tgg#4163)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Gate iOS glass layout on native support (pingdotgg#4032)
b6d9ce3
Co-authored-by: codex <codex@users.noreply.github.com>
@vdmkotai@codex
fix(opencode): resume the OpenCode session on follow-ups instead of s…
f4da4f3
…tarting an empty one (pingdotgg#3617)
Co-authored-by: codex <codex@users.noreply.github.com>
@UtkarshUsername
fix(server): use CLI for OpenCode health check instead of spawning se…
0ca3240
…rver (pingdotgg#4153)
@xxashxx-svg@claude
fix(web): scope timeline minimap hover target to the side gutter (pin…
946b867
…gdotgg#3869)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@maxwellyoung
[codex] show complete approval details (pingdotgg#4111)
a135f2c
@yordis
fix(web): paint text selection over composer chips (pingdotgg#4139)
c710167
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@maxwellyoung
[codex] preserve custom model slugs (pingdotgg#4168)
fa69f05
@Rhiz3K@juliusmarminge
fix(web): preview workspace images in the file panel (pingdotgg#3996)
0936fd2
Co-authored-by: Rhiz3K <rhiz3k@protonmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@yordis@juliusmarminge
feat(web): drag files from the explorer into the chat composer (pingd…
8ca4eec
…otgg#4140)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@anirudhsama@juliusmarminge@codex
fix(desktop): preserve main window bounds (pingdotgg#3851)
2c199aa
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@RusiruSadathana@codex@juliusmarminge
perf(orchestration): speed up new-chat propagation and offline catch-…
db4b2d8
…up (pingdotgg#4177)
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@sandersonstabo@juliusmarminge
Finale: upgrade changed files card to fix various UI issues (pingdotg…
c8a04bd
…g#4113)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Pass CLI OAuth config to hosted web deploy (pingdotgg#4186)
5d34f9f
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): always show environment chip for remote projects (pingdotgg…
c0bb237
…#4217)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(web): keep composer editable while disconnected (pingdotgg#4241)
23c18fd
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix: better defaults — Claude 1M context, Codex gpt-5.6, worktrees fr…
62cf461
…om origin main (pingdotgg#4240)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(claude): handle all SDK stream messages; stop spurious work-log w…
6f34ad3
…arning rows (pingdotgg#4244)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL

labels
Jul 23, 2026
@DanielGGordon@claude
merge: upstream through6f34ad3(2026-07-21) — pre-Sidebar-v2 cut
d963ff7
True merge replacing per-commit cherry-picks; see UPSTREAM_DIVERGENCE.md
2026-07-23 entry for strategy, superseded decisions, and conflict notes.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@DanielGGordon
DanielGGordonforce-pushed
the
t3code/upstream-sidebar-change
branch
from
26828c3 to
d963ff7CompareJuly 23, 2026 22:13
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.

1 similar comment

@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3777 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7447 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7447 ⇄ loopback 3777.
@DanielGGordon
DanielGGordon
merged commit 8dc98e8
into
mainJul 24, 2026

6 of 10 checks passed

@DanielGGordonDanielGGordon
mentioned this pull request
Jul 27, 2026
 Merged

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

Reviewers


No reviews


Assignees


No one assigned


Labels

size:XXLvouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

19 participants

@DanielGGordon@juliusmarminge@avocardow@Prgm-code@jakeleventhal@VedankPurohit@t3dotgg@kridaydave@D3OXY@dmstoykov@HugoVizcainoSantana@EricTsai83@AmoonPod@BunnyGamezsc@olivoil@Fazalkadivar21@maxwellyoung@nateEc@jamesx0416

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut - #42
Merged
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Jul 24, 2026
Merged
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut#42
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Conversation
@DanielGGordon
@DanielGGordonDanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

Owner
Summary
True merge of ~130 upstream commits (last sync base dad0889, 2026-07-07 → upstream 6f34ad3e8, 2026-07-21). The cut point deliberately stops before the churny 7/22+ wave: Sidebar v2 beta (+ DB migration 033), the glass UI redesign, and the mobile thread-sync overhaul — those are planned as a follow-up merge once upstream stabilizes.
This is a strategy change from per-commit cherry-picks to a real merge; see the new dated entry in UPSTREAM_DIVERGENCE.md for full rationale, superseded skip-decisions, and per-file conflict notes.
Highlights pulled in
  • Headless t3 connect for SSH hosts; lightweight connection probe; faster new-chat propagation and offline catch-up; localhost preview URL resolution for remote environments
  • Claude: handle all SDK stream messages (no more spurious work-log warning rows), capability probe isolated from user MCP servers, CLAUDE_CONFIG_DIR respected, Bedrock auth recognized
  • New defaults: Claude 1M context, Codex gpt-5.6, worktrees from origin main
  • Codex launch-arguments setting; regenerated Codex protocol bindings
  • Drag files from explorer into composer; archive threads from context menu; diffs default to working changes; image-upload crash fix; stale-active-turn cleanup
  • Clerk stack upgrade, desktop packaging fixes (previously deferred — now along for the ride)
Notable resolutions
  • Mobile: resolved wholesale to upstream's official Android implementation (supersedes our hand-rolled Android commits, per the standing no-mobile-investment policy). Kept fork-only: self-signed-TLS trust plugin + APK publish script.
  • Shell resume: our fix(sync): stop the shell thread list from wedging on a stale cache #40 stale-cache fix retired in favor of upstream's rework (c14a5ca49/db4b2d8a0), which covers both failure modes with tests.
  • Unions: dotfiles toggle + root input (FileBrowserPanel), Solarized theme layer + file-viewer worker pool (FilePreviewPanel/index.css), ThemeToggle — all preserved alongside upstream's new composer file links, workspace image preview, and sidebar width work.
  • .claude/skills → upstream's .agents/skills symlink layout; /redeploy skill moved accordingly.
Verification
  • Typecheck clean: apps/server, apps/web, packages/client-runtime
  • Tests: shell-sync.test.ts + shell.test.ts (5/5), server.test.ts -t subscribeShell (7/7)
🤖 Generated with Claude Code
juliusmarmingeand others
added 30 commits
July 7, 2026 22:49
@juliusmarminge@cursoragent
Use rounded depth logo for production splash screen (pingdotgg#3780)
7778a1c
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge@cursoragent
fix(release): stage pnpm 11 allowBuilds for desktop installs (pingdot…
03ac1f0
…gg#3781)
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge
Upgrade Clerk toolchain to latest versions (pingdotgg#3785)
e775bc6
@avocardow
fix(release): bump electron-builder so pnpm 11 deduped deps land in t…
0c66565
…he asar (pingdotgg#3790)
@Prgm-code
Fix desktop native optional dependency packaging (pingdotgg#3816)
18a4138
@juliusmarminge@codex
[codex] Upgrade Clerk stack (pingdotgg#3821)
e912765
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Preserve worktree metadata during branch sync (pingdotgg#3822)
3201e00
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarmingeJulius Marminge@codex
feat(client): persist offline environment data and mobile preferences (…
2250e3e
…pingdotgg#3795)
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Label max and ultra reasoning (pingdotgg#3824)
ca1e08b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
fix(mobile): embed fonts and render project favicons reliably (pingdo…
843cf17
…tgg#3823)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Show compact PR number badges in mobile thread rows (pingdotgg#3827)
8619ef2
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Expose mobile PR indicator labels to accessibility (pingdotgg#3828)
f61fa94
Co-authored-by: codex <codex@users.noreply.github.com>
@jakeleventhal
Fix truncated chat error alert layout (pingdotgg#3899)
ef943a2
@VedankPurohit
fix(marketing): show platform-appropriate commit shortcut on the webs…
619b0ec
…ite (pingdotgg#3644)
@juliusmarminge@HorusGoul
@claude@maria-rcks@shivamhwp@bmdavis419@PixPMusic@codexJulius Marminge
[codex] Add Android mobile support (pingdotgg#3579)
c1ec191
Co-authored-by: Horus Lugo <horusgoul@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Ben Davis <45952064+bmdavis419@users.noreply.github.com>
Co-authored-by: Alex <me@pixp.cc>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@mac.lan>
@juliusmarminge
Use client-side fallbacks for missing project favicons (pingdotgg#3959)
8de254a
@juliusmarminge
Skip stale working-task notifications (pingdotgg#3961)
735240f
@juliusmarminge
Prepare Android beta branding and review diff UI (pingdotgg#3967)
3513fa0
@t3dotgg
perf(web): duty-cycle status animations and remove fixed noise overlay (
2fdc704
pingdotgg#3978)
@kridaydave
fix(docs): correct CI task-runner commands in ci.md (pingdotgg#3990)
7b928d5
@kridaydave
fix(docs): repair broken source links in architecture overview (pingd…
c69120f
…otgg#3991)
@kridaydave
fix(docs): replace stale codething-mvp absolute paths with repo-relat…
4624426
…ive links (pingdotgg#3992)
@juliusmarminge@codex
docs: Add T3 Code Legal Docs (pingdotgg#3972)
d359789
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Fix Legal modal header crash (pingdotgg#4000)
ecb35f7
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Fix onboarding connection status (pingdotgg#4001)
b982337
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
Isolate native diff highlight grammar state (pingdotgg#4029)
5e8b2c8
@D3OXY
Fix macOS fullscreen titlebar spacing (pingdotgg#4019)
0418301
@juliusmarminge@codex
Prevent duplicate project workspace roots (pingdotgg#3829)
d114e27
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Normalize over-indented markdown list items (pingdotgg#4020)
54f167e
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Resolve localhost preview URLs for remote environments (pingdotgg#4011)
bde0a4c
Co-authored-by: codex <codex@users.noreply.github.com>
Andrew-Forsterand others
added 21 commits
July 20, 2026 11:04
@Andrew-Forster@juliusmarminge
[orchestration] Clear stale active turn when session becomes inactive (…
501ce27
…pingdotgg#3159)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Regenerate Codex reset credit protocol bindings (pingdotgg#4173)
08993a5
Co-authored-by: codex <codex@users.noreply.github.com>
@Chrrxs@juliusmarminge@codex
fix(preview): preserve direct localhost navigation (pingdotgg#3939)
2fae0d0
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Synchronize mobile threads with authoritative shell snapshots (pingdo…
8e3467f
…tgg#4163)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Gate iOS glass layout on native support (pingdotgg#4032)
b6d9ce3
Co-authored-by: codex <codex@users.noreply.github.com>
@vdmkotai@codex
fix(opencode): resume the OpenCode session on follow-ups instead of s…
f4da4f3
…tarting an empty one (pingdotgg#3617)
Co-authored-by: codex <codex@users.noreply.github.com>
@UtkarshUsername
fix(server): use CLI for OpenCode health check instead of spawning se…
0ca3240
…rver (pingdotgg#4153)
@xxashxx-svg@claude
fix(web): scope timeline minimap hover target to the side gutter (pin…
946b867
…gdotgg#3869)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@maxwellyoung
[codex] show complete approval details (pingdotgg#4111)
a135f2c
@yordis
fix(web): paint text selection over composer chips (pingdotgg#4139)
c710167
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@maxwellyoung
[codex] preserve custom model slugs (pingdotgg#4168)
fa69f05
@Rhiz3K@juliusmarminge
fix(web): preview workspace images in the file panel (pingdotgg#3996)
0936fd2
Co-authored-by: Rhiz3K <rhiz3k@protonmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@yordis@juliusmarminge
feat(web): drag files from the explorer into the chat composer (pingd…
8ca4eec
…otgg#4140)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@anirudhsama@juliusmarminge@codex
fix(desktop): preserve main window bounds (pingdotgg#3851)
2c199aa
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@RusiruSadathana@codex@juliusmarminge
perf(orchestration): speed up new-chat propagation and offline catch-…
db4b2d8
…up (pingdotgg#4177)
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@sandersonstabo@juliusmarminge
Finale: upgrade changed files card to fix various UI issues (pingdotg…
c8a04bd
…g#4113)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Pass CLI OAuth config to hosted web deploy (pingdotgg#4186)
5d34f9f
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): always show environment chip for remote projects (pingdotgg…
c0bb237
…#4217)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(web): keep composer editable while disconnected (pingdotgg#4241)
23c18fd
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix: better defaults — Claude 1M context, Codex gpt-5.6, worktrees fr…
62cf461
…om origin main (pingdotgg#4240)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(claude): handle all SDK stream messages; stop spurious work-log w…
6f34ad3
…arning rows (pingdotgg#4244)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL

labels
Jul 23, 2026
@DanielGGordon@claude
merge: upstream through6f34ad3(2026-07-21) — pre-Sidebar-v2 cut
d963ff7
True merge replacing per-commit cherry-picks; see UPSTREAM_DIVERGENCE.md
2026-07-23 entry for strategy, superseded decisions, and conflict notes.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@DanielGGordon
DanielGGordonforce-pushed
the
t3code/upstream-sidebar-change
branch
from
26828c3 to
d963ff7CompareJuly 23, 2026 22:13
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.

1 similar comment

@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3777 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7447 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7447 ⇄ loopback 3777.
@DanielGGordon
DanielGGordon
merged commit 8dc98e8
into
mainJul 24, 2026

6 of 10 checks passed

@DanielGGordonDanielGGordon
mentioned this pull request
Jul 27, 2026
 Merged

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

Reviewers


No reviews


Assignees


No one assigned


Labels

size:XXLvouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

19 participants

@DanielGGordon@juliusmarminge@avocardow@Prgm-code@jakeleventhal@VedankPurohit@t3dotgg@kridaydave@D3OXY@dmstoykov@HugoVizcainoSantana@EricTsai83@AmoonPod@BunnyGamezsc@olivoil@Fazalkadivar21@maxwellyoung@nateEc@jamesx0416

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut - #42
Merged
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Jul 24, 2026
Merged
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut#42
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Conversation
@DanielGGordon
@DanielGGordonDanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

Owner
Summary
True merge of ~130 upstream commits (last sync base dad0889, 2026-07-07 → upstream 6f34ad3e8, 2026-07-21). The cut point deliberately stops before the churny 7/22+ wave: Sidebar v2 beta (+ DB migration 033), the glass UI redesign, and the mobile thread-sync overhaul — those are planned as a follow-up merge once upstream stabilizes.
This is a strategy change from per-commit cherry-picks to a real merge; see the new dated entry in UPSTREAM_DIVERGENCE.md for full rationale, superseded skip-decisions, and per-file conflict notes.
Highlights pulled in
  • Headless t3 connect for SSH hosts; lightweight connection probe; faster new-chat propagation and offline catch-up; localhost preview URL resolution for remote environments
  • Claude: handle all SDK stream messages (no more spurious work-log warning rows), capability probe isolated from user MCP servers, CLAUDE_CONFIG_DIR respected, Bedrock auth recognized
  • New defaults: Claude 1M context, Codex gpt-5.6, worktrees from origin main
  • Codex launch-arguments setting; regenerated Codex protocol bindings
  • Drag files from explorer into composer; archive threads from context menu; diffs default to working changes; image-upload crash fix; stale-active-turn cleanup
  • Clerk stack upgrade, desktop packaging fixes (previously deferred — now along for the ride)
Notable resolutions
  • Mobile: resolved wholesale to upstream's official Android implementation (supersedes our hand-rolled Android commits, per the standing no-mobile-investment policy). Kept fork-only: self-signed-TLS trust plugin + APK publish script.
  • Shell resume: our fix(sync): stop the shell thread list from wedging on a stale cache #40 stale-cache fix retired in favor of upstream's rework (c14a5ca49/db4b2d8a0), which covers both failure modes with tests.
  • Unions: dotfiles toggle + root input (FileBrowserPanel), Solarized theme layer + file-viewer worker pool (FilePreviewPanel/index.css), ThemeToggle — all preserved alongside upstream's new composer file links, workspace image preview, and sidebar width work.
  • .claude/skills → upstream's .agents/skills symlink layout; /redeploy skill moved accordingly.
Verification
  • Typecheck clean: apps/server, apps/web, packages/client-runtime
  • Tests: shell-sync.test.ts + shell.test.ts (5/5), server.test.ts -t subscribeShell (7/7)
🤖 Generated with Claude Code
juliusmarmingeand others
added 30 commits
July 7, 2026 22:49
@juliusmarminge@cursoragent
Use rounded depth logo for production splash screen (pingdotgg#3780)
7778a1c
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge@cursoragent
fix(release): stage pnpm 11 allowBuilds for desktop installs (pingdot…
03ac1f0
…gg#3781)
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge
Upgrade Clerk toolchain to latest versions (pingdotgg#3785)
e775bc6
@avocardow
fix(release): bump electron-builder so pnpm 11 deduped deps land in t…
0c66565
…he asar (pingdotgg#3790)
@Prgm-code
Fix desktop native optional dependency packaging (pingdotgg#3816)
18a4138
@juliusmarminge@codex
[codex] Upgrade Clerk stack (pingdotgg#3821)
e912765
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Preserve worktree metadata during branch sync (pingdotgg#3822)
3201e00
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarmingeJulius Marminge@codex
feat(client): persist offline environment data and mobile preferences (…
2250e3e
…pingdotgg#3795)
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Label max and ultra reasoning (pingdotgg#3824)
ca1e08b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
fix(mobile): embed fonts and render project favicons reliably (pingdo…
843cf17
…tgg#3823)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Show compact PR number badges in mobile thread rows (pingdotgg#3827)
8619ef2
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Expose mobile PR indicator labels to accessibility (pingdotgg#3828)
f61fa94
Co-authored-by: codex <codex@users.noreply.github.com>
@jakeleventhal
Fix truncated chat error alert layout (pingdotgg#3899)
ef943a2
@VedankPurohit
fix(marketing): show platform-appropriate commit shortcut on the webs…
619b0ec
…ite (pingdotgg#3644)
@juliusmarminge@HorusGoul
@claude@maria-rcks@shivamhwp@bmdavis419@PixPMusic@codexJulius Marminge
[codex] Add Android mobile support (pingdotgg#3579)
c1ec191
Co-authored-by: Horus Lugo <horusgoul@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Ben Davis <45952064+bmdavis419@users.noreply.github.com>
Co-authored-by: Alex <me@pixp.cc>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@mac.lan>
@juliusmarminge
Use client-side fallbacks for missing project favicons (pingdotgg#3959)
8de254a
@juliusmarminge
Skip stale working-task notifications (pingdotgg#3961)
735240f
@juliusmarminge
Prepare Android beta branding and review diff UI (pingdotgg#3967)
3513fa0
@t3dotgg
perf(web): duty-cycle status animations and remove fixed noise overlay (
2fdc704
pingdotgg#3978)
@kridaydave
fix(docs): correct CI task-runner commands in ci.md (pingdotgg#3990)
7b928d5
@kridaydave
fix(docs): repair broken source links in architecture overview (pingd…
c69120f
…otgg#3991)
@kridaydave
fix(docs): replace stale codething-mvp absolute paths with repo-relat…
4624426
…ive links (pingdotgg#3992)
@juliusmarminge@codex
docs: Add T3 Code Legal Docs (pingdotgg#3972)
d359789
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Fix Legal modal header crash (pingdotgg#4000)
ecb35f7
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Fix onboarding connection status (pingdotgg#4001)
b982337
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
Isolate native diff highlight grammar state (pingdotgg#4029)
5e8b2c8
@D3OXY
Fix macOS fullscreen titlebar spacing (pingdotgg#4019)
0418301
@juliusmarminge@codex
Prevent duplicate project workspace roots (pingdotgg#3829)
d114e27
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Normalize over-indented markdown list items (pingdotgg#4020)
54f167e
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Resolve localhost preview URLs for remote environments (pingdotgg#4011)
bde0a4c
Co-authored-by: codex <codex@users.noreply.github.com>
Andrew-Forsterand others
added 21 commits
July 20, 2026 11:04
@Andrew-Forster@juliusmarminge
[orchestration] Clear stale active turn when session becomes inactive (…
501ce27
…pingdotgg#3159)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Regenerate Codex reset credit protocol bindings (pingdotgg#4173)
08993a5
Co-authored-by: codex <codex@users.noreply.github.com>
@Chrrxs@juliusmarminge@codex
fix(preview): preserve direct localhost navigation (pingdotgg#3939)
2fae0d0
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Synchronize mobile threads with authoritative shell snapshots (pingdo…
8e3467f
…tgg#4163)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Gate iOS glass layout on native support (pingdotgg#4032)
b6d9ce3
Co-authored-by: codex <codex@users.noreply.github.com>
@vdmkotai@codex
fix(opencode): resume the OpenCode session on follow-ups instead of s…
f4da4f3
…tarting an empty one (pingdotgg#3617)
Co-authored-by: codex <codex@users.noreply.github.com>
@UtkarshUsername
fix(server): use CLI for OpenCode health check instead of spawning se…
0ca3240
…rver (pingdotgg#4153)
@xxashxx-svg@claude
fix(web): scope timeline minimap hover target to the side gutter (pin…
946b867
…gdotgg#3869)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@maxwellyoung
[codex] show complete approval details (pingdotgg#4111)
a135f2c
@yordis
fix(web): paint text selection over composer chips (pingdotgg#4139)
c710167
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@maxwellyoung
[codex] preserve custom model slugs (pingdotgg#4168)
fa69f05
@Rhiz3K@juliusmarminge
fix(web): preview workspace images in the file panel (pingdotgg#3996)
0936fd2
Co-authored-by: Rhiz3K <rhiz3k@protonmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@yordis@juliusmarminge
feat(web): drag files from the explorer into the chat composer (pingd…
8ca4eec
…otgg#4140)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@anirudhsama@juliusmarminge@codex
fix(desktop): preserve main window bounds (pingdotgg#3851)
2c199aa
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@RusiruSadathana@codex@juliusmarminge
perf(orchestration): speed up new-chat propagation and offline catch-…
db4b2d8
…up (pingdotgg#4177)
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@sandersonstabo@juliusmarminge
Finale: upgrade changed files card to fix various UI issues (pingdotg…
c8a04bd
…g#4113)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Pass CLI OAuth config to hosted web deploy (pingdotgg#4186)
5d34f9f
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): always show environment chip for remote projects (pingdotgg…
c0bb237
…#4217)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(web): keep composer editable while disconnected (pingdotgg#4241)
23c18fd
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix: better defaults — Claude 1M context, Codex gpt-5.6, worktrees fr…
62cf461
…om origin main (pingdotgg#4240)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(claude): handle all SDK stream messages; stop spurious work-log w…
6f34ad3
…arning rows (pingdotgg#4244)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL

labels
Jul 23, 2026
@DanielGGordon@claude
merge: upstream through6f34ad3(2026-07-21) — pre-Sidebar-v2 cut
d963ff7
True merge replacing per-commit cherry-picks; see UPSTREAM_DIVERGENCE.md
2026-07-23 entry for strategy, superseded decisions, and conflict notes.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@DanielGGordon
DanielGGordonforce-pushed
the
t3code/upstream-sidebar-change
branch
from
26828c3 to
d963ff7CompareJuly 23, 2026 22:13
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.

1 similar comment

@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3777 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7447 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7447 ⇄ loopback 3777.
@DanielGGordon
DanielGGordon
merged commit 8dc98e8
into
mainJul 24, 2026

6 of 10 checks passed

@DanielGGordonDanielGGordon
mentioned this pull request
Jul 27, 2026
 Merged

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

Reviewers


No reviews


Assignees


No one assigned


Labels

size:XXLvouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

19 participants

@DanielGGordon@juliusmarminge@avocardow@Prgm-code@jakeleventhal@VedankPurohit@t3dotgg@kridaydave@D3OXY@dmstoykov@HugoVizcainoSantana@EricTsai83@AmoonPod@BunnyGamezsc@olivoil@Fazalkadivar21@maxwellyoung@nateEc@jamesx0416

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut - #42
Merged
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Jul 24, 2026
Merged
merge: upstream through 6f34ad3e8 (2026-07-21) — pre-Sidebar-v2 cut#42
DanielGGordon merged 130 commits into
mainfrom 
t3code/upstream-sidebar-change
Conversation
@DanielGGordon
@DanielGGordonDanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

Owner
Summary
True merge of ~130 upstream commits (last sync base dad0889, 2026-07-07 → upstream 6f34ad3e8, 2026-07-21). The cut point deliberately stops before the churny 7/22+ wave: Sidebar v2 beta (+ DB migration 033), the glass UI redesign, and the mobile thread-sync overhaul — those are planned as a follow-up merge once upstream stabilizes.
This is a strategy change from per-commit cherry-picks to a real merge; see the new dated entry in UPSTREAM_DIVERGENCE.md for full rationale, superseded skip-decisions, and per-file conflict notes.
Highlights pulled in
  • Headless t3 connect for SSH hosts; lightweight connection probe; faster new-chat propagation and offline catch-up; localhost preview URL resolution for remote environments
  • Claude: handle all SDK stream messages (no more spurious work-log warning rows), capability probe isolated from user MCP servers, CLAUDE_CONFIG_DIR respected, Bedrock auth recognized
  • New defaults: Claude 1M context, Codex gpt-5.6, worktrees from origin main
  • Codex launch-arguments setting; regenerated Codex protocol bindings
  • Drag files from explorer into composer; archive threads from context menu; diffs default to working changes; image-upload crash fix; stale-active-turn cleanup
  • Clerk stack upgrade, desktop packaging fixes (previously deferred — now along for the ride)
Notable resolutions
  • Mobile: resolved wholesale to upstream's official Android implementation (supersedes our hand-rolled Android commits, per the standing no-mobile-investment policy). Kept fork-only: self-signed-TLS trust plugin + APK publish script.
  • Shell resume: our fix(sync): stop the shell thread list from wedging on a stale cache #40 stale-cache fix retired in favor of upstream's rework (c14a5ca49/db4b2d8a0), which covers both failure modes with tests.
  • Unions: dotfiles toggle + root input (FileBrowserPanel), Solarized theme layer + file-viewer worker pool (FilePreviewPanel/index.css), ThemeToggle — all preserved alongside upstream's new composer file links, workspace image preview, and sidebar width work.
  • .claude/skills → upstream's .agents/skills symlink layout; /redeploy skill moved accordingly.
Verification
  • Typecheck clean: apps/server, apps/web, packages/client-runtime
  • Tests: shell-sync.test.ts + shell.test.ts (5/5), server.test.ts -t subscribeShell (7/7)
🤖 Generated with Claude Code
juliusmarmingeand others
added 30 commits
July 7, 2026 22:49
@juliusmarminge@cursoragent
Use rounded depth logo for production splash screen (pingdotgg#3780)
7778a1c
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge@cursoragent
fix(release): stage pnpm 11 allowBuilds for desktop installs (pingdot…
03ac1f0
…gg#3781)
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@juliusmarminge
Upgrade Clerk toolchain to latest versions (pingdotgg#3785)
e775bc6
@avocardow
fix(release): bump electron-builder so pnpm 11 deduped deps land in t…
0c66565
…he asar (pingdotgg#3790)
@Prgm-code
Fix desktop native optional dependency packaging (pingdotgg#3816)
18a4138
@juliusmarminge@codex
[codex] Upgrade Clerk stack (pingdotgg#3821)
e912765
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Preserve worktree metadata during branch sync (pingdotgg#3822)
3201e00
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarmingeJulius Marminge@codex
feat(client): persist offline environment data and mobile preferences (…
2250e3e
…pingdotgg#3795)
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Label max and ultra reasoning (pingdotgg#3824)
ca1e08b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
fix(mobile): embed fonts and render project favicons reliably (pingdo…
843cf17
…tgg#3823)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Show compact PR number badges in mobile thread rows (pingdotgg#3827)
8619ef2
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Expose mobile PR indicator labels to accessibility (pingdotgg#3828)
f61fa94
Co-authored-by: codex <codex@users.noreply.github.com>
@jakeleventhal
Fix truncated chat error alert layout (pingdotgg#3899)
ef943a2
@VedankPurohit
fix(marketing): show platform-appropriate commit shortcut on the webs…
619b0ec
…ite (pingdotgg#3644)
@juliusmarminge@HorusGoul
@claude@maria-rcks@shivamhwp@bmdavis419@PixPMusic@codexJulius Marminge
[codex] Add Android mobile support (pingdotgg#3579)
c1ec191
Co-authored-by: Horus Lugo <horusgoul@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Ben Davis <45952064+bmdavis419@users.noreply.github.com>
Co-authored-by: Alex <me@pixp.cc>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@mac.lan>
@juliusmarminge
Use client-side fallbacks for missing project favicons (pingdotgg#3959)
8de254a
@juliusmarminge
Skip stale working-task notifications (pingdotgg#3961)
735240f
@juliusmarminge
Prepare Android beta branding and review diff UI (pingdotgg#3967)
3513fa0
@t3dotgg
perf(web): duty-cycle status animations and remove fixed noise overlay (
2fdc704
pingdotgg#3978)
@kridaydave
fix(docs): correct CI task-runner commands in ci.md (pingdotgg#3990)
7b928d5
@kridaydave
fix(docs): repair broken source links in architecture overview (pingd…
c69120f
…otgg#3991)
@kridaydave
fix(docs): replace stale codething-mvp absolute paths with repo-relat…
4624426
…ive links (pingdotgg#3992)
@juliusmarminge@codex
docs: Add T3 Code Legal Docs (pingdotgg#3972)
d359789
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Fix Legal modal header crash (pingdotgg#4000)
ecb35f7
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
[codex] Fix onboarding connection status (pingdotgg#4001)
b982337
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
Isolate native diff highlight grammar state (pingdotgg#4029)
5e8b2c8
@D3OXY
Fix macOS fullscreen titlebar spacing (pingdotgg#4019)
0418301
@juliusmarminge@codex
Prevent duplicate project workspace roots (pingdotgg#3829)
d114e27
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Normalize over-indented markdown list items (pingdotgg#4020)
54f167e
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Resolve localhost preview URLs for remote environments (pingdotgg#4011)
bde0a4c
Co-authored-by: codex <codex@users.noreply.github.com>
Andrew-Forsterand others
added 21 commits
July 20, 2026 11:04
@Andrew-Forster@juliusmarminge
[orchestration] Clear stale active turn when session becomes inactive (…
501ce27
…pingdotgg#3159)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Regenerate Codex reset credit protocol bindings (pingdotgg#4173)
08993a5
Co-authored-by: codex <codex@users.noreply.github.com>
@Chrrxs@juliusmarminge@codex
fix(preview): preserve direct localhost navigation (pingdotgg#3939)
2fae0d0
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Synchronize mobile threads with authoritative shell snapshots (pingdo…
8e3467f
…tgg#4163)
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Gate iOS glass layout on native support (pingdotgg#4032)
b6d9ce3
Co-authored-by: codex <codex@users.noreply.github.com>
@vdmkotai@codex
fix(opencode): resume the OpenCode session on follow-ups instead of s…
f4da4f3
…tarting an empty one (pingdotgg#3617)
Co-authored-by: codex <codex@users.noreply.github.com>
@UtkarshUsername
fix(server): use CLI for OpenCode health check instead of spawning se…
0ca3240
…rver (pingdotgg#4153)
@xxashxx-svg@claude
fix(web): scope timeline minimap hover target to the side gutter (pin…
946b867
…gdotgg#3869)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@maxwellyoung
[codex] show complete approval details (pingdotgg#4111)
a135f2c
@yordis
fix(web): paint text selection over composer chips (pingdotgg#4139)
c710167
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@maxwellyoung
[codex] preserve custom model slugs (pingdotgg#4168)
fa69f05
@Rhiz3K@juliusmarminge
fix(web): preview workspace images in the file panel (pingdotgg#3996)
0936fd2
Co-authored-by: Rhiz3K <rhiz3k@protonmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@yordis@juliusmarminge
feat(web): drag files from the explorer into the chat composer (pingd…
8ca4eec
…otgg#4140)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@anirudhsama@juliusmarminge@codex
fix(desktop): preserve main window bounds (pingdotgg#3851)
2c199aa
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@RusiruSadathana@codex@juliusmarminge
perf(orchestration): speed up new-chat propagation and offline catch-…
db4b2d8
…up (pingdotgg#4177)
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@sandersonstabo@juliusmarminge
Finale: upgrade changed files card to fix various UI issues (pingdotg…
c8a04bd
…g#4113)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge@codex
Pass CLI OAuth config to hosted web deploy (pingdotgg#4186)
5d34f9f
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): always show environment chip for remote projects (pingdotgg…
c0bb237
…#4217)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(web): keep composer editable while disconnected (pingdotgg#4241)
23c18fd
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix: better defaults — Claude 1M context, Codex gpt-5.6, worktrees fr…
62cf461
…om origin main (pingdotgg#4240)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg@claude
fix(claude): handle all SDK stream messages; stop spurious work-log w…
6f34ad3
…arning rows (pingdotgg#4244)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL

labels
Jul 23, 2026
@DanielGGordon@claude
merge: upstream through6f34ad3(2026-07-21) — pre-Sidebar-v2 cut
d963ff7
True merge replacing per-commit cherry-picks; see UPSTREAM_DIVERGENCE.md
2026-07-23 entry for strategy, superseded decisions, and conflict notes.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@DanielGGordon
DanielGGordonforce-pushed
the
t3code/upstream-sidebar-change
branch
from
26828c3 to
d963ff7CompareJuly 23, 2026 22:13
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.

1 similar comment

@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3776 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7446 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7446 ⇄ loopback 3776.
@DanielGGordon
DanielGGordon
commented
Jul 23, 2026

Copy link


Copy Markdown

OwnerAuthor
Test deployment (degraded / tunnel mode)
This branch is running on a local test instance, but the external HTTPS

port is not reachable yet (Caddy not bootstrapped or OVH port closed), so

there is no public URL. Reach it over an SSH tunnel:
# Open the tunnel from your laptop (keep this session open):
ssh -L 8080:127.0.0.1:3777 dgordon@<SERVER_IP># THEN, inside that SSH session (i.e. on <SERVER_IP>, not your laptop),# mint a link whose URL points at your tunnel origin:
node scripts/test-status.ts --pair 7447 --base-url http://127.0.0.1:8080
# finally open the printed http://127.0.0.1:8080/pair#token=... in your local browser
Slot: external 7447 ⇄ loopback 3777.
@DanielGGordon
DanielGGordon
merged commit 8dc98e8
into
mainJul 24, 2026

6 of 10 checks passed

@DanielGGordonDanielGGordon
mentioned this pull request
Jul 27, 2026
 Merged

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

Reviewers


No reviews


Assignees


No one assigned


Labels

size:XXLvouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

19 participants

@DanielGGordon@juliusmarminge@avocardow@Prgm-code@jakeleventhal@VedankPurohit@t3dotgg@kridaydave@D3OXY@dmstoykov@HugoVizcainoSantana@EricTsai83@AmoonPod@BunnyGamezsc@olivoil@Fazalkadivar21@maxwellyoung@nateEc@jamesx0416