Skip to content

chore: sync upstream v2026.5.20#72

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

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

Conversation

@github-actions
Copy link
Copy Markdown

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

Status: merge conflicts — manual resolution required

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

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

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/update-command.ts
  • src/commands/auth-choice-options.ts
  • src/commands/onboard-types.ts
  • src/config/schema.base.generated.ts
  • src/plugins/bundled-plugin-metadata.generated.ts

Upstream changes (29140 commits)

e510042870 fix(qa): accept Telegram no-reply timeout details
ec2d744ba7 test(release): respect stable ClawHub channel
bf141fa663 chore(release): prepare 2026.5.20 stable
bb00b2eee2 chore(release): refresh generated baselines
a76234b54a chore(release): refresh config baseline
a4ea646108 fix(agent): lock Pi session event persistence
ca73aee40a fix(agent): allow prompt-owned assistant transcript writes
63906cfda7 ci: reset SwiftPM artifacts on macOS retry
631b1c50f6 test(whatsapp): stabilize release prerelease checks
6762c79cc9 ci: retry macOS Swift binary artifacts cleanly
59650ba258 fix(release): sync plugin manifest versions
3bc560b8b1 test: restore secret-file rejection expectation
eb05ef1692 chore(release): prepare 2026.5.20 beta 2
4a2c8d0405 fix(docker): keep runtime prune offline
c3f0672fbb test: align Docker prune assertion
2ea100fdd4 fix(docker): allow prune to refill prod store
1f160682ee test: refresh prerelease assertions
295ab0b07d test: align beta release expectations
680132d044 chore(release): prepare 2026.5.20 beta 1
1b1580cbc3 chore(release): refresh generated baselines
e72f601925 fix(openshell): use NVIDIA CLI contract
94b6d9f8b2 docs(release): prefer 1Password provider preflight
6dbd5bd446 Policy: add model, network, and MCP conformance checks (#80783)
2bb00f6726 fix(agents): fence embedded session writes
95eac52e92 test: update command auth expectations
e0b53cae41 docs: remove stale owner tool wording
02182d5a30 refactor: remove sender owner tool gating
159b3002e4 fix(xai): keep OAuth URL clickable (#84927)
a901396ad1 Fix stale WebChat typing indicator after terminal session patch (#84565)
c49647ee23 docs: document rejected autoreview findings

Resolution

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

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 22, 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