Repository navigation
chore(sync): merge pingdotgg/t3code main - #341
Merged
Merged
Conversation
…iet (pingdotgg#24334) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#24406) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#24534) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… error after the SDK's late resume (pingdotgg#24231) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ntermediates (pingdotgg#24542) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…4-2109 # Conflicts: # apps/mobile/src/native/EnrichedMarkdownText.tsx # pnpm-lock.yaml
Upstream pingdotgg#24334 marks the runs of compactions that T3 Code starts as silent (latestRunSilent), and the web client no longer notifies on their completion. Fork web push now skips those completions too. A failure still notifies.
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.
Cause
Fork Sync run 40132761627 stopped on merge conflicts in
apps/mobile/src/native/EnrichedMarkdownText.tsxandpnpm-lock.yaml. Upstream pingdotgg#24534 "move Enriched Markdown to upstream's block renderers" bumpsreact-native-enriched-markdownto1.2.0-t3.16and rewrites how the mobile markdown view collects links and renders images.Conflicts and resolution
pnpm-lock.yaml: rebuilt withlockfile.py. The integrity changes equal upstream's (one package:react-native-enriched-markdown).EnrichedMarkdownText.tsx: took upstream's new link collection (onLinksChange, skill link keys,linkUrls). The fork lineconst monospace = useFontFamily("mono")(the fork font setting for code) stays. The forkmonospaceinmarkdownStylewas merged on its own.Upstream merge
Merges pingdotgg/t3code main at 3afb9b3 "fix(server): server preview browser rejects the compromised eMudhra intermediates (pingdotgg#24542)". Six upstream commits: pingdotgg#24334 (idle compactions read as one working row and stay quiet), pingdotgg#24406 (GitCafe checks), pingdotgg#24521 (HTML preview light and dark mode), pingdotgg#24534 (Enriched Markdown block renderers), pingdotgg#24231 (Cursor late resume), pingdotgg#24542 (eMudhra intermediates).
Adopted upstream pull requests
All 7 entries (pingdotgg#16653, pingdotgg#16654, pingdotgg#16655, pingdotgg#16684, pingdotgg#16695, pingdotgg#16698, pingdotgg#16719) are unchanged at their listed heads. No new merges.
Upstream changes in fork areas
15 files changed on both sides.
latestRunSilent).ThreadNotificationCoordinatorno longer notifies when they complete. The fork server push (apps/server/src/fork/webPush/WebPush.ts) did not read that flag, so it would push "Thread completed" for each idle compaction.attentionTransitionnow takessilentand skips a silent completion. A failure still pushes, as on the page. The test is inWebPush.test.ts, anddocs/fork/features.md"Web Push" names the case.ThreadNotificationCoordinator(tasks under their parent, installed app notification, terminal thread notifications) stay next to upstream's newlatestRunSilentcheck./compact's echo as a reply and records the compaction failure reason. The fork task names, thread credential and native message cursor on compaction stay.idleCompactionthrough messages, queue and commands, and projectslatestRunSilent. No fork code sends its own/compact. No effect.useComposerSend.ts: upstream marks the "compact on return" send. The fork readable-machine check stays. No effect.Checks
checks.py: typecheck, migration check and adopted pull request check pass.fork_tests.py: 171 fork test files pass locally (113 root files and 58 web files).apps/server/src/fork/webPush/WebPush.test.tspasses (5 tests). The otherapps/serverfork test files are left to Fork CI, because they stop the agent session on this VPS.Fork repair skill changes
None.