Skip to content

fix(server): align preview recovery branch with main - #31076

Open
ElliotDrel wants to merge 687 commits into
pingdotgg:fix/issue-28141from
ElliotDrel:t3/integrate-issue-28141
Open

ElliotDrel wants to merge 687 commits into
pingdotgg:fix/issue-28141from
ElliotDrel:t3/integrate-issue-28141

Conversation

@ElliotDrel

@ElliotDrel ElliotDrel commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

What Changed and Why

Issue: PR #28154 conflicts with main and cannot be updated through this account.

Why this change was necessary: This PR targets its owning fix/issue-28141 branch so the owner can adopt the base alignment while retaining the original author commits. It extends integration bfab75e with the main snapshot fetched at the start of this run, dd5f98ee. The shared main ref advanced during verification; this records the tested snapshot.

New status quo: The merge carries accumulated main history. Against dd5f98ee, the result changes only ServerBrowser.test.ts, ServerBrowser.ts, and ServerBrowserPage.ts (186 insertions, 24 deletions), preserving the original navigation recovery and newer main behavior. The refresh merged automatically. The sole manual resolution remains the earlier makeContext conflict:

const renderer = makeRenderer();
let url = initialUrl;

The renderer fake and main's initial URL both survive. The rejected acknowledgement change remains withdrawn. The usage correction from #28603 is inherited from main with no added usage patch.

Verification

Automated by gpt-6.1-sol through Codex on Windows at e5af171e57cf5c418d8589840e9c418834755edc:

  • Focused ServerBrowser.test.ts, ServerBrowserPage.test.ts, and UsageService.test.ts: 133 passed, 2 skipped.
  • Server tsc --noEmit, targeted lint and formatting of those tests and the two preview implementation files, and git diff --check: passed.
  • vp run check:changed dd5f98eeecad5db5b10314296221df115f130fbd --concurrency 2: exit 0; format, lint, both knip checks, GraphQL generation, three affected package typechecks, and selected tests passed (86 tests).

No browser, development server, or provider was launched for this base alignment.

After merge

The branch owner should merge this PR preserving merge history (or fast-forward from ElliotDrel:t3/integrate-issue-28141), then finish the original #28154 review and merge. This is an integration into the owner's branch.

Model: gpt-6.1-sol. Harness: Codex.

Hosted check limitation

Label PR size failed with spawnSync git ENOBUFS while buffering the accumulated main-history diff against the old target branch. This is an executed automation failure, not a source-test failure. Build/typecheck, lint, and the context-budget check passed at this inspection; the remaining suite is still running. No CI configuration, labels, or history were changed to bypass it. The owner can adopt the integration preserving history; the original PR then needs validation against main.

juliusmarminge and others added 30 commits November 2, 2026 18:00
…y Running (pingdotgg#28356)

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

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s skip-worktree or assume-unchanged (pingdotgg#23624)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…wser reports offline (pingdotgg#29347)

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ger stay running (pingdotgg#28040)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rade from 1.x (pingdotgg#27779)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…to run t3 service restart (pingdotgg#27660)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…adable .git/config (pingdotgg#23690)

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…turn absorbed its wake (pingdotgg#28010)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ory scan ends (pingdotgg#29535)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 24 commits November 3, 2026 16:53
…#27205)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d get too narrow (pingdotgg#27218)

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

Co-authored-by: Otavio Salvador <otavio@ossystems.com.br>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Preserve MCP and OpenCode image outputs so tool details show screenshots before their inputs. Highlight HTML preview input and valid JSON arguments and results across clients, while keeping native file text readable.

Sanitize CI test logs to avoid a Unicode runner crash without changing test exit codes.

Validation: all CI checks passed, 729 affected tests and the full 156-test Pi suite passed locally, web and iOS details verified.

Model: GPT 6.1 Sol. Harness: Codex.
…id (pingdotgg#26297)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tail pane always fill the width (pingdotgg#26328)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Add 8 px edge padding to usage breakdown tables shared by Cost and Tokens. Align thread status text and actions to a common baseline while keeping icons centered.

Validated with check:changed, CI, usage-table before/after browser captures, and actual ThreadNow component captures at 100% and 91% CSS zoom. No behavior or calculation changes.

Model: GPT 6.1 Sol. Harness: Codex in T3 Code.
…reenContent (pingdotgg#30500)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Merge main 8b44f42 into PR 28154 at f054e85. Retain the renderer fake alongside main's configurable initial URL in the sole conflicting fixture. Keep main's newer preview behavior and merged usage clock fix; leave the separately proposed termination acknowledgement in PR 30670 out.
…tgg#30256)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…f chat (pingdotgg#30257)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Merge main dd5f98e into existing integration bfab75e, preserving original author commits. The staged 38-file delta relative to bfab75e is main history; relative to merged origin/main the result differs only in the three original preview files. No new behavior or usage changes.
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 4, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-04T19:17:49.568266Z e5af171 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

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 github-actions Bot added the vouch:unvouched PR author is not yet trusted in the VOUCHED list. label Nov 4, 2026
@github-actions github-actions Bot added the 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. label Nov 4, 2026
@chatgpt-codex-connector

Copy link
Copy Markdown

💡 Codex Review

yield* Effect.forEach(fresh, (target) =>
Effect.gen(function* () {
yield* engine.dispatch({

P1 Badge Move batch pull-request mutations out of the MCP transport

Both new batch tools resolve targets, decide which links to change, and dispatch multiple orchestration commands inside their MCP handlers. This is newly added feature logic rather than a thin transport adapter, contrary to AGENTS.md's requirement that an MCP tool decode input, call one service method, and map errors. Move the batch linking/unlinking workflows into the appropriate pull-request/thread service and have these handlers call those methods, keeping the capability reusable and testable independently of MCP.

AGENTS.md reference: AGENTS.md:L196-L196

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@ElliotDrel

Copy link
Copy Markdown
Contributor Author

Note

🤖 gpt-6.1-sol responding on behalf of Elliot

Addressing the batch-tool architecture finding: I am declining that refactor in this integration PR. The cited file is byte-for-byte identical to the integrated main snapshot dd5f98eeecad5db5b10314296221df115f130fbd: both refs have blob 33ce2a0b84bdb618a5d20d50f26b3dc3a6d93ee0. The diff against that main snapshot contains only the three preview files. The batch tools arrive through accumulated main history because this PR targets the older recovery branch; they were not authored by this conflict resolution.

Whether that existing main implementation should move to a service is a separate architectural concern. Changing it here would expand a base-alignment PR into an unrelated refactor. This response does not claim the broader architecture is correct; it establishes that the finding is outside this integration's own changes. The review summary still records the finding; this top-level comment has no resolvable inline thread.

This branch has not been deployed

No deployments
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. vouch:unvouched PR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.