Skip to content

chore: sync upstream v2026.4.26#61

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

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

Conversation

@github-actions
Copy link
Copy Markdown

@github-actions github-actions Bot commented Apr 28, 2026

Status: merge conflicts — manual resolution required

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

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

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

be8c24633a docs: consolidate 2026.4.26 changelog
414b68df6f chore(release): prepare 2026.4.26 stable
2c7f65e025 docs: record npm provenance in release evidence
7c44230fda ci: support ref-backed telegram package e2e
09d044e0f4 test: tolerate old Windows updater restart handoff
a230f0f558 test: tolerate transient release validation output
aed6ccf090 test: stabilize live release checks
17596fc484 fix(update): restart Windows startup gateway after update
42220c929a ci: record package proof in release evidence
0518ff6f35 chore(release): refresh config baseline after coven removal
6b97dee4c1 chore(release): refresh plugin sdk api baseline
4623bba650 chore(release): refresh config docs baseline
f02ced0fab chore(release): refresh bundled channel metadata
49aa1d07b0 chore(release): prepare 2026.4.26 beta 1
f7797ca62b chore: remove coven extension
dc96886378 fix: clean up bundled LSP process trees on shutdown
d9bef3fe7c fix(ui): discard stale config state on explicit reload (#72624)
be6263da4f fix(gateway): preserve runtime-backed health state (#72417)
2161b46032 fix(feishu): support native interactive card payload sends (#72667)
c5678194d4 docs(qa): document Telegram and Discord QA lanes against code
b39d80835f test: retry transient openai websocket live stream
2f909b0b21 test: optimize slow tests
dd1a94f089 docs(qa): reorg, audit against code, and refresh stale content
abca187df5 docs(qa): add dedicated Matrix QA reference page
ea92dc9202 chore(coven): enable ClawHub publishing
8f8ba8af40 test: harden live release validation flakes
a2ec5a7d72 fix(plugins): break metadata snapshot cycle
147752ecc3 refactor: split plugin metadata normalizer
e3ad82d86d fix(control-ui): polish tweakcn theme imports
fc8ccde542 feat(acp): add opt-in Coven runtime bridge

Resolution

git fetch origin sync/upstream-release-v2026.4.26 && git fetch upstream --tags
git checkout -B sync/upstream-release-v2026.4.26 origin/sync/upstream-release-v2026.4.26
git merge --no-ff --no-edit refs/tags/v2026.4.26
# resolve conflicts, then:
git rm .upstream-sync-pending || true
git commit
git push origin sync/upstream-release-v2026.4.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 Apr 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