Skip to content

chore: merge upstream T3 Code (cc0b86ddf) — CONFLICTS to resolve - #1715

Closed
deathemperor wants to merge 69 commits into
mainfrom
upstream-sync-cc0b86ddf
Closed

deathemperor wants to merge 69 commits into
mainfrom
upstream-sync-cc0b86ddf

Conversation

@deathemperor

Copy link
Copy Markdown
Owner

Daily upstream sync hit conflicts; the merge commit carries the markers. Files:

apps/mobile/src/features/threads/thread-list-v2-items.tsx
apps/mobile/src/features/threads/use-composer-command-menu.ts
apps/mobile/src/state/use-remote-environment-registry.ts
apps/web/src/components/ConfirmDialogHost.tsx
apps/web/src/components/ThreadNotificationCoordinator.tsx
apps/web/src/components/settings/settingsSearch.test.ts
apps/web/src/components/settings/settingsSearch.ts
apps/web/src/components/sidebar/SidebarThreadRow.tsx
apps/web/src/components/sidebar/updateEverythingRun.tsx
apps/web/src/routes/__root.tsx
apps/web/vite.config.ts
infra/relay/src/worker.ts

Resolve on this branch, then merge with a merge commit (never squash: it drops the merge-base).

juliusmarminge and others added 30 commits October 25, 2026 20:23
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ich attach through ref callbacks (#25246)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#25238)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…251)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ll drops its sync effects (#25239)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… (#25223)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ment now show (#25229)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…295)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…e app (#25233)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t in effects (#25234)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tton (#25315)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ges (#25316)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t (#25321)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gn (#25323)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…(#25328)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s lifetime (#25226)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nd (#25329)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otices (#25335)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
t3dotgg and others added 24 commits October 25, 2026 23:53
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… instead of effect timers (#25363)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
`vp run mobile:e2e` now leases iOS and Android devices from the Simlock pool
(SIMLOCK_AGENT_DEVICE_URL + AGENT_DEVICE_DAEMON_AUTH_TOKEN) instead of booting
local simulators, and walks each of 12 poses (phone sizes, iPads, a fold,
a tablet, dark mode, largest text) through the app: thread list, a thread,
scrolling, typing, back, settings, then rotation or folding.

Every screen gets generic layout checks that need no per-screen code: app in
front, no error screen or launch dialog, no fixed control cut off by the
screen edge, no sibling controls stacked, nothing under a system bar, no
input under the keyboard. Transitions keep the video check for tabs lagging
the screen, now measured against the recording's own first and last frames.
Afterwards a headless Claude reviews each pose's screenshots for what the
checks cannot see, and the findings land in the same report grid.

`mobile:install --session` now has the session's host download the dev
client from the shared cache with the read-only key, instead of uploading it
through the gateway (13 s instead of 10+ minutes for an APK).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…by up to 10s (#25368)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…, iOS on EAS (#25390)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#25412)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…5415)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e, not on every open (#25377)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…failing (#25371)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…provider and cwd (#25370)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…aft, not by the composer (#25376)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Poses now cover iPhone SE, iPhone 18 Pro, iPhone Duo folded and unfolded,
iPad Pro 13" in both orientations, Pixel 10 Pro, Pixel 10 Pro Fold folded,
unfolded and unfolded landscape, and Pixel Tablet in both orientations.
Landscape poses rotate once the app is up (a rotation during launch is lost)
and check that the screen really is wider than tall. Taps fall back to the
element's centre when agent-device refuses a covered ref, and a gateway
whose workers briefly reconnect is retried.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The --prepare flag from #25390 had no default, so effect/cli made it
required and every mobile:install failed with "Missing required flag".

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
agent-device names rotations relative to the device's natural orientation,
which is landscape on the Pixel Tablet and an unfolded Fold, so
"landscape-left" turned them portrait. The runner now asks for a shape and
tries each rotation until the screen has it. It also prepares each platform's
dev client before leasing, rides out longer worker drops, and skips the
Duo poses by default until agent-device can fold Simlock's simulators.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…oes (#25426)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…-sync-cc0b86ddf

# Conflicts:
#	apps/mobile/src/features/threads/thread-list-v2-items.tsx
#	apps/mobile/src/features/threads/use-composer-command-menu.ts
#	apps/mobile/src/state/use-remote-environment-registry.ts
#	apps/web/src/components/ConfirmDialogHost.tsx
#	apps/web/src/components/ThreadNotificationCoordinator.tsx
#	apps/web/src/components/settings/settingsSearch.test.ts
#	apps/web/src/components/settings/settingsSearch.ts
#	apps/web/src/components/sidebar/SidebarThreadRow.tsx
#	apps/web/src/components/sidebar/updateEverythingRun.tsx
#	apps/web/src/routes/__root.tsx
#	apps/web/vite.config.ts
#	infra/relay/src/worker.ts
#	pnpm-lock.yaml
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL 1,000+ effective changed lines (test files excluded in mixed PRs). 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. labels Oct 26, 2026
@deathemperor

Copy link
Copy Markdown
Owner Author

Superseded by the sync of upstream 0b02b21, which contains these commits.

@deathemperor
deathemperor deleted the upstream-sync-cc0b86ddf branch October 27, 2026 06:24
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 1,000+ effective changed lines (test files excluded in mixed PRs). 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.

6 participants