chore(upstream): sync marcode through e60821f0e0d8 - #9
Draft
github-actions[bot] wants to merge 3 commits into
Draft
chore(upstream): sync marcode through e60821f0e0d8#9github-actions[bot] wants to merge 3 commits into
github-actions[bot] wants to merge 3 commits into
Conversation
…erver running (pingdotgg#5217) Co-authored-by: Claude <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automatic upstream detection produced a clean merge of
pingdotgg/t3code@e60821f0e0d8.maindc6a1ad283556386e9df1dbd19d0cdf06397d4cbmaine60821f0e0d82a5d671ca3b94719c49d333921c85192f777fe54c2a2a359f6c25ecf5fbde46d49b0e7c4cae99f00de6ca4c94f6748f147afe3b6873cUpstream commits
e60821f0e0d8feat: fold legacy models into separate menus (feat: fold legacy models into separate menus pingdotgg/t3code#5190) — Theo Browne (2026-08-02T00:45:05-07:00)64bf0161919efix(server): stop npx service updates from silently leaving the old server running (fix(server): stop npx service updates from silently leaving the old server running pingdotgg/t3code#5217) — Theo Browne (2026-08-01T22:42:39-07:00)Hotspot matches by owner
apps/mobile/src/features/threads/NewTaskDraftScreen.tsxapps/mobile/src/features/threads/ThreadComposer.tsxapps/mobile/src/lib/modelOptions.test.tsapps/mobile/src/lib/modelOptions.tsapps/server/src/cloud/bootService.test.tsapps/server/src/cloud/bootService.tsapps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.tsapps/server/src/provider/Layers/ClaudeProvider.tsapps/server/src/provider/Layers/CodexProvider.test.tsapps/server/src/provider/Layers/CodexProvider.tsCoupled vendored-repo findings
effect-version-subtree— source changed: false, companion changed: falsealchemy-version-subtree— source changed: false, companion changed: falseRequired checks on this pull request
Safety statement
No conflicts were auto-resolved. The bot never uses
--force,reset,checkout --ours/--theirs,or auto-merge. This is a normal two-parent merge commit whose tree was verified against a
non-mutating merge probe before it was pushed.
Manual verification checklist
apps/server/src/provider/**changed.