Repository navigation
Merge 1.138.0 from upstream - #16475
Merged
Merged
Conversation
midleman
added a commit
that referenced
this pull request
Oct 7, 2026
…ges (#16479) ### Summary Fixes the exploratory-test gate crashing on very large diffs, and makes upstream Code OSS merges explorable. - Gate and explorer build the diff stat from git instead of an env var; an upstream merge's 1.2 MB stat hit Linux's 128 KB per-variable limit (`Argument list too long`, [failed run](https://github.com/posit-dev/positron/actions/runs/37544621285/job/112545565759)) - The stat shown to the model is capped at 300 files plus totals - Upstream merges are detected from the `Upstream Code OSS changes from X to Y` commit and narrowed to where Positron meets them: Positron files, upstream files with a Positron block, and post-merge hand fixes - The gate passes upstream merges without a model call; the explorer is told to test Positron on top of the merge, not upstream behavior ### Release Notes #### New Features - N/A #### Bug Fixes - N/A ### QA Notes Verified with a dispatch on #16475 (1.138.0, 4,470 files narrowed to 184): [run](https://github.com/posit-dev/positron/actions/runs/37547806430), [report](https://d38p2avprg8il3.cloudfront.net/exploratory-report-37547806430-1-opus-ubuntu-x64/index.html). Harness-only change, so no e2e tags.
Collaborator
Author
|
Full test suite: https://github.com/posit-dev/positron/actions/runs/37523481298 |
|
E2E Tests 🚀 Note No feature tags detected. If this PR needs feature coverage, add the tag above and retrigger the workflow. |
Collaborator
Author
|
@softwarenerd confirmed that the build is working well for him; I've done sanity passes on macOS; @jonvanausdeln has done checking on Windows, tests are passing, and I've done successful builds on all 3 platforms. |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
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.
This PR merges upstream Code OSS changes from 1.134.0 to 1.138.0.
Notable changes
npm installafter pulling.Testing
Build, Vitest, core unit tests, and extension host tests pass. The full e2e suite was run in the CI lab; the remaining failures were traced to environment gaps or known flakes, not to the merge.
@:no-auto-tags