Skip to content

chore: sync upstream main - #46

Merged
matheustimbo merged 157 commits into
fork-mainfrom
main
Oct 7, 2026
Merged

chore: sync upstream main#46
matheustimbo merged 157 commits into
fork-mainfrom
main

Conversation

@github-actions

@github-actions github-actions Bot commented Oct 5, 2026 •
edited
Loading

Copy link
Copy Markdown

The automated sync from pingdotgg/t3code:main cannot land on its own.

Conflicting files as of 2026-10-07 00:40 UTC:

  • apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts
  • apps/desktop/src/backend/DesktopLocalEnvironmentAuth.ts
  • apps/desktop/src/wsl/DesktopWslBackend.test.ts
  • apps/server/src/binCli.ts
  • apps/server/src/environment/ServerEnvironment.test.ts
  • apps/server/src/orchestration-v2/AcpRegistryOrchestratorV2.live.test.ts
  • apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
  • apps/server/src/orchestration-v2/CursorOrchestratorV2.live.test.ts
  • apps/server/src/orchestration-v2/DelegatedCompletionDelivery.test.ts
  • apps/server/src/orchestration-v2/GrokOrchestratorV2.live.test.ts
  • apps/server/src/orchestration-v2/OpenCode2OrchestratorV2.live.test.ts
  • apps/server/src/orchestration-v2/ProjectStore.test.ts
  • apps/server/src/orchestration-v2/ProjectStore.ts
  • apps/server/src/orchestration-v2/ProviderSessionManager.test.ts
  • apps/server/src/orchestration-v2/ThreadLaunchService.test.ts
  • apps/server/src/orchestration-v2/ThreadTitleRegenerationService.test.ts
  • apps/server/src/orchestration-v2/runtimeLayer.test.ts
  • apps/server/src/persistence/Migrations.ts
  • apps/server/src/persistence/Migrations/059_OrchestrationV2.test.ts
  • apps/server/src/persistence/reconcileV2PreviewMigration.test.ts
  • apps/server/src/persistence/reconcileV2PreviewMigration.ts
  • apps/server/src/provider/Drivers/OpenCodeDriver.test.ts
  • apps/server/src/provider/Drivers/OpenCodeDriver.ts
  • apps/server/src/provider/openCodeUsageLimits.ts
  • apps/server/src/provider/polledUsageLimits.ts
  • apps/server/src/server.ts
  • apps/server/src/serverSettings.ts
  • apps/server/src/ws.ts
  • apps/web/src/components/settings/ProjectSettingsPanel.tsx
  • packages/contracts/src/applicationEvent.ts
  • packages/contracts/src/orchestrationProject.ts
  • packages/shared/src/serverSettings.ts
  • pnpm-lock.yaml
  • pnpm-workspace.yaml

Resolve locally, preserving the fork-only ticket-title and release behavior:

git fetch origin fork-main main
git switch -c sync-upstream origin/fork-main
git merge origin/main
# resolve, then:
git push origin HEAD:fork-main

No fork release can ship until fork-main contains upstream again.

