Skip to content

chore: bring the fork level with upstream pingdotgg/t3code - #26

Merged
polymaniadeveloper-hub merged 987 commits into
masterfrom
integration/upstream-2026-10-09
Oct 10, 2026
Merged

polymaniadeveloper-hub merged 987 commits into
masterfrom
integration/upstream-2026-10-09

Conversation

@polymaniadeveloper-hub

@polymaniadeveloper-hub polymaniadeveloper-hub commented Oct 9, 2026 •

Copy link
Copy Markdown
Collaborator

This brings the fork level with upstream pingdotgg/t3code main at 64972461c. Together with the orchestrator V2 integration it builds on, that is 982 upstream commits master does not yet have, including the move of OpenCode, Pi, Cursor, Grok, Muse and ACP into their own provider packages and the removal of the legacy providers settings map. The fork's own work (delivery, board, engine, the Kimi, Hermes and DeepSeek drivers, usage accounts and plan limits, and the upstream-sync workflow) is kept and adapted to the new upstream APIs.

It is built from feat/orchestrator-v2-integration, then origin/master, then pingdotgg/main, all as real merge commits, so upstream's history stays an ancestor of master for the daily sync.

Conflicted files

  • apps/server/src/provider/ClaudeProvider.ts: upstream's provider-core imports; the fork's Claude runtime modes kept.
  • apps/server/src/provider/Drivers/CodexDriver.ts: upstream's ModelCatalog and ProviderHost; the fork's Codex sandbox check still sets the runtime modes.
  • apps/server/src/provider/builtInDrivers.ts: Cursor, Grok, OpenCode, Muse and Pi from upstream's packages; the fork's Kimi, Hermes and DeepSeek drivers kept.
  • apps/server/src/usage/UsageService.ts: upstream's rule that an unconfigured default slot runs with default config; the fork's DeepSeek, pi, Kimi and Hermes transcript sources kept, and the implicit Antigravity slot no longer reads the removed legacy settings.
  • apps/web/src/components/chat/ModelPickerContent.tsx: the fork's provider setup entries kept, with upstream's "update the CLI for this model" notices below them.
  • apps/web/src/components/settings/providerDriverMeta.ts: upstream's provider client registry; Kimi, Hermes and DeepSeek added to it. Pi uses upstream's piClient, so its label is "Pi" and it no longer shows an Early Access badge.
  • apps/web/src/components/usage/UsageLimitsPooled.tsx: upstream's providerClients.get; the fork's quota-group label and harness list kept.
  • packages/contracts/src/settings.ts: upstream's shape (no providers map or per-driver patches; Muse, OpenCode, ACP Registry and Pi schemas live in their packages). Usage accounts, the Kimi, Hermes and DeepSeek schemas, and delivery settings kept. The fork's Pi provider field moves to packages/provider-pi/src/settings.ts.
  • packages/provider-opencode/src/server/adapter.ts: upstream's McpProviderSessions; a team-bound thread's stdio servers are still added.
  • packages/provider-opencode/src/server/driver.ts: upstream's package imports; the fork's merged Go and GLM plan limits kept.
  • packages/provider-opencode/src/server/status.ts: upstream's imports; the fork's OpenCode runtime modes kept.
  • packages/provider-opencode/src/server/usageLimits.ts: upstream's imports and its Go credential fingerprint, which the earlier integration had dropped; the fork's GLM plan reader and merge kept, and the merge passes the fingerprint through when only one plan reports.
  • packages/provider-opencode/src/server/v2/adapter.ts: upstream's mcpSessions and host paths; team stdio servers kept.
  • packages/provider-pi/src/server/driver.ts: upstream's imports; pi's ChatGPT plan limits kept.

Other adaptations needed to compile

  • The delivery thread record (team instructions and stdio servers) moves to a fork-only packages/provider-core/src/server/deliveryThreadSession.ts, so provider packages can read it. apps/server/src/delivery/DeliveryThreadSession.ts re-exports it. The ACP, Cursor, Claude and Codex MCP builders now take the thread id beside upstream's MCP session.
  • runtimeModeSupport and the Z.AI usage reader move to fork-only modules in provider-core. pi's usage reader moves into provider-pi and maps ChatGPT windows the way the Codex driver does. Its tests and the OpenCode GLM tests move next to the code.
  • The Kimi, Hermes and DeepSeek drivers use ProviderHost, the Effect-built ACP adapter and provider-core imports.
  • Kimi, Hermes and DeepSeek icons are drawn through ProviderInstanceIcon's map, which upstream uses for drivers without a package icon. Before, they showed initials. No screenshots are attached.
  • The stale .github/tevin-upstream-sync-conflicts.md report is deleted.

