Repository navigation
chore: bring the fork level with upstream (10 Oct) - #30
Open
polymaniadeveloper-hub wants to merge 133 commits into
Open
polymaniadeveloper-hub wants to merge 133 commits into
polymaniadeveloper-hub wants to merge 133 commits into
Conversation
…ngdotgg#17559) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…#16674) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Ben Davis <bmdavis419@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…pingdotgg#17599) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ract (pingdotgg#17602) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#17573) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rgejo (pingdotgg#17581) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ol-azure-devops (pingdotgg#17592) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…lab (pingdotgg#17594) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…bitbucket (pingdotgg#17597) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…hub (pingdotgg#17607) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#17576) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#17577) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#17578) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#17579) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#17615) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…st kinds (pingdotgg#17617) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…not its kind (pingdotgg#17619) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g move into their packages (pingdotgg#17624) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nce (pingdotgg#17628) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#17641) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#17645) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…utput (pingdotgg#17376) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… again (pingdotgg#17379) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…its thread (pingdotgg#17327) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…a check is still going (pingdotgg#17344) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…ingdotgg#17496) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#17223) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…ingdotgg#17843) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…g#17724) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
… full-access MCP grants (pingdotgg#17772) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pull request (pingdotgg#12223) Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Co-authored-by: Julius Marminge <jmarminge@gmail.com> Signed-off-by: Loïs Postula <lois@postu.la>
Brings in 132 upstream commits. Upstream now reads usage through readers that live on each driver; the fork's Kimi, Hermes, DeepSeek and pi usage moves onto that API as scan readers, and its model-provider attribution rides on upstream's Claude and Codex readers through fork-only wrappers. Conflicts: - RpcAuthorization.ts: both sides' new scopes kept. - server.ts: upstream moved layerUsage; layerDelivery kept. - Drivers/antigravityUsageReader.ts: upstream's Effect reader, plus the fork's executor_metadata model fallback. - builtInDrivers.ts: upstream's usage driver list, plus the fork's drivers and readers. - UsageService.ts, usageTranscriptReader.ts: upstream's; the fork keeps only its v6 cache migration. - usageScanCache.ts: upstream's format-aware decoder with the fork's model-provider columns (v6). - usageTranscripts.ts, opencodeUsageReader.ts: deleted as upstream did; their fork parsers moved to the driver readers. - ChatView.tsx: upstream's child-input banner and the fork's task banner. - SidebarChrome.tsx: both imports; the fork's mobile brand classes with upstream's inset focus ring. - __root.tsx: CheckoutUpdateProvider and DesktopWebLinkCoordinator. - provider-opencode driver.ts, usageLimits.ts: upstream's usage reader and HomeDirectory reference, with the fork's GLM plan limits. - shared usageLimits.ts: upstream's workspace-aware account keys with the fork's quota groups. Adapted to upstream API changes: @t3tools/shared/HostProcess, mergeProviderInstanceEnvironment as an Effect, expandHomePath(home). 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.
This merges 132 new upstream commits from pingdotgg/t3code
mainintomasteras one real merge commit, on top of #26. The main upstream change is that usage history is now read by readers that live on each provider driver, so the fork's Kimi, Hermes, DeepSeek and pi usage moves onto that API, and the fork's model-provider attribution rides on upstream's Claude and Codex readers through fork-only wrappers.This supersedes the draft sync PR #28, whose conflict list predates #26.
Conflicts and how each was resolved
apps/server/src/auth/RpcAuthorization.ts: kept both sides' new scopes (the fork's checkout-update methods and upstream's storage-cleanup report).apps/server/src/server.ts: upstream movedlayerUsageabove the background policy, so the fork's duplicate was dropped;layerDeliverykept.apps/server/src/provider/Drivers/antigravityUsageReader.ts: upstream's Effect/SqlClient reader, with the fork's fallback to the conversation's model fromexecutor_metadataported onto it.apps/server/src/provider/builtInDrivers.ts: upstream's usage driver list and env, plus the fork's Kimi, Hermes and DeepSeek drivers, pi's reader, and the Claude/Codex attribution wrappers.apps/server/src/usage/UsageService.ts: upstream's driver-reader service; the fork keeps only its scan-cache migration (read the previous v5 file and the legacy file when the v6 file is missing). Its hard-coded harness homes, Hermes database, engine pi sources, OpenCode roots and Antigravity billing moved into the readers below.apps/server/src/usage/opencodeUsageReader.ts: deleted, as upstream did; the fork'sproviderIDattribution moved into provider-opencode's reader.apps/server/src/usage/usageScanCache.ts: upstream's format-aware decoder, with the fork's model-provider columns (cache v6, and the fork's own older v5 rows still read).apps/server/src/usage/usageTranscriptReader.ts: upstream's; the fork's pi, Kimi and DeepSeek parsing moved to the new readers.apps/server/src/usage/usageTranscripts.ts: deleted, as upstream did; its fork parsers moved toDrivers/piUsage.ts,kimiUsage.tsanddeepseekUsage.ts.apps/web/src/components/ChatView.tsx: upstream's child-input banner and the fork's thread-tasks banner both kept.apps/web/src/components/sidebar/SidebarChrome.tsx: both sides' imports; the fork's mobile-visible brand classes with upstream's inset focus ring.apps/web/src/routes/__root.tsx: both imports;CheckoutUpdateProviderstill wraps the app shell and upstream'sDesktopWebLinkCoordinatoris mounted.packages/provider-opencode/src/server/driver.ts: upstream's usage reader and catalog imports, with the fork's GLM plan limits.packages/provider-opencode/src/server/usageLimits.ts: the fork's shared auth-file reader and GLM limits, moved onto upstream'sHostProcess.HomeDirectory.packages/shared/src/usageLimits.ts: upstream's workspace-aware account keys, with the fork's quota groups and harness list.Fork code adapted to upstream API changes
Drivers/piUsage.ts,kimiUsage.ts,deepseekUsage.tsandhermesUsage.ts(scan readers), sharingharnessUsageFiles.ts.usageModelProviders.tswraps upstream's Claude and Codex readers to add the model provider, so their own files stay as upstream wrote them.UsageRecordin provider-core gains the optionalmodelProviderandmodelProviderSourcefields. Provider-opencode's reader recordsproviderIDand also reads each configured instance's ownOPENCODE_DATA_DIR. Antigravity usage keeps the fork's billing attribution andGEMINI_HOME.@t3tools/shared/hostProcessto@t3tools/shared/HostProcessin the checkout-update, delivery, workspace and Codex code. The Kimi, Hermes and DeepSeek drivers now handlemergeProviderInstanceEnvironmentreturning an Effect andexpandHomePathtaking the home directory.apps/server/src/usage/antigravityUsage.ts(and its test) andusageDatabases.ts. Neither was used by production code on master: upstream's Antigravity reader had replaced the first, and the second's Hermes half moved tohermesUsage.ts.Verification
vp i: ok.tsc --noEmit -pforapps/server,apps/web,packages/provider-opencode,packages/sharedandpackages/provider-core: no errors or warnings.vp test runon server tests next to the conflicted files (auth, Antigravity reader and driver, Claude/Codex usage, all ofusage/), the new reader tests, the ACP support tests, checkout update, workspace, CLI invocation, delivery, and the provider-opencode and shared usage tests: 324 passed, 2 failed. The 2 failures are incli/invocation.test.ts("requires the npm prefix's bin…" and "proves the native executable…"). They fail the same way on origin/master: on macOS the temp dir resolves to/private/var.vp test runon the web side (ChatView.logic,CheckoutUpdate*tests,lib/delivery*,state/delivery*,components/delivery/): 469 passed.node --test .github/scripts/tevin-upstream-sync.test.cjs: 23 passed.Worth a reviewer's look
usage-scan-cache-v6.json(version 6, with model-provider columns). This is the fork's own numbering. If upstream later ships its own v6, the next merge has to rename it.OPENCODE_DATA_DIRand the Antigravity billing attribution are small fork additions to upstream files (provider-opencode/src/server/usage.tsandDrivers/AntigravityUsage.ts).🤖 Generated with Claude Code