Repository navigation
chore(fork): merge upstream v0.1.11-nightly.20261119.4928 - #59
Merged
Merged
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#38517) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e a refresh while loading (pingdotgg#38508)
… MCP credentials (pingdotgg#26652) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ject file (pingdotgg#38510) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e hold is already met (pingdotgg#38545)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s in generated folder and branch names (pingdotgg#38540) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…h screens (pingdotgg#38546) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ess (pingdotgg#38553) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ry (pingdotgg#38493) Co-authored-by: Grok 4.7 <noreply@x.ai> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…els (pingdotgg#38556) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#38565) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#38491) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ist (pingdotgg#36035) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… of resolving every package fresh (pingdotgg#38592)
… to the T3 MCP server (pingdotgg#36439)
…rowser (pingdotgg#36037) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ding (pingdotgg#37406) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nd in Background work (pingdotgg#37787)
…pingdotgg#38598) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…rough MCP tools (pingdotgg#26751) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…CP tools (pingdotgg#26752) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#38106) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…iting (pingdotgg#38968) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#23654) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#35621) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#38980) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…laced (pingdotgg#38978) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…th (pingdotgg#24683) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ished states (pingdotgg#38986) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#38996) Co-authored-by: DominikScholz <12826585+DominikScholz@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ady loaded (pingdotgg#39000) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ails (pingdotgg#38995) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#38998) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#39004) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ch (pingdotgg#39012) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#39017) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…onnections (pingdotgg#38974) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#38991) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#39007) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…lost (pingdotgg#39018) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-Authored-By: Claude <noreply@anthropic.com>
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 v0.1.11-nightly.20261119.4928 conflicted in 15 files. Most conflicts were two features added at the same spot, so both sides were kept.
Conflicted files:
apps/mobile/index.ts: took upstream's comments on the Intl polyfill import the fork already had.apps/mobile/src/Stack.tsx: kept the fork's phone setup, agent access and power screens and added upstream'sThreadGuestSharesheet.apps/mobile/src/features/agent-awareness/liveActivityPreferences.ts: took upstream's rewrite, which updates a linked server's Live Activity preference instead of relinking it. Kept the fork's rule (feat(mobile): share the phone's server with other devices through T3 Connect #19) that skips the phone's own server, applied to upstream's connection loop. Upstream's bearer-token filter is gone, as upstream intended.liveActivityPreferences.test.ts: took upstream's tests and moved the fork's phone-server cases into the "only creates missing links" test. That test now also checks that the phone servers are never updated.apps/mobile/src/features/settings/SettingsNotificationsRouteScreen.tsx: took upstream's update and link callbacks and keptphoneServerEnvironmentId.apps/server/src/cloud/CloudLink.ts,apps/server/src/cloud/http.ts,packages/contracts/src/environmentHttp.ts: kept the fork'ssetSharingModeand/api/connect/sharing-modeendpoint next to upstream's newupdateLiveActivityPreferenceand/api/connect/live-activity-preference. Removed theEnvironmentAuthenticatedPrincipalimport, which upstream stopped using.packages/contracts/src/auth.ts: keptAuthViewOnlyClientScopesnext to upstream's newAuthAdministrativeClientScopes.apps/server/src/cloud/http.test.ts: kept the fork'sgethelper and took upstream'slinkableHeresignature.apps/server/src/orchestration-v2/runtimeLayer.test.ts: added upstream's new "watch until" test. Kept the fork's settle test (fix(server): background work an agent waits on survives settles, crashes and failed wakes #14), where automatic settlement waits on a watch.OrchestratorReplayRecovery.integration.test.ts,OrchestratorReplayRestartBackgroundNote.integration.test.ts: the fork's restart note header (fix(server): background work an agent waits on survives settles, crashes and failed wakes #14) plus upstream's new SendMessage resume hint on the subagent line. This matches what the mergedRestartBackgroundNote.tsproduces.apps/server/src/provider/agentContextBudget.json: set to the measured values, which are upstream's plus 32 bytes of the fork's MCP tool text.docs/user/remote-access.md: kept upstream's paragraph on indirect permissions, followed by the fork's "Share a phone's server" section.Changes beyond the conflict markers, so the phone's T3 Connect sharing (#19) keeps working:
linkEnvironmentToCloudWithPreferencenow runs inside an environment command.phone-sharing-commands.tsnow calls it throughcreateEnvironmentCommand.relay:configurescope, whicht3 pairleaves out by default. The phone now pairs with its own server usingAuthAdministrativeClientScopes(device-runtime.ts,T3DeviceRuntimeModule.kt). A phone paired before this change has to pair again through phone setup before it can turn sharing on.A second commit merges main after #57 and #58 landed. Its one conflict, in
phone-sharing-commands.ts, keeps the environment command call above and the translated error text from main.Checks run: typecheck for contracts, server, mobile and web; the tests for the AgentContextBudget, cloud http, the full runtimeLayer file, both replay integration files, liveActivityPreferences, and mobile phone, device-runtime and cloud.
Opus 5.5 in Claude Code did this work.
🤖 Generated with Claude Code