Skip to content

chore(fork): merge upstream v0.1.9-nightly.20261110.4465 - #37

Merged
tebiggs merged 151 commits into
mainfrom
sync-conflict/v0.1.9-nightly.20261110.4465
Nov 10, 2026
Merged

tebiggs merged 151 commits into
mainfrom
sync-conflict/v0.1.9-nightly.20261110.4465

Conversation

@tebiggs

@tebiggs tebiggs commented Nov 10, 2026

Copy link
Copy Markdown
Owner

Merge this with Create a merge commit, not squash, so upstream history stays intact.

Merges upstream v0.1.9-nightly.20261110.4465 (from v0.1.8-nightly.20261109.4399).

Conflicted files:

  • packages/contracts/src/environmentHttp.ts: kept both the fork's sharingMode / sharingModeChangePending (feat(mobile): share the phone's server with other devices through T3 Connect #19) and upstream's new tunnelHostname / linkableHere fields.
  • apps/server/src/cloud/CloudLink.ts: link state returns both the fork's sharing-mode fields and upstream's tunnelHostname.
  • apps/server/src/cloud/http.test.ts: the test client keeps the fork's get helper and adds upstream's linkableHere.
  • apps/server/src/auth/EnvironmentAuth.ts: kept the fork's accessGeneration and redeemMcpApproval; took upstream's removal of authenticateBrowserSession and its new consumeMcpApprovalCode signature, which returns the approved level.
  • apps/server/src/auth/McpOAuth.ts: approve keeps the fork's generation snapshot and passes upstream's resolved access level to mintCode.
  • apps/server/src/ws.ts: serverRefreshProviders checks the fork's read-only guard first, then upstream's modelCatalogOnly path. A catalog refresh probes providers, so a view-only session still only gets the known list.
  • apps/server/src/provider/agentContextBudget.json: set to the measured values (upstream's shrink plus the fork's MCP tool text).

One change outside the conflicts keeps #19 working: upstream now hides agent approval codes from listPairingLinks, so revokeOtherAccess stopped revoking them. It now lists active pairing links from the store directly. EnvironmentAuthAdmin.test.ts checks that an approval code issued before a revocation can't be spent after it; that assertion failed before the change.

Upstream's new hosted agent approval needs the access-write scope, which View only sessions don't have, so it doesn't widen what View only grants.

Server typecheck passes, along with the server tests for the conflicted files (AgentContextBudget, cloud/http, CloudLink, McpOAuth, EnvironmentAuth, EnvironmentAuthAdmin, ws).

🤖 Generated with Claude Code (Opus 5.5)

juliusmarminge and others added 30 commits November 8, 2026 20:11
…h .android overrides (pingdotgg#33173)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…3177)

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

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#24482)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…nal displays (pingdotgg#19064)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
… blank tile (pingdotgg#21163)

Co-authored-by: T3 Code Test <t3code-test@example.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: shivamhwp <shivamhwp@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…27576)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#21652)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#24933)

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>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…pingdotgg#31998)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#25828)

Co-authored-by: danddanddand <47586871+danddanddand@users.noreply.github.com>
Co-authored-by: whoisaldo <whois.younes@gmail.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: juliusmarminge <julius0216@outlook.com>
Co-authored-by: Claudesaul <139932571+Claudesaul@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#31207)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…tgg#27753)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
… Android (pingdotgg#28524)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#28125)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… on iPhone Duo (pingdotgg#33213)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#24079)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
juliusmarminge and others added 29 commits November 9, 2026 20:26
)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#24599)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#28221)

Held assistant paragraphs now appear after 800 ms without new text while the turn remains open. Idle writes preserve ingestion order, routing and finalization. Includes lean edge-case coverage and regressions for finalized-root reopening and early timer wakes.

Verified with focused tests, check:changed, real web and compiled macOS captures, independent Codex review, and a fresh Claude Opus 5.5 READY review. Natural Antigravity hangs remain unverified.

Implemented with Claude Opus 5.5 through Claude Code; investigated and verified with GPT-6.1-Sol through Codex in T3 Code.
…33730)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…al (pingdotgg#33535)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…uest times out (pingdotgg#27677)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s later subagent results (pingdotgg#33469)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#33438)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…to itself (pingdotgg#33695)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#33263)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ame is long (pingdotgg#33181)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude <noreply@anthropic.com>
@tebiggs
tebiggs merged commit f0cb879 into main Nov 10, 2026
25 of 26 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.