Skip to content

chore: sync upstream v2026.5.2#64

Draft
github-actions[bot] wants to merge 1 commit into
mainfrom
sync/upstream-release-v2026.5.2
Draft

chore: sync upstream v2026.5.2#64
github-actions[bot] wants to merge 1 commit into
mainfrom
sync/upstream-release-v2026.5.2

Conversation

@github-actions
Copy link
Copy Markdown

@github-actions github-actions Bot commented May 3, 2026

Status: merge conflicts — manual resolution required

Automated sync from upstream stable release v2026.5.2 hit merge conflicts.

Upstream release https://github.com/openclaw/openclaw/releases/tag/v2026.5.2
Sync branch sync/upstream-release-v2026.5.2
Workflow run https://github.com/daydreamsai/dreaming-claw/actions/runs/25272785992

Conflicted files

  • docs/cli/index.md
  • docs/concepts/model-providers.md
  • docs/help/testing.md
  • docs/providers/index.md
  • docs/providers/models.md
  • package.json
  • pnpm-lock.yaml
  • src/agents/pi-embedded-runner/run.ts
  • src/cli/update-cli.test.ts
  • src/cli/update-cli/update-command.ts
  • src/commands/auth-choice-options.ts
  • src/commands/onboard-types.ts
  • src/plugins/bundled-plugin-metadata.generated.ts

Upstream changes (18189 commits)

8b2a6e57fe docs: refresh plugin inventory for bundled channels
0accc7f745 fix(channels): keep matrix and mattermost bundled
8842a5bd43 test(e2e): allow npm configured plugin installs
c975bff486 fix: trusted installs
90079f5790 test(tooling): align plugin prerelease expectations
d8f31a2bfb fix(plugins): allow Discord install repair
dd22838630 test(docker): expect discord onboard package lane
a121f98e55 test(plugins): avoid kitchen sink config drift
13e8c49ee0 test(plugins): pin kitchen sink npm fixture
6cb548475e test(plugins): harden package plugin e2e lanes
dfad38d153 test: align stable release expectations
0126dbe171 chore: refresh stable config schema
57b158ff90 chore: prepare stable release metadata
f352caf07e fix: keep runtime model auth alias after build
61349d6bdc test: isolate prerelease catalog fixture
3d69cd0a1d test: align release assertions with beta metadata
8ecc5fcc51 docs: prepare 2026.5.2 changelog
b2c4c2daa4 docs: refresh release metadata after rebase
793485a472 chore: bump beta release to 2026.5.2-beta.3
8771cfb5b7 fix: resolve bundled public surfaces from packaged dist
bf91494035 test: keep windows smoke compatible with old agent cli
13424b9b3e test: accept externalized discord voice fallback
c96e62d5ab build: avoid ambiguous runtime aliases
beefac0564 build: restore postbuild config baseline
de42d35441 build: use ci config baseline hash
11932ccd92 build: refresh generated config schema
d761910457 fix: backport gateway start repair
0f1b1e0293 fix: backport release validation fixes
4dc9c43df8 fix: stabilize beta update and OpenAI transport paths
4b72d8e73c docs: clarify beta validation-only fixes

Resolution

git fetch origin sync/upstream-release-v2026.5.2 && git fetch upstream --tags
git checkout -B sync/upstream-release-v2026.5.2 origin/sync/upstream-release-v2026.5.2
git merge --no-ff --no-edit refs/tags/v2026.5.2
# resolve conflicts, then:
git rm .upstream-sync-pending || true
git commit
git push origin sync/upstream-release-v2026.5.2

Mark this PR as Ready for review once conflicts are resolved.


This PR was created by .github/workflows/upstream-release-sync.yml.

@github-actions github-actions Bot added the upstream-sync Automated upstream release sync label May 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

upstream-sync Automated upstream release sync

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants