Repository navigation
chore(sync): merge upstream into livemap - #41
Merged
Merged
Conversation
… (#38444) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#38712) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…(#37980) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… themselves (#37990) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ing history (#38724)
…(#37980) (#38739) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ems (#38263) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…hat may be live (#38733)
…s (#38740) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s (#38544) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Cursor <cursoragent@cursor.com>
…(#38683) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…8889) 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> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…ktop app's own environment is off (#38722)
…(#38772) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
…s (#38856) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ad (#38890) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… runtime folder (#29279)
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…round work details (#38904) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d /c launchers (#38946)
…(#38917) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… (#38825) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…8848) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… the PR merges (#38926) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…(#38867) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…er a restart (#38955)
Co-authored-by: Claude Fable 5.2 (primary) <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ount (#34194) Co-authored-by: Nicholas Wasmiller <derped@mnpl.fyi> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
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>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…d of the portable archive (#35268) Co-authored-by: Felix Mrak <180021770+felixleopold@users.noreply.github.com> Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Merge upstream c1f8459 into livemap 63184ea. Conflict: packages/contracts/src/auth.ts authScopeRequiredResponse. Kept both compatibility mappings: fork ari:read reports orchestration:read and upstream admin-only relay:configure reports relay:write as requiredScope for clients with the original scope enum. 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.
Summary
Sync the fork's upstream mirror
main(c1f8459153490d78c0d674b2ce5d749f31aaa4cb, 112 upstream-only commits) intolivemap(63184ea4f061fb7fce83dfb7410dda1fdfea83db). This is the follow-up to the 19 Nov sync escalation and the preceding sync in #40. The commit retains both parents in that order; tested merge9dc16043280450c4e3bf475bd7480d07e3279fdb, tree204530685cc3347b3355569b6393b055d7c0f4b7.Both branches extended
authScopeRequiredResponseinpackages/contracts/src/auth.ts, the only textual conflict. The resolution keeps both legacy error mappings (ari:read→orchestration:read,relay:configure→relay:write). This is response compatibility, not a permission grant:ari:readremains in the standard scopes,relay:configureremains admin-only, and upstream token renewal is unchanged. Existing table coverage inpackages/contracts/src/auth.test.tscaught the loss of each mapping separately and passed 30/30 when both were restored.Fork changes preserved
livemap; upstream native code is retained without adding fork-specific native features.Host readback: the verified merge bundle has the expected tree and ordered parents,
git show --remerge-diffidentified the expected auth resolution, andgit diff --check 63184ea4 HEADpassed. The product diff is 569 files versuslivemap(+24,055/−4,018), not the Boxd bootstrap patch.Boxd verification
Node 26.13.1, Vite+ 1.4.0; Claude Code (Opus 5.5).
vp i --frozen-lockfilepassed. The focused repo-local./node_modules/.bin/vp test run $(cat /task/work/t3code-focused-tests.txt)ran 45 files: 983 tests passed, 1 skipped, 1 failed.vp run check:changed 63184ea4f061fb7fce83dfb7410dda1fdfea83dbran 236 files in the main test batch (235 passed; 6,996 tests passed, 4 skipped, 1 failed); the second test batch passed both files. Unused patches, format, lint, Knip, GraphQL, typecheck (42 packages) and React compiler checks passed. The command exited 1 for the pre-existing failure below. Playwright Chromium was installed before the final run, resolving missing-browser errors in the first run.Accepted baseline exception:
apps/server/src/provider/AntigravityInstallation.test.ts:697, “explains that the linux-arm64 runtime needs 4 KiB pages when it aborts on a 16 KiB kernel”, failed withexpected 'cancelled' to be 'failed'../node_modules/.bin/vp test run apps/server/src/provider/AntigravityInstallation.test.ts -t 'explains that the linux-arm64 runtime needs 4 KiB pages when it aborts on a 16 KiB kernel'reproduced the same assertion and exit 1 on unchanged upstreamc1f8459in the same VM environment. The test was not changed; this is the only remaining failure, accepted for PR publication, not a green suite.vp run --filter @t3tools/web --filter t3 build,vp run build:desktopandnode apps/desktop/scripts/verify-preload-bundle.mjsall exited 0. The desktop rerun used the samelibsecret-1-devandpkg-configprerequisites as CI. No full-suite, native-device, release or macOS signing verification is claimed.Reviewer checks and release
Review the single conflict resolution, then check Settings → Sharing & access → Create link: View Ari is checked by default; Configure relay (admin) is offered but unchecked. The Boxd browser smoke check also showed Ari Code branding and the theme. GitHub CI is intentionally disabled and was not changed. Opening this PR does not advance
livemapor trigger its push-based release. No merge or deployment was performed.