Skip to content

Merge upstream main through 618761a2d6 - #588

Merged
patroza merged 103 commits into
fork/devfrom
sync/upstream-4f651cb10d
Oct 21, 2026
Merged

patroza merged 103 commits into
fork/devfrom
sync/upstream-4f651cb10d

Conversation

@patroza

@patroza patroza commented Oct 21, 2026 •

Copy link
Copy Markdown
Owner

Merges upstream d36b7da2485b..618761a2d6 (92 commits) into the latest fork/dev, including the Discord workspace fix in #586.

The iOS update checker now imports AppState statically. Upstream #22488 identifies the same NativeEventEmitter startup exception reported for build 70: Metro's dynamic React Native namespace import evaluates the unavailable legacy PushNotificationIOS module. This sync brings that fix and its foreground-listener regression test.

Other upstream changes include mobile thread controls and archive undo, Mermaid rendering via Pele, webhook filtering/deduplication, runtime cleanup, Electron 44.9.3, GitCafe REST creation, thread-link chips with project icons, and reliable cleanup when stopping stuck delegates, and an approval-aware composer on web/mobile, delegate settlement after leftover work, Grok command completion, and per-provider replay fixtures.

Conflict resolutions preserve fork identity, bot integrations, permissions, queue behavior, migration separation, and regression assertions. Mobile archive actions await fork worktree cleanup and preserve upstream's boolean return contract and undo behavior. Retained fork tests were adapted to upstream's disposable browser fixtures and stricter timing rules; helper exports still consumed by those tests and product paths remain available. The approval merge preserves fresh send-time attachment/context snapshots, permission checks, and queue behavior. Regenerated the pnpm lockfile. Electron installation uses its local download cache while pinning child platform, architecture, and output directory to the host runtime; regression tests cover cross-build environment variables. Inherited CI/deployment/release workflows remain disabled.

Focused validation passed for mobile (114 tests), retained web units (642), browser regression files, server terminal/launcher/workspace/MCP cases (129), and Discord fixtures (75). Scoped typechecks pass across mobile, web, server, packages, desktop, and scripts. Retained tests now follow upstream's disposable-render and event-driven timing rules. Full ChatView compilation retains its previous 30-second ceiling in the dedicated compiler project rather than a per-test override. The full agent ship gate passed on 783aa9be7feb: workspace formatting/lint, workspace typecheck, and all 31 test tasks, including 5,185 server tests and 2,235 mobile tests.

Integrated web smoke covers existing thread rendering, model controls, panels, General Settings, Integrations, Archive, Usage, and thread-chip project icons/navigation using isolated copied data. Native iOS verification is unavailable because Device support is off; this PR does not claim a new TestFlight build was installed or deployed. A projection-only pending approval fixture confirms that its card remains visible while typing and Submit remains enabled; focused tests verify the decline-before-send sequence. No provider was started or prompt submitted during this browser check. UI evidence is retained locally in the task's Browser artifacts.

Land with gh pr merge --merge to preserve upstream ancestry.

Knip was run for the incoming file/export changes. It reports eight unchanged files and one unchanged development dependency; two file reports are known executable-path false positives. No finding comes from this upstream range. The six unused-file candidates and dependency were already unreferenced at the actual PR base; this sync did not orphan them.

The latest upstream range adds Vite+ 1.3 cached package typechecks, leaner platform installs, setup completion markers, provider environment cleanup, corrected storage accounting, and restored low-latency simulator AVC decoding. Fork test projects, compiler timeout, isolated Git settings, and worktree state safeguards are preserved. Focused app configuration, setup failure/success, AVC, provider, and storage checks passed. Knip reports the same documented baseline findings. Full gate passed for the latest merge.

User-approved cutoff: finish this sync at 618761a2d6; later upstream advances belong to a future sync.

t3dotgg and others added 30 commits October 20, 2026 04:58
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#22253)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…vent in act (pingdotgg#22424)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…; fixture README (pingdotgg#22453)

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

Co-authored-by: Pixel Perfect <me@pixp.cc>
Co-authored-by: Theo Browne <me@t3.gg>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
…g#22194)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…sts over REST (pingdotgg#22495)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
github-actions Bot and others added 2 commits October 21, 2026 08:21
Dispose the retained PR panel fixture without returning Vitest utilities.

Model: gpt-6.1-sol; harness: Codex in T3 Code.
@github-actions github-actions Bot added the 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. label Oct 21, 2026
github-actions Bot and others added 4 commits October 21, 2026 08:25
Use disposable browser rendering and persisted-event milestones in retained web and Discord tests. Keep the compiler project ceiling for the full ChatView compilation proof.

Model: gpt-6.1-sol; harness: Codex in T3 Code.
…ck (pingdotgg#22653)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Await fork worktree cleanup before returning the upstream archive result, so rejected or active-run requests remain false and successful archives remain true.

Model: gpt-6.1-sol; harness: Codex in T3 Code.
Include the two new upstream fixes for delegate Stop cleanup and project icons on thread-link chips.

Model: gpt-6.1-sol; harness: Codex in T3 Code.
@patroza patroza changed the title Merge upstream main through 4f651cb10d2a Merge upstream main through 6a6c84f990 Oct 21, 2026
github-actions Bot and others added 2 commits October 21, 2026 08:50
Retain the Claude SDK probe fixture, update explicit upstream-ledger assertions for migration 67, and seed canonical unattributed thread metadata in the transfer fixture.

Model: gpt-6.1-sol; harness: Codex in T3 Code.
@patroza
patroza marked this pull request as ready for review October 21, 2026 07:04
t3dotgg and others added 5 commits October 21, 2026 00:12
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Include approval-aware composer editing and redirect sends on web and mobile while preserving fresh fork draft snapshots, queues, and context attachments.

Model: gpt-6.1-sol; harness: Codex in T3 Code.
…cache (pingdotgg#22712)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rok commands stop holding runs open (pingdotgg#22709)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Fuksss <fuxik12345@gmail.com>
@patroza patroza changed the title Merge upstream main through 6a6c84f990 Merge upstream main through a93b03c8a5 Oct 21, 2026
t3dotgg and others added 5 commits October 21, 2026 00:33
…ace (pingdotgg#22713)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Include delegate settlement and Grok command completion fixes, per-provider replay fixtures, and cached Electron installation. Preserve fork background-task behavior and host runtime targeting.

Model: gpt-6.1-sol; harness: Codex in T3 Code.
…22714)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@patroza patroza changed the title Merge upstream main through a93b03c8a5 Merge upstream main through 163bdeaa11 Oct 21, 2026
t3dotgg and others added 3 commits October 21, 2026 00:49
…hanges (pingdotgg#22735)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rning, setup-done marker (pingdotgg#22718)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Include leaner cross-platform installs, cached package typechecks, provider test environment isolation, storage cleanup accounting, and iOS simulator AVC decoding. The sync now includes 92 upstream commits since d36b7da; preserve fork test isolation and development state safeguards.

Model: gpt-6.1-sol; harness: Codex in T3 Code.
@patroza patroza changed the title Merge upstream main through 163bdeaa11 Merge upstream main through 618761a2d6 Oct 21, 2026
Include desktop script tests in its isolated project so root Vite test routing keeps the launcher regressions. Apply the upgraded formatter to upstream documentation snippets.

Model: gpt-6.1-sol; harness: Codex in T3 Code.
@patroza
patroza merged commit 94b3598 into fork/dev Oct 21, 2026
14 of 15 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants