Skip to content

chore: merge upstream v1.4.0 into dev#15

Merged
mlgarchery merged 863 commits into
mammouth-ai:devfrom
jo-s-eph:upstream-merge-1.4.0
Apr 20, 2026
Merged

chore: merge upstream v1.4.0 into dev#15
mlgarchery merged 863 commits into
mammouth-ai:devfrom
jo-s-eph:upstream-merge-1.4.0

Conversation

@jo-s-eph
Copy link
Copy Markdown

@jo-s-eph jo-s-eph commented Apr 8, 2026

Issue for this PR

Closes #none

Type of change

  • Bug fix
  • New feature
  • Refactor / code improvement
  • Documentation

What does this PR do?

This PR merges the latest upstream v1.4.0 release into our dev branch.
During the merge, several structural changes from upstream conflicted with our custom Mammouth Code setup. I resolved these by:

  1. Re-applying our custom Mammouth branding across the TUI and UI components.
  2. Preserving our custom mammouth-ai provider logic in src/provider/models.ts and src/cli/cmd/tui/routes/session/index.tsx.
  3. Ensuring our custom MAMMOUTH_* environment variables and flags (in flag.ts) override the default upstream OPENCODE_* equivalents.
  4. Disabling newly added upstream GitHub actions that don't apply to our fork.
  5. Fixing a few TypeScript errors (like the model variable redeclaration and missing Bun.sleep imports) 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?

  • Ran bun install to successfully rebuild bun.lock.
  • Ran bun turbo typecheck across all packages, which now passes completely without errors.
  • Executed the local test suite via bun test to ensure core functionality hasn't broken.

Screenshots / recordings

N/A - Backend and upstream merge sync

Checklist

  • I have tested my changes locally
  • I have not included unrelated changes in this PR

opencode-agent Bot and others added 30 commits March 30, 2026 20:08
…#20123)

Co-authored-by: Jaaneek <jankiewiczmilosz@gmail.com>
Co-authored-by: dongyuxin <dongyuxin@dev.dongyuxin.msh-dev.svc.cluster.local>
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 8, 2026

Hey! Your PR title Upstream merge 1.4.0 doesn't follow conventional commit format.

Please update it to start with one of:

  • feat: or feat(scope): new feature
  • fix: or fix(scope): bug fix
  • docs: or docs(scope): documentation changes
  • chore: or chore(scope): maintenance tasks
  • refactor: or refactor(scope): code refactoring
  • test: or test(scope): adding or updating tests

Where scope is the package name (e.g., app, desktop, opencode).

See CONTRIBUTING.md for details.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 8, 2026

This PR doesn't fully meet our contributing guidelines and PR template.

What needs to be fixed:

  • No issue referenced. Please add Closes #<number> linking to the relevant issue.

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.

@jo-s-eph jo-s-eph changed the title Upstream merge 1.4.0 chore: merge upstream v1.4.0 into dev Apr 8, 2026
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 8, 2026

Thanks for your contribution!

This PR doesn't have a linked issue. All PRs must reference an existing issue.

Please:

  1. Open an issue describing the bug/feature (if one doesn't exist)
  2. Add Fixes #<number> or Closes #<number> to this PR description

See CONTRIBUTING.md for details.

Comment thread packages/opencode/script/build.ts Outdated
@jo-s-eph jo-s-eph requested a review from mlgarchery April 15, 2026 09:27
@mlgarchery mlgarchery merged commit 032cb74 into mammouth-ai:dev Apr 20, 2026
2 checks passed
@jo-s-eph jo-s-eph deleted the upstream-merge-1.4.0 branch April 20, 2026 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.