Checks

  • tsc --noEmit has 0 errors in contracts, provider-core, provider-acp, provider-cursor, provider-opencode, provider-pi, shared, apps/server, apps/web and apps/mobile.
  • tsc --noEmit in client-runtime has 6 errors, all in src/state/delivery.test.ts. The integration branch had the same 6 before this merge; they are not fixed here.
  • vp test run, server (delivery tests, DeliveryAdapterBinding, planUsageLimits, runtimeModeSupport, ForkAcpAdapter, AcpSessionOption, Claude and Codex adapters, CodexDriver, UsageService, ProviderRegistry): 486 passed after the fixes below.
  • vp test run, packages (contracts settings, provider-core runtimeInstructions, cursor adapter, OpenCode adapter, driver, status and usageLimits, pi driver and usageLimits): 269 passed after the fixes below.
  • vp test run, web (apps/web/src/lib/delivery*.test.ts, ProviderSettingsForm, UsagePage, ModelPickerContent, ProviderModelPicker): 255 passed.
  • node --test .github/scripts/tevin-upstream-sync.test.cjs: 23 passed.
  • vp fmt and vp lint were run on the edited files. Lint shows only warnings that upstream code already has.

Fixes for tests that failed before this merge

  • The OpenCode version probe allows 10 seconds again, restoring fork commit e5e3a07, which the earlier integration lost when the probe moved into provider-opencode.
  • ProviderRegistry.test.ts "keeps Cursor disabled…" now expects the fork's Kimi, Hermes and DeepSeek default slots. Behaviour is unchanged.

Upstream sync PR #25

#25 (automation/tevin-upstream-sync) was merged into master before this PR was opened. Its only change was the conflict report, which this PR deletes. Once this PR merges, the conflicts it reported are resolved and the next daily sync starts from upstream 64972461c.

🤖 Generated with Claude Code

Yash-Singh1 and others added 30 commits October 6, 2026 04:14
…g#13217)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#16400)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…#16515)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…dotgg#14825)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ibfuse2 launch failure) (pingdotgg#7765)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#16319)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
pingdotgg#16320)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…stead of gh (pingdotgg#16321)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…wer reads per PR action (pingdotgg#16322)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ow it (pingdotgg#16551)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…tgg#16571)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…gdotgg#16563)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ingdotgg#16562)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
ScottN-PV and others added 25 commits October 9, 2026 00:10
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ect (pingdotgg#17366)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ilscale (pingdotgg#17158)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ff (pingdotgg#17359)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… card (pingdotgg#17094)

Co-authored-by: macodev00 <macodev00@users.noreply.github.com>
…hem (pingdotgg#17191)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
… port (pingdotgg#17417)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…hout (pingdotgg#17427)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…LatestVersions service (pingdotgg#17434)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…essions service (pingdotgg#17446)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e with Effect conventions (pingdotgg#17542)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…service conventions (pingdotgg#17544)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Carries the fork's latest master, including the upstream-sync workflow
fixes, into the orchestrator V2 integration before merging upstream.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Brings the fork level with upstream at 6497246. Upstream wins where it
implemented the same thing (provider packages, settings shape, usage
limits); the fork's delivery, board and engine work is kept.

Fork code adapted to the moved upstream APIs:
- The delivery thread record (team instructions and stdio servers) moves
  to a fork-only provider-core module, so the OpenCode, Pi, ACP and
  Cursor packages can read it. apps/server re-exports it.
- runtimeModeSupport and the Z.AI usage reader move to fork-only
  provider-core modules; pi's ChatGPT usage reader moves into
  provider-pi. Their tests move next to them.
- Kimi, Hermes and DeepSeek drivers use ProviderHost, the Effect-built
  ACP adapter and provider-core imports; their settings stay in contracts
  and their client definitions join upstream's provider client registry.
- OpenCode Go keeps upstream's credential fingerprint beside the fork's
  GLM plan and quota group.
- The stale upstream-sync conflict report is removed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@github-actions github-actions Bot added the vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. label Oct 9, 2026
Tevin2119 and others added 2 commits October 9, 2026 19:06
…ork providers

The OpenCode version probe allows 10 seconds again, as fork commit
e5e3a07 set before the probe moved into provider-opencode. The
ProviderRegistry default-settings test now expects the fork's Kimi,
Hermes and DeepSeek default slots; behaviour is unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#1189)

master took pingdotgg#1189 (the T3 checkout update in the v2 sidebar's update pill) after this branch was
made. Both sides are kept: the sidebar footer has the thread undo notice and the checkout pill, and
the root keeps the Nightly mobile notice while the checkout update provider wraps the shell.
Two tests imported AsyncResult from effect/unstable/reactivity, which upstream's Effect moved to
effect/reactivity; client-runtime's six type errors on master were this.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@polymaniadeveloper-hub
polymaniadeveloper-hub merged commit 96781da into master Oct 10, 2026
6 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.