chore: sync upstream 2026-08-16 - #36
Merged
Merged
Conversation
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…ngdotgg#6572) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ngdotgg#6654) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Nickolas Kyryliuk <nickolaskyryliuk@gmail.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
- Disable feature-request issue templates - Direct contributors to Ideas discussions for proposals
…#6649) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…sion (pingdotgg#6538) Co-authored-by: tsouth89 <tsouth89@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
…ingdotgg#5872) Co-authored-by: codex <codex@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…show (pingdotgg#4986) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>
…g#4197) Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>
…gdotgg#5989) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>
…7081) Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: maria <maria@kuuro.net>
pingdotgg#7132) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…#6392) Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Merge upstream/main (fee10de, 113 commits) into fork main. Conflict resolutions: - ActivityPayloadProjection: keep the fork's capped full-output retention over upstream's first-line summaries; port upstream's ACP `content` support as a full-text fold into rawOutput.content (capped). Adapt the two new upstream projection tests and the tool.updated streaming test to the fork's retention semantics. - MessagesTimeline: keep the fork's WorkEntryExpandedBody/copy controls at their fixed 11px size; upstream pingdotgg#6510 tied expanded tool output to the code-font setting, which the fork intentionally does not adopt (agent tool output is not code blocks/diffs/file previews and needs its own setting — tracked as a follow-up). - ChatView: run upstream's provider-input preflight before the fork arms its send-recovery context and pre-dispatch cancellation latch. - ChatComposer: keep the fork's expand-button state alongside upstream's submission-error state and submitComposerDraft; collapse the expanded composer only after a dispatched send. - ComposerPromptEditor/index.css: take upstream's inline composer font classes and dead-rule pruning; keep the fork's expand-control scrollbar rule, work-entry preview clip, working-spinner, and 9% sidebar active row. - ClaudeAdapter: keep upstream's command_lifecycle early return ahead of the fork's interrupt-replay block. - AppRoot.test: ServerBootReload first, QuitHoldOverlay last. Verified: server/web/contracts typecheck clean; server, web, and package suites pass except the pre-existing fork failures (two mcp_tool_call slimming assertions, transfer-budget test, ghostty runtimeAbi wasm import) which fail identically on fork main. Lint failures are the pre-existing no-manual-effect-runtime-in-tests baseline overruns, also on fork main. Co-authored-by: Claude Fable 5 <noreply@anthropic.com> via Claude Code
github-actions
Bot
added
the
vouch:trusted
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
20 participants
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.
Merge upstream/main (
fee10def1, 113 commits) into fork main.Conflict resolutions
contentsupport as a full-text fold intorawOutput.content(capped). Adapted the two new upstream projection tests and thetool.updatedstreaming test to fork semantics.WorkEntryExpandedBody/copy controls at a fixed 11px. Upstream fix(web): scale command details with code font pingdotgg/t3code#6510 tied expanded tool output to the Code font size; the fork does not adopt that (separate setting is a follow-up).submitComposerDraft; collapse only after a dispatched send.command_lifecycleearly return ahead of the fork's interrupt-replay block.ServerBootReloadfirst,QuitHoldOverlaylast.Verification
no-manual-effect-runtime-in-testsbaseline overruns, also on fork maint3start)