Repository navigation
chore: sync upstream/main into collin/main (2026-11-13) - #44
Open
collissimo wants to merge 1039 commits into
Open
collissimo wants to merge 1039 commits into
collissimo wants to merge 1039 commits into
Conversation
…ingdotgg#32302) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#35322) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ping each key (pingdotgg#35581) Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…card (pingdotgg#31115) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…t pull (pingdotgg#26568) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#35586) Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…after a full scan (pingdotgg#33993) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ls (pingdotgg#27928) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rrow viewports (pingdotgg#29288) Co-authored-by: imluckii <imluckii@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…1723) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
…in worktrees (pingdotgg#33923) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…its for its status read (pingdotgg#33877) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…r (median 7,826 to 3,168 ms) (pingdotgg#33954) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#33858) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#33902) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ly (pingdotgg#33896) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…worktrees (pingdotgg#33908) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#33898) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#33405) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#29441) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…r a slow link drops from 5,555 ms to 751 ms median (7.4x) (pingdotgg#33942) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#28422) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
… slow (pingdotgg#26127) Co-authored-by: Elliot Drel <elliotdrel@gmail.com>
… read a long thread's whole history (pingdotgg#29521)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#35993) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#35948) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#36021) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#36009) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: GPT 6.1 Sol <codex@openai.com> Co-authored-by: Grok 4.7 <noreply@x.ai>
Conflict resolutions: - desktop main.ts: keep DesktopDictation layer; upstream moved layerDesktopSsh to provideMerge. - OrchestratorMcpService: keep both imports; upstream dropped loadProjection, so the remote-delegation worker-model lookup reads the thread via loadThreadRecords(id, []). - CodexAdapterV2 / codexLaunchArgs: keep fork's threadInstructions + code mode alongside upstream's configuredReasoningSummary + thread_unload_delay_secs=0. - claudeResetCredits: upstream's readClaudeOauthAccount using fork's shared readJsonFile. - ChatComposer: fork's attach+dictation group hides when upstream's dictation capsule takes the compact footer; history dialog stays mounted. - client-runtime server.ts/package.json, fakeEnvironment, ChatView test, docs, lockfile: union. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.
fork/sync.shhit merge conflicts (1038 upstream commits). This branch mergesupstream/mainintocollin/mainwith the conflicts resolved, keeping upstream behavior and the fork's add-ons.Resolutions
apps/desktop/src/main.ts: keepDesktopDictation.layer; upstream movedlayerDesktopSshinto aprovideMerge(dropped frommergeAll).apps/server/src/mcp/OrchestratorMcpService.ts: both imports kept. Upstream removedloadProjection(perf perf(server): MCP tool calls no longer read the caller's whole thread pingdotgg/t3code#33295), so the fork's remote-delegation worker-model lookup now reads the thread withloadThreadRecords(id, []).CodexAdapterV2.ts,codexLaunchArgs.ts: fork'sthreadInstructionsand Code mode flags alongside upstream'sconfiguredReasoningSummaryandthread_unload_delay_secs=0(code-mode test updated for the new leading args).claudeResetCredits.ts: upstream's newreadClaudeOauthAccount, using the fork's sharedreadJsonFile.ChatComposer.tsx: the fork's attach + dictation button group hides when upstream's dictation capsule takes the compact footer (upstream hid only the attach button);DictationHistoryDialogstays mounted.OrchestratorMcpService.test.ts: the fork's capabilities assertion now uses the case'sparentmodel (upstream added a "parent named the same model by alias" case).server.ts/package.json,fakeEnvironment.ts,ChatView.browser.test.tsx,providers-codex.md,pnpm-lock.yaml: union of both sides.Verification
vp i --frozen-lockfileOK.src/mcp/,src/provider/,CodexAdapterV2.test.ts→ 1508/1509; client-runtimestate/server.test.ts41/41.AntigravityInstallation.test.ts("linux-arm64 runtime needs 4 KiB pages",cancelledvsfailed), is in files identical to upstream; not checked whether it also fails on upstream/main on this host.🤖 Generated with Claude Code