Repository navigation
chore(sync): merge pingdotgg/t3code main - #272
Merged
Merged
Conversation
…ingdotgg#21872) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
….7 to 17.10 answer (pingdotgg#21909)
…s AGENTS.md (pingdotgg#22848) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… shell (pingdotgg#22856) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t found" (pingdotgg#22850) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t for 3 minutes (pingdotgg#22903) On desktop, an abandoned browser sign-in blocked every T3 Connect sign-in for 3 minutes. A new attempt now replaces the stale Clerk flow, and a Cancel bar resets the sheet. Takeover of pingdotgg#22708. Co-authored-by: steve-ai-vibe <steve.ai.vibe@gmail.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…character catalog dump (pingdotgg#22889) 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.
Cause
The Fork Sync run 39622391807 stopped on a merge conflict in
pnpm-lock.yaml. Upstream added 12 commits. One of them (pingdotgg#22903) patches@clerk/electron@0.1.1.Conflict and how it is resolved
pnpm-lock.yaml: upstream addedpatch_hashto the 3@clerk/electronentries. The fork entries have theelectron@44.9.3(supports-color@10.2.2)peer. I took the fork lockfile and applied upstream's change: thepatchedDependenciesentry and thepatch_hashon the 3 entries. A full re-resolve would also prunerolldown1.2.13 entries that both sides keep, so I did not use it.CI=1 vp i --frozen-lockfilepasses, and the patched package installs.Upstream changes in fork areas
OrchestratorMcpService.ts,orchestratorMcp.ts,tools.ts(fix(server): agents get a short, current model list instead of a 55k-character catalog dump pingdotgg/t3code#22889):orchestrator_capabilitiesnow lists a short model list, takessearch, and returns option ids and values instead of full descriptors. The fork "Scheduled task model" check validatesmodelSelectionagainst the full provider catalog, not this list, so it is not affected.OrchestratorMcpService.ts(fix(mcp): point a bare thread uuid at its mcp: thread in thread_not_found pingdotgg/t3code#22452):thread_not_foundnames themcp:thread for a bare uuid. This does not affect fork code.preload.ts,ipc.ts(fix(desktop): an abandoned browser sign-in no longer blocks T3 Connect for 3 minutes pingdotgg/t3code#22903): the new Clerk OAuth cancel bridge sits beside the fork bridge methods (bearer token, tunnel pairing, Cloudflare Access, update check). Both stay.GitVcsDriverCore.ts(fix(server): avoid expensive diff minimization in status refreshes pingdotgg/t3code#21872):--minimalnow applies only to the review diff, not to the status numstat. No fork code uses that flag.GitManager.ts,orchestrationInstructions.ts,core.test.ts: these are upstream text and test changes beside fork code. Both sides stay.Checks
vp run typecheck: pass (35 of 35).McpHttpServer.test.ts,OrchestratorMcpService.activity.test.ts,toolkits/core.test.ts,machineMap/handlers.test.ts,project/handlers.test.ts: 40 of 40 pass.