Skip to content

chore: sync upstream v2026.5.26#74

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

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

Conversation

@github-actions
Copy link
Copy Markdown

Status: merge conflicts — manual resolution required

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

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

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

10ad3aa160 chore(release): prepare 2026.5.26 stable
c45cc7978e test(e2e): preserve macos smoke entrypoint path
7d89681bb0 test(e2e): harden shell helper env assertions
f0e25b7fbe test(e2e): isolate shell helper env
13436ca463 ci(ui): refresh raw copy baseline
cd1e8fb733 fix(agents): preserve sessions_send fallback cause
292d60546d docs(plugin-sdk): refresh beta API baseline
e8c27faf6d docs(plugin-sdk): refresh beta API baseline
8584ea0f94 docs(changelog): refresh 2026.5.26 notes
daedbb4a5e chore(release): prepare 2026.5.26 beta 2
4e09f80e50 chore(release): refresh plugin shrinkwraps
67c265679d chore(release): sync plugin beta versions
95e453ce32 chore(release): prepare 2026.5.26 beta 1
e74a039035 docs(changelog): refresh 2026.5.26 notes
b9f6abf5e8 fix: bind plugin command llm auth to host agent
96bd939995 fix(e2e): bound kitchen sink RPC probes
95c8fc9678 ci: support native Windows Crabbox daemon hydration (#87175)
81e7e8ef24 fix: handle sessions_send active fallback failures (#86638)
ae972fe1fe fix(gateway): enable default auth rate limiting (#87148)
9772cf202c test(media): isolate generation provider registry mocks (#87173)
0762acae86 perf(gateway): skip lifecycle session cache clone
fdf58c1998 fix(e2e): backstop Parallels update jobs
f348284fa9 fix(daemon): avoid workgroup schtasks user prompts
d92a33306e fix(daemon): keep Windows Scheduled Task running on battery power (#59299)
b75f70bc04 perf(gateway): avoid cloning live switch store reads
586a6ce03b fix(crabbox): use host-visible local work roots
15c0dfa61b docs(changelog): refresh 2026.5.26 notes
42f0822bfa fix(exec): hide unavailable durable approval actions (#86359)
2899560a6b fix(reply): derive explicit control command turns
44c1cc8285 fix(e2e): check onboarding systemd noise

Resolution

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

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