Skip to content

chore: sync with upstream/main (bb0d718b3) - #96

Open
Fryuni wants to merge 435 commits into
mainfrom
fryuni/merge-upstream-main-9
Open

Fryuni wants to merge 435 commits into
mainfrom
fryuni/merge-upstream-main-9

Conversation

@Fryuni

@Fryuni Fryuni commented Nov 21, 2026 •

Copy link
Copy Markdown
Owner

Problem

The fork is 431 commits behind upstream/main. This sync keeps the features recorded in docs/adr and uses upstream's implementation wherever it can.

Change

Merged pingdotgg/t3code main at bb0d718b3. 30 files had conflicts. git show --remerge-diff a88afb3b83 shows the whole resolution; follow-up commits fix what CI found.

Workflows (ADR 0011). Upstream edited agent-context-budget.yml, mobile-showcase-screenshots.yml and release-desktop.yml; all three stay deleted. ci.yml is unchanged upstream.

Implemented upstream. No upstream commit in this range supersedes an ADR, in whole or in part.

Multi-repository projects vs. Check out in worktree (ADR 0008). Upstream pingdotgg#35925 lets a project cover several repositories: a worktree launch in such a project makes a task folder with one new branch in every repository. An existing branch belongs to one repository, so:

  • ThreadLaunchService keeps upstream's task-folder path and the fork's existing-branch checkout on the single-checkout path;
  • it refuses createBranch: false before the thread exists when the project plans a task folder (new row in the existing rejection table);
  • web and mobile hide Check out in worktree for projects that track other Git repositories.

Fixes for new upstream interactions

ADRs. All ADRs now compare against bb0d718b3. Notes were added in 0008, 0009, 0011, 0016, 0020, 0023 and 0028. docs/user/thread-sidebar.md keeps the fork's text, adds upstream's scoped New thread sentence, and says when Check out in worktree is not offered.

Verification

  • vp run check:changed upstream/main (with --timeout 5400):
    • Format, lint, knip, GraphQL, typecheck (43 packages) and the React compiler pass.
    • Tests: 4,253 pass and 3 fail, all in GitManager.test.ts. The 3 pass with GIT_CONFIG_GLOBAL=/dev/null; they fail because of this host's global url.*.insteadOf rules, as earlier syncs recorded.
  • vp run i18n:check passes for web, mobile and desktop.
  • Focused runs pass: storageCleanup.test.ts task-folder cases, ThreadLaunchService.test.ts existing-branch rejections, AgentContextBudget.test.ts, linkCreatedPullRequest.test.ts.

Not run locally:

  • browser tests (Chromium cannot start on this NixOS host);
  • a manual pass in a real client;
  • the mcp-tool-use eval;
  • the fork release workflow end to end.

Model: Claude Opus 5.5; harness: Claude Code in T3 Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 19, 2026 19:47
…erseded ones (pingdotgg#39502)

Co-authored-by: Cursor <cursoragent@cursor.com>
…6499)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ents that failed (pingdotgg#39536)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#39552)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#39548)

Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
pingdotgg#39562)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…n closes (pingdotgg#39569)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#39579)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#39598)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#39605)

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…when they exit (pingdotgg#38348)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…a failure (pingdotgg#39596)

Co-authored-by: Ryan McDonough <Ryan@r2n.io>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ands (pingdotgg#39618)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
juliusmarminge and others added 17 commits November 20, 2026 23:53
…ffort summaries (pingdotgg#40136)

Co-authored-by: thecsguy <344173356+itsthecsguy@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…CODE_TANSTACK_SOURCE (pingdotgg#40207)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit b32f90b)
…rt grow-in

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit 4ce558b)
Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit cbc50d8)
Copilot AI balanced review requested due to automatic review settings November 21, 2026 10:51
@chatgpt-codex-connector

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

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

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

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-21T11:44:34.601508Z fb2dbd7 New commits
ℹ️ 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.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.

Copilot AI balanced review requested due to automatic review settings November 21, 2026 11:05

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.

Copilot AI balanced review requested due to automatic review settings November 21, 2026 11:07

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.

Copilot AI balanced review requested due to automatic review settings November 21, 2026 11:33

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: fb2dbd73d5

ℹ️ 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".

Comment thread apps/web/src/components/ChatView.tsx Resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.