Skip to content

chore(sync): merge pingdotgg/t3code main - #341

Merged
Yarden-zamir merged 9 commits into
mainfrom
fork-sync/2026-10-24-2109
Oct 24, 2026
Merged

Yarden-zamir merged 9 commits into
mainfrom
fork-sync/2026-10-24-2109

Conversation

@Yarden-zamir

Copy link
Copy Markdown
Owner

Cause

Fork Sync run 40132761627 stopped on merge conflicts in apps/mobile/src/native/EnrichedMarkdownText.tsx and pnpm-lock.yaml. Upstream pingdotgg#24534 "move Enriched Markdown to upstream's block renderers" bumps react-native-enriched-markdown to 1.2.0-t3.16 and rewrites how the mobile markdown view collects links and renders images.

Conflicts and resolution

  • pnpm-lock.yaml: rebuilt with lockfile.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 line const monospace = useFontFamily("mono") (the fork font setting for code) stays. The fork monospace in markdownStyle was 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.

  • Web Push (fixed): upstream feat: compactions T3 Code starts read as one working row, and stay quiet pingdotgg/t3code#24334 marks the runs of compactions that T3 Code starts on its own as silent (latestRunSilent). ThreadNotificationCoordinator no 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. attentionTransition now takes silent and skips a silent completion. A failure still pushes, as on the page. The test is in WebPush.test.ts, and docs/fork/features.md "Web Push" names the case.
  • Notifications (web): the fork changes in ThreadNotificationCoordinator (tasks under their parent, installed app notification, terminal thread notifications) stay next to upstream's new latestRunSilent check.
  • Claude adapter: upstream hides /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.
  • Orchestrator, ProjectionStore, contracts: upstream passes idleCompaction through messages, queue and commands, and projects latestRunSilent. No fork code sends its own /compact. No effect.
  • Timeline (web) and feed (mobile): upstream renders compaction runs as one row. The fork timeline announcer and message link code stay. 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.ts passes (5 tests). The other apps/server fork test files are left to Fork CI, because they stop the agent session on this VPS.

Fork repair skill changes

None.

juliusmarminge and others added 9 commits October 24, 2026 12:37
…iet (pingdotgg#24334)

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.
@Yarden-zamir
Yarden-zamir merged commit bff3a32 into main Oct 24, 2026
18 of 19 checks passed
@Yarden-zamir
Yarden-zamir deleted the fork-sync/2026-10-24-2109 branch October 24, 2026 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants