Skip to content

chore: sync upstream/main (281 commits) - #28

Closed
r4iju wants to merge 283 commits into
mainfrom
sync/upstream-20260918
Closed

r4iju wants to merge 283 commits into
mainfrom
sync/upstream-20260918

Conversation

@r4iju

@r4iju r4iju commented Sep 18, 2026

Copy link
Copy Markdown
Owner

Merges 281 commits from pingdotgg/t3code into our main. 29 files conflicted. The resolutions below needed judgment; the rest keep both sides.

Migration id collision. Our 051_AuthSessionLastSeenAt and upstream's 051_ProjectionThreadMessageContext claimed the same id. The migrator runs only ids above the highest one recorded, so on a database that already ran our 51, upstream's 51 would never run, and renumbering ours would repeat the problem at every future sync. So:

  • Fork schema moves to persistence/ForkSchema.ts, outside the numbered migrations. Migrations.ts is now byte-identical to upstream's.
  • On startup, the retired fork id (51) is released before the migrations run and last_seen_at is added afterwards, if it is missing.
  • Tested on a fresh database and on a real one that recorded our 51: upstream's 51–53 ran, and the 12 existing last_seen_at values were kept.

Upstream absorbed our change. Audio range serving in http.ts (read aloud) is now upstream's own isMedia path, so we take theirs.

Ported into upstream's new shapes:

  • Speech assets: union members next to upstream's new github-media asset.
  • blockedReason: added where upstream now builds an unsupported connection presentation.
  • Mobile re-pair ("Pair again") works in upstream's new Android row layout and in LocalEnvironmentList. It now applies to enabled environments only.
  • The mobile Read Aloud settings row moved into upstream's "Interface" section, because the old "General" section no longer exists.

Checks:

  • Typecheck and format are clean; lint reports warnings only.
  • Tests: web 5314/5314, contracts 448/448, mobile 1653/1653, client-runtime 1554/1554.
  • Server and shared fail only in tests that also fail on untouched upstream/main on this machine: GitManager, ThreadSettlementReactor storage cleanup, the entrypoint symlink test, composerContextLegacy, and a racy ServerSecretStore test that passes 5/5 on its own.

maria-rcks and others added 30 commits September 12, 2026 21:56
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
… it (pingdotgg#11487)

Co-authored-by: Claude Code <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ngdotgg#9139)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…1524)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…6208)

Preflight repository and base commit availability before creating the thread. Fall back to the project checkout for non-Git directories and repositories without a usable base commit, while preserving valid worktree setup.
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
saphid and others added 24 commits September 17, 2026 17:30
…#11842)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
The fork's last-seen migration had taken id 51, which upstream now uses
for ProjectionThreadMessageContext. The migrator skips every id at or
below the highest recorded one, so databases that ran the fork's 51
would never get upstream's. Fork schema now lives in ForkSchema.ts,
outside the numbered migrations: startup releases the retired fork id
so upstream's 51 runs, then idempotently adds last_seen_at.
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Sep 18, 2026
@github-actions

Copy link
Copy Markdown

Thread transfer impact

⚠️ The latest CI run did not produce a thread transfer result for f9d7397.

This comment will update automatically after the next completed run.

@r4iju

r4iju commented Sep 24, 2026

Copy link
Copy Markdown
Owner Author

Superseded: main already has these upstream changes. The nightly t3-release worker syncs upstream from now on.

@r4iju r4iju closed this Sep 24, 2026
@r4iju
r4iju deleted the sync/upstream-20260918 branch September 24, 2026 06:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.