Skip to content

chore: sync upstream v2026.5.7#68

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

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

Conversation

@github-actions
Copy link
Copy Markdown

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

Status: merge conflicts — manual resolution required

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

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

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 (19336 commits)

eeef486449 test(release): align stable onboarding npm prompt
c5c7d102db chore(release): set stable package version
db1ee678ac fix(release): clear final validation blockers
bccf2d6a62 chore(release): set beta package version
001a89ec00 test(discord): type voice capture stream mock
6b4a7d844b fix(release): remove stale unused symbols
e1ac32b4ae fix(plugins): type legacy peer install args
8c667d1ab0 chore(release): set version to 2026.5.7
cb2fa4affb ci(release): speed up beta publish path
803ba3ded3 chore(release): set version to 2026.5.6
06809c45fc fix(doctor): preserve Codex route repair sequencing
7de45e0dfd fix: handle mixed Codex OAuth PI recovery
7b53e58670 fix: preserve Codex OAuth doctor routes
5507a1db76 fix(auto-reply): gate inline skill tool dispatch [AI] (#78517)
f6415d51c3 fix: clear reset skills snapshot (#78873)
cd070c2a49 Honor owner enforcement for native commands [AI] (#78864)
543dbd179b fix(active-memory): require admin scope for global toggles [AI] (#78863)
84a0015973 fix(compaction): ignore metadata bytes in preflight pressure
a17876c9ba feat(openai): add chat-latest model override
344f56a23f fix(plugins): share npm script shell env (#78887)
88752d9359 changelog: credit @sliverp for channels list channel-only rework
2db4d779db Feat/channels list show all and drop auth (#78456)
8737b1860e Fix Tavily tool SecretRef runtime config
edbc6f4d49 docs(cli): document cron list/show --json status field
105242f06d feat(cron): add computed status field to --json output (#78701)
18ebbe3f36 fix(btw): keep usage placeholder visible
6c1f92ed88 fix: refresh plugin approval protocol models
5e9e645458 fix: let codex guardian own native permission approvals
f0bc87def4 fix: scope native approval reuse by session
4b8f9433b8 fix: reuse codex native approvals

Resolution

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

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