Repository navigation
chore(fork): merge upstream v0.1.10-nightly.20261114.4669 - #48
Merged
Merged
Conversation
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…hread's conversation (pingdotgg#36103)
…thread's whole history (pingdotgg#36100)
…ingdotgg#36104) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…eady (pingdotgg#35327) Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ry thread payload (pingdotgg#36146)
…esktop-settings.json (pingdotgg#36168)
…put (pingdotgg#36115) Co-authored-by: Claude Haiku 5.5 <noreply@anthropic.com>
…g#33566) Co-authored-by: maria-rcks <maria@kuuro.net>
…rted through a wrapper (pingdotgg#34959)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… previous one (pingdotgg#34446) Co-authored-by: nibarAhmed <nibarahmed0@gmail.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#35247) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…#36419) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…h every few minutes (pingdotgg#36371)
…stead of two per file (pingdotgg#35295) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…etect (pingdotgg#31170) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#31146) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…disk but not loaded (pingdotgg#36490)
Co-Authored-By: Claude <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.
Merge this with Create a merge commit, not squash, so upstream history stays intact.
Upstream's T3 Connect device approval (approve or revoke each device a T3 Connect sign-in brings) rewrote the credential minting and exchange code that fork feature #19 (phone sharing, View only / Full control) also changes. The resolution keeps both.
Conflicted files:
apps/server/src/auth/EnvironmentAuth.ts: took upstream's exchange (device trust,connectTrustLockfor DPoP exchanges) and kept the fork'scredentialExchangeLockaround the whole exchange, outside upstream's lock, sorevokeOtherAccessstill can't land between spending a credential and issuing its session.issueConnectCredentialtakes optionalscopes, defaulting to upstream's standard client scopes.apps/server/src/cloud/CloudLink.ts: mints through upstream'sissueConnectCredentialwith its approval setting, still under the fork'ssharingModeLock, passing View only scopes when the stored sharing mode is View only. Kept the fork's imports.apps/server/src/cloud/CloudLink.test.ts: kept the fork's harness and sharing-mode tests, moved them from mockingcreatePairingLinkto upstream'sissueConnectCredentialmock. Upstream's single mint test is folded into the fork's per-mode table, which now asserts the full request (thumbprint,requireApproval: false, scopes).apps/mobile/src/App.tsx: kept both the fork'sForkPushRegistrarand upstream'sConnectDeviceApprovalCoordinator.apps/server/src/provider/agentContextBudget.json: set to the measured values after the merge (upstream's, with the MCP tool list at 49838 bytes for the fork's tools).AgentContextBudget,CloudLink,EnvironmentAuth,EnvironmentAuthAdminandMcpOAuthtests pass locally.🤖 Generated with Claude Code