Skip to content

chore(turbo): ingest upstream through v0.0.38-nightly.20260831 (repair #76) - #81

Merged
gfsaaser24 merged 287 commits into
turbofrom
repair/turbo-nightly-20260831
Aug 31, 2026
Merged

chore(turbo): ingest upstream through v0.0.38-nightly.20260831 (repair #76)#81
gfsaaser24 merged 287 commits into
turbofrom
repair/turbo-nightly-20260831

Conversation

@gfsaaser24

Copy link
Copy Markdown
Owner

Manual repair for the conflicted nightly sync (issue #76). Ingests 283 upstream commits (through upstream main 9b2d04317, i.e. past v0.0.38-nightly.20260831.1236) into turbo via merge-ingest. 51 conflicted files resolved by hand.

Included from upstream

Seam decisions

  • Chat panes/splits preserved — draft route stays pane-local (upstream's new draft route view would fight the pane workspace); pane tests pass
  • Turn-plan chips retired — their renderer went with upstream's timeline rework; orbs live on in the composer and turbo/orbs
  • Usage meters grafted onto upstream's new composer toolbar, next to the new attach button
  • Sidebar sort keeps the fork's decorate-sort but adopts upstream's un-settle re-anchoring
  • release.yml: upstream's new parallel job graph re-pinned to TURBO_RELEASE_REF (two github.sha checkouts would have built from main again), new quality job put on public runners, publish_cli stays deleted
  • Branding: client metadata labels, CLI service/connect copy, mic permission, keybinding notices, Codex instructions test re-Turbo'd; mobileBranding kept against upstream's deletion
  • Settled-lifecycle: updatedAt threading now fully tracks upstream
  • Markdown preview: Ctrl+Shift+click system-default open re-grafted onto upstream's remote-open resolution

Version line: 0.0.45 across all four manifests.

Verification

  • 28 seams / 176 checks verify
  • Typecheck clean: contracts, server, web, desktop, shared, client-runtime
  • Tests: chat panes suite, OpenRouter suite (25), versionSkew (16), settingsSearch, clientMetadata, manifest + branding policy tests — all pass

🤖 Generated with Claude Code

StiensWout and others added 30 commits August 19, 2026 14:23
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
maria-rcks and others added 18 commits August 30, 2026 18:05
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@mac.lan>
…gg#8734)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <jmarminge@gmail.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…0260831)

Merge-ingest of 283 upstream commits since bab4b6f (last ingest cutoff
2026-08-16). 51 conflicted files resolved by hand; every fork seam verified
after (28 seams, 176 checks). Version line advances to 0.0.45.

Headline upstream features now on turbo: file attachments (PDF/ZIP up to
50MB, attach button, paste-to-attach), PR-to-thread linking, video
attachment playback, offline iPhone voice input, mobile file sharing,
environment-published themes, provider settings split into list+editor,
searchable sidebar project filter, keyboard settle/restore, Claude
auto-compaction of old threads, cached-token pricing fix, restored unified
activity logs.

Seam notes:
- chat panes: draft route stays pane-local (upstream's new draft view fights
  the pane workspace); turn-plan chips retired with upstream's timeline
  rework (renderer went upstream-side; orbs live on in composer + turbo/orbs)
- release-from-turbo: re-pinned upstream's new parallel jobs (github.sha ->
  TURBO_RELEASE_REF) and the new quality job to public runners; publish_cli
  stays deleted
- usage meters: grafted onto upstream's new composer toolbar next to the
  attach button; sidebar sort keeps decorate-sort with upstream's un-settle
  anchor
- branding: client metadata labels, CLI service copy, Codex instructions
  test, mic permission, keybinding notices re-Turbo'd; mobileBranding kept
  against upstream's deletion
- settled-lifecycle: updatedAt threading now fully tracks upstream
  (GitManager, contracts/git.ts, mobile PR presentation)
- markdown-preview: system-default open re-grafted onto upstream's
  remote-open resolution; seam markers updated

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Aug 31, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 5d598312-d53d-4d56-ab0d-9eb10edc44e9

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Aug 31, 2026
@socket-security

socket-security Bot commented Aug 31, 2026

Copy link
Copy Markdown

All alerts resolved. Learn more about Socket for GitHub.

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

View full report

@github-actions github-actions Bot added the 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. label Aug 31, 2026
… cleanups

Upstream added CI jobs on bare Blacksmith runners and new lint rules (no
native title tooltips, no mobile useThemeColor). Pin the new jobs to the
repo-conditional public runner, convert the fork's breadcrumb reveal to
Tooltip, drop dead useThemeColor imports the merge unions kept, and update
the runner-count canary (3 -> 6).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@github-actions

github-actions Bot commented Aug 31, 2026

Copy link
Copy Markdown

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

ℹ️ No successful main baseline artifact is available yet. This run establishes the initial measurement.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire 13.2 KiB 15.1 KiB
Codex Thread snapshot wire 6.9 KiB 7.3 KiB
Codex Live turn WebSocket wire 6.3 KiB 7.8 KiB
Codex Live turn WebSocket decoded 54.7 KiB 66.4 KiB
Codex Live turn messages 9 21
Claude Total thread wire 13.5 KiB 15.1 KiB
Claude Thread snapshot wire 6.9 KiB 7.3 KiB
Claude Live turn WebSocket wire 6.6 KiB 7.8 KiB
Claude Live turn WebSocket decoded 57.9 KiB 66.4 KiB
Claude Live turn messages 11 21

Baseline: unavailable · PR result: de6ff21 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

  • Codex decoded thread snapshot: 109.4 KiB
  • Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

t3-turbo-bot and others added 2 commits August 31, 2026 10:50
- ProviderRegistry: upstream's new reconnect/catalog tests build the registry
  without the fork's ProviderUsageLimitsStore; provide it in their layer
- ProjectionPipeline: track upstream's per-event refresh wholesale — its
  deferred-context design supersedes the fork's batch variant and its tests
  assert exact write counts
- window.test: fork's workspace-image-preview list includes bmp
- AppSymbol: import IconGauge used by the fork's settings entry

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Upstream changed `attachmentRelativePath` to return `string | null` so callers
skip attachment types a build does not know. The Turbo official-import
attachment collector still assumed a plain `string`, which broke the Check job
with four TS2345 errors.

Guard on the null result and skip that attachment pair, matching the contract
documented on `attachmentRelativePath`.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@gfsaaser24
gfsaaser24 merged commit 8f6f302 into turbo Aug 31, 2026
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.