Skip to content

chore: sync upstream main - #29

Merged
matheustimbo merged 233 commits into
fork-mainfrom
main
Sep 22, 2026
Merged

chore: sync upstream main#29
matheustimbo merged 233 commits into
fork-mainfrom
main

Conversation

@github-actions

@github-actions github-actions Bot commented Sep 16, 2026 •
edited
Loading

Copy link
Copy Markdown

The automated sync from pingdotgg/t3code:main cannot land on its own.

Conflicting files as of 2026-09-22 16:55 UTC:

  • README.md
  • apps/marketing/src/pages/download.astro
  • apps/mobile/src/Stack.tsx
  • apps/mobile/src/features/settings/SettingsRouteScreen.tsx
  • apps/mobile/src/features/settings/components/settings-sheet-targets.ts
  • apps/mobile/src/features/threads/ThreadDetailScreen.tsx
  • apps/mobile/src/persistence/mobile-preferences.ts
  • apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
  • apps/server/src/persistence/Layers/ProjectionProjects.ts
  • apps/server/src/persistence/Layers/ProjectionThreads.ts
  • apps/server/src/persistence/Migrations.ts
  • apps/server/src/persistence/Migrations/051_ProjectionThreadsActiveOrderKey.test.ts
  • apps/server/src/persistence/Migrations/052_ProjectionThreadPullRequests.test.ts
  • apps/server/src/provider/Layers/ClaudeAdapter.ts
  • apps/server/src/serverSettings.ts
  • apps/web/src/components/Sidebar.tsx
  • apps/web/src/components/chat/ChatComposer.tsx
  • apps/web/src/components/chat/restingComposerControlsMeasurement.ts
  • docs/user/background-service.md
  • docs/user/install.md
  • docs/user/remote-access.md
  • docs/user/updating.md
  • packages/contracts/src/settings.ts
  • packages/shared/package.json
  • packages/shared/src/composerTrigger.test.ts
  • pnpm-lock.yaml
  • scripts/build-desktop-artifact.ts

Resolve locally, preserving the fork-only ticket-title and release behavior:

git fetch origin fork-main main
git switch -c sync-upstream origin/fork-main
git merge origin/main
# resolve, then:
git push origin HEAD:fork-main

No fork release can ship until fork-main contains upstream again.

t3-code Bot and others added 9 commits September 16, 2026 04:59
@t3-code
chore(release): prepare v0.0.42
fe896e6
@juliusmarminge @claude
fix(web): stop the worktree setup card from flashing and shifting (pi…
0f5a151 
…ngdotgg#12015)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(clients): show unsupported environments as neutral rows with thei…
c1b2ed6 
…r machine icon (pingdotgg#12026)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@juliusmarminge @claude
fix(clients): hold the discovered machine icon across relay refreshes (…
6ee0324 
…pingdotgg#12030)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@juliusmarminge
fix(server): resolve Node for standalone helper scripts (pingdotgg#12033
bf55408 
)
@saphid @shivamhwp
feat(web): reveal timestamps on tool rows and turn folds (pingdotgg#8641
b900fc9 
)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
@juliusmarminge @claude
docs: make the standalone installer the primary way to get the CLI (p…
ccf220b 
…ingdotgg#11696)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@flamboh
fix(web): submit PR comments with Cmd/Ctrl+Enter (pingdotgg#11994)
f45c6b4
@flamboh
refactor(web): centralize pull request icon state presentation (pingd…
e8ca3a8 
…otgg#11144)
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Sep 16, 2026
maria-rcks and others added 19 commits September 16, 2026 13:58
@maria-rcks
feat(providers): expose native slash commands across clients (pingdot…
0b83045 
…gg#11519)
@Bil0000
feat(web): add send shortcut and follow-up controls (pingdotgg#12075)
f4ef515
@maria-rcks maria-rcks
@claude @cursoragent
feat(chat): show provider thinking traces (pingdotgg#11784)
052c7ae 
Co-authored-by: maria-rcks <mwria.rocks@gmail.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
@maria-rcks
feat(usage): show OpenCode Go, Cursor, and Grok subscription limits (p…
eff44be 
…ingdotgg#12115)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@SunkenInTime @devin-ai-integration
fix(web): dropped folders become path chips on the local environment …
d1a6448 
…and are refused on remote ones (pingdotgg#12001)

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
@tris203
fix(web): adapt provider settings to available content width (pingdot…
384de08 
…gg#12138)
@maria-rcks @claude
fix(web): show private repository media in pull request tabs (pingdot…
32e8b25 
…gg#11706)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
@tris203 @maria-rcks
fix(review): show complete counts and load large diffs progressively (p…
aae361c 
…ingdotgg#10822)

Co-authored-by: maria-rcks <maria@kuuro.net>
@maria-rcks
fix(web): prioritize linked pull requests over automatic diffs (pingd…
52ad70e 
…otgg#12142)
@juliusmarminge
feat(cli): show installer and update download progress (pingdotgg#12044)
f1b497a
@Bil0000
fix(web): simplify agent approval prompts (pingdotgg#12082)
01e6419
@flamboh
fix(web): show tooltips for composer environment and workspace contro…
dda44ed 
…ls (pingdotgg#11787)
@maria-rcks
fix(chat): group thoughts into the changing tool activity line (pingd…
22539f2 
…otgg#12147)
@Yash-Singh1
fix(web): keep tool timestamps before disclosure chevrons (pingdotgg#…
ed12389 
…12152)
@maria-rcks
fix(web): default diff panel to working tree (pingdotgg#12139)
394af73 
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@PixPMusic @juliusmarminge
design(mobile): unify Android Material layouts and native controls (p…
e106fe9 
…ingdotgg#11841)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@maria-rcks
feat(web): choose themes from chat with color previews (pingdotgg#12143)
9686cd9
@Bil0000
fix(web): align follow-up and license settings controls (pingdotgg#12167
e47a11e 
)
@maria-rcks
fix(web): align composer task rows (pingdotgg#12165)
892b86d
juliusmarminge and others added 29 commits September 20, 2026 21:45
@juliusmarminge
feat(devices): add read-only update discovery and remote ownership (p…
61b25b8 
…ingdotgg#12818)
@juliusmarminge
fix(devices): safely reclaim obsolete managed tool versions (pingdotg…
790be6d 
…g#12819)
@maria-rcks
fix(web): match thread notification icons to sidebar status (pingdotg…
30e3649 
…g#12806)
@maria-rcks @cursoragent
fix(web): move sidebar shelves as one block (pingdotgg#11772)
f391b88 
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
@saphid
fix(web): offer undo after unpinning a thread (pingdotgg#10744)
6b0a04a
@juliusmarminge @claude
feat(web): undo settle, snooze and archive, with a mod+z shortcut (pi…
5781b52 
…ngdotgg#12848)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge
fix(mobile): use a proper pull request icon on iOS (pingdotgg#12855)
1eeeabb
@t3-code
test(web): remove redundant favicon test (pingdotgg#12856)
b379b5b
@juliusmarminge
feat(devices): offer manual updates in tool version details (pingdotg…
1de563c 
…g#12877)
@maria-rcks @claude
feat(web): answer pull request actions on the row at once (pingdotgg#…
371b52d 
…12843)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@juliusmarminge @claude
fix(mobile): stop iOS autocorrect from rewriting search queries (ping…
33cb911 
…dotgg#12949)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@flamboh
fix(web): pull request embed chip shows the state icon (pingdotgg#12951)
2c2fa8c
@Yash-Singh1
fix(web): dismiss selection actions when pressing buttons (pingdotgg#…
2d377bf 
…12950)
@saphid
fix(web): name message copy actions accurately (pingdotgg#12865)
d2a90b9
@Mnigos
fix(contracts): old message-sent events without turnId no longer stop…
80d9c18 
… the server from starting (pingdotgg#12763)
@Mnigos
fix(web): the custom snooze calendar starts the week where the locale…
e1cbb70 
… does (pingdotgg#12745)
@t3-code @codex
chore(mobile): bump app version to 1.3.0
76cc9b0 
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge @claude
feat(server): let t3.json limit or disable submodule init in new work…
1262d2f 
…trees (pingdotgg#12953)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
feat(settings): resolve t3.json inside the project settings resolver (p…
742173a 
…ingdotgg#12954)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
feat(settings): choose how new worktrees initialize submodules (pingd…
0141bc2 
…otgg#12955)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge
fix(web): show thread undo notice in the sidebar (pingdotgg#12972)
9a609a4
@Bil0000 @maria-rcks
feat(web): merge the comment and review buttons into one composer (pi…
5423ba0 
…ngdotgg#12945)

Co-authored-by: maria-rcks <maria@kuuro.net>
@carterwsmith
fix(web): allow text selection when renaming threads (pingdotgg#12935)
e65bc1c
@juliusmarminge @claude
chore(lint): report className restyling of components/ui exports (pin…
5a61f50 
…gdotgg#12982)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): drop className overrides that repeat the base styles (p…
c26119a 
…ingdotgg#12984)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@Gigioxx
fix(web): close menus when clicking into the browser tab (pingdotgg#1…
438bf46 
…1148)
@juliusmarminge @claude
refactor(web): give Spinner and RefreshIcon a size prop (pingdotgg#12985
b5a0f81 
)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@StiensWout
fix(web): retry failed attachment uploads after reconnect (pingdotgg#…
aff9318 
…10338)
@gsimone
fix(web): respect panel motion in composer transitions (pingdotgg#11064)
da6a85b
@matheustimbo
matheustimbo merged commit 7a0c5bb into fork-main Sep 22, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

size:XXL vouch:trusted PR 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.