juliusmarminge and others added 30 commits October 5, 2026 08:55
@juliusmarminge @claude
fix(mobile): make the routes list match the other settings rows (ping…
68802a4 
…dotgg#15958)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@Bil0000
fix(threads): stop pull request watches when settling (pingdotgg#16095)
51f7f77
@juliusmarminge @claude
feat(contracts): clients tolerate union members they don't know yet (p…
ca3f973 
…ingdotgg#15951)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
refactor(contracts): project icons decode forward-compatibly instead …
5c03ced 
…of encoding a fallback (pingdotgg#16118)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@kridaydave
Removed an unused helper from the Android push payload builder (pingd…
31f9d83 
…otgg#16116)
@juliusmarminge
perf(mobile): reduce shell cache encoding work (pingdotgg#15096)
1c33f3b
@juliusmarminge
perf(mobile): defer audio recorder creation until dictation (pingdotg…
c71ca06 
…g#15248)
@Droyder7
feat(server): bump Antigravity ACP agent to 1.3.0 (pingdotgg#15746)
4dbc012
@maria-rcks
feat(acp): support local provider commands (pingdotgg#16021)
9d029a1
@BlankParticle
fix(server): honor submodule settings when creating worktrees (pingdo…
3e6b450 
…tgg#15594)
@juliusmarminge @claude
chore(deps): upgrade Effect to stable 4.0.1 (pingdotgg#16138)
194c73f 
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
fix(server): worktree threads survive a local branch named t3code (pi…
b12b3f7 
…ngdotgg#16167)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
chore(refs): sync Effect and Alchemy references to 4.0.1 and beta.80 (p…
6f9cea0 
…ingdotgg#16170)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@StiensWout
fix(web): match subagent timestamp fonts to chat (pingdotgg#16151)
039ddf1
@UtkarshUsername
fix(web): wrap full status text in composer hover details (pingdotgg#…
5b613de 
…16158)
@juliusmarminge @claude
ci: run the transfer report job on Blacksmith (pingdotgg#16178)
2bffcc5 
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@t3dotgg @claude
fix(server): Stop also stops delegated tasks and pull request watches (…
f32c23c 
…pingdotgg#16002)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@t3dotgg @claude
feat: native /goal for Codex and Claude, with goal status in the UI (p…
a172e1c 
…ingdotgg#15592)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge
fix(server): use current SQL import in thread stop tests
73fd3c1
@walid-baharwal @juliusmarminge @claude
fix(server): name the cause of a failed git command (pingdotgg#8645)
f973b1d 
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@Gigioxx
fix(server): PR watch wakes the agent when a bot edits its review com…
21eb9a4 
…ment (pingdotgg#15415)
@juliusmarminge
feat(source-control): omit agent credits from PR merge messages (ping…
24238fe 
…dotgg#16192)
@t3dotgg @claude
fix(clients): dropped connections say why in the client trace (pingdo…
5cebd3b 
…tgg#16200)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@ScottN-PV @claude
fix(server): PR watch reports a required check that first appears alr…
404e229 
…eady passed (pingdotgg#15804)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
fix: a failed DPoP key load and a fresh maintenance read are no longe…
2a68a77 
…r cached (pingdotgg#15500)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@t3dotgg @claude
fix: tool screenshots show as images, not base64 text (pingdotgg#16199)
5eb8773 
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@t3dotgg @claude
docs(mcp): thread tools reach threads in any project (pingdotgg#15947)
f5eb250 
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@t3dotgg @claude
fix(threads): threads watching a PR stay in Working instead of bounci…
207f6a1 
…ng to the inbox (pingdotgg#16204)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
chore(deps): bump cursor sdk and astro to clear vulnerable transitives (
3d2a98f 
pingdotgg#16214)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@t3dotgg @claude
fix(server): PR sync waits out a GitHub rate limit pause instead of f…
54b6b66 
…ailing every PR (pingdotgg#16203)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Bombatomica64 and others added 29 commits October 6, 2026 12:41
@Bombatomica64 @juliusmarminge
fix(desktop): build AppImage with the static runtime toolset (fixes l…
9b2c03e 
…ibfuse2 launch failure) (pingdotgg#7765)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@bjrump
fix(mobile): keep usage-limit notice opaque (pingdotgg#15602)
7bf6de1
@juliusmarminge @claude
feat(server): GitHub API transport that uses gh only for the token (p…
1564aaa 
…ingdotgg#16319)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
feat(server): pull requests talk to GitHub's API instead of the gh CLI (
adc3c93 
pingdotgg#16320)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
feat(server): source control, media and discovery use GitHub's API in…
649418f 
…stead of gh (pingdotgg#16321)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
feat: choose the GitHub account per host, save a GitHub token, and fe…
9ac8f33 
…wer reads per PR action (pingdotgg#16322)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
fix(server): Rebase stack moves each layer onto the rebased layer bel…
1eae9c2 
…ow it (pingdotgg#16551)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
fix(web): diff panel keeps the chosen scope while a turn runs (pingdo…
3dfe373 
…tgg#16571)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
fix(desktop): honor the telemetry opt-out from the shell profile (pin…
78c9fca 
…gdotgg#16563)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
docs(marketing): disclose product usage data in the privacy policy (p…
3b44698 
…ingdotgg#16562)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
feat(web): note anonymous usage data in onboarding and link the priva…
115640a 
…cy policy (pingdotgg#16564)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@stevan-borus @juliusmarminge @claude
perf(web): diff panel no longer re-renders every file header each tim…
f21d6da 
…e a patch arrives (pingdotgg#16033)

Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
feat(server): every T3 MCP tool declares who may call it (pingdotgg#1…
2f85686 
…6335)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
feat(server): outside agents sign in to the T3 MCP server with OAuth (p…
2c8be58 
…ingdotgg#16336)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
feat(web): copy an environment's MCP URL for outside agents (pingdotg…
fbe5df2 
…g#16337)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@esthor @juliusmarminge @claude
chore(tsconfig): turn off the Schema-over-JSON diagnostic in test fil…
7bee189 
…es (pingdotgg#16375)

Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@esthor
chore(review): CodeRabbit gates outside contributors' pull requests (p…
c9b21b2 
…ingdotgg#16332)
@juliusmarminge
fix(desktop): include Linux package license and app metadata (pingdot…
f4f148e 
…gg#16597)
@juliusmarminge @claude
fix(server): one failing RPC handler no longer ends the client's othe…
8ddf200 
…r requests (pingdotgg#15515)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
fix(contracts): a context record that cannot be encoded no longer fai…
13aabf3 
…ls the send (pingdotgg#16398)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@jakeleventhal
fix(web): open pull request row actions on right-click (pingdotgg#16612)
d8d037e
@maria-rcks
fix(web): show attempted paths in file preview errors (pingdotgg#15628)
876f865
@maria-rcks
fix(vcs): passive sidebar rows stop retaining remote pollers (pingdot…
5055de3 
…gg#15666)
@maria-rcks
feat(web): group keybindings settings by area with a page toolbar (pi…
72d5c32 
…ngdotgg#12822)
@Bil0000
feat(web): stop T3-owned subagents from Lineage (pingdotgg#15211)
c5c6f9c
@maria-rcks
feat(web): add fast actions to linked pull requests (pingdotgg#16627)
ab28039
@Bil0000 @juliusmarminge
feat(web): open right panel tab menu with Mod+T (pingdotgg#15686)
7202ba6 
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge @claude
fix(server): provider sessions clean up when their start is interrupt…
4b5c604 
…ed (pingdotgg#15571)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
fix(web): show "No project" near the top of the new thread picker (pi…
517188b 
…ngdotgg#16628)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@matheustimbo
matheustimbo merged commit 517188b into fork-main Oct 7, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.