Repository navigation
chore: sync with upstream main - #19
Merged
Merged
Conversation
…nd median (pingdotgg#39660) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…efault (pingdotgg#39981) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…only when cut off (pingdotgg#40076)
… app does (pingdotgg#28597) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rogress (pingdotgg#37859) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#38895) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#30925) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#39670) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…t page by default (pingdotgg#40003) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…hanges (pingdotgg#24841) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#24888) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s current (pingdotgg#36868) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…checkout (pingdotgg#37191) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… errors (pingdotgg#40042) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#39994) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nvironment inputs (pingdotgg#39992)
…Button, and ControlPill (pingdotgg#40002)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#40133) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#40778) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…reloads them mid-run (pingdotgg#31999) Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ills (pingdotgg#40808) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…us (pingdotgg#31295) Co-authored-by: Justin <159104807+Justin24506@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…d back to the end (pingdotgg#31907)
…(body edit 10.3 s → 5.4 s) (pingdotgg#30879) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…queue (pingdotgg#40763) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…laced and abandoned staging (pingdotgg#40817)
…tgg#31349) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#26661) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…h the agent (pingdotgg#40777) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…0816) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#29438) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…usage frames (pingdotgg#40804) Co-authored-by: lvning.liu <lvning.liu@weimob.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#40830) Co-authored-by: lvning.liu <lvning.liu@weimob.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ad of stepping through stale states (pingdotgg#27401) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#40841) Co-authored-by: Julius Marminge <julius0216@outlook.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.
The fork was 748 commits behind pingdotgg/t3code. This merges upstream main at 1e78f37 so Sanu Code runs on current code.
Merge this with a merge commit, not squash. Squashing would drop upstream's history and every later sync would conflict again.
Conflicts
CheckpointDiffQuery.ts,CheckpointService.ts: upstream's multi-repository projects (feat(projects): a project covers several repositories pingdotgg/t3code#35925) land beside the fork's moved-thread checks (a turn range that spans two folders, a folder that no longer exists).DiffPanel.tsx: a turn can be diffed when the folder is Git, when it has tracked repositories (upstream), or when its checkpoint is ready (the fork, for moved threads).RightPanelTabs.tsx: the new-surface shortcut keeps the fork's command runner and adds upstream's desktop menu action (fix(desktop): Cmd+T opens the new-tab menu from a focused browser page pingdotgg/t3code#39769).Sidebar.tsx: the fork's command runner now also reaches upstream's draft rows (fix(web): numbered jumps and next/previous thread include unsent drafts pingdotgg/t3code#39968). The thread menu keeps the move targets and takes upstream'scanRename(fix(web): right-clicking a sidebar search result now opens its thread actions pingdotgg/t3code#31545).KeybindingsSettings.logic.ts: keeps the fork's "restore the default the command lost" rule beside upstream's preview labels (feat(web): search actions when adding keybindings pingdotgg/t3code#28612).AGENTS.md,RpcAuthorization.test.ts,DiffPanel.browser.test.tsx,KeybindingsSettings.logic.test.ts,AgentContextBudget.test.ts: both sides kept.agentContextBudget.json: re-measured. The tool list is 62,321 bytes: upstream's 59,170 plus the same 3,151 the fork already added.Fork code adapted to upstream
runAtomCommand, and its test commands are Effects with a tagged error.t3code/no-untranslated-copynow catches fork strings: the mobile thread-move dialogs, the Vim mode toast, and the "Try again." fallback. They're wrapped and the catalogs regenerated. New keys show English in other languages, as in the last sync.activeThreadwithout a null check, which crashed six palette browser tests whose mock has no active thread.scopeProjectId.Validation
The fork has no CI, so these ran locally:
vp run check:changed upstream/mainon Node 26.13.1 (the pinned version): format, lint, knip, GraphQL, typecheck (43 packages), and React Compiler pass.vp run i18n:checkpasses.ServerEnvironment.test.ts(macOS resolves the temp dir to/private/var) and therightPanelOpenshortcut test inChatView.browser.test.tsx.migrate-dev-db, migrations 106 and 107 applied). The server logged no errors. In the browser: the sidebar and settled threads load, the command palette opens with the fork's actions, a real turn's diff renders, and the thread menu shows both "Rename thread" and "Move to project".Claude Opus 5.5 via Claude Code in T3 Code.
🤖 Generated with Claude Code