chore: merge upstream v1.4.0 into dev#15
Merged
Conversation
…#20123) Co-authored-by: Jaaneek <jankiewiczmilosz@gmail.com>
Co-authored-by: dongyuxin <dongyuxin@dev.dongyuxin.msh-dev.svc.cluster.local>
|
Hey! Your PR title Please update it to start with one of:
Where See CONTRIBUTING.md for details. |
|
This PR doesn't fully meet our contributing guidelines and PR template. What needs to be fixed:
Please edit this PR description to address the above within 2 hours, or it will be automatically closed. If you believe this was flagged incorrectly, please let a maintainer know. |
|
Thanks for your contribution! This PR doesn't have a linked issue. All PRs must reference an existing issue. Please:
See CONTRIBUTING.md for details. |
mlgarchery
requested changes
Apr 10, 2026
Co-authored-by: Martial Garchery <martial.garchery@gmail.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.
Issue for this PR
Closes #none
Type of change
What does this PR do?
This PR merges the latest upstream
v1.4.0release into ourdevbranch.During the merge, several structural changes from upstream conflicted with our custom Mammouth Code setup. I resolved these by:
mammouth-aiprovider logic insrc/provider/models.tsandsrc/cli/cmd/tui/routes/session/index.tsx.MAMMOUTH_*environment variables and flags (inflag.ts) override the default upstreamOPENCODE_*equivalents.modelvariable redeclaration and missingBun.sleepimports) that popped up as a result of the conflict resolutions.The result is a clean merge that brings in 1.4.0 improvements while fully maintaining our custom Mammouth ecosystem.
How did you verify your code works?
bun installto successfully rebuildbun.lock.bun turbo typecheckacross all packages, which now passes completely without errors.bun testto ensure core functionality hasn't broken.Screenshots / recordings
N/A - Backend and upstream merge sync
Checklist