Repository navigation
chore: sync upstream/main into collin/main (2026-11-14) - #51
Open
collissimo wants to merge 1254 commits into
Open
collissimo wants to merge 1254 commits into
collissimo wants to merge 1254 commits into
Conversation
…started during cleanup (pingdotgg#31038)
… 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>
…stead of two per file (pingdotgg#35295) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…etect (pingdotgg#31170) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#31146) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…disk but not loaded (pingdotgg#36490)
…ged revalidation (pingdotgg#23775) Signed-off-by: Shaswat Raj <shaswat340@gmail.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ell (pingdotgg#33064) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: lyn1dev <lyn1dev@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… local port (pingdotgg#24247) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#23743) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: only21mil <only21mil@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…omposer (pingdotgg#26692) Co-authored-by: nibarAhmed <nibarahmed0@gmail.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Conflicts resolved keeping upstream behavior and the fork add-ons: - desktop main: SSH layer is now provided once by upstream; keep DesktopDictation - MCP: keep ScriptToolkit next to upstream's MessageToolkit; remote delegate reads the parent thread via loadThreadRecords (loadProjection is gone upstream) - Codex: app-server keeps upstream's thread_unload_delay_secs=0 plus code mode; turn input carries both threadInstructions and configuredReasoningSummary - Claude: upstream's readClaudeOauthAccount on the fork's readJsonFile - composer: fork dictation button/history next to upstream's voice footer (hidden while upstream dictation takes the compact footer) - client-runtime, fakeEnvironment, docs, lockfile: union of both sides 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.
sh fork/sync.shhit merge conflicts (13 files, 1253 upstream commits). This mergesupstream/mainintocollin/mainwith conflicts resolved, keeping upstream behavior and the fork add-ons.Resolutions:
apps/desktop/src/main.ts: upstream now provides the SSH layer once (for update/tunnel ordering); dropped the fork's duplicate, keptDesktopDictation.layer.McpHttpServer.ts: bothlayerScriptToolkit(fork) andlayerMessageToolkit(upstream).OrchestratorMcpService.ts: both imports; remote delegation now reads the parent vialoadThreadRecords(id, [])sinceloadProjectionwas removed upstream.codexLaunchArgs.ts:app-server -c thread_unload_delay_secs=0(upstream) followed by optional code-mode flags (fork); test updated.CodexAdapterV2.ts: turn input carries boththreadInstructions(fork) andconfiguredReasoningSummary(upstream).claudeResetCredits.ts: upstream'sreadClaudeOauthAccount, built on the fork'sreadJsonFile.ChatComposer.tsx: fork's dictation keydown handler/button/history kept next to upstream's folder-drop refactor; the fork's attach+dictation group is hidden while upstream's dictation capsule takes the compact footer (dictationTakesFooter), matching upstream's intent there.client-runtimepackage exports /state/server.ts,fakeEnvironment.ts,ChatView.browser.test.tsx,providers-codex.md,pnpm-lock.yaml: union of both sides.OrchestratorMcpService.test.ts: the fork's capabilities assertion now expects the parent's own model for upstream's new "parent named the same model by alias" case.Verified: typecheck of server, web, desktop, mobile, client-runtime, shared, contracts (no errors); tests: server mcp + Codex adapter + Claude credits + codexLaunchArgs (477), ChatView browser + dictation browser tests, client-runtime state (943) all pass. Pre-commit fmt/lint/knip passed. Not run: full CI suites.
Opus 5.5 via Claude Code (T3 Code).
🤖 Generated with Claude Code