Skip to content

chore(fork): merge upstream v0.1.11-nightly.20261119.4928 - #59

Merged
tebiggs merged 185 commits into
mainfrom
sync-conflict/v0.1.11-nightly.20261119.4928
Nov 19, 2026
Merged

tebiggs merged 185 commits into
mainfrom
sync-conflict/v0.1.11-nightly.20261119.4928

Conversation

@tebiggs

@tebiggs tebiggs commented Nov 19, 2026 •

Copy link
Copy Markdown
Owner

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's ThreadGuestShare sheet.
  • 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 kept phoneServerEnvironmentId.
  • apps/server/src/cloud/CloudLink.ts, apps/server/src/cloud/http.ts, packages/contracts/src/environmentHttp.ts: kept the fork's setSharingMode and /api/connect/sharing-mode endpoint next to upstream's new updateLiveActivityPreference and /api/connect/live-activity-preference. Removed the EnvironmentAuthenticatedPrincipal import, which upstream stopped using.
  • packages/contracts/src/auth.ts: kept AuthViewOnlyClientScopes next to upstream's new AuthAdministrativeClientScopes.
  • apps/server/src/cloud/http.test.ts: kept the fork's get helper and took upstream's linkableHere signature.
  • 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 merged RestartBackgroundNote.ts produces.
  • 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:

  • Upstream's linkEnvironmentToCloudWithPreference now runs inside an environment command. phone-sharing-commands.ts now calls it through createEnvironmentCommand.
  • Linking now needs upstream's new relay:configure scope, which t3 pair leaves out by default. The phone now pairs with its own server using AuthAdministrativeClientScopes (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

amv146 and others added 30 commits November 18, 2026 01:45
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>
… 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>
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>
…g#38491)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ist (pingdotgg#36035)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…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>
…pingdotgg#38598)

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
juliusmarminge and others added 29 commits November 18, 2026 22:16
…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>
…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>
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>
…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>
…onnections (pingdotgg#38974)

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>
@tebiggs
tebiggs merged commit 0df9600 into main Nov 19, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.