Repository navigation
fix(server): integrate main into snapshot timeout diagnostics - #1
Closed
ElliotDrel wants to merge 246 commits into
Closed
ElliotDrel wants to merge 246 commits into
ElliotDrel wants to merge 246 commits into
Conversation
…ngdotgg#29922) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…29909) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…arent's turn (pingdotgg#29752) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…and longer fences (pingdotgg#29755) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#26495) Co-authored-by: maria-rcks <maria@kuuro.net>
…ts or subagents (pingdotgg#29917) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… without raw provider text (pingdotgg#29877) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29905) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ect under diff.relative (pingdotgg#29879) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…in a subagent or side chat (pingdotgg#29891) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#29912) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#28684) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…squash-merged (pingdotgg#29919) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ointed parent run (pingdotgg#25662) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#29721) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#29580) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
… the project folder (pingdotgg#29908) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Maria <maria-rcks@users.noreply.github.com>
…ngdotgg#29962) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#29911) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…oading it (pingdotgg#29893) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29902) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…0085) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#28622) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29044) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ders (pingdotgg#24904) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…0421) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Elliot Drel <elliotdrel@gmail.com>
…gg#28928) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#30704) Co-authored-by: Maxime Cathala <84846651+mcathala@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…onnection in a loop (pingdotgg#23758) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
… it (pingdotgg#24946) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…7935) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…otgg#26464) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Albert Li <albertli_042@hotmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…wake (pingdotgg#28204) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…29838) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#25341) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ironment disconnects (pingdotgg#31269) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#31218) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#29639) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ve Error (pingdotgg#31216) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Merge origin/main at 298cb24, preserving contributor history and current preview behavior. Adapt snapshot and frame timeout helpers to the schema error constructor while retaining the 10-second deadline and pending-stage details.
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
github-actions
Bot
added
the
vouch:unvouched
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What Changed and Why
Issue: Upstream PR #24130 conflicts with current main in
apps/server/src/preview/ServerBrowserPage.ts.Why this change was necessary: Main migrated
ServerBrowserOperationErrorto a schema error with object arguments. The contributor's snapshot/frame timeout helpers still used positional arguments. This merge adapts both helpers, preserving the 10,000 ms capture deadline, 1,000 ms frame deadline, pending-stage diagnostics, and current preview features.New status quo: Merge commit
88363b39f4bed41a6b3f8c049074b2a1b9da68f4preserves owner head3f8949a4204ea2211c6a34b93da2ff5a07e40d22and main298cb24140fdddebfbfaedad3a097e86ff3d9d04as parents. This PR targets the owner's branch so the original upstream PR remains the delivery vehicle. The owner-relative diff includes main's history; review the diagnostic-only diff against main separately (five files, 294 additions/30 deletions).Verification
At
88363b39f4bed41a6b3f8c049074b2a1b9da68f4, Windows/Codex:git diff origin/main --check: passed.No browser, dev server, or live provider was run. Earlier provider/client evidence in the upstream verification comment applies to
71dd2616b70e3242257bfe7264f1e73f4c6c1cc7, not this integration head. Background-tab capture failures are outside this conflict-resolution change.Implemented by GPT-6.1 Sol (
gpt-6.1-sol) using the Codex harness in T3 Code.Hosted checks
The CI, fingerprint, mobile-preview and context-budget runs are approval-gated with zero executed jobs; they are not passing test results or executed test failures. The separate size-label job executed and failed with
spawnSync git ENOBUFSwhile handling the accumulated main-history diff. No CI configuration, labels or history were changed to bypass it. Local verification above remains the available execution evidence; owner approval/incorporation and resulting-head upstream CI are still